From aa78c32f7e7474a5483185be4c74ea40d40b7275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:17:28 +0000
Subject: [PATCH 001/148] chore(deps): bump actions/download-artifact from 3 to
 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/reusable-coveralls.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index a5dfc83996cb..32415f80a602 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -24,7 +24,7 @@ jobs:
           coverage: xdebug
 
       - name: Download coverage files
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: build/cov
 

From 19a54ba666858716e9e083ed44c01925b210d6df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Dec 2023 20:15:29 +0900
Subject: [PATCH 002/148] docs: add changelog and upgrade for v4.4.5

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

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

From 4f4b969f71d8587df9ea0a99baef3bf8ee9ca3e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 08:43:46 +0900
Subject: [PATCH 003/148] docs: add instruction to merge develop into 4.x

---
 admin/RELEASE.md | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 8d68ccd9923a..b168f7856354 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -6,7 +6,21 @@
 >
 > -MGatner, kenjis
 
-## [Minor version only] Merge minor version branch into develop
+## Merge `develop` branch into next minor version branch `4.x`
+
+Before starting release process, if there are commits in `develop` branch that
+are not merged into `4.x` branch, merge them. This is because if conflicts occur,
+merging will take time.
+
+```console
+git fetch upstream
+git switch 4.x
+git merge upstream/4.x
+git merge upstream/develop
+git push upstream HEAD
+```
+
+## [Minor version only] Merge minor version branch into `develop`
 
 If you release a new minor version.
 
@@ -149,7 +163,7 @@ Work off direct clones of the repos so the release branches persist for a time.
     git merge origin/master
     git push origin HEAD
     ```
-* [ ] Update the next minor upgrade branch `4.x`:
+* [ ] Update the next minor version branch `4.x`:
     ```console
     git fetch origin
     git checkout 4.x
@@ -157,7 +171,7 @@ Work off direct clones of the repos so the release branches persist for a time.
     git merge origin/develop
     git push origin HEAD
     ```
-* [ ] [Minor version only] Create the next minor upgrade branch `4.x`:
+* [ ] [Minor version only] Create the new next minor version branch `4.x`:
     ```console
     git fetch origin
     git switch develop

From 43f3da3de907b9b24d745d4902c272e40449ab95 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:22:24 +0900
Subject: [PATCH 004/148] docs: fix section title level

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

diff --git a/user_guide_src/source/changelogs/v4.4.4.rst b/user_guide_src/source/changelogs/v4.4.4.rst
index e7990adf9173..409ef9361830 100644
--- a/user_guide_src/source/changelogs/v4.4.4.rst
+++ b/user_guide_src/source/changelogs/v4.4.4.rst
@@ -39,6 +39,7 @@ Filesystem Helper
 :php:func:`get_filenames()` now follows symlink folders, which it previously just returned
 without following.
 
+************
 Enhancements
 ************
 

From e5331d432454de3e9f0294dadac10dea199095a8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:36:00 +0900
Subject: [PATCH 005/148] chore: update php-cs-fixer version

---
 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 9d7cba44ddbb..e50d6445aba4 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.5",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
diff --git a/composer.json b/composer.json
index f7f98d862c11..0b3a49f8c6ba 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.41.0",
+        "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

From 4b2985ce5edfb15d228ff893c4e69c7ce52e9c0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:47:27 +0900
Subject: [PATCH 006/148] chore: add fully_qualified_strict_types config

Do not process @see tag.
See https://cs.symfony.com/doc/rules/import/fully_qualified_strict_types.html
---
 .php-cs-fixer.dist.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 8c2a6b8b7a52..13f5ddc63e47 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -67,6 +67,31 @@
             'use',
         ],
     ],
+    'fully_qualified_strict_types' => [
+        'import_symbols'                        => false,
+        'leading_backslash_in_global_namespace' => false,
+        'phpdoc_tags'                           => [
+            'param',
+            'phpstan-param',
+            'phpstan-property',
+            'phpstan-property-read',
+            'phpstan-property-write',
+            'phpstan-return',
+            'phpstan-var',
+            'property',
+            'property-read',
+            'property-write',
+            'psalm-param',
+            'psalm-property',
+            'psalm-property-read',
+            'psalm-property-write',
+            'psalm-return',
+            'psalm-var',
+            'return',
+            'throws',
+            'var',
+        ],
+    ],
 ];
 
 $options = [

From a12d8d8dcb1f1d15497992ef1ef15324fcf41d31 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:49:04 +0900
Subject: [PATCH 007/148] docs: composer cs-fix

---
 system/Debug/Toolbar/Views/toolbar.tpl.php    | 32 +++++++++----------
 system/Exceptions/FrameworkException.php      |  2 +-
 user_guide_src/source/models/entities/018.php |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index aadf72ee19ad..3652a536443c 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -1,21 +1,21 @@
 <?php
 /**
- * @var \CodeIgniter\Debug\Toolbar $this
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var string                     $url
- * @var string                     $method
- * @var bool                       $isAJAX
- * @var int                        $startTime
- * @var int                        $totalTime
- * @var int                        $totalMemory
- * @var float                      $segmentDuration
- * @var int                        $segmentCount
- * @var string                     $CI_VERSION
- * @var array                      $collectors
- * @var array                      $vars
- * @var array                      $styles
- * @var \CodeIgniter\View\Parser   $parser
+ * @var CodeIgniter\Debug\Toolbar $this
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var string                    $url
+ * @var string                    $method
+ * @var bool                      $isAJAX
+ * @var int                       $startTime
+ * @var int                       $totalTime
+ * @var int                       $totalMemory
+ * @var float                     $segmentDuration
+ * @var int                       $segmentCount
+ * @var string                    $CI_VERSION
+ * @var array                     $collectors
+ * @var array                     $vars
+ * @var array                     $styles
+ * @var CodeIgniter\View\Parser   $parser
  */
 ?>
 <style>
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index faf3f1480126..4cafd71177e2 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -66,7 +66,7 @@ public static function forMissingExtension(string $extension)
                 'The framework needs the following extension(s) installed and loaded: %s.',
                 $extension
             );
-        // @codeCoverageIgnoreEnd
+            // @codeCoverageIgnoreEnd
         } else {
             $message = lang('Core.missingExtension', [$extension]);
         }
diff --git a/user_guide_src/source/models/entities/018.php b/user_guide_src/source/models/entities/018.php
index dc793bb8de81..2bb8750affe1 100644
--- a/user_guide_src/source/models/entities/018.php
+++ b/user_guide_src/source/models/entities/018.php
@@ -13,7 +13,7 @@ class MyEntity extends Entity
 
     // Bind the type to the handler
     protected $castHandlers = [
-        'base64' => \App\Entities\Cast\CastBase64::class,
+        'base64' => Cast\CastBase64::class,
     ];
 }
 

From f514d3b25cc6e4125e5095f42c65a4c18672e62a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Dec 2023 09:49:22 +0900
Subject: [PATCH 008/148] test: composer cs-fix

---
 tests/system/Router/AutoRouterImprovedTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 0efecd2e50ac..9360352f4900 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -177,7 +177,7 @@ public function testAutoRouteFindsControllerWithSubfolder(): void
             = $router->getRoute('subfolder/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
         $this->assertSame([
@@ -195,7 +195,7 @@ public function testAutoRouteFindsControllerWithSubSubfolder()
             = $router->getRoute('subfolder/sub/mycontroller/somemethod', 'get');
 
         $this->assertSame('Subfolder/Sub/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Sub\Mycontroller::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Sub\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -209,7 +209,7 @@ public function testAutoRouteFindsDashedSubfolder(): void
 
         $this->assertSame('Dash_folder/', $directory);
         $this->assertSame(
-            '\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
+            '\\' . Controllers\Dash_folder\Mycontroller::class,
             $controller
         );
         $this->assertSame('getSomemethod', $method);
@@ -281,7 +281,7 @@ public function testAutoRouteFallbackToDefaultControllerOneParam()
             = $router->getRoute('subfolder/15', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15'], $params);
         $this->assertSame([
@@ -299,7 +299,7 @@ public function testAutoRouteFallbackToDefaultControllerTwoParams()
             = $router->getRoute('subfolder/15/20', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame(['15', '20'], $params);
         $this->assertSame([
@@ -317,7 +317,7 @@ public function testAutoRouteFallbackToDefaultControllerNoParams()
             = $router->getRoute('subfolder', 'get');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Home::class, $controller);
+        $this->assertSame('\\' . Controllers\Subfolder\Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
         $this->assertSame([

From 86c15b0aaf93f78fd1ccdf286538afc98d6e9535 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 29 Dec 2023 08:17:35 +0100
Subject: [PATCH 009/148] fix phpunit badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1a47301b82cc..e8a48b0e0205 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeIgniter 4 Development
 
-[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/workflows/PHPUnit/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
+[![PHPUnit](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpunit.yml)
 [![PHPStan](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-phpstan.yml)
 [![Psalm](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml/badge.svg)](https://github.com/codeigniter4/CodeIgniter4/actions/workflows/test-psalm.yml)
 [![Coverage Status](https://coveralls.io/repos/github/codeigniter4/CodeIgniter4/badge.svg?branch=develop)](https://coveralls.io/github/codeigniter4/CodeIgniter4?branch=develop)

From 4d18f1497645261e6b8231ee97732499899fe665 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 30 Dec 2023 01:54:33 +0800
Subject: [PATCH 010/148] Remove overrides for coding-standard v1.7.12

---
 .php-cs-fixer.dist.php        | 51 +----------------------------------
 .php-cs-fixer.no-header.php   | 26 +-----------------
 .php-cs-fixer.user-guide.php  | 31 +++------------------
 admin/framework/composer.json |  2 +-
 composer.json                 |  2 +-
 5 files changed, 8 insertions(+), 104 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 13f5ddc63e47..3653cf1349c2 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -43,56 +43,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    'php_unit_data_provider_name' => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
-    'php_unit_data_provider_static'      => true,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-    'fully_qualified_strict_types' => [
-        'import_symbols'                        => false,
-        'leading_backslash_in_global_namespace' => false,
-        'phpdoc_tags'                           => [
-            'param',
-            'phpstan-param',
-            'phpstan-property',
-            'phpstan-property-read',
-            'phpstan-property-write',
-            'phpstan-return',
-            'phpstan-var',
-            'property',
-            'property-read',
-            'property-write',
-            'psalm-param',
-            'psalm-property',
-            'psalm-property-read',
-            'psalm-property-write',
-            'psalm-return',
-            'psalm-var',
-            'return',
-            'throws',
-            'var',
-        ],
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.no-header.php b/.php-cs-fixer.no-header.php
index 5fb4ce95bfbe..7c9ae1e80737 100644
--- a/.php-cs-fixer.no-header.php
+++ b/.php-cs-fixer.no-header.php
@@ -29,31 +29,7 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [
-    'php_unit_data_provider_name' => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
-    'php_unit_data_provider_static'      => true,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
index cf344d903ad5..7700626c965f 100644
--- a/.php-cs-fixer.user-guide.php
+++ b/.php-cs-fixer.user-guide.php
@@ -31,33 +31,10 @@
     ]);
 
 $overrides = [
-    'echo_tag_syntax'                    => false,
-    'php_unit_internal_class'            => false,
-    'no_unused_imports'                  => false,
-    'class_attributes_separation'        => false,
-    'php_unit_data_provider_return_type' => true,
-    'no_extra_blank_lines'               => [
-        'tokens' => [
-            'attribute',
-            'break',
-            'case',
-            'continue',
-            'curly_brace_block',
-            'default',
-            'extra',
-            'parenthesis_brace_block',
-            'return',
-            'square_brace_block',
-            'switch',
-            'throw',
-            'use',
-        ],
-    ],
-    'php_unit_data_provider_static' => true,
-    'php_unit_data_provider_name'   => [
-        'prefix' => 'provide',
-        'suffix' => '',
-    ],
+    'echo_tag_syntax'             => false,
+    'php_unit_internal_class'     => false,
+    'no_unused_imports'           => false,
+    'class_attributes_separation' => false,
 ];
 
 $options = [
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index e50d6445aba4..1c6af5b94446 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -18,7 +18,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "codeigniter/coding-standard": "^1.5",
+        "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
diff --git a/composer.json b/composer.json
index 0b3a49f8c6ba..e1128874b4ff 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "codeigniter/coding-standard": "^1.5",
+        "codeigniter/coding-standard": "^1.7",
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",

From 08043b2e600ffb261e97d196d65037a512b09dcd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 30 Dec 2023 02:09:06 +0800
Subject: [PATCH 011/148] Fix leftover cases of `phpunit_data_provider_static`

---
 tests/system/AutoReview/FrameworkCodeTest.php |   6 +-
 tests/system/HTTP/SiteURITest.php             |   6 +-
 .../system/Validation/CreditCardRulesTest.php | 420 +++++++++---------
 .../StrictRules/CreditCardRulesTest.php       | 420 +++++++++---------
 .../Validation/StrictRules/ValidationTest.php |   2 +-
 tests/system/Validation/ValidationTest.php    |  27 +-
 6 files changed, 445 insertions(+), 436 deletions(-)

diff --git a/tests/system/AutoReview/FrameworkCodeTest.php b/tests/system/AutoReview/FrameworkCodeTest.php
index 6583c9f2839e..c9c7bed7b77e 100644
--- a/tests/system/AutoReview/FrameworkCodeTest.php
+++ b/tests/system/AutoReview/FrameworkCodeTest.php
@@ -73,14 +73,14 @@ public function testEachTestClassHasCorrectGroupAnnotation(string $class): void
         ));
     }
 
-    public function provideEachTestClassHasCorrectGroupAnnotation(): iterable
+    public static function provideEachTestClassHasCorrectGroupAnnotation(): iterable
     {
-        foreach ($this->getTestClasses() as $class) {
+        foreach (self::getTestClasses() as $class) {
             yield $class => [$class];
         }
     }
 
-    private function getTestClasses(): array
+    private static function getTestClasses(): array
     {
         if (self::$testClasses !== []) {
             return self::$testClasses;
diff --git a/tests/system/HTTP/SiteURITest.php b/tests/system/HTTP/SiteURITest.php
index f839b51c0771..554904c2436b 100644
--- a/tests/system/HTTP/SiteURITest.php
+++ b/tests/system/HTTP/SiteURITest.php
@@ -60,9 +60,9 @@ public function testConstructor(
         $this->assertSame($expectedTotalSegments, $uri->getTotalSegments());
     }
 
-    public function provideConstructor(): iterable
+    public static function provideConstructor(): iterable
     {
-        return array_merge($this->provideSetPath(), $this->provideRelativePathWithQueryOrFragment());
+        return array_merge(self::provideSetPath(), self::provideRelativePathWithQueryOrFragment());
     }
 
     public static function provideSetPath(): iterable
@@ -214,7 +214,7 @@ public static function provideSetPath(): iterable
         ];
     }
 
-    public function provideRelativePathWithQueryOrFragment()
+    public static function provideRelativePathWithQueryOrFragment(): iterable
     {
         return [
             'one/two?foo=1&bar=2' => [
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 397675270eda..e0f21691eebb 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -63,7 +63,7 @@ public function testValidCCNumber(string $type, ?string $number, bool $expected)
      *
      * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
      */
-    public function provideValidCCNumber(): iterable
+    public static function provideValidCCNumber(): iterable
     {
         yield from [
             'null_test' => [
@@ -73,7 +73,7 @@ public function provideValidCCNumber(): iterable
             ],
             'random_test' => [
                 'amex',
-                $this->generateCardNumber('37', 16),
+                self::generateCardNumber('37', 16),
                 false,
             ],
             'invalid_type' => [
@@ -173,1027 +173,1027 @@ public function provideValidCCNumber(): iterable
             ],
             'unionpay1' => [
                 'unionpay',
-                $this->generateCardNumber(62, 16),
+                self::generateCardNumber(62, 16),
                 true,
             ],
             'unionpay2' => [
                 'unionpay',
-                $this->generateCardNumber(62, 17),
+                self::generateCardNumber(62, 17),
                 true,
             ],
             'unionpay3' => [
                 'unionpay',
-                $this->generateCardNumber(62, 18),
+                self::generateCardNumber(62, 18),
                 true,
             ],
             'unionpay4' => [
                 'unionpay',
-                $this->generateCardNumber(62, 19),
+                self::generateCardNumber(62, 19),
                 true,
             ],
             'unionpay5' => [
                 'unionpay',
-                $this->generateCardNumber(63, 19),
+                self::generateCardNumber(63, 19),
                 false,
             ],
             'carteblanche1' => [
                 'carteblanche',
-                $this->generateCardNumber(300, 14),
+                self::generateCardNumber(300, 14),
                 true,
             ],
             'carteblanche2' => [
                 'carteblanche',
-                $this->generateCardNumber(301, 14),
+                self::generateCardNumber(301, 14),
                 true,
             ],
             'carteblanche3' => [
                 'carteblanche',
-                $this->generateCardNumber(302, 14),
+                self::generateCardNumber(302, 14),
                 true,
             ],
             'carteblanche4' => [
                 'carteblanche',
-                $this->generateCardNumber(303, 14),
+                self::generateCardNumber(303, 14),
                 true,
             ],
             'carteblanche5' => [
                 'carteblanche',
-                $this->generateCardNumber(304, 14),
+                self::generateCardNumber(304, 14),
                 true,
             ],
             'carteblanche6' => [
                 'carteblanche',
-                $this->generateCardNumber(305, 14),
+                self::generateCardNumber(305, 14),
                 true,
             ],
             'carteblanche7' => [
                 'carteblanche',
-                $this->generateCardNumber(306, 14),
+                self::generateCardNumber(306, 14),
                 false,
             ],
             'dinersclub3' => [
                 'dinersclub',
-                $this->generateCardNumber(300, 14),
+                self::generateCardNumber(300, 14),
                 true,
             ],
             'dinersclub4' => [
                 'dinersclub',
-                $this->generateCardNumber(301, 14),
+                self::generateCardNumber(301, 14),
                 true,
             ],
             'dinersclub5' => [
                 'dinersclub',
-                $this->generateCardNumber(302, 14),
+                self::generateCardNumber(302, 14),
                 true,
             ],
             'dinersclub6' => [
                 'dinersclub',
-                $this->generateCardNumber(303, 14),
+                self::generateCardNumber(303, 14),
                 true,
             ],
             'dinersclub7' => [
                 'dinersclub',
-                $this->generateCardNumber(304, 14),
+                self::generateCardNumber(304, 14),
                 true,
             ],
             'dinersclub8' => [
                 'dinersclub',
-                $this->generateCardNumber(305, 14),
+                self::generateCardNumber(305, 14),
                 true,
             ],
             'dinersclub9' => [
                 'dinersclub',
-                $this->generateCardNumber(309, 14),
+                self::generateCardNumber(309, 14),
                 true,
             ],
             'dinersclub10' => [
                 'dinersclub',
-                $this->generateCardNumber(36, 14),
+                self::generateCardNumber(36, 14),
                 true,
             ],
             'dinersclub11' => [
                 'dinersclub',
-                $this->generateCardNumber(38, 14),
+                self::generateCardNumber(38, 14),
                 true,
             ],
             'dinersclub12' => [
                 'dinersclub',
-                $this->generateCardNumber(39, 14),
+                self::generateCardNumber(39, 14),
                 true,
             ],
             'dinersclub13' => [
                 'dinersclub',
-                $this->generateCardNumber(54, 14),
+                self::generateCardNumber(54, 14),
                 true,
             ],
             'dinersclub14' => [
                 'dinersclub',
-                $this->generateCardNumber(55, 14),
+                self::generateCardNumber(55, 14),
                 true,
             ],
             'dinersclub15' => [
                 'dinersclub',
-                $this->generateCardNumber(300, 16),
+                self::generateCardNumber(300, 16),
                 true,
             ],
             'dinersclub16' => [
                 'dinersclub',
-                $this->generateCardNumber(301, 16),
+                self::generateCardNumber(301, 16),
                 true,
             ],
             'dinersclub17' => [
                 'dinersclub',
-                $this->generateCardNumber(302, 16),
+                self::generateCardNumber(302, 16),
                 true,
             ],
             'dinersclub18' => [
                 'dinersclub',
-                $this->generateCardNumber(303, 16),
+                self::generateCardNumber(303, 16),
                 true,
             ],
             'dinersclub19' => [
                 'dinersclub',
-                $this->generateCardNumber(304, 16),
+                self::generateCardNumber(304, 16),
                 true,
             ],
             'dinersclub20' => [
                 'dinersclub',
-                $this->generateCardNumber(305, 16),
+                self::generateCardNumber(305, 16),
                 true,
             ],
             'dinersclub21' => [
                 'dinersclub',
-                $this->generateCardNumber(309, 16),
+                self::generateCardNumber(309, 16),
                 true,
             ],
             'dinersclub22' => [
                 'dinersclub',
-                $this->generateCardNumber(36, 16),
+                self::generateCardNumber(36, 16),
                 true,
             ],
             'dinersclub23' => [
                 'dinersclub',
-                $this->generateCardNumber(38, 16),
+                self::generateCardNumber(38, 16),
                 true,
             ],
             'dinersclub24' => [
                 'dinersclub',
-                $this->generateCardNumber(39, 16),
+                self::generateCardNumber(39, 16),
                 true,
             ],
             'dinersclub25' => [
                 'dinersclub',
-                $this->generateCardNumber(54, 16),
+                self::generateCardNumber(54, 16),
                 true,
             ],
             'dinersclub26' => [
                 'dinersclub',
-                $this->generateCardNumber(55, 16),
+                self::generateCardNumber(55, 16),
                 true,
             ],
             'discover3' => [
                 'discover',
-                $this->generateCardNumber(6011, 16),
+                self::generateCardNumber(6011, 16),
                 true,
             ],
             'discover4' => [
                 'discover',
-                $this->generateCardNumber(622, 16),
+                self::generateCardNumber(622, 16),
                 true,
             ],
             'discover5' => [
                 'discover',
-                $this->generateCardNumber(644, 16),
+                self::generateCardNumber(644, 16),
                 true,
             ],
             'discover6' => [
                 'discover',
-                $this->generateCardNumber(645, 16),
+                self::generateCardNumber(645, 16),
                 true,
             ],
             'discover7' => [
                 'discover',
-                $this->generateCardNumber(656, 16),
+                self::generateCardNumber(656, 16),
                 true,
             ],
             'discover8' => [
                 'discover',
-                $this->generateCardNumber(647, 16),
+                self::generateCardNumber(647, 16),
                 true,
             ],
             'discover9' => [
                 'discover',
-                $this->generateCardNumber(648, 16),
+                self::generateCardNumber(648, 16),
                 true,
             ],
             'discover10' => [
                 'discover',
-                $this->generateCardNumber(649, 16),
+                self::generateCardNumber(649, 16),
                 true,
             ],
             'discover11' => [
                 'discover',
-                $this->generateCardNumber(65, 16),
+                self::generateCardNumber(65, 16),
                 true,
             ],
             'discover12' => [
                 'discover',
-                $this->generateCardNumber(6011, 19),
+                self::generateCardNumber(6011, 19),
                 true,
             ],
             'discover13' => [
                 'discover',
-                $this->generateCardNumber(622, 19),
+                self::generateCardNumber(622, 19),
                 true,
             ],
             'discover14' => [
                 'discover',
-                $this->generateCardNumber(644, 19),
+                self::generateCardNumber(644, 19),
                 true,
             ],
             'discover15' => [
                 'discover',
-                $this->generateCardNumber(645, 19),
+                self::generateCardNumber(645, 19),
                 true,
             ],
             'discover16' => [
                 'discover',
-                $this->generateCardNumber(656, 19),
+                self::generateCardNumber(656, 19),
                 true,
             ],
             'discover17' => [
                 'discover',
-                $this->generateCardNumber(647, 19),
+                self::generateCardNumber(647, 19),
                 true,
             ],
             'discover18' => [
                 'discover',
-                $this->generateCardNumber(648, 19),
+                self::generateCardNumber(648, 19),
                 true,
             ],
             'discover19' => [
                 'discover',
-                $this->generateCardNumber(649, 19),
+                self::generateCardNumber(649, 19),
                 true,
             ],
             'discover20' => [
                 'discover',
-                $this->generateCardNumber(65, 19),
+                self::generateCardNumber(65, 19),
                 true,
             ],
             'interpayment1' => [
                 'interpayment',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'interpayment2' => [
                 'interpayment',
-                $this->generateCardNumber(4, 17),
+                self::generateCardNumber(4, 17),
                 true,
             ],
             'interpayment3' => [
                 'interpayment',
-                $this->generateCardNumber(4, 18),
+                self::generateCardNumber(4, 18),
                 true,
             ],
             'interpayment4' => [
                 'interpayment',
-                $this->generateCardNumber(4, 19),
+                self::generateCardNumber(4, 19),
                 true,
             ],
             'jcb1' => [
                 'jcb',
-                $this->generateCardNumber(352, 16),
+                self::generateCardNumber(352, 16),
                 true,
             ],
             'jcb2' => [
                 'jcb',
-                $this->generateCardNumber(353, 16),
+                self::generateCardNumber(353, 16),
                 true,
             ],
             'jcb3' => [
                 'jcb',
-                $this->generateCardNumber(354, 16),
+                self::generateCardNumber(354, 16),
                 true,
             ],
             'jcb4' => [
                 'jcb',
-                $this->generateCardNumber(355, 16),
+                self::generateCardNumber(355, 16),
                 true,
             ],
             'jcb5' => [
                 'jcb',
-                $this->generateCardNumber(356, 16),
+                self::generateCardNumber(356, 16),
                 true,
             ],
             'jcb6' => [
                 'jcb',
-                $this->generateCardNumber(357, 16),
+                self::generateCardNumber(357, 16),
                 true,
             ],
             'jcb7' => [
                 'jcb',
-                $this->generateCardNumber(358, 16),
+                self::generateCardNumber(358, 16),
                 true,
             ],
             'maestro1' => [
                 'maestro',
-                $this->generateCardNumber(50, 12),
+                self::generateCardNumber(50, 12),
                 true,
             ],
             'maestro2' => [
                 'maestro',
-                $this->generateCardNumber(56, 12),
+                self::generateCardNumber(56, 12),
                 true,
             ],
             'maestro3' => [
                 'maestro',
-                $this->generateCardNumber(57, 12),
+                self::generateCardNumber(57, 12),
                 true,
             ],
             'maestro4' => [
                 'maestro',
-                $this->generateCardNumber(58, 12),
+                self::generateCardNumber(58, 12),
                 true,
             ],
             'maestro5' => [
                 'maestro',
-                $this->generateCardNumber(59, 12),
+                self::generateCardNumber(59, 12),
                 true,
             ],
             'maestro6' => [
                 'maestro',
-                $this->generateCardNumber(60, 12),
+                self::generateCardNumber(60, 12),
                 true,
             ],
             'maestro7' => [
                 'maestro',
-                $this->generateCardNumber(61, 12),
+                self::generateCardNumber(61, 12),
                 true,
             ],
             'maestro8' => [
                 'maestro',
-                $this->generateCardNumber(62, 12),
+                self::generateCardNumber(62, 12),
                 true,
             ],
             'maestro9' => [
                 'maestro',
-                $this->generateCardNumber(63, 12),
+                self::generateCardNumber(63, 12),
                 true,
             ],
             'maestro10' => [
                 'maestro',
-                $this->generateCardNumber(64, 12),
+                self::generateCardNumber(64, 12),
                 true,
             ],
             'maestro11' => [
                 'maestro',
-                $this->generateCardNumber(65, 12),
+                self::generateCardNumber(65, 12),
                 true,
             ],
             'maestro12' => [
                 'maestro',
-                $this->generateCardNumber(66, 12),
+                self::generateCardNumber(66, 12),
                 true,
             ],
             'maestro13' => [
                 'maestro',
-                $this->generateCardNumber(67, 12),
+                self::generateCardNumber(67, 12),
                 true,
             ],
             'maestro14' => [
                 'maestro',
-                $this->generateCardNumber(68, 12),
+                self::generateCardNumber(68, 12),
                 true,
             ],
             'maestro15' => [
                 'maestro',
-                $this->generateCardNumber(69, 12),
+                self::generateCardNumber(69, 12),
                 true,
             ],
             'maestro16' => [
                 'maestro',
-                $this->generateCardNumber(50, 13),
+                self::generateCardNumber(50, 13),
                 true,
             ],
             'maestro17' => [
                 'maestro',
-                $this->generateCardNumber(56, 13),
+                self::generateCardNumber(56, 13),
                 true,
             ],
             'maestro18' => [
                 'maestro',
-                $this->generateCardNumber(57, 13),
+                self::generateCardNumber(57, 13),
                 true,
             ],
             'maestro19' => [
                 'maestro',
-                $this->generateCardNumber(58, 13),
+                self::generateCardNumber(58, 13),
                 true,
             ],
             'maestro20' => [
                 'maestro',
-                $this->generateCardNumber(59, 13),
+                self::generateCardNumber(59, 13),
                 true,
             ],
             'maestro21' => [
                 'maestro',
-                $this->generateCardNumber(60, 13),
+                self::generateCardNumber(60, 13),
                 true,
             ],
             'maestro22' => [
                 'maestro',
-                $this->generateCardNumber(61, 13),
+                self::generateCardNumber(61, 13),
                 true,
             ],
             'maestro23' => [
                 'maestro',
-                $this->generateCardNumber(62, 13),
+                self::generateCardNumber(62, 13),
                 true,
             ],
             'maestro24' => [
                 'maestro',
-                $this->generateCardNumber(63, 13),
+                self::generateCardNumber(63, 13),
                 true,
             ],
             'maestro25' => [
                 'maestro',
-                $this->generateCardNumber(64, 13),
+                self::generateCardNumber(64, 13),
                 true,
             ],
             'maestro26' => [
                 'maestro',
-                $this->generateCardNumber(65, 13),
+                self::generateCardNumber(65, 13),
                 true,
             ],
             'maestro27' => [
                 'maestro',
-                $this->generateCardNumber(66, 13),
+                self::generateCardNumber(66, 13),
                 true,
             ],
             'maestro28' => [
                 'maestro',
-                $this->generateCardNumber(67, 13),
+                self::generateCardNumber(67, 13),
                 true,
             ],
             'maestro29' => [
                 'maestro',
-                $this->generateCardNumber(68, 13),
+                self::generateCardNumber(68, 13),
                 true,
             ],
             'maestro30' => [
                 'maestro',
-                $this->generateCardNumber(69, 13),
+                self::generateCardNumber(69, 13),
                 true,
             ],
             'maestro31' => [
                 'maestro',
-                $this->generateCardNumber(50, 14),
+                self::generateCardNumber(50, 14),
                 true,
             ],
             'maestro32' => [
                 'maestro',
-                $this->generateCardNumber(56, 14),
+                self::generateCardNumber(56, 14),
                 true,
             ],
             'maestro33' => [
                 'maestro',
-                $this->generateCardNumber(57, 14),
+                self::generateCardNumber(57, 14),
                 true,
             ],
             'maestro34' => [
                 'maestro',
-                $this->generateCardNumber(58, 14),
+                self::generateCardNumber(58, 14),
                 true,
             ],
             'maestro35' => [
                 'maestro',
-                $this->generateCardNumber(59, 14),
+                self::generateCardNumber(59, 14),
                 true,
             ],
             'maestro36' => [
                 'maestro',
-                $this->generateCardNumber(60, 14),
+                self::generateCardNumber(60, 14),
                 true,
             ],
             'maestro37' => [
                 'maestro',
-                $this->generateCardNumber(61, 14),
+                self::generateCardNumber(61, 14),
                 true,
             ],
             'maestro38' => [
                 'maestro',
-                $this->generateCardNumber(62, 14),
+                self::generateCardNumber(62, 14),
                 true,
             ],
             'maestro39' => [
                 'maestro',
-                $this->generateCardNumber(63, 14),
+                self::generateCardNumber(63, 14),
                 true,
             ],
             'maestro40' => [
                 'maestro',
-                $this->generateCardNumber(64, 14),
+                self::generateCardNumber(64, 14),
                 true,
             ],
             'maestro41' => [
                 'maestro',
-                $this->generateCardNumber(65, 14),
+                self::generateCardNumber(65, 14),
                 true,
             ],
             'maestro42' => [
                 'maestro',
-                $this->generateCardNumber(66, 14),
+                self::generateCardNumber(66, 14),
                 true,
             ],
             'maestro43' => [
                 'maestro',
-                $this->generateCardNumber(67, 14),
+                self::generateCardNumber(67, 14),
                 true,
             ],
             'maestro44' => [
                 'maestro',
-                $this->generateCardNumber(68, 14),
+                self::generateCardNumber(68, 14),
                 true,
             ],
             'maestro45' => [
                 'maestro',
-                $this->generateCardNumber(69, 14),
+                self::generateCardNumber(69, 14),
                 true,
             ],
             'maestro46' => [
                 'maestro',
-                $this->generateCardNumber(50, 15),
+                self::generateCardNumber(50, 15),
                 true,
             ],
             'maestro47' => [
                 'maestro',
-                $this->generateCardNumber(56, 15),
+                self::generateCardNumber(56, 15),
                 true,
             ],
             'maestro48' => [
                 'maestro',
-                $this->generateCardNumber(57, 15),
+                self::generateCardNumber(57, 15),
                 true,
             ],
             'maestro49' => [
                 'maestro',
-                $this->generateCardNumber(58, 15),
+                self::generateCardNumber(58, 15),
                 true,
             ],
             'maestro50' => [
                 'maestro',
-                $this->generateCardNumber(59, 15),
+                self::generateCardNumber(59, 15),
                 true,
             ],
             'maestro51' => [
                 'maestro',
-                $this->generateCardNumber(60, 15),
+                self::generateCardNumber(60, 15),
                 true,
             ],
             'maestro52' => [
                 'maestro',
-                $this->generateCardNumber(61, 15),
+                self::generateCardNumber(61, 15),
                 true,
             ],
             'maestro53' => [
                 'maestro',
-                $this->generateCardNumber(62, 15),
+                self::generateCardNumber(62, 15),
                 true,
             ],
             'maestro54' => [
                 'maestro',
-                $this->generateCardNumber(63, 15),
+                self::generateCardNumber(63, 15),
                 true,
             ],
             'maestro55' => [
                 'maestro',
-                $this->generateCardNumber(64, 15),
+                self::generateCardNumber(64, 15),
                 true,
             ],
             'maestro56' => [
                 'maestro',
-                $this->generateCardNumber(65, 15),
+                self::generateCardNumber(65, 15),
                 true,
             ],
             'maestro57' => [
                 'maestro',
-                $this->generateCardNumber(66, 15),
+                self::generateCardNumber(66, 15),
                 true,
             ],
             'maestro58' => [
                 'maestro',
-                $this->generateCardNumber(67, 15),
+                self::generateCardNumber(67, 15),
                 true,
             ],
             'maestro59' => [
                 'maestro',
-                $this->generateCardNumber(68, 15),
+                self::generateCardNumber(68, 15),
                 true,
             ],
             'maestro60' => [
                 'maestro',
-                $this->generateCardNumber(69, 15),
+                self::generateCardNumber(69, 15),
                 true,
             ],
             'maestro61' => [
                 'maestro',
-                $this->generateCardNumber(50, 16),
+                self::generateCardNumber(50, 16),
                 true,
             ],
             'maestro62' => [
                 'maestro',
-                $this->generateCardNumber(56, 16),
+                self::generateCardNumber(56, 16),
                 true,
             ],
             'maestro63' => [
                 'maestro',
-                $this->generateCardNumber(57, 16),
+                self::generateCardNumber(57, 16),
                 true,
             ],
             'maestro64' => [
                 'maestro',
-                $this->generateCardNumber(58, 16),
+                self::generateCardNumber(58, 16),
                 true,
             ],
             'maestro65' => [
                 'maestro',
-                $this->generateCardNumber(59, 16),
+                self::generateCardNumber(59, 16),
                 true,
             ],
             'maestro66' => [
                 'maestro',
-                $this->generateCardNumber(60, 16),
+                self::generateCardNumber(60, 16),
                 true,
             ],
             'maestro67' => [
                 'maestro',
-                $this->generateCardNumber(61, 16),
+                self::generateCardNumber(61, 16),
                 true,
             ],
             'maestro68' => [
                 'maestro',
-                $this->generateCardNumber(62, 16),
+                self::generateCardNumber(62, 16),
                 true,
             ],
             'maestro69' => [
                 'maestro',
-                $this->generateCardNumber(63, 16),
+                self::generateCardNumber(63, 16),
                 true,
             ],
             'maestro70' => [
                 'maestro',
-                $this->generateCardNumber(64, 16),
+                self::generateCardNumber(64, 16),
                 true,
             ],
             'maestro71' => [
                 'maestro',
-                $this->generateCardNumber(65, 16),
+                self::generateCardNumber(65, 16),
                 true,
             ],
             'maestro72' => [
                 'maestro',
-                $this->generateCardNumber(66, 16),
+                self::generateCardNumber(66, 16),
                 true,
             ],
             'maestro73' => [
                 'maestro',
-                $this->generateCardNumber(67, 16),
+                self::generateCardNumber(67, 16),
                 true,
             ],
             'maestro74' => [
                 'maestro',
-                $this->generateCardNumber(68, 16),
+                self::generateCardNumber(68, 16),
                 true,
             ],
             'maestro75' => [
                 'maestro',
-                $this->generateCardNumber(69, 16),
+                self::generateCardNumber(69, 16),
                 true,
             ],
             'maestro91' => [
                 'maestro',
-                $this->generateCardNumber(50, 18),
+                self::generateCardNumber(50, 18),
                 true,
             ],
             'maestro92' => [
                 'maestro',
-                $this->generateCardNumber(56, 18),
+                self::generateCardNumber(56, 18),
                 true,
             ],
             'maestro93' => [
                 'maestro',
-                $this->generateCardNumber(57, 18),
+                self::generateCardNumber(57, 18),
                 true,
             ],
             'maestro94' => [
                 'maestro',
-                $this->generateCardNumber(58, 18),
+                self::generateCardNumber(58, 18),
                 true,
             ],
             'maestro95' => [
                 'maestro',
-                $this->generateCardNumber(59, 18),
+                self::generateCardNumber(59, 18),
                 true,
             ],
             'maestro96' => [
                 'maestro',
-                $this->generateCardNumber(60, 18),
+                self::generateCardNumber(60, 18),
                 true,
             ],
             'maestro97' => [
                 'maestro',
-                $this->generateCardNumber(61, 18),
+                self::generateCardNumber(61, 18),
                 true,
             ],
             'maestro98' => [
                 'maestro',
-                $this->generateCardNumber(62, 18),
+                self::generateCardNumber(62, 18),
                 true,
             ],
             'maestro99' => [
                 'maestro',
-                $this->generateCardNumber(63, 18),
+                self::generateCardNumber(63, 18),
                 true,
             ],
             'maestro100' => [
                 'maestro',
-                $this->generateCardNumber(64, 18),
+                self::generateCardNumber(64, 18),
                 true,
             ],
             'maestro101' => [
                 'maestro',
-                $this->generateCardNumber(65, 18),
+                self::generateCardNumber(65, 18),
                 true,
             ],
             'maestro102' => [
                 'maestro',
-                $this->generateCardNumber(66, 18),
+                self::generateCardNumber(66, 18),
                 true,
             ],
             'maestro103' => [
                 'maestro',
-                $this->generateCardNumber(67, 18),
+                self::generateCardNumber(67, 18),
                 true,
             ],
             'maestro104' => [
                 'maestro',
-                $this->generateCardNumber(68, 18),
+                self::generateCardNumber(68, 18),
                 true,
             ],
             'maestro105' => [
                 'maestro',
-                $this->generateCardNumber(69, 18),
+                self::generateCardNumber(69, 18),
                 true,
             ],
             'maestro106' => [
                 'maestro',
-                $this->generateCardNumber(50, 19),
+                self::generateCardNumber(50, 19),
                 true,
             ],
             'maestro107' => [
                 'maestro',
-                $this->generateCardNumber(56, 19),
+                self::generateCardNumber(56, 19),
                 true,
             ],
             'maestro108' => [
                 'maestro',
-                $this->generateCardNumber(57, 19),
+                self::generateCardNumber(57, 19),
                 true,
             ],
             'maestro109' => [
                 'maestro',
-                $this->generateCardNumber(58, 19),
+                self::generateCardNumber(58, 19),
                 true,
             ],
             'maestro110' => [
                 'maestro',
-                $this->generateCardNumber(59, 19),
+                self::generateCardNumber(59, 19),
                 true,
             ],
             'maestro111' => [
                 'maestro',
-                $this->generateCardNumber(60, 19),
+                self::generateCardNumber(60, 19),
                 true,
             ],
             'maestro112' => [
                 'maestro',
-                $this->generateCardNumber(61, 19),
+                self::generateCardNumber(61, 19),
                 true,
             ],
             'maestro113' => [
                 'maestro',
-                $this->generateCardNumber(62, 19),
+                self::generateCardNumber(62, 19),
                 true,
             ],
             'maestro114' => [
                 'maestro',
-                $this->generateCardNumber(63, 19),
+                self::generateCardNumber(63, 19),
                 true,
             ],
             'maestro115' => [
                 'maestro',
-                $this->generateCardNumber(64, 19),
+                self::generateCardNumber(64, 19),
                 true,
             ],
             'maestro116' => [
                 'maestro',
-                $this->generateCardNumber(65, 19),
+                self::generateCardNumber(65, 19),
                 true,
             ],
             'maestro117' => [
                 'maestro',
-                $this->generateCardNumber(66, 19),
+                self::generateCardNumber(66, 19),
                 true,
             ],
             'maestro118' => [
                 'maestro',
-                $this->generateCardNumber(67, 19),
+                self::generateCardNumber(67, 19),
                 true,
             ],
             'maestro119' => [
                 'maestro',
-                $this->generateCardNumber(68, 19),
+                self::generateCardNumber(68, 19),
                 true,
             ],
             'maestro120' => [
                 'maestro',
-                $this->generateCardNumber(69, 19),
+                self::generateCardNumber(69, 19),
                 true,
             ],
             'dankort1' => [
                 'dankort',
-                $this->generateCardNumber(5019, 16),
+                self::generateCardNumber(5019, 16),
                 true,
             ],
             'dankort2' => [
                 'dankort',
-                $this->generateCardNumber(4175, 16),
+                self::generateCardNumber(4175, 16),
                 true,
             ],
             'dankort3' => [
                 'dankort',
-                $this->generateCardNumber(4571, 16),
+                self::generateCardNumber(4571, 16),
                 true,
             ],
             'dankort4' => [
                 'dankort',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'mir1' => [
                 'mir',
-                $this->generateCardNumber(2200, 16),
+                self::generateCardNumber(2200, 16),
                 true,
             ],
             'mir2' => [
                 'mir',
-                $this->generateCardNumber(2201, 16),
+                self::generateCardNumber(2201, 16),
                 true,
             ],
             'mir3' => [
                 'mir',
-                $this->generateCardNumber(2202, 16),
+                self::generateCardNumber(2202, 16),
                 true,
             ],
             'mir4' => [
                 'mir',
-                $this->generateCardNumber(2203, 16),
+                self::generateCardNumber(2203, 16),
                 true,
             ],
             'mir5' => [
                 'mir',
-                $this->generateCardNumber(2204, 16),
+                self::generateCardNumber(2204, 16),
                 true,
             ],
             'mastercard1' => [
                 'mastercard',
-                $this->generateCardNumber(51, 16),
+                self::generateCardNumber(51, 16),
                 true,
             ],
             'mastercard2' => [
                 'mastercard',
-                $this->generateCardNumber(52, 16),
+                self::generateCardNumber(52, 16),
                 true,
             ],
             'mastercard3' => [
                 'mastercard',
-                $this->generateCardNumber(53, 16),
+                self::generateCardNumber(53, 16),
                 true,
             ],
             'mastercard4' => [
                 'mastercard',
-                $this->generateCardNumber(54, 16),
+                self::generateCardNumber(54, 16),
                 true,
             ],
             'mastercard5' => [
                 'mastercard',
-                $this->generateCardNumber(55, 16),
+                self::generateCardNumber(55, 16),
                 true,
             ],
             'mastercard6' => [
                 'mastercard',
-                $this->generateCardNumber(22, 16),
+                self::generateCardNumber(22, 16),
                 true,
             ],
             'mastercard7' => [
                 'mastercard',
-                $this->generateCardNumber(23, 16),
+                self::generateCardNumber(23, 16),
                 true,
             ],
             'mastercard8' => [
                 'mastercard',
-                $this->generateCardNumber(24, 16),
+                self::generateCardNumber(24, 16),
                 true,
             ],
             'mastercard9' => [
                 'mastercard',
-                $this->generateCardNumber(25, 16),
+                self::generateCardNumber(25, 16),
                 true,
             ],
             'mastercard10' => [
                 'mastercard',
-                $this->generateCardNumber(26, 16),
+                self::generateCardNumber(26, 16),
                 true,
             ],
             'mastercard11' => [
                 'mastercard',
-                $this->generateCardNumber(27, 16),
+                self::generateCardNumber(27, 16),
                 true,
             ],
             'visa1' => [
                 'visa',
-                $this->generateCardNumber(4, 13),
+                self::generateCardNumber(4, 13),
                 true,
             ],
             'visa2' => [
                 'visa',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'visa3' => [
                 'visa',
-                $this->generateCardNumber(4, 19),
+                self::generateCardNumber(4, 19),
                 true,
             ],
             'uatp' => [
                 'uatp',
-                $this->generateCardNumber(1, 15),
+                self::generateCardNumber(1, 15),
                 true,
             ],
             'verve1' => [
                 'verve',
-                $this->generateCardNumber(506, 16),
+                self::generateCardNumber(506, 16),
                 true,
             ],
             'verve2' => [
                 'verve',
-                $this->generateCardNumber(650, 16),
+                self::generateCardNumber(650, 16),
                 true,
             ],
             'verve3' => [
                 'verve',
-                $this->generateCardNumber(506, 19),
+                self::generateCardNumber(506, 19),
                 true,
             ],
             'verve4' => [
                 'verve',
-                $this->generateCardNumber(650, 19),
+                self::generateCardNumber(650, 19),
                 true,
             ],
             'cibc1' => [
                 'cibc',
-                $this->generateCardNumber(4506, 16),
+                self::generateCardNumber(4506, 16),
                 true,
             ],
             'rbc1' => [
                 'rbc',
-                $this->generateCardNumber(45, 16),
+                self::generateCardNumber(45, 16),
                 true,
             ],
             'tdtrust' => [
                 'tdtrust',
-                $this->generateCardNumber(589297, 16),
+                self::generateCardNumber(589297, 16),
                 true,
             ],
             'scotia1' => [
                 'scotia',
-                $this->generateCardNumber(4536, 16),
+                self::generateCardNumber(4536, 16),
                 true,
             ],
             'bmoabm1' => [
                 'bmoabm',
-                $this->generateCardNumber(500, 16),
+                self::generateCardNumber(500, 16),
                 true,
             ],
             'hsbc1' => [
                 'hsbc',
-                $this->generateCardNumber(56, 16),
+                self::generateCardNumber(56, 16),
                 true,
             ],
             'hsbc2' => [
                 'hsbc',
-                $this->generateCardNumber(57, 16),
+                self::generateCardNumber(57, 16),
                 false,
             ],
         ];
@@ -1202,7 +1202,7 @@ public function provideValidCCNumber(): iterable
     /**
      * Generate a fake credit card number that still passes the Luhn algorithm.
      */
-    private function generateCardNumber(int $prefix, int $length): string
+    private static function generateCardNumber(int $prefix, int $length): string
     {
         $prefix = (string) $prefix;
         $cursor = strlen($prefix);
@@ -1214,12 +1214,12 @@ private function generateCardNumber(int $prefix, int $length): string
             $digits[$cursor++] = (string) random_int(0, 9);
         }
 
-        $digits[$length - 1] = (string) $this->calculateLuhnChecksum($digits, $length);
+        $digits[$length - 1] = (string) self::calculateLuhnChecksum($digits, $length);
 
         return implode('', $digits);
     }
 
-    private function calculateLuhnChecksum(array $digits, int $length): int
+    private static function calculateLuhnChecksum(array $digits, int $length): int
     {
         $parity = $length % 2;
 
diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
index 2e685c852e55..ffe5818c4cff 100644
--- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php
+++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
@@ -64,7 +64,7 @@ public function testValidCCNumber(string $type, ?string $number, bool $expected)
      *
      * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
      */
-    public function provideValidCCNumber(): iterable
+    public static function provideValidCCNumber(): iterable
     {
         yield from [
             'null_test' => [
@@ -74,7 +74,7 @@ public function provideValidCCNumber(): iterable
             ],
             'random_test' => [
                 'amex',
-                $this->generateCardNumber('37', 16),
+                self::generateCardNumber('37', 16),
                 false,
             ],
             'invalid_type' => [
@@ -174,1027 +174,1027 @@ public function provideValidCCNumber(): iterable
             ],
             'unionpay1' => [
                 'unionpay',
-                $this->generateCardNumber(62, 16),
+                self::generateCardNumber(62, 16),
                 true,
             ],
             'unionpay2' => [
                 'unionpay',
-                $this->generateCardNumber(62, 17),
+                self::generateCardNumber(62, 17),
                 true,
             ],
             'unionpay3' => [
                 'unionpay',
-                $this->generateCardNumber(62, 18),
+                self::generateCardNumber(62, 18),
                 true,
             ],
             'unionpay4' => [
                 'unionpay',
-                $this->generateCardNumber(62, 19),
+                self::generateCardNumber(62, 19),
                 true,
             ],
             'unionpay5' => [
                 'unionpay',
-                $this->generateCardNumber(63, 19),
+                self::generateCardNumber(63, 19),
                 false,
             ],
             'carteblanche1' => [
                 'carteblanche',
-                $this->generateCardNumber(300, 14),
+                self::generateCardNumber(300, 14),
                 true,
             ],
             'carteblanche2' => [
                 'carteblanche',
-                $this->generateCardNumber(301, 14),
+                self::generateCardNumber(301, 14),
                 true,
             ],
             'carteblanche3' => [
                 'carteblanche',
-                $this->generateCardNumber(302, 14),
+                self::generateCardNumber(302, 14),
                 true,
             ],
             'carteblanche4' => [
                 'carteblanche',
-                $this->generateCardNumber(303, 14),
+                self::generateCardNumber(303, 14),
                 true,
             ],
             'carteblanche5' => [
                 'carteblanche',
-                $this->generateCardNumber(304, 14),
+                self::generateCardNumber(304, 14),
                 true,
             ],
             'carteblanche6' => [
                 'carteblanche',
-                $this->generateCardNumber(305, 14),
+                self::generateCardNumber(305, 14),
                 true,
             ],
             'carteblanche7' => [
                 'carteblanche',
-                $this->generateCardNumber(306, 14),
+                self::generateCardNumber(306, 14),
                 false,
             ],
             'dinersclub3' => [
                 'dinersclub',
-                $this->generateCardNumber(300, 14),
+                self::generateCardNumber(300, 14),
                 true,
             ],
             'dinersclub4' => [
                 'dinersclub',
-                $this->generateCardNumber(301, 14),
+                self::generateCardNumber(301, 14),
                 true,
             ],
             'dinersclub5' => [
                 'dinersclub',
-                $this->generateCardNumber(302, 14),
+                self::generateCardNumber(302, 14),
                 true,
             ],
             'dinersclub6' => [
                 'dinersclub',
-                $this->generateCardNumber(303, 14),
+                self::generateCardNumber(303, 14),
                 true,
             ],
             'dinersclub7' => [
                 'dinersclub',
-                $this->generateCardNumber(304, 14),
+                self::generateCardNumber(304, 14),
                 true,
             ],
             'dinersclub8' => [
                 'dinersclub',
-                $this->generateCardNumber(305, 14),
+                self::generateCardNumber(305, 14),
                 true,
             ],
             'dinersclub9' => [
                 'dinersclub',
-                $this->generateCardNumber(309, 14),
+                self::generateCardNumber(309, 14),
                 true,
             ],
             'dinersclub10' => [
                 'dinersclub',
-                $this->generateCardNumber(36, 14),
+                self::generateCardNumber(36, 14),
                 true,
             ],
             'dinersclub11' => [
                 'dinersclub',
-                $this->generateCardNumber(38, 14),
+                self::generateCardNumber(38, 14),
                 true,
             ],
             'dinersclub12' => [
                 'dinersclub',
-                $this->generateCardNumber(39, 14),
+                self::generateCardNumber(39, 14),
                 true,
             ],
             'dinersclub13' => [
                 'dinersclub',
-                $this->generateCardNumber(54, 14),
+                self::generateCardNumber(54, 14),
                 true,
             ],
             'dinersclub14' => [
                 'dinersclub',
-                $this->generateCardNumber(55, 14),
+                self::generateCardNumber(55, 14),
                 true,
             ],
             'dinersclub15' => [
                 'dinersclub',
-                $this->generateCardNumber(300, 16),
+                self::generateCardNumber(300, 16),
                 true,
             ],
             'dinersclub16' => [
                 'dinersclub',
-                $this->generateCardNumber(301, 16),
+                self::generateCardNumber(301, 16),
                 true,
             ],
             'dinersclub17' => [
                 'dinersclub',
-                $this->generateCardNumber(302, 16),
+                self::generateCardNumber(302, 16),
                 true,
             ],
             'dinersclub18' => [
                 'dinersclub',
-                $this->generateCardNumber(303, 16),
+                self::generateCardNumber(303, 16),
                 true,
             ],
             'dinersclub19' => [
                 'dinersclub',
-                $this->generateCardNumber(304, 16),
+                self::generateCardNumber(304, 16),
                 true,
             ],
             'dinersclub20' => [
                 'dinersclub',
-                $this->generateCardNumber(305, 16),
+                self::generateCardNumber(305, 16),
                 true,
             ],
             'dinersclub21' => [
                 'dinersclub',
-                $this->generateCardNumber(309, 16),
+                self::generateCardNumber(309, 16),
                 true,
             ],
             'dinersclub22' => [
                 'dinersclub',
-                $this->generateCardNumber(36, 16),
+                self::generateCardNumber(36, 16),
                 true,
             ],
             'dinersclub23' => [
                 'dinersclub',
-                $this->generateCardNumber(38, 16),
+                self::generateCardNumber(38, 16),
                 true,
             ],
             'dinersclub24' => [
                 'dinersclub',
-                $this->generateCardNumber(39, 16),
+                self::generateCardNumber(39, 16),
                 true,
             ],
             'dinersclub25' => [
                 'dinersclub',
-                $this->generateCardNumber(54, 16),
+                self::generateCardNumber(54, 16),
                 true,
             ],
             'dinersclub26' => [
                 'dinersclub',
-                $this->generateCardNumber(55, 16),
+                self::generateCardNumber(55, 16),
                 true,
             ],
             'discover3' => [
                 'discover',
-                $this->generateCardNumber(6011, 16),
+                self::generateCardNumber(6011, 16),
                 true,
             ],
             'discover4' => [
                 'discover',
-                $this->generateCardNumber(622, 16),
+                self::generateCardNumber(622, 16),
                 true,
             ],
             'discover5' => [
                 'discover',
-                $this->generateCardNumber(644, 16),
+                self::generateCardNumber(644, 16),
                 true,
             ],
             'discover6' => [
                 'discover',
-                $this->generateCardNumber(645, 16),
+                self::generateCardNumber(645, 16),
                 true,
             ],
             'discover7' => [
                 'discover',
-                $this->generateCardNumber(656, 16),
+                self::generateCardNumber(656, 16),
                 true,
             ],
             'discover8' => [
                 'discover',
-                $this->generateCardNumber(647, 16),
+                self::generateCardNumber(647, 16),
                 true,
             ],
             'discover9' => [
                 'discover',
-                $this->generateCardNumber(648, 16),
+                self::generateCardNumber(648, 16),
                 true,
             ],
             'discover10' => [
                 'discover',
-                $this->generateCardNumber(649, 16),
+                self::generateCardNumber(649, 16),
                 true,
             ],
             'discover11' => [
                 'discover',
-                $this->generateCardNumber(65, 16),
+                self::generateCardNumber(65, 16),
                 true,
             ],
             'discover12' => [
                 'discover',
-                $this->generateCardNumber(6011, 19),
+                self::generateCardNumber(6011, 19),
                 true,
             ],
             'discover13' => [
                 'discover',
-                $this->generateCardNumber(622, 19),
+                self::generateCardNumber(622, 19),
                 true,
             ],
             'discover14' => [
                 'discover',
-                $this->generateCardNumber(644, 19),
+                self::generateCardNumber(644, 19),
                 true,
             ],
             'discover15' => [
                 'discover',
-                $this->generateCardNumber(645, 19),
+                self::generateCardNumber(645, 19),
                 true,
             ],
             'discover16' => [
                 'discover',
-                $this->generateCardNumber(656, 19),
+                self::generateCardNumber(656, 19),
                 true,
             ],
             'discover17' => [
                 'discover',
-                $this->generateCardNumber(647, 19),
+                self::generateCardNumber(647, 19),
                 true,
             ],
             'discover18' => [
                 'discover',
-                $this->generateCardNumber(648, 19),
+                self::generateCardNumber(648, 19),
                 true,
             ],
             'discover19' => [
                 'discover',
-                $this->generateCardNumber(649, 19),
+                self::generateCardNumber(649, 19),
                 true,
             ],
             'discover20' => [
                 'discover',
-                $this->generateCardNumber(65, 19),
+                self::generateCardNumber(65, 19),
                 true,
             ],
             'interpayment1' => [
                 'interpayment',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'interpayment2' => [
                 'interpayment',
-                $this->generateCardNumber(4, 17),
+                self::generateCardNumber(4, 17),
                 true,
             ],
             'interpayment3' => [
                 'interpayment',
-                $this->generateCardNumber(4, 18),
+                self::generateCardNumber(4, 18),
                 true,
             ],
             'interpayment4' => [
                 'interpayment',
-                $this->generateCardNumber(4, 19),
+                self::generateCardNumber(4, 19),
                 true,
             ],
             'jcb1' => [
                 'jcb',
-                $this->generateCardNumber(352, 16),
+                self::generateCardNumber(352, 16),
                 true,
             ],
             'jcb2' => [
                 'jcb',
-                $this->generateCardNumber(353, 16),
+                self::generateCardNumber(353, 16),
                 true,
             ],
             'jcb3' => [
                 'jcb',
-                $this->generateCardNumber(354, 16),
+                self::generateCardNumber(354, 16),
                 true,
             ],
             'jcb4' => [
                 'jcb',
-                $this->generateCardNumber(355, 16),
+                self::generateCardNumber(355, 16),
                 true,
             ],
             'jcb5' => [
                 'jcb',
-                $this->generateCardNumber(356, 16),
+                self::generateCardNumber(356, 16),
                 true,
             ],
             'jcb6' => [
                 'jcb',
-                $this->generateCardNumber(357, 16),
+                self::generateCardNumber(357, 16),
                 true,
             ],
             'jcb7' => [
                 'jcb',
-                $this->generateCardNumber(358, 16),
+                self::generateCardNumber(358, 16),
                 true,
             ],
             'maestro1' => [
                 'maestro',
-                $this->generateCardNumber(50, 12),
+                self::generateCardNumber(50, 12),
                 true,
             ],
             'maestro2' => [
                 'maestro',
-                $this->generateCardNumber(56, 12),
+                self::generateCardNumber(56, 12),
                 true,
             ],
             'maestro3' => [
                 'maestro',
-                $this->generateCardNumber(57, 12),
+                self::generateCardNumber(57, 12),
                 true,
             ],
             'maestro4' => [
                 'maestro',
-                $this->generateCardNumber(58, 12),
+                self::generateCardNumber(58, 12),
                 true,
             ],
             'maestro5' => [
                 'maestro',
-                $this->generateCardNumber(59, 12),
+                self::generateCardNumber(59, 12),
                 true,
             ],
             'maestro6' => [
                 'maestro',
-                $this->generateCardNumber(60, 12),
+                self::generateCardNumber(60, 12),
                 true,
             ],
             'maestro7' => [
                 'maestro',
-                $this->generateCardNumber(61, 12),
+                self::generateCardNumber(61, 12),
                 true,
             ],
             'maestro8' => [
                 'maestro',
-                $this->generateCardNumber(62, 12),
+                self::generateCardNumber(62, 12),
                 true,
             ],
             'maestro9' => [
                 'maestro',
-                $this->generateCardNumber(63, 12),
+                self::generateCardNumber(63, 12),
                 true,
             ],
             'maestro10' => [
                 'maestro',
-                $this->generateCardNumber(64, 12),
+                self::generateCardNumber(64, 12),
                 true,
             ],
             'maestro11' => [
                 'maestro',
-                $this->generateCardNumber(65, 12),
+                self::generateCardNumber(65, 12),
                 true,
             ],
             'maestro12' => [
                 'maestro',
-                $this->generateCardNumber(66, 12),
+                self::generateCardNumber(66, 12),
                 true,
             ],
             'maestro13' => [
                 'maestro',
-                $this->generateCardNumber(67, 12),
+                self::generateCardNumber(67, 12),
                 true,
             ],
             'maestro14' => [
                 'maestro',
-                $this->generateCardNumber(68, 12),
+                self::generateCardNumber(68, 12),
                 true,
             ],
             'maestro15' => [
                 'maestro',
-                $this->generateCardNumber(69, 12),
+                self::generateCardNumber(69, 12),
                 true,
             ],
             'maestro16' => [
                 'maestro',
-                $this->generateCardNumber(50, 13),
+                self::generateCardNumber(50, 13),
                 true,
             ],
             'maestro17' => [
                 'maestro',
-                $this->generateCardNumber(56, 13),
+                self::generateCardNumber(56, 13),
                 true,
             ],
             'maestro18' => [
                 'maestro',
-                $this->generateCardNumber(57, 13),
+                self::generateCardNumber(57, 13),
                 true,
             ],
             'maestro19' => [
                 'maestro',
-                $this->generateCardNumber(58, 13),
+                self::generateCardNumber(58, 13),
                 true,
             ],
             'maestro20' => [
                 'maestro',
-                $this->generateCardNumber(59, 13),
+                self::generateCardNumber(59, 13),
                 true,
             ],
             'maestro21' => [
                 'maestro',
-                $this->generateCardNumber(60, 13),
+                self::generateCardNumber(60, 13),
                 true,
             ],
             'maestro22' => [
                 'maestro',
-                $this->generateCardNumber(61, 13),
+                self::generateCardNumber(61, 13),
                 true,
             ],
             'maestro23' => [
                 'maestro',
-                $this->generateCardNumber(62, 13),
+                self::generateCardNumber(62, 13),
                 true,
             ],
             'maestro24' => [
                 'maestro',
-                $this->generateCardNumber(63, 13),
+                self::generateCardNumber(63, 13),
                 true,
             ],
             'maestro25' => [
                 'maestro',
-                $this->generateCardNumber(64, 13),
+                self::generateCardNumber(64, 13),
                 true,
             ],
             'maestro26' => [
                 'maestro',
-                $this->generateCardNumber(65, 13),
+                self::generateCardNumber(65, 13),
                 true,
             ],
             'maestro27' => [
                 'maestro',
-                $this->generateCardNumber(66, 13),
+                self::generateCardNumber(66, 13),
                 true,
             ],
             'maestro28' => [
                 'maestro',
-                $this->generateCardNumber(67, 13),
+                self::generateCardNumber(67, 13),
                 true,
             ],
             'maestro29' => [
                 'maestro',
-                $this->generateCardNumber(68, 13),
+                self::generateCardNumber(68, 13),
                 true,
             ],
             'maestro30' => [
                 'maestro',
-                $this->generateCardNumber(69, 13),
+                self::generateCardNumber(69, 13),
                 true,
             ],
             'maestro31' => [
                 'maestro',
-                $this->generateCardNumber(50, 14),
+                self::generateCardNumber(50, 14),
                 true,
             ],
             'maestro32' => [
                 'maestro',
-                $this->generateCardNumber(56, 14),
+                self::generateCardNumber(56, 14),
                 true,
             ],
             'maestro33' => [
                 'maestro',
-                $this->generateCardNumber(57, 14),
+                self::generateCardNumber(57, 14),
                 true,
             ],
             'maestro34' => [
                 'maestro',
-                $this->generateCardNumber(58, 14),
+                self::generateCardNumber(58, 14),
                 true,
             ],
             'maestro35' => [
                 'maestro',
-                $this->generateCardNumber(59, 14),
+                self::generateCardNumber(59, 14),
                 true,
             ],
             'maestro36' => [
                 'maestro',
-                $this->generateCardNumber(60, 14),
+                self::generateCardNumber(60, 14),
                 true,
             ],
             'maestro37' => [
                 'maestro',
-                $this->generateCardNumber(61, 14),
+                self::generateCardNumber(61, 14),
                 true,
             ],
             'maestro38' => [
                 'maestro',
-                $this->generateCardNumber(62, 14),
+                self::generateCardNumber(62, 14),
                 true,
             ],
             'maestro39' => [
                 'maestro',
-                $this->generateCardNumber(63, 14),
+                self::generateCardNumber(63, 14),
                 true,
             ],
             'maestro40' => [
                 'maestro',
-                $this->generateCardNumber(64, 14),
+                self::generateCardNumber(64, 14),
                 true,
             ],
             'maestro41' => [
                 'maestro',
-                $this->generateCardNumber(65, 14),
+                self::generateCardNumber(65, 14),
                 true,
             ],
             'maestro42' => [
                 'maestro',
-                $this->generateCardNumber(66, 14),
+                self::generateCardNumber(66, 14),
                 true,
             ],
             'maestro43' => [
                 'maestro',
-                $this->generateCardNumber(67, 14),
+                self::generateCardNumber(67, 14),
                 true,
             ],
             'maestro44' => [
                 'maestro',
-                $this->generateCardNumber(68, 14),
+                self::generateCardNumber(68, 14),
                 true,
             ],
             'maestro45' => [
                 'maestro',
-                $this->generateCardNumber(69, 14),
+                self::generateCardNumber(69, 14),
                 true,
             ],
             'maestro46' => [
                 'maestro',
-                $this->generateCardNumber(50, 15),
+                self::generateCardNumber(50, 15),
                 true,
             ],
             'maestro47' => [
                 'maestro',
-                $this->generateCardNumber(56, 15),
+                self::generateCardNumber(56, 15),
                 true,
             ],
             'maestro48' => [
                 'maestro',
-                $this->generateCardNumber(57, 15),
+                self::generateCardNumber(57, 15),
                 true,
             ],
             'maestro49' => [
                 'maestro',
-                $this->generateCardNumber(58, 15),
+                self::generateCardNumber(58, 15),
                 true,
             ],
             'maestro50' => [
                 'maestro',
-                $this->generateCardNumber(59, 15),
+                self::generateCardNumber(59, 15),
                 true,
             ],
             'maestro51' => [
                 'maestro',
-                $this->generateCardNumber(60, 15),
+                self::generateCardNumber(60, 15),
                 true,
             ],
             'maestro52' => [
                 'maestro',
-                $this->generateCardNumber(61, 15),
+                self::generateCardNumber(61, 15),
                 true,
             ],
             'maestro53' => [
                 'maestro',
-                $this->generateCardNumber(62, 15),
+                self::generateCardNumber(62, 15),
                 true,
             ],
             'maestro54' => [
                 'maestro',
-                $this->generateCardNumber(63, 15),
+                self::generateCardNumber(63, 15),
                 true,
             ],
             'maestro55' => [
                 'maestro',
-                $this->generateCardNumber(64, 15),
+                self::generateCardNumber(64, 15),
                 true,
             ],
             'maestro56' => [
                 'maestro',
-                $this->generateCardNumber(65, 15),
+                self::generateCardNumber(65, 15),
                 true,
             ],
             'maestro57' => [
                 'maestro',
-                $this->generateCardNumber(66, 15),
+                self::generateCardNumber(66, 15),
                 true,
             ],
             'maestro58' => [
                 'maestro',
-                $this->generateCardNumber(67, 15),
+                self::generateCardNumber(67, 15),
                 true,
             ],
             'maestro59' => [
                 'maestro',
-                $this->generateCardNumber(68, 15),
+                self::generateCardNumber(68, 15),
                 true,
             ],
             'maestro60' => [
                 'maestro',
-                $this->generateCardNumber(69, 15),
+                self::generateCardNumber(69, 15),
                 true,
             ],
             'maestro61' => [
                 'maestro',
-                $this->generateCardNumber(50, 16),
+                self::generateCardNumber(50, 16),
                 true,
             ],
             'maestro62' => [
                 'maestro',
-                $this->generateCardNumber(56, 16),
+                self::generateCardNumber(56, 16),
                 true,
             ],
             'maestro63' => [
                 'maestro',
-                $this->generateCardNumber(57, 16),
+                self::generateCardNumber(57, 16),
                 true,
             ],
             'maestro64' => [
                 'maestro',
-                $this->generateCardNumber(58, 16),
+                self::generateCardNumber(58, 16),
                 true,
             ],
             'maestro65' => [
                 'maestro',
-                $this->generateCardNumber(59, 16),
+                self::generateCardNumber(59, 16),
                 true,
             ],
             'maestro66' => [
                 'maestro',
-                $this->generateCardNumber(60, 16),
+                self::generateCardNumber(60, 16),
                 true,
             ],
             'maestro67' => [
                 'maestro',
-                $this->generateCardNumber(61, 16),
+                self::generateCardNumber(61, 16),
                 true,
             ],
             'maestro68' => [
                 'maestro',
-                $this->generateCardNumber(62, 16),
+                self::generateCardNumber(62, 16),
                 true,
             ],
             'maestro69' => [
                 'maestro',
-                $this->generateCardNumber(63, 16),
+                self::generateCardNumber(63, 16),
                 true,
             ],
             'maestro70' => [
                 'maestro',
-                $this->generateCardNumber(64, 16),
+                self::generateCardNumber(64, 16),
                 true,
             ],
             'maestro71' => [
                 'maestro',
-                $this->generateCardNumber(65, 16),
+                self::generateCardNumber(65, 16),
                 true,
             ],
             'maestro72' => [
                 'maestro',
-                $this->generateCardNumber(66, 16),
+                self::generateCardNumber(66, 16),
                 true,
             ],
             'maestro73' => [
                 'maestro',
-                $this->generateCardNumber(67, 16),
+                self::generateCardNumber(67, 16),
                 true,
             ],
             'maestro74' => [
                 'maestro',
-                $this->generateCardNumber(68, 16),
+                self::generateCardNumber(68, 16),
                 true,
             ],
             'maestro75' => [
                 'maestro',
-                $this->generateCardNumber(69, 16),
+                self::generateCardNumber(69, 16),
                 true,
             ],
             'maestro91' => [
                 'maestro',
-                $this->generateCardNumber(50, 18),
+                self::generateCardNumber(50, 18),
                 true,
             ],
             'maestro92' => [
                 'maestro',
-                $this->generateCardNumber(56, 18),
+                self::generateCardNumber(56, 18),
                 true,
             ],
             'maestro93' => [
                 'maestro',
-                $this->generateCardNumber(57, 18),
+                self::generateCardNumber(57, 18),
                 true,
             ],
             'maestro94' => [
                 'maestro',
-                $this->generateCardNumber(58, 18),
+                self::generateCardNumber(58, 18),
                 true,
             ],
             'maestro95' => [
                 'maestro',
-                $this->generateCardNumber(59, 18),
+                self::generateCardNumber(59, 18),
                 true,
             ],
             'maestro96' => [
                 'maestro',
-                $this->generateCardNumber(60, 18),
+                self::generateCardNumber(60, 18),
                 true,
             ],
             'maestro97' => [
                 'maestro',
-                $this->generateCardNumber(61, 18),
+                self::generateCardNumber(61, 18),
                 true,
             ],
             'maestro98' => [
                 'maestro',
-                $this->generateCardNumber(62, 18),
+                self::generateCardNumber(62, 18),
                 true,
             ],
             'maestro99' => [
                 'maestro',
-                $this->generateCardNumber(63, 18),
+                self::generateCardNumber(63, 18),
                 true,
             ],
             'maestro100' => [
                 'maestro',
-                $this->generateCardNumber(64, 18),
+                self::generateCardNumber(64, 18),
                 true,
             ],
             'maestro101' => [
                 'maestro',
-                $this->generateCardNumber(65, 18),
+                self::generateCardNumber(65, 18),
                 true,
             ],
             'maestro102' => [
                 'maestro',
-                $this->generateCardNumber(66, 18),
+                self::generateCardNumber(66, 18),
                 true,
             ],
             'maestro103' => [
                 'maestro',
-                $this->generateCardNumber(67, 18),
+                self::generateCardNumber(67, 18),
                 true,
             ],
             'maestro104' => [
                 'maestro',
-                $this->generateCardNumber(68, 18),
+                self::generateCardNumber(68, 18),
                 true,
             ],
             'maestro105' => [
                 'maestro',
-                $this->generateCardNumber(69, 18),
+                self::generateCardNumber(69, 18),
                 true,
             ],
             'maestro106' => [
                 'maestro',
-                $this->generateCardNumber(50, 19),
+                self::generateCardNumber(50, 19),
                 true,
             ],
             'maestro107' => [
                 'maestro',
-                $this->generateCardNumber(56, 19),
+                self::generateCardNumber(56, 19),
                 true,
             ],
             'maestro108' => [
                 'maestro',
-                $this->generateCardNumber(57, 19),
+                self::generateCardNumber(57, 19),
                 true,
             ],
             'maestro109' => [
                 'maestro',
-                $this->generateCardNumber(58, 19),
+                self::generateCardNumber(58, 19),
                 true,
             ],
             'maestro110' => [
                 'maestro',
-                $this->generateCardNumber(59, 19),
+                self::generateCardNumber(59, 19),
                 true,
             ],
             'maestro111' => [
                 'maestro',
-                $this->generateCardNumber(60, 19),
+                self::generateCardNumber(60, 19),
                 true,
             ],
             'maestro112' => [
                 'maestro',
-                $this->generateCardNumber(61, 19),
+                self::generateCardNumber(61, 19),
                 true,
             ],
             'maestro113' => [
                 'maestro',
-                $this->generateCardNumber(62, 19),
+                self::generateCardNumber(62, 19),
                 true,
             ],
             'maestro114' => [
                 'maestro',
-                $this->generateCardNumber(63, 19),
+                self::generateCardNumber(63, 19),
                 true,
             ],
             'maestro115' => [
                 'maestro',
-                $this->generateCardNumber(64, 19),
+                self::generateCardNumber(64, 19),
                 true,
             ],
             'maestro116' => [
                 'maestro',
-                $this->generateCardNumber(65, 19),
+                self::generateCardNumber(65, 19),
                 true,
             ],
             'maestro117' => [
                 'maestro',
-                $this->generateCardNumber(66, 19),
+                self::generateCardNumber(66, 19),
                 true,
             ],
             'maestro118' => [
                 'maestro',
-                $this->generateCardNumber(67, 19),
+                self::generateCardNumber(67, 19),
                 true,
             ],
             'maestro119' => [
                 'maestro',
-                $this->generateCardNumber(68, 19),
+                self::generateCardNumber(68, 19),
                 true,
             ],
             'maestro120' => [
                 'maestro',
-                $this->generateCardNumber(69, 19),
+                self::generateCardNumber(69, 19),
                 true,
             ],
             'dankort1' => [
                 'dankort',
-                $this->generateCardNumber(5019, 16),
+                self::generateCardNumber(5019, 16),
                 true,
             ],
             'dankort2' => [
                 'dankort',
-                $this->generateCardNumber(4175, 16),
+                self::generateCardNumber(4175, 16),
                 true,
             ],
             'dankort3' => [
                 'dankort',
-                $this->generateCardNumber(4571, 16),
+                self::generateCardNumber(4571, 16),
                 true,
             ],
             'dankort4' => [
                 'dankort',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'mir1' => [
                 'mir',
-                $this->generateCardNumber(2200, 16),
+                self::generateCardNumber(2200, 16),
                 true,
             ],
             'mir2' => [
                 'mir',
-                $this->generateCardNumber(2201, 16),
+                self::generateCardNumber(2201, 16),
                 true,
             ],
             'mir3' => [
                 'mir',
-                $this->generateCardNumber(2202, 16),
+                self::generateCardNumber(2202, 16),
                 true,
             ],
             'mir4' => [
                 'mir',
-                $this->generateCardNumber(2203, 16),
+                self::generateCardNumber(2203, 16),
                 true,
             ],
             'mir5' => [
                 'mir',
-                $this->generateCardNumber(2204, 16),
+                self::generateCardNumber(2204, 16),
                 true,
             ],
             'mastercard1' => [
                 'mastercard',
-                $this->generateCardNumber(51, 16),
+                self::generateCardNumber(51, 16),
                 true,
             ],
             'mastercard2' => [
                 'mastercard',
-                $this->generateCardNumber(52, 16),
+                self::generateCardNumber(52, 16),
                 true,
             ],
             'mastercard3' => [
                 'mastercard',
-                $this->generateCardNumber(53, 16),
+                self::generateCardNumber(53, 16),
                 true,
             ],
             'mastercard4' => [
                 'mastercard',
-                $this->generateCardNumber(54, 16),
+                self::generateCardNumber(54, 16),
                 true,
             ],
             'mastercard5' => [
                 'mastercard',
-                $this->generateCardNumber(55, 16),
+                self::generateCardNumber(55, 16),
                 true,
             ],
             'mastercard6' => [
                 'mastercard',
-                $this->generateCardNumber(22, 16),
+                self::generateCardNumber(22, 16),
                 true,
             ],
             'mastercard7' => [
                 'mastercard',
-                $this->generateCardNumber(23, 16),
+                self::generateCardNumber(23, 16),
                 true,
             ],
             'mastercard8' => [
                 'mastercard',
-                $this->generateCardNumber(24, 16),
+                self::generateCardNumber(24, 16),
                 true,
             ],
             'mastercard9' => [
                 'mastercard',
-                $this->generateCardNumber(25, 16),
+                self::generateCardNumber(25, 16),
                 true,
             ],
             'mastercard10' => [
                 'mastercard',
-                $this->generateCardNumber(26, 16),
+                self::generateCardNumber(26, 16),
                 true,
             ],
             'mastercard11' => [
                 'mastercard',
-                $this->generateCardNumber(27, 16),
+                self::generateCardNumber(27, 16),
                 true,
             ],
             'visa1' => [
                 'visa',
-                $this->generateCardNumber(4, 13),
+                self::generateCardNumber(4, 13),
                 true,
             ],
             'visa2' => [
                 'visa',
-                $this->generateCardNumber(4, 16),
+                self::generateCardNumber(4, 16),
                 true,
             ],
             'visa3' => [
                 'visa',
-                $this->generateCardNumber(4, 19),
+                self::generateCardNumber(4, 19),
                 true,
             ],
             'uatp' => [
                 'uatp',
-                $this->generateCardNumber(1, 15),
+                self::generateCardNumber(1, 15),
                 true,
             ],
             'verve1' => [
                 'verve',
-                $this->generateCardNumber(506, 16),
+                self::generateCardNumber(506, 16),
                 true,
             ],
             'verve2' => [
                 'verve',
-                $this->generateCardNumber(650, 16),
+                self::generateCardNumber(650, 16),
                 true,
             ],
             'verve3' => [
                 'verve',
-                $this->generateCardNumber(506, 19),
+                self::generateCardNumber(506, 19),
                 true,
             ],
             'verve4' => [
                 'verve',
-                $this->generateCardNumber(650, 19),
+                self::generateCardNumber(650, 19),
                 true,
             ],
             'cibc1' => [
                 'cibc',
-                $this->generateCardNumber(4506, 16),
+                self::generateCardNumber(4506, 16),
                 true,
             ],
             'rbc1' => [
                 'rbc',
-                $this->generateCardNumber(45, 16),
+                self::generateCardNumber(45, 16),
                 true,
             ],
             'tdtrust' => [
                 'tdtrust',
-                $this->generateCardNumber(589297, 16),
+                self::generateCardNumber(589297, 16),
                 true,
             ],
             'scotia1' => [
                 'scotia',
-                $this->generateCardNumber(4536, 16),
+                self::generateCardNumber(4536, 16),
                 true,
             ],
             'bmoabm1' => [
                 'bmoabm',
-                $this->generateCardNumber(500, 16),
+                self::generateCardNumber(500, 16),
                 true,
             ],
             'hsbc1' => [
                 'hsbc',
-                $this->generateCardNumber(56, 16),
+                self::generateCardNumber(56, 16),
                 true,
             ],
             'hsbc2' => [
                 'hsbc',
-                $this->generateCardNumber(57, 16),
+                self::generateCardNumber(57, 16),
                 false,
             ],
         ];
@@ -1203,7 +1203,7 @@ public function provideValidCCNumber(): iterable
     /**
      * Generate a fake credit card number that still passes the Luhn algorithm.
      */
-    private function generateCardNumber(int $prefix, int $length): string
+    private static function generateCardNumber(int $prefix, int $length): string
     {
         $prefix = (string) $prefix;
         $cursor = strlen($prefix);
@@ -1215,12 +1215,12 @@ private function generateCardNumber(int $prefix, int $length): string
             $digits[$cursor++] = (string) random_int(0, 9);
         }
 
-        $digits[$length - 1] = (string) $this->calculateLuhnChecksum($digits, $length);
+        $digits[$length - 1] = (string) self::calculateLuhnChecksum($digits, $length);
 
         return implode('', $digits);
     }
 
-    private function calculateLuhnChecksum(array $digits, int $length): int
+    private static function calculateLuhnChecksum(array $digits, int $length): int
     {
         $parity = $length % 2;
 
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index e6b8f770640c..f330f8701be8 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -21,7 +21,7 @@
  */
 final class ValidationTest extends TraditionalValidationTest
 {
-    protected array $config = [
+    protected static array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index f7f87549087a..bb8ece43dd86 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -21,6 +21,7 @@
 use Config\Services;
 use PHPUnit\Framework\ExpectationFailedException;
 use Tests\Support\Validation\TestRules;
+use Throwable;
 use TypeError;
 
 /**
@@ -33,7 +34,7 @@
 class ValidationTest extends CIUnitTestCase
 {
     protected Validation $validation;
-    protected array $config = [
+    protected static array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -75,7 +76,7 @@ class ValidationTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation = new Validation((object) static::$config, Services::renderer());
         $this->validation->reset();
     }
 
@@ -202,7 +203,7 @@ public function testSetRuleRulesFormat(bool $expected, $rules): void
         $this->addToAssertionCount(1);
     }
 
-    public function provideSetRuleRulesFormat(): iterable
+    public static function provideSetRuleRulesFormat(): iterable
     {
         yield 'fail-simple-object' => [
             false,
@@ -221,7 +222,7 @@ public function provideSetRuleRulesFormat(): iterable
 
         yield 'fail-deep-object' => [
             false,
-            new Validation((object) $this->config, Services::renderer()),
+            new Validation((object) static::$config, Services::renderer()),
         ];
 
         yield 'pass-multiple-string' => [
@@ -900,12 +901,20 @@ public function testShowBadTemplate(): void
 
     public function testNoRuleSetsSetup(): void
     {
-        $this->expectException(ValidationException::class);
+        try {
+            $rulesets = static::$config['ruleSets'];
 
-        $this->config['ruleSets'] = null;
-        $this->validation         = new Validation((object) $this->config, Services::renderer());
-        $this->validation->reset();
-        $this->validation->run(['foo' => '']);
+            static::$config['ruleSets'] = null;
+            (new Validation((object) static::$config, Services::renderer()))
+                ->reset()
+                ->run(['foo' => '']);
+
+            $this->fail(sprintf('%s should throw %s.', __METHOD__, ValidationException::class));
+        } catch (Throwable $e) {
+            $this->assertInstanceOf(ValidationException::class, $e);
+        } finally {
+            static::$config['ruleSets'] = $rulesets;
+        }
     }
 
     public function testNotCustomRuleGroup(): void

From 3c2522f2afb556452710625226fb9cfcbf63cbd2 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 30 Dec 2023 02:18:48 +0800
Subject: [PATCH 012/148] test: fix path name of composer.json

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

diff --git a/tests/system/AutoReview/ComposerJsonTest.php b/tests/system/AutoReview/ComposerJsonTest.php
index ecc57c028cba..543b1c2d8536 100644
--- a/tests/system/AutoReview/ComposerJsonTest.php
+++ b/tests/system/AutoReview/ComposerJsonTest.php
@@ -62,7 +62,7 @@ public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void
                 $dependency,
                 $expectedVersion,
                 $fwRequireDev[$dependency],
-                clean_path(dirname(__DIR__, 2) . '/admin/framework/composer.json')
+                clean_path(dirname(__DIR__, 3) . '/admin/framework/composer.json')
             ));
         }
     }

From 0ee4e4ae8e3f78a8f24696ae73fd474f4436886b Mon Sep 17 00:00:00 2001
From: ALTITUDE DEV <contact@altitude-dev.fr>
Date: Sat, 30 Dec 2023 08:28:45 +0100
Subject: [PATCH 013/148] Fix bug 4.4.4 spark not working

After upgrading 4.4.3 to 4.4.4 a bug are coming, spark not launching the CI with cmd. php spark server*

Error log:

Undefined global variable $_SESSION

at SYSTEMPATH\Session\Session.php:499

Backtrace:
  1    SYSTEMPATH\Session\Session.php:499
       CodeIgniter\Debug\Exceptions()->errorHandler(2, 'Undefined global variable $_SESSION', 'C:\\wamp64\\www\\system\\Session\\Session.php', 499)

My fix working with no errors and launching correctly CI.
---
 system/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Session/Session.php b/system/Session/Session.php
index 5c087579a2e4..94017d27f6dc 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -496,7 +496,7 @@ public function get(?string $key = null)
             return $value;
         }
 
-        if ($_SESSION === []) {
+        if (empty($_SESSION) || $_SESSION === []) {
             return $key === null ? [] : null;
         }
 

From 6dda6364f0790f5b7961418ffa6ff9294a08a238 Mon Sep 17 00:00:00 2001
From: ALTITUDE DEV <contact@altitude-dev.fr>
Date: Sat, 30 Dec 2023 08:58:03 +0100
Subject: [PATCH 014/148] Update Session.php

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

diff --git a/system/Session/Session.php b/system/Session/Session.php
index 94017d27f6dc..875387f29827 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -496,7 +496,7 @@ public function get(?string $key = null)
             return $value;
         }
 
-        if (empty($_SESSION) || $_SESSION === []) {
+        if (! isset($_SESSION) || $_SESSION === []) {
             return $key === null ? [] : null;
         }
 

From 8a7a68947e4491d8dbc778d0d1afb4266065cf56 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 31 Dec 2023 02:07:24 +0800
Subject: [PATCH 015/148] test: ensure no .env when EncryptionTest is run

---
 tests/system/Encryption/EncryptionTest.php | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 9ab09dc77216..d9391d0d1726 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -25,19 +25,40 @@ final class EncryptionTest extends CIUnitTestCase
 {
     private Encryption $encryption;
 
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        if (is_file(ROOTPATH . '.env')) {
+            rename(ROOTPATH . '.env', ROOTPATH . '.env.bak');
+
+            putenv('encryption.key');
+            unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
+        }
+    }
+
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->encryption = new Encryption();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        parent::tearDownAfterClass();
+
+        if (is_file(ROOTPATH . '.env.bak')) {
+            rename(ROOTPATH . '.env.bak', ROOTPATH . '.env');
+        }
+    }
+
     /**
-     * __construct test
-     *
      * Covers behavior with config encryption key set or not
      */
     public function testConstructor(): void
     {
-        // Assume no configuration from set_up()
+        // Assume no configuration from setUp()
         $this->assertEmpty($this->encryption->key);
 
         // Try with an empty value

From 53d1382e3cbe1598980b8e95744619062d5e87fd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 31 Dec 2023 02:36:04 +0800
Subject: [PATCH 016/148] chore: enforce PR title format with PRLint Reloaded

---
 .github/prlint.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/prlint.json

diff --git a/.github/prlint.json b/.github/prlint.json
new file mode 100644
index 000000000000..a3f9b2c0994e
--- /dev/null
+++ b/.github/prlint.json
@@ -0,0 +1,8 @@
+{
+    "title": [
+        {
+            "pattern": "^(\\[\\d+\\.\\d+\\]\\s{1})?(feat|fix|chore|docs|perf|refactor|style|test)(\\([\\-.@:`a-zA-Z0-9]+\\))?!?:\\s{1}\\S.+\\S$",
+            "message": "PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion."
+        }
+    ]
+}

From 688c8bab17bb59bde9d09e9ae0342bc6503074e1 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 5 Jan 2024 10:47:43 +0100
Subject: [PATCH 017/148] fix: highlightFile() in BaseExceptionHandler

---
 system/Debug/BaseExceptionHandler.php          | 18 ++++++++++++++----
 tests/_support/Debug/highlightFile.html        | 16 ++++++++++++++++
 .../Debug/highlightFile_pre_8_3_0.html         | 16 ++++++++++++++++
 tests/system/Debug/ExceptionHandlerTest.php    | 13 +++++++++++++
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 tests/_support/Debug/highlightFile.html
 create mode 100644 tests/_support/Debug/highlightFile_pre_8_3_0.html

diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index 33dd126ff1ec..a751aed3a1f2 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -180,9 +180,16 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
             return false;
         }
 
-        $source = str_replace(["\r\n", "\r"], "\n", $source);
-        $source = explode("\n", highlight_string($source, true));
-        $source = str_replace('<br />', "\n", $source[1]);
+        if (version_compare(PHP_VERSION, '8.3.0', '<')) {
+            $source = str_replace(["\r\n", "\r"], "\n", $source);
+            $source = explode("\n", highlight_string($source, true));
+            $source = str_replace('<br />', "\n", $source[1]);
+        } else {
+            $source = highlight_string($source, true);
+            // We have to remove these tags since we're preparing the result
+            // ourselves and these tags are added manually at the end.
+            $source = str_replace(['<pre><code>', '</code></pre>'], '', $source);
+        }
         $source = explode("\n", str_replace("\r\n", "\n", $source));
 
         // Get just the part to show
@@ -199,7 +206,7 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
         // of open and close span tags on one line, we need
         // to ensure we can close them all to get the lines
         // showing correctly.
-        $spans = 1;
+        $spans = 0;
 
         foreach ($source as $n => $row) {
             $spans += substr_count($row, '<span') - substr_count($row, '</span');
@@ -216,6 +223,9 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
                 );
             } else {
                 $out .= sprintf('<span class="line"><span class="number">' . $format . '</span> %s', $n + $start + 1, $row) . "\n";
+                // We're closing only one span tag we added manually line before,
+                // so we have to increment $spans count to close this tag later.
+                $spans++;
             }
         }
 
diff --git a/tests/_support/Debug/highlightFile.html b/tests/_support/Debug/highlightFile.html
new file mode 100644
index 000000000000..a9eef9fe5b2c
--- /dev/null
+++ b/tests/_support/Debug/highlightFile.html
@@ -0,0 +1,16 @@
+<pre><code><span class="line"><span class="number"> 9</span>  * the LICENSE file that was distributed with this source code.
+<span class="line"><span class="number">10</span>  */
+<span class="line"><span class="number">11</span> 
+<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace </span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">13</span> 
+<span class="line"><span class="number">14</span> use </span><span style="color: #c7c7c7">CodeIgniter\Controller</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">15</span> 
+<span class='line highlight'><span class='number'>16</span> class Hello extends Controller
+</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
+<span class="line"><span class="number">18</span>     public function </span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
+<span class="line"><span class="number">19</span>     {
+<span class="line"><span class="number">20</span>         return </span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">21</span>     }
+<span class="line"><span class="number">22</span> }
+<span class="line"><span class="number">23</span> </span>
+</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
\ No newline at end of file
diff --git a/tests/_support/Debug/highlightFile_pre_8_3_0.html b/tests/_support/Debug/highlightFile_pre_8_3_0.html
new file mode 100644
index 000000000000..4fb3633f2861
--- /dev/null
+++ b/tests/_support/Debug/highlightFile_pre_8_3_0.html
@@ -0,0 +1,16 @@
+<pre><code><span class="line"><span class="number"> 9</span> &nbsp;*&nbsp;the&nbsp;LICENSE&nbsp;file&nbsp;that&nbsp;was&nbsp;distributed&nbsp;with&nbsp;this&nbsp;source&nbsp;code.
+<span class="line"><span class="number">10</span> &nbsp;*/
+<span class="line"><span class="number">11</span> 
+<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests\Support\Controllers</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">13</span> 
+<span class="line"><span class="number">14</span> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter\Controller</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">15</span> 
+<span class='line highlight'><span class='number'>16</span> class&nbsp;Hello&nbsp;extends&nbsp;Controller
+</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
+<span class="line"><span class="number">18</span> &nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
+<span class="line"><span class="number">19</span> &nbsp;&nbsp;&nbsp;&nbsp;{
+<span class="line"><span class="number">20</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;</span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;}
+<span class="line"><span class="number">22</span> }
+<span class="line"><span class="number">23</span> </span>
+</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
\ No newline at end of file
diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php
index 1321f67195f3..dba00a6952af 100644
--- a/tests/system/Debug/ExceptionHandlerTest.php
+++ b/tests/system/Debug/ExceptionHandlerTest.php
@@ -237,4 +237,17 @@ public function testMaskSensitiveDataTraceDataKey(): void
 
         $this->assertSame('/var/www/CodeIgniter4/app/Controllers/Home.php', $newTrace[0]['file']);
     }
+
+    public function testHighlightFile(): void
+    {
+        $highlightFile = $this->getPrivateMethodInvoker($this->handler, 'highlightFile');
+        $result        = $highlightFile(SUPPORTPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Hello.php', 16);
+        $resultFile    = version_compare(PHP_VERSION, '8.3.0', '<') ?
+            'highlightFile_pre_8_3_0.html' :
+            'highlightFile.html';
+
+        $expected = file_get_contents(SUPPORTPATH . 'Debug' . DIRECTORY_SEPARATOR . $resultFile);
+
+        $this->assertSame($expected, $result);
+    }
 }

From 0cf729d15af4d9e83a44adb66f3583632c8e07a8 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 5 Jan 2024 10:56:11 +0100
Subject: [PATCH 018/148] updates for $source handling based on kenjis PR

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

diff --git a/system/Debug/BaseExceptionHandler.php b/system/Debug/BaseExceptionHandler.php
index a751aed3a1f2..6a5b5e47e5c7 100644
--- a/system/Debug/BaseExceptionHandler.php
+++ b/system/Debug/BaseExceptionHandler.php
@@ -180,17 +180,17 @@ protected static function highlightFile(string $file, int $lineNumber, int $line
             return false;
         }
 
-        if (version_compare(PHP_VERSION, '8.3.0', '<')) {
-            $source = str_replace(["\r\n", "\r"], "\n", $source);
-            $source = explode("\n", highlight_string($source, true));
+        $source = str_replace(["\r\n", "\r"], "\n", $source);
+        $source = explode("\n", highlight_string($source, true));
+
+        if (PHP_VERSION_ID < 80300) {
             $source = str_replace('<br />', "\n", $source[1]);
+            $source = explode("\n", str_replace("\r\n", "\n", $source));
         } else {
-            $source = highlight_string($source, true);
             // We have to remove these tags since we're preparing the result
             // ourselves and these tags are added manually at the end.
             $source = str_replace(['<pre><code>', '</code></pre>'], '', $source);
         }
-        $source = explode("\n", str_replace("\r\n", "\n", $source));
 
         // Get just the part to show
         $start = max($lineNumber - (int) round($lines / 2), 0);

From c9798b6bc7d521a6ebfb0383882de397accc5156 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Jan 2024 19:09:40 +0900
Subject: [PATCH 019/148] docs: make PHPDoc type more specific

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

diff --git a/system/View/Table.php b/system/View/Table.php
index 0cab38fb4f39..7c16efb59cd3 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -25,7 +25,7 @@ class Table
     /**
      * Data for table rows
      *
-     * @var array
+     * @var list<array>|list<list<array>>
      */
     public $rows = [];
 
@@ -258,7 +258,7 @@ public function setSyncRowsWithHeading(bool $orderByKey)
      *
      * Ensures a standard associative array format for all cell data
      *
-     * @return array
+     * @return array<string, array>|list<array>
      */
     protected function _prepArgs(array $args)
     {

From 7602145d38a93debaff4966c9c985a70c976d971 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Jan 2024 19:10:10 +0900
Subject: [PATCH 020/148] refactor: remove unneeded if condition

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

diff --git a/system/View/Table.php b/system/View/Table.php
index 7c16efb59cd3..c9cd33d39ac6 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -381,7 +381,7 @@ public function generate($tableData = null)
                     $cell = $cell['data'] ?? '';
                     $out .= $temp;
 
-                    if ($cell === '' || $cell === null) {
+                    if ($cell === '') {
                         $out .= $this->emptyCells;
                     } elseif (isset($this->function)) {
                         $out .= ($this->function)($cell);

From 3eac5abce733f394ec0f7a0635d23f9d54b950d5 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 5 Jan 2024 13:37:58 +0100
Subject: [PATCH 021/148] add IniTestTrait to easy backup ini values

---
 system/Test/IniTestTrait.php                  | 33 +++++++++++++++
 ..._3_0.html => highlightFile_pre_80300.html} |  0
 tests/system/Debug/ExceptionHandlerTest.php   | 12 +++++-
 tests/system/Test/IniTestTraitTest.php        | 41 +++++++++++++++++++
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 system/Test/IniTestTrait.php
 rename tests/_support/Debug/{highlightFile_pre_8_3_0.html => highlightFile_pre_80300.html} (100%)
 create mode 100644 tests/system/Test/IniTestTraitTest.php

diff --git a/system/Test/IniTestTrait.php b/system/Test/IniTestTrait.php
new file mode 100644
index 000000000000..5820cfc1a71e
--- /dev/null
+++ b/system/Test/IniTestTrait.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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;
+
+trait IniTestTrait
+{
+    private array $iniSettings = [];
+
+    private function backupIniValues(array $keys): void
+    {
+        foreach ($keys as $key) {
+            $this->iniSettings[$key] = ini_get($key);
+        }
+    }
+
+    private function restoreIniValues(): void
+    {
+        foreach ($this->iniSettings as $key => $value) {
+            ini_set($key, $value);
+        }
+
+        $this->iniSettings = [];
+    }
+}
diff --git a/tests/_support/Debug/highlightFile_pre_8_3_0.html b/tests/_support/Debug/highlightFile_pre_80300.html
similarity index 100%
rename from tests/_support/Debug/highlightFile_pre_8_3_0.html
rename to tests/_support/Debug/highlightFile_pre_80300.html
diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php
index dba00a6952af..f5eba44ed591 100644
--- a/tests/system/Debug/ExceptionHandlerTest.php
+++ b/tests/system/Debug/ExceptionHandlerTest.php
@@ -14,6 +14,7 @@
 use App\Controllers\Home;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\IniTestTrait;
 use CodeIgniter\Test\StreamFilterTrait;
 use Config\Exceptions as ExceptionsConfig;
 use Config\Services;
@@ -27,6 +28,7 @@
 final class ExceptionHandlerTest extends CIUnitTestCase
 {
     use StreamFilterTrait;
+    use IniTestTrait;
 
     private ExceptionHandler $handler;
 
@@ -240,14 +242,20 @@ public function testMaskSensitiveDataTraceDataKey(): void
 
     public function testHighlightFile(): void
     {
+        $this->backupIniValues([
+            'highlight.comment', 'highlight.default', 'highlight.html', 'highlight.keyword', 'highlight.string',
+        ]);
+
         $highlightFile = $this->getPrivateMethodInvoker($this->handler, 'highlightFile');
         $result        = $highlightFile(SUPPORTPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Hello.php', 16);
-        $resultFile    = version_compare(PHP_VERSION, '8.3.0', '<') ?
-            'highlightFile_pre_8_3_0.html' :
+        $resultFile    = PHP_VERSION_ID < 80300 ?
+            'highlightFile_pre_80300.html' :
             'highlightFile.html';
 
         $expected = file_get_contents(SUPPORTPATH . 'Debug' . DIRECTORY_SEPARATOR . $resultFile);
 
         $this->assertSame($expected, $result);
+
+        $this->restoreIniValues();
     }
 }
diff --git a/tests/system/Test/IniTestTraitTest.php b/tests/system/Test/IniTestTraitTest.php
new file mode 100644
index 000000000000..7881af978614
--- /dev/null
+++ b/tests/system/Test/IniTestTraitTest.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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 ReflectionException;
+
+/**
+ * @internal
+ */
+final class IniTestTraitTest extends CIUnitTestCase
+{
+    use IniTestTrait;
+
+    /**
+     * @throws ReflectionException
+     */
+    public function testBackupAndRestoreIniValues(): void
+    {
+        $this->backupIniValues(['highlight.default']);
+        $backup = $this->getPrivateProperty($this, 'iniSettings');
+        $this->assertSame('#0000BB', $backup['highlight.default']);
+
+        ini_set('highlight.default', '#FFFFFF');
+        $this->assertSame('#FFFFFF', ini_get('highlight.default'));
+
+        $this->restoreIniValues();
+        $this->assertSame('#0000BB', ini_get('highlight.default'));
+
+        $backup = $this->getPrivateProperty($this, 'iniSettings');
+        $this->assertSame([], $backup);
+    }
+}

From 128463cf116a42ab55e70b86229c99398bf2973a Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 5 Jan 2024 13:40:02 +0100
Subject: [PATCH 022/148] add PHP 8.3 to the bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 17e6b415ba0d..cf018d3c39d8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -29,6 +29,7 @@ body:
         - '8.0'
         - '8.1'
         - '8.2'
+        - '8.3'
     validations:
       required: true
 

From e98dcfd82980032ad167567ac3bfc0cf1704ce74 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 5 Jan 2024 13:48:25 +0100
Subject: [PATCH 023/148] add group to the IniTestTratiTest

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

diff --git a/tests/system/Test/IniTestTraitTest.php b/tests/system/Test/IniTestTraitTest.php
index 7881af978614..e1c9a9a6f7c0 100644
--- a/tests/system/Test/IniTestTraitTest.php
+++ b/tests/system/Test/IniTestTraitTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group Others
  */
 final class IniTestTraitTest extends CIUnitTestCase
 {

From f9bd4da1562876097762ef290569193ab96ebb69 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 6 Jan 2024 09:09:19 +0100
Subject: [PATCH 024/148] add separate results for PHP 7.4

---
 .../_support/Debug/highlightFile_pre_80000.html  | 16 ++++++++++++++++
 tests/system/Debug/ExceptionHandlerTest.php      | 16 +++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 tests/_support/Debug/highlightFile_pre_80000.html

diff --git a/tests/_support/Debug/highlightFile_pre_80000.html b/tests/_support/Debug/highlightFile_pre_80000.html
new file mode 100644
index 000000000000..6b83117b9c97
--- /dev/null
+++ b/tests/_support/Debug/highlightFile_pre_80000.html
@@ -0,0 +1,16 @@
+<pre><code><span class="line"><span class="number"> 9</span> &nbsp;*&nbsp;the&nbsp;LICENSE&nbsp;file&nbsp;that&nbsp;was&nbsp;distributed&nbsp;with&nbsp;this&nbsp;source&nbsp;code.
+<span class="line"><span class="number">10</span> &nbsp;*/
+<span class="line"><span class="number">11</span>
+<span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Support</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controllers</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">13</span>
+<span class="line"><span class="number">14</span> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">15</span>
+<span class='line highlight'><span class='number'>16</span> class&nbsp;Hello&nbsp;extends&nbsp;Controller
+</span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
+<span class="line"><span class="number">18</span> &nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
+<span class="line"><span class="number">19</span> &nbsp;&nbsp;&nbsp;&nbsp;{
+<span class="line"><span class="number">20</span> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;</span><span style="color: #869d6a">'Hello'</span><span style="color: #f1ce61;">;
+<span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;}
+<span class="line"><span class="number">22</span> }
+<span class="line"><span class="number">23</span> </span>
+</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
diff --git a/tests/system/Debug/ExceptionHandlerTest.php b/tests/system/Debug/ExceptionHandlerTest.php
index f5eba44ed591..8dcad8e6c338 100644
--- a/tests/system/Debug/ExceptionHandlerTest.php
+++ b/tests/system/Debug/ExceptionHandlerTest.php
@@ -248,9 +248,19 @@ public function testHighlightFile(): void
 
         $highlightFile = $this->getPrivateMethodInvoker($this->handler, 'highlightFile');
         $result        = $highlightFile(SUPPORTPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Hello.php', 16);
-        $resultFile    = PHP_VERSION_ID < 80300 ?
-            'highlightFile_pre_80300.html' :
-            'highlightFile.html';
+
+        switch (true) {
+            case PHP_VERSION_ID < 80000:
+                $resultFile = 'highlightFile_pre_80000.html';
+                break;
+
+            case PHP_VERSION_ID < 80300:
+                $resultFile = 'highlightFile_pre_80300.html';
+                break;
+
+            default:
+                $resultFile = 'highlightFile.html';
+        }
 
         $expected = file_get_contents(SUPPORTPATH . 'Debug' . DIRECTORY_SEPARATOR . $resultFile);
 

From d558f09551aac247420838746022f201fddb37e3 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 6 Jan 2024 09:56:57 +0100
Subject: [PATCH 025/148] update separate results for PHP 7.4

---
 tests/_support/Debug/highlightFile_pre_80000.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/_support/Debug/highlightFile_pre_80000.html b/tests/_support/Debug/highlightFile_pre_80000.html
index 6b83117b9c97..4b4ad7cecf34 100644
--- a/tests/_support/Debug/highlightFile_pre_80000.html
+++ b/tests/_support/Debug/highlightFile_pre_80000.html
@@ -1,10 +1,10 @@
 <pre><code><span class="line"><span class="number"> 9</span> &nbsp;*&nbsp;the&nbsp;LICENSE&nbsp;file&nbsp;that&nbsp;was&nbsp;distributed&nbsp;with&nbsp;this&nbsp;source&nbsp;code.
 <span class="line"><span class="number">10</span> &nbsp;*/
-<span class="line"><span class="number">11</span>
+<span class="line"><span class="number">11</span> 
 <span class="line"><span class="number">12</span> </span><span style="color: #f1ce61;">namespace&nbsp;</span><span style="color: #c7c7c7">Tests</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Support</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controllers</span><span style="color: #f1ce61;">;
-<span class="line"><span class="number">13</span>
+<span class="line"><span class="number">13</span> 
 <span class="line"><span class="number">14</span> use&nbsp;</span><span style="color: #c7c7c7">CodeIgniter</span><span style="color: #f1ce61;">\</span><span style="color: #c7c7c7">Controller</span><span style="color: #f1ce61;">;
-<span class="line"><span class="number">15</span>
+<span class="line"><span class="number">15</span> 
 <span class='line highlight'><span class='number'>16</span> class&nbsp;Hello&nbsp;extends&nbsp;Controller
 </span></span><span style="color: #c7c7c7"></span><span style="color: #f1ce61;"></span><span style="color: #c7c7c7"><span class="line"><span class="number">17</span> </span><span style="color: #f1ce61;">{
 <span class="line"><span class="number">18</span> &nbsp;&nbsp;&nbsp;&nbsp;public&nbsp;function&nbsp;</span><span style="color: #c7c7c7">index</span><span style="color: #f1ce61;">()
@@ -13,4 +13,4 @@
 <span class="line"><span class="number">21</span> &nbsp;&nbsp;&nbsp;&nbsp;}
 <span class="line"><span class="number">22</span> }
 <span class="line"><span class="number">23</span> </span>
-</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
+</span></span></span></span></span></span></span></span></span></span></span></span></span></code></pre>
\ No newline at end of file

From 83cffecd39aebcc1a213d0643995949d856e1740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 7 Jan 2024 00:58:30 +0000
Subject: [PATCH 026/148] chore(deps): bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy-userguide-latest.yml           | 2 +-
 .github/workflows/reusable-phpunit-test.yml             | 2 +-
 .github/workflows/reusable-serviceless-phpunit-test.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index ab366268e5ee..8c1545286fe9 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -48,7 +48,7 @@ jobs:
 
       # Create an artifact of the html output
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: HTML Documentation
           path: user_guide_src/build/html/
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index 0963f5865242..300f510a0d7f 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -206,7 +206,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index 6371847c77bd..d7d8f4ca8c46 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -116,7 +116,7 @@ jobs:
 
       - name: Upload coverage results as artifact
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.ARTIFACT_NAME }}
           path: build/cov/coverage-${{ env.ARTIFACT_NAME }}.cov

From f6a59e66d9b046c547b9b3595ee03b9eed8b4e5f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Jan 2024 17:16:07 +0900
Subject: [PATCH 027/148] docs: remove redundant @return

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

diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 9c8f7be07ec2..7db126fae2d6 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -702,8 +702,6 @@ function alternator(...$args): string
      * @param int    $radius   The amount of characters returned around the phrase.
      * @param string $ellipsis Ending that will be appended
      *
-     * @return string
-     *
      * If no $phrase is passed, will generate an excerpt of $radius characters
      * from the beginning of $text.
      */

From 0643f57dadebd624f284db5d3bed1460d1b9ead9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Jan 2024 17:16:43 +0900
Subject: [PATCH 028/148] test: update coding style with php-cs-fixer

---
 tests/system/Config/fixtures/RegistrarConfig.php | 2 +-
 tests/system/Config/fixtures/SimpleConfig.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Config/fixtures/RegistrarConfig.php b/tests/system/Config/fixtures/RegistrarConfig.php
index a8a656c5ae6b..4d5635a99497 100644
--- a/tests/system/Config/fixtures/RegistrarConfig.php
+++ b/tests/system/Config/fixtures/RegistrarConfig.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
+class RegistrarConfig extends CodeIgniter\Config\BaseConfig
 {
     public $foo = 'bar';
     public $bar = [
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index 9870c72b0ac2..28b8f6671481 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-class SimpleConfig extends \CodeIgniter\Config\BaseConfig
+class SimpleConfig extends CodeIgniter\Config\BaseConfig
 {
     public $QZERO;
     public $QZEROSTR;

From be3397b645bec0f931f84929ee05dd16dac93fc9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Jan 2024 17:17:14 +0900
Subject: [PATCH 029/148] docs: update coding style with php-cs-fixer

---
 user_guide_src/source/cli/cli_commands/006.php         |  2 +-
 user_guide_src/source/concepts/factories/002.php       |  2 +-
 user_guide_src/source/concepts/factories/008.php       |  2 +-
 user_guide_src/source/concepts/factories/009.php       |  2 +-
 user_guide_src/source/concepts/services/001.php        |  2 +-
 user_guide_src/source/concepts/services/002.php        |  2 +-
 user_guide_src/source/concepts/services/003.php        |  2 +-
 user_guide_src/source/concepts/services/004.php        |  2 +-
 user_guide_src/source/concepts/services/005.php        |  2 +-
 user_guide_src/source/concepts/services/009.php        |  2 +-
 user_guide_src/source/concepts/services/012.php        |  2 +-
 user_guide_src/source/concepts/services/013.php        |  2 +-
 user_guide_src/source/concepts/services/014.php        |  2 +-
 user_guide_src/source/concepts/services/015.php        |  4 ++--
 user_guide_src/source/database/connecting/001.php      |  2 +-
 user_guide_src/source/database/connecting/003.php      |  2 +-
 user_guide_src/source/database/connecting/004.php      |  2 +-
 user_guide_src/source/database/connecting/005.php      |  4 ++--
 user_guide_src/source/database/connecting/006.php      |  2 +-
 user_guide_src/source/database/examples/001.php        |  2 +-
 user_guide_src/source/database/query_builder/001.php   |  2 +-
 user_guide_src/source/database/results/003.php         |  2 +-
 user_guide_src/source/database/results/007.php         |  2 +-
 user_guide_src/source/database/results/011.php         |  2 +-
 user_guide_src/source/database/results/014.php         |  2 +-
 user_guide_src/source/database/results/015.php         |  2 +-
 user_guide_src/source/database/results/016.php         |  2 +-
 user_guide_src/source/database/utilities/001.php       |  2 +-
 user_guide_src/source/database/utilities/002.php       |  2 +-
 user_guide_src/source/database/utilities/003.php       |  2 +-
 user_guide_src/source/database/utilities/004.php       |  2 +-
 user_guide_src/source/database/utilities/005.php       |  2 +-
 user_guide_src/source/database/utilities/006.php       |  2 +-
 user_guide_src/source/database/utilities/008.php       |  2 +-
 user_guide_src/source/database/utilities/009.php       |  2 +-
 user_guide_src/source/database/utilities/010.php       |  2 +-
 user_guide_src/source/dbmgmt/forge/001.php             |  2 +-
 user_guide_src/source/dbmgmt/forge/002.php             |  2 +-
 user_guide_src/source/dbmgmt/seeds/004.php             |  2 +-
 user_guide_src/source/extending/events/005.php         |  2 +-
 user_guide_src/source/extending/events/006.php         |  2 +-
 user_guide_src/source/general/configuration/001.php    |  2 +-
 user_guide_src/source/general/configuration/002.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/errors/003.php           |  2 +-
 user_guide_src/source/general/errors/004.php           |  4 ++--
 user_guide_src/source/general/errors/007.php           |  2 +-
 user_guide_src/source/general/errors/008.php           |  2 +-
 user_guide_src/source/general/errors/009.php           |  2 +-
 user_guide_src/source/general/errors/010.php           |  2 +-
 user_guide_src/source/general/errors/011.php           |  2 +-
 user_guide_src/source/general/errors/018.php           |  4 ++--
 user_guide_src/source/general/logging/006.php          |  2 +-
 user_guide_src/source/general/modules/008.php          |  2 +-
 user_guide_src/source/general/modules/010.php          |  2 +-
 user_guide_src/source/general/modules/011.php          |  2 +-
 .../source/incoming/content_negotiation/001.php        |  2 +-
 user_guide_src/source/incoming/incomingrequest/002.php |  2 +-
 user_guide_src/source/incoming/incomingrequest/003.php |  2 +-
 user_guide_src/source/incoming/routing/013.php         |  2 +-
 user_guide_src/source/incoming/routing/036.php         |  2 +-
 user_guide_src/source/incoming/routing/037.php         |  2 +-
 .../source/installation/upgrade_html_tables/001.php    |  2 +-
 .../source/installation/upgrade_pagination/001.php     |  2 +-
 user_guide_src/source/libraries/caching/002.php        |  2 +-
 user_guide_src/source/libraries/curlrequest/002.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/003.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/004.php    |  8 ++++----
 user_guide_src/source/libraries/curlrequest/005.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/008.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/028.php    |  2 +-
 user_guide_src/source/libraries/email/001.php          |  2 +-
 user_guide_src/source/libraries/encryption/001.php     |  2 +-
 user_guide_src/source/libraries/encryption/003.php     |  4 ++--
 user_guide_src/source/libraries/encryption/004.php     |  4 ++--
 user_guide_src/source/libraries/encryption/006.php     |  2 +-
 user_guide_src/source/libraries/encryption/009.php     |  2 +-
 user_guide_src/source/libraries/files/001.php          |  2 +-
 user_guide_src/source/libraries/images/001.php         |  2 +-
 user_guide_src/source/libraries/images/002.php         |  2 +-
 user_guide_src/source/libraries/images/007.php         |  2 +-
 user_guide_src/source/libraries/images/008.php         |  4 ++--
 user_guide_src/source/libraries/images/009.php         |  2 +-
 user_guide_src/source/libraries/images/010.php         |  2 +-
 user_guide_src/source/libraries/images/011.php         |  4 ++--
 user_guide_src/source/libraries/images/012.php         |  2 +-
 user_guide_src/source/libraries/images/013.php         |  2 +-
 user_guide_src/source/libraries/images/014.php         |  2 +-
 user_guide_src/source/libraries/pagination/001.php     |  2 +-
 user_guide_src/source/libraries/pagination/003.php     |  2 +-
 user_guide_src/source/libraries/pagination/005.php     |  2 +-
 user_guide_src/source/libraries/pagination/018.php     |  2 +-
 user_guide_src/source/libraries/publisher/001.php      |  2 +-
 user_guide_src/source/libraries/publisher/002.php      |  2 +-
 user_guide_src/source/libraries/security/001.php       |  2 +-
 user_guide_src/source/libraries/sessions/001.php       |  2 +-
 user_guide_src/source/libraries/throttler/001.php      |  2 +-
 user_guide_src/source/libraries/typography/001.php     |  2 +-
 user_guide_src/source/libraries/uploaded_files/010.php |  2 +-
 user_guide_src/source/libraries/uri/001.php            |  2 +-
 user_guide_src/source/libraries/uri/008.php            |  2 +-
 user_guide_src/source/libraries/uri/009.php            |  2 +-
 user_guide_src/source/libraries/uri/014.php            |  2 +-
 user_guide_src/source/libraries/uri/015.php            |  2 +-
 user_guide_src/source/libraries/uri/016.php            |  2 +-
 user_guide_src/source/libraries/uri/017.php            |  2 +-
 user_guide_src/source/libraries/uri/020.php            |  2 +-
 user_guide_src/source/libraries/uri/021.php            |  2 +-
 user_guide_src/source/libraries/uri/022.php            |  2 +-
 user_guide_src/source/libraries/validation/004.php     |  2 +-
 user_guide_src/source/libraries/validation/008.php     |  4 ++--
 user_guide_src/source/libraries/validation/044.php     |  2 +-
 user_guide_src/source/models/entities/003.php          |  2 +-
 user_guide_src/source/models/entities/004.php          |  2 +-
 user_guide_src/source/models/entities/005.php          |  2 +-
 user_guide_src/source/models/entities/011.php          |  2 +-
 user_guide_src/source/models/entities/022.php          |  2 +-
 user_guide_src/source/models/model/001.php             |  2 +-
 user_guide_src/source/outgoing/table/001.php           |  2 +-
 user_guide_src/source/outgoing/table/002.php           |  2 +-
 user_guide_src/source/outgoing/table/003.php           |  2 +-
 user_guide_src/source/outgoing/table/004.php           |  2 +-
 user_guide_src/source/outgoing/table/005.php           |  2 +-
 user_guide_src/source/outgoing/table/008.php           |  2 +-
 user_guide_src/source/outgoing/table/009.php           |  2 +-
 user_guide_src/source/outgoing/table/018.php           |  2 +-
 user_guide_src/source/outgoing/table/019.php           |  2 +-
 user_guide_src/source/outgoing/table/020.php           |  2 +-
 user_guide_src/source/outgoing/view_parser/001.php     |  2 +-
 user_guide_src/source/outgoing/view_parser/002.php     |  2 +-
 user_guide_src/source/outgoing/view_renderer/001.php   |  2 +-
 user_guide_src/source/outgoing/view_renderer/002.php   |  2 +-
 user_guide_src/source/testing/benchmark/001.php        |  2 +-
 user_guide_src/source/testing/benchmark/007.php        |  2 +-
 user_guide_src/source/testing/controllers/003.php      |  2 +-
 user_guide_src/source/testing/controllers/004.php      |  2 +-
 user_guide_src/source/testing/controllers/005.php      |  4 ++--
 user_guide_src/source/testing/controllers/006.php      | 10 +++++-----
 user_guide_src/source/testing/controllers/007.php      |  4 ++--
 user_guide_src/source/testing/controllers/008.php      |  4 ++--
 user_guide_src/source/testing/controllers/009.php      |  2 +-
 user_guide_src/source/testing/controllers/010.php      |  2 +-
 user_guide_src/source/testing/mocking/001.php          |  2 +-
 user_guide_src/source/testing/mocking/002.php          |  2 +-
 user_guide_src/source/testing/mocking/003.php          |  2 +-
 user_guide_src/source/testing/response/001.php         |  2 +-
 147 files changed, 166 insertions(+), 166 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/006.php b/user_guide_src/source/cli/cli_commands/006.php
index bdc252c957be..52ce751cfb43 100644
--- a/user_guide_src/source/cli/cli_commands/006.php
+++ b/user_guide_src/source/cli/cli_commands/006.php
@@ -2,6 +2,6 @@
 
 try {
     // ...
-} catch (\Exception $e) {
+} catch (Exception $e) {
     $this->showError($e);
 }
diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php
index 6de5996e74af..0f19a4c0730b 100644
--- a/user_guide_src/source/concepts/factories/002.php
+++ b/user_guide_src/source/concepts/factories/002.php
@@ -2,4 +2,4 @@
 
 $users = Factories::models('Blog\Models\UserModel');
 // Or
-$users = Factories::models(\Blog\Models\UserModel::class);
+$users = Factories::models(Blog\Models\UserModel::class);
diff --git a/user_guide_src/source/concepts/factories/008.php b/user_guide_src/source/concepts/factories/008.php
index 866daa36acb2..2bc7df9e8aa5 100644
--- a/user_guide_src/source/concepts/factories/008.php
+++ b/user_guide_src/source/concepts/factories/008.php
@@ -3,4 +3,4 @@
 $appConfig = config('App');
 
 // The code above is the same as the code below.
-$appConfig = \CodeIgniter\Config\Factories::config('App');
+$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
index 7ca5f31baada..3c9610ef4a0f 100644
--- a/user_guide_src/source/concepts/factories/009.php
+++ b/user_guide_src/source/concepts/factories/009.php
@@ -3,4 +3,4 @@
 $user = model('UserModel');
 
 // The code above is the same as the code below.
-$user = \CodeIgniter\Config\Factories::models('UserModel');
+$user = CodeIgniter\Config\Factories::models('UserModel');
diff --git a/user_guide_src/source/concepts/services/001.php b/user_guide_src/source/concepts/services/001.php
index 1ef57b345f26..261bc090ae33 100644
--- a/user_guide_src/source/concepts/services/001.php
+++ b/user_guide_src/source/concepts/services/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$timer = new \CodeIgniter\Debug\Timer();
+$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
index cb292ecaeb42..28ebb27f6ad1 100644
--- a/user_guide_src/source/concepts/services/002.php
+++ b/user_guide_src/source/concepts/services/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$timer = \Config\Services::timer();
+$timer = Config\Services::timer();
diff --git a/user_guide_src/source/concepts/services/003.php b/user_guide_src/source/concepts/services/003.php
index a13e8ebf1696..ae7bc71eafa1 100644
--- a/user_guide_src/source/concepts/services/003.php
+++ b/user_guide_src/source/concepts/services/003.php
@@ -3,4 +3,4 @@
 $logger = service('logger');
 
 // The code above is the same as the code below.
-$logger = \Config\Services::logger();
+$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 04f7670a0d2c..6c6f73f0907f 100644
--- a/user_guide_src/source/concepts/services/004.php
+++ b/user_guide_src/source/concepts/services/004.php
@@ -3,4 +3,4 @@
 $renderer = service('renderer', APPPATH . 'views/');
 
 // The code above is the same as the code below.
-$renderer = \Config\Services::renderer(APPPATH . 'views/');
+$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 827a8a6c0707..6e7e192a6055 100644
--- a/user_guide_src/source/concepts/services/005.php
+++ b/user_guide_src/source/concepts/services/005.php
@@ -3,4 +3,4 @@
 $logger = single_service('logger');
 
 // The code above is the same as the code below.
-$logger = \Config\Services::logger(false);
+$logger = Config\Services::logger(false);
diff --git a/user_guide_src/source/concepts/services/009.php b/user_guide_src/source/concepts/services/009.php
index 78e4d7c74caf..d61357b46678 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/');
diff --git a/user_guide_src/source/concepts/services/012.php b/user_guide_src/source/concepts/services/012.php
index bd3c89f971ec..cc4b63b4e20c 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();
diff --git a/user_guide_src/source/concepts/services/013.php b/user_guide_src/source/concepts/services/013.php
index 0c82ed0e95fa..85e23bcadf2a 100644
--- a/user_guide_src/source/concepts/services/013.php
+++ b/user_guide_src/source/concepts/services/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = \Config\Services::typography();
+$typography = Config\Services::typography();
diff --git a/user_guide_src/source/concepts/services/014.php b/user_guide_src/source/concepts/services/014.php
index ce012f44a65b..50a2a8057f8e 100644
--- a/user_guide_src/source/concepts/services/014.php
+++ b/user_guide_src/source/concepts/services/014.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = \Config\Services::typography(false);
+$typography = Config\Services::typography(false);
diff --git a/user_guide_src/source/concepts/services/015.php b/user_guide_src/source/concepts/services/015.php
index efaf1be9f00d..97f7c6edf6e3 100644
--- a/user_guide_src/source/concepts/services/015.php
+++ b/user_guide_src/source/concepts/services/015.php
@@ -4,12 +4,12 @@
     'baseURI' => 'http://example.com/api/v1/',
     'timeout' => 3,
 ];
-$client1 = \Config\Services::curlrequest($options1);
+$client1 = Config\Services::curlrequest($options1);
 
 $options2 = [
     'baseURI' => 'http://another.example.com/api/v2/',
     'timeout' => 10,
 ];
-$client2 = \Config\Services::curlrequest($options2);
+$client2 = Config\Services::curlrequest($options2);
 // $options2 does not work.
 // $client2 is the exactly same instance as $client1.
diff --git a/user_guide_src/source/database/connecting/001.php b/user_guide_src/source/database/connecting/001.php
index 74e502c387ea..6a688ae3ca7f 100644
--- a/user_guide_src/source/database/connecting/001.php
+++ b/user_guide_src/source/database/connecting/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = \Config\Database::connect();
+$db = Config\Database::connect();
diff --git a/user_guide_src/source/database/connecting/003.php b/user_guide_src/source/database/connecting/003.php
index 498c5cff34aa..a63d4b75ff6a 100644
--- a/user_guide_src/source/database/connecting/003.php
+++ b/user_guide_src/source/database/connecting/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = \Config\Database::connect('group_name');
+$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
index 21e887e2b627..b7da76a86ab3 100644
--- a/user_guide_src/source/database/connecting/004.php
+++ b/user_guide_src/source/database/connecting/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = \Config\Database::connect('group_name', false);
+$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
index a40deceecadd..46f7e4815ea8 100644
--- a/user_guide_src/source/database/connecting/005.php
+++ b/user_guide_src/source/database/connecting/005.php
@@ -1,4 +1,4 @@
 <?php
 
-$db1 = \Config\Database::connect('group_one');
-$db2 = \Config\Database::connect('group_two');
+$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
index 55e8010730d2..3c5266173134 100644
--- a/user_guide_src/source/database/connecting/006.php
+++ b/user_guide_src/source/database/connecting/006.php
@@ -19,4 +19,4 @@
     'failover' => [],
     'port'     => 3306,
 ];
-$db = \Config\Database::connect($custom);
+$db = Config\Database::connect($custom);
diff --git a/user_guide_src/source/database/examples/001.php b/user_guide_src/source/database/examples/001.php
index 74e502c387ea..6a688ae3ca7f 100644
--- a/user_guide_src/source/database/examples/001.php
+++ b/user_guide_src/source/database/examples/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = \Config\Database::connect();
+$db = Config\Database::connect();
diff --git a/user_guide_src/source/database/query_builder/001.php b/user_guide_src/source/database/query_builder/001.php
index eea94ebba32b..f776d7d4189d 100644
--- a/user_guide_src/source/database/query_builder/001.php
+++ b/user_guide_src/source/database/query_builder/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$db      = \Config\Database::connect();
+$db      = Config\Database::connect();
 $builder = $db->table('users');
diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
index d3fc78cc8d77..e4c097b77ab7 100644
--- a/user_guide_src/source/database/results/003.php
+++ b/user_guide_src/source/database/results/003.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('SELECT * FROM users;');
 
-foreach ($query->getResult(\App\Entities\User::class) as $user) {
+foreach ($query->getResult(App\Entities\User::class) as $user) {
     echo $user->name;          // access attributes
     echo $user->reverseName(); // or methods defined on the 'User' class
 }
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index ed1550836aab..7d4f4eb1fe59 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, \App\Entities\User::class);
+$row   = $query->getRow(0, App\Entities\User::class);
 
 echo $row->name;           // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/011.php b/user_guide_src/source/database/results/011.php
index b33681cd74b4..0da187cac408 100644
--- a/user_guide_src/source/database/results/011.php
+++ b/user_guide_src/source/database/results/011.php
@@ -4,7 +4,7 @@
 
 $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');
 
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index 1ee5af841a25..4fb111880082 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$rows = $query->getCustomResultObject(\App\Entities\User::class);
+$rows = $query->getCustomResultObject(App\Entities\User::class);
 
 foreach ($rows as $row) {
     echo $row->id;
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 7cc9b7996e3b..595e4f1cb521 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$row = $query->getCustomRowObject(0, \App\Entities\User::class);
+$row = $query->getCustomRowObject(0, App\Entities\User::class);
 
 if (isset($row)) {
     echo $row->email;              // access attributes
diff --git a/user_guide_src/source/database/results/016.php b/user_guide_src/source/database/results/016.php
index f6d0e2325ce6..0dff3d004f23 100644
--- a/user_guide_src/source/database/results/016.php
+++ b/user_guide_src/source/database/results/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$row = $query->getCustomRowObject(0, \App\Entities\User::class);
+$row = $query->getCustomRowObject(0, App\Entities\User::class);
diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index 131222efc86b..cdc581fe4487 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/002.php b/user_guide_src/source/database/utilities/002.php
index 42bbbd63acc6..39d0bba6fc67 100644
--- a/user_guide_src/source/database/utilities/002.php
+++ b/user_guide_src/source/database/utilities/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
diff --git a/user_guide_src/source/database/utilities/003.php b/user_guide_src/source/database/utilities/003.php
index 5c6527dc543a..edee56c9d0c7 100644
--- a/user_guide_src/source/database/utilities/003.php
+++ b/user_guide_src/source/database/utilities/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = \Config\Database::utils('group_name');
+$dbutil = Config\Database::utils('group_name');
diff --git a/user_guide_src/source/database/utilities/004.php b/user_guide_src/source/database/utilities/004.php
index 3908bb7ad76c..2786d5ca22e3 100644
--- a/user_guide_src/source/database/utilities/004.php
+++ b/user_guide_src/source/database/utilities/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 $dbs = $dbutil->listDatabases();
 
diff --git a/user_guide_src/source/database/utilities/005.php b/user_guide_src/source/database/utilities/005.php
index 92ddaa3487ce..38c4bd75e41f 100644
--- a/user_guide_src/source/database/utilities/005.php
+++ b/user_guide_src/source/database/utilities/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 if ($dbutil->databaseExists('database_name')) {
     // some code...
diff --git a/user_guide_src/source/database/utilities/006.php b/user_guide_src/source/database/utilities/006.php
index e85a07933798..7fdaeca76e7c 100644
--- a/user_guide_src/source/database/utilities/006.php
+++ b/user_guide_src/source/database/utilities/006.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 if ($dbutil->optimizeTable('table_name')) {
     echo 'Success!';
diff --git a/user_guide_src/source/database/utilities/008.php b/user_guide_src/source/database/utilities/008.php
index 726b15a822dd..c5404bb5923d 100644
--- a/user_guide_src/source/database/utilities/008.php
+++ b/user_guide_src/source/database/utilities/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 $result = $dbutil->optimizeDatabase();
 
diff --git a/user_guide_src/source/database/utilities/009.php b/user_guide_src/source/database/utilities/009.php
index f8bf84f6a499..4adca9a55743 100644
--- a/user_guide_src/source/database/utilities/009.php
+++ b/user_guide_src/source/database/utilities/009.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/010.php b/user_guide_src/source/database/utilities/010.php
index 7e11cc18019b..a557dbd443e2 100644
--- a/user_guide_src/source/database/utilities/010.php
+++ b/user_guide_src/source/database/utilities/010.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = \Config\Database::utils();
+$dbutil = Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/dbmgmt/forge/001.php b/user_guide_src/source/dbmgmt/forge/001.php
index e1891c1b162e..7768b19d8314 100644
--- a/user_guide_src/source/dbmgmt/forge/001.php
+++ b/user_guide_src/source/dbmgmt/forge/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$forge = \Config\Database::forge();
+$forge = Config\Database::forge();
diff --git a/user_guide_src/source/dbmgmt/forge/002.php b/user_guide_src/source/dbmgmt/forge/002.php
index c6e8694acf7a..addcb4ee163b 100644
--- a/user_guide_src/source/dbmgmt/forge/002.php
+++ b/user_guide_src/source/dbmgmt/forge/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$this->myforge = \Config\Database::forge('other_db');
+$this->myforge = Config\Database::forge('other_db');
diff --git a/user_guide_src/source/dbmgmt/seeds/004.php b/user_guide_src/source/dbmgmt/seeds/004.php
index be137c21d0d6..89dafe836a52 100644
--- a/user_guide_src/source/dbmgmt/seeds/004.php
+++ b/user_guide_src/source/dbmgmt/seeds/004.php
@@ -1,4 +1,4 @@
 <?php
 
-$seeder = \Config\Database::seeder();
+$seeder = Config\Database::seeder();
 $seeder->call('TestSeeder');
diff --git a/user_guide_src/source/extending/events/005.php b/user_guide_src/source/extending/events/005.php
index 3bd11f846ade..7e8ad501f986 100644
--- a/user_guide_src/source/extending/events/005.php
+++ b/user_guide_src/source/extending/events/005.php
@@ -1,3 +1,3 @@
 <?php
 
-\CodeIgniter\Events\Events::trigger('some_event');
+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
index bceef2866e9e..b03f1fde0dcc 100644
--- a/user_guide_src/source/extending/events/006.php
+++ b/user_guide_src/source/extending/events/006.php
@@ -1,6 +1,6 @@
 <?php
 
-\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
 Events::on('some_event', static function ($foo, $bar, $baz) {
     // ...
diff --git a/user_guide_src/source/general/configuration/001.php b/user_guide_src/source/general/configuration/001.php
index 574881308e60..01aed04ba7fc 100644
--- a/user_guide_src/source/general/configuration/001.php
+++ b/user_guide_src/source/general/configuration/001.php
@@ -1,4 +1,4 @@
 <?php
 
 // Creating new configuration object by hand
-$config = new \Config\Pager();
+$config = new Config\Pager();
diff --git a/user_guide_src/source/general/configuration/002.php b/user_guide_src/source/general/configuration/002.php
index 7b3a531ac4c7..6c48548a84fb 100644
--- a/user_guide_src/source/general/configuration/002.php
+++ b/user_guide_src/source/general/configuration/002.php
@@ -5,7 +5,7 @@
 
 // Access config class with namespace
 $config = config('Config\\Pager');
-$config = config(\Config\Pager::class);
+$config = config(Config\Pager::class);
 
 // Creating a new object with config function
 $config = config('Pager', false);
diff --git a/user_guide_src/source/general/errors/001.php b/user_guide_src/source/general/errors/001.php
index e2e253748543..eb8ed6ae575a 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 4e04619be5bb..016ab20522c7 100644
--- a/user_guide_src/source/general/errors/002.php
+++ b/user_guide_src/source/general/errors/002.php
@@ -2,6 +2,6 @@
 
 try {
     $user = $userModel->find($id);
-} catch (\Exception $e) {
+} catch (Exception $e) {
     exit($e->getMessage());
 }
diff --git a/user_guide_src/source/general/errors/003.php b/user_guide_src/source/general/errors/003.php
index 2d230d34f29a..b802a55ab3fb 100644
--- a/user_guide_src/source/general/errors/003.php
+++ b/user_guide_src/source/general/errors/003.php
@@ -2,6 +2,6 @@
 
 try {
     $user = $userModel->find($id);
-} catch (\CodeIgniter\UnknownFileException $e) {
+} 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 752b23bdba30..c985ebe8239d 100644
--- a/user_guide_src/source/general/errors/004.php
+++ b/user_guide_src/source/general/errors/004.php
@@ -2,8 +2,8 @@
 
 try {
     $user = $userModel->find($id);
-} catch (\CodeIgniter\UnknownFileException $e) {
+} catch (CodeIgniter\UnknownFileException $e) {
     // do something here...
 
-    throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
+    throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
 }
diff --git a/user_guide_src/source/general/errors/007.php b/user_guide_src/source/general/errors/007.php
index a06e5000737a..47086b3bfa57 100644
--- a/user_guide_src/source/general/errors/007.php
+++ b/user_guide_src/source/general/errors/007.php
@@ -1,5 +1,5 @@
 <?php
 
 if (! $page = $pageModel->find($id)) {
-    throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+    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
index 5e39b61fdcd6..bb2eaf719969 100644
--- a/user_guide_src/source/general/errors/008.php
+++ b/user_guide_src/source/general/errors/008.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\Exceptions\ConfigException();
+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
index 98b72a493f38..b0a2361b81ff 100644
--- a/user_guide_src/source/general/errors/009.php
+++ b/user_guide_src/source/general/errors/009.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\Database\Exceptions\DatabaseException();
+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
index dbe3736a49e9..363e12d6a409 100644
--- a/user_guide_src/source/general/errors/010.php
+++ b/user_guide_src/source/general/errors/010.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri);
+throw new CodeIgniter\HTTP\Exceptions\RedirectException($uri);
diff --git a/user_guide_src/source/general/errors/011.php b/user_guide_src/source/general/errors/011.php
index f5c8cf4b57ff..1280d8169f68 100644
--- a/user_guide_src/source/general/errors/011.php
+++ b/user_guide_src/source/general/errors/011.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri, 301);
+throw new CodeIgniter\HTTP\Exceptions\RedirectException($uri, 301);
diff --git a/user_guide_src/source/general/errors/018.php b/user_guide_src/source/general/errors/018.php
index 3cba09951d8b..bd4b16b631f6 100644
--- a/user_guide_src/source/general/errors/018.php
+++ b/user_guide_src/source/general/errors/018.php
@@ -1,8 +1,8 @@
 <?php
 
-$response = \Config\Services::response()
+$response = Config\Services::response()
     ->redirect('https://example.com/path')
     ->setHeader('Some', 'header')
     ->setCookie('and', 'cookie');
 
-throw new \CodeIgniter\HTTP\Exceptions\RedirectException($response);
+throw new CodeIgniter\HTTP\Exceptions\RedirectException($response);
diff --git a/user_guide_src/source/general/logging/006.php b/user_guide_src/source/general/logging/006.php
index 7186f9761f6e..0c9f98f6b3ba 100644
--- a/user_guide_src/source/general/logging/006.php
+++ b/user_guide_src/source/general/logging/006.php
@@ -2,6 +2,6 @@
 
 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/008.php b/user_guide_src/source/general/modules/008.php
index b502d164c5cb..66c16ea2d7f9 100644
--- a/user_guide_src/source/general/modules/008.php
+++ b/user_guide_src/source/general/modules/008.php
@@ -1,3 +1,3 @@
 <?php
 
-$config = new \Acme\Blog\Config\Blog();
+$config = new Acme\Blog\Config\Blog();
diff --git a/user_guide_src/source/general/modules/010.php b/user_guide_src/source/general/modules/010.php
index 1065ff9328f9..3039a9cd1637 100644
--- a/user_guide_src/source/general/modules/010.php
+++ b/user_guide_src/source/general/modules/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$lib = new \Acme\Blog\Libraries\BlogLib();
+$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
index 2619f95e6599..a4f83d7f38fa 100644
--- a/user_guide_src/source/general/modules/011.php
+++ b/user_guide_src/source/general/modules/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$model = new \Acme\Blog\Models\PostModel();
+$model = new Acme\Blog\Models\PostModel();
diff --git a/user_guide_src/source/incoming/content_negotiation/001.php b/user_guide_src/source/incoming/content_negotiation/001.php
index 3c55e788eff9..a5eda5fe0996 100644
--- a/user_guide_src/source/incoming/content_negotiation/001.php
+++ b/user_guide_src/source/incoming/content_negotiation/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$negotiate = \Config\Services::negotiator();
+$negotiate = Config\Services::negotiator();
diff --git a/user_guide_src/source/incoming/incomingrequest/002.php b/user_guide_src/source/incoming/incomingrequest/002.php
index 94d680abbdc3..620fa2287dc3 100644
--- a/user_guide_src/source/incoming/incomingrequest/002.php
+++ b/user_guide_src/source/incoming/incomingrequest/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$request = \Config\Services::request();
+$request = Config\Services::request();
diff --git a/user_guide_src/source/incoming/incomingrequest/003.php b/user_guide_src/source/incoming/incomingrequest/003.php
index 5668f74a86a8..f8e153ff0178 100644
--- a/user_guide_src/source/incoming/incomingrequest/003.php
+++ b/user_guide_src/source/incoming/incomingrequest/003.php
@@ -12,4 +12,4 @@ public function __construct(RequestInterface $request)
     }
 }
 
-$someClass = new SomeClass(\Config\Services::request());
+$someClass = new SomeClass(Config\Services::request());
diff --git a/user_guide_src/source/incoming/routing/013.php b/user_guide_src/source/incoming/routing/013.php
index b562d01ba3b2..5cb8a9b63a35 100644
--- a/user_guide_src/source/incoming/routing/013.php
+++ b/user_guide_src/source/incoming/routing/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('/', [\App\Controllers\Home::class, 'index']);
+$routes->get('/', [App\Controllers\Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/036.php b/user_guide_src/source/incoming/routing/036.php
index dd6cd63ba61d..511c10766c4c 100644
--- a/user_guide_src/source/incoming/routing/036.php
+++ b/user_guide_src/source/incoming/routing/036.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/037.php b/user_guide_src/source/incoming/routing/037.php
index 94ae43246897..5838cde5ded0 100644
--- a/user_guide_src/source/incoming/routing/037.php
+++ b/user_guide_src/source/incoming/routing/037.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/installation/upgrade_html_tables/001.php b/user_guide_src/source/installation/upgrade_html_tables/001.php
index 0d0679305409..385894b1b568 100644
--- a/user_guide_src/source/installation/upgrade_html_tables/001.php
+++ b/user_guide_src/source/installation/upgrade_html_tables/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 
diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/001.php
index 62710360fca9..fa7f359aed6b 100644
--- a/user_guide_src/source/installation/upgrade_pagination/001.php
+++ b/user_guide_src/source/installation/upgrade_pagination/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$model = new \App\Models\UserModel();
+$model = new App\Models\UserModel();
 
 $data = [
     'users' => $model->paginate(10),
diff --git a/user_guide_src/source/libraries/caching/002.php b/user_guide_src/source/libraries/caching/002.php
index ed453264b505..0aced52172b0 100644
--- a/user_guide_src/source/libraries/caching/002.php
+++ b/user_guide_src/source/libraries/caching/002.php
@@ -1,5 +1,5 @@
 <?php
 
-$cache = \Config\Services::cache();
+$cache = Config\Services::cache();
 
 $foo = $cache->get('foo');
diff --git a/user_guide_src/source/libraries/curlrequest/002.php b/user_guide_src/source/libraries/curlrequest/002.php
index 5d84bfe442b5..28e71adb74c7 100644
--- a/user_guide_src/source/libraries/curlrequest/002.php
+++ b/user_guide_src/source/libraries/curlrequest/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$client = \Config\Services::curlrequest();
+$client = Config\Services::curlrequest();
diff --git a/user_guide_src/source/libraries/curlrequest/003.php b/user_guide_src/source/libraries/curlrequest/003.php
index 5f02e4f18c00..c56e8182d791 100644
--- a/user_guide_src/source/libraries/curlrequest/003.php
+++ b/user_guide_src/source/libraries/curlrequest/003.php
@@ -4,4 +4,4 @@
     'baseURI' => 'http://example.com/api/v1/',
     'timeout' => 3,
 ];
-$client = \Config\Services::curlrequest($options);
+$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
index 4d6a14fadbb0..d73ea9243411 100644
--- a/user_guide_src/source/libraries/curlrequest/004.php
+++ b/user_guide_src/source/libraries/curlrequest/004.php
@@ -1,8 +1,8 @@
 <?php
 
-$client = new \CodeIgniter\HTTP\CURLRequest(
-    new \Config\App(),
-    new \CodeIgniter\HTTP\URI(),
-    new \CodeIgniter\HTTP\Response(new \Config\App()),
+$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
index ab2b479c4a18..9a899d44a023 100644
--- a/user_guide_src/source/libraries/curlrequest/005.php
+++ b/user_guide_src/source/libraries/curlrequest/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$client = \Config\Services::curlrequest();
+$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/008.php b/user_guide_src/source/libraries/curlrequest/008.php
index 611909c2df7d..73c6cf6da396 100644
--- a/user_guide_src/source/libraries/curlrequest/008.php
+++ b/user_guide_src/source/libraries/curlrequest/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$client = \Config\Services::curlrequest([
+$client = Config\Services::curlrequest([
     'baseURI' => 'https://example.com/api/v1/',
 ]);
 
diff --git a/user_guide_src/source/libraries/curlrequest/028.php b/user_guide_src/source/libraries/curlrequest/028.php
index fcce227c1d9a..6059c832c64d 100644
--- a/user_guide_src/source/libraries/curlrequest/028.php
+++ b/user_guide_src/source/libraries/curlrequest/028.php
@@ -2,5 +2,5 @@
 
 $post_data = [
     'foo'      => 'bar',
-    'userfile' => new \CURLFile('/path/to/file.txt'),
+    'userfile' => new CURLFile('/path/to/file.txt'),
 ];
diff --git a/user_guide_src/source/libraries/email/001.php b/user_guide_src/source/libraries/email/001.php
index 914193c15203..968bcdbc1218 100644
--- a/user_guide_src/source/libraries/email/001.php
+++ b/user_guide_src/source/libraries/email/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$email = \Config\Services::email();
+$email = Config\Services::email();
 
 $email->setFrom('your@example.com', 'Your Name');
 $email->setTo('someone@example.com');
diff --git a/user_guide_src/source/libraries/encryption/001.php b/user_guide_src/source/libraries/encryption/001.php
index 8f840be59245..c07227c81fa7 100644
--- a/user_guide_src/source/libraries/encryption/001.php
+++ b/user_guide_src/source/libraries/encryption/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$encrypter = \Config\Services::encrypter();
+$encrypter = Config\Services::encrypter();
diff --git a/user_guide_src/source/libraries/encryption/003.php b/user_guide_src/source/libraries/encryption/003.php
index 772a2172417f..0e91e70b7dad 100644
--- a/user_guide_src/source/libraries/encryption/003.php
+++ b/user_guide_src/source/libraries/encryption/003.php
@@ -1,7 +1,7 @@
 <?php
 
-$config         = new \Config\Encryption();
+$config         = new Config\Encryption();
 $config->key    = 'aBigsecret_ofAtleast32Characters';
 $config->driver = 'OpenSSL';
 
-$encrypter = \Config\Services::encrypter($config);
+$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
index 30d861e74a40..538f857b8ee3 100644
--- a/user_guide_src/source/libraries/encryption/004.php
+++ b/user_guide_src/source/libraries/encryption/004.php
@@ -1,8 +1,8 @@
 <?php
 
 // $key will be assigned a 32-byte (256-bit) random key
-$key = \CodeIgniter\Encryption\Encryption::createKey();
+$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);
+$key = CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
diff --git a/user_guide_src/source/libraries/encryption/006.php b/user_guide_src/source/libraries/encryption/006.php
index 43e52f0bcad2..7685c7a1855c 100644
--- a/user_guide_src/source/libraries/encryption/006.php
+++ b/user_guide_src/source/libraries/encryption/006.php
@@ -1,7 +1,7 @@
 <?php
 
 // Get a hex-encoded representation of the key:
-$encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
+$encoded = bin2hex(CodeIgniter\Encryption\Encryption::createKey(32));
 
 // Put the same value with hex2bin(),
 // so that it is still passed as binary to the library:
diff --git a/user_guide_src/source/libraries/encryption/009.php b/user_guide_src/source/libraries/encryption/009.php
index ec40cae6127c..ba98b2f21334 100644
--- a/user_guide_src/source/libraries/encryption/009.php
+++ b/user_guide_src/source/libraries/encryption/009.php
@@ -1,7 +1,7 @@
 <?php
 
 // create an Encryption instance
-$encryption = new \CodeIgniter\Encryption\Encryption();
+$encryption = new CodeIgniter\Encryption\Encryption();
 
 // reconfigure an instance with different settings
 $encrypter = $encryption->initialize($config);
diff --git a/user_guide_src/source/libraries/files/001.php b/user_guide_src/source/libraries/files/001.php
index 643758d14ca8..314cf5a90319 100644
--- a/user_guide_src/source/libraries/files/001.php
+++ b/user_guide_src/source/libraries/files/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$file = new \CodeIgniter\Files\File($path);
+$file = new CodeIgniter\Files\File($path);
diff --git a/user_guide_src/source/libraries/images/001.php b/user_guide_src/source/libraries/images/001.php
index 780bb37b3a4d..f83934b3e241 100644
--- a/user_guide_src/source/libraries/images/001.php
+++ b/user_guide_src/source/libraries/images/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$image = \Config\Services::image();
+$image = Config\Services::image();
diff --git a/user_guide_src/source/libraries/images/002.php b/user_guide_src/source/libraries/images/002.php
index 9215a57e9e23..b0f698c3d768 100644
--- a/user_guide_src/source/libraries/images/002.php
+++ b/user_guide_src/source/libraries/images/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$image = \Config\Services::image('imagick');
+$image = Config\Services::image('imagick');
diff --git a/user_guide_src/source/libraries/images/007.php b/user_guide_src/source/libraries/images/007.php
index 51521268855f..f8999835e486 100644
--- a/user_guide_src/source/libraries/images/007.php
+++ b/user_guide_src/source/libraries/images/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$image = \Config\Services::image();
+$image = Config\Services::image();
 
 try {
     $image->withFile('/path/to/image/mypic.jpg')
diff --git a/user_guide_src/source/libraries/images/008.php b/user_guide_src/source/libraries/images/008.php
index 01406733d31b..b24dd171abc9 100644
--- a/user_guide_src/source/libraries/images/008.php
+++ b/user_guide_src/source/libraries/images/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$info = \Config\Services::image('imagick')
+$info = Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.jpg')
     ->getFile()
     ->getProperties(true);
@@ -8,7 +8,7 @@
 $xOffset = ($info['width'] / 2) - 25;
 $yOffset = ($info['height'] / 2) - 25;
 
-\Config\Services::image('imagick')
+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
index 6314181ef435..7fdbeab90582 100644
--- a/user_guide_src/source/libraries/images/009.php
+++ b/user_guide_src/source/libraries/images/009.php
@@ -1,6 +1,6 @@
 <?php
 
-\Config\Services::image()
+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
index b70b179815cd..b7dd8ed52f68 100644
--- a/user_guide_src/source/libraries/images/010.php
+++ b/user_guide_src/source/libraries/images/010.php
@@ -1,6 +1,6 @@
 <?php
 
-\Config\Services::image('imagick')
+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
index f18fb55545a1..2db14bace838 100644
--- a/user_guide_src/source/libraries/images/011.php
+++ b/user_guide_src/source/libraries/images/011.php
@@ -1,11 +1,11 @@
 <?php
 
-\Config\Services::image('imagick')
+Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.png')
     ->flatten()
     ->save('/path/to/new/image.jpg');
 
-\Config\Services::image('imagick')
+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
index 581a984238bd..63e402a6e104 100644
--- a/user_guide_src/source/libraries/images/012.php
+++ b/user_guide_src/source/libraries/images/012.php
@@ -1,6 +1,6 @@
 <?php
 
-\Config\Services::image('imagick')
+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
index c51a7126be8d..cae77fa028ff 100644
--- a/user_guide_src/source/libraries/images/013.php
+++ b/user_guide_src/source/libraries/images/013.php
@@ -1,6 +1,6 @@
 <?php
 
-\Config\Services::image('imagick')
+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
index 32943ed142c6..45f3b86a2134 100644
--- a/user_guide_src/source/libraries/images/014.php
+++ b/user_guide_src/source/libraries/images/014.php
@@ -1,6 +1,6 @@
 <?php
 
-\Config\Services::image('imagick')
+Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.jpg')
     ->text('Copyright 2017 My Photo Co', [
         'color'      => '#fff',
diff --git a/user_guide_src/source/libraries/pagination/001.php b/user_guide_src/source/libraries/pagination/001.php
index ec86f0e73490..9c7facc66801 100644
--- a/user_guide_src/source/libraries/pagination/001.php
+++ b/user_guide_src/source/libraries/pagination/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$pager = \Config\Services::pager();
+$pager = Config\Services::pager();
diff --git a/user_guide_src/source/libraries/pagination/003.php b/user_guide_src/source/libraries/pagination/003.php
index 6ea631c7a9bc..2378915d1db8 100644
--- a/user_guide_src/source/libraries/pagination/003.php
+++ b/user_guide_src/source/libraries/pagination/003.php
@@ -1,7 +1,7 @@
 <?php
 
 // In your Controller.
-$model = new \App\Models\UserModel();
+$model = new App\Models\UserModel();
 
 $data = [
     'users' => $model->where('ban', 1)->paginate(10),
diff --git a/user_guide_src/source/libraries/pagination/005.php b/user_guide_src/source/libraries/pagination/005.php
index dec2c3161e76..bf6f8a004004 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();
+$userModel = new App\Models\UserModel();
 $page      = 3;
 
 $users = $userModel->paginate(10, 'group1', $page);
diff --git a/user_guide_src/source/libraries/pagination/018.php b/user_guide_src/source/libraries/pagination/018.php
index 002d034a643c..09b4b0320587 100644
--- a/user_guide_src/source/libraries/pagination/018.php
+++ b/user_guide_src/source/libraries/pagination/018.php
@@ -1,7 +1,7 @@
 <?php
 
 // In your Controller.
-$model = new \App\Models\UserModel();
+$model = new App\Models\UserModel();
 
 $data = [
     'users' => $model->banned()->paginate(10),
diff --git a/user_guide_src/source/libraries/publisher/001.php b/user_guide_src/source/libraries/publisher/001.php
index 6312e0d034f4..42335338b982 100644
--- a/user_guide_src/source/libraries/publisher/001.php
+++ b/user_guide_src/source/libraries/publisher/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$publisher = new \CodeIgniter\Publisher\Publisher();
+$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
index 6312e0d034f4..42335338b982 100644
--- a/user_guide_src/source/libraries/publisher/002.php
+++ b/user_guide_src/source/libraries/publisher/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$publisher = new \CodeIgniter\Publisher\Publisher();
+$publisher = new CodeIgniter\Publisher\Publisher();
diff --git a/user_guide_src/source/libraries/security/001.php b/user_guide_src/source/libraries/security/001.php
index fe504ef35a8e..6953dbc4bc83 100644
--- a/user_guide_src/source/libraries/security/001.php
+++ b/user_guide_src/source/libraries/security/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$security = \Config\Services::security();
+$security = Config\Services::security();
diff --git a/user_guide_src/source/libraries/sessions/001.php b/user_guide_src/source/libraries/sessions/001.php
index b1fa9aac3530..0ae6fbe3b7dd 100644
--- a/user_guide_src/source/libraries/sessions/001.php
+++ b/user_guide_src/source/libraries/sessions/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$session = \Config\Services::session($config);
+$session = Config\Services::session($config);
diff --git a/user_guide_src/source/libraries/throttler/001.php b/user_guide_src/source/libraries/throttler/001.php
index 20086d3fc60a..594dd1e21c54 100644
--- a/user_guide_src/source/libraries/throttler/001.php
+++ b/user_guide_src/source/libraries/throttler/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$throttler = \Config\Services::throttler();
+$throttler = Config\Services::throttler();
 $throttler->check($name, 60, MINUTE);
diff --git a/user_guide_src/source/libraries/typography/001.php b/user_guide_src/source/libraries/typography/001.php
index 0c82ed0e95fa..85e23bcadf2a 100644
--- a/user_guide_src/source/libraries/typography/001.php
+++ b/user_guide_src/source/libraries/typography/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = \Config\Services::typography();
+$typography = Config\Services::typography();
diff --git a/user_guide_src/source/libraries/uploaded_files/010.php b/user_guide_src/source/libraries/uploaded_files/010.php
index 094ea73c1064..fc277fac976b 100644
--- a/user_guide_src/source/libraries/uploaded_files/010.php
+++ b/user_guide_src/source/libraries/uploaded_files/010.php
@@ -1,5 +1,5 @@
 <?php
 
 if (! $file->isValid()) {
-    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
+    throw new RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
 }
diff --git a/user_guide_src/source/libraries/uri/001.php b/user_guide_src/source/libraries/uri/001.php
index 7219d03d248f..00ddb3444fa8 100644
--- a/user_guide_src/source/libraries/uri/001.php
+++ b/user_guide_src/source/libraries/uri/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+$uri = new CodeIgniter\HTTP\URI('http://www.example.com/some/path');
diff --git a/user_guide_src/source/libraries/uri/008.php b/user_guide_src/source/libraries/uri/008.php
index 66746092b49f..7a097b24fd6d 100644
--- a/user_guide_src/source/libraries/uri/008.php
+++ b/user_guide_src/source/libraries/uri/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+$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
index 44043fbe63d0..8f4dd92deee4 100644
--- a/user_guide_src/source/libraries/uri/009.php
+++ b/user_guide_src/source/libraries/uri/009.php
@@ -1,5 +1,5 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/014.php b/user_guide_src/source/libraries/uri/014.php
index 79192a56955d..e8615be7e449 100644
--- a/user_guide_src/source/libraries/uri/014.php
+++ b/user_guide_src/source/libraries/uri/014.php
@@ -1,6 +1,6 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/015.php b/user_guide_src/source/libraries/uri/015.php
index f5b43c3a65d0..cfbd7e4dc4b6 100644
--- a/user_guide_src/source/libraries/uri/015.php
+++ b/user_guide_src/source/libraries/uri/015.php
@@ -1,6 +1,6 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/016.php b/user_guide_src/source/libraries/uri/016.php
index f9d82a86759d..ae4c9201c43d 100644
--- a/user_guide_src/source/libraries/uri/016.php
+++ b/user_guide_src/source/libraries/uri/016.php
@@ -1,6 +1,6 @@
 <?php
 
-$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'
diff --git a/user_guide_src/source/libraries/uri/017.php b/user_guide_src/source/libraries/uri/017.php
index dd45fb157f4b..84b737f1d363 100644
--- a/user_guide_src/source/libraries/uri/017.php
+++ b/user_guide_src/source/libraries/uri/017.php
@@ -1,6 +1,6 @@
 <?php
 
-$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');
diff --git a/user_guide_src/source/libraries/uri/020.php b/user_guide_src/source/libraries/uri/020.php
index 53c3b8d66dd9..2a285a9d92ca 100644
--- a/user_guide_src/source/libraries/uri/020.php
+++ b/user_guide_src/source/libraries/uri/020.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+$uri = new CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
 
 // Returns 'foo=bar'
 echo $uri->getQuery(['only' => ['foo']]);
diff --git a/user_guide_src/source/libraries/uri/021.php b/user_guide_src/source/libraries/uri/021.php
index ed2976e6e1d3..26d7263a4ab3 100644
--- a/user_guide_src/source/libraries/uri/021.php
+++ b/user_guide_src/source/libraries/uri/021.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+$uri = new CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
 
 // Leaves just the 'baz' variable
 $uri->stripQuery('foo', 'bar');
diff --git a/user_guide_src/source/libraries/uri/022.php b/user_guide_src/source/libraries/uri/022.php
index e2df019dcb87..7fa5b961124b 100644
--- a/user_guide_src/source/libraries/uri/022.php
+++ b/user_guide_src/source/libraries/uri/022.php
@@ -1,6 +1,6 @@
 <?php
 
-$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'
diff --git a/user_guide_src/source/libraries/validation/004.php b/user_guide_src/source/libraries/validation/004.php
index 01e5f9b648bd..0777376e84ba 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/008.php b/user_guide_src/source/libraries/validation/008.php
index 41e37f0652ef..079165a7639b 100644
--- a/user_guide_src/source/libraries/validation/008.php
+++ b/user_guide_src/source/libraries/validation/008.php
@@ -1,7 +1,7 @@
 <?php
 
-$validation = \Config\Services::validation();
-$request    = \Config\Services::request();
+$validation = Config\Services::validation();
+$request    = Config\Services::request();
 
 if ($validation->withRequest($request)->run()) {
     // If you use the input data, you should get it from the getValidated() method.
diff --git a/user_guide_src/source/libraries/validation/044.php b/user_guide_src/source/libraries/validation/044.php
index 7f3a0e0e0902..6f1a18214740 100644
--- a/user_guide_src/source/libraries/validation/044.php
+++ b/user_guide_src/source/libraries/validation/044.php
@@ -1,6 +1,6 @@
 <?php
 
-$validation = \Config\Services::validation();
+$validation = Config\Services::validation();
 $validation->setRules([
     'username' => 'required',
     'password' => 'required|min_length[10]',
diff --git a/user_guide_src/source/models/entities/003.php b/user_guide_src/source/models/entities/003.php
index 3b50b6691d0d..c68fa08e8d92 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/004.php b/user_guide_src/source/models/entities/004.php
index e5307d38b1a2..775ef026c2bc 100644
--- a/user_guide_src/source/models/entities/004.php
+++ b/user_guide_src/source/models/entities/004.php
@@ -2,6 +2,6 @@
 
 $data = $this->request->getPost();
 
-$user = new \App\Entities\User();
+$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
index 5dd5d47af1f5..6b756baf687b 100644
--- a/user_guide_src/source/models/entities/005.php
+++ b/user_guide_src/source/models/entities/005.php
@@ -2,5 +2,5 @@
 
 $data = $this->request->getPost();
 
-$user = new \App\Entities\User($data);
+$user = new App\Entities\User($data);
 $userModel->save($user);
diff --git a/user_guide_src/source/models/entities/011.php b/user_guide_src/source/models/entities/011.php
index 9dedc28458b8..8867e4761da0 100644
--- a/user_guide_src/source/models/entities/011.php
+++ b/user_guide_src/source/models/entities/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = new \App\Entities\User();
+$user = new App\Entities\User();
 
 // Converted to Time instance
 $user->created_at = 'April 15, 2017 10:30:00';
diff --git a/user_guide_src/source/models/entities/022.php b/user_guide_src/source/models/entities/022.php
index 07dc560038a3..7afe406b3075 100644
--- a/user_guide_src/source/models/entities/022.php
+++ b/user_guide_src/source/models/entities/022.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = new \App\Entities\User();
+$user = new App\Entities\User();
 $user->hasChanged('name'); // false
 
 $user->name = 'Fred';
diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php
index 90cdb17d98ea..5bdcecde7a96 100644
--- a/user_guide_src/source/models/model/001.php
+++ b/user_guide_src/source/models/model/001.php
@@ -1,7 +1,7 @@
 <?php
 
 // Create a new class manually.
-$userModel = new \App\Models\UserModel();
+$userModel = new App\Models\UserModel();
 
 // Create a shared instance of the model.
 $userModel = model('UserModel');
diff --git a/user_guide_src/source/outgoing/table/001.php b/user_guide_src/source/outgoing/table/001.php
index dbd5ba323335..12bea5b47f82 100644
--- a/user_guide_src/source/outgoing/table/001.php
+++ b/user_guide_src/source/outgoing/table/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$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
index 4ce9b5b0e2ab..3d0d548e345c 100644
--- a/user_guide_src/source/outgoing/table/002.php
+++ b/user_guide_src/source/outgoing/table/002.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $data = [
     ['Name', 'Color', 'Size'],
diff --git a/user_guide_src/source/outgoing/table/003.php b/user_guide_src/source/outgoing/table/003.php
index 91218de3f143..2b1b8a966de4 100644
--- a/user_guide_src/source/outgoing/table/003.php
+++ b/user_guide_src/source/outgoing/table/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $query = $db->query('SELECT * FROM my_table');
 
diff --git a/user_guide_src/source/outgoing/table/004.php b/user_guide_src/source/outgoing/table/004.php
index 0d0679305409..385894b1b568 100644
--- a/user_guide_src/source/outgoing/table/004.php
+++ b/user_guide_src/source/outgoing/table/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 
diff --git a/user_guide_src/source/outgoing/table/005.php b/user_guide_src/source/outgoing/table/005.php
index 08d6dabb1850..5817d146bf21 100644
--- a/user_guide_src/source/outgoing/table/005.php
+++ b/user_guide_src/source/outgoing/table/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading(['Name', 'Color', 'Size']);
 
diff --git a/user_guide_src/source/outgoing/table/008.php b/user_guide_src/source/outgoing/table/008.php
index 99f12f2b2fcd..e13d1991a1b2 100644
--- a/user_guide_src/source/outgoing/table/008.php
+++ b/user_guide_src/source/outgoing/table/008.php
@@ -4,4 +4,4 @@
     'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
 ];
 
-$table = new \CodeIgniter\View\Table($customSettings);
+$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
index c08af5b1fa9a..68cd17ab8552 100644
--- a/user_guide_src/source/outgoing/table/009.php
+++ b/user_guide_src/source/outgoing/table/009.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 $table->addRow('Fred', '<strong>Blue</strong>', 'Small');
diff --git a/user_guide_src/source/outgoing/table/018.php b/user_guide_src/source/outgoing/table/018.php
index c67c746bde9b..9e2b18ff04d3 100644
--- a/user_guide_src/source/outgoing/table/018.php
+++ b/user_guide_src/source/outgoing/table/018.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setCaption('Preferences')
     ->setHeading('Name', 'Color', 'Size')
diff --git a/user_guide_src/source/outgoing/table/019.php b/user_guide_src/source/outgoing/table/019.php
index 5478867fddfa..1f3ef696f4b1 100644
--- a/user_guide_src/source/outgoing/table/019.php
+++ b/user_guide_src/source/outgoing/table/019.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading(['name' => 'Name', 'color' => 'Color', 'size' => 'Size'])
     ->setSyncRowsWithHeading(true)
diff --git a/user_guide_src/source/outgoing/table/020.php b/user_guide_src/source/outgoing/table/020.php
index 42bda4d2f3bc..1d3736858562 100644
--- a/user_guide_src/source/outgoing/table/020.php
+++ b/user_guide_src/source/outgoing/table/020.php
@@ -16,7 +16,7 @@
     ],
 ];
 
-$table = new \CodeIgniter\View\Table();
+$table = new CodeIgniter\View\Table();
 
 $table->setHeading(['name' => 'Name', 'color' => 'Color', 'size' => 'Size'])
     ->setSyncRowsWithHeading(true);
diff --git a/user_guide_src/source/outgoing/view_parser/001.php b/user_guide_src/source/outgoing/view_parser/001.php
index 56f7f51e4a07..e5d30f21ab7c 100644
--- a/user_guide_src/source/outgoing/view_parser/001.php
+++ b/user_guide_src/source/outgoing/view_parser/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$parser = \Config\Services::parser();
+$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
index a57951d052b0..cbd7e5cf0e2b 100644
--- a/user_guide_src/source/outgoing/view_parser/002.php
+++ b/user_guide_src/source/outgoing/view_parser/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$parser = new \CodeIgniter\View\Parser();
+$parser = new CodeIgniter\View\Parser();
diff --git a/user_guide_src/source/outgoing/view_renderer/001.php b/user_guide_src/source/outgoing/view_renderer/001.php
index 2772e22cad0d..65983f69a832 100644
--- a/user_guide_src/source/outgoing/view_renderer/001.php
+++ b/user_guide_src/source/outgoing/view_renderer/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$view = \Config\Services::renderer();
+$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
index 05fedb3b7b6b..1fcd432484e1 100644
--- a/user_guide_src/source/outgoing/view_renderer/002.php
+++ b/user_guide_src/source/outgoing/view_renderer/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$view = new \CodeIgniter\View\View();
+$view = new CodeIgniter\View\View();
diff --git a/user_guide_src/source/testing/benchmark/001.php b/user_guide_src/source/testing/benchmark/001.php
index ce3bd09ac87f..ad9653e7c935 100644
--- a/user_guide_src/source/testing/benchmark/001.php
+++ b/user_guide_src/source/testing/benchmark/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$benchmark = \Config\Services::timer();
+$benchmark = Config\Services::timer();
 $benchmark->start('render view');
diff --git a/user_guide_src/source/testing/benchmark/007.php b/user_guide_src/source/testing/benchmark/007.php
index 4997eb1875b0..74bd22552636 100644
--- a/user_guide_src/source/testing/benchmark/007.php
+++ b/user_guide_src/source/testing/benchmark/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$iterator = new \CodeIgniter\Debug\Iterator();
+$iterator = new CodeIgniter\Debug\Iterator();
 
 $iterator->add('double', static function ($word = 'little') {
     "Some basic {$word} string test.";
diff --git a/user_guide_src/source/testing/controllers/003.php b/user_guide_src/source/testing/controllers/003.php
index 51e810538e87..4f5ddc00a6c5 100644
--- a/user_guide_src/source/testing/controllers/003.php
+++ b/user_guide_src/source/testing/controllers/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$this->controller(\App\Controllers\ForumController::class);
+$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
index 17b5f42590ce..233d1d67cc88 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)
+$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
index 11717bc79e7a..030de80452ea 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)
+    ->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 5e101f1bbfbb..022a4192bbfb 100644
--- a/user_guide_src/source/testing/controllers/006.php
+++ b/user_guide_src/source/testing/controllers/006.php
@@ -1,14 +1,14 @@
 <?php
 
-$request = new \CodeIgniter\HTTP\IncomingRequest(
-    new \Config\App(),
-    new \CodeIgniter\HTTP\URI('http://example.com'),
+$request = new CodeIgniter\HTTP\IncomingRequest(
+    new Config\App(),
+    new CodeIgniter\HTTP\URI('http://example.com'),
     null,
-    new \CodeIgniter\HTTP\UserAgent()
+    new CodeIgniter\HTTP\UserAgent()
 );
 
 $request->setLocale($locale);
 
 $results = $this->withRequest($request)
-    ->controller(\App\Controllers\ForumController::class)
+    ->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 8f7d55448035..ecf5b34343fb 100644
--- a/user_guide_src/source/testing/controllers/007.php
+++ b/user_guide_src/source/testing/controllers/007.php
@@ -1,7 +1,7 @@
 <?php
 
-$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)
+    ->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 641a7f92f68b..2a58ed415143 100644
--- a/user_guide_src/source/testing/controllers/008.php
+++ b/user_guide_src/source/testing/controllers/008.php
@@ -1,8 +1,8 @@
 <?php
 
-$logger = new \CodeIgniter\Log\Handlers\FileHandler();
+$logger = new CodeIgniter\Log\Handlers\FileHandler();
 
 $results = $this->withResponse($response)
     ->withLogger($logger)
-    ->controller(\App\Controllers\ForumController::class)
+    ->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 711d947b4267..5fad87c836a9 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)
+    ->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 e257dcbc4928..b54045c1a011 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)
+    ->controller(App\Controllers\ForumController::class)
     ->execute('showCategories');
diff --git a/user_guide_src/source/testing/mocking/001.php b/user_guide_src/source/testing/mocking/001.php
index 69e69239049d..8740a1e9d6eb 100644
--- a/user_guide_src/source/testing/mocking/001.php
+++ b/user_guide_src/source/testing/mocking/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+$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
index 7afe011ef20b..8f0a9013b13a 100644
--- a/user_guide_src/source/testing/mocking/002.php
+++ b/user_guide_src/source/testing/mocking/002.php
@@ -1,5 +1,5 @@
 <?php
 
-$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+$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
index 4a3babddaf54..f67b7e0420e3 100644
--- a/user_guide_src/source/testing/mocking/003.php
+++ b/user_guide_src/source/testing/mocking/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+$mock = mock(CodeIgniter\Cache\CacheFactory::class);
 
 // Assert that a cached item named $key exists
 $mock->assertHas($key);
diff --git a/user_guide_src/source/testing/response/001.php b/user_guide_src/source/testing/response/001.php
index 0e37cfec37ba..ee7e298d0a35 100644
--- a/user_guide_src/source/testing/response/001.php
+++ b/user_guide_src/source/testing/response/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$result = new \CodeIgniter\Test\TestResponse($response);
+$result = new CodeIgniter\Test\TestResponse($response);
 $result->assertOK();

From 73f5d468d602e3554ac8d890fcdd14db8f8f0196 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 09:47:03 +0900
Subject: [PATCH 030/148] docs: add namespace to sample code in testing

---
 user_guide_src/source/testing/overview/017.php | 3 +++
 user_guide_src/source/testing/overview/021.php | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index c31ac96eb459..f5e436377383 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Tests;
+
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Mock\MockUserModel;
 
 final class SomeTest extends CIUnitTestCase
 {
diff --git a/user_guide_src/source/testing/overview/021.php b/user_guide_src/source/testing/overview/021.php
index 7a8c7a026afd..b91da950fbf6 100644
--- a/user_guide_src/source/testing/overview/021.php
+++ b/user_guide_src/source/testing/overview/021.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests;
+
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Test\CIUnitTestCase;
 

From 44d0bb63d49e018dc7d34ddf69144927cb0557e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 09:50:24 +0900
Subject: [PATCH 031/148] chore: change coding style for User Guide sample code

The code copied from the user guide should work out of the box as possible.
---
 .php-cs-fixer.user-guide.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.php-cs-fixer.user-guide.php b/.php-cs-fixer.user-guide.php
index 7700626c965f..fe634f0a6f21 100644
--- a/.php-cs-fixer.user-guide.php
+++ b/.php-cs-fixer.user-guide.php
@@ -31,10 +31,14 @@
     ]);
 
 $overrides = [
-    'echo_tag_syntax'             => false,
-    'php_unit_internal_class'     => false,
-    'no_unused_imports'           => false,
-    'class_attributes_separation' => false,
+    'echo_tag_syntax'              => false,
+    'php_unit_internal_class'      => false,
+    'no_unused_imports'            => false,
+    'class_attributes_separation'  => false,
+    'fully_qualified_strict_types' => [
+        'import_symbols'                        => false,
+        'leading_backslash_in_global_namespace' => true,
+    ],
 ];
 
 $options = [

From f7ce5cd08a5cc00ac6b5f4b01857385955d3d7af Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 09:49:32 +0900
Subject: [PATCH 032/148] docs: update coding style with php-cs-fixer

---
 user_guide_src/source/cli/cli_commands/006.php         |  2 +-
 user_guide_src/source/cli/cli_library/002.php          |  2 +-
 user_guide_src/source/cli/cli_library/003.php          |  2 +-
 user_guide_src/source/cli/cli_library/004.php          |  2 +-
 user_guide_src/source/cli/cli_library/005.php          |  2 +-
 user_guide_src/source/cli/cli_library/006.php          |  2 +-
 user_guide_src/source/cli/cli_library/007.php          |  2 +-
 user_guide_src/source/cli/cli_library/008.php          |  2 +-
 user_guide_src/source/cli/cli_library/009.php          |  2 +-
 user_guide_src/source/cli/cli_library/010.php          |  2 +-
 user_guide_src/source/cli/cli_library/011.php          |  2 +-
 user_guide_src/source/cli/cli_library/012.php          |  2 +-
 user_guide_src/source/cli/cli_library/013.php          |  2 +-
 user_guide_src/source/cli/cli_library/014.php          |  2 +-
 user_guide_src/source/cli/cli_library/015.php          |  4 ++--
 user_guide_src/source/cli/cli_library/016.php          |  2 +-
 user_guide_src/source/cli/cli_library/017.php          |  4 ++--
 user_guide_src/source/cli/cli_library/018.php          |  2 +-
 user_guide_src/source/cli/cli_library/019.php          |  2 +-
 user_guide_src/source/cli/cli_library/020.php          |  4 ++--
 user_guide_src/source/cli/cli_library/021.php          |  2 +-
 user_guide_src/source/cli/cli_library/022.php          |  6 +++---
 user_guide_src/source/cli/cli_library/023.php          |  2 +-
 user_guide_src/source/concepts/factories/002.php       |  4 ++--
 user_guide_src/source/concepts/factories/004.php       |  2 +-
 user_guide_src/source/concepts/factories/006.php       |  4 ++--
 user_guide_src/source/concepts/factories/007.php       |  4 ++--
 user_guide_src/source/concepts/factories/008.php       |  2 +-
 user_guide_src/source/concepts/factories/009.php       |  2 +-
 user_guide_src/source/concepts/factories/010.php       |  2 +-
 user_guide_src/source/concepts/factories/013.php       |  2 +-
 user_guide_src/source/concepts/factories/014.php       |  2 +-
 user_guide_src/source/concepts/services/001.php        |  2 +-
 user_guide_src/source/concepts/services/002.php        |  2 +-
 user_guide_src/source/concepts/services/003.php        |  2 +-
 user_guide_src/source/concepts/services/004.php        |  2 +-
 user_guide_src/source/concepts/services/005.php        |  2 +-
 user_guide_src/source/concepts/services/009.php        |  2 +-
 user_guide_src/source/concepts/services/012.php        |  2 +-
 user_guide_src/source/concepts/services/013.php        |  2 +-
 user_guide_src/source/concepts/services/014.php        |  2 +-
 user_guide_src/source/concepts/services/015.php        |  4 ++--
 user_guide_src/source/database/connecting/001.php      |  2 +-
 user_guide_src/source/database/connecting/003.php      |  2 +-
 user_guide_src/source/database/connecting/004.php      |  2 +-
 user_guide_src/source/database/connecting/005.php      |  4 ++--
 user_guide_src/source/database/connecting/006.php      |  2 +-
 user_guide_src/source/database/examples/001.php        |  2 +-
 user_guide_src/source/database/query_builder/001.php   |  2 +-
 user_guide_src/source/database/query_builder/077.php   |  2 +-
 user_guide_src/source/database/query_builder/087.php   |  2 +-
 user_guide_src/source/database/query_builder/089.php   |  2 +-
 user_guide_src/source/database/query_builder/111.php   |  2 +-
 user_guide_src/source/database/query_builder/113.php   |  2 +-
 user_guide_src/source/database/query_builder/115.php   |  2 +-
 user_guide_src/source/database/query_builder/116.php   |  2 +-
 user_guide_src/source/database/results/003.php         |  2 +-
 user_guide_src/source/database/results/007.php         |  2 +-
 user_guide_src/source/database/results/011.php         |  2 +-
 user_guide_src/source/database/results/014.php         |  2 +-
 user_guide_src/source/database/results/015.php         |  2 +-
 user_guide_src/source/database/results/016.php         |  2 +-
 user_guide_src/source/database/utilities/001.php       |  2 +-
 user_guide_src/source/database/utilities/002.php       |  2 +-
 user_guide_src/source/database/utilities/003.php       |  2 +-
 user_guide_src/source/database/utilities/004.php       |  2 +-
 user_guide_src/source/database/utilities/005.php       |  2 +-
 user_guide_src/source/database/utilities/006.php       |  2 +-
 user_guide_src/source/database/utilities/008.php       |  2 +-
 user_guide_src/source/database/utilities/009.php       |  2 +-
 user_guide_src/source/database/utilities/010.php       |  2 +-
 user_guide_src/source/dbmgmt/forge/001.php             |  2 +-
 user_guide_src/source/dbmgmt/forge/002.php             |  2 +-
 user_guide_src/source/dbmgmt/seeds/004.php             |  2 +-
 user_guide_src/source/extending/events/002.php         | 10 +++++-----
 user_guide_src/source/extending/events/003.php         |  2 +-
 user_guide_src/source/extending/events/005.php         |  2 +-
 user_guide_src/source/extending/events/006.php         |  4 ++--
 user_guide_src/source/extending/events/007.php         |  2 +-
 user_guide_src/source/extending/events/008.php         |  2 +-
 user_guide_src/source/general/configuration/001.php    |  2 +-
 user_guide_src/source/general/configuration/002.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/errors/003.php           |  2 +-
 user_guide_src/source/general/errors/004.php           |  4 ++--
 user_guide_src/source/general/errors/007.php           |  2 +-
 user_guide_src/source/general/errors/008.php           |  2 +-
 user_guide_src/source/general/errors/009.php           |  2 +-
 user_guide_src/source/general/errors/010.php           |  2 +-
 user_guide_src/source/general/errors/011.php           |  2 +-
 user_guide_src/source/general/errors/018.php           |  4 ++--
 user_guide_src/source/general/logging/006.php          |  2 +-
 user_guide_src/source/general/modules/005.php          |  2 +-
 user_guide_src/source/general/modules/008.php          |  2 +-
 user_guide_src/source/general/modules/010.php          |  2 +-
 user_guide_src/source/general/modules/011.php          |  2 +-
 .../source/helpers/filesystem_helper/005.php           |  2 +-
 .../source/incoming/content_negotiation/001.php        |  2 +-
 user_guide_src/source/incoming/incomingrequest/002.php |  2 +-
 user_guide_src/source/incoming/incomingrequest/003.php |  2 +-
 user_guide_src/source/incoming/routing/013.php         |  2 +-
 user_guide_src/source/incoming/routing/020.php         |  2 +-
 user_guide_src/source/incoming/routing/036.php         |  2 +-
 user_guide_src/source/incoming/routing/037.php         |  2 +-
 user_guide_src/source/incoming/routing/045.php         |  2 +-
 user_guide_src/source/incoming/routing/049.php         |  2 +-
 user_guide_src/source/incoming/routing/050.php         |  2 +-
 user_guide_src/source/incoming/routing/051.php         |  2 +-
 user_guide_src/source/incoming/routing/052.php         |  2 +-
 .../source/installation/upgrade_html_tables/001.php    |  2 +-
 .../source/installation/upgrade_pagination/001.php     |  2 +-
 user_guide_src/source/libraries/caching/002.php        |  2 +-
 user_guide_src/source/libraries/caching/012.php        |  2 +-
 user_guide_src/source/libraries/cookies/013.php        |  2 +-
 user_guide_src/source/libraries/curlrequest/002.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/003.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/004.php    |  8 ++++----
 user_guide_src/source/libraries/curlrequest/005.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/008.php    |  2 +-
 user_guide_src/source/libraries/curlrequest/028.php    |  2 +-
 user_guide_src/source/libraries/email/001.php          |  2 +-
 user_guide_src/source/libraries/encryption/001.php     |  2 +-
 user_guide_src/source/libraries/encryption/003.php     |  4 ++--
 user_guide_src/source/libraries/encryption/004.php     |  4 ++--
 user_guide_src/source/libraries/encryption/006.php     |  2 +-
 user_guide_src/source/libraries/encryption/009.php     |  2 +-
 user_guide_src/source/libraries/files/001.php          |  2 +-
 user_guide_src/source/libraries/files/011.php          |  2 +-
 user_guide_src/source/libraries/files/015.php          |  2 +-
 user_guide_src/source/libraries/images/001.php         |  2 +-
 user_guide_src/source/libraries/images/002.php         |  2 +-
 user_guide_src/source/libraries/images/007.php         |  4 ++--
 user_guide_src/source/libraries/images/008.php         |  4 ++--
 user_guide_src/source/libraries/images/009.php         |  2 +-
 user_guide_src/source/libraries/images/010.php         |  2 +-
 user_guide_src/source/libraries/images/011.php         |  4 ++--
 user_guide_src/source/libraries/images/012.php         |  2 +-
 user_guide_src/source/libraries/images/013.php         |  2 +-
 user_guide_src/source/libraries/images/014.php         |  2 +-
 user_guide_src/source/libraries/pagination/001.php     |  2 +-
 user_guide_src/source/libraries/pagination/003.php     |  2 +-
 user_guide_src/source/libraries/pagination/005.php     |  2 +-
 user_guide_src/source/libraries/pagination/018.php     |  2 +-
 user_guide_src/source/libraries/publisher/001.php      |  2 +-
 user_guide_src/source/libraries/publisher/002.php      |  2 +-
 user_guide_src/source/libraries/publisher/006.php      |  2 +-
 user_guide_src/source/libraries/publisher/011.php      |  2 +-
 user_guide_src/source/libraries/publisher/012.php      |  2 +-
 user_guide_src/source/libraries/security/001.php       |  2 +-
 user_guide_src/source/libraries/sessions/001.php       |  2 +-
 user_guide_src/source/libraries/throttler/001.php      |  2 +-
 user_guide_src/source/libraries/time/013.php           |  2 +-
 user_guide_src/source/libraries/time/038.php           |  2 +-
 user_guide_src/source/libraries/typography/001.php     |  2 +-
 user_guide_src/source/libraries/uploaded_files/010.php |  2 +-
 user_guide_src/source/libraries/uri/001.php            |  2 +-
 user_guide_src/source/libraries/uri/007.php            |  4 ++--
 user_guide_src/source/libraries/uri/008.php            |  2 +-
 user_guide_src/source/libraries/uri/009.php            |  2 +-
 user_guide_src/source/libraries/uri/014.php            |  2 +-
 user_guide_src/source/libraries/uri/015.php            |  2 +-
 user_guide_src/source/libraries/uri/016.php            |  2 +-
 user_guide_src/source/libraries/uri/017.php            |  2 +-
 user_guide_src/source/libraries/uri/020.php            |  2 +-
 user_guide_src/source/libraries/uri/021.php            |  2 +-
 user_guide_src/source/libraries/uri/022.php            |  2 +-
 user_guide_src/source/libraries/validation/004.php     |  2 +-
 user_guide_src/source/libraries/validation/008.php     |  4 ++--
 user_guide_src/source/libraries/validation/044.php     |  2 +-
 user_guide_src/source/models/entities/003.php          |  2 +-
 user_guide_src/source/models/entities/004.php          |  2 +-
 user_guide_src/source/models/entities/005.php          |  2 +-
 user_guide_src/source/models/entities/011.php          |  2 +-
 user_guide_src/source/models/entities/022.php          |  2 +-
 user_guide_src/source/models/model/001.php             |  4 ++--
 user_guide_src/source/outgoing/response/022.php        |  2 +-
 user_guide_src/source/outgoing/table/001.php           |  2 +-
 user_guide_src/source/outgoing/table/002.php           |  2 +-
 user_guide_src/source/outgoing/table/003.php           |  2 +-
 user_guide_src/source/outgoing/table/004.php           |  2 +-
 user_guide_src/source/outgoing/table/005.php           |  2 +-
 user_guide_src/source/outgoing/table/008.php           |  2 +-
 user_guide_src/source/outgoing/table/009.php           |  2 +-
 user_guide_src/source/outgoing/table/018.php           |  2 +-
 user_guide_src/source/outgoing/table/019.php           |  2 +-
 user_guide_src/source/outgoing/table/020.php           |  2 +-
 user_guide_src/source/outgoing/view_parser/001.php     |  2 +-
 user_guide_src/source/outgoing/view_parser/002.php     |  2 +-
 user_guide_src/source/outgoing/view_renderer/001.php   |  2 +-
 user_guide_src/source/outgoing/view_renderer/002.php   |  2 +-
 user_guide_src/source/testing/benchmark/001.php        |  2 +-
 user_guide_src/source/testing/benchmark/007.php        |  2 +-
 user_guide_src/source/testing/controllers/003.php      |  2 +-
 user_guide_src/source/testing/controllers/004.php      |  2 +-
 user_guide_src/source/testing/controllers/005.php      |  4 ++--
 user_guide_src/source/testing/controllers/006.php      | 10 +++++-----
 user_guide_src/source/testing/controllers/007.php      |  4 ++--
 user_guide_src/source/testing/controllers/008.php      |  4 ++--
 user_guide_src/source/testing/controllers/009.php      |  2 +-
 user_guide_src/source/testing/controllers/010.php      |  2 +-
 user_guide_src/source/testing/fabricator/003.php       |  4 ++--
 user_guide_src/source/testing/fabricator/004.php       |  2 +-
 user_guide_src/source/testing/fabricator/007.php       |  2 +-
 user_guide_src/source/testing/fabricator/008.php       |  2 +-
 user_guide_src/source/testing/fabricator/020.php       |  2 +-
 user_guide_src/source/testing/mocking/001.php          |  2 +-
 user_guide_src/source/testing/mocking/002.php          |  2 +-
 user_guide_src/source/testing/mocking/003.php          |  2 +-
 user_guide_src/source/testing/overview/006.php         |  2 +-
 user_guide_src/source/testing/overview/007.php         |  6 +++---
 user_guide_src/source/testing/overview/008.php         |  4 ++--
 user_guide_src/source/testing/overview/011.php         |  2 +-
 user_guide_src/source/testing/overview/012.php         |  2 +-
 user_guide_src/source/testing/overview/013.php         |  2 +-
 user_guide_src/source/testing/overview/014.php         |  2 +-
 user_guide_src/source/testing/overview/015.php         |  2 +-
 user_guide_src/source/testing/response/001.php         |  2 +-
 218 files changed, 257 insertions(+), 257 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/006.php b/user_guide_src/source/cli/cli_commands/006.php
index 52ce751cfb43..bdc252c957be 100644
--- a/user_guide_src/source/cli/cli_commands/006.php
+++ b/user_guide_src/source/cli/cli_commands/006.php
@@ -2,6 +2,6 @@
 
 try {
     // ...
-} catch (Exception $e) {
+} catch (\Exception $e) {
     $this->showError($e);
 }
diff --git a/user_guide_src/source/cli/cli_library/002.php b/user_guide_src/source/cli/cli_library/002.php
index 076bf0c4442c..a32c14af3519 100644
--- a/user_guide_src/source/cli/cli_library/002.php
+++ b/user_guide_src/source/cli/cli_library/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$color = CLI::prompt('What is your favorite color?');
+$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
index 7385fef697e3..0bb2d83f24bc 100644
--- a/user_guide_src/source/cli/cli_library/003.php
+++ b/user_guide_src/source/cli/cli_library/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$color = CLI::prompt('What is your favorite color?', 'blue');
+$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
index 7fae108cd3e7..c04aa825bb95 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/005.php b/user_guide_src/source/cli/cli_library/005.php
index 7ca14c1494cb..d3e72fff0fff 100644
--- a/user_guide_src/source/cli/cli_library/005.php
+++ b/user_guide_src/source/cli/cli_library/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$email = CLI::prompt('What is your email?', null, 'required|valid_email');
+$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
index 052a540ba758..6e3074db8a4a 100644
--- a/user_guide_src/source/cli/cli_library/006.php
+++ b/user_guide_src/source/cli/cli_library/006.php
@@ -1,3 +1,3 @@
 <?php
 
-$email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
+$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
index 0c9d257b1ecd..897980f1b3d7 100644
--- a/user_guide_src/source/cli/cli_library/007.php
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
+$fruit = \CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
 /*
  * These are your choices:
  *   [0]  The red apple
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index c1d434b77960..342fab3bf1f2 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
+$fruit = \CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
     'apple'  => 'The red apple',
     'orange' => 'The plump orange',
     'banana' => 'The ripe banana',
diff --git a/user_guide_src/source/cli/cli_library/009.php b/user_guide_src/source/cli/cli_library/009.php
index a5bc3f49ac65..5e18cb53bab6 100644
--- a/user_guide_src/source/cli/cli_library/009.php
+++ b/user_guide_src/source/cli/cli_library/009.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::write('The rain in Spain falls mainly on the plains.');
+\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
index 63b709c06a1f..1526bb8603c2 100644
--- a/user_guide_src/source/cli/cli_library/010.php
+++ b/user_guide_src/source/cli/cli_library/010.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::write('File created.', 'green');
+\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
index e2366162bcab..1e21fac1667f 100644
--- a/user_guide_src/source/cli/cli_library/011.php
+++ b/user_guide_src/source/cli/cli_library/011.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::write('File overwritten.', 'light_red', 'dark_gray');
+\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
index 106bc6d8bfa7..432dc2761ef4 100644
--- a/user_guide_src/source/cli/cli_library/012.php
+++ b/user_guide_src/source/cli/cli_library/012.php
@@ -1,5 +1,5 @@
 <?php
 
 for ($i = 0; $i <= 10; $i++) {
-    CLI::print($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
index 64c5ad14f457..9af80c2724f9 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/014.php b/user_guide_src/source/cli/cli_library/014.php
index 4ceea8dc098a..c0c7ebe063ed 100644
--- a/user_guide_src/source/cli/cli_library/014.php
+++ b/user_guide_src/source/cli/cli_library/014.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::error('Cannot write to file: ' . $file);
+\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
index 6eaf10f9c1e0..02dcbe452fc6 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::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
index f929d6b0d1d1..df8920408437 100644
--- a/user_guide_src/source/cli/cli_library/016.php
+++ b/user_guide_src/source/cli/cli_library/016.php
@@ -1,4 +1,4 @@
 <?php
 
 // Wrap the text at max 20 characters wide
-CLI::wrap($description, 20);
+\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
index 83b373487f3f..a42385d78f0c 100644
--- a/user_guide_src/source/cli/cli_library/017.php
+++ b/user_guide_src/source/cli/cli_library/017.php
@@ -14,7 +14,7 @@
 $maxlen = max(array_map('strlen', $titles));
 
 for ($i = 0; $i < count($titles); $i++) {
-    CLI::write(
+    \CLI::write(
         // Display the title on the left of the row
         substr(
             $titles[$i] . str_repeat(' ', $maxlen + 3),
@@ -24,6 +24,6 @@
         // 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)
+        \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
index 88ebf6cf7609..38fb2014715f 100644
--- a/user_guide_src/source/cli/cli_library/018.php
+++ b/user_guide_src/source/cli/cli_library/018.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::newLine();
+\CLI::newLine();
diff --git a/user_guide_src/source/cli/cli_library/019.php b/user_guide_src/source/cli/cli_library/019.php
index e08c79664ce3..da3f376820da 100644
--- a/user_guide_src/source/cli/cli_library/019.php
+++ b/user_guide_src/source/cli/cli_library/019.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::clearScreen();
+\CLI::clearScreen();
diff --git a/user_guide_src/source/cli/cli_library/020.php b/user_guide_src/source/cli/cli_library/020.php
index 61b5fd37cfed..be6759fd2792 100644
--- a/user_guide_src/source/cli/cli_library/020.php
+++ b/user_guide_src/source/cli/cli_library/020.php
@@ -4,9 +4,9 @@
 $currStep   = 1;
 
 foreach ($tasks as $task) {
-    CLI::showProgress($currStep++, $totalSteps);
+    \CLI::showProgress($currStep++, $totalSteps);
     $task->run();
 }
 
 // Done, so erase it...
-CLI::showProgress(false);
+\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
index 899d7eaecb8c..e16a43be6f22 100644
--- a/user_guide_src/source/cli/cli_library/021.php
+++ b/user_guide_src/source/cli/cli_library/021.php
@@ -6,4 +6,4 @@
     [8, 'Another great item title', '2017-11-16 13:46:54', 0],
 ];
 
-CLI::table($tbody, $thead);
+\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
index dcd1a2ef3d44..75b3571733a8 100644
--- a/user_guide_src/source/cli/cli_library/022.php
+++ b/user_guide_src/source/cli/cli_library/022.php
@@ -1,10 +1,10 @@
 <?php
 
 // wait for specified interval, with countdown displayed
-CLI::wait($seconds, true);
+\CLI::wait($seconds, true);
 
 // show continuation message and wait for input
-CLI::wait(0, false);
+\CLI::wait(0, false);
 
 // wait for specified interval
-CLI::wait($seconds, false);
+\CLI::wait($seconds, false);
diff --git a/user_guide_src/source/cli/cli_library/023.php b/user_guide_src/source/cli/cli_library/023.php
index da8b8891c0e8..a2edcccae398 100644
--- a/user_guide_src/source/cli/cli_library/023.php
+++ b/user_guide_src/source/cli/cli_library/023.php
@@ -1,6 +1,6 @@
 <?php
 
-$hobbies = CLI::promptByMultipleKeys('Select your hobbies:', ['Playing game', 'Sleep', 'Badminton']);
+$hobbies = \CLI::promptByMultipleKeys('Select your hobbies:', ['Playing game', 'Sleep', 'Badminton']);
 /*
  * Select your hobbies:
  *   [0]  Playing game
diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php
index 0f19a4c0730b..3420edfa3ee8 100644
--- a/user_guide_src/source/concepts/factories/002.php
+++ b/user_guide_src/source/concepts/factories/002.php
@@ -1,5 +1,5 @@
 <?php
 
-$users = Factories::models('Blog\Models\UserModel');
+$users = \Factories::models('Blog\Models\UserModel');
 // Or
-$users = Factories::models(Blog\Models\UserModel::class);
+$users = \Factories::models(\Blog\Models\UserModel::class);
diff --git a/user_guide_src/source/concepts/factories/004.php b/user_guide_src/source/concepts/factories/004.php
index dc7dda75f61a..5f297508e007 100644
--- a/user_guide_src/source/concepts/factories/004.php
+++ b/user_guide_src/source/concepts/factories/004.php
@@ -1,4 +1,4 @@
 <?php
 
 $conn  = db_connect('auth');
-$users = Factories::models('UserModel', [], $conn);
+$users = \Factories::models('UserModel', [], $conn);
diff --git a/user_guide_src/source/concepts/factories/006.php b/user_guide_src/source/concepts/factories/006.php
index 98c1c70888ac..3b3034da9a54 100644
--- a/user_guide_src/source/concepts/factories/006.php
+++ b/user_guide_src/source/concepts/factories/006.php
@@ -1,6 +1,6 @@
 <?php
 
-Factories::setOptions('filters', [
-    'instanceOf' => FilterInterface::class,
+\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
index 2a7def236420..3228272e8a41 100644
--- a/user_guide_src/source/concepts/factories/007.php
+++ b/user_guide_src/source/concepts/factories/007.php
@@ -1,4 +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
+$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/factories/008.php b/user_guide_src/source/concepts/factories/008.php
index 2bc7df9e8aa5..866daa36acb2 100644
--- a/user_guide_src/source/concepts/factories/008.php
+++ b/user_guide_src/source/concepts/factories/008.php
@@ -3,4 +3,4 @@
 $appConfig = config('App');
 
 // The code above is the same as the code below.
-$appConfig = CodeIgniter\Config\Factories::config('App');
+$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
index 3c9610ef4a0f..7ca5f31baada 100644
--- a/user_guide_src/source/concepts/factories/009.php
+++ b/user_guide_src/source/concepts/factories/009.php
@@ -3,4 +3,4 @@
 $user = model('UserModel');
 
 // The code above is the same as the code below.
-$user = CodeIgniter\Config\Factories::models('UserModel');
+$user = \CodeIgniter\Config\Factories::models('UserModel');
diff --git a/user_guide_src/source/concepts/factories/010.php b/user_guide_src/source/concepts/factories/010.php
index 90f5f26ef524..f43c1ac85ad9 100644
--- a/user_guide_src/source/concepts/factories/010.php
+++ b/user_guide_src/source/concepts/factories/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$users = Factories::models('Blog\Models\UserModel', ['preferApp' => false]);
+$users = \Factories::models('Blog\Models\UserModel', ['preferApp' => false]);
diff --git a/user_guide_src/source/concepts/factories/013.php b/user_guide_src/source/concepts/factories/013.php
index ce10c9280939..5a65be63bba3 100644
--- a/user_guide_src/source/concepts/factories/013.php
+++ b/user_guide_src/source/concepts/factories/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$lib = Factories::libraries('Sub/SubLib');
+$lib = \Factories::libraries('Sub/SubLib');
diff --git a/user_guide_src/source/concepts/factories/014.php b/user_guide_src/source/concepts/factories/014.php
index 992b0f7b2236..449ee01861d9 100644
--- a/user_guide_src/source/concepts/factories/014.php
+++ b/user_guide_src/source/concepts/factories/014.php
@@ -1,3 +1,3 @@
 <?php
 
-Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel');
+\Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel');
diff --git a/user_guide_src/source/concepts/services/001.php b/user_guide_src/source/concepts/services/001.php
index 261bc090ae33..1ef57b345f26 100644
--- a/user_guide_src/source/concepts/services/001.php
+++ b/user_guide_src/source/concepts/services/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$timer = new CodeIgniter\Debug\Timer();
+$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
index 28ebb27f6ad1..cb292ecaeb42 100644
--- a/user_guide_src/source/concepts/services/002.php
+++ b/user_guide_src/source/concepts/services/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$timer = Config\Services::timer();
+$timer = \Config\Services::timer();
diff --git a/user_guide_src/source/concepts/services/003.php b/user_guide_src/source/concepts/services/003.php
index ae7bc71eafa1..a13e8ebf1696 100644
--- a/user_guide_src/source/concepts/services/003.php
+++ b/user_guide_src/source/concepts/services/003.php
@@ -3,4 +3,4 @@
 $logger = service('logger');
 
 // The code above is the same as the code below.
-$logger = Config\Services::logger();
+$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 6c6f73f0907f..04f7670a0d2c 100644
--- a/user_guide_src/source/concepts/services/004.php
+++ b/user_guide_src/source/concepts/services/004.php
@@ -3,4 +3,4 @@
 $renderer = service('renderer', APPPATH . 'views/');
 
 // The code above is the same as the code below.
-$renderer = Config\Services::renderer(APPPATH . 'views/');
+$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 6e7e192a6055..827a8a6c0707 100644
--- a/user_guide_src/source/concepts/services/005.php
+++ b/user_guide_src/source/concepts/services/005.php
@@ -3,4 +3,4 @@
 $logger = single_service('logger');
 
 // The code above is the same as the code below.
-$logger = Config\Services::logger(false);
+$logger = \Config\Services::logger(false);
diff --git a/user_guide_src/source/concepts/services/009.php b/user_guide_src/source/concepts/services/009.php
index d61357b46678..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/');
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();
diff --git a/user_guide_src/source/concepts/services/013.php b/user_guide_src/source/concepts/services/013.php
index 85e23bcadf2a..0c82ed0e95fa 100644
--- a/user_guide_src/source/concepts/services/013.php
+++ b/user_guide_src/source/concepts/services/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = Config\Services::typography();
+$typography = \Config\Services::typography();
diff --git a/user_guide_src/source/concepts/services/014.php b/user_guide_src/source/concepts/services/014.php
index 50a2a8057f8e..ce012f44a65b 100644
--- a/user_guide_src/source/concepts/services/014.php
+++ b/user_guide_src/source/concepts/services/014.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = Config\Services::typography(false);
+$typography = \Config\Services::typography(false);
diff --git a/user_guide_src/source/concepts/services/015.php b/user_guide_src/source/concepts/services/015.php
index 97f7c6edf6e3..efaf1be9f00d 100644
--- a/user_guide_src/source/concepts/services/015.php
+++ b/user_guide_src/source/concepts/services/015.php
@@ -4,12 +4,12 @@
     'baseURI' => 'http://example.com/api/v1/',
     'timeout' => 3,
 ];
-$client1 = Config\Services::curlrequest($options1);
+$client1 = \Config\Services::curlrequest($options1);
 
 $options2 = [
     'baseURI' => 'http://another.example.com/api/v2/',
     'timeout' => 10,
 ];
-$client2 = Config\Services::curlrequest($options2);
+$client2 = \Config\Services::curlrequest($options2);
 // $options2 does not work.
 // $client2 is the exactly same instance as $client1.
diff --git a/user_guide_src/source/database/connecting/001.php b/user_guide_src/source/database/connecting/001.php
index 6a688ae3ca7f..74e502c387ea 100644
--- a/user_guide_src/source/database/connecting/001.php
+++ b/user_guide_src/source/database/connecting/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = Config\Database::connect();
+$db = \Config\Database::connect();
diff --git a/user_guide_src/source/database/connecting/003.php b/user_guide_src/source/database/connecting/003.php
index a63d4b75ff6a..498c5cff34aa 100644
--- a/user_guide_src/source/database/connecting/003.php
+++ b/user_guide_src/source/database/connecting/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = Config\Database::connect('group_name');
+$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
index b7da76a86ab3..21e887e2b627 100644
--- a/user_guide_src/source/database/connecting/004.php
+++ b/user_guide_src/source/database/connecting/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = Config\Database::connect('group_name', false);
+$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
index 46f7e4815ea8..a40deceecadd 100644
--- a/user_guide_src/source/database/connecting/005.php
+++ b/user_guide_src/source/database/connecting/005.php
@@ -1,4 +1,4 @@
 <?php
 
-$db1 = Config\Database::connect('group_one');
-$db2 = Config\Database::connect('group_two');
+$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
index 3c5266173134..55e8010730d2 100644
--- a/user_guide_src/source/database/connecting/006.php
+++ b/user_guide_src/source/database/connecting/006.php
@@ -19,4 +19,4 @@
     'failover' => [],
     'port'     => 3306,
 ];
-$db = Config\Database::connect($custom);
+$db = \Config\Database::connect($custom);
diff --git a/user_guide_src/source/database/examples/001.php b/user_guide_src/source/database/examples/001.php
index 6a688ae3ca7f..74e502c387ea 100644
--- a/user_guide_src/source/database/examples/001.php
+++ b/user_guide_src/source/database/examples/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$db = Config\Database::connect();
+$db = \Config\Database::connect();
diff --git a/user_guide_src/source/database/query_builder/001.php b/user_guide_src/source/database/query_builder/001.php
index f776d7d4189d..eea94ebba32b 100644
--- a/user_guide_src/source/database/query_builder/001.php
+++ b/user_guide_src/source/database/query_builder/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$db      = Config\Database::connect();
+$db      = \Config\Database::connect();
 $builder = $db->table('users');
diff --git a/user_guide_src/source/database/query_builder/077.php b/user_guide_src/source/database/query_builder/077.php
index ba38d99ff43b..e35bacf9564e 100644
--- a/user_guide_src/source/database/query_builder/077.php
+++ b/user_guide_src/source/database/query_builder/077.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/087.php b/user_guide_src/source/database/query_builder/087.php
index d395bc3b8ea9..16280213efb4 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.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/089.php b/user_guide_src/source/database/query_builder/089.php
index 445e53716041..2709d96502c6 100644
--- a/user_guide_src/source/database/query_builder/089.php
+++ b/user_guide_src/source/database/query_builder/089.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/111.php b/user_guide_src/source/database/query_builder/111.php
index e02a3d1769c3..d4d14a803d8f 100644
--- a/user_guide_src/source/database/query_builder/111.php
+++ b/user_guide_src/source/database/query_builder/111.php
@@ -15,7 +15,7 @@
     ],
 ];
 
-$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->setData($data)->updateFields($additionalUpdateField, true)->upsertBatch();
 /* MySQLi produces:
diff --git a/user_guide_src/source/database/query_builder/113.php b/user_guide_src/source/database/query_builder/113.php
index 862839b5c1b2..0bb85d93e006 100644
--- a/user_guide_src/source/database/query_builder/113.php
+++ b/user_guide_src/source/database/query_builder/113.php
@@ -7,5 +7,5 @@ class Myclass
     public $country = 'Iran';
 }
 
-$object = new Myclass();
+$object = new \Myclass();
 $builder->upsert($object);
diff --git a/user_guide_src/source/database/query_builder/115.php b/user_guide_src/source/database/query_builder/115.php
index 7526474da334..640c5cb29bdc 100644
--- a/user_guide_src/source/database/query_builder/115.php
+++ b/user_guide_src/source/database/query_builder/115.php
@@ -5,7 +5,7 @@
     ->join('user', 'user.email = user2.email', 'left')
     ->where('user.email IS NULL');
 
-$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->setQueryAsData($query)
     ->onConstraint('email')
diff --git a/user_guide_src/source/database/query_builder/116.php b/user_guide_src/source/database/query_builder/116.php
index 416fe9c935da..8f2b066276b4 100644
--- a/user_guide_src/source/database/query_builder/116.php
+++ b/user_guide_src/source/database/query_builder/116.php
@@ -5,7 +5,7 @@
     ->join('user', 'user.email = user2.email', 'inner')
     ->where('user2.country', 'US');
 
-$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->table('user')
     ->setQueryAsData($query, null, 'u')
diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
index e4c097b77ab7..d3fc78cc8d77 100644
--- a/user_guide_src/source/database/results/003.php
+++ b/user_guide_src/source/database/results/003.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('SELECT * FROM users;');
 
-foreach ($query->getResult(App\Entities\User::class) as $user) {
+foreach ($query->getResult(\App\Entities\User::class) as $user) {
     echo $user->name;          // access attributes
     echo $user->reverseName(); // or methods defined on the 'User' class
 }
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 7d4f4eb1fe59..ed1550836aab 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, App\Entities\User::class);
+$row   = $query->getRow(0, \App\Entities\User::class);
 
 echo $row->name;           // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/011.php b/user_guide_src/source/database/results/011.php
index 0da187cac408..b33681cd74b4 100644
--- a/user_guide_src/source/database/results/011.php
+++ b/user_guide_src/source/database/results/011.php
@@ -4,7 +4,7 @@
 
 $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');
 
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index 4fb111880082..1ee5af841a25 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$rows = $query->getCustomResultObject(App\Entities\User::class);
+$rows = $query->getCustomResultObject(\App\Entities\User::class);
 
 foreach ($rows as $row) {
     echo $row->id;
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index 595e4f1cb521..7cc9b7996e3b 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -2,7 +2,7 @@
 
 $query = $db->query('YOUR QUERY');
 
-$row = $query->getCustomRowObject(0, App\Entities\User::class);
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);
 
 if (isset($row)) {
     echo $row->email;              // access attributes
diff --git a/user_guide_src/source/database/results/016.php b/user_guide_src/source/database/results/016.php
index 0dff3d004f23..f6d0e2325ce6 100644
--- a/user_guide_src/source/database/results/016.php
+++ b/user_guide_src/source/database/results/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$row = $query->getCustomRowObject(0, App\Entities\User::class);
+$row = $query->getCustomRowObject(0, \App\Entities\User::class);
diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index cdc581fe4487..131222efc86b 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/002.php b/user_guide_src/source/database/utilities/002.php
index 39d0bba6fc67..42bbbd63acc6 100644
--- a/user_guide_src/source/database/utilities/002.php
+++ b/user_guide_src/source/database/utilities/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
diff --git a/user_guide_src/source/database/utilities/003.php b/user_guide_src/source/database/utilities/003.php
index edee56c9d0c7..5c6527dc543a 100644
--- a/user_guide_src/source/database/utilities/003.php
+++ b/user_guide_src/source/database/utilities/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$dbutil = Config\Database::utils('group_name');
+$dbutil = \Config\Database::utils('group_name');
diff --git a/user_guide_src/source/database/utilities/004.php b/user_guide_src/source/database/utilities/004.php
index 2786d5ca22e3..3908bb7ad76c 100644
--- a/user_guide_src/source/database/utilities/004.php
+++ b/user_guide_src/source/database/utilities/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 $dbs = $dbutil->listDatabases();
 
diff --git a/user_guide_src/source/database/utilities/005.php b/user_guide_src/source/database/utilities/005.php
index 38c4bd75e41f..92ddaa3487ce 100644
--- a/user_guide_src/source/database/utilities/005.php
+++ b/user_guide_src/source/database/utilities/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 if ($dbutil->databaseExists('database_name')) {
     // some code...
diff --git a/user_guide_src/source/database/utilities/006.php b/user_guide_src/source/database/utilities/006.php
index 7fdaeca76e7c..e85a07933798 100644
--- a/user_guide_src/source/database/utilities/006.php
+++ b/user_guide_src/source/database/utilities/006.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 if ($dbutil->optimizeTable('table_name')) {
     echo 'Success!';
diff --git a/user_guide_src/source/database/utilities/008.php b/user_guide_src/source/database/utilities/008.php
index c5404bb5923d..726b15a822dd 100644
--- a/user_guide_src/source/database/utilities/008.php
+++ b/user_guide_src/source/database/utilities/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 $result = $dbutil->optimizeDatabase();
 
diff --git a/user_guide_src/source/database/utilities/009.php b/user_guide_src/source/database/utilities/009.php
index 4adca9a55743..f8bf84f6a499 100644
--- a/user_guide_src/source/database/utilities/009.php
+++ b/user_guide_src/source/database/utilities/009.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/database/utilities/010.php b/user_guide_src/source/database/utilities/010.php
index a557dbd443e2..7e11cc18019b 100644
--- a/user_guide_src/source/database/utilities/010.php
+++ b/user_guide_src/source/database/utilities/010.php
@@ -1,7 +1,7 @@
 <?php
 
 $db     = db_connect();
-$dbutil = Config\Database::utils();
+$dbutil = \Config\Database::utils();
 
 $query = $db->query('SELECT * FROM mytable');
 
diff --git a/user_guide_src/source/dbmgmt/forge/001.php b/user_guide_src/source/dbmgmt/forge/001.php
index 7768b19d8314..e1891c1b162e 100644
--- a/user_guide_src/source/dbmgmt/forge/001.php
+++ b/user_guide_src/source/dbmgmt/forge/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$forge = Config\Database::forge();
+$forge = \Config\Database::forge();
diff --git a/user_guide_src/source/dbmgmt/forge/002.php b/user_guide_src/source/dbmgmt/forge/002.php
index addcb4ee163b..c6e8694acf7a 100644
--- a/user_guide_src/source/dbmgmt/forge/002.php
+++ b/user_guide_src/source/dbmgmt/forge/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$this->myforge = Config\Database::forge('other_db');
+$this->myforge = \Config\Database::forge('other_db');
diff --git a/user_guide_src/source/dbmgmt/seeds/004.php b/user_guide_src/source/dbmgmt/seeds/004.php
index 89dafe836a52..be137c21d0d6 100644
--- a/user_guide_src/source/dbmgmt/seeds/004.php
+++ b/user_guide_src/source/dbmgmt/seeds/004.php
@@ -1,4 +1,4 @@
 <?php
 
-$seeder = Config\Database::seeder();
+$seeder = \Config\Database::seeder();
 $seeder->call('TestSeeder');
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index ca9bf0074209..cae63a4c0971 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -1,16 +1,16 @@
 <?php
 
 // Call a standalone function
-Events::on('pre_system', 'some_function');
+\Events::on('pre_system', 'some_function');
 
 // Call on an instance method
-$user = new User();
-Events::on('pre_system', [$user, 'someMethod']);
+$user = new \User();
+\Events::on('pre_system', [$user, 'someMethod']);
 
 // Call on a static method
-Events::on('pre_system', 'SomeClass::someMethod');
+\Events::on('pre_system', 'SomeClass::someMethod');
 
 // Use a Closure
-Events::on('pre_system', static function (...$params) {
+\Events::on('pre_system', static function (...$params) {
     // ...
 });
diff --git a/user_guide_src/source/extending/events/003.php b/user_guide_src/source/extending/events/003.php
index 39638696f5ff..bc747b528e5d 100644
--- a/user_guide_src/source/extending/events/003.php
+++ b/user_guide_src/source/extending/events/003.php
@@ -1,3 +1,3 @@
 <?php
 
-Events::on('post_controller_constructor', 'some_function', 25);
+\Events::on('post_controller_constructor', 'some_function', 25);
diff --git a/user_guide_src/source/extending/events/005.php b/user_guide_src/source/extending/events/005.php
index 7e8ad501f986..3bd11f846ade 100644
--- a/user_guide_src/source/extending/events/005.php
+++ b/user_guide_src/source/extending/events/005.php
@@ -1,3 +1,3 @@
 <?php
 
-CodeIgniter\Events\Events::trigger('some_event');
+\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
index b03f1fde0dcc..82f4d8fefa31 100644
--- a/user_guide_src/source/extending/events/006.php
+++ b/user_guide_src/source/extending/events/006.php
@@ -1,7 +1,7 @@
 <?php
 
-CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
-Events::on('some_event', static function ($foo, $bar, $baz) {
+\Events::on('some_event', static function ($foo, $bar, $baz) {
     // ...
 });
diff --git a/user_guide_src/source/extending/events/007.php b/user_guide_src/source/extending/events/007.php
index b6539f2fff55..84fb1d7281b3 100644
--- a/user_guide_src/source/extending/events/007.php
+++ b/user_guide_src/source/extending/events/007.php
@@ -1,3 +1,3 @@
 <?php
 
-Events::simulate(true);
+\Events::simulate(true);
diff --git a/user_guide_src/source/extending/events/008.php b/user_guide_src/source/extending/events/008.php
index 99e21a64a4c3..483972fe68df 100644
--- a/user_guide_src/source/extending/events/008.php
+++ b/user_guide_src/source/extending/events/008.php
@@ -1,3 +1,3 @@
 <?php
 
-Events::simulate(false);
+\Events::simulate(false);
diff --git a/user_guide_src/source/general/configuration/001.php b/user_guide_src/source/general/configuration/001.php
index 01aed04ba7fc..574881308e60 100644
--- a/user_guide_src/source/general/configuration/001.php
+++ b/user_guide_src/source/general/configuration/001.php
@@ -1,4 +1,4 @@
 <?php
 
 // Creating new configuration object by hand
-$config = new Config\Pager();
+$config = new \Config\Pager();
diff --git a/user_guide_src/source/general/configuration/002.php b/user_guide_src/source/general/configuration/002.php
index 6c48548a84fb..7b3a531ac4c7 100644
--- a/user_guide_src/source/general/configuration/002.php
+++ b/user_guide_src/source/general/configuration/002.php
@@ -5,7 +5,7 @@
 
 // Access config class with namespace
 $config = config('Config\\Pager');
-$config = config(Config\Pager::class);
+$config = config(\Config\Pager::class);
 
 // Creating a new object with config function
 $config = config('Pager', false);
diff --git a/user_guide_src/source/general/errors/001.php b/user_guide_src/source/general/errors/001.php
index eb8ed6ae575a..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 016ab20522c7..4e04619be5bb 100644
--- a/user_guide_src/source/general/errors/002.php
+++ b/user_guide_src/source/general/errors/002.php
@@ -2,6 +2,6 @@
 
 try {
     $user = $userModel->find($id);
-} catch (Exception $e) {
+} catch (\Exception $e) {
     exit($e->getMessage());
 }
diff --git a/user_guide_src/source/general/errors/003.php b/user_guide_src/source/general/errors/003.php
index b802a55ab3fb..2d230d34f29a 100644
--- a/user_guide_src/source/general/errors/003.php
+++ b/user_guide_src/source/general/errors/003.php
@@ -2,6 +2,6 @@
 
 try {
     $user = $userModel->find($id);
-} catch (CodeIgniter\UnknownFileException $e) {
+} 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 c985ebe8239d..752b23bdba30 100644
--- a/user_guide_src/source/general/errors/004.php
+++ b/user_guide_src/source/general/errors/004.php
@@ -2,8 +2,8 @@
 
 try {
     $user = $userModel->find($id);
-} catch (CodeIgniter\UnknownFileException $e) {
+} catch (\CodeIgniter\UnknownFileException $e) {
     // do something here...
 
-    throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
+    throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
 }
diff --git a/user_guide_src/source/general/errors/007.php b/user_guide_src/source/general/errors/007.php
index 47086b3bfa57..a06e5000737a 100644
--- a/user_guide_src/source/general/errors/007.php
+++ b/user_guide_src/source/general/errors/007.php
@@ -1,5 +1,5 @@
 <?php
 
 if (! $page = $pageModel->find($id)) {
-    throw CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+    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
index bb2eaf719969..5e39b61fdcd6 100644
--- a/user_guide_src/source/general/errors/008.php
+++ b/user_guide_src/source/general/errors/008.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new CodeIgniter\Exceptions\ConfigException();
+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
index b0a2361b81ff..98b72a493f38 100644
--- a/user_guide_src/source/general/errors/009.php
+++ b/user_guide_src/source/general/errors/009.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new CodeIgniter\Database\Exceptions\DatabaseException();
+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
index 363e12d6a409..dbe3736a49e9 100644
--- a/user_guide_src/source/general/errors/010.php
+++ b/user_guide_src/source/general/errors/010.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new CodeIgniter\HTTP\Exceptions\RedirectException($uri);
+throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri);
diff --git a/user_guide_src/source/general/errors/011.php b/user_guide_src/source/general/errors/011.php
index 1280d8169f68..f5c8cf4b57ff 100644
--- a/user_guide_src/source/general/errors/011.php
+++ b/user_guide_src/source/general/errors/011.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new CodeIgniter\HTTP\Exceptions\RedirectException($uri, 301);
+throw new \CodeIgniter\HTTP\Exceptions\RedirectException($uri, 301);
diff --git a/user_guide_src/source/general/errors/018.php b/user_guide_src/source/general/errors/018.php
index bd4b16b631f6..3cba09951d8b 100644
--- a/user_guide_src/source/general/errors/018.php
+++ b/user_guide_src/source/general/errors/018.php
@@ -1,8 +1,8 @@
 <?php
 
-$response = Config\Services::response()
+$response = \Config\Services::response()
     ->redirect('https://example.com/path')
     ->setHeader('Some', 'header')
     ->setCookie('and', 'cookie');
 
-throw new CodeIgniter\HTTP\Exceptions\RedirectException($response);
+throw new \CodeIgniter\HTTP\Exceptions\RedirectException($response);
diff --git a/user_guide_src/source/general/logging/006.php b/user_guide_src/source/general/logging/006.php
index 0c9f98f6b3ba..7186f9761f6e 100644
--- a/user_guide_src/source/general/logging/006.php
+++ b/user_guide_src/source/general/logging/006.php
@@ -2,6 +2,6 @@
 
 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/005.php b/user_guide_src/source/general/modules/005.php
index ff0ae7b9ead4..3488279b32ea 100644
--- a/user_guide_src/source/general/modules/005.php
+++ b/user_guide_src/source/general/modules/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$filters->aliases['menus'] = MenusFilter::class;
+$filters->aliases['menus'] = \MenusFilter::class;
diff --git a/user_guide_src/source/general/modules/008.php b/user_guide_src/source/general/modules/008.php
index 66c16ea2d7f9..b502d164c5cb 100644
--- a/user_guide_src/source/general/modules/008.php
+++ b/user_guide_src/source/general/modules/008.php
@@ -1,3 +1,3 @@
 <?php
 
-$config = new Acme\Blog\Config\Blog();
+$config = new \Acme\Blog\Config\Blog();
diff --git a/user_guide_src/source/general/modules/010.php b/user_guide_src/source/general/modules/010.php
index 3039a9cd1637..1065ff9328f9 100644
--- a/user_guide_src/source/general/modules/010.php
+++ b/user_guide_src/source/general/modules/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$lib = new Acme\Blog\Libraries\BlogLib();
+$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
index a4f83d7f38fa..2619f95e6599 100644
--- a/user_guide_src/source/general/modules/011.php
+++ b/user_guide_src/source/general/modules/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$model = new Acme\Blog\Models\PostModel();
+$model = new \Acme\Blog\Models\PostModel();
diff --git a/user_guide_src/source/helpers/filesystem_helper/005.php b/user_guide_src/source/helpers/filesystem_helper/005.php
index f1b155034deb..4a8a3bf2c2da 100644
--- a/user_guide_src/source/helpers/filesystem_helper/005.php
+++ b/user_guide_src/source/helpers/filesystem_helper/005.php
@@ -2,6 +2,6 @@
 
 try {
     directory_mirror($uploadedImages, FCPATH . 'images/');
-} catch (Throwable $e) {
+} catch (\Throwable $e) {
     echo 'Failed to export uploads!';
 }
diff --git a/user_guide_src/source/incoming/content_negotiation/001.php b/user_guide_src/source/incoming/content_negotiation/001.php
index a5eda5fe0996..3c55e788eff9 100644
--- a/user_guide_src/source/incoming/content_negotiation/001.php
+++ b/user_guide_src/source/incoming/content_negotiation/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$negotiate = Config\Services::negotiator();
+$negotiate = \Config\Services::negotiator();
diff --git a/user_guide_src/source/incoming/incomingrequest/002.php b/user_guide_src/source/incoming/incomingrequest/002.php
index 620fa2287dc3..94d680abbdc3 100644
--- a/user_guide_src/source/incoming/incomingrequest/002.php
+++ b/user_guide_src/source/incoming/incomingrequest/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$request = Config\Services::request();
+$request = \Config\Services::request();
diff --git a/user_guide_src/source/incoming/incomingrequest/003.php b/user_guide_src/source/incoming/incomingrequest/003.php
index f8e153ff0178..80cee777236a 100644
--- a/user_guide_src/source/incoming/incomingrequest/003.php
+++ b/user_guide_src/source/incoming/incomingrequest/003.php
@@ -12,4 +12,4 @@ public function __construct(RequestInterface $request)
     }
 }
 
-$someClass = new SomeClass(Config\Services::request());
+$someClass = new \SomeClass(\Config\Services::request());
diff --git a/user_guide_src/source/incoming/routing/013.php b/user_guide_src/source/incoming/routing/013.php
index 5cb8a9b63a35..b562d01ba3b2 100644
--- a/user_guide_src/source/incoming/routing/013.php
+++ b/user_guide_src/source/incoming/routing/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('/', [App\Controllers\Home::class, 'index']);
+$routes->get('/', [\App\Controllers\Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
index e4fc5bde4a68..c25debb132e1 100644
--- a/user_guide_src/source/incoming/routing/020.php
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -1,7 +1,7 @@
 <?php
 
 $routes->get('feed', static function () {
-    $rss = new RSSFeeder();
+    $rss = new \RSSFeeder();
 
     return $rss->feed('general');
 });
diff --git a/user_guide_src/source/incoming/routing/036.php b/user_guide_src/source/incoming/routing/036.php
index 511c10766c4c..dd6cd63ba61d 100644
--- a/user_guide_src/source/incoming/routing/036.php
+++ b/user_guide_src/source/incoming/routing/036.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/037.php b/user_guide_src/source/incoming/routing/037.php
index 5838cde5ded0..94ae43246897 100644
--- a/user_guide_src/source/incoming/routing/037.php
+++ b/user_guide_src/source/incoming/routing/037.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/045.php b/user_guide_src/source/incoming/routing/045.php
index 8c4c5e9616ee..8e78434a96c3 100644
--- a/user_guide_src/source/incoming/routing/045.php
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -1,7 +1,7 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends BaseRouting
+class Routing extends \BaseRouting
 {
     // ...
     public string $defaultNamespace = '';
diff --git a/user_guide_src/source/incoming/routing/049.php b/user_guide_src/source/incoming/routing/049.php
index ea10d4e5b0fe..41862c50c401 100644
--- a/user_guide_src/source/incoming/routing/049.php
+++ b/user_guide_src/source/incoming/routing/049.php
@@ -1,7 +1,7 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends BaseRouting
+class Routing extends \BaseRouting
 {
     // ...
     public bool $translateURIDashes = true;
diff --git a/user_guide_src/source/incoming/routing/050.php b/user_guide_src/source/incoming/routing/050.php
index 155ac633568e..ea30ce45c0d3 100644
--- a/user_guide_src/source/incoming/routing/050.php
+++ b/user_guide_src/source/incoming/routing/050.php
@@ -1,7 +1,7 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends BaseRouting
+class Routing extends \BaseRouting
 {
     // ...
     public bool $autoRoute = false;
diff --git a/user_guide_src/source/incoming/routing/051.php b/user_guide_src/source/incoming/routing/051.php
index c84acce93d4b..72cbf8fed9b6 100644
--- a/user_guide_src/source/incoming/routing/051.php
+++ b/user_guide_src/source/incoming/routing/051.php
@@ -1,7 +1,7 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends BaseRouting
+class Routing extends \BaseRouting
 {
     // ...
     public $override404 = 'App\Errors::show404';
diff --git a/user_guide_src/source/incoming/routing/052.php b/user_guide_src/source/incoming/routing/052.php
index d9fb5998c21d..d4cf6667ab3e 100644
--- a/user_guide_src/source/incoming/routing/052.php
+++ b/user_guide_src/source/incoming/routing/052.php
@@ -1,7 +1,7 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends BaseRouting
+class Routing extends \BaseRouting
 {
     // ...
     public bool $prioritize = true;
diff --git a/user_guide_src/source/installation/upgrade_html_tables/001.php b/user_guide_src/source/installation/upgrade_html_tables/001.php
index 385894b1b568..0d0679305409 100644
--- a/user_guide_src/source/installation/upgrade_html_tables/001.php
+++ b/user_guide_src/source/installation/upgrade_html_tables/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 
diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/001.php
index fa7f359aed6b..62710360fca9 100644
--- a/user_guide_src/source/installation/upgrade_pagination/001.php
+++ b/user_guide_src/source/installation/upgrade_pagination/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$model = new App\Models\UserModel();
+$model = new \App\Models\UserModel();
 
 $data = [
     'users' => $model->paginate(10),
diff --git a/user_guide_src/source/libraries/caching/002.php b/user_guide_src/source/libraries/caching/002.php
index 0aced52172b0..ed453264b505 100644
--- a/user_guide_src/source/libraries/caching/002.php
+++ b/user_guide_src/source/libraries/caching/002.php
@@ -1,5 +1,5 @@
 <?php
 
-$cache = Config\Services::cache();
+$cache = \Config\Services::cache();
 
 $foo = $cache->get('foo');
diff --git a/user_guide_src/source/libraries/caching/012.php b/user_guide_src/source/libraries/caching/012.php
index 90395ed77429..cb4d40f3e9ef 100644
--- a/user_guide_src/source/libraries/caching/012.php
+++ b/user_guide_src/source/libraries/caching/012.php
@@ -1,3 +1,3 @@
 <?php
 
-$prefixedKey = BaseHandler::validateKey($key, $prefix);
+$prefixedKey = \BaseHandler::validateKey($key, $prefix);
diff --git a/user_guide_src/source/libraries/cookies/013.php b/user_guide_src/source/libraries/cookies/013.php
index e9c09b49052a..68356ce78bd2 100644
--- a/user_guide_src/source/libraries/cookies/013.php
+++ b/user_guide_src/source/libraries/cookies/013.php
@@ -6,4 +6,4 @@
 cookies()->display();
 
 // or even from the Response
-Services::response()->getCookies();
+\Services::response()->getCookies();
diff --git a/user_guide_src/source/libraries/curlrequest/002.php b/user_guide_src/source/libraries/curlrequest/002.php
index 28e71adb74c7..5d84bfe442b5 100644
--- a/user_guide_src/source/libraries/curlrequest/002.php
+++ b/user_guide_src/source/libraries/curlrequest/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$client = Config\Services::curlrequest();
+$client = \Config\Services::curlrequest();
diff --git a/user_guide_src/source/libraries/curlrequest/003.php b/user_guide_src/source/libraries/curlrequest/003.php
index c56e8182d791..5f02e4f18c00 100644
--- a/user_guide_src/source/libraries/curlrequest/003.php
+++ b/user_guide_src/source/libraries/curlrequest/003.php
@@ -4,4 +4,4 @@
     'baseURI' => 'http://example.com/api/v1/',
     'timeout' => 3,
 ];
-$client = Config\Services::curlrequest($options);
+$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
index d73ea9243411..4d6a14fadbb0 100644
--- a/user_guide_src/source/libraries/curlrequest/004.php
+++ b/user_guide_src/source/libraries/curlrequest/004.php
@@ -1,8 +1,8 @@
 <?php
 
-$client = new CodeIgniter\HTTP\CURLRequest(
-    new Config\App(),
-    new CodeIgniter\HTTP\URI(),
-    new CodeIgniter\HTTP\Response(new Config\App()),
+$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
index 9a899d44a023..ab2b479c4a18 100644
--- a/user_guide_src/source/libraries/curlrequest/005.php
+++ b/user_guide_src/source/libraries/curlrequest/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$client = Config\Services::curlrequest();
+$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/008.php b/user_guide_src/source/libraries/curlrequest/008.php
index 73c6cf6da396..611909c2df7d 100644
--- a/user_guide_src/source/libraries/curlrequest/008.php
+++ b/user_guide_src/source/libraries/curlrequest/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$client = Config\Services::curlrequest([
+$client = \Config\Services::curlrequest([
     'baseURI' => 'https://example.com/api/v1/',
 ]);
 
diff --git a/user_guide_src/source/libraries/curlrequest/028.php b/user_guide_src/source/libraries/curlrequest/028.php
index 6059c832c64d..fcce227c1d9a 100644
--- a/user_guide_src/source/libraries/curlrequest/028.php
+++ b/user_guide_src/source/libraries/curlrequest/028.php
@@ -2,5 +2,5 @@
 
 $post_data = [
     'foo'      => 'bar',
-    'userfile' => new CURLFile('/path/to/file.txt'),
+    'userfile' => new \CURLFile('/path/to/file.txt'),
 ];
diff --git a/user_guide_src/source/libraries/email/001.php b/user_guide_src/source/libraries/email/001.php
index 968bcdbc1218..914193c15203 100644
--- a/user_guide_src/source/libraries/email/001.php
+++ b/user_guide_src/source/libraries/email/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$email = Config\Services::email();
+$email = \Config\Services::email();
 
 $email->setFrom('your@example.com', 'Your Name');
 $email->setTo('someone@example.com');
diff --git a/user_guide_src/source/libraries/encryption/001.php b/user_guide_src/source/libraries/encryption/001.php
index c07227c81fa7..8f840be59245 100644
--- a/user_guide_src/source/libraries/encryption/001.php
+++ b/user_guide_src/source/libraries/encryption/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$encrypter = Config\Services::encrypter();
+$encrypter = \Config\Services::encrypter();
diff --git a/user_guide_src/source/libraries/encryption/003.php b/user_guide_src/source/libraries/encryption/003.php
index 0e91e70b7dad..772a2172417f 100644
--- a/user_guide_src/source/libraries/encryption/003.php
+++ b/user_guide_src/source/libraries/encryption/003.php
@@ -1,7 +1,7 @@
 <?php
 
-$config         = new Config\Encryption();
+$config         = new \Config\Encryption();
 $config->key    = 'aBigsecret_ofAtleast32Characters';
 $config->driver = 'OpenSSL';
 
-$encrypter = Config\Services::encrypter($config);
+$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
index 538f857b8ee3..30d861e74a40 100644
--- a/user_guide_src/source/libraries/encryption/004.php
+++ b/user_guide_src/source/libraries/encryption/004.php
@@ -1,8 +1,8 @@
 <?php
 
 // $key will be assigned a 32-byte (256-bit) random key
-$key = CodeIgniter\Encryption\Encryption::createKey();
+$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);
+$key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
diff --git a/user_guide_src/source/libraries/encryption/006.php b/user_guide_src/source/libraries/encryption/006.php
index 7685c7a1855c..43e52f0bcad2 100644
--- a/user_guide_src/source/libraries/encryption/006.php
+++ b/user_guide_src/source/libraries/encryption/006.php
@@ -1,7 +1,7 @@
 <?php
 
 // Get a hex-encoded representation of the key:
-$encoded = bin2hex(CodeIgniter\Encryption\Encryption::createKey(32));
+$encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
 
 // Put the same value with hex2bin(),
 // so that it is still passed as binary to the library:
diff --git a/user_guide_src/source/libraries/encryption/009.php b/user_guide_src/source/libraries/encryption/009.php
index ba98b2f21334..ec40cae6127c 100644
--- a/user_guide_src/source/libraries/encryption/009.php
+++ b/user_guide_src/source/libraries/encryption/009.php
@@ -1,7 +1,7 @@
 <?php
 
 // create an Encryption instance
-$encryption = new CodeIgniter\Encryption\Encryption();
+$encryption = new \CodeIgniter\Encryption\Encryption();
 
 // reconfigure an instance with different settings
 $encrypter = $encryption->initialize($config);
diff --git a/user_guide_src/source/libraries/files/001.php b/user_guide_src/source/libraries/files/001.php
index 314cf5a90319..643758d14ca8 100644
--- a/user_guide_src/source/libraries/files/001.php
+++ b/user_guide_src/source/libraries/files/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$file = new CodeIgniter\Files\File($path);
+$file = new \CodeIgniter\Files\File($path);
diff --git a/user_guide_src/source/libraries/files/011.php b/user_guide_src/source/libraries/files/011.php
index fb15a5ca6cbd..91dcd69ac9d8 100644
--- a/user_guide_src/source/libraries/files/011.php
+++ b/user_guide_src/source/libraries/files/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$files = new FileCollection([
+$files = new \FileCollection([
     FCPATH . 'index.php',
     ROOTPATH . 'spark',
 ]);
diff --git a/user_guide_src/source/libraries/files/015.php b/user_guide_src/source/libraries/files/015.php
index 7e5c65e9a3d6..6850de2c18b0 100644
--- a/user_guide_src/source/libraries/files/015.php
+++ b/user_guide_src/source/libraries/files/015.php
@@ -1,6 +1,6 @@
 <?php
 
-$files = new FileCollection();
+$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
diff --git a/user_guide_src/source/libraries/images/001.php b/user_guide_src/source/libraries/images/001.php
index f83934b3e241..780bb37b3a4d 100644
--- a/user_guide_src/source/libraries/images/001.php
+++ b/user_guide_src/source/libraries/images/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$image = Config\Services::image();
+$image = \Config\Services::image();
diff --git a/user_guide_src/source/libraries/images/002.php b/user_guide_src/source/libraries/images/002.php
index b0f698c3d768..9215a57e9e23 100644
--- a/user_guide_src/source/libraries/images/002.php
+++ b/user_guide_src/source/libraries/images/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$image = Config\Services::image('imagick');
+$image = \Config\Services::image('imagick');
diff --git a/user_guide_src/source/libraries/images/007.php b/user_guide_src/source/libraries/images/007.php
index f8999835e486..5faaf426ebb0 100644
--- a/user_guide_src/source/libraries/images/007.php
+++ b/user_guide_src/source/libraries/images/007.php
@@ -1,11 +1,11 @@
 <?php
 
-$image = Config\Services::image();
+$image = \Config\Services::image();
 
 try {
     $image->withFile('/path/to/image/mypic.jpg')
         ->fit(100, 100, 'center')
         ->save('/path/to/image/mypic_thumb.jpg');
-} catch (CodeIgniter\Images\Exceptions\ImageException $e) {
+} catch (\CodeIgniter\Images\Exceptions\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
index b24dd171abc9..01406733d31b 100644
--- a/user_guide_src/source/libraries/images/008.php
+++ b/user_guide_src/source/libraries/images/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$info = Config\Services::image('imagick')
+$info = \Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.jpg')
     ->getFile()
     ->getProperties(true);
@@ -8,7 +8,7 @@
 $xOffset = ($info['width'] / 2) - 25;
 $yOffset = ($info['height'] / 2) - 25;
 
-Config\Services::image('imagick')
+\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
index 7fdbeab90582..6314181ef435 100644
--- a/user_guide_src/source/libraries/images/009.php
+++ b/user_guide_src/source/libraries/images/009.php
@@ -1,6 +1,6 @@
 <?php
 
-Config\Services::image()
+\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
index b7dd8ed52f68..b70b179815cd 100644
--- a/user_guide_src/source/libraries/images/010.php
+++ b/user_guide_src/source/libraries/images/010.php
@@ -1,6 +1,6 @@
 <?php
 
-Config\Services::image('imagick')
+\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
index 2db14bace838..f18fb55545a1 100644
--- a/user_guide_src/source/libraries/images/011.php
+++ b/user_guide_src/source/libraries/images/011.php
@@ -1,11 +1,11 @@
 <?php
 
-Config\Services::image('imagick')
+\Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.png')
     ->flatten()
     ->save('/path/to/new/image.jpg');
 
-Config\Services::image('imagick')
+\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
index 63e402a6e104..581a984238bd 100644
--- a/user_guide_src/source/libraries/images/012.php
+++ b/user_guide_src/source/libraries/images/012.php
@@ -1,6 +1,6 @@
 <?php
 
-Config\Services::image('imagick')
+\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
index cae77fa028ff..c51a7126be8d 100644
--- a/user_guide_src/source/libraries/images/013.php
+++ b/user_guide_src/source/libraries/images/013.php
@@ -1,6 +1,6 @@
 <?php
 
-Config\Services::image('imagick')
+\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
index 45f3b86a2134..32943ed142c6 100644
--- a/user_guide_src/source/libraries/images/014.php
+++ b/user_guide_src/source/libraries/images/014.php
@@ -1,6 +1,6 @@
 <?php
 
-Config\Services::image('imagick')
+\Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.jpg')
     ->text('Copyright 2017 My Photo Co', [
         'color'      => '#fff',
diff --git a/user_guide_src/source/libraries/pagination/001.php b/user_guide_src/source/libraries/pagination/001.php
index 9c7facc66801..ec86f0e73490 100644
--- a/user_guide_src/source/libraries/pagination/001.php
+++ b/user_guide_src/source/libraries/pagination/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$pager = Config\Services::pager();
+$pager = \Config\Services::pager();
diff --git a/user_guide_src/source/libraries/pagination/003.php b/user_guide_src/source/libraries/pagination/003.php
index 2378915d1db8..6ea631c7a9bc 100644
--- a/user_guide_src/source/libraries/pagination/003.php
+++ b/user_guide_src/source/libraries/pagination/003.php
@@ -1,7 +1,7 @@
 <?php
 
 // In your Controller.
-$model = new App\Models\UserModel();
+$model = new \App\Models\UserModel();
 
 $data = [
     'users' => $model->where('ban', 1)->paginate(10),
diff --git a/user_guide_src/source/libraries/pagination/005.php b/user_guide_src/source/libraries/pagination/005.php
index bf6f8a004004..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();
+$userModel = new \App\Models\UserModel();
 $page      = 3;
 
 $users = $userModel->paginate(10, 'group1', $page);
diff --git a/user_guide_src/source/libraries/pagination/018.php b/user_guide_src/source/libraries/pagination/018.php
index 09b4b0320587..002d034a643c 100644
--- a/user_guide_src/source/libraries/pagination/018.php
+++ b/user_guide_src/source/libraries/pagination/018.php
@@ -1,7 +1,7 @@
 <?php
 
 // In your Controller.
-$model = new App\Models\UserModel();
+$model = new \App\Models\UserModel();
 
 $data = [
     'users' => $model->banned()->paginate(10),
diff --git a/user_guide_src/source/libraries/publisher/001.php b/user_guide_src/source/libraries/publisher/001.php
index 42335338b982..6312e0d034f4 100644
--- a/user_guide_src/source/libraries/publisher/001.php
+++ b/user_guide_src/source/libraries/publisher/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$publisher = new CodeIgniter\Publisher\Publisher();
+$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
index 42335338b982..6312e0d034f4 100644
--- a/user_guide_src/source/libraries/publisher/002.php
+++ b/user_guide_src/source/libraries/publisher/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$publisher = new CodeIgniter\Publisher\Publisher();
+$publisher = new \CodeIgniter\Publisher\Publisher();
diff --git a/user_guide_src/source/libraries/publisher/006.php b/user_guide_src/source/libraries/publisher/006.php
index 9ec20cc403e2..d13afdf4de80 100644
--- a/user_guide_src/source/libraries/publisher/006.php
+++ b/user_guide_src/source/libraries/publisher/006.php
@@ -1,3 +1,3 @@
 <?php
 
-$memePublishers = Publisher::discover('CatGIFs');
+$memePublishers = \Publisher::discover('CatGIFs');
diff --git a/user_guide_src/source/libraries/publisher/011.php b/user_guide_src/source/libraries/publisher/011.php
index b48e43282de1..0c64fb65ca99 100644
--- a/user_guide_src/source/libraries/publisher/011.php
+++ b/user_guide_src/source/libraries/publisher/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$publisher = new Publisher('/home/source', '/home/destination');
+$publisher = new \Publisher('/home/source', '/home/destination');
 $publisher->addPaths([
     'pencil/lead.png',
     'metal/lead.png',
diff --git a/user_guide_src/source/libraries/publisher/012.php b/user_guide_src/source/libraries/publisher/012.php
index 32ec11f13b33..2ca41a5a33db 100644
--- a/user_guide_src/source/libraries/publisher/012.php
+++ b/user_guide_src/source/libraries/publisher/012.php
@@ -1,6 +1,6 @@
 <?php
 
-$publisher = new Publisher('/home/source', '/home/destination');
+$publisher = new \Publisher('/home/source', '/home/destination');
 $publisher->addPaths([
     'pencil/lead.png',
     'metal/lead.png',
diff --git a/user_guide_src/source/libraries/security/001.php b/user_guide_src/source/libraries/security/001.php
index 6953dbc4bc83..fe504ef35a8e 100644
--- a/user_guide_src/source/libraries/security/001.php
+++ b/user_guide_src/source/libraries/security/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$security = Config\Services::security();
+$security = \Config\Services::security();
diff --git a/user_guide_src/source/libraries/sessions/001.php b/user_guide_src/source/libraries/sessions/001.php
index 0ae6fbe3b7dd..b1fa9aac3530 100644
--- a/user_guide_src/source/libraries/sessions/001.php
+++ b/user_guide_src/source/libraries/sessions/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$session = Config\Services::session($config);
+$session = \Config\Services::session($config);
diff --git a/user_guide_src/source/libraries/throttler/001.php b/user_guide_src/source/libraries/throttler/001.php
index 594dd1e21c54..20086d3fc60a 100644
--- a/user_guide_src/source/libraries/throttler/001.php
+++ b/user_guide_src/source/libraries/throttler/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$throttler = Config\Services::throttler();
+$throttler = \Config\Services::throttler();
 $throttler->check($name, 60, MINUTE);
diff --git a/user_guide_src/source/libraries/time/013.php b/user_guide_src/source/libraries/time/013.php
index 2e0c52ff1f58..be8299c16444 100644
--- a/user_guide_src/source/libraries/time/013.php
+++ b/user_guide_src/source/libraries/time/013.php
@@ -2,5 +2,5 @@
 
 use CodeIgniter\I18n\Time;
 
-$dt   = new DateTime('now');
+$dt   = new \DateTime('now');
 $time = Time::createFromInstance($dt, 'en_US');
diff --git a/user_guide_src/source/libraries/time/038.php b/user_guide_src/source/libraries/time/038.php
index 8eda0d1ff688..4ada6f1ea0c7 100644
--- a/user_guide_src/source/libraries/time/038.php
+++ b/user_guide_src/source/libraries/time/038.php
@@ -5,5 +5,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/typography/001.php b/user_guide_src/source/libraries/typography/001.php
index 85e23bcadf2a..0c82ed0e95fa 100644
--- a/user_guide_src/source/libraries/typography/001.php
+++ b/user_guide_src/source/libraries/typography/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$typography = Config\Services::typography();
+$typography = \Config\Services::typography();
diff --git a/user_guide_src/source/libraries/uploaded_files/010.php b/user_guide_src/source/libraries/uploaded_files/010.php
index fc277fac976b..094ea73c1064 100644
--- a/user_guide_src/source/libraries/uploaded_files/010.php
+++ b/user_guide_src/source/libraries/uploaded_files/010.php
@@ -1,5 +1,5 @@
 <?php
 
 if (! $file->isValid()) {
-    throw new RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
+    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
 }
diff --git a/user_guide_src/source/libraries/uri/001.php b/user_guide_src/source/libraries/uri/001.php
index 00ddb3444fa8..7219d03d248f 100644
--- a/user_guide_src/source/libraries/uri/001.php
+++ b/user_guide_src/source/libraries/uri/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$uri = new CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
diff --git a/user_guide_src/source/libraries/uri/007.php b/user_guide_src/source/libraries/uri/007.php
index 3329798cffb0..4fe96c6bf111 100644
--- a/user_guide_src/source/libraries/uri/007.php
+++ b/user_guide_src/source/libraries/uri/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$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');
+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
index 7a097b24fd6d..66746092b49f 100644
--- a/user_guide_src/source/libraries/uri/008.php
+++ b/user_guide_src/source/libraries/uri/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+$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
index 8f4dd92deee4..44043fbe63d0 100644
--- a/user_guide_src/source/libraries/uri/009.php
+++ b/user_guide_src/source/libraries/uri/009.php
@@ -1,5 +1,5 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/014.php b/user_guide_src/source/libraries/uri/014.php
index e8615be7e449..79192a56955d 100644
--- a/user_guide_src/source/libraries/uri/014.php
+++ b/user_guide_src/source/libraries/uri/014.php
@@ -1,6 +1,6 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/015.php b/user_guide_src/source/libraries/uri/015.php
index cfbd7e4dc4b6..f5b43c3a65d0 100644
--- a/user_guide_src/source/libraries/uri/015.php
+++ b/user_guide_src/source/libraries/uri/015.php
@@ -1,6 +1,6 @@
 <?php
 
-$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
diff --git a/user_guide_src/source/libraries/uri/016.php b/user_guide_src/source/libraries/uri/016.php
index ae4c9201c43d..f9d82a86759d 100644
--- a/user_guide_src/source/libraries/uri/016.php
+++ b/user_guide_src/source/libraries/uri/016.php
@@ -1,6 +1,6 @@
 <?php
 
-$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'
diff --git a/user_guide_src/source/libraries/uri/017.php b/user_guide_src/source/libraries/uri/017.php
index 84b737f1d363..dd45fb157f4b 100644
--- a/user_guide_src/source/libraries/uri/017.php
+++ b/user_guide_src/source/libraries/uri/017.php
@@ -1,6 +1,6 @@
 <?php
 
-$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');
diff --git a/user_guide_src/source/libraries/uri/020.php b/user_guide_src/source/libraries/uri/020.php
index 2a285a9d92ca..53c3b8d66dd9 100644
--- a/user_guide_src/source/libraries/uri/020.php
+++ b/user_guide_src/source/libraries/uri/020.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
 
 // Returns 'foo=bar'
 echo $uri->getQuery(['only' => ['foo']]);
diff --git a/user_guide_src/source/libraries/uri/021.php b/user_guide_src/source/libraries/uri/021.php
index 26d7263a4ab3..ed2976e6e1d3 100644
--- a/user_guide_src/source/libraries/uri/021.php
+++ b/user_guide_src/source/libraries/uri/021.php
@@ -1,6 +1,6 @@
 <?php
 
-$uri = new CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
 
 // Leaves just the 'baz' variable
 $uri->stripQuery('foo', 'bar');
diff --git a/user_guide_src/source/libraries/uri/022.php b/user_guide_src/source/libraries/uri/022.php
index 7fa5b961124b..e2df019dcb87 100644
--- a/user_guide_src/source/libraries/uri/022.php
+++ b/user_guide_src/source/libraries/uri/022.php
@@ -1,6 +1,6 @@
 <?php
 
-$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'
diff --git a/user_guide_src/source/libraries/validation/004.php b/user_guide_src/source/libraries/validation/004.php
index 0777376e84ba..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/008.php b/user_guide_src/source/libraries/validation/008.php
index 079165a7639b..41e37f0652ef 100644
--- a/user_guide_src/source/libraries/validation/008.php
+++ b/user_guide_src/source/libraries/validation/008.php
@@ -1,7 +1,7 @@
 <?php
 
-$validation = Config\Services::validation();
-$request    = Config\Services::request();
+$validation = \Config\Services::validation();
+$request    = \Config\Services::request();
 
 if ($validation->withRequest($request)->run()) {
     // If you use the input data, you should get it from the getValidated() method.
diff --git a/user_guide_src/source/libraries/validation/044.php b/user_guide_src/source/libraries/validation/044.php
index 6f1a18214740..7f3a0e0e0902 100644
--- a/user_guide_src/source/libraries/validation/044.php
+++ b/user_guide_src/source/libraries/validation/044.php
@@ -1,6 +1,6 @@
 <?php
 
-$validation = Config\Services::validation();
+$validation = \Config\Services::validation();
 $validation->setRules([
     'username' => 'required',
     'password' => 'required|min_length[10]',
diff --git a/user_guide_src/source/models/entities/003.php b/user_guide_src/source/models/entities/003.php
index c68fa08e8d92..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/004.php b/user_guide_src/source/models/entities/004.php
index 775ef026c2bc..e5307d38b1a2 100644
--- a/user_guide_src/source/models/entities/004.php
+++ b/user_guide_src/source/models/entities/004.php
@@ -2,6 +2,6 @@
 
 $data = $this->request->getPost();
 
-$user = new App\Entities\User();
+$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
index 6b756baf687b..5dd5d47af1f5 100644
--- a/user_guide_src/source/models/entities/005.php
+++ b/user_guide_src/source/models/entities/005.php
@@ -2,5 +2,5 @@
 
 $data = $this->request->getPost();
 
-$user = new App\Entities\User($data);
+$user = new \App\Entities\User($data);
 $userModel->save($user);
diff --git a/user_guide_src/source/models/entities/011.php b/user_guide_src/source/models/entities/011.php
index 8867e4761da0..9dedc28458b8 100644
--- a/user_guide_src/source/models/entities/011.php
+++ b/user_guide_src/source/models/entities/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = new App\Entities\User();
+$user = new \App\Entities\User();
 
 // Converted to Time instance
 $user->created_at = 'April 15, 2017 10:30:00';
diff --git a/user_guide_src/source/models/entities/022.php b/user_guide_src/source/models/entities/022.php
index 7afe406b3075..07dc560038a3 100644
--- a/user_guide_src/source/models/entities/022.php
+++ b/user_guide_src/source/models/entities/022.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = new App\Entities\User();
+$user = new \App\Entities\User();
 $user->hasChanged('name'); // false
 
 $user->name = 'Fred';
diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php
index 5bdcecde7a96..a02d46890a74 100644
--- a/user_guide_src/source/models/model/001.php
+++ b/user_guide_src/source/models/model/001.php
@@ -1,14 +1,14 @@
 <?php
 
 // Create a new class manually.
-$userModel = new App\Models\UserModel();
+$userModel = new \App\Models\UserModel();
 
 // Create a shared instance of the model.
 $userModel = model('UserModel');
 // or
 $userModel = model('App\Models\UserModel');
 // or
-$userModel = model(App\Models\UserModel::class);
+$userModel = model(\App\Models\UserModel::class);
 
 // Create a new class with the model() function.
 $userModel = model('UserModel', false);
diff --git a/user_guide_src/source/outgoing/response/022.php b/user_guide_src/source/outgoing/response/022.php
index 0fd2fa4776c0..85f2b3d62986 100644
--- a/user_guide_src/source/outgoing/response/022.php
+++ b/user_guide_src/source/outgoing/response/022.php
@@ -1,4 +1,4 @@
 <?php
 
 $response->setLastModified(date('D, d M Y H:i:s'));
-$response->setLastModified(DateTime::createFromFormat('!U', $timestamp));
+$response->setLastModified(\DateTime::createFromFormat('!U', $timestamp));
diff --git a/user_guide_src/source/outgoing/table/001.php b/user_guide_src/source/outgoing/table/001.php
index 12bea5b47f82..dbd5ba323335 100644
--- a/user_guide_src/source/outgoing/table/001.php
+++ b/user_guide_src/source/outgoing/table/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$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
index 3d0d548e345c..4ce9b5b0e2ab 100644
--- a/user_guide_src/source/outgoing/table/002.php
+++ b/user_guide_src/source/outgoing/table/002.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $data = [
     ['Name', 'Color', 'Size'],
diff --git a/user_guide_src/source/outgoing/table/003.php b/user_guide_src/source/outgoing/table/003.php
index 2b1b8a966de4..91218de3f143 100644
--- a/user_guide_src/source/outgoing/table/003.php
+++ b/user_guide_src/source/outgoing/table/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $query = $db->query('SELECT * FROM my_table');
 
diff --git a/user_guide_src/source/outgoing/table/004.php b/user_guide_src/source/outgoing/table/004.php
index 385894b1b568..0d0679305409 100644
--- a/user_guide_src/source/outgoing/table/004.php
+++ b/user_guide_src/source/outgoing/table/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 
diff --git a/user_guide_src/source/outgoing/table/005.php b/user_guide_src/source/outgoing/table/005.php
index 5817d146bf21..08d6dabb1850 100644
--- a/user_guide_src/source/outgoing/table/005.php
+++ b/user_guide_src/source/outgoing/table/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading(['Name', 'Color', 'Size']);
 
diff --git a/user_guide_src/source/outgoing/table/008.php b/user_guide_src/source/outgoing/table/008.php
index e13d1991a1b2..99f12f2b2fcd 100644
--- a/user_guide_src/source/outgoing/table/008.php
+++ b/user_guide_src/source/outgoing/table/008.php
@@ -4,4 +4,4 @@
     'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
 ];
 
-$table = new CodeIgniter\View\Table($customSettings);
+$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
index 68cd17ab8552..c08af5b1fa9a 100644
--- a/user_guide_src/source/outgoing/table/009.php
+++ b/user_guide_src/source/outgoing/table/009.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading('Name', 'Color', 'Size');
 $table->addRow('Fred', '<strong>Blue</strong>', 'Small');
diff --git a/user_guide_src/source/outgoing/table/018.php b/user_guide_src/source/outgoing/table/018.php
index 9e2b18ff04d3..c67c746bde9b 100644
--- a/user_guide_src/source/outgoing/table/018.php
+++ b/user_guide_src/source/outgoing/table/018.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setCaption('Preferences')
     ->setHeading('Name', 'Color', 'Size')
diff --git a/user_guide_src/source/outgoing/table/019.php b/user_guide_src/source/outgoing/table/019.php
index 1f3ef696f4b1..5478867fddfa 100644
--- a/user_guide_src/source/outgoing/table/019.php
+++ b/user_guide_src/source/outgoing/table/019.php
@@ -1,6 +1,6 @@
 <?php
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading(['name' => 'Name', 'color' => 'Color', 'size' => 'Size'])
     ->setSyncRowsWithHeading(true)
diff --git a/user_guide_src/source/outgoing/table/020.php b/user_guide_src/source/outgoing/table/020.php
index 1d3736858562..42bda4d2f3bc 100644
--- a/user_guide_src/source/outgoing/table/020.php
+++ b/user_guide_src/source/outgoing/table/020.php
@@ -16,7 +16,7 @@
     ],
 ];
 
-$table = new CodeIgniter\View\Table();
+$table = new \CodeIgniter\View\Table();
 
 $table->setHeading(['name' => 'Name', 'color' => 'Color', 'size' => 'Size'])
     ->setSyncRowsWithHeading(true);
diff --git a/user_guide_src/source/outgoing/view_parser/001.php b/user_guide_src/source/outgoing/view_parser/001.php
index e5d30f21ab7c..56f7f51e4a07 100644
--- a/user_guide_src/source/outgoing/view_parser/001.php
+++ b/user_guide_src/source/outgoing/view_parser/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$parser = Config\Services::parser();
+$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
index cbd7e5cf0e2b..a57951d052b0 100644
--- a/user_guide_src/source/outgoing/view_parser/002.php
+++ b/user_guide_src/source/outgoing/view_parser/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$parser = new CodeIgniter\View\Parser();
+$parser = new \CodeIgniter\View\Parser();
diff --git a/user_guide_src/source/outgoing/view_renderer/001.php b/user_guide_src/source/outgoing/view_renderer/001.php
index 65983f69a832..2772e22cad0d 100644
--- a/user_guide_src/source/outgoing/view_renderer/001.php
+++ b/user_guide_src/source/outgoing/view_renderer/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$view = Config\Services::renderer();
+$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
index 1fcd432484e1..05fedb3b7b6b 100644
--- a/user_guide_src/source/outgoing/view_renderer/002.php
+++ b/user_guide_src/source/outgoing/view_renderer/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$view = new CodeIgniter\View\View();
+$view = new \CodeIgniter\View\View();
diff --git a/user_guide_src/source/testing/benchmark/001.php b/user_guide_src/source/testing/benchmark/001.php
index ad9653e7c935..ce3bd09ac87f 100644
--- a/user_guide_src/source/testing/benchmark/001.php
+++ b/user_guide_src/source/testing/benchmark/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$benchmark = Config\Services::timer();
+$benchmark = \Config\Services::timer();
 $benchmark->start('render view');
diff --git a/user_guide_src/source/testing/benchmark/007.php b/user_guide_src/source/testing/benchmark/007.php
index 74bd22552636..4997eb1875b0 100644
--- a/user_guide_src/source/testing/benchmark/007.php
+++ b/user_guide_src/source/testing/benchmark/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$iterator = new CodeIgniter\Debug\Iterator();
+$iterator = new \CodeIgniter\Debug\Iterator();
 
 $iterator->add('double', static function ($word = 'little') {
     "Some basic {$word} string test.";
diff --git a/user_guide_src/source/testing/controllers/003.php b/user_guide_src/source/testing/controllers/003.php
index 4f5ddc00a6c5..51e810538e87 100644
--- a/user_guide_src/source/testing/controllers/003.php
+++ b/user_guide_src/source/testing/controllers/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$this->controller(App\Controllers\ForumController::class);
+$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
index 233d1d67cc88..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)
+$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
index 030de80452ea..11717bc79e7a 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)
+    ->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 022a4192bbfb..5e101f1bbfbb 100644
--- a/user_guide_src/source/testing/controllers/006.php
+++ b/user_guide_src/source/testing/controllers/006.php
@@ -1,14 +1,14 @@
 <?php
 
-$request = new CodeIgniter\HTTP\IncomingRequest(
-    new Config\App(),
-    new CodeIgniter\HTTP\URI('http://example.com'),
+$request = new \CodeIgniter\HTTP\IncomingRequest(
+    new \Config\App(),
+    new \CodeIgniter\HTTP\URI('http://example.com'),
     null,
-    new CodeIgniter\HTTP\UserAgent()
+    new \CodeIgniter\HTTP\UserAgent()
 );
 
 $request->setLocale($locale);
 
 $results = $this->withRequest($request)
-    ->controller(App\Controllers\ForumController::class)
+    ->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 ecf5b34343fb..8f7d55448035 100644
--- a/user_guide_src/source/testing/controllers/007.php
+++ b/user_guide_src/source/testing/controllers/007.php
@@ -1,7 +1,7 @@
 <?php
 
-$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)
+    ->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 2a58ed415143..641a7f92f68b 100644
--- a/user_guide_src/source/testing/controllers/008.php
+++ b/user_guide_src/source/testing/controllers/008.php
@@ -1,8 +1,8 @@
 <?php
 
-$logger = new CodeIgniter\Log\Handlers\FileHandler();
+$logger = new \CodeIgniter\Log\Handlers\FileHandler();
 
 $results = $this->withResponse($response)
     ->withLogger($logger)
-    ->controller(App\Controllers\ForumController::class)
+    ->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 5fad87c836a9..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)
+    ->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 b54045c1a011..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)
+    ->controller(\App\Controllers\ForumController::class)
     ->execute('showCategories');
diff --git a/user_guide_src/source/testing/fabricator/003.php b/user_guide_src/source/testing/fabricator/003.php
index 5432bba5728a..3a9c90299bf1 100644
--- a/user_guide_src/source/testing/fabricator/003.php
+++ b/user_guide_src/source/testing/fabricator/003.php
@@ -1,5 +1,5 @@
 <?php
 
-$model = new UserModel($testDbConnection);
+$model = new \UserModel($testDbConnection);
 
-$fabricator = new Fabricator($model);
+$fabricator = new \Fabricator($model);
diff --git a/user_guide_src/source/testing/fabricator/004.php b/user_guide_src/source/testing/fabricator/004.php
index d999fbba3a2d..e3765f60f703 100644
--- a/user_guide_src/source/testing/fabricator/004.php
+++ b/user_guide_src/source/testing/fabricator/004.php
@@ -7,4 +7,4 @@
     'avatar' => 'imageUrl',
 ];
 
-$fabricator = new Fabricator(UserModel::class, $formatters);
+$fabricator = new \Fabricator(\UserModel::class, $formatters);
diff --git a/user_guide_src/source/testing/fabricator/007.php b/user_guide_src/source/testing/fabricator/007.php
index 906a210eb943..b1f664b21ff9 100644
--- a/user_guide_src/source/testing/fabricator/007.php
+++ b/user_guide_src/source/testing/fabricator/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$fabricator = new Fabricator(UserModel::class, null, 'fr_FR');
+$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
index d726613fa0a6..fec3d5b5456b 100644
--- a/user_guide_src/source/testing/fabricator/008.php
+++ b/user_guide_src/source/testing/fabricator/008.php
@@ -1,5 +1,5 @@
 <?php
 
-$fabricator = new Fabricator(UserFabricator::class);
+$fabricator = new \Fabricator(\UserFabricator::class);
 $testUser   = $fabricator->make();
 print_r($testUser);
diff --git a/user_guide_src/source/testing/fabricator/020.php b/user_guide_src/source/testing/fabricator/020.php
index 385646b2ea2c..ce9d1e0a43e2 100644
--- a/user_guide_src/source/testing/fabricator/020.php
+++ b/user_guide_src/source/testing/fabricator/020.php
@@ -1,5 +1,5 @@
 <?php
 
-$fabricator = new Fabricator('App\Models\UserModel');
+$fabricator = new \Fabricator('App\Models\UserModel');
 $fabricator->setOverrides(['name' => 'Gerry']);
 $user = $fabricator->create();
diff --git a/user_guide_src/source/testing/mocking/001.php b/user_guide_src/source/testing/mocking/001.php
index 8740a1e9d6eb..69e69239049d 100644
--- a/user_guide_src/source/testing/mocking/001.php
+++ b/user_guide_src/source/testing/mocking/001.php
@@ -1,3 +1,3 @@
 <?php
 
-$mock = mock(CodeIgniter\Cache\CacheFactory::class);
+$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
index 8f0a9013b13a..7afe011ef20b 100644
--- a/user_guide_src/source/testing/mocking/002.php
+++ b/user_guide_src/source/testing/mocking/002.php
@@ -1,5 +1,5 @@
 <?php
 
-$mock = mock(CodeIgniter\Cache\CacheFactory::class);
+$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
index f67b7e0420e3..4a3babddaf54 100644
--- a/user_guide_src/source/testing/mocking/003.php
+++ b/user_guide_src/source/testing/mocking/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$mock = mock(CodeIgniter\Cache\CacheFactory::class);
+$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
 
 // Assert that a cached item named $key exists
 $mock->assertHas($key);
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index 6193eb88bf50..26043d11dc1a 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -15,7 +15,7 @@ protected function setUpAuthTrait()
 
 final class AuthenticationFeatureTest extends CIUnitTestCase
 {
-    use AuthTrait;
+    use \AuthTrait;
 
     // ...
 }
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index 2d48511a046a..c4ab265edde0 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -1,13 +1,13 @@
 <?php
 
-$config = new Config\Logger();
-$logger = new CodeIgniter\Log\Logger($config);
+$config = new \Config\Logger();
+$logger = new \CodeIgniter\Log\Logger($config);
 
 // check verbatim the log message
 $logger->log('error', "That's no moon");
 $this->assertLogged('error', "That's no moon");
 
 // check that a portion of the message is found in the logs
-$exception = new RuntimeException('Hello world.');
+$exception = new \RuntimeException('Hello world.');
 $logger->log('error', $exception->getTraceAsString());
 $this->assertLogContains('error', '{main}');
diff --git a/user_guide_src/source/testing/overview/008.php b/user_guide_src/source/testing/overview/008.php
index 5d69c01c16d5..cd1f6725f485 100644
--- a/user_guide_src/source/testing/overview/008.php
+++ b/user_guide_src/source/testing/overview/008.php
@@ -1,9 +1,9 @@
 <?php
 
-Events::on('foo', static function ($arg) use (&$result) {
+\Events::on('foo', static function ($arg) use (&$result) {
     $result = $arg;
 });
 
-Events::trigger('foo', 'bar');
+\Events::trigger('foo', 'bar');
 
 $this->assertEventTriggered('foo');
diff --git a/user_guide_src/source/testing/overview/011.php b/user_guide_src/source/testing/overview/011.php
index c9b85aef7f87..8f4f0fe90133 100644
--- a/user_guide_src/source/testing/overview/011.php
+++ b/user_guide_src/source/testing/overview/011.php
@@ -1,5 +1,5 @@
 <?php
 
-$timer = new Timer();
+$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 1c03733868e4..7543ca5ecce0 100644
--- a/user_guide_src/source/testing/overview/012.php
+++ b/user_guide_src/source/testing/overview/012.php
@@ -1,5 +1,5 @@
 <?php
 
-$timer = new Timer();
+$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/013.php b/user_guide_src/source/testing/overview/013.php
index f228dcf28963..a7ae7a53d7cf 100644
--- a/user_guide_src/source/testing/overview/013.php
+++ b/user_guide_src/source/testing/overview/013.php
@@ -1,7 +1,7 @@
 <?php
 
 // Create an instance of the class to test
-$obj = new Foo();
+$obj = new \Foo();
 
 // Get the invoker for the 'privateMethod' method.
 $method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
diff --git a/user_guide_src/source/testing/overview/014.php b/user_guide_src/source/testing/overview/014.php
index 1befb710253e..9847b698eb21 100644
--- a/user_guide_src/source/testing/overview/014.php
+++ b/user_guide_src/source/testing/overview/014.php
@@ -1,7 +1,7 @@
 <?php
 
 // Create an instance of the class to test
-$obj = new Foo();
+$obj = new \Foo();
 
 // 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 c2e815953dd9..f481e208e03b 100644
--- a/user_guide_src/source/testing/overview/015.php
+++ b/user_guide_src/source/testing/overview/015.php
@@ -1,7 +1,7 @@
 <?php
 
 // Create an instance of the class to test
-$obj = new Foo();
+$obj = new \Foo();
 
 // Set the value
 $this->setPrivateProperty($obj, 'baz', 'oops!');
diff --git a/user_guide_src/source/testing/response/001.php b/user_guide_src/source/testing/response/001.php
index ee7e298d0a35..0e37cfec37ba 100644
--- a/user_guide_src/source/testing/response/001.php
+++ b/user_guide_src/source/testing/response/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$result = new CodeIgniter\Test\TestResponse($response);
+$result = new \CodeIgniter\Test\TestResponse($response);
 $result->assertOK();

From 123f378998c9786f696115524c94a7b4bfaa8cd8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:08:49 +0900
Subject: [PATCH 033/148] docs: add type to class property in sample code

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

diff --git a/user_guide_src/source/incoming/routing/051.php b/user_guide_src/source/incoming/routing/051.php
index 72cbf8fed9b6..3bb721fcb082 100644
--- a/user_guide_src/source/incoming/routing/051.php
+++ b/user_guide_src/source/incoming/routing/051.php
@@ -4,7 +4,7 @@
 class Routing extends \BaseRouting
 {
     // ...
-    public $override404 = 'App\Errors::show404';
+    public ?string $override404 = 'App\Errors::show404';
     // ...
 }
 

From 5fc0849f9b80cc38044ff8c930acaefbb3456734 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 09:59:12 +0900
Subject: [PATCH 034/148] docs: fix incorrect global classname in sample code

---
 user_guide_src/source/cli/cli_library/002.php        |  4 +++-
 user_guide_src/source/cli/cli_library/003.php        |  4 +++-
 user_guide_src/source/cli/cli_library/004.php        |  4 +++-
 user_guide_src/source/cli/cli_library/005.php        |  4 +++-
 user_guide_src/source/cli/cli_library/006.php        |  4 +++-
 user_guide_src/source/cli/cli_library/007.php        |  4 +++-
 user_guide_src/source/cli/cli_library/008.php        |  4 +++-
 user_guide_src/source/cli/cli_library/009.php        |  4 +++-
 user_guide_src/source/cli/cli_library/010.php        |  4 +++-
 user_guide_src/source/cli/cli_library/011.php        |  4 +++-
 user_guide_src/source/cli/cli_library/012.php        |  4 +++-
 user_guide_src/source/cli/cli_library/013.php        |  4 +++-
 user_guide_src/source/cli/cli_library/014.php        |  4 +++-
 user_guide_src/source/cli/cli_library/015.php        |  6 ++++--
 user_guide_src/source/cli/cli_library/016.php        |  4 +++-
 user_guide_src/source/cli/cli_library/017.php        |  6 ++++--
 user_guide_src/source/cli/cli_library/018.php        |  4 +++-
 user_guide_src/source/cli/cli_library/019.php        |  4 +++-
 user_guide_src/source/cli/cli_library/020.php        |  6 ++++--
 user_guide_src/source/cli/cli_library/021.php        |  4 +++-
 user_guide_src/source/cli/cli_library/022.php        |  8 +++++---
 user_guide_src/source/cli/cli_library/023.php        |  4 +++-
 user_guide_src/source/concepts/factories/002.php     |  6 ++++--
 user_guide_src/source/concepts/factories/004.php     |  4 +++-
 user_guide_src/source/concepts/factories/006.php     |  7 +++++--
 user_guide_src/source/concepts/factories/007.php     |  6 ++++--
 user_guide_src/source/concepts/factories/010.php     |  4 +++-
 user_guide_src/source/concepts/factories/013.php     |  4 +++-
 user_guide_src/source/concepts/factories/014.php     |  4 +++-
 user_guide_src/source/database/query_builder/111.php |  4 +++-
 user_guide_src/source/database/query_builder/115.php |  4 +++-
 user_guide_src/source/database/query_builder/116.php |  4 +++-
 user_guide_src/source/extending/events/002.php       | 10 ++++++----
 user_guide_src/source/extending/events/003.php       |  4 +++-
 user_guide_src/source/extending/events/006.php       |  6 ++++--
 user_guide_src/source/extending/events/007.php       |  4 +++-
 user_guide_src/source/extending/events/008.php       |  4 +++-
 user_guide_src/source/incoming/routing/045.php       |  5 ++++-
 user_guide_src/source/incoming/routing/049.php       |  5 ++++-
 user_guide_src/source/incoming/routing/050.php       |  5 ++++-
 user_guide_src/source/incoming/routing/051.php       |  5 ++++-
 user_guide_src/source/incoming/routing/052.php       |  5 ++++-
 user_guide_src/source/libraries/caching/012.php      |  4 +++-
 user_guide_src/source/libraries/cookies/013.php      |  4 +++-
 user_guide_src/source/libraries/files/011.php        |  4 +++-
 user_guide_src/source/libraries/files/015.php        |  4 +++-
 user_guide_src/source/libraries/publisher/006.php    |  4 +++-
 user_guide_src/source/libraries/publisher/011.php    |  4 +++-
 user_guide_src/source/libraries/publisher/012.php    |  4 +++-
 user_guide_src/source/libraries/uri/007.php          |  6 ++++--
 user_guide_src/source/testing/fabricator/003.php     |  4 +++-
 user_guide_src/source/testing/fabricator/004.php     |  4 +++-
 user_guide_src/source/testing/fabricator/007.php     |  4 +++-
 user_guide_src/source/testing/fabricator/008.php     |  4 +++-
 user_guide_src/source/testing/fabricator/020.php     |  4 +++-
 user_guide_src/source/testing/overview/008.php       |  6 ++++--
 user_guide_src/source/testing/overview/011.php       |  4 +++-
 user_guide_src/source/testing/overview/012.php       |  4 +++-
 58 files changed, 194 insertions(+), 72 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library/002.php b/user_guide_src/source/cli/cli_library/002.php
index a32c14af3519..1576f82e7660 100644
--- a/user_guide_src/source/cli/cli_library/002.php
+++ b/user_guide_src/source/cli/cli_library/002.php
@@ -1,3 +1,5 @@
 <?php
 
-$color = \CLI::prompt('What is your favorite color?');
+use CodeIgniter\CLI\CLI;
+
+$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
index 0bb2d83f24bc..eab87b1f0450 100644
--- a/user_guide_src/source/cli/cli_library/003.php
+++ b/user_guide_src/source/cli/cli_library/003.php
@@ -1,3 +1,5 @@
 <?php
 
-$color = \CLI::prompt('What is your favorite color?', 'blue');
+use CodeIgniter\CLI\CLI;
+
+$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
index c04aa825bb95..880813aefd93 100644
--- a/user_guide_src/source/cli/cli_library/004.php
+++ b/user_guide_src/source/cli/cli_library/004.php
@@ -1,3 +1,5 @@
 <?php
 
-$overwrite = \CLI::prompt('File exists. Overwrite?', ['y', 'n']);
+use CodeIgniter\CLI\CLI;
+
+$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
index d3e72fff0fff..581701a2bbe5 100644
--- a/user_guide_src/source/cli/cli_library/005.php
+++ b/user_guide_src/source/cli/cli_library/005.php
@@ -1,3 +1,5 @@
 <?php
 
-$email = \CLI::prompt('What is your email?', null, 'required|valid_email');
+use CodeIgniter\CLI\CLI;
+
+$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
index 6e3074db8a4a..018f35c2d7e2 100644
--- a/user_guide_src/source/cli/cli_library/006.php
+++ b/user_guide_src/source/cli/cli_library/006.php
@@ -1,3 +1,5 @@
 <?php
 
-$email = \CLI::prompt('What is your email?', null, ['required', 'valid_email']);
+use CodeIgniter\CLI\CLI;
+
+$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
index 897980f1b3d7..b31a37541cb9 100644
--- a/user_guide_src/source/cli/cli_library/007.php
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -1,6 +1,8 @@
 <?php
 
-$fruit = \CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
+use CodeIgniter\CLI\CLI;
+
+$fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
 /*
  * These are your choices:
  *   [0]  The red apple
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index 342fab3bf1f2..f3b6e1e2955f 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -1,6 +1,8 @@
 <?php
 
-$fruit = \CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
+use CodeIgniter\CLI\CLI;
+
+$fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
     'apple'  => 'The red apple',
     'orange' => 'The plump orange',
     'banana' => 'The ripe banana',
diff --git a/user_guide_src/source/cli/cli_library/009.php b/user_guide_src/source/cli/cli_library/009.php
index 5e18cb53bab6..672b67ac004e 100644
--- a/user_guide_src/source/cli/cli_library/009.php
+++ b/user_guide_src/source/cli/cli_library/009.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::write('The rain in Spain falls mainly on the plains.');
+use CodeIgniter\CLI\CLI;
+
+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
index 1526bb8603c2..1953c724b326 100644
--- a/user_guide_src/source/cli/cli_library/010.php
+++ b/user_guide_src/source/cli/cli_library/010.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::write('File created.', 'green');
+use CodeIgniter\CLI\CLI;
+
+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
index 1e21fac1667f..eea5eaa40f0c 100644
--- a/user_guide_src/source/cli/cli_library/011.php
+++ b/user_guide_src/source/cli/cli_library/011.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::write('File overwritten.', 'light_red', 'dark_gray');
+use CodeIgniter\CLI\CLI;
+
+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
index 432dc2761ef4..60cb396481e1 100644
--- a/user_guide_src/source/cli/cli_library/012.php
+++ b/user_guide_src/source/cli/cli_library/012.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 for ($i = 0; $i <= 10; $i++) {
-    \CLI::print($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
index 9af80c2724f9..e1cadafbc7cd 100644
--- a/user_guide_src/source/cli/cli_library/013.php
+++ b/user_guide_src/source/cli/cli_library/013.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::write("fileA \t" . \CLI::color('/path/to/file', 'white'), 'yellow');
+use CodeIgniter\CLI\CLI;
+
+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
index c0c7ebe063ed..abd30c644726 100644
--- a/user_guide_src/source/cli/cli_library/014.php
+++ b/user_guide_src/source/cli/cli_library/014.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::error('Cannot write to file: ' . $file);
+use CodeIgniter\CLI\CLI;
+
+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
index 02dcbe452fc6..ca79e94f0ed8 100644
--- a/user_guide_src/source/cli/cli_library/015.php
+++ b/user_guide_src/source/cli/cli_library/015.php
@@ -1,4 +1,6 @@
 <?php
 
-\CLI::color("task1\t", 'yellow');
-\CLI::wrap('Some long description goes here that might be longer than the current window.');
+use CodeIgniter\CLI\CLI;
+
+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
index df8920408437..c01a3ebba3c7 100644
--- a/user_guide_src/source/cli/cli_library/016.php
+++ b/user_guide_src/source/cli/cli_library/016.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 // Wrap the text at max 20 characters wide
-\CLI::wrap($description, 20);
+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
index a42385d78f0c..095e21c279ec 100644
--- a/user_guide_src/source/cli/cli_library/017.php
+++ b/user_guide_src/source/cli/cli_library/017.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $titles = [
     'task1a',
     'task1abc',
@@ -14,7 +16,7 @@
 $maxlen = max(array_map('strlen', $titles));
 
 for ($i = 0; $i < count($titles); $i++) {
-    \CLI::write(
+    CLI::write(
         // Display the title on the left of the row
         substr(
             $titles[$i] . str_repeat(' ', $maxlen + 3),
@@ -24,6 +26,6 @@
         // 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)
+        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
index 38fb2014715f..90b73924d47c 100644
--- a/user_guide_src/source/cli/cli_library/018.php
+++ b/user_guide_src/source/cli/cli_library/018.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::newLine();
+use CodeIgniter\CLI\CLI;
+
+CLI::newLine();
diff --git a/user_guide_src/source/cli/cli_library/019.php b/user_guide_src/source/cli/cli_library/019.php
index da3f376820da..058a6357b229 100644
--- a/user_guide_src/source/cli/cli_library/019.php
+++ b/user_guide_src/source/cli/cli_library/019.php
@@ -1,3 +1,5 @@
 <?php
 
-\CLI::clearScreen();
+use CodeIgniter\CLI\CLI;
+
+CLI::clearScreen();
diff --git a/user_guide_src/source/cli/cli_library/020.php b/user_guide_src/source/cli/cli_library/020.php
index be6759fd2792..b942dbf914bf 100644
--- a/user_guide_src/source/cli/cli_library/020.php
+++ b/user_guide_src/source/cli/cli_library/020.php
@@ -1,12 +1,14 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $totalSteps = count($tasks);
 $currStep   = 1;
 
 foreach ($tasks as $task) {
-    \CLI::showProgress($currStep++, $totalSteps);
+    CLI::showProgress($currStep++, $totalSteps);
     $task->run();
 }
 
 // Done, so erase it...
-\CLI::showProgress(false);
+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
index e16a43be6f22..e8a1490ebaf2 100644
--- a/user_guide_src/source/cli/cli_library/021.php
+++ b/user_guide_src/source/cli/cli_library/021.php
@@ -1,9 +1,11 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 $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);
+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
index 75b3571733a8..492e2ffbc739 100644
--- a/user_guide_src/source/cli/cli_library/022.php
+++ b/user_guide_src/source/cli/cli_library/022.php
@@ -1,10 +1,12 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
+
 // wait for specified interval, with countdown displayed
-\CLI::wait($seconds, true);
+CLI::wait($seconds, true);
 
 // show continuation message and wait for input
-\CLI::wait(0, false);
+CLI::wait(0, false);
 
 // wait for specified interval
-\CLI::wait($seconds, false);
+CLI::wait($seconds, false);
diff --git a/user_guide_src/source/cli/cli_library/023.php b/user_guide_src/source/cli/cli_library/023.php
index a2edcccae398..163394e1d016 100644
--- a/user_guide_src/source/cli/cli_library/023.php
+++ b/user_guide_src/source/cli/cli_library/023.php
@@ -1,6 +1,8 @@
 <?php
 
-$hobbies = \CLI::promptByMultipleKeys('Select your hobbies:', ['Playing game', 'Sleep', 'Badminton']);
+use CodeIgniter\CLI\CLI;
+
+$hobbies = CLI::promptByMultipleKeys('Select your hobbies:', ['Playing game', 'Sleep', 'Badminton']);
 /*
  * Select your hobbies:
  *   [0]  Playing game
diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php
index 3420edfa3ee8..783a373d0d70 100644
--- a/user_guide_src/source/concepts/factories/002.php
+++ b/user_guide_src/source/concepts/factories/002.php
@@ -1,5 +1,7 @@
 <?php
 
-$users = \Factories::models('Blog\Models\UserModel');
+use CodeIgniter\Config\Factories;
+
+$users = Factories::models('Blog\Models\UserModel');
 // Or
-$users = \Factories::models(\Blog\Models\UserModel::class);
+$users = Factories::models(\Blog\Models\UserModel::class);
diff --git a/user_guide_src/source/concepts/factories/004.php b/user_guide_src/source/concepts/factories/004.php
index 5f297508e007..5b85a714b827 100644
--- a/user_guide_src/source/concepts/factories/004.php
+++ b/user_guide_src/source/concepts/factories/004.php
@@ -1,4 +1,6 @@
 <?php
 
+use CodeIgniter\Config\Factories;
+
 $conn  = db_connect('auth');
-$users = \Factories::models('UserModel', [], $conn);
+$users = Factories::models('UserModel', [], $conn);
diff --git a/user_guide_src/source/concepts/factories/006.php b/user_guide_src/source/concepts/factories/006.php
index 3b3034da9a54..3eb98389d193 100644
--- a/user_guide_src/source/concepts/factories/006.php
+++ b/user_guide_src/source/concepts/factories/006.php
@@ -1,6 +1,9 @@
 <?php
 
-\Factories::setOptions('filters', [
-    'instanceOf' => \FilterInterface::class,
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Filters\FilterInterface;
+
+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
index 3228272e8a41..0a07cf3509fd 100644
--- a/user_guide_src/source/concepts/factories/007.php
+++ b/user_guide_src/source/concepts/factories/007.php
@@ -1,4 +1,6 @@
 <?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
+use CodeIgniter\Config\Factories;
+
+$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/factories/010.php b/user_guide_src/source/concepts/factories/010.php
index f43c1ac85ad9..29abf8cd2d01 100644
--- a/user_guide_src/source/concepts/factories/010.php
+++ b/user_guide_src/source/concepts/factories/010.php
@@ -1,3 +1,5 @@
 <?php
 
-$users = \Factories::models('Blog\Models\UserModel', ['preferApp' => false]);
+use CodeIgniter\Config\Factories;
+
+$users = Factories::models('Blog\Models\UserModel', ['preferApp' => false]);
diff --git a/user_guide_src/source/concepts/factories/013.php b/user_guide_src/source/concepts/factories/013.php
index 5a65be63bba3..8f6ed48f9228 100644
--- a/user_guide_src/source/concepts/factories/013.php
+++ b/user_guide_src/source/concepts/factories/013.php
@@ -1,3 +1,5 @@
 <?php
 
-$lib = \Factories::libraries('Sub/SubLib');
+use CodeIgniter\Config\Factories;
+
+$lib = Factories::libraries('Sub/SubLib');
diff --git a/user_guide_src/source/concepts/factories/014.php b/user_guide_src/source/concepts/factories/014.php
index 449ee01861d9..9fc4be7ace14 100644
--- a/user_guide_src/source/concepts/factories/014.php
+++ b/user_guide_src/source/concepts/factories/014.php
@@ -1,3 +1,5 @@
 <?php
 
-\Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel');
+use CodeIgniter\Config\Factories;
+
+Factories::define('models', 'Myth\Auth\Models\UserModel', 'App\Models\UserModel');
diff --git a/user_guide_src/source/database/query_builder/111.php b/user_guide_src/source/database/query_builder/111.php
index d4d14a803d8f..707c5fc200be 100644
--- a/user_guide_src/source/database/query_builder/111.php
+++ b/user_guide_src/source/database/query_builder/111.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $data = [
     [
         'id'      => 2,
@@ -15,7 +17,7 @@
     ],
 ];
 
-$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->setData($data)->updateFields($additionalUpdateField, true)->upsertBatch();
 /* MySQLi produces:
diff --git a/user_guide_src/source/database/query_builder/115.php b/user_guide_src/source/database/query_builder/115.php
index 640c5cb29bdc..803e2be5427f 100644
--- a/user_guide_src/source/database/query_builder/115.php
+++ b/user_guide_src/source/database/query_builder/115.php
@@ -1,11 +1,13 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $query = $this->db->table('user2')
     ->select('user2.name, user2.email, user2.country')
     ->join('user', 'user.email = user2.email', 'left')
     ->where('user.email IS NULL');
 
-$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->setQueryAsData($query)
     ->onConstraint('email')
diff --git a/user_guide_src/source/database/query_builder/116.php b/user_guide_src/source/database/query_builder/116.php
index 8f2b066276b4..8ec1f06879f4 100644
--- a/user_guide_src/source/database/query_builder/116.php
+++ b/user_guide_src/source/database/query_builder/116.php
@@ -1,11 +1,13 @@
 <?php
 
+use CodeIgniter\Database\RawSql;
+
 $query = $this->db->table('user2')
     ->select('user2.name, user2.email, user2.country')
     ->join('user', 'user.email = user2.email', 'inner')
     ->where('user2.country', 'US');
 
-$additionalUpdateField = ['updated_at' => new \RawSql('CURRENT_TIMESTAMP')];
+$additionalUpdateField = ['updated_at' => new RawSql('CURRENT_TIMESTAMP')];
 
 $sql = $builder->table('user')
     ->setQueryAsData($query, null, 'u')
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index cae63a4c0971..162b18ce734c 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -1,16 +1,18 @@
 <?php
 
+use CodeIgniter\Events\Events;
+
 // Call a standalone function
-\Events::on('pre_system', 'some_function');
+Events::on('pre_system', 'some_function');
 
 // Call on an instance method
 $user = new \User();
-\Events::on('pre_system', [$user, 'someMethod']);
+Events::on('pre_system', [$user, 'someMethod']);
 
 // Call on a static method
-\Events::on('pre_system', 'SomeClass::someMethod');
+Events::on('pre_system', 'SomeClass::someMethod');
 
 // Use a Closure
-\Events::on('pre_system', static function (...$params) {
+Events::on('pre_system', static function (...$params) {
     // ...
 });
diff --git a/user_guide_src/source/extending/events/003.php b/user_guide_src/source/extending/events/003.php
index bc747b528e5d..0754da2411c8 100644
--- a/user_guide_src/source/extending/events/003.php
+++ b/user_guide_src/source/extending/events/003.php
@@ -1,3 +1,5 @@
 <?php
 
-\Events::on('post_controller_constructor', 'some_function', 25);
+use CodeIgniter\Events\Events;
+
+Events::on('post_controller_constructor', 'some_function', 25);
diff --git a/user_guide_src/source/extending/events/006.php b/user_guide_src/source/extending/events/006.php
index 82f4d8fefa31..a6574b254598 100644
--- a/user_guide_src/source/extending/events/006.php
+++ b/user_guide_src/source/extending/events/006.php
@@ -1,7 +1,9 @@
 <?php
 
-\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+use CodeIgniter\Events\Events;
 
-\Events::on('some_event', static function ($foo, $bar, $baz) {
+Events::trigger('some_events', $foo, $bar, $baz);
+
+Events::on('some_event', static function ($foo, $bar, $baz) {
     // ...
 });
diff --git a/user_guide_src/source/extending/events/007.php b/user_guide_src/source/extending/events/007.php
index 84fb1d7281b3..6adcc150b9ae 100644
--- a/user_guide_src/source/extending/events/007.php
+++ b/user_guide_src/source/extending/events/007.php
@@ -1,3 +1,5 @@
 <?php
 
-\Events::simulate(true);
+use CodeIgniter\Events\Events;
+
+Events::simulate(true);
diff --git a/user_guide_src/source/extending/events/008.php b/user_guide_src/source/extending/events/008.php
index 483972fe68df..e887ac031b79 100644
--- a/user_guide_src/source/extending/events/008.php
+++ b/user_guide_src/source/extending/events/008.php
@@ -1,3 +1,5 @@
 <?php
 
-\Events::simulate(false);
+use CodeIgniter\Events\Events;
+
+Events::simulate(false);
diff --git a/user_guide_src/source/incoming/routing/045.php b/user_guide_src/source/incoming/routing/045.php
index 8e78434a96c3..d3d5e66dbd7c 100644
--- a/user_guide_src/source/incoming/routing/045.php
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -1,7 +1,10 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends \BaseRouting
+use CodeIgniter\Config\Routing as BaseRouting;
+
+// ...
+class Routing extends BaseRouting
 {
     // ...
     public string $defaultNamespace = '';
diff --git a/user_guide_src/source/incoming/routing/049.php b/user_guide_src/source/incoming/routing/049.php
index 41862c50c401..303fff95304a 100644
--- a/user_guide_src/source/incoming/routing/049.php
+++ b/user_guide_src/source/incoming/routing/049.php
@@ -1,7 +1,10 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends \BaseRouting
+use CodeIgniter\Config\Routing as BaseRouting;
+
+// ...
+class Routing extends BaseRouting
 {
     // ...
     public bool $translateURIDashes = true;
diff --git a/user_guide_src/source/incoming/routing/050.php b/user_guide_src/source/incoming/routing/050.php
index ea30ce45c0d3..f11fabf834f9 100644
--- a/user_guide_src/source/incoming/routing/050.php
+++ b/user_guide_src/source/incoming/routing/050.php
@@ -1,7 +1,10 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends \BaseRouting
+use CodeIgniter\Config\Routing as BaseRouting;
+
+// ...
+class Routing extends BaseRouting
 {
     // ...
     public bool $autoRoute = false;
diff --git a/user_guide_src/source/incoming/routing/051.php b/user_guide_src/source/incoming/routing/051.php
index 3bb721fcb082..8c598c400b03 100644
--- a/user_guide_src/source/incoming/routing/051.php
+++ b/user_guide_src/source/incoming/routing/051.php
@@ -1,7 +1,10 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends \BaseRouting
+use CodeIgniter\Config\Routing as BaseRouting;
+
+// ...
+class Routing extends BaseRouting
 {
     // ...
     public ?string $override404 = 'App\Errors::show404';
diff --git a/user_guide_src/source/incoming/routing/052.php b/user_guide_src/source/incoming/routing/052.php
index d4cf6667ab3e..cf40693c1a9c 100644
--- a/user_guide_src/source/incoming/routing/052.php
+++ b/user_guide_src/source/incoming/routing/052.php
@@ -1,7 +1,10 @@
 <?php
 
 // In app/Config/Routing.php
-class Routing extends \BaseRouting
+use CodeIgniter\Config\Routing as BaseRouting;
+
+// ...
+class Routing extends BaseRouting
 {
     // ...
     public bool $prioritize = true;
diff --git a/user_guide_src/source/libraries/caching/012.php b/user_guide_src/source/libraries/caching/012.php
index cb4d40f3e9ef..b6a56120731d 100644
--- a/user_guide_src/source/libraries/caching/012.php
+++ b/user_guide_src/source/libraries/caching/012.php
@@ -1,3 +1,5 @@
 <?php
 
-$prefixedKey = \BaseHandler::validateKey($key, $prefix);
+use CodeIgniter\Cache\Handlers\BaseHandler;
+
+$prefixedKey = BaseHandler::validateKey($key, $prefix);
diff --git a/user_guide_src/source/libraries/cookies/013.php b/user_guide_src/source/libraries/cookies/013.php
index 68356ce78bd2..6dcb79807380 100644
--- a/user_guide_src/source/libraries/cookies/013.php
+++ b/user_guide_src/source/libraries/cookies/013.php
@@ -1,9 +1,11 @@
 <?php
 
+use Config\Services;
+
 cookies()->get(); // array of Cookie objects
 
 // alternatively, you can use the display method
 cookies()->display();
 
 // or even from the Response
-\Services::response()->getCookies();
+Services::response()->getCookies();
diff --git a/user_guide_src/source/libraries/files/011.php b/user_guide_src/source/libraries/files/011.php
index 91dcd69ac9d8..db63f20a0f79 100644
--- a/user_guide_src/source/libraries/files/011.php
+++ b/user_guide_src/source/libraries/files/011.php
@@ -1,6 +1,8 @@
 <?php
 
-$files = new \FileCollection([
+use CodeIgniter\Files\FileCollection;
+
+$files = new FileCollection([
     FCPATH . 'index.php',
     ROOTPATH . 'spark',
 ]);
diff --git a/user_guide_src/source/libraries/files/015.php b/user_guide_src/source/libraries/files/015.php
index 6850de2c18b0..f03f2a205c32 100644
--- a/user_guide_src/source/libraries/files/015.php
+++ b/user_guide_src/source/libraries/files/015.php
@@ -1,6 +1,8 @@
 <?php
 
-$files = new \FileCollection();
+use CodeIgniter\Files\FileCollection;
+
+$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
diff --git a/user_guide_src/source/libraries/publisher/006.php b/user_guide_src/source/libraries/publisher/006.php
index d13afdf4de80..5a1eb24c87b2 100644
--- a/user_guide_src/source/libraries/publisher/006.php
+++ b/user_guide_src/source/libraries/publisher/006.php
@@ -1,3 +1,5 @@
 <?php
 
-$memePublishers = \Publisher::discover('CatGIFs');
+use CodeIgniter\Publisher\Publisher;
+
+$memePublishers = Publisher::discover('CatGIFs');
diff --git a/user_guide_src/source/libraries/publisher/011.php b/user_guide_src/source/libraries/publisher/011.php
index 0c64fb65ca99..6e7ce630232e 100644
--- a/user_guide_src/source/libraries/publisher/011.php
+++ b/user_guide_src/source/libraries/publisher/011.php
@@ -1,6 +1,8 @@
 <?php
 
-$publisher = new \Publisher('/home/source', '/home/destination');
+use CodeIgniter\Publisher\Publisher;
+
+$publisher = new Publisher('/home/source', '/home/destination');
 $publisher->addPaths([
     'pencil/lead.png',
     'metal/lead.png',
diff --git a/user_guide_src/source/libraries/publisher/012.php b/user_guide_src/source/libraries/publisher/012.php
index 2ca41a5a33db..7d978744758a 100644
--- a/user_guide_src/source/libraries/publisher/012.php
+++ b/user_guide_src/source/libraries/publisher/012.php
@@ -1,6 +1,8 @@
 <?php
 
-$publisher = new \Publisher('/home/source', '/home/destination');
+use CodeIgniter\Publisher\Publisher;
+
+$publisher = new Publisher('/home/source', '/home/destination');
 $publisher->addPaths([
     'pencil/lead.png',
     'metal/lead.png',
diff --git a/user_guide_src/source/libraries/uri/007.php b/user_guide_src/source/libraries/uri/007.php
index 4fe96c6bf111..71f597659e27 100644
--- a/user_guide_src/source/libraries/uri/007.php
+++ b/user_guide_src/source/libraries/uri/007.php
@@ -1,6 +1,8 @@
 <?php
 
-$uriString = \URI::createURIString($scheme, $authority, $path, $query, $fragment);
+use CodeIgniter\HTTP\URI;
+
+$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');
+echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
diff --git a/user_guide_src/source/testing/fabricator/003.php b/user_guide_src/source/testing/fabricator/003.php
index 3a9c90299bf1..6172108f59ab 100644
--- a/user_guide_src/source/testing/fabricator/003.php
+++ b/user_guide_src/source/testing/fabricator/003.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Test\Fabricator;
+
 $model = new \UserModel($testDbConnection);
 
-$fabricator = new \Fabricator($model);
+$fabricator = new Fabricator($model);
diff --git a/user_guide_src/source/testing/fabricator/004.php b/user_guide_src/source/testing/fabricator/004.php
index e3765f60f703..da3e6d135f76 100644
--- a/user_guide_src/source/testing/fabricator/004.php
+++ b/user_guide_src/source/testing/fabricator/004.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Test\Fabricator;
+
 $formatters = [
     'first'  => 'firstName',
     'email'  => 'email',
@@ -7,4 +9,4 @@
     'avatar' => 'imageUrl',
 ];
 
-$fabricator = new \Fabricator(\UserModel::class, $formatters);
+$fabricator = new Fabricator(\UserModel::class, $formatters);
diff --git a/user_guide_src/source/testing/fabricator/007.php b/user_guide_src/source/testing/fabricator/007.php
index b1f664b21ff9..e615ae4cd923 100644
--- a/user_guide_src/source/testing/fabricator/007.php
+++ b/user_guide_src/source/testing/fabricator/007.php
@@ -1,3 +1,5 @@
 <?php
 
-$fabricator = new \Fabricator(\UserModel::class, null, 'fr_FR');
+use CodeIgniter\Test\Fabricator;
+
+$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
index fec3d5b5456b..1a0d56cf95e2 100644
--- a/user_guide_src/source/testing/fabricator/008.php
+++ b/user_guide_src/source/testing/fabricator/008.php
@@ -1,5 +1,7 @@
 <?php
 
-$fabricator = new \Fabricator(\UserFabricator::class);
+use CodeIgniter\Test\Fabricator;
+
+$fabricator = new Fabricator(\UserFabricator::class);
 $testUser   = $fabricator->make();
 print_r($testUser);
diff --git a/user_guide_src/source/testing/fabricator/020.php b/user_guide_src/source/testing/fabricator/020.php
index ce9d1e0a43e2..784afa93718c 100644
--- a/user_guide_src/source/testing/fabricator/020.php
+++ b/user_guide_src/source/testing/fabricator/020.php
@@ -1,5 +1,7 @@
 <?php
 
-$fabricator = new \Fabricator('App\Models\UserModel');
+use CodeIgniter\Test\Fabricator;
+
+$fabricator = new Fabricator('App\Models\UserModel');
 $fabricator->setOverrides(['name' => 'Gerry']);
 $user = $fabricator->create();
diff --git a/user_guide_src/source/testing/overview/008.php b/user_guide_src/source/testing/overview/008.php
index cd1f6725f485..6599533453e8 100644
--- a/user_guide_src/source/testing/overview/008.php
+++ b/user_guide_src/source/testing/overview/008.php
@@ -1,9 +1,11 @@
 <?php
 
-\Events::on('foo', static function ($arg) use (&$result) {
+use CodeIgniter\Events\Events;
+
+Events::on('foo', static function ($arg) use (&$result) {
     $result = $arg;
 });
 
-\Events::trigger('foo', 'bar');
+Events::trigger('foo', 'bar');
 
 $this->assertEventTriggered('foo');
diff --git a/user_guide_src/source/testing/overview/011.php b/user_guide_src/source/testing/overview/011.php
index 8f4f0fe90133..7f96f4f93e44 100644
--- a/user_guide_src/source/testing/overview/011.php
+++ b/user_guide_src/source/testing/overview/011.php
@@ -1,5 +1,7 @@
 <?php
 
-$timer = new \Timer();
+use CodeIgniter\Debug\Timer;
+
+$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 7543ca5ecce0..af7f506d2a46 100644
--- a/user_guide_src/source/testing/overview/012.php
+++ b/user_guide_src/source/testing/overview/012.php
@@ -1,5 +1,7 @@
 <?php
 
-$timer = new \Timer();
+use CodeIgniter\Debug\Timer;
+
+$timer = new Timer();
 $timer->start('longjohn', strtotime('-11 minutes'));
 $this->assertCloseEnoughString(11 * 60, $timer->getElapsedTime('longjohn'));

From 37a4a523049f4b59dfb2eb890ef34d3bc232814d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:28:26 +0900
Subject: [PATCH 035/148] docs: fix incorrect global classname in sample code

---
 user_guide_src/source/general/modules/005.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/modules/005.php b/user_guide_src/source/general/modules/005.php
index 3488279b32ea..954c4eef7c37 100644
--- a/user_guide_src/source/general/modules/005.php
+++ b/user_guide_src/source/general/modules/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$filters->aliases['menus'] = \MenusFilter::class;
+$filters->aliases['menus'] = \App\Filters\MenusFilter::class;

From 20996a80fcd56d94ce257e83ddf158e865f500f9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:35:34 +0900
Subject: [PATCH 036/148] docs: add namespace App\Libraries to sample code

---
 user_guide_src/source/incoming/incomingrequest/003.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest/003.php b/user_guide_src/source/incoming/incomingrequest/003.php
index 80cee777236a..78378b4396aa 100644
--- a/user_guide_src/source/incoming/incomingrequest/003.php
+++ b/user_guide_src/source/incoming/incomingrequest/003.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Libraries;
+
 use CodeIgniter\HTTP\RequestInterface;
 
 class SomeClass
@@ -12,4 +14,4 @@ public function __construct(RequestInterface $request)
     }
 }
 
-$someClass = new \SomeClass(\Config\Services::request());
+$someClass = new SomeClass(\Config\Services::request());

From 4dd42c29b1a721923fd5835ff24b77c40748c1b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:39:09 +0900
Subject: [PATCH 037/148] docs: add namespace to sample class

---
 user_guide_src/source/incoming/routing/020.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
index c25debb132e1..450d3dd499d5 100644
--- a/user_guide_src/source/incoming/routing/020.php
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -1,7 +1,9 @@
 <?php
 
+use App\Libraries\RSSFeeder;
+
 $routes->get('feed', static function () {
-    $rss = new \RSSFeeder();
+    $rss = new RSSFeeder();
 
     return $rss->feed('general');
 });

From 3a06211f00344bf327e051c836204cb80687fa16 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:42:11 +0900
Subject: [PATCH 038/148] docs: fix namespace for UserModel

---
 user_guide_src/source/testing/fabricator/003.php | 3 ++-
 user_guide_src/source/testing/fabricator/004.php | 3 ++-
 user_guide_src/source/testing/fabricator/007.php | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/testing/fabricator/003.php b/user_guide_src/source/testing/fabricator/003.php
index 6172108f59ab..6f03358f26b1 100644
--- a/user_guide_src/source/testing/fabricator/003.php
+++ b/user_guide_src/source/testing/fabricator/003.php
@@ -1,7 +1,8 @@
 <?php
 
+use App\Models\UserModel;
 use CodeIgniter\Test\Fabricator;
 
-$model = new \UserModel($testDbConnection);
+$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
index da3e6d135f76..e9578755b13b 100644
--- a/user_guide_src/source/testing/fabricator/004.php
+++ b/user_guide_src/source/testing/fabricator/004.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\UserModel;
 use CodeIgniter\Test\Fabricator;
 
 $formatters = [
@@ -9,4 +10,4 @@
     'avatar' => 'imageUrl',
 ];
 
-$fabricator = new Fabricator(\UserModel::class, $formatters);
+$fabricator = new Fabricator(UserModel::class, $formatters);
diff --git a/user_guide_src/source/testing/fabricator/007.php b/user_guide_src/source/testing/fabricator/007.php
index e615ae4cd923..ce0acdc49868 100644
--- a/user_guide_src/source/testing/fabricator/007.php
+++ b/user_guide_src/source/testing/fabricator/007.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\UserModel;
 use CodeIgniter\Test\Fabricator;
 
-$fabricator = new Fabricator(\UserModel::class, null, 'fr_FR');
+$fabricator = new Fabricator(UserModel::class, null, 'fr_FR');

From 3d78f16789839dc1f1020654e43b8f8693855b7d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 6 Jan 2024 10:47:28 +0900
Subject: [PATCH 039/148] docs: add namespace App\Libraries to sample code

---
 user_guide_src/source/testing/overview/013.php | 4 +++-
 user_guide_src/source/testing/overview/014.php | 4 +++-
 user_guide_src/source/testing/overview/015.php | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/testing/overview/013.php b/user_guide_src/source/testing/overview/013.php
index a7ae7a53d7cf..bca1a8513f67 100644
--- a/user_guide_src/source/testing/overview/013.php
+++ b/user_guide_src/source/testing/overview/013.php
@@ -1,7 +1,9 @@
 <?php
 
+use App\Libraries\Foo;
+
 // Create an instance of the class to test
-$obj = new \Foo();
+$obj = new Foo();
 
 // Get the invoker for the 'privateMethod' method.
 $method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
diff --git a/user_guide_src/source/testing/overview/014.php b/user_guide_src/source/testing/overview/014.php
index 9847b698eb21..eb2509ac64b8 100644
--- a/user_guide_src/source/testing/overview/014.php
+++ b/user_guide_src/source/testing/overview/014.php
@@ -1,7 +1,9 @@
 <?php
 
+use App\Libraries\Foo;
+
 // Create an instance of the class to test
-$obj = new \Foo();
+$obj = new Foo();
 
 // 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 f481e208e03b..059c55a12011 100644
--- a/user_guide_src/source/testing/overview/015.php
+++ b/user_guide_src/source/testing/overview/015.php
@@ -1,7 +1,9 @@
 <?php
 
+use App\Libraries\Foo;
+
 // Create an instance of the class to test
-$obj = new \Foo();
+$obj = new Foo();
 
 // Set the value
 $this->setPrivateProperty($obj, 'baz', 'oops!');

From 4bbc13c940c5b8c341382379f020ba3ced20ec0a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Jan 2024 10:15:02 +0900
Subject: [PATCH 040/148] docs: fix namespaces for sample classes

---
 user_guide_src/source/database/query_builder/077.php | 4 +++-
 user_guide_src/source/extending/events/002.php       | 2 +-
 user_guide_src/source/testing/overview/006.php       | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/query_builder/077.php b/user_guide_src/source/database/query_builder/077.php
index e35bacf9564e..0290aa881db1 100644
--- a/user_guide_src/source/database/query_builder/077.php
+++ b/user_guide_src/source/database/query_builder/077.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Libraries;
+
 class Myclass
 {
     public $title   = 'My Title';
@@ -7,6 +9,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/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index 162b18ce734c..4e602f6690c7 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -6,7 +6,7 @@
 Events::on('pre_system', 'some_function');
 
 // Call on an instance method
-$user = new \User();
+$user = new \App\Libraries\User();
 Events::on('pre_system', [$user, 'someMethod']);
 
 // Call on a static method
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index 26043d11dc1a..22c079ffdd08 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Traits;
+
 trait AuthTrait
 {
     protected function setUpAuthTrait()
@@ -15,7 +17,7 @@ protected function setUpAuthTrait()
 
 final class AuthenticationFeatureTest extends CIUnitTestCase
 {
-    use \AuthTrait;
+    use AuthTrait;
 
     // ...
 }

From 192c5b252a08c9d90f4c50c0495728ace953f11b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Jan 2024 10:20:40 +0900
Subject: [PATCH 041/148] docs: improve $builder->insert() description

---
 user_guide_src/source/database/query_builder.rst     | 10 ++++++----
 user_guide_src/source/database/query_builder/077.php |  6 +-----
 user_guide_src/source/database/query_builder/121.php |  7 +++++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 user_guide_src/source/database/query_builder/121.php

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 56035153db80..fb95a006efd4 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -829,15 +829,17 @@ method. Here is an example using an array:
 
 The first parameter is an associative array of values.
 
+.. note:: All values except ``RawSql`` are escaped automatically producing safer queries.
+
+.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 Here is an example using an object:
 
 .. literalinclude:: query_builder/077.php
 
-The first parameter is an object.
+.. literalinclude:: query_builder/121.php
 
-.. note:: All values except ``RawSql`` are escaped automatically producing safer queries.
-
-.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+The first parameter is an object.
 
 $builder->ignore()
 ------------------
diff --git a/user_guide_src/source/database/query_builder/077.php b/user_guide_src/source/database/query_builder/077.php
index 0290aa881db1..15f26e6f018c 100644
--- a/user_guide_src/source/database/query_builder/077.php
+++ b/user_guide_src/source/database/query_builder/077.php
@@ -2,13 +2,9 @@
 
 namespace App\Libraries;
 
-class Myclass
+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/121.php b/user_guide_src/source/database/query_builder/121.php
new file mode 100644
index 000000000000..d230aba571b6
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/121.php
@@ -0,0 +1,7 @@
+<?php
+
+use App\Libraries\MyClass;
+
+$object = new MyClass();
+$builder->insert($object);
+// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')

From 702261d07444efb4d5db9ee8f34fd8727702ee1e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Jan 2024 10:25:54 +0900
Subject: [PATCH 042/148] docs: split sample code file

---
 user_guide_src/source/testing/overview.rst     |  2 ++
 user_guide_src/source/testing/overview/006.php |  9 ---------
 user_guide_src/source/testing/overview/022.php | 13 +++++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 user_guide_src/source/testing/overview/022.php

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 2dd63d4eed9e..6cd60c100e73 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -124,6 +124,8 @@ logged in user:
 
 .. literalinclude:: overview/006.php
 
+.. literalinclude:: overview/022.php
+
 Additional Assertions
 ---------------------
 
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index 22c079ffdd08..98a31481583a 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -12,12 +12,3 @@ protected function setUpAuthTrait()
 
     // ...
 }
-
-use CodeIgniter\Test\CIUnitTestCase;
-
-final class AuthenticationFeatureTest extends CIUnitTestCase
-{
-    use AuthTrait;
-
-    // ...
-}
diff --git a/user_guide_src/source/testing/overview/022.php b/user_guide_src/source/testing/overview/022.php
new file mode 100644
index 000000000000..8d53304ebfec
--- /dev/null
+++ b/user_guide_src/source/testing/overview/022.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Tests;
+
+use App\Traits\AuthTrait;
+use CodeIgniter\Test\CIUnitTestCase;
+
+final class AuthenticationFeatureTest extends CIUnitTestCase
+{
+    use AuthTrait;
+
+    // ...
+}

From 73cb246bfc02140aa5a70cb360eabb13597e50b5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Jan 2024 10:41:30 +0900
Subject: [PATCH 043/148] docs: improve sample for insert(), update(), upsert()

---
 user_guide_src/source/database/query_builder.rst     |  6 ++++++
 user_guide_src/source/database/query_builder/087.php |  9 ++-------
 user_guide_src/source/database/query_builder/089.php | 11 +++--------
 user_guide_src/source/database/query_builder/113.php |  9 ++-------
 user_guide_src/source/database/query_builder/122.php | 10 ++++++++++
 5 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 user_guide_src/source/database/query_builder/122.php

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index fb95a006efd4..0be07d71340b 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -924,6 +924,8 @@ The first parameter is an associative array of values.
 
 Here is an example using an object:
 
+.. literalinclude:: query_builder/122.php
+
 .. literalinclude:: query_builder/113.php
 
 The first parameter is an object.
@@ -1058,6 +1060,8 @@ You can also pass an associative array to this method:
 
 Or an object:
 
+.. literalinclude:: query_builder/077.php
+
 .. literalinclude:: query_builder/087.php
 
 $builder->update()
@@ -1071,6 +1075,8 @@ is an example using an array:
 
 Or you can supply an object:
 
+.. literalinclude:: query_builder/077.php
+
 .. literalinclude:: query_builder/089.php
 
 .. note:: All values except ``RawSql`` are escaped automatically producing safer queries.
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
index 16280213efb4..3ecba8d34bd2 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -1,12 +1,7 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+use App\Libraries\MyClass;
 
-$object = new \Myclass();
+$object = new MyClass();
 $builder->set($object);
 $builder->insert();
diff --git a/user_guide_src/source/database/query_builder/089.php b/user_guide_src/source/database/query_builder/089.php
index 2709d96502c6..be7e3b9aa6ad 100644
--- a/user_guide_src/source/database/query_builder/089.php
+++ b/user_guide_src/source/database/query_builder/089.php
@@ -1,18 +1,13 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+use App\Libraries\MyClass;
 
-$object = new \Myclass();
+$object = new MyClass();
 $builder->where('id', $id);
 $builder->update($object);
 /*
  * Produces:
  * UPDATE `mytable`
- * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+ * SET `title` = '{$title}', `content` = '{$content}', `date` = '{$date}'
  * WHERE id = `$id`
  */
diff --git a/user_guide_src/source/database/query_builder/113.php b/user_guide_src/source/database/query_builder/113.php
index 0bb85d93e006..f57f8410b440 100644
--- a/user_guide_src/source/database/query_builder/113.php
+++ b/user_guide_src/source/database/query_builder/113.php
@@ -1,11 +1,6 @@
 <?php
 
-class Myclass
-{
-    public $email   = 'ahmadinejad@example.com';
-    public $name    = 'Ahmadinejad';
-    public $country = 'Iran';
-}
+use App\Libraries\MyClass;
 
-$object = new \Myclass();
+$object = new MyClass();
 $builder->upsert($object);
diff --git a/user_guide_src/source/database/query_builder/122.php b/user_guide_src/source/database/query_builder/122.php
new file mode 100644
index 000000000000..3197fcb03782
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/122.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Libraries;
+
+class MyClass
+{
+    public $email   = 'ahmadinejad@example.com';
+    public $name    = 'Ahmadinejad';
+    public $country = 'Iran';
+}

From 2aab39371ae257327bcb954dcd1b2c00311d6f94 Mon Sep 17 00:00:00 2001
From: Toto <totoprayogo1916@gmail.com>
Date: Sun, 7 Jan 2024 15:02:01 +0700
Subject: [PATCH 044/148] Fix doc: include empty values by `array_group_by()`
 (#8396)

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

diff --git a/user_guide_src/source/helpers/array_helper/014.php b/user_guide_src/source/helpers/array_helper/014.php
index 99089d236598..8cd64f7f84bb 100644
--- a/user_guide_src/source/helpers/array_helper/014.php
+++ b/user_guide_src/source/helpers/array_helper/014.php
@@ -1,6 +1,6 @@
 <?php
 
-$result = array_group_by($employees, ['gender', 'hr.department']);
+$result = array_group_by($employees, ['gender', 'hr.department'], true);
 
 $result = [
     '' => [

From 495fb0c83a6acabed5db4bea8dd0e7deb84e1602 Mon Sep 17 00:00:00 2001
From: Jason Liang <jasonliang512@gmail.com>
Date: Sat, 6 Jan 2024 21:43:40 -0800
Subject: [PATCH 045/148] fix: typo in pager default_simple

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

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 1d32322ab5d4..e63572442810 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -2491,11 +2491,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Pager/Pager.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to method CodeIgniter\\\\Pager\\\\PagerRenderer\\:\\:getNext\\(\\) with incorrect case\\: getnext$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Pager/Views/default_simple.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Argument \\#1 \\$name \\(class\\-string\\) passed to function model does not extend CodeIgniter\\\\\\\\Model\\.$#',
 	'count' => 1,
diff --git a/system/Pager/Views/default_simple.php b/system/Pager/Views/default_simple.php
index fc00ce88e1e5..df7f7e0e84b8 100644
--- a/system/Pager/Views/default_simple.php
+++ b/system/Pager/Views/default_simple.php
@@ -15,7 +15,7 @@
 			</a>
 		</li>
 		<li <?= $pager->hasNext() ? '' : 'class="disabled"' ?>>
-			<a href="<?= $pager->getnext() ?? '#' ?>" aria-label="<?= lang('Pager.next') ?>">
+			<a href="<?= $pager->getNext() ?? '#' ?>" aria-label="<?= lang('Pager.next') ?>">
 				<span aria-hidden="true"><?= lang('Pager.older') ?></span>
 			</a>
 		</li>

From d64fdb5b4e8aa2e9505818bc74d5155e9067bf0e Mon Sep 17 00:00:00 2001
From: Michal Sniatala <michal@sniatala.pl>
Date: Tue, 9 Jan 2024 08:30:38 +0100
Subject: [PATCH 046/148] feat: remove `pre-commit` (#8406)

* remove pre-commit

* re-add pre-commit and setup.sh
---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e1128874b4ff..605cd190e89f 100644
--- a/composer.json
+++ b/composer.json
@@ -91,8 +91,7 @@
     },
     "scripts": {
         "post-update-cmd": [
-            "CodeIgniter\\ComposerScripts::postUpdate",
-            "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
+            "CodeIgniter\\ComposerScripts::postUpdate"
         ],
         "analyze": [
             "Composer\\Config::disableProcessTimeout",

From 42afdb1a31575bf6191a56b07c2283e37df26331 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 15:10:43 +0000
Subject: [PATCH 047/148] chore(deps-dev): update rector/rector requirement
 from 0.18.13 to 0.19.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.18.13...0.19.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 605cd190e89f..00d4d9275a6a 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.18.13",
+        "rector/rector": "0.19.0",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

From 9fef92553244ca892fa60c500be833da8dfd3c6f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 9 Jan 2024 22:15:52 +0700
Subject: [PATCH 048/148] Fix parallel timeout

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

diff --git a/rector.php b/rector.php
index 5be63b31e59d..7cf424f73e88 100644
--- a/rector.php
+++ b/rector.php
@@ -59,7 +59,7 @@
         PHPUnitSetList::PHPUNIT_100,
     ]);
 
-    $rectorConfig->parallel();
+    $rectorConfig->parallel(120);
 
     // paths to refactor; solid alternative to CLI arguments
     $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils']);

From d5fb953dd7333624ca8fb33fc1497217ae9dd4c4 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 9 Jan 2024 22:17:42 +0700
Subject: [PATCH 049/148] update Rector\Core subnamespace to Rector

---
 .../Rector/PassStrictParameterToFunctionParameterRector.php | 2 +-
 utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php   | 2 +-
 utils/Rector/UnderscoreToCamelCaseVariableNameRector.php    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/Rector/PassStrictParameterToFunctionParameterRector.php b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
index c6e92bb9d418..14b1a840e60b 100644
--- a/utils/Rector/PassStrictParameterToFunctionParameterRector.php
+++ b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
@@ -18,7 +18,7 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index 06c8ca39de4d..5bdd8ed8bb7b 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -19,7 +19,7 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\NodeTraverser;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 4af0be534e61..23035e7bee46 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -22,9 +22,9 @@
 use PhpParser\Node\Stmt\Function_;
 use PhpParser\Node\Stmt\Namespace_;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
-use Rector\Core\Php\ReservedKeywordAnalyzer;
-use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Php\ReservedKeywordAnalyzer;
+use Rector\PhpParser\Node\CustomNode\FileWithoutNamespace;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 

From edee5c7100cb9e9512f9a5e98cc1087c927a912f Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
Date: Sun, 14 Jan 2024 22:01:20 +0700
Subject: [PATCH 050/148] docs: update `PULL_REQUEST_TEMPLATE` (#8413)

---
 .github/PULL_REQUEST_TEMPLATE.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 98aa948b795e..f16a793ece5b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,10 +2,11 @@
 
 Each pull request should address a single issue and have a meaningful title.
 
+- PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion.
 - Pull requests must be in English.
 - If a pull request fixes an issue, reference the issue with a suitable keyword (e.g., Fixes <issue number>).
 - All bug fixes should be sent to the __"develop"__ branch, this is where the next bug fix version will be developed.
-- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.3"__
+- PRs with any enhancement should be sent to the next minor version branch, e.g. __"4.5"__
 
 -->
 **Description**

From e5a2ebc1b675700eee9f1b46096b63e823ea82ae Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:52:45 +0700
Subject: [PATCH 051/148] chore: temporary fix for v3.47

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

diff --git a/composer.json b/composer.json
index 00d4d9275a6a..f649114c7dee 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "friendsofphp/php-cs-fixer": "^3.43",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
+        "friendsofphp/php-cs-fixer": "~3.46.0",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
         "php-coveralls/php-coveralls": "^2.5",

From cbdfd3865ebaa2fa7527ed0078d2e7c55c72278f Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:56:43 +0700
Subject: [PATCH 052/148] fix duplicate

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

diff --git a/composer.json b/composer.json
index f649114c7dee..7331880e41cf 100644
--- a/composer.json
+++ b/composer.json
@@ -22,10 +22,9 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.43",
+        "friendsofphp/php-cs-fixer": "~3.46.0",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
-        "friendsofphp/php-cs-fixer": "~3.46.0",
         "nexusphp/cs-config": "^3.6",
         "nexusphp/tachycardia": "^1.0",
         "php-coveralls/php-coveralls": "^2.5",

From 675ec94dc62cfe077f37d2b2292ddb2e70ac0371 Mon Sep 17 00:00:00 2001
From: Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:58:22 +0700
Subject: [PATCH 053/148] Update 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 1c6af5b94446..9df02a62db0f 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.43",
+        "friendsofphp/php-cs-fixer": "~3.46.0",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

From 6f045bf4e0d1708deb9cc81b6e832abd22afff33 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 16 Jan 2024 13:59:33 +0700
Subject: [PATCH 054/148] Update Rector parallel config

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

diff --git a/rector.php b/rector.php
index 7cf424f73e88..b1520c38e10a 100644
--- a/rector.php
+++ b/rector.php
@@ -59,7 +59,7 @@
         PHPUnitSetList::PHPUNIT_100,
     ]);
 
-    $rectorConfig->parallel(120);
+    $rectorConfig->parallel(120, 8, 15);
 
     // paths to refactor; solid alternative to CLI arguments
     $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils']);

From c12f75f82940bca88224cb4081a5b4d59cb959dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 15:51:54 +0000
Subject: [PATCH 055/148] chore(deps-dev): update rector/rector requirement
 from 0.19.0 to 0.19.1

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

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

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

diff --git a/composer.json b/composer.json
index 7331880e41cf..57eb44fc8ed4 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.19.0",
+        "rector/rector": "0.19.1",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

From 7fce7c636dbd89c11859845e74e0d78701186396 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 05:30:42 +0900
Subject: [PATCH 056/148] chore: update php-cs-fixer vertion to ^3.47.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 9df02a62db0f..891bff556031 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -20,7 +20,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.46.0",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",
diff --git a/composer.json b/composer.json
index 7331880e41cf..c20e425c9932 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
         "codeigniter/phpstan-codeigniter": "^1.4",
         "ergebnis/composer-normalize": "^2.28",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "~3.46.0",
+        "friendsofphp/php-cs-fixer": "^3.47.1",
         "kint-php/kint": "^5.0.4",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.6",

From 1d8eb00249340bbed524945ccff3a64a46fca30b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 05:32:21 +0900
Subject: [PATCH 057/148] style: fix stdclass -> stdClass

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

diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index b733e980b30e..77fd8699459f 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Database\SQLite3;
 
 use CodeIgniter\Database\Exceptions\DataException;
-use stdclass;
+use stdClass;
 
 /**
  * Class Table

From 8b2a99122aebcd2f462a53eac3f1b03249a7c12c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 05:33:12 +0900
Subject: [PATCH 058/148] test: composer cs-fix

---
 tests/system/Database/Live/SQLite/GetIndexDataTest.php | 6 +++---
 tests/system/Debug/ExceptionsTest.php                  | 2 +-
 tests/system/View/ViewTest.php                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite/GetIndexDataTest.php
index 7a3c649c9392..c8b34d7ee651 100644
--- a/tests/system/Database/Live/SQLite/GetIndexDataTest.php
+++ b/tests/system/Database/Live/SQLite/GetIndexDataTest.php
@@ -75,19 +75,19 @@ public function testGetIndexData(): void
 
         $expectedIndexes = [];
 
-        $row                        = new stdclass();
+        $row                        = new stdClass();
         $row->name                  = 'PRIMARY';
         $row->fields                = ['id'];
         $row->type                  = 'PRIMARY';
         $expectedIndexes['PRIMARY'] = $row;
 
-        $row                               = new stdclass();
+        $row                               = new stdClass();
         $row->name                         = 'testuser_email';
         $row->fields                       = ['email'];
         $row->type                         = 'UNIQUE';
         $expectedIndexes['testuser_email'] = $row;
 
-        $row                                 = new stdclass();
+        $row                                 = new stdClass();
         $row->name                           = 'testuser_country';
         $row->fields                         = ['country'];
         $row->type                           = 'INDEX';
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 4a30a32f1133..8c85a69006a0 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -31,7 +31,7 @@ final class ExceptionsTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
-    private \CodeIgniter\Debug\Exceptions $exception;
+    private Exceptions $exception;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 3f3b28827a00..3b3b7daf3476 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -27,7 +27,7 @@ final class ViewTest extends CIUnitTestCase
 {
     private FileLocator $loader;
     private string $viewsDir;
-    private \Config\View $config;
+    private Config\View $config;
 
     protected function setUp(): void
     {

From 4fc5e1c97c80d262f55415295e6692714d6d9c97 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 05:39:05 +0900
Subject: [PATCH 059/148] chore: remove ignoreErrors

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

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index e63572442810..738fd6d6f6d8 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1666,11 +1666,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/PreparedQuery.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Class stdClass referenced with incorrect case\\: stdclass\\.$#',
-	'count' => 2,
-	'path' => __DIR__ . '/system/Database/SQLite3/Table.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 2,

From 8c23fed9a8aec75de116fddc44a9051a294bc4fc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 05:48:48 +0900
Subject: [PATCH 060/148] style: fix incorrect case method name

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

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index e63572442810..c5fcc2b39491 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1846,11 +1846,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Exceptions/PageNotFoundException.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Call to method SplFileInfo\\:\\:getBasename\\(\\) with incorrect case\\: getBaseName$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Files/File.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
diff --git a/system/Files/File.php b/system/Files/File.php
index 4e4ee388047e..0113112914ff 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -140,7 +140,7 @@ public function getRandomName(): string
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath = rtrim($targetPath, '/') . '/';
-        $name ??= $this->getBaseName();
+        $name ??= $this->getBasename();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         $oldName = $this->getRealPath() ?: $this->__toString();

From 75d54000aee17788b6a5ee99dc238bddab8e9c90 Mon Sep 17 00:00:00 2001
From: grimpirate <grimpirate_jrs@yahoo.com>
Date: Tue, 16 Jan 2024 18:50:02 -0500
Subject: [PATCH 061/148] DotArrayFilter replace rather than merge

The use of array_merge_recursive rewrites numerically indexed values when attempting to retrieve validated data. Use of the array_replace_recursive function preserves their ordering. Unit test demonstrates the failure of array_merge_recursive's use rather than array_replace_recursive
---
 system/Validation/DotArrayFilter.php           |  2 +-
 tests/system/Validation/DotArrayFilterTest.php | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/system/Validation/DotArrayFilter.php b/system/Validation/DotArrayFilter.php
index 4f696886451d..1ba9b92fa710 100644
--- a/system/Validation/DotArrayFilter.php
+++ b/system/Validation/DotArrayFilter.php
@@ -44,7 +44,7 @@ public static function run(array $indexes, array $array): array
                 $segments
             );
 
-            $result = array_merge_recursive($result, self::filter($segments, $array));
+            $result = array_replace_recursive($result, self::filter($segments, $array));
         }
 
         return $result;
diff --git a/tests/system/Validation/DotArrayFilterTest.php b/tests/system/Validation/DotArrayFilterTest.php
index 6d3b380f517a..c5d5b8310841 100644
--- a/tests/system/Validation/DotArrayFilterTest.php
+++ b/tests/system/Validation/DotArrayFilterTest.php
@@ -180,4 +180,19 @@ public function testRunNestedArray()
         ];
         $this->assertSame($expected, $result);
     }
+
+    public function testRunReturnOrderedIndices()
+    {
+        $data = [
+            'foo' => [
+                2 => 'bar',
+                0 => 'baz',
+                1 => 'biz',
+            ],
+        ];
+
+        $result = DotArrayFilter::run(['foo.2', 'foo.0', 'foo.1'], $data);
+
+        $this->assertSame($data, $result);
+    }
 }

From 49acaf01315258c9f97ee9bc8a4addff293697dd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Jan 2024 13:12:45 +0900
Subject: [PATCH 062/148] chore: update Sphinx version

---
 user_guide_src/requirements.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/requirements.txt b/user_guide_src/requirements.txt
index c1b52845bab9..0048104e26c4 100644
--- a/user_guide_src/requirements.txt
+++ b/user_guide_src/requirements.txt
@@ -1,5 +1,5 @@
-sphinx>=4.5.0,<5
-sphinxcontrib-phpdomain>=0.8.0
-docutils>=0.16
-sphinx-rtd-theme>=0.5.0
-jinja2<3.1
+sphinx>=5.3.0,<6.0.0
+sphinxcontrib-phpdomain>=0.11.0
+docutils>=0.19
+sphinx-rtd-theme>=2.0.0,<3.0.0
+jinja2>=3.1.3,<4.0.0

From b1f1a9cdd59cb3e8fa44c7ada95e846a9c44315c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Jan 2024 16:02:30 +0900
Subject: [PATCH 063/148] test: remove duplicate assignment

---
 tests/_support/Database/Seeds/CITestSeeder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 1749970fe338..7849647c3462 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -168,7 +168,6 @@ public function run(): void
 
         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';

From 37cff22e70e32a3ad45964c2cd1977702e4f1016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 15:03:18 +0000
Subject: [PATCH 064/148] chore(deps): bump actions/cache from 3 to 4

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

---
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/reusable-coveralls.yml                | 4 ++--
 .github/workflows/reusable-phpunit-test.yml             | 4 ++--
 .github/workflows/reusable-serviceless-phpunit-test.yml | 4 ++--
 .github/workflows/test-coding-standards.yml             | 2 +-
 .github/workflows/test-deptrac.yml                      | 4 ++--
 .github/workflows/test-phpstan.yml                      | 4 ++--
 .github/workflows/test-psalm.yml                        | 4 ++--
 .github/workflows/test-rector.yml                       | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/reusable-coveralls.yml b/.github/workflows/reusable-coveralls.yml
index 32415f80a602..0e1df16d4ef5 100644
--- a/.github/workflows/reusable-coveralls.yml
+++ b/.github/workflows/reusable-coveralls.yml
@@ -37,7 +37,7 @@ jobs:
           echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -46,7 +46,7 @@ jobs:
             ${{ github.job }}-
 
       - name: Cache PHPUnit's static analysis cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build/.phpunit.cache/code-coverage
           key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
diff --git a/.github/workflows/reusable-phpunit-test.yml b/.github/workflows/reusable-phpunit-test.yml
index 300f510a0d7f..4943d3f3ac2c 100644
--- a/.github/workflows/reusable-phpunit-test.yml
+++ b/.github/workflows/reusable-phpunit-test.yml
@@ -167,7 +167,7 @@ jobs:
           echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
@@ -178,7 +178,7 @@ jobs:
 
       - name: Cache PHPUnit's static analysis cache
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build/.phpunit.cache/code-coverage
           key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
diff --git a/.github/workflows/reusable-serviceless-phpunit-test.yml b/.github/workflows/reusable-serviceless-phpunit-test.yml
index d7d8f4ca8c46..8a9f00c5e2e6 100644
--- a/.github/workflows/reusable-serviceless-phpunit-test.yml
+++ b/.github/workflows/reusable-serviceless-phpunit-test.yml
@@ -79,7 +79,7 @@ jobs:
           echo "ARTIFACT_NAME=${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}" >> $GITHUB_ENV
 
       - name: Cache Composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
@@ -89,7 +89,7 @@ jobs:
 
       - name: Cache PHPUnit's static analysis cache
         if: ${{ inputs.enable-artifact-upload }}
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build/.phpunit.cache/code-coverage
           key: phpunit-code-coverage-${{ hashFiles('**/phpunit.*') }}
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index 9217f48bb127..5461dda461bd 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -46,7 +46,7 @@ jobs:
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_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 b92f861c790c..67c9843f334e 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -53,7 +53,7 @@ jobs:
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -63,7 +63,7 @@ jobs:
         run: mkdir -p build/
 
       - name: Cache Deptrac results
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build
           key: ${{ runner.os }}-deptrac-${{ github.sha }}
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 3ab82f25c762..a8e6eaefcb49 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -63,7 +63,7 @@ jobs:
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -73,7 +73,7 @@ jobs:
         run: mkdir -p build/phpstan
 
       - name: Cache PHPStan result cache directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build/phpstan
           key: ${{ runner.os }}-phpstan-${{ github.sha }}
diff --git a/.github/workflows/test-psalm.yml b/.github/workflows/test-psalm.yml
index 62e65bf7a866..98ca5c44c5b3 100644
--- a/.github/workflows/test-psalm.yml
+++ b/.github/workflows/test-psalm.yml
@@ -44,7 +44,7 @@ jobs:
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache composer dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
@@ -54,7 +54,7 @@ jobs:
         run: mkdir -p build/psalm
 
       - name: Cache Psalm results
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: build/psalm
           key: ${{ runner.os }}-psalm-${{ github.sha }}
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 7912a59f5d3f..9d9e402ff035 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -71,7 +71,7 @@ jobs:
         run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

From 36d61500d053a7081a04e3bd3e7e2f86187b57b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 10:47:00 +0900
Subject: [PATCH 065/148] test: add test for getFieldData() on SQLite3

---
 .../Database/Live/SQLite/GetFieldDataTest.php | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 tests/system/Database/Live/SQLite/GetFieldDataTest.php

diff --git a/tests/system/Database/Live/SQLite/GetFieldDataTest.php b/tests/system/Database/Live/SQLite/GetFieldDataTest.php
new file mode 100644
index 000000000000..48f78ea4d3bc
--- /dev/null
+++ b/tests/system/Database/Live/SQLite/GetFieldDataTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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;
+use CodeIgniter\Database\SQLite3\Forge;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Database;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class GetFieldDataTest extends CIUnitTestCase
+{
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    private Forge $forge;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = Database::connect($this->DBGroup);
+        if ($this->db->DBDriver !== 'SQLite3') {
+            $this->markTestSkipped('This test is only for SQLite3.');
+        }
+
+        $config = [
+            'DBDriver' => 'SQLite3',
+            'database' => 'database.db',
+            'DBDebug'  => true,
+        ];
+        $this->db    = db_connect($config);
+        $this->forge = Database::forge($config);
+    }
+
+    public function testGetFieldData(): void
+    {
+        $this->forge->dropTable('test1', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'auto_increment' => true,
+            ],
+            'text_not_null' => [
+                'type' => 'VARCHAR',
+            ],
+            'text_null' => [
+                'type' => 'VARCHAR',
+                'null' => true,
+            ],
+            'int_default_0' => [
+                'type'    => 'INT',
+                'default' => 0,
+            ],
+            'text_default_null' => [
+                'type'    => 'VARCHAR',
+                'default' => null,
+            ],
+            'text_default_text_null' => [
+                'type'    => 'VARCHAR',
+                'default' => 'null',
+            ],
+            'text_default_abc' => [
+                'type'    => 'VARCHAR',
+                'default' => 'abc',
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('test1');
+
+        $fields = $this->db->getFieldData('test1');
+
+        $this->assertJsonStringEqualsJsonString(
+            json_encode([
+                (object) [
+                    'name'        => 'id',
+                    'type'        => 'INTEGER',
+                    'max_length'  => null,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => true,
+                    'nullable'    => true,
+                ],
+                (object) [
+                    'name'        => 'text_not_null',
+                    'type'        => 'VARCHAR',
+                    'max_length'  => null,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => false,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_null',
+                    'type'        => 'VARCHAR',
+                    'max_length'  => null,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => false,
+                    'nullable'    => true,
+                ],
+                (object) [
+                    'name'        => 'int_default_0',
+                    'type'        => 'INT',
+                    'max_length'  => null,
+                    'default'     => '0', // int 0
+                    'primary_key' => false,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_default_null',
+                    'type'        => 'VARCHAR',
+                    'max_length'  => null,
+                    'default'     => 'NULL', // NULL value
+                    'primary_key' => false,
+                    'nullable'    => true,
+                ],
+                (object) [
+                    'name'        => 'text_default_text_null',
+                    'type'        => 'VARCHAR',
+                    'max_length'  => null,
+                    'default'     => "'null'", // string "null"
+                    'primary_key' => false,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_default_abc',
+                    'type'        => 'VARCHAR',
+                    'max_length'  => null,
+                    'default'     => "'abc'", // string "abc"
+                    'primary_key' => false,
+                    'nullable'    => false,
+                ],
+            ]),
+            json_encode($fields)
+        );
+    }
+}

From 2938cdfab7be074d18c68e8d07fc79468733eb77 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 10:50:06 +0900
Subject: [PATCH 066/148] test: rename folder name to exact same name as DB
 driver

---
 .../system/Database/Live/{SQLite => SQLite3}/AlterTableTest.php | 2 +-
 .../Database/Live/{SQLite => SQLite3}/GetFieldDataTest.php      | 2 +-
 .../Database/Live/{SQLite => SQLite3}/GetIndexDataTest.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/system/Database/Live/{SQLite => SQLite3}/AlterTableTest.php (99%)
 rename tests/system/Database/Live/{SQLite => SQLite3}/GetFieldDataTest.php (99%)
 rename tests/system/Database/Live/{SQLite => SQLite3}/GetIndexDataTest.php (98%)

diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite3/AlterTableTest.php
similarity index 99%
rename from tests/system/Database/Live/SQLite/AlterTableTest.php
rename to tests/system/Database/Live/SQLite3/AlterTableTest.php
index 74d53cb0783d..1a66c3a9018a 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite3/AlterTableTest.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Live\SQLite;
+namespace CodeIgniter\Database\Live\SQLite3;
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Database\SQLite3\Forge;
diff --git a/tests/system/Database/Live/SQLite/GetFieldDataTest.php b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
similarity index 99%
rename from tests/system/Database/Live/SQLite/GetFieldDataTest.php
rename to tests/system/Database/Live/SQLite3/GetFieldDataTest.php
index 48f78ea4d3bc..978a6704e570 100644
--- a/tests/system/Database/Live/SQLite/GetFieldDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Live\SQLite;
+namespace CodeIgniter\Database\Live\SQLite3;
 
 use CodeIgniter\Database\SQLite3\Connection;
 use CodeIgniter\Database\SQLite3\Forge;
diff --git a/tests/system/Database/Live/SQLite/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
similarity index 98%
rename from tests/system/Database/Live/SQLite/GetIndexDataTest.php
rename to tests/system/Database/Live/SQLite3/GetIndexDataTest.php
index c8b34d7ee651..491ff7a8a20e 100644
--- a/tests/system/Database/Live/SQLite/GetIndexDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Database\Live\SQLite;
+namespace CodeIgniter\Database\Live\SQLite3;
 
 use CodeIgniter\Database\SQLite3\Connection;
 use CodeIgniter\Database\SQLite3\Forge;

From 0499e8167f3e2ed0af385a9899757a1919e9aa35 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 11:05:54 +0900
Subject: [PATCH 067/148] test: add markTestSkipped()

---
 tests/system/Database/Live/SQLite3/AlterTableTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/SQLite3/AlterTableTest.php b/tests/system/Database/Live/SQLite3/AlterTableTest.php
index 1a66c3a9018a..4a06a8ada091 100644
--- a/tests/system/Database/Live/SQLite3/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite3/AlterTableTest.php
@@ -43,12 +43,15 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        if ($this->db->DBDriver !== 'SQLite3') {
+            $this->markTestSkipped('This test is only for SQLite3.');
+        }
+
         $config = [
             'DBDriver' => 'SQLite3',
             'database' => ':memory:',
             'DBDebug'  => true,
         ];
-
         $this->db    = db_connect($config);
         $this->forge = Database::forge($config);
         $this->table = new Table($this->db, $this->forge);

From 3b60067d68dbc29fe0d6bd8a3f39677d7fb8c5ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 11:07:17 +0900
Subject: [PATCH 068/148] test: add markTestSkipped() and remove
 DatabaseTestTrait

---
 .../Database/Live/SQLite3/GetIndexDataTest.php    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
index 491ff7a8a20e..6fdd81b345eb 100644
--- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Database\SQLite3\Connection;
 use CodeIgniter\Database\SQLite3\Forge;
 use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
 use stdClass;
 
@@ -25,15 +24,6 @@
  */
 final class GetIndexDataTest extends CIUnitTestCase
 {
-    use DatabaseTestTrait;
-
-    /**
-     * In setUp() db connection is changed. So migration doesn't work
-     *
-     * @var bool
-     */
-    protected $migrate = false;
-
     /**
      * @var Connection
      */
@@ -45,6 +35,11 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        $this->db = Database::connect($this->DBGroup);
+        if ($this->db->DBDriver !== 'SQLite3') {
+            $this->markTestSkipped('This test is only for SQLite3.');
+        }
+
         $config = [
             'DBDriver' => 'SQLite3',
             'database' => 'database.db',

From 0114c4d25f325784298c964c141a12cd6d60560d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Jan 2024 16:48:42 +0900
Subject: [PATCH 069/148] refactor: rename variable names

---
 system/Database/Forge.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 57e43bf199fe..c23ddfad1127 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -380,15 +380,15 @@ public function addField($field)
         }
 
         if (is_array($field)) {
-            foreach ($field as $idx => $f) {
-                if (is_string($f)) {
-                    $this->addField($f);
+            foreach ($field as $name => $attributes) {
+                if (is_string($attributes)) {
+                    $this->addField($attributes);
 
                     continue;
                 }
 
-                if (is_array($f)) {
-                    $this->fields = array_merge($this->fields, [$idx => $f]);
+                if (is_array($attributes)) {
+                    $this->fields = array_merge($this->fields, [$name => $attributes]);
                 }
             }
         }
@@ -727,8 +727,8 @@ public function addColumn(string $table, $field): bool
             $field = [$field];
         }
 
-        foreach (array_keys($field) as $k) {
-            $this->addField([$k => $field[$k]]);
+        foreach (array_keys($field) as $name) {
+            $this->addField([$name => $field[$name]]);
         }
 
         $sqls = $this->_alterTable('ADD', $this->db->DBPrefix . $table, $this->_processFields());
@@ -783,8 +783,8 @@ public function modifyColumn(string $table, $field): bool
             $field = [$field];
         }
 
-        foreach (array_keys($field) as $k) {
-            $this->addField([$k => $field[$k]]);
+        foreach (array_keys($field) as $name) {
+            $this->addField([$name => $field[$name]]);
         }
 
         if ($this->fields === []) {
@@ -852,7 +852,7 @@ protected function _processFields(bool $createTable = false): array
     {
         $fields = [];
 
-        foreach ($this->fields as $key => $attributes) {
+        foreach ($this->fields as $name => $attributes) {
             if (! is_array($attributes)) {
                 $fields[] = ['_literal' => $attributes];
 
@@ -870,7 +870,7 @@ protected function _processFields(bool $createTable = false): array
             }
 
             $field = [
-                'name'           => $key,
+                'name'           => $name,
                 'new_name'       => $attributes['NAME'] ?? null,
                 'type'           => $attributes['TYPE'] ?? null,
                 'length'         => '',
@@ -1163,10 +1163,10 @@ protected function _processForeignKeys(string $table, bool $asQuery = false): ar
     {
         $errorNames = [];
 
-        foreach ($this->foreignKeys as $name) {
-            foreach ($name['field'] as $f) {
-                if (! isset($this->fields[$f])) {
-                    $errorNames[] = $f;
+        foreach ($this->foreignKeys as $fkeyInfo) {
+            foreach ($fkeyInfo['field'] as $fieldName) {
+                if (! isset($this->fields[$fieldName])) {
+                    $errorNames[] = $fieldName;
                 }
             }
         }

From 6c18480a7c8607eb5aef497b7e25c4c42250001e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Jan 2024 16:57:04 +0900
Subject: [PATCH 070/148] docs: make @var more detailed

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

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index c23ddfad1127..acb6b963bc46 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -32,7 +32,7 @@ class Forge
     /**
      * List of fields.
      *
-     * @var array
+     * @var array<string, array|string> [name => attributes]
      */
     protected $fields = [];
 
@@ -351,7 +351,7 @@ public function addUniqueKey($key, string $keyName = '')
     /**
      * Add Field
      *
-     * @param array|string $field
+     * @param array<string, array|string>|string $field
      *
      * @return Forge
      */
@@ -716,7 +716,7 @@ public function renameTable(string $tableName, string $newTableName)
     }
 
     /**
-     * @param array|string $field
+     * @param array<string, array|string>|string $field
      *
      * @throws DatabaseException
      */
@@ -772,7 +772,7 @@ public function dropColumn(string $table, $columnName)
     }
 
     /**
-     * @param array|string $field
+     * @param array<string, array|string>|string $field
      *
      * @throws DatabaseException
      */

From efaa41ac402b229a92acc6ad846232d67a62a930 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 11:20:33 +0900
Subject: [PATCH 071/148] test: remove test1 table after testing

---
 tests/system/Database/Live/SQLite3/GetFieldDataTest.php | 2 ++
 tests/system/Database/Live/SQLite3/GetIndexDataTest.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
index 978a6704e570..252c6485f7f8 100644
--- a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
@@ -147,5 +147,7 @@ public function testGetFieldData(): void
             ]),
             json_encode($fields)
         );
+
+        $this->forge->dropTable('test1', true);
     }
 }
diff --git a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
index 6fdd81b345eb..cf05b7a7f07b 100644
--- a/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetIndexDataTest.php
@@ -45,7 +45,6 @@ protected function setUp(): void
             'database' => 'database.db',
             'DBDebug'  => true,
         ];
-
         $this->db    = db_connect($config);
         $this->forge = Database::forge($config);
     }

From c452ad017bb3ffd369712608d9e60d84656c9b76 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 15:05:35 +0900
Subject: [PATCH 072/148] docs: add PHPDocs

---
 system/Database/Forge.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index acb6b963bc46..a8d9efc89c30 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -518,7 +518,9 @@ public function dropForeignKey(string $table, string $foreignName)
     }
 
     /**
-     * @return mixed
+     * @param array $attributes Table attributes
+     *
+     * @return bool
      *
      * @throws DatabaseException
      */
@@ -562,6 +564,8 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
     }
 
     /**
+     * @param array $attributes Table attributes
+     *
      * @return string SQL string
      *
      * @deprecated $ifNotExists is no longer used, and will be removed.

From add3e072e7b5376e1117956d36048b5c0a60949d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 15:06:02 +0900
Subject: [PATCH 073/148] style: break long line

---
 system/Database/SQLite3/Forge.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index b1dcb1dd599b..3a004492244c 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -183,8 +183,11 @@ protected function _attributeType(array &$attributes)
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
-        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-            && stripos($field['type'], 'int') !== false) {
+        if (
+            ! empty($attributes['AUTO_INCREMENT'])
+            && $attributes['AUTO_INCREMENT'] === true
+            && stripos($field['type'], 'int') !== false
+        ) {
             $field['type']           = 'INTEGER PRIMARY KEY';
             $field['default']        = '';
             $field['null']           = '';

From 4ac6ca513af97de726a31912f8c201e176841a4c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 15:39:36 +0900
Subject: [PATCH 074/148] refactor: rename variable names

Variables with the same meaning have the same variable name.
Variables with different meanings are given different names.
---
 system/Database/Forge.php         | 61 ++++++++++++++++---------------
 system/Database/MySQLi/Forge.php  | 24 ++++++------
 system/Database/OCI8/Forge.php    | 28 +++++++-------
 system/Database/Postgre/Forge.php | 14 +++----
 system/Database/SQLSRV/Forge.php  | 16 ++++----
 system/Database/SQLite3/Forge.php | 20 +++++-----
 6 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index a8d9efc89c30..74bb5c8fde93 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -572,22 +572,22 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
      */
     protected function _createTable(string $table, bool $ifNotExists, array $attributes)
     {
-        $columns = $this->_processFields(true);
+        $processedFields = $this->_processFields(true);
 
-        for ($i = 0, $c = count($columns); $i < $c; $i++) {
-            $columns[$i] = ($columns[$i]['_literal'] !== false) ? "\n\t" . $columns[$i]['_literal']
-                : "\n\t" . $this->_processColumn($columns[$i]);
+        for ($i = 0, $c = count($processedFields); $i < $c; $i++) {
+            $processedFields[$i] = ($processedFields[$i]['_literal'] !== false) ? "\n\t" . $processedFields[$i]['_literal']
+                : "\n\t" . $this->_processColumn($processedFields[$i]);
         }
 
-        $columns = implode(',', $columns);
+        $processedFields = implode(',', $processedFields);
 
-        $columns .= $this->_processPrimaryKeys($table);
-        $columns .= current($this->_processForeignKeys($table));
+        $processedFields .= $this->_processPrimaryKeys($table);
+        $processedFields .= current($this->_processForeignKeys($table));
 
         if ($this->createTableKeys === true) {
             $indexes = current($this->_processIndexes($table));
             if (is_string($indexes)) {
-                $columns .= $indexes;
+                $processedFields .= $indexes;
             }
         }
 
@@ -595,7 +595,7 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
             $this->createTableStr . '%s',
             'CREATE TABLE',
             $this->db->escapeIdentifiers($table),
-            $columns,
+            $processedFields,
             $this->_createTableAttributes($attributes)
         );
     }
@@ -817,30 +817,31 @@ public function modifyColumn(string $table, $field): bool
     }
 
     /**
-     * @param array|string $fields
+     * @param 'ADD'|'CHANGE'|'DROP' $alterType
+     * @param array|string          $processedFields Processed column definitions
      *
      * @return false|string|string[]
      */
-    protected function _alterTable(string $alterType, string $table, $fields)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . ' ';
 
         // DROP has everything it needs now.
         if ($alterType === 'DROP') {
-            if (is_string($fields)) {
-                $fields = explode(',', $fields);
+            if (is_string($processedFields)) {
+                $processedFields = explode(',', $processedFields);
             }
 
-            $fields = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $fields);
+            $processedFields = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $processedFields);
 
-            return $sql . implode(', ', $fields);
+            return $sql . implode(', ', $processedFields);
         }
 
         $sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';
 
         $sqls = [];
 
-        foreach ($fields as $data) {
+        foreach ($processedFields as $data) {
             $sqls[] = $sql . ($data['_literal'] !== false
                 ? $data['_literal']
                 : $this->_processColumn($data));
@@ -850,15 +851,15 @@ protected function _alterTable(string $alterType, string $table, $fields)
     }
 
     /**
-     * Process fields
+     * Returns $processedFields array from $this->fields data.
      */
     protected function _processFields(bool $createTable = false): array
     {
-        $fields = [];
+        $processedFields = [];
 
         foreach ($this->fields as $name => $attributes) {
             if (! is_array($attributes)) {
-                $fields[] = ['_literal' => $attributes];
+                $processedFields[] = ['_literal' => $attributes];
 
                 continue;
             }
@@ -932,24 +933,24 @@ protected function _processFields(bool $createTable = false): array
                 $field['length'] = '(' . $attributes['CONSTRAINT'] . ')';
             }
 
-            $fields[] = $field;
+            $processedFields[] = $field;
         }
 
-        return $fields;
+        return $processedFields;
     }
 
     /**
-     * Process column
+     * Converts $processedField array to field definition string.
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
-        return $this->db->escapeIdentifiers($field['name'])
-            . ' ' . $field['type'] . $field['length']
-            . $field['unsigned']
-            . $field['default']
-            . $field['null']
-            . $field['auto_increment']
-            . $field['unique'];
+        return $this->db->escapeIdentifiers($processedField['name'])
+            . ' ' . $processedField['type'] . $processedField['length']
+            . $processedField['unsigned']
+            . $processedField['default']
+            . $processedField['null']
+            . $processedField['auto_increment']
+            . $processedField['unique'];
     }
 
     /**
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 0d294c2d09a2..1b4f2f6b6130 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -162,23 +162,23 @@ protected function _alterTable(string $alterType, string $table, $field)
     /**
      * Process column
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
-        $extraClause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+        $extraClause = isset($processedField['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($processedField['after']) : '';
 
-        if (empty($extraClause) && isset($field['first']) && $field['first'] === true) {
+        if (empty($extraClause) && isset($processedField['first']) && $processedField['first'] === true) {
             $extraClause = ' 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'])
+        return $this->db->escapeIdentifiers($processedField['name'])
+                . (empty($processedField['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($processedField['new_name']))
+                . ' ' . $processedField['type'] . $processedField['length']
+                . $processedField['unsigned']
+                . $processedField['null']
+                . $processedField['default']
+                . $processedField['auto_increment']
+                . $processedField['unique']
+                . (empty($processedField['comment']) ? '' : ' COMMENT ' . $processedField['comment'])
                 . $extraClause;
     }
 
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 6e1e85f666a1..33f43ebf3bf3 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -184,26 +184,26 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
     /**
      * Process column
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
         $constraint = '';
         // @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'] . ')';
+        if ($processedField['type'] === 'VARCHAR2' && strpos($processedField['length'], "('") === 0) {
+            $constraint = ' CHECK(' . $this->db->escapeIdentifiers($processedField['name'])
+                . ' IN ' . $processedField['length'] . ')';
 
-            $field['length'] = '(' . max(array_map('mb_strlen', explode("','", mb_substr($field['length'], 2, -2)))) . ')' . $constraint;
-        } elseif (isset($this->primaryKeys['fields']) && count($this->primaryKeys['fields']) === 1 && $field['name'] === $this->primaryKeys['fields'][0]) {
-            $field['unique'] = '';
+            $processedField['length'] = '(' . max(array_map('mb_strlen', explode("','", mb_substr($processedField['length'], 2, -2)))) . ')' . $constraint;
+        } elseif (isset($this->primaryKeys['fields']) && count($this->primaryKeys['fields']) === 1 && $processedField['name'] === $this->primaryKeys['fields'][0]) {
+            $processedField['unique'] = '';
         }
 
-        return $this->db->escapeIdentifiers($field['name'])
-           . ' ' . $field['type'] . $field['length']
-           . $field['unsigned']
-           . $field['default']
-           . $field['auto_increment']
-           . $field['null']
-           . $field['unique'];
+        return $this->db->escapeIdentifiers($processedField['name'])
+           . ' ' . $processedField['type'] . $processedField['length']
+           . $processedField['unsigned']
+           . $processedField['default']
+           . $processedField['auto_increment']
+           . $processedField['null']
+           . $processedField['unique'];
     }
 
     /**
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 47be1b063c8d..60eb7aba0586 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -134,14 +134,14 @@ protected function _alterTable(string $alterType, string $table, $field)
     /**
      * Process column
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
-        return $this->db->escapeIdentifiers($field['name'])
-            . ' ' . $field['type'] . ($field['type'] === 'text' ? '' : $field['length'])
-            . $field['default']
-            . $field['null']
-            . $field['auto_increment']
-            . $field['unique'];
+        return $this->db->escapeIdentifiers($processedField['name'])
+            . ' ' . $processedField['type'] . ($processedField['type'] === 'text' ? '' : $processedField['length'])
+            . $processedField['default']
+            . $processedField['null']
+            . $processedField['auto_increment']
+            . $processedField['unique'];
     }
 
     /**
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index ff1ce2e59bb9..9d7ab764e17a 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -287,16 +287,16 @@ protected function _processIndexes(string $table, bool $asQuery = false): array
     /**
      * Process column
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
-        return $this->db->escapeIdentifiers($field['name'])
-            . (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
-            . ' ' . $field['type'] . ($field['type'] === 'text' ? '' : $field['length'])
-            . $field['default']
-            . $field['null']
-            . $field['auto_increment']
+        return $this->db->escapeIdentifiers($processedField['name'])
+            . (empty($processedField['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($processedField['new_name']))
+            . ' ' . $processedField['type'] . ($processedField['type'] === 'text' ? '' : $processedField['length'])
+            . $processedField['default']
+            . $processedField['null']
+            . $processedField['auto_increment']
             . ''
-            . $field['unique'];
+            . $processedField['unique'];
     }
 
     /**
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 3a004492244c..eaa6643a85ab 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -141,19 +141,19 @@ protected function _alterTable(string $alterType, string $table, $field)
     /**
      * Process column
      */
-    protected function _processColumn(array $field): string
+    protected function _processColumn(array $processedField): string
     {
-        if ($field['type'] === 'TEXT' && strpos($field['length'], "('") === 0) {
-            $field['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
-                . ' IN ' . $field['length'] . ')';
+        if ($processedField['type'] === 'TEXT' && strpos($processedField['length'], "('") === 0) {
+            $processedField['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($processedField['name'])
+                . ' IN ' . $processedField['length'] . ')';
         }
 
-        return $this->db->escapeIdentifiers($field['name'])
-            . ' ' . $field['type']
-            . $field['auto_increment']
-            . $field['null']
-            . $field['unique']
-            . $field['default'];
+        return $this->db->escapeIdentifiers($processedField['name'])
+            . ' ' . $processedField['type']
+            . $processedField['auto_increment']
+            . $processedField['null']
+            . $processedField['unique']
+            . $processedField['default'];
     }
 
     /**

From f34fc584d94a5608d7ae9d3e46ff65e41883ff4e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:00:17 +0900
Subject: [PATCH 075/148] refactor: rename variable names when DROP column

---
 system/Database/Forge.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 74bb5c8fde93..3028e0e571cb 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -755,15 +755,16 @@ public function addColumn(string $table, $field): bool
     }
 
     /**
-     * @param array|string $columnName
+     * @param array|string $columnNames column names to DROP
      *
-     * @return mixed
+     * @return bool
      *
      * @throws DatabaseException
      */
-    public function dropColumn(string $table, $columnName)
+    public function dropColumn(string $table, $columnNames)
     {
-        $sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnName);
+        $sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnNames);
+
         if ($sql === false) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('This feature is not available for the database you are using.');
@@ -819,8 +820,10 @@ public function modifyColumn(string $table, $field): bool
     /**
      * @param 'ADD'|'CHANGE'|'DROP' $alterType
      * @param array|string          $processedFields Processed column definitions
+     *                                               or column names to DROP
      *
-     * @return false|string|string[]
+     * @return list<string>|string SQL string
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
      */
     protected function _alterTable(string $alterType, string $table, $processedFields)
     {
@@ -828,13 +831,15 @@ protected function _alterTable(string $alterType, string $table, $processedField
 
         // DROP has everything it needs now.
         if ($alterType === 'DROP') {
-            if (is_string($processedFields)) {
-                $processedFields = explode(',', $processedFields);
+            $columnNamesToDrop = $processedFields;
+
+            if (is_string($columnNamesToDrop)) {
+                $columnNamesToDrop = explode(',', $columnNamesToDrop);
             }
 
-            $processedFields = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $processedFields);
+            $columnNamesToDrop = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $columnNamesToDrop);
 
-            return $sql . implode(', ', $processedFields);
+            return $sql . implode(', ', $columnNamesToDrop);
         }
 
         $sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';

From 8924cb0a10f15995907837416c81a44676b4c6dd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:16:03 +0900
Subject: [PATCH 076/148] refactor: rename parameter name in _alterTable()

---
 system/Database/MySQLi/Forge.php  | 26 ++++++++-------
 system/Database/OCI8/Forge.php    | 55 ++++++++++++++++---------------
 system/Database/Postgre/Forge.php | 12 ++++---
 system/Database/SQLSRV/Forge.php  | 22 +++++++------
 system/Database/SQLite3/Forge.php | 16 +++++----
 5 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 1b4f2f6b6130..1b0ad79e7607 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -128,35 +128,37 @@ protected function _createTableAttributes(array $attributes): string
     /**
      * ALTER TABLE
      *
-     * @param string       $alterType ALTER type
-     * @param string       $table     Table name
-     * @param array|string $field     Column definition
+     * @param string       $alterType       ALTER type
+     * @param string       $table           Table name
+     * @param array|string $processedFields Processed column definitions
+     *                                      or column names to DROP
      *
-     * @return string|string[]
+     * @return list<string>|string SQL string
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
      */
-    protected function _alterTable(string $alterType, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         if ($alterType === 'DROP') {
-            return parent::_alterTable($alterType, $table, $field);
+            return parent::_alterTable($alterType, $table, $processedFields);
         }
 
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
-        foreach ($field as $i => $data) {
+        foreach ($processedFields as $i => $data) {
             if ($data['_literal'] !== false) {
-                $field[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+                $processedFields[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
             } else {
                 if ($alterType === 'ADD') {
-                    $field[$i]['_literal'] = "\n\tADD ";
+                    $processedFields[$i]['_literal'] = "\n\tADD ";
                 } else {
-                    $field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+                    $processedFields[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
                 }
 
-                $field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
+                $processedFields[$i] = $processedFields[$i]['_literal'] . $this->_processColumn($processedFields[$i]);
             }
         }
 
-        return [$sql . implode(',', $field)];
+        return [$sql . implode(',', $processedFields)];
     }
 
     /**
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 33f43ebf3bf3..e7688ff22f47 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -93,21 +93,24 @@ class Forge extends BaseForge
     /**
      * ALTER TABLE
      *
-     * @param string       $alterType ALTER type
-     * @param string       $table     Table name
-     * @param array|string $field     Column definition
+     * @param string       $alterType       ALTER type
+     * @param string       $table           Table name
+     * @param array|string $processedFields Processed column definitions
+     *                                      or column names to DROP
      *
-     * @return string|string[]
+     * @return list<string>|string SQL string
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
      */
-    protected function _alterTable(string $alterType, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         $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($processedFields)), is_string($processedFields) ? explode(',', $processedFields) : $processedFields);
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }
+
         if ($alterType === 'CHANGE') {
             $alterType = 'MODIFY';
         }
@@ -115,50 +118,50 @@ protected function _alterTable(string $alterType, string $table, $field)
         $nullableMap = array_column($this->db->getFieldData($table), 'nullable', 'name');
         $sqls        = [];
 
-        for ($i = 0, $c = count($field); $i < $c; $i++) {
+        for ($i = 0, $c = count($processedFields); $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.
                 // If a not null constraint is added to a column with a not null constraint,
                 // ORA-01442 will occur.
-                $wantToAddNull   = strpos($field[$i]['null'], ' NOT') === false;
-                $currentNullable = $nullableMap[$field[$i]['name']];
+                $wantToAddNull   = strpos($processedFields[$i]['null'], ' NOT') === false;
+                $currentNullable = $nullableMap[$processedFields[$i]['name']];
 
                 if ($wantToAddNull === true && $currentNullable === true) {
-                    $field[$i]['null'] = '';
-                } elseif ($field[$i]['null'] === '' && $currentNullable === false) {
+                    $processedFields[$i]['null'] = '';
+                } elseif ($processedFields[$i]['null'] === '' && $currentNullable === false) {
                     // Nullable by default
-                    $field[$i]['null'] = ' NULL';
+                    $processedFields[$i]['null'] = ' NULL';
                 } elseif ($wantToAddNull === false && $currentNullable === false) {
-                    $field[$i]['null'] = '';
+                    $processedFields[$i]['null'] = '';
                 }
             }
 
-            if ($field[$i]['_literal'] !== false) {
-                $field[$i] = "\n\t" . $field[$i]['_literal'];
+            if ($processedFields[$i]['_literal'] !== false) {
+                $processedFields[$i] = "\n\t" . $processedFields[$i]['_literal'];
             } else {
-                $field[$i]['_literal'] = "\n\t" . $this->_processColumn($field[$i]);
+                $processedFields[$i]['_literal'] = "\n\t" . $this->_processColumn($processedFields[$i]);
 
-                if (! empty($field[$i]['comment'])) {
+                if (! empty($processedFields[$i]['comment'])) {
                     $sqls[] = 'COMMENT ON COLUMN '
-                        . $this->db->escapeIdentifiers($table) . '.' . $this->db->escapeIdentifiers($field[$i]['name'])
-                        . ' IS ' . $field[$i]['comment'];
+                        . $this->db->escapeIdentifiers($table) . '.' . $this->db->escapeIdentifiers($processedFields[$i]['name'])
+                        . ' IS ' . $processedFields[$i]['comment'];
                 }
 
-                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']);
+                if ($alterType === 'MODIFY' && ! empty($processedFields[$i]['new_name'])) {
+                    $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($processedFields[$i]['name'])
+                        . ' TO ' . $this->db->escapeIdentifiers($processedFields[$i]['new_name']);
                 }
 
-                $field[$i] = "\n\t" . $field[$i]['_literal'];
+                $processedFields[$i] = "\n\t" . $processedFields[$i]['_literal'];
             }
         }
 
         $sql .= ' ' . $alterType . ' ';
-        $sql .= count($field) === 1
-                ? $field[0]
-                : '(' . implode(',', $field) . ')';
+        $sql .= count($processedFields) === 1
+                ? $processedFields[0]
+                : '(' . implode(',', $processedFields) . ')';
 
         // RENAME COLUMN must be executed after MODIFY
         array_unshift($sqls, $sql);
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 60eb7aba0586..e3cf2ee63fab 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -81,20 +81,22 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * @param array|string $field
+     * @param array|string $processedFields Processed column definitions
+     *                                      or column names to DROP
      *
-     * @return array|bool|string
+     * @return false|list<string>|string SQL string or false
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|false)
      */
-    protected function _alterTable(string $alterType, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         if (in_array($alterType, ['DROP', 'ADD'], true)) {
-            return parent::_alterTable($alterType, $table, $field);
+            return parent::_alterTable($alterType, $table, $processedFields);
         }
 
         $sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
         $sqls = [];
 
-        foreach ($field as $data) {
+        foreach ($processedFields as $data) {
             if ($data['_literal'] !== false) {
                 return false;
             }
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 9d7ab764e17a..38740b57e640 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -126,11 +126,13 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * @param array|string $field
+     * @param array|string $processedFields Processed column definitions
+     *                                      or column names to DROP
      *
-     * @return false|string|string[]
+     * @return list<string>|string SQL string
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
      */
-    protected function _alterTable(string $alterType, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         // Handle DROP here
         if ($alterType === 'DROP') {
@@ -138,11 +140,11 @@ protected function _alterTable(string $alterType, string $table, $field)
             $indexData = $this->db->getIndexData($table);
 
             foreach ($indexData as $index) {
-                if (is_string($field)) {
-                    $field = explode(',', $field);
+                if (is_string($processedFields)) {
+                    $processedFields = explode(',', $processedFields);
                 }
 
-                $fld = array_intersect($field, $index->fields);
+                $fld = array_intersect($processedFields, $index->fields);
 
                 // Drop index if field is part of an index
                 if ($fld !== []) {
@@ -153,7 +155,7 @@ protected function _alterTable(string $alterType, string $table, $field)
             $fullTable = $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table);
 
             // Drop default constraints
-            $fields = implode(',', $this->db->escape((array) $field));
+            $fields = implode(',', $this->db->escape((array) $processedFields));
 
             $sql = <<<SQL
                 SELECT name
@@ -170,7 +172,7 @@ protected function _alterTable(string $alterType, string $table, $field)
 
             $sql = 'ALTER TABLE ' . $fullTable . ' DROP ';
 
-            $fields = array_map(static fn ($item) => 'COLUMN [' . trim($item) . ']', (array) $field);
+            $fields = array_map(static fn ($item) => 'COLUMN [' . trim($item) . ']', (array) $processedFields);
 
             return $sql . implode(',', $fields);
         }
@@ -181,14 +183,14 @@ protected function _alterTable(string $alterType, string $table, $field)
         $sqls = [];
 
         if ($alterType === 'ADD') {
-            foreach ($field as $data) {
+            foreach ($processedFields as $data) {
                 $sqls[] = $sql . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
             }
 
             return $sqls;
         }
 
-        foreach ($field as $data) {
+        foreach ($processedFields as $data) {
             if ($data['_literal'] !== false) {
                 return false;
             }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index eaa6643a85ab..e6d14440108b 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -109,32 +109,34 @@ public function dropDatabase(string $dbName): bool
     }
 
     /**
-     * @param array|string $field
+     * @param array|string $processedFields Processed column definitions
+     *                                      or column names to DROP
      *
      * @return array|string|null
+     * @return list<string>|string|null SQL string or null
      */
-    protected function _alterTable(string $alterType, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $processedFields)
     {
         switch ($alterType) {
             case 'DROP':
                 $sqlTable = new Table($this->db, $this);
 
                 $sqlTable->fromTable($table)
-                    ->dropColumn($field)
+                    ->dropColumn($processedFields)
                     ->run();
 
-                return '';
+                return ''; // Why empty string?
 
             case 'CHANGE':
                 (new Table($this->db, $this))
                     ->fromTable($table)
-                    ->modifyColumn($field)
+                    ->modifyColumn($processedFields)
                     ->run();
 
-                return null;
+                return null; // Why null?
 
             default:
-                return parent::_alterTable($alterType, $table, $field);
+                return parent::_alterTable($alterType, $table, $processedFields);
         }
     }
 

From 145e89a828f89581ff629e6bfbc52b9c13b62054 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:24:01 +0900
Subject: [PATCH 077/148] docs: add @TODO

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

diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index e6d14440108b..abe13d0035ec 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -130,7 +130,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
             case 'CHANGE':
                 (new Table($this->db, $this))
                     ->fromTable($table)
-                    ->modifyColumn($processedFields)
+                    ->modifyColumn($processedFields) // @TODO Bug: should be NOT processed fields
                     ->run();
 
                 return null; // Why null?

From a33ff9c17b30e0bcb94ac16193d2ef6ba2b28d56 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:24:19 +0900
Subject: [PATCH 078/148] docs: add PHPDoc types

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

diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 77fd8699459f..1b1bf4f01c51 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -28,7 +28,7 @@ class Table
     /**
      * All of the fields this table represents.
      *
-     * @var array<string, array<string, bool|int|string|null>>
+     * @var array<string, array<string, bool|int|string|null>> [name => attributes]
      */
     protected $fields = [];
 
@@ -156,7 +156,7 @@ public function run(): bool
     /**
      * Drops columns from the table.
      *
-     * @param array|string $columns
+     * @param list<string>|string $columns Column names to drop.
      *
      * @return Table
      */
@@ -180,6 +180,8 @@ public function dropColumn($columns)
      * Modifies a field, including changing data type,
      * renaming, etc.
      *
+     * @param array<string, array<string, bool|int|string|null>> $fields [name => attributes]
+     *
      * @return Table
      */
     public function modifyColumn(array $fields)

From 3f56cc55c45afe082e232a19ff32d7dedb12977c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:29:52 +0900
Subject: [PATCH 079/148] refactor: replace $data with $field

---
 system/Database/Forge.php         |  8 +++----
 system/Database/MySQLi/Forge.php  |  8 +++----
 system/Database/Postgre/Forge.php | 32 +++++++++++++--------------
 system/Database/SQLSRV/Forge.php  | 36 +++++++++++++++----------------
 4 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 3028e0e571cb..4d5ef643c34b 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -846,10 +846,10 @@ protected function _alterTable(string $alterType, string $table, $processedField
 
         $sqls = [];
 
-        foreach ($processedFields as $data) {
-            $sqls[] = $sql . ($data['_literal'] !== false
-                ? $data['_literal']
-                : $this->_processColumn($data));
+        foreach ($processedFields as $field) {
+            $sqls[] = $sql . ($field['_literal'] !== false
+                ? $field['_literal']
+                : $this->_processColumn($field));
         }
 
         return $sqls;
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 1b0ad79e7607..b1beba2a9dd2 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -144,14 +144,14 @@ protected function _alterTable(string $alterType, string $table, $processedField
 
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
-        foreach ($processedFields as $i => $data) {
-            if ($data['_literal'] !== false) {
-                $processedFields[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+        foreach ($processedFields as $i => $field) {
+            if ($field['_literal'] !== false) {
+                $processedFields[$i] = ($alterType === 'ADD') ? "\n\tADD " . $field['_literal'] : "\n\tMODIFY " . $field['_literal'];
             } else {
                 if ($alterType === 'ADD') {
                     $processedFields[$i]['_literal'] = "\n\tADD ";
                 } else {
-                    $processedFields[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+                    $processedFields[$i]['_literal'] = empty($field['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
                 }
 
                 $processedFields[$i] = $processedFields[$i]['_literal'] . $this->_processColumn($processedFields[$i]);
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index e3cf2ee63fab..ee7583642684 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -96,37 +96,37 @@ protected function _alterTable(string $alterType, string $table, $processedField
         $sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
         $sqls = [];
 
-        foreach ($processedFields as $data) {
-            if ($data['_literal'] !== false) {
+        foreach ($processedFields as $field) {
+            if ($field['_literal'] !== false) {
                 return false;
             }
 
-            if (version_compare($this->db->getVersion(), '8', '>=') && isset($data['type'])) {
-                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                    . " TYPE {$data['type']}{$data['length']}";
+            if (version_compare($this->db->getVersion(), '8', '>=') && isset($field['type'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
+                    . " TYPE {$field['type']}{$field['length']}";
             }
 
-            if (! empty($data['default'])) {
-                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                    . " SET DEFAULT {$data['default']}";
+            if (! empty($field['default'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
+                    . " SET DEFAULT {$field['default']}";
             }
 
             $nullable = true; // Nullable by default.
-            if (isset($data['null']) && ($data['null'] === false || $data['null'] === ' NOT ' . $this->null)) {
+            if (isset($field['null']) && ($field['null'] === false || $field['null'] === ' NOT ' . $this->null)) {
                 $nullable = false;
             }
-            $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+            $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
                 . ($nullable === 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']);
+            if (! empty($field['new_name'])) {
+                $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field['name'])
+                    . ' TO ' . $this->db->escapeIdentifiers($field['new_name']);
             }
 
-            if (! empty($data['comment'])) {
+            if (! empty($field['comment'])) {
                 $sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
-                    . '.' . $this->db->escapeIdentifiers($data['name'])
-                    . " IS {$data['comment']}";
+                    . '.' . $this->db->escapeIdentifiers($field['name'])
+                    . " IS {$field['comment']}";
             }
         }
 
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 38740b57e640..1e6db4b3c081 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -183,45 +183,45 @@ protected function _alterTable(string $alterType, string $table, $processedField
         $sqls = [];
 
         if ($alterType === 'ADD') {
-            foreach ($processedFields as $data) {
-                $sqls[] = $sql . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
+            foreach ($processedFields as $field) {
+                $sqls[] = $sql . ($field['_literal'] !== false ? $field['_literal'] : $this->_processColumn($field));
             }
 
             return $sqls;
         }
 
-        foreach ($processedFields as $data) {
-            if ($data['_literal'] !== false) {
+        foreach ($processedFields as $field) {
+            if ($field['_literal'] !== false) {
                 return false;
             }
 
-            if (isset($data['type'])) {
-                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                    . " {$data['type']}{$data['length']}";
+            if (isset($field['type'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
+                    . " {$field['type']}{$field['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']);
+            if (! empty($field['default'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($field['name']) . '_def'
+                    . " DEFAULT {$field['default']} FOR " . $this->db->escapeIdentifiers($field['name']);
             }
 
             $nullable = true; // Nullable by default.
-            if (isset($data['null']) && ($data['null'] === false || $data['null'] === ' NOT ' . $this->null)) {
+            if (isset($field['null']) && ($field['null'] === false || $field['null'] === ' NOT ' . $this->null)) {
                 $nullable = false;
             }
-            $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                . " {$data['type']}{$data['length']} " . ($nullable === true ? '' : 'NOT') . ' NULL';
+            $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($field['name'])
+                . " {$field['type']}{$field['length']} " . ($nullable === true ? '' : 'NOT') . ' NULL';
 
-            if (! empty($data['comment'])) {
+            if (! empty($field['comment'])) {
                 $sqls[] = 'EXEC sys.sp_addextendedproperty '
-                    . "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
+                    . "@name=N'Caption', @value=N'" . $field['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']) . "'";
+                    . "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($field['name']) . "'";
             }
 
-            if (! empty($data['new_name'])) {
-                $sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
+            if (! empty($field['new_name'])) {
+                $sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $field['name'] . "]' , '" . $field['new_name'] . "', 'COLUMN';";
             }
         }
 

From 601ec5895148b2d8d501eed2f31df8cce19d027d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:39:25 +0900
Subject: [PATCH 080/148] docs: fix @phpstan-return

---
 phpstan-baseline.php              | 10 ----------
 system/Database/Forge.php         |  4 ++--
 system/Database/SQLSRV/Forge.php  |  4 ++--
 system/Database/SQLite3/Forge.php |  1 +
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 9aa75c0b204b..48585d6fd969 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1451,11 +1451,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|bool\\|string\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Postgre/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#',
 	'count' => 1,
@@ -1656,11 +1651,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Return type \\(array\\|string\\|null\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\Forge\\:\\:_alterTable\\(\\) should be covariant with return type \\(array\\<string\\>\\|string\\|false\\) of method CodeIgniter\\\\Database\\\\Forge\\:\\:_alterTable\\(\\)$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/SQLite3/Forge.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(SQLite3Result\\|false\\) of method CodeIgniter\\\\Database\\\\SQLite3\\\\PreparedQuery\\:\\:_getResult\\(\\) should be covariant with return type \\(object\\|resource\\|null\\) of method CodeIgniter\\\\Database\\\\BasePreparedQuery\\<SQLite3,SQLite3Stmt,SQLite3Result\\>\\:\\:_getResult\\(\\)$#',
 	'count' => 1,
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 4d5ef643c34b..497185aba6ec 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -822,8 +822,8 @@ public function modifyColumn(string $table, $field): bool
      * @param array|string          $processedFields Processed column definitions
      *                                               or column names to DROP
      *
-     * @return list<string>|string SQL string
-     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
+     * @return false|list<string>|string|null SQL string
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|false|null)
      */
     protected function _alterTable(string $alterType, string $table, $processedFields)
     {
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 1e6db4b3c081..08e7952e7a0b 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -129,8 +129,8 @@ protected function _createTableAttributes(array $attributes): string
      * @param array|string $processedFields Processed column definitions
      *                                      or column names to DROP
      *
-     * @return list<string>|string SQL string
-     * @phpstan-return ($alterType is 'DROP' ? string : list<string>)
+     * @return false|list<string>|string SQL string or false
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|false)
      */
     protected function _alterTable(string $alterType, string $table, $processedFields)
     {
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index abe13d0035ec..3e34fa535f85 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -114,6 +114,7 @@ public function dropDatabase(string $dbName): bool
      *
      * @return array|string|null
      * @return list<string>|string|null SQL string or null
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|false|null)
      */
     protected function _alterTable(string $alterType, string $table, $processedFields)
     {

From e14ca8be383a89022a94bda3bf48c6367058c8b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 16:58:04 +0900
Subject: [PATCH 081/148] style: break long line

---
 system/Database/OCI8/Forge.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index e7688ff22f47..efef8245bb67 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -106,7 +106,10 @@ protected function _alterTable(string $alterType, string $table, $processedField
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
         if ($alterType === 'DROP') {
-            $fields = array_map(fn ($field) => $this->db->escapeIdentifiers(trim($processedFields)), is_string($processedFields) ? explode(',', $processedFields) : $processedFields);
+            $fields = array_map(
+                fn ($field) => $this->db->escapeIdentifiers(trim($processedFields)),
+                is_string($processedFields) ? explode(',', $processedFields) : $processedFields
+            );
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }

From bf30645d2f6d058dbed61312495d376d3fcced4f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 17:01:08 +0900
Subject: [PATCH 082/148] fix: incorrect refactoring

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

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index efef8245bb67..232bdcf2721e 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -106,9 +106,11 @@ protected function _alterTable(string $alterType, string $table, $processedField
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
         if ($alterType === 'DROP') {
+            $columnNamesToDrop = $processedFields;
+
             $fields = array_map(
-                fn ($field) => $this->db->escapeIdentifiers(trim($processedFields)),
-                is_string($processedFields) ? explode(',', $processedFields) : $processedFields
+                fn ($field) => $this->db->escapeIdentifiers(trim($field)),
+                is_string($columnNamesToDrop) ? explode(',', $columnNamesToDrop) : $columnNamesToDrop
             );
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';

From 4d930fbc441a9a3cc19df40266ee4f45a719b017 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 17:09:23 +0900
Subject: [PATCH 083/148] docs: fix @phpstan-return

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

diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 3e34fa535f85..f9b6b8af23c6 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -114,7 +114,7 @@ public function dropDatabase(string $dbName): bool
      *
      * @return array|string|null
      * @return list<string>|string|null SQL string or null
-     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|false|null)
+     * @phpstan-return ($alterType is 'DROP' ? string : list<string>|null)
      */
     protected function _alterTable(string $alterType, string $table, $processedFields)
     {

From 1dd2e965c33e8daf74b4f0a61d0389003eaa31d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 18:40:01 +0900
Subject: [PATCH 084/148] refactor: rename parameter name in
 Table::modifyColumn()

---
 system/Database/SQLite3/Table.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 1b1bf4f01c51..620d28464738 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -177,16 +177,15 @@ public function dropColumn($columns)
     }
 
     /**
-     * Modifies a field, including changing data type,
-     * renaming, etc.
+     * Modifies a field, including changing data type, renaming, etc.
      *
-     * @param array<string, array<string, bool|int|string|null>> $fields [name => attributes]
+     * @param list<array<string, bool|int|string|null>> $fieldsToModify
      *
      * @return Table
      */
-    public function modifyColumn(array $fields)
+    public function modifyColumn(array $fieldsToModify)
     {
-        foreach ($fields as $field) {
+        foreach ($fieldsToModify as $field) {
             $oldName = $field['name'];
             unset($field['name']);
 

From f097aeb10faff92b0fca066d393e3cff329f3387 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:29:57 +0900
Subject: [PATCH 085/148] refactor: replace $field with $fields

---
 system/Database/Forge.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 497185aba6ec..5a3600e3388f 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -351,14 +351,14 @@ public function addUniqueKey($key, string $keyName = '')
     /**
      * Add Field
      *
-     * @param array<string, array|string>|string $field
+     * @param array<string, array|string>|string $fields Field array or Field string
      *
      * @return Forge
      */
-    public function addField($field)
+    public function addField($fields)
     {
-        if (is_string($field)) {
-            if ($field === 'id') {
+        if (is_string($fields)) {
+            if ($fields === 'id') {
                 $this->addField([
                     'id' => [
                         'type'           => 'INT',
@@ -368,19 +368,19 @@ public function addField($field)
                 ]);
                 $this->addKey('id', true);
             } else {
-                if (strpos($field, ' ') === false) {
+                if (strpos($fields, ' ') === false) {
                     throw new InvalidArgumentException('Field information is required for that operation.');
                 }
 
-                $fieldName = explode(' ', $field, 2)[0];
+                $fieldName = explode(' ', $fields, 2)[0];
                 $fieldName = trim($fieldName, '`\'"');
 
-                $this->fields[$fieldName] = $field;
+                $this->fields[$fieldName] = $fields;
             }
         }
 
-        if (is_array($field)) {
-            foreach ($field as $name => $attributes) {
+        if (is_array($fields)) {
+            foreach ($fields as $name => $attributes) {
                 if (is_string($attributes)) {
                     $this->addField($attributes);
 
@@ -720,19 +720,19 @@ public function renameTable(string $tableName, string $newTableName)
     }
 
     /**
-     * @param array<string, array|string>|string $field
+     * @param array<string, array|string>|string $fields Field array or Field string
      *
      * @throws DatabaseException
      */
-    public function addColumn(string $table, $field): bool
+    public function addColumn(string $table, $fields): bool
     {
         // Work-around for literal column definitions
         if (! is_array($field)) {
-            $field = [$field];
+            $fields = [$fields];
         }
 
-        foreach (array_keys($field) as $name) {
-            $this->addField([$name => $field[$name]]);
+        foreach (array_keys($fields) as $name) {
+            $this->addField([$name => $fields[$name]]);
         }
 
         $sqls = $this->_alterTable('ADD', $this->db->DBPrefix . $table, $this->_processFields());
@@ -777,19 +777,19 @@ public function dropColumn(string $table, $columnNames)
     }
 
     /**
-     * @param array<string, array|string>|string $field
+     * @param array<string, array|string>|string $fields Field array or Field string
      *
      * @throws DatabaseException
      */
-    public function modifyColumn(string $table, $field): bool
+    public function modifyColumn(string $table, $fields): bool
     {
         // Work-around for literal column definitions
         if (! is_array($field)) {
-            $field = [$field];
+            $fields = [$fields];
         }
 
-        foreach (array_keys($field) as $name) {
-            $this->addField([$name => $field[$name]]);
+        foreach (array_keys($fields) as $name) {
+            $this->addField([$name => $fields[$name]]);
         }
 
         if ($this->fields === []) {

From b9c063f593c5217407d8952c1cdf0240daebb5bb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:30:31 +0900
Subject: [PATCH 086/148] style: break long line

---
 system/Database/Forge.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 5a3600e3388f..b42995f90a05 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -404,8 +404,14 @@ public function addField($fields)
      *
      * @throws DatabaseException
      */
-    public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '', string $fkName = ''): Forge
-    {
+    public function addForeignKey(
+        $fieldName = '',
+        string $tableName = '',
+        $tableField = '',
+        string $onUpdate = '',
+        string $onDelete = '',
+        string $fkName = ''
+    ): Forge {
         $fieldName  = (array) $fieldName;
         $tableField = (array) $tableField;
 

From 3d4e12b6b6e979fe5ccb634fd50acd038426d707 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:31:01 +0900
Subject: [PATCH 087/148] style: add empty lines

---
 system/Database/Forge.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index b42995f90a05..bf19980240ef 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -434,8 +434,9 @@ public function addForeignKey(
      */
     public function dropKey(string $table, string $keyName, bool $prefixKeyName = true): bool
     {
-        $keyName             = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName);
-        $table               = $this->db->escapeIdentifiers($this->db->DBPrefix . $table);
+        $keyName = $this->db->escapeIdentifiers(($prefixKeyName === true ? $this->db->DBPrefix : '') . $keyName);
+        $table   = $this->db->escapeIdentifiers($this->db->DBPrefix . $table);
+
         $dropKeyAsConstraint = $this->dropKeyAsConstraint($table, $keyName);
 
         if ($dropKeyAsConstraint === true) {
@@ -743,6 +744,7 @@ public function addColumn(string $table, $fields): bool
 
         $sqls = $this->_alterTable('ADD', $this->db->DBPrefix . $table, $this->_processFields());
         $this->reset();
+
         if ($sqls === false) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('This feature is not available for the database you are using.');
@@ -804,6 +806,7 @@ public function modifyColumn(string $table, $fields): bool
 
         $sqls = $this->_alterTable('CHANGE', $this->db->DBPrefix . $table, $this->_processFields());
         $this->reset();
+
         if ($sqls === false) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('This feature is not available for the database you are using.');

From b8db96a7ca0bc2bc1b0d83ab7b7612881f845335 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:31:17 +0900
Subject: [PATCH 088/148] docs: remove duplicated if

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

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index bf19980240ef..85135388c0f7 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -465,7 +465,7 @@ public function dropKey(string $table, string $keyName, bool $prefixKeyName = tr
     }
 
     /**
-     * Checks if if key needs to be dropped as a constraint.
+     * Checks if key needs to be dropped as a constraint.
      */
     protected function dropKeyAsConstraint(string $table, string $constraintName): bool
     {

From ee1076639abb24d190a9181daf6fa97f47b237ac Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:32:00 +0900
Subject: [PATCH 089/148] refactor: replace `! is_array()` with `is_string()`

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

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 85135388c0f7..79bf94e2c9f7 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -734,7 +734,7 @@ public function renameTable(string $tableName, string $newTableName)
     public function addColumn(string $table, $fields): bool
     {
         // Work-around for literal column definitions
-        if (! is_array($field)) {
+        if (is_string($fields)) {
             $fields = [$fields];
         }
 
@@ -792,7 +792,7 @@ public function dropColumn(string $table, $columnNames)
     public function modifyColumn(string $table, $fields): bool
     {
         // Work-around for literal column definitions
-        if (! is_array($field)) {
+        if (is_string($fields)) {
             $fields = [$fields];
         }
 

From 04b66435e7ad5222089c10b7bee786a2086aaf3e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 20:40:32 +0900
Subject: [PATCH 090/148] docs: fix @return types

---
 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 79bf94e2c9f7..adbdc208fc47 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -501,7 +501,7 @@ public function dropPrimaryKey(string $table, string $keyName = ''): bool
     }
 
     /**
-     * @return BaseResult|bool|false|mixed|Query
+     * @return bool
      *
      * @throws DatabaseException
      */
@@ -621,7 +621,7 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * @return mixed
+     * @return bool
      *
      * @throws DatabaseException
      */
@@ -687,7 +687,7 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade)
     }
 
     /**
-     * @return mixed
+     * @return bool
      *
      * @throws DatabaseException
      */

From 2e6fbddc89daabff497d85d38d9fb639c8c67bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:43:45 +0000
Subject: [PATCH 091/148] chore(deps-dev): update rector/rector requirement
 from 0.19.1 to 0.19.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.19.1...0.19.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 6777534ce5f3..82c97606b4c8 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,7 @@
         "phpunit/phpcov": "^8.2",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1 || ^2.0",
-        "rector/rector": "0.19.1",
+        "rector/rector": "0.19.2",
         "vimeo/psalm": "^5.0"
     },
     "replace": {

From 213f0b94047fe58766e7008674c6a7569593a3d9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Jan 2024 09:33:41 +0900
Subject: [PATCH 092/148] refactor: add $columnNamesToDrop

---
 system/Database/SQLSRV/Forge.php  | 12 +++++++-----
 system/Database/SQLite3/Forge.php |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 08e7952e7a0b..522d5fa02f54 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -136,15 +136,17 @@ protected function _alterTable(string $alterType, string $table, $processedField
     {
         // Handle DROP here
         if ($alterType === 'DROP') {
+            $columnNamesToDrop = $processedFields;
+
             // check if fields are part of any indexes
             $indexData = $this->db->getIndexData($table);
 
             foreach ($indexData as $index) {
-                if (is_string($processedFields)) {
-                    $processedFields = explode(',', $processedFields);
+                if (is_string($columnNamesToDrop)) {
+                    $columnNamesToDrop = explode(',', $columnNamesToDrop);
                 }
 
-                $fld = array_intersect($processedFields, $index->fields);
+                $fld = array_intersect($columnNamesToDrop, $index->fields);
 
                 // Drop index if field is part of an index
                 if ($fld !== []) {
@@ -155,7 +157,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
             $fullTable = $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table);
 
             // Drop default constraints
-            $fields = implode(',', $this->db->escape((array) $processedFields));
+            $fields = implode(',', $this->db->escape((array) $columnNamesToDrop));
 
             $sql = <<<SQL
                 SELECT name
@@ -172,7 +174,7 @@ protected function _alterTable(string $alterType, string $table, $processedField
 
             $sql = 'ALTER TABLE ' . $fullTable . ' DROP ';
 
-            $fields = array_map(static fn ($item) => 'COLUMN [' . trim($item) . ']', (array) $processedFields);
+            $fields = array_map(static fn ($item) => 'COLUMN [' . trim($item) . ']', (array) $columnNamesToDrop);
 
             return $sql . implode(',', $fields);
         }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index f9b6b8af23c6..d7112c61389f 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -120,10 +120,12 @@ protected function _alterTable(string $alterType, string $table, $processedField
     {
         switch ($alterType) {
             case 'DROP':
+                $columnNamesToDrop = $processedFields;
+
                 $sqlTable = new Table($this->db, $this);
 
                 $sqlTable->fromTable($table)
-                    ->dropColumn($processedFields)
+                    ->dropColumn($columnNamesToDrop)
                     ->run();
 
                 return ''; // Why empty string?

From 74f2b812a2a667371e956bdf50a3a6c883986805 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 12:35:47 +0900
Subject: [PATCH 093/148] test: add test for getFieldData() for MySQLi

---
 .../Live/AbstractGetFieldDataTest.php         |  95 +++++++++++
 .../Database/Live/MySQLi/GetFieldDataTest.php | 156 ++++++++++++++++++
 2 files changed, 251 insertions(+)
 create mode 100644 tests/system/Database/Live/AbstractGetFieldDataTest.php
 create mode 100644 tests/system/Database/Live/MySQLi/GetFieldDataTest.php

diff --git a/tests/system/Database/Live/AbstractGetFieldDataTest.php b/tests/system/Database/Live/AbstractGetFieldDataTest.php
new file mode 100644
index 000000000000..570061cac3e3
--- /dev/null
+++ b/tests/system/Database/Live/AbstractGetFieldDataTest.php
@@ -0,0 +1,95 @@
+<?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\Database\Live;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Forge;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Database;
+
+abstract class AbstractGetFieldDataTest extends CIUnitTestCase
+{
+    /**
+     * @var BaseConnection
+     */
+    protected $db;
+
+    protected Forge $forge;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = Database::connect($this->DBGroup);
+
+        $this->createForge();
+        $this->createTable();
+    }
+
+    /**
+     * Make sure that $db and $forge are instantiated.
+     */
+    abstract protected function createForge(): void;
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->forge->dropTable('test1', true);
+    }
+
+    protected function createTable()
+    {
+        $this->forge->dropTable('test1', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'auto_increment' => true,
+            ],
+            'text_not_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+            ],
+            'text_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'null'       => true,
+            ],
+            'int_default_0' => [
+                'type'    => 'INT',
+                'default' => 0,
+            ],
+            'text_default_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => null,
+            ],
+            'text_default_text_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => 'null',
+            ],
+            'text_default_abc' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => 'abc',
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('test1');
+    }
+
+    abstract public function testGetFieldData(): void;
+}
diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTest.php b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
new file mode 100644
index 000000000000..f7a14f950f8f
--- /dev/null
+++ b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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\MySQLi;
+
+use CodeIgniter\Database\MySQLi\Connection;
+use CodeIgniter\Database\MySQLi\Forge;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class GetFieldDataTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $migrate = false;
+
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    private Forge $forge;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if ($this->db->DBDriver !== 'MySQLi') {
+            $this->markTestSkipped('This test is only for MySQLi.');
+        }
+
+        $this->forge = Database::forge($this->db);
+    }
+
+    public function testGetFieldData(): void
+    {
+        $this->forge->dropTable('test1', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'auto_increment' => true,
+            ],
+            'text_not_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+            ],
+            'text_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'null'       => true,
+            ],
+            'int_default_0' => [
+                'type'    => 'INT',
+                'default' => 0,
+            ],
+            'text_default_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => null,
+            ],
+            'text_default_text_null' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => 'null',
+            ],
+            'text_default_abc' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 64,
+                'default'    => 'abc',
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('test1');
+
+        $fields = $this->db->getFieldData('test1');
+
+        $this->assertJsonStringEqualsJsonString(
+            json_encode([
+                (object) [
+                    'name'        => 'id',
+                    'type'        => 'int',
+                    'max_length'  => null,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => 1,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_not_null',
+                    'type'        => 'varchar',
+                    'max_length'  => 64,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => 0,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_null',
+                    'type'        => 'varchar',
+                    'max_length'  => 64,
+                    'default'     => null, // The default value is not defined.
+                    'primary_key' => 0,
+                    'nullable'    => true,
+                ],
+                (object) [
+                    'name'        => 'int_default_0',
+                    'type'        => 'int',
+                    'max_length'  => null,
+                    'default'     => '0', // int 0
+                    'primary_key' => 0,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_default_null',
+                    'type'        => 'varchar',
+                    'max_length'  => 64,
+                    'default'     => null, // NULL value
+                    'primary_key' => 0,
+                    'nullable'    => true,
+                ],
+                (object) [
+                    'name'        => 'text_default_text_null',
+                    'type'        => 'varchar',
+                    'max_length'  => 64,
+                    'default'     => 'null', // string "null"
+                    'primary_key' => 0,
+                    'nullable'    => false,
+                ],
+                (object) [
+                    'name'        => 'text_default_abc',
+                    'type'        => 'varchar',
+                    'max_length'  => 64,
+                    'default'     => 'abc', // string "abc"
+                    'primary_key' => 0,
+                    'nullable'    => false,
+                ],
+            ]),
+            json_encode($fields)
+        );
+
+        $this->forge->dropTable('test1', true);
+    }
+}

From ebf8fab81d8b75efec9fa6c147947395f6274bfb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Jan 2024 13:07:28 +0900
Subject: [PATCH 094/148] test: extract AbstractGetFieldDataTest class

---
 .../Database/Live/MySQLi/GetFieldDataTest.php | 65 ++-----------------
 .../Live/SQLite3/GetFieldDataTest.php         | 54 +--------------
 2 files changed, 8 insertions(+), 111 deletions(-)

diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTest.php b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
index f7a14f950f8f..7ba2fc43a0cb 100644
--- a/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
+++ b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * This file is part of CodeIgniter 4 framework.
  *
@@ -11,10 +13,7 @@
 
 namespace CodeIgniter\Database\Live\MySQLi;
 
-use CodeIgniter\Database\MySQLi\Connection;
-use CodeIgniter\Database\MySQLi\Forge;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Database\Live\AbstractGetFieldDataTest;
 use Config\Database;
 
 /**
@@ -22,23 +21,10 @@
  *
  * @internal
  */
-final class GetFieldDataTest extends CIUnitTestCase
+final class GetFieldDataTest extends AbstractGetFieldDataTest
 {
-    use DatabaseTestTrait;
-
-    protected $migrate = false;
-
-    /**
-     * @var Connection
-     */
-    protected $db;
-
-    private Forge $forge;
-
-    protected function setUp(): void
+    protected function createForge(): void
     {
-        parent::setUp();
-
         if ($this->db->DBDriver !== 'MySQLi') {
             $this->markTestSkipped('This test is only for MySQLi.');
         }
@@ -48,45 +34,6 @@ protected function setUp(): void
 
     public function testGetFieldData(): void
     {
-        $this->forge->dropTable('test1', true);
-
-        $this->forge->addField([
-            'id' => [
-                'type'           => 'INT',
-                'auto_increment' => true,
-            ],
-            'text_not_null' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 64,
-            ],
-            'text_null' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 64,
-                'null'       => true,
-            ],
-            'int_default_0' => [
-                'type'    => 'INT',
-                'default' => 0,
-            ],
-            'text_default_null' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 64,
-                'default'    => null,
-            ],
-            'text_default_text_null' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 64,
-                'default'    => 'null',
-            ],
-            'text_default_abc' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 64,
-                'default'    => 'abc',
-            ],
-        ]);
-        $this->forge->addKey('id', true);
-        $this->forge->createTable('test1');
-
         $fields = $this->db->getFieldData('test1');
 
         $this->assertJsonStringEqualsJsonString(
@@ -150,7 +97,5 @@ public function testGetFieldData(): void
             ]),
             json_encode($fields)
         );
-
-        $this->forge->dropTable('test1', true);
     }
 }
diff --git a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
index 252c6485f7f8..70586f10fbdd 100644
--- a/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
+++ b/tests/system/Database/Live/SQLite3/GetFieldDataTest.php
@@ -11,9 +11,7 @@
 
 namespace CodeIgniter\Database\Live\SQLite3;
 
-use CodeIgniter\Database\SQLite3\Connection;
-use CodeIgniter\Database\SQLite3\Forge;
-use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Database\Live\AbstractGetFieldDataTest;
 use Config\Database;
 
 /**
@@ -21,20 +19,10 @@
  *
  * @internal
  */
-final class GetFieldDataTest extends CIUnitTestCase
+final class GetFieldDataTest extends AbstractGetFieldDataTest
 {
-    /**
-     * @var Connection
-     */
-    protected $db;
-
-    private Forge $forge;
-
-    protected function setUp(): void
+    protected function createForge(): void
     {
-        parent::setUp();
-
-        $this->db = Database::connect($this->DBGroup);
         if ($this->db->DBDriver !== 'SQLite3') {
             $this->markTestSkipped('This test is only for SQLite3.');
         }
@@ -50,40 +38,6 @@ protected function setUp(): void
 
     public function testGetFieldData(): void
     {
-        $this->forge->dropTable('test1', true);
-
-        $this->forge->addField([
-            'id' => [
-                'type'           => 'INT',
-                'auto_increment' => true,
-            ],
-            'text_not_null' => [
-                'type' => 'VARCHAR',
-            ],
-            'text_null' => [
-                'type' => 'VARCHAR',
-                'null' => true,
-            ],
-            'int_default_0' => [
-                'type'    => 'INT',
-                'default' => 0,
-            ],
-            'text_default_null' => [
-                'type'    => 'VARCHAR',
-                'default' => null,
-            ],
-            'text_default_text_null' => [
-                'type'    => 'VARCHAR',
-                'default' => 'null',
-            ],
-            'text_default_abc' => [
-                'type'    => 'VARCHAR',
-                'default' => 'abc',
-            ],
-        ]);
-        $this->forge->addKey('id', true);
-        $this->forge->createTable('test1');
-
         $fields = $this->db->getFieldData('test1');
 
         $this->assertJsonStringEqualsJsonString(
@@ -147,7 +101,5 @@ public function testGetFieldData(): void
             ]),
             json_encode($fields)
         );
-
-        $this->forge->dropTable('test1', true);
     }
 }

From 4411e44c1dfb8f2d86f3e8b9a0bc308d3e602bf6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Jan 2024 10:43:29 +0900
Subject: [PATCH 095/148] test: fix assertions on MySQL 5.7

---
 .../Database/Live/MySQLi/GetFieldDataTest.php  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/system/Database/Live/MySQLi/GetFieldDataTest.php b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
index 7ba2fc43a0cb..aacc7fa84b99 100644
--- a/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
+++ b/tests/system/Database/Live/MySQLi/GetFieldDataTest.php
@@ -32,6 +32,20 @@ protected function createForge(): void
         $this->forge = Database::forge($this->db);
     }
 
+    /**
+     * 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
+     */
+    private function isOldMySQL(): bool
+    {
+        return ! (
+            version_compare($this->db->getVersion(), '8.0.17', '>=')
+            && strpos($this->db->getVersion(), 'MariaDB') === false
+        );
+    }
+
     public function testGetFieldData(): void
     {
         $fields = $this->db->getFieldData('test1');
@@ -41,7 +55,7 @@ public function testGetFieldData(): void
                 (object) [
                     'name'        => 'id',
                     'type'        => 'int',
-                    'max_length'  => null,
+                    'max_length'  => $this->isOldMySQL() ? 11 : null,
                     'default'     => null, // The default value is not defined.
                     'primary_key' => 1,
                     'nullable'    => false,
@@ -65,7 +79,7 @@ public function testGetFieldData(): void
                 (object) [
                     'name'        => 'int_default_0',
                     'type'        => 'int',
-                    'max_length'  => null,
+                    'max_length'  => $this->isOldMySQL() ? 11 : null,
                     'default'     => '0', // int 0
                     'primary_key' => 0,
                     'nullable'    => false,

From bdbc8e4b71816da0152561a2b7b356bab6914304 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 18:27:09 +0900
Subject: [PATCH 096/148] fix: OCI8 Forge always sets NOT NULL when BOOLEAN is
 specified

---
 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 232bdcf2721e..2735b886cb86 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -254,7 +254,6 @@ protected function _attributeType(array &$attributes)
                 $attributes['TYPE']       = 'NUMBER';
                 $attributes['CONSTRAINT'] = 1;
                 $attributes['UNSIGNED']   = true;
-                $attributes['NULL']       = false;
 
                 return;
 

From 40bd88c1aa872f2634f778c249c1058f6d07c69e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 19:44:11 +0900
Subject: [PATCH 097/148] docs: fix incorrect descriptions

This bug was fixed in v4.3.4.
---
 user_guide_src/source/dbmgmt/forge.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index c14664b1ad7c..875d76b267e2 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -306,11 +306,11 @@ change the name, you can add a "name" key into the field defining array.
     a table, if ``null`` is not specified, the column will be ``NULL``, not
     ``NOT NULL``.
 
-.. note:: Due to a bug, prior v4.3.3, SQLite3 may not set ``NOT NULL`` even if you
+.. note:: Due to a bug, prior v4.3.4, SQLite3 may not set ``NOT NULL`` even if you
     specify ``'null' => false``.
 
-.. note:: Due to a bug, prior v4.3.3, Postgres and SQLSRV set ``NOT NULL`` even
-    if you specify ``'null' => false``.
+.. note:: Due to a bug, prior v4.3.4, Postgres and SQLSRV set ``NOT NULL`` even
+    if you specify ``'null' => true``.
 
 .. _db-forge-adding-keys-to-a-table:
 

From 02de3560dfc9acc817f08ffad31da9a67a138b02 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 10:14:20 +0900
Subject: [PATCH 098/148] test: update comment

---
 .../Migrations/20160428212500_Create_test_tables.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 6e3d9be574fa..80969a3f23ec 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -46,9 +46,10 @@ public function up(): void
         ])->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
-        // id must be interger else SQLite3 error on not null for autoinc field
+        // missing types:
+        //     TINYINT,MEDIUMINT,BIT,YEAR,BINARY,VARBINARY,TINYTEXT,LONGTEXT,
+        //     JSON,Spatial data types
+        // `id` must be INTEGER else SQLite3 error on not null for autoincrement field.
         $data_type_fields = [
             'id'              => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true],
             'type_varchar'    => ['type' => 'VARCHAR', 'constraint' => 40, 'null' => true],

From b796f0b05154872a7b52f5ce292ba2e524f1c282 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 10:16:15 +0900
Subject: [PATCH 099/148] test: add test for type date and datetime

---
 tests/system/Database/Live/UpdateTest.php | 58 ++++++++++++++++++-----
 1 file changed, 45 insertions(+), 13 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 1c6ae8a430b6..efa0c7b51102 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -113,26 +113,58 @@ public function testUpdateWithWhereAndLimit(): void
 
     public function testUpdateBatch(): void
     {
+        $table = 'type_test';
+
+        // Prepares test data.
+        $builder = $this->db->table($table);
+        $builder->truncate();
+
+        for ($i = 0; $i < 3; $i++) {
+            $builder->insert([
+                'type_varchar'  => 'test' . $i,
+                'type_char'     => 'char',
+                'type_text'     => 'text',
+                'type_smallint' => 32767,
+                'type_integer'  => 2147483647,
+                'type_bigint'   => 9223372036854775807,
+                'type_float'    => 10.1,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-21',
+                'type_datetime' => '2023-12-21 12:00:00',
+            ]);
+        }
+
         $data = [
             [
-                'name'    => 'Derek Jones',
-                'country' => 'Greece',
+                'type_varchar'  => 'test1',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9999999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
             ],
             [
-                'name'    => 'Ahmadinejad',
-                'country' => 'Greece',
+                'type_varchar'  => 'test2',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9999999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
             ],
         ];
-
-        $this->db->table('user')->updateBatch($data, 'name');
-
-        $this->seeInDatabase('user', [
-            'name'    => 'Derek Jones',
-            'country' => 'Greece',
+        $this->db->table($table)->updateBatch($data, 'type_varchar');
+
+        $this->seeInDatabase($table, [
+            'type_varchar'  => 'test1',
+            'type_text'     => 'updated',
+            'type_bigint'   => 9999999,
+            'type_date'     => '2024-01-01',
+            'type_datetime' => '2024-01-01 09:00:00',
         ]);
-        $this->seeInDatabase('user', [
-            'name'    => 'Ahmadinejad',
-            'country' => 'Greece',
+        $this->seeInDatabase($table, [
+            'type_varchar'  => 'test2',
+            'type_text'     => 'updated',
+            'type_bigint'   => 9999999,
+            'type_date'     => '2024-01-01',
+            'type_datetime' => '2024-01-01 09:00:00',
         ]);
     }
 

From a71aa3c6bf7d6dd836891419b5a325c2073f4efb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 12:11:56 +0900
Subject: [PATCH 100/148] refactor: copy _updateBatch() to override

---
 system/Database/Postgre/Builder.php | 93 +++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 3e3ed68a9356..e31568d0672a 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -312,6 +312,99 @@ public function join(string $table, $cond, string $type = '', ?bool $escape = nu
         return parent::join($table, $cond, $type, $escape);
     }
 
+    /**
+     * Generates a platform-specific batch update string from the supplied data
+     *
+     * @used-by batchExecute
+     *
+     * @param string                 $table  Protected table name
+     * @param list<string>           $keys   QBKeys
+     * @param list<list<int|string>> $values QBSet
+     */
+    protected function _updateBatch(string $table, array $keys, array $values): string
+    {
+        $sql = $this->QBOptions['sql'] ?? '';
+
+        // if this is the first iteration of batch then we need to build skeleton sql
+        if ($sql === '') {
+            $constraints = $this->QBOptions['constraints'] ?? [];
+
+            if ($constraints === []) {
+                if ($this->db->DBDebug) {
+                    throw new DatabaseException('You must specify a constraint to match on for batch updates.'); // @codeCoverageIgnore
+                }
+
+                return ''; // @codeCoverageIgnore
+            }
+
+            $updateFields = $this->QBOptions['updateFields'] ??
+                $this->updateFields($keys, false, $constraints)->QBOptions['updateFields'] ??
+                [];
+
+            $alias = $this->QBOptions['alias'] ?? '_u';
+
+            $sql = 'UPDATE ' . $this->compileIgnore('update') . $table . "\n";
+
+            $sql .= "SET\n";
+
+            $sql .= implode(
+                ",\n",
+                array_map(
+                    static fn ($key, $value) => $key . ($value instanceof RawSql ?
+                            ' = ' . $value :
+                            ' = ' . $alias . '.' . $value),
+                    array_keys($updateFields),
+                    $updateFields
+                )
+            ) . "\n";
+
+            $sql .= "FROM (\n{:_table_:}";
+
+            $sql .= ') ' . $alias . "\n";
+
+            $sql .= 'WHERE ' . implode(
+                ' AND ',
+                array_map(
+                    static fn ($key, $value) => (
+                        ($value instanceof RawSql && is_string($key))
+                        ?
+                        $table . '.' . $key . ' = ' . $value
+                        :
+                        (
+                            $value instanceof RawSql
+                            ?
+                            $value
+                            :
+                            $table . '.' . $value . ' = ' . $alias . '.' . $value
+                        )
+                    ),
+                    array_keys($constraints),
+                    $constraints
+                )
+            );
+
+            $this->QBOptions['sql'] = $sql;
+        }
+
+        if (isset($this->QBOptions['setQueryAsData'])) {
+            $data = $this->QBOptions['setQueryAsData'];
+        } else {
+            $data = implode(
+                " UNION ALL\n",
+                array_map(
+                    static fn ($value) => 'SELECT ' . implode(', ', array_map(
+                        static fn ($key, $index) => $index . ' ' . $key,
+                        $keys,
+                        $value
+                    )),
+                    $values
+                )
+            ) . "\n";
+        }
+
+        return str_replace('{:_table_:}', $data, $sql);
+    }
+
     /**
      * Generates a platform-specific upsertBatch string from the supplied data
      *

From f1b4a6c8872018255a7a5ceb153a166d8d239be3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Jan 2024 13:14:09 +0900
Subject: [PATCH 101/148] refactor: make if condition more strict

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

diff --git a/phpstan-baseline.php b/phpstan-baseline.php
index 48585d6fd969..22aae16b046e 100644
--- a/phpstan-baseline.php
+++ b/phpstan-baseline.php
@@ -1341,11 +1341,6 @@
 	'count' => 7,
 	'path' => __DIR__ . '/system/Database/Postgre/Builder.php',
 ];
-$ignoreErrors[] = [
-	'message' => '#^Only booleans are allowed in a negated boolean, array\\<int\\|string, array\\<int, int\\|string\\>\\|string\\> given\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/system/Database/Postgre/Builder.php',
-];
 $ignoreErrors[] = [
 	'message' => '#^Return type \\(CodeIgniter\\\\Database\\\\BaseBuilder\\) of method CodeIgniter\\\\Database\\\\Postgre\\\\Builder\\:\\:join\\(\\) should be covariant with return type \\(\\$this\\(CodeIgniter\\\\Database\\\\BaseBuilder\\)\\) of method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:join\\(\\)$#',
 	'count' => 1,
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index e31568d0672a..81c45520d6f1 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -146,7 +146,7 @@ public function replace(?array $set = null)
             $this->set($set);
         }
 
-        if (! $this->QBSet) {
+        if ($this->QBSet === []) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }

From 88326013afe0f6915b60e7835dc98133246c6f2a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 11:09:22 +0900
Subject: [PATCH 102/148] fix: updateBatch() Postgre type error

---
 system/Database/Postgre/Builder.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 81c45520d6f1..4abc78ffc6bb 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -347,12 +347,19 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             $sql .= "SET\n";
 
+            $fieldTypes = $this->getFieldTypes($table);
+
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static fn ($key, $value) => $key . ($value instanceof RawSql ?
-                            ' = ' . $value :
-                            ' = ' . $alias . '.' . $value),
+                    static function ($key, $value) use ($alias, $fieldTypes) {
+                        $type = $fieldTypes[trim($key, '"')] ?? null;
+                        $cast = ($type === null) ? '' : '::' . $type;
+
+                        return $key . ($value instanceof RawSql ?
+                                ' = ' . $value :
+                                ' = ' . $alias . '.' . $value . $cast);
+                    },
                     array_keys($updateFields),
                     $updateFields
                 )
@@ -405,6 +412,20 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
         return str_replace('{:_table_:}', $data, $sql);
     }
 
+    /**
+     * @return array<string, string> [name => type]
+     */
+    private function getFieldTypes(string $table): array
+    {
+        $types = [];
+
+        foreach ($this->db->getFieldData($table) as $field) {
+            $types[$field->name] = $field->type;
+        }
+
+        return $types;
+    }
+
     /**
      * Generates a platform-specific upsertBatch string from the supplied data
      *

From 1d967536d5ab061f08da6f91f3cf9084412f9e32 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Jan 2024 10:49:18 +0900
Subject: [PATCH 103/148] docs: add sub section titles and tweaks

---
 .../source/database/query_builder.rst          | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 0be07d71340b..5e6d54985a6c 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1107,18 +1107,20 @@ $builder->updateBatch()
 .. note:: Since v4.3.0, the second parameter ``$index`` of ``updateBatch()`` has
     changed to ``$constraints``. It now accepts types array, string, or ``RawSql``.
 
+Update from Data
+^^^^^^^^^^^^^^^^
+
 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/092.php
 
-.. note:: Since v4.3.0, the generated SQL structure has been Improved.
+The first parameter is an associative array of values, the second parameter is the where keys.
 
-The first parameter is an associative array of values, the second parameter is the where key.
+.. note:: Since v4.3.0, the generated SQL structure has been Improved.
 
-Since v4.3.0, you can also use the ``setQueryAsData()``, ``onConstraint()``, and
-``updateFields()`` methods:
+Since v4.3.0, you can also use the ``onConstraint()`` and ``updateFields()`` methods:
 
 .. literalinclude:: query_builder/120.php
 
@@ -1130,12 +1132,12 @@ Since v4.3.0, you can also use the ``setQueryAsData()``, ``onConstraint()``, and
     due to the very nature of how it works. Instead, ``updateBatch()``
     returns the number of rows affected.
 
-You can also update from a query:
+Update from a Query
+^^^^^^^^^^^^^^^^^^^
 
-.. literalinclude:: query_builder/116.php
+Since v4.3.0, you can also update from a query with the ``setQueryAsData()`` method:
 
-.. note:: The ``setQueryAsData()``, ``onConstraint()``, and ``updateFields()``
-    methods can be used since v4.3.0.
+.. literalinclude:: query_builder/116.php
 
 .. note:: It is required to alias the columns of the select query to match those of the target table.
 

From 9ae66a26d80cb7e5bc1dd8048a129f3a9cfad701 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 11:11:25 +0900
Subject: [PATCH 104/148] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.4.5.rst b/user_guide_src/source/changelogs/v4.4.5.rst
index e029a1d9f3a5..cc395dc9100f 100644
--- a/user_guide_src/source/changelogs/v4.4.5.rst
+++ b/user_guide_src/source/changelogs/v4.4.5.rst
@@ -30,6 +30,9 @@ Deprecations
 Bugs Fixed
 **********
 
+- **QueryBuilder:** Fixed a bug that the ``updateBatch()`` method does not work
+  due to type errors on PostgreSQL.
+
 See the repo's
 `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_
 for a complete list of bugs fixed.

From 560e7454fb6911b091acfabccaf5062e0cb5ea18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 11:21:54 +0900
Subject: [PATCH 105/148] refactory: by rector

---
 tests/system/Database/Live/UpdateTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index efa0c7b51102..7f035ef45ad5 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -125,8 +125,8 @@ public function testUpdateBatch(): void
                 'type_char'     => 'char',
                 'type_text'     => 'text',
                 'type_smallint' => 32767,
-                'type_integer'  => 2147483647,
-                'type_bigint'   => 9223372036854775807,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
                 'type_float'    => 10.1,
                 'type_numeric'  => 123.23,
                 'type_date'     => '2023-12-21',
@@ -138,14 +138,14 @@ public function testUpdateBatch(): void
             [
                 'type_varchar'  => 'test1',
                 'type_text'     => 'updated',
-                'type_bigint'   => 9999999,
+                'type_bigint'   => 9_999_999,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ],
             [
                 'type_varchar'  => 'test2',
                 'type_text'     => 'updated',
-                'type_bigint'   => 9999999,
+                'type_bigint'   => 9_999_999,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ],
@@ -155,14 +155,14 @@ public function testUpdateBatch(): void
         $this->seeInDatabase($table, [
             'type_varchar'  => 'test1',
             'type_text'     => 'updated',
-            'type_bigint'   => 9999999,
+            'type_bigint'   => 9_999_999,
             'type_date'     => '2024-01-01',
             'type_datetime' => '2024-01-01 09:00:00',
         ]);
         $this->seeInDatabase($table, [
             'type_varchar'  => 'test2',
             'type_text'     => 'updated',
-            'type_bigint'   => 9999999,
+            'type_bigint'   => 9_999_999,
             'type_date'     => '2024-01-01',
             'type_datetime' => '2024-01-01 09:00:00',
         ]);

From 1bffa76915416e19f9acbf220442d5371b7360f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 16:57:54 +0900
Subject: [PATCH 106/148] test: fix assertion for SQLSRV

---
 tests/system/Database/Live/UpdateTest.php | 49 ++++++++++++++++-------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 7f035ef45ad5..240bdde49455 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -152,20 +152,41 @@ public function testUpdateBatch(): void
         ];
         $this->db->table($table)->updateBatch($data, 'type_varchar');
 
-        $this->seeInDatabase($table, [
-            'type_varchar'  => 'test1',
-            'type_text'     => 'updated',
-            'type_bigint'   => 9_999_999,
-            'type_date'     => '2024-01-01',
-            'type_datetime' => '2024-01-01 09:00:00',
-        ]);
-        $this->seeInDatabase($table, [
-            'type_varchar'  => 'test2',
-            'type_text'     => 'updated',
-            'type_bigint'   => 9_999_999,
-            'type_date'     => '2024-01-01',
-            'type_datetime' => '2024-01-01 09:00:00',
-        ]);
+        if ($this->db->DBDriver === 'SQLSRV') {
+            // We cannot compare `text` and `varchar` with `=`. It causes the error:
+            // [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The data types text and varchar are incompatible in the equal to operator.
+            // And data type `text`, `ntext`, `image` are deprecated in SQL Server 2016
+            // See https://github.com/codeigniter4/CodeIgniter4/pull/8439#issuecomment-1902535909
+            $this->seeInDatabase($table, [
+                'type_varchar' => 'test1',
+                // 'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+            $this->seeInDatabase($table, [
+                'type_varchar' => 'test2',
+                // 'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+        } else {
+            $this->seeInDatabase($table, [
+                'type_varchar'  => 'test1',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+            $this->seeInDatabase($table, [
+                'type_varchar'  => 'test2',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+        }
     }
 
     public function testUpdateWithWhereSameColumn(): void

From 38fb5b266f248e449c4602befe974a5441b55fac Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 09:06:57 +0900
Subject: [PATCH 107/148] test: add test for updateBatch() with constrants DATE

---
 tests/system/Database/Live/UpdateTest.php | 78 ++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 240bdde49455..d9c4a43ea452 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -111,7 +111,7 @@ public function testUpdateWithWhereAndLimit(): void
         }
     }
 
-    public function testUpdateBatch(): void
+    public function testUpdateBatchConstraintsVarchar(): void
     {
         $table = 'type_test';
 
@@ -189,6 +189,82 @@ public function testUpdateBatch(): void
         }
     }
 
+    public function testUpdateBatchConstraintsDate(): void
+    {
+        $table = 'type_test';
+
+        // Prepares test data.
+        $builder = $this->db->table($table);
+        $builder->truncate();
+
+        for ($i = 1; $i < 4; $i++) {
+            $builder->insert([
+                'type_varchar'  => 'test' . $i,
+                'type_char'     => 'char',
+                'type_text'     => 'text',
+                'type_smallint' => 32767,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
+                'type_float'    => 10.1,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-0' . $i,
+                'type_datetime' => '2023-12-21 12:00:00',
+            ]);
+        }
+
+        $data = [
+            [
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-01', // Key
+                'type_datetime' => '2024-01-01 09:00:00',
+            ],
+            [
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-02', // Key
+                'type_datetime' => '2024-01-01 09:00:00',
+            ],
+        ];
+        $this->db->table($table)->updateBatch($data, 'type_date');
+
+        if ($this->db->DBDriver === 'SQLSRV') {
+            // We cannot compare `text` and `varchar` with `=`. It causes the error:
+            // [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The data types text and varchar are incompatible in the equal to operator.
+            // And data type `text`, `ntext`, `image` are deprecated in SQL Server 2016
+            // See https://github.com/codeigniter4/CodeIgniter4/pull/8439#issuecomment-1902535909
+            $this->seeInDatabase($table, [
+                'type_varchar' => 'test1',
+                // 'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+            $this->seeInDatabase($table, [
+                'type_varchar' => 'test2',
+                // 'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-02',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+        } else {
+            $this->seeInDatabase($table, [
+                'type_varchar'  => 'test1',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+            $this->seeInDatabase($table, [
+                'type_varchar'  => 'test2',
+                'type_text'     => 'updated',
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2023-12-02',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ]);
+        }
+    }
+
     public function testUpdateWithWhereSameColumn(): void
     {
         $this->db->table('user')->update(['country' => 'CA'], ['country' => 'US']);

From 3336010b75d3e16a292f6c88968696cfc8e59f1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 09:07:48 +0900
Subject: [PATCH 108/148] fix: Postgre updateBatch() SQL type error in WHERE
 part

---
 system/Database/Postgre/Builder.php | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 4abc78ffc6bb..d3877c301db9 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -372,19 +372,20 @@ static function ($key, $value) use ($alias, $fieldTypes) {
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key, $value) => (
-                        ($value instanceof RawSql && is_string($key))
-                        ?
-                        $table . '.' . $key . ' = ' . $value
-                        :
-                        (
-                            $value instanceof RawSql
-                            ?
-                            $value
-                            :
-                            $table . '.' . $value . ' = ' . $alias . '.' . $value
-                        )
-                    ),
+                    static function ($key, $value) use ($table, $alias, $fieldTypes) {
+                        if ($value instanceof RawSql && is_string($key)) {
+                            return $table . '.' . $key . ' = ' . $value;
+                        }
+
+                        if ($value instanceof RawSql) {
+                            return $value;
+                        }
+
+                        $type = $fieldTypes[trim($value, '"')] ?? null;
+                        $cast = ($type === null) ? '' : '::' . $type;
+
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $value . $cast;
+                    },
                     array_keys($constraints),
                     $constraints
                 )

From f86c6d266fe2f438f2f0cfdb0954d8e4c6bfe9eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 09:41:27 +0900
Subject: [PATCH 109/148] test: add test for more types

---
 tests/system/Database/Live/UpdateTest.php | 28 +++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index d9c4a43ea452..70aa1de3bd75 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -136,16 +136,24 @@ public function testUpdateBatchConstraintsVarchar(): void
 
         $data = [
             [
-                'type_varchar'  => 'test1',
+                'type_varchar'  => 'test1', // Key
                 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ],
             [
-                'type_varchar'  => 'test2',
+                'type_varchar'  => 'test2', // Key
                 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ],
@@ -160,14 +168,22 @@ public function testUpdateBatchConstraintsVarchar(): void
             $this->seeInDatabase($table, [
                 'type_varchar' => 'test1',
                 // 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ]);
             $this->seeInDatabase($table, [
                 'type_varchar' => 'test2',
                 // 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ]);
@@ -175,14 +191,22 @@ public function testUpdateBatchConstraintsVarchar(): void
             $this->seeInDatabase($table, [
                 'type_varchar'  => 'test1',
                 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ]);
             $this->seeInDatabase($table, [
                 'type_varchar'  => 'test2',
                 'type_text'     => 'updated',
+                'type_smallint' => 9999,
+                'type_integer'  => 9_999_999,
                 'type_bigint'   => 9_999_999,
+                'type_float'    => 999999.9,
+                'type_numeric'  => 999999.99,
                 'type_date'     => '2024-01-01',
                 'type_datetime' => '2024-01-01 09:00:00',
             ]);

From fc0a858799851a07c04d407f827c3b711266ca1f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 10:24:00 +0900
Subject: [PATCH 110/148] refactor: add castValue() and use it

---
 system/Database/BaseBuilder.php     |  3 ++-
 system/Database/Postgre/Builder.php | 42 ++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 9d43e5577943..509d5c748ff0 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -169,7 +169,8 @@ class BaseBuilder
      *   constraints?: array,
      *   setQueryAsData?: string,
      *   sql?: string,
-     *   alias?: string
+     *   alias?: string,
+     *   fieldTypes?: array<string, string>
      * }
      */
     protected $QBOptions;
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index d3877c301db9..8606760ee7dd 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\RawSql;
 use InvalidArgumentException;
+use LogicException;
 
 /**
  * Builder for Postgre
@@ -347,18 +348,18 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             $sql .= "SET\n";
 
-            $fieldTypes = $this->getFieldTypes($table);
+            $this->getFieldTypes($table);
 
+            $that = $this;
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static function ($key, $value) use ($alias, $fieldTypes) {
-                        $type = $fieldTypes[trim($key, '"')] ?? null;
-                        $cast = ($type === null) ? '' : '::' . $type;
+                    static function ($key, $value) use ($alias, $that) {
+                        $fieldName = trim($key, '"');
 
                         return $key . ($value instanceof RawSql ?
                                 ' = ' . $value :
-                                ' = ' . $alias . '.' . $value . $cast);
+                                ' = ' . $alias . '.' . $that->castValue($fieldName, $value));
                     },
                     array_keys($updateFields),
                     $updateFields
@@ -372,7 +373,7 @@ static function ($key, $value) use ($alias, $fieldTypes) {
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static function ($key, $value) use ($table, $alias, $fieldTypes) {
+                    static function ($key, $value) use ($table, $alias, $that) {
                         if ($value instanceof RawSql && is_string($key)) {
                             return $table . '.' . $key . ' = ' . $value;
                         }
@@ -381,10 +382,9 @@ static function ($key, $value) use ($table, $alias, $fieldTypes) {
                             return $value;
                         }
 
-                        $type = $fieldTypes[trim($value, '"')] ?? null;
-                        $cast = ($type === null) ? '' : '::' . $type;
+                        $fieldName = trim($value, '"');
 
-                        return $table . '.' . $value . ' = ' . $alias . '.' . $value . $cast;
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->castValue($fieldName, $value);
                     },
                     array_keys($constraints),
                     $constraints
@@ -414,9 +414,27 @@ static function ($key, $value) use ($table, $alias, $fieldTypes) {
     }
 
     /**
-     * @return array<string, string> [name => type]
+     * Returns cast value.
+     *
+     * @param float|int|string $value Escaped value
+     */
+    private function castValue(string $fieldName, $value): string
+    {
+        if (! isset($this->QBOptions['fieldTypes'])) {
+            throw new LogicException(
+                'You must call getFieldTypes() before calling castValue().'
+            );
+        }
+
+        $type = $this->QBOptions['fieldTypes'][$fieldName] ?? null;
+
+        return ($type === null) ? $value : $value . '::' . $type;
+    }
+
+    /**
+     * Gets filed types from database meta data.
      */
-    private function getFieldTypes(string $table): array
+    private function getFieldTypes(string $table): void
     {
         $types = [];
 
@@ -424,7 +442,7 @@ private function getFieldTypes(string $table): array
             $types[$field->name] = $field->type;
         }
 
-        return $types;
+        $this->QBOptions['fieldTypes'] = $types;
     }
 
     /**

From ec1128489c67a73416a55c8cfed52cff5cb8f4c3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 11:09:25 +0900
Subject: [PATCH 111/148] test: refactor with dataProvider

---
 tests/system/Database/Live/UpdateTest.php | 238 +++++++++-------------
 1 file changed, 95 insertions(+), 143 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 70aa1de3bd75..d55328f493c2 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -111,7 +111,10 @@ public function testUpdateWithWhereAndLimit(): void
         }
     }
 
-    public function testUpdateBatchConstraintsVarchar(): void
+    /**
+     * @dataProvider provideUpdateBatch
+     */
+    public function testUpdateBatch(string $constraints, array $data, array $expected): void
     {
         $table = 'type_test';
 
@@ -119,7 +122,7 @@ public function testUpdateBatchConstraintsVarchar(): void
         $builder = $this->db->table($table);
         $builder->truncate();
 
-        for ($i = 0; $i < 3; $i++) {
+        for ($i = 1; $i < 4; $i++) {
             $builder->insert([
                 'type_varchar'  => 'test' . $i,
                 'type_char'     => 'char',
@@ -129,164 +132,113 @@ public function testUpdateBatchConstraintsVarchar(): void
                 'type_bigint'   => 9_223_372_036_854_775_807,
                 'type_float'    => 10.1,
                 'type_numeric'  => 123.23,
-                'type_date'     => '2023-12-21',
+                'type_date'     => '2023-12-0' . $i,
                 'type_datetime' => '2023-12-21 12:00:00',
             ]);
         }
 
-        $data = [
-            [
-                'type_varchar'  => 'test1', // Key
-                'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ],
-            [
-                'type_varchar'  => 'test2', // Key
-                'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ],
-        ];
-        $this->db->table($table)->updateBatch($data, 'type_varchar');
+        $this->db->table($table)->updateBatch($data, $constraints);
 
         if ($this->db->DBDriver === 'SQLSRV') {
             // We cannot compare `text` and `varchar` with `=`. It causes the error:
             // [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The data types text and varchar are incompatible in the equal to operator.
             // And data type `text`, `ntext`, `image` are deprecated in SQL Server 2016
             // See https://github.com/codeigniter4/CodeIgniter4/pull/8439#issuecomment-1902535909
-            $this->seeInDatabase($table, [
-                'type_varchar' => 'test1',
-                // 'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-            $this->seeInDatabase($table, [
-                'type_varchar' => 'test2',
-                // 'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-        } else {
-            $this->seeInDatabase($table, [
-                'type_varchar'  => 'test1',
-                'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-            $this->seeInDatabase($table, [
-                'type_varchar'  => 'test2',
-                'type_text'     => 'updated',
-                'type_smallint' => 9999,
-                'type_integer'  => 9_999_999,
-                'type_bigint'   => 9_999_999,
-                'type_float'    => 999999.9,
-                'type_numeric'  => 999999.99,
-                'type_date'     => '2024-01-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
+            unset($expected[0]['type_text'], $expected[1]['type_text']);
         }
+
+        $this->seeInDatabase($table, $expected[0]);
+        $this->seeInDatabase($table, $expected[1]);
     }
 
-    public function testUpdateBatchConstraintsDate(): void
+    public static function provideUpdateBatch(): iterable
     {
-        $table = 'type_test';
-
-        // Prepares test data.
-        $builder = $this->db->table($table);
-        $builder->truncate();
-
-        for ($i = 1; $i < 4; $i++) {
-            $builder->insert([
-                'type_varchar'  => 'test' . $i,
-                'type_char'     => 'char',
-                'type_text'     => 'text',
-                'type_smallint' => 32767,
-                'type_integer'  => 2_147_483_647,
-                'type_bigint'   => 9_223_372_036_854_775_807,
-                'type_float'    => 10.1,
-                'type_numeric'  => 123.23,
-                'type_date'     => '2023-12-0' . $i,
-                'type_datetime' => '2023-12-21 12:00:00',
-            ]);
-        }
-
-        $data = [
-            [
-                'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-01', // Key
-                'type_datetime' => '2024-01-01 09:00:00',
+        yield from [
+            'constraints varchar' => [
+                'type_varchar',
+                [
+                    [
+                        'type_varchar'  => 'test1', // Key
+                        'type_text'     => 'updated',
+                        'type_smallint' => 9999,
+                        'type_integer'  => 9_999_999,
+                        'type_bigint'   => 9_999_999,
+                        'type_float'    => 999999.9,
+                        'type_numeric'  => 999999.99,
+                        'type_date'     => '2024-01-01',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                    [
+                        'type_varchar'  => 'test2', // Key
+                        'type_text'     => 'updated',
+                        'type_smallint' => 9999,
+                        'type_integer'  => 9_999_999,
+                        'type_bigint'   => 9_999_999,
+                        'type_float'    => 999999.9,
+                        'type_numeric'  => 999999.99,
+                        'type_date'     => '2024-01-01',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                ],
+                [
+                    [
+                        'type_varchar'  => 'test1',
+                        'type_text'     => 'updated',
+                        'type_smallint' => 9999,
+                        'type_integer'  => 9_999_999,
+                        'type_bigint'   => 9_999_999,
+                        'type_float'    => 999999.9,
+                        'type_numeric'  => 999999.99,
+                        'type_date'     => '2024-01-01',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                    [
+                        'type_varchar'  => 'test2',
+                        'type_text'     => 'updated',
+                        'type_smallint' => 9999,
+                        'type_integer'  => 9_999_999,
+                        'type_bigint'   => 9_999_999,
+                        'type_float'    => 999999.9,
+                        'type_numeric'  => 999999.99,
+                        'type_date'     => '2024-01-01',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                ],
             ],
-            [
-                'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-02', // Key
-                'type_datetime' => '2024-01-01 09:00:00',
+            'constraints date' => [
+                'type_date',
+                [
+                    [
+                        'type_text'     => 'updated',
+                        'type_bigint'   => 9_999_999,
+                        'type_date'     => '2023-12-01', // Key
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                    [
+                        'type_text'     => 'updated',
+                        'type_bigint'   => 9_999_999,
+                        'type_date'     => '2023-12-02', // Key
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                ],
+                [
+                    [
+                        'type_varchar'  => 'test1',
+                        'type_text'     => 'updated',
+                        'type_bigint'   => 9_999_999,
+                        'type_date'     => '2023-12-01',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                    [
+                        'type_varchar'  => 'test2',
+                        'type_text'     => 'updated',
+                        'type_bigint'   => 9_999_999,
+                        'type_date'     => '2023-12-02',
+                        'type_datetime' => '2024-01-01 09:00:00',
+                    ],
+                ],
             ],
         ];
-        $this->db->table($table)->updateBatch($data, 'type_date');
-
-        if ($this->db->DBDriver === 'SQLSRV') {
-            // We cannot compare `text` and `varchar` with `=`. It causes the error:
-            // [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]The data types text and varchar are incompatible in the equal to operator.
-            // And data type `text`, `ntext`, `image` are deprecated in SQL Server 2016
-            // See https://github.com/codeigniter4/CodeIgniter4/pull/8439#issuecomment-1902535909
-            $this->seeInDatabase($table, [
-                'type_varchar' => 'test1',
-                // 'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-            $this->seeInDatabase($table, [
-                'type_varchar' => 'test2',
-                // 'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-02',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-        } else {
-            $this->seeInDatabase($table, [
-                'type_varchar'  => 'test1',
-                'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-01',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-            $this->seeInDatabase($table, [
-                'type_varchar'  => 'test2',
-                'type_text'     => 'updated',
-                'type_bigint'   => 9_999_999,
-                'type_date'     => '2023-12-02',
-                'type_datetime' => '2024-01-01 09:00:00',
-            ]);
-        }
     }
 
     public function testUpdateWithWhereSameColumn(): void

From d4f3e928138fce897ec23b6b5eb3245fec9301f7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 11:23:29 +0900
Subject: [PATCH 112/148] refactor: make type uppercase in SQL string for
 readablitiy

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

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 8606760ee7dd..09d77d9fa91b 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -428,7 +428,7 @@ private function castValue(string $fieldName, $value): string
 
         $type = $this->QBOptions['fieldTypes'][$fieldName] ?? null;
 
-        return ($type === null) ? $value : $value . '::' . $type;
+        return ($type === null) ? $value : $value . '::' . strtoupper($type);
     }
 
     /**

From 5ca6dfa9414c46366c96d974f218d67f5c23fe23 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 11:16:22 +0900
Subject: [PATCH 113/148] test: add test for int as string

---
 tests/system/Database/Live/UpdateTest.php | 27 +++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index d55328f493c2..c6348aba25d2 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -238,6 +238,33 @@ public static function provideUpdateBatch(): iterable
                     ],
                 ],
             ],
+            'int as string' => [
+                'type_varchar',
+                [
+                    [
+                        'type_varchar' => 'test1', // Key
+                        'type_integer' => '9999999', // PHP string
+                        'type_bigint'  => '2448114396435166946', // PHP string
+                    ],
+                    [
+                        'type_varchar' => 'test2', // Key
+                        'type_integer' => '9999999', // PHP string
+                        'type_bigint'  => '2448114396435166946', // PHP string
+                    ],
+                ],
+                [
+                    [
+                        'type_varchar' => 'test1',
+                        'type_integer' => 9_999_999,
+                        'type_bigint'  => 2_448_114_396_435_166_946,
+                    ],
+                    [
+                        'type_varchar' => 'test2',
+                        'type_integer' => 9_999_999,
+                        'type_bigint'  => 2_448_114_396_435_166_946,
+                    ],
+                ],
+            ],
         ];
     }
 

From 64cd79119fc9546381d0f0ba20251fa982136bac Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Jan 2024 13:42:41 +0900
Subject: [PATCH 114/148] test: FLOAT on MySQL cannot be used as WHERE = key

See https://dev.mysql.com/doc/refman/8.0/en/floating-point-types.html
---
 .../20160428212500_Create_test_tables.php     | 22 ++++++++++++-------
 tests/system/Database/Live/UpdateTest.php     |  6 ++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 80969a3f23ec..e646e371fb7c 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -47,16 +47,22 @@ public function up(): void
 
         // Database Type test table
         // missing types:
-        //     TINYINT,MEDIUMINT,BIT,YEAR,BINARY,VARBINARY,TINYTEXT,LONGTEXT,
-        //     JSON,Spatial data types
+        //   TINYINT,MEDIUMINT,BIT,YEAR,BINARY,VARBINARY,TINYTEXT,LONGTEXT,
+        //   JSON,Spatial data types
         // `id` must be INTEGER else SQLite3 error on not null for autoincrement field.
         $data_type_fields = [
-            'id'              => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true],
-            'type_varchar'    => ['type' => 'VARCHAR', 'constraint' => 40, 'null' => true],
-            'type_char'       => ['type' => 'CHAR', 'constraint' => 10, 'null' => true],
-            'type_text'       => ['type' => 'TEXT', 'null' => true],
-            'type_smallint'   => ['type' => 'SMALLINT', 'null' => true],
-            'type_integer'    => ['type' => 'INTEGER', 'null' => true],
+            'id'           => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true],
+            'type_varchar' => ['type' => 'VARCHAR', 'constraint' => 40, 'null' => true],
+            'type_char'    => ['type' => 'CHAR', 'constraint' => 10, 'null' => true],
+            // TEXT should not be used on SQLSRV. It is deprecated.
+            'type_text'     => ['type' => 'TEXT', 'null' => true],
+            'type_smallint' => ['type' => 'SMALLINT', 'null' => true],
+            'type_integer'  => ['type' => 'INTEGER', 'null' => true],
+            // FLOAT should not be used on MySQL.
+            //   CREATE TABLE t (f FLOAT, d DOUBLE);
+            //   INSERT INTO t VALUES(99.9, 99.9);
+            //   SELECT * FROM t WHERE f=99.9; // Empty set
+            //   SELECT * FROM t WHERE d=99.9; // 1 row
             'type_float'      => ['type' => 'FLOAT', 'null' => true],
             'type_numeric'    => ['type' => 'NUMERIC', 'constraint' => '18,2', 'null' => true],
             'type_date'       => ['type' => 'DATE', 'null' => true],
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index c6348aba25d2..f8b0ced088db 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -163,7 +163,7 @@ public static function provideUpdateBatch(): iterable
                         'type_smallint' => 9999,
                         'type_integer'  => 9_999_999,
                         'type_bigint'   => 9_999_999,
-                        'type_float'    => 999999.9,
+                        'type_float'    => 99.9,
                         'type_numeric'  => 999999.99,
                         'type_date'     => '2024-01-01',
                         'type_datetime' => '2024-01-01 09:00:00',
@@ -174,7 +174,7 @@ public static function provideUpdateBatch(): iterable
                         'type_smallint' => 9999,
                         'type_integer'  => 9_999_999,
                         'type_bigint'   => 9_999_999,
-                        'type_float'    => 999999.9,
+                        'type_float'    => 99.9,
                         'type_numeric'  => 999999.99,
                         'type_date'     => '2024-01-01',
                         'type_datetime' => '2024-01-01 09:00:00',
@@ -187,7 +187,6 @@ public static function provideUpdateBatch(): iterable
                         'type_smallint' => 9999,
                         'type_integer'  => 9_999_999,
                         'type_bigint'   => 9_999_999,
-                        'type_float'    => 999999.9,
                         'type_numeric'  => 999999.99,
                         'type_date'     => '2024-01-01',
                         'type_datetime' => '2024-01-01 09:00:00',
@@ -198,7 +197,6 @@ public static function provideUpdateBatch(): iterable
                         'type_smallint' => 9999,
                         'type_integer'  => 9_999_999,
                         'type_bigint'   => 9_999_999,
-                        'type_float'    => 999999.9,
                         'type_numeric'  => 999999.99,
                         'type_date'     => '2024-01-01',
                         'type_datetime' => '2024-01-01 09:00:00',

From 6d4ce25435ef1aae1c3c9bfeaf23ec5399bc77c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 09:57:21 +0900
Subject: [PATCH 115/148] refactor: change castValue() API

---
 system/Database/Postgre/Builder.php | 31 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 09d77d9fa91b..7e0125c606ac 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -15,7 +15,6 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\RawSql;
 use InvalidArgumentException;
-use LogicException;
 
 /**
  * Builder for Postgre
@@ -348,18 +347,16 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
 
             $sql .= "SET\n";
 
-            $this->getFieldTypes($table);
-
             $that = $this;
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static function ($key, $value) use ($alias, $that) {
+                    static function ($key, $value) use ($table, $alias, $that) {
                         $fieldName = trim($key, '"');
 
                         return $key . ($value instanceof RawSql ?
                                 ' = ' . $value :
-                                ' = ' . $alias . '.' . $that->castValue($fieldName, $value));
+                                ' = ' . $alias . '.' . $that->castValue($table, $key, $value));
                     },
                     array_keys($updateFields),
                     $updateFields
@@ -382,9 +379,7 @@ static function ($key, $value) use ($table, $alias, $that) {
                             return $value;
                         }
 
-                        $fieldName = trim($value, '"');
-
-                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->castValue($fieldName, $value);
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->castValue($table, $value, $value);
                     },
                     array_keys($constraints),
                     $constraints
@@ -416,23 +411,27 @@ static function ($key, $value) use ($table, $alias, $that) {
     /**
      * Returns cast value.
      *
-     * @param float|int|string $value Escaped value
+     * @param string           $table     Protected Table name.
+     * @param string           $fieldName Field name. May be protected.
+     * @param float|int|string $value     Escaped value
      */
-    private function castValue(string $fieldName, $value): string
+    private function castValue(string $table, string $fieldName, $value): string
     {
-        if (! isset($this->QBOptions['fieldTypes'])) {
-            throw new LogicException(
-                'You must call getFieldTypes() before calling castValue().'
-            );
+        $fieldName = trim($fieldName, $this->db->escapeChar);
+
+        if (! isset($this->QBOptions['fieldTypes'][$table])) {
+            $this->getFieldTypes($table);
         }
 
-        $type = $this->QBOptions['fieldTypes'][$fieldName] ?? null;
+        $type = $this->QBOptions['fieldTypes'][$table][$fieldName] ?? null;
 
         return ($type === null) ? $value : $value . '::' . strtoupper($type);
     }
 
     /**
      * Gets filed types from database meta data.
+     *
+     * @param string $table Protected Table name.
      */
     private function getFieldTypes(string $table): void
     {
@@ -442,7 +441,7 @@ private function getFieldTypes(string $table): void
             $types[$field->name] = $field->type;
         }
 
-        $this->QBOptions['fieldTypes'] = $types;
+        $this->QBOptions['fieldTypes'][$table] = $types;
     }
 
     /**

From 19de81bb3951148b98f2627f08c32d82bfe3702f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 10:40:17 +0900
Subject: [PATCH 116/148] docs: add sub section titles

---
 user_guide_src/source/outgoing/csp.rst | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/csp.rst b/user_guide_src/source/outgoing/csp.rst
index 0761f289a611..9e97f8bf23ca 100644
--- a/user_guide_src/source/outgoing/csp.rst
+++ b/user_guide_src/source/outgoing/csp.rst
@@ -88,7 +88,12 @@ Inline Content
 
 It is possible to set a website to not protect even inline scripts and styles on its own pages, since this might have
 been the result of user-generated content. To protect against this, CSP allows you to specify a nonce within the
-``<style>`` and ``<script>`` tags, and to add those values to the response's header. This is a pain to handle in real
+``<style>`` and ``<script>`` tags, and to add those values to the response's header.
+
+Using Placeholders
+==================
+
+This is a pain to handle in real
 life, and is most secure when generated on the fly. To make this simple, you can include a ``{csp-style-nonce}`` or
 ``{csp-script-nonce}`` placeholder in the tag and it will be handled for you automatically::
 
@@ -109,7 +114,13 @@ life, and is most secure when generated on the fly. To make this simple, you can
 
 .. 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**.
+.. _csp-using-functions:
+
+Using Functions
+===============
+
+If you don't like the auto replacement functionality above, you can turn it off
+with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**.
 
 In this case, you can use the functions, :php:func:`csp_script_nonce()` and :php:func:`csp_style_nonce()`::
 

From 3cf324250dd75e2eb4d037a9bf65b7bf57c36a8c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 10:40:32 +0900
Subject: [PATCH 117/148] docs: remove HTTP link for example domain

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

diff --git a/user_guide_src/source/outgoing/csp.rst b/user_guide_src/source/outgoing/csp.rst
index 9e97f8bf23ca..6d22edee0f25 100644
--- a/user_guide_src/source/outgoing/csp.rst
+++ b/user_guide_src/source/outgoing/csp.rst
@@ -21,7 +21,7 @@ the response's ``Content-Security-Policy`` header and offers various configurati
 options.
 
 This sounds complex, and on some sites, can definitely be challenging. For many simple sites, though, where all content
-is served by the same domain (http://example.com), it is very simple to integrate.
+is served by the same domain (e.g., **http://example.com**), it is very simple to integrate.
 
 As this is a complex subject, this user guide will not go over all of the details. For more information, you should
 visit the following sites:

From ab7a678456a6c119e8544325e0f3cf0bd66a117c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 10:41:09 +0900
Subject: [PATCH 118/148] docs: make links to subsection

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

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index a7b701241007..75d2cbebd13c 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -226,7 +226,7 @@ Miscellaneous Functions
     :rtype: string
 
     Returns the nonce attribute for a script tag. For example: ``nonce="Eskdikejidojdk978Ad8jf"``.
-    See :ref:`content-security-policy`.
+    See :ref:`Content Security Policy <csp-using-functions>`.
 
 .. php:function:: csp_style_nonce()
 
@@ -234,7 +234,7 @@ Miscellaneous Functions
     :rtype: string
 
     Returns the nonce attribute for a style tag. For example: ``nonce="Eskdikejidojdk978Ad8jf"``.
-    See :ref:`content-security-policy`.
+    See :ref:`Content Security Policy <csp-using-functions>`.
 
 .. php:function:: csrf_token()
 

From cd644df4de7bfa0b9380d443ecb0804e6dca9358 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 11:24:38 +0900
Subject: [PATCH 119/148] docs: add @param

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 509d5c748ff0..936b4c3be778 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1759,6 +1759,8 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
     /**
      * Compiles batch insert/update/upsert strings and runs the queries
      *
+     * @param '_deleteBatch'|'_insertBatch'|'_updateBatch'|'_upsertBatch' $renderMethod
+     *
      * @return false|int|string[] Number of rows inserted or FALSE on failure, SQL array when testMode
      *
      * @throws DatabaseException

From 92cc84e1ff1ac91c596bed6d511633cc70c5457b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 11:25:12 +0900
Subject: [PATCH 120/148] refactor: change castValue(),getFieldTypes() to
 cast(),getFieldType()

---
 system/Database/Postgre/Builder.php | 45 +++++++++++++----------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 7e0125c606ac..b597e2df517c 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -352,11 +352,9 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
                 ",\n",
                 array_map(
                     static function ($key, $value) use ($table, $alias, $that) {
-                        $fieldName = trim($key, '"');
-
                         return $key . ($value instanceof RawSql ?
                                 ' = ' . $value :
-                                ' = ' . $alias . '.' . $that->castValue($table, $key, $value));
+                                ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $key)));
                     },
                     array_keys($updateFields),
                     $updateFields
@@ -379,7 +377,7 @@ static function ($key, $value) use ($table, $alias, $that) {
                             return $value;
                         }
 
-                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->castValue($table, $value, $value);
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $value));
                     },
                     array_keys($constraints),
                     $constraints
@@ -409,39 +407,36 @@ static function ($key, $value) use ($table, $alias, $that) {
     }
 
     /**
-     * Returns cast value.
+     * Returns cast expression.
+     *
+     * @TODO move this to BaseBuilder in 4.5.0
      *
-     * @param string           $table     Protected Table name.
-     * @param string           $fieldName Field name. May be protected.
-     * @param float|int|string $value     Escaped value
+     * @param float|int|string $expression
      */
-    private function castValue(string $table, string $fieldName, $value): string
+    private function cast($expression, ?string $type): string
     {
-        $fieldName = trim($fieldName, $this->db->escapeChar);
-
-        if (! isset($this->QBOptions['fieldTypes'][$table])) {
-            $this->getFieldTypes($table);
-        }
-
-        $type = $this->QBOptions['fieldTypes'][$table][$fieldName] ?? null;
-
-        return ($type === null) ? $value : $value . '::' . strtoupper($type);
+        return ($type === null) ? $expression : $expression . '::' . strtoupper($type);
     }
 
     /**
-     * Gets filed types from database meta data.
+     * Returns the filed type from database meta data.
      *
-     * @param string $table Protected Table name.
+     * @param string $table     Protected table name.
+     * @param string $fieldName Field name. May be protected.
      */
-    private function getFieldTypes(string $table): void
+    private function getFieldType(string $table, string $fieldName): ?string
     {
-        $types = [];
+        $fieldName = trim($fieldName, $this->db->escapeChar);
 
-        foreach ($this->db->getFieldData($table) as $field) {
-            $types[$field->name] = $field->type;
+        if (! isset($this->QBOptions['fieldTypes'][$table])) {
+            $this->QBOptions['fieldTypes'][$table] = [];
+
+            foreach ($this->db->getFieldData($table) as $field) {
+                $this->QBOptions['fieldTypes'][$table][$field->name] = $field->type;
+            }
         }
 
-        $this->QBOptions['fieldTypes'][$table] = $types;
+        return $this->QBOptions['fieldTypes'][$table][$fieldName] ?? null;
     }
 
     /**

From fa2e07378dfe2f3bb6f70b5324601141ae5038c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Jan 2024 11:44:24 +0900
Subject: [PATCH 121/148] refactor: by rector

---
 system/Database/Postgre/Builder.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index b597e2df517c..496e9bd86bd6 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -351,11 +351,9 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
             $sql .= implode(
                 ",\n",
                 array_map(
-                    static function ($key, $value) use ($table, $alias, $that) {
-                        return $key . ($value instanceof RawSql ?
-                                ' = ' . $value :
-                                ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $key)));
-                    },
+                    static fn ($key, $value) => $key . ($value instanceof RawSql ?
+                            ' = ' . $value :
+                            ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $key))),
                     array_keys($updateFields),
                     $updateFields
                 )

From 12c4c7e88a1ace74ecc81892313f9bff83596d12 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Jan 2024 08:51:27 +0900
Subject: [PATCH 122/148] test: add test for getFieldData() for Postgre

---
 .../Live/Postgre/GetFieldDataTest.php         | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 tests/system/Database/Live/Postgre/GetFieldDataTest.php

diff --git a/tests/system/Database/Live/Postgre/GetFieldDataTest.php b/tests/system/Database/Live/Postgre/GetFieldDataTest.php
new file mode 100644
index 000000000000..64caac6126b3
--- /dev/null
+++ b/tests/system/Database/Live/Postgre/GetFieldDataTest.php
@@ -0,0 +1,101 @@
+<?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\Database\Live\Postgre;
+
+use CodeIgniter\Database\Live\AbstractGetFieldDataTest;
+use Config\Database;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class GetFieldDataTest extends AbstractGetFieldDataTest
+{
+    protected function createForge(): void
+    {
+        if ($this->db->DBDriver !== 'Postgre') {
+            $this->markTestSkipped('This test is only for Postgre.');
+        }
+
+        $this->forge = Database::forge($this->db);
+    }
+
+    public function testGetFieldData(): void
+    {
+        $fields = $this->db->getFieldData('test1');
+
+        $this->assertJsonStringEqualsJsonString(
+            json_encode([
+                (object) [
+                    'name'       => 'id',
+                    'type'       => 'integer',
+                    'max_length' => '32',
+                    'default'    => "nextval('db_test1_id_seq'::regclass)", // The default value is not defined.
+                    // 'primary_key' => 1,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_not_null',
+                    'type'       => 'character varying',
+                    'max_length' => '64',
+                    'default'    => null, // The default value is not defined.
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_null',
+                    'type'       => 'character varying',
+                    'max_length' => '64',
+                    'default'    => null, // The default value is not defined.
+                    // 'primary_key' => 0,
+                    'nullable' => true,
+                ],
+                (object) [
+                    'name'       => 'int_default_0',
+                    'type'       => 'integer',
+                    'max_length' => '32',
+                    'default'    => '0', // int 0
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_default_null',
+                    'type'       => 'character varying',
+                    'max_length' => '64',
+                    'default'    => 'NULL::character varying', // NULL value
+                    // 'primary_key' => 0,
+                    'nullable' => true,
+                ],
+                (object) [
+                    'name'       => 'text_default_text_null',
+                    'type'       => 'character varying',
+                    'max_length' => '64',
+                    'default'    => "'null'::character varying", // string "null"
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_default_abc',
+                    'type'       => 'character varying',
+                    'max_length' => '64',
+                    'default'    => "'abc'::character varying", // string "abc"
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+            ]),
+            json_encode($fields)
+        );
+    }
+}

From fbacb3071b53b316de17064710f53d22b67e07b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 05:44:05 +0900
Subject: [PATCH 123/148] refactor: use `CAST(expression AS type)` instead of
 `::type`

---
 system/Database/Postgre/Builder.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 496e9bd86bd6..3d566f6051a0 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -353,7 +353,7 @@ protected function _updateBatch(string $table, array $keys, array $values): stri
                 array_map(
                     static fn ($key, $value) => $key . ($value instanceof RawSql ?
                             ' = ' . $value :
-                            ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $key))),
+                            ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))),
                     array_keys($updateFields),
                     $updateFields
                 )
@@ -375,7 +375,8 @@ static function ($key, $value) use ($table, $alias, $that) {
                             return $value;
                         }
 
-                        return $table . '.' . $value . ' = ' . $alias . '.' . $that->cast($value, $that->getFieldType($table, $value));
+                        return $table . '.' . $value . ' = '
+                            . $that->cast($alias . '.' . $value, $that->getFieldType($table, $value));
                     },
                     array_keys($constraints),
                     $constraints
@@ -413,7 +414,7 @@ static function ($key, $value) use ($table, $alias, $that) {
      */
     private function cast($expression, ?string $type): string
     {
-        return ($type === null) ? $expression : $expression . '::' . strtoupper($type);
+        return ($type === null) ? $expression : 'CAST(' . $expression . ' AS ' . strtoupper($type) . ')';
     }
 
     /**

From 1741648fe6d2ad0b78deeceec85c2ef7a337f4ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 07:04:04 +0900
Subject: [PATCH 124/148] test: add tests for setAttachmentCID()

---
 tests/system/Email/EmailTest.php | 51 ++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index dfcbedf183cc..77f40dead168 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -162,4 +162,55 @@ private function createMockEmail(): MockEmail
 
         return new MockEmail($config);
     }
+
+    public function testSetAttachmentCIDFile(): void
+    {
+        $email = $this->createMockEmail();
+
+        $email->setFrom('your@example.com', 'Your Name');
+        $email->setTo('foo@example.jp');
+
+        $filename = SUPPORTPATH . 'Images/ci-logo.png';
+        $email->attach($filename);
+        $cid = $email->setAttachmentCID($filename);
+        $email->setMessage('<img src="cid:' . $cid . '" alt="CI Logo">');
+
+        $this->assertTrue($email->send());
+
+        $this->assertStringStartsWith('ci-logo.png@', $cid);
+        $this->assertStringStartsWith(
+            'ci-logo.png@',
+            $email->archive['attachments'][0]['cid']
+        );
+        $this->assertMatchesRegularExpression(
+            '/<img src="cid:ci-logo.png@(.+?)" alt="CI Logo">/u',
+            $email->archive['body']
+        );
+    }
+
+    public function testSetAttachmentCIDBufferString(): void
+    {
+        $email = $this->createMockEmail();
+
+        $email->setFrom('your@example.com', 'Your Name');
+        $email->setTo('foo@example.jp');
+
+        $filename  = SUPPORTPATH . 'Images/ci-logo.png';
+        $imageData = file_get_contents($filename);
+        $email->attach($imageData, 'inline', 'image001.png', 'image/png');
+        $cid = $email->setAttachmentCID('image001.png');
+        $email->setMessage('<img src="cid:' . $cid . '" alt="CI Logo">');
+
+        $this->assertTrue($email->send());
+
+        $this->assertStringStartsWith('image001.png@', $cid);
+        $this->assertStringStartsWith(
+            'image001.png@',
+            $email->archive['attachments'][0]['cid']
+        );
+        $this->assertMatchesRegularExpression(
+            '/<img src="cid:image001.png@(.+?)" alt="CI Logo">/u',
+            $email->archive['body']
+        );
+    }
 }

From 51d6963588c5c0c3761e8e2e26621c54d3c45e34 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 07:07:04 +0900
Subject: [PATCH 125/148] fix: setAttachmentCID() does not work with buffer
 string

---
 system/Email/Email.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/Email/Email.php b/system/Email/Email.php
index d18b40ff7cef..42835c3d404e 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -705,6 +705,7 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
     public function setAttachmentCID($filename)
     {
         foreach ($this->attachments as $i => $attachment) {
+            // For file path.
             if ($attachment['name'][0] === $filename) {
                 $this->attachments[$i]['multipart'] = 'related';
 
@@ -712,6 +713,15 @@ public function setAttachmentCID($filename)
 
                 return $this->attachments[$i]['cid'];
             }
+
+            // For buffer string.
+            if ($attachment['name'][1] === $filename) {
+                $this->attachments[$i]['multipart'] = 'related';
+
+                $this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][1]) . '@', true);
+
+                return $this->attachments[$i]['cid'];
+            }
         }
 
         return false;

From 8c4695ae04da4debb4fee0d546f352f2cc3f3eee Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 10:36:40 +0900
Subject: [PATCH 126/148] fix: DB Seeder may use wrong DB connection during
 testing

The shared migration holds an old DB connection.
If SQLite3 `:memory:` is used, a new DB connection is a connection to a new database.
---
 system/Test/DatabaseTestTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index f69a535f41ec..59dc5f82385d 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -79,7 +79,7 @@ public function loadDependencies()
             $config          = new Migrations();
             $config->enabled = true;
 
-            $this->migrations = Services::migrations($config, $this->db);
+            $this->migrations = Services::migrations($config, $this->db, false);
             $this->migrations->setSilent(false);
         }
 

From fa08bb2b0a353f45cd164b3d3ba7ac3678679953 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 13:07:42 +0900
Subject: [PATCH 127/148] docs: add "Notes on Data Types"

---
 user_guide_src/source/dbmgmt/forge.rst | 34 ++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index c14664b1ad7c..90bda20dfdba 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -120,6 +120,40 @@ After the fields have been defined, they can be added using
 ``$forge->addField($fields)`` followed by a call to the
 ``createTable()`` method.
 
+Notes on Data Types
+-------------------
+
+Floating-Point Types
+^^^^^^^^^^^^^^^^^^^^
+
+Floating-Point types such as ``FLOAT`` and ``DOUBLE`` represent approximate values.
+Therefore, they should not be used when exact values are needed.
+
+::
+
+    mysql> CREATE TABLE t (f FLOAT, d DOUBLE);
+    mysql> INSERT INTO t VALUES(99.9, 99.9);
+
+    mysql> SELECT * FROM t WHERE f=99.9;
+    Empty set (0.00 sec)
+
+    mysql> SELECT * FROM t WHERE f > 99.89 AND f < 99.91;
+    +------+------+
+    | f    | d    |
+    +------+------+
+    | 99.9 | 99.9 |
+    +------+------+
+    1 row in set (0.01 sec)
+
+When it is important to preserve exact precision, for example with monetary data,
+``DECIMAL`` or ``NUMERIC`` should be used.
+
+TEXT
+^^^^
+
+``TEXT`` should not be used on SQLSRV. It is deprecated.
+See `ntext, text, and image (Transact-SQL) - SQL Server | Microsoft Learn <https://learn.microsoft.com/en-us/sql/t-sql/data-types/ntext-text-and-image-transact-sql?view=sql-server-ver16>`_.
+
 $forge->addField()
 ------------------
 

From a5062173ef2a39dc02dad67dc3ede165149ac473 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 13:09:14 +0900
Subject: [PATCH 128/148] docs: improve readability

---
 user_guide_src/source/dbmgmt/forge.rst     | 29 +++++++++++-----------
 user_guide_src/source/dbmgmt/forge/007.php |  1 +
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 90bda20dfdba..5be595d48371 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -96,29 +96,33 @@ mechanism for this.
 Adding Fields
 =============
 
+$forge->addField()
+------------------
+
 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
-example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR)
-also require a ``constraint`` key.
+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.
 
 .. literalinclude:: forge/006.php
 
 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".
+-  ``unsigned``/true : to generate ``UNSIGNED`` in the field definition.
+-  ``default``/value : to generate ``DEFAULT`` constraint 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
    field. Note that the field type must be a type that supports this,
-   such as integer.
+   such as ``INTEGER``.
 -  ``unique``/true : to generate a unique key for the field definition.
 
 .. literalinclude:: forge/007.php
 
 After the fields have been defined, they can be added using
 ``$forge->addField($fields)`` followed by a call to the
-``createTable()`` method.
+:ref:`createTable() <creating-a-table>`  method.
 
 Notes on Data Types
 -------------------
@@ -154,11 +158,6 @@ TEXT
 ``TEXT`` should not be used on SQLSRV. It is deprecated.
 See `ntext, text, and image (Transact-SQL) - SQL Server | Microsoft Learn <https://learn.microsoft.com/en-us/sql/t-sql/data-types/ntext-text-and-image-transact-sql?view=sql-server-ver16>`_.
 
-$forge->addField()
-------------------
-
-The ``addField()`` method will accept the above array.
-
 .. _forge-addfield-default-value-rawsql:
 
 Raw Sql Strings as Default Values
@@ -243,6 +242,8 @@ You can specify the desired action for the "on update" and "on delete" propertie
 
 .. note:: SQLite3 does not support the naming of foreign keys. CodeIgniter will refer to them by ``prefix_table_column_foreign``.
 
+.. _creating-a-table:
+
 Creating a Table
 ================
 
diff --git a/user_guide_src/source/dbmgmt/forge/007.php b/user_guide_src/source/dbmgmt/forge/007.php
index 182ea8347633..1cfa77487d2b 100644
--- a/user_guide_src/source/dbmgmt/forge/007.php
+++ b/user_guide_src/source/dbmgmt/forge/007.php
@@ -27,3 +27,4 @@
         'default'    => 'pending',
     ],
 ];
+$forge->addField($fields);

From 415012c37a50df8e2f73158c12b39e044ee0b123 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 13:09:32 +0900
Subject: [PATCH 129/148] docs: align comments

---
 user_guide_src/source/dbmgmt/forge/025.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/dbmgmt/forge/025.php b/user_guide_src/source/dbmgmt/forge/025.php
index 7e1aa8ebd320..848625a9b0d6 100644
--- a/user_guide_src/source/dbmgmt/forge/025.php
+++ b/user_guide_src/source/dbmgmt/forge/025.php
@@ -1,4 +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 comma separated column names
 $forge->dropColumn('table_name', ['column_1', 'column_2']); // by proving array of column names

From 9bda43adcb4852ae973e1c52f0468de1c23fd420 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 13:09:46 +0900
Subject: [PATCH 130/148] docs: replace MySqli with MySQLi

---
 user_guide_src/source/dbmgmt/forge/028.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/dbmgmt/forge/028.php b/user_guide_src/source/dbmgmt/forge/028.php
index 776c587b896c..b0a92357d088 100644
--- a/user_guide_src/source/dbmgmt/forge/028.php
+++ b/user_guide_src/source/dbmgmt/forge/028.php
@@ -1,5 +1,5 @@
 <?php
 
-// MySqli Produces: ALTER TABLE `tablename` DROP PRIMARY KEY
+// MySQLi Produces: ALTER TABLE `tablename` DROP PRIMARY KEY
 // Others Produces: ALTER TABLE `tablename` DROP CONSTRAINT `pk_tablename`
 $forge->dropPrimaryKey('tablename');

From 22d8e74dc145ae4ff7c006862bc22d5178d26dff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Jan 2024 20:58:45 +0900
Subject: [PATCH 131/148] test: add test for getFieldData() for SQLSRV

---
 .../Database/Live/SQLSRV/GetFieldDataTest.php | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 tests/system/Database/Live/SQLSRV/GetFieldDataTest.php

diff --git a/tests/system/Database/Live/SQLSRV/GetFieldDataTest.php b/tests/system/Database/Live/SQLSRV/GetFieldDataTest.php
new file mode 100644
index 000000000000..07a41cd1467e
--- /dev/null
+++ b/tests/system/Database/Live/SQLSRV/GetFieldDataTest.php
@@ -0,0 +1,101 @@
+<?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\Database\Live\SQLSRV;
+
+use CodeIgniter\Database\Live\AbstractGetFieldDataTest;
+use Config\Database;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class GetFieldDataTest extends AbstractGetFieldDataTest
+{
+    protected function createForge(): void
+    {
+        if ($this->db->DBDriver !== 'SQLSRV') {
+            $this->markTestSkipped('This test is only for SQLSRV.');
+        }
+
+        $this->forge = Database::forge($this->db);
+    }
+
+    public function testGetFieldData(): void
+    {
+        $fields = $this->db->getFieldData('test1');
+
+        $this->assertJsonStringEqualsJsonString(
+            json_encode([
+                (object) [
+                    'name'       => 'id',
+                    'type'       => 'int',
+                    'max_length' => 10,
+                    'default'    => null, // The default value is not defined.
+                    // 'primary_key' => 1,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_not_null',
+                    'type'       => 'varchar',
+                    'max_length' => 64,
+                    'default'    => null, // The default value is not defined.
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_null',
+                    'type'       => 'varchar',
+                    'max_length' => 64,
+                    'default'    => null, // The default value is not defined.
+                    // 'primary_key' => 0,
+                    'nullable' => true,
+                ],
+                (object) [
+                    'name'       => 'int_default_0',
+                    'type'       => 'int',
+                    'max_length' => 10,
+                    'default'    => '((0))', // int 0
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_default_null',
+                    'type'       => 'varchar',
+                    'max_length' => 64,
+                    'default'    => '(NULL)', // NULL value
+                    // 'primary_key' => 0,
+                    'nullable' => true,
+                ],
+                (object) [
+                    'name'       => 'text_default_text_null',
+                    'type'       => 'varchar',
+                    'max_length' => 64,
+                    'default'    => "('null')", // string "null"
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+                (object) [
+                    'name'       => 'text_default_abc',
+                    'type'       => 'varchar',
+                    'max_length' => 64,
+                    'default'    => "('abc')", // string "abc"
+                    // 'primary_key' => 0,
+                    'nullable' => false,
+                ],
+            ]),
+            json_encode($fields)
+        );
+    }
+}

From baca36e4ee9119dd0976a383ca69e33f60af4762 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 07:07:03 +0900
Subject: [PATCH 132/148] docs: update PHPDoc

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 936b4c3be778..48302ab26fc7 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -170,8 +170,10 @@ class BaseBuilder
      *   setQueryAsData?: string,
      *   sql?: string,
      *   alias?: string,
-     *   fieldTypes?: array<string, string>
+     *   fieldTypes?: array<string, array<string, string>>
      * }
+     *
+     * fieldTypes: [ProtectedTableName => [FieldName => Type]]
      */
     protected $QBOptions;
 

From 63ab12b61c3c08554e730b6307f9b40d6c9c31b9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 08:47:22 +0900
Subject: [PATCH 133/148] test: update testInsertBatch() to use various data
 types

---
 tests/system/Database/Live/InsertTest.php | 34 +++++++++++++++++------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index cd40a179dd4d..72afb83c8d58 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -49,21 +49,39 @@ public function testInsert(): void
 
     public function testInsertBatch(): void
     {
-        $jobData = [
+        $table = 'type_test';
+
+        $builder = $this->db->table($table);
+        $builder->truncate();
+
+        $data = [
             [
-                'name'        => 'Comedian',
-                'description' => 'Theres something in your teeth',
+                'type_varchar'  => 'test1',
+                'type_char'     => 'char',
+                'type_smallint' => 32767,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-01',
+                'type_datetime' => '2023-12-21 12:00:00',
             ],
             [
-                'name'        => 'Cab Driver',
-                'description' => 'Iam yellow',
+                'type_varchar'  => 'test2',
+                'type_char'     => 'char',
+                'type_smallint' => 32767,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-02',
+                'type_datetime' => '2023-12-21 12:00:00',
             ],
         ];
 
-        $this->db->table('job')->insertBatch($jobData);
+        $this->db->table($table)->insertBatch($data);
 
-        $this->seeInDatabase('job', ['name' => 'Comedian']);
-        $this->seeInDatabase('job', ['name' => 'Cab Driver']);
+        $expected = $data;
+        $this->seeInDatabase($table, $expected[0]);
+        $this->seeInDatabase($table, $expected[1]);
     }
 
     public function testReplaceWithNoMatchingData(): void

From fcf5384188459b480c3304c80f02db9c249ed124 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 09:20:11 +0900
Subject: [PATCH 134/148] test: add test for deleteBatch() with DATE where key

---
 tests/system/Database/Live/DeleteTest.php | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 4383d32b78a0..7b53c8b0b272 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -98,6 +98,52 @@ public function testDeleteBatch(): void
         $this->dontSeeInDatabase('user', ['email' => 'ahmadinejad@world.com', 'name' => 'Ahmadinejad']);
     }
 
+    public function testDeleteBatchConstraintsDate(): void
+    {
+        $table = 'type_test';
+
+        // Prepares test data.
+        $builder = $this->db->table($table);
+        $builder->truncate();
+
+        for ($i = 1; $i < 4; $i++) {
+            $builder->insert([
+                'type_varchar'  => 'test' . $i,
+                'type_char'     => 'char',
+                'type_text'     => 'text',
+                'type_smallint' => 32767,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
+                'type_float'    => 10.1,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-0' . $i,
+                'type_datetime' => '2023-12-21 12:00:00',
+            ]);
+        }
+
+        $data = [
+            ['date' => '2023-12-01', 'unused' => 'You can have fields you dont use'],
+            ['date' => '2023-12-02', 'unused' => 'You can have fields you dont use'],
+        ];
+        $builder = $this->db->table($table)
+            ->setData($data, null, 'data')
+            ->onConstraint(['type_date' => 'date']);
+        $builder->deleteBatch();
+
+        $this->dontSeeInDatabase(
+            $table,
+            ['type_date' => '2023-12-01', 'type_varchar' => 'test1']
+        );
+        $this->dontSeeInDatabase(
+            $table,
+            ['type_date' => '2023-12-02', 'type_varchar' => 'test2']
+        );
+        $this->seeInDatabase(
+            $table,
+            ['type_date' => '2023-12-03', 'type_varchar' => 'test3']
+        );
+    }
+
     public function testDeleteBatchWithQuery(): void
     {
         $this->forge = Database::forge($this->DBGroup);

From bec64222b336bc0816857e0d3c655390458dc948 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 09:21:31 +0900
Subject: [PATCH 135/148] fix: deleteBatch() Postgre type error

---
 system/Database/Postgre/Builder.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 3d566f6051a0..6da3d377b93b 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -562,6 +562,7 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
 
             $sql .= ') ' . $alias . "\n";
 
+            $that = $this;
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
@@ -570,8 +571,8 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
                         $value :
                         (
                             is_string($key) ?
-                            $table . '.' . $key . ' = ' . $alias . '.' . $value :
-                            $table . '.' . $value . ' = ' . $alias . '.' . $value
+                            $table . '.' . $key . ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key)) :
+                            $table . '.' . $value . ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))
                         )
                     ),
                     array_keys($constraints),

From b6b8c311af589df901243d63ed34756234dc3599 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 09:27:30 +0900
Subject: [PATCH 136/148] refactor: use if statement

---
 system/Database/Postgre/Builder.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 6da3d377b93b..61562a7f8d65 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -566,15 +566,25 @@ protected function _deleteBatch(string $table, array $keys, array $values): stri
             $sql .= 'WHERE ' . implode(
                 ' AND ',
                 array_map(
-                    static fn ($key, $value) => (
-                        $value instanceof RawSql ?
-                        $value :
-                        (
-                            is_string($key) ?
-                            $table . '.' . $key . ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key)) :
-                            $table . '.' . $value . ' = ' . $that->cast($alias . '.' . $value, $that->getFieldType($table, $key))
-                        )
-                    ),
+                    static function ($key, $value) use ($table, $alias, $that) {
+                        if ($value instanceof RawSql) {
+                            return $value;
+                        }
+
+                        if (is_string($key)) {
+                            return $table . '.' . $key . ' = '
+                                . $that->cast(
+                                    $alias . '.' . $value,
+                                    $that->getFieldType($table, $key)
+                                );
+                        }
+
+                        return $table . '.' . $value . ' = '
+                            . $that->cast(
+                                $alias . '.' . $value,
+                                $that->getFieldType($table, $key)
+                            );
+                    },
                     array_keys($constraints),
                     $constraints
                 )

From 4be3bd8dd50151e8634fd39f006cc136cc98c2ec Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 09:46:16 +0900
Subject: [PATCH 137/148] fix: remove unneeded cast()

---
 system/Database/Postgre/Builder.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 61562a7f8d65..3749d8383237 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -579,11 +579,7 @@ static function ($key, $value) use ($table, $alias, $that) {
                                 );
                         }
 
-                        return $table . '.' . $value . ' = '
-                            . $that->cast(
-                                $alias . '.' . $value,
-                                $that->getFieldType($table, $key)
-                            );
+                        return $table . '.' . $value . ' = ' . $alias . '.' . $value;
                     },
                     array_keys($constraints),
                     $constraints

From 6d3ac2dd4ccfb670adc0610dcb182515b307d829 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 10:16:28 +0900
Subject: [PATCH 138/148] docs: add section titles for DeteteBatch

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 5e6d54985a6c..0849f1d4bb27 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1176,11 +1176,17 @@ method, or ``emptyTable()``.
 
 .. _delete-batch:
 
+DeleteBatch
+===========
+
 $builder->deleteBatch()
 -----------------------
 
 .. versionadded:: 4.3.0
 
+Delete from Data
+^^^^^^^^^^^^^^^^
+
 Generates a batch **DELETE** statement based on a set of data.
 
 .. literalinclude:: query_builder/118.php
@@ -1189,6 +1195,9 @@ This method may be especially useful when deleting data in a table with a compos
 
 .. note:: SQLite does not support the use of ``where()``.
 
+Delete from a Query
+^^^^^^^^^^^^^^^^^^^
+
 You can also delete from a query:
 
 .. literalinclude:: query_builder/119.php

From 3c3668623640dff621113d6854e4857c722457ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 10:17:09 +0900
Subject: [PATCH 139/148] docs: remove unneeded note

---
 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 0849f1d4bb27..8d4643c3dff9 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1202,8 +1202,6 @@ You can also delete from a query:
 
 .. literalinclude:: query_builder/119.php
 
-.. note:: ``$deleteBatch()`` can be used since v4.3.0.
-
 $builder->emptyTable()
 ----------------------
 

From 4531b3bb3e419aee923ea0d8bf84c6ed62c17202 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 10:19:12 +0900
Subject: [PATCH 140/148] docs: move section positions

---
 .../source/database/query_builder.rst         | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 8d4643c3dff9..1cb718b9338e 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1096,6 +1096,16 @@ Or as an array:
 You may also use the ``$builder->set()`` method described above when
 performing updates.
 
+$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.
+
+For more information view documentation for `$builder->getCompiledInsert()`_.
+
+.. note:: This method doesn't work for batched updates.
+
 .. _update-batch:
 
 UpdateBatch
@@ -1141,16 +1151,6 @@ Since v4.3.0, you can also update from a query with the ``setQueryAsData()`` met
 
 .. note:: It is required to alias the columns of the select query to match those of the target table.
 
-$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.
-
-For more information view documentation for ``$builder->getCompiledInsert()``.
-
-.. note:: This method doesn't work for batched updates.
-
 *************
 Deleting Data
 *************
@@ -1174,6 +1174,14 @@ 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->getCompiledDelete()
+-----------------------------
+
+This works exactly the same way as ``$builder->getCompiledInsert()`` except
+that it produces a **DELETE** SQL string instead of an **INSERT** SQL string.
+
+For more information view documentation for `$builder->getCompiledInsert()`_.
+
 .. _delete-batch:
 
 DeleteBatch
@@ -1220,14 +1228,6 @@ 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()
------------------------------
-
-This works exactly the same way as ``$builder->getCompiledInsert()`` except
-that it produces a **DELETE** SQL string instead of an **INSERT** SQL string.
-
-For more information view documentation for ``$builder->getCompiledInsert()``.
-
 **********************
 Conditional Statements
 **********************

From 6df49112b8d37e911bf884408f776e89f59f77d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 10:20:15 +0900
Subject: [PATCH 141/148] docs: replace SQLite with SQLite3

It is the DB driver name.
---
 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 1cb718b9338e..6383f8b26909 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1201,7 +1201,7 @@ Generates a batch **DELETE** statement based on a set of data.
 
 This method may be especially useful when deleting data in a table with a composite primary key.
 
-.. note:: SQLite does not support the use of ``where()``.
+.. note:: SQLite3 does not support the use of ``where()``.
 
 Delete from a Query
 ^^^^^^^^^^^^^^^^^^^

From 6f83075ccf46e489aa038133d2783af74535e7b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 11:40:04 +0900
Subject: [PATCH 142/148] test: add test for Postgre upsertBatch()

---
 tests/system/Database/Live/UpsertTest.php | 50 +++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tests/system/Database/Live/UpsertTest.php b/tests/system/Database/Live/UpsertTest.php
index 8c9fcb694c72..faeef0bc21e9 100644
--- a/tests/system/Database/Live/UpsertTest.php
+++ b/tests/system/Database/Live/UpsertTest.php
@@ -50,6 +50,56 @@ public function testUpsertOnUniqueIndex(): void
         $this->seeInDatabase('user', ['name' => 'Upsert One']);
     }
 
+    public function testUpsertBatch(): void
+    {
+        $table = 'type_test';
+
+        // Prepares test data.
+        $builder = $this->db->table($table);
+        $builder->truncate();
+
+        $this->forge = Database::forge($this->DBGroup);
+        $this->forge->addKey(['type_varchar'], false, true);
+        $this->forge->processIndexes($table);
+
+        for ($i = 1; $i < 2; $i++) {
+            $builder->insert([
+                'type_varchar'  => 'test' . $i,
+                'type_char'     => 'char',
+                'type_smallint' => 32767,
+                'type_integer'  => 2_147_483_647,
+                'type_bigint'   => 9_223_372_036_854_775_807,
+                'type_numeric'  => 123.23,
+                'type_date'     => '2023-12-0' . $i,
+                'type_datetime' => '2023-12-21 12:00:00',
+            ]);
+        }
+
+        $data = [
+            // new row insert
+            [
+                'type_varchar'  => 'insert', // Key
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ],
+            // update
+            [
+                'type_varchar'  => 'test1', // Key
+                'type_bigint'   => 9_999_999,
+                'type_date'     => '2024-01-01',
+                'type_datetime' => '2024-01-01 09:00:00',
+            ],
+        ];
+
+        $builder->onConstraint('type_varchar')->upsertBatch($data);
+
+        $expected = $data;
+        $this->seeInDatabase($table, $expected[0]);
+        $this->seeInDatabase($table, $expected[1]);
+        $this->assertSame(2, $builder->countAll());
+    }
+
     public function testUpsertAndUpsertBatchWithObject(): void
     {
         $data = [];

From 0a2f0c759cb5ada51b93d144096ea9a97babeab0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 12:24:57 +0900
Subject: [PATCH 143/148] docs: add section titles for UpsertBatch

---
 user_guide_src/source/database/query_builder.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 6383f8b26909..658c177fc9d1 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -954,11 +954,16 @@ $builder->upsertBatch()
 
 .. versionadded:: 4.3.0
 
+Upsert from Data
+^^^^^^^^^^^^^^^^
+
 Generates an upsert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
 method. By default a constraint will be defined in order. A primary
 key will be selected first and then unique keys. MySQL will use any
-constraint by default. Here is an example using an array:
+constraint by default.
+
+Here is an example using an array:
 
 .. literalinclude:: query_builder/108.php
 
@@ -966,6 +971,9 @@ The first parameter is an associative array of values.
 
 .. note:: All values are escaped automatically producing safer queries.
 
+Upsert from a Query
+^^^^^^^^^^^^^^^^^^^
+
 You can also upsert from a query:
 
 .. literalinclude:: query_builder/115.php

From ebb950abade7f5b965cdd7dace75b6cd42770e26 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 12:27:44 +0900
Subject: [PATCH 144/148] docs: add section titles for InsertBatch

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 658c177fc9d1..f0f9e90363ce 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -878,6 +878,9 @@ insertBatch
 $builder->insertBatch()
 -----------------------
 
+Insert from 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:
@@ -890,6 +893,9 @@ The first parameter is an associative array of values.
 
 .. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
 
+Insert from a Query
+^^^^^^^^^^^^^^^^^^^
+
 You can also insert from a query:
 
 .. literalinclude:: query_builder/117.php

From cadc6f8d755b0d3a7eec6c44d4cd79282952f83c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 18:45:22 +0900
Subject: [PATCH 145/148] docs: add missing $allowEmptyInserts

---
 user_guide_src/source/models/model.rst     | 13 +++++++++++++
 user_guide_src/source/models/model/005.php |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index fdedcc7d15d7..74225cd7869c 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -157,6 +157,17 @@ potential mass assignment vulnerabilities.
 
 .. note:: The `$primaryKey`_ field should never be an allowed field.
 
+$allowEmptyInserts
+------------------
+
+.. versionadded:: 4.3.0
+
+Whether to allow inserting empty data. The default value is ``false``, meaning
+that if you try to insert empty data, an exception with
+"There is no data to insert." will raise.
+
+You may also change this setting with the :ref:`model-allow-empty-inserts` method.
+
 Dates
 -----
 
@@ -371,6 +382,8 @@ You can use ``allowEmptyInserts()`` method to insert empty data. The Model throw
 
 .. literalinclude:: model/056.php
 
+You may also change this setting with the `$allowEmptyInserts`_ property.
+
 You can enable the check again by calling ``allowEmptyInserts(false)``.
 
 update()
diff --git a/user_guide_src/source/models/model/005.php b/user_guide_src/source/models/model/005.php
index c54aa69c05a8..956870af2969 100644
--- a/user_guide_src/source/models/model/005.php
+++ b/user_guide_src/source/models/model/005.php
@@ -16,6 +16,8 @@ class UserModel extends Model
 
     protected $allowedFields = ['name', 'email'];
 
+    protected bool $allowEmptyInserts = false;
+
     // Dates
     protected $useTimestamps = false;
     protected $dateFormat    = 'datetime';

From aa66b793bb1c8067d832c6a9f8206ef1eecca1e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Jan 2024 18:52:06 +0900
Subject: [PATCH 146/148] fix: add missing $allowEmptyInserts to template

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

diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
index b9b9c99eb560..72509cdbd9d4 100644
--- a/system/Commands/Generators/Views/model.tpl.php
+++ b/system/Commands/Generators/Views/model.tpl.php
@@ -17,6 +17,8 @@ class {class} extends Model
     protected $protectFields    = true;
     protected $allowedFields    = [];
 
+    protected bool $allowEmptyInserts = false;
+
     // Dates
     protected $useTimestamps = false;
     protected $dateFormat    = 'datetime';

From 94ac62308c1d9b481f334349cb2074f866f03d6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 27 Jan 2024 09:22:40 +0900
Subject: [PATCH 147/148] Prep for 4.4.5 release

---
 CHANGELOG.md                                  | 22 ++++++++++++++++
 phpdoc.dist.xml                               |  2 +-
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.4.5.rst   | 18 +------------
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_445.rst       | 25 +------------------
 6 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61b773f58ac4..c7c4e4dd3254 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## [v4.4.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.5) (2024-01-27)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.4...v4.4.5)
+
+### Fixed Bugs
+
+* fix: bug 4.4.4 `spark serve` not working when using Session in Routes.php by @ALTITUDE-DEV-FR in https://github.com/codeigniter4/CodeIgniter4/pull/8389
+* fix: `highlightFile()` in `BaseExceptionHandler` for PHP 8.3 by @michalsn in https://github.com/codeigniter4/CodeIgniter4/pull/8401
+* fix: [Validation] DotArrayFilter returns incorrect array when numeric index array is passed by @grimpirate in https://github.com/codeigniter4/CodeIgniter4/pull/8425
+* fix: OCI8 Forge always sets NOT NULL when BOOLEAN is specified by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8440
+* fix: DB Seeder may use wrong DB connection during testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8447
+* fix: [Postgre] QueryBuilder::updateBatch() does not work (No API change) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8439
+* fix: [Postgre] QueryBuilder::deleteBatch() does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8451
+* fix: [Email] setAttachmentCID() does not work with buffer string by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8446
+* fix: add undocumented Model $allowEmptyInserts by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8456
+
+### Refactoring
+
+* refactor: remove overrides for coding-standard v1.7.12 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/8386
+* refactor: Table class to fix phpstan errors by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8402
+* fix: typo in pager default_simple by @jasonliang-dev in https://github.com/codeigniter4/CodeIgniter4/pull/8407
+* refactor: improve Forge variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/8434
+
 ## [v4.4.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.4.4) (2023-12-28)
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.4.3...v4.4.4)
 
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index 4fb8fd62693f..f0b3a7408da4 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -10,7 +10,7 @@
         <output>api/build/</output>
         <cache>api/cache/</cache>
     </paths>
-    <version number="4.4.4">
+    <version number="4.4.5">
         <api format="php">
             <source dsn=".">
                 <path>system</path>
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index bc23a6e51a7c..46eb419f7717 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -54,7 +54,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.4.4';
+    public const CI_VERSION = '4.4.5';
 
     /**
      * App startup time.
diff --git a/user_guide_src/source/changelogs/v4.4.5.rst b/user_guide_src/source/changelogs/v4.4.5.rst
index cc395dc9100f..45ece9b22be7 100644
--- a/user_guide_src/source/changelogs/v4.4.5.rst
+++ b/user_guide_src/source/changelogs/v4.4.5.rst
@@ -2,7 +2,7 @@
 Version 4.4.5
 #############
 
-Release Date: Unreleased
+Release Date: January 27, 2024
 
 **4.4.5 release of CodeIgniter4**
 
@@ -10,22 +10,6 @@ Release Date: Unreleased
     :local:
     :depth: 3
 
-********
-BREAKING
-********
-
-***************
-Message Changes
-***************
-
-*******
-Changes
-*******
-
-************
-Deprecations
-************
-
 **********
 Bugs Fixed
 **********
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index b71d69fd9eb3..86a3517b9d43 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -26,7 +26,7 @@
 version = '4.4'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.4.4'
+release = '4.4.5'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_445.rst b/user_guide_src/source/installation/upgrade_445.rst
index 48273f86da62..f5f6f0a1607c 100644
--- a/user_guide_src/source/installation/upgrade_445.rst
+++ b/user_guide_src/source/installation/upgrade_445.rst
@@ -12,18 +12,6 @@ Please refer to the upgrade instructions corresponding to your installation meth
     :local:
     :depth: 2
 
-**********************
-Mandatory File Changes
-**********************
-
-****************
-Breaking Changes
-****************
-
-*********************
-Breaking Enhancements
-*********************
-
 *************
 Project Files
 *************
@@ -34,21 +22,10 @@ these files being outside of the **system** scope they will not be changed witho
 There are some third-party CodeIgniter modules available to assist with merging changes to
 the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
 
-Content Changes
-===============
-
-The following files received significant changes (including deprecations or visual adjustments)
-and it is recommended that you merge the updated versions with your application:
-
-Config
-------
-
-- @TODO
-
 All Changes
 ===========
 
 This is a list of all files in the **project space** that received changes;
 many will be simple comments or formatting that have no effect on the runtime:
 
-- @TODO
+- composer.json

From 769545e4ea6d50fa624be1dec89232cbc6380434 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 27 Jan 2024 09:36:00 +0900
Subject: [PATCH 148/148] chore: add PR title patterns for release

---
 .github/prlint.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/prlint.json b/.github/prlint.json
index a3f9b2c0994e..b8dec09f108d 100644
--- a/.github/prlint.json
+++ b/.github/prlint.json
@@ -1,7 +1,7 @@
 {
     "title": [
         {
-            "pattern": "^(\\[\\d+\\.\\d+\\]\\s{1})?(feat|fix|chore|docs|perf|refactor|style|test)(\\([\\-.@:`a-zA-Z0-9]+\\))?!?:\\s{1}\\S.+\\S$",
+            "pattern": "^(\\[\\d+\\.\\d+\\]\\s{1})?(feat|fix|chore|docs|perf|refactor|style|test)(\\([\\-.@:`a-zA-Z0-9]+\\))?!?:\\s{1}\\S.+\\S|Prep for \\d\\.\\d\\.\\d release|\\d\\.\\d\\.\\d Ready code$",
             "message": "PR title must include the type (feat, fix, chore, docs, perf, refactor, style, test) of the commit per Conventional Commits specification. See https://www.conventionalcommits.org/en/v1.0.0/ for the discussion."
         }
     ]