diff --git a/.editorconfig b/.editorconfig
index 23a7072c587b..53faf5c3beac 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,7 +6,8 @@ root = true
 end_of_line = lf
 
 [*.php]
-indent_style = tab
+indent_style = space
+indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/.gitattributes b/.gitattributes
index 1a7b3deb77e8..bf0e1f766d96 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -25,6 +25,7 @@ utils/ export-ignore
 rector.php export-ignore
 phpunit.xml.dist export-ignore
 phpstan.neon.dist export-ignore
+.php-cs-fixer.dist.php export-ignore
 
 # The source user guide, either
 user_guide_src/ export-ignore
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6532121074ad..d3afefe5c9fd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,13 +1,18 @@
 version: 2
+
 updates:
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: 'composer'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 10
 
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    # Check for updates to GitHub Actions every weekday
-    interval: "daily"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    ignore:
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-minor'
+          - 'version-update:semver-patch'
diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 393adaf7c277..3b441e36485d 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -1,6 +1,6 @@
 # When changes are pushed to the develop branch,
 # build the current version of the API documentation
-# with phpDocumentor and deploy it to the api branch.
+# with phpDocumentor and deploy it to codeigniter4/api.
 name: Deploy API Documentation
 
 on:
@@ -9,13 +9,14 @@ on:
       - 'develop'
     paths:
       - 'system/**'
+      - '.github/workflows/deploy-apidocs.yml'
 
 jobs:
-
   build:
     name: Deploy to api
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
-    runs-on: ubuntu-latest
+    if: github.repository == 'codeigniter4/CodeIgniter4'
+    runs-on: ubuntu-20.04
+
     steps:
       - name: Setup credentials
         run: |
@@ -37,37 +38,34 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
-          extensions: intl
+          php-version: '8.0'
+          coverage: none
 
-      - name: Install GraphViz for phpDocumentor
-        run: |
-          sudo apt install -yq graphviz
-
-      - name: Download phpDocumentor
+      - name: Download phpDocumentor v3.1
         run: |
           cd ./source
           curl \
-            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v2.9.1/phpDocumentor.phar \
+            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.1.0/phpDocumentor.phar \
             -o admin/phpDocumentor.phar
 
-      - name: Prepare
+      - name: Prepare API repo
+        working-directory: api
         run: |
-          cd ./api
-          rm -rf ./api/docs*
-          mkdir -p ./api/docs
           git reset --hard master
+          rm -rfv docs
+          mkdir --parents --verbose docs
 
-      - name: Build
+      - name: Build API in source repo
+        working-directory: source
         run: |
-          cd ./source
-          chmod +x admin/phpDocumentor.phar
-          admin/phpDocumentor.phar
+          php admin/phpDocumentor.phar run --ansi --verbose
           cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
 
-      - name: Deploy
+      - name: Deploy to API repo
+        working-directory: api
         run: |
-          cd ./api
           git add .
-          git commit -m "API sync for ${GITHUB_SHA}"
-          git push
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Updated API for commit ${GITHUB_SHA}"
+            git push origin master
+          fi
diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index fff563878b2e..226cf242ed59 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   framework:
     name: Deploy to framework
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    if: github.repository == 'codeigniter4/CodeIgniter4'
     runs-on: ubuntu-latest
     steps:
       - name: Identify
@@ -36,7 +36,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4.0.2
+        uses: actions/github-script@v4
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -54,7 +54,7 @@ jobs:
 
   appstarter:
     name: Deploy to appstarter
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    if: github.repository == 'codeigniter4/CodeIgniter4'
     runs-on: ubuntu-latest
     steps:
       - name: Identify
@@ -81,7 +81,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4.0.2
+        uses: actions/github-script@v4
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
new file mode 100644
index 000000000000..cb7d9671e2cd
--- /dev/null
+++ b/.github/workflows/test-coding-standards.yml
@@ -0,0 +1,59 @@
+name: Coding Standards
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+
+jobs:
+  lint:
+    name: PHP ${{ matrix.php-version }} Lint with PHP CS Fixer
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '7.3'
+          - '7.4'
+          - '8.0'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: tokenizer
+          coverage: none
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php-version }}-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
+      - name: Run lint on `app/`, `admin/`, `public/`
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.no-header.php-cs-fixer.dist.php --using-cache=no --diff
+
+      - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
new file mode 100644
index 000000000000..fcc66f7d682c
--- /dev/null
+++ b/.github/workflows/test-phpcpd.yml
@@ -0,0 +1,43 @@
+# When a PR is opened or a push is made, check code
+# for duplication with PHP Copy/Paste Detector.
+name: PHPCPD
+
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'public/**'
+      - 'system/**'
+      - '.github/workflows/test-phpcpd.yml'
+  push:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'public/**'
+      - 'system/**'
+      - '.github/workflows/test-phpcpd.yml'
+
+jobs:
+  build:
+    name: Duplicate Code Detection
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          tools: phive
+          extensions: intl, json, mbstring, xml
+
+      - name: Detect code duplication
+        run: |
+            sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
+            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php app/ public/ system/
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 86b68b058ea1..0e59e3bf4e3a 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -54,7 +54,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -64,7 +64,7 @@ jobs:
         run: mkdir -p build/phpstan
 
       - name: Cache PHPStan result cache directory
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: build/phpstan
           key: ${{ runner.os }}-phpstan-${{ github.sha }}
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 1b547fb76884..c093190233cb 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -44,9 +44,9 @@ jobs:
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
         mysql-versions: ['5.7']
         include:
-          - php-versions: 7.4
+          - php-versions: '7.4'
             db-platforms: MySQLi
-            mysql-versions: 8.0
+            mysql-versions: '8.0'
 
     services:
       mysql:
@@ -107,13 +107,14 @@ jobs:
         run: |
           sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
           sudo apt-get install -y imagemagick
+          sudo apt-get install --fix-broken
 
       - name: Get composer cache directory
         id: composercache
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -122,7 +123,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan codeigniter4/codeigniter4-standard squizlabs/php_codesniffer
+          composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
           php -r 'file_put_contents("vendor/laminas/laminas-zendframework-bridge/src/autoload.php", "");'
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
@@ -140,7 +141,7 @@ jobs:
       - if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '7.4'
         name: Run Coveralls
         run: |
-          composer global require php-coveralls/php-coveralls:^2.4
+          composer global require --ansi php-coveralls/php-coveralls:^2.4
           php-coveralls --coverage_clover=build/logs/clover.xml -v
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index e1420c965f37..0d7262ceb4ea 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -58,7 +58,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
diff --git a/.gitignore b/.gitignore
index b769053b4a4b..74c6d0ce6c4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,5 @@ nb-configuration.xml
 /results/
 /phpunit*.xml
 /.phpunit.*.cache
+
+/.php-cs-fixer.php
diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
new file mode 100644
index 000000000000..12acddb81087
--- /dev/null
+++ b/.no-header.php-cs-fixer.dist.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+use CodeIgniter\CodingStandard\CodeIgniter4;
+use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
+use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
+use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->files()
+    ->in([
+        __DIR__ . '/admin',
+        __DIR__ . '/app',
+        __DIR__ . '/public',
+    ])
+    ->notName('#Logger\.php$#');
+
+$overrides = [];
+
+$options = [
+    'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
+    'finder'       => $finder,
+    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
+    'customRules'  => [
+        NoCodeSeparatorCommentFixer::name() => true,
+        SpaceAfterCommentStartFixer::name() => true,
+    ],
+];
+
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
new file mode 100644
index 000000000000..3c9e05fe3b74
--- /dev/null
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+use CodeIgniter\CodingStandard\CodeIgniter4;
+use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
+use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
+use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->files()
+    ->in([
+        __DIR__ . '/system',
+        __DIR__ . '/tests',
+        __DIR__ . '/utils',
+    ])
+    ->exclude(['ThirdParty'])
+    ->notName('#Foobar.php$#')
+    ->append([
+        __FILE__,
+        __DIR__ . '/.no-header.php-cs-fixer.dist.php',
+        __DIR__ . '/rector.php',
+        __DIR__ . '/spark',
+    ]);
+
+$overrides = [];
+
+$options = [
+    'cacheFile'    => 'build/.php-cs-fixer.cache',
+    'finder'       => $finder,
+    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
+    'customRules'  => [
+        NoCodeSeparatorCommentFixer::name() => true,
+        SpaceAfterCommentStartFixer::name() => true,
+    ],
+];
+
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
+    'CodeIgniter 4 framework',
+    'CodeIgniter Foundation',
+    'admin@codeigniter.com'
+);
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86777d7fccab..74513d243589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 # Changelog
 
-## [Unreleased](https://github.com/codeigniter4/CodeIgniter4/tree/HEAD)
+## [v4.1.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.4) (2021-09-06)
 
-[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.2...HEAD)
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+[CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) (based on PSR-12).
+
+*Note: Full changelog forthcoming.*
+
+## [v4.1.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.3) (2021-06-06)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.2...v4.1.3)
 
 **Fixed bugs:**
 
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index e5e88487cfe6..6e3852d2af79 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -1,47 +1,48 @@
 {
-	"name": "codeigniter4/framework",
-	"type": "project",
-	"description": "The CodeIgniter framework v4",
-	"homepage": "https://codeigniter.com",
-	"license": "MIT",
-	"require": {
-		"php": "^7.3||^8.0",
-		"ext-curl": "*",
-		"ext-intl": "*",
-		"ext-json": "*",
-		"ext-mbstring": "*",
-		"kint-php/kint": "^3.3",
-		"laminas/laminas-escaper": "^2.6",
-		"psr/log": "^1.1"
-	},
-	"require-dev": {
-		"codeigniter4/codeigniter4-standard": "^1.0",
-		"fakerphp/faker": "^1.9",
-		"mikey179/vfsstream": "^1.6",
-		"phpunit/phpunit": "^9.1",
-		"predis/predis": "^1.1",
-		"squizlabs/php_codesniffer": "^3.3"
-	},
-	"suggest": {
-		"ext-fileinfo": "Improves mime type detection for files"
-	},
-	"autoload": {
-		"psr-4": {
-			"CodeIgniter\\": "system/"
-		},
-		"exclude-from-classmap": [
-			"**/Database/Migrations/**"
-		]
-	},
-	"scripts": {
-		"post-update-cmd": [
-			"CodeIgniter\\ComposerScripts::postUpdate"
-		],
-		"test": "phpunit"
-	},
-	"support": {
-		"forum": "http://forum.codeigniter.com/",
-		"source": "https://github.com/codeigniter4/CodeIgniter4",
-		"slack": "https://codeigniterchat.slack.com"
-	}
+    "name": "codeigniter4/framework",
+    "type": "project",
+    "description": "The CodeIgniter framework v4",
+    "homepage": "https://codeigniter.com",
+    "license": "MIT",
+    "require": {
+        "php": "^7.3 || ^8.0",
+        "ext-curl": "*",
+        "ext-intl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "kint-php/kint": "^3.3",
+        "laminas/laminas-escaper": "^2.8",
+        "psr/log": "^1.1"
+    },
+    "require-dev": {
+        "codeigniter/coding-standard": "^1.1",
+        "fakerphp/faker": "^1.9",
+        "friendsofphp/php-cs-fixer": "^3.1",
+        "mikey179/vfsstream": "^1.6",
+        "nexusphp/cs-config": "^3.3",
+        "phpunit/phpunit": "^9.1",
+        "predis/predis": "^1.1"
+    },
+    "suggest": {
+        "ext-fileinfo": "Improves mime type detection for files"
+    },
+    "autoload": {
+        "psr-4": {
+            "CodeIgniter\\": "system/"
+        },
+        "exclude-from-classmap": [
+            "**/Database/Migrations/**"
+        ]
+    },
+    "scripts": {
+        "post-update-cmd": [
+            "CodeIgniter\\ComposerScripts::postUpdate"
+        ],
+        "test": "phpunit"
+    },
+    "support": {
+        "forum": "http://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    }
 }
diff --git a/admin/module/composer.json b/admin/module/composer.json
index f2b85c785ad8..70197a43010c 100644
--- a/admin/module/composer.json
+++ b/admin/module/composer.json
@@ -1,38 +1,38 @@
 {
-	"name": "mydomain/mymodule",
-	"description": "CodeIgniter4 starter module",
-	"homepage": "https://codeigniter.com",
-	"license": "MIT",
-	"require": {
-		"php": "^7.3||^8.0"
-	},
-	"require-dev": {
-		"codeigniter4/codeigniter4": "dev-develop",
-		"fakerphp/faker": "^1.9",
-		"mikey179/vfsstream": "^1.6",
-		"phpunit/phpunit": "^9.1"
-	},
-	"suggest": {
-		"ext-fileinfo": "Improves mime type detection for files"
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Tests\\Support\\": "tests/_support"
-		}
-	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "https://github.com/codeigniter4/codeigniter4"
-		}
-	],
-	"minimum-stability": "dev",
-	"scripts": {
-		"test": "phpunit"
-	},
-	"support": {
-		"forum": "http://forum.codeigniter.com/",
-		"source": "https://github.com/codeigniter4/CodeIgniter4",
-		"slack": "https://codeigniterchat.slack.com"
-	}
+    "name": "mydomain/mymodule",
+    "description": "CodeIgniter4 starter module",
+    "homepage": "https://codeigniter.com",
+    "license": "MIT",
+    "require": {
+        "php": "^7.3 || ^8.0"
+    },
+    "require-dev": {
+        "codeigniter4/codeigniter4": "dev-develop",
+        "fakerphp/faker": "^1.9",
+        "mikey179/vfsstream": "^1.6",
+        "phpunit/phpunit": "^9.1"
+    },
+    "suggest": {
+        "ext-fileinfo": "Improves mime type detection for files"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\Support\\": "tests/_support"
+        }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/codeigniter4/codeigniter4"
+        }
+    ],
+    "minimum-stability": "dev",
+    "scripts": {
+        "test": "phpunit"
+    },
+    "support": {
+        "forum": "http://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    }
 }
diff --git a/admin/module/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php b/admin/module/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
index 1bfd4a33c171..2bbdcfe51994 100644
--- a/admin/module/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
+++ b/admin/module/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
@@ -1,61 +1,37 @@
-<?php namespace Tests\Support\Database\Migrations;
+<?php
+
+namespace Tests\Support\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
 class ExampleMigration extends Migration
 {
-	protected $DBGroup = 'tests';
-
-	public function up()
-	{
-		$fields = [
-			'name'       => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'uid'        => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'class'      => [
-				'type'       => 'varchar',
-				'constraint' => 63,
-			],
-			'icon'       => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'summary'    => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-			],
-			'created_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-			'updated_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-			'deleted_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-		];
+    protected $DBGroup = 'tests';
 
-		$this->forge->addField('id');
-		$this->forge->addField($fields);
+    public function up()
+    {
+        $this->forge->addField('id');
+        $this->forge->addField([
+            'name'       => ['type' => 'varchar', 'constraint' => 31],
+            'uid'        => ['type' => 'varchar', 'constraint' => 31],
+            'class'      => ['type' => 'varchar', 'constraint' => 63],
+            'icon'       => ['type' => 'varchar', 'constraint' => 31],
+            'summary'    => ['type' => 'varchar', 'constraint' => 255],
+            'created_at' => ['type' => 'datetime', 'null' => true],
+            'updated_at' => ['type' => 'datetime', 'null' => true],
+            'deleted_at' => ['type' => 'datetime', 'null' => true],
+        ]);
 
-		$this->forge->addKey('name');
-		$this->forge->addKey('uid');
-		$this->forge->addKey(['deleted_at', 'id']);
-		$this->forge->addKey('created_at');
+        $this->forge->addKey('name');
+        $this->forge->addKey('uid');
+        $this->forge->addKey(['deleted_at', 'id']);
+        $this->forge->addKey('created_at');
 
-		$this->forge->createTable('factories');
-	}
+        $this->forge->createTable('factories');
+    }
 
-	public function down()
-	{
-		$this->forge->dropTable('factories');
-	}
+    public function down()
+    {
+        $this->forge->dropTable('factories');
+    }
 }
diff --git a/admin/module/tests/_support/Database/Seeds/ExampleSeeder.php b/admin/module/tests/_support/Database/Seeds/ExampleSeeder.php
index 1b14cedaa2dc..f67bf8fb8cae 100644
--- a/admin/module/tests/_support/Database/Seeds/ExampleSeeder.php
+++ b/admin/module/tests/_support/Database/Seeds/ExampleSeeder.php
@@ -1,40 +1,41 @@
-<?php namespace Tests\Support\Database\Seeds;
+<?php
+
+namespace Tests\Support\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
 
 class ExampleSeeder extends Seeder
 {
-	public function run()
-	{
-		$factories = [
-			[
-				'name'    => 'Test Factory',
-				'uid'     => 'test001',
-				'class'   => 'Factories\Tests\NewFactory',
-				'icon'    => 'fas fa-puzzle-piece',
-				'summary' => 'Longer sample text for testing',
-			],
-			[
-				'name'    => 'Widget Factory',
-				'uid'     => 'widget',
-				'class'   => 'Factories\Tests\WidgetPlant',
-				'icon'    => 'fas fa-puzzle-piece',
-				'summary' => 'Create widgets in your factory',
-			],
-			[
-				'name'    => 'Evil Factory',
-				'uid'     => 'evil-maker',
-				'class'   => 'Factories\Evil\MyFactory',
-				'icon'    => 'fas fa-book-dead',
-				'summary' => 'Abandon all hope, ye who enter here',
-			],
-		];
+    public function run()
+    {
+        $factories = [
+            [
+                'name'    => 'Test Factory',
+                'uid'     => 'test001',
+                'class'   => 'Factories\Tests\NewFactory',
+                'icon'    => 'fas fa-puzzle-piece',
+                'summary' => 'Longer sample text for testing',
+            ],
+            [
+                'name'    => 'Widget Factory',
+                'uid'     => 'widget',
+                'class'   => 'Factories\Tests\WidgetPlant',
+                'icon'    => 'fas fa-puzzle-piece',
+                'summary' => 'Create widgets in your factory',
+            ],
+            [
+                'name'    => 'Evil Factory',
+                'uid'     => 'evil-maker',
+                'class'   => 'Factories\Evil\MyFactory',
+                'icon'    => 'fas fa-book-dead',
+                'summary' => 'Abandon all hope, ye who enter here',
+            ],
+        ];
 
-		$builder = $this->db->table('factories');
+        $builder = $this->db->table('factories');
 
-		foreach ($factories as $factory)
-		{
-			$builder->insert($factory);
-		}
-	}
+        foreach ($factories as $factory) {
+            $builder->insert($factory);
+        }
+    }
 }
diff --git a/admin/module/tests/_support/DatabaseTestCase.php b/admin/module/tests/_support/DatabaseTestCase.php
index 9eb8fb703e90..fd067a585c87 100644
--- a/admin/module/tests/_support/DatabaseTestCase.php
+++ b/admin/module/tests/_support/DatabaseTestCase.php
@@ -1,55 +1,61 @@
-<?php namespace Tests\Support;
+<?php
+
+namespace Tests\Support;
+
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class DatabaseTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseTestCase extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	/**
-	 * Should the database be refreshed before each test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
-
-	/**
-	 * The seed file(s) used for all tests within this test case.
-	 * Should be fully-namespaced or relative to $basePath
-	 *
-	 * @var string|array
-	 */
-	protected $seed = 'Tests\Support\Database\Seeds\ExampleSeeder';
-
-	/**
-	 * The path to the seeds directory.
-	 * Allows overriding the default application directories.
-	 *
-	 * @var string
-	 */
-	protected $basePath = SUPPORTPATH . 'Database/';
-
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = 'Tests\Support';
-
-	public function setUp(): void
-	{
-		parent::setUp();
-
-		// Extra code to run before each test
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		// Extra code to run after each test
-	}
+    use DatabaseTestTrait;
+
+    /**
+     * Should the database be refreshed before each test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
+
+    /**
+     * The seed file(s) used for all tests within this test case.
+     * Should be fully-namespaced or relative to $basePath
+     *
+     * @var array|string
+     */
+    protected $seed = 'Tests\Support\Database\Seeds\ExampleSeeder';
+
+    /**
+     * The path to the seeds directory.
+     * Allows overriding the default application directories.
+     *
+     * @var string
+     */
+    protected $basePath = SUPPORTPATH . 'Database/';
+
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = 'Tests\Support';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Extra code to run before each test
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        // Extra code to run after each test
+    }
 }
diff --git a/admin/module/tests/_support/Libraries/ConfigReader.php b/admin/module/tests/_support/Libraries/ConfigReader.php
index 600d6c3a3c29..40d057acbe22 100644
--- a/admin/module/tests/_support/Libraries/ConfigReader.php
+++ b/admin/module/tests/_support/Libraries/ConfigReader.php
@@ -1,43 +1,5 @@
 <?php
 
-
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2021 CodeIgniter Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2021 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- */
-
 namespace Tests\Support\Libraries;
 
 /**
@@ -47,9 +9,9 @@
  * loading external values. Used to read actual local values from
  * a config file.
  */
-class ConfigReader extends \App\Config\App
+class ConfigReader extends \Config\App
 {
-	public function __construct()
-	{
-	}
+    public function __construct()
+    {
+    }
 }
diff --git a/admin/module/tests/_support/Models/ExampleModel.php b/admin/module/tests/_support/Models/ExampleModel.php
index e02aeec30b58..a71009e74f8b 100644
--- a/admin/module/tests/_support/Models/ExampleModel.php
+++ b/admin/module/tests/_support/Models/ExampleModel.php
@@ -1,26 +1,28 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class ExampleModel extends Model
 {
-	protected $table      = 'factories';
-	protected $primaryKey = 'id';
+    protected $table      = 'factories';
+    protected $primaryKey = 'id';
 
-	protected $returnType     = 'object';
-	protected $useSoftDeletes = false;
+    protected $returnType     = 'object';
+    protected $useSoftDeletes = false;
 
-	protected $allowedFields = [
-		'name',
-		'uid',
-		'class',
-		'icon',
-		'summary',
-	];
+    protected $allowedFields = [
+        'name',
+        'uid',
+        'class',
+        'icon',
+        'summary',
+    ];
 
-	protected $useTimestamps = true;
+    protected $useTimestamps = true;
 
-	protected $validationRules    = [];
-	protected $validationMessages = [];
-	protected $skipValidation     = false;
+    protected $validationRules    = [];
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
 }
diff --git a/admin/module/tests/_support/SessionTestCase.php b/admin/module/tests/_support/SessionTestCase.php
index d3a5b43bccfa..08a071154494 100644
--- a/admin/module/tests/_support/SessionTestCase.php
+++ b/admin/module/tests/_support/SessionTestCase.php
@@ -1,33 +1,38 @@
-<?php namespace Tests\Support;
+<?php
+
+namespace Tests\Support;
 
 use CodeIgniter\Session\Handlers\ArrayHandler;
 use CodeIgniter\Session\SessionInterface;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSession;
 
-class SessionTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionTestCase extends CIUnitTestCase
 {
-	/**
-	 * @var SessionInterface
-	 */
-	protected $session;
+    /**
+     * @var SessionInterface
+     */
+    protected $session;
 
-	public function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->mockSession();
-	}
+        $this->mockSession();
+    }
 
-	/**
-	 * Pre-loads the mock session driver into $this->session.
-	 *
-	 * @var string
-	 */
-	protected function mockSession()
-	{
-		$config        = config('App');
-		$this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
-		\Config\Services::injectMock('session', $this->session);
-	}
+    /**
+     * Pre-loads the mock session driver into $this->session.
+     *
+     * @var string
+     */
+    protected function mockSession()
+    {
+        $config        = config('App');
+        $this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
+        \Config\Services::injectMock('session', $this->session);
+    }
 }
diff --git a/admin/module/tests/database/ExampleDatabaseTest.php b/admin/module/tests/database/ExampleDatabaseTest.php
index 2de0b6ae01bf..203b1261c7e0 100644
--- a/admin/module/tests/database/ExampleDatabaseTest.php
+++ b/admin/module/tests/database/ExampleDatabaseTest.php
@@ -2,41 +2,44 @@
 
 use Tests\Support\Models\ExampleModel;
 
-class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+/**
+ * @internal
+ */
+final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		// Extra code to run before each test
-	}
+        // Extra code to run before each test
+    }
 
-	public function testModelFindAll()
-	{
-		$model = new ExampleModel();
+    public function testModelFindAll()
+    {
+        $model = new ExampleModel();
 
-		// Get every row created by ExampleSeeder
-		$objects = $model->findAll();
+        // Get every row created by ExampleSeeder
+        $objects = $model->findAll();
 
-		// Make sure the count is as expected
-		$this->assertCount(3, $objects);
-	}
+        // Make sure the count is as expected
+        $this->assertCount(3, $objects);
+    }
 
-	public function testSoftDeleteLeavesRow()
-	{
-		$model = new ExampleModel();
-		$this->setPrivateProperty($model, 'useSoftDeletes', true);
-		$this->setPrivateProperty($model, 'tempUseSoftDeletes', true);
+    public function testSoftDeleteLeavesRow()
+    {
+        $model = new ExampleModel();
+        $this->setPrivateProperty($model, 'useSoftDeletes', true);
+        $this->setPrivateProperty($model, 'tempUseSoftDeletes', true);
 
-		$object = $model->first();
-		$model->delete($object->id);
+        $object = $model->first();
+        $model->delete($object->id);
 
-		// The model should no longer find it
-		$this->assertNull($model->find($object->id));
+        // The model should no longer find it
+        $this->assertNull($model->find($object->id));
 
-		// ... but it should still be in the database
-		$result = $model->builder()->where('id', $object->id)->get()->getResult();
+        // ... but it should still be in the database
+        $result = $model->builder()->where('id', $object->id)->get()->getResult();
 
-		$this->assertCount(1, $result);
-	}
+        $this->assertCount(1, $result);
+    }
 }
diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
index 6ec0d011bd8d..65dd37c6b498 100644
--- a/admin/module/tests/session/ExampleSessionTest.php
+++ b/admin/module/tests/session/ExampleSessionTest.php
@@ -1,18 +1,21 @@
 <?php
 
-class ExampleSessionTest extends \Tests\Support\SessionTestCase
+/**
+ * @internal
+ */
+final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
 
-	public function testSessionSimple()
-	{
-		$this->session->set('logged_in', 123);
+    public function testSessionSimple()
+    {
+        $this->session->set('logged_in', 123);
 
-		$value = $this->session->get('logged_in');
+        $value = $this->session->get('logged_in');
 
-		$this->assertEquals(123, $value);
-	}
+        $this->assertSame(123, $value);
+    }
 }
diff --git a/admin/module/tests/unit/ExampleTest.php b/admin/module/tests/unit/ExampleTest.php
index 2bab3125452f..4306ddfe55d5 100644
--- a/admin/module/tests/unit/ExampleTest.php
+++ b/admin/module/tests/unit/ExampleTest.php
@@ -1,16 +1,19 @@
 <?php
 
-class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
+/**
+ * @internal
+ */
+final class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
 
-	public function testIsDefinedAppPath()
-	{
-		$test = defined('APPPATH');
+    public function testIsDefinedAppPath()
+    {
+        $test = defined('APPPATH');
 
-		$this->assertTrue($test);
-	}
+        $this->assertTrue($test);
+    }
 }
diff --git a/admin/pre-commit b/admin/pre-commit
index 94665c1ed4a5..d05724d58146 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -4,60 +4,75 @@ PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
 STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php$`
 
 # Determine if a file list is passed
-if [ "$#" -eq 1 ]
-then
-	oIFS=$IFS
-	IFS='
-	'
-	SFILES="$1"
-	IFS=$oIFS
+if [ "$#" -eq 1 ]; then
+    oIFS=$IFS
+    IFS='
+    '
+    SFILES="$1"
+    IFS=$oIFS
 fi
+
 SFILES=${SFILES:-$STAGED_FILES_CMD}
 
 echo "Starting CodeIgniter precommit..."
 
-if [ "$SFILES" != "" ]
-then
-	echo "Linting PHP code..."
-	for FILE in $SFILES
-	do
-		php -l -d display_errors=0 "$PROJECT/$FILE"
-		if [ $? != 0 ]
-		then
-			echo "Fix the error(s) before commit."
-			exit 1
-		fi
-		FILES="$FILES $FILE"
-	done
+if [ "$SFILES" != "" ]; then
+    echo "Linting PHP code..."
+    for FILE in $SFILES; do
+        php -l -d display_errors=0 "$PROJECT/$FILE"
+
+        if [ $? != 0 ]; then
+            echo "Fix the error(s) before commit."
+            exit 1
+        fi
+
+        FILES="$FILES $FILE"
+    done
 fi
 
-if [ "$FILES" != "" ]
-then
-	echo "Running PHPStan..."
-	# Run on whole codebase
-	if [ -d /proc/cygdrive ]
-	then
-		./vendor/bin/phpstan analyse
-	else
-		php ./vendor/bin/phpstan analyse
-	fi
-
-	if [ $? != 0 ]
-	then
-		echo "Fix the phpstan error(s) before commit."
-		exit 1
-	fi
+if [ "$FILES" != "" ]; then
+    echo "Running PHPStan..."
+
+    # Run on whole codebase
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/phpstan analyse
+    else
+        php ./vendor/bin/phpstan analyse
+    fi
+
+    if [ $? != 0 ]; then
+        echo "Fix the phpstan error(s) before commit."
+        exit 1
+    fi
 fi
 
-if [ "$FILES" != "" ]
-then
-	echo "Running Code Sniffer..."
-	if [ -d /proc/cygdrive ]
-	then
-		./vendor/bin/phpcbf --standard=./vendor/codeigniter4/codeigniter4-standard/CodeIgniter4 --encoding=utf-8 -n -p $FILES
-	else
-		php ./vendor/bin/phpcbf --standard=./vendor/codeigniter4/codeigniter4-standard/CodeIgniter4 --encoding=utf-8 -n -p $FILES
-	fi
+if [ "$FILES" != "" ]; then
+    echo "Running PHP CS Fixer..."
+
+    # Run on whole codebase to skip on unnecessary filtering
+    # Run first on app, admin, public
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+    else
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+    fi
+
+    if [ $? != 0 ]; then
+        echo "Files in app, admin, or public are not following the coding standards. Please fix them before commit."
+        exit 1
+    fi
+
+    # Next, run on system, tests, utils, and root PHP files
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+    else
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+    fi
+
+    if [ $? != 0 ]; then
+        echo "Files in system, tests, utils, or root are not following the coding standards. Please fix them before commit."
+        exit 1
+    fi
 fi
 
 exit $?
diff --git a/admin/setup.sh b/admin/setup.sh
index 86254e8e8889..55adf547e4bd 100644
--- a/admin/setup.sh
+++ b/admin/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Install a pre-commit hook that
-# automatically runs phpcs to fix styles
+# automatically runs php-cs-fixer to lint code
 mkdir -p .git/hooks
 cp admin/pre-commit .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit
diff --git a/admin/starter/app/Config/Paths.php b/admin/starter/app/Config/Paths.php
index 007a6d328e97..d97bbb35a820 100644
--- a/admin/starter/app/Config/Paths.php
+++ b/admin/starter/app/Config/Paths.php
@@ -13,74 +13,73 @@
  *
  * All paths are relative to the project's root folder.
  */
-
 class Paths
 {
-	/**
-	 * ---------------------------------------------------------------
-	 * SYSTEM FOLDER NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This must contain the name of your "system" folder. Include
-	 * the path if the folder is not in the same directory as this file.
-	 *
-	 * @var string
-	 */
-	public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
+    /**
+     * ---------------------------------------------------------------
+     * SYSTEM FOLDER NAME
+     * ---------------------------------------------------------------
+     *
+     * This must contain the name of your "system" folder. Include
+     * the path if the folder is not in the same directory as this file.
+     *
+     * @var string
+     */
+    public $systemDirectory = __DIR__ . '/../../vendor/codeigniter4/framework/system';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * APPLICATION FOLDER NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * If you want this front controller to use a different "app"
-	 * folder than the default one you can set its name here. The folder
-	 * can also be renamed or relocated anywhere on your getServer. If
-	 * you do, use a full getServer path.
-	 *
-	 * @see http://codeigniter.com/user_guide/general/managing_apps.html
-	 *
-	 * @var string
-	 */
-	public $appDirectory = __DIR__ . '/..';
+    /**
+     * ---------------------------------------------------------------
+     * APPLICATION FOLDER NAME
+     * ---------------------------------------------------------------
+     *
+     * If you want this front controller to use a different "app"
+     * folder than the default one you can set its name here. The folder
+     * can also be renamed or relocated anywhere on your getServer. If
+     * you do, use a full getServer path.
+     *
+     * @see http://codeigniter.com/user_guide/general/managing_apps.html
+     *
+     * @var string
+     */
+    public $appDirectory = __DIR__ . '/..';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * WRITABLE DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of your "writable" directory.
-	 * The writable directory allows you to group all directories that
-	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the app and/or
-	 * system directories.
-	 *
-	 * @var string
-	 */
-	public $writableDirectory = __DIR__ . '/../../writable';
+    /**
+     * ---------------------------------------------------------------
+     * WRITABLE DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "writable" directory.
+     * The writable directory allows you to group all directories that
+     * need write permission to a single place that can be tucked away
+     * for maximum security, keeping it out of the app and/or
+     * system directories.
+     *
+     * @var string
+     */
+    public $writableDirectory = __DIR__ . '/../../writable';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * TESTS DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of your "tests" directory.
-	 *
-	 * @var string
-	 */
-	public $testsDirectory = __DIR__ . '/../../tests';
+    /**
+     * ---------------------------------------------------------------
+     * TESTS DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "tests" directory.
+     *
+     * @var string
+     */
+    public $testsDirectory = __DIR__ . '/../../tests';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * VIEW DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of the directory that
-	 * contains the view files used by your application. By
-	 * default this is in `app/Views`. This value
-	 * is used when no value is provided to `Services::renderer()`.
-	 *
-	 * @var string
-	 */
-	public $viewDirectory = __DIR__ . '/../Views';
+    /**
+     * ---------------------------------------------------------------
+     * VIEW DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of the directory that
+     * contains the view files used by your application. By
+     * default this is in `app/Views`. This value
+     * is used when no value is provided to `Services::renderer()`.
+     *
+     * @var string
+     */
+    public $viewDirectory = __DIR__ . '/../Views';
 }
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
index 63112d799057..9f7dc492cbc8 100644
--- a/admin/starter/composer.json
+++ b/admin/starter/composer.json
@@ -1,41 +1,41 @@
 {
-	"name": "codeigniter4/appstarter",
-	"type": "project",
-	"description": "CodeIgniter4 starter app",
-	"homepage": "https://codeigniter.com",
-	"license": "MIT",
-	"require": {
-		"php": "^7.3||^8.0",
-		"codeigniter4/framework": "^4"
-	},
-	"require-dev": {
-		"fakerphp/faker": "^1.9",
-		"mikey179/vfsstream": "^1.6",
-		"phpunit/phpunit": "^9.1"
-	},
-	"suggest": {
-		"ext-fileinfo": "Improves mime type detection for files"
-	},
-	"autoload": {
-		"psr-4": {
-			"App\\": "app",
-			"Config\\": "app/Config"
-		},
-		"exclude-from-classmap": [
-			"**/Database/Migrations/**"
-		]
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"Tests\\Support\\": "tests/_support"
-		}
-	},
-	"scripts": {
-		"test": "phpunit"
-	},
-	"support": {
-		"forum": "http://forum.codeigniter.com/",
-		"source": "https://github.com/codeigniter4/CodeIgniter4",
-		"slack": "https://codeigniterchat.slack.com"
-	}
+    "name": "codeigniter4/appstarter",
+    "type": "project",
+    "description": "CodeIgniter4 starter app",
+    "homepage": "https://codeigniter.com",
+    "license": "MIT",
+    "require": {
+        "php": "^7.3 || ^8.0",
+        "codeigniter4/framework": "^4"
+    },
+    "require-dev": {
+        "fakerphp/faker": "^1.9",
+        "mikey179/vfsstream": "^1.6",
+        "phpunit/phpunit": "^9.1"
+    },
+    "suggest": {
+        "ext-fileinfo": "Improves mime type detection for files"
+    },
+    "autoload": {
+        "psr-4": {
+            "App\\": "app",
+            "Config\\": "app/Config"
+        },
+        "exclude-from-classmap": [
+            "**/Database/Migrations/**"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\Support\\": "tests/_support"
+        }
+    },
+    "scripts": {
+        "test": "phpunit"
+    },
+    "support": {
+        "forum": "http://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    }
 }
diff --git a/admin/starter/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php b/admin/starter/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
index 1bfd4a33c171..2bbdcfe51994 100644
--- a/admin/starter/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
+++ b/admin/starter/tests/_support/Database/Migrations/2020-02-22-222222_example_migration.php
@@ -1,61 +1,37 @@
-<?php namespace Tests\Support\Database\Migrations;
+<?php
+
+namespace Tests\Support\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
 class ExampleMigration extends Migration
 {
-	protected $DBGroup = 'tests';
-
-	public function up()
-	{
-		$fields = [
-			'name'       => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'uid'        => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'class'      => [
-				'type'       => 'varchar',
-				'constraint' => 63,
-			],
-			'icon'       => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'summary'    => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-			],
-			'created_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-			'updated_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-			'deleted_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-		];
+    protected $DBGroup = 'tests';
 
-		$this->forge->addField('id');
-		$this->forge->addField($fields);
+    public function up()
+    {
+        $this->forge->addField('id');
+        $this->forge->addField([
+            'name'       => ['type' => 'varchar', 'constraint' => 31],
+            'uid'        => ['type' => 'varchar', 'constraint' => 31],
+            'class'      => ['type' => 'varchar', 'constraint' => 63],
+            'icon'       => ['type' => 'varchar', 'constraint' => 31],
+            'summary'    => ['type' => 'varchar', 'constraint' => 255],
+            'created_at' => ['type' => 'datetime', 'null' => true],
+            'updated_at' => ['type' => 'datetime', 'null' => true],
+            'deleted_at' => ['type' => 'datetime', 'null' => true],
+        ]);
 
-		$this->forge->addKey('name');
-		$this->forge->addKey('uid');
-		$this->forge->addKey(['deleted_at', 'id']);
-		$this->forge->addKey('created_at');
+        $this->forge->addKey('name');
+        $this->forge->addKey('uid');
+        $this->forge->addKey(['deleted_at', 'id']);
+        $this->forge->addKey('created_at');
 
-		$this->forge->createTable('factories');
-	}
+        $this->forge->createTable('factories');
+    }
 
-	public function down()
-	{
-		$this->forge->dropTable('factories');
-	}
+    public function down()
+    {
+        $this->forge->dropTable('factories');
+    }
 }
diff --git a/admin/starter/tests/_support/Database/Seeds/ExampleSeeder.php b/admin/starter/tests/_support/Database/Seeds/ExampleSeeder.php
index 1b14cedaa2dc..f67bf8fb8cae 100644
--- a/admin/starter/tests/_support/Database/Seeds/ExampleSeeder.php
+++ b/admin/starter/tests/_support/Database/Seeds/ExampleSeeder.php
@@ -1,40 +1,41 @@
-<?php namespace Tests\Support\Database\Seeds;
+<?php
+
+namespace Tests\Support\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
 
 class ExampleSeeder extends Seeder
 {
-	public function run()
-	{
-		$factories = [
-			[
-				'name'    => 'Test Factory',
-				'uid'     => 'test001',
-				'class'   => 'Factories\Tests\NewFactory',
-				'icon'    => 'fas fa-puzzle-piece',
-				'summary' => 'Longer sample text for testing',
-			],
-			[
-				'name'    => 'Widget Factory',
-				'uid'     => 'widget',
-				'class'   => 'Factories\Tests\WidgetPlant',
-				'icon'    => 'fas fa-puzzle-piece',
-				'summary' => 'Create widgets in your factory',
-			],
-			[
-				'name'    => 'Evil Factory',
-				'uid'     => 'evil-maker',
-				'class'   => 'Factories\Evil\MyFactory',
-				'icon'    => 'fas fa-book-dead',
-				'summary' => 'Abandon all hope, ye who enter here',
-			],
-		];
+    public function run()
+    {
+        $factories = [
+            [
+                'name'    => 'Test Factory',
+                'uid'     => 'test001',
+                'class'   => 'Factories\Tests\NewFactory',
+                'icon'    => 'fas fa-puzzle-piece',
+                'summary' => 'Longer sample text for testing',
+            ],
+            [
+                'name'    => 'Widget Factory',
+                'uid'     => 'widget',
+                'class'   => 'Factories\Tests\WidgetPlant',
+                'icon'    => 'fas fa-puzzle-piece',
+                'summary' => 'Create widgets in your factory',
+            ],
+            [
+                'name'    => 'Evil Factory',
+                'uid'     => 'evil-maker',
+                'class'   => 'Factories\Evil\MyFactory',
+                'icon'    => 'fas fa-book-dead',
+                'summary' => 'Abandon all hope, ye who enter here',
+            ],
+        ];
 
-		$builder = $this->db->table('factories');
+        $builder = $this->db->table('factories');
 
-		foreach ($factories as $factory)
-		{
-			$builder->insert($factory);
-		}
-	}
+        foreach ($factories as $factory) {
+            $builder->insert($factory);
+        }
+    }
 }
diff --git a/admin/starter/tests/_support/DatabaseTestCase.php b/admin/starter/tests/_support/DatabaseTestCase.php
index 42cbc6f5c1a0..fd067a585c87 100644
--- a/admin/starter/tests/_support/DatabaseTestCase.php
+++ b/admin/starter/tests/_support/DatabaseTestCase.php
@@ -1,56 +1,61 @@
-<?php namespace Tests\Support;
+<?php
+
+namespace Tests\Support;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class DatabaseTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseTestCase extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	/**
-	 * Should the database be refreshed before each test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
-
-	/**
-	 * The seed file(s) used for all tests within this test case.
-	 * Should be fully-namespaced or relative to $basePath
-	 *
-	 * @var string|array
-	 */
-	protected $seed = 'Tests\Support\Database\Seeds\ExampleSeeder';
-
-	/**
-	 * The path to the seeds directory.
-	 * Allows overriding the default application directories.
-	 *
-	 * @var string
-	 */
-	protected $basePath = SUPPORTPATH . 'Database/';
-
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = 'Tests\Support';
-
-	public function setUp(): void
-	{
-		parent::setUp();
-
-		// Extra code to run before each test
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		// Extra code to run after each test
-	}
+    use DatabaseTestTrait;
+
+    /**
+     * Should the database be refreshed before each test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
+
+    /**
+     * The seed file(s) used for all tests within this test case.
+     * Should be fully-namespaced or relative to $basePath
+     *
+     * @var array|string
+     */
+    protected $seed = 'Tests\Support\Database\Seeds\ExampleSeeder';
+
+    /**
+     * The path to the seeds directory.
+     * Allows overriding the default application directories.
+     *
+     * @var string
+     */
+    protected $basePath = SUPPORTPATH . 'Database/';
+
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = 'Tests\Support';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Extra code to run before each test
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        // Extra code to run after each test
+    }
 }
diff --git a/admin/starter/tests/_support/Libraries/ConfigReader.php b/admin/starter/tests/_support/Libraries/ConfigReader.php
index 16765acbf2ba..40d057acbe22 100644
--- a/admin/starter/tests/_support/Libraries/ConfigReader.php
+++ b/admin/starter/tests/_support/Libraries/ConfigReader.php
@@ -1,43 +1,5 @@
 <?php
 
-
-/**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2021 CodeIgniter Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2021 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- */
-
 namespace Tests\Support\Libraries;
 
 /**
@@ -49,7 +11,7 @@
  */
 class ConfigReader extends \Config\App
 {
-	public function __construct()
-	{
-	}
+    public function __construct()
+    {
+    }
 }
diff --git a/admin/starter/tests/_support/Models/ExampleModel.php b/admin/starter/tests/_support/Models/ExampleModel.php
index e02aeec30b58..a71009e74f8b 100644
--- a/admin/starter/tests/_support/Models/ExampleModel.php
+++ b/admin/starter/tests/_support/Models/ExampleModel.php
@@ -1,26 +1,28 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class ExampleModel extends Model
 {
-	protected $table      = 'factories';
-	protected $primaryKey = 'id';
+    protected $table      = 'factories';
+    protected $primaryKey = 'id';
 
-	protected $returnType     = 'object';
-	protected $useSoftDeletes = false;
+    protected $returnType     = 'object';
+    protected $useSoftDeletes = false;
 
-	protected $allowedFields = [
-		'name',
-		'uid',
-		'class',
-		'icon',
-		'summary',
-	];
+    protected $allowedFields = [
+        'name',
+        'uid',
+        'class',
+        'icon',
+        'summary',
+    ];
 
-	protected $useTimestamps = true;
+    protected $useTimestamps = true;
 
-	protected $validationRules    = [];
-	protected $validationMessages = [];
-	protected $skipValidation     = false;
+    protected $validationRules    = [];
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
 }
diff --git a/admin/starter/tests/_support/SessionTestCase.php b/admin/starter/tests/_support/SessionTestCase.php
index d3a5b43bccfa..08a071154494 100644
--- a/admin/starter/tests/_support/SessionTestCase.php
+++ b/admin/starter/tests/_support/SessionTestCase.php
@@ -1,33 +1,38 @@
-<?php namespace Tests\Support;
+<?php
+
+namespace Tests\Support;
 
 use CodeIgniter\Session\Handlers\ArrayHandler;
 use CodeIgniter\Session\SessionInterface;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSession;
 
-class SessionTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionTestCase extends CIUnitTestCase
 {
-	/**
-	 * @var SessionInterface
-	 */
-	protected $session;
+    /**
+     * @var SessionInterface
+     */
+    protected $session;
 
-	public function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->mockSession();
-	}
+        $this->mockSession();
+    }
 
-	/**
-	 * Pre-loads the mock session driver into $this->session.
-	 *
-	 * @var string
-	 */
-	protected function mockSession()
-	{
-		$config        = config('App');
-		$this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
-		\Config\Services::injectMock('session', $this->session);
-	}
+    /**
+     * Pre-loads the mock session driver into $this->session.
+     *
+     * @var string
+     */
+    protected function mockSession()
+    {
+        $config        = config('App');
+        $this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
+        \Config\Services::injectMock('session', $this->session);
+    }
 }
diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
index 2de0b6ae01bf..203b1261c7e0 100644
--- a/admin/starter/tests/database/ExampleDatabaseTest.php
+++ b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -2,41 +2,44 @@
 
 use Tests\Support\Models\ExampleModel;
 
-class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+/**
+ * @internal
+ */
+final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		// Extra code to run before each test
-	}
+        // Extra code to run before each test
+    }
 
-	public function testModelFindAll()
-	{
-		$model = new ExampleModel();
+    public function testModelFindAll()
+    {
+        $model = new ExampleModel();
 
-		// Get every row created by ExampleSeeder
-		$objects = $model->findAll();
+        // Get every row created by ExampleSeeder
+        $objects = $model->findAll();
 
-		// Make sure the count is as expected
-		$this->assertCount(3, $objects);
-	}
+        // Make sure the count is as expected
+        $this->assertCount(3, $objects);
+    }
 
-	public function testSoftDeleteLeavesRow()
-	{
-		$model = new ExampleModel();
-		$this->setPrivateProperty($model, 'useSoftDeletes', true);
-		$this->setPrivateProperty($model, 'tempUseSoftDeletes', true);
+    public function testSoftDeleteLeavesRow()
+    {
+        $model = new ExampleModel();
+        $this->setPrivateProperty($model, 'useSoftDeletes', true);
+        $this->setPrivateProperty($model, 'tempUseSoftDeletes', true);
 
-		$object = $model->first();
-		$model->delete($object->id);
+        $object = $model->first();
+        $model->delete($object->id);
 
-		// The model should no longer find it
-		$this->assertNull($model->find($object->id));
+        // The model should no longer find it
+        $this->assertNull($model->find($object->id));
 
-		// ... but it should still be in the database
-		$result = $model->builder()->where('id', $object->id)->get()->getResult();
+        // ... but it should still be in the database
+        $result = $model->builder()->where('id', $object->id)->get()->getResult();
 
-		$this->assertCount(1, $result);
-	}
+        $this->assertCount(1, $result);
+    }
 }
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index 6ec0d011bd8d..65dd37c6b498 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -1,18 +1,21 @@
 <?php
 
-class ExampleSessionTest extends \Tests\Support\SessionTestCase
+/**
+ * @internal
+ */
+final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
 
-	public function testSessionSimple()
-	{
-		$this->session->set('logged_in', 123);
+    public function testSessionSimple()
+    {
+        $this->session->set('logged_in', 123);
 
-		$value = $this->session->get('logged_in');
+        $value = $this->session->get('logged_in');
 
-		$this->assertEquals(123, $value);
-	}
+        $this->assertSame(123, $value);
+    }
 }
diff --git a/admin/starter/tests/unit/HealthTest.php b/admin/starter/tests/unit/HealthTest.php
index d5e979afca4e..f834ac605b40 100644
--- a/admin/starter/tests/unit/HealthTest.php
+++ b/admin/starter/tests/unit/HealthTest.php
@@ -2,51 +2,52 @@
 
 use Config\Services;
 
-class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
+/**
+ * @internal
+ */
+final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	public function testIsDefinedAppPath()
-	{
-		$test = defined('APPPATH');
-
-		$this->assertTrue($test);
-	}
-
-	public function testBaseUrlHasBeenSet()
-	{
-		$validation = Services::validation();
-		$env        = false;
-
-		// Check the baseURL in .env
-		if (is_file(HOMEPATH . '.env'))
-		{
-			$env = (bool) preg_grep('/^app\.baseURL = ./', file(HOMEPATH . '.env'));
-		}
-
-		if ($env)
-		{
-			// BaseURL in .env is a valid URL?
-			// phpunit.xml.dist sets app.baseURL in $_SERVER
-			// So if you set app.baseURL in .env, it takes precedence
-			$config = new Config\App();
-			$this->assertTrue(
-				$validation->check($config->baseURL, 'valid_url'),
-				'baseURL "' . $config->baseURL . '" in .env is not valid URL'
-			);
-		}
-
-		// Get the baseURL in app/Config/App.php
-		// You can't use Config\App, because phpunit.xml.dist sets app.baseURL
-		$reader = new \Tests\Support\Libraries\ConfigReader();
-
-		// BaseURL in app/Config/App.php is a valid URL?
-		$this->assertTrue(
-			$validation->check($reader->baseURL, 'valid_url'),
-			'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL'
-		);
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function testIsDefinedAppPath()
+    {
+        $test = defined('APPPATH');
+
+        $this->assertTrue($test);
+    }
+
+    public function testBaseUrlHasBeenSet()
+    {
+        $validation = Services::validation();
+        $env        = false;
+
+        // Check the baseURL in .env
+        if (is_file(HOMEPATH . '.env')) {
+            $env = (bool) preg_grep('/^app\.baseURL = ./', file(HOMEPATH . '.env'));
+        }
+
+        if ($env) {
+            // BaseURL in .env is a valid URL?
+            // phpunit.xml.dist sets app.baseURL in $_SERVER
+            // So if you set app.baseURL in .env, it takes precedence
+            $config = new Config\App();
+            $this->assertTrue(
+                $validation->check($config->baseURL, 'valid_url'),
+                'baseURL "' . $config->baseURL . '" in .env is not valid URL'
+            );
+        }
+
+        // Get the baseURL in app/Config/App.php
+        // You can't use Config\App, because phpunit.xml.dist sets app.baseURL
+        $reader = new \Tests\Support\Libraries\ConfigReader();
+
+        // BaseURL in app/Config/App.php is a valid URL?
+        $this->assertTrue(
+            $validation->check($reader->baseURL, 'valid_url'),
+            'baseURL "' . $reader->baseURL . '" in app/Config/App.php is not valid URL'
+        );
+    }
 }
diff --git a/admin/userguide/composer.json b/admin/userguide/composer.json
index 198450876c89..a8fc259202fd 100644
--- a/admin/userguide/composer.json
+++ b/admin/userguide/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3||^8.0",
+        "php": "^7.3 || ^8.0",
         "codeigniter4/framework": "^4"
     },
     "support": {
diff --git a/app/Common.php b/app/Common.php
index 780ba3f80198..a74d46d1ed5c 100644
--- a/app/Common.php
+++ b/app/Common.php
@@ -11,5 +11,5 @@
  * loaded early on, and may also contain additional functions
  * that you'd like to use throughout your entire application
  *
- * @link: https://codeigniter4.github.io/CodeIgniter4/
+ * @see: https://codeigniter4.github.io/CodeIgniter4/
  */
diff --git a/app/Config/App.php b/app/Config/App.php
index 86b94d04b217..88b295e9a010 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -6,460 +6,459 @@
 
 class App extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Base Site URL
-	 * --------------------------------------------------------------------------
-	 *
-	 * URL to your CodeIgniter root. Typically this will be your base URL,
-	 * WITH a trailing slash:
-	 *
-	 *    http://example.com/
-	 *
-	 * If this is not set then CodeIgniter will try guess the protocol, domain
-	 * and path to your installation. However, you should always configure this
-	 * explicitly and never rely on auto-guessing, especially in production
-	 * environments.
-	 *
-	 * @var string
-	 */
-	public $baseURL = 'http://localhost:8080/';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Index File
-	 * --------------------------------------------------------------------------
-	 *
-	 * Typically this will be your index.php file, unless you've renamed it to
-	 * something else. If you are using mod_rewrite to remove the page set this
-	 * variable so that it is blank.
-	 *
-	 * @var string
-	 */
-	public $indexPage = 'index.php';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * URI PROTOCOL
-	 * --------------------------------------------------------------------------
-	 *
-	 * This item determines which getServer global should be used to retrieve the
-	 * URI string.  The default setting of 'REQUEST_URI' works for most servers.
-	 * If your links do not seem to work, try one of the other delicious flavors:
-	 *
-	 * 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
-	 * 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
-	 * 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
-	 *
-	 * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
-	 *
-	 * @var string
-	 */
-	public $uriProtocol = 'REQUEST_URI';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Default Locale
-	 * --------------------------------------------------------------------------
-	 *
-	 * The Locale roughly represents the language and location that your visitor
-	 * is viewing the site from. It affects the language strings and other
-	 * strings (like currency markers, numbers, etc), that your program
-	 * should run under for this request.
-	 *
-	 * @var string
-	 */
-	public $defaultLocale = 'en';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Negotiate Locale
-	 * --------------------------------------------------------------------------
-	 *
-	 * If true, the current Request object will automatically determine the
-	 * language to use based on the value of the Accept-Language header.
-	 *
-	 * If false, no automatic detection will be performed.
-	 *
-	 * @var boolean
-	 */
-	public $negotiateLocale = false;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Supported Locales
-	 * --------------------------------------------------------------------------
-	 *
-	 * If $negotiateLocale is true, this array lists the locales supported
-	 * by the application in descending order of priority. If no match is
-	 * found, the first locale will be used.
-	 *
-	 * @var string[]
-	 */
-	public $supportedLocales = ['en'];
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Application Timezone
-	 * --------------------------------------------------------------------------
-	 *
-	 * The default timezone that will be used in your application to display
-	 * dates with the date helper, and can be retrieved through app_timezone()
-	 *
-	 * @var string
-	 */
-	public $appTimezone = 'America/Chicago';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Default Character Set
-	 * --------------------------------------------------------------------------
-	 *
-	 * This determines which character set is used by default in various methods
-	 * that require a character set to be provided.
-	 *
-	 * @see http://php.net/htmlspecialchars for a list of supported charsets.
-	 *
-	 * @var string
-	 */
-	public $charset = 'UTF-8';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * URI PROTOCOL
-	 * --------------------------------------------------------------------------
-	 *
-	 * If true, this will force every request made to this application to be
-	 * made via a secure connection (HTTPS). If the incoming request is not
-	 * secure, the user will be redirected to a secure version of the page
-	 * and the HTTP Strict Transport Security header will be set.
-	 *
-	 * @var boolean
-	 */
-	public $forceGlobalSecureRequests = false;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Driver
-	 * --------------------------------------------------------------------------
-	 *
-	 * The session storage driver to use:
-	 * - `CodeIgniter\Session\Handlers\FileHandler`
-	 * - `CodeIgniter\Session\Handlers\DatabaseHandler`
-	 * - `CodeIgniter\Session\Handlers\MemcachedHandler`
-	 * - `CodeIgniter\Session\Handlers\RedisHandler`
-	 *
-	 * @var string
-	 */
-	public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Cookie Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * The session cookie name, must contain only [0-9a-z_-] characters
-	 *
-	 * @var string
-	 */
-	public $sessionCookieName = 'ci_session';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Expiration
-	 * --------------------------------------------------------------------------
-	 *
-	 * The number of SECONDS you want the session to last.
-	 * Setting to 0 (zero) means expire when the browser is closed.
-	 *
-	 * @var integer
-	 */
-	public $sessionExpiration = 7200;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Save Path
-	 * --------------------------------------------------------------------------
-	 *
-	 * The location to save sessions to and is driver dependent.
-	 *
-	 * For the 'files' driver, it's a path to a writable directory.
-	 * WARNING: Only absolute paths are supported!
-	 *
-	 * For the 'database' driver, it's a table name.
-	 * Please read up the manual for the format with other session drivers.
-	 *
-	 * IMPORTANT: You are REQUIRED to set a valid save path!
-	 *
-	 * @var string
-	 */
-	public $sessionSavePath = WRITEPATH . 'session';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Match IP
-	 * --------------------------------------------------------------------------
-	 *
-	 * Whether to match the user's IP address when reading the session data.
-	 *
-	 * WARNING: If you're using the database driver, don't forget to update
-	 *          your session table's PRIMARY KEY when changing this setting.
-	 *
-	 * @var boolean
-	 */
-	public $sessionMatchIP = false;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Time to Update
-	 * --------------------------------------------------------------------------
-	 *
-	 * How many seconds between CI regenerating the session ID.
-	 *
-	 * @var integer
-	 */
-	public $sessionTimeToUpdate = 300;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Session Regenerate Destroy
-	 * --------------------------------------------------------------------------
-	 *
-	 * Whether to destroy session data associated with the old session ID
-	 * when auto-regenerating the session ID. When set to FALSE, the data
-	 * will be later deleted by the garbage collector.
-	 *
-	 * @var boolean
-	 */
-	public $sessionRegenerateDestroy = false;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Prefix
-	 * --------------------------------------------------------------------------
-	 *
-	 * Set a cookie name prefix if you need to avoid collisions.
-	 *
-	 * @var string
-	 *
-	 * @deprecated use Config\Cookie::$prefix property instead.
-	 */
-	public $cookiePrefix = '';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Domain
-	 * --------------------------------------------------------------------------
-	 *
-	 * Set to `.your-domain.com` for site-wide cookies.
-	 *
-	 * @var string
-	 *
-	 * @deprecated use Config\Cookie::$domain property instead.
-	 */
-	public $cookieDomain = '';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Path
-	 * --------------------------------------------------------------------------
-	 *
-	 * Typically will be a forward slash.
-	 *
-	 * @var string
-	 *
-	 * @deprecated use Config\Cookie::$path property instead.
-	 */
-	public $cookiePath = '/';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Secure
-	 * --------------------------------------------------------------------------
-	 *
-	 * Cookie will only be set if a secure HTTPS connection exists.
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated use Config\Cookie::$secure property instead.
-	 */
-	public $cookieSecure = false;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie HttpOnly
-	 * --------------------------------------------------------------------------
-	 *
-	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated use Config\Cookie::$httponly property instead.
-	 */
-	public $cookieHTTPOnly = true;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie SameSite
-	 * --------------------------------------------------------------------------
-	 *
-	 * Configure cookie SameSite setting. Allowed values are:
-	 * - None
-	 * - Lax
-	 * - Strict
-	 * - ''
-	 *
-	 * Alternatively, you can use the constant names:
-	 * - `Cookie::SAMESITE_NONE`
-	 * - `Cookie::SAMESITE_LAX`
-	 * - `Cookie::SAMESITE_STRICT`
-	 *
-	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
-	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
-	 * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
-	 *
-	 * @var string
-	 *
-	 * @deprecated use Config\Cookie::$samesite property instead.
-	 */
-	public $cookieSameSite = 'Lax';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Reverse Proxy IPs
-	 * --------------------------------------------------------------------------
-	 *
-	 * If your server is behind a reverse proxy, you must whitelist the proxy
-	 * IP addresses from which CodeIgniter should trust headers such as
-	 * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
-	 * the visitor's IP address.
-	 *
-	 * You can use both an array or a comma-separated list of proxy addresses,
-	 * as well as specifying whole subnets. Here are a few examples:
-	 *
-	 * Comma-separated:	'10.0.1.200,192.168.5.0/24'
-	 * Array: ['10.0.1.200', '192.168.5.0/24']
-	 *
-	 * @var string|string[]
-	 */
-	public $proxyIPs = '';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Token Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * The token name.
-	 *
-	 * @deprecated Use `Config\Security` $tokenName property instead of using this property.
-	 *
-	 * @var string
-	 */
-	public $CSRFTokenName = 'csrf_test_name';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Header Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * The header name.
-	 *
-	 * @deprecated Use `Config\Security` $headerName property instead of using this property.
-	 *
-	 * @var string
-	 */
-	public $CSRFHeaderName = 'X-CSRF-TOKEN';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Cookie Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * The cookie name.
-	 *
-	 * @deprecated Use `Config\Security` $cookieName property instead of using this property.
-	 *
-	 * @var string
-	 */
-	public $CSRFCookieName = 'csrf_cookie_name';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Expire
-	 * --------------------------------------------------------------------------
-	 *
-	 * The number in seconds the token should expire.
-	 *
-	 * @deprecated Use `Config\Security` $expire property instead of using this property.
-	 *
-	 * @var integer
-	 */
-	public $CSRFExpire = 7200;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Regenerate
-	 * --------------------------------------------------------------------------
-	 *
-	 * Regenerate token on every submission?
-	 *
-	 * @deprecated Use `Config\Security` $regenerate property instead of using this property.
-	 *
-	 * @var boolean
-	 */
-	public $CSRFRegenerate = true;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Redirect
-	 * --------------------------------------------------------------------------
-	 *
-	 * Redirect to previous page with error on failure?
-	 *
-	 * @deprecated Use `Config\Security` $redirect property instead of using this property.
-	 *
-	 * @var boolean
-	 */
-	public $CSRFRedirect = true;
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF SameSite
-	 * --------------------------------------------------------------------------
-	 *
-	 * Setting for CSRF SameSite cookie token. Allowed values are:
-	 * - None
-	 * - Lax
-	 * - Strict
-	 * - ''
-	 *
-	 * Defaults to `Lax` as recommended in this link:
-	 *
-	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
-	 *
-	 * @deprecated Use `Config\Security` $samesite property instead of using this property.
-	 *
-	 * @var string
-	 */
-	public $CSRFSameSite = 'Lax';
-
-	/**
-	 * --------------------------------------------------------------------------
-	 * Content Security Policy
-	 * --------------------------------------------------------------------------
-	 *
-	 * Enables the Response's Content Secure Policy to restrict the sources that
-	 * can be used for images, scripts, CSS files, audio, video, etc. If enabled,
-	 * the Response object will populate default values for the policy from the
-	 * `ContentSecurityPolicy.php` file. Controllers can always add to those
-	 * restrictions at run time.
-	 *
-	 * For a better understanding of CSP, see these documents:
-	 *
-	 * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
-	 * @see http://www.w3.org/TR/CSP/
-	 *
-	 * @var boolean
-	 */
-	public $CSPEnabled = false;
+    /**
+     * --------------------------------------------------------------------------
+     * Base Site URL
+     * --------------------------------------------------------------------------
+     *
+     * URL to your CodeIgniter root. Typically this will be your base URL,
+     * WITH a trailing slash:
+     *
+     *    http://example.com/
+     *
+     * If this is not set then CodeIgniter will try guess the protocol, domain
+     * and path to your installation. However, you should always configure this
+     * explicitly and never rely on auto-guessing, especially in production
+     * environments.
+     *
+     * @var string
+     */
+    public $baseURL = 'http://localhost:8080/';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Index File
+     * --------------------------------------------------------------------------
+     *
+     * Typically this will be your index.php file, unless you've renamed it to
+     * something else. If you are using mod_rewrite to remove the page set this
+     * variable so that it is blank.
+     *
+     * @var string
+     */
+    public $indexPage = 'index.php';
+
+    /**
+     * --------------------------------------------------------------------------
+     * URI PROTOCOL
+     * --------------------------------------------------------------------------
+     *
+     * This item determines which getServer global should be used to retrieve the
+     * URI string.  The default setting of 'REQUEST_URI' works for most servers.
+     * If your links do not seem to work, try one of the other delicious flavors:
+     *
+     * 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+     * 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+     * 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+     *
+     * WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+     *
+     * @var string
+     */
+    public $uriProtocol = 'REQUEST_URI';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Default Locale
+     * --------------------------------------------------------------------------
+     *
+     * The Locale roughly represents the language and location that your visitor
+     * is viewing the site from. It affects the language strings and other
+     * strings (like currency markers, numbers, etc), that your program
+     * should run under for this request.
+     *
+     * @var string
+     */
+    public $defaultLocale = 'en';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Negotiate Locale
+     * --------------------------------------------------------------------------
+     *
+     * If true, the current Request object will automatically determine the
+     * language to use based on the value of the Accept-Language header.
+     *
+     * If false, no automatic detection will be performed.
+     *
+     * @var bool
+     */
+    public $negotiateLocale = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Supported Locales
+     * --------------------------------------------------------------------------
+     *
+     * If $negotiateLocale is true, this array lists the locales supported
+     * by the application in descending order of priority. If no match is
+     * found, the first locale will be used.
+     *
+     * @var string[]
+     */
+    public $supportedLocales = ['en'];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Application Timezone
+     * --------------------------------------------------------------------------
+     *
+     * The default timezone that will be used in your application to display
+     * dates with the date helper, and can be retrieved through app_timezone()
+     *
+     * @var string
+     */
+    public $appTimezone = 'America/Chicago';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Default Character Set
+     * --------------------------------------------------------------------------
+     *
+     * This determines which character set is used by default in various methods
+     * that require a character set to be provided.
+     *
+     * @see http://php.net/htmlspecialchars for a list of supported charsets.
+     *
+     * @var string
+     */
+    public $charset = 'UTF-8';
+
+    /**
+     * --------------------------------------------------------------------------
+     * URI PROTOCOL
+     * --------------------------------------------------------------------------
+     *
+     * If true, this will force every request made to this application to be
+     * made via a secure connection (HTTPS). If the incoming request is not
+     * secure, the user will be redirected to a secure version of the page
+     * and the HTTP Strict Transport Security header will be set.
+     *
+     * @var bool
+     */
+    public $forceGlobalSecureRequests = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Driver
+     * --------------------------------------------------------------------------
+     *
+     * The session storage driver to use:
+     * - `CodeIgniter\Session\Handlers\FileHandler`
+     * - `CodeIgniter\Session\Handlers\DatabaseHandler`
+     * - `CodeIgniter\Session\Handlers\MemcachedHandler`
+     * - `CodeIgniter\Session\Handlers\RedisHandler`
+     *
+     * @var string
+     */
+    public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Cookie Name
+     * --------------------------------------------------------------------------
+     *
+     * The session cookie name, must contain only [0-9a-z_-] characters
+     *
+     * @var string
+     */
+    public $sessionCookieName = 'ci_session';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Expiration
+     * --------------------------------------------------------------------------
+     *
+     * The number of SECONDS you want the session to last.
+     * Setting to 0 (zero) means expire when the browser is closed.
+     *
+     * @var int
+     */
+    public $sessionExpiration = 7200;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Save Path
+     * --------------------------------------------------------------------------
+     *
+     * The location to save sessions to and is driver dependent.
+     *
+     * For the 'files' driver, it's a path to a writable directory.
+     * WARNING: Only absolute paths are supported!
+     *
+     * For the 'database' driver, it's a table name.
+     * Please read up the manual for the format with other session drivers.
+     *
+     * IMPORTANT: You are REQUIRED to set a valid save path!
+     *
+     * @var string
+     */
+    public $sessionSavePath = WRITEPATH . 'session';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Match IP
+     * --------------------------------------------------------------------------
+     *
+     * Whether to match the user's IP address when reading the session data.
+     *
+     * WARNING: If you're using the database driver, don't forget to update
+     *          your session table's PRIMARY KEY when changing this setting.
+     *
+     * @var bool
+     */
+    public $sessionMatchIP = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Time to Update
+     * --------------------------------------------------------------------------
+     *
+     * How many seconds between CI regenerating the session ID.
+     *
+     * @var int
+     */
+    public $sessionTimeToUpdate = 300;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Session Regenerate Destroy
+     * --------------------------------------------------------------------------
+     *
+     * Whether to destroy session data associated with the old session ID
+     * when auto-regenerating the session ID. When set to FALSE, the data
+     * will be later deleted by the garbage collector.
+     *
+     * @var bool
+     */
+    public $sessionRegenerateDestroy = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Prefix
+     * --------------------------------------------------------------------------
+     *
+     * Set a cookie name prefix if you need to avoid collisions.
+     *
+     * @var string
+     *
+     * @deprecated use Config\Cookie::$prefix property instead.
+     */
+    public $cookiePrefix = '';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Domain
+     * --------------------------------------------------------------------------
+     *
+     * Set to `.your-domain.com` for site-wide cookies.
+     *
+     * @var string
+     *
+     * @deprecated use Config\Cookie::$domain property instead.
+     */
+    public $cookieDomain = '';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Path
+     * --------------------------------------------------------------------------
+     *
+     * Typically will be a forward slash.
+     *
+     * @var string
+     *
+     * @deprecated use Config\Cookie::$path property instead.
+     */
+    public $cookiePath = '/';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Secure
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be set if a secure HTTPS connection exists.
+     *
+     * @var bool
+     *
+     * @deprecated use Config\Cookie::$secure property instead.
+     */
+    public $cookieSecure = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie HttpOnly
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be accessible via HTTP(S) (no JavaScript).
+     *
+     * @var bool
+     *
+     * @deprecated use Config\Cookie::$httponly property instead.
+     */
+    public $cookieHTTPOnly = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie SameSite
+     * --------------------------------------------------------------------------
+     *
+     * Configure cookie SameSite setting. Allowed values are:
+     * - None
+     * - Lax
+     * - Strict
+     * - ''
+     *
+     * Alternatively, you can use the constant names:
+     * - `Cookie::SAMESITE_NONE`
+     * - `Cookie::SAMESITE_LAX`
+     * - `Cookie::SAMESITE_STRICT`
+     *
+     * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+     * (empty string) means default SameSite attribute set by browsers (`Lax`)
+     * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
+     *
+     * @var string
+     *
+     * @deprecated use Config\Cookie::$samesite property instead.
+     */
+    public $cookieSameSite = 'Lax';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Reverse Proxy IPs
+     * --------------------------------------------------------------------------
+     *
+     * If your server is behind a reverse proxy, you must whitelist the proxy
+     * IP addresses from which CodeIgniter should trust headers such as
+     * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+     * the visitor's IP address.
+     *
+     * You can use both an array or a comma-separated list of proxy addresses,
+     * as well as specifying whole subnets. Here are a few examples:
+     *
+     * Comma-separated:	'10.0.1.200,192.168.5.0/24'
+     * Array: ['10.0.1.200', '192.168.5.0/24']
+     *
+     * @var string|string[]
+     */
+    public $proxyIPs = '';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Token Name
+     * --------------------------------------------------------------------------
+     *
+     * The token name.
+     *
+     * @deprecated Use `Config\Security` $tokenName property instead of using this property.
+     *
+     * @var string
+     */
+    public $CSRFTokenName = 'csrf_test_name';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Header Name
+     * --------------------------------------------------------------------------
+     *
+     * The header name.
+     *
+     * @deprecated Use `Config\Security` $headerName property instead of using this property.
+     *
+     * @var string
+     */
+    public $CSRFHeaderName = 'X-CSRF-TOKEN';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Cookie Name
+     * --------------------------------------------------------------------------
+     *
+     * The cookie name.
+     *
+     * @deprecated Use `Config\Security` $cookieName property instead of using this property.
+     *
+     * @var string
+     */
+    public $CSRFCookieName = 'csrf_cookie_name';
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Expire
+     * --------------------------------------------------------------------------
+     *
+     * The number in seconds the token should expire.
+     *
+     * @deprecated Use `Config\Security` $expire property instead of using this property.
+     *
+     * @var int
+     */
+    public $CSRFExpire = 7200;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Regenerate
+     * --------------------------------------------------------------------------
+     *
+     * Regenerate token on every submission?
+     *
+     * @deprecated Use `Config\Security` $regenerate property instead of using this property.
+     *
+     * @var bool
+     */
+    public $CSRFRegenerate = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Redirect
+     * --------------------------------------------------------------------------
+     *
+     * Redirect to previous page with error on failure?
+     *
+     * @deprecated Use `Config\Security` $redirect property instead of using this property.
+     *
+     * @var bool
+     */
+    public $CSRFRedirect = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF SameSite
+     * --------------------------------------------------------------------------
+     *
+     * Setting for CSRF SameSite cookie token. Allowed values are:
+     * - None
+     * - Lax
+     * - Strict
+     * - ''
+     *
+     * Defaults to `Lax` as recommended in this link:
+     *
+     * @see https://portswigger.net/web-security/csrf/samesite-cookies
+     * @deprecated Use `Config\Security` $samesite property instead of using this property.
+     *
+     * @var string
+     */
+    public $CSRFSameSite = 'Lax';
+
+    /**
+     * --------------------------------------------------------------------------
+     * Content Security Policy
+     * --------------------------------------------------------------------------
+     *
+     * Enables the Response's Content Secure Policy to restrict the sources that
+     * can be used for images, scripts, CSS files, audio, video, etc. If enabled,
+     * the Response object will populate default values for the policy from the
+     * `ContentSecurityPolicy.php` file. Controllers can always add to those
+     * restrictions at run time.
+     *
+     * For a better understanding of CSP, see these documents:
+     *
+     * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
+     * @see http://www.w3.org/TR/CSP/
+     *
+     * @var bool
+     */
+    public $CSPEnabled = false;
 }
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index 1ed5e3f65b91..ee27e3b2ce18 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -17,68 +17,71 @@
  */
 class Autoload extends AutoloadConfig
 {
-	/**
-	 * -------------------------------------------------------------------
-	 * Namespaces
-	 * -------------------------------------------------------------------
-	 * This maps the locations of any namespaces in your application to
-	 * their location on the file system. These are used by the autoloader
-	 * to locate files the first time they have been instantiated.
-	 *
-	 * The '/app' and '/system' directories are already mapped for you.
-	 * you may change the name of the 'App' namespace if you wish,
-	 * but this should be done prior to creating any namespaced classes,
-	 * else you will need to modify all of those classes for this to work.
-	 *
-	 * Prototype:
-	 *```
-	 *   $psr4 = [
-	 *       'CodeIgniter' => SYSTEMPATH,
-	 *       'App'	       => APPPATH
-	 *   ];
-	 *```
-	 * @var array<string, string>
-	 */
-	public $psr4 = [
-		APP_NAMESPACE => APPPATH, // For custom app namespace
-		'Config'      => APPPATH . 'Config',
-	];
+    /**
+     * -------------------------------------------------------------------
+     * Namespaces
+     * -------------------------------------------------------------------
+     * This maps the locations of any namespaces in your application to
+     * their location on the file system. These are used by the autoloader
+     * to locate files the first time they have been instantiated.
+     *
+     * The '/app' and '/system' directories are already mapped for you.
+     * you may change the name of the 'App' namespace if you wish,
+     * but this should be done prior to creating any namespaced classes,
+     * else you will need to modify all of those classes for this to work.
+     *
+     * Prototype:
+     *```
+     *   $psr4 = [
+     *       'CodeIgniter' => SYSTEMPATH,
+     *       'App'	       => APPPATH
+     *   ];
+     *```
+     *
+     * @var array<string, string>
+     */
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH, // For custom app namespace
+        'Config'      => APPPATH . 'Config',
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Class Map
-	 * -------------------------------------------------------------------
-	 * The class map provides a map of class names and their exact
-	 * location on the drive. Classes loaded in this manner will have
-	 * slightly faster performance because they will not have to be
-	 * searched for within one or more directories as they would if they
-	 * were being autoloaded through a namespace.
-	 *
-	 * Prototype:
-	 *```
-	 *   $classmap = [
-	 *       'MyClass'   => '/path/to/class/file.php'
-	 *   ];
-	 *```
-	 * @var array<string, string>
-	 */
-	public $classmap = [];
+    /**
+     * -------------------------------------------------------------------
+     * Class Map
+     * -------------------------------------------------------------------
+     * The class map provides a map of class names and their exact
+     * location on the drive. Classes loaded in this manner will have
+     * slightly faster performance because they will not have to be
+     * searched for within one or more directories as they would if they
+     * were being autoloaded through a namespace.
+     *
+     * Prototype:
+     *```
+     *   $classmap = [
+     *       'MyClass'   => '/path/to/class/file.php'
+     *   ];
+     *```
+     *
+     * @var array<string, string>
+     */
+    public $classmap = [];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Files
-	 * -------------------------------------------------------------------
-	 * The files array provides a list of paths to __non-class__ files
-	 * that will be autoloaded. This can be useful for bootstrap operations
-	 * or for loading functions.
-	 *
-	 * Prototype:
-	 * ```
-	 *	  $files = [
-	 *	 	   '/path/to/my/file.php',
-	 *    ];
-	 * ```
-	 * @var array<int, string>
-	 */
-	public $files = [];
+    /**
+     * -------------------------------------------------------------------
+     * Files
+     * -------------------------------------------------------------------
+     * The files array provides a list of paths to __non-class__ files
+     * that will be autoloaded. This can be useful for bootstrap operations
+     * or for loading functions.
+     *
+     * Prototype:
+     * ```
+     *	  $files = [
+     *	 	   '/path/to/my/file.php',
+     *    ];
+     * ```
+     *
+     * @var array<int, string>
+     */
+    public $files = [];
 }
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index e5711a35fbca..ce1db4d7f24e 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -12,156 +12,156 @@
 
 class Cache extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Primary Handler
-	 * --------------------------------------------------------------------------
-	 *
-	 * The name of the preferred handler that should be used. If for some reason
-	 * it is not available, the $backupHandler will be used in its place.
-	 *
-	 * @var string
-	 */
-	public $handler = 'file';
+    /**
+     * --------------------------------------------------------------------------
+     * Primary Handler
+     * --------------------------------------------------------------------------
+     *
+     * The name of the preferred handler that should be used. If for some reason
+     * it is not available, the $backupHandler will be used in its place.
+     *
+     * @var string
+     */
+    public $handler = 'file';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Backup Handler
-	 * --------------------------------------------------------------------------
-	 *
-	 * The name of the handler that will be used in case the first one is
-	 * unreachable. Often, 'file' is used here since the filesystem is
-	 * always available, though that's not always practical for the app.
-	 *
-	 * @var string
-	 */
-	public $backupHandler = 'dummy';
+    /**
+     * --------------------------------------------------------------------------
+     * Backup Handler
+     * --------------------------------------------------------------------------
+     *
+     * The name of the handler that will be used in case the first one is
+     * unreachable. Often, 'file' is used here since the filesystem is
+     * always available, though that's not always practical for the app.
+     *
+     * @var string
+     */
+    public $backupHandler = 'dummy';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cache Directory Path
-	 * --------------------------------------------------------------------------
-	 *
-	 * The path to where cache files should be stored, if using a file-based
-	 * system.
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use the driver-specific variant under $file
-	 */
-	public $storePath = WRITEPATH . 'cache/';
+    /**
+     * --------------------------------------------------------------------------
+     * Cache Directory Path
+     * --------------------------------------------------------------------------
+     *
+     * The path to where cache files should be stored, if using a file-based
+     * system.
+     *
+     * @var string
+     *
+     * @deprecated Use the driver-specific variant under $file
+     */
+    public $storePath = WRITEPATH . 'cache/';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cache Include Query String
-	 * --------------------------------------------------------------------------
-	 *
-	 * Whether to take the URL query string into consideration when generating
-	 * output cache files. Valid options are:
-	 *
-	 *    false      = Disabled
-	 *    true       = Enabled, take all query parameters into account.
-	 *                 Please be aware that this may result in numerous cache
-	 *                 files generated for the same page over and over again.
-	 *    array('q') = Enabled, but only take into account the specified list
-	 *                 of query parameters.
-	 *
-	 * @var boolean|string[]
-	 */
-	public $cacheQueryString = false;
+    /**
+     * --------------------------------------------------------------------------
+     * Cache Include Query String
+     * --------------------------------------------------------------------------
+     *
+     * Whether to take the URL query string into consideration when generating
+     * output cache files. Valid options are:
+     *
+     *    false      = Disabled
+     *    true       = Enabled, take all query parameters into account.
+     *                 Please be aware that this may result in numerous cache
+     *                 files generated for the same page over and over again.
+     *    array('q') = Enabled, but only take into account the specified list
+     *                 of query parameters.
+     *
+     * @var bool|string[]
+     */
+    public $cacheQueryString = false;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Key Prefix
-	 * --------------------------------------------------------------------------
-	 *
-	 * This string is added to all cache item names to help avoid collisions
-	 * if you run multiple applications with the same cache engine.
-	 *
-	 * @var string
-	 */
-	public $prefix = '';
+    /**
+     * --------------------------------------------------------------------------
+     * Key Prefix
+     * --------------------------------------------------------------------------
+     *
+     * This string is added to all cache item names to help avoid collisions
+     * if you run multiple applications with the same cache engine.
+     *
+     * @var string
+     */
+    public $prefix = '';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Default TTL
-	 * --------------------------------------------------------------------------
-	 *
-	 * The default number of seconds to save items when none is specified.
-	 *
-	 * WARNING: This is not used by framework handlers where 60 seconds is
-	 * hard-coded, but may be useful to projects and modules. This will replace
-	 * the hard-coded value in a future release.
-	 *
-	 * @var integer
-	 */
-	public $ttl = 60;
+    /**
+     * --------------------------------------------------------------------------
+     * Default TTL
+     * --------------------------------------------------------------------------
+     *
+     * The default number of seconds to save items when none is specified.
+     *
+     * WARNING: This is not used by framework handlers where 60 seconds is
+     * hard-coded, but may be useful to projects and modules. This will replace
+     * the hard-coded value in a future release.
+     *
+     * @var int
+     */
+    public $ttl = 60;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * File settings
-	 * --------------------------------------------------------------------------
-	 * Your file storage preferences can be specified below, if you are using
-	 * the File driver.
-	 *
-	 * @var array<string, string|int|null>
-	 */
-	public $file = [
-		'storePath' => WRITEPATH . 'cache/',
-		'mode'      => 0640,
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * File settings
+     * --------------------------------------------------------------------------
+     * Your file storage preferences can be specified below, if you are using
+     * the File driver.
+     *
+     * @var array<string, int|string|null>
+     */
+    public $file = [
+        'storePath' => WRITEPATH . 'cache/',
+        'mode'      => 0640,
+    ];
 
-	/**
-	 * -------------------------------------------------------------------------
-	 * Memcached settings
-	 * -------------------------------------------------------------------------
-	 * Your Memcached servers can be specified below, if you are using
-	 * the Memcached drivers.
-	 *
-	 * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
-	 *
-	 * @var array<string, string|int|boolean>
-	 */
-	public $memcached = [
-		'host'   => '127.0.0.1',
-		'port'   => 11211,
-		'weight' => 1,
-		'raw'    => false,
-	];
+    /**
+     * -------------------------------------------------------------------------
+     * Memcached settings
+     * -------------------------------------------------------------------------
+     * Your Memcached servers can be specified below, if you are using
+     * the Memcached drivers.
+     *
+     * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
+     *
+     * @var array<string, boolean|int|string>
+     */
+    public $memcached = [
+        'host'   => '127.0.0.1',
+        'port'   => 11211,
+        'weight' => 1,
+        'raw'    => false,
+    ];
 
-	/**
-	 * -------------------------------------------------------------------------
-	 * Redis settings
-	 * -------------------------------------------------------------------------
-	 * Your Redis server can be specified below, if you are using
-	 * the Redis or Predis drivers.
-	 *
-	 * @var array<string, string|int|null>
-	 */
-	public $redis = [
-		'host'     => '127.0.0.1',
-		'password' => null,
-		'port'     => 6379,
-		'timeout'  => 0,
-		'database' => 0,
-	];
+    /**
+     * -------------------------------------------------------------------------
+     * Redis settings
+     * -------------------------------------------------------------------------
+     * Your Redis server can be specified below, if you are using
+     * the Redis or Predis drivers.
+     *
+     * @var array<string, int|string|null>
+     */
+    public $redis = [
+        'host'     => '127.0.0.1',
+        'password' => null,
+        'port'     => 6379,
+        'timeout'  => 0,
+        'database' => 0,
+    ];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Available Cache Handlers
-	 * --------------------------------------------------------------------------
-	 *
-	 * This is an array of cache engine alias' and class names. Only engines
-	 * that are listed here are allowed to be used.
-	 *
-	 * @var array<string, string>
-	 */
-	public $validHandlers = [
-		'dummy'     => DummyHandler::class,
-		'file'      => FileHandler::class,
-		'memcached' => MemcachedHandler::class,
-		'predis'    => PredisHandler::class,
-		'redis'     => RedisHandler::class,
-		'wincache'  => WincacheHandler::class,
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Available Cache Handlers
+     * --------------------------------------------------------------------------
+     *
+     * This is an array of cache engine alias' and class names. Only engines
+     * that are listed here are allowed to be used.
+     *
+     * @var array<string, string>
+     */
+    public $validHandlers = [
+        'dummy'     => DummyHandler::class,
+        'file'      => FileHandler::class,
+        'memcached' => MemcachedHandler::class,
+        'predis'    => PredisHandler::class,
+        'redis'     => RedisHandler::class,
+        'wincache'  => WincacheHandler::class,
+    ];
 }
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index a04e3d0f9e6a..6fa5bd7b4cc7 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -15,153 +15,153 @@
  */
 class ContentSecurityPolicy extends BaseConfig
 {
-	//-------------------------------------------------------------------------
-	// Broadbrush CSP management
-	//-------------------------------------------------------------------------
-
-	/**
-	 * Default CSP report context
-	 *
-	 * @var boolean
-	 */
-	public $reportOnly = false;
-
-	/**
-	 * Specifies a URL where a browser will send reports
-	 * when a content security policy is violated.
-	 *
-	 * @var string|null
-	 */
-	public $reportURI = null;
-
-	/**
-	 * Instructs user agents to rewrite URL schemes, changing
-	 * HTTP to HTTPS. This directive is for websites with
-	 * large numbers of old URLs that need to be rewritten.
-	 *
-	 * @var boolean
-	 */
-	public $upgradeInsecureRequests = false;
-
-	//-------------------------------------------------------------------------
-	// Sources allowed
-	// Note: once you set a policy to 'none', it cannot be further restricted
-	//-------------------------------------------------------------------------
-
-	/**
-	 * Will default to self if not overridden
-	 *
-	 * @var string|string[]|null
-	 */
-	public $defaultSrc = null;
-
-	/**
-	 * Lists allowed scripts' URLs.
-	 *
-	 * @var string|string[]
-	 */
-	public $scriptSrc = 'self';
-
-	/**
-	 * Lists allowed stylesheets' URLs.
-	 *
-	 * @var string|string[]
-	 */
-	public $styleSrc = 'self';
-
-	/**
-	 * Defines the origins from which images can be loaded.
-	 *
-	 * @var string|string[]
-	 */
-	public $imageSrc = 'self';
-
-	/**
-	 * Restricts the URLs that can appear in a page's `<base>` element.
-	 *
-	 * Will default to self if not overridden
-	 *
-	 * @var string|string[]|null
-	 */
-	public $baseURI = null;
-
-	/**
-	 * Lists the URLs for workers and embedded frame contents
-	 *
-	 * @var string|string[]
-	 */
-	public $childSrc = 'self';
-
-	/**
-	 * Limits the origins that you can connect to (via XHR,
-	 * WebSockets, and EventSource).
-	 *
-	 * @var string|string[]
-	 */
-	public $connectSrc = 'self';
-
-	/**
-	 * Specifies the origins that can serve web fonts.
-	 *
-	 * @var string|string[]
-	 */
-	public $fontSrc = null;
-
-	/**
-	 * Lists valid endpoints for submission from `<form>` tags.
-	 *
-	 * @var string|string[]
-	 */
-	public $formAction = 'self';
-
-	/**
-	 * Specifies the sources that can embed the current page.
-	 * This directive applies to `<frame>`, `<iframe>`, `<embed>`,
-	 * and `<applet>` tags. This directive can't be used in
-	 * `<meta>` tags and applies only to non-HTML resources.
-	 *
-	 * @var string|string[]|null
-	 */
-	public $frameAncestors = null;
-
-	/**
-	 * The frame-src directive restricts the URLs which may
-	 * be loaded into nested browsing contexts.
-	 *
-	 * @var array|string|null
-	 */
-	public $frameSrc = null;
-
-	/**
-	 * Restricts the origins allowed to deliver video and audio.
-	 *
-	 * @var string|string[]|null
-	 */
-	public $mediaSrc = null;
-
-	/**
-	 * Allows control over Flash and other plugins.
-	 *
-	 * @var string|string[]
-	 */
-	public $objectSrc = 'self';
-
-	/**
-	 * @var string|string[]|null
-	 */
-	public $manifestSrc = null;
-
-	/**
-	 * Limits the kinds of plugins a page may invoke.
-	 *
-	 * @var string|string[]|null
-	 */
-	public $pluginTypes = null;
-
-	/**
-	 * List of actions allowed.
-	 *
-	 * @var string|string[]|null
-	 */
-	public $sandbox = null;
+    //-------------------------------------------------------------------------
+    // Broadbrush CSP management
+    //-------------------------------------------------------------------------
+
+    /**
+     * Default CSP report context
+     *
+     * @var bool
+     */
+    public $reportOnly = false;
+
+    /**
+     * Specifies a URL where a browser will send reports
+     * when a content security policy is violated.
+     *
+     * @var string|null
+     */
+    public $reportURI;
+
+    /**
+     * Instructs user agents to rewrite URL schemes, changing
+     * HTTP to HTTPS. This directive is for websites with
+     * large numbers of old URLs that need to be rewritten.
+     *
+     * @var bool
+     */
+    public $upgradeInsecureRequests = false;
+
+    //-------------------------------------------------------------------------
+    // Sources allowed
+    // Note: once you set a policy to 'none', it cannot be further restricted
+    //-------------------------------------------------------------------------
+
+    /**
+     * Will default to self if not overridden
+     *
+     * @var string|string[]|null
+     */
+    public $defaultSrc;
+
+    /**
+     * Lists allowed scripts' URLs.
+     *
+     * @var string|string[]
+     */
+    public $scriptSrc = 'self';
+
+    /**
+     * Lists allowed stylesheets' URLs.
+     *
+     * @var string|string[]
+     */
+    public $styleSrc = 'self';
+
+    /**
+     * Defines the origins from which images can be loaded.
+     *
+     * @var string|string[]
+     */
+    public $imageSrc = 'self';
+
+    /**
+     * Restricts the URLs that can appear in a page's `<base>` element.
+     *
+     * Will default to self if not overridden
+     *
+     * @var string|string[]|null
+     */
+    public $baseURI;
+
+    /**
+     * Lists the URLs for workers and embedded frame contents
+     *
+     * @var string|string[]
+     */
+    public $childSrc = 'self';
+
+    /**
+     * Limits the origins that you can connect to (via XHR,
+     * WebSockets, and EventSource).
+     *
+     * @var string|string[]
+     */
+    public $connectSrc = 'self';
+
+    /**
+     * Specifies the origins that can serve web fonts.
+     *
+     * @var string|string[]
+     */
+    public $fontSrc;
+
+    /**
+     * Lists valid endpoints for submission from `<form>` tags.
+     *
+     * @var string|string[]
+     */
+    public $formAction = 'self';
+
+    /**
+     * Specifies the sources that can embed the current page.
+     * This directive applies to `<frame>`, `<iframe>`, `<embed>`,
+     * and `<applet>` tags. This directive can't be used in
+     * `<meta>` tags and applies only to non-HTML resources.
+     *
+     * @var string|string[]|null
+     */
+    public $frameAncestors;
+
+    /**
+     * The frame-src directive restricts the URLs which may
+     * be loaded into nested browsing contexts.
+     *
+     * @var array|string|null
+     */
+    public $frameSrc;
+
+    /**
+     * Restricts the origins allowed to deliver video and audio.
+     *
+     * @var string|string[]|null
+     */
+    public $mediaSrc;
+
+    /**
+     * Allows control over Flash and other plugins.
+     *
+     * @var string|string[]
+     */
+    public $objectSrc = 'self';
+
+    /**
+     * @var string|string[]|null
+     */
+    public $manifestSrc;
+
+    /**
+     * Limits the kinds of plugins a page may invoke.
+     *
+     * @var string|string[]|null
+     */
+    public $pluginTypes;
+
+    /**
+     * List of actions allowed.
+     *
+     * @var string|string[]|null
+     */
+    public $sandbox;
 }
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
index 4e4e20d3a731..8ee01c71b655 100644
--- a/app/Config/Cookie.php
+++ b/app/Config/Cookie.php
@@ -7,113 +7,113 @@
 
 class Cookie extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Prefix
-	 * --------------------------------------------------------------------------
-	 *
-	 * Set a cookie name prefix if you need to avoid collisions.
-	 *
-	 * @var string
-	 */
-	public $prefix = '';
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Prefix
+     * --------------------------------------------------------------------------
+     *
+     * Set a cookie name prefix if you need to avoid collisions.
+     *
+     * @var string
+     */
+    public $prefix = '';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Expires Timestamp
-	 * --------------------------------------------------------------------------
-	 *
-	 * Default expires timestamp for cookies. Setting this to `0` will mean the
-	 * cookie will not have the `Expires` attribute and will behave as a session
-	 * cookie.
-	 *
-	 * @var DateTimeInterface|integer|string
-	 */
-	public $expires = 0;
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Expires Timestamp
+     * --------------------------------------------------------------------------
+     *
+     * Default expires timestamp for cookies. Setting this to `0` will mean the
+     * cookie will not have the `Expires` attribute and will behave as a session
+     * cookie.
+     *
+     * @var DateTimeInterface|int|string
+     */
+    public $expires = 0;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Path
-	 * --------------------------------------------------------------------------
-	 *
-	 * Typically will be a forward slash.
-	 *
-	 * @var string
-	 */
-	public $path = '/';
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Path
+     * --------------------------------------------------------------------------
+     *
+     * Typically will be a forward slash.
+     *
+     * @var string
+     */
+    public $path = '/';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Domain
-	 * --------------------------------------------------------------------------
-	 *
-	 * Set to `.your-domain.com` for site-wide cookies.
-	 *
-	 * @var string
-	 */
-	public $domain = '';
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Domain
+     * --------------------------------------------------------------------------
+     *
+     * Set to `.your-domain.com` for site-wide cookies.
+     *
+     * @var string
+     */
+    public $domain = '';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Secure
-	 * --------------------------------------------------------------------------
-	 *
-	 * Cookie will only be set if a secure HTTPS connection exists.
-	 *
-	 * @var boolean
-	 */
-	public $secure = false;
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Secure
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be set if a secure HTTPS connection exists.
+     *
+     * @var bool
+     */
+    public $secure = false;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie HTTPOnly
-	 * --------------------------------------------------------------------------
-	 *
-	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
-	 *
-	 * @var boolean
-	 */
-	public $httponly = true;
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie HTTPOnly
+     * --------------------------------------------------------------------------
+     *
+     * Cookie will only be accessible via HTTP(S) (no JavaScript).
+     *
+     * @var bool
+     */
+    public $httponly = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie SameSite
-	 * --------------------------------------------------------------------------
-	 *
-	 * Configure cookie SameSite setting. Allowed values are:
-	 * - None
-	 * - Lax
-	 * - Strict
-	 * - ''
-	 *
-	 * Alternatively, you can use the constant names:
-	 * - `Cookie::SAMESITE_NONE`
-	 * - `Cookie::SAMESITE_LAX`
-	 * - `Cookie::SAMESITE_STRICT`
-	 *
-	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
-	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
-	 * will be set on cookies. If set to `None`, `$secure` must also be set.
-	 *
-	 * @var string
-	 */
-	public $samesite = 'Lax';
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie SameSite
+     * --------------------------------------------------------------------------
+     *
+     * Configure cookie SameSite setting. Allowed values are:
+     * - None
+     * - Lax
+     * - Strict
+     * - ''
+     *
+     * Alternatively, you can use the constant names:
+     * - `Cookie::SAMESITE_NONE`
+     * - `Cookie::SAMESITE_LAX`
+     * - `Cookie::SAMESITE_STRICT`
+     *
+     * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+     * (empty string) means default SameSite attribute set by browsers (`Lax`)
+     * will be set on cookies. If set to `None`, `$secure` must also be set.
+     *
+     * @var string
+     */
+    public $samesite = 'Lax';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Cookie Raw
-	 * --------------------------------------------------------------------------
-	 *
-	 * This flag allows setting a "raw" cookie, i.e., its name and value are
-	 * not URL encoded using `rawurlencode()`.
-	 *
-	 * If this is set to `true`, cookie names should be compliant of RFC 2616's
-	 * list of allowed characters.
-	 *
-	 * @var boolean
-	 *
-	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
-	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
-	 */
-	public $raw = false;
+    /**
+     * --------------------------------------------------------------------------
+     * Cookie Raw
+     * --------------------------------------------------------------------------
+     *
+     * This flag allows setting a "raw" cookie, i.e., its name and value are
+     * not URL encoded using `rawurlencode()`.
+     *
+     * If this is set to `true`, cookie names should be compliant of RFC 2616's
+     * list of allowed characters.
+     *
+     * @var bool
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+     * @see https://tools.ietf.org/html/rfc2616#section-2.2
+     */
+    public $raw = false;
 }
diff --git a/app/Config/Database.php b/app/Config/Database.php
index a0b46c35f45a..1e6340899bf4 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -9,88 +9,82 @@
  */
 class Database extends Config
 {
-	/**
-	 * The directory that holds the Migrations
-	 * and Seeds directories.
-	 *
-	 * @var string
-	 */
-	public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
+    /**
+     * The directory that holds the Migrations
+     * and Seeds directories.
+     *
+     * @var string
+     */
+    public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
 
-	/**
-	 * Lets you choose which connection group to
-	 * use if no other is specified.
-	 *
-	 * @var string
-	 */
-	public $defaultGroup = 'default';
+    /**
+     * Lets you choose which connection group to
+     * use if no other is specified.
+     *
+     * @var string
+     */
+    public $defaultGroup = 'default';
 
-	/**
-	 * The default database connection.
-	 *
-	 * @var array
-	 */
-	public $default = [
-		'DSN'      => '',
-		'hostname' => 'localhost',
-		'username' => '',
-		'password' => '',
-		'database' => '',
-		'DBDriver' => 'MySQLi',
-		'DBPrefix' => '',
-		'pConnect' => false,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => false,
-		'failover' => [],
-		'port'     => 3306,
-	];
+    /**
+     * The default database connection.
+     *
+     * @var array
+     */
+    public $default = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => '',
+        'pConnect' => false,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
+        'failover' => [],
+        'port'     => 3306,
+    ];
 
-	/**
-	 * This database connection is used when
-	 * running PHPUnit database tests.
-	 *
-	 * @var array
-	 */
-	public $tests = [
-		'DSN'      => '',
-		'hostname' => '127.0.0.1',
-		'username' => '',
-		'password' => '',
-		'database' => ':memory:',
-		'DBDriver' => 'SQLite3',
-		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
-		'pConnect' => false,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => false,
-		'failover' => [],
-		'port'     => 3306,
-	];
+    /**
+     * This database connection is used when
+     * running PHPUnit database tests.
+     *
+     * @var array
+     */
+    public $tests = [
+        'DSN'      => '',
+        'hostname' => '127.0.0.1',
+        'username' => '',
+        'password' => '',
+        'database' => ':memory:',
+        'DBDriver' => 'SQLite3',
+        'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
+        'pConnect' => false,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
+        'failover' => [],
+        'port'     => 3306,
+    ];
 
-	//--------------------------------------------------------------------
-
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Ensure that we always set the database group to 'tests' if
-		// we are currently running an automated test suite, so that
-		// we don't overwrite live data on accident.
-		if (ENVIRONMENT === 'testing')
-		{
-			$this->defaultGroup = 'tests';
-		}
-	}
-
-	//--------------------------------------------------------------------
+    public function __construct()
+    {
+        parent::__construct();
 
+        // Ensure that we always set the database group to 'tests' if
+        // we are currently running an automated test suite, so that
+        // we don't overwrite live data on accident.
+        if (ENVIRONMENT === 'testing') {
+            $this->defaultGroup = 'tests';
+        }
+    }
 }
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
index dc85c0440290..6f16693686fe 100755
--- a/app/Config/DocTypes.php
+++ b/app/Config/DocTypes.php
@@ -4,30 +4,30 @@
 
 class DocTypes
 {
-	/**
-	 * List of valid document types.
-	 *
-	 * @var array<string, string>
-	 */
-	public $list = [
-		'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-		'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-		'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-		'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-		'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
-		'html5'             => '<!DOCTYPE html>',
-		'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-		'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-		'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
-		'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
-		'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
-		'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
-		'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
-		'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
-		'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
-		'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-		'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-		'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
-		'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
-	];
+    /**
+     * List of valid document types.
+     *
+     * @var array<string, string>
+     */
+    public $list = [
+        'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+        'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+        'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+        'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+        'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+        'html5'             => '<!DOCTYPE html>',
+        'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+        'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+        'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+        'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+        'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+        'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+        'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+        'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+        'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+        'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+        'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+        'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+        'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+    ];
 }
diff --git a/app/Config/Email.php b/app/Config/Email.php
index 1d0c181e3a41..3a42fbe68ecb 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -6,166 +6,165 @@
 
 class Email extends BaseConfig
 {
-	/**
-	 * @var string
-	 */
-	public $fromEmail;
-
-	/**
-	 * @var string
-	 */
-	public $fromName;
-
-	/**
-	 * @var string
-	 */
-	public $recipients;
-
-	/**
-	 * The "user agent"
-	 *
-	 * @var string
-	 */
-	public $userAgent = 'CodeIgniter';
-
-	/**
-	 * The mail sending protocol: mail, sendmail, smtp
-	 *
-	 * @var string
-	 */
-	public $protocol = 'mail';
-
-	/**
-	 * The server path to Sendmail.
-	 *
-	 * @var string
-	 */
-	public $mailPath = '/usr/sbin/sendmail';
-
-	/**
-	 * SMTP Server Address
-	 *
-	 * @var string
-	 */
-	public $SMTPHost;
-
-	/**
-	 * SMTP Username
-	 *
-	 * @var string
-	 */
-	public $SMTPUser;
-
-	/**
-	 * SMTP Password
-	 *
-	 * @var string
-	 */
-	public $SMTPPass;
-
-	/**
-	 * SMTP Port
-	 *
-	 * @var integer
-	 */
-	public $SMTPPort = 25;
-
-	/**
-	 * SMTP Timeout (in seconds)
-	 *
-	 * @var integer
-	 */
-	public $SMTPTimeout = 5;
-
-	/**
-	 * Enable persistent SMTP connections
-	 *
-	 * @var boolean
-	 */
-	public $SMTPKeepAlive = false;
-
-	/**
-	 * SMTP Encryption. Either tls or ssl
-	 *
-	 * @var string
-	 */
-	public $SMTPCrypto = 'tls';
-
-	/**
-	 * Enable word-wrap
-	 *
-	 * @var boolean
-	 */
-	public $wordWrap = true;
-
-	/**
-	 * Character count to wrap at
-	 *
-	 * @var integer
-	 */
-	public $wrapChars = 76;
-
-	/**
-	 * Type of mail, either 'text' or 'html'
-	 *
-	 * @var string
-	 */
-	public $mailType = 'text';
-
-	/**
-	 * Character set (utf-8, iso-8859-1, etc.)
-	 *
-	 * @var string
-	 */
-	public $charset = 'UTF-8';
-
-	/**
-	 * Whether to validate the email address
-	 *
-	 * @var boolean
-	 */
-	public $validate = false;
-
-	/**
-	 * Email Priority. 1 = highest. 5 = lowest. 3 = normal
-	 *
-	 * @var integer
-	 */
-	public $priority = 3;
-
-	/**
-	 * Newline character. (Use “\r\n” to comply with RFC 822)
-	 *
-	 * @var string
-	 */
-	public $CRLF = "\r\n";
-
-	/**
-	 * Newline character. (Use “\r\n” to comply with RFC 822)
-	 *
-	 * @var string
-	 */
-	public $newline = "\r\n";
-
-	/**
-	 * Enable BCC Batch Mode.
-	 *
-	 * @var boolean
-	 */
-	public $BCCBatchMode = false;
-
-	/**
-	 * Number of emails in each BCC batch
-	 *
-	 * @var integer
-	 */
-	public $BCCBatchSize = 200;
-
-	/**
-	 * Enable notify message from server
-	 *
-	 * @var boolean
-	 */
-	public $DSN = false;
-
+    /**
+     * @var string
+     */
+    public $fromEmail;
+
+    /**
+     * @var string
+     */
+    public $fromName;
+
+    /**
+     * @var string
+     */
+    public $recipients;
+
+    /**
+     * The "user agent"
+     *
+     * @var string
+     */
+    public $userAgent = 'CodeIgniter';
+
+    /**
+     * The mail sending protocol: mail, sendmail, smtp
+     *
+     * @var string
+     */
+    public $protocol = 'mail';
+
+    /**
+     * The server path to Sendmail.
+     *
+     * @var string
+     */
+    public $mailPath = '/usr/sbin/sendmail';
+
+    /**
+     * SMTP Server Address
+     *
+     * @var string
+     */
+    public $SMTPHost;
+
+    /**
+     * SMTP Username
+     *
+     * @var string
+     */
+    public $SMTPUser;
+
+    /**
+     * SMTP Password
+     *
+     * @var string
+     */
+    public $SMTPPass;
+
+    /**
+     * SMTP Port
+     *
+     * @var int
+     */
+    public $SMTPPort = 25;
+
+    /**
+     * SMTP Timeout (in seconds)
+     *
+     * @var int
+     */
+    public $SMTPTimeout = 5;
+
+    /**
+     * Enable persistent SMTP connections
+     *
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * SMTP Encryption. Either tls or ssl
+     *
+     * @var string
+     */
+    public $SMTPCrypto = 'tls';
+
+    /**
+     * Enable word-wrap
+     *
+     * @var bool
+     */
+    public $wordWrap = true;
+
+    /**
+     * Character count to wrap at
+     *
+     * @var int
+     */
+    public $wrapChars = 76;
+
+    /**
+     * Type of mail, either 'text' or 'html'
+     *
+     * @var string
+     */
+    public $mailType = 'text';
+
+    /**
+     * Character set (utf-8, iso-8859-1, etc.)
+     *
+     * @var string
+     */
+    public $charset = 'UTF-8';
+
+    /**
+     * Whether to validate the email address
+     *
+     * @var bool
+     */
+    public $validate = false;
+
+    /**
+     * Email Priority. 1 = highest. 5 = lowest. 3 = normal
+     *
+     * @var int
+     */
+    public $priority = 3;
+
+    /**
+     * Newline character. (Use “\r\n” to comply with RFC 822)
+     *
+     * @var string
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Newline character. (Use “\r\n” to comply with RFC 822)
+     *
+     * @var string
+     */
+    public $newline = "\r\n";
+
+    /**
+     * Enable BCC Batch Mode.
+     *
+     * @var bool
+     */
+    public $BCCBatchMode = false;
+
+    /**
+     * Number of emails in each BCC batch
+     *
+     * @var int
+     */
+    public $BCCBatchSize = 200;
+
+    /**
+     * Enable notify message from server
+     *
+     * @var bool
+     */
+    public $DSN = false;
 }
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
index 39c6fd37dcb8..07b45a0bdfac 100644
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -12,56 +12,56 @@
  */
 class Encryption extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Encryption Key Starter
-	 * --------------------------------------------------------------------------
-	 *
-	 * If you use the Encryption class you must set an encryption key (seed).
-	 * You need to ensure it is long enough for the cipher and mode you plan to use.
-	 * See the user guide for more info.
-	 *
-	 * @var string
-	 */
-	public $key = '';
+    /**
+     * --------------------------------------------------------------------------
+     * Encryption Key Starter
+     * --------------------------------------------------------------------------
+     *
+     * If you use the Encryption class you must set an encryption key (seed).
+     * You need to ensure it is long enough for the cipher and mode you plan to use.
+     * See the user guide for more info.
+     *
+     * @var string
+     */
+    public $key = '';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Encryption Driver to Use
-	 * --------------------------------------------------------------------------
-	 *
-	 * One of the supported encryption drivers.
-	 *
-	 * Available drivers:
-	 * - OpenSSL
-	 * - Sodium
-	 *
-	 * @var string
-	 */
-	public $driver = 'OpenSSL';
+    /**
+     * --------------------------------------------------------------------------
+     * Encryption Driver to Use
+     * --------------------------------------------------------------------------
+     *
+     * One of the supported encryption drivers.
+     *
+     * Available drivers:
+     * - OpenSSL
+     * - Sodium
+     *
+     * @var string
+     */
+    public $driver = 'OpenSSL';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * SodiumHandler's Padding Length in Bytes
-	 * --------------------------------------------------------------------------
-	 *
-	 * This is the number of bytes that will be padded to the plaintext message
-	 * before it is encrypted. This value should be greater than zero.
-	 *
-	 * See the user guide for more information on padding.
-	 *
-	 * @var integer
-	 */
-	public $blockSize = 16;
+    /**
+     * --------------------------------------------------------------------------
+     * SodiumHandler's Padding Length in Bytes
+     * --------------------------------------------------------------------------
+     *
+     * This is the number of bytes that will be padded to the plaintext message
+     * before it is encrypted. This value should be greater than zero.
+     *
+     * See the user guide for more information on padding.
+     *
+     * @var int
+     */
+    public $blockSize = 16;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Encryption digest
-	 * --------------------------------------------------------------------------
-	 *
-	 * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
-	 *
-	 * @var string
-	 */
-	public $digest = 'SHA512';
+    /**
+     * --------------------------------------------------------------------------
+     * Encryption digest
+     * --------------------------------------------------------------------------
+     *
+     * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
+     *
+     * @var string
+     */
+    public $digest = 'SHA512';
 }
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 49dd96e99df6..183280ebda31 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -22,33 +22,29 @@
  *      Events::on('create', [$myInstance, 'myMethod']);
  */
 
-Events::on('pre_system', function () {
-	if (ENVIRONMENT !== 'testing')
-	{
-		if (ini_get('zlib.output_compression'))
-		{
-			throw FrameworkException::forEnabledZlibOutputCompression();
-		}
+Events::on('pre_system', static function () {
+    if (ENVIRONMENT !== 'testing') {
+        if (ini_get('zlib.output_compression')) {
+            throw FrameworkException::forEnabledZlibOutputCompression();
+        }
 
-		while (ob_get_level() > 0)
-		{
-			ob_end_flush();
-		}
+        while (ob_get_level() > 0) {
+            ob_end_flush();
+        }
 
-		ob_start(function ($buffer) {
-			return $buffer;
-		});
-	}
+        ob_start(static function ($buffer) {
+            return $buffer;
+        });
+    }
 
-	/*
-	 * --------------------------------------------------------------------
-	 * Debug Toolbar Listeners.
-	 * --------------------------------------------------------------------
-	 * If you delete, they will no longer be collected.
-	 */
-	if (CI_DEBUG && ! is_cli())
-	{
-		Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
-		Services::toolbar()->respond();
-	}
+    /*
+     * --------------------------------------------------------------------
+     * Debug Toolbar Listeners.
+     * --------------------------------------------------------------------
+     * If you delete, they will no longer be collected.
+     */
+    if (CI_DEBUG && ! is_cli()) {
+        Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+        Services::toolbar()->respond();
+    }
 });
diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php
index 671b078a468c..7cbc78a88a3a 100644
--- a/app/Config/Exceptions.php
+++ b/app/Config/Exceptions.php
@@ -9,52 +9,52 @@
  */
 class Exceptions extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * LOG EXCEPTIONS?
-	 * --------------------------------------------------------------------------
-	 * If true, then exceptions will be logged
-	 * through Services::Log.
-	 *
-	 * Default: true
-	 *
-	 * @var boolean
-	 */
-	public $log = true;
+    /**
+     * --------------------------------------------------------------------------
+     * LOG EXCEPTIONS?
+     * --------------------------------------------------------------------------
+     * If true, then exceptions will be logged
+     * through Services::Log.
+     *
+     * Default: true
+     *
+     * @var bool
+     */
+    public $log = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * DO NOT LOG STATUS CODES
-	 * --------------------------------------------------------------------------
-	 * Any status codes here will NOT be logged if logging is turned on.
-	 * By default, only 404 (Page Not Found) exceptions are ignored.
-	 *
-	 * @var array
-	 */
-	public $ignoreCodes = [404];
+    /**
+     * --------------------------------------------------------------------------
+     * DO NOT LOG STATUS CODES
+     * --------------------------------------------------------------------------
+     * Any status codes here will NOT be logged if logging is turned on.
+     * By default, only 404 (Page Not Found) exceptions are ignored.
+     *
+     * @var array
+     */
+    public $ignoreCodes = [404];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Error Views Path
-	 * --------------------------------------------------------------------------
-	 * This is the path to the directory that contains the 'cli' and 'html'
-	 * directories that hold the views used to generate errors.
-	 *
-	 * Default: APPPATH.'Views/errors'
-	 *
-	 * @var string
-	 */
-	public $errorViewPath = APPPATH . 'Views/errors';
+    /**
+     * --------------------------------------------------------------------------
+     * Error Views Path
+     * --------------------------------------------------------------------------
+     * This is the path to the directory that contains the 'cli' and 'html'
+     * directories that hold the views used to generate errors.
+     *
+     * Default: APPPATH.'Views/errors'
+     *
+     * @var string
+     */
+    public $errorViewPath = APPPATH . 'Views/errors';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * HIDE FROM DEBUG TRACE
-	 * --------------------------------------------------------------------------
-	 * Any data that you would like to hide from the debug trace.
-	 * In order to specify 2 levels, use "/" to separate.
-	 * ex. ['server', 'setup/password', 'secret_token']
-	 *
-	 * @var array
-	 */
-	public $sensitiveDataInTrace = [];
+    /**
+     * --------------------------------------------------------------------------
+     * HIDE FROM DEBUG TRACE
+     * --------------------------------------------------------------------------
+     * Any data that you would like to hide from the debug trace.
+     * In order to specify 2 levels, use "/" to separate.
+     * ex. ['server', 'setup/password', 'secret_token']
+     *
+     * @var array
+     */
+    public $sensitiveDataInTrace = [];
 }
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 515aff3300db..df90270a6480 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -9,54 +9,54 @@
 
 class Filters extends BaseConfig
 {
-	/**
-	 * Configures aliases for Filter classes to
-	 * make reading things nicer and simpler.
-	 *
-	 * @var array
-	 */
-	public $aliases = [
-		'csrf'     => CSRF::class,
-		'toolbar'  => DebugToolbar::class,
-		'honeypot' => Honeypot::class,
-	];
+    /**
+     * Configures aliases for Filter classes to
+     * make reading things nicer and simpler.
+     *
+     * @var array
+     */
+    public $aliases = [
+        'csrf'     => CSRF::class,
+        'toolbar'  => DebugToolbar::class,
+        'honeypot' => Honeypot::class,
+    ];
 
-	/**
-	 * List of filter aliases that are always
-	 * applied before and after every request.
-	 *
-	 * @var array
-	 */
-	public $globals = [
-		'before' => [
-			// 'honeypot',
-			// 'csrf',
-		],
-		'after'  => [
-			'toolbar',
-			// 'honeypot',
-		],
-	];
+    /**
+     * List of filter aliases that are always
+     * applied before and after every request.
+     *
+     * @var array
+     */
+    public $globals = [
+        'before' => [
+            // 'honeypot',
+            // 'csrf',
+        ],
+        'after' => [
+            'toolbar',
+            // 'honeypot',
+        ],
+    ];
 
-	/**
-	 * List of filter aliases that works on a
-	 * particular HTTP method (GET, POST, etc.).
-	 *
-	 * Example:
-	 * 'post' => ['csrf', 'throttle']
-	 *
-	 * @var array
-	 */
-	public $methods = [];
+    /**
+     * List of filter aliases that works on a
+     * particular HTTP method (GET, POST, etc.).
+     *
+     * Example:
+     * 'post' => ['csrf', 'throttle']
+     *
+     * @var array
+     */
+    public $methods = [];
 
-	/**
-	 * List of filter aliases that should run on any
-	 * before or after URI patterns.
-	 *
-	 * Example:
-	 * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
-	 *
-	 * @var array
-	 */
-	public $filters = [];
+    /**
+     * List of filter aliases that should run on any
+     * before or after URI patterns.
+     *
+     * Example:
+     * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
+     *
+     * @var array
+     */
+    public $filters = [];
 }
diff --git a/app/Config/Format.php b/app/Config/Format.php
index fdaa640bb78c..533540e27918 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -7,73 +7,69 @@
 
 class Format extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Available Response Formats
-	 * --------------------------------------------------------------------------
-	 *
-	 * When you perform content negotiation with the request, these are the
-	 * available formats that your application supports. This is currently
-	 * only used with the API\ResponseTrait. A valid Formatter must exist
-	 * for the specified format.
-	 *
-	 * These formats are only checked when the data passed to the respond()
-	 * method is an array.
-	 *
-	 * @var string[]
-	 */
-	public $supportedResponseFormats = [
-		'application/json',
-		'application/xml', // machine-readable XML
-		'text/xml', // human-readable XML
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Available Response Formats
+     * --------------------------------------------------------------------------
+     *
+     * When you perform content negotiation with the request, these are the
+     * available formats that your application supports. This is currently
+     * only used with the API\ResponseTrait. A valid Formatter must exist
+     * for the specified format.
+     *
+     * These formats are only checked when the data passed to the respond()
+     * method is an array.
+     *
+     * @var string[]
+     */
+    public $supportedResponseFormats = [
+        'application/json',
+        'application/xml', // machine-readable XML
+        'text/xml', // human-readable XML
+    ];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Formatters
-	 * --------------------------------------------------------------------------
-	 *
-	 * Lists the class to use to format responses with of a particular type.
-	 * For each mime type, list the class that should be used. Formatters
-	 * can be retrieved through the getFormatter() method.
-	 *
-	 * @var array<string, string>
-	 */
-	public $formatters = [
-		'application/json' => 'CodeIgniter\Format\JSONFormatter',
-		'application/xml'  => 'CodeIgniter\Format\XMLFormatter',
-		'text/xml'         => 'CodeIgniter\Format\XMLFormatter',
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Formatters
+     * --------------------------------------------------------------------------
+     *
+     * Lists the class to use to format responses with of a particular type.
+     * For each mime type, list the class that should be used. Formatters
+     * can be retrieved through the getFormatter() method.
+     *
+     * @var array<string, string>
+     */
+    public $formatters = [
+        'application/json' => 'CodeIgniter\Format\JSONFormatter',
+        'application/xml'  => 'CodeIgniter\Format\XMLFormatter',
+        'text/xml'         => 'CodeIgniter\Format\XMLFormatter',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Formatters Options
-	 * --------------------------------------------------------------------------
-	 *
-	 * Additional Options to adjust default formatters behaviour.
-	 * For each mime type, list the additional options that should be used.
-	 *
-	 * @var array<string, int>
-	 */
-	public $formatterOptions = [
-		'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
-		'application/xml'  => 0,
-		'text/xml'         => 0,
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Formatters Options
+     * --------------------------------------------------------------------------
+     *
+     * Additional Options to adjust default formatters behaviour.
+     * For each mime type, list the additional options that should be used.
+     *
+     * @var array<string, int>
+     */
+    public $formatterOptions = [
+        'application/json' => JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES,
+        'application/xml'  => 0,
+        'text/xml'         => 0,
+    ];
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * A Factory method to return the appropriate formatter for the given mime type.
-	 *
-	 * @param string $mime
-	 *
-	 * @return FormatterInterface
-	 *
-	 * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
-	 */
-	public function getFormatter(string $mime)
-	{
-		return Services::format()->getFormatter($mime);
-	}
+    /**
+     * A Factory method to return the appropriate formatter for the given mime type.
+     *
+     * @return FormatterInterface
+     *
+     * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
+     */
+    public function getFormatter(string $mime)
+    {
+        return Services::format()->getFormatter($mime);
+    }
 }
diff --git a/app/Config/Generators.php b/app/Config/Generators.php
index 2c32587a1788..c47153d47042 100644
--- a/app/Config/Generators.php
+++ b/app/Config/Generators.php
@@ -6,34 +6,34 @@
 
 class Generators extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Generator Commands' Views
-	 * --------------------------------------------------------------------------
-	 *
-	 * This array defines the mapping of generator commands to the view files
-	 * they are using. If you need to customize them for your own, copy these
-	 * view files in your own folder and indicate the location here.
-	 *
-	 * You will notice that the views have special placeholders enclosed in
-	 * curly braces `{...}`. These placeholders are used internally by the
-	 * generator commands in processing replacements, thus you are warned
-	 * not to delete them or modify the names. If you will do so, you may
-	 * end up disrupting the scaffolding process and throw errors.
-	 *
-	 * YOU HAVE BEEN WARNED!
-	 *
-	 * @var array<string, string>
-	 */
-	public $views = [
-		'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
-		'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
-		'make:entity'       => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
-		'make:filter'       => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',
-		'make:migration'    => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
-		'make:model'        => 'CodeIgniter\Commands\Generators\Views\model.tpl.php',
-		'make:seeder'       => 'CodeIgniter\Commands\Generators\Views\seeder.tpl.php',
-		'make:validation'   => 'CodeIgniter\Commands\Generators\Views\validation.tpl.php',
-		'session:migration' => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Generator Commands' Views
+     * --------------------------------------------------------------------------
+     *
+     * This array defines the mapping of generator commands to the view files
+     * they are using. If you need to customize them for your own, copy these
+     * view files in your own folder and indicate the location here.
+     *
+     * You will notice that the views have special placeholders enclosed in
+     * curly braces `{...}`. These placeholders are used internally by the
+     * generator commands in processing replacements, thus you are warned
+     * not to delete them or modify the names. If you will do so, you may
+     * end up disrupting the scaffolding process and throw errors.
+     *
+     * YOU HAVE BEEN WARNED!
+     *
+     * @var array<string, string>
+     */
+    public $views = [
+        'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+        'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
+        'make:entity'       => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
+        'make:filter'       => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',
+        'make:migration'    => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+        'make:model'        => 'CodeIgniter\Commands\Generators\Views\model.tpl.php',
+        'make:seeder'       => 'CodeIgniter\Commands\Generators\Views\seeder.tpl.php',
+        'make:validation'   => 'CodeIgniter\Commands\Generators\Views\validation.tpl.php',
+        'session:migration' => 'CodeIgniter\Commands\Generators\Views\migration.tpl.php',
+    ];
 }
diff --git a/app/Config/Honeypot.php b/app/Config/Honeypot.php
index 54bdcd4d0f73..42b5a0dc827e 100644
--- a/app/Config/Honeypot.php
+++ b/app/Config/Honeypot.php
@@ -6,38 +6,38 @@
 
 class Honeypot extends BaseConfig
 {
-	/**
-	 * Makes Honeypot visible or not to human
-	 *
-	 * @var boolean
-	 */
-	public $hidden = true;
+    /**
+     * Makes Honeypot visible or not to human
+     *
+     * @var bool
+     */
+    public $hidden = true;
 
-	/**
-	 * Honeypot Label Content
-	 *
-	 * @var string
-	 */
-	public $label = 'Fill This Field';
+    /**
+     * Honeypot Label Content
+     *
+     * @var string
+     */
+    public $label = 'Fill This Field';
 
-	/**
-	 * Honeypot Field Name
-	 *
-	 * @var string
-	 */
-	public $name = 'honeypot';
+    /**
+     * Honeypot Field Name
+     *
+     * @var string
+     */
+    public $name = 'honeypot';
 
-	/**
-	 * Honeypot HTML Template
-	 *
-	 * @var string
-	 */
-	public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
+    /**
+     * Honeypot HTML Template
+     *
+     * @var string
+     */
+    public $template = '<label>{label}</label><input type="text" name="{name}" value=""/>';
 
-	/**
-	 * Honeypot container
-	 *
-	 * @var string
-	 */
-	public $container = '<div style="display:none">{template}</div>';
+    /**
+     * Honeypot container
+     *
+     * @var string
+     */
+    public $container = '<div style="display:none">{template}</div>';
 }
diff --git a/app/Config/Images.php b/app/Config/Images.php
index 87cc5f86b1ce..1c15d8151ed2 100644
--- a/app/Config/Images.php
+++ b/app/Config/Images.php
@@ -8,28 +8,28 @@
 
 class Images extends BaseConfig
 {
-	/**
-	 * Default handler used if no other handler is specified.
-	 *
-	 * @var string
-	 */
-	public $defaultHandler = 'gd';
+    /**
+     * Default handler used if no other handler is specified.
+     *
+     * @var string
+     */
+    public $defaultHandler = 'gd';
 
-	/**
-	 * The path to the image library.
-	 * Required for ImageMagick, GraphicsMagick, or NetPBM.
-	 *
-	 * @var string
-	 */
-	public $libraryPath = '/usr/local/bin/convert';
+    /**
+     * The path to the image library.
+     * Required for ImageMagick, GraphicsMagick, or NetPBM.
+     *
+     * @var string
+     */
+    public $libraryPath = '/usr/local/bin/convert';
 
-	/**
-	 * The available handler classes.
-	 *
-	 * @var array<string, string>
-	 */
-	public $handlers = [
-		'gd'      => GDHandler::class,
-		'imagick' => ImageMagickHandler::class,
-	];
+    /**
+     * The available handler classes.
+     *
+     * @var array<string, string>
+     */
+    public $handlers = [
+        'gd'      => GDHandler::class,
+        'imagick' => ImageMagickHandler::class,
+    ];
 }
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index 665de0bb1def..4b52422af7d7 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -17,45 +17,45 @@
  */
 class Kint extends BaseConfig
 {
-	/*
-	|--------------------------------------------------------------------------
-	| Global Settings
-	|--------------------------------------------------------------------------
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Global Settings
+    |--------------------------------------------------------------------------
+    */
 
-	public $plugins = null;
+    public $plugins;
 
-	public $maxDepth = 6;
+    public $maxDepth = 6;
 
-	public $displayCalledFrom = true;
+    public $displayCalledFrom = true;
 
-	public $expanded = false;
+    public $expanded = false;
 
-	/*
-	|--------------------------------------------------------------------------
-	| RichRenderer Settings
-	|--------------------------------------------------------------------------
-	*/
-	public $richTheme = 'aante-light.css';
+    /*
+    |--------------------------------------------------------------------------
+    | RichRenderer Settings
+    |--------------------------------------------------------------------------
+    */
+    public $richTheme = 'aante-light.css';
 
-	public $richFolder = false;
+    public $richFolder = false;
 
-	public $richSort = Renderer::SORT_FULL;
+    public $richSort = Renderer::SORT_FULL;
 
-	public $richObjectPlugins = null;
+    public $richObjectPlugins;
 
-	public $richTabPlugins = null;
+    public $richTabPlugins;
 
-	/*
-	|--------------------------------------------------------------------------
-	| CLI Settings
-	|--------------------------------------------------------------------------
-	*/
-	public $cliColors = true;
+    /*
+    |--------------------------------------------------------------------------
+    | CLI Settings
+    |--------------------------------------------------------------------------
+    */
+    public $cliColors = true;
 
-	public $cliForceUTF8 = false;
+    public $cliForceUTF8 = false;
 
-	public $cliDetectWidth = true;
+    public $cliDetectWidth = true;
 
-	public $cliMinWidth = 40;
+    public $cliMinWidth = 40;
 }
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 0cee08d83725..a4eaeb648955 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -6,150 +6,148 @@
 
 class Logger extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Error Logging Threshold
-	 * --------------------------------------------------------------------------
-	 *
-	 * You can enable error logging by setting a threshold over zero. The
-	 * threshold determines what gets logged. Any values below or equal to the
-	 * threshold will be logged.
-	 *
-	 * Threshold options are:
-	 *
-	 * - 0 = Disables logging, Error logging TURNED OFF
-	 * - 1 = Emergency Messages - System is unusable
-	 * - 2 = Alert Messages - Action Must Be Taken Immediately
-	 * - 3 = Critical Messages - Application component unavailable, unexpected exception.
-	 * - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
-	 * - 5 = Warnings - Exceptional occurrences that are not errors.
-	 * - 6 = Notices - Normal but significant events.
-	 * - 7 = Info - Interesting events, like user logging in, etc.
-	 * - 8 = Debug - Detailed debug information.
-	 * - 9 = All Messages
-	 *
-	 * You can also pass an array with threshold levels to show individual error types
-	 *
-	 *     array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
-	 *
-	 * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
-	 * your log files will fill up very fast.
-	 *
-	 * @var integer|array
-	 */
-	public $threshold = 4;
+    /**
+     * --------------------------------------------------------------------------
+     * Error Logging Threshold
+     * --------------------------------------------------------------------------
+     *
+     * You can enable error logging by setting a threshold over zero. The
+     * threshold determines what gets logged. Any values below or equal to the
+     * threshold will be logged.
+     *
+     * Threshold options are:
+     *
+     * - 0 = Disables logging, Error logging TURNED OFF
+     * - 1 = Emergency Messages - System is unusable
+     * - 2 = Alert Messages - Action Must Be Taken Immediately
+     * - 3 = Critical Messages - Application component unavailable, unexpected exception.
+     * - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+     * - 5 = Warnings - Exceptional occurrences that are not errors.
+     * - 6 = Notices - Normal but significant events.
+     * - 7 = Info - Interesting events, like user logging in, etc.
+     * - 8 = Debug - Detailed debug information.
+     * - 9 = All Messages
+     *
+     * You can also pass an array with threshold levels to show individual error types
+     *
+     *     array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
+     *
+     * For a live site you'll usually enable Critical or higher (3) to be logged otherwise
+     * your log files will fill up very fast.
+     *
+     * @var array|int
+     */
+    public $threshold = 4;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Date Format for Logs
-	 * --------------------------------------------------------------------------
-	 *
-	 * Each item that is logged has an associated date. You can use PHP date
-	 * codes to set your own date formatting
-	 *
-	 * @var string
-	 */
-	public $dateFormat = 'Y-m-d H:i:s';
+    /**
+     * --------------------------------------------------------------------------
+     * Date Format for Logs
+     * --------------------------------------------------------------------------
+     *
+     * Each item that is logged has an associated date. You can use PHP date
+     * codes to set your own date formatting
+     *
+     * @var string
+     */
+    public $dateFormat = 'Y-m-d H:i:s';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Log Handlers
-	 * --------------------------------------------------------------------------
-	 *
-	 * The logging system supports multiple actions to be taken when something
-	 * is logged. This is done by allowing for multiple Handlers, special classes
-	 * designed to write the log to their chosen destinations, whether that is
-	 * a file on the getServer, a cloud-based service, or even taking actions such
-	 * as emailing the dev team.
-	 *
-	 * Each handler is defined by the class name used for that handler, and it
-	 * MUST implement the `CodeIgniter\Log\Handlers\HandlerInterface` interface.
-	 *
-	 * The value of each key is an array of configuration items that are sent
-	 * to the constructor of each handler. The only required configuration item
-	 * is the 'handles' element, which must be an array of integer log levels.
-	 * This is most easily handled by using the constants defined in the
-	 * `Psr\Log\LogLevel` class.
-	 *
-	 * Handlers are executed in the order defined in this array, starting with
-	 * the handler on top and continuing down.
-	 *
-	 * @var array
-	 */
-	public $handlers = [
+    /**
+     * --------------------------------------------------------------------------
+     * Log Handlers
+     * --------------------------------------------------------------------------
+     *
+     * The logging system supports multiple actions to be taken when something
+     * is logged. This is done by allowing for multiple Handlers, special classes
+     * designed to write the log to their chosen destinations, whether that is
+     * a file on the getServer, a cloud-based service, or even taking actions such
+     * as emailing the dev team.
+     *
+     * Each handler is defined by the class name used for that handler, and it
+     * MUST implement the `CodeIgniter\Log\Handlers\HandlerInterface` interface.
+     *
+     * The value of each key is an array of configuration items that are sent
+     * to the constructor of each handler. The only required configuration item
+     * is the 'handles' element, which must be an array of integer log levels.
+     * This is most easily handled by using the constants defined in the
+     * `Psr\Log\LogLevel` class.
+     *
+     * Handlers are executed in the order defined in this array, starting with
+     * the handler on top and continuing down.
+     *
+     * @var array
+     */
+    public $handlers = [
 
-		/*
-		 * --------------------------------------------------------------------
-		 * File Handler
-		 * --------------------------------------------------------------------
-		 */
-		'CodeIgniter\Log\Handlers\FileHandler' => [
+        /*
+         * --------------------------------------------------------------------
+         * File Handler
+         * --------------------------------------------------------------------
+         */
+        'CodeIgniter\Log\Handlers\FileHandler' => [
 
-			/*
-			 * The log levels that this handler will handle.
-			 */
-			'handles'         => [
-				'critical',
-				'alert',
-				'emergency',
-				'debug',
-				'error',
-				'info',
-				'notice',
-				'warning',
-			],
+            // The log levels that this handler will handle.
+            'handles' => [
+                'critical',
+                'alert',
+                'emergency',
+                'debug',
+                'error',
+                'info',
+                'notice',
+                'warning',
+            ],
 
-			/*
-			 * The default filename extension for log files.
-			 * An extension of 'php' allows for protecting the log files via basic
-			 * scripting, when they are to be stored under a publicly accessible directory.
-			 *
-			 * Note: Leaving it blank will default to 'log'.
-			 */
-			'fileExtension'   => '',
+            /*
+             * The default filename extension for log files.
+             * An extension of 'php' allows for protecting the log files via basic
+             * scripting, when they are to be stored under a publicly accessible directory.
+             *
+             * Note: Leaving it blank will default to 'log'.
+             */
+            'fileExtension' => '',
 
-			/*
-			 * The file system permissions to be applied on newly created log files.
-			 *
-			 * IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
-			 * integer notation (i.e. 0700, 0644, etc.)
-			 */
-			'filePermissions' => 0644,
+            /*
+             * The file system permissions to be applied on newly created log files.
+             *
+             * IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+             * integer notation (i.e. 0700, 0644, etc.)
+             */
+            'filePermissions' => 0644,
 
-			/*
-			 * Logging Directory Path
-			 *
-			 * By default, logs are written to WRITEPATH . 'logs/'
-			 * Specify a different destination here, if desired.
-			 */
-			'path'            => '',
-		],
+            /*
+             * Logging Directory Path
+             *
+             * By default, logs are written to WRITEPATH . 'logs/'
+             * Specify a different destination here, if desired.
+             */
+            'path' => '',
+        ],
 
-		/**
-		 * The ChromeLoggerHandler requires the use of the Chrome web browser
-		 * and the ChromeLogger extension. Uncomment this block to use it.
-		 */
-		// 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
-		//     /*
-		//      * The log levels that this handler will handle.
-		//      */
-		//     'handles' => ['critical', 'alert', 'emergency', 'debug',
-		//                   'error', 'info', 'notice', 'warning'],
-		// ],
+        /*
+         * The ChromeLoggerHandler requires the use of the Chrome web browser
+         * and the ChromeLogger extension. Uncomment this block to use it.
+         */
+        // 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
+        //     /*
+        //      * The log levels that this handler will handle.
+        //      */
+        //     'handles' => ['critical', 'alert', 'emergency', 'debug',
+        //                   'error', 'info', 'notice', 'warning'],
+        // ],
 
-		/**
-		 * The ErrorlogHandler writes the logs to PHP's native `error_log()` function.
-		 * Uncomment this block to use it.
-		 */
-		// 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
-		// 		/* The log levels this handler can handle. */
-		// 		'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
-		//
-		// 		/*
-		// 		 * The message type where the error should go. Can be 0 or 4, or use the
-		// 		 * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
-		// 		 */
-		// 		'messageType' => 0,
-		// ],
-	];
+        /*
+         * The ErrorlogHandler writes the logs to PHP's native `error_log()` function.
+         * Uncomment this block to use it.
+         */
+        // 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
+        // 		/* The log levels this handler can handle. */
+        // 		'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+        //
+        // 		/*
+        // 		 * The message type where the error should go. Can be 0 or 4, or use the
+        // 		 * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
+        // 		 */
+        // 		'messageType' => 0,
+        // ],
+    ];
 }
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
index 1fa3100af07c..91e80b4a9074 100644
--- a/app/Config/Migrations.php
+++ b/app/Config/Migrations.php
@@ -6,50 +6,50 @@
 
 class Migrations extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Enable/Disable Migrations
-	 * --------------------------------------------------------------------------
-	 *
-	 * Migrations are enabled by default.
-	 *
-	 * You should enable migrations whenever you intend to do a schema migration
-	 * and disable it back when you're done.
-	 *
-	 * @var boolean
-	 */
-	public $enabled = true;
+    /**
+     * --------------------------------------------------------------------------
+     * Enable/Disable Migrations
+     * --------------------------------------------------------------------------
+     *
+     * Migrations are enabled by default.
+     *
+     * You should enable migrations whenever you intend to do a schema migration
+     * and disable it back when you're done.
+     *
+     * @var bool
+     */
+    public $enabled = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Migrations Table
-	 * --------------------------------------------------------------------------
-	 *
-	 * This is the name of the table that will store the current migrations state.
-	 * When migrations runs it will store in a database table which migration
-	 * level the system is at. It then compares the migration level in this
-	 * table to the $config['migration_version'] if they are not the same it
-	 * will migrate up. This must be set.
-	 *
-	 * @var string
-	 */
-	public $table = 'migrations';
+    /**
+     * --------------------------------------------------------------------------
+     * Migrations Table
+     * --------------------------------------------------------------------------
+     *
+     * This is the name of the table that will store the current migrations state.
+     * When migrations runs it will store in a database table which migration
+     * level the system is at. It then compares the migration level in this
+     * table to the $config['migration_version'] if they are not the same it
+     * will migrate up. This must be set.
+     *
+     * @var string
+     */
+    public $table = 'migrations';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Timestamp Format
-	 * --------------------------------------------------------------------------
-	 *
-	 * This is the format that will be used when creating new migrations
-	 * using the CLI command:
-	 *   > php spark migrate:create
-	 *
-	 * Typical formats:
-	 * - YmdHis_
-	 * - Y-m-d-His_
-	 * - Y_m_d_His_
-	 *
-	 * @var string
-	 */
-	public $timestampFormat = 'Y-m-d-His_';
+    /**
+     * --------------------------------------------------------------------------
+     * Timestamp Format
+     * --------------------------------------------------------------------------
+     *
+     * This is the format that will be used when creating new migrations
+     * using the CLI command:
+     *   > php spark migrate:create
+     *
+     * Typical formats:
+     * - YmdHis_
+     * - Y-m-d-His_
+     * - Y_m_d_His_
+     *
+     * @var string
+     */
+    public $timestampFormat = 'Y-m-d-His_';
 }
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 7a32e84efff0..973fb3984901 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -16,528 +16,519 @@
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
  */
-
 class Mimes
 {
-	/**
-	 * Map of extensions to mime types.
-	 *
-	 * @var array
-	 */
-	public static $mimes = [
-		'hqx'   => [
-			'application/mac-binhex40',
-			'application/mac-binhex',
-			'application/x-binhex40',
-			'application/x-mac-binhex40',
-		],
-		'cpt'   => 'application/mac-compactpro',
-		'csv'   => [
-			'text/csv',
-			'text/x-comma-separated-values',
-			'text/comma-separated-values',
-			'application/vnd.ms-excel',
-			'application/x-csv',
-			'text/x-csv',
-			'application/csv',
-			'application/excel',
-			'application/vnd.msexcel',
-			'text/plain',
-		],
-		'bin'   => [
-			'application/macbinary',
-			'application/mac-binary',
-			'application/octet-stream',
-			'application/x-binary',
-			'application/x-macbinary',
-		],
-		'dms'   => 'application/octet-stream',
-		'lha'   => 'application/octet-stream',
-		'lzh'   => 'application/octet-stream',
-		'exe'   => [
-			'application/octet-stream',
-			'application/x-msdownload',
-		],
-		'class' => 'application/octet-stream',
-		'psd'   => [
-			'application/x-photoshop',
-			'image/vnd.adobe.photoshop',
-		],
-		'so'    => 'application/octet-stream',
-		'sea'   => 'application/octet-stream',
-		'dll'   => 'application/octet-stream',
-		'oda'   => 'application/oda',
-		'pdf'   => [
-			'application/pdf',
-			'application/force-download',
-			'application/x-download',
-		],
-		'ai'    => [
-			'application/pdf',
-			'application/postscript',
-		],
-		'eps'   => 'application/postscript',
-		'ps'    => 'application/postscript',
-		'smi'   => 'application/smil',
-		'smil'  => 'application/smil',
-		'mif'   => 'application/vnd.mif',
-		'xls'   => [
-			'application/vnd.ms-excel',
-			'application/msexcel',
-			'application/x-msexcel',
-			'application/x-ms-excel',
-			'application/x-excel',
-			'application/x-dos_ms_excel',
-			'application/xls',
-			'application/x-xls',
-			'application/excel',
-			'application/download',
-			'application/vnd.ms-office',
-			'application/msword',
-		],
-		'ppt'   => [
-			'application/vnd.ms-powerpoint',
-			'application/powerpoint',
-			'application/vnd.ms-office',
-			'application/msword',
-		],
-		'pptx'  => [
-			'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-			'application/x-zip',
-			'application/zip',
-		],
-		'wbxml' => 'application/wbxml',
-		'wmlc'  => 'application/wmlc',
-		'dcr'   => 'application/x-director',
-		'dir'   => 'application/x-director',
-		'dxr'   => 'application/x-director',
-		'dvi'   => 'application/x-dvi',
-		'gtar'  => 'application/x-gtar',
-		'gz'    => 'application/x-gzip',
-		'gzip'  => 'application/x-gzip',
-		'php'   => [
-			'application/x-php',
-			'application/x-httpd-php',
-			'application/php',
-			'text/php',
-			'text/x-php',
-			'application/x-httpd-php-source',
-		],
-		'php4'  => 'application/x-httpd-php',
-		'php3'  => 'application/x-httpd-php',
-		'phtml' => 'application/x-httpd-php',
-		'phps'  => 'application/x-httpd-php-source',
-		'js'    => [
-			'application/x-javascript',
-			'text/plain',
-		],
-		'swf'   => 'application/x-shockwave-flash',
-		'sit'   => 'application/x-stuffit',
-		'tar'   => 'application/x-tar',
-		'tgz'   => [
-			'application/x-tar',
-			'application/x-gzip-compressed',
-		],
-		'z'     => 'application/x-compress',
-		'xhtml' => 'application/xhtml+xml',
-		'xht'   => 'application/xhtml+xml',
-		'zip'   => [
-			'application/x-zip',
-			'application/zip',
-			'application/x-zip-compressed',
-			'application/s-compressed',
-			'multipart/x-zip',
-		],
-		'rar'   => [
-			'application/vnd.rar',
-			'application/x-rar',
-			'application/rar',
-			'application/x-rar-compressed',
-		],
-		'mid'   => 'audio/midi',
-		'midi'  => 'audio/midi',
-		'mpga'  => 'audio/mpeg',
-		'mp2'   => 'audio/mpeg',
-		'mp3'   => [
-			'audio/mpeg',
-			'audio/mpg',
-			'audio/mpeg3',
-			'audio/mp3',
-		],
-		'aif'   => [
-			'audio/x-aiff',
-			'audio/aiff',
-		],
-		'aiff'  => [
-			'audio/x-aiff',
-			'audio/aiff',
-		],
-		'aifc'  => 'audio/x-aiff',
-		'ram'   => 'audio/x-pn-realaudio',
-		'rm'    => 'audio/x-pn-realaudio',
-		'rpm'   => 'audio/x-pn-realaudio-plugin',
-		'ra'    => 'audio/x-realaudio',
-		'rv'    => 'video/vnd.rn-realvideo',
-		'wav'   => [
-			'audio/x-wav',
-			'audio/wave',
-			'audio/wav',
-		],
-		'bmp'   => [
-			'image/bmp',
-			'image/x-bmp',
-			'image/x-bitmap',
-			'image/x-xbitmap',
-			'image/x-win-bitmap',
-			'image/x-windows-bmp',
-			'image/ms-bmp',
-			'image/x-ms-bmp',
-			'application/bmp',
-			'application/x-bmp',
-			'application/x-win-bitmap',
-		],
-		'gif'   => 'image/gif',
-		'jpg'   => [
-			'image/jpeg',
-			'image/pjpeg',
-		],
-		'jpeg'  => [
-			'image/jpeg',
-			'image/pjpeg',
-		],
-		'jpe'   => [
-			'image/jpeg',
-			'image/pjpeg',
-		],
-		'jp2'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'j2k'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'jpf'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'jpg2'  => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'jpx'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'jpm'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'mj2'   => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'mjp2'  => [
-			'image/jp2',
-			'video/mj2',
-			'image/jpx',
-			'image/jpm',
-		],
-		'png'   => [
-			'image/png',
-			'image/x-png',
-		],
-		'tif'   => 'image/tiff',
-		'tiff'  => 'image/tiff',
-		'css'   => [
-			'text/css',
-			'text/plain',
-		],
-		'html'  => [
-			'text/html',
-			'text/plain',
-		],
-		'htm'   => [
-			'text/html',
-			'text/plain',
-		],
-		'shtml' => [
-			'text/html',
-			'text/plain',
-		],
-		'txt'   => 'text/plain',
-		'text'  => 'text/plain',
-		'log'   => [
-			'text/plain',
-			'text/x-log',
-		],
-		'rtx'   => 'text/richtext',
-		'rtf'   => 'text/rtf',
-		'xml'   => [
-			'application/xml',
-			'text/xml',
-			'text/plain',
-		],
-		'xsl'   => [
-			'application/xml',
-			'text/xsl',
-			'text/xml',
-		],
-		'mpeg'  => 'video/mpeg',
-		'mpg'   => 'video/mpeg',
-		'mpe'   => 'video/mpeg',
-		'qt'    => 'video/quicktime',
-		'mov'   => 'video/quicktime',
-		'avi'   => [
-			'video/x-msvideo',
-			'video/msvideo',
-			'video/avi',
-			'application/x-troff-msvideo',
-		],
-		'movie' => 'video/x-sgi-movie',
-		'doc'   => [
-			'application/msword',
-			'application/vnd.ms-office',
-		],
-		'docx'  => [
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-			'application/zip',
-			'application/msword',
-			'application/x-zip',
-		],
-		'dot'   => [
-			'application/msword',
-			'application/vnd.ms-office',
-		],
-		'dotx'  => [
-			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-			'application/zip',
-			'application/msword',
-		],
-		'xlsx'  => [
-			'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-			'application/zip',
-			'application/vnd.ms-excel',
-			'application/msword',
-			'application/x-zip',
-		],
-		'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-		'xlsm'  => 'application/vnd.ms-excel.sheet.macroEnabled.12',
-		'word'  => [
-			'application/msword',
-			'application/octet-stream',
-		],
-		'xl'    => 'application/excel',
-		'eml'   => 'message/rfc822',
-		'json'  => [
-			'application/json',
-			'text/json',
-		],
-		'pem'   => [
-			'application/x-x509-user-cert',
-			'application/x-pem-file',
-			'application/octet-stream',
-		],
-		'p10'   => [
-			'application/x-pkcs10',
-			'application/pkcs10',
-		],
-		'p12'   => 'application/x-pkcs12',
-		'p7a'   => 'application/x-pkcs7-signature',
-		'p7c'   => [
-			'application/pkcs7-mime',
-			'application/x-pkcs7-mime',
-		],
-		'p7m'   => [
-			'application/pkcs7-mime',
-			'application/x-pkcs7-mime',
-		],
-		'p7r'   => 'application/x-pkcs7-certreqresp',
-		'p7s'   => 'application/pkcs7-signature',
-		'crt'   => [
-			'application/x-x509-ca-cert',
-			'application/x-x509-user-cert',
-			'application/pkix-cert',
-		],
-		'crl'   => [
-			'application/pkix-crl',
-			'application/pkcs-crl',
-		],
-		'der'   => 'application/x-x509-ca-cert',
-		'kdb'   => 'application/octet-stream',
-		'pgp'   => 'application/pgp',
-		'gpg'   => 'application/gpg-keys',
-		'sst'   => 'application/octet-stream',
-		'csr'   => 'application/octet-stream',
-		'rsa'   => 'application/x-pkcs7',
-		'cer'   => [
-			'application/pkix-cert',
-			'application/x-x509-ca-cert',
-		],
-		'3g2'   => 'video/3gpp2',
-		'3gp'   => [
-			'video/3gp',
-			'video/3gpp',
-		],
-		'mp4'   => 'video/mp4',
-		'm4a'   => 'audio/x-m4a',
-		'f4v'   => [
-			'video/mp4',
-			'video/x-f4v',
-		],
-		'flv'   => 'video/x-flv',
-		'webm'  => 'video/webm',
-		'aac'   => 'audio/x-acc',
-		'm4u'   => 'application/vnd.mpegurl',
-		'm3u'   => 'text/plain',
-		'xspf'  => 'application/xspf+xml',
-		'vlc'   => 'application/videolan',
-		'wmv'   => [
-			'video/x-ms-wmv',
-			'video/x-ms-asf',
-		],
-		'au'    => 'audio/x-au',
-		'ac3'   => 'audio/ac3',
-		'flac'  => 'audio/x-flac',
-		'ogg'   => [
-			'audio/ogg',
-			'video/ogg',
-			'application/ogg',
-		],
-		'kmz'   => [
-			'application/vnd.google-earth.kmz',
-			'application/zip',
-			'application/x-zip',
-		],
-		'kml'   => [
-			'application/vnd.google-earth.kml+xml',
-			'application/xml',
-			'text/xml',
-		],
-		'ics'   => 'text/calendar',
-		'ical'  => 'text/calendar',
-		'zsh'   => 'text/x-scriptzsh',
-		'7zip'  => [
-			'application/x-compressed',
-			'application/x-zip-compressed',
-			'application/zip',
-			'multipart/x-zip',
-		],
-		'cdr'   => [
-			'application/cdr',
-			'application/coreldraw',
-			'application/x-cdr',
-			'application/x-coreldraw',
-			'image/cdr',
-			'image/x-cdr',
-			'zz-application/zz-winassoc-cdr',
-		],
-		'wma'   => [
-			'audio/x-ms-wma',
-			'video/x-ms-asf',
-		],
-		'jar'   => [
-			'application/java-archive',
-			'application/x-java-application',
-			'application/x-jar',
-			'application/x-compressed',
-		],
-		'svg'   => [
-			'image/svg+xml',
-			'image/svg',
-			'application/xml',
-			'text/xml',
-		],
-		'vcf'   => 'text/x-vcard',
-		'srt'   => [
-			'text/srt',
-			'text/plain',
-		],
-		'vtt'   => [
-			'text/vtt',
-			'text/plain',
-		],
-		'ico'   => [
-			'image/x-icon',
-			'image/x-ico',
-			'image/vnd.microsoft.icon',
-		],
-		'stl'   => [
-			'application/sla',
-			'application/vnd.ms-pki.stl',
-			'application/x-navistyle',
-		],
-	];
+    /**
+     * Map of extensions to mime types.
+     *
+     * @var array
+     */
+    public static $mimes = [
+        'hqx' => [
+            'application/mac-binhex40',
+            'application/mac-binhex',
+            'application/x-binhex40',
+            'application/x-mac-binhex40',
+        ],
+        'cpt' => 'application/mac-compactpro',
+        'csv' => [
+            'text/csv',
+            'text/x-comma-separated-values',
+            'text/comma-separated-values',
+            'application/vnd.ms-excel',
+            'application/x-csv',
+            'text/x-csv',
+            'application/csv',
+            'application/excel',
+            'application/vnd.msexcel',
+            'text/plain',
+        ],
+        'bin' => [
+            'application/macbinary',
+            'application/mac-binary',
+            'application/octet-stream',
+            'application/x-binary',
+            'application/x-macbinary',
+        ],
+        'dms' => 'application/octet-stream',
+        'lha' => 'application/octet-stream',
+        'lzh' => 'application/octet-stream',
+        'exe' => [
+            'application/octet-stream',
+            'application/x-msdownload',
+        ],
+        'class' => 'application/octet-stream',
+        'psd'   => [
+            'application/x-photoshop',
+            'image/vnd.adobe.photoshop',
+        ],
+        'so'  => 'application/octet-stream',
+        'sea' => 'application/octet-stream',
+        'dll' => 'application/octet-stream',
+        'oda' => 'application/oda',
+        'pdf' => [
+            'application/pdf',
+            'application/force-download',
+            'application/x-download',
+        ],
+        'ai' => [
+            'application/pdf',
+            'application/postscript',
+        ],
+        'eps'  => 'application/postscript',
+        'ps'   => 'application/postscript',
+        'smi'  => 'application/smil',
+        'smil' => 'application/smil',
+        'mif'  => 'application/vnd.mif',
+        'xls'  => [
+            'application/vnd.ms-excel',
+            'application/msexcel',
+            'application/x-msexcel',
+            'application/x-ms-excel',
+            'application/x-excel',
+            'application/x-dos_ms_excel',
+            'application/xls',
+            'application/x-xls',
+            'application/excel',
+            'application/download',
+            'application/vnd.ms-office',
+            'application/msword',
+        ],
+        'ppt' => [
+            'application/vnd.ms-powerpoint',
+            'application/powerpoint',
+            'application/vnd.ms-office',
+            'application/msword',
+        ],
+        'pptx' => [
+            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'application/x-zip',
+            'application/zip',
+        ],
+        'wbxml' => 'application/wbxml',
+        'wmlc'  => 'application/wmlc',
+        'dcr'   => 'application/x-director',
+        'dir'   => 'application/x-director',
+        'dxr'   => 'application/x-director',
+        'dvi'   => 'application/x-dvi',
+        'gtar'  => 'application/x-gtar',
+        'gz'    => 'application/x-gzip',
+        'gzip'  => 'application/x-gzip',
+        'php'   => [
+            'application/x-php',
+            'application/x-httpd-php',
+            'application/php',
+            'text/php',
+            'text/x-php',
+            'application/x-httpd-php-source',
+        ],
+        'php4'  => 'application/x-httpd-php',
+        'php3'  => 'application/x-httpd-php',
+        'phtml' => 'application/x-httpd-php',
+        'phps'  => 'application/x-httpd-php-source',
+        'js'    => [
+            'application/x-javascript',
+            'text/plain',
+        ],
+        'swf' => 'application/x-shockwave-flash',
+        'sit' => 'application/x-stuffit',
+        'tar' => 'application/x-tar',
+        'tgz' => [
+            'application/x-tar',
+            'application/x-gzip-compressed',
+        ],
+        'z'     => 'application/x-compress',
+        'xhtml' => 'application/xhtml+xml',
+        'xht'   => 'application/xhtml+xml',
+        'zip'   => [
+            'application/x-zip',
+            'application/zip',
+            'application/x-zip-compressed',
+            'application/s-compressed',
+            'multipart/x-zip',
+        ],
+        'rar' => [
+            'application/vnd.rar',
+            'application/x-rar',
+            'application/rar',
+            'application/x-rar-compressed',
+        ],
+        'mid'  => 'audio/midi',
+        'midi' => 'audio/midi',
+        'mpga' => 'audio/mpeg',
+        'mp2'  => 'audio/mpeg',
+        'mp3'  => [
+            'audio/mpeg',
+            'audio/mpg',
+            'audio/mpeg3',
+            'audio/mp3',
+        ],
+        'aif' => [
+            'audio/x-aiff',
+            'audio/aiff',
+        ],
+        'aiff' => [
+            'audio/x-aiff',
+            'audio/aiff',
+        ],
+        'aifc' => 'audio/x-aiff',
+        'ram'  => 'audio/x-pn-realaudio',
+        'rm'   => 'audio/x-pn-realaudio',
+        'rpm'  => 'audio/x-pn-realaudio-plugin',
+        'ra'   => 'audio/x-realaudio',
+        'rv'   => 'video/vnd.rn-realvideo',
+        'wav'  => [
+            'audio/x-wav',
+            'audio/wave',
+            'audio/wav',
+        ],
+        'bmp' => [
+            'image/bmp',
+            'image/x-bmp',
+            'image/x-bitmap',
+            'image/x-xbitmap',
+            'image/x-win-bitmap',
+            'image/x-windows-bmp',
+            'image/ms-bmp',
+            'image/x-ms-bmp',
+            'application/bmp',
+            'application/x-bmp',
+            'application/x-win-bitmap',
+        ],
+        'gif' => 'image/gif',
+        'jpg' => [
+            'image/jpeg',
+            'image/pjpeg',
+        ],
+        'jpeg' => [
+            'image/jpeg',
+            'image/pjpeg',
+        ],
+        'jpe' => [
+            'image/jpeg',
+            'image/pjpeg',
+        ],
+        'jp2' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'j2k' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'jpf' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'jpg2' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'jpx' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'jpm' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'mj2' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'mjp2' => [
+            'image/jp2',
+            'video/mj2',
+            'image/jpx',
+            'image/jpm',
+        ],
+        'png' => [
+            'image/png',
+            'image/x-png',
+        ],
+        'tif'  => 'image/tiff',
+        'tiff' => 'image/tiff',
+        'css'  => [
+            'text/css',
+            'text/plain',
+        ],
+        'html' => [
+            'text/html',
+            'text/plain',
+        ],
+        'htm' => [
+            'text/html',
+            'text/plain',
+        ],
+        'shtml' => [
+            'text/html',
+            'text/plain',
+        ],
+        'txt'  => 'text/plain',
+        'text' => 'text/plain',
+        'log'  => [
+            'text/plain',
+            'text/x-log',
+        ],
+        'rtx' => 'text/richtext',
+        'rtf' => 'text/rtf',
+        'xml' => [
+            'application/xml',
+            'text/xml',
+            'text/plain',
+        ],
+        'xsl' => [
+            'application/xml',
+            'text/xsl',
+            'text/xml',
+        ],
+        'mpeg' => 'video/mpeg',
+        'mpg'  => 'video/mpeg',
+        'mpe'  => 'video/mpeg',
+        'qt'   => 'video/quicktime',
+        'mov'  => 'video/quicktime',
+        'avi'  => [
+            'video/x-msvideo',
+            'video/msvideo',
+            'video/avi',
+            'application/x-troff-msvideo',
+        ],
+        'movie' => 'video/x-sgi-movie',
+        'doc'   => [
+            'application/msword',
+            'application/vnd.ms-office',
+        ],
+        'docx' => [
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/zip',
+            'application/msword',
+            'application/x-zip',
+        ],
+        'dot' => [
+            'application/msword',
+            'application/vnd.ms-office',
+        ],
+        'dotx' => [
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'application/zip',
+            'application/msword',
+        ],
+        'xlsx' => [
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'application/zip',
+            'application/vnd.ms-excel',
+            'application/msword',
+            'application/x-zip',
+        ],
+        'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+        'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+        'word' => [
+            'application/msword',
+            'application/octet-stream',
+        ],
+        'xl'   => 'application/excel',
+        'eml'  => 'message/rfc822',
+        'json' => [
+            'application/json',
+            'text/json',
+        ],
+        'pem' => [
+            'application/x-x509-user-cert',
+            'application/x-pem-file',
+            'application/octet-stream',
+        ],
+        'p10' => [
+            'application/x-pkcs10',
+            'application/pkcs10',
+        ],
+        'p12' => 'application/x-pkcs12',
+        'p7a' => 'application/x-pkcs7-signature',
+        'p7c' => [
+            'application/pkcs7-mime',
+            'application/x-pkcs7-mime',
+        ],
+        'p7m' => [
+            'application/pkcs7-mime',
+            'application/x-pkcs7-mime',
+        ],
+        'p7r' => 'application/x-pkcs7-certreqresp',
+        'p7s' => 'application/pkcs7-signature',
+        'crt' => [
+            'application/x-x509-ca-cert',
+            'application/x-x509-user-cert',
+            'application/pkix-cert',
+        ],
+        'crl' => [
+            'application/pkix-crl',
+            'application/pkcs-crl',
+        ],
+        'der' => 'application/x-x509-ca-cert',
+        'kdb' => 'application/octet-stream',
+        'pgp' => 'application/pgp',
+        'gpg' => 'application/gpg-keys',
+        'sst' => 'application/octet-stream',
+        'csr' => 'application/octet-stream',
+        'rsa' => 'application/x-pkcs7',
+        'cer' => [
+            'application/pkix-cert',
+            'application/x-x509-ca-cert',
+        ],
+        '3g2' => 'video/3gpp2',
+        '3gp' => [
+            'video/3gp',
+            'video/3gpp',
+        ],
+        'mp4' => 'video/mp4',
+        'm4a' => 'audio/x-m4a',
+        'f4v' => [
+            'video/mp4',
+            'video/x-f4v',
+        ],
+        'flv'  => 'video/x-flv',
+        'webm' => 'video/webm',
+        'aac'  => 'audio/x-acc',
+        'm4u'  => 'application/vnd.mpegurl',
+        'm3u'  => 'text/plain',
+        'xspf' => 'application/xspf+xml',
+        'vlc'  => 'application/videolan',
+        'wmv'  => [
+            'video/x-ms-wmv',
+            'video/x-ms-asf',
+        ],
+        'au'   => 'audio/x-au',
+        'ac3'  => 'audio/ac3',
+        'flac' => 'audio/x-flac',
+        'ogg'  => [
+            'audio/ogg',
+            'video/ogg',
+            'application/ogg',
+        ],
+        'kmz' => [
+            'application/vnd.google-earth.kmz',
+            'application/zip',
+            'application/x-zip',
+        ],
+        'kml' => [
+            'application/vnd.google-earth.kml+xml',
+            'application/xml',
+            'text/xml',
+        ],
+        'ics'  => 'text/calendar',
+        'ical' => 'text/calendar',
+        'zsh'  => 'text/x-scriptzsh',
+        '7zip' => [
+            'application/x-compressed',
+            'application/x-zip-compressed',
+            'application/zip',
+            'multipart/x-zip',
+        ],
+        'cdr' => [
+            'application/cdr',
+            'application/coreldraw',
+            'application/x-cdr',
+            'application/x-coreldraw',
+            'image/cdr',
+            'image/x-cdr',
+            'zz-application/zz-winassoc-cdr',
+        ],
+        'wma' => [
+            'audio/x-ms-wma',
+            'video/x-ms-asf',
+        ],
+        'jar' => [
+            'application/java-archive',
+            'application/x-java-application',
+            'application/x-jar',
+            'application/x-compressed',
+        ],
+        'svg' => [
+            'image/svg+xml',
+            'image/svg',
+            'application/xml',
+            'text/xml',
+        ],
+        'vcf' => 'text/x-vcard',
+        'srt' => [
+            'text/srt',
+            'text/plain',
+        ],
+        'vtt' => [
+            'text/vtt',
+            'text/plain',
+        ],
+        'ico' => [
+            'image/x-icon',
+            'image/x-ico',
+            'image/vnd.microsoft.icon',
+        ],
+        'stl' => [
+            'application/sla',
+            'application/vnd.ms-pki.stl',
+            'application/x-navistyle',
+        ],
+    ];
 
-	/**
-	 * Attempts to determine the best mime type for the given file extension.
-	 *
-	 * @param string $extension
-	 *
-	 * @return string|null The mime type found, or none if unable to determine.
-	 */
-	public static function guessTypeFromExtension(string $extension)
-	{
-		$extension = trim(strtolower($extension), '. ');
+    /**
+     * Attempts to determine the best mime type for the given file extension.
+     *
+     * @return string|null The mime type found, or none if unable to determine.
+     */
+    public static function guessTypeFromExtension(string $extension)
+    {
+        $extension = trim(strtolower($extension), '. ');
 
-		if (! array_key_exists($extension, static::$mimes))
-		{
-			return null;
-		}
+        if (! array_key_exists($extension, static::$mimes)) {
+            return null;
+        }
 
-		return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
-	}
+        return is_array(static::$mimes[$extension]) ? static::$mimes[$extension][0] : static::$mimes[$extension];
+    }
 
-	/**
-	 * Attempts to determine the best file extension for a given mime type.
-	 *
-	 * @param string      $type
-	 * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
-	 *
-	 * @return string|null The extension determined, or null if unable to match.
-	 */
-	public static function guessExtensionFromType(string $type, string $proposedExtension = null)
-	{
-		$type = trim(strtolower($type), '. ');
+    /**
+     * Attempts to determine the best file extension for a given mime type.
+     *
+     * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
+     *
+     * @return string|null The extension determined, or null if unable to match.
+     */
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null)
+    {
+        $type = trim(strtolower($type), '. ');
 
-		$proposedExtension = trim(strtolower($proposedExtension));
+        $proposedExtension = trim(strtolower($proposedExtension));
 
-		if ($proposedExtension !== '')
-		{
-			if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true))
-			{
-				// The detected mime type matches with the proposed extension.
-				return $proposedExtension;
-			}
+        if ($proposedExtension !== '') {
+            if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
+                // The detected mime type matches with the proposed extension.
+                return $proposedExtension;
+            }
 
-			// An extension was proposed, but the media type does not match the mime type list.
-			return null;
-		}
+            // An extension was proposed, but the media type does not match the mime type list.
+            return null;
+        }
 
-		// Reverse check the mime type list if no extension was proposed.
-		// This search is order sensitive!
-		foreach (static::$mimes as $ext => $types)
-		{
-			if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true)))
-			{
-				return $ext;
-			}
-		}
+        // Reverse check the mime type list if no extension was proposed.
+        // This search is order sensitive!
+        foreach (static::$mimes as $ext => $types) {
+            if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true))) {
+                return $ext;
+            }
+        }
 
-		return null;
-	}
+        return null;
+    }
 }
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index 0814a0cfd65b..bde4079f77c4 100644
--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -6,48 +6,48 @@
 
 class Modules extends BaseModules
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Enable Auto-Discovery?
-	 * --------------------------------------------------------------------------
-	 *
-	 * If true, then auto-discovery will happen across all elements listed in
-	 * $aliases below. If false, no auto-discovery will happen at all,
-	 * giving a slight performance boost.
-	 *
-	 * @var boolean
-	 */
-	public $enabled = true;
+    /**
+     * --------------------------------------------------------------------------
+     * Enable Auto-Discovery?
+     * --------------------------------------------------------------------------
+     *
+     * If true, then auto-discovery will happen across all elements listed in
+     * $aliases below. If false, no auto-discovery will happen at all,
+     * giving a slight performance boost.
+     *
+     * @var bool
+     */
+    public $enabled = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Enable Auto-Discovery Within Composer Packages?
-	 * --------------------------------------------------------------------------
-	 *
-	 * If true, then auto-discovery will happen across all namespaces loaded
-	 * by Composer, as well as the namespaces configured locally.
-	 *
-	 * @var boolean
-	 */
-	public $discoverInComposer = true;
+    /**
+     * --------------------------------------------------------------------------
+     * Enable Auto-Discovery Within Composer Packages?
+     * --------------------------------------------------------------------------
+     *
+     * If true, then auto-discovery will happen across all namespaces loaded
+     * by Composer, as well as the namespaces configured locally.
+     *
+     * @var bool
+     */
+    public $discoverInComposer = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Auto-Discovery Rules
-	 * --------------------------------------------------------------------------
-	 *
-	 * Aliases list of all discovery classes that will be active and used during
-	 * the current application request.
-	 *
-	 * If it is not listed, only the base application elements will be used.
-	 *
-	 * @var string[]
-	 */
-	public $aliases = [
-		'events',
-		'filters',
-		'registrars',
-		'routes',
-		'services',
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Auto-Discovery Rules
+     * --------------------------------------------------------------------------
+     *
+     * Aliases list of all discovery classes that will be active and used during
+     * the current application request.
+     *
+     * If it is not listed, only the base application elements will be used.
+     *
+     * @var string[]
+     */
+    public $aliases = [
+        'events',
+        'filters',
+        'registrars',
+        'routes',
+        'services',
+    ];
 }
diff --git a/app/Config/Pager.php b/app/Config/Pager.php
index 44993132c860..922575389a69 100644
--- a/app/Config/Pager.php
+++ b/app/Config/Pager.php
@@ -6,34 +6,34 @@
 
 class Pager extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Templates
-	 * --------------------------------------------------------------------------
-	 *
-	 * Pagination links are rendered out using views to configure their
-	 * appearance. This array contains aliases and the view names to
-	 * use when rendering the links.
-	 *
-	 * Within each view, the Pager object will be available as $pager,
-	 * and the desired group as $pagerGroup;
-	 *
-	 * @var array<string, string>
-	 */
-	public $templates = [
-		'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-		'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-		'default_head'   => 'CodeIgniter\Pager\Views\default_head',
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Templates
+     * --------------------------------------------------------------------------
+     *
+     * Pagination links are rendered out using views to configure their
+     * appearance. This array contains aliases and the view names to
+     * use when rendering the links.
+     *
+     * Within each view, the Pager object will be available as $pager,
+     * and the desired group as $pagerGroup;
+     *
+     * @var array<string, string>
+     */
+    public $templates = [
+        'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+        'default_head'   => 'CodeIgniter\Pager\Views\default_head',
+    ];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Items Per Page
-	 * --------------------------------------------------------------------------
-	 *
-	 * The default number of results shown in a single page.
-	 *
-	 * @var integer
-	 */
-	public $perPage = 20;
+    /**
+     * --------------------------------------------------------------------------
+     * Items Per Page
+     * --------------------------------------------------------------------------
+     *
+     * The default number of results shown in a single page.
+     *
+     * @var int
+     */
+    public $perPage = 20;
 }
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
index bd77d27051b3..f701b7570507 100644
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -13,74 +13,73 @@
  *
  * All paths are relative to the project's root folder.
  */
-
 class Paths
 {
-	/**
-	 * ---------------------------------------------------------------
-	 * SYSTEM FOLDER NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This must contain the name of your "system" folder. Include
-	 * the path if the folder is not in the same directory as this file.
-	 *
-	 * @var string
-	 */
-	public $systemDirectory = __DIR__ . '/../../system';
+    /**
+     * ---------------------------------------------------------------
+     * SYSTEM FOLDER NAME
+     * ---------------------------------------------------------------
+     *
+     * This must contain the name of your "system" folder. Include
+     * the path if the folder is not in the same directory as this file.
+     *
+     * @var string
+     */
+    public $systemDirectory = __DIR__ . '/../../system';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * APPLICATION FOLDER NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * If you want this front controller to use a different "app"
-	 * folder than the default one you can set its name here. The folder
-	 * can also be renamed or relocated anywhere on your getServer. If
-	 * you do, use a full getServer path.
-	 *
-	 * @see http://codeigniter.com/user_guide/general/managing_apps.html
-	 *
-	 * @var string
-	 */
-	public $appDirectory = __DIR__ . '/..';
+    /**
+     * ---------------------------------------------------------------
+     * APPLICATION FOLDER NAME
+     * ---------------------------------------------------------------
+     *
+     * If you want this front controller to use a different "app"
+     * folder than the default one you can set its name here. The folder
+     * can also be renamed or relocated anywhere on your getServer. If
+     * you do, use a full getServer path.
+     *
+     * @see http://codeigniter.com/user_guide/general/managing_apps.html
+     *
+     * @var string
+     */
+    public $appDirectory = __DIR__ . '/..';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * WRITABLE DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of your "writable" directory.
-	 * The writable directory allows you to group all directories that
-	 * need write permission to a single place that can be tucked away
-	 * for maximum security, keeping it out of the app and/or
-	 * system directories.
-	 *
-	 * @var string
-	 */
-	public $writableDirectory = __DIR__ . '/../../writable';
+    /**
+     * ---------------------------------------------------------------
+     * WRITABLE DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "writable" directory.
+     * The writable directory allows you to group all directories that
+     * need write permission to a single place that can be tucked away
+     * for maximum security, keeping it out of the app and/or
+     * system directories.
+     *
+     * @var string
+     */
+    public $writableDirectory = __DIR__ . '/../../writable';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * TESTS DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of your "tests" directory.
-	 *
-	 * @var string
-	 */
-	public $testsDirectory = __DIR__ . '/../../tests';
+    /**
+     * ---------------------------------------------------------------
+     * TESTS DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of your "tests" directory.
+     *
+     * @var string
+     */
+    public $testsDirectory = __DIR__ . '/../../tests';
 
-	/**
-	 * ---------------------------------------------------------------
-	 * VIEW DIRECTORY NAME
-	 * ---------------------------------------------------------------
-	 *
-	 * This variable must contain the name of the directory that
-	 * contains the view files used by your application. By
-	 * default this is in `app/Views`. This value
-	 * is used when no value is provided to `Services::renderer()`.
-	 *
-	 * @var string
-	 */
-	public $viewDirectory = __DIR__ . '/../Views';
+    /**
+     * ---------------------------------------------------------------
+     * VIEW DIRECTORY NAME
+     * ---------------------------------------------------------------
+     *
+     * This variable must contain the name of the directory that
+     * contains the view files used by your application. By
+     * default this is in `app/Views`. This value
+     * is used when no value is provided to `Services::renderer()`.
+     *
+     * @var string
+     */
+    public $viewDirectory = __DIR__ . '/../Views';
 }
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b6e1dd43e7aa..0060a6f67dff 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -7,12 +7,11 @@
 
 // Load the system's routing file first, so that the app and ENVIRONMENT
 // can override as needed.
-if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
-{
-	require SYSTEMPATH . 'Config/Routes.php';
+if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
+    require SYSTEMPATH . 'Config/Routes.php';
 }
 
-/**
+/*
  * --------------------------------------------------------------------
  * Router Setup
  * --------------------------------------------------------------------
@@ -47,7 +46,6 @@
  * You will have access to the $routes object within that file without
  * needing to reload it.
  */
-if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php'))
-{
-	require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
+if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php')) {
+    require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
 }
diff --git a/app/Config/Security.php b/app/Config/Security.php
index afdfd2ea50cb..c4cf7a25f42e 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -6,90 +6,90 @@
 
 class Security extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Token Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * Token name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	public $tokenName = 'csrf_test_name';
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Token Name
+     * --------------------------------------------------------------------------
+     *
+     * Token name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    public $tokenName = 'csrf_test_name';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Header Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * Token name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	public $headerName = 'X-CSRF-TOKEN';
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Header Name
+     * --------------------------------------------------------------------------
+     *
+     * Token name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    public $headerName = 'X-CSRF-TOKEN';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Cookie Name
-	 * --------------------------------------------------------------------------
-	 *
-	 * Cookie name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	 public $cookieName = 'csrf_cookie_name';
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Cookie Name
+     * --------------------------------------------------------------------------
+     *
+     * Cookie name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    public $cookieName = 'csrf_cookie_name';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Expires
-	 * --------------------------------------------------------------------------
-	 *
-	 * Expiration time for Cross Site Request Forgery protection cookie.
-	 *
-	 * Defaults to two hours (in seconds).
-	 *
-	 * @var integer
-	 */
-	public $expires = 7200;
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Expires
+     * --------------------------------------------------------------------------
+     *
+     * Expiration time for Cross Site Request Forgery protection cookie.
+     *
+     * Defaults to two hours (in seconds).
+     *
+     * @var int
+     */
+    public $expires = 7200;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Regenerate
-	 * --------------------------------------------------------------------------
-	 *
-	 * Regenerate CSRF Token on every request.
-	 *
-	 * @var boolean
-	 */
-	public $regenerate = true;
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Regenerate
+     * --------------------------------------------------------------------------
+     *
+     * Regenerate CSRF Token on every request.
+     *
+     * @var bool
+     */
+    public $regenerate = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF Redirect
-	 * --------------------------------------------------------------------------
-	 *
-	 * Redirect to previous page with error on failure.
-	 *
-	 * @var boolean
-	 */
-	public $redirect = true;
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Redirect
+     * --------------------------------------------------------------------------
+     *
+     * Redirect to previous page with error on failure.
+     *
+     * @var bool
+     */
+    public $redirect = true;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * CSRF SameSite
-	 * --------------------------------------------------------------------------
-	 *
-	 * Setting for CSRF SameSite cookie token.
-	 *
-	 * Allowed values are: None - Lax - Strict - ''.
-	 *
-	 * Defaults to `Lax` as recommended in this link:
-	 *
-	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
-	 *
-	 * @var string
-	 *
-	 * @deprecated
-	 */
-	public $samesite = 'Lax';
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF SameSite
+     * --------------------------------------------------------------------------
+     *
+     * Setting for CSRF SameSite cookie token.
+     *
+     * Allowed values are: None - Lax - Strict - ''.
+     *
+     * Defaults to `Lax` as recommended in this link:
+     *
+     * @see https://portswigger.net/web-security/csrf/samesite-cookies
+     *
+     * @var string
+     *
+     * @deprecated
+     */
+    public $samesite = 'Lax';
 }
diff --git a/app/Config/Services.php b/app/Config/Services.php
index 898bcd030f81..df7c8ad08600 100644
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -19,13 +19,14 @@
  */
 class Services extends BaseService
 {
-	// public static function example($getShared = true)
-	// {
-	//     if ($getShared)
-	//     {
-	//         return static::getSharedInstance('example');
-	//     }
-	//
-	//     return new \CodeIgniter\Example();
-	// }
+    /*
+     * public static function example($getShared = true)
+     * {
+     *     if ($getShared) {
+     *         return static::getSharedInstance('example');
+     *     }
+     *
+     *     return new \CodeIgniter\Example();
+     * }
+     */
 }
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
index c7603e2f4693..16a37e83c2b8 100644
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -23,65 +23,65 @@
  */
 class Toolbar extends BaseConfig
 {
-	/**
-	 * --------------------------------------------------------------------------
-	 * Toolbar Collectors
-	 * --------------------------------------------------------------------------
-	 *
-	 * List of toolbar collectors that will be called when Debug Toolbar
-	 * fires up and collects data from.
-	 *
-	 * @var string[]
-	 */
-	public $collectors = [
-		Timers::class,
-		Database::class,
-		Logs::class,
-		Views::class,
-		// \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
-		Files::class,
-		Routes::class,
-		Events::class,
-	];
+    /**
+     * --------------------------------------------------------------------------
+     * Toolbar Collectors
+     * --------------------------------------------------------------------------
+     *
+     * List of toolbar collectors that will be called when Debug Toolbar
+     * fires up and collects data from.
+     *
+     * @var string[]
+     */
+    public $collectors = [
+        Timers::class,
+        Database::class,
+        Logs::class,
+        Views::class,
+        // \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+        Files::class,
+        Routes::class,
+        Events::class,
+    ];
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Max History
-	 * --------------------------------------------------------------------------
-	 *
-	 * `$maxHistory` sets a limit on the number of past requests that are stored,
-	 * helping to conserve file space used to store them. You can set it to
-	 * 0 (zero) to not have any history stored, or -1 for unlimited history.
-	 *
-	 * @var integer
-	 */
-	public $maxHistory = 20;
+    /**
+     * --------------------------------------------------------------------------
+     * Max History
+     * --------------------------------------------------------------------------
+     *
+     * `$maxHistory` sets a limit on the number of past requests that are stored,
+     * helping to conserve file space used to store them. You can set it to
+     * 0 (zero) to not have any history stored, or -1 for unlimited history.
+     *
+     * @var int
+     */
+    public $maxHistory = 20;
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Toolbar Views Path
-	 * --------------------------------------------------------------------------
-	 *
-	 * The full path to the the views that are used by the toolbar.
-	 * This MUST have a trailing slash.
-	 *
-	 * @var string
-	 */
-	public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
+    /**
+     * --------------------------------------------------------------------------
+     * Toolbar Views Path
+     * --------------------------------------------------------------------------
+     *
+     * The full path to the the views that are used by the toolbar.
+     * This MUST have a trailing slash.
+     *
+     * @var string
+     */
+    public $viewsPath = SYSTEMPATH . 'Debug/Toolbar/Views/';
 
-	/**
-	 * --------------------------------------------------------------------------
-	 * Max Queries
-	 * --------------------------------------------------------------------------
-	 *
-	 * If the Database Collector is enabled, it will log every query that the
-	 * the system generates so they can be displayed on the toolbar's timeline
-	 * and in the query log. This can lead to memory issues in some instances
-	 * with hundreds of queries.
-	 *
-	 * `$maxQueries` defines the maximum amount of queries that will be stored.
-	 *
-	 * @var integer
-	 */
-	public $maxQueries = 100;
+    /**
+     * --------------------------------------------------------------------------
+     * Max Queries
+     * --------------------------------------------------------------------------
+     *
+     * If the Database Collector is enabled, it will log every query that the
+     * the system generates so they can be displayed on the toolbar's timeline
+     * and in the query log. This can lead to memory issues in some instances
+     * with hundreds of queries.
+     *
+     * `$maxQueries` defines the maximum amount of queries that will be stored.
+     *
+     * @var int
+     */
+    public $maxQueries = 100;
 }
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
index db17d737ae36..e1dbfa63d726 100644
--- a/app/Config/UserAgents.php
+++ b/app/Config/UserAgents.php
@@ -16,237 +16,237 @@
  */
 class UserAgents extends BaseConfig
 {
-	/**
-	 * -------------------------------------------------------------------
-	 * OS Platforms
-	 * -------------------------------------------------------------------
-	 *
-	 * @var array<string, string>
-	 */
-	public $platforms = [
-		'windows nt 10.0' => 'Windows 10',
-		'windows nt 6.3'  => 'Windows 8.1',
-		'windows nt 6.2'  => 'Windows 8',
-		'windows nt 6.1'  => 'Windows 7',
-		'windows nt 6.0'  => 'Windows Vista',
-		'windows nt 5.2'  => 'Windows 2003',
-		'windows nt 5.1'  => 'Windows XP',
-		'windows nt 5.0'  => 'Windows 2000',
-		'windows nt 4.0'  => 'Windows NT 4.0',
-		'winnt4.0'        => 'Windows NT 4.0',
-		'winnt 4.0'       => 'Windows NT',
-		'winnt'           => 'Windows NT',
-		'windows 98'      => 'Windows 98',
-		'win98'           => 'Windows 98',
-		'windows 95'      => 'Windows 95',
-		'win95'           => 'Windows 95',
-		'windows phone'   => 'Windows Phone',
-		'windows'         => 'Unknown Windows OS',
-		'android'         => 'Android',
-		'blackberry'      => 'BlackBerry',
-		'iphone'          => 'iOS',
-		'ipad'            => 'iOS',
-		'ipod'            => 'iOS',
-		'os x'            => 'Mac OS X',
-		'ppc mac'         => 'Power PC Mac',
-		'freebsd'         => 'FreeBSD',
-		'ppc'             => 'Macintosh',
-		'linux'           => 'Linux',
-		'debian'          => 'Debian',
-		'sunos'           => 'Sun Solaris',
-		'beos'            => 'BeOS',
-		'apachebench'     => 'ApacheBench',
-		'aix'             => 'AIX',
-		'irix'            => 'Irix',
-		'osf'             => 'DEC OSF',
-		'hp-ux'           => 'HP-UX',
-		'netbsd'          => 'NetBSD',
-		'bsdi'            => 'BSDi',
-		'openbsd'         => 'OpenBSD',
-		'gnu'             => 'GNU/Linux',
-		'unix'            => 'Unknown Unix OS',
-		'symbian'         => 'Symbian OS',
-	];
+    /**
+     * -------------------------------------------------------------------
+     * OS Platforms
+     * -------------------------------------------------------------------
+     *
+     * @var array<string, string>
+     */
+    public $platforms = [
+        'windows nt 10.0' => 'Windows 10',
+        'windows nt 6.3'  => 'Windows 8.1',
+        'windows nt 6.2'  => 'Windows 8',
+        'windows nt 6.1'  => 'Windows 7',
+        'windows nt 6.0'  => 'Windows Vista',
+        'windows nt 5.2'  => 'Windows 2003',
+        'windows nt 5.1'  => 'Windows XP',
+        'windows nt 5.0'  => 'Windows 2000',
+        'windows nt 4.0'  => 'Windows NT 4.0',
+        'winnt4.0'        => 'Windows NT 4.0',
+        'winnt 4.0'       => 'Windows NT',
+        'winnt'           => 'Windows NT',
+        'windows 98'      => 'Windows 98',
+        'win98'           => 'Windows 98',
+        'windows 95'      => 'Windows 95',
+        'win95'           => 'Windows 95',
+        'windows phone'   => 'Windows Phone',
+        'windows'         => 'Unknown Windows OS',
+        'android'         => 'Android',
+        'blackberry'      => 'BlackBerry',
+        'iphone'          => 'iOS',
+        'ipad'            => 'iOS',
+        'ipod'            => 'iOS',
+        'os x'            => 'Mac OS X',
+        'ppc mac'         => 'Power PC Mac',
+        'freebsd'         => 'FreeBSD',
+        'ppc'             => 'Macintosh',
+        'linux'           => 'Linux',
+        'debian'          => 'Debian',
+        'sunos'           => 'Sun Solaris',
+        'beos'            => 'BeOS',
+        'apachebench'     => 'ApacheBench',
+        'aix'             => 'AIX',
+        'irix'            => 'Irix',
+        'osf'             => 'DEC OSF',
+        'hp-ux'           => 'HP-UX',
+        'netbsd'          => 'NetBSD',
+        'bsdi'            => 'BSDi',
+        'openbsd'         => 'OpenBSD',
+        'gnu'             => 'GNU/Linux',
+        'unix'            => 'Unknown Unix OS',
+        'symbian'         => 'Symbian OS',
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Browsers
-	 * -------------------------------------------------------------------
-	 *
-	 * The order of this array should NOT be changed. Many browsers return
-	 * multiple browser types so we want to identify the subtype first.
-	 *
-	 * @var array<string, string>
-	 */
-	public $browsers = [
-		'OPR'               => 'Opera',
-		'Flock'             => 'Flock',
-		'Edge'              => 'Spartan',
-		'Edg'               => 'Edge',
-		'Chrome'            => 'Chrome',
-		// Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
-		'Opera.*?Version'   => 'Opera',
-		'Opera'             => 'Opera',
-		'MSIE'              => 'Internet Explorer',
-		'Internet Explorer' => 'Internet Explorer',
-		'Trident.* rv'      => 'Internet Explorer',
-		'Shiira'            => 'Shiira',
-		'Firefox'           => 'Firefox',
-		'Chimera'           => 'Chimera',
-		'Phoenix'           => 'Phoenix',
-		'Firebird'          => 'Firebird',
-		'Camino'            => 'Camino',
-		'Netscape'          => 'Netscape',
-		'OmniWeb'           => 'OmniWeb',
-		'Safari'            => 'Safari',
-		'Mozilla'           => 'Mozilla',
-		'Konqueror'         => 'Konqueror',
-		'icab'              => 'iCab',
-		'Lynx'              => 'Lynx',
-		'Links'             => 'Links',
-		'hotjava'           => 'HotJava',
-		'amaya'             => 'Amaya',
-		'IBrowse'           => 'IBrowse',
-		'Maxthon'           => 'Maxthon',
-		'Ubuntu'            => 'Ubuntu Web Browser',
-		'Vivaldi'           => 'Vivaldi',
-	];
+    /**
+     * -------------------------------------------------------------------
+     * Browsers
+     * -------------------------------------------------------------------
+     *
+     * The order of this array should NOT be changed. Many browsers return
+     * multiple browser types so we want to identify the subtype first.
+     *
+     * @var array<string, string>
+     */
+    public $browsers = [
+        'OPR'    => 'Opera',
+        'Flock'  => 'Flock',
+        'Edge'   => 'Spartan',
+        'Edg'    => 'Edge',
+        'Chrome' => 'Chrome',
+        // Opera 10+ always reports Opera/9.80 and appends Version/<real version> to the user agent string
+        'Opera.*?Version'   => 'Opera',
+        'Opera'             => 'Opera',
+        'MSIE'              => 'Internet Explorer',
+        'Internet Explorer' => 'Internet Explorer',
+        'Trident.* rv'      => 'Internet Explorer',
+        'Shiira'            => 'Shiira',
+        'Firefox'           => 'Firefox',
+        'Chimera'           => 'Chimera',
+        'Phoenix'           => 'Phoenix',
+        'Firebird'          => 'Firebird',
+        'Camino'            => 'Camino',
+        'Netscape'          => 'Netscape',
+        'OmniWeb'           => 'OmniWeb',
+        'Safari'            => 'Safari',
+        'Mozilla'           => 'Mozilla',
+        'Konqueror'         => 'Konqueror',
+        'icab'              => 'iCab',
+        'Lynx'              => 'Lynx',
+        'Links'             => 'Links',
+        'hotjava'           => 'HotJava',
+        'amaya'             => 'Amaya',
+        'IBrowse'           => 'IBrowse',
+        'Maxthon'           => 'Maxthon',
+        'Ubuntu'            => 'Ubuntu Web Browser',
+        'Vivaldi'           => 'Vivaldi',
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Mobiles
-	 * -------------------------------------------------------------------
-	 *
-	 * @var array<string, string>
-	 */
-	public $mobiles = [
-		// legacy array, old values commented out
-		'mobileexplorer'       => 'Mobile Explorer',
-		// 'openwave'             => 'Open Wave',
-		// 'opera mini'           => 'Opera Mini',
-		// 'operamini'            => 'Opera Mini',
-		// 'elaine'               => 'Palm',
-		'palmsource'           => 'Palm',
-		// 'digital paths'        => 'Palm',
-		// 'avantgo'              => 'Avantgo',
-		// 'xiino'                => 'Xiino',
-		'palmscape'            => 'Palmscape',
-		// 'nokia'                => 'Nokia',
-		// 'ericsson'             => 'Ericsson',
-		// 'blackberry'           => 'BlackBerry',
-		// 'motorola'             => 'Motorola'
+    /**
+     * -------------------------------------------------------------------
+     * Mobiles
+     * -------------------------------------------------------------------
+     *
+     * @var array<string, string>
+     */
+    public $mobiles = [
+        // legacy array, old values commented out
+        'mobileexplorer' => 'Mobile Explorer',
+        // 'openwave'             => 'Open Wave',
+        // 'opera mini'           => 'Opera Mini',
+        // 'operamini'            => 'Opera Mini',
+        // 'elaine'               => 'Palm',
+        'palmsource' => 'Palm',
+        // 'digital paths'        => 'Palm',
+        // 'avantgo'              => 'Avantgo',
+        // 'xiino'                => 'Xiino',
+        'palmscape' => 'Palmscape',
+        // 'nokia'                => 'Nokia',
+        // 'ericsson'             => 'Ericsson',
+        // 'blackberry'           => 'BlackBerry',
+        // 'motorola'             => 'Motorola'
 
-		// Phones and Manufacturers
-		'motorola'             => 'Motorola',
-		'nokia'                => 'Nokia',
-		'palm'                 => 'Palm',
-		'iphone'               => 'Apple iPhone',
-		'ipad'                 => 'iPad',
-		'ipod'                 => 'Apple iPod Touch',
-		'sony'                 => 'Sony Ericsson',
-		'ericsson'             => 'Sony Ericsson',
-		'blackberry'           => 'BlackBerry',
-		'cocoon'               => 'O2 Cocoon',
-		'blazer'               => 'Treo',
-		'lg'                   => 'LG',
-		'amoi'                 => 'Amoi',
-		'xda'                  => 'XDA',
-		'mda'                  => 'MDA',
-		'vario'                => 'Vario',
-		'htc'                  => 'HTC',
-		'samsung'              => 'Samsung',
-		'sharp'                => 'Sharp',
-		'sie-'                 => 'Siemens',
-		'alcatel'              => 'Alcatel',
-		'benq'                 => 'BenQ',
-		'ipaq'                 => 'HP iPaq',
-		'mot-'                 => 'Motorola',
-		'playstation portable' => 'PlayStation Portable',
-		'playstation 3'        => 'PlayStation 3',
-		'playstation vita'     => 'PlayStation Vita',
-		'hiptop'               => 'Danger Hiptop',
-		'nec-'                 => 'NEC',
-		'panasonic'            => 'Panasonic',
-		'philips'              => 'Philips',
-		'sagem'                => 'Sagem',
-		'sanyo'                => 'Sanyo',
-		'spv'                  => 'SPV',
-		'zte'                  => 'ZTE',
-		'sendo'                => 'Sendo',
-		'nintendo dsi'         => 'Nintendo DSi',
-		'nintendo ds'          => 'Nintendo DS',
-		'nintendo 3ds'         => 'Nintendo 3DS',
-		'wii'                  => 'Nintendo Wii',
-		'open web'             => 'Open Web',
-		'openweb'              => 'OpenWeb',
+        // Phones and Manufacturers
+        'motorola'             => 'Motorola',
+        'nokia'                => 'Nokia',
+        'palm'                 => 'Palm',
+        'iphone'               => 'Apple iPhone',
+        'ipad'                 => 'iPad',
+        'ipod'                 => 'Apple iPod Touch',
+        'sony'                 => 'Sony Ericsson',
+        'ericsson'             => 'Sony Ericsson',
+        'blackberry'           => 'BlackBerry',
+        'cocoon'               => 'O2 Cocoon',
+        'blazer'               => 'Treo',
+        'lg'                   => 'LG',
+        'amoi'                 => 'Amoi',
+        'xda'                  => 'XDA',
+        'mda'                  => 'MDA',
+        'vario'                => 'Vario',
+        'htc'                  => 'HTC',
+        'samsung'              => 'Samsung',
+        'sharp'                => 'Sharp',
+        'sie-'                 => 'Siemens',
+        'alcatel'              => 'Alcatel',
+        'benq'                 => 'BenQ',
+        'ipaq'                 => 'HP iPaq',
+        'mot-'                 => 'Motorola',
+        'playstation portable' => 'PlayStation Portable',
+        'playstation 3'        => 'PlayStation 3',
+        'playstation vita'     => 'PlayStation Vita',
+        'hiptop'               => 'Danger Hiptop',
+        'nec-'                 => 'NEC',
+        'panasonic'            => 'Panasonic',
+        'philips'              => 'Philips',
+        'sagem'                => 'Sagem',
+        'sanyo'                => 'Sanyo',
+        'spv'                  => 'SPV',
+        'zte'                  => 'ZTE',
+        'sendo'                => 'Sendo',
+        'nintendo dsi'         => 'Nintendo DSi',
+        'nintendo ds'          => 'Nintendo DS',
+        'nintendo 3ds'         => 'Nintendo 3DS',
+        'wii'                  => 'Nintendo Wii',
+        'open web'             => 'Open Web',
+        'openweb'              => 'OpenWeb',
 
-		// Operating Systems
-		'android'              => 'Android',
-		'symbian'              => 'Symbian',
-		'SymbianOS'            => 'SymbianOS',
-		'elaine'               => 'Palm',
-		'series60'             => 'Symbian S60',
-		'windows ce'           => 'Windows CE',
+        // Operating Systems
+        'android'    => 'Android',
+        'symbian'    => 'Symbian',
+        'SymbianOS'  => 'SymbianOS',
+        'elaine'     => 'Palm',
+        'series60'   => 'Symbian S60',
+        'windows ce' => 'Windows CE',
 
-		// Browsers
-		'obigo'                => 'Obigo',
-		'netfront'             => 'Netfront Browser',
-		'openwave'             => 'Openwave Browser',
-		'mobilexplorer'        => 'Mobile Explorer',
-		'operamini'            => 'Opera Mini',
-		'opera mini'           => 'Opera Mini',
-		'opera mobi'           => 'Opera Mobile',
-		'fennec'               => 'Firefox Mobile',
+        // Browsers
+        'obigo'         => 'Obigo',
+        'netfront'      => 'Netfront Browser',
+        'openwave'      => 'Openwave Browser',
+        'mobilexplorer' => 'Mobile Explorer',
+        'operamini'     => 'Opera Mini',
+        'opera mini'    => 'Opera Mini',
+        'opera mobi'    => 'Opera Mobile',
+        'fennec'        => 'Firefox Mobile',
 
-		// Other
-		'digital paths'        => 'Digital Paths',
-		'avantgo'              => 'AvantGo',
-		'xiino'                => 'Xiino',
-		'novarra'              => 'Novarra Transcoder',
-		'vodafone'             => 'Vodafone',
-		'docomo'               => 'NTT DoCoMo',
-		'o2'                   => 'O2',
+        // Other
+        'digital paths' => 'Digital Paths',
+        'avantgo'       => 'AvantGo',
+        'xiino'         => 'Xiino',
+        'novarra'       => 'Novarra Transcoder',
+        'vodafone'      => 'Vodafone',
+        'docomo'        => 'NTT DoCoMo',
+        'o2'            => 'O2',
 
-		// Fallback
-		'mobile'               => 'Generic Mobile',
-		'wireless'             => 'Generic Mobile',
-		'j2me'                 => 'Generic Mobile',
-		'midp'                 => 'Generic Mobile',
-		'cldc'                 => 'Generic Mobile',
-		'up.link'              => 'Generic Mobile',
-		'up.browser'           => 'Generic Mobile',
-		'smartphone'           => 'Generic Mobile',
-		'cellphone'            => 'Generic Mobile',
-	];
+        // Fallback
+        'mobile'     => 'Generic Mobile',
+        'wireless'   => 'Generic Mobile',
+        'j2me'       => 'Generic Mobile',
+        'midp'       => 'Generic Mobile',
+        'cldc'       => 'Generic Mobile',
+        'up.link'    => 'Generic Mobile',
+        'up.browser' => 'Generic Mobile',
+        'smartphone' => 'Generic Mobile',
+        'cellphone'  => 'Generic Mobile',
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Robots
-	 * -------------------------------------------------------------------
-	 *
-	 * There are hundred of bots but these are the most common.
-	 *
-	 * @var array<string, string>
-	 */
-	public $robots = [
-		'googlebot'            => 'Googlebot',
-		'msnbot'               => 'MSNBot',
-		'baiduspider'          => 'Baiduspider',
-		'bingbot'              => 'Bing',
-		'slurp'                => 'Inktomi Slurp',
-		'yahoo'                => 'Yahoo',
-		'ask jeeves'           => 'Ask Jeeves',
-		'fastcrawler'          => 'FastCrawler',
-		'infoseek'             => 'InfoSeek Robot 1.0',
-		'lycos'                => 'Lycos',
-		'yandex'               => 'YandexBot',
-		'mediapartners-google' => 'MediaPartners Google',
-		'CRAZYWEBCRAWLER'      => 'Crazy Webcrawler',
-		'adsbot-google'        => 'AdsBot Google',
-		'feedfetcher-google'   => 'Feedfetcher Google',
-		'curious george'       => 'Curious George',
-		'ia_archiver'          => 'Alexa Crawler',
-		'MJ12bot'              => 'Majestic-12',
-		'Uptimebot'            => 'Uptimebot',
-	];
+    /**
+     * -------------------------------------------------------------------
+     * Robots
+     * -------------------------------------------------------------------
+     *
+     * There are hundred of bots but these are the most common.
+     *
+     * @var array<string, string>
+     */
+    public $robots = [
+        'googlebot'            => 'Googlebot',
+        'msnbot'               => 'MSNBot',
+        'baiduspider'          => 'Baiduspider',
+        'bingbot'              => 'Bing',
+        'slurp'                => 'Inktomi Slurp',
+        'yahoo'                => 'Yahoo',
+        'ask jeeves'           => 'Ask Jeeves',
+        'fastcrawler'          => 'FastCrawler',
+        'infoseek'             => 'InfoSeek Robot 1.0',
+        'lycos'                => 'Lycos',
+        'yandex'               => 'YandexBot',
+        'mediapartners-google' => 'MediaPartners Google',
+        'CRAZYWEBCRAWLER'      => 'Crazy Webcrawler',
+        'adsbot-google'        => 'AdsBot Google',
+        'feedfetcher-google'   => 'Feedfetcher Google',
+        'curious george'       => 'Curious George',
+        'ia_archiver'          => 'Alexa Crawler',
+        'MJ12bot'              => 'Majestic-12',
+        'Uptimebot'            => 'Uptimebot',
+    ];
 }
diff --git a/app/Config/Validation.php b/app/Config/Validation.php
index 9cb802e5561a..1cff0424f4de 100644
--- a/app/Config/Validation.php
+++ b/app/Config/Validation.php
@@ -9,35 +9,35 @@
 
 class Validation
 {
-	//--------------------------------------------------------------------
-	// Setup
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
+    // Setup
+    //--------------------------------------------------------------------
 
-	/**
-	 * Stores the classes that contain the
-	 * rules that are available.
-	 *
-	 * @var string[]
-	 */
-	public $ruleSets = [
-		Rules::class,
-		FormatRules::class,
-		FileRules::class,
-		CreditCardRules::class,
-	];
+    /**
+     * Stores the classes that contain the
+     * rules that are available.
+     *
+     * @var string[]
+     */
+    public $ruleSets = [
+        Rules::class,
+        FormatRules::class,
+        FileRules::class,
+        CreditCardRules::class,
+    ];
 
-	/**
-	 * Specifies the views that are used to display the
-	 * errors.
-	 *
-	 * @var array<string, string>
-	 */
-	public $templates = [
-		'list'   => 'CodeIgniter\Validation\Views\list',
-		'single' => 'CodeIgniter\Validation\Views\single',
-	];
+    /**
+     * Specifies the views that are used to display the
+     * errors.
+     *
+     * @var array<string, string>
+     */
+    public $templates = [
+        'list'   => 'CodeIgniter\Validation\Views\list',
+        'single' => 'CodeIgniter\Validation\Views\single',
+    ];
 
-	//--------------------------------------------------------------------
-	// Rules
-	//--------------------------------------------------------------------
+    //--------------------------------------------------------------------
+    // Rules
+    //--------------------------------------------------------------------
 }
diff --git a/app/Config/View.php b/app/Config/View.php
index c945e2e068c8..024e8302a01b 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -6,39 +6,39 @@
 
 class View extends BaseView
 {
-	/**
-	 * When false, the view method will clear the data between each
-	 * call. This keeps your data safe and ensures there is no accidental
-	 * leaking between calls, so you would need to explicitly pass the data
-	 * to each view. You might prefer to have the data stick around between
-	 * calls so that it is available to all views. If that is the case,
-	 * set $saveData to true.
-	 *
-	 * @var boolean
-	 */
-	public $saveData = true;
+    /**
+     * When false, the view method will clear the data between each
+     * call. This keeps your data safe and ensures there is no accidental
+     * leaking between calls, so you would need to explicitly pass the data
+     * to each view. You might prefer to have the data stick around between
+     * calls so that it is available to all views. If that is the case,
+     * set $saveData to true.
+     *
+     * @var bool
+     */
+    public $saveData = true;
 
-	/**
-	 * Parser Filters map a filter name with any PHP callable. When the
-	 * Parser prepares a variable for display, it will chain it
-	 * through the filters in the order defined, inserting any parameters.
-	 * To prevent potential abuse, all filters MUST be defined here
-	 * in order for them to be available for use within the Parser.
-	 *
-	 * Examples:
-	 *  { title|esc(js) }
-	 *  { created_on|date(Y-m-d)|esc(attr) }
-	 *
-	 * @var array
-	 */
-	public $filters = [];
+    /**
+     * Parser Filters map a filter name with any PHP callable. When the
+     * Parser prepares a variable for display, it will chain it
+     * through the filters in the order defined, inserting any parameters.
+     * To prevent potential abuse, all filters MUST be defined here
+     * in order for them to be available for use within the Parser.
+     *
+     * Examples:
+     *  { title|esc(js) }
+     *  { created_on|date(Y-m-d)|esc(attr) }
+     *
+     * @var array
+     */
+    public $filters = [];
 
-	/**
-	 * Parser Plugins provide a way to extend the functionality provided
-	 * by the core Parser by creating aliases that will be replaced with
-	 * any callable. Can be single or tag pair.
-	 *
-	 * @var array
-	 */
-	public $plugins = [];
+    /**
+     * Parser Plugins provide a way to extend the functionality provided
+     * by the core Parser by creating aliases that will be replaced with
+     * any callable. Can be single or tag pair.
+     *
+     * @var array
+     */
+    public $plugins = [];
 }
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 5a1946b8693e..0328f140bfdf 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -19,40 +19,34 @@
  *
  * For security be sure to declare any new methods as protected or private.
  */
-
 class BaseController extends Controller
 {
-	/**
-	 * Instance of the main Request object.
-	 *
-	 * @var IncomingRequest|CLIRequest
-	 */
-	protected $request;
+    /**
+     * Instance of the main Request object.
+     *
+     * @var CLIRequest|IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * An array of helpers to be loaded automatically upon
+     * class instantiation. These helpers will be available
+     * to all other controllers that extend BaseController.
+     *
+     * @var array
+     */
+    protected $helpers = [];
 
-	/**
-	 * An array of helpers to be loaded automatically upon
-	 * class instantiation. These helpers will be available
-	 * to all other controllers that extend BaseController.
-	 *
-	 * @var array
-	 */
-	protected $helpers = [];
+    /**
+     * Constructor.
+     */
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    {
+        // Do Not Edit This Line
+        parent::initController($request, $response, $logger);
 
-	/**
-	 * Constructor.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param LoggerInterface   $logger
-	 */
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		// Do Not Edit This Line
-		parent::initController($request, $response, $logger);
+        // Preload any models, libraries, etc, here.
 
-		//--------------------------------------------------------------------
-		// Preload any models, libraries, etc, here.
-		//--------------------------------------------------------------------
-		// E.g.: $this->session = \Config\Services::session();
-	}
+        // E.g.: $this->session = \Config\Services::session();
+    }
 }
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index f059375f0a58..7f867e95ffc4 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -4,8 +4,8 @@
 
 class Home extends BaseController
 {
-	public function index()
-	{
-		return view('welcome_message');
-	}
+    public function index()
+    {
+        return view('welcome_message');
+    }
 }
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index e505003690fc..f24e98fb9a49 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -12,61 +12,54 @@
 CLI::newLine();
 
 // The backtrace
-if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE)
-{
-	$backtraces = $exception->getTrace();
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE) {
+    $backtraces = $exception->getTrace();
 
-	if ($backtraces)
-	{
-		CLI::write('Backtrace:', 'green');
-	}
+    if ($backtraces) {
+        CLI::write('Backtrace:', 'green');
+    }
 
-	foreach ($backtraces as $i => $error)
-	{
-		$padFile  = '    '; // 4 spaces
-		$padClass = '       '; // 7 spaces
-		$c        = str_pad($i + 1, 3, ' ', STR_PAD_LEFT);
+    foreach ($backtraces as $i => $error) {
+        $padFile  = '    '; // 4 spaces
+        $padClass = '       '; // 7 spaces
+        $c        = str_pad($i + 1, 3, ' ', STR_PAD_LEFT);
 
-		if (isset($error['file']))
-		{
-			$filepath = clean_path($error['file']) . ':' . $error['line'];
+        if (isset($error['file'])) {
+            $filepath = clean_path($error['file']) . ':' . $error['line'];
 
-			CLI::write($c . $padFile . CLI::color($filepath, 'yellow'));
-		}
-		else
-		{
-			CLI::write($c . $padFile . CLI::color('[internal function]', 'yellow'));
-		}
+            CLI::write($c . $padFile . CLI::color($filepath, 'yellow'));
+        } else {
+            CLI::write($c . $padFile . CLI::color('[internal function]', 'yellow'));
+        }
 
-		$function = '';
+        $function = '';
 
-		if (isset($error['class']))
-		{
-			$type = ($error['type'] === '->') ? '()' . $error['type'] : $error['type'];
-			$function .= $padClass . $error['class'] . $type . $error['function'];
-		}
-		elseif (! isset($error['class']) && isset($error['function']))
-		{
-			$function .= $padClass . $error['function'];
-		}
+        if (isset($error['class'])) {
+            $type = ($error['type'] === '->') ? '()' . $error['type'] : $error['type'];
+            $function .= $padClass . $error['class'] . $type . $error['function'];
+        } elseif (! isset($error['class']) && isset($error['function'])) {
+            $function .= $padClass . $error['function'];
+        }
 
-		$args = implode(', ', array_map(function ($value) {
-			switch (true)
-			{
-				case is_object($value):
-					return 'Object(' . get_class($value) . ')';
-				case is_array($value):
-					return count($value) ? '[...]' : '[]';
-				case is_null($value):
-					return 'null'; // return the lowercased version
-				default:
-					return var_export($value, true);
-			}
-		}, array_values($error['args'] ?? [])));
+        $args = implode(', ', array_map(static function ($value) {
+            switch (true) {
+                case is_object($value):
+                    return 'Object(' . get_class($value) . ')';
 
-		$function .= '(' . $args . ')';
+                case is_array($value):
+                    return count($value) ? '[...]' : '[]';
 
-		CLI::write($function);
-		CLI::newLine();
-	}
+                case $value === null:
+                    return 'null'; // return the lowercased version
+
+                default:
+                    return var_export($value, true);
+            }
+        }, array_values($error['args'] ?? [])));
+
+        $function .= '(' . $args . ')';
+
+        CLI::write($function);
+        CLI::newLine();
+    }
 }
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
index f36f8b504188..2b4d0638153a 100644
--- a/app/Views/errors/html/debug.js
+++ b/app/Views/errors/html/debug.js
@@ -1,6 +1,4 @@
-//--------------------------------------------------------------------
 // Tabs
-//--------------------------------------------------------------------
 
 var tabLinks    = new Array();
 var contentDivs = new Array();
@@ -52,8 +50,6 @@ function init()
 	}
 }
 
-//--------------------------------------------------------------------
-
 function showTab()
 {
 	var selectedId = getHash(this.getAttribute('href'));
@@ -78,8 +74,6 @@ function showTab()
 	return false;
 }
 
-//--------------------------------------------------------------------
-
 function getFirstChildWithTagName(element, tagName)
 {
 	for (var i = 0; i < element.childNodes.length; i ++)
@@ -91,16 +85,12 @@ function getFirstChildWithTagName(element, tagName)
 	}
 }
 
-//--------------------------------------------------------------------
-
 function getHash(url)
 {
 	var hashPos = url.lastIndexOf('#');
 	return url.substring(hashPos + 1);
 }
 
-//--------------------------------------------------------------------
-
 function toggle(elem)
 {
 	elem = document.getElementById(elem);
@@ -125,4 +115,4 @@ function toggle(elem)
 	elem.style.display = disp == 'block' ? 'none' : 'block';
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 22b4ecddc0e4..4477ee08ff8b 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -63,15 +63,12 @@
 							<!-- Trace info -->
 							<?php if (isset($row['file']) && is_file($row['file'])) :?>
 								<?php
-								if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true))
-								{
-									echo esc($row['function'] . ' ' . static::cleanPath($row['file']));
-								}
-								else
-								{
-									echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
-								}
-								?>
+                                if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
+                                    echo esc($row['function'] . ' ' . static::cleanPath($row['file']));
+                                } else {
+                                    echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
+                                }
+                                ?>
 							<?php else : ?>
 								{PHP internal code}
 							<?php endif; ?>
@@ -86,16 +83,16 @@
 										<table cellspacing="0">
 
 										<?php
-										$params = null;
-										// Reflection by name is not available for closure function
-										if (substr($row['function'], -1) !== '}')
-										{
-											$mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
-											$params = $mirror->getParameters();
-										}
-										foreach ($row['args'] as $key => $value) : ?>
+                                        $params = null;
+                                        // Reflection by name is not available for closure function
+                                        if (substr($row['function'], -1) !== '}') {
+                                            $mirror = isset($row['class']) ? new \ReflectionMethod($row['class'], $row['function']) : new \ReflectionFunction($row['function']);
+                                            $params = $mirror->getParameters();
+                                        }
+
+                                        foreach ($row['args'] as $key => $value) : ?>
 											<tr>
-												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#$key") ?></code></td>
+												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
 												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
 											</tr>
 										<?php endforeach ?>
@@ -128,10 +125,10 @@
 			<!-- Server -->
 			<div class="content" id="server">
 				<?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
-					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
-					{
-						continue;
-					} ?>
+					<?php
+                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                        continue;
+                    } ?>
 
 					<h3>$<?= esc($var) ?></h3>
 
@@ -231,10 +228,10 @@
 
 				<?php $empty = true; ?>
 				<?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
-					<?php if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var]))
-					{
-						continue;
-					} ?>
+					<?php
+                    if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
+                        continue;
+                    } ?>
 
 					<?php $empty = false; ?>
 
@@ -287,14 +284,14 @@
 						</thead>
 						<tbody>
 						<?php foreach ($headers as $value) : ?>
-							<?php if (empty($value))
-							{
-								continue;
-							} ?>
-							<?php if (! is_array($value))
-							{
-								$value = [$value];
-							} ?>
+							<?php
+                            if (empty($value)) {
+                                continue;
+                            }
+
+                            if (! is_array($value)) {
+                                $value = [$value];
+                            } ?>
 							<?php foreach ($value as $h) : ?>
 								<tr>
 									<td><?= esc($h->getName(), 'html') ?></td>
@@ -310,9 +307,9 @@
 
 			<!-- Response -->
 			<?php
-				$response = \Config\Services::response();
-				$response->setStatusCode(http_response_code());
-			?>
+                $response = \Config\Services::response();
+                $response->setStatusCode(http_response_code());
+            ?>
 			<div class="content" id="response">
 				<table>
 					<tr>
@@ -389,7 +386,7 @@
 
 			<p>
 				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-				PHP: <?= esc(phpversion()) ?>  &mdash;
+				PHP: <?= esc(PHP_VERSION) ?>  &mdash;
 				CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
 			</p>
 
diff --git a/composer.json b/composer.json
index ef2e937e7dce..7b9d50b8e620 100644
--- a/composer.json
+++ b/composer.json
@@ -1,69 +1,70 @@
 {
-	"name": "codeigniter4/codeigniter4",
-	"type": "project",
-	"description": "The CodeIgniter framework v4",
-	"homepage": "https://codeigniter.com",
-	"license": "MIT",
-	"require": {
-		"php": "^7.3 || ^8.0",
-		"ext-curl": "*",
-		"ext-intl": "*",
-		"ext-json": "*",
-		"ext-mbstring": "*",
-		"kint-php/kint": "^3.3",
-		"laminas/laminas-escaper": "^2.6",
-		"psr/log": "^1.1"
-	},
-	"require-dev": {
-		"codeigniter4/codeigniter4-standard": "^1.0",
-		"fakerphp/faker": "^1.9",
-		"mikey179/vfsstream": "^1.6",
-		"nexusphp/tachycardia": "^1.0",
-		"phpstan/phpstan": "0.12.88",
-		"phpunit/phpunit": "^9.1",
-		"predis/predis": "^1.1",
-		"rector/rector": "0.11.8",
-		"squizlabs/php_codesniffer": "^3.3",
-		"symplify/package-builder": "^9.3"
-	},
-	"suggest": {
-		"ext-fileinfo": "Improves mime type detection for files"
-	},
-	"config": {
-		"optimize-autoloader": true,
-		"preferred-install": "dist",
-		"sort-packages": true
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-develop": "4.x-dev"
-		}
-	},
-	"autoload": {
-		"psr-4": {
-			"CodeIgniter\\": "system/"
-		},
-		"exclude-from-classmap": [
-			"**/Database/Migrations/**"
-		]
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"CodeIgniter\\": "tests/system/",
-			"Utils\\": "utils/"
-		}
-	},
-	"scripts": {
-		"post-update-cmd": [
-			"CodeIgniter\\ComposerScripts::postUpdate",
-			"bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
-		],
-		"analyze": "phpstan analyze",
-		"test": "phpunit"
-	},
-	"support": {
-		"forum": "http://forum.codeigniter.com/",
-		"source": "https://github.com/codeigniter4/CodeIgniter4",
-		"slack": "https://codeigniterchat.slack.com"
-	}
+    "name": "codeigniter4/codeigniter4",
+    "type": "project",
+    "description": "The CodeIgniter framework v4",
+    "homepage": "https://codeigniter.com",
+    "license": "MIT",
+    "require": {
+        "php": "^7.3 || ^8.0",
+        "ext-curl": "*",
+        "ext-intl": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "kint-php/kint": "^3.3",
+        "laminas/laminas-escaper": "^2.8",
+        "psr/log": "^1.1"
+    },
+    "require-dev": {
+        "codeigniter/coding-standard": "^1.1",
+        "fakerphp/faker": "^1.9",
+        "friendsofphp/php-cs-fixer": "^3.1",
+        "mikey179/vfsstream": "^1.6",
+        "nexusphp/cs-config": "^3.3",
+        "nexusphp/tachycardia": "^1.0",
+        "phpstan/phpstan": "^0.12.91",
+        "phpunit/phpunit": "^9.1",
+        "predis/predis": "^1.1",
+        "rector/rector": "0.11.52",
+        "symplify/package-builder": "^9.3"
+    },
+    "suggest": {
+        "ext-fileinfo": "Improves mime type detection for files"
+    },
+    "config": {
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "4.x-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "CodeIgniter\\": "system/"
+        },
+        "exclude-from-classmap": [
+            "**/Database/Migrations/**"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "CodeIgniter\\": "tests/system/",
+            "Utils\\": "utils/"
+        }
+    },
+    "scripts": {
+        "post-update-cmd": [
+            "CodeIgniter\\ComposerScripts::postUpdate",
+            "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
+        ],
+        "analyze": "phpstan analyse",
+        "test": "phpunit"
+    },
+    "support": {
+        "forum": "http://forum.codeigniter.com/",
+        "source": "https://github.com/codeigniter4/CodeIgniter4",
+        "slack": "https://codeigniterchat.slack.com"
+    }
 }
diff --git a/contributing/styleguide.rst b/contributing/styleguide.rst
index dd976afdc89e..a500d663fe11 100644
--- a/contributing/styleguide.rst
+++ b/contributing/styleguide.rst
@@ -266,61 +266,38 @@ An example::
 
     <?php
 
-    /**
-     * CodeIgniter
-     *
-     * An open source application development framework for PHP
-     *
-     ...
-     *
-     * @package    CodeIgniter
-     * @author     CodeIgniter Dev Team
-     * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
-     * @license    https://opensource.org/licenses/MIT	MIT License
-     * @link       https://codeigniter.com
-     * @since      Version 4.0.0
-     * @filesource
-     */
     namespace CodeIgniter\Fruit;
+
     use CodeIgniter\Config\BaseConfig;
 
     /**
      * Base class for entities in the CodeIgniter\Fruit module.
-     *
-     * @property $group
-     * @property $name
-     * @property $description
-     *
-     * @package CodeIgniter\Fruit
      */
     abstract class BaseFruit
     {
-
-            /**
-             * The group a fruit belongs to.
-             *
-             * @var string
-             */
-            protected $group;
-
-            /**
-             * Fruit constructor.
-             *
-             * @param BaseConfig       $config
-             */
-            public function __construct(BaseConfig $Config)
-            {
-                    $this->group   = 'Unknown';
-            }
-
-            //--------------------------------------------------------------------
-
-            /**
-             * Model a fruit ripening over time.
-             * 
-             * @param	array	$params
-             */
-            abstract public function ripen(array $params);
+      /**
+        * The group a fruit belongs to.
+        *
+        * @var string
+        */
+      protected $group;
+
+      /**
+        * Fruit constructor.
+        *
+        * @param BaseConfig       $config
+        */
+      public function __construct(BaseConfig $Config)
+      {
+              $this->group   = 'Unknown';
+      }
+
+      /**
+        * Model a fruit ripening over time.
+        *
+        * @param	array	$params
+        */
+      abstract public function ripen(array $params);
     }
 
 Other
diff --git a/env b/env
index 1106ce46f932..38eabf203988 100644
--- a/env
+++ b/env
@@ -26,7 +26,7 @@
 # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
 # app.sessionCookieName = 'ci_session'
 # app.sessionExpiration = 7200
-# app.sessionSavePath = NULL
+# app.sessionSavePath = null
 # app.sessionMatchIP = false
 # app.sessionTimeToUpdate = 300
 # app.sessionRegenerateDestroy = false
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index d88de8d9a259..157b02055990 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<phpdoc>
+<phpdocumentor
+    configVersion="3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://www.phpdoc.org"
+    xsi:noNamespaceSchemaLocation="https://docs.phpdoc.org/latest/phpdoc.xsd"
+>
     <title>CodeIgniter v4.0.0 API</title>
-    <parser>
-        <target>api/data/</target>
-    </parser>
-    <transformer>
-        <target>api/build/</target>
-    </transformer>
-    <files>
-        <directory>system</directory>
-        <ignore>vendor/*</ignore>
-        <ignore>tests/*</ignore>
-        <ignore>ThirdParty/*</ignore>
-        <ignore>*.tpl.php</ignore>
-        <ignore>*.js.php</ignore>
-        <ignore>bootstrap.php</ignore>
-        <ignore>Validation/Views/*</ignore>
-        <ignore>Pager/Views/</ignore>
-    </files>
-
-    <logging>
-        <level>err</level>
-        <paths>
-            <default>api/log/{DATE}.log</default>
-            <errors>api/{DATE}.errors.log</errors>
-        </paths>
-    </logging>
-
-    <transformations>
-        <template name="responsive-twig" />
-    </transformations>
-</phpdoc>
+    <paths>
+        <output>api/build/</output>
+        <cache>api/cache/</cache>
+    </paths>
+    <version number="4.0.0">
+        <api format="php">
+            <source dsn=".">
+                <path>system</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>system/ThirdParty/**/*</path>
+                <path>*.tpl.php</path>
+                <path>*.js.php</path>
+                <path>**/Views/*</path>
+                <path>bootstrap.php</path>
+            </ignore>
+        </api>
+    </version>
+    <template name="default" />
+</phpdocumentor>
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 0dec90aa847f..3847a2f02a69 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -32,16 +32,13 @@ parameters:
 		- '#Access to an undefined property CodeIgniter\\Database\\Forge::\$dropConstraintStr#'
 		- '#Access to an undefined property CodeIgniter\\Database\\BaseConnection::\$mysqli|\$schema#'
 		- '#Access to an undefined property CodeIgniter\\Database\\ConnectionInterface::(\$DBDriver|\$connID|\$likeEscapeStr|\$likeEscapeChar|\$escapeChar|\$protectIdentifiers|\$schema)#'
-		- '#Access to protected property CodeIgniter\\Database\\BaseConnection::(\$DBDebug|\$DBPrefix|\$swapPre|\$charset|\$DBCollat|\$database)#'
 		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::_(disable|enable)ForeignKeyChecks\(\)#'
-		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::supportsForeignKeys\(\)#'
 		- '#Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface::(getDefaultNamespace|isFiltered|getFilterForRoute|getRoutesOptions)\(\)#'
 		- '#Cannot access property [\$a-z_]+ on ((bool\|)?object\|resource)#'
 		- '#Cannot call method [a-zA-Z_]+\(\) on ((bool\|)?object\|resource)#'
 		- '#Method CodeIgniter\\Router\\RouteCollectionInterface::getRoutes\(\) invoked with 1 parameter, 0 required#'
 		- '#Method CodeIgniter\\Validation\\ValidationInterface::run\(\) invoked with 3 parameters, 0-2 required#'
 		- '#Negated boolean expression is always (true|false)#'
-		- '#Parameter \#1 \$db of class CodeIgniter\\Database\\SQLite3\\Table constructor expects CodeIgniter\\Database\\SQLite3\\Connection, CodeIgniter\\Database\\BaseConnection given#'
 		- '#Return type \(bool\) of method CodeIgniter\\HTTP\\Files\\UploadedFile::move\(\) should be compatible with return type \(CodeIgniter\\Files\\File\) of method CodeIgniter\\Files\\File::move\(\)#'
 	parallel:
 		processTimeout: 300.0
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c4f8ee944a89..de2f81aae07e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,79 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-		 bootstrap="system/Test/bootstrap.php"
-		 backupGlobals="false"
-		 beStrictAboutOutputDuringTests="true"
-		 beStrictAboutTodoAnnotatedTests="true"
-		 cacheResultFile="build/.phpunit.cache/test-results"
-		 colors="true"
-		 failOnRisky="true"
-		 failOnWarning="true"
-		 verbose="true">
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="system/Test/bootstrap.php"
+         backupGlobals="false"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         cacheResultFile="build/.phpunit.cache/test-results"
+         colors="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
 
-	<coverage processUncoveredFiles="true" ignoreDeprecatedCodeUnits="true">
-		<include>
-			<directory suffix=".php">./system</directory>
-		</include>
+    <coverage processUncoveredFiles="true" ignoreDeprecatedCodeUnits="true">
+        <include>
+            <directory suffix=".php">./system</directory>
+        </include>
 
-		<exclude>
-			<directory>./system/Commands/Generators/Views</directory>
-			<directory>./system/Debug/Toolbar/Views</directory>
-			<directory>./system/Pager/Views</directory>
-			<directory>./system/ThirdParty</directory>
-			<directory>./system/Validation/Views</directory>
-			<file>./system/bootstrap.php</file>
-			<file>./system/ComposerScripts.php</file>
-			<file>./system/Config/Routes.php</file>
-			<file>./system/Test/bootstrap.php</file>
-			<file>./system/Test/ControllerTester.php</file>
-			<file>./system/Test/FeatureTestCase.php</file>
-		</exclude>
+        <exclude>
+            <directory>./system/Commands/Generators/Views</directory>
+            <directory>./system/Debug/Toolbar/Views</directory>
+            <directory>./system/Pager/Views</directory>
+            <directory>./system/ThirdParty</directory>
+            <directory>./system/Validation/Views</directory>
+            <file>./system/bootstrap.php</file>
+            <file>./system/ComposerScripts.php</file>
+            <file>./system/Config/Routes.php</file>
+            <file>./system/Test/bootstrap.php</file>
+            <file>./system/Test/ControllerTester.php</file>
+            <file>./system/Test/FeatureTestCase.php</file>
+        </exclude>
 
-		<report>
-			<clover outputFile="build/logs/clover.xml"/>
-		</report>
-	</coverage>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
 
-	<testsuites>
-		<testsuite name="System">
-			<directory>./tests/system</directory>
-			<exclude>./tests/system/Database</exclude>
-		</testsuite>
-		<testsuite name="Database">
-			<directory>./tests/system/Database</directory>
-		</testsuite>
-	</testsuites>
+    <testsuites>
+        <testsuite name="System">
+            <directory>./tests/system</directory>
+            <exclude>./tests/system/Database</exclude>
+        </testsuite>
+        <testsuite name="Database">
+            <directory>./tests/system/Database</directory>
+        </testsuite>
+    </testsuites>
 
-	<extensions>
-		<extension class="Nexus\PHPUnit\Extension\Tachycardia">
-			<arguments>
-				<array>
-					<element key="timeLimit">
-						<double>0.50</double>
-					</element>
-					<element key="reportable">
-						<integer>30</integer>
-					</element>
-					<element key="precision">
-						<integer>2</integer>
-					</element>
-					<element key="tabulate">
-						<boolean>false</boolean>
-					</element>
-				</array>
-			</arguments>
-		</extension>
-	</extensions>
+    <extensions>
+        <extension class="Nexus\PHPUnit\Extension\Tachycardia">
+            <arguments>
+                <array>
+                    <element key="timeLimit">
+                        <double>0.50</double>
+                    </element>
+                    <element key="reportable">
+                        <integer>30</integer>
+                    </element>
+                    <element key="precision">
+                        <integer>2</integer>
+                    </element>
+                    <element key="tabulate">
+                        <boolean>false</boolean>
+                    </element>
+                </array>
+            </arguments>
+        </extension>
+    </extensions>
 
-	<php>
-		<env name="XDEBUG_MODE" value="coverage"/>
-		<server name="app.baseURL" value="http://example.com/"/>
-		<!-- Directory containing phpunit.xml -->
-		<const name="HOMEPATH" value="./"/>
-		<!-- Directory containing the Paths config file -->
-		<const name="CONFIGPATH" value="./app/Config/"/>
-		<!-- Directory containing the front controller (index.php) -->
-		<const name="PUBLICPATH" value="./public/"/>
-	</php>
+    <php>
+        <env name="XDEBUG_MODE" value="coverage"/>
+        <server name="app.baseURL" value="http://example.com/"/>
+        <!-- Directory containing phpunit.xml -->
+        <const name="HOMEPATH" value="./"/>
+        <!-- Directory containing the Paths config file -->
+        <const name="CONFIGPATH" value="./app/Config/"/>
+        <!-- Directory containing the front controller (index.php) -->
+        <const name="PUBLICPATH" value="./public/"/>
+    </php>
 </phpunit>
diff --git a/rector.php b/rector.php
index 3df26ace9d06..054ed3ea09ad 100644
--- a/rector.php
+++ b/rector.php
@@ -1,29 +1,44 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
+use Rector\CodeQuality\Rector\FuncCall\AddPregQuoteDelimiterRector;
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
+use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
+use Rector\CodeQuality\Rector\Name\FixClassCaseSensitivityNameRector;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
-use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
+use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
+use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
-use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
-use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
-use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector;
+use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
+use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
+use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
@@ -35,63 +50,91 @@
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
-	$containerConfigurator->import(SetList::PHP_73);
-
-	$parameters = $containerConfigurator->parameters();
-
-	// paths to refactor; solid alternative to CLI arguments
-	$parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
-
-	// do you need to include constants, class aliases or custom autoloader? files listed will be executed
-	$parameters->set(Option::BOOTSTRAP_FILES, [
-		__DIR__ . '/system/Test/bootstrap.php',
-	]);
-
-	// is there a file you need to skip?
-	$parameters->set(Option::SKIP, [
-		__DIR__ . '/app/Views',
-		__DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
-		__DIR__ . '/system/ThirdParty',
-		__DIR__ . '/tests/system/Config/fixtures',
-		__DIR__ . '/tests/_support',
-		PassStrictParameterToFunctionParameterRector::class => [__DIR__ . '/tests/system/Database/Live/SelectTest.php'],
-		JsonThrowOnErrorRector::class,
-		StringifyStrNeedlesRector::class,
-	]);
-
-	// auto import fully qualified class names
-	$parameters->set(Option::AUTO_IMPORT_NAMES, true);
-	$parameters->set(Option::ENABLE_CACHE, true);
-	$parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
-
-	$services = $containerConfigurator->services();
-	$services->load('Symplify\\PackageBuilder\\', __DIR__ . '/vendor/symplify/package-builder/src');
-
-	$services->set(UnderscoreToCamelCaseVariableNameRector::class);
-	$services->set(SimplifyUselessVariableRector::class);
-	$services->set(RemoveAlwaysElseRector::class);
-	$services->set(PassStrictParameterToFunctionParameterRector::class);
-	$services->set(CountArrayToEmptyArrayComparisonRector::class);
-	$services->set(ForToForeachRector::class);
-	$services->set(ChangeNestedForeachIfsToEarlyContinueRector::class);
-	$services->set(ChangeIfElseValueAssignToEarlyReturnRector::class);
-	$services->set(SimplifyStrposLowerRector::class);
-	$services->set(CombineIfRector::class);
-	$services->set(SimplifyIfReturnBoolRector::class);
-	$services->set(RemoveDuplicatedCaseInSwitchRector::class);
-	$services->set(InlineIfToExplicitIfRector::class);
-	$services->set(PreparedValueToEarlyReturnRector::class);
-	$services->set(ShortenElseIfRector::class);
-	$services->set(RemoveUnusedForeachKeyRector::class);
-	$services->set(SimplifyIfElseToTernaryRector::class);
-	$services->set(UnusedForeachValueToArrayKeysRector::class);
-	$services->set(RemoveConcatAutocastRector::class);
-	$services->set(ChangeArrayPushToArrayAssignRector::class);
-	$services->set(UnnecessaryTernaryExpressionRector::class);
-	$services->set(RemoveUnusedPrivatePropertyRector::class);
-	$services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
-	$services->set(TernaryToNullCoalescingRector::class);
-	$services->set(ListToArrayDestructRector::class);
-	$services->set(MoveVariableDeclarationNearReferenceRector::class);
-	$services->set(RemoveVarTagFromClassConstantRector::class);
+    $containerConfigurator->import(SetList::DEAD_CODE);
+    $containerConfigurator->import(SetList::PHP_73);
+
+    $parameters = $containerConfigurator->parameters();
+
+    // paths to refactor; solid alternative to CLI arguments
+    $parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
+
+    // do you need to include constants, class aliases or custom autoloader? files listed will be executed
+    $parameters->set(Option::BOOTSTRAP_FILES, [
+        __DIR__ . '/system/Test/bootstrap.php',
+    ]);
+
+    // is there a file you need to skip?
+    $parameters->set(Option::SKIP, [
+        __DIR__ . '/app/Views',
+        __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
+        __DIR__ . '/system/ThirdParty',
+        __DIR__ . '/tests/system/Config/fixtures',
+        __DIR__ . '/tests/_support',
+        JsonThrowOnErrorRector::class,
+        StringifyStrNeedlesRector::class,
+
+        // requires php 8
+        RemoveUnusedPromotedPropertyRector::class,
+
+        // private method called via getPrivateMethodInvoker
+        RemoveUnusedPrivateMethodRector::class => [
+            __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
+        ],
+
+        // call on purpose for nothing happen check
+        RemoveEmptyMethodCallRector::class => [
+            __DIR__ . '/tests',
+        ],
+
+        // check on constant compare
+        UnwrapFutureCompatibleIfPhpVersionRector::class => [
+            __DIR__ . '/system/CodeIgniter.php',
+        ],
+
+        // casted to Entity via EntityTest->getCastEntity()
+        RecastingRemovalRector::class => [
+            __DIR__ . '/tests/system/Entity/EntityTest.php',
+        ],
+
+        // session handlers have the gc() method with underscored parameter `$max_lifetime`
+        UnderscoreToCamelCaseVariableNameRector::class => [
+            __DIR__ . '/system/Session/Handlers',
+        ],
+    ]);
+
+    // auto import fully qualified class names
+    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
+    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
+
+    $services = $containerConfigurator->services();
+    $services->load('Symplify\\PackageBuilder\\', __DIR__ . '/vendor/symplify/package-builder/src');
+
+    $services->set(UnderscoreToCamelCaseVariableNameRector::class);
+    $services->set(SimplifyUselessVariableRector::class);
+    $services->set(RemoveAlwaysElseRector::class);
+    $services->set(PassStrictParameterToFunctionParameterRector::class);
+    $services->set(CountArrayToEmptyArrayComparisonRector::class);
+    $services->set(ForToForeachRector::class);
+    $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class);
+    $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class);
+    $services->set(SimplifyStrposLowerRector::class);
+    $services->set(CombineIfRector::class);
+    $services->set(SimplifyIfReturnBoolRector::class);
+    $services->set(InlineIfToExplicitIfRector::class);
+    $services->set(PreparedValueToEarlyReturnRector::class);
+    $services->set(ShortenElseIfRector::class);
+    $services->set(SimplifyIfElseToTernaryRector::class);
+    $services->set(UnusedForeachValueToArrayKeysRector::class);
+    $services->set(ChangeArrayPushToArrayAssignRector::class);
+    $services->set(UnnecessaryTernaryExpressionRector::class);
+    $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
+    $services->set(TernaryToNullCoalescingRector::class);
+    $services->set(ListToArrayDestructRector::class);
+    $services->set(RemoveVarTagFromClassConstantRector::class);
+    $services->set(AddPregQuoteDelimiterRector::class);
+    $services->set(SimplifyRegexPatternRector::class);
+    $services->set(RemoveExtraParametersRector::class);
+    $services->set(FuncGetArgsToVariadicParamRector::class);
+    $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
+    $services->set(FixClassCaseSensitivityNameRector::class);
 };
diff --git a/spark b/spark
index f62aeddb2978..9a5a5db90284 100755
--- a/spark
+++ b/spark
@@ -24,9 +24,8 @@ define('SPARKED', true);
  */
 
 // Refuse to run when called from php-cgi
-if (strpos(PHP_SAPI, 'cgi') === 0)
-{
-	die("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
+if (strpos(PHP_SAPI, 'cgi') === 0) {
+    exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
 }
 
 // Path to the front controller
@@ -53,17 +52,16 @@ error_reporting(-1);
 ini_set('display_errors', '1');
 
 // Show basic information before we do anything else.
-if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true)))
-{
-	unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
-	$suppress = true;
+if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
+    unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
+    $suppress = true;
 }
 
 $console->showHeader($suppress);
 
 // fire off the command in the main framework.
 $response = $console->run();
-if ($response->getStatusCode() >= 300)
-{
-	exit($response->getStatusCode());
+
+if ($response->getStatusCode() >= 300) {
+    exit($response->getStatusCode());
 }
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 8aa8682a8300..56848ea608de 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\API;
@@ -17,8 +17,6 @@
 use Config\Services;
 
 /**
- * Response trait.
- *
  * Provides common, more readable, methods to provide
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
@@ -28,412 +26,330 @@
  */
 trait ResponseTrait
 {
-	/**
-	 * Allows child classes to override the
-	 * status code that is used in their API.
-	 *
-	 * @var array
-	 */
-	protected $codes = [
-		'created'                   => 201,
-		'deleted'                   => 200,
-		'updated'                   => 200,
-		'no_content'                => 204,
-		'invalid_request'           => 400,
-		'unsupported_response_type' => 400,
-		'invalid_scope'             => 400,
-		'temporarily_unavailable'   => 400,
-		'invalid_grant'             => 400,
-		'invalid_credentials'       => 400,
-		'invalid_refresh'           => 400,
-		'no_data'                   => 400,
-		'invalid_data'              => 400,
-		'access_denied'             => 401,
-		'unauthorized'              => 401,
-		'invalid_client'            => 401,
-		'forbidden'                 => 403,
-		'resource_not_found'        => 404,
-		'not_acceptable'            => 406,
-		'resource_exists'           => 409,
-		'conflict'                  => 409,
-		'resource_gone'             => 410,
-		'payload_too_large'         => 413,
-		'unsupported_media_type'    => 415,
-		'too_many_requests'         => 429,
-		'server_error'              => 500,
-		'unsupported_grant_type'    => 501,
-		'not_implemented'           => 501,
-	];
-
-	/**
-	 * How to format the response data.
-	 * Either 'json' or 'xml'. If blank will be
-	 * determine through content negotiation.
-	 *
-	 * @var string
-	 */
-	protected $format = 'json';
-
-	/**
-	 * Current Formatter instance. This is usually set by ResponseTrait::format
-	 *
-	 * @var FormatterInterface
-	 */
-	protected $formatter;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provides a single, simple method to return an API response, formatted
-	 * to match the requested format, with proper content-type and status code.
-	 *
-	 * @param array|string|null $data
-	 * @param integer           $status
-	 * @param string            $message
-	 *
-	 * @return mixed
-	 */
-	public function respond($data = null, int $status = null, string $message = '')
-	{
-		// If data is null and status code not provided, exit and bail
-		if ($data === null && $status === null)
-		{
-			$status = 404;
-
-			// Create the output var here in case of $this->response([]);
-			$output = null;
-		}
-		// If data is null but status provided, keep the output empty.
-		elseif ($data === null && is_numeric($status))
-		{
-			$output = null;
-		}
-		else
-		{
-			$status = empty($status) ? 200 : $status;
-			$output = $this->format($data);
-		}
-
-		if (! is_null($output))
-		{
-			if ($this->format === 'json')
-			{
-				return $this->response->setJSON($output)->setStatusCode($status, $message);
-			}
-
-			if ($this->format === 'xml')
-			{
-				return $this->response->setXML($output)->setStatusCode($status, $message);
-			}
-		}
-
-		return $this->response->setBody($output)->setStatusCode($status, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used for generic failures that no custom methods exist for.
-	 *
-	 * @param string|array $messages
-	 * @param integer      $status        HTTP status code
-	 * @param string|null  $code          Custom, API-specific, error code
-	 * @param string       $customMessage
-	 *
-	 * @return mixed
-	 */
-	public function fail($messages, int $status = 400, string $code = null, string $customMessage = '')
-	{
-		if (! is_array($messages))
-		{
-			$messages = ['error' => $messages];
-		}
-
-		$response = [
-			'status'   => $status,
-			'error'    => $code ?? $status,
-			'messages' => $messages,
-		];
-
-		return $this->respond($response, $status, $customMessage);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Response Helpers
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used after successfully creating a new resource.
-	 *
-	 * @param mixed  $data    Data.
-	 * @param string $message Message.
-	 *
-	 * @return mixed
-	 */
-	public function respondCreated($data = null, string $message = '')
-	{
-		return $this->respond($data, $this->codes['created'], $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used after a resource has been successfully deleted.
-	 *
-	 * @param mixed  $data    Data.
-	 * @param string $message Message.
-	 *
-	 * @return mixed
-	 */
-	public function respondDeleted($data = null, string $message = '')
-	{
-		return $this->respond($data, $this->codes['deleted'], $message);
-	}
-
-	/**
-	 * Used after a resource has been successfully updated.
-	 *
-	 * @param mixed  $data    Data.
-	 * @param string $message Message.
-	 *
-	 * @return mixed
-	 */
-	public function respondUpdated($data = null, string $message = '')
-	{
-		return $this->respond($data, $this->codes['updated'], $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used after a command has been successfully executed but there is no
-	 * meaningful reply to send back to the client.
-	 *
-	 * @param string $message Message.
-	 *
-	 * @return mixed
-	 */
-	public function respondNoContent(string $message = 'No Content')
-	{
-		return $this->respond(null, $this->codes['no_content'], $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when the client is either didn't send authorization information,
-	 * or had bad authorization credentials. User is encouraged to try again
-	 * with the proper information.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failUnauthorized(string $description = 'Unauthorized', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['unauthorized'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when access is always denied to this resource and no amount
-	 * of trying again will help.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failForbidden(string $description = 'Forbidden', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['forbidden'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when a specified resource cannot be found.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failNotFound(string $description = 'Not Found', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when the data provided by the client cannot be validated.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 *
-	 * @deprecated Use failValidationErrors instead
-	 */
-	public function failValidationError(string $description = 'Bad Request', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['invalid_data'], $code, $message);
-	}
-
-	/**
-	 * Used when the data provided by the client cannot be validated on one or more fields.
-	 *
-	 * @param string|string[] $errors
-	 * @param string|null 	  $code
-	 * @param string		  $message
-	 *
-	 * @return mixed
-	 */
-	public function failValidationErrors($errors, string $code = null, string $message = '')
-	{
-		return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Use when trying to create a new resource and it already exists.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failResourceExists(string $description = 'Conflict', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['resource_exists'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Use when a resource was previously deleted. This is different than
-	 * Not Found, because here we know the data previously existed, but is now gone,
-	 * where Not Found means we simply cannot find any information about it.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failResourceGone(string $description = 'Gone', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['resource_gone'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when the user has made too many requests for the resource recently.
-	 *
-	 * @param string $description
-	 * @param string $code
-	 * @param string $message
-	 *
-	 * @return mixed
-	 */
-	public function failTooManyRequests(string $description = 'Too Many Requests', string $code = null, string $message = '')
-	{
-		return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used when there is a server error.
-	 *
-	 * @param string      $description The error message to show the user.
-	 * @param string|null $code        A custom, API-specific, error code.
-	 * @param string      $message     A custom "reason" message to return.
-	 *
-	 * @return Response The value of the Response's send() method.
-	 */
-	public function failServerError(string $description = 'Internal Server Error', string $code = null, string $message = ''): Response
-	{
-		return $this->fail($description, $this->codes['server_error'], $code, $message);
-	}
-
-	//--------------------------------------------------------------------
-	// Utility Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles formatting a response. Currently makes some heavy assumptions
-	 * and needs updating! :)
-	 *
-	 * @param string|array|null $data
-	 *
-	 * @return string|null
-	 */
-	protected function format($data = null)
-	{
-		// If the data is a string, there's not much we can do to it...
-		if (is_string($data))
-		{
-			// The content type should be text/... and not application/...
-			$contentType = $this->response->getHeaderLine('Content-Type');
-			$contentType = str_replace('application/json', 'text/html', $contentType);
-			$contentType = str_replace('application/', 'text/', $contentType);
-			$this->response->setContentType($contentType);
-			$this->format = 'html';
-
-			return $data;
-		}
-
-		$format = Services::format();
-		$mime   = "application/{$this->format}";
-
-		// Determine correct response type through content negotiation if not explicitly declared
-		if (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true))
-		{
-			$mime = $this->request->negotiate('media', $format->getConfig()->supportedResponseFormats, false);
-		}
-
-		$this->response->setContentType($mime);
-
-		// if we don't have a formatter, make one
-		if (! isset($this->formatter))
-		{
-			// if no formatter, use the default
-			$this->formatter = $format->getFormatter($mime);
-		}
-
-		if ($mime !== 'application/json')
-		{
-			// Recursively convert objects into associative arrays
-			// Conversion not required for JSONFormatter
-			$data = json_decode(json_encode($data), true);
-		}
-
-		return $this->formatter->format($data);
-	}
-
-	/**
-	 * Sets the format the response should be in.
-	 *
-	 * @param string $format
-	 *
-	 * @return $this
-	 */
-	public function setResponseFormat(string $format = null)
-	{
-		$this->format = strtolower($format);
-
-		return $this;
-	}
+    /**
+     * Allows child classes to override the
+     * status code that is used in their API.
+     *
+     * @var array<string, int>
+     */
+    protected $codes = [
+        'created'                   => 201,
+        'deleted'                   => 200,
+        'updated'                   => 200,
+        'no_content'                => 204,
+        'invalid_request'           => 400,
+        'unsupported_response_type' => 400,
+        'invalid_scope'             => 400,
+        'temporarily_unavailable'   => 400,
+        'invalid_grant'             => 400,
+        'invalid_credentials'       => 400,
+        'invalid_refresh'           => 400,
+        'no_data'                   => 400,
+        'invalid_data'              => 400,
+        'access_denied'             => 401,
+        'unauthorized'              => 401,
+        'invalid_client'            => 401,
+        'forbidden'                 => 403,
+        'resource_not_found'        => 404,
+        'not_acceptable'            => 406,
+        'resource_exists'           => 409,
+        'conflict'                  => 409,
+        'resource_gone'             => 410,
+        'payload_too_large'         => 413,
+        'unsupported_media_type'    => 415,
+        'too_many_requests'         => 429,
+        'server_error'              => 500,
+        'unsupported_grant_type'    => 501,
+        'not_implemented'           => 501,
+    ];
+
+    /**
+     * How to format the response data.
+     * Either 'json' or 'xml'. If blank will be
+     * determine through content negotiation.
+     *
+     * @var string
+     */
+    protected $format = 'json';
+
+    /**
+     * Current Formatter instance. This is usually set by ResponseTrait::format
+     *
+     * @var FormatterInterface
+     */
+    protected $formatter;
+
+    /**
+     * Provides a single, simple method to return an API response, formatted
+     * to match the requested format, with proper content-type and status code.
+     *
+     * @param array|string|null $data
+     *
+     * @return mixed
+     */
+    public function respond($data = null, ?int $status = null, string $message = '')
+    {
+        if ($data === null && $status === null) {
+            $status = 404;
+            $output = null;
+        } elseif ($data === null && is_numeric($status)) {
+            $output = null;
+        } else {
+            $status = empty($status) ? 200 : $status;
+            $output = $this->format($data);
+        }
+
+        if ($output !== null) {
+            if ($this->format === 'json') {
+                return $this->response->setJSON($output)->setStatusCode($status, $message);
+            }
+
+            if ($this->format === 'xml') {
+                return $this->response->setXML($output)->setStatusCode($status, $message);
+            }
+        }
+
+        return $this->response->setBody($output)->setStatusCode($status, $message);
+    }
+
+    /**
+     * Used for generic failures that no custom methods exist for.
+     *
+     * @param array|string $messages
+     * @param int          $status   HTTP status code
+     * @param string|null  $code     Custom, API-specific, error code
+     *
+     * @return mixed
+     */
+    public function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '')
+    {
+        if (! is_array($messages)) {
+            $messages = ['error' => $messages];
+        }
+
+        $response = [
+            'status'   => $status,
+            'error'    => $code ?? $status,
+            'messages' => $messages,
+        ];
+
+        return $this->respond($response, $status, $customMessage);
+    }
+
+    //--------------------------------------------------------------------
+    // Response Helpers
+    //--------------------------------------------------------------------
+
+    /**
+     * Used after successfully creating a new resource.
+     *
+     * @param mixed $data
+     *
+     * @return mixed
+     */
+    public function respondCreated($data = null, string $message = '')
+    {
+        return $this->respond($data, $this->codes['created'], $message);
+    }
+
+    /**
+     * Used after a resource has been successfully deleted.
+     *
+     * @param mixed $data
+     *
+     * @return mixed
+     */
+    public function respondDeleted($data = null, string $message = '')
+    {
+        return $this->respond($data, $this->codes['deleted'], $message);
+    }
+
+    /**
+     * Used after a resource has been successfully updated.
+     *
+     * @param mixed $data
+     *
+     * @return mixed
+     */
+    public function respondUpdated($data = null, string $message = '')
+    {
+        return $this->respond($data, $this->codes['updated'], $message);
+    }
+
+    /**
+     * Used after a command has been successfully executed but there is no
+     * meaningful reply to send back to the client.
+     *
+     * @return mixed
+     */
+    public function respondNoContent(string $message = 'No Content')
+    {
+        return $this->respond(null, $this->codes['no_content'], $message);
+    }
+
+    /**
+     * Used when the client is either didn't send authorization information,
+     * or had bad authorization credentials. User is encouraged to try again
+     * with the proper information.
+     *
+     * @return mixed
+     */
+    public function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['unauthorized'], $code, $message);
+    }
+
+    /**
+     * Used when access is always denied to this resource and no amount
+     * of trying again will help.
+     *
+     * @return mixed
+     */
+    public function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['forbidden'], $code, $message);
+    }
+
+    /**
+     * Used when a specified resource cannot be found.
+     *
+     * @return mixed
+     */
+    public function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
+    }
+
+    /**
+     * Used when the data provided by the client cannot be validated.
+     *
+     * @return mixed
+     *
+     * @deprecated Use failValidationErrors instead
+     */
+    public function failValidationError(string $description = 'Bad Request', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['invalid_data'], $code, $message);
+    }
+
+    /**
+     * Used when the data provided by the client cannot be validated on one or more fields.
+     *
+     * @param string|string[] $errors
+     *
+     * @return mixed
+     */
+    public function failValidationErrors($errors, ?string $code = null, string $message = '')
+    {
+        return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
+    }
+
+    /**
+     * Use when trying to create a new resource and it already exists.
+     *
+     * @return mixed
+     */
+    public function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['resource_exists'], $code, $message);
+    }
+
+    /**
+     * Use when a resource was previously deleted. This is different than
+     * Not Found, because here we know the data previously existed, but is now gone,
+     * where Not Found means we simply cannot find any information about it.
+     *
+     * @return mixed
+     */
+    public function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['resource_gone'], $code, $message);
+    }
+
+    /**
+     * Used when the user has made too many requests for the resource recently.
+     *
+     * @return mixed
+     */
+    public function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
+    {
+        return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
+    }
+
+    /**
+     * Used when there is a server error.
+     *
+     * @param string      $description The error message to show the user.
+     * @param string|null $code        A custom, API-specific, error code.
+     * @param string      $message     A custom "reason" message to return.
+     *
+     * @return Response The value of the Response's send() method.
+     */
+    public function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): Response
+    {
+        return $this->fail($description, $this->codes['server_error'], $code, $message);
+    }
+
+    //--------------------------------------------------------------------
+    // Utility Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Handles formatting a response. Currently makes some heavy assumptions
+     * and needs updating! :)
+     *
+     * @param array|string|null $data
+     *
+     * @return string|null
+     */
+    protected function format($data = null)
+    {
+        // If the data is a string, there's not much we can do to it...
+        if (is_string($data)) {
+            // The content type should be text/... and not application/...
+            $contentType = $this->response->getHeaderLine('Content-Type');
+            $contentType = str_replace('application/json', 'text/html', $contentType);
+            $contentType = str_replace('application/', 'text/', $contentType);
+            $this->response->setContentType($contentType);
+            $this->format = 'html';
+
+            return $data;
+        }
+
+        $format = Services::format();
+        $mime   = "application/{$this->format}";
+
+        // Determine correct response type through content negotiation if not explicitly declared
+        if (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true)) {
+            $mime = $this->request->negotiate('media', $format->getConfig()->supportedResponseFormats, false);
+        }
+
+        $this->response->setContentType($mime);
+
+        // if we don't have a formatter, make one
+        if (! isset($this->formatter)) {
+            // if no formatter, use the default
+            $this->formatter = $format->getFormatter($mime);
+        }
+
+        if ($mime !== 'application/json') {
+            // Recursively convert objects into associative arrays
+            // Conversion not required for JSONFormatter
+            $data = json_decode(json_encode($data), true);
+        }
+
+        return $this->formatter->format($data);
+    }
+
+    /**
+     * Sets the format the response should be in.
+     *
+     * @return $this
+     */
+    public function setResponseFormat(?string $format = null)
+    {
+        $this->format = strtolower($format);
+
+        return $this;
+    }
 }
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 162d898394a2..3472756ad4dd 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
@@ -17,8 +17,6 @@
 use InvalidArgumentException;
 
 /**
- * CodeIgniter Autoloader
- *
  * An autoloader that uses both PSR4 autoloading, and traditional classmaps.
  *
  * Given a foo-bar package of classes in the file system at the following paths:
@@ -55,318 +53,276 @@
  */
 class Autoloader
 {
-	/**
-	 * Stores namespaces as key, and path as values.
-	 *
-	 * @var array<string, array<string>>
-	 */
-	protected $prefixes = [];
-
-	/**
-	 * Stores class name as key, and path as values.
-	 *
-	 * @var array<string, string>
-	 */
-	protected $classmap = [];
-
-	/**
-	 * Stores files as a list.
-	 *
-	 * @var array<int, string>
-	 */
-	protected $files = [];
-
-	/**
-	 * Reads in the configuration array (described above) and stores
-	 * the valid parts that we'll need.
-	 *
-	 * @param Autoload $config
-	 * @param Modules  $modules
-	 *
-	 * @return $this
-	 */
-	public function initialize(Autoload $config, Modules $modules)
-	{
-		// We have to have one or the other, though we don't enforce the need
-		// to have both present in order to work.
-		if (empty($config->psr4) && empty($config->classmap))
-		{
-			throw new InvalidArgumentException('Config array must contain either the \'psr4\' key or the \'classmap\' key.');
-		}
-
-		if (isset($config->psr4))
-		{
-			$this->addNamespace($config->psr4);
-		}
-
-		if (isset($config->classmap))
-		{
-			$this->classmap = $config->classmap;
-		}
-
-		if (isset($config->files))
-		{
-			$this->files = $config->files;
-		}
-
-		// Should we load through Composer's namespaces, also?
-		if ($modules->discoverInComposer)
-		{
-			$this->discoverComposerNamespaces();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Register the loader with the SPL autoloader stack.
-	 */
-	public function register()
-	{
-		// Prepend the PSR4  autoloader for maximum performance.
-		spl_autoload_register([$this, 'loadClass'], true, true); // @phpstan-ignore-line
-
-		// Now prepend another loader for the files in our class map.
-		spl_autoload_register([$this, 'loadClassmap'], true, true); // @phpstan-ignore-line
-
-		// Load our non-class files
-		foreach ($this->files as $file)
-		{
-			if (is_string($file))
-			{
-				$this->includeFile($file);
-			}
-		}
-	}
-
-	/**
-	 * Registers namespaces with the autoloader.
-	 *
-	 * @param array|string $namespace
-	 * @param string       $path
-	 *
-	 * @return $this
-	 */
-	public function addNamespace($namespace, string $path = null)
-	{
-		if (is_array($namespace))
-		{
-			foreach ($namespace as $prefix => $path)
-			{
-				$prefix = trim($prefix, '\\');
-
-				if (is_array($path))
-				{
-					foreach ($path as $dir)
-					{
-						$this->prefixes[$prefix][] = rtrim($dir, '\\/') . DIRECTORY_SEPARATOR;
-					}
-
-					continue;
-				}
-
-				$this->prefixes[$prefix][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
-			}
-		}
-		else
-		{
-			$this->prefixes[trim($namespace, '\\')][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get namespaces with prefixes as keys and paths as values.
-	 *
-	 * If a prefix param is set, returns only paths to the given prefix.
-	 *
-	 * @param string|null $prefix
-	 *
-	 * @return array
-	 */
-	public function getNamespace(string $prefix = null)
-	{
-		if ($prefix === null)
-		{
-			return $this->prefixes;
-		}
-
-		return $this->prefixes[trim($prefix, '\\')] ?? [];
-	}
-
-	/**
-	 * Removes a single namespace from the psr4 settings.
-	 *
-	 * @param string $namespace
-	 *
-	 * @return $this
-	 */
-	public function removeNamespace(string $namespace)
-	{
-		if (isset($this->prefixes[trim($namespace, '\\')]))
-		{
-			unset($this->prefixes[trim($namespace, '\\')]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Load a class using available class mapping.
-	 *
-	 * @param string $class
-	 *
-	 * @return string|false
-	 */
-	public function loadClassmap(string $class)
-	{
-		$file = $this->classmap[$class] ?? '';
-
-		if (is_string($file) && $file !== '')
-		{
-			return $this->includeFile($file);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Loads the class file for a given class name.
-	 *
-	 * @param string $class The fully qualified class name.
-	 *
-	 * @return string|false The mapped file on success, or boolean false
-	 *                          on failure.
-	 */
-	public function loadClass(string $class)
-	{
-		$class = trim($class, '\\');
-		$class = str_ireplace('.php', '', $class);
-
-		return $this->loadInNamespace($class);
-	}
-
-	/**
-	 * Loads the class file for a given class name.
-	 *
-	 * @param string $class The fully-qualified class name
-	 *
-	 * @return string|false The mapped file name on success, or boolean false on fail
-	 */
-	protected function loadInNamespace(string $class)
-	{
-		if (strpos($class, '\\') === false)
-		{
-			return false;
-		}
-
-		foreach ($this->prefixes as $namespace => $directories)
-		{
-			foreach ($directories as $directory)
-			{
-				$directory = rtrim($directory, '\\/');
-
-				if (strpos($class, $namespace) === 0)
-				{
-					$filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
-					$filename = $this->includeFile($filePath);
-
-					if ($filename)
-					{
-						return $filename;
-					}
-				}
-			}
-		}
-
-		// never found a mapped file
-		return false;
-	}
-
-	/**
-	 * A central way to include a file. Split out primarily for testing purposes.
-	 *
-	 * @param string $file
-	 *
-	 * @return string|false The filename on success, false if the file is not loaded
-	 */
-	protected function includeFile(string $file)
-	{
-		$file = $this->sanitizeFilename($file);
-
-		if (is_file($file))
-		{
-			include_once $file;
-
-			return $file;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sanitizes a filename, replacing spaces with dashes.
-	 *
-	 * Removes special characters that are illegal in filenames on certain
-	 * operating systems and special characters requiring special escaping
-	 * to manipulate at the command line. Replaces spaces and consecutive
-	 * dashes with a single dash. Trim period, dash and underscore from beginning
-	 * and end of filename.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string The sanitized filename
-	 */
-	public function sanitizeFilename(string $filename): string
-	{
-		// Only allow characters deemed safe for POSIX portable filenames.
-		// Plus the forward slash for directory separators since this might be a path.
-		// http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_278
-		// Modified to allow backslash and colons for on Windows machines.
-		$filename = preg_replace('/[^0-9\p{L}\s\/\-\_\.\:\\\\]/u', '', $filename);
-
-		// Clean up our filename edges.
-		$filename = trim($filename, '.-_');
-
-		return $filename;
-	}
-
-	/**
-	 * Locates autoload information from Composer, if available.
-	 *
-	 * @return void
-	 */
-	protected function discoverComposerNamespaces()
-	{
-		if (! is_file(COMPOSER_PATH))
-		{
-			return;
-		}
-
-		/**
-		 * @var ClassLoader $composer
-		 */
-		$composer = include COMPOSER_PATH;
-		$paths    = $composer->getPrefixesPsr4();
-		$classes  = $composer->getClassMap();
-
-		unset($composer);
-
-		// Get rid of CodeIgniter so we don't have duplicates
-		if (isset($paths['CodeIgniter\\']))
-		{
-			unset($paths['CodeIgniter\\']);
-		}
-
-		$newPaths = [];
-		foreach ($paths as $key => $value)
-		{
-			// Composer stores namespaces with trailing slash. We don't.
-			$newPaths[rtrim($key, '\\ ')] = $value;
-		}
-
-		$this->prefixes = array_merge($this->prefixes, $newPaths);
-		$this->classmap = array_merge($this->classmap, $classes);
-	}
+    /**
+     * Stores namespaces as key, and path as values.
+     *
+     * @var array<string, array<string>>
+     */
+    protected $prefixes = [];
+
+    /**
+     * Stores class name as key, and path as values.
+     *
+     * @var array<string, string>
+     */
+    protected $classmap = [];
+
+    /**
+     * Stores files as a list.
+     *
+     * @var array<int, string>
+     */
+    protected $files = [];
+
+    /**
+     * Reads in the configuration array (described above) and stores
+     * the valid parts that we'll need.
+     *
+     * @return $this
+     */
+    public function initialize(Autoload $config, Modules $modules)
+    {
+        // We have to have one or the other, though we don't enforce the need
+        // to have both present in order to work.
+        if (empty($config->psr4) && empty($config->classmap)) {
+            throw new InvalidArgumentException('Config array must contain either the \'psr4\' key or the \'classmap\' key.');
+        }
+
+        if (isset($config->psr4)) {
+            $this->addNamespace($config->psr4);
+        }
+
+        if (isset($config->classmap)) {
+            $this->classmap = $config->classmap;
+        }
+
+        if (isset($config->files)) {
+            $this->files = $config->files;
+        }
+
+        // Should we load through Composer's namespaces, also?
+        if ($modules->discoverInComposer) {
+            $this->discoverComposerNamespaces();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Register the loader with the SPL autoloader stack.
+     */
+    public function register()
+    {
+        // Prepend the PSR4  autoloader for maximum performance.
+        spl_autoload_register([$this, 'loadClass'], true, true); // @phpstan-ignore-line
+
+        // Now prepend another loader for the files in our class map.
+        spl_autoload_register([$this, 'loadClassmap'], true, true); // @phpstan-ignore-line
+
+        // Load our non-class files
+        foreach ($this->files as $file) {
+            if (is_string($file)) {
+                $this->includeFile($file);
+            }
+        }
+    }
+
+    /**
+     * Registers namespaces with the autoloader.
+     *
+     * @param array|string $namespace
+     *
+     * @return $this
+     */
+    public function addNamespace($namespace, ?string $path = null)
+    {
+        if (is_array($namespace)) {
+            foreach ($namespace as $prefix => $namespacedPath) {
+                $prefix = trim($prefix, '\\');
+
+                if (is_array($namespacedPath)) {
+                    foreach ($namespacedPath as $dir) {
+                        $this->prefixes[$prefix][] = rtrim($dir, '\\/') . DIRECTORY_SEPARATOR;
+                    }
+
+                    continue;
+                }
+
+                $this->prefixes[$prefix][] = rtrim($namespacedPath, '\\/') . DIRECTORY_SEPARATOR;
+            }
+        } else {
+            $this->prefixes[trim($namespace, '\\')][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get namespaces with prefixes as keys and paths as values.
+     *
+     * If a prefix param is set, returns only paths to the given prefix.
+     *
+     * @return array
+     */
+    public function getNamespace(?string $prefix = null)
+    {
+        if ($prefix === null) {
+            return $this->prefixes;
+        }
+
+        return $this->prefixes[trim($prefix, '\\')] ?? [];
+    }
+
+    /**
+     * Removes a single namespace from the psr4 settings.
+     *
+     * @return $this
+     */
+    public function removeNamespace(string $namespace)
+    {
+        if (isset($this->prefixes[trim($namespace, '\\')])) {
+            unset($this->prefixes[trim($namespace, '\\')]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Load a class using available class mapping.
+     *
+     * @return false|string
+     */
+    public function loadClassmap(string $class)
+    {
+        $file = $this->classmap[$class] ?? '';
+
+        if (is_string($file) && $file !== '') {
+            return $this->includeFile($file);
+        }
+
+        return false;
+    }
+
+    /**
+     * Loads the class file for a given class name.
+     *
+     * @param string $class The fully qualified class name.
+     *
+     * @return false|string The mapped file on success, or boolean false
+     *                      on failure.
+     */
+    public function loadClass(string $class)
+    {
+        $class = trim($class, '\\');
+        $class = str_ireplace('.php', '', $class);
+
+        return $this->loadInNamespace($class);
+    }
+
+    /**
+     * Loads the class file for a given class name.
+     *
+     * @param string $class The fully-qualified class name
+     *
+     * @return false|string The mapped file name on success, or boolean false on fail
+     */
+    protected function loadInNamespace(string $class)
+    {
+        if (strpos($class, '\\') === false) {
+            return false;
+        }
+
+        foreach ($this->prefixes as $namespace => $directories) {
+            foreach ($directories as $directory) {
+                $directory = rtrim($directory, '\\/');
+
+                if (strpos($class, $namespace) === 0) {
+                    $filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
+                    $filename = $this->includeFile($filePath);
+
+                    if ($filename) {
+                        return $filename;
+                    }
+                }
+            }
+        }
+
+        // never found a mapped file
+        return false;
+    }
+
+    /**
+     * A central way to include a file. Split out primarily for testing purposes.
+     *
+     * @return false|string The filename on success, false if the file is not loaded
+     */
+    protected function includeFile(string $file)
+    {
+        $file = $this->sanitizeFilename($file);
+
+        if (is_file($file)) {
+            include_once $file;
+
+            return $file;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sanitizes a filename, replacing spaces with dashes.
+     *
+     * Removes special characters that are illegal in filenames on certain
+     * operating systems and special characters requiring special escaping
+     * to manipulate at the command line. Replaces spaces and consecutive
+     * dashes with a single dash. Trim period, dash and underscore from beginning
+     * and end of filename.
+     *
+     * @return string The sanitized filename
+     */
+    public function sanitizeFilename(string $filename): string
+    {
+        // Only allow characters deemed safe for POSIX portable filenames.
+        // Plus the forward slash for directory separators since this might be a path.
+        // http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_278
+        // Modified to allow backslash and colons for on Windows machines.
+        $filename = preg_replace('/[^0-9\p{L}\s\/\-\_\.\:\\\\]/u', '', $filename);
+
+        // Clean up our filename edges.
+        return trim($filename, '.-_');
+    }
+
+    /**
+     * Locates autoload information from Composer, if available.
+     */
+    protected function discoverComposerNamespaces()
+    {
+        if (! is_file(COMPOSER_PATH)) {
+            return;
+        }
+
+        /**
+         * @var ClassLoader $composer
+         */
+        $composer = include COMPOSER_PATH;
+        $paths    = $composer->getPrefixesPsr4();
+        $classes  = $composer->getClassMap();
+
+        unset($composer);
+
+        // Get rid of CodeIgniter so we don't have duplicates
+        if (isset($paths['CodeIgniter\\'])) {
+            unset($paths['CodeIgniter\\']);
+        }
+
+        $newPaths = [];
+
+        foreach ($paths as $key => $value) {
+            // Composer stores namespaces with trailing slash. We don't.
+            $newPaths[rtrim($key, '\\ ')] = $value;
+        }
+
+        $this->prefixes = array_merge($this->prefixes, $newPaths);
+        $this->classmap = array_merge($this->classmap, $classes);
+    }
 }
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 1774c51bfa7b..6fa8109bf992 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -1,452 +1,371 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
 
 /**
- * Class FileLocator
- *
  * Allows loading non-class files in a namespaced manner.
  * Works with Helpers, Views, etc.
  */
 class FileLocator
 {
-	/**
-	 * The Autoloader to use.
-	 *
-	 * @var Autoloader
-	 */
-	protected $autoloader;
-
-	/**
-	 * Constructor
-	 *
-	 * @param Autoloader $autoloader
-	 */
-	public function __construct(Autoloader $autoloader)
-	{
-		$this->autoloader = $autoloader;
-	}
-
-	/**
-	 * Attempts to locate a file by examining the name for a namespace
-	 * and looking through the PSR-4 namespaced files that we know about.
-	 *
-	 * @param string      $file   The namespaced file to locate
-	 * @param string|null $folder The folder within the namespace that we should look for the file.
-	 * @param string      $ext    The file extension the file should have.
-	 *
-	 * @return string|false The path to the file, or false if not found.
-	 */
-	public function locateFile(string $file, string $folder = null, string $ext = 'php')
-	{
-		$file = $this->ensureExt($file, $ext);
-
-		// Clears the folder name if it is at the beginning of the filename
-		if (! empty($folder) && strpos($file, $folder) === 0)
-		{
-			$file = substr($file, strlen($folder . '/'));
-		}
-
-		// Is not namespaced? Try the application folder.
-		if (strpos($file, '\\') === false)
-		{
-			return $this->legacyLocate($file, $folder);
-		}
-
-		// Standardize slashes to handle nested directories.
-		$file = strtr($file, '/', '\\');
-
-		$segments = explode('\\', $file);
-
-		// The first segment will be empty if a slash started the filename.
-		if (empty($segments[0]))
-		{
-			unset($segments[0]);
-		}
-
-		$paths    = [];
-		$prefix   = '';
-		$filename = '';
-
-		// Namespaces always comes with arrays of paths
-		$namespaces = $this->autoloader->getNamespace();
-
-		while (! empty($segments))
-		{
-			$prefix .= empty($prefix) ? array_shift($segments) : '\\' . array_shift($segments);
-
-			if (empty($namespaces[$prefix]))
-			{
-				continue;
-			}
-
-			$paths = $namespaces[$prefix];
-
-			$filename = implode('/', $segments);
-			break;
-		}
-
-		// if no namespaces matched then quit
-		if (empty($paths))
-		{
-			return false;
-		}
-
-		// Check each path in the namespace
-		foreach ($paths as $path)
-		{
-			// Ensure trailing slash
-			$path = rtrim($path, '/') . '/';
-
-			// If we have a folder name, then the calling function
-			// expects this file to be within that folder, like 'Views',
-			// or 'libraries'.
-			if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false)
-			{
-				$path .= trim($folder, '/') . '/';
-			}
-
-			$path .= $filename;
-			if (is_file($path))
-			{
-				return $path;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Examines a file and returns the fully qualified domain name.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 */
-	public function getClassname(string $file) : string
-	{
-		$php       = file_get_contents($file);
-		$tokens    = token_get_all($php);
-		$dlm       = false;
-		$namespace = '';
-		$className = '';
-
-		foreach ($tokens as $i => $token)
-		{
-			if ($i < 2)
-			{
-				continue;
-			}
-
-			if ((isset($tokens[$i - 2][1]) && ($tokens[$i - 2][1] === 'phpnamespace' || $tokens[$i - 2][1] === 'namespace')) || ($dlm && $tokens[$i - 1][0] === T_NS_SEPARATOR && $token[0] === T_STRING))
-			{
-				if (! $dlm)
-				{
-					$namespace = 0;
-				}
-				if (isset($token[1]))
-				{
-					$namespace = $namespace ? $namespace . '\\' . $token[1] : $token[1];
-					$dlm       = true;
-				}
-			}
-			elseif ($dlm && ($token[0] !== T_NS_SEPARATOR) && ($token[0] !== T_STRING))
-			{
-				$dlm = false;
-			}
-
-			if (($tokens[$i - 2][0] === T_CLASS || (isset($tokens[$i - 2][1]) && $tokens[$i - 2][1] === 'phpclass'))
-				&& $tokens[$i - 1][0] === T_WHITESPACE
-				&& $token[0] === T_STRING)
-			{
-				$className = $token[1];
-				break;
-			}
-		}
-
-		if (empty($className))
-		{
-			return '';
-		}
-
-		return $namespace . '\\' . $className;
-	}
-
-	/**
-	 * Searches through all of the defined namespaces looking for a file.
-	 * Returns an array of all found locations for the defined file.
-	 *
-	 * Example:
-	 *
-	 *  $locator->search('Config/Routes.php');
-	 *  // Assuming PSR4 namespaces include foo and bar, might return:
-	 *  [
-	 *      'app/Modules/foo/Config/Routes.php',
-	 *      'app/Modules/bar/Config/Routes.php',
-	 *  ]
-	 *
-	 * @param string  $path
-	 * @param string  $ext
-	 * @param boolean $prioritizeApp
-	 *
-	 * @return array
-	 */
-	public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
-	{
-		$path = $this->ensureExt($path, $ext);
-
-		$foundPaths = [];
-		$appPaths   = [];
-
-		foreach ($this->getNamespaces() as $namespace)
-		{
-			if (isset($namespace['path']) && is_file($namespace['path'] . $path))
-			{
-				$fullPath = $namespace['path'] . $path;
-				$fullPath = realpath($fullPath) ?: $fullPath;
-
-				if ($prioritizeApp)
-				{
-					$foundPaths[] = $fullPath;
-				}
-				elseif (strpos($fullPath, APPPATH) === 0)
-				{
-					$appPaths[] = $fullPath;
-				}
-				else
-				{
-					$foundPaths[] = $fullPath;
-				}
-			}
-		}
-
-		if (! $prioritizeApp && ! empty($appPaths))
-		{
-			$foundPaths = array_merge($foundPaths, $appPaths);
-		}
-
-		// Remove any duplicates
-		$foundPaths = array_unique($foundPaths);
-
-		return $foundPaths;
-	}
-
-	/**
-	 * Ensures a extension is at the end of a filename
-	 *
-	 * @param string $path
-	 * @param string $ext
-	 *
-	 * @return string
-	 */
-	protected function ensureExt(string $path, string $ext): string
-	{
-		if ($ext)
-		{
-			$ext = '.' . $ext;
-
-			if (substr($path, -strlen($ext)) !== $ext)
-			{
-				$path .= $ext;
-			}
-		}
-
-		return $path;
-	}
-
-	/**
-	 * Return the namespace mappings we know about.
-	 *
-	 * @return array|string
-	 */
-	protected function getNamespaces()
-	{
-		$namespaces = [];
-
-		// Save system for last
-		$system = [];
-
-		foreach ($this->autoloader->getNamespace() as $prefix => $paths)
-		{
-			foreach ($paths as $path)
-			{
-				if ($prefix === 'CodeIgniter')
-				{
-					$system = [
-						'prefix' => $prefix,
-						'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
-					];
-
-					continue;
-				}
-
-				$namespaces[] = [
-					'prefix' => $prefix,
-					'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
-				];
-			}
-		}
-
-		$namespaces[] = $system;
-
-		return $namespaces;
-	}
-
-	/**
-	 * Find the qualified name of a file according to
-	 * the namespace of the first matched namespace path.
-	 *
-	 * @param string $path
-	 *
-	 * @return string|false The qualified name or false if the path is not found
-	 */
-	public function findQualifiedNameFromPath(string $path)
-	{
-		$path = realpath($path) ?: $path;
-
-		if (! is_file($path))
-		{
-			return false;
-		}
-
-		foreach ($this->getNamespaces() as $namespace)
-		{
-			$namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
-
-			if (empty($namespace['path']))
-			{
-				continue;
-			}
-
-			if (mb_strpos($path, $namespace['path']) === 0)
-			{
-				$className = '\\' . $namespace['prefix'] . '\\' .
-						ltrim(str_replace('/', '\\', mb_substr(
-							$path, mb_strlen($namespace['path']))
-						), '\\');
-
-				// Remove the file extension (.php)
-				$className = mb_substr($className, 0, -4);
-
-				// Check if this exists
-				if (class_exists($className))
-				{
-					return $className;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Scans the defined namespaces, returning a list of all files
-	 * that are contained within the subpath specified by $path.
-	 *
-	 * @param string $path
-	 *
-	 * @return array
-	 */
-	public function listFiles(string $path): array
-	{
-		if (empty($path))
-		{
-			return [];
-		}
-
-		$files = [];
-		helper('filesystem');
-
-		foreach ($this->getNamespaces() as $namespace)
-		{
-			$fullPath = $namespace['path'] . $path;
-			$fullPath = realpath($fullPath) ?: $fullPath;
-
-			if (! is_dir($fullPath))
-			{
-				continue;
-			}
-
-			$tempFiles = get_filenames($fullPath, true);
-
-			if (! empty($tempFiles))
-			{
-				$files = array_merge($files, $tempFiles);
-			}
-		}
-
-		return $files;
-	}
-
-	/**
-	 * Scans the provided namespace, returning a list of all files
-	 * that are contained within the subpath specified by $path.
-	 *
-	 * @param string $prefix
-	 * @param string $path
-	 *
-	 * @return array
-	 */
-	public function listNamespaceFiles(string $prefix, string $path): array
-	{
-		if (empty($path) || empty($prefix))
-		{
-			return [];
-		}
-
-		$files = [];
-		helper('filesystem');
-
-		// autoloader->getNamespace($prefix) returns an array of paths for that namespace
-		foreach ($this->autoloader->getNamespace($prefix) as $namespacePath)
-		{
-			$fullPath = rtrim($namespacePath, '/') . '/' . $path;
-			$fullPath = realpath($fullPath) ?: $fullPath;
-
-			if (! is_dir($fullPath))
-			{
-				continue;
-			}
-
-			$tempFiles = get_filenames($fullPath, true);
-
-			if (! empty($tempFiles))
-			{
-				$files = array_merge($files, $tempFiles);
-			}
-		}
-
-		return $files;
-	}
-
-	/**
-	 * Checks the app folder to see if the file can be found.
-	 * Only for use with filenames that DO NOT include namespacing.
-	 *
-	 * @param string      $file
-	 * @param string|null $folder
-	 *
-	 * @return string|false The path to the file, or false if not found.
-	 */
-	protected function legacyLocate(string $file, string $folder = null)
-	{
-		$path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
-		$path = realpath($path) ?: $path;
-
-		if (is_file($path))
-		{
-			return $path;
-		}
-
-		return false;
-	}
+    /**
+     * The Autoloader to use.
+     *
+     * @var Autoloader
+     */
+    protected $autoloader;
+
+    public function __construct(Autoloader $autoloader)
+    {
+        $this->autoloader = $autoloader;
+    }
+
+    /**
+     * Attempts to locate a file by examining the name for a namespace
+     * and looking through the PSR-4 namespaced files that we know about.
+     *
+     * @param string      $file   The namespaced file to locate
+     * @param string|null $folder The folder within the namespace that we should look for the file.
+     * @param string      $ext    The file extension the file should have.
+     *
+     * @return false|string The path to the file, or false if not found.
+     */
+    public function locateFile(string $file, ?string $folder = null, string $ext = 'php')
+    {
+        $file = $this->ensureExt($file, $ext);
+
+        // Clears the folder name if it is at the beginning of the filename
+        if (! empty($folder) && strpos($file, $folder) === 0) {
+            $file = substr($file, strlen($folder . '/'));
+        }
+
+        // Is not namespaced? Try the application folder.
+        if (strpos($file, '\\') === false) {
+            return $this->legacyLocate($file, $folder);
+        }
+
+        // Standardize slashes to handle nested directories.
+        $file = strtr($file, '/', '\\');
+
+        $segments = explode('\\', $file);
+
+        // The first segment will be empty if a slash started the filename.
+        if (empty($segments[0])) {
+            unset($segments[0]);
+        }
+
+        $paths    = [];
+        $prefix   = '';
+        $filename = '';
+
+        // Namespaces always comes with arrays of paths
+        $namespaces = $this->autoloader->getNamespace();
+
+        while (! empty($segments)) {
+            $prefix .= empty($prefix) ? array_shift($segments) : '\\' . array_shift($segments);
+
+            if (empty($namespaces[$prefix])) {
+                continue;
+            }
+
+            $paths = $namespaces[$prefix];
+
+            $filename = implode('/', $segments);
+            break;
+        }
+
+        // if no namespaces matched then quit
+        if (empty($paths)) {
+            return false;
+        }
+
+        // Check each path in the namespace
+        foreach ($paths as $path) {
+            // Ensure trailing slash
+            $path = rtrim($path, '/') . '/';
+
+            // If we have a folder name, then the calling function
+            // expects this file to be within that folder, like 'Views',
+            // or 'libraries'.
+            if (! empty($folder) && strpos($path . $filename, '/' . $folder . '/') === false) {
+                $path .= trim($folder, '/') . '/';
+            }
+
+            $path .= $filename;
+            if (is_file($path)) {
+                return $path;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Examines a file and returns the fully qualified domain name.
+     */
+    public function getClassname(string $file): string
+    {
+        $php       = file_get_contents($file);
+        $tokens    = token_get_all($php);
+        $dlm       = false;
+        $namespace = '';
+        $className = '';
+
+        foreach ($tokens as $i => $token) {
+            if ($i < 2) {
+                continue;
+            }
+
+            if ((isset($tokens[$i - 2][1]) && ($tokens[$i - 2][1] === 'phpnamespace' || $tokens[$i - 2][1] === 'namespace')) || ($dlm && $tokens[$i - 1][0] === T_NS_SEPARATOR && $token[0] === T_STRING)) {
+                if (! $dlm) {
+                    $namespace = 0;
+                }
+                if (isset($token[1])) {
+                    $namespace = $namespace ? $namespace . '\\' . $token[1] : $token[1];
+                    $dlm       = true;
+                }
+            } elseif ($dlm && ($token[0] !== T_NS_SEPARATOR) && ($token[0] !== T_STRING)) {
+                $dlm = false;
+            }
+
+            if (($tokens[$i - 2][0] === T_CLASS || (isset($tokens[$i - 2][1]) && $tokens[$i - 2][1] === 'phpclass'))
+                && $tokens[$i - 1][0] === T_WHITESPACE
+                && $token[0] === T_STRING) {
+                $className = $token[1];
+                break;
+            }
+        }
+
+        if (empty($className)) {
+            return '';
+        }
+
+        return $namespace . '\\' . $className;
+    }
+
+    /**
+     * Searches through all of the defined namespaces looking for a file.
+     * Returns an array of all found locations for the defined file.
+     *
+     * Example:
+     *
+     *  $locator->search('Config/Routes.php');
+     *  // Assuming PSR4 namespaces include foo and bar, might return:
+     *  [
+     *      'app/Modules/foo/Config/Routes.php',
+     *      'app/Modules/bar/Config/Routes.php',
+     *  ]
+     */
+    public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
+    {
+        $path = $this->ensureExt($path, $ext);
+
+        $foundPaths = [];
+        $appPaths   = [];
+
+        foreach ($this->getNamespaces() as $namespace) {
+            if (isset($namespace['path']) && is_file($namespace['path'] . $path)) {
+                $fullPath = $namespace['path'] . $path;
+                $fullPath = realpath($fullPath) ?: $fullPath;
+
+                if ($prioritizeApp) {
+                    $foundPaths[] = $fullPath;
+                } elseif (strpos($fullPath, APPPATH) === 0) {
+                    $appPaths[] = $fullPath;
+                } else {
+                    $foundPaths[] = $fullPath;
+                }
+            }
+        }
+
+        if (! $prioritizeApp && ! empty($appPaths)) {
+            $foundPaths = array_merge($foundPaths, $appPaths);
+        }
+
+        // Remove any duplicates
+        return array_unique($foundPaths);
+    }
+
+    /**
+     * Ensures a extension is at the end of a filename
+     */
+    protected function ensureExt(string $path, string $ext): string
+    {
+        if ($ext) {
+            $ext = '.' . $ext;
+
+            if (substr($path, -strlen($ext)) !== $ext) {
+                $path .= $ext;
+            }
+        }
+
+        return $path;
+    }
+
+    /**
+     * Return the namespace mappings we know about.
+     *
+     * @return array|string
+     */
+    protected function getNamespaces()
+    {
+        $namespaces = [];
+
+        // Save system for last
+        $system = [];
+
+        foreach ($this->autoloader->getNamespace() as $prefix => $paths) {
+            foreach ($paths as $path) {
+                if ($prefix === 'CodeIgniter') {
+                    $system = [
+                        'prefix' => $prefix,
+                        'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
+                    ];
+
+                    continue;
+                }
+
+                $namespaces[] = [
+                    'prefix' => $prefix,
+                    'path'   => rtrim($path, '\\/') . DIRECTORY_SEPARATOR,
+                ];
+            }
+        }
+
+        $namespaces[] = $system;
+
+        return $namespaces;
+    }
+
+    /**
+     * Find the qualified name of a file according to
+     * the namespace of the first matched namespace path.
+     *
+     * @return false|string The qualified name or false if the path is not found
+     */
+    public function findQualifiedNameFromPath(string $path)
+    {
+        $path = realpath($path) ?: $path;
+
+        if (! is_file($path)) {
+            return false;
+        }
+
+        foreach ($this->getNamespaces() as $namespace) {
+            $namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
+
+            if (empty($namespace['path'])) {
+                continue;
+            }
+
+            if (mb_strpos($path, $namespace['path']) === 0) {
+                $className = '\\' . $namespace['prefix'] . '\\' .
+                        ltrim(str_replace(
+                            '/',
+                            '\\',
+                            mb_substr($path, mb_strlen($namespace['path']))
+                        ), '\\');
+
+                // Remove the file extension (.php)
+                $className = mb_substr($className, 0, -4);
+
+                // Check if this exists
+                if (class_exists($className)) {
+                    return $className;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Scans the defined namespaces, returning a list of all files
+     * that are contained within the subpath specified by $path.
+     */
+    public function listFiles(string $path): array
+    {
+        if (empty($path)) {
+            return [];
+        }
+
+        $files = [];
+        helper('filesystem');
+
+        foreach ($this->getNamespaces() as $namespace) {
+            $fullPath = $namespace['path'] . $path;
+            $fullPath = realpath($fullPath) ?: $fullPath;
+
+            if (! is_dir($fullPath)) {
+                continue;
+            }
+
+            $tempFiles = get_filenames($fullPath, true);
+
+            if (! empty($tempFiles)) {
+                $files = array_merge($files, $tempFiles);
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Scans the provided namespace, returning a list of all files
+     * that are contained within the subpath specified by $path.
+     */
+    public function listNamespaceFiles(string $prefix, string $path): array
+    {
+        if (empty($path) || empty($prefix)) {
+            return [];
+        }
+
+        $files = [];
+        helper('filesystem');
+
+        // autoloader->getNamespace($prefix) returns an array of paths for that namespace
+        foreach ($this->autoloader->getNamespace($prefix) as $namespacePath) {
+            $fullPath = rtrim($namespacePath, '/') . '/' . $path;
+            $fullPath = realpath($fullPath) ?: $fullPath;
+
+            if (! is_dir($fullPath)) {
+                continue;
+            }
+
+            $tempFiles = get_filenames($fullPath, true);
+
+            if (! empty($tempFiles)) {
+                $files = array_merge($files, $tempFiles);
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Checks the app folder to see if the file can be found.
+     * Only for use with filenames that DO NOT include namespacing.
+     *
+     * @return false|string The path to the file, or false if not found.
+     */
+    protected function legacyLocate(string $file, ?string $folder = null)
+    {
+        $path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
+        $path = realpath($path) ?: $path;
+
+        if (is_file($path)) {
+            return $path;
+        }
+
+        return false;
+    }
 }
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 75947add1d73..e57ac4fec6bd 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -29,8 +29,6 @@
 use stdClass;
 
 /**
- * Class Model
- *
  * The BaseModel class provides a number of convenient features that
  * makes working with a databases less painful. Extending this class
  * provide means of implementing various database systems
@@ -46,1767 +44,1651 @@
  */
 abstract class BaseModel
 {
-	/**
-	 * Pager instance.
-	 * Populated after calling $this->paginate()
-	 *
-	 * @var Pager
-	 */
-	public $pager;
-
-	/**
-	 * Last insert ID
-	 *
-	 * @var integer|string
-	 */
-	protected $insertID = 0;
-
-	/**
-	 * The Database connection group that
-	 * should be instantiated.
-	 *
-	 * @var string
-	 */
-	protected $DBGroup;
-
-	/**
-	 * The format that the results should be returned as.
-	 * Will be overridden if the as* methods are used.
-	 *
-	 * @var string
-	 */
-	protected $returnType = 'array';
-
-	/**
-	 * If this model should use "softDeletes" and
-	 * simply set a date when rows are deleted, or
-	 * do hard deletes.
-	 *
-	 * @var boolean
-	 */
-	protected $useSoftDeletes = false;
-
-	/**
-	 * An array of field names that are allowed
-	 * to be set by the user in inserts/updates.
-	 *
-	 * @var array
-	 */
-	protected $allowedFields = [];
-
-	/**
-	 * If true, will set created_at, and updated_at
-	 * values during insert and update routines.
-	 *
-	 * @var boolean
-	 */
-	protected $useTimestamps = false;
-
-	/**
-	 * The type of column that created_at and updated_at
-	 * are expected to.
-	 *
-	 * Allowed: 'datetime', 'date', 'int'
-	 *
-	 * @var string
-	 */
-	protected $dateFormat = 'datetime';
-
-	/**
-	 * The column used for insert timestamps
-	 *
-	 * @var string
-	 */
-	protected $createdField = 'created_at';
-
-	/**
-	 * The column used for update timestamps
-	 *
-	 * @var string
-	 */
-	protected $updatedField = 'updated_at';
-
-	/**
-	 * Used by withDeleted to override the
-	 * model's softDelete setting.
-	 *
-	 * @var boolean
-	 */
-	protected $tempUseSoftDeletes;
-
-	/**
-	 * The column used to save soft delete state
-	 *
-	 * @var string
-	 */
-	protected $deletedField = 'deleted_at';
-
-	/**
-	 * Used by asArray and asObject to provide
-	 * temporary overrides of model default.
-	 *
-	 * @var string
-	 */
-	protected $tempReturnType;
-
-	/**
-	 * Whether we should limit fields in inserts
-	 * and updates to those available in $allowedFields or not.
-	 *
-	 * @var boolean
-	 */
-	protected $protectFields = true;
-
-	/**
-	 * Database Connection
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * Rules used to validate data in insert, update, and save methods.
-	 * The array must match the format of data passed to the Validation
-	 * library.
-	 *
-	 * @var array|string
-	 */
-	protected $validationRules = [];
-
-	/**
-	 * Contains any custom error messages to be
-	 * used during data validation.
-	 *
-	 * @var array
-	 */
-	protected $validationMessages = [];
-
-	/**
-	 * Skip the model's validation. Used in conjunction with skipValidation()
-	 * to skip data validation for any future calls.
-	 *
-	 * @var boolean
-	 */
-	protected $skipValidation = false;
-
-	/**
-	 * Whether rules should be removed that do not exist
-	 * in the passed in data. Used between inserts/updates.
-	 *
-	 * @var boolean
-	 */
-	protected $cleanValidationRules = true;
-
-	/**
-	 * Our validator instance.
-	 *
-	 * @var Validation
-	 */
-	protected $validation;
-
-	/*
-	 * Callbacks.
-	 *
-	 * Each array should contain the method names (within the model)
-	 * that should be called when those events are triggered.
-	 *
-	 * "Update" and "delete" methods are passed the same items that
-	 * are given to their respective method.
-	 *
-	 * "Find" methods receive the ID searched for (if present), and
-	 * 'afterFind' additionally receives the results that were found.
-	 */
-
-	/**
-	 * Whether to trigger the defined callbacks
-	 *
-	 * @var boolean
-	 */
-	protected $allowCallbacks = true;
-
-	/**
-	 * Used by allowCallbacks() to override the
-	 * model's allowCallbacks setting.
-	 *
-	 * @var boolean
-	 */
-	protected $tempAllowCallbacks;
-
-	/**
-	 * Callbacks for beforeInsert
-	 *
-	 * @var array
-	 */
-	protected $beforeInsert = [];
-
-	/**
-	 * Callbacks for afterInsert
-	 *
-	 * @var array
-	 */
-	protected $afterInsert = [];
-
-	/**
-	 * Callbacks for beforeUpdate
-	 *
-	 * @var array
-	 */
-	protected $beforeUpdate = [];
-
-	/**
-	 * Callbacks for afterUpdate
-	 *
-	 * @var array
-	 */
-	protected $afterUpdate = [];
-
-	/**
-	 * Callbacks for beforeFind
-	 *
-	 * @var array
-	 */
-	protected $beforeFind = [];
-
-	/**
-	 * Callbacks for afterFind
-	 *
-	 * @var array
-	 */
-	protected $afterFind = [];
-
-	/**
-	 * Callbacks for beforeDelete
-	 *
-	 * @var array
-	 */
-	protected $beforeDelete = [];
-
-	/**
-	 * Callbacks for afterDelete
-	 *
-	 * @var array
-	 */
-	protected $afterDelete = [];
-
-	/**
-	 * BaseModel constructor.
-	 *
-	 * @param ValidationInterface|null $validation Validation
-	 */
-	public function __construct(ValidationInterface $validation = null)
-	{
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		/**
-		 * @var Validation $validation
-		 */
-		$validation       = $validation ?? Services::validation(null, false);
-		$this->validation = $validation;
-
-		$this->initialize();
-	}
-
-	/**
-	 * Initializes the instance with any additional steps.
-	 * Optionally implemented by child classes.
-	 */
-	protected function initialize()
-	{
-	}
-
-	/**
-	 * Fetches the row of database
-	 * This methods works only with dbCalls
-	 *
-	 * @param boolean                   $singleton Single or multiple results
-	 * @param array|integer|string|null $id        One primary key or an array of primary keys
-	 *
-	 * @return array|object|null The resulting row of data, or null.
-	 */
-	abstract protected function doFind(bool $singleton, $id = null);
-
-	/**
-	 * Fetches the column of database
-	 * This methods works only with dbCalls
-	 *
-	 * @param string $columnName Column Name
-	 *
-	 * @return array|null The resulting row of data, or null if no data found.
-	 *
-	 * @throws DataException
-	 */
-	abstract protected function doFindColumn(string $columnName);
-
-	/**
-	 * Fetches all results, while optionally limiting them.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer $limit  Limit
-	 * @param integer $offset Offset
-	 *
-	 * @return array
-	 */
-	abstract protected function doFindAll(int $limit = 0, int $offset = 0);
-
-	/**
-	 * Returns the first row of the result set.
-	 * This methods works only with dbCalls
-	 *
-	 * @return array|object|null
-	 */
-	abstract protected function doFirst();
-
-	/**
-	 * Inserts data into the current database
-	 * This methods works only with dbCalls
-	 *
-	 * @param array $data Data
-	 *
-	 * @return integer|string|boolean
-	 */
-	abstract protected function doInsert(array $data);
-
-	/**
-	 * Compiles batch insert and runs the queries, validating each row prior.
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null   $set       An associative array of insert values
-	 * @param boolean|null $escape    Whether to escape values and identifiers
-	 * @param integer      $batchSize The size of the batch to run
-	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
-	 *
-	 * @return integer|boolean Number of rows inserted or FALSE on failure
-	 */
-	abstract protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false);
-
-	/**
-	 * Updates a single record in the database.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer|array|string|null $id   ID
-	 * @param array|null                $data Data
-	 *
-	 * @return boolean
-	 */
-	abstract protected function doUpdate($id = null, $data = null): bool;
-
-	/**
-	 * Compiles an update and runs the query
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null  $set       An associative array of update values
-	 * @param string|null $index     The where key
-	 * @param integer     $batchSize The size of the batch to run
-	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
-	 *
-	 * @return mixed    Number of rows affected or FALSE on failure
-	 *
-	 * @throws DatabaseException
-	 */
-	abstract protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false);
-
-	/**
-	 * Deletes a single record from the database where $id matches
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer|string|array|null $id    The rows primary key(s)
-	 * @param boolean                   $purge Allows overriding the soft deletes setting.
-	 *
-	 * @return string|boolean
-	 *
-	 * @throws DatabaseException
-	 */
-	abstract protected function doDelete($id = null, bool $purge = false);
-
-	/**
-	 * Permanently deletes all rows that have been marked as deleted
-	 * through soft deletes (deleted = 1)
-	 * This methods works only with dbCalls
-	 *
-	 * @return boolean|mixed
-	 */
-	abstract protected function doPurgeDeleted();
-
-	/**
-	 * Works with the find* methods to return only the rows that
-	 * have been deleted.
-	 * This methods works only with dbCalls
-	 *
-	 * @return void
-	 */
-	abstract protected function doOnlyDeleted();
-
-	/**
-	 * Compiles a replace and runs the query
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null $data      Data
-	 * @param boolean    $returnSQL Set to true to return Query String
-	 *
-	 * @return mixed
-	 */
-	abstract protected function doReplace(array $data = null, bool $returnSQL = false);
-
-	/**
-	 * Grabs the last error(s) that occurred from the Database connection.
-	 * This methods works only with dbCalls
-	 *
-	 * @return array|null
-	 */
-	abstract protected function doErrors();
-
-	/**
-	 * Returns the id value for the data array or object
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return integer|array|string|null
-	 *
-	 * @deprecated Add an override on getIdValue() instead. Will be removed in version 5.0.
-	 */
-	abstract protected function idValue($data);
-
-	/**
-	 * Public getter to return the id value using the idValue() method
-	 * For example with SQL this will return $data->$this->primaryKey
-	 *
-	 * @param array|object $data
-	 *
-	 * @return array|integer|string|null
-	 *
-	 * @todo: Make abstract in version 5.0
-	 */
-	public function getIdValue($data)
-	{
-		return $this->idValue($data);
-	}
-
-	/**
-	 * Override countAllResults to account for soft deleted accounts.
-	 * This methods works only with dbCalls
-	 *
-	 * @param boolean $reset Reset
-	 * @param boolean $test  Test
-	 *
-	 * @return mixed
-	 */
-	abstract public function countAllResults(bool $reset = true, bool $test = false);
-
-	/**
-	 * Loops over records in batches, allowing you to operate on them.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer $size     Size
-	 * @param Closure $userFunc Callback Function
-	 *
-	 * @return void
-	 *
-	 * @throws DataException
-	 */
-	abstract public function chunk(int $size, Closure $userFunc);
-
-	/**
-	 * Fetches the row of database
-	 *
-	 * @param array|integer|string|null $id One primary key or an array of primary keys
-	 *
-	 * @return array|object|null The resulting row of data, or null.
-	 */
-	public function find($id = null)
-	{
-		$singleton = is_numeric($id) || is_string($id);
-
-		if ($this->tempAllowCallbacks)
-		{
-			// Call the before event and check for a return
-			$eventData = $this->trigger('beforeFind', [
-				'id'        => $id,
-				'method'    => 'find',
-				'singleton' => $singleton,
-			]);
-
-			if (! empty($eventData['returnData']))
-			{
-				return $eventData['data'];
-			}
-		}
-
-		$eventData = [
-			'id'        => $id,
-			'data'      => $this->doFind($singleton, $id),
-			'method'    => 'find',
-			'singleton' => $singleton,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$eventData = $this->trigger('afterFind', $eventData);
-		}
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		return $eventData['data'];
-	}
-
-	/**
-	 * Fetches the column of database
-	 *
-	 * @param string $columnName Column Name
-	 *
-	 * @return array|null The resulting row of data, or null if no data found.
-	 *
-	 * @throws DataException
-	 */
-	public function findColumn(string $columnName)
-	{
-		if (strpos($columnName, ',') !== false)
-		{
-			throw DataException::forFindColumnHaveMultipleColumns();
-		}
-
-		$resultSet = $this->doFindColumn($columnName);
-
-		return $resultSet ? array_column($resultSet, $columnName) : null;
-	}
-
-	/**
-	 * Fetches all results, while optionally limiting them.
-	 *
-	 * @param integer $limit  Limit
-	 * @param integer $offset Offset
-	 *
-	 * @return array
-	 */
-	public function findAll(int $limit = 0, int $offset = 0)
-	{
-		if ($this->tempAllowCallbacks)
-		{
-			// Call the before event and check for a return
-			$eventData = $this->trigger('beforeFind', [
-				'method'    => 'findAll',
-				'limit'     => $limit,
-				'offset'    => $offset,
-				'singleton' => false,
-			]);
-
-			if (! empty($eventData['returnData']))
-			{
-				return $eventData['data'];
-			}
-		}
-
-		$eventData = [
-			'data'      => $this->doFindAll($limit, $offset),
-			'limit'     => $limit,
-			'offset'    => $offset,
-			'method'    => 'findAll',
-			'singleton' => false,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$eventData = $this->trigger('afterFind', $eventData);
-		}
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		return $eventData['data'];
-	}
-
-	/**
-	 * Returns the first row of the result set.
-	 *
-	 * @return array|object|null
-	 */
-	public function first()
-	{
-		if ($this->tempAllowCallbacks)
-		{
-			// Call the before event and check for a return
-			$eventData = $this->trigger('beforeFind', [
-				'method'    => 'first',
-				'singleton' => true,
-			]);
-
-			if (! empty($eventData['returnData']))
-			{
-				return $eventData['data'];
-			}
-		}
-
-		$eventData = [
-			'data'      => $this->doFirst(),
-			'method'    => 'first',
-			'singleton' => true,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$eventData = $this->trigger('afterFind', $eventData);
-		}
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		return $eventData['data'];
-	}
-
-	/**
-	 * A convenience method that will attempt to determine whether the
-	 * data should be inserted or updated. Will work with either
-	 * an array or object. When using with custom class objects,
-	 * you must ensure that the class will provide access to the class
-	 * variables, even if through a magic method.
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return boolean
-	 *
-	 * @throws ReflectionException
-	 */
-	public function save($data): bool
-	{
-		if (empty($data))
-		{
-			return true;
-		}
-
-		if ($this->shouldUpdate($data))
-		{
-			$response = $this->update($this->getIdValue($data), $data);
-		}
-		else
-		{
-			$response = $this->insert($data, false);
-
-			if ($response !== false)
-			{
-				$response = true;
-			}
-		}
-		return $response;
-	}
-
-	/**
-	 * This method is called on save to determine if entry have to be updated
-	 * If this method return false insert operation will be executed
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return boolean
-	 */
-	protected function shouldUpdate($data) : bool
-	{
-		return ! empty($this->getIdValue($data));
-	}
-
-	/**
-	 * Returns last insert ID or 0.
-	 *
-	 * @return integer|string
-	 */
-	public function getInsertID()
-	{
-		return is_numeric($this->insertID) ? (int) $this->insertID : $this->insertID;
-	}
-
-	/**
-	 * Inserts data into the database. If an object is provided,
-	 * it will attempt to convert it to an array.
-	 *
-	 * @param array|object|null $data     Data
-	 * @param boolean           $returnID Whether insert ID should be returned or not.
-	 *
-	 * @return integer|string|boolean
-	 *
-	 * @throws ReflectionException
-	 */
-	public function insert($data = null, bool $returnID = true)
-	{
-		$this->insertID = 0;
-
-		$data = $this->transformDataToArray($data, 'insert');
-
-		// Validate data before saving.
-		if (! $this->skipValidation && ! $this->cleanRules()->validate($data))
-		{
-			return false;
-		}
-
-		// Must be called first so we don't
-		// strip out created_at values.
-		$data = $this->doProtectFields($data);
-
-		// doProtectFields() can further remove elements from
-		// $data so we need to check for empty dataset again
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('insert');
-		}
-
-		// Set created_at and updated_at with same time
-		$date = $this->setDate();
-
-		if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $data))
-		{
-			$data[$this->createdField] = $date;
-		}
-
-		if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data))
-		{
-			$data[$this->updatedField] = $date;
-		}
-
-		$eventData = ['data' => $data];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$eventData = $this->trigger('beforeInsert', $eventData);
-		}
-
-		$result = $this->doInsert($eventData['data']);
-
-		$eventData = [
-			'id'     => $this->insertID,
-			'data'   => $eventData['data'],
-			'result' => $result,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			// Trigger afterInsert events with the inserted data and new ID
-			$this->trigger('afterInsert', $eventData);
-		}
-
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		// If insertion failed, get out of here
-		if (! $result)
-		{
-			return $result;
-		}
-
-		// otherwise return the insertID, if requested.
-		return $returnID ? $this->insertID : $result;
-	}
-
-	/**
-	 * Compiles batch insert runs the queries, validating each row prior.
-	 *
-	 * @param array|null   $set       an associative array of insert values
-	 * @param boolean|null $escape    Whether to escape values and identifiers
-	 * @param integer      $batchSize The size of the batch to run
-	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
-	 *
-	 * @return integer|boolean Number of rows inserted or FALSE on failure
-	 *
-	 * @throws ReflectionException
-	 */
-	public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
-	{
-		if (is_array($set))
-		{
-			foreach ($set as &$row)
-			{
-				// If $data is using a custom class with public or protected
-				// properties representing the collection elements, we need to grab
-				// them as an array.
-				if (is_object($row) && ! $row instanceof stdClass)
-				{
-					$row = $this->objectToArray($row, false, true);
-				}
-
-				// If it's still a stdClass, go ahead and convert to
-				// an array so doProtectFields and other model methods
-				// don't have to do special checks.
-				if (is_object($row))
-				{
-					$row = (array) $row;
-				}
-
-				// Validate every row..
-				if (! $this->skipValidation && ! $this->cleanRules()->validate($row))
-				{
-					return false;
-				}
-
-				// Must be called first so we don't
-				// strip out created_at values.
-				$row = $this->doProtectFields($row);
-
-				// Set created_at and updated_at with same time
-				$date = $this->setDate();
-
-				if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $row))
-				{
-					$row[$this->createdField] = $date;
-				}
-
-				if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row))
-				{
-					$row[$this->updatedField] = $date;
-				}
-			}
-		}
-
-		return $this->doInsertBatch($set, $escape, $batchSize, $testing);
-	}
-
-	/**
-	 * Updates a single record in the database. If an object is provided,
-	 * it will attempt to convert it into an array.
-	 *
-	 * @param integer|array|string|null $id   ID
-	 * @param array|object|null         $data Data
-	 *
-	 * @return boolean
-	 *
-	 * @throws ReflectionException
-	 */
-	public function update($id = null, $data = null): bool
-	{
-		if (is_numeric($id) || is_string($id))
-		{
-			$id = [$id];
-		}
-
-		$data = $this->transformDataToArray($data, 'update');
-
-		// Validate data before saving.
-		if (! $this->skipValidation && ! $this->cleanRules(true)->validate($data))
-		{
-			return false;
-		}
-
-		// Must be called first so we don't
-		// strip out updated_at values.
-		$data = $this->doProtectFields($data);
-
-		// doProtectFields() can further remove elements from
-		// $data so we need to check for empty dataset again
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('update');
-		}
-
-		if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data))
-		{
-			$data[$this->updatedField] = $this->setDate();
-		}
-
-		$eventData = [
-			'id'   => $id,
-			'data' => $data,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$eventData = $this->trigger('beforeUpdate', $eventData);
-		}
-
-		$eventData = [
-			'id'     => $id,
-			'data'   => $eventData['data'],
-			'result' => $this->doUpdate($id, $eventData['data']),
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$this->trigger('afterUpdate', $eventData);
-		}
-
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		return $eventData['result'];
-	}
-
-	/**
-	 * Compiles an update and runs the query
-	 *
-	 * @param array|null  $set       An associative array of update values
-	 * @param string|null $index     The where key
-	 * @param integer     $batchSize The size of the batch to run
-	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
-	 *
-	 * @return mixed    Number of rows affected or FALSE on failure
-	 *
-	 * @throws DatabaseException
-	 * @throws ReflectionException
-	 */
-	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
-	{
-		if (is_array($set))
-		{
-			foreach ($set as &$row)
-			{
-				// If $data is using a custom class with public or protected
-				// properties representing the collection elements, we need to grab
-				// them as an array.
-				if (is_object($row) && ! $row instanceof stdClass)
-				{
-					$row = $this->objectToArray($row, true, true);
-				}
-
-				// If it's still a stdClass, go ahead and convert to
-				// an array so doProtectFields and other model methods
-				// don't have to do special checks.
-				if (is_object($row))
-				{
-					$row = (array) $row;
-				}
-
-				// Validate data before saving.
-				if (! $this->skipValidation && ! $this->cleanRules(true)->validate($row))
-				{
-					return false;
-				}
-
-				// Save updateIndex for later
-				$updateIndex = $row[$index] ?? null;
-
-				// Must be called first so we don't
-				// strip out updated_at values.
-				$row = $this->doProtectFields($row);
-
-				// Restore updateIndex value in case it was wiped out
-				if ($updateIndex !== null)
-				{
-					$row[$index] = $updateIndex;
-				}
-
-				if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row))
-				{
-					$row[$this->updatedField] = $this->setDate();
-				}
-			}
-		}
-
-		return $this->doUpdateBatch($set, $index, $batchSize, $returnSQL);
-	}
-
-	/**
-	 * Deletes a single record from the database where $id matches
-	 *
-	 * @param integer|string|array|null $id    The rows primary key(s)
-	 * @param boolean                   $purge Allows overriding the soft deletes setting.
-	 *
-	 * @return BaseResult|boolean
-	 *
-	 * @throws DatabaseException
-	 */
-	public function delete($id = null, bool $purge = false)
-	{
-		if ($id && (is_numeric($id) || is_string($id)))
-		{
-			$id = [$id];
-		}
-
-		$eventData = [
-			'id'    => $id,
-			'purge' => $purge,
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$this->trigger('beforeDelete', $eventData);
-		}
-
-		$eventData = [
-			'id'     => $id,
-			'data'   => null,
-			'purge'  => $purge,
-			'result' => $this->doDelete($id, $purge),
-		];
-
-		if ($this->tempAllowCallbacks)
-		{
-			$this->trigger('afterDelete', $eventData);
-		}
-
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		return $eventData['result'];
-	}
-
-	/**
-	 * Permanently deletes all rows that have been marked as deleted
-	 * through soft deletes (deleted = 1)
-	 *
-	 * @return boolean|mixed
-	 */
-	public function purgeDeleted()
-	{
-		if (! $this->useSoftDeletes)
-		{
-			return true;
-		}
-
-		return $this->doPurgeDeleted();
-	}
-
-	/**
-	 * Sets $useSoftDeletes value so that we can temporarily override
-	 * the soft deletes settings. Can be used for all find* methods.
-	 *
-	 * @param boolean $val Value
-	 *
-	 * @return $this
-	 */
-	public function withDeleted(bool $val = true)
-	{
-		$this->tempUseSoftDeletes = ! $val;
-
-		return $this;
-	}
-
-	/**
-	 * Works with the find* methods to return only the rows that
-	 * have been deleted.
-	 *
-	 * @return $this
-	 */
-	public function onlyDeleted()
-	{
-		$this->tempUseSoftDeletes = false;
-		$this->doOnlyDeleted();
-
-		return $this;
-	}
-
-	/**
-	 * Compiles a replace and runs the query
-	 *
-	 * @param array|null $data      Data
-	 * @param boolean    $returnSQL Set to true to return Query String
-	 *
-	 * @return mixed
-	 */
-	public function replace(array $data = null, bool $returnSQL = false)
-	{
-		// Validate data before saving.
-		if ($data && ! $this->skipValidation && ! $this->cleanRules(true)->validate($data))
-		{
-			return false;
-		}
-
-		return $this->doReplace($data, $returnSQL);
-	}
-
-	/**
-	 * Grabs the last error(s) that occurred. If data was validated,
-	 * it will first check for errors there, otherwise will try to
-	 * grab the last error from the Database connection.
-	 * The return array should be in the following format:
-	 *  ['source' => 'message']
-	 *
-	 * @param boolean $forceDB Always grab the db error, not validation
-	 *
-	 * @return array<string,string>
-	 */
-	public function errors(bool $forceDB = false)
-	{
-		// Do we have validation errors?
-		if (! $forceDB && ! $this->skipValidation && ($errors = $this->validation->getErrors()))
-		{
-			return $errors;
-		}
-
-		return $this->doErrors();
-	}
-
-	/**
-	 * Works with Pager to get the size and offset parameters.
-	 * Expects a GET variable (?page=2) that specifies the page of results
-	 * to display.
-	 *
-	 * @param integer|null $perPage Items per page
-	 * @param string       $group   Will be used by the pagination library to identify a unique pagination set.
-	 * @param integer|null $page    Optional page number (useful when the page number is provided in different way)
-	 * @param integer      $segment Optional URI segment number (if page number is provided by URI segment)
-	 *
-	 * @return array|null
-	 */
-	public function paginate(int $perPage = null, string $group = 'default', int $page = null, int $segment = 0)
-	{
-		$pager = Services::pager(null, null, false);
-
-		if ($segment)
-		{
-			$pager->setSegment($segment);
-		}
-
-		$page = $page >= 1 ? $page : $pager->getCurrentPage($group);
-		// Store it in the Pager library, so it can be paginated in the views.
-		$this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
-		$perPage     = $this->pager->getPerPage($group);
-		$offset      = ($page - 1) * $perPage;
-
-		return $this->findAll($perPage, $offset);
-	}
-
-	/**
-	 * It could be used when you have to change default or override current allowed fields.
-	 *
-	 * @param array $allowedFields Array with names of fields
-	 *
-	 * @return $this
-	 */
-	public function setAllowedFields(array $allowedFields)
-	{
-		$this->allowedFields = $allowedFields;
-
-		return $this;
-	}
-
-	/**
-	 * Sets whether or not we should whitelist data set during
-	 * updates or inserts against $this->availableFields.
-	 *
-	 * @param boolean $protect Value
-	 *
-	 * @return $this
-	 */
-	public function protect(bool $protect = true)
-	{
-		$this->protectFields = $protect;
-
-		return $this;
-	}
-
-	/**
-	 * Ensures that only the fields that are allowed to be updated
-	 * are in the data array.
-	 *
-	 * Used by insert() and update() to protect against mass assignment
-	 * vulnerabilities.
-	 *
-	 * @param array $data Data
-	 *
-	 * @return array
-	 *
-	 * @throws DataException
-	 */
-	protected function doProtectFields(array $data): array
-	{
-		if (! $this->protectFields)
-		{
-			return $data;
-		}
-
-		if (empty($this->allowedFields))
-		{
-			throw DataException::forInvalidAllowedFields(get_class($this));
-		}
-
-		foreach (array_keys($data) as $key)
-		{
-			if (! in_array($key, $this->allowedFields, true))
-			{
-				unset($data[$key]);
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Sets the date or current date if null value is passed
-	 *
-	 * @param integer|null $userData An optional PHP timestamp to be converted.
-	 *
-	 * @return mixed
-	 *
-	 * @throws ModelException
-	 */
-	protected function setDate(?int $userData = null)
-	{
-		$currentDate = $userData ?? time();
-		return $this->intToDate($currentDate);
-	}
-
-	/**
-	 * A utility function to allow child models to use the type of
-	 * date/time format that they prefer. This is primarily used for
-	 * setting created_at, updated_at and deleted_at values, but can be
-	 * used by inheriting classes.
-	 *
-	 * The available time formats are:
-	 *  - 'int'      - Stores the date as an integer timestamp
-	 *  - 'datetime' - Stores the data in the SQL datetime format
-	 *  - 'date'     - Stores the date (only) in the SQL date format.
-	 *
-	 * @param integer $value value
-	 *
-	 * @return integer|string
-	 *
-	 * @throws ModelException
-	 */
-	protected function intToDate(int $value)
-	{
-		switch ($this->dateFormat)
-		{
-			case 'int':
-				return $value;
-			case 'datetime':
-				return date('Y-m-d H:i:s', $value);
-			case 'date':
-				return date('Y-m-d', $value);
-			default:
-				throw ModelException::forNoDateFormat(static::class);
-		}
-	}
-
-	/**
-	 * Converts Time value to string using $this->dateFormat
-	 *
-	 * The available time formats are:
-	 *  - 'int'      - Stores the date as an integer timestamp
-	 *  - 'datetime' - Stores the data in the SQL datetime format
-	 *  - 'date'     - Stores the date (only) in the SQL date format.
-	 *
-	 * @param Time $value value
-	 *
-	 * @return string|integer
-	 */
-	protected function timeToDate(Time $value)
-	{
-		switch ($this->dateFormat)
-		{
-			case 'datetime':
-				return $value->format('Y-m-d H:i:s');
-			case 'date':
-				return $value->format('Y-m-d');
-			case 'int':
-				return $value->getTimestamp();
-			default:
-				return (string) $value;
-		}
-	}
-
-	/**
-	 * Set the value of the skipValidation flag.
-	 *
-	 * @param boolean $skip Value
-	 *
-	 * @return $this
-	 */
-	public function skipValidation(bool $skip = true)
-	{
-		$this->skipValidation = $skip;
-
-		return $this;
-	}
-
-	/**
-	 * Allows to set validation messages.
-	 * It could be used when you have to change default or override current validate messages.
-	 *
-	 * @param array $validationMessages Value
-	 *
-	 * @return $this
-	 */
-	public function setValidationMessages(array $validationMessages)
-	{
-		$this->validationMessages = $validationMessages;
-
-		return $this;
-	}
-
-	/**
-	 * Allows to set field wise validation message.
-	 * It could be used when you have to change default or override current validate messages.
-	 *
-	 * @param string $field         Field Name
-	 * @param array  $fieldMessages Validation messages
-	 *
-	 * @return $this
-	 */
-	public function setValidationMessage(string $field, array $fieldMessages)
-	{
-		$this->validationMessages[$field] = $fieldMessages;
-
-		return $this;
-	}
-
-	/**
-	 * Allows to set validation rules.
-	 * It could be used when you have to change default or override current validate rules.
-	 *
-	 * @param array $validationRules Value
-	 *
-	 * @return $this
-	 */
-	public function setValidationRules(array $validationRules)
-	{
-		$this->validationRules = $validationRules;
-
-		return $this;
-	}
-
-	/**
-	 * Allows to set field wise validation rules.
-	 * It could be used when you have to change default or override current validate rules.
-	 *
-	 * @param string       $field      Field Name
-	 * @param string|array $fieldRules Validation rules
-	 *
-	 * @return $this
-	 */
-	public function setValidationRule(string $field, $fieldRules)
-	{
-		$this->validationRules[$field] = $fieldRules;
-
-		return $this;
-	}
-
-	/**
-	 * Should validation rules be removed before saving?
-	 * Most handy when doing updates.
-	 *
-	 * @param boolean $choice Value
-	 *
-	 * @return $this
-	 */
-	public function cleanRules(bool $choice = false)
-	{
-		$this->cleanValidationRules = $choice;
-
-		return $this;
-	}
-
-	/**
-	 * Validate the data against the validation rules (or the validation group)
-	 * specified in the class property, $validationRules.
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return boolean
-	 */
-	public function validate($data): bool
-	{
-		$rules = $this->getValidationRules();
-
-		if ($this->skipValidation || empty($rules) || empty($data))
-		{
-			return true;
-		}
-
-		//Validation requires array, so cast away.
-		if (is_object($data))
-		{
-			$data = (array) $data;
-		}
-
-		$rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $data) : $rules;
-
-		// If no data existed that needs validation
-		// our job is done here.
-		if (empty($rules))
-		{
-			return true;
-		}
-
-		return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup);
-	}
-
-	/**
-	 * Returns the model's defined validation rules so that they
-	 * can be used elsewhere, if needed.
-	 *
-	 * @param array $options Options
-	 *
-	 * @return array
-	 */
-	public function getValidationRules(array $options = []): array
-	{
-		$rules = $this->validationRules;
-
-		// ValidationRules can be either a string, which is the group name,
-		// or an array of rules.
-		if (is_string($rules))
-		{
-			$rules = $this->validation->loadRuleGroup($rules);
-		}
-
-		if (isset($options['except']))
-		{
-			$rules = array_diff_key($rules, array_flip($options['except']));
-		}
-		elseif (isset($options['only']))
-		{
-			$rules = array_intersect_key($rules, array_flip($options['only']));
-		}
-
-		return $rules;
-	}
-
-	/**
-	 * Returns the model's define validation messages so they
-	 * can be used elsewhere, if needed.
-	 *
-	 * @return array
-	 */
-	public function getValidationMessages(): array
-	{
-		return $this->validationMessages;
-	}
-
-	/**
-	 * Removes any rules that apply to fields that have not been set
-	 * currently so that rules don't block updating when only updating
-	 * a partial row.
-	 *
-	 * @param array      $rules Array containing field name and rule
-	 * @param array|null $data  Data
-	 *
-	 * @return array
-	 */
-	protected function cleanValidationRules(array $rules, array $data = null): array
-	{
-		if (empty($data))
-		{
-			return [];
-		}
-
-		foreach (array_keys($rules) as $field)
-		{
-			if (! array_key_exists($field, $data))
-			{
-				unset($rules[$field]);
-			}
-		}
-
-		return $rules;
-	}
-
-	/**
-	 * Sets $tempAllowCallbacks value so that we can temporarily override
-	 * the setting. Resets after the next method that uses triggers.
-	 *
-	 * @param boolean $val value
-	 *
-	 * @return $this
-	 */
-	public function allowCallbacks(bool $val = true)
-	{
-		$this->tempAllowCallbacks = $val;
-
-		return $this;
-	}
-
-	/**
-	 * A simple event trigger for Model Events that allows additional
-	 * data manipulation within the model. Specifically intended for
-	 * usage by child models this can be used to format data,
-	 * save/load related classes, etc.
-	 *
-	 * It is the responsibility of the callback methods to return
-	 * the data itself.
-	 *
-	 * Each $eventData array MUST have a 'data' key with the relevant
-	 * data for callback methods (like an array of key/value pairs to insert
-	 * or update, an array of results, etc)
-	 *
-	 * If callbacks are not allowed then returns $eventData immediately.
-	 *
-	 * @param string $event     Event
-	 * @param array  $eventData Event Data
-	 *
-	 * @return mixed
-	 *
-	 * @throws DataException
-	 */
-	protected function trigger(string $event, array $eventData)
-	{
-		// Ensure it's a valid event
-		if (! isset($this->{$event}) || empty($this->{$event}))
-		{
-			return $eventData;
-		}
-
-		foreach ($this->{$event} as $callback)
-		{
-			if (! method_exists($this, $callback))
-			{
-				throw DataException::forInvalidMethodTriggered($callback);
-			}
-
-			$eventData = $this->{$callback}($eventData);
-		}
-
-		return $eventData;
-	}
-
-	/**
-	 * Sets the return type of the results to be as an associative array.
-	 *
-	 * @return $this
-	 */
-	public function asArray()
-	{
-		$this->tempReturnType = 'array';
-
-		return $this;
-	}
-
-	/**
-	 * Sets the return type to be of the specified type of object.
-	 * Defaults to a simple object, but can be any class that has
-	 * class vars with the same name as the collection columns,
-	 * or at least allows them to be created.
-	 *
-	 * @param string $class Class Name
-	 *
-	 * @return $this
-	 */
-	public function asObject(string $class = 'object')
-	{
-		$this->tempReturnType = $class;
-
-		return $this;
-	}
-
-	/**
-	 * Takes a class an returns an array of it's public and protected
-	 * properties as an array suitable for use in creates and updates.
-	 * This method use objectToRawArray internally and does conversion
-	 * to string on all Time instances
-	 *
-	 * @param string|object $data        Data
-	 * @param boolean       $onlyChanged Only Changed Property
-	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
-	 *
-	 * @return array Array
-	 *
-	 * @throws ReflectionException
-	 */
-	protected function objectToArray($data, bool $onlyChanged = true, bool $recursive = false): array
-	{
-		$properties = $this->objectToRawArray($data, $onlyChanged, $recursive);
-
-		// Convert any Time instances to appropriate $dateFormat
-		if ($properties)
-		{
-			$properties = array_map(function ($value) {
-				if ($value instanceof Time)
-				{
-					return $this->timeToDate($value);
-				}
-				return $value;
-			}, $properties);
-		}
-
-		return $properties;
-	}
-
-	/**
-	 * Takes a class an returns an array of it's public and protected
-	 * properties as an array with raw values.
-	 *
-	 * @param string|object $data        Data
-	 * @param boolean       $onlyChanged Only Changed Property
-	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
-	 *
-	 * @return array|null Array
-	 *
-	 * @throws ReflectionException
-	 */
-	protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
-	{
-		if (method_exists($data, 'toRawArray'))
-		{
-			$properties = $data->toRawArray($onlyChanged, $recursive);
-		}
-		else
-		{
-			$mirror = new ReflectionClass($data);
-			$props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
-
-			$properties = [];
-
-			// Loop over each property,
-			// saving the name/value in a new array we can return.
-			foreach ($props as $prop)
-			{
-				// Must make protected values accessible.
-				$prop->setAccessible(true);
-				$properties[$prop->getName()] = $prop->getValue($data);
-			}
-		}
-
-		return $properties;
-	}
-
-	/**
-	 * Transform data to array
-	 *
-	 * @param array|object|null $data Data
-	 * @param string            $type Type of data (insert|update)
-	 *
-	 * @return array
-	 *
-	 * @throws DataException
-	 * @throws InvalidArgumentException
-	 * @throws ReflectionException
-	 */
-	protected function transformDataToArray($data, string $type): array
-	{
-		if (! in_array($type, ['insert', 'update'], true))
-		{
-			throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
-		}
-
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset($type);
-		}
-
-		// If $data is using a custom class with public or protected
-		// properties representing the collection elements, we need to grab
-		// them as an array.
-		if (is_object($data) && ! $data instanceof stdClass)
-		{
-			$data = $this->objectToArray($data, true, true);
-		}
-
-		// If it's still a stdClass, go ahead and convert to
-		// an array so doProtectFields and other model methods
-		// don't have to do special checks.
-		if (is_object($data))
-		{
-			$data = (array) $data;
-		}
-
-		// If it's still empty here, means $data is no change or is empty object
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset($type);
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Provides the db connection and model's properties.
-	 *
-	 * @param string $name Name
-	 *
-	 * @return mixed
-	 */
-	public function __get(string $name)
-	{
-		if (property_exists($this, $name))
-		{
-			return $this->$name;
-		}
-
-		if (isset($this->db->$name))
-		{
-			return $this->db->$name;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Checks for the existence of properties across this model, and db connection.
-	 *
-	 * @param string $name Name
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $name): bool
-	{
-		if (property_exists($this, $name))
-		{
-			return true;
-		}
-		return isset($this->db->$name);
-	}
-
-	/**
-	 * Provides direct access to method in the database connection.
-	 *
-	 * @param string $name   Name
-	 * @param array  $params Params
-	 *
-	 * @return $this|null
-	 */
-	public function __call(string $name, array $params)
-	{
-		if (method_exists($this->db, $name))
-		{
-			return $this->db->{$name}(...$params);
-		}
-
-		return null;
-	}
-
-	/**
-	 * Replace any placeholders within the rules with the values that
-	 * match the 'key' of any properties being set. For example, if
-	 * we had the following $data array:
-	 *
-	 * [ 'id' => 13 ]
-	 *
-	 * and the following rule:
-	 *
-	 *  'required|is_unique[users,email,id,{id}]'
-	 *
-	 * The value of {id} would be replaced with the actual id in the form data:
-	 *
-	 *  'required|is_unique[users,email,id,13]'
-	 *
-	 * @param array $rules Validation rules
-	 * @param array $data  Data
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @deprecated use fillPlaceholders($rules, $data) from Validation instead
-	 *
-	 * @return array
-	 */
-	protected function fillPlaceholders(array $rules, array $data): array
-	{
-		$replacements = [];
-
-		foreach ($data as $key => $value)
-		{
-			$replacements['{' . $key . '}'] = $value;
-		}
-
-		if (! empty($replacements))
-		{
-			foreach ($rules as &$rule)
-			{
-				if (is_array($rule))
-				{
-					foreach ($rule as &$row)
-					{
-						// Should only be an `errors` array
-						// which doesn't take placeholders.
-						if (is_array($row))
-						{
-							continue;
-						}
-
-						$row = strtr($row, $replacements);
-					}
-
-					continue;
-				}
-
-				$rule = strtr($rule, $replacements);
-			}
-		}
-
-		return $rules;
-	}
+    /**
+     * Pager instance.
+     * Populated after calling $this->paginate()
+     *
+     * @var Pager
+     */
+    public $pager;
+
+    /**
+     * Last insert ID
+     *
+     * @var int|string
+     */
+    protected $insertID = 0;
+
+    /**
+     * The Database connection group that
+     * should be instantiated.
+     *
+     * @var string
+     */
+    protected $DBGroup;
+
+    /**
+     * The format that the results should be returned as.
+     * Will be overridden if the as* methods are used.
+     *
+     * @var string
+     */
+    protected $returnType = 'array';
+
+    /**
+     * If this model should use "softDeletes" and
+     * simply set a date when rows are deleted, or
+     * do hard deletes.
+     *
+     * @var bool
+     */
+    protected $useSoftDeletes = false;
+
+    /**
+     * An array of field names that are allowed
+     * to be set by the user in inserts/updates.
+     *
+     * @var array
+     */
+    protected $allowedFields = [];
+
+    /**
+     * If true, will set created_at, and updated_at
+     * values during insert and update routines.
+     *
+     * @var bool
+     */
+    protected $useTimestamps = false;
+
+    /**
+     * The type of column that created_at and updated_at
+     * are expected to.
+     *
+     * Allowed: 'datetime', 'date', 'int'
+     *
+     * @var string
+     */
+    protected $dateFormat = 'datetime';
+
+    /**
+     * The column used for insert timestamps
+     *
+     * @var string
+     */
+    protected $createdField = 'created_at';
+
+    /**
+     * The column used for update timestamps
+     *
+     * @var string
+     */
+    protected $updatedField = 'updated_at';
+
+    /**
+     * Used by withDeleted to override the
+     * model's softDelete setting.
+     *
+     * @var bool
+     */
+    protected $tempUseSoftDeletes;
+
+    /**
+     * The column used to save soft delete state
+     *
+     * @var string
+     */
+    protected $deletedField = 'deleted_at';
+
+    /**
+     * Used by asArray and asObject to provide
+     * temporary overrides of model default.
+     *
+     * @var string
+     */
+    protected $tempReturnType;
+
+    /**
+     * Whether we should limit fields in inserts
+     * and updates to those available in $allowedFields or not.
+     *
+     * @var bool
+     */
+    protected $protectFields = true;
+
+    /**
+     * Database Connection
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * Rules used to validate data in insert, update, and save methods.
+     * The array must match the format of data passed to the Validation
+     * library.
+     *
+     * @var array|string
+     */
+    protected $validationRules = [];
+
+    /**
+     * Contains any custom error messages to be
+     * used during data validation.
+     *
+     * @var array
+     */
+    protected $validationMessages = [];
+
+    /**
+     * Skip the model's validation. Used in conjunction with skipValidation()
+     * to skip data validation for any future calls.
+     *
+     * @var bool
+     */
+    protected $skipValidation = false;
+
+    /**
+     * Whether rules should be removed that do not exist
+     * in the passed in data. Used between inserts/updates.
+     *
+     * @var bool
+     */
+    protected $cleanValidationRules = true;
+
+    /**
+     * Our validator instance.
+     *
+     * @var Validation
+     */
+    protected $validation;
+
+    /*
+     * Callbacks.
+     *
+     * Each array should contain the method names (within the model)
+     * that should be called when those events are triggered.
+     *
+     * "Update" and "delete" methods are passed the same items that
+     * are given to their respective method.
+     *
+     * "Find" methods receive the ID searched for (if present), and
+     * 'afterFind' additionally receives the results that were found.
+     */
+
+    /**
+     * Whether to trigger the defined callbacks
+     *
+     * @var bool
+     */
+    protected $allowCallbacks = true;
+
+    /**
+     * Used by allowCallbacks() to override the
+     * model's allowCallbacks setting.
+     *
+     * @var bool
+     */
+    protected $tempAllowCallbacks;
+
+    /**
+     * Callbacks for beforeInsert
+     *
+     * @var array
+     */
+    protected $beforeInsert = [];
+
+    /**
+     * Callbacks for afterInsert
+     *
+     * @var array
+     */
+    protected $afterInsert = [];
+
+    /**
+     * Callbacks for beforeUpdate
+     *
+     * @var array
+     */
+    protected $beforeUpdate = [];
+
+    /**
+     * Callbacks for afterUpdate
+     *
+     * @var array
+     */
+    protected $afterUpdate = [];
+
+    /**
+     * Callbacks for beforeFind
+     *
+     * @var array
+     */
+    protected $beforeFind = [];
+
+    /**
+     * Callbacks for afterFind
+     *
+     * @var array
+     */
+    protected $afterFind = [];
+
+    /**
+     * Callbacks for beforeDelete
+     *
+     * @var array
+     */
+    protected $beforeDelete = [];
+
+    /**
+     * Callbacks for afterDelete
+     *
+     * @var array
+     */
+    protected $afterDelete = [];
+
+    public function __construct(?ValidationInterface $validation = null)
+    {
+        $this->tempReturnType     = $this->returnType;
+        $this->tempUseSoftDeletes = $this->useSoftDeletes;
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        /**
+         * @var Validation $validation
+         */
+        $validation       = $validation ?? Services::validation(null, false);
+        $this->validation = $validation;
+
+        $this->initialize();
+    }
+
+    /**
+     * Initializes the instance with any additional steps.
+     * Optionally implemented by child classes.
+     */
+    protected function initialize()
+    {
+    }
+
+    /**
+     * Fetches the row of database
+     * This methods works only with dbCalls
+     *
+     * @param bool                  $singleton Single or multiple results
+     * @param array|int|string|null $id        One primary key or an array of primary keys
+     *
+     * @return array|object|null The resulting row of data, or null.
+     */
+    abstract protected function doFind(bool $singleton, $id = null);
+
+    /**
+     * Fetches the column of database
+     * This methods works only with dbCalls
+     *
+     * @param string $columnName Column Name
+     *
+     * @throws DataException
+     *
+     * @return array|null The resulting row of data, or null if no data found.
+     */
+    abstract protected function doFindColumn(string $columnName);
+
+    /**
+     * Fetches all results, while optionally limiting them.
+     * This methods works only with dbCalls
+     *
+     * @param int $limit  Limit
+     * @param int $offset Offset
+     *
+     * @return array
+     */
+    abstract protected function doFindAll(int $limit = 0, int $offset = 0);
+
+    /**
+     * Returns the first row of the result set.
+     * This methods works only with dbCalls
+     *
+     * @return array|object|null
+     */
+    abstract protected function doFirst();
+
+    /**
+     * Inserts data into the current database
+     * This methods works only with dbCalls
+     *
+     * @param array $data Data
+     *
+     * @return bool|int|string
+     */
+    abstract protected function doInsert(array $data);
+
+    /**
+     * Compiles batch insert and runs the queries, validating each row prior.
+     * This methods works only with dbCalls
+     *
+     * @param array|null $set       An associative array of insert values
+     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param int        $batchSize The size of the batch to run
+     * @param bool       $testing   True means only number of records is returned, false will execute the query
+     *
+     * @return bool|int Number of rows inserted or FALSE on failure
+     */
+    abstract protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false);
+
+    /**
+     * Updates a single record in the database.
+     * This methods works only with dbCalls
+     *
+     * @param array|int|string|null $id   ID
+     * @param array|null            $data Data
+     */
+    abstract protected function doUpdate($id = null, $data = null): bool;
+
+    /**
+     * Compiles an update and runs the query
+     * This methods works only with dbCalls
+     *
+     * @param array|null  $set       An associative array of update values
+     * @param string|null $index     The where key
+     * @param int         $batchSize The size of the batch to run
+     * @param bool        $returnSQL True means SQL is returned, false will execute the query
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed Number of rows affected or FALSE on failure
+     */
+    abstract protected function doUpdateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false);
+
+    /**
+     * Deletes a single record from the database where $id matches
+     * This methods works only with dbCalls
+     *
+     * @param array|int|string|null $id    The rows primary key(s)
+     * @param bool                  $purge Allows overriding the soft deletes setting.
+     *
+     * @throws DatabaseException
+     *
+     * @return bool|string
+     */
+    abstract protected function doDelete($id = null, bool $purge = false);
+
+    /**
+     * Permanently deletes all rows that have been marked as deleted
+     * through soft deletes (deleted = 1)
+     * This methods works only with dbCalls
+     *
+     * @return bool|mixed
+     */
+    abstract protected function doPurgeDeleted();
+
+    /**
+     * Works with the find* methods to return only the rows that
+     * have been deleted.
+     * This methods works only with dbCalls
+     */
+    abstract protected function doOnlyDeleted();
+
+    /**
+     * Compiles a replace and runs the query
+     * This methods works only with dbCalls
+     *
+     * @param array|null $data      Data
+     * @param bool       $returnSQL Set to true to return Query String
+     *
+     * @return mixed
+     */
+    abstract protected function doReplace(?array $data = null, bool $returnSQL = false);
+
+    /**
+     * Grabs the last error(s) that occurred from the Database connection.
+     * This methods works only with dbCalls
+     *
+     * @return array|null
+     */
+    abstract protected function doErrors();
+
+    /**
+     * Returns the id value for the data array or object
+     *
+     * @param array|object $data Data
+     *
+     * @return array|int|string|null
+     *
+     * @deprecated Add an override on getIdValue() instead. Will be removed in version 5.0.
+     */
+    abstract protected function idValue($data);
+
+    /**
+     * Public getter to return the id value using the idValue() method
+     * For example with SQL this will return $data->$this->primaryKey
+     *
+     * @param array|object $data
+     *
+     * @return array|int|string|null
+     *
+     * @todo: Make abstract in version 5.0
+     */
+    public function getIdValue($data)
+    {
+        return $this->idValue($data);
+    }
+
+    /**
+     * Override countAllResults to account for soft deleted accounts.
+     * This methods works only with dbCalls
+     *
+     * @param bool $reset Reset
+     * @param bool $test  Test
+     *
+     * @return mixed
+     */
+    abstract public function countAllResults(bool $reset = true, bool $test = false);
+
+    /**
+     * Loops over records in batches, allowing you to operate on them.
+     * This methods works only with dbCalls
+     *
+     * @param int     $size     Size
+     * @param Closure $userFunc Callback Function
+     *
+     * @throws DataException
+     */
+    abstract public function chunk(int $size, Closure $userFunc);
+
+    /**
+     * Fetches the row of database
+     *
+     * @param array|int|string|null $id One primary key or an array of primary keys
+     *
+     * @return array|object|null The resulting row of data, or null.
+     */
+    public function find($id = null)
+    {
+        $singleton = is_numeric($id) || is_string($id);
+
+        if ($this->tempAllowCallbacks) {
+            // Call the before event and check for a return
+            $eventData = $this->trigger('beforeFind', [
+                'id'        => $id,
+                'method'    => 'find',
+                'singleton' => $singleton,
+            ]);
+
+            if (! empty($eventData['returnData'])) {
+                return $eventData['data'];
+            }
+        }
+
+        $eventData = [
+            'id'        => $id,
+            'data'      => $this->doFind($singleton, $id),
+            'method'    => 'find',
+            'singleton' => $singleton,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $eventData = $this->trigger('afterFind', $eventData);
+        }
+
+        $this->tempReturnType     = $this->returnType;
+        $this->tempUseSoftDeletes = $this->useSoftDeletes;
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        return $eventData['data'];
+    }
+
+    /**
+     * Fetches the column of database
+     *
+     * @param string $columnName Column Name
+     *
+     * @throws DataException
+     *
+     * @return array|null The resulting row of data, or null if no data found.
+     */
+    public function findColumn(string $columnName)
+    {
+        if (strpos($columnName, ',') !== false) {
+            throw DataException::forFindColumnHaveMultipleColumns();
+        }
+
+        $resultSet = $this->doFindColumn($columnName);
+
+        return $resultSet ? array_column($resultSet, $columnName) : null;
+    }
+
+    /**
+     * Fetches all results, while optionally limiting them.
+     *
+     * @param int $limit  Limit
+     * @param int $offset Offset
+     *
+     * @return array
+     */
+    public function findAll(int $limit = 0, int $offset = 0)
+    {
+        if ($this->tempAllowCallbacks) {
+            // Call the before event and check for a return
+            $eventData = $this->trigger('beforeFind', [
+                'method'    => 'findAll',
+                'limit'     => $limit,
+                'offset'    => $offset,
+                'singleton' => false,
+            ]);
+
+            if (! empty($eventData['returnData'])) {
+                return $eventData['data'];
+            }
+        }
+
+        $eventData = [
+            'data'      => $this->doFindAll($limit, $offset),
+            'limit'     => $limit,
+            'offset'    => $offset,
+            'method'    => 'findAll',
+            'singleton' => false,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $eventData = $this->trigger('afterFind', $eventData);
+        }
+
+        $this->tempReturnType     = $this->returnType;
+        $this->tempUseSoftDeletes = $this->useSoftDeletes;
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        return $eventData['data'];
+    }
+
+    /**
+     * Returns the first row of the result set.
+     *
+     * @return array|object|null
+     */
+    public function first()
+    {
+        if ($this->tempAllowCallbacks) {
+            // Call the before event and check for a return
+            $eventData = $this->trigger('beforeFind', [
+                'method'    => 'first',
+                'singleton' => true,
+            ]);
+
+            if (! empty($eventData['returnData'])) {
+                return $eventData['data'];
+            }
+        }
+
+        $eventData = [
+            'data'      => $this->doFirst(),
+            'method'    => 'first',
+            'singleton' => true,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $eventData = $this->trigger('afterFind', $eventData);
+        }
+
+        $this->tempReturnType     = $this->returnType;
+        $this->tempUseSoftDeletes = $this->useSoftDeletes;
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        return $eventData['data'];
+    }
+
+    /**
+     * A convenience method that will attempt to determine whether the
+     * data should be inserted or updated. Will work with either
+     * an array or object. When using with custom class objects,
+     * you must ensure that the class will provide access to the class
+     * variables, even if through a magic method.
+     *
+     * @param array|object $data Data
+     *
+     * @throws ReflectionException
+     */
+    public function save($data): bool
+    {
+        if (empty($data)) {
+            return true;
+        }
+
+        if ($this->shouldUpdate($data)) {
+            $response = $this->update($this->getIdValue($data), $data);
+        } else {
+            $response = $this->insert($data, false);
+
+            if ($response !== false) {
+                $response = true;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * This method is called on save to determine if entry have to be updated
+     * If this method return false insert operation will be executed
+     *
+     * @param array|object $data Data
+     */
+    protected function shouldUpdate($data): bool
+    {
+        return ! empty($this->getIdValue($data));
+    }
+
+    /**
+     * Returns last insert ID or 0.
+     *
+     * @return int|string
+     */
+    public function getInsertID()
+    {
+        return is_numeric($this->insertID) ? (int) $this->insertID : $this->insertID;
+    }
+
+    /**
+     * Inserts data into the database. If an object is provided,
+     * it will attempt to convert it to an array.
+     *
+     * @param array|object|null $data     Data
+     * @param bool              $returnID Whether insert ID should be returned or not.
+     *
+     * @throws ReflectionException
+     *
+     * @return bool|int|string
+     */
+    public function insert($data = null, bool $returnID = true)
+    {
+        $this->insertID = 0;
+
+        $data = $this->transformDataToArray($data, 'insert');
+
+        // Validate data before saving.
+        if (! $this->skipValidation && ! $this->cleanRules()->validate($data)) {
+            return false;
+        }
+
+        // Must be called first so we don't
+        // strip out created_at values.
+        $data = $this->doProtectFields($data);
+
+        // doProtectFields() can further remove elements from
+        // $data so we need to check for empty dataset again
+        if (empty($data)) {
+            throw DataException::forEmptyDataset('insert');
+        }
+
+        // Set created_at and updated_at with same time
+        $date = $this->setDate();
+
+        if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $data)) {
+            $data[$this->createdField] = $date;
+        }
+
+        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data)) {
+            $data[$this->updatedField] = $date;
+        }
+
+        $eventData = ['data' => $data];
+
+        if ($this->tempAllowCallbacks) {
+            $eventData = $this->trigger('beforeInsert', $eventData);
+        }
+
+        $result = $this->doInsert($eventData['data']);
+
+        $eventData = [
+            'id'     => $this->insertID,
+            'data'   => $eventData['data'],
+            'result' => $result,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            // Trigger afterInsert events with the inserted data and new ID
+            $this->trigger('afterInsert', $eventData);
+        }
+
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        // If insertion failed, get out of here
+        if (! $result) {
+            return $result;
+        }
+
+        // otherwise return the insertID, if requested.
+        return $returnID ? $this->insertID : $result;
+    }
+
+    /**
+     * Compiles batch insert runs the queries, validating each row prior.
+     *
+     * @param array|null $set       an associative array of insert values
+     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param int        $batchSize The size of the batch to run
+     * @param bool       $testing   True means only number of records is returned, false will execute the query
+     *
+     * @throws ReflectionException
+     *
+     * @return bool|int Number of rows inserted or FALSE on failure
+     */
+    public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
+    {
+        if (is_array($set)) {
+            foreach ($set as &$row) {
+                // If $data is using a custom class with public or protected
+                // properties representing the collection elements, we need to grab
+                // them as an array.
+                if (is_object($row) && ! $row instanceof stdClass) {
+                    $row = $this->objectToArray($row, false, true);
+                }
+
+                // If it's still a stdClass, go ahead and convert to
+                // an array so doProtectFields and other model methods
+                // don't have to do special checks.
+                if (is_object($row)) {
+                    $row = (array) $row;
+                }
+
+                // Validate every row..
+                if (! $this->skipValidation && ! $this->cleanRules()->validate($row)) {
+                    return false;
+                }
+
+                // Must be called first so we don't
+                // strip out created_at values.
+                $row = $this->doProtectFields($row);
+
+                // Set created_at and updated_at with same time
+                $date = $this->setDate();
+
+                if ($this->useTimestamps && $this->createdField && ! array_key_exists($this->createdField, $row)) {
+                    $row[$this->createdField] = $date;
+                }
+
+                if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row)) {
+                    $row[$this->updatedField] = $date;
+                }
+            }
+        }
+
+        return $this->doInsertBatch($set, $escape, $batchSize, $testing);
+    }
+
+    /**
+     * Updates a single record in the database. If an object is provided,
+     * it will attempt to convert it into an array.
+     *
+     * @param array|int|string|null $id
+     * @param array|object|null     $data
+     *
+     * @throws ReflectionException
+     */
+    public function update($id = null, $data = null): bool
+    {
+        if (is_numeric($id) || is_string($id)) {
+            $id = [$id];
+        }
+
+        $data = $this->transformDataToArray($data, 'update');
+
+        // Validate data before saving.
+        if (! $this->skipValidation && ! $this->cleanRules(true)->validate($data)) {
+            return false;
+        }
+
+        // Must be called first so we don't
+        // strip out updated_at values.
+        $data = $this->doProtectFields($data);
+
+        // doProtectFields() can further remove elements from
+        // $data so we need to check for empty dataset again
+        if (empty($data)) {
+            throw DataException::forEmptyDataset('update');
+        }
+
+        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $data)) {
+            $data[$this->updatedField] = $this->setDate();
+        }
+
+        $eventData = [
+            'id'   => $id,
+            'data' => $data,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $eventData = $this->trigger('beforeUpdate', $eventData);
+        }
+
+        $eventData = [
+            'id'     => $id,
+            'data'   => $eventData['data'],
+            'result' => $this->doUpdate($id, $eventData['data']),
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $this->trigger('afterUpdate', $eventData);
+        }
+
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        return $eventData['result'];
+    }
+
+    /**
+     * Compiles an update and runs the query
+     *
+     * @param array|null  $set       An associative array of update values
+     * @param string|null $index     The where key
+     * @param int         $batchSize The size of the batch to run
+     * @param bool        $returnSQL True means SQL is returned, false will execute the query
+     *
+     * @throws DatabaseException
+     * @throws ReflectionException
+     *
+     * @return mixed Number of rows affected or FALSE on failure
+     */
+    public function updateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false)
+    {
+        if (is_array($set)) {
+            foreach ($set as &$row) {
+                // If $data is using a custom class with public or protected
+                // properties representing the collection elements, we need to grab
+                // them as an array.
+                if (is_object($row) && ! $row instanceof stdClass) {
+                    $row = $this->objectToArray($row, true, true);
+                }
+
+                // If it's still a stdClass, go ahead and convert to
+                // an array so doProtectFields and other model methods
+                // don't have to do special checks.
+                if (is_object($row)) {
+                    $row = (array) $row;
+                }
+
+                // Validate data before saving.
+                if (! $this->skipValidation && ! $this->cleanRules(true)->validate($row)) {
+                    return false;
+                }
+
+                // Save updateIndex for later
+                $updateIndex = $row[$index] ?? null;
+
+                // Must be called first so we don't
+                // strip out updated_at values.
+                $row = $this->doProtectFields($row);
+
+                // Restore updateIndex value in case it was wiped out
+                if ($updateIndex !== null) {
+                    $row[$index] = $updateIndex;
+                }
+
+                if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, $row)) {
+                    $row[$this->updatedField] = $this->setDate();
+                }
+            }
+        }
+
+        return $this->doUpdateBatch($set, $index, $batchSize, $returnSQL);
+    }
+
+    /**
+     * Deletes a single record from the database where $id matches
+     *
+     * @param array|int|string|null $id    The rows primary key(s)
+     * @param bool                  $purge Allows overriding the soft deletes setting.
+     *
+     * @throws DatabaseException
+     *
+     * @return BaseResult|bool
+     */
+    public function delete($id = null, bool $purge = false)
+    {
+        if ($id && (is_numeric($id) || is_string($id))) {
+            $id = [$id];
+        }
+
+        $eventData = [
+            'id'    => $id,
+            'purge' => $purge,
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $this->trigger('beforeDelete', $eventData);
+        }
+
+        $eventData = [
+            'id'     => $id,
+            'data'   => null,
+            'purge'  => $purge,
+            'result' => $this->doDelete($id, $purge),
+        ];
+
+        if ($this->tempAllowCallbacks) {
+            $this->trigger('afterDelete', $eventData);
+        }
+
+        $this->tempAllowCallbacks = $this->allowCallbacks;
+
+        return $eventData['result'];
+    }
+
+    /**
+     * Permanently deletes all rows that have been marked as deleted
+     * through soft deletes (deleted = 1)
+     *
+     * @return mixed
+     */
+    public function purgeDeleted()
+    {
+        if (! $this->useSoftDeletes) {
+            return true;
+        }
+
+        return $this->doPurgeDeleted();
+    }
+
+    /**
+     * Sets $useSoftDeletes value so that we can temporarily override
+     * the soft deletes settings. Can be used for all find* methods.
+     *
+     * @param bool $val Value
+     *
+     * @return $this
+     */
+    public function withDeleted(bool $val = true)
+    {
+        $this->tempUseSoftDeletes = ! $val;
+
+        return $this;
+    }
+
+    /**
+     * Works with the find* methods to return only the rows that
+     * have been deleted.
+     *
+     * @return $this
+     */
+    public function onlyDeleted()
+    {
+        $this->tempUseSoftDeletes = false;
+        $this->doOnlyDeleted();
+
+        return $this;
+    }
+
+    /**
+     * Compiles a replace and runs the query
+     *
+     * @param array|null $data      Data
+     * @param bool       $returnSQL Set to true to return Query String
+     *
+     * @return mixed
+     */
+    public function replace(?array $data = null, bool $returnSQL = false)
+    {
+        // Validate data before saving.
+        if ($data && ! $this->skipValidation && ! $this->cleanRules(true)->validate($data)) {
+            return false;
+        }
+
+        return $this->doReplace($data, $returnSQL);
+    }
+
+    /**
+     * Grabs the last error(s) that occurred. If data was validated,
+     * it will first check for errors there, otherwise will try to
+     * grab the last error from the Database connection.
+     * The return array should be in the following format:
+     *  ['source' => 'message']
+     *
+     * @param bool $forceDB Always grab the db error, not validation
+     *
+     * @return array<string,string>
+     */
+    public function errors(bool $forceDB = false)
+    {
+        // Do we have validation errors?
+        if (! $forceDB && ! $this->skipValidation && ($errors = $this->validation->getErrors())) {
+            return $errors;
+        }
+
+        return $this->doErrors();
+    }
+
+    /**
+     * Works with Pager to get the size and offset parameters.
+     * Expects a GET variable (?page=2) that specifies the page of results
+     * to display.
+     *
+     * @param int|null $perPage Items per page
+     * @param string   $group   Will be used by the pagination library to identify a unique pagination set.
+     * @param int|null $page    Optional page number (useful when the page number is provided in different way)
+     * @param int      $segment Optional URI segment number (if page number is provided by URI segment)
+     *
+     * @return array|null
+     */
+    public function paginate(?int $perPage = null, string $group = 'default', ?int $page = null, int $segment = 0)
+    {
+        $pager = Services::pager(null, null, false);
+
+        if ($segment) {
+            $pager->setSegment($segment);
+        }
+
+        $page = $page >= 1 ? $page : $pager->getCurrentPage($group);
+        // Store it in the Pager library, so it can be paginated in the views.
+        $this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
+        $perPage     = $this->pager->getPerPage($group);
+        $offset      = ($page - 1) * $perPage;
+
+        return $this->findAll($perPage, $offset);
+    }
+
+    /**
+     * It could be used when you have to change default or override current allowed fields.
+     *
+     * @param array $allowedFields Array with names of fields
+     *
+     * @return $this
+     */
+    public function setAllowedFields(array $allowedFields)
+    {
+        $this->allowedFields = $allowedFields;
+
+        return $this;
+    }
+
+    /**
+     * Sets whether or not we should whitelist data set during
+     * updates or inserts against $this->availableFields.
+     *
+     * @param bool $protect Value
+     *
+     * @return $this
+     */
+    public function protect(bool $protect = true)
+    {
+        $this->protectFields = $protect;
+
+        return $this;
+    }
+
+    /**
+     * Ensures that only the fields that are allowed to be updated
+     * are in the data array.
+     *
+     * Used by insert() and update() to protect against mass assignment
+     * vulnerabilities.
+     *
+     * @param array $data Data
+     *
+     * @throws DataException
+     */
+    protected function doProtectFields(array $data): array
+    {
+        if (! $this->protectFields) {
+            return $data;
+        }
+
+        if (empty($this->allowedFields)) {
+            throw DataException::forInvalidAllowedFields(static::class);
+        }
+
+        foreach (array_keys($data) as $key) {
+            if (! in_array($key, $this->allowedFields, true)) {
+                unset($data[$key]);
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Sets the date or current date if null value is passed
+     *
+     * @param int|null $userData An optional PHP timestamp to be converted.
+     *
+     * @throws ModelException
+     *
+     * @return mixed
+     */
+    protected function setDate(?int $userData = null)
+    {
+        $currentDate = $userData ?? time();
+
+        return $this->intToDate($currentDate);
+    }
+
+    /**
+     * A utility function to allow child models to use the type of
+     * date/time format that they prefer. This is primarily used for
+     * setting created_at, updated_at and deleted_at values, but can be
+     * used by inheriting classes.
+     *
+     * The available time formats are:
+     *  - 'int'      - Stores the date as an integer timestamp
+     *  - 'datetime' - Stores the data in the SQL datetime format
+     *  - 'date'     - Stores the date (only) in the SQL date format.
+     *
+     * @param int $value value
+     *
+     * @throws ModelException
+     *
+     * @return int|string
+     */
+    protected function intToDate(int $value)
+    {
+        switch ($this->dateFormat) {
+            case 'int':
+                return $value;
+
+            case 'datetime':
+                return date('Y-m-d H:i:s', $value);
+
+            case 'date':
+                return date('Y-m-d', $value);
+
+            default:
+                throw ModelException::forNoDateFormat(static::class);
+        }
+    }
+
+    /**
+     * Converts Time value to string using $this->dateFormat
+     *
+     * The available time formats are:
+     *  - 'int'      - Stores the date as an integer timestamp
+     *  - 'datetime' - Stores the data in the SQL datetime format
+     *  - 'date'     - Stores the date (only) in the SQL date format.
+     *
+     * @param Time $value value
+     *
+     * @return int|string
+     */
+    protected function timeToDate(Time $value)
+    {
+        switch ($this->dateFormat) {
+            case 'datetime':
+                return $value->format('Y-m-d H:i:s');
+
+            case 'date':
+                return $value->format('Y-m-d');
+
+            case 'int':
+                return $value->getTimestamp();
+
+            default:
+                return (string) $value;
+        }
+    }
+
+    /**
+     * Set the value of the skipValidation flag.
+     *
+     * @param bool $skip Value
+     *
+     * @return $this
+     */
+    public function skipValidation(bool $skip = true)
+    {
+        $this->skipValidation = $skip;
+
+        return $this;
+    }
+
+    /**
+     * Allows to set validation messages.
+     * It could be used when you have to change default or override current validate messages.
+     *
+     * @param array $validationMessages Value
+     *
+     * @return $this
+     */
+    public function setValidationMessages(array $validationMessages)
+    {
+        $this->validationMessages = $validationMessages;
+
+        return $this;
+    }
+
+    /**
+     * Allows to set field wise validation message.
+     * It could be used when you have to change default or override current validate messages.
+     *
+     * @param string $field         Field Name
+     * @param array  $fieldMessages Validation messages
+     *
+     * @return $this
+     */
+    public function setValidationMessage(string $field, array $fieldMessages)
+    {
+        $this->validationMessages[$field] = $fieldMessages;
+
+        return $this;
+    }
+
+    /**
+     * Allows to set validation rules.
+     * It could be used when you have to change default or override current validate rules.
+     *
+     * @param array $validationRules Value
+     *
+     * @return $this
+     */
+    public function setValidationRules(array $validationRules)
+    {
+        $this->validationRules = $validationRules;
+
+        return $this;
+    }
+
+    /**
+     * Allows to set field wise validation rules.
+     * It could be used when you have to change default or override current validate rules.
+     *
+     * @param string       $field      Field Name
+     * @param array|string $fieldRules Validation rules
+     *
+     * @return $this
+     */
+    public function setValidationRule(string $field, $fieldRules)
+    {
+        $this->validationRules[$field] = $fieldRules;
+
+        return $this;
+    }
+
+    /**
+     * Should validation rules be removed before saving?
+     * Most handy when doing updates.
+     *
+     * @param bool $choice Value
+     *
+     * @return $this
+     */
+    public function cleanRules(bool $choice = false)
+    {
+        $this->cleanValidationRules = $choice;
+
+        return $this;
+    }
+
+    /**
+     * Validate the data against the validation rules (or the validation group)
+     * specified in the class property, $validationRules.
+     *
+     * @param array|object $data Data
+     */
+    public function validate($data): bool
+    {
+        $rules = $this->getValidationRules();
+
+        if ($this->skipValidation || empty($rules) || empty($data)) {
+            return true;
+        }
+
+        // Validation requires array, so cast away.
+        if (is_object($data)) {
+            $data = (array) $data;
+        }
+
+        $rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $data) : $rules;
+
+        // If no data existed that needs validation
+        // our job is done here.
+        if (empty($rules)) {
+            return true;
+        }
+
+        return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup);
+    }
+
+    /**
+     * Returns the model's defined validation rules so that they
+     * can be used elsewhere, if needed.
+     *
+     * @param array $options Options
+     */
+    public function getValidationRules(array $options = []): array
+    {
+        $rules = $this->validationRules;
+
+        // ValidationRules can be either a string, which is the group name,
+        // or an array of rules.
+        if (is_string($rules)) {
+            $rules = $this->validation->loadRuleGroup($rules);
+        }
+
+        if (isset($options['except'])) {
+            $rules = array_diff_key($rules, array_flip($options['except']));
+        } elseif (isset($options['only'])) {
+            $rules = array_intersect_key($rules, array_flip($options['only']));
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Returns the model's define validation messages so they
+     * can be used elsewhere, if needed.
+     */
+    public function getValidationMessages(): array
+    {
+        return $this->validationMessages;
+    }
+
+    /**
+     * Removes any rules that apply to fields that have not been set
+     * currently so that rules don't block updating when only updating
+     * a partial row.
+     *
+     * @param array      $rules Array containing field name and rule
+     * @param array|null $data  Data
+     */
+    protected function cleanValidationRules(array $rules, ?array $data = null): array
+    {
+        if (empty($data)) {
+            return [];
+        }
+
+        foreach (array_keys($rules) as $field) {
+            if (! array_key_exists($field, $data)) {
+                unset($rules[$field]);
+            }
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Sets $tempAllowCallbacks value so that we can temporarily override
+     * the setting. Resets after the next method that uses triggers.
+     *
+     * @param bool $val value
+     *
+     * @return $this
+     */
+    public function allowCallbacks(bool $val = true)
+    {
+        $this->tempAllowCallbacks = $val;
+
+        return $this;
+    }
+
+    /**
+     * A simple event trigger for Model Events that allows additional
+     * data manipulation within the model. Specifically intended for
+     * usage by child models this can be used to format data,
+     * save/load related classes, etc.
+     *
+     * It is the responsibility of the callback methods to return
+     * the data itself.
+     *
+     * Each $eventData array MUST have a 'data' key with the relevant
+     * data for callback methods (like an array of key/value pairs to insert
+     * or update, an array of results, etc)
+     *
+     * If callbacks are not allowed then returns $eventData immediately.
+     *
+     * @param string $event     Event
+     * @param array  $eventData Event Data
+     *
+     * @throws DataException
+     *
+     * @return mixed
+     */
+    protected function trigger(string $event, array $eventData)
+    {
+        // Ensure it's a valid event
+        if (! isset($this->{$event}) || empty($this->{$event})) {
+            return $eventData;
+        }
+
+        foreach ($this->{$event} as $callback) {
+            if (! method_exists($this, $callback)) {
+                throw DataException::forInvalidMethodTriggered($callback);
+            }
+
+            $eventData = $this->{$callback}($eventData);
+        }
+
+        return $eventData;
+    }
+
+    /**
+     * Sets the return type of the results to be as an associative array.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $this->tempReturnType = 'array';
+
+        return $this;
+    }
+
+    /**
+     * Sets the return type to be of the specified type of object.
+     * Defaults to a simple object, but can be any class that has
+     * class vars with the same name as the collection columns,
+     * or at least allows them to be created.
+     *
+     * @param string $class Class Name
+     *
+     * @return $this
+     */
+    public function asObject(string $class = 'object')
+    {
+        $this->tempReturnType = $class;
+
+        return $this;
+    }
+
+    /**
+     * Takes a class an returns an array of it's public and protected
+     * properties as an array suitable for use in creates and updates.
+     * This method use objectToRawArray internally and does conversion
+     * to string on all Time instances
+     *
+     * @param object|string $data        Data
+     * @param bool          $onlyChanged Only Changed Property
+     * @param bool          $recursive   If true, inner entities will be casted as array as well
+     *
+     * @throws ReflectionException
+     *
+     * @return array Array
+     */
+    protected function objectToArray($data, bool $onlyChanged = true, bool $recursive = false): array
+    {
+        $properties = $this->objectToRawArray($data, $onlyChanged, $recursive);
+
+        // Convert any Time instances to appropriate $dateFormat
+        if ($properties) {
+            $properties = array_map(function ($value) {
+                if ($value instanceof Time) {
+                    return $this->timeToDate($value);
+                }
+
+                return $value;
+            }, $properties);
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Takes a class an returns an array of it's public and protected
+     * properties as an array with raw values.
+     *
+     * @param object|string $data        Data
+     * @param bool          $onlyChanged Only Changed Property
+     * @param bool          $recursive   If true, inner entities will be casted as array as well
+     *
+     * @throws ReflectionException
+     *
+     * @return array|null Array
+     */
+    protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+    {
+        if (method_exists($data, 'toRawArray')) {
+            $properties = $data->toRawArray($onlyChanged, $recursive);
+        } else {
+            $mirror = new ReflectionClass($data);
+            $props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
+
+            $properties = [];
+
+            // Loop over each property,
+            // saving the name/value in a new array we can return.
+            foreach ($props as $prop) {
+                // Must make protected values accessible.
+                $prop->setAccessible(true);
+                $properties[$prop->getName()] = $prop->getValue($data);
+            }
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Transform data to array
+     *
+     * @param array|object|null $data Data
+     * @param string            $type Type of data (insert|update)
+     *
+     * @throws DataException
+     * @throws InvalidArgumentException
+     * @throws ReflectionException
+     */
+    protected function transformDataToArray($data, string $type): array
+    {
+        if (! in_array($type, ['insert', 'update'], true)) {
+            throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
+        }
+
+        if (empty($data)) {
+            throw DataException::forEmptyDataset($type);
+        }
+
+        // If $data is using a custom class with public or protected
+        // properties representing the collection elements, we need to grab
+        // them as an array.
+        if (is_object($data) && ! $data instanceof stdClass) {
+            $data = $this->objectToArray($data, true, true);
+        }
+
+        // If it's still a stdClass, go ahead and convert to
+        // an array so doProtectFields and other model methods
+        // don't have to do special checks.
+        if (is_object($data)) {
+            $data = (array) $data;
+        }
+
+        // If it's still empty here, means $data is no change or is empty object
+        if (empty($data)) {
+            throw DataException::forEmptyDataset($type);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Provides the db connection and model's properties.
+     *
+     * @param string $name Name
+     *
+     * @return mixed
+     */
+    public function __get(string $name)
+    {
+        if (property_exists($this, $name)) {
+            return $this->{$name};
+        }
+
+        return $this->db->{$name} ?? null;
+    }
+
+    /**
+     * Checks for the existence of properties across this model, and db connection.
+     *
+     * @param string $name Name
+     */
+    public function __isset(string $name): bool
+    {
+        if (property_exists($this, $name)) {
+            return true;
+        }
+
+        return isset($this->db->{$name});
+    }
+
+    /**
+     * Provides direct access to method in the database connection.
+     *
+     * @param string $name   Name
+     * @param array  $params Params
+     *
+     * @return $this|null
+     */
+    public function __call(string $name, array $params)
+    {
+        if (method_exists($this->db, $name)) {
+            return $this->db->{$name}(...$params);
+        }
+
+        return null;
+    }
+
+    /**
+     * Replace any placeholders within the rules with the values that
+     * match the 'key' of any properties being set. For example, if
+     * we had the following $data array:
+     *
+     * [ 'id' => 13 ]
+     *
+     * and the following rule:
+     *
+     *  'required|is_unique[users,email,id,{id}]'
+     *
+     * The value of {id} would be replaced with the actual id in the form data:
+     *
+     *  'required|is_unique[users,email,id,13]'
+     *
+     * @param array $rules Validation rules
+     * @param array $data  Data
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated use fillPlaceholders($rules, $data) from Validation instead
+     */
+    protected function fillPlaceholders(array $rules, array $data): array
+    {
+        $replacements = [];
+
+        foreach ($data as $key => $value) {
+            $replacements['{' . $key . '}'] = $value;
+        }
+
+        if (! empty($replacements)) {
+            foreach ($rules as &$rule) {
+                if (is_array($rule)) {
+                    foreach ($rule as &$row) {
+                        // Should only be an `errors` array
+                        // which doesn't take placeholders.
+                        if (is_array($row)) {
+                            continue;
+                        }
+
+                        $row = strtr($row, $replacements);
+                    }
+
+                    continue;
+                }
+
+                $rule = strtr($rule, $replacements);
+            }
+        }
+
+        return $rules;
+    }
 }
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 54bf4c935366..8f843c4f5c73 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
@@ -18,244 +18,202 @@
 /**
  * BaseCommand is the base class used in creating CLI commands.
  *
+ * @property array           $arguments
+ * @property Commands        $commands
+ * @property string          $description
  * @property string          $group
+ * @property LoggerInterface $logger
  * @property string          $name
- * @property string          $usage
- * @property string          $description
  * @property array           $options
- * @property array           $arguments
- * @property LoggerInterface $logger
- * @property Commands        $commands
+ * @property string          $usage
  */
 abstract class BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group;
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * the Command's usage description
-	 *
-	 * @var string
-	 */
-	protected $usage;
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description;
-
-	/**
-	 * the Command's options description
-	 *
-	 * @var array
-	 */
-	protected $options = [];
-
-	/**
-	 * the Command's Arguments description
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
-	 * The Logger to use for a command
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Instance of Commands so
-	 * commands can call other commands.
-	 *
-	 * @var Commands
-	 */
-	protected $commands;
-
-	/**
-	 * BaseCommand constructor.
-	 *
-	 * @param LoggerInterface $logger
-	 * @param Commands        $commands
-	 */
-	public function __construct(LoggerInterface $logger, Commands $commands)
-	{
-		$this->logger   = $logger;
-		$this->commands = $commands;
-	}
-
-	/**
-	 * Actually execute a command.
-	 * This has to be over-ridden in any concrete implementation.
-	 *
-	 * @param array $params
-	 */
-	abstract public function run(array $params);
-
-	/**
-	 * Can be used by a command to run other commands.
-	 *
-	 * @param string $command
-	 * @param array  $params
-	 *
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	protected function call(string $command, array $params = [])
-	{
-		return $this->commands->run($command, $params);
-	}
-
-	/**
-	 * A simple method to display an error with line/file, in child commands.
-	 *
-	 * @param Throwable $e
-	 */
-	protected function showError(Throwable $e)
-	{
-		$exception = $e;
-		$message   = $e->getMessage();
-
-		require APPPATH . 'Views/errors/cli/error_exception.php';
-	}
-
-	/**
-	 * Show Help includes (Usage, Arguments, Description, Options).
-	 */
-	public function showHelp()
-	{
-		CLI::write(lang('CLI.helpUsage'), 'yellow');
-
-		if (! empty($this->usage))
-		{
-			$usage = $this->usage;
-		}
-		else
-		{
-			$usage = $this->name;
-
-			if (! empty($this->arguments))
-			{
-				$usage .= ' [arguments]';
-			}
-		}
-
-		CLI::write($this->setPad($usage, 0, 0, 2));
-
-		if (! empty($this->description))
-		{
-			CLI::newLine();
-			CLI::write(lang('CLI.helpDescription'), 'yellow');
-			CLI::write($this->setPad($this->description, 0, 0, 2));
-		}
-
-		if (! empty($this->arguments))
-		{
-			CLI::newLine();
-			CLI::write(lang('CLI.helpArguments'), 'yellow');
-			$length = max(array_map('strlen', array_keys($this->arguments)));
-
-			foreach ($this->arguments as $argument => $description)
-			{
-				CLI::write(CLI::color($this->setPad($argument, $length, 2, 2), 'green') . $description);
-			}
-		}
-
-		if (! empty($this->options))
-		{
-			CLI::newLine();
-			CLI::write(lang('CLI.helpOptions'), 'yellow');
-			$length = max(array_map('strlen', array_keys($this->options)));
-
-			foreach ($this->options as $option => $description)
-			{
-				CLI::write(CLI::color($this->setPad($option, $length, 2, 2), 'green') . $description);
-			}
-		}
-	}
-
-	/**
-	 * Pads our string out so that all titles are the same length to nicely line up descriptions.
-	 *
-	 * @param string  $item
-	 * @param integer $max
-	 * @param integer $extra  How many extra spaces to add at the end
-	 * @param integer $indent
-	 *
-	 * @return string
-	 */
-	public function setPad(string $item, int $max, int $extra = 2, int $indent = 0): string
-	{
-		$max += $extra + $indent;
-
-		return str_pad(str_repeat(' ', $indent) . $item, $max);
-	}
-
-	/**
-	 * Get pad for $key => $value array output
-	 *
-	 * @param array   $array
-	 * @param integer $pad
-	 *
-	 * @return integer
-	 *
-	 * @deprecated Use setPad() instead.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getPad(array $array, int $pad): int
-	{
-		$max = 0;
-
-		foreach (array_keys($array) as $key)
-		{
-			$max = max($max, strlen($key));
-		}
-
-		return $max + $pad;
-	}
-
-	/**
-	 * Makes it simple to access our protected properties.
-	 *
-	 * @param string $key
-	 *
-	 * @return mixed
-	 */
-	public function __get(string $key)
-	{
-		if (isset($this->$key))
-		{
-			return $this->$key;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Makes it simple to check our protected properties.
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $key): bool
-	{
-		return isset($this->$key);
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group;
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * the Command's usage description
+     *
+     * @var string
+     */
+    protected $usage;
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description;
+
+    /**
+     * the Command's options description
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * the Command's Arguments description
+     *
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * The Logger to use for a command
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Instance of Commands so
+     * commands can call other commands.
+     *
+     * @var Commands
+     */
+    protected $commands;
+
+    public function __construct(LoggerInterface $logger, Commands $commands)
+    {
+        $this->logger   = $logger;
+        $this->commands = $commands;
+    }
+
+    /**
+     * Actually execute a command.
+     *
+     * @param array<string, mixed> $params
+     */
+    abstract public function run(array $params);
+
+    /**
+     * Can be used by a command to run other commands.
+     *
+     * @throws ReflectionException
+     *
+     * @return mixed
+     */
+    protected function call(string $command, array $params = [])
+    {
+        return $this->commands->run($command, $params);
+    }
+
+    /**
+     * A simple method to display an error with line/file, in child commands.
+     */
+    protected function showError(Throwable $e)
+    {
+        $exception = $e;
+        $message   = $e->getMessage();
+
+        require APPPATH . 'Views/errors/cli/error_exception.php';
+    }
+
+    /**
+     * Show Help includes (Usage, Arguments, Description, Options).
+     */
+    public function showHelp()
+    {
+        CLI::write(lang('CLI.helpUsage'), 'yellow');
+
+        if (! empty($this->usage)) {
+            $usage = $this->usage;
+        } else {
+            $usage = $this->name;
+
+            if (! empty($this->arguments)) {
+                $usage .= ' [arguments]';
+            }
+        }
+
+        CLI::write($this->setPad($usage, 0, 0, 2));
+
+        if (! empty($this->description)) {
+            CLI::newLine();
+            CLI::write(lang('CLI.helpDescription'), 'yellow');
+            CLI::write($this->setPad($this->description, 0, 0, 2));
+        }
+
+        if (! empty($this->arguments)) {
+            CLI::newLine();
+            CLI::write(lang('CLI.helpArguments'), 'yellow');
+            $length = max(array_map('strlen', array_keys($this->arguments)));
+
+            foreach ($this->arguments as $argument => $description) {
+                CLI::write(CLI::color($this->setPad($argument, $length, 2, 2), 'green') . $description);
+            }
+        }
+
+        if (! empty($this->options)) {
+            CLI::newLine();
+            CLI::write(lang('CLI.helpOptions'), 'yellow');
+            $length = max(array_map('strlen', array_keys($this->options)));
+
+            foreach ($this->options as $option => $description) {
+                CLI::write(CLI::color($this->setPad($option, $length, 2, 2), 'green') . $description);
+            }
+        }
+    }
+
+    /**
+     * Pads our string out so that all titles are the same length to nicely line up descriptions.
+     *
+     * @param int $extra How many extra spaces to add at the end
+     */
+    public function setPad(string $item, int $max, int $extra = 2, int $indent = 0): string
+    {
+        $max += $extra + $indent;
+
+        return str_pad(str_repeat(' ', $indent) . $item, $max);
+    }
+
+    /**
+     * Get pad for $key => $value array output
+     *
+     * @deprecated Use setPad() instead.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getPad(array $array, int $pad): int
+    {
+        $max = 0;
+
+        foreach (array_keys($array) as $key) {
+            $max = max($max, strlen($key));
+        }
+
+        return $max + $pad;
+    }
+
+    /**
+     * Makes it simple to access our protected properties.
+     *
+     * @return mixed
+     */
+    public function __get(string $key)
+    {
+        return $this->{$key} ?? null;
+    }
+
+    /**
+     * Makes it simple to check our protected properties.
+     */
+    public function __isset(string $key): bool
+    {
+        return isset($this->{$key});
+    }
 }
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index a477f71be151..b463aa6a3016 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
@@ -36,1150 +36,924 @@
  */
 class CLI
 {
-	/**
-	 * Is the readline library on the system?
-	 *
-	 * @var boolean
-	 */
-	public static $readline_support = false;
-
-	/**
-	 * The message displayed at prompts.
-	 *
-	 * @var string
-	 */
-	public static $wait_msg = 'Press any key to continue...';
-
-	/**
-	 * Has the class already been initialized?
-	 *
-	 * @var boolean
-	 */
-	protected static $initialized = false;
-
-	/**
-	 * Foreground color list
-	 *
-	 * @var array
-	 */
-	protected static $foreground_colors = [
-		'black'        => '0;30',
-		'dark_gray'    => '1;30',
-		'blue'         => '0;34',
-		'dark_blue'    => '0;34',
-		'light_blue'   => '1;34',
-		'green'        => '0;32',
-		'light_green'  => '1;32',
-		'cyan'         => '0;36',
-		'light_cyan'   => '1;36',
-		'red'          => '0;31',
-		'light_red'    => '1;31',
-		'purple'       => '0;35',
-		'light_purple' => '1;35',
-		'yellow'       => '0;33',
-		'light_yellow' => '1;33',
-		'light_gray'   => '0;37',
-		'white'        => '1;37',
-	];
-
-	/**
-	 * Background color list
-	 *
-	 * @var array
-	 */
-	protected static $background_colors = [
-		'black'      => '40',
-		'red'        => '41',
-		'green'      => '42',
-		'yellow'     => '43',
-		'blue'       => '44',
-		'magenta'    => '45',
-		'cyan'       => '46',
-		'light_gray' => '47',
-	];
-
-	/**
-	 * List of array segments.
-	 *
-	 * @var array
-	 */
-	protected static $segments = [];
-
-	/**
-	 * @var array
-	 */
-	protected static $options = [];
-
-	/**
-	 * Helps track internally whether the last
-	 * output was a "write" or a "print" to
-	 * keep the output clean and as expected.
-	 *
-	 * @var string|null
-	 */
-	protected static $lastWrite;
-
-	/**
-	 * Height of the CLI window
-	 *
-	 * @var integer|null
-	 */
-	protected static $height;
-
-	/**
-	 * Width of the CLI window
-	 *
-	 * @var integer|null
-	 */
-	protected static $width;
-
-	/**
-	 * Whether the current stream supports colored output.
-	 *
-	 * @var boolean
-	 */
-	protected static $isColored = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Static "constructor".
-	 */
-	public static function init()
-	{
-		if (is_cli())
-		{
-			// Readline is an extension for PHP that makes interactivity with PHP
-			// much more bash-like.
-			// http://www.php.net/manual/en/readline.installation.php
-			static::$readline_support = extension_loaded('readline');
-
-			// clear segments & options to keep testing clean
-			static::$segments = [];
-			static::$options  = [];
-
-			// Check our stream resource for color support
-			static::$isColored = static::hasColorSupport(STDOUT);
-
-			static::parseCommandLine();
-
-			static::$initialized = true;
-		}
-		else
-		{
-			// If the command is being called from a controller
-			// we need to define STDOUT ourselves
-			// @codeCoverageIgnoreStart
-			define('STDOUT', 'php://output');
-			// @codeCoverageIgnoreEnd
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get input from the shell, using readline or the standard STDIN
-	 *
-	 * Named options must be in the following formats:
-	 * php index.php user -v --v -name=John --name=John
-	 *
-	 * @param  string $prefix
-	 * @return string
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function input(string $prefix = null): string
-	{
-		if (static::$readline_support)
-		{
-			return readline($prefix);
-		}
-
-		echo $prefix;
-
-		return fgets(STDIN);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asks the user for input.
-	 *
-	 * Usage:
-	 *
-	 * // Takes any input
-	 * $color = CLI::prompt('What is your favorite color?');
-	 *
-	 * // Takes any input, but offers default
-	 * $color = CLI::prompt('What is your favourite color?', 'white');
-	 *
-	 * // Will validate options with the in_list rule and accept only if one of the list
-	 * $color = CLI::prompt('What is your favourite color?', array('red','blue'));
-	 *
-	 * // Do not provide options but requires a valid email
-	 * $email = CLI::prompt('What is your email?', null, 'required|valid_email');
-	 *
-	 * @param string       $field      Output "field" question
-	 * @param string|array $options    String to a default value, array to a list of options (the first option will be the default value)
-	 * @param string|array $validation Validation rules
-	 *
-	 * @return string The user input
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function prompt(string $field, $options = null, $validation = null): string
-	{
-		$extraOutput = '';
-		$default     = '';
-
-		if ($validation && ! is_array($validation) && ! is_string($validation))
-		{
-			throw new InvalidArgumentException('$rules can only be of type string|array');
-		}
-
-		if (! is_array($validation))
-		{
-			$validation = $validation ? explode('|', $validation) : [];
-		}
-
-		if (is_string($options))
-		{
-			$extraOutput = ' [' . static::color($options, 'white') . ']';
-			$default     = $options;
-		}
-
-		if (is_array($options) && $options)
-		{
-			$opts               = $options;
-			$extraOutputDefault = static::color($opts[0], 'white');
-
-			unset($opts[0]);
-
-			if (empty($opts))
-			{
-				$extraOutput = $extraOutputDefault;
-			}
-			else
-			{
-				$extraOutput  = ' [' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
-				$validation[] = 'in_list[' . implode(',', $options) . ']';
-			}
-
-			$default = $options[0];
-		}
-
-		static::fwrite(STDOUT, $field . $extraOutput . ': ');
-
-		// Read the input from keyboard.
-		$input = trim(static::input()) ?: $default;
-
-		if ($validation)
-		{
-			while (! static::validate($field, $input, $validation))
-			{
-				$input = static::prompt($field, $options, $validation);
-			}
-		}
-
-		return empty($input) ? '' : $input;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Validate one prompt "field" at a time
-	 *
-	 * @param string       $field Prompt "field" output
-	 * @param string       $value Input value
-	 * @param string|array $rules Validation rules
-	 *
-	 * @return boolean
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected static function validate(string $field, string $value, $rules): bool
-	{
-		$label      = $field;
-		$field      = 'temp';
-		$validation = Services::validation(null, false);
-		$validation->setRules([
-			$field => [
-				'label' => $label,
-				'rules' => $rules,
-			],
-		]);
-		$validation->run([$field => $value]);
-
-		if ($validation->hasError($field))
-		{
-			static::error($validation->getError($field));
-
-			return false;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Outputs a string to the CLI without any surrounding newlines.
-	 * Useful for showing repeating elements on a single line.
-	 *
-	 * @param string      $text
-	 * @param string|null $foreground
-	 * @param string|null $background
-	 */
-	public static function print(string $text = '', string $foreground = null, string $background = null)
-	{
-		if ($foreground || $background)
-		{
-			$text = static::color($text, $foreground, $background);
-		}
-
-		static::$lastWrite = null;
-
-		static::fwrite(STDOUT, $text);
-	}
-
-	/**
-	 * Outputs a string to the cli on it's own line.
-	 *
-	 * @param string $text       The text to output
-	 * @param string $foreground
-	 * @param string $background
-	 */
-	public static function write(string $text = '', string $foreground = null, string $background = null)
-	{
-		if ($foreground || $background)
-		{
-			$text = static::color($text, $foreground, $background);
-		}
-
-		if (static::$lastWrite !== 'write')
-		{
-			$text              = PHP_EOL . $text;
-			static::$lastWrite = 'write';
-		}
-
-		static::fwrite(STDOUT, $text . PHP_EOL);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Outputs an error to the CLI using STDERR instead of STDOUT
-	 *
-	 * @param string      $text       The text to output, or array of errors
-	 * @param string      $foreground
-	 * @param string|null $background
-	 */
-	public static function error(string $text, string $foreground = 'light_red', string $background = null)
-	{
-		// Check color support for STDERR
-		$stdout            = static::$isColored;
-		static::$isColored = static::hasColorSupport(STDERR);
-
-		if ($foreground || $background)
-		{
-			$text = static::color($text, $foreground, $background);
-		}
-
-		static::fwrite(STDERR, $text . PHP_EOL);
-
-		// return STDOUT color support
-		static::$isColored = $stdout;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Beeps a certain number of times.
-	 *
-	 * @param integer $num The number of times to beep
-	 */
-	public static function beep(int $num = 1)
-	{
-		echo str_repeat("\x07", $num);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Waits a certain number of seconds, optionally showing a wait message and
-	 * waiting for a key press.
-	 *
-	 * @param integer $seconds   Number of seconds
-	 * @param boolean $countdown Show a countdown or not
-	 */
-	public static function wait(int $seconds, bool $countdown = false)
-	{
-		if ($countdown === true)
-		{
-			$time = $seconds;
-			while ($time > 0)
-			{
-				static::fwrite(STDOUT, $time . '... ');
-				sleep(1);
-				$time --;
-			}
-			static::write();
-		}
-		elseif ($seconds > 0)
-		{
-			sleep($seconds);
-		}
-		else
-		{
-			// this chunk cannot be tested because of keyboard input
-			// @codeCoverageIgnoreStart
-			static::write(static::$wait_msg);
-			static::input();
-			// @codeCoverageIgnoreEnd
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * if operating system === windows
-	 *
-	 * @return boolean
-	 */
-	public static function isWindows(): bool
-	{
-		return stripos(PHP_OS, 'WIN') === 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Enter a number of empty lines
-	 *
-	 * @param integer $num Number of lines to output
-	 *
-	 * @return void
-	 */
-	public static function newLine(int $num = 1)
-	{
-		// Do it once or more, write with empty string gives us a new line
-		for ($i = 0; $i < $num; $i ++)
-		{
-			static::write();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Clears the screen of output
-	 *
-	 * @return void
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function clearScreen()
-	{
-		// Unix systems, and Windows with VT100 Terminal support (i.e. Win10)
-		// can handle CSI sequences. For lower than Win10 we just shove in 40 new lines.
-		static::isWindows() && ! static::streamSupports('sapi_windows_vt100_support', STDOUT)
-			? static::newLine(40)
-			: static::fwrite(STDOUT, "\033[H\033[2J");
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the given text with the correct color codes for a foreground and
-	 * optionally a background color.
-	 *
-	 * @param string $text       The text to color
-	 * @param string $foreground The foreground color
-	 * @param string $background The background color
-	 * @param string $format     Other formatting to apply. Currently only 'underline' is understood
-	 *
-	 * @return string    The color coded string
-	 */
-	public static function color(string $text, string $foreground, string $background = null, string $format = null): string
-	{
-		if (! static::$isColored)
-		{
-			return $text;
-		}
-
-		if (! array_key_exists($foreground, static::$foreground_colors))
-		{
-			throw CLIException::forInvalidColor('foreground', $foreground);
-		}
-
-		if ($background !== null && ! array_key_exists($background, static::$background_colors))
-		{
-			throw CLIException::forInvalidColor('background', $background);
-		}
-
-		$string = "\033[" . static::$foreground_colors[$foreground] . 'm';
-
-		if ($background !== null)
-		{
-			$string .= "\033[" . static::$background_colors[$background] . 'm';
-		}
-
-		if ($format === 'underline')
-		{
-			$string .= "\033[4m";
-		}
-
-		// Detect if color method was already in use with this text
-		if (strpos($text, "\033[0m") !== false)
-		{
-			// Split the text into parts so that we can see
-			// if any part missing the color definition
-			$chunks = mb_split("\\033\[0m", $text);
-			// Reset text
-			$text = '';
-
-			foreach ($chunks as $chunk)
-			{
-				if ($chunk === '')
-				{
-					continue;
-				}
-
-				// If chunk doesn't have colors defined we need to add them
-				if (strpos($chunk, "\033[") === false)
-				{
-					$chunk = static::color($chunk, $foreground, $background, $format);
-					// Add color reset before chunk and clear end of the string
-					$text .= rtrim("\033[0m" . $chunk, "\033[0m");
-				}
-				else
-				{
-					$text .= $chunk;
-				}
-			}
-		}
-
-		return $string . $text . "\033[0m";
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the number of characters in string having encoded characters
-	 * and ignores styles set by the color() function
-	 *
-	 * @param string $string
-	 *
-	 * @return integer
-	 */
-	public static function strlen(?string $string): int
-	{
-		if (is_null($string))
-		{
-			return 0;
-		}
-
-		foreach (static::$foreground_colors as $color)
-		{
-			$string = strtr($string, ["\033[" . $color . 'm' => '']);
-		}
-
-		foreach (static::$background_colors as $color)
-		{
-			$string = strtr($string, ["\033[" . $color . 'm' => '']);
-		}
-
-		$string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
-
-		return mb_strwidth($string);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks whether the current stream resource supports or
-	 * refers to a valid terminal type device.
-	 *
-	 * @param string   $function
-	 * @param resource $resource
-	 *
-	 * @return boolean
-	 */
-	public static function streamSupports(string $function, $resource): bool
-	{
-		if (ENVIRONMENT === 'testing')
-		{
-			// In the current setup of the tests we cannot fully check
-			// if the stream supports the function since we are using
-			// filtered streams.
-			return function_exists($function);
-		}
-
-		// @codeCoverageIgnoreStart
-		return function_exists($function) && @$function($resource);
-		// @codeCoverageIgnoreEnd
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns true if the stream resource supports colors.
-	 *
-	 * This is tricky on Windows, because Cygwin, Msys2 etc. emulate pseudo
-	 * terminals via named pipes, so we can only check the environment.
-	 *
-	 * Reference: https://github.com/composer/xdebug-handler/blob/master/src/Process.php
-	 *
-	 * @param resource $resource
-	 *
-	 * @return boolean
-	 */
-	public static function hasColorSupport($resource): bool
-	{
-		// Follow https://no-color.org/
-		if (isset($_SERVER['NO_COLOR']) || getenv('NO_COLOR') !== false)
-		{
-			return false;
-		}
-
-		if (getenv('TERM_PROGRAM') === 'Hyper')
-		{
-			return true;
-		}
-
-		if (static::isWindows())
-		{
-			// @codeCoverageIgnoreStart
-			return static::streamSupports('sapi_windows_vt100_support', $resource)
-				|| isset($_SERVER['ANSICON'])
-				|| getenv('ANSICON') !== false
-				|| getenv('ConEmuANSI') === 'ON'
-				|| getenv('TERM') === 'xterm';
-			// @codeCoverageIgnoreEnd
-		}
-
-		return static::streamSupports('stream_isatty', $resource);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to determine the width of the viewable CLI window.
-	 *
-	 * @param integer $default
-	 *
-	 * @return integer
-	 */
-	public static function getWidth(int $default = 80): int
-	{
-		if (\is_null(static::$width))
-		{
-			static::generateDimensions();
-		}
-
-		return static::$width ?: $default;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to determine the height of the viewable CLI window.
-	 *
-	 * @param integer $default
-	 *
-	 * @return integer
-	 */
-	public static function getHeight(int $default = 32): int
-	{
-		if (\is_null(static::$height))
-		{
-			static::generateDimensions();
-		}
-
-		return static::$height ?: $default;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Populates the CLI's dimensions.
-	 *
-	 * @return void
-	 */
-	public static function generateDimensions()
-	{
-		try
-		{
-			if (static::isWindows())
-			{
-				// Shells such as `Cygwin` and `Git bash` returns incorrect values
-				// when executing `mode CON`, so we use `tput` instead
-				// @codeCoverageIgnoreStart
-				if (($shell = getenv('SHELL')) && preg_match('/(?:bash|zsh)(?:\.exe)?$/', $shell) || getenv('TERM'))
-				{
-					static::$height = (int) exec('tput lines');
-					static::$width  = (int) exec('tput cols');
-				}
-				else
-				{
-					$return = -1;
-					$output = [];
-					exec('mode CON', $output, $return);
-
-					// Look for the next lines ending in ": <number>"
-					// Searching for "Columns:" or "Lines:" will fail on non-English locales
-					if ($return === 0 && $output && preg_match('/:\s*(\d+)\n[^:]+:\s*(\d+)\n/', implode("\n", $output), $matches))
-					{
-						static::$height = (int) $matches[1];
-						static::$width  = (int) $matches[2];
-					}
-				}
-				// @codeCoverageIgnoreEnd
-			}
-			elseif (($size = exec('stty size')) && preg_match('/(\d+)\s+(\d+)/', $size, $matches))
-			{
-				static::$height = (int) $matches[1];
-				static::$width  = (int) $matches[2];
-			}
-			else
-			{
-				// @codeCoverageIgnoreStart
-				static::$height = (int) exec('tput lines');
-				static::$width  = (int) exec('tput cols');
-				// @codeCoverageIgnoreEnd
-			}
-		}
-		// @codeCoverageIgnoreStart
-		catch (Throwable $e)
-		{
-			// Reset the dimensions so that the default values will be returned later.
-			// Then let the developer know of the error.
-			static::$height = null;
-			static::$width  = null;
-			log_message('error', $e->getMessage());
-		}
-		// @codeCoverageIgnoreEnd
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays a progress bar on the CLI. You must call it repeatedly
-	 * to update it. Set $thisStep = false to erase the progress bar.
-	 *
-	 * @param integer|boolean $thisStep
-	 * @param integer         $totalSteps
-	 */
-	public static function showProgress($thisStep = 1, int $totalSteps = 10)
-	{
-		static $inProgress = false;
-
-		// restore cursor position when progress is continuing.
-		if ($inProgress !== false && $inProgress <= $thisStep)
-		{
-			static::fwrite(STDOUT, "\033[1A");
-		}
-		$inProgress = $thisStep;
-
-		if ($thisStep !== false)
-		{
-			// Don't allow div by zero or negative numbers....
-			$thisStep   = abs($thisStep);
-			$totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
-
-			$percent = (int) (($thisStep / $totalSteps) * 100);
-			$step    = (int) round($percent / 10);
-
-			// Write the progress bar
-			static::fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
-			// Textual representation...
-			static::fwrite(STDOUT, sprintf(' %3d%% Complete', $percent) . PHP_EOL);
-		}
-		else
-		{
-			static::fwrite(STDOUT, "\007");
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes a string and writes it to the command line, wrapping to a maximum
-	 * width. If no maximum width is specified, will wrap to the window's max
-	 * width.
-	 *
-	 * If an int is passed into $pad_left, then all strings after the first
-	 * will padded with that many spaces to the left. Useful when printing
-	 * short descriptions that need to start on an existing line.
-	 *
-	 * @param string  $string
-	 * @param integer $max
-	 * @param integer $padLeft
-	 *
-	 * @return string
-	 */
-	public static function wrap(string $string = null, int $max = 0, int $padLeft = 0): string
-	{
-		if (empty($string))
-		{
-			return '';
-		}
-
-		if ($max === 0)
-		{
-			$max = CLI::getWidth();
-		}
-
-		if (CLI::getWidth() < $max)
-		{
-			$max = CLI::getWidth();
-		}
-
-		$max = $max - $padLeft;
-
-		$lines = wordwrap($string, $max, PHP_EOL);
-
-		if ($padLeft > 0)
-		{
-			$lines = explode(PHP_EOL, $lines);
-
-			$first = true;
-
-			array_walk($lines, function (&$line, $index) use ($padLeft, &$first) {
-				if (! $first)
-				{
-					$line = str_repeat(' ', $padLeft) . $line;
-				}
-				else
-				{
-					$first = false;
-				}
-			});
-
-			$lines = implode(PHP_EOL, $lines);
-		}
-
-		return $lines;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Command-Line 'URI' support
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the command line it was called from and collects all
-	 * options and valid segments.
-	 */
-	protected static function parseCommandLine()
-	{
-		$args = $_SERVER['argv'] ?? [];
-		array_shift($args); // scrap invoking program
-		$optionValue = false;
-
-		foreach ($args as $i => $arg)
-		{
-			// If there's no "-" at the beginning, then
-			// this is probably an argument or an option value
-			if (mb_strpos($arg, '-') !== 0)
-			{
-				if ($optionValue)
-				{
-					// We have already included this in the previous
-					// iteration, so reset this flag
-					$optionValue = false;
-				}
-				else
-				{
-					// Yup, it's a segment
-					static::$segments[] = $arg;
-				}
-
-				continue;
-			}
-
-			$arg   = ltrim($arg, '-');
-			$value = null;
-
-			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
-			{
-				$value       = $args[$i + 1];
-				$optionValue = true;
-			}
-
-			static::$options[$arg] = $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the command line string portions of the arguments, minus
-	 * any options, as a string. This is used to pass along to the main
-	 * CodeIgniter application.
-	 *
-	 * @return string
-	 */
-	public static function getURI(): string
-	{
-		return implode('/', static::$segments);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an individual segment.
-	 *
-	 * This ignores any options that might have been dispersed between
-	 * valid segments in the command:
-	 *
-	 *  // segment(3) is 'three', not '-f' or 'anOption'
-	 *  > php spark one two -f anOption three
-	 *
-	 * **IMPORTANT:** The index here is one-based instead of zero-based.
-	 *
-	 * @param integer $index
-	 *
-	 * @return mixed|null
-	 */
-	public static function getSegment(int $index)
-	{
-		if (! isset(static::$segments[$index - 1]))
-		{
-			return null;
-		}
-
-		return static::$segments[$index - 1];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the raw array of segments found.
-	 *
-	 * @return array
-	 */
-	public static function getSegments(): array
-	{
-		return static::$segments;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets a single command-line option. Returns TRUE if the option
-	 * exists, but doesn't have a value, and is simply acting as a flag.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean|mixed|null
-	 */
-	public static function getOption(string $name)
-	{
-		if (! array_key_exists($name, static::$options))
-		{
-			return null;
-		}
-
-		// If the option didn't have a value, simply return TRUE
-		// so they know it was set, otherwise return the actual value.
-		$val = static::$options[$name] ?? true;
-
-		return $val;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the raw array of options found.
-	 *
-	 * @return array
-	 */
-	public static function getOptions(): array
-	{
-		return static::$options;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the options as a string, suitable for passing along on
-	 * the CLI to other commands.
-	 *
-	 * @param boolean $useLongOpts Use '--' for long options?
-	 * @param boolean $trim        Trim final string output?
-	 *
-	 * @return string
-	 */
-	public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
-	{
-		if (empty(static::$options))
-		{
-			return '';
-		}
-
-		$out = '';
-
-		foreach (static::$options as $name => $value)
-		{
-			if ($useLongOpts && mb_strlen($name) > 1)
-			{
-				$out .= "--{$name} ";
-			}
-			else
-			{
-				$out .= "-{$name} ";
-			}
-
-			// If there's a space, we need to group
-			// so it will pass correctly.
-			if (mb_strpos($value, ' ') !== false)
-			{
-				$out .= '"' . $value . '" ';
-			}
-			elseif ($value !== null)
-			{
-				$out .= "{$value} ";
-			}
-		}
-
-		return $trim ? trim($out) : $out;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a well formatted table
-	 *
-	 * @param array $tbody List of rows
-	 * @param array $thead List of columns
-	 *
-	 * @return void
-	 */
-	public static function table(array $tbody, array $thead = [])
-	{
-		// All the rows in the table will be here until the end
-		$tableRows = [];
-
-		// We need only indexes and not keys
-		if (! empty($thead))
-		{
-			$tableRows[] = array_values($thead);
-		}
-
-		foreach ($tbody as $tr)
-		{
-			$tableRows[] = array_values($tr);
-		}
-
-		// Yes, it really is necessary to know this count
-		$totalRows = count($tableRows);
-
-		// Store all columns lengths
-		// $all_cols_lengths[row][column] = length
-		$allColsLengths = [];
-
-		// Store maximum lengths by column
-		// $max_cols_lengths[column] = length
-		$maxColsLengths = [];
-
-		// Read row by row and define the longest columns
-		for ($row = 0; $row < $totalRows; $row ++)
-		{
-			$column = 0; // Current column index
-			foreach ($tableRows[$row] as $col)
-			{
-				// Sets the size of this column in the current row
-				$allColsLengths[$row][$column] = static::strlen($col);
-
-				// If the current column does not have a value among the larger ones
-				// or the value of this is greater than the existing one
-				// then, now, this assumes the maximum length
-				if (! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column])
-				{
-					$maxColsLengths[$column] = $allColsLengths[$row][$column];
-				}
-
-				// We can go check the size of the next column...
-				$column ++;
-			}
-		}
-
-		// Read row by row and add spaces at the end of the columns
-		// to match the exact column length
-		for ($row = 0; $row < $totalRows; $row ++)
-		{
-			$column = 0;
-			foreach ($tableRows[$row] as $col)
-			{
-				$diff = $maxColsLengths[$column] - static::strlen($col);
-				if ($diff)
-				{
-					$tableRows[$row][$column] = $tableRows[$row][$column] . str_repeat(' ', $diff);
-				}
-				$column ++;
-			}
-		}
-
-		$table = '';
-
-		// Joins columns and append the well formatted rows to the table
-		for ($row = 0; $row < $totalRows; $row ++)
-		{
-			// Set the table border-top
-			if ($row === 0)
-			{
-				$cols = '+';
-				foreach ($tableRows[$row] as $col)
-				{
-					$cols .= str_repeat('-', static::strlen($col) + 2) . '+';
-				}
-				$table .= $cols . PHP_EOL;
-			}
-
-			// Set the columns borders
-			$table .= '| ' . implode(' | ', $tableRows[$row]) . ' |' . PHP_EOL;
-
-			// Set the thead and table borders-bottom
-			if (isset($cols) && ($row === 0 && ! empty($thead) || $row + 1 === $totalRows))
-			{
-				$table .= $cols . PHP_EOL;
-			}
-		}
-
-		static::write($table);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * While the library is intended for use on CLI commands,
-	 * commands can be called from controllers and elsewhere
-	 * so we need a way to allow them to still work.
-	 *
-	 * For now, just echo the content, but look into a better
-	 * solution down the road.
-	 *
-	 * @param resource $handle
-	 * @param string   $string
-	 *
-	 * @return void
-	 */
-	protected static function fwrite($handle, string $string)
-	{
-		if (! is_cli())
-		{
-			// @codeCoverageIgnoreStart
-			echo $string;
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		fwrite($handle, $string);
-	}
+    /**
+     * Is the readline library on the system?
+     *
+     * @var bool
+     */
+    public static $readline_support = false;
+
+    /**
+     * The message displayed at prompts.
+     *
+     * @var string
+     */
+    public static $wait_msg = 'Press any key to continue...';
+
+    /**
+     * Has the class already been initialized?
+     *
+     * @var bool
+     */
+    protected static $initialized = false;
+
+    /**
+     * Foreground color list
+     *
+     * @var array<string, string>
+     */
+    protected static $foreground_colors = [
+        'black'        => '0;30',
+        'dark_gray'    => '1;30',
+        'blue'         => '0;34',
+        'dark_blue'    => '0;34',
+        'light_blue'   => '1;34',
+        'green'        => '0;32',
+        'light_green'  => '1;32',
+        'cyan'         => '0;36',
+        'light_cyan'   => '1;36',
+        'red'          => '0;31',
+        'light_red'    => '1;31',
+        'purple'       => '0;35',
+        'light_purple' => '1;35',
+        'yellow'       => '0;33',
+        'light_yellow' => '1;33',
+        'light_gray'   => '0;37',
+        'white'        => '1;37',
+    ];
+
+    /**
+     * Background color list
+     *
+     * @var array<string, string>
+     */
+    protected static $background_colors = [
+        'black'      => '40',
+        'red'        => '41',
+        'green'      => '42',
+        'yellow'     => '43',
+        'blue'       => '44',
+        'magenta'    => '45',
+        'cyan'       => '46',
+        'light_gray' => '47',
+    ];
+
+    /**
+     * List of array segments.
+     *
+     * @var array
+     */
+    protected static $segments = [];
+
+    /**
+     * @var array
+     */
+    protected static $options = [];
+
+    /**
+     * Helps track internally whether the last
+     * output was a "write" or a "print" to
+     * keep the output clean and as expected.
+     *
+     * @var string|null
+     */
+    protected static $lastWrite;
+
+    /**
+     * Height of the CLI window
+     *
+     * @var int|null
+     */
+    protected static $height;
+
+    /**
+     * Width of the CLI window
+     *
+     * @var int|null
+     */
+    protected static $width;
+
+    /**
+     * Whether the current stream supports colored output.
+     *
+     * @var bool
+     */
+    protected static $isColored = false;
+
+    /**
+     * Static "constructor".
+     */
+    public static function init()
+    {
+        if (is_cli()) {
+            // Readline is an extension for PHP that makes interactivity with PHP
+            // much more bash-like.
+            // http://www.php.net/manual/en/readline.installation.php
+            static::$readline_support = extension_loaded('readline');
+
+            // clear segments & options to keep testing clean
+            static::$segments = [];
+            static::$options  = [];
+
+            // Check our stream resource for color support
+            static::$isColored = static::hasColorSupport(STDOUT);
+
+            static::parseCommandLine();
+
+            static::$initialized = true;
+        } else {
+            // If the command is being called from a controller
+            // we need to define STDOUT ourselves
+            define('STDOUT', 'php://output'); // @codeCoverageIgnore
+        }
+    }
+
+    /**
+     * Get input from the shell, using readline or the standard STDIN
+     *
+     * Named options must be in the following formats:
+     * php index.php user -v --v -name=John --name=John
+     *
+     * @param string $prefix
+     *
+     * @codeCoverageIgnore
+     */
+    public static function input(?string $prefix = null): string
+    {
+        if (static::$readline_support) {
+            return readline($prefix);
+        }
+
+        echo $prefix;
+
+        return fgets(STDIN);
+    }
+
+    /**
+     * Asks the user for input.
+     *
+     * Usage:
+     *
+     * // Takes any input
+     * $color = CLI::prompt('What is your favorite color?');
+     *
+     * // Takes any input, but offers default
+     * $color = CLI::prompt('What is your favourite color?', 'white');
+     *
+     * // Will validate options with the in_list rule and accept only if one of the list
+     * $color = CLI::prompt('What is your favourite color?', array('red','blue'));
+     *
+     * // Do not provide options but requires a valid email
+     * $email = CLI::prompt('What is your email?', null, 'required|valid_email');
+     *
+     * @param string       $field      Output "field" question
+     * @param array|string $options    String to a default value, array to a list of options (the first option will be the default value)
+     * @param array|string $validation Validation rules
+     *
+     * @return string The user input
+     *
+     * @codeCoverageIgnore
+     */
+    public static function prompt(string $field, $options = null, $validation = null): string
+    {
+        $extraOutput = '';
+        $default     = '';
+
+        if ($validation && ! is_array($validation) && ! is_string($validation)) {
+            throw new InvalidArgumentException('$rules can only be of type string|array');
+        }
+
+        if (! is_array($validation)) {
+            $validation = $validation ? explode('|', $validation) : [];
+        }
+
+        if (is_string($options)) {
+            $extraOutput = ' [' . static::color($options, 'white') . ']';
+            $default     = $options;
+        }
+
+        if (is_array($options) && $options) {
+            $opts               = $options;
+            $extraOutputDefault = static::color($opts[0], 'white');
+
+            unset($opts[0]);
+
+            if (empty($opts)) {
+                $extraOutput = $extraOutputDefault;
+            } else {
+                $extraOutput  = ' [' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
+                $validation[] = 'in_list[' . implode(',', $options) . ']';
+            }
+
+            $default = $options[0];
+        }
+
+        static::fwrite(STDOUT, $field . $extraOutput . ': ');
+
+        // Read the input from keyboard.
+        $input = trim(static::input()) ?: $default;
+
+        if ($validation) {
+            while (! static::validate($field, $input, $validation)) {
+                $input = static::prompt($field, $options, $validation);
+            }
+        }
+
+        return empty($input) ? '' : $input;
+    }
+
+    /**
+     * Validate one prompt "field" at a time
+     *
+     * @param string       $field Prompt "field" output
+     * @param string       $value Input value
+     * @param array|string $rules Validation rules
+     *
+     * @codeCoverageIgnore
+     */
+    protected static function validate(string $field, string $value, $rules): bool
+    {
+        $label      = $field;
+        $field      = 'temp';
+        $validation = Services::validation(null, false);
+        $validation->setRules([
+            $field => [
+                'label' => $label,
+                'rules' => $rules,
+            ],
+        ]);
+        $validation->run([$field => $value]);
+
+        if ($validation->hasError($field)) {
+            static::error($validation->getError($field));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Outputs a string to the CLI without any surrounding newlines.
+     * Useful for showing repeating elements on a single line.
+     */
+    public static function print(string $text = '', ?string $foreground = null, ?string $background = null)
+    {
+        if ($foreground || $background) {
+            $text = static::color($text, $foreground, $background);
+        }
+
+        static::$lastWrite = null;
+
+        static::fwrite(STDOUT, $text);
+    }
+
+    /**
+     * Outputs a string to the cli on it's own line.
+     */
+    public static function write(string $text = '', ?string $foreground = null, ?string $background = null)
+    {
+        if ($foreground || $background) {
+            $text = static::color($text, $foreground, $background);
+        }
+
+        if (static::$lastWrite !== 'write') {
+            $text              = PHP_EOL . $text;
+            static::$lastWrite = 'write';
+        }
+
+        static::fwrite(STDOUT, $text . PHP_EOL);
+    }
+
+    /**
+     * Outputs an error to the CLI using STDERR instead of STDOUT
+     */
+    public static function error(string $text, string $foreground = 'light_red', ?string $background = null)
+    {
+        // Check color support for STDERR
+        $stdout            = static::$isColored;
+        static::$isColored = static::hasColorSupport(STDERR);
+
+        if ($foreground || $background) {
+            $text = static::color($text, $foreground, $background);
+        }
+
+        static::fwrite(STDERR, $text . PHP_EOL);
+
+        // return STDOUT color support
+        static::$isColored = $stdout;
+    }
+
+    /**
+     * Beeps a certain number of times.
+     *
+     * @param int $num The number of times to beep
+     */
+    public static function beep(int $num = 1)
+    {
+        echo str_repeat("\x07", $num);
+    }
+
+    /**
+     * Waits a certain number of seconds, optionally showing a wait message and
+     * waiting for a key press.
+     *
+     * @param int  $seconds   Number of seconds
+     * @param bool $countdown Show a countdown or not
+     */
+    public static function wait(int $seconds, bool $countdown = false)
+    {
+        if ($countdown === true) {
+            $time = $seconds;
+
+            while ($time > 0) {
+                static::fwrite(STDOUT, $time . '... ');
+                sleep(1);
+                $time--;
+            }
+
+            static::write();
+        } elseif ($seconds > 0) {
+            sleep($seconds);
+        } else {
+            // this chunk cannot be tested because of keyboard input
+            // @codeCoverageIgnoreStart
+            static::write(static::$wait_msg);
+            static::input();
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    /**
+     * if operating system === windows
+     */
+    public static function isWindows(): bool
+    {
+        return PHP_OS_FAMILY === 'Windows';
+    }
+
+    /**
+     * Enter a number of empty lines
+     */
+    public static function newLine(int $num = 1)
+    {
+        // Do it once or more, write with empty string gives us a new line
+        for ($i = 0; $i < $num; $i++) {
+            static::write();
+        }
+    }
+
+    /**
+     * Clears the screen of output
+     *
+     * @codeCoverageIgnore
+     */
+    public static function clearScreen()
+    {
+        // Unix systems, and Windows with VT100 Terminal support (i.e. Win10)
+        // can handle CSI sequences. For lower than Win10 we just shove in 40 new lines.
+        static::isWindows() && ! static::streamSupports('sapi_windows_vt100_support', STDOUT)
+            ? static::newLine(40)
+            : static::fwrite(STDOUT, "\033[H\033[2J");
+    }
+
+    /**
+     * Returns the given text with the correct color codes for a foreground and
+     * optionally a background color.
+     *
+     * @param string $text       The text to color
+     * @param string $foreground The foreground color
+     * @param string $background The background color
+     * @param string $format     Other formatting to apply. Currently only 'underline' is understood
+     *
+     * @return string The color coded string
+     */
+    public static function color(string $text, string $foreground, ?string $background = null, ?string $format = null): string
+    {
+        if (! static::$isColored) {
+            return $text;
+        }
+
+        if (! array_key_exists($foreground, static::$foreground_colors)) {
+            throw CLIException::forInvalidColor('foreground', $foreground);
+        }
+
+        if ($background !== null && ! array_key_exists($background, static::$background_colors)) {
+            throw CLIException::forInvalidColor('background', $background);
+        }
+
+        $string = "\033[" . static::$foreground_colors[$foreground] . 'm';
+
+        if ($background !== null) {
+            $string .= "\033[" . static::$background_colors[$background] . 'm';
+        }
+
+        if ($format === 'underline') {
+            $string .= "\033[4m";
+        }
+
+        // Detect if color method was already in use with this text
+        if (strpos($text, "\033[0m") !== false) {
+            // Split the text into parts so that we can see
+            // if any part missing the color definition
+            $chunks = mb_split('\\033\\[0m', $text);
+            // Reset text
+            $text = '';
+
+            foreach ($chunks as $chunk) {
+                if ($chunk === '') {
+                    continue;
+                }
+
+                // If chunk doesn't have colors defined we need to add them
+                if (strpos($chunk, "\033[") === false) {
+                    $chunk = static::color($chunk, $foreground, $background, $format);
+                    // Add color reset before chunk and clear end of the string
+                    $text .= rtrim("\033[0m" . $chunk, "\033[0m");
+                } else {
+                    $text .= $chunk;
+                }
+            }
+        }
+
+        return $string . $text . "\033[0m";
+    }
+
+    /**
+     * Get the number of characters in string having encoded characters
+     * and ignores styles set by the color() function
+     */
+    public static function strlen(?string $string): int
+    {
+        if ($string === null) {
+            return 0;
+        }
+
+        foreach (static::$foreground_colors as $color) {
+            $string = strtr($string, ["\033[" . $color . 'm' => '']);
+        }
+
+        foreach (static::$background_colors as $color) {
+            $string = strtr($string, ["\033[" . $color . 'm' => '']);
+        }
+
+        $string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
+
+        return mb_strwidth($string);
+    }
+
+    /**
+     * Checks whether the current stream resource supports or
+     * refers to a valid terminal type device.
+     *
+     * @param resource $resource
+     */
+    public static function streamSupports(string $function, $resource): bool
+    {
+        if (ENVIRONMENT === 'testing') {
+            // In the current setup of the tests we cannot fully check
+            // if the stream supports the function since we are using
+            // filtered streams.
+            return function_exists($function);
+        }
+
+        return function_exists($function) && @$function($resource); // @codeCoverageIgnore
+    }
+
+    /**
+     * Returns true if the stream resource supports colors.
+     *
+     * This is tricky on Windows, because Cygwin, Msys2 etc. emulate pseudo
+     * terminals via named pipes, so we can only check the environment.
+     *
+     * Reference: https://github.com/composer/xdebug-handler/blob/master/src/Process.php
+     *
+     * @param resource $resource
+     */
+    public static function hasColorSupport($resource): bool
+    {
+        // Follow https://no-color.org/
+        if (isset($_SERVER['NO_COLOR']) || getenv('NO_COLOR') !== false) {
+            return false;
+        }
+
+        if (getenv('TERM_PROGRAM') === 'Hyper') {
+            return true;
+        }
+
+        if (static::isWindows()) {
+            // @codeCoverageIgnoreStart
+            return static::streamSupports('sapi_windows_vt100_support', $resource)
+                || isset($_SERVER['ANSICON'])
+                || getenv('ANSICON') !== false
+                || getenv('ConEmuANSI') === 'ON'
+                || getenv('TERM') === 'xterm';
+            // @codeCoverageIgnoreEnd
+        }
+
+        return static::streamSupports('stream_isatty', $resource);
+    }
+
+    /**
+     * Attempts to determine the width of the viewable CLI window.
+     */
+    public static function getWidth(int $default = 80): int
+    {
+        if (static::$width === null) {
+            static::generateDimensions();
+        }
+
+        return static::$width ?: $default;
+    }
+
+    /**
+     * Attempts to determine the height of the viewable CLI window.
+     */
+    public static function getHeight(int $default = 32): int
+    {
+        if (static::$height === null) {
+            static::generateDimensions();
+        }
+
+        return static::$height ?: $default;
+    }
+
+    /**
+     * Populates the CLI's dimensions.
+     *
+     * @codeCoverageIgnore
+     */
+    public static function generateDimensions()
+    {
+        try {
+            if (static::isWindows()) {
+                // Shells such as `Cygwin` and `Git bash` returns incorrect values
+                // when executing `mode CON`, so we use `tput` instead
+                if (getenv('TERM') || (($shell = getenv('SHELL')) && preg_match('/(?:bash|zsh)(?:\.exe)?$/', $shell))) {
+                    static::$height = (int) exec('tput lines');
+                    static::$width  = (int) exec('tput cols');
+                } else {
+                    $return = -1;
+                    $output = [];
+                    exec('mode CON', $output, $return);
+
+                    // Look for the next lines ending in ": <number>"
+                    // Searching for "Columns:" or "Lines:" will fail on non-English locales
+                    if ($return === 0 && $output && preg_match('/:\s*(\d+)\n[^:]+:\s*(\d+)\n/', implode("\n", $output), $matches)) {
+                        static::$height = (int) $matches[1];
+                        static::$width  = (int) $matches[2];
+                    }
+                }
+            } elseif (($size = exec('stty size')) && preg_match('/(\d+)\s+(\d+)/', $size, $matches)) {
+                static::$height = (int) $matches[1];
+                static::$width  = (int) $matches[2];
+            } else {
+                static::$height = (int) exec('tput lines');
+                static::$width  = (int) exec('tput cols');
+            }
+        } catch (Throwable $e) {
+            // Reset the dimensions so that the default values will be returned later.
+            // Then let the developer know of the error.
+            static::$height = null;
+            static::$width  = null;
+            log_message('error', $e->getMessage());
+        }
+    }
+
+    /**
+     * Displays a progress bar on the CLI. You must call it repeatedly
+     * to update it. Set $thisStep = false to erase the progress bar.
+     *
+     * @param bool|int $thisStep
+     */
+    public static function showProgress($thisStep = 1, int $totalSteps = 10)
+    {
+        static $inProgress = false;
+
+        // restore cursor position when progress is continuing.
+        if ($inProgress !== false && $inProgress <= $thisStep) {
+            static::fwrite(STDOUT, "\033[1A");
+        }
+        $inProgress = $thisStep;
+
+        if ($thisStep !== false) {
+            // Don't allow div by zero or negative numbers....
+            $thisStep   = abs($thisStep);
+            $totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
+
+            $percent = (int) (($thisStep / $totalSteps) * 100);
+            $step    = (int) round($percent / 10);
+
+            // Write the progress bar
+            static::fwrite(STDOUT, "[\033[32m" . str_repeat('#', $step) . str_repeat('.', 10 - $step) . "\033[0m]");
+            // Textual representation...
+            static::fwrite(STDOUT, sprintf(' %3d%% Complete', $percent) . PHP_EOL);
+        } else {
+            static::fwrite(STDOUT, "\007");
+        }
+    }
+
+    /**
+     * Takes a string and writes it to the command line, wrapping to a maximum
+     * width. If no maximum width is specified, will wrap to the window's max
+     * width.
+     *
+     * If an int is passed into $pad_left, then all strings after the first
+     * will padded with that many spaces to the left. Useful when printing
+     * short descriptions that need to start on an existing line.
+     */
+    public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
+    {
+        if (empty($string)) {
+            return '';
+        }
+
+        if ($max === 0) {
+            $max = self::getWidth();
+        }
+
+        if (self::getWidth() < $max) {
+            $max = self::getWidth();
+        }
+
+        $max = $max - $padLeft;
+
+        $lines = wordwrap($string, $max, PHP_EOL);
+
+        if ($padLeft > 0) {
+            $lines = explode(PHP_EOL, $lines);
+
+            $first = true;
+
+            array_walk($lines, static function (&$line) use ($padLeft, &$first) {
+                if (! $first) {
+                    $line = str_repeat(' ', $padLeft) . $line;
+                } else {
+                    $first = false;
+                }
+            });
+
+            $lines = implode(PHP_EOL, $lines);
+        }
+
+        return $lines;
+    }
+
+    //--------------------------------------------------------------------
+    // Command-Line 'URI' support
+    //--------------------------------------------------------------------
+
+    /**
+     * Parses the command line it was called from and collects all
+     * options and valid segments.
+     */
+    protected static function parseCommandLine()
+    {
+        $args = $_SERVER['argv'] ?? [];
+        array_shift($args); // scrap invoking program
+        $optionValue = false;
+
+        foreach ($args as $i => $arg) {
+            // If there's no "-" at the beginning, then
+            // this is probably an argument or an option value
+            if (mb_strpos($arg, '-') !== 0) {
+                if ($optionValue) {
+                    // We have already included this in the previous
+                    // iteration, so reset this flag
+                    $optionValue = false;
+                } else {
+                    // Yup, it's a segment
+                    static::$segments[] = $arg;
+                }
+
+                continue;
+            }
+
+            $arg   = ltrim($arg, '-');
+            $value = null;
+
+            if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
+                $value       = $args[$i + 1];
+                $optionValue = true;
+            }
+
+            static::$options[$arg] = $value;
+        }
+    }
+
+    /**
+     * Returns the command line string portions of the arguments, minus
+     * any options, as a string. This is used to pass along to the main
+     * CodeIgniter application.
+     */
+    public static function getURI(): string
+    {
+        return implode('/', static::$segments);
+    }
+
+    /**
+     * Returns an individual segment.
+     *
+     * This ignores any options that might have been dispersed between
+     * valid segments in the command:
+     *
+     *  // segment(3) is 'three', not '-f' or 'anOption'
+     *  > php spark one two -f anOption three
+     *
+     * **IMPORTANT:** The index here is one-based instead of zero-based.
+     *
+     * @return mixed
+     */
+    public static function getSegment(int $index)
+    {
+        return static::$segments[$index - 1] ?? null;
+    }
+
+    /**
+     * Returns the raw array of segments found.
+     */
+    public static function getSegments(): array
+    {
+        return static::$segments;
+    }
+
+    /**
+     * Gets a single command-line option. Returns TRUE if the option
+     * exists, but doesn't have a value, and is simply acting as a flag.
+     *
+     * @return mixed
+     */
+    public static function getOption(string $name)
+    {
+        if (! array_key_exists($name, static::$options)) {
+            return null;
+        }
+
+        // If the option didn't have a value, simply return TRUE
+        // so they know it was set, otherwise return the actual value.
+        $val = static::$options[$name] ?? true;
+
+        return $val;
+    }
+
+    /**
+     * Returns the raw array of options found.
+     */
+    public static function getOptions(): array
+    {
+        return static::$options;
+    }
+
+    /**
+     * Returns the options as a string, suitable for passing along on
+     * the CLI to other commands.
+     *
+     * @param bool $useLongOpts Use '--' for long options?
+     * @param bool $trim        Trim final string output?
+     */
+    public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
+    {
+        if (empty(static::$options)) {
+            return '';
+        }
+
+        $out = '';
+
+        foreach (static::$options as $name => $value) {
+            if ($useLongOpts && mb_strlen($name) > 1) {
+                $out .= "--{$name} ";
+            } else {
+                $out .= "-{$name} ";
+            }
+
+            // If there's a space, we need to group
+            // so it will pass correctly.
+            if (mb_strpos($value, ' ') !== false) {
+                $out .= '"' . $value . '" ';
+            } elseif ($value !== null) {
+                $out .= "{$value} ";
+            }
+        }
+
+        return $trim ? trim($out) : $out;
+    }
+
+    /**
+     * Returns a well formatted table
+     *
+     * @param array $tbody List of rows
+     * @param array $thead List of columns
+     */
+    public static function table(array $tbody, array $thead = [])
+    {
+        // All the rows in the table will be here until the end
+        $tableRows = [];
+
+        // We need only indexes and not keys
+        if (! empty($thead)) {
+            $tableRows[] = array_values($thead);
+        }
+
+        foreach ($tbody as $tr) {
+            $tableRows[] = array_values($tr);
+        }
+
+        // Yes, it really is necessary to know this count
+        $totalRows = count($tableRows);
+
+        // Store all columns lengths
+        // $all_cols_lengths[row][column] = length
+        $allColsLengths = [];
+
+        // Store maximum lengths by column
+        // $max_cols_lengths[column] = length
+        $maxColsLengths = [];
+
+        // Read row by row and define the longest columns
+        for ($row = 0; $row < $totalRows; $row++) {
+            $column = 0; // Current column index
+
+            foreach ($tableRows[$row] as $col) {
+                // Sets the size of this column in the current row
+                $allColsLengths[$row][$column] = static::strlen($col);
+
+                // If the current column does not have a value among the larger ones
+                // or the value of this is greater than the existing one
+                // then, now, this assumes the maximum length
+                if (! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column]) {
+                    $maxColsLengths[$column] = $allColsLengths[$row][$column];
+                }
+
+                // We can go check the size of the next column...
+                $column++;
+            }
+        }
+
+        // Read row by row and add spaces at the end of the columns
+        // to match the exact column length
+        for ($row = 0; $row < $totalRows; $row++) {
+            $column = 0;
+
+            foreach ($tableRows[$row] as $col) {
+                $diff = $maxColsLengths[$column] - static::strlen($col);
+
+                if ($diff) {
+                    $tableRows[$row][$column] = $tableRows[$row][$column] . str_repeat(' ', $diff);
+                }
+
+                $column++;
+            }
+        }
+
+        $table = '';
+
+        // Joins columns and append the well formatted rows to the table
+        for ($row = 0; $row < $totalRows; $row++) {
+            // Set the table border-top
+            if ($row === 0) {
+                $cols = '+';
+
+                foreach ($tableRows[$row] as $col) {
+                    $cols .= str_repeat('-', static::strlen($col) + 2) . '+';
+                }
+                $table .= $cols . PHP_EOL;
+            }
+
+            // Set the columns borders
+            $table .= '| ' . implode(' | ', $tableRows[$row]) . ' |' . PHP_EOL;
+
+            // Set the thead and table borders-bottom
+            if (isset($cols) && (($row === 0 && ! empty($thead)) || ($row + 1 === $totalRows))) {
+                $table .= $cols . PHP_EOL;
+            }
+        }
+
+        static::write($table);
+    }
+
+    /**
+     * While the library is intended for use on CLI commands,
+     * commands can be called from controllers and elsewhere
+     * so we need a way to allow them to still work.
+     *
+     * For now, just echo the content, but look into a better
+     * solution down the road.
+     *
+     * @param resource $handle
+     */
+    protected static function fwrite($handle, string $string)
+    {
+        if (! is_cli()) {
+            // @codeCoverageIgnoreStart
+            echo $string;
+
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        fwrite($handle, $string);
+    }
 }
 
 // Ensure the class is initialized. Done outside of code coverage
-// @codeCoverageIgnoreStart
-CLI::init();
-// @codeCoverageIgnoreEnd
+CLI::init(); // @codeCoverageIgnore
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index e1643b60c035..a6985d0db931 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
@@ -20,64 +20,61 @@
  */
 class CommandRunner extends Controller
 {
-	/**
-	 * Instance of class managing the collection of commands
-	 *
-	 * @var Commands
-	 */
-	protected $commands;
+    /**
+     * Instance of class managing the collection of commands
+     *
+     * @var Commands
+     */
+    protected $commands;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		$this->commands = Services::commands();
-	}
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->commands = Services::commands();
+    }
 
-	/**
-	 * We map all un-routed CLI methods through this function
-	 * so we have the chance to look for a Command first.
-	 *
-	 * @param string $method
-	 * @param array  ...$params
-	 *
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	public function _remap($method, ...$params)
-	{
-		// The first param is usually empty, so scrap it.
-		if (empty($params[0]))
-		{
-			array_shift($params);
-		}
+    /**
+     * We map all un-routed CLI methods through this function
+     * so we have the chance to look for a Command first.
+     *
+     * @param string $method
+     * @param array  ...$params
+     *
+     * @throws ReflectionException
+     *
+     * @return mixed
+     */
+    public function _remap($method, ...$params)
+    {
+        // The first param is usually empty, so scrap it.
+        if (empty($params[0])) {
+            array_shift($params);
+        }
 
-		return $this->index($params);
-	}
+        return $this->index($params);
+    }
 
-	/**
-	 * Default command.
-	 *
-	 * @param array $params
-	 *
-	 * @return mixed
-	 * @throws ReflectionException
-	 */
-	public function index(array $params)
-	{
-		$command = array_shift($params) ?? 'list';
+    /**
+     * Default command.
+     *
+     * @throws ReflectionException
+     *
+     * @return mixed
+     */
+    public function index(array $params)
+    {
+        $command = array_shift($params) ?? 'list';
 
-		return $this->commands->run($command, $params);
-	}
+        return $this->commands->run($command, $params);
+    }
 
-	/**
-	 * Allows access to the current commands that have been found.
-	 *
-	 * @return array
-	 */
-	public function getCommands(): array
-	{
-		return $this->commands->getCommands();
-	}
+    /**
+     * Allows access to the current commands that have been found.
+     */
+    public function getCommands(): array
+    {
+        return $this->commands->getCommands();
+    }
 }
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index cdbbed0299c0..3f84f33d918f 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
@@ -21,193 +21,161 @@
  */
 class Commands
 {
-	/**
-	 * The found commands.
-	 *
-	 * @var array
-	 */
-	protected $commands = [];
-
-	/**
-	 * Logger instance.
-	 *
-	 * @var Logger
-	 */
-	protected $logger;
-
-	/**
-	 * Constructor
-	 *
-	 * @param Logger|null $logger
-	 */
-	public function __construct($logger = null)
-	{
-		$this->logger = $logger ?? service('logger');
-		$this->discoverCommands();
-	}
-
-	/**
-	 * Runs a command given
-	 *
-	 * @param string $command
-	 * @param array  $params
-	 */
-	public function run(string $command, array $params)
-	{
-		if (! $this->verifyCommand($command, $this->commands))
-		{
-			return;
-		}
-
-		// The file would have already been loaded during the
-		// createCommandList function...
-		$className = $this->commands[$command]['class'];
-		$class     = new $className($this->logger, $this);
-
-		return $class->run($params);
-	}
-
-	/**
-	 * Provide access to the list of commands.
-	 *
-	 * @return array
-	 */
-	public function getCommands()
-	{
-		return $this->commands;
-	}
-
-	/**
-	 * Discovers all commands in the framework and within user code,
-	 * and collects instances of them to work with.
-	 *
-	 * @return void
-	 */
-	public function discoverCommands()
-	{
-		if ($this->commands !== [])
-		{
-			return;
-		}
-
-		/** @var FileLocator $locator */
-		$locator = service('locator');
-		$files   = $locator->listFiles('Commands/');
-
-		// If no matching command files were found, bail
-		// This should never happen in unit testing.
-		if ($files === [])
-		{
-			return; // @codeCoverageIgnore
-		}
-
-		// Loop over each file checking to see if a command with that
-		// alias exists in the class.
-		foreach ($files as $file)
-		{
-			$className = $locator->findQualifiedNameFromPath($file);
-
-			if (empty($className) || ! class_exists($className))
-			{
-				continue;
-			}
-
-			try
-			{
-				$class = new ReflectionClass($className);
-
-				if (! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class))
-				{
-					continue;
-				}
-
-				/** @var BaseCommand $class */
-				$class = new $className($this->logger, $this);
-
-				if (isset($class->group))
-				{
-					$this->commands[$class->name] = [
-						'class'       => $className,
-						'file'        => $file,
-						'group'       => $class->group,
-						'description' => $class->description,
-					];
-				}
-
-				unset($class);
-			}
-			catch (ReflectionException $e)
-			{
-				$this->logger->error($e->getMessage());
-			}
-		}
-
-		asort($this->commands);
-	}
-
-	/**
-	 * Verifies if the command being sought is found
-	 * in the commands list.
-	 *
-	 * @param string $command
-	 * @param array  $commands
-	 *
-	 * @return boolean
-	 */
-	public function verifyCommand(string $command, array $commands): bool
-	{
-		if (isset($commands[$command]))
-		{
-			return true;
-		}
-
-		$message = lang('CLI.commandNotFound', [$command]);
-
-		if ($alternatives = $this->getCommandAlternatives($command, $commands))
-		{
-			if (count($alternatives) === 1)
-			{
-				$message .= "\n\n" . lang('CLI.altCommandSingular') . "\n    ";
-			}
-			else
-			{
-				$message .= "\n\n" . lang('CLI.altCommandPlural') . "\n    ";
-			}
-
-			$message .= implode("\n    ", $alternatives);
-		}
-
-		CLI::error($message);
-		CLI::newLine();
-
-		return false;
-	}
-
-	/**
-	 * Finds alternative of `$name` among collection
-	 * of commands.
-	 *
-	 * @param string $name
-	 * @param array  $collection
-	 *
-	 * @return array
-	 */
-	protected function getCommandAlternatives(string $name, array $collection): array
-	{
-		$alternatives = [];
-
-		foreach (array_keys($collection) as $commandName)
-		{
-			$lev = levenshtein($name, $commandName);
-
-			if ($lev <= strlen($commandName) / 3 || strpos($commandName, $name) !== false)
-			{
-				$alternatives[$commandName] = $lev;
-			}
-		}
-
-		ksort($alternatives, SORT_NATURAL | SORT_FLAG_CASE);
-
-		return array_keys($alternatives);
-	}
+    /**
+     * The found commands.
+     *
+     * @var array
+     */
+    protected $commands = [];
+
+    /**
+     * Logger instance.
+     *
+     * @var Logger
+     */
+    protected $logger;
+
+    /**
+     * Constructor
+     *
+     * @param Logger|null $logger
+     */
+    public function __construct($logger = null)
+    {
+        $this->logger = $logger ?? service('logger');
+        $this->discoverCommands();
+    }
+
+    /**
+     * Runs a command given
+     */
+    public function run(string $command, array $params)
+    {
+        if (! $this->verifyCommand($command, $this->commands)) {
+            return;
+        }
+
+        // The file would have already been loaded during the
+        // createCommandList function...
+        $className = $this->commands[$command]['class'];
+        $class     = new $className($this->logger, $this);
+
+        return $class->run($params);
+    }
+
+    /**
+     * Provide access to the list of commands.
+     *
+     * @return array
+     */
+    public function getCommands()
+    {
+        return $this->commands;
+    }
+
+    /**
+     * Discovers all commands in the framework and within user code,
+     * and collects instances of them to work with.
+     */
+    public function discoverCommands()
+    {
+        if ($this->commands !== []) {
+            return;
+        }
+
+        /** @var FileLocator $locator */
+        $locator = service('locator');
+        $files   = $locator->listFiles('Commands/');
+
+        // If no matching command files were found, bail
+        // This should never happen in unit testing.
+        if ($files === []) {
+            return; // @codeCoverageIgnore
+        }
+
+        // Loop over each file checking to see if a command with that
+        // alias exists in the class.
+        foreach ($files as $file) {
+            $className = $locator->findQualifiedNameFromPath($file);
+
+            if (empty($className) || ! class_exists($className)) {
+                continue;
+            }
+
+            try {
+                $class = new ReflectionClass($className);
+
+                if (! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class)) {
+                    continue;
+                }
+
+                /** @var BaseCommand $class */
+                $class = new $className($this->logger, $this);
+
+                if (isset($class->group)) {
+                    $this->commands[$class->name] = [
+                        'class'       => $className,
+                        'file'        => $file,
+                        'group'       => $class->group,
+                        'description' => $class->description,
+                    ];
+                }
+
+                unset($class);
+            } catch (ReflectionException $e) {
+                $this->logger->error($e->getMessage());
+            }
+        }
+
+        asort($this->commands);
+    }
+
+    /**
+     * Verifies if the command being sought is found
+     * in the commands list.
+     */
+    public function verifyCommand(string $command, array $commands): bool
+    {
+        if (isset($commands[$command])) {
+            return true;
+        }
+
+        $message = lang('CLI.commandNotFound', [$command]);
+
+        if ($alternatives = $this->getCommandAlternatives($command, $commands)) {
+            if (count($alternatives) === 1) {
+                $message .= "\n\n" . lang('CLI.altCommandSingular') . "\n    ";
+            } else {
+                $message .= "\n\n" . lang('CLI.altCommandPlural') . "\n    ";
+            }
+
+            $message .= implode("\n    ", $alternatives);
+        }
+
+        CLI::error($message);
+        CLI::newLine();
+
+        return false;
+    }
+
+    /**
+     * Finds alternative of `$name` among collection
+     * of commands.
+     */
+    protected function getCommandAlternatives(string $name, array $collection): array
+    {
+        $alternatives = [];
+
+        foreach (array_keys($collection) as $commandName) {
+            $lev = levenshtein($name, $commandName);
+
+            if ($lev <= strlen($commandName) / 3 || strpos($commandName, $name) !== false) {
+                $alternatives[$commandName] = $lev;
+            }
+        }
+
+        ksort($alternatives, SORT_NATURAL | SORT_FLAG_CASE);
+
+        return array_keys($alternatives);
+    }
 }
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index 711184fc9372..0bf8a0f7ce0a 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -1,20 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CodeIgniter;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\ResponseInterface;
 use Exception;
 
 /**
@@ -22,60 +19,45 @@
  */
 class Console
 {
-	/**
-	 * Main CodeIgniter instance.
-	 *
-	 * @var CodeIgniter
-	 */
-	protected $app;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Console constructor.
-	 *
-	 * @param CodeIgniter $app
-	 */
-	public function __construct(CodeIgniter $app)
-	{
-		$this->app = $app;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Runs the current command discovered on the CLI.
-	 *
-	 * @param boolean $useSafeOutput
-	 *
-	 * @return RequestInterface|Response|ResponseInterface|mixed
-	 * @throws Exception
-	 */
-	public function run(bool $useSafeOutput = false)
-	{
-		$path = CLI::getURI() ?: 'list';
-
-		// Set the path for the application to route to.
-		$this->app->setPath("ci{$path}");
-
-		return $this->app->useSafeOutput($useSafeOutput)->run();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays basic information about the Console.
-	 *
-	 * @param boolean $suppress
-	 */
-	public function showHeader(bool $suppress = false)
-	{
-		if ($suppress)
-		{
-			return;
-		}
-
-		CLI::write(sprintf('CodeIgniter v%s Command Line Tool - Server Time: %s UTC%s', CodeIgniter::CI_VERSION, date('Y-m-d H:i:s'), date('P')), 'green');
-		CLI::newLine();
-	}
+    /**
+     * Main CodeIgniter instance.
+     *
+     * @var CodeIgniter
+     */
+    protected $app;
+
+    public function __construct(CodeIgniter $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Runs the current command discovered on the CLI.
+     *
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function run(bool $useSafeOutput = false)
+    {
+        $path = CLI::getURI() ?: 'list';
+
+        // Set the path for the application to route to.
+        $this->app->setPath("ci{$path}");
+
+        return $this->app->useSafeOutput($useSafeOutput)->run();
+    }
+
+    /**
+     * Displays basic information about the Console.
+     */
+    public function showHeader(bool $suppress = false)
+    {
+        if ($suppress) {
+            return;
+        }
+
+        CLI::write(sprintf('CodeIgniter v%s Command Line Tool - Server Time: %s UTC%s', CodeIgniter::CI_VERSION, date('Y-m-d H:i:s'), date('P')), 'green');
+        CLI::newLine();
+    }
 }
diff --git a/system/CLI/Exceptions/CLIException.php b/system/CLI/Exceptions/CLIException.php
index 2a0373d5b0e1..4e07cd64f905 100644
--- a/system/CLI/Exceptions/CLIException.php
+++ b/system/CLI/Exceptions/CLIException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI\Exceptions;
@@ -19,19 +19,16 @@
  */
 class CLIException extends RuntimeException
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Thrown when `$color` specified for `$type` is not within the
-	 * allowed list of colors.
-	 *
-	 * @param string $type
-	 * @param string $color
-	 *
-	 * @return CLIException
-	 */
-	public static function forInvalidColor(string $type, string $color)
-	{
-		return new static(lang('CLI.invalidColor', [$type, $color]));
-	}
+    /**
+     * Thrown when `$color` specified for `$type` is not within the
+     * allowed list of colors.
+     *
+     * @return CLIException
+     */
+    public static function forInvalidColor(string $type, string $color)
+    {
+        return new static(lang('CLI.invalidColor', [$type, $color]));
+    }
 }
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index d0e6bc525f39..b0668a49f4d2 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
@@ -20,391 +20,333 @@
  */
 trait GeneratorTrait
 {
-	/**
-	 * Component Name
-	 *
-	 * @var string
-	 */
-	protected $component;
-
-	/**
-	 * File directory
-	 *
-	 * @var string
-	 */
-	protected $directory;
-
-	/**
-	 * View template name
-	 *
-	 * @var string
-	 */
-	protected $template;
-
-	/**
-	 * Language string key for required class names.
-	 *
-	 * @var string
-	 */
-	protected $classNameLang = '';
-
-	/**
-	 * Whether to require class name.
-	 *
-	 * @internal
-	 *
-	 * @var boolean
-	 */
-	private $hasClassName = true;
-
-	/**
-	 * Whether to sort class imports.
-	 *
-	 * @internal
-	 *
-	 * @var boolean
-	 */
-	private $sortImports = true;
-
-	/**
-	 * Whether the `--suffix` option has any effect.
-	 *
-	 * @internal
-	 *
-	 * @var boolean
-	 */
-	private $enabledSuffixing = true;
-
-	/**
-	 * The params array for easy access by other methods.
-	 *
-	 * @internal
-	 *
-	 * @var array
-	 */
-	private $params = [];
-
-	/**
-	 * Execute the command.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	protected function execute(array $params): void
-	{
-		$this->params = $params;
-
-		if ($this->getOption('namespace') === 'CodeIgniter')
-		{
-			// @codeCoverageIgnoreStart
-			CLI::write(lang('CLI.generator.usingCINamespace'), 'yellow');
-			CLI::newLine();
-
-			if (CLI::prompt('Are you sure you want to continue?', ['y', 'n'], 'required') === 'n')
-			{
-				CLI::newLine();
-				CLI::write(lang('CLI.generator.cancelOperation'), 'yellow');
-				CLI::newLine();
-
-				return;
-			}
-
-			CLI::newLine();
-			// @codeCoverageIgnoreEnd
-		}
-
-		// Get the fully qualified class name from the input.
-		$class = $this->qualifyClassName();
-
-		// Get the file path from class name.
-		$path = $this->buildPath($class);
-
-		// Check if path is empty.
-		if (empty($path))
-		{
-			return;
-		}
-
-		$isFile = is_file($path);
-
-		// Overwriting files unknowingly is a serious annoyance, So we'll check if
-		// we are duplicating things, If 'force' option is not supplied, we bail.
-		if (! $this->getOption('force') && $isFile)
-		{
-			CLI::error(lang('CLI.generator.fileExist', [clean_path($path)]), 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-		}
-
-		// Check if the directory to save the file is existing.
-		$dir = dirname($path);
-
-		if (! is_dir($dir))
-		{
-			mkdir($dir, 0755, true);
-		}
-
-		helper('filesystem');
-
-		// Build the class based on the details we have, We'll be getting our file
-		// contents from the template, and then we'll do the necessary replacements.
-		if (! write_file($path, $this->buildContent($class)))
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error(lang('CLI.generator.fileError', [clean_path($path)]), 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		if ($this->getOption('force') && $isFile)
-		{
-			CLI::write(lang('CLI.generator.fileOverwrite', [clean_path($path)]), 'yellow');
-			CLI::newLine();
-
-			return;
-		}
-
-		CLI::write(lang('CLI.generator.fileCreate', [clean_path($path)]), 'green');
-		CLI::newLine();
-	}
-
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		return $this->parseTemplate($class);
-	}
-
-	/**
-	 * Change file basename before saving.
-	 *
-	 * Useful for components where the file name has a date.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string
-	 */
-	protected function basename(string $filename): string
-	{
-		return basename($filename);
-	}
-
-	/**
-	 * Parses the class name and checks if it is already qualified.
-	 *
-	 * @return string
-	 */
-	protected function qualifyClassName(): string
-	{
-		// Gets the class name from input.
-		$class = $this->params[0] ?? CLI::getSegment(2);
-
-		if (is_null($class) && $this->hasClassName)
-		{
-			// @codeCoverageIgnoreStart
-			$nameLang = $this->classNameLang ?: 'CLI.generator.className.default';
-			$class    = CLI::prompt(lang($nameLang), null, 'required');
-			CLI::newLine();
-			// @codeCoverageIgnoreEnd
-		}
-
-		helper('inflector');
-
-		$component = singular($this->component);
-
-		/**
-		 * @see https://regex101.com/r/a5KNCR/1
-		 */
-		$pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)/i', $component);
-
-		if (preg_match($pattern, $class, $matches) === 1)
-		{
-			$class = $matches[1] . ucfirst($matches[2]);
-		}
-
-		if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, $component))
-		{
-			$class .= ucfirst($component);
-		}
-
-		// Trims input, normalize separators, and ensure that all paths are in Pascalcase.
-		$class = ltrim(implode('\\', array_map('pascalize', explode('\\', str_replace('/', '\\', trim($class))))), '\\/');
-
-		// Gets the namespace from input.
-		$namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
-
-		if (strncmp($class, $namespace, strlen($namespace)) === 0)
-		{
-			return $class; // @codeCoverageIgnore
-		}
-
-		return $namespace . '\\' . $this->directory . '\\' . str_replace('/', '\\', $class);
-	}
-
-	/**
-	 * Gets the generator view as defined in the `Config\Generators::$views`,
-	 * with fallback to `$template` when the defined view does not exist.
-	 *
-	 * @param array $data Data to be passed to the view.
-	 *
-	 * @return string
-	 */
-	protected function renderTemplate(array $data = []): string
-	{
-		try
-		{
-			return view(config('Generators')->views[$this->name], $data, ['debug' => false]);
-		}
-		catch (Throwable $e)
-		{
-			log_message('error', $e->getMessage());
-
-			return view("CodeIgniter\Commands\Generators\Views\\{$this->template}", $data, ['debug' => false]);
-		}
-	}
-
-	/**
-	 * Performs pseudo-variables contained within view file.
-	 *
-	 * @param string $class
-	 * @param array  $search
-	 * @param array  $replace
-	 * @param array  $data
-	 *
-	 * @return string
-	 */
-	protected function parseTemplate(string $class, array $search = [], array $replace = [], array $data = []): string
-	{
-		// Retrieves the namespace part from the fully qualified class name.
-		$namespace = trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\');
-		$search[]  = '<@php';
-		$search[]  = '{namespace}';
-		$search[]  = '{class}';
-		$replace[] = '<?php';
-		$replace[] = $namespace;
-		$replace[] = str_replace($namespace . '\\', '', $class);
-
-		return str_replace($search, $replace, $this->renderTemplate($data));
-	}
-
-	/**
-	 * Builds the contents for class being generated, doing all
-	 * the replacements necessary, and alphabetically sorts the
-	 * imports for a given template.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function buildContent(string $class): string
-	{
-		$template = $this->prepare($class);
-
-		if ($this->sortImports && preg_match('/(?P<imports>(?:^use [^;]+;$\n?)+)/m', $template, $match))
-		{
-			$imports = explode("\n", trim($match['imports']));
-			sort($imports);
-
-			return str_replace(trim($match['imports']), implode("\n", $imports), $template);
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Builds the file path from the class name.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function buildPath(string $class): string
-	{
-		$namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
-
-		// Check if the namespace is actually defined and we are not just typing gibberish.
-		$base = Services::autoloader()->getNamespace($namespace);
-
-		if (! $base = reset($base))
-		{
-			CLI::error(lang('CLI.namespaceNotDefined', [$namespace]), 'light_gray', 'red');
-			CLI::newLine();
-
-			return '';
-		}
-
-		$base = realpath($base) ?: $base;
-		$file = $base . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, trim(str_replace($namespace . '\\', '', $class), '\\')) . '.php';
-
-		return implode(DIRECTORY_SEPARATOR, array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, -1)) . DIRECTORY_SEPARATOR . $this->basename($file);
-	}
-
-	/**
-	 * Allows child generators to modify the internal `$hasClassName` flag.
-	 *
-	 * @param boolean $hasClassName
-	 *
-	 * @return $this
-	 */
-	protected function setHasClassName(bool $hasClassName)
-	{
-		$this->hasClassName = $hasClassName;
-
-		return $this;
-	}
-
-	/**
-	 * Allows child generators to modify the internal `$sortImports` flag.
-	 *
-	 * @param boolean $sortImports
-	 *
-	 * @return $this
-	 */
-	protected function setSortImports(bool $sortImports)
-	{
-		$this->sortImports = $sortImports;
-
-		return $this;
-	}
-
-	/**
-	 * Allows child generators to modify the internal `$enabledSuffixing` flag.
-	 *
-	 * @param boolean $enabledSuffixing
-	 *
-	 * @return $this
-	 */
-	protected function setEnabledSuffixing(bool $enabledSuffixing)
-	{
-		$this->enabledSuffixing = $enabledSuffixing;
-
-		return $this;
-	}
-
-	/**
-	 * Gets a single command-line option. Returns TRUE if the option exists,
-	 * but doesn't have a value, and is simply acting as a flag.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	protected function getOption(string $name)
-	{
-		if (! array_key_exists($name, $this->params))
-		{
-			return CLI::getOption($name);
-		}
-
-		return is_null($this->params[$name]) ? true : $this->params[$name];
-	}
+    /**
+     * Component Name
+     *
+     * @var string
+     */
+    protected $component;
+
+    /**
+     * File directory
+     *
+     * @var string
+     */
+    protected $directory;
+
+    /**
+     * View template name
+     *
+     * @var string
+     */
+    protected $template;
+
+    /**
+     * Language string key for required class names.
+     *
+     * @var string
+     */
+    protected $classNameLang = '';
+
+    /**
+     * Whether to require class name.
+     *
+     * @internal
+     *
+     * @var bool
+     */
+    private $hasClassName = true;
+
+    /**
+     * Whether to sort class imports.
+     *
+     * @internal
+     *
+     * @var bool
+     */
+    private $sortImports = true;
+
+    /**
+     * Whether the `--suffix` option has any effect.
+     *
+     * @internal
+     *
+     * @var bool
+     */
+    private $enabledSuffixing = true;
+
+    /**
+     * The params array for easy access by other methods.
+     *
+     * @internal
+     *
+     * @var array
+     */
+    private $params = [];
+
+    /**
+     * Execute the command.
+     */
+    protected function execute(array $params): void
+    {
+        $this->params = $params;
+
+        if ($this->getOption('namespace') === 'CodeIgniter') {
+            // @codeCoverageIgnoreStart
+            CLI::write(lang('CLI.generator.usingCINamespace'), 'yellow');
+            CLI::newLine();
+
+            if (CLI::prompt('Are you sure you want to continue?', ['y', 'n'], 'required') === 'n') {
+                CLI::newLine();
+                CLI::write(lang('CLI.generator.cancelOperation'), 'yellow');
+                CLI::newLine();
+
+                return;
+            }
+
+            CLI::newLine();
+            // @codeCoverageIgnoreEnd
+        }
+
+        // Get the fully qualified class name from the input.
+        $class = $this->qualifyClassName();
+
+        // Get the file path from class name.
+        $path = $this->buildPath($class);
+
+        // Check if path is empty.
+        if (empty($path)) {
+            return;
+        }
+
+        $isFile = is_file($path);
+
+        // Overwriting files unknowingly is a serious annoyance, So we'll check if
+        // we are duplicating things, If 'force' option is not supplied, we bail.
+        if (! $this->getOption('force') && $isFile) {
+            CLI::error(lang('CLI.generator.fileExist', [clean_path($path)]), 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        // Check if the directory to save the file is existing.
+        $dir = dirname($path);
+
+        if (! is_dir($dir)) {
+            mkdir($dir, 0755, true);
+        }
+
+        helper('filesystem');
+
+        // Build the class based on the details we have, We'll be getting our file
+        // contents from the template, and then we'll do the necessary replacements.
+        if (! write_file($path, $this->buildContent($class))) {
+            // @codeCoverageIgnoreStart
+            CLI::error(lang('CLI.generator.fileError', [clean_path($path)]), 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ($this->getOption('force') && $isFile) {
+            CLI::write(lang('CLI.generator.fileOverwrite', [clean_path($path)]), 'yellow');
+            CLI::newLine();
+
+            return;
+        }
+
+        CLI::write(lang('CLI.generator.fileCreate', [clean_path($path)]), 'green');
+        CLI::newLine();
+    }
+
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        return $this->parseTemplate($class);
+    }
+
+    /**
+     * Change file basename before saving.
+     *
+     * Useful for components where the file name has a date.
+     */
+    protected function basename(string $filename): string
+    {
+        return basename($filename);
+    }
+
+    /**
+     * Parses the class name and checks if it is already qualified.
+     */
+    protected function qualifyClassName(): string
+    {
+        // Gets the class name from input.
+        $class = $this->params[0] ?? CLI::getSegment(2);
+
+        if ($class === null && $this->hasClassName) {
+            // @codeCoverageIgnoreStart
+            $nameLang = $this->classNameLang ?: 'CLI.generator.className.default';
+            $class    = CLI::prompt(lang($nameLang), null, 'required');
+            CLI::newLine();
+            // @codeCoverageIgnoreEnd
+        }
+
+        helper('inflector');
+
+        $component = singular($this->component);
+
+        /**
+         * @see https://regex101.com/r/a5KNCR/1
+         */
+        $pattern = sprintf('/([a-z][a-z0-9_\/\\\\]+)(%s)/i', $component);
+
+        if (preg_match($pattern, $class, $matches) === 1) {
+            $class = $matches[1] . ucfirst($matches[2]);
+        }
+
+        if ($this->enabledSuffixing && $this->getOption('suffix') && ! strripos($class, $component)) {
+            $class .= ucfirst($component);
+        }
+
+        // Trims input, normalize separators, and ensure that all paths are in Pascalcase.
+        $class = ltrim(implode('\\', array_map('pascalize', explode('\\', str_replace('/', '\\', trim($class))))), '\\/');
+
+        // Gets the namespace from input.
+        $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
+
+        if (strncmp($class, $namespace, strlen($namespace)) === 0) {
+            return $class; // @codeCoverageIgnore
+        }
+
+        return $namespace . '\\' . $this->directory . '\\' . str_replace('/', '\\', $class);
+    }
+
+    /**
+     * Gets the generator view as defined in the `Config\Generators::$views`,
+     * with fallback to `$template` when the defined view does not exist.
+     */
+    protected function renderTemplate(array $data = []): string
+    {
+        try {
+            return view(config('Generators')->views[$this->name], $data, ['debug' => false]);
+        } catch (Throwable $e) {
+            log_message('error', $e->getMessage());
+
+            return view("CodeIgniter\\Commands\\Generators\\Views\\{$this->template}", $data, ['debug' => false]);
+        }
+    }
+
+    /**
+     * Performs pseudo-variables contained within view file.
+     */
+    protected function parseTemplate(string $class, array $search = [], array $replace = [], array $data = []): string
+    {
+        // Retrieves the namespace part from the fully qualified class name.
+        $namespace = trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\');
+        $search[]  = '<@php';
+        $search[]  = '{namespace}';
+        $search[]  = '{class}';
+        $replace[] = '<?php';
+        $replace[] = $namespace;
+        $replace[] = str_replace($namespace . '\\', '', $class);
+
+        return str_replace($search, $replace, $this->renderTemplate($data));
+    }
+
+    /**
+     * Builds the contents for class being generated, doing all
+     * the replacements necessary, and alphabetically sorts the
+     * imports for a given template.
+     */
+    protected function buildContent(string $class): string
+    {
+        $template = $this->prepare($class);
+
+        if ($this->sortImports && preg_match('/(?P<imports>(?:^use [^;]+;$\n?)+)/m', $template, $match)) {
+            $imports = explode("\n", trim($match['imports']));
+            sort($imports);
+
+            return str_replace(trim($match['imports']), implode("\n", $imports), $template);
+        }
+
+        return $template;
+    }
+
+    /**
+     * Builds the file path from the class name.
+     */
+    protected function buildPath(string $class): string
+    {
+        $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
+
+        // Check if the namespace is actually defined and we are not just typing gibberish.
+        $base = Services::autoloader()->getNamespace($namespace);
+
+        if (! $base = reset($base)) {
+            CLI::error(lang('CLI.namespaceNotDefined', [$namespace]), 'light_gray', 'red');
+            CLI::newLine();
+
+            return '';
+        }
+
+        $base = realpath($base) ?: $base;
+        $file = $base . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, trim(str_replace($namespace . '\\', '', $class), '\\')) . '.php';
+
+        return implode(DIRECTORY_SEPARATOR, array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, -1)) . DIRECTORY_SEPARATOR . $this->basename($file);
+    }
+
+    /**
+     * Allows child generators to modify the internal `$hasClassName` flag.
+     *
+     * @return $this
+     */
+    protected function setHasClassName(bool $hasClassName)
+    {
+        $this->hasClassName = $hasClassName;
+
+        return $this;
+    }
+
+    /**
+     * Allows child generators to modify the internal `$sortImports` flag.
+     *
+     * @return $this
+     */
+    protected function setSortImports(bool $sortImports)
+    {
+        $this->sortImports = $sortImports;
+
+        return $this;
+    }
+
+    /**
+     * Allows child generators to modify the internal `$enabledSuffixing` flag.
+     *
+     * @return $this
+     */
+    protected function setEnabledSuffixing(bool $enabledSuffixing)
+    {
+        $this->enabledSuffixing = $enabledSuffixing;
+
+        return $this;
+    }
+
+    /**
+     * Gets a single command-line option. Returns TRUE if the option exists,
+     * but doesn't have a value, and is simply acting as a flag.
+     *
+     * @return mixed
+     */
+    protected function getOption(string $name)
+    {
+        if (! array_key_exists($name, $this->params)) {
+            return CLI::getOption($name);
+        }
+
+        return $this->params[$name] ?? true;
+    }
 }
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index e77961313827..720fae0e4c6c 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
@@ -16,73 +16,57 @@
 use Config\Cache;
 
 /**
- * Class Cache
- *
  * A factory for loading the desired
  */
 class CacheFactory
 {
-	/**
-	 * Attempts to create the desired cache handler, based upon the
-	 *
-	 * @param Cache       $config
-	 * @param string|null $handler
-	 * @param string|null $backup
-	 *
-	 * @return CacheInterface
-	 */
-	public static function getHandler(Cache $config, string $handler = null, string $backup = null)
-	{
-		if (! isset($config->validHandlers) || ! is_array($config->validHandlers))
-		{
-			throw CacheException::forInvalidHandlers();
-		}
-
-		if (! isset($config->handler) || ! isset($config->backupHandler))
-		{
-			throw CacheException::forNoBackup();
-		}
+    /**
+     * Attempts to create the desired cache handler, based upon the
+     *
+     * @return CacheInterface
+     */
+    public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
+    {
+        if (! isset($config->validHandlers) || ! is_array($config->validHandlers)) {
+            throw CacheException::forInvalidHandlers();
+        }
 
-		$handler = ! empty($handler) ? $handler : $config->handler;
-		$backup  = ! empty($backup) ? $backup : $config->backupHandler;
+        if (! isset($config->handler) || ! isset($config->backupHandler)) {
+            throw CacheException::forNoBackup();
+        }
 
-		if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers))
-		{
-			throw CacheException::forHandlerNotFound();
-		}
+        $handler = ! empty($handler) ? $handler : $config->handler;
+        $backup  = ! empty($backup) ? $backup : $config->backupHandler;
 
-		// Get an instance of our handler.
-		$adapter = new $config->validHandlers[$handler]($config);
+        if (! array_key_exists($handler, $config->validHandlers) || ! array_key_exists($backup, $config->validHandlers)) {
+            throw CacheException::forHandlerNotFound();
+        }
 
-		if (! $adapter->isSupported())
-		{
-			$adapter = new $config->validHandlers[$backup]($config);
+        // Get an instance of our handler.
+        $adapter = new $config->validHandlers[$handler]($config);
 
-			if (! $adapter->isSupported())
-			{
-				// Log stuff here, don't throw exception. No need to raise a fuss.
-				// Fall back to the dummy adapter.
-				$adapter = new $config->validHandlers['dummy']();
-			}
-		}
+        if (! $adapter->isSupported()) {
+            $adapter = new $config->validHandlers[$backup]($config);
 
-		// If $adapter->initialization throws a CriticalError exception, we will attempt to
-		// use the $backup handler, if that also fails, we resort to the dummy handler.
-		try
-		{
-			$adapter->initialize();
-		}
-		catch (CriticalError $e)
-		{
-			// log the fact that an exception occurred as well what handler we are resorting to
-			log_message('critical', $e->getMessage() . ' Resorting to using ' . $backup . ' handler.');
+            if (! $adapter->isSupported()) {
+                // Log stuff here, don't throw exception. No need to raise a fuss.
+                // Fall back to the dummy adapter.
+                $adapter = new $config->validHandlers['dummy']();
+            }
+        }
 
-			// get the next best cache handler (or dummy if the $backup also fails)
-			$adapter = self::getHandler($config, $backup, 'dummy');
-		}
+        // If $adapter->initialization throws a CriticalError exception, we will attempt to
+        // use the $backup handler, if that also fails, we resort to the dummy handler.
+        try {
+            $adapter->initialize();
+        } catch (CriticalError $e) {
+            // log the fact that an exception occurred as well what handler we are resorting to
+            log_message('critical', $e->getMessage() . ' Resorting to using ' . $backup . ' handler.');
 
-		return $adapter;
-	}
+            // get the next best cache handler (or dummy if the $backup also fails)
+            $adapter = self::getHandler($config, $backup, 'dummy');
+        }
 
-	//--------------------------------------------------------------------
+        return $adapter;
+    }
 }
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
index 8a929fa33157..72b3626d94cf 100644
--- a/system/Cache/CacheInterface.php
+++ b/system/Cache/CacheInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
@@ -16,113 +16,91 @@
  */
 interface CacheInterface
 {
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return mixed
-	 */
-	public function increment(string $key, int $offset = 1);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return mixed
-	 */
-	public function decrement(string $key, int $offset = 1);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return mixed
-	 */
-	public function getCacheInfo();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|false|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 *   Some handlers may return false when an item does not exist, which is deprecated.
-	 */
-	public function getMetaData(string $key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool;
-
-	//--------------------------------------------------------------------
+    /**
+     * Takes care of any handler-specific setup that must be done.
+     */
+    public function initialize();
+
+    /**
+     * Attempts to fetch an item from the cache store.
+     *
+     * @param string $key Cache item name
+     *
+     * @return mixed
+     */
+    public function get(string $key);
+
+    /**
+     * Saves an item to the cache store.
+     *
+     * @param string $key   Cache item name
+     * @param mixed  $value The data to save
+     * @param int    $ttl   Time To Live, in seconds (default 60)
+     *
+     * @return bool Success or failure
+     */
+    public function save(string $key, $value, int $ttl = 60);
+
+    /**
+     * Deletes a specific item from the cache store.
+     *
+     * @param string $key Cache item name
+     *
+     * @return bool Success or failure
+     */
+    public function delete(string $key);
+
+    /**
+     * Performs atomic incrementation of a raw stored value.
+     *
+     * @param string $key    Cache ID
+     * @param int    $offset Step/value to increase by
+     *
+     * @return mixed
+     */
+    public function increment(string $key, int $offset = 1);
+
+    /**
+     * Performs atomic decrementation of a raw stored value.
+     *
+     * @param string $key    Cache ID
+     * @param int    $offset Step/value to increase by
+     *
+     * @return mixed
+     */
+    public function decrement(string $key, int $offset = 1);
+
+    /**
+     * Will delete all items in the entire cache.
+     *
+     * @return bool Success or failure
+     */
+    public function clean();
+
+    /**
+     * Returns information on the entire cache.
+     *
+     * The information returned and the structure of the data
+     * varies depending on the handler.
+     *
+     * @return mixed
+     */
+    public function getCacheInfo();
+
+    /**
+     * Returns detailed information about the specific item in the cache.
+     *
+     * @param string $key Cache item name.
+     *
+     * @return array|false|null
+     *                          Returns null if the item does not exist, otherwise array<string, mixed>
+     *                          with at least the 'expire' key for absolute epoch expiry (or null).
+     *                          Some handlers may return false when an item does not exist, which is deprecated.
+     */
+    public function getMetaData(string $key);
+
+    /**
+     * Determines if the driver is supported on this system.
+     */
+    public function isSupported(): bool;
 }
diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php
index 9020e0fc5c31..3445590cf926 100644
--- a/system/Cache/Exceptions/CacheException.php
+++ b/system/Cache/Exceptions/CacheException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
@@ -20,47 +20,45 @@
  */
 class CacheException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Thrown when handler has no permission to write cache.
-	 *
-	 * @param string $path
-	 *
-	 * @return CacheException
-	 */
-	public static function forUnableToWrite(string $path)
-	{
-		return new static(lang('Cache.unableToWrite', [$path]));
-	}
+    /**
+     * Thrown when handler has no permission to write cache.
+     *
+     * @return CacheException
+     */
+    public static function forUnableToWrite(string $path)
+    {
+        return new static(lang('Cache.unableToWrite', [$path]));
+    }
 
-	/**
-	 * Thrown when an unrecognized handler is used.
-	 *
-	 * @return CacheException
-	 */
-	public static function forInvalidHandlers()
-	{
-		return new static(lang('Cache.invalidHandlers'));
-	}
+    /**
+     * Thrown when an unrecognized handler is used.
+     *
+     * @return CacheException
+     */
+    public static function forInvalidHandlers()
+    {
+        return new static(lang('Cache.invalidHandlers'));
+    }
 
-	/**
-	 * Thrown when no backup handler is setup in config.
-	 *
-	 * @return CacheException
-	 */
-	public static function forNoBackup()
-	{
-		return new static(lang('Cache.noBackup'));
-	}
+    /**
+     * Thrown when no backup handler is setup in config.
+     *
+     * @return CacheException
+     */
+    public static function forNoBackup()
+    {
+        return new static(lang('Cache.noBackup'));
+    }
 
-	/**
-	 * Thrown when specified handler was not found.
-	 *
-	 * @return CacheException
-	 */
-	public static function forHandlerNotFound()
-	{
-		return new static(lang('Cache.handlerNotFound'));
-	}
+    /**
+     * Thrown when specified handler was not found.
+     *
+     * @return CacheException
+     */
+    public static function forHandlerNotFound()
+    {
+        return new static(lang('Cache.handlerNotFound'));
+    }
 }
diff --git a/system/Cache/Exceptions/ExceptionInterface.php b/system/Cache/Exceptions/ExceptionInterface.php
index 371301153b56..067e8aa208b5 100644
--- a/system/Cache/Exceptions/ExceptionInterface.php
+++ b/system/Cache/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index a5de4286f093..cae03b901664 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -21,90 +21,82 @@
  */
 abstract class BaseHandler implements CacheInterface
 {
-	/**
-	 * Reserved characters that cannot be used in a key or tag.
-	 * From https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
-	 */
-	public const RESERVED_CHARACTERS = '{}()/\@:';
+    /**
+     * Reserved characters that cannot be used in a key or tag.
+     * From https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
+     */
+    public const RESERVED_CHARACTERS = '{}()/\@:';
 
-	/**
-	 * Maximum key length.
-	 */
-	public const MAX_KEY_LENGTH = PHP_INT_MAX;
+    /**
+     * Maximum key length.
+     */
+    public const MAX_KEY_LENGTH = PHP_INT_MAX;
 
-	/**
-	 * Prefix to apply to cache keys.
-	 * May not be used by all handlers.
-	 *
-	 * @var string
-	 */
-	protected $prefix;
+    /**
+     * Prefix to apply to cache keys.
+     * May not be used by all handlers.
+     *
+     * @var string
+     */
+    protected $prefix;
 
-	/**
-	 * Validates a cache key according to PSR-6.
-	 * Keys that exceed MAX_KEY_LENGTH are hashed.
-	 * From https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
-	 *
-	 * @param string $key    The key to validate
-	 * @param string $prefix Optional prefix to include in length calculations
-	 *
-	 * @throws InvalidArgumentException When $key is not valid
-	 */
-	public static function validateKey($key, $prefix = ''): string
-	{
-		if (! is_string($key))
-		{
-			throw new InvalidArgumentException('Cache key must be a string');
-		}
-		if ($key === '')
-		{
-			throw new InvalidArgumentException('Cache key cannot be empty.');
-		}
-		if (strpbrk($key, self::RESERVED_CHARACTERS) !== false)
-		{
-			throw new InvalidArgumentException('Cache key contains reserved characters ' . self::RESERVED_CHARACTERS);
-		}
+    /**
+     * Validates a cache key according to PSR-6.
+     * Keys that exceed MAX_KEY_LENGTH are hashed.
+     * From https://github.com/symfony/cache/blob/7b024c6726af21fd4984ac8d1eae2b9f3d90de88/CacheItem.php#L158
+     *
+     * @param string $key    The key to validate
+     * @param string $prefix Optional prefix to include in length calculations
+     *
+     * @throws InvalidArgumentException When $key is not valid
+     */
+    public static function validateKey($key, $prefix = ''): string
+    {
+        if (! is_string($key)) {
+            throw new InvalidArgumentException('Cache key must be a string');
+        }
+        if ($key === '') {
+            throw new InvalidArgumentException('Cache key cannot be empty.');
+        }
+        if (strpbrk($key, self::RESERVED_CHARACTERS) !== false) {
+            throw new InvalidArgumentException('Cache key contains reserved characters ' . self::RESERVED_CHARACTERS);
+        }
 
-		// If the key with prefix exceeds the length then return the hashed version
-		return strlen($prefix . $key) > static::MAX_KEY_LENGTH ? $prefix . md5($key) : $prefix . $key;
-	}
+        // If the key with prefix exceeds the length then return the hashed version
+        return strlen($prefix . $key) > static::MAX_KEY_LENGTH ? $prefix . md5($key) : $prefix . $key;
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * Get an item from the cache, or execute the given Closure and store the result.
+     *
+     * @param string  $key      Cache item name
+     * @param int     $ttl      Time to live
+     * @param Closure $callback Callback return value
+     *
+     * @return mixed
+     */
+    public function remember(string $key, int $ttl, Closure $callback)
+    {
+        $value = $this->get($key);
 
-	/**
-	 * Get an item from the cache, or execute the given Closure and store the result.
-	 *
-	 * @param string  $key      Cache item name
-	 * @param integer $ttl      Time to live
-	 * @param Closure $callback Callback return value
-	 *
-	 * @return mixed
-	 */
-	public function remember(string $key, int $ttl, Closure $callback)
-	{
-		$value = $this->get($key);
+        if ($value !== null) {
+            return $value;
+        }
 
-		if (! is_null($value))
-		{
-			return $value;
-		}
+        $this->save($key, $value = $callback(), $ttl);
 
-		$this->save($key, $value = $callback(), $ttl);
+        return $value;
+    }
 
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @throws Exception
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		throw new Exception('The deleteMatching method is not implemented.');
-	}
+    /**
+     * Deletes items from the cache store matching a given pattern.
+     *
+     * @param string $pattern Cache items glob-style pattern
+     *
+     * @throws Exception
+     */
+    public function deleteMatching(string $pattern)
+    {
+        throw new Exception('The deleteMatching method is not implemented.');
+    }
 }
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index 1a0f414fb979..fd4f1b503111 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -18,167 +18,98 @@
  */
 class DummyHandler extends BaseHandler
 {
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return null
-	 */
-	public function get(string $key)
-	{
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get an item from the cache, or execute the given Closure and store the result.
-	 *
-	 * @param string  $key      Cache item name
-	 * @param integer $ttl      Time to live
-	 * @param Closure $callback Callback return value
-	 *
-	 * @return null
-	 */
-	public function remember(string $key, int $ttl, Closure $callback)
-	{
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @return integer The number of deleted items
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		return 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return null
-	 */
-	public function getCacheInfo()
-	{
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return null
-	 */
-	public function getMetaData(string $key)
-	{
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return true;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function remember(string $key, int $ttl, Closure $callback)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return true;
+    }
 }
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index c67b2180a643..db2e5d6574ee 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -20,529 +20,405 @@
  */
 class FileHandler extends BaseHandler
 {
-	/**
-	 * Maximum key length.
-	 */
-	public const MAX_KEY_LENGTH = 255;
-
-	/**
-	 * Where to store cached files on the disk.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * Mode for the stored files.
-	 * Must be chmod-safe (octal).
-	 *
-	 * @var integer
-	 *
-	 * @see https://www.php.net/manual/en/function.chmod.php
-	 */
-	protected $mode;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param  Cache $config
-	 * @throws CacheException
-	 */
-	public function __construct(Cache $config)
-	{
-		if (! property_exists($config, 'file'))
-		{
-			$config->file = [
-				'storePath' => $config->storePath ?? WRITEPATH . 'cache',
-				'mode'      => 0640,
-			];
-		}
-
-		$this->path = ! empty($config->file['storePath']) ? $config->file['storePath'] : WRITEPATH . 'cache';
-		$this->path = rtrim($this->path, '/') . '/';
-
-		if (! is_really_writable($this->path))
-		{
-			throw CacheException::forUnableToWrite($this->path);
-		}
-
-		$this->mode   = $config->file['mode'] ?? 0640;
-		$this->prefix = $config->prefix;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key  = static::validateKey($key, $this->prefix);
-		$data = $this->getItem($key);
-
-		return is_array($data) ? $data['data'] : null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		$contents = [
-			'time' => time(),
-			'ttl'  => $ttl,
-			'data' => $value,
-		];
-
-		if ($this->writeFile($this->path . $key, serialize($contents)))
-		{
-			try
-			{
-				chmod($this->path . $key, $this->mode);
-			}
-			// @codeCoverageIgnoreStart
-			catch (Throwable $e)
-			{
-				log_message('debug', 'Failed to set mode on cache file: ' . $e->getMessage());
-			}
-			// @codeCoverageIgnoreEnd
-
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return is_file($this->path . $key) && unlink($this->path . $key);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @return integer The number of deleted items
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		$deleted = 0;
-
-		foreach (glob($this->path . $pattern, GLOB_NOSORT) as $filename)
-		{
-			if (is_file($filename) && @unlink($filename))
-			{
-				$deleted++;
-			}
-		}
-
-		return $deleted;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		$key  = static::validateKey($key, $this->prefix);
-		$data = $this->getItem($key);
-
-		if ($data === false)
-		{
-			$data = [
-				'data' => 0,
-				'ttl'  => 60,
-			];
-		}
-		elseif (! is_int($data['data']))
-		{
-			return false;
-		}
-
-		$newValue = $data['data'] + $offset;
-
-		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		$key  = static::validateKey($key, $this->prefix);
-		$data = $this->getItem($key);
-
-		if ($data === false)
-		{
-			$data = [
-				'data' => 0,
-				'ttl'  => 60,
-			];
-		}
-		elseif (! is_int($data['data']))
-		{
-			return false;
-		}
-
-		$newValue = $data['data'] - $offset;
-
-		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return $this->deleteFiles($this->path, false, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return array|false
-	 */
-	public function getCacheInfo()
-	{
-		return $this->getDirFileInfo($this->path);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|false|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 *   Some handlers may return false when an item does not exist, which is deprecated.
-	 */
-	public function getMetaData(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		if (false === $data = $this->getItem($key))
-		{
-			return false; // This will return null in a future release
-		}
-
-		return [
-			'expire' => $data['time'] + $data['ttl'],
-			'mtime'  => filemtime($this->path . $key),
-			'data'   => $data['data'],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return is_writable($this->path);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the heavy lifting of actually retrieving the file and
-	 * verifying it's age.
-	 *
-	 * @param string $filename
-	 *
-	 * @return boolean|mixed
-	 */
-	protected function getItem(string $filename)
-	{
-		if (! is_file($this->path . $filename))
-		{
-			return false;
-		}
-
-		$data = @unserialize(file_get_contents($this->path . $filename));
-		if (! is_array($data) || ! isset($data['ttl']))
-		{
-			return false;
-		}
-
-		// @phpstan-ignore-next-line
-		if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
-		{
-			// If the file is still there then try to remove it
-			if (is_file($this->path . $filename))
-			{
-				@unlink($this->path . $filename);
-			}
-
-			return false;
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// SUPPORT METHODS FOR FILES
-	//--------------------------------------------------------------------
-
-	/**
-	 * Writes a file to disk, or returns false if not successful.
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @param string $mode
-	 *
-	 * @return boolean
-	 */
-	protected function writeFile($path, $data, $mode = 'wb')
-	{
-		if (($fp = @fopen($path, $mode)) === false)
-		{
-			return false;
-		}
-
-		flock($fp, LOCK_EX);
-
-		for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result)
-		{
-			if (($result = fwrite($fp, substr($data, $written))) === false)
-			{
-				break;
-			}
-		}
-
-		flock($fp, LOCK_UN);
-		fclose($fp);
-
-		return is_int($result);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete Files
-	 *
-	 * Deletes all files contained in the supplied directory path.
-	 * Files must be writable or owned by the system in order to be deleted.
-	 * If the second parameter is set to TRUE, any directories contained
-	 * within the supplied base directory will be nuked as well.
-	 *
-	 * @param string  $path   File path
-	 * @param boolean $delDir Whether to delete any directories found in the path
-	 * @param boolean $htdocs Whether to skip deleting .htaccess and index page files
-	 * @param integer $_level Current directory depth level (default: 0; internal use only)
-	 *
-	 * @return boolean
-	 */
-	protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs = false, int $_level = 0): bool
-	{
-		// Trim the trailing slash
-		$path = rtrim($path, '/\\');
-
-		if (! $currentDir = @opendir($path))
-		{
-			return false;
-		}
-
-		while (false !== ($filename = @readdir($currentDir)))
-		{
-			if ($filename !== '.' && $filename !== '..')
-			{
-				if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.')
-				{
-					$this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
-				}
-				elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
-				{
-					@unlink($path . DIRECTORY_SEPARATOR . $filename);
-				}
-			}
-		}
-
-		closedir($currentDir);
-
-		return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get Directory File Information
-	 *
-	 * Reads the specified directory and builds an array containing the filenames,
-	 * filesize, dates, and permissions
-	 *
-	 * Any sub-folders contained within the specified path are read as well.
-	 *
-	 * @param string  $sourceDir    Path to source
-	 * @param boolean $topLevelOnly Look only at the top level directory specified?
-	 * @param boolean $_recursion   Internal variable to determine recursion status - do not use in calls
-	 *
-	 * @return array|false
-	 */
-	protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, bool $_recursion = false)
-	{
-		static $_filedata = [];
-		$relativePath     = $sourceDir;
-
-		if ($fp = @opendir($sourceDir))
-		{
-			// reset the array and make sure $source_dir has a trailing slash on the initial call
-			if ($_recursion === false)
-			{
-				$_filedata = [];
-				$sourceDir = rtrim(realpath($sourceDir) ?: $sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-			}
-
-			// Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
-			while (false !== ($file = readdir($fp)))
-			{
-				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
-				{
-					$this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
-				}
-				elseif ($file[0] !== '.')
-				{
-					$_filedata[$file]                  = $this->getFileInfo($sourceDir . $file);
-					$_filedata[$file]['relative_path'] = $relativePath;
-				}
-			}
-
-			closedir($fp);
-
-			return $_filedata;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get File Info
-	 *
-	 * Given a file and path, returns the name, path, size, date modified
-	 * Second parameter allows you to explicitly declare what information you want returned
-	 * Options are: name, server_path, size, date, readable, writable, executable, fileperms
-	 * Returns FALSE if the file cannot be found.
-	 *
-	 * @param string $file           Path to file
-	 * @param mixed  $returnedValues Array or comma separated string of information returned
-	 *
-	 * @return array|false
-	 */
-	protected function getFileInfo(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
-	{
-		if (! is_file($file))
-		{
-			return false;
-		}
-
-		if (is_string($returnedValues))
-		{
-			$returnedValues = explode(',', $returnedValues);
-		}
-
-		$fileInfo = [];
-
-		foreach ($returnedValues as $key)
-		{
-			switch ($key)
-			{
-				case 'name':
-					$fileInfo['name'] = basename($file);
-					break;
-				case 'server_path':
-					$fileInfo['server_path'] = $file;
-					break;
-				case 'size':
-					$fileInfo['size'] = filesize($file);
-					break;
-				case 'date':
-					$fileInfo['date'] = filemtime($file);
-					break;
-				case 'readable':
-					$fileInfo['readable'] = is_readable($file);
-					break;
-				case 'writable':
-					$fileInfo['writable'] = is_writable($file);
-					break;
-				case 'executable':
-					$fileInfo['executable'] = is_executable($file);
-					break;
-				case 'fileperms':
-					$fileInfo['fileperms'] = fileperms($file);
-					break;
-			}
-		}
-
-		return $fileInfo;
-	}
+    /**
+     * Maximum key length.
+     */
+    public const MAX_KEY_LENGTH = 255;
+
+    /**
+     * Where to store cached files on the disk.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Mode for the stored files.
+     * Must be chmod-safe (octal).
+     *
+     * @var int
+     *
+     * @see https://www.php.net/manual/en/function.chmod.php
+     */
+    protected $mode;
+
+    /**
+     * @throws CacheException
+     */
+    public function __construct(Cache $config)
+    {
+        if (! property_exists($config, 'file')) {
+            $config->file = [
+                'storePath' => $config->storePath ?? WRITEPATH . 'cache',
+                'mode'      => 0640,
+            ];
+        }
+
+        $this->path = ! empty($config->file['storePath']) ? $config->file['storePath'] : WRITEPATH . 'cache';
+        $this->path = rtrim($this->path, '/') . '/';
+
+        if (! is_really_writable($this->path)) {
+            throw CacheException::forUnableToWrite($this->path);
+        }
+
+        $this->mode   = $config->file['mode'] ?? 0640;
+        $this->prefix = $config->prefix;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        $key  = static::validateKey($key, $this->prefix);
+        $data = $this->getItem($key);
+
+        return is_array($data) ? $data['data'] : null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        $contents = [
+            'time' => time(),
+            'ttl'  => $ttl,
+            'data' => $value,
+        ];
+
+        if ($this->writeFile($this->path . $key, serialize($contents))) {
+            try {
+                chmod($this->path . $key, $this->mode);
+
+                // @codeCoverageIgnoreStart
+            } catch (Throwable $e) {
+                log_message('debug', 'Failed to set mode on cache file: ' . $e->getMessage());
+                // @codeCoverageIgnoreEnd
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return is_file($this->path . $key) && unlink($this->path . $key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        $deleted = 0;
+
+        foreach (glob($this->path . $pattern, GLOB_NOSORT) as $filename) {
+            if (is_file($filename) && @unlink($filename)) {
+                $deleted++;
+            }
+        }
+
+        return $deleted;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        $key  = static::validateKey($key, $this->prefix);
+        $data = $this->getItem($key);
+
+        if ($data === false) {
+            $data = [
+                'data' => 0,
+                'ttl'  => 60,
+            ];
+        } elseif (! is_int($data['data'])) {
+            return false;
+        }
+
+        $newValue = $data['data'] + $offset;
+
+        return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        $key  = static::validateKey($key, $this->prefix);
+        $data = $this->getItem($key);
+
+        if ($data === false) {
+            $data = [
+                'data' => 0,
+                'ttl'  => 60,
+            ];
+        } elseif (! is_int($data['data'])) {
+            return false;
+        }
+
+        $newValue = $data['data'] - $offset;
+
+        return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return $this->deleteFiles($this->path, false, true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return $this->getDirFileInfo($this->path);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        if (false === $data = $this->getItem($key)) {
+            return false; // This will return null in a future release
+        }
+
+        return [
+            'expire' => $data['time'] + $data['ttl'],
+            'mtime'  => filemtime($this->path . $key),
+            'data'   => $data['data'],
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return is_writable($this->path);
+    }
+
+    /**
+     * Does the heavy lifting of actually retrieving the file and
+     * verifying it's age.
+     *
+     * @return mixed
+     */
+    protected function getItem(string $filename)
+    {
+        if (! is_file($this->path . $filename)) {
+            return false;
+        }
+
+        $data = @unserialize(file_get_contents($this->path . $filename));
+        if (! is_array($data) || ! isset($data['ttl'])) {
+            return false;
+        }
+
+        // @phpstan-ignore-next-line
+        if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl']) {
+            // If the file is still there then try to remove it
+            if (is_file($this->path . $filename)) {
+                @unlink($this->path . $filename);
+            }
+
+            return false;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Writes a file to disk, or returns false if not successful.
+     *
+     * @param string $path
+     * @param string $data
+     * @param string $mode
+     *
+     * @return bool
+     */
+    protected function writeFile($path, $data, $mode = 'wb')
+    {
+        if (($fp = @fopen($path, $mode)) === false) {
+            return false;
+        }
+
+        flock($fp, LOCK_EX);
+
+        for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result) {
+            if (($result = fwrite($fp, substr($data, $written))) === false) {
+                break;
+            }
+        }
+
+        flock($fp, LOCK_UN);
+        fclose($fp);
+
+        return is_int($result);
+    }
+
+    /**
+     * Deletes all files contained in the supplied directory path.
+     * Files must be writable or owned by the system in order to be deleted.
+     * If the second parameter is set to TRUE, any directories contained
+     * within the supplied base directory will be nuked as well.
+     *
+     * @param string $path   File path
+     * @param bool   $delDir Whether to delete any directories found in the path
+     * @param bool   $htdocs Whether to skip deleting .htaccess and index page files
+     * @param int    $_level Current directory depth level (default: 0; internal use only)
+     */
+    protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs = false, int $_level = 0): bool
+    {
+        // Trim the trailing slash
+        $path = rtrim($path, '/\\');
+
+        if (! $currentDir = @opendir($path)) {
+            return false;
+        }
+
+        while (false !== ($filename = @readdir($currentDir))) {
+            if ($filename !== '.' && $filename !== '..') {
+                if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.') {
+                    $this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
+                } elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
+                    @unlink($path . DIRECTORY_SEPARATOR . $filename);
+                }
+            }
+        }
+
+        closedir($currentDir);
+
+        return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
+    }
+
+    /**
+     * Reads the specified directory and builds an array containing the filenames,
+     * filesize, dates, and permissions
+     *
+     * Any sub-folders contained within the specified path are read as well.
+     *
+     * @param string $sourceDir    Path to source
+     * @param bool   $topLevelOnly Look only at the top level directory specified?
+     * @param bool   $_recursion   Internal variable to determine recursion status - do not use in calls
+     *
+     * @return array|false
+     */
+    protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, bool $_recursion = false)
+    {
+        static $_filedata = [];
+        $relativePath     = $sourceDir;
+
+        if ($fp = @opendir($sourceDir)) {
+            // reset the array and make sure $source_dir has a trailing slash on the initial call
+            if ($_recursion === false) {
+                $_filedata = [];
+                $sourceDir = rtrim(realpath($sourceDir) ?: $sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+            }
+
+            // Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
+            while (false !== ($file = readdir($fp))) {
+                if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
+                    $this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
+                } elseif ($file[0] !== '.') {
+                    $_filedata[$file]                  = $this->getFileInfo($sourceDir . $file);
+                    $_filedata[$file]['relative_path'] = $relativePath;
+                }
+            }
+
+            closedir($fp);
+
+            return $_filedata;
+        }
+
+        return false;
+    }
+
+    /**
+     * Given a file and path, returns the name, path, size, date modified
+     * Second parameter allows you to explicitly declare what information you want returned
+     * Options are: name, server_path, size, date, readable, writable, executable, fileperms
+     * Returns FALSE if the file cannot be found.
+     *
+     * @param string $file           Path to file
+     * @param mixed  $returnedValues Array or comma separated string of information returned
+     *
+     * @return array|false
+     */
+    protected function getFileInfo(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
+    {
+        if (! is_file($file)) {
+            return false;
+        }
+
+        if (is_string($returnedValues)) {
+            $returnedValues = explode(',', $returnedValues);
+        }
+
+        $fileInfo = [];
+
+        foreach ($returnedValues as $key) {
+            switch ($key) {
+                case 'name':
+                    $fileInfo['name'] = basename($file);
+                    break;
+
+                case 'server_path':
+                    $fileInfo['server_path'] = $file;
+                    break;
+
+                case 'size':
+                    $fileInfo['size'] = filesize($file);
+                    break;
+
+                case 'date':
+                    $fileInfo['date'] = filemtime($file);
+                    break;
+
+                case 'readable':
+                    $fileInfo['readable'] = is_readable($file);
+                    break;
+
+                case 'writable':
+                    $fileInfo['writable'] = is_writable($file);
+                    break;
+
+                case 'executable':
+                    $fileInfo['executable'] = is_executable($file);
+                    break;
+
+                case 'fileperms':
+                    $fileInfo['fileperms'] = fileperms($file);
+                    break;
+            }
+        }
+
+        return $fileInfo;
+    }
 }
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index e6a0ce2007c0..2667abca92a6 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -22,356 +22,252 @@
  */
 class MemcachedHandler extends BaseHandler
 {
-	/**
-	 * The memcached object
-	 *
-	 * @var Memcached|Memcache
-	 */
-	protected $memcached;
-
-	/**
-	 * Memcached Configuration
-	 *
-	 * @var array
-	 */
-	protected $config = [
-		'host'   => '127.0.0.1',
-		'port'   => 11211,
-		'weight' => 1,
-		'raw'    => false,
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Cache $config
-	 */
-	public function __construct(Cache $config)
-	{
-		$this->prefix = $config->prefix;
-
-		if (! empty($config))
-		{
-			$this->config = array_merge($this->config, $config->memcached);
-		}
-	}
-
-	/**
-	 * Class destructor
-	 *
-	 * Closes the connection to Memcache(d) if present.
-	 */
-	public function __destruct()
-	{
-		if ($this->memcached instanceof Memcached)
-		{
-			$this->memcached->quit();
-		}
-		elseif ($this->memcached instanceof Memcache)
-		{
-			$this->memcached->close();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-		// Try to connect to Memcache or Memcached, if an issue occurs throw a CriticalError exception,
-		// so that the CacheFactory can attempt to initiate the next cache handler.
-		try
-		{
-			if (class_exists(Memcached::class))
-			{
-				// Create new instance of Memcached
-				$this->memcached = new Memcached();
-				if ($this->config['raw'])
-				{
-					$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
-				}
-
-				// Add server
-				$this->memcached->addServer(
-					$this->config['host'], $this->config['port'], $this->config['weight']
-				);
-
-				// attempt to get status of servers
-				$stats = $this->memcached->getStats();
-
-				// $stats should be an associate array with a key in the format of host:port.
-				// If it doesn't have the key, we know the server is not working as expected.
-				if (! isset($stats[$this->config['host'] . ':' . $this->config['port']]))
-				{
-					throw new CriticalError('Cache: Memcached connection failed.');
-				}
-			}
-			elseif (class_exists(Memcache::class))
-			{
-				// Create new instance of Memcache
-				$this->memcached = new Memcache();
-
-				// Check if we can connect to the server
-				$canConnect = $this->memcached->connect(
-					$this->config['host'], $this->config['port']
-				);
-
-				// If we can't connect, throw a CriticalError exception
-				if ($canConnect === false)
-				{
-					throw new CriticalError('Cache: Memcache connection failed.');
-				}
-
-				// Add server, third parameter is persistence and defaults to TRUE.
-				$this->memcached->addServer(
-					$this->config['host'], $this->config['port'], true, $this->config['weight']
-				);
-			}
-			else
-			{
-				throw new CriticalError('Cache: Not support Memcache(d) extension.');
-			}
-		}
-		catch (CriticalError $e)
-		{
-			// If a CriticalError exception occurs, throw it up.
-			throw $e;
-		}
-		catch (Exception $e)
-		{
-			// If an \Exception occurs, convert it into a CriticalError exception and throw it.
-			throw new CriticalError('Cache: Memcache(d) connection refused (' . $e->getMessage() . ').');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		if ($this->memcached instanceof Memcached)
-		{
-			$data = $this->memcached->get($key);
-
-			// check for unmatched key
-			if ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND)
-			{
-				return null;
-			}
-		}
-		elseif ($this->memcached instanceof Memcache)
-		{
-			$flags = false;
-			$data  = $this->memcached->get($key, $flags); // @phpstan-ignore-line
-
-			// check for unmatched key (i.e. $flags is untouched)
-			if ($flags === false)
-			{
-				return null;
-			}
-		}
-
-		return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		if (! $this->config['raw'])
-		{
-			$value = [
-				$value,
-				time(),
-				$ttl,
-			];
-		}
-
-		if ($this->memcached instanceof Memcached)
-		{
-			return $this->memcached->set($key, $value, $ttl);
-		}
-
-		if ($this->memcached instanceof Memcache)
-		{
-			return $this->memcached->set($key, $value, 0, $ttl);
-		}
-
-		// @phpstan-ignore-next-line
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return $this->memcached->delete($key);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @throws Exception
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer|false
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		if (! $this->config['raw'])
-		{
-			return false;
-		}
-
-		$key = static::validateKey($key, $this->prefix);
-
-		// @phpstan-ignore-next-line
-		return $this->memcached->increment($key, $offset, $offset, 60);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer|false
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		if (! $this->config['raw'])
-		{
-			return false;
-		}
-
-		$key = static::validateKey($key, $this->prefix);
-
-		//FIXME: third parameter isn't other handler actions.
-		// @phpstan-ignore-next-line
-		return $this->memcached->decrement($key, $offset, $offset, 60);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return $this->memcached->flush();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return array|false
-	 */
-	public function getCacheInfo()
-	{
-		return $this->memcached->getStats();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|false|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 *   Some handlers may return false when an item does not exist, which is deprecated.
-	 */
-	public function getMetaData(string $key)
-	{
-		$key    = static::validateKey($key, $this->prefix);
-		$stored = $this->memcached->get($key);
-
-		// if not an array, don't try to count for PHP7.2
-		if (! is_array($stored) || count($stored) !== 3)
-		{
-			return false; // This will return null in a future release
-		}
-
-		[$data, $time, $limit] = $stored;
-
-		// Calculate the remaining time to live from the original limit
-		$ttl = time() - $time - $limit;
-
-		return [
-			'expire' => $limit > 0 ? $time + $limit : null,
-			'mtime'  => $time,
-			'data'   => $data,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return extension_loaded('memcached') || extension_loaded('memcache');
-	}
+    /**
+     * The memcached object
+     *
+     * @var Memcache|Memcached
+     */
+    protected $memcached;
+
+    /**
+     * Memcached Configuration
+     *
+     * @var array
+     */
+    protected $config = [
+        'host'   => '127.0.0.1',
+        'port'   => 11211,
+        'weight' => 1,
+        'raw'    => false,
+    ];
+
+    public function __construct(Cache $config)
+    {
+        $this->prefix = $config->prefix;
+
+        if (! empty($config)) {
+            $this->config = array_merge($this->config, $config->memcached);
+        }
+    }
+
+    /**
+     * Closes the connection to Memcache(d) if present.
+     */
+    public function __destruct()
+    {
+        if ($this->memcached instanceof Memcached) {
+            $this->memcached->quit();
+        } elseif ($this->memcached instanceof Memcache) {
+            $this->memcached->close();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+        try {
+            if (class_exists(Memcached::class)) {
+                // Create new instance of Memcached
+                $this->memcached = new Memcached();
+                if ($this->config['raw']) {
+                    $this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
+                }
+
+                // Add server
+                $this->memcached->addServer(
+                    $this->config['host'],
+                    $this->config['port'],
+                    $this->config['weight']
+                );
+
+                // attempt to get status of servers
+                $stats = $this->memcached->getStats();
+
+                // $stats should be an associate array with a key in the format of host:port.
+                // If it doesn't have the key, we know the server is not working as expected.
+                if (! isset($stats[$this->config['host'] . ':' . $this->config['port']])) {
+                    throw new CriticalError('Cache: Memcached connection failed.');
+                }
+            } elseif (class_exists(Memcache::class)) {
+                // Create new instance of Memcache
+                $this->memcached = new Memcache();
+
+                // Check if we can connect to the server
+                $canConnect = $this->memcached->connect(
+                    $this->config['host'],
+                    $this->config['port']
+                );
+
+                // If we can't connect, throw a CriticalError exception
+                if ($canConnect === false) {
+                    throw new CriticalError('Cache: Memcache connection failed.');
+                }
+
+                // Add server, third parameter is persistence and defaults to TRUE.
+                $this->memcached->addServer(
+                    $this->config['host'],
+                    $this->config['port'],
+                    true,
+                    $this->config['weight']
+                );
+            } else {
+                throw new CriticalError('Cache: Not support Memcache(d) extension.');
+            }
+        } catch (CriticalError $e) {
+            throw $e;
+        } catch (Exception $e) {
+            throw new CriticalError('Cache: Memcache(d) connection refused (' . $e->getMessage() . ').');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        if ($this->memcached instanceof Memcached) {
+            $data = $this->memcached->get($key);
+
+            // check for unmatched key
+            if ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND) {
+                return null;
+            }
+        } elseif ($this->memcached instanceof Memcache) {
+            $flags = false;
+            $data  = $this->memcached->get($key, $flags);
+
+            // check for unmatched key (i.e. $flags is untouched)
+            if ($flags === false) {
+                return null;
+            }
+        }
+
+        return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        if (! $this->config['raw']) {
+            $value = [
+                $value,
+                time(),
+                $ttl,
+            ];
+        }
+
+        if ($this->memcached instanceof Memcached) {
+            return $this->memcached->set($key, $value, $ttl);
+        }
+
+        if ($this->memcached instanceof Memcache) {
+            return $this->memcached->set($key, $value, 0, $ttl);
+        }
+
+        // @phpstan-ignore-next-line
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return $this->memcached->delete($key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        if (! $this->config['raw']) {
+            return false;
+        }
+
+        $key = static::validateKey($key, $this->prefix);
+
+        // @phpstan-ignore-next-line
+        return $this->memcached->increment($key, $offset, $offset, 60);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        if (! $this->config['raw']) {
+            return false;
+        }
+
+        $key = static::validateKey($key, $this->prefix);
+
+        // FIXME: third parameter isn't other handler actions.
+        // @phpstan-ignore-next-line
+        return $this->memcached->decrement($key, $offset, $offset, 60);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return $this->memcached->flush();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return $this->memcached->getStats();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        $key    = static::validateKey($key, $this->prefix);
+        $stored = $this->memcached->get($key);
+
+        // if not an array, don't try to count for PHP7.2
+        if (! is_array($stored) || count($stored) !== 3) {
+            return false; // This will return null in a future release
+        }
+
+        [$data, $time, $limit] = $stored;
+
+        return [
+            'expire' => $limit > 0 ? $time + $limit : null,
+            'mtime'  => $time,
+            'data'   => $data,
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return extension_loaded('memcached') || extension_loaded('memcache');
+    }
 }
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 1892e812f366..374b3895ed05 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -22,290 +22,204 @@
  */
 class PredisHandler extends BaseHandler
 {
-	/**
-	 * Default config
-	 *
-	 * @var array
-	 */
-	protected $config = [
-		'scheme'   => 'tcp',
-		'host'     => '127.0.0.1',
-		'password' => null,
-		'port'     => 6379,
-		'timeout'  => 0,
-	];
-
-	/**
-	 * Predis connection
-	 *
-	 * @var Client
-	 */
-	protected $redis;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Cache $config
-	 */
-	public function __construct(Cache $config)
-	{
-		$this->prefix = $config->prefix;
-
-		if (isset($config->redis))
-		{
-			$this->config = array_merge($this->config, $config->redis);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-		// Try to connect to Redis, if an issue occurs throw a CriticalError exception,
-		// so that the CacheFactory can attempt to initiate the next cache handler.
-		try
-		{
-			// Create a new instance of Predis\Client
-			$this->redis = new Client($this->config, ['prefix' => $this->prefix]);
-
-			// Check if the connection is valid by trying to get the time.
-			$this->redis->time();
-		}
-		catch (Exception $e)
-		{
-			// thrown if can't connect to redis server.
-			throw new CriticalError('Cache: Predis connection refused (' . $e->getMessage() . ').');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key = static::validateKey($key);
-
-		$data = array_combine([
-			'__ci_type',
-			'__ci_value',
-		],
-			$this->redis->hmget($key, ['__ci_type', '__ci_value'])
-		);
-
-		if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false)
-		{
-			return null;
-		}
-
-		switch ($data['__ci_type'])
-		{
-			case 'array':
-			case 'object':
-				return unserialize($data['__ci_value']);
-			case 'boolean':
-			case 'integer':
-			case 'double': // Yes, 'double' is returned and NOT 'float'
-			case 'string':
-			case 'NULL':
-				return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-			case 'resource':
-			default:
-				return null;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		$key = static::validateKey($key);
-
-		switch ($dataType = gettype($value))
-		{
-			case 'array':
-			case 'object':
-				$value = serialize($value);
-				break;
-			case 'boolean':
-			case 'integer':
-			case 'double': // Yes, 'double' is returned and NOT 'float'
-			case 'string':
-			case 'NULL':
-				break;
-			case 'resource':
-			default:
-				return false;
-		}
-
-		if (! $this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
-		{
-			return false;
-		}
-
-		$this->redis->expireat($key, time() + $ttl);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key);
-
-		return $this->redis->del($key) === 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @return integer The number of deleted items
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		$matchedKeys = [];
-
-		foreach (new Keyspace($this->redis, $pattern) as $key)
-		{
-			$matchedKeys[] = $key;
-		}
-
-		return $this->redis->del($matchedKeys);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key);
-
-		return $this->redis->hincrby($key, 'data', $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key);
-
-		return $this->redis->hincrby($key, 'data', -$offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return $this->redis->flushdb()->getPayload() === 'OK';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return array
-	 */
-	public function getCacheInfo()
-	{
-		return $this->redis->info();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|false|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 */
-	public function getMetaData(string $key)
-	{
-		$key = static::validateKey($key);
-
-		$data = array_combine(['__ci_value'], $this->redis->hmget($key, ['__ci_value']));
-
-		if (isset($data['__ci_value']) && $data['__ci_value'] !== false)
-		{
-			$time = time();
-			$ttl  = $this->redis->ttl($key);
-
-			return [
-				'expire' => $ttl > 0 ? time() + $ttl : null,
-				'mtime'  => $time,
-				'data'   => $data['__ci_value'],
-			];
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return class_exists('\Predis\Client');
-	}
+    /**
+     * Default config
+     *
+     * @var array
+     */
+    protected $config = [
+        'scheme'   => 'tcp',
+        'host'     => '127.0.0.1',
+        'password' => null,
+        'port'     => 6379,
+        'timeout'  => 0,
+    ];
+
+    /**
+     * Predis connection
+     *
+     * @var Client
+     */
+    protected $redis;
+
+    public function __construct(Cache $config)
+    {
+        $this->prefix = $config->prefix;
+
+        if (isset($config->redis)) {
+            $this->config = array_merge($this->config, $config->redis);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+        try {
+            $this->redis = new Client($this->config, ['prefix' => $this->prefix]);
+            $this->redis->time();
+        } catch (Exception $e) {
+            throw new CriticalError('Cache: Predis connection refused (' . $e->getMessage() . ').');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        $key = static::validateKey($key);
+
+        $data = array_combine(
+            ['__ci_type', '__ci_value'],
+            $this->redis->hmget($key, ['__ci_type', '__ci_value'])
+        );
+
+        if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
+            return null;
+        }
+
+        switch ($data['__ci_type']) {
+            case 'array':
+            case 'object':
+                return unserialize($data['__ci_value']);
+
+            case 'boolean':
+            case 'integer':
+            case 'double': // Yes, 'double' is returned and NOT 'float'
+            case 'string':
+            case 'NULL':
+                return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
+
+            case 'resource':
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        $key = static::validateKey($key);
+
+        switch ($dataType = gettype($value)) {
+            case 'array':
+            case 'object':
+                $value = serialize($value);
+                break;
+
+            case 'boolean':
+            case 'integer':
+            case 'double': // Yes, 'double' is returned and NOT 'float'
+            case 'string':
+            case 'NULL':
+                break;
+
+            case 'resource':
+            default:
+                return false;
+        }
+
+        if (! $this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
+            return false;
+        }
+
+        $this->redis->expireat($key, time() + $ttl);
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key);
+
+        return $this->redis->del($key) === 1;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        $matchedKeys = [];
+
+        foreach (new Keyspace($this->redis, $pattern) as $key) {
+            $matchedKeys[] = $key;
+        }
+
+        return $this->redis->del($matchedKeys);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key);
+
+        return $this->redis->hincrby($key, 'data', $offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key);
+
+        return $this->redis->hincrby($key, 'data', -$offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return $this->redis->flushdb()->getPayload() === 'OK';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return $this->redis->info();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        $key = static::validateKey($key);
+
+        $data = array_combine(['__ci_value'], $this->redis->hmget($key, ['__ci_value']));
+
+        if (isset($data['__ci_value']) && $data['__ci_value'] !== false) {
+            $time = time();
+            $ttl  = $this->redis->ttl($key);
+
+            return [
+                'expire' => $ttl > 0 ? time() + $ttl : null,
+                'mtime'  => $time,
+                'data'   => $data['__ci_value'],
+            ];
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return class_exists('Predis\Client');
+    }
 }
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index f8c13879a789..553825f615e8 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -21,332 +21,243 @@
  */
 class RedisHandler extends BaseHandler
 {
-	/**
-	 * Default config
-	 *
-	 * @var array
-	 */
-	protected $config = [
-		'host'     => '127.0.0.1',
-		'password' => null,
-		'port'     => 6379,
-		'timeout'  => 0,
-		'database' => 0,
-	];
-
-	/**
-	 * Redis connection
-	 *
-	 * @var Redis
-	 */
-	protected $redis;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Cache $config
-	 */
-	public function __construct(Cache $config)
-	{
-		$this->prefix = $config->prefix;
-
-		if (! empty($config))
-		{
-			$this->config = array_merge($this->config, $config->redis);
-		}
-	}
-
-	/**
-	 * Class destructor
-	 *
-	 * Closes the connection to Redis if present.
-	 */
-	public function __destruct()
-	{
-		if (isset($this->redis))
-		{
-			$this->redis->close();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-		$config = $this->config;
-
-		$this->redis = new Redis();
-
-		// Try to connect to Redis, if an issue occurs throw a CriticalError exception,
-		// so that the CacheFactory can attempt to initiate the next cache handler.
-		try
-		{
-			// Note:: If Redis is your primary cache choice, and it is "offline", every page load will end up been delayed by the timeout duration.
-			// I feel like some sort of temporary flag should be set, to indicate that we think Redis is "offline", allowing us to bypass the timeout for a set period of time.
-
-			if (! $this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout']))
-			{
-				// Note:: I'm unsure if log_message() is necessary, however I'm not 100% comfortable removing it.
-				log_message('error', 'Cache: Redis connection failed. Check your configuration.');
-				throw new CriticalError('Cache: Redis connection failed. Check your configuration.');
-			}
-
-			if (isset($config['password']) && ! $this->redis->auth($config['password']))
-			{
-				log_message('error', 'Cache: Redis authentication failed.');
-				throw new CriticalError('Cache: Redis authentication failed.');
-			}
-
-			if (isset($config['database']) && ! $this->redis->select($config['database']))
-			{
-				log_message('error', 'Cache: Redis select database failed.');
-				throw new CriticalError('Cache: Redis select database failed.');
-			}
-		}
-		catch (RedisException $e)
-		{
-			// $this->redis->connect() can sometimes throw a RedisException.
-			// We need to convert the exception into a CriticalError exception and throw it.
-			throw new CriticalError('Cache: RedisException occurred with message (' . $e->getMessage() . ').');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key  = static::validateKey($key, $this->prefix);
-		$data = $this->redis->hMGet($key, ['__ci_type', '__ci_value']);
-
-		if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false)
-		{
-			return null;
-		}
-
-		switch ($data['__ci_type'])
-		{
-			case 'array':
-			case 'object':
-				return unserialize($data['__ci_value']);
-			case 'boolean':
-			case 'integer':
-			case 'double': // Yes, 'double' is returned and NOT 'float'
-			case 'string':
-			case 'NULL':
-				return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
-			case 'resource':
-			default:
-				return null;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		switch ($dataType = gettype($value))
-		{
-			case 'array':
-			case 'object':
-				$value = serialize($value);
-				break;
-			case 'boolean':
-			case 'integer':
-			case 'double': // Yes, 'double' is returned and NOT 'float'
-			case 'string':
-			case 'NULL':
-				break;
-			case 'resource':
-			default:
-				return false;
-		}
-
-		if (! $this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
-		{
-			return false;
-		}
-
-		if ($ttl)
-		{
-			$this->redis->expireAt($key, time() + $ttl);
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return $this->redis->del($key) === 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @return integer The number of deleted items
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		$matchedKeys = [];
-		$iterator    = null;
-
-		do
-		{
-			// Scan for some keys
-			$keys = $this->redis->scan($iterator, $pattern);
-
-			// Redis may return empty results, so protect against that
-			if ($keys !== false)
-			{
-				foreach ($keys as $key)
-				{
-					$matchedKeys[] = $key;
-				}
-			}
-		}
-		while ($iterator > 0);
-
-		return $this->redis->del($matchedKeys);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return $this->redis->hIncrBy($key, 'data', $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return $this->redis->hIncrBy($key, 'data', -$offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return $this->redis->flushDB();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return array
-	 */
-	public function getCacheInfo()
-	{
-		return $this->redis->info();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 */
-	public function getMetaData(string $key)
-	{
-		$key   = static::validateKey($key, $this->prefix);
-		$value = $this->get($key);
-
-		if ($value !== null)
-		{
-			$time = time();
-			$ttl  = $this->redis->ttl($key);
-
-			return [
-				'expire' => $ttl > 0 ? time() + $ttl : null,
-				'mtime'  => $time,
-				'data'   => $value,
-			];
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return extension_loaded('redis');
-	}
+    /**
+     * Default config
+     *
+     * @var array
+     */
+    protected $config = [
+        'host'     => '127.0.0.1',
+        'password' => null,
+        'port'     => 6379,
+        'timeout'  => 0,
+        'database' => 0,
+    ];
+
+    /**
+     * Redis connection
+     *
+     * @var Redis
+     */
+    protected $redis;
+
+    public function __construct(Cache $config)
+    {
+        $this->prefix = $config->prefix;
+
+        if (! empty($config)) {
+            $this->config = array_merge($this->config, $config->redis);
+        }
+    }
+
+    /**
+     * Closes the connection to Redis if present.
+     */
+    public function __destruct()
+    {
+        if (isset($this->redis)) {
+            $this->redis->close();
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+        $config = $this->config;
+
+        $this->redis = new Redis();
+
+        try {
+            // Note:: If Redis is your primary cache choice, and it is "offline", every page load will end up been delayed by the timeout duration.
+            // I feel like some sort of temporary flag should be set, to indicate that we think Redis is "offline", allowing us to bypass the timeout for a set period of time.
+
+            if (! $this->redis->connect($config['host'], ($config['host'][0] === '/' ? 0 : $config['port']), $config['timeout'])) {
+                // Note:: I'm unsure if log_message() is necessary, however I'm not 100% comfortable removing it.
+                log_message('error', 'Cache: Redis connection failed. Check your configuration.');
+
+                throw new CriticalError('Cache: Redis connection failed. Check your configuration.');
+            }
+
+            if (isset($config['password']) && ! $this->redis->auth($config['password'])) {
+                log_message('error', 'Cache: Redis authentication failed.');
+
+                throw new CriticalError('Cache: Redis authentication failed.');
+            }
+
+            if (isset($config['database']) && ! $this->redis->select($config['database'])) {
+                log_message('error', 'Cache: Redis select database failed.');
+
+                throw new CriticalError('Cache: Redis select database failed.');
+            }
+        } catch (RedisException $e) {
+            throw new CriticalError('Cache: RedisException occurred with message (' . $e->getMessage() . ').');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        $key  = static::validateKey($key, $this->prefix);
+        $data = $this->redis->hMGet($key, ['__ci_type', '__ci_value']);
+
+        if (! isset($data['__ci_type'], $data['__ci_value']) || $data['__ci_value'] === false) {
+            return null;
+        }
+
+        switch ($data['__ci_type']) {
+            case 'array':
+            case 'object':
+                return unserialize($data['__ci_value']);
+
+            case 'boolean':
+            case 'integer':
+            case 'double': // Yes, 'double' is returned and NOT 'float'
+            case 'string':
+            case 'NULL':
+                return settype($data['__ci_value'], $data['__ci_type']) ? $data['__ci_value'] : null;
+
+            case 'resource':
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        switch ($dataType = gettype($value)) {
+            case 'array':
+            case 'object':
+                $value = serialize($value);
+                break;
+
+            case 'boolean':
+            case 'integer':
+            case 'double': // Yes, 'double' is returned and NOT 'float'
+            case 'string':
+            case 'NULL':
+                break;
+
+            case 'resource':
+            default:
+                return false;
+        }
+
+        if (! $this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value])) {
+            return false;
+        }
+
+        if ($ttl) {
+            $this->redis->expireAt($key, time() + $ttl);
+        }
+
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return $this->redis->del($key) === 1;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        $matchedKeys = [];
+        $iterator    = null;
+
+        do {
+            // Scan for some keys
+            $keys = $this->redis->scan($iterator, $pattern);
+
+            // Redis may return empty results, so protect against that
+            if ($keys !== false) {
+                foreach ($keys as $key) {
+                    $matchedKeys[] = $key;
+                }
+            }
+        } while ($iterator > 0);
+
+        return $this->redis->del($matchedKeys);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return $this->redis->hIncrBy($key, 'data', $offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return $this->redis->hIncrBy($key, 'data', -$offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return $this->redis->flushDB();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return $this->redis->info();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        $key   = static::validateKey($key, $this->prefix);
+        $value = $this->get($key);
+
+        if ($value !== null) {
+            $time = time();
+            $ttl  = $this->redis->ttl($key);
+
+            return [
+                'expire' => $ttl > 0 ? time() + $ttl : null,
+                'mtime'  => $time,
+                'data'   => $value,
+            ];
+        }
+
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return extension_loaded('redis');
+    }
 }
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index daf041a6d04c..368408af7217 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
@@ -21,196 +21,124 @@
  */
 class WincacheHandler extends BaseHandler
 {
-	/**
-	 * Constructor.
-	 *
-	 * @param Cache $config
-	 */
-	public function __construct(Cache $config)
-	{
-		$this->prefix = $config->prefix;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key     = static::validateKey($key, $this->prefix);
-		$success = false;
-
-		$data = wincache_ucache_get($key, $success);
-
-		// Success returned by reference from wincache_ucache_get()
-		return $success ? $data : null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value The data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function save(string $key, $value, int $ttl = 60)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return wincache_ucache_set($key, $value, $ttl);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return wincache_ucache_delete($key);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @throws Exception
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer|false
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return wincache_ucache_inc($key, $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return integer|false
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return wincache_ucache_dec($key, $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean Success or failure
-	 */
-	public function clean()
-	{
-		return wincache_ucache_clear();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return array|false
-	 */
-	public function getCacheInfo()
-	{
-		return wincache_ucache_info(true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|false|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 *   Some handlers may return false when an item does not exist, which is deprecated.
-	 */
-	public function getMetaData(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		if ($stored = wincache_ucache_info(false, $key))
-		{
-			$age      = $stored['ucache_entries'][1]['age_seconds'];
-			$ttl      = $stored['ucache_entries'][1]['ttl_seconds'];
-			$hitcount = $stored['ucache_entries'][1]['hitcount'];
-
-			return [
-				'expire'   => $ttl > 0 ? time() + $ttl : null,
-				'hitcount' => $hitcount,
-				'age'      => $age,
-				'ttl'      => $ttl,
-			];
-		}
-
-		return false; // This will return null in a future release
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return extension_loaded('wincache') && ini_get('wincache.ucenabled');
-	}
+    public function __construct(Cache $config)
+    {
+        $this->prefix = $config->prefix;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function initialize()
+    {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function get(string $key)
+    {
+        $key     = static::validateKey($key, $this->prefix);
+        $success = false;
+
+        $data = wincache_ucache_get($key, $success);
+
+        // Success returned by reference from wincache_ucache_get()
+        return $success ? $data : null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function save(string $key, $value, int $ttl = 60)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return wincache_ucache_set($key, $value, $ttl);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return wincache_ucache_delete($key);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function deleteMatching(string $pattern)
+    {
+        throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return wincache_ucache_inc($key, $offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return wincache_ucache_dec($key, $offset);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function clean()
+    {
+        return wincache_ucache_clear();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getCacheInfo()
+    {
+        return wincache_ucache_info(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMetaData(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        if ($stored = wincache_ucache_info(false, $key)) {
+            $age      = $stored['ucache_entries'][1]['age_seconds'];
+            $ttl      = $stored['ucache_entries'][1]['ttl_seconds'];
+            $hitcount = $stored['ucache_entries'][1]['hitcount'];
+
+            return [
+                'expire'   => $ttl > 0 ? time() + $ttl : null,
+                'hitcount' => $hitcount,
+                'age'      => $age,
+                'ttl'      => $ttl,
+            ];
+        }
+
+        return false; // This will return null in a future release
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSupported(): bool
+    {
+        return extension_loaded('wincache') && ini_get('wincache.ucenabled');
+    }
 }
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 92bb010f6bd0..4350876bd3a2 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -41,1096 +41,936 @@
  */
 class CodeIgniter
 {
-	/**
-	 * The current version of CodeIgniter Framework
-	 */
-	const CI_VERSION = '4.1.3';
-
-	private const MIN_PHP_VERSION = '7.3';
-
-	/**
-	 * App startup time.
-	 *
-	 * @var mixed
-	 */
-	protected $startTime;
-
-	/**
-	 * Total app execution time
-	 *
-	 * @var float
-	 */
-	protected $totalTime;
-
-	/**
-	 * Main application configuration
-	 *
-	 * @var App
-	 */
-	protected $config;
-
-	/**
-	 * Timer instance.
-	 *
-	 * @var Timer
-	 */
-	protected $benchmark;
-
-	/**
-	 * Current request.
-	 *
-	 * @var Request|IncomingRequest|CLIRequest
-	 */
-	protected $request;
-
-	/**
-	 * Current response.
-	 *
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	/**
-	 * Router to use.
-	 *
-	 * @var Router
-	 */
-	protected $router;
-
-	/**
-	 * Controller to use.
-	 *
-	 * @var string|Closure
-	 */
-	protected $controller;
-
-	/**
-	 * Controller method to invoke.
-	 *
-	 * @var string
-	 */
-	protected $method;
-
-	/**
-	 * Output handler to use.
-	 *
-	 * @var string
-	 */
-	protected $output;
-
-	/**
-	 * Cache expiration time
-	 *
-	 * @var integer
-	 */
-	protected static $cacheTTL = 0;
-
-	/**
-	 * Request path to use.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * Should the Response instance "pretend"
-	 * to keep from setting headers/cookies/etc
-	 *
-	 * @var boolean
-	 */
-	protected $useSafeOutput = false;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param App $config
-	 */
-	public function __construct(App $config)
-	{
-		if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<'))
-		{
-			// @codeCoverageIgnoreStart
-			$message = extension_loaded('intl')
-				? lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION])
-				: sprintf('Your PHP version must be %s or higher to run CodeIgniter. Current version: %s', self::MIN_PHP_VERSION, PHP_VERSION);
-
-			exit($message);
-			// @codeCoverageIgnoreEnd
-		}
-
-		$this->startTime = microtime(true);
-		$this->config    = $config;
-	}
-
-	/**
-	 * Handles some basic app and environment setup.
-	 */
-	public function initialize()
-	{
-		// Define environment variables
-		$this->detectEnvironment();
-		$this->bootstrapEnvironment();
-
-		// Setup Exception Handling
-		Services::exceptions()->initialize();
-
-		// Run this check for manual installations
-		if (! is_file(COMPOSER_PATH))
-		{
-			$this->resolvePlatformExtensions(); // @codeCoverageIgnore
-		}
-
-		// Set default locale on the server
-		locale_set_default($this->config->defaultLocale ?? 'en');
-
-		// Set default timezone on the server
-		date_default_timezone_set($this->config->appTimezone ?? 'UTC');
-
-		$this->initializeKint();
-
-		if (! CI_DEBUG)
-		{
-			Kint::$enabled_mode = false; // @codeCoverageIgnore
-		}
-	}
-
-	/**
-	 * Checks system for missing required PHP extensions.
-	 *
-	 * @throws FrameworkException
-	 *
-	 * @return void
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function resolvePlatformExtensions()
-	{
-		$requiredExtensions = [
-			'curl',
-			'intl',
-			'json',
-			'mbstring',
-			'xml',
-		];
-
-		$missingExtensions = [];
-
-		foreach ($requiredExtensions as $extension)
-		{
-			if (! extension_loaded($extension))
-			{
-				$missingExtensions[] = $extension;
-			}
-		}
-
-		if ($missingExtensions !== [])
-		{
-			throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions));
-		}
-	}
-
-	/**
-	 * Initializes Kint
-	 */
-	protected function initializeKint()
-	{
-		// If we have KINT_DIR it means it's already loaded via composer
-		if (! defined('KINT_DIR'))
-		{
-			spl_autoload_register(function ($class) {
-				$class = explode('\\', $class);
-
-				if ('Kint' !== array_shift($class))
-				{
-					return;
-				}
-
-				$file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php';
-
-				file_exists($file) && require_once $file;
-			});
-
-			require_once SYSTEMPATH . 'ThirdParty/Kint/init.php';
-		}
-
-		/**
-		 * Config\Kint
-		 */
-		$config = config('Config\Kint');
-
-		Kint::$max_depth           = $config->maxDepth;
-		Kint::$display_called_from = $config->displayCalledFrom;
-		Kint::$expanded            = $config->expanded;
-
-		if (! empty($config->plugins) && is_array($config->plugins))
-		{
-			Kint::$plugins = $config->plugins;
-		}
-
-		RichRenderer::$theme  = $config->richTheme;
-		RichRenderer::$folder = $config->richFolder;
-		RichRenderer::$sort   = $config->richSort;
-		if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins))
-		{
-			RichRenderer::$object_plugins = $config->richObjectPlugins;
-		}
-		if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins))
-		{
-			RichRenderer::$tab_plugins = $config->richTabPlugins;
-		}
-
-		CliRenderer::$cli_colors         = $config->cliColors;
-		CliRenderer::$force_utf8         = $config->cliForceUTF8;
-		CliRenderer::$detect_width       = $config->cliDetectWidth;
-		CliRenderer::$min_terminal_width = $config->cliMinWidth;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Launch the application!
-	 *
-	 * This is "the loop" if you will. The main entry point into the script
-	 * that gets the required class instances, fires off the filters,
-	 * tries to route the response, loads the controller and generally
-	 * makes all of the pieces work together.
-	 *
-	 * @param RouteCollectionInterface|null $routes
-	 * @param boolean                       $returnResponse
-	 *
-	 * @return boolean|RequestInterface|ResponseInterface|mixed
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
-	{
-		$this->startBenchmark();
-
-		$this->getRequestObject();
-		$this->getResponseObject();
-
-		$this->forceSecureAccess();
-
-		$this->spoofRequestMethod();
-
-		Events::trigger('pre_system');
-
-		// Check for a cached page. Execution will stop
-		// if the page has been cached.
-		$cacheConfig = new Cache();
-		$response    = $this->displayCache($cacheConfig);
-		if ($response instanceof ResponseInterface)
-		{
-			if ($returnResponse)
-			{
-				return $response;
-			}
-
-			$this->response->pretend($this->useSafeOutput)->send();
-			$this->callExit(EXIT_SUCCESS);
-			return;
-		}
-
-		try
-		{
-			return $this->handleRequest($routes, $cacheConfig, $returnResponse);
-		}
-		catch (RedirectException $e)
-		{
-			$logger = Services::logger();
-			$logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
-
-			// If the route is a 'redirect' route, it throws
-			// the exception with the $to as the message
-			$this->response->redirect(base_url($e->getMessage()), 'auto', $e->getCode());
-			$this->sendResponse();
-
-			$this->callExit(EXIT_SUCCESS);
-			return;
-		}
-		catch (PageNotFoundException $e)
-		{
-			$this->display404errors($e);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set our Response instance to "pretend" mode so that things like
-	 * cookies and headers are not actually sent, allowing PHP 7.2+ to
-	 * not complain when ini_set() function is used.
-	 *
-	 * @param boolean $safe
-	 *
-	 * @return $this
-	 */
-	public function useSafeOutput(bool $safe = true)
-	{
-		$this->useSafeOutput = $safe;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles the main request logic and fires the controller.
-	 *
-	 * @param RouteCollectionInterface|null $routes
-	 * @param Cache                         $cacheConfig
-	 * @param boolean                       $returnResponse
-	 *
-	 * @return RequestInterface|ResponseInterface|mixed
-	 * @throws RedirectException
-	 */
-	protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false)
-	{
-		$routeFilter = $this->tryToRouteIt($routes);
-
-		// Run "before" filters
-		$filters = Services::filters();
-
-		// If any filters were specified within the routes file,
-		// we need to ensure it's active for the current request
-		if (! is_null($routeFilter))
-		{
-			$filters->enableFilter($routeFilter, 'before');
-			$filters->enableFilter($routeFilter, 'after');
-		}
-
-		$uri = $this->determinePath();
-
-		// Never run filters when running through Spark cli
-		if (! defined('SPARKED'))
-		{
-			$possibleResponse = $filters->run($uri, 'before');
-
-			// If a ResponseInterface instance is returned then send it back to the client and stop
-			if ($possibleResponse instanceof ResponseInterface)
-			{
-				return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();
-			}
-
-			if ($possibleResponse instanceof Request)
-			{
-				$this->request = $possibleResponse;
-			}
-		}
-
-		$returned = $this->startController();
-
-		// Closure controller has run in startController().
-		if (! is_callable($this->controller))
-		{
-			$controller = $this->createController();
-
-			if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false))
-			{
-				throw PageNotFoundException::forMethodNotFound($this->method);
-			}
-
-			// Is there a "post_controller_constructor" event?
-			Events::trigger('post_controller_constructor');
-
-			$returned = $this->runController($controller);
-		}
-		else
-		{
-			$this->benchmark->stop('controller_constructor');
-			$this->benchmark->stop('controller');
-		}
-
-		// If $returned is a string, then the controller output something,
-		// probably a view, instead of echoing it directly. Send it along
-		// so it can be used with the output.
-		$this->gatherOutput($cacheConfig, $returned);
-
-		// Never run filters when running through Spark cli
-		if (! defined('SPARKED'))
-		{
-			$filters->setResponse($this->response);
-			// Run "after" filters
-			$response = $filters->run($uri, 'after');
-		}
-		else
-		{
-			$response = $this->response;
-
-			// Set response code for CLI command failures
-			if (is_numeric($returned) || $returned === false)
-			{
-				$response->setStatusCode(400);
-			}
-		}
-
-		if ($response instanceof ResponseInterface)
-		{
-			$this->response = $response;
-		}
-
-		// Save our current URI as the previous URI in the session
-		// for safer, more accurate use with `previous_url()` helper function.
-		$this->storePreviousURL(current_url(true));
-
-		unset($uri);
-
-		if (! $returnResponse)
-		{
-			$this->sendResponse();
-		}
-
-		//--------------------------------------------------------------------
-		// Is there a post-system event?
-		//--------------------------------------------------------------------
-		Events::trigger('post_system');
-
-		return $this->response;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * You can load different configurations depending on your
-	 * current environment. Setting the environment also influences
-	 * things like logging and error reporting.
-	 *
-	 * This can be set to anything, but default usage is:
-	 *
-	 *     development
-	 *     testing
-	 *     production
-	 */
-	protected function detectEnvironment()
-	{
-		// Make sure ENVIRONMENT isn't already set by other means.
-		defined('ENVIRONMENT') || define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production'); // @codeCoverageIgnore
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Load any custom boot files based upon the current environment.
-	 *
-	 * If no boot file exists, we shouldn't continue because something
-	 * is wrong. At the very least, they should have error reporting setup.
-	 */
-	protected function bootstrapEnvironment()
-	{
-		if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php'))
-		{
-			require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
-		}
-		else
-		{
-			// @codeCoverageIgnoreStart
-			header('HTTP/1.1 503 Service Unavailable.', true, 503);
-			echo 'The application environment is not set correctly.';
-			exit(EXIT_ERROR); // EXIT_ERROR
-			// @codeCoverageIgnoreEnd
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Start the Benchmark
-	 *
-	 * The timer is used to display total script execution both in the
-	 * debug toolbar, and potentially on the displayed page.
-	 */
-	protected function startBenchmark()
-	{
-		$this->startTime = microtime(true);
-
-		$this->benchmark = Services::timer();
-		$this->benchmark->start('total_execution', $this->startTime);
-		$this->benchmark->start('bootstrap');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets a Request object to be used for this request.
-	 * Used when running certain tests.
-	 *
-	 * @param Request $request
-	 *
-	 * @return $this
-	 */
-	public function setRequest(Request $request)
-	{
-		$this->request = $request;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get our Request object, (either IncomingRequest or CLIRequest)
-	 * and set the server protocol based on the information provided
-	 * by the server.
-	 */
-	protected function getRequestObject()
-	{
-		if ($this->request instanceof Request)
-		{
-			return;
-		}
-
-		// @phpstan-ignore-next-line
-		if (is_cli() && ENVIRONMENT !== 'testing')
-		{
-			// @codeCoverageIgnoreStart
-			$this->request = Services::clirequest($this->config);
-			// @codeCoverageIgnoreEnd
-		}
-		else
-		{
-			$this->request = Services::request($this->config);
-			// guess at protocol if needed
-			$this->request->setProtocolVersion($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get our Response object, and set some default values, including
-	 * the HTTP protocol version and a default successful response.
-	 */
-	protected function getResponseObject()
-	{
-		$this->response = Services::response($this->config);
-
-		if (! is_cli() || ENVIRONMENT === 'testing')
-		{
-			$this->response->setProtocolVersion($this->request->getProtocolVersion());
-		}
-
-		// Assume success until proven otherwise.
-		$this->response->setStatusCode(200);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Force Secure Site Access? If the config value 'forceGlobalSecureRequests'
-	 * is true, will enforce that all requests to this site are made through
-	 * HTTPS. Will redirect the user to the current page with HTTPS, as well
-	 * as set the HTTP Strict Transport Security header for those browsers
-	 * that support it.
-	 *
-	 * @param integer $duration How long the Strict Transport Security
-	 *                          should be enforced for this URL.
-	 */
-	protected function forceSecureAccess($duration = 31536000)
-	{
-		if ($this->config->forceGlobalSecureRequests !== true)
-		{
-			return;
-		}
-
-		force_https($duration, $this->request, $this->response);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if a response has been cached for the given URI.
-	 *
-	 * @param Cache $config
-	 *
-	 * @throws Exception
-	 *
-	 * @return boolean|ResponseInterface
-	 */
-	public function displayCache(Cache $config)
-	{
-		if ($cachedResponse = cache()->get($this->generateCacheName($config)))
-		{
-			$cachedResponse = unserialize($cachedResponse);
-			if (! is_array($cachedResponse) || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers']))
-			{
-				throw new Exception('Error unserializing page cache');
-			}
-
-			$headers = $cachedResponse['headers'];
-			$output  = $cachedResponse['output'];
-
-			// Clear all default headers
-			foreach (array_keys($this->response->headers()) as $key)
-			{
-				$this->response->removeHeader($key);
-			}
-
-			// Set cached headers
-			foreach ($headers as $name => $value)
-			{
-				$this->response->setHeader($name, $value);
-			}
-
-			$output = $this->displayPerformanceMetrics($output);
-			$this->response->setBody($output);
-
-			return $this->response;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tells the app that the final output should be cached.
-	 *
-	 * @param integer $time
-	 *
-	 * @return void
-	 */
-	public static function cache(int $time)
-	{
-		static::$cacheTTL = $time;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Caches the full response from the current request. Used for
-	 * full-page caching for very high performance.
-	 *
-	 * @param Cache $config
-	 *
-	 * @return mixed
-	 */
-	public function cachePage(Cache $config)
-	{
-		$headers = [];
-		foreach ($this->response->headers() as $header)
-		{
-			$headers[$header->getName()] = $header->getValueLine();
-		}
-
-		return cache()->save($this->generateCacheName($config), serialize(['headers' => $headers, 'output' => $this->output]), static::$cacheTTL);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array with our basic performance stats collected.
-	 *
-	 * @return array
-	 */
-	public function getPerformanceStats(): array
-	{
-		return [
-			'startTime' => $this->startTime,
-			'totalTime' => $this->totalTime,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the cache name to use for our full-page caching.
-	 *
-	 * @param Cache $config
-	 *
-	 * @return string
-	 */
-	protected function generateCacheName(Cache $config): string
-	{
-		if ($this->request instanceof CLIRequest)
-		{
-			return md5($this->request->getPath());
-		}
-
-		$uri = $this->request->getUri();
-
-		if ($config->cacheQueryString)
-		{
-			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery());
-		}
-		else
-		{
-			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
-		}
-
-		return md5($name);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replaces the memory_usage and elapsed_time tags.
-	 *
-	 * @param string $output
-	 *
-	 * @return string
-	 */
-	public function displayPerformanceMetrics(string $output): string
-	{
-		$this->totalTime = $this->benchmark->getElapsedTime('total_execution');
-
-		return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Try to Route It - As it sounds like, works with the router to
-	 * match a route against the current URI. If the route is a
-	 * "redirect route", will also handle the redirect.
-	 *
-	 * @param RouteCollectionInterface|null $routes An collection interface to use in place
-	 *                                         of the config file.
-	 *
-	 * @return string|null
-	 * @throws RedirectException
-	 */
-	protected function tryToRouteIt(RouteCollectionInterface $routes = null)
-	{
-		if ($routes === null)
-		{
-			require APPPATH . 'Config/Routes.php';
-		}
-
-		// $routes is defined in Config/Routes.php
-		$this->router = Services::router($routes, $this->request);
-
-		$path = $this->determinePath();
-
-		$this->benchmark->stop('bootstrap');
-		$this->benchmark->start('routing');
-
-		ob_start();
-
-		$this->controller = $this->router->handle($path);
-		$this->method     = $this->router->methodName();
-
-		// If a {locale} segment was matched in the final route,
-		// then we need to set the correct locale on our Request.
-		if ($this->router->hasLocale())
-		{
-			$this->request->setLocale($this->router->getLocale()); // @phpstan-ignore-line
-		}
-
-		$this->benchmark->stop('routing');
-
-		return $this->router->getFilter();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the path to use for us to try to route to, based
-	 * on user input (setPath), or the CLI/IncomingRequest path.
-	 */
-	protected function determinePath()
-	{
-		if (! empty($this->path))
-		{
-			return $this->path;
-		}
-
-		return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows the request path to be set from outside the class,
-	 * instead of relying on CLIRequest or IncomingRequest for the path.
-	 *
-	 * This is primarily used by the Console.
-	 *
-	 * @param string $path
-	 *
-	 * @return $this
-	 */
-	public function setPath(string $path)
-	{
-		$this->path = $path;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Now that everything has been setup, this method attempts to run the
-	 * controller method and make the script go. If it's not able to, will
-	 * show the appropriate Page Not Found error.
-	 */
-	protected function startController()
-	{
-		$this->benchmark->start('controller');
-		$this->benchmark->start('controller_constructor');
-
-		// Is it routed to a Closure?
-		if (is_object($this->controller) && (get_class($this->controller) === 'Closure'))
-		{
-			$controller = $this->controller;
-			return $controller(...$this->router->params());
-		}
-
-		// No controller specified - we don't know what to do now.
-		if (empty($this->controller))
-		{
-			throw PageNotFoundException::forEmptyController();
-		}
-
-		// Try to autoload the class
-		if (! class_exists($this->controller, true) || $this->method[0] === '_')
-		{
-			throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Instantiates the controller class.
-	 *
-	 * @return mixed
-	 */
-	protected function createController()
-	{
-		$class = new $this->controller();
-		$class->initController($this->request, $this->response, Services::logger());
-
-		$this->benchmark->stop('controller_constructor');
-
-		return $class;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Runs the controller, allowing for _remap methods to function.
-	 *
-	 * @param mixed $class
-	 *
-	 * @return mixed
-	 */
-	protected function runController($class)
-	{
-		// If this is a console request then use the input segments as parameters
-		$params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params(); // @phpstan-ignore-line
-
-		if (method_exists($class, '_remap'))
-		{
-			$output = $class->_remap($this->method, ...$params);
-		}
-		else
-		{
-			$output = $class->{$this->method}(...$params);
-		}
-
-		$this->benchmark->stop('controller');
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays a 404 Page Not Found error. If set, will try to
-	 * call the 404Override controller/method that was set in routing config.
-	 *
-	 * @param PageNotFoundException $e
-	 */
-	protected function display404errors(PageNotFoundException $e)
-	{
-		// Is there a 404 Override available?
-		if ($override = $this->router->get404Override())
-		{
-			if ($override instanceof Closure)
-			{
-				echo $override($e->getMessage());
-			}
-			elseif (is_array($override))
-			{
-				$this->benchmark->start('controller');
-				$this->benchmark->start('controller_constructor');
-
-				$this->controller = $override[0];
-				$this->method     = $override[1];
-
-				$controller = $this->createController();
-				$this->runController($controller);
-			}
-
-			unset($override);
-
-			$cacheConfig = new Cache();
-			$this->gatherOutput($cacheConfig);
-			$this->sendResponse();
-
-			return;
-		}
-
-		// Display 404 Errors
-		$this->response->setStatusCode($e->getCode());
-
-		if (ENVIRONMENT !== 'testing')
-		{
-			// @codeCoverageIgnoreStart
-			if (ob_get_level() > 0)
-			{
-				ob_end_flush();
-			}
-			// @codeCoverageIgnoreEnd
-		}
-		// When testing, one is for phpunit, another is for test case.
-		elseif (ob_get_level() > 2)
-		{
-			ob_end_flush(); // @codeCoverageIgnore
-		}
-
-		throw PageNotFoundException::forPageNotFound(ENVIRONMENT !== 'production' || is_cli() ? $e->getMessage() : '');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gathers the script output from the buffer, replaces some execution
-	 * time tag in the output and displays the debug toolbar, if required.
-	 *
-	 * @param Cache|null $cacheConfig
-	 * @param mixed|null $returned
-	 */
-	protected function gatherOutput(Cache $cacheConfig = null, $returned = null)
-	{
-		$this->output = ob_get_contents();
-		// If buffering is not null.
-		// Clean (erase) the output buffer and turn off output buffering
-		if (ob_get_length())
-		{
-			ob_end_clean();
-		}
-
-		if ($returned instanceof DownloadResponse)
-		{
-			$this->response = $returned;
-			return;
-		}
-		// If the controller returned a response object,
-		// we need to grab the body from it so it can
-		// be added to anything else that might have been
-		// echoed already.
-		// We also need to save the instance locally
-		// so that any status code changes, etc, take place.
-		if ($returned instanceof ResponseInterface)
-		{
-			$this->response = $returned;
-			$returned       = $returned->getBody();
-		}
-
-		if (is_string($returned))
-		{
-			$this->output .= $returned;
-		}
-
-		// Cache it without the performance metrics replaced
-		// so that we can have live speed updates along the way.
-		if (static::$cacheTTL > 0)
-		{
-			$this->cachePage($cacheConfig);
-		}
-
-		$this->output = $this->displayPerformanceMetrics($this->output);
-
-		$this->response->setBody($this->output);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If we have a session object to use, store the current URI
-	 * as the previous URI. This is called just prior to sending the
-	 * response to the client, and will make it available next request.
-	 *
-	 * This helps provider safer, more reliable previous_url() detection.
-	 *
-	 * @param URI|string $uri
-	 */
-	public function storePreviousURL($uri)
-	{
-		// Ignore CLI requests
-		if (is_cli())
-		{
-			return;
-		}
-		// Ignore AJAX requests
-		if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX())
-		{
-			return;
-		}
-
-		// This is mainly needed during testing...
-		if (is_string($uri))
-		{
-			$uri = new URI($uri);
-		}
-
-		if (isset($_SESSION))
-		{
-			$_SESSION['_ci_previous_url'] = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Modifies the Request Object to use a different method if a POST
-	 * variable called _method is found.
-	 */
-	public function spoofRequestMethod()
-	{
-		// Only works with POSTED forms
-		if ($this->request->getMethod() !== 'post')
-		{
-			return;
-		}
-
-		$method = $this->request->getPost('_method'); // @phpstan-ignore-line
-
-		if (empty($method))
-		{
-			return;
-		}
-
-		$this->request = $this->request->setMethod($method);
-	}
-
-	/**
-	 * Sends the output of this request back to the client.
-	 * This is what they've been waiting for!
-	 */
-	protected function sendResponse()
-	{
-		$this->response->pretend($this->useSafeOutput)->send();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Exits the application, setting the exit code for CLI-based applications
-	 * that might be watching.
-	 *
-	 * Made into a separate method so that it can be mocked during testing
-	 * without actually stopping script execution.
-	 *
-	 * @param integer $code
-	 */
-	protected function callExit($code)
-	{
-		// @codeCoverageIgnoreStart
-		exit($code);
-		// @codeCoverageIgnoreEnd
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The current version of CodeIgniter Framework
+     */
+    public const CI_VERSION = '4.1.4';
+
+    private const MIN_PHP_VERSION = '7.3';
+
+    /**
+     * App startup time.
+     *
+     * @var mixed
+     */
+    protected $startTime;
+
+    /**
+     * Total app execution time
+     *
+     * @var float
+     */
+    protected $totalTime;
+
+    /**
+     * Main application configuration
+     *
+     * @var App
+     */
+    protected $config;
+
+    /**
+     * Timer instance.
+     *
+     * @var Timer
+     */
+    protected $benchmark;
+
+    /**
+     * Current request.
+     *
+     * @var CLIRequest|IncomingRequest|Request
+     */
+    protected $request;
+
+    /**
+     * Current response.
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Router to use.
+     *
+     * @var Router
+     */
+    protected $router;
+
+    /**
+     * Controller to use.
+     *
+     * @var Closure|string
+     */
+    protected $controller;
+
+    /**
+     * Controller method to invoke.
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * Output handler to use.
+     *
+     * @var string
+     */
+    protected $output;
+
+    /**
+     * Cache expiration time
+     *
+     * @var int
+     */
+    protected static $cacheTTL = 0;
+
+    /**
+     * Request path to use.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Should the Response instance "pretend"
+     * to keep from setting headers/cookies/etc
+     *
+     * @var bool
+     */
+    protected $useSafeOutput = false;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(App $config)
+    {
+        if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<')) {
+            // @codeCoverageIgnoreStart
+            $message = extension_loaded('intl')
+                ? lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION])
+                : sprintf('Your PHP version must be %s or higher to run CodeIgniter. Current version: %s', self::MIN_PHP_VERSION, PHP_VERSION);
+
+            exit($message);
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->startTime = microtime(true);
+        $this->config    = $config;
+    }
+
+    /**
+     * Handles some basic app and environment setup.
+     */
+    public function initialize()
+    {
+        // Define environment variables
+        $this->detectEnvironment();
+        $this->bootstrapEnvironment();
+
+        // Setup Exception Handling
+        Services::exceptions()->initialize();
+
+        // Run this check for manual installations
+        if (! is_file(COMPOSER_PATH)) {
+            $this->resolvePlatformExtensions(); // @codeCoverageIgnore
+        }
+
+        // Set default locale on the server
+        locale_set_default($this->config->defaultLocale ?? 'en');
+
+        // Set default timezone on the server
+        date_default_timezone_set($this->config->appTimezone ?? 'UTC');
+
+        $this->initializeKint();
+
+        if (! CI_DEBUG) {
+            Kint::$enabled_mode = false; // @codeCoverageIgnore
+        }
+    }
+
+    /**
+     * Checks system for missing required PHP extensions.
+     *
+     * @throws FrameworkException
+     *
+     * @codeCoverageIgnore
+     */
+    protected function resolvePlatformExtensions()
+    {
+        $requiredExtensions = [
+            'curl',
+            'intl',
+            'json',
+            'mbstring',
+            'xml',
+        ];
+
+        $missingExtensions = [];
+
+        foreach ($requiredExtensions as $extension) {
+            if (! extension_loaded($extension)) {
+                $missingExtensions[] = $extension;
+            }
+        }
+
+        if ($missingExtensions !== []) {
+            throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions));
+        }
+    }
+
+    /**
+     * Initializes Kint
+     */
+    protected function initializeKint()
+    {
+        // If we have KINT_DIR it means it's already loaded via composer
+        if (! defined('KINT_DIR')) {
+            spl_autoload_register(function ($class) {
+                $class = explode('\\', $class);
+
+                if (array_shift($class) !== 'Kint') {
+                    return;
+                }
+
+                $file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php';
+
+                if (file_exists($file)) {
+                    require_once $file;
+                }
+            });
+
+            require_once SYSTEMPATH . 'ThirdParty/Kint/init.php';
+        }
+
+        /**
+         * Config\Kint
+         */
+        $config = config('Config\Kint');
+
+        Kint::$max_depth           = $config->maxDepth;
+        Kint::$display_called_from = $config->displayCalledFrom;
+        Kint::$expanded            = $config->expanded;
+
+        if (! empty($config->plugins) && is_array($config->plugins)) {
+            Kint::$plugins = $config->plugins;
+        }
+
+        RichRenderer::$theme  = $config->richTheme;
+        RichRenderer::$folder = $config->richFolder;
+        RichRenderer::$sort   = $config->richSort;
+        if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins)) {
+            RichRenderer::$object_plugins = $config->richObjectPlugins;
+        }
+        if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins)) {
+            RichRenderer::$tab_plugins = $config->richTabPlugins;
+        }
+
+        CliRenderer::$cli_colors         = $config->cliColors;
+        CliRenderer::$force_utf8         = $config->cliForceUTF8;
+        CliRenderer::$detect_width       = $config->cliDetectWidth;
+        CliRenderer::$min_terminal_width = $config->cliMinWidth;
+    }
+
+    /**
+     * Launch the application!
+     *
+     * This is "the loop" if you will. The main entry point into the script
+     * that gets the required class instances, fires off the filters,
+     * tries to route the response, loads the controller and generally
+     * makes all of the pieces work together.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return bool|mixed|RequestInterface|ResponseInterface
+     */
+    public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
+    {
+        $this->startBenchmark();
+
+        $this->getRequestObject();
+        $this->getResponseObject();
+
+        $this->forceSecureAccess();
+
+        $this->spoofRequestMethod();
+
+        Events::trigger('pre_system');
+
+        // Check for a cached page. Execution will stop
+        // if the page has been cached.
+        $cacheConfig = new Cache();
+        $response    = $this->displayCache($cacheConfig);
+        if ($response instanceof ResponseInterface) {
+            if ($returnResponse) {
+                return $response;
+            }
+
+            $this->response->pretend($this->useSafeOutput)->send();
+            $this->callExit(EXIT_SUCCESS);
+
+            return;
+        }
+
+        try {
+            return $this->handleRequest($routes, $cacheConfig, $returnResponse);
+        } catch (RedirectException $e) {
+            $logger = Services::logger();
+            $logger->info('REDIRECTED ROUTE at ' . $e->getMessage());
+
+            // If the route is a 'redirect' route, it throws
+            // the exception with the $to as the message
+            $this->response->redirect(base_url($e->getMessage()), 'auto', $e->getCode());
+            $this->sendResponse();
+
+            $this->callExit(EXIT_SUCCESS);
+
+            return;
+        } catch (PageNotFoundException $e) {
+            $this->display404errors($e);
+        }
+    }
+
+    /**
+     * Set our Response instance to "pretend" mode so that things like
+     * cookies and headers are not actually sent, allowing PHP 7.2+ to
+     * not complain when ini_set() function is used.
+     *
+     * @return $this
+     */
+    public function useSafeOutput(bool $safe = true)
+    {
+        $this->useSafeOutput = $safe;
+
+        return $this;
+    }
+
+    /**
+     * Handles the main request logic and fires the controller.
+     *
+     * @throws RedirectException
+     *
+     * @return mixed|RequestInterface|ResponseInterface
+     */
+    protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false)
+    {
+        $routeFilter = $this->tryToRouteIt($routes);
+
+        // Run "before" filters
+        $filters = Services::filters();
+
+        // If any filters were specified within the routes file,
+        // we need to ensure it's active for the current request
+        if ($routeFilter !== null) {
+            $filters->enableFilter($routeFilter, 'before');
+            $filters->enableFilter($routeFilter, 'after');
+        }
+
+        $uri = $this->determinePath();
+
+        // Never run filters when running through Spark cli
+        if (! defined('SPARKED')) {
+            $possibleResponse = $filters->run($uri, 'before');
+
+            // If a ResponseInterface instance is returned then send it back to the client and stop
+            if ($possibleResponse instanceof ResponseInterface) {
+                return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();
+            }
+
+            if ($possibleResponse instanceof Request) {
+                $this->request = $possibleResponse;
+            }
+        }
+
+        $returned = $this->startController();
+
+        // Closure controller has run in startController().
+        if (! is_callable($this->controller)) {
+            $controller = $this->createController();
+
+            if (! method_exists($controller, '_remap') && ! is_callable([$controller, $this->method], false)) {
+                throw PageNotFoundException::forMethodNotFound($this->method);
+            }
+
+            // Is there a "post_controller_constructor" event?
+            Events::trigger('post_controller_constructor');
+
+            $returned = $this->runController($controller);
+        } else {
+            $this->benchmark->stop('controller_constructor');
+            $this->benchmark->stop('controller');
+        }
+
+        // If $returned is a string, then the controller output something,
+        // probably a view, instead of echoing it directly. Send it along
+        // so it can be used with the output.
+        $this->gatherOutput($cacheConfig, $returned);
+
+        // Never run filters when running through Spark cli
+        if (! defined('SPARKED')) {
+            $filters->setResponse($this->response);
+            // Run "after" filters
+            $response = $filters->run($uri, 'after');
+        } else {
+            $response = $this->response;
+
+            // Set response code for CLI command failures
+            if (is_numeric($returned) || $returned === false) {
+                $response->setStatusCode(400);
+            }
+        }
+
+        if ($response instanceof ResponseInterface) {
+            $this->response = $response;
+        }
+
+        // Save our current URI as the previous URI in the session
+        // for safer, more accurate use with `previous_url()` helper function.
+        $this->storePreviousURL(current_url(true));
+
+        unset($uri);
+
+        if (! $returnResponse) {
+            $this->sendResponse();
+        }
+
+        // Is there a post-system event?
+        Events::trigger('post_system');
+
+        return $this->response;
+    }
+
+    /**
+     * You can load different configurations depending on your
+     * current environment. Setting the environment also influences
+     * things like logging and error reporting.
+     *
+     * This can be set to anything, but default usage is:
+     *
+     *     development
+     *     testing
+     *     production
+     *
+     * @codeCoverageIgnore
+     */
+    protected function detectEnvironment()
+    {
+        // Make sure ENVIRONMENT isn't already set by other means.
+        if (! defined('ENVIRONMENT')) {
+            define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production');
+        }
+    }
+
+    /**
+     * Load any custom boot files based upon the current environment.
+     *
+     * If no boot file exists, we shouldn't continue because something
+     * is wrong. At the very least, they should have error reporting setup.
+     */
+    protected function bootstrapEnvironment()
+    {
+        if (is_file(APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php')) {
+            require_once APPPATH . 'Config/Boot/' . ENVIRONMENT . '.php';
+        } else {
+            // @codeCoverageIgnoreStart
+            header('HTTP/1.1 503 Service Unavailable.', true, 503);
+            echo 'The application environment is not set correctly.';
+
+            exit(EXIT_ERROR); // EXIT_ERROR
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    /**
+     * Start the Benchmark
+     *
+     * The timer is used to display total script execution both in the
+     * debug toolbar, and potentially on the displayed page.
+     */
+    protected function startBenchmark()
+    {
+        $this->startTime = microtime(true);
+
+        $this->benchmark = Services::timer();
+        $this->benchmark->start('total_execution', $this->startTime);
+        $this->benchmark->start('bootstrap');
+    }
+
+    /**
+     * Sets a Request object to be used for this request.
+     * Used when running certain tests.
+     *
+     * @return $this
+     */
+    public function setRequest(Request $request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Get our Request object, (either IncomingRequest or CLIRequest)
+     * and set the server protocol based on the information provided
+     * by the server.
+     */
+    protected function getRequestObject()
+    {
+        if ($this->request instanceof Request) {
+            return;
+        }
+
+        // @phpstan-ignore-next-line
+        if (is_cli() && ENVIRONMENT !== 'testing') {
+            // @codeCoverageIgnoreStart
+            $this->request = Services::clirequest($this->config);
+        // @codeCoverageIgnoreEnd
+        } else {
+            $this->request = Services::request($this->config);
+            // guess at protocol if needed
+            $this->request->setProtocolVersion($_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.1');
+        }
+    }
+
+    /**
+     * Get our Response object, and set some default values, including
+     * the HTTP protocol version and a default successful response.
+     */
+    protected function getResponseObject()
+    {
+        $this->response = Services::response($this->config);
+
+        if (! is_cli() || ENVIRONMENT === 'testing') {
+            $this->response->setProtocolVersion($this->request->getProtocolVersion());
+        }
+
+        // Assume success until proven otherwise.
+        $this->response->setStatusCode(200);
+    }
+
+    /**
+     * Force Secure Site Access? If the config value 'forceGlobalSecureRequests'
+     * is true, will enforce that all requests to this site are made through
+     * HTTPS. Will redirect the user to the current page with HTTPS, as well
+     * as set the HTTP Strict Transport Security header for those browsers
+     * that support it.
+     *
+     * @param int $duration How long the Strict Transport Security
+     *                      should be enforced for this URL.
+     */
+    protected function forceSecureAccess($duration = 31536000)
+    {
+        if ($this->config->forceGlobalSecureRequests !== true) {
+            return;
+        }
+
+        force_https($duration, $this->request, $this->response);
+    }
+
+    /**
+     * Determines if a response has been cached for the given URI.
+     *
+     * @throws Exception
+     *
+     * @return bool|ResponseInterface
+     */
+    public function displayCache(Cache $config)
+    {
+        if ($cachedResponse = cache()->get($this->generateCacheName($config))) {
+            $cachedResponse = unserialize($cachedResponse);
+            if (! is_array($cachedResponse) || ! isset($cachedResponse['output']) || ! isset($cachedResponse['headers'])) {
+                throw new Exception('Error unserializing page cache');
+            }
+
+            $headers = $cachedResponse['headers'];
+            $output  = $cachedResponse['output'];
+
+            // Clear all default headers
+            foreach (array_keys($this->response->headers()) as $key) {
+                $this->response->removeHeader($key);
+            }
+
+            // Set cached headers
+            foreach ($headers as $name => $value) {
+                $this->response->setHeader($name, $value);
+            }
+
+            $output = $this->displayPerformanceMetrics($output);
+            $this->response->setBody($output);
+
+            return $this->response;
+        }
+
+        return false;
+    }
+
+    /**
+     * Tells the app that the final output should be cached.
+     */
+    public static function cache(int $time)
+    {
+        static::$cacheTTL = $time;
+    }
+
+    /**
+     * Caches the full response from the current request. Used for
+     * full-page caching for very high performance.
+     *
+     * @return mixed
+     */
+    public function cachePage(Cache $config)
+    {
+        $headers = [];
+
+        foreach ($this->response->headers() as $header) {
+            $headers[$header->getName()] = $header->getValueLine();
+        }
+
+        return cache()->save($this->generateCacheName($config), serialize(['headers' => $headers, 'output' => $this->output]), static::$cacheTTL);
+    }
+
+    /**
+     * Returns an array with our basic performance stats collected.
+     */
+    public function getPerformanceStats(): array
+    {
+        return [
+            'startTime' => $this->startTime,
+            'totalTime' => $this->totalTime,
+        ];
+    }
+
+    /**
+     * Generates the cache name to use for our full-page caching.
+     */
+    protected function generateCacheName(Cache $config): string
+    {
+        if ($this->request instanceof CLIRequest) {
+            return md5($this->request->getPath());
+        }
+
+        $uri = $this->request->getUri();
+
+        if ($config->cacheQueryString) {
+            $name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery());
+        } else {
+            $name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
+        }
+
+        return md5($name);
+    }
+
+    /**
+     * Replaces the elapsed_time tag.
+     */
+    public function displayPerformanceMetrics(string $output): string
+    {
+        $this->totalTime = $this->benchmark->getElapsedTime('total_execution');
+
+        return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
+    }
+
+    /**
+     * Try to Route It - As it sounds like, works with the router to
+     * match a route against the current URI. If the route is a
+     * "redirect route", will also handle the redirect.
+     *
+     * @param RouteCollectionInterface|null $routes An collection interface to use in place
+     *                                              of the config file.
+     *
+     * @throws RedirectException
+     *
+     * @return string|null
+     */
+    protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
+    {
+        if ($routes === null) {
+            require APPPATH . 'Config/Routes.php';
+        }
+
+        // $routes is defined in Config/Routes.php
+        $this->router = Services::router($routes, $this->request);
+
+        $path = $this->determinePath();
+
+        $this->benchmark->stop('bootstrap');
+        $this->benchmark->start('routing');
+
+        ob_start();
+
+        $this->controller = $this->router->handle($path);
+        $this->method     = $this->router->methodName();
+
+        // If a {locale} segment was matched in the final route,
+        // then we need to set the correct locale on our Request.
+        if ($this->router->hasLocale()) {
+            $this->request->setLocale($this->router->getLocale()); // @phpstan-ignore-line
+        }
+
+        $this->benchmark->stop('routing');
+
+        return $this->router->getFilter();
+    }
+
+    /**
+     * Determines the path to use for us to try to route to, based
+     * on user input (setPath), or the CLI/IncomingRequest path.
+     */
+    protected function determinePath()
+    {
+        if (! empty($this->path)) {
+            return $this->path;
+        }
+
+        return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
+    }
+
+    /**
+     * Allows the request path to be set from outside the class,
+     * instead of relying on CLIRequest or IncomingRequest for the path.
+     *
+     * This is primarily used by the Console.
+     *
+     * @return $this
+     */
+    public function setPath(string $path)
+    {
+        $this->path = $path;
+
+        return $this;
+    }
+
+    /**
+     * Now that everything has been setup, this method attempts to run the
+     * controller method and make the script go. If it's not able to, will
+     * show the appropriate Page Not Found error.
+     */
+    protected function startController()
+    {
+        $this->benchmark->start('controller');
+        $this->benchmark->start('controller_constructor');
+
+        // Is it routed to a Closure?
+        if (is_object($this->controller) && (get_class($this->controller) === 'Closure')) {
+            $controller = $this->controller;
+
+            return $controller(...$this->router->params());
+        }
+
+        // No controller specified - we don't know what to do now.
+        if (empty($this->controller)) {
+            throw PageNotFoundException::forEmptyController();
+        }
+
+        // Try to autoload the class
+        if (! class_exists($this->controller, true) || $this->method[0] === '_') {
+            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        }
+    }
+
+    /**
+     * Instantiates the controller class.
+     *
+     * @return mixed
+     */
+    protected function createController()
+    {
+        $class = new $this->controller();
+        $class->initController($this->request, $this->response, Services::logger());
+
+        $this->benchmark->stop('controller_constructor');
+
+        return $class;
+    }
+
+    /**
+     * Runs the controller, allowing for _remap methods to function.
+     *
+     * @param mixed $class
+     *
+     * @return mixed
+     */
+    protected function runController($class)
+    {
+        // If this is a console request then use the input segments as parameters
+        $params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params(); // @phpstan-ignore-line
+
+        if (method_exists($class, '_remap')) {
+            $output = $class->_remap($this->method, ...$params);
+        } else {
+            $output = $class->{$this->method}(...$params);
+        }
+
+        $this->benchmark->stop('controller');
+
+        return $output;
+    }
+
+    /**
+     * Displays a 404 Page Not Found error. If set, will try to
+     * call the 404Override controller/method that was set in routing config.
+     */
+    protected function display404errors(PageNotFoundException $e)
+    {
+        // Is there a 404 Override available?
+        if ($override = $this->router->get404Override()) {
+            if ($override instanceof Closure) {
+                echo $override($e->getMessage());
+            } elseif (is_array($override)) {
+                $this->benchmark->start('controller');
+                $this->benchmark->start('controller_constructor');
+
+                $this->controller = $override[0];
+                $this->method     = $override[1];
+
+                $controller = $this->createController();
+                $this->runController($controller);
+            }
+
+            unset($override);
+
+            $cacheConfig = new Cache();
+            $this->gatherOutput($cacheConfig);
+            $this->sendResponse();
+
+            return;
+        }
+
+        // Display 404 Errors
+        $this->response->setStatusCode($e->getCode());
+
+        if (ENVIRONMENT !== 'testing') {
+            // @codeCoverageIgnoreStart
+            if (ob_get_level() > 0) {
+                ob_end_flush();
+            }
+            // @codeCoverageIgnoreEnd
+        }
+        // When testing, one is for phpunit, another is for test case.
+        elseif (ob_get_level() > 2) {
+            ob_end_flush(); // @codeCoverageIgnore
+        }
+
+        throw PageNotFoundException::forPageNotFound(ENVIRONMENT !== 'production' || is_cli() ? $e->getMessage() : '');
+    }
+
+    /**
+     * Gathers the script output from the buffer, replaces some execution
+     * time tag in the output and displays the debug toolbar, if required.
+     *
+     * @param mixed|null $returned
+     */
+    protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
+    {
+        $this->output = ob_get_contents();
+        // If buffering is not null.
+        // Clean (erase) the output buffer and turn off output buffering
+        if (ob_get_length()) {
+            ob_end_clean();
+        }
+
+        if ($returned instanceof DownloadResponse) {
+            $this->response = $returned;
+
+            return;
+        }
+        // If the controller returned a response object,
+        // we need to grab the body from it so it can
+        // be added to anything else that might have been
+        // echoed already.
+        // We also need to save the instance locally
+        // so that any status code changes, etc, take place.
+        if ($returned instanceof ResponseInterface) {
+            $this->response = $returned;
+            $returned       = $returned->getBody();
+        }
+
+        if (is_string($returned)) {
+            $this->output .= $returned;
+        }
+
+        // Cache it without the performance metrics replaced
+        // so that we can have live speed updates along the way.
+        if (static::$cacheTTL > 0) {
+            $this->cachePage($cacheConfig);
+        }
+
+        $this->output = $this->displayPerformanceMetrics($this->output);
+
+        $this->response->setBody($this->output);
+    }
+
+    /**
+     * If we have a session object to use, store the current URI
+     * as the previous URI. This is called just prior to sending the
+     * response to the client, and will make it available next request.
+     *
+     * This helps provider safer, more reliable previous_url() detection.
+     *
+     * @param string|URI $uri
+     */
+    public function storePreviousURL($uri)
+    {
+        // Ignore CLI requests
+        if (is_cli()) {
+            return;
+        }
+        // Ignore AJAX requests
+        if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX()) {
+            return;
+        }
+
+        // This is mainly needed during testing...
+        if (is_string($uri)) {
+            $uri = new URI($uri);
+        }
+
+        if (isset($_SESSION)) {
+            $_SESSION['_ci_previous_url'] = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+        }
+    }
+
+    /**
+     * Modifies the Request Object to use a different method if a POST
+     * variable called _method is found.
+     */
+    public function spoofRequestMethod()
+    {
+        // Only works with POSTED forms
+        if ($this->request->getMethod() !== 'post') {
+            return;
+        }
+
+        $method = $this->request->getPost('_method'); // @phpstan-ignore-line
+
+        if (empty($method)) {
+            return;
+        }
+
+        $this->request = $this->request->setMethod($method);
+    }
+
+    /**
+     * Sends the output of this request back to the client.
+     * This is what they've been waiting for!
+     */
+    protected function sendResponse()
+    {
+        $this->response->pretend($this->useSafeOutput)->send();
+    }
+
+    /**
+     * Exits the application, setting the exit code for CLI-based applications
+     * that might be watching.
+     *
+     * Made into a separate method so that it can be mocked during testing
+     * without actually stopping script execution.
+     *
+     * @param int $code
+     */
+    protected function callExit($code)
+    {
+        exit($code); // @codeCoverageIgnore
+    }
 }
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
index 6a8c6b4629d5..bb98177a0c0d 100644
--- a/system/Commands/Cache/ClearCache.php
+++ b/system/Commands/Cache/ClearCache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Cache;
@@ -20,72 +20,68 @@
  */
 class ClearCache extends BaseCommand
 {
-	/**
-	 * Command grouping.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Cache';
+    /**
+     * Command grouping.
+     *
+     * @var string
+     */
+    protected $group = 'Cache';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'cache:clear';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'cache:clear';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Clears the current system caches.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Clears the current system caches.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'cache:clear [driver]';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'cache:clear [driver]';
 
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'driver' => 'The cache driver to use',
-	];
+    /**
+     * the Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'driver' => 'The cache driver to use',
+    ];
 
-	/**
-	 * Clears the cache
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$config  = config('Cache');
-		$handler = $params[0] ?? $config->handler;
+    /**
+     * Clears the cache
+     */
+    public function run(array $params)
+    {
+        $config  = config('Cache');
+        $handler = $params[0] ?? $config->handler;
 
-		if (! array_key_exists($handler, $config->validHandlers))
-		{
-			CLI::error($handler . ' is not a valid cache handler.');
+        if (! array_key_exists($handler, $config->validHandlers)) {
+            CLI::error($handler . ' is not a valid cache handler.');
 
-			return;
-		}
+            return;
+        }
 
-		$config->handler = $handler;
-		$cache           = CacheFactory::getHandler($config);
+        $config->handler = $handler;
+        $cache           = CacheFactory::getHandler($config);
 
-		if (! $cache->clean())
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error('Error while clearing the cache.');
+        if (! $cache->clean()) {
+            // @codeCoverageIgnoreStart
+            CLI::error('Error while clearing the cache.');
 
-			return;
-			// @codeCoverageIgnoreEnd
-		}
+            return;
+            // @codeCoverageIgnoreEnd
+        }
 
-		CLI::write(CLI::color('Cache cleared.', 'green'));
-	}
+        CLI::write(CLI::color('Cache cleared.', 'green'));
+    }
 }
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
index c86385fd758e..db5a51d76f91 100644
--- a/system/Commands/Cache/InfoCache.php
+++ b/system/Commands/Cache/InfoCache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Cache;
@@ -21,72 +21,68 @@
  */
 class InfoCache extends BaseCommand
 {
-	/**
-	 * Command grouping.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Cache';
+    /**
+     * Command grouping.
+     *
+     * @var string
+     */
+    protected $group = 'Cache';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'cache:info';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'cache:info';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Shows file cache information in the current system.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Shows file cache information in the current system.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'cache:info';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'cache:info';
 
-	/**
-	 * Clears the cache
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$config = config('Cache');
-		helper('number');
+    /**
+     * Clears the cache
+     */
+    public function run(array $params)
+    {
+        $config = config('Cache');
+        helper('number');
 
-		if ($config->handler !== 'file')
-		{
-			CLI::error('This command only supports the file cache handler.');
+        if ($config->handler !== 'file') {
+            CLI::error('This command only supports the file cache handler.');
 
-			return;
-		}
+            return;
+        }
 
-		$cache  = CacheFactory::getHandler($config);
-		$caches = $cache->getCacheInfo();
-		$tbody  = [];
+        $cache  = CacheFactory::getHandler($config);
+        $caches = $cache->getCacheInfo();
+        $tbody  = [];
 
-		foreach ($caches as $key => $field)
-		{
-			$tbody[] = [
-				$key,
-				clean_path($field['server_path']),
-				number_to_size($field['size']),
-				Time::createFromTimestamp($field['date']),
-			];
-		}
+        foreach ($caches as $key => $field) {
+            $tbody[] = [
+                $key,
+                clean_path($field['server_path']),
+                number_to_size($field['size']),
+                Time::createFromTimestamp($field['date']),
+            ];
+        }
 
-		$thead = [
-			CLI::color('Name', 'green'),
-			CLI::color('Server Path', 'green'),
-			CLI::color('Size', 'green'),
-			CLI::color('Date', 'green'),
-		];
+        $thead = [
+            CLI::color('Name', 'green'),
+            CLI::color('Server Path', 'green'),
+            CLI::color('Size', 'green'),
+            CLI::color('Date', 'green'),
+        ];
 
-		CLI::table($tbody, $thead);
-	}
+        CLI::table($tbody, $thead);
+    }
 }
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index d6eaef1cbfec..17e1e51bb68b 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -23,148 +23,133 @@
  */
 class CreateDatabase extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'db:create';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Create a new database schema.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'db:create <db_name> [options]';
-
-	/**
-	 * The Command's arguments
-	 *
-	 * @var array<string, string>
-	 */
-	protected $arguments = [
-		'db_name' => 'The database name to use',
-	];
-
-	/**
-	 * The Command's options
-	 *
-	 * @var array<string, string>
-	 */
-	protected $options = [
-		'--ext' => 'File extension of the database file for SQLite3. Can be `db` or `sqlite`. Defaults to `db`.',
-	];
-
-	/**
-	 * Creates a new database.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$name = array_shift($params);
-
-		if (empty($name))
-		{
-			$name = CLI::prompt('Database name', null, 'required'); // @codeCoverageIgnore
-		}
-
-		try
-		{
-			/**
-			 * @var Database $config
-			 */
-			$config = config('Database');
-
-			// Set to an empty database to prevent connection errors.
-			$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
-			$config->{$group}['database'] = '';
-
-			$db = Database::connect();
-
-			// Special SQLite3 handling
-			if ($db instanceof Connection)
-			{
-				$ext = $params['ext'] ?? CLI::getOption('ext') ?? 'db';
-
-				if (! in_array($ext, ['db', 'sqlite'], true))
-				{
-					$ext = CLI::prompt('Please choose a valid file extension', ['db', 'sqlite']); // @codeCoverageIgnore
-				}
-
-				if ($name !== ':memory:')
-				{
-					$name = str_replace(['.db', '.sqlite'], '', $name) . ".{$ext}";
-				}
-
-				$config->{$group}['DBDriver'] = 'SQLite3';
-				$config->{$group}['database'] = $name;
-
-				if ($name !== ':memory:')
-				{
-					$dbName = strpos($name, DIRECTORY_SEPARATOR) === false ? WRITEPATH . $name : $name;
-
-					if (is_file($dbName))
-					{
-						CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');
-						CLI::newLine();
-
-						return;
-					}
-
-					unset($dbName);
-				}
-
-				// Connect to new SQLite3 to create new database
-				$db = Database::connect(null, false);
-				$db->connect();
-
-				if (! is_file($db->getDatabase()) && $name !== ':memory:')
-				{
-					// @codeCoverageIgnoreStart
-					CLI::error('Database creation failed.', 'light_gray', 'red');
-					CLI::newLine();
-					return;
-					// @codeCoverageIgnoreEnd
-				}
-			}
-			elseif (! Database::forge()->createDatabase($name))
-			{
-				// @codeCoverageIgnoreStart
-				CLI::error('Database creation failed.', 'light_gray', 'red');
-				CLI::newLine();
-				return;
-				// @codeCoverageIgnoreEnd
-			}
-
-			CLI::write("Database \"{$name}\" successfully created.", 'green');
-			CLI::newLine();
-		}
-		catch (Throwable $e)
-		{
-			$this->showError($e);
-		}
-		finally
-		{
-			// Reset the altered config no matter what happens.
-			Factories::reset('config');
-		}
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'db:create';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Create a new database schema.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'db:create <db_name> [options]';
+
+    /**
+     * The Command's arguments
+     *
+     * @var array<string, string>
+     */
+    protected $arguments = [
+        'db_name' => 'The database name to use',
+    ];
+
+    /**
+     * The Command's options
+     *
+     * @var array<string, string>
+     */
+    protected $options = [
+        '--ext' => 'File extension of the database file for SQLite3. Can be `db` or `sqlite`. Defaults to `db`.',
+    ];
+
+    /**
+     * Creates a new database.
+     */
+    public function run(array $params)
+    {
+        $name = array_shift($params);
+
+        if (empty($name)) {
+            $name = CLI::prompt('Database name', null, 'required'); // @codeCoverageIgnore
+        }
+
+        try {
+            /**
+             * @var Database $config
+             */
+            $config = config('Database');
+
+            // Set to an empty database to prevent connection errors.
+            $group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+
+            $config->{$group}['database'] = '';
+
+            $db = Database::connect();
+
+            // Special SQLite3 handling
+            if ($db instanceof Connection) {
+                $ext = $params['ext'] ?? CLI::getOption('ext') ?? 'db';
+
+                if (! in_array($ext, ['db', 'sqlite'], true)) {
+                    $ext = CLI::prompt('Please choose a valid file extension', ['db', 'sqlite']); // @codeCoverageIgnore
+                }
+
+                if ($name !== ':memory:') {
+                    $name = str_replace(['.db', '.sqlite'], '', $name) . ".{$ext}";
+                }
+
+                $config->{$group}['DBDriver'] = 'SQLite3';
+                $config->{$group}['database'] = $name;
+
+                if ($name !== ':memory:') {
+                    $dbName = strpos($name, DIRECTORY_SEPARATOR) === false ? WRITEPATH . $name : $name;
+
+                    if (is_file($dbName)) {
+                        CLI::error("Database \"{$dbName}\" already exists.", 'light_gray', 'red');
+                        CLI::newLine();
+
+                        return;
+                    }
+
+                    unset($dbName);
+                }
+
+                // Connect to new SQLite3 to create new database
+                $db = Database::connect(null, false);
+                $db->connect();
+
+                if (! is_file($db->getDatabase()) && $name !== ':memory:') {
+                    // @codeCoverageIgnoreStart
+                    CLI::error('Database creation failed.', 'light_gray', 'red');
+                    CLI::newLine();
+
+                    return;
+                    // @codeCoverageIgnoreEnd
+                }
+            } elseif (! Database::forge()->createDatabase($name)) {
+                // @codeCoverageIgnoreStart
+                CLI::error('Database creation failed.', 'light_gray', 'red');
+                CLI::newLine();
+
+                return;
+                // @codeCoverageIgnoreEnd
+            }
+
+            CLI::write("Database \"{$name}\" successfully created.", 'green');
+            CLI::newLine();
+        } catch (Throwable $e) {
+            $this->showError($e);
+        } finally {
+            // Reset the altered config no matter what happens.
+            Factories::reset('config');
+        }
+    }
 }
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index 9a716f31e756..91a699b346d6 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -21,95 +21,82 @@
  */
 class Migrate extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'migrate';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Locates and runs all new migrations against the database.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate [options]';
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-n'    => 'Set migration namespace',
-		'-g'    => 'Set database group',
-		'--all' => 'Set for all namespaces, will ignore (-n) option',
-	];
-
-	/**
-	 * Ensures that all migrations have been run.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$runner = Services::migrations();
-		$runner->clearCliMessages();
-
-		CLI::write(lang('Migrations.latest'), 'yellow');
-
-		$namespace = $params['n'] ?? CLI::getOption('n');
-		$group     = $params['g'] ?? CLI::getOption('g');
-
-		try
-		{
-			// Check for 'all' namespaces
-			if (array_key_exists('all', $params) || CLI::getOption('all'))
-			{
-				$runner->setNamespace(null);
-			}
-			// Check for a specified namespace
-			elseif ($namespace)
-			{
-				$runner->setNamespace($namespace);
-			}
-
-			if (! $runner->latest($group))
-			{
-				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
-			}
-
-			$messages = $runner->getCliMessages();
-
-			foreach ($messages as $message)
-			{
-				CLI::write($message);
-			}
-
-			CLI::write('Done migrations.', 'green');
-		}
-		// @codeCoverageIgnoreStart
-		catch (Throwable $e)
-		{
-			$this->showError($e);
-		}
-		// @codeCoverageIgnoreEnd
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'migrate';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Locates and runs all new migrations against the database.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'migrate [options]';
+
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '-n'    => 'Set migration namespace',
+        '-g'    => 'Set database group',
+        '--all' => 'Set for all namespaces, will ignore (-n) option',
+    ];
+
+    /**
+     * Ensures that all migrations have been run.
+     */
+    public function run(array $params)
+    {
+        $runner = Services::migrations();
+        $runner->clearCliMessages();
+
+        CLI::write(lang('Migrations.latest'), 'yellow');
+
+        $namespace = $params['n'] ?? CLI::getOption('n');
+        $group     = $params['g'] ?? CLI::getOption('g');
+
+        try {
+            if (array_key_exists('all', $params) || CLI::getOption('all')) {
+                $runner->setNamespace(null);
+            } elseif ($namespace) {
+                $runner->setNamespace($namespace);
+            }
+
+            if (! $runner->latest($group)) {
+                CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
+            }
+
+            $messages = $runner->getCliMessages();
+
+            foreach ($messages as $message) {
+                CLI::write($message);
+            }
+
+            CLI::write('Done migrations.', 'green');
+
+            // @codeCoverageIgnoreStart
+        } catch (Throwable $e) {
+            $this->showError($e);
+            // @codeCoverageIgnoreEnd
+        }
+    }
 }
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index fd7ba46c23fa..689c75424f80 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -20,74 +20,68 @@
  */
 class MigrateRefresh extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'migrate:refresh';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'migrate:refresh';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Does a rollback followed by a latest to refresh the current state of the database.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Does a rollback followed by a latest to refresh the current state of the database.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate:refresh [options]';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'migrate:refresh [options]';
 
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-n'    => 'Set migration namespace',
-		'-g'    => 'Set database group',
-		'--all' => 'Set latest for all namespace, will ignore (-n) option',
-		'-f'    => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
-	];
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '-n'    => 'Set migration namespace',
+        '-g'    => 'Set database group',
+        '--all' => 'Set latest for all namespace, will ignore (-n) option',
+        '-f'    => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
+    ];
 
-	/**
-	 * Does a rollback followed by a latest to refresh the current state
-	 * of the database.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$params['b'] = 0;
+    /**
+     * Does a rollback followed by a latest to refresh the current state
+     * of the database.
+     */
+    public function run(array $params)
+    {
+        $params['b'] = 0;
 
-		if (ENVIRONMENT === 'production')
-		{
-			// @codeCoverageIgnoreStart
-			$force = array_key_exists('f', $params) || CLI::getOption('f');
+        if (ENVIRONMENT === 'production') {
+            // @codeCoverageIgnoreStart
+            $force = array_key_exists('f', $params) || CLI::getOption('f');
 
-			if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n')
-			{
-				return;
-			}
+            if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n') {
+                return;
+            }
 
-			$params['f'] = null;
-			// @codeCoverageIgnoreEnd
-		}
+            $params['f'] = null;
+            // @codeCoverageIgnoreEnd
+        }
 
-		$this->call('migrate:rollback', $params);
-		$this->call('migrate', $params);
-	}
+        $this->call('migrate:rollback', $params);
+        $this->call('migrate', $params);
+    }
 }
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index 284504c9ab6b..17434da4b56d 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -22,100 +22,89 @@
  */
 class MigrateRollback extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'migrate:rollback';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Runs the "down" method for all migrations in the last batch.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate:rollback [options]';
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3 or "-2" to roll back twice',
-		'-g' => 'Set database group',
-		'-f' => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
-	];
-
-	/**
-	 * Runs all of the migrations in reverse order, until they have
-	 * all been unapplied.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		if (ENVIRONMENT === 'production')
-		{
-			// @codeCoverageIgnoreStart
-			$force = array_key_exists('f', $params) || CLI::getOption('f');
-
-			if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n')
-			{
-				return;
-			}
-			// @codeCoverageIgnoreEnd
-		}
-
-		$runner = Services::migrations();
-		$group  = $params['g'] ?? CLI::getOption('g');
-
-		if (is_string($group))
-		{
-			$runner->setGroup($group);
-		}
-
-		try
-		{
-			$batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
-			CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
-
-			if (! $runner->regress($batch))
-			{
-				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
-			}
-
-			$messages = $runner->getCliMessages();
-
-			foreach ($messages as $message)
-			{
-				CLI::write($message);
-			}
-
-			CLI::write('Done rolling back migrations.', 'green');
-		}
-		// @codeCoverageIgnoreStart
-		catch (Throwable $e)
-		{
-			$this->showError($e);
-		}
-		// @codeCoverageIgnoreEnd
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'migrate:rollback';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Runs the "down" method for all migrations in the last batch.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'migrate:rollback [options]';
+
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '-b' => 'Specify a batch to roll back to; e.g. "3" to return to batch #3 or "-2" to roll back twice',
+        '-g' => 'Set database group',
+        '-f' => 'Force command - this option allows you to bypass the confirmation question when running this command in a production environment',
+    ];
+
+    /**
+     * Runs all of the migrations in reverse order, until they have
+     * all been unapplied.
+     */
+    public function run(array $params)
+    {
+        if (ENVIRONMENT === 'production') {
+            // @codeCoverageIgnoreStart
+            $force = array_key_exists('f', $params) || CLI::getOption('f');
+
+            if (! $force && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n') {
+                return;
+            }
+            // @codeCoverageIgnoreEnd
+        }
+
+        $runner = Services::migrations();
+        $group  = $params['g'] ?? CLI::getOption('g');
+
+        if (is_string($group)) {
+            $runner->setGroup($group);
+        }
+
+        try {
+            $batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
+            CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
+
+            if (! $runner->regress($batch)) {
+                CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
+            }
+
+            $messages = $runner->getCliMessages();
+
+            foreach ($messages as $message) {
+                CLI::write($message);
+            }
+
+            CLI::write('Done rolling back migrations.', 'green');
+
+            // @codeCoverageIgnoreStart
+        } catch (Throwable $e) {
+            $this->showError($e);
+            // @codeCoverageIgnoreEnd
+        }
+    }
 }
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index e660d023a90f..91b52950b2b4 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -20,156 +20,145 @@
  */
 class MigrateStatus extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'migrate:status';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Displays a list of all migrations and whether they\'ve been run or not.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate:status [options]';
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array<string, string>
-	 */
-	protected $options = [
-		'-g' => 'Set database group',
-	];
-
-	/**
-	 * Namespaces to ignore when looking for migrations.
-	 *
-	 * @var string[]
-	 */
-	protected $ignoredNamespaces = [
-		'CodeIgniter',
-		'Config',
-		'Kint',
-		'Laminas\ZendFrameworkBridge',
-		'Laminas\Escaper',
-		'Psr\Log',
-	];
-
-	/**
-	 * Displays a list of all migrations and whether they've been run or not.
-	 *
-	 * @param array<string, mixed> $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$runner = Services::migrations();
-		$group  = $params['g'] ?? CLI::getOption('g');
-
-		// Get all namespaces
-		$namespaces = Services::autoloader()->getNamespace();
-
-		// Collection of migration status
-		$status = [];
-
-		foreach (array_keys($namespaces) as $namespace)
-		{
-			if (ENVIRONMENT !== 'testing')
-			{
-				// Make Tests\\Support discoverable for testing
-				$this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
-			}
-
-			if (in_array($namespace, $this->ignoredNamespaces, true))
-			{
-				continue;
-			}
-
-			if (APP_NAMESPACE !== 'App' && $namespace === 'App')
-			{
-				continue; // @codeCoverageIgnore
-			}
-
-			$migrations = $runner->findNamespaceMigrations($namespace);
-
-			if (empty($migrations))
-			{
-				continue;
-			}
-
-			$history = $runner->getHistory((string) $group);
-			ksort($migrations);
-
-			foreach ($migrations as $uid => $migration)
-			{
-				$migrations[$uid]->name = mb_substr($migration->name, mb_strpos($migration->name, $uid . '_'));
-
-				$date  = '---';
-				$group = '---';
-				$batch = '---';
-
-				foreach ($history as $row)
-				{
-					// @codeCoverageIgnoreStart
-					if ($runner->getObjectUid($row) !== $migration->uid)
-					{
-						continue;
-					}
-
-					$date  = date('Y-m-d H:i:s', $row->time);
-					$group = $row->group;
-					$batch = $row->batch;
-					// @codeCoverageIgnoreEnd
-				}
-
-				$status[] = [
-					$namespace,
-					$migration->version,
-					$migration->name,
-					$group,
-					$date,
-					$batch,
-				];
-			}
-		}
-
-		if (! $status)
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		$headers = [
-			CLI::color(lang('Migrations.namespace'), 'yellow'),
-			CLI::color(lang('Migrations.version'), 'yellow'),
-			CLI::color(lang('Migrations.filename'), 'yellow'),
-			CLI::color(lang('Migrations.group'), 'yellow'),
-			CLI::color(str_replace(': ', '', lang('Migrations.on')), 'yellow'),
-			CLI::color(lang('Migrations.batch'), 'yellow'),
-		];
-
-		CLI::table($status, $headers);
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'migrate:status';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Displays a list of all migrations and whether they\'ve been run or not.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'migrate:status [options]';
+
+    /**
+     * the Command's Options
+     *
+     * @var array<string, string>
+     */
+    protected $options = [
+        '-g' => 'Set database group',
+    ];
+
+    /**
+     * Namespaces to ignore when looking for migrations.
+     *
+     * @var string[]
+     */
+    protected $ignoredNamespaces = [
+        'CodeIgniter',
+        'Config',
+        'Kint',
+        'Laminas\ZendFrameworkBridge',
+        'Laminas\Escaper',
+        'Psr\Log',
+    ];
+
+    /**
+     * Displays a list of all migrations and whether they've been run or not.
+     *
+     * @param array<string, mixed> $params
+     */
+    public function run(array $params)
+    {
+        $runner = Services::migrations();
+        $group  = $params['g'] ?? CLI::getOption('g');
+
+        // Get all namespaces
+        $namespaces = Services::autoloader()->getNamespace();
+
+        // Collection of migration status
+        $status = [];
+
+        foreach (array_keys($namespaces) as $namespace) {
+            if (ENVIRONMENT !== 'testing') {
+                // Make Tests\\Support discoverable for testing
+                $this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
+            }
+
+            if (in_array($namespace, $this->ignoredNamespaces, true)) {
+                continue;
+            }
+
+            if (APP_NAMESPACE !== 'App' && $namespace === 'App') {
+                continue; // @codeCoverageIgnore
+            }
+
+            $migrations = $runner->findNamespaceMigrations($namespace);
+
+            if (empty($migrations)) {
+                continue;
+            }
+
+            $history = $runner->getHistory((string) $group);
+            ksort($migrations);
+
+            foreach ($migrations as $uid => $migration) {
+                $migrations[$uid]->name = mb_substr($migration->name, mb_strpos($migration->name, $uid . '_'));
+
+                $date  = '---';
+                $group = '---';
+                $batch = '---';
+
+                foreach ($history as $row) {
+                    // @codeCoverageIgnoreStart
+                    if ($runner->getObjectUid($row) !== $migration->uid) {
+                        continue;
+                    }
+
+                    $date  = date('Y-m-d H:i:s', $row->time);
+                    $group = $row->group;
+                    $batch = $row->batch;
+                    // @codeCoverageIgnoreEnd
+                }
+
+                $status[] = [
+                    $namespace,
+                    $migration->version,
+                    $migration->name,
+                    $group,
+                    $date,
+                    $batch,
+                ];
+            }
+        }
+
+        if (! $status) {
+            // @codeCoverageIgnoreStart
+            CLI::error(lang('Migrations.noneFound'), 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        $headers = [
+            CLI::color(lang('Migrations.namespace'), 'yellow'),
+            CLI::color(lang('Migrations.version'), 'yellow'),
+            CLI::color(lang('Migrations.filename'), 'yellow'),
+            CLI::color(lang('Migrations.group'), 'yellow'),
+            CLI::color(str_replace(': ', '', lang('Migrations.on')), 'yellow'),
+            CLI::color(lang('Migrations.batch'), 'yellow'),
+        ];
+
+        CLI::table($status, $headers);
+    }
 }
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
index dcc41ab5a2f7..adfdd0a5f701 100644
--- a/system/Commands/Database/Seed.php
+++ b/system/Commands/Database/Seed.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -23,68 +23,60 @@
  */
 class Seed extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Database';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'db:seed';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'db:seed';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Runs the specified seeder to populate known data into the database.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Runs the specified seeder to populate known data into the database.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'db:seed <seeder_name>';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'db:seed <seeder_name>';
 
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array<string, string>
-	 */
-	protected $arguments = [
-		'seeder_name' => 'The seeder name to run',
-	];
+    /**
+     * the Command's Arguments
+     *
+     * @var array<string, string>
+     */
+    protected $arguments = [
+        'seeder_name' => 'The seeder name to run',
+    ];
 
-	/**
-	 * Passes to Seeder to populate the database.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$seeder   = new Seeder(new Database());
-		$seedName = array_shift($params);
+    /**
+     * Passes to Seeder to populate the database.
+     */
+    public function run(array $params)
+    {
+        $seeder   = new Seeder(new Database());
+        $seedName = array_shift($params);
 
-		if (empty($seedName))
-		{
-			$seedName = CLI::prompt(lang('Migrations.migSeeder'), null, 'required'); // @codeCoverageIgnore
-		}
+        if (empty($seedName)) {
+            $seedName = CLI::prompt(lang('Migrations.migSeeder'), null, 'required'); // @codeCoverageIgnore
+        }
 
-		try
-		{
-			$seeder->call($seedName);
-		}
-		catch (Throwable $e)
-		{
-			$this->showError($e);
-		}
-	}
+        try {
+            $seeder->call($seedName);
+        } catch (Throwable $e) {
+            $this->showError($e);
+        }
+    }
 }
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 57b1756aa32f..c43713efe893 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Encryption;
@@ -21,205 +21,168 @@
  */
 class GenerateKey extends BaseCommand
 {
-	/**
-	 * The Command's group.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Encryption';
-
-	/**
-	 * The Command's name.
-	 *
-	 * @var string
-	 */
-	protected $name = 'key:generate';
-
-	/**
-	 * The Command's usage.
-	 *
-	 * @var string
-	 */
-	protected $usage = 'key:generate [options]';
-
-	/**
-	 * The Command's short description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new encryption key and writes it in an `.env` file.';
-
-	/**
-	 * The command's options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--force'  => 'Force overwrite existing key in `.env` file.',
-		'--length' => 'The length of the random string that should be returned in bytes. Defaults to 32.',
-		'--prefix' => 'Prefix to prepend to encoded key (either hex2bin or base64). Defaults to hex2bin.',
-		'--show'   => 'Shows the generated key in the terminal instead of storing in the `.env` file.',
-	];
-
-	/**
-	 * Actually execute the command.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		$prefix = $params['prefix'] ?? CLI::getOption('prefix');
-		if (in_array($prefix, [null, true], true))
-		{
-			$prefix = 'hex2bin';
-		}
-		elseif (! in_array($prefix, ['hex2bin', 'base64'], true))
-		{
-			// @codeCoverageIgnoreStart
-			$prefix = CLI::prompt('Please provide a valid prefix to use.', ['hex2bin', 'base64'], 'required');
-			// @codeCoverageIgnoreEnd
-		}
-
-		$length = $params['length'] ?? CLI::getOption('length');
-		if (in_array($length, [null, true], true))
-		{
-			$length = 32;
-		}
-
-		$encodedKey = $this->generateRandomKey($prefix, $length);
-
-		if (array_key_exists('show', $params) || (bool) CLI::getOption('show'))
-		{
-			CLI::write($encodedKey, 'yellow');
-			CLI::newLine();
-			return;
-		}
-
-		if (! $this->setNewEncryptionKey($encodedKey, $params))
-		{
-			CLI::write('Error in setting new encryption key to .env file.', 'light_gray', 'red');
-			CLI::newLine();
-			return;
-		}
-
-		// force DotEnv to reload the new env vars
-		putenv('encryption.key');
-		unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
-		$dotenv = new DotEnv(ROOTPATH);
-		$dotenv->load();
-
-		CLI::write('Application\'s new encryption key was successfully set.', 'green');
-		CLI::newLine();
-	}
-
-	/**
-	 * Generates a key and encodes it.
-	 *
-	 * @param string  $prefix
-	 * @param integer $length
-	 *
-	 * @return string
-	 */
-	protected function generateRandomKey(string $prefix, int $length): string
-	{
-		$key = Encryption::createKey($length);
-
-		if ($prefix === 'hex2bin')
-		{
-			return 'hex2bin:' . bin2hex($key);
-		}
-
-		return 'base64:' . base64_encode($key);
-	}
-
-	/**
-	 * Sets the new encryption key in your .env file.
-	 *
-	 * @param string $key
-	 * @param array  $params
-	 *
-	 * @return boolean
-	 */
-	protected function setNewEncryptionKey(string $key, array $params): bool
-	{
-		$currentKey = env('encryption.key', '');
-
-		if (strlen($currentKey) !== 0 && ! $this->confirmOverwrite($params))
-		{
-			// Not yet testable since it requires keyboard input
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		return $this->writeNewEncryptionKeyToFile($currentKey, $key);
-	}
-
-	/**
-	 * Checks whether to overwrite existing encryption key.
-	 *
-	 * @param array $params
-	 *
-	 * @return boolean
-	 */
-	protected function confirmOverwrite(array $params): bool
-	{
-		return (array_key_exists('force', $params) || CLI::getOption('force')) || CLI::prompt('Overwrite existing key?', ['n', 'y']) === 'y';
-	}
-
-	/**
-	 * Writes the new encryption key to .env file.
-	 *
-	 * @param string $oldKey
-	 * @param string $newKey
-	 *
-	 * @return boolean
-	 */
-	protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bool
-	{
-		$baseEnv = ROOTPATH . 'env';
-		$envFile = ROOTPATH . '.env';
-
-		if (! file_exists($envFile))
-		{
-			if (! file_exists($baseEnv))
-			{
-				CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
-				CLI::write('Here\'s your new key instead: ' . CLI::color($newKey, 'yellow'));
-				CLI::newLine();
-				return false;
-			}
-
-			copy($baseEnv, $envFile);
-		}
-
-		$ret = file_put_contents($envFile, preg_replace(
-			$this->keyPattern($oldKey),
-			"\nencryption.key = $newKey",
-			file_get_contents($envFile)
-		));
-
-		return $ret !== false;
-	}
-
-	/**
-	 * Get the regex of the current encryption key.
-	 *
-	 * @param string $oldKey
-	 *
-	 * @return string
-	 */
-	protected function keyPattern(string $oldKey): string
-	{
-		$escaped = preg_quote($oldKey, '/');
-
-		if ($escaped !== '')
-		{
-			$escaped = "[$escaped]*";
-		}
-
-		return "/^[#\s]*encryption.key[=\s]*{$escaped}$/m";
-	}
+    /**
+     * The Command's group.
+     *
+     * @var string
+     */
+    protected $group = 'Encryption';
+
+    /**
+     * The Command's name.
+     *
+     * @var string
+     */
+    protected $name = 'key:generate';
+
+    /**
+     * The Command's usage.
+     *
+     * @var string
+     */
+    protected $usage = 'key:generate [options]';
+
+    /**
+     * The Command's short description.
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new encryption key and writes it in an `.env` file.';
+
+    /**
+     * The command's options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--force'  => 'Force overwrite existing key in `.env` file.',
+        '--length' => 'The length of the random string that should be returned in bytes. Defaults to 32.',
+        '--prefix' => 'Prefix to prepend to encoded key (either hex2bin or base64). Defaults to hex2bin.',
+        '--show'   => 'Shows the generated key in the terminal instead of storing in the `.env` file.',
+    ];
+
+    /**
+     * Actually execute the command.
+     */
+    public function run(array $params)
+    {
+        $prefix = $params['prefix'] ?? CLI::getOption('prefix');
+        if (in_array($prefix, [null, true], true)) {
+            $prefix = 'hex2bin';
+        } elseif (! in_array($prefix, ['hex2bin', 'base64'], true)) {
+            $prefix = CLI::prompt('Please provide a valid prefix to use.', ['hex2bin', 'base64'], 'required'); // @codeCoverageIgnore
+        }
+
+        $length = $params['length'] ?? CLI::getOption('length');
+        if (in_array($length, [null, true], true)) {
+            $length = 32;
+        }
+
+        $encodedKey = $this->generateRandomKey($prefix, $length);
+
+        if (array_key_exists('show', $params) || (bool) CLI::getOption('show')) {
+            CLI::write($encodedKey, 'yellow');
+            CLI::newLine();
+
+            return;
+        }
+
+        if (! $this->setNewEncryptionKey($encodedKey, $params)) {
+            CLI::write('Error in setting new encryption key to .env file.', 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        // force DotEnv to reload the new env vars
+        putenv('encryption.key');
+        unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
+        $dotenv = new DotEnv(ROOTPATH);
+        $dotenv->load();
+
+        CLI::write('Application\'s new encryption key was successfully set.', 'green');
+        CLI::newLine();
+    }
+
+    /**
+     * Generates a key and encodes it.
+     */
+    protected function generateRandomKey(string $prefix, int $length): string
+    {
+        $key = Encryption::createKey($length);
+
+        if ($prefix === 'hex2bin') {
+            return 'hex2bin:' . bin2hex($key);
+        }
+
+        return 'base64:' . base64_encode($key);
+    }
+
+    /**
+     * Sets the new encryption key in your .env file.
+     */
+    protected function setNewEncryptionKey(string $key, array $params): bool
+    {
+        $currentKey = env('encryption.key', '');
+
+        if (strlen($currentKey) !== 0 && ! $this->confirmOverwrite($params)) {
+            // Not yet testable since it requires keyboard input
+            // @codeCoverageIgnoreStart
+            return false;
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this->writeNewEncryptionKeyToFile($currentKey, $key);
+    }
+
+    /**
+     * Checks whether to overwrite existing encryption key.
+     */
+    protected function confirmOverwrite(array $params): bool
+    {
+        return (array_key_exists('force', $params) || CLI::getOption('force')) || CLI::prompt('Overwrite existing key?', ['n', 'y']) === 'y';
+    }
+
+    /**
+     * Writes the new encryption key to .env file.
+     */
+    protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bool
+    {
+        $baseEnv = ROOTPATH . 'env';
+        $envFile = ROOTPATH . '.env';
+
+        if (! file_exists($envFile)) {
+            if (! file_exists($baseEnv)) {
+                CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
+                CLI::write('Here\'s your new key instead: ' . CLI::color($newKey, 'yellow'));
+                CLI::newLine();
+
+                return false;
+            }
+
+            copy($baseEnv, $envFile);
+        }
+
+        $ret = file_put_contents($envFile, preg_replace(
+            $this->keyPattern($oldKey),
+            "\nencryption.key = {$newKey}",
+            file_get_contents($envFile)
+        ));
+
+        return $ret !== false;
+    }
+
+    /**
+     * Get the regex of the current encryption key.
+     */
+    protected function keyPattern(string $oldKey): string
+    {
+        $escaped = preg_quote($oldKey, '/');
+
+        if ($escaped !== '') {
+            $escaped = "[{$escaped}]*";
+        }
+
+        return "/^[#\\s]*encryption.key[=\\s]*{$escaped}$/m";
+    }
 }
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
index 9d0c0f4ac30a..7ccae13f7163 100644
--- a/system/Commands/Generators/CommandGenerator.php
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -20,108 +20,100 @@
  */
 class CommandGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:command';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new spark command.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:command <name> [options]';
-
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The command class name.',
-	];
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--command'   => 'The command name. Default: "command:name"',
-		'--type'      => 'The command type. Options [basic, generator]. Default: "basic".',
-		'--group'     => 'The command group. Default: [basic -> "CodeIgniter", generator -> "Generators"].',
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserCommand).',
-		'--force'     => 'Force overwrite existing file.',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Command';
-		$this->directory = 'Commands';
-		$this->template  = 'command.tpl.php';
-
-		$this->classNameLang = 'CLI.generator.className.command';
-		$this->execute($params);
-	}
-
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$command = $this->getOption('command');
-		$group   = $this->getOption('group');
-		$type    = $this->getOption('type');
-
-		$command = is_string($command) ? $command : 'command:name';
-		$type    = is_string($type) ? $type : 'basic';
-
-		if (! in_array($type, ['basic', 'generator'], true))
-		{
-			// @codeCoverageIgnoreStart
-			$type = CLI::prompt(lang('CLI.generator.commandType'), ['basic', 'generator'], 'required');
-			CLI::newLine();
-			// @codeCoverageIgnoreEnd
-		}
-
-		if (! is_string($group))
-		{
-			$group = $type === 'generator' ? 'Generators' : 'CodeIgniter';
-		}
-
-		return $this->parseTemplate(
-			$class,
-			['{group}', '{command}'],
-			[$group, $command],
-			['type' => $type]
-		);
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:command';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new spark command.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:command <name> [options]';
+
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The command class name.',
+    ];
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--command'   => 'The command name. Default: "command:name"',
+        '--type'      => 'The command type. Options [basic, generator]. Default: "basic".',
+        '--group'     => 'The command group. Default: [basic -> "CodeIgniter", generator -> "Generators"].',
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserCommand).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Command';
+        $this->directory = 'Commands';
+        $this->template  = 'command.tpl.php';
+
+        $this->classNameLang = 'CLI.generator.className.command';
+        $this->execute($params);
+    }
+
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $command = $this->getOption('command');
+        $group   = $this->getOption('group');
+        $type    = $this->getOption('type');
+
+        $command = is_string($command) ? $command : 'command:name';
+        $type    = is_string($type) ? $type : 'basic';
+
+        if (! in_array($type, ['basic', 'generator'], true)) {
+            // @codeCoverageIgnoreStart
+            $type = CLI::prompt(lang('CLI.generator.commandType'), ['basic', 'generator'], 'required');
+            CLI::newLine();
+            // @codeCoverageIgnoreEnd
+        }
+
+        if (! is_string($group)) {
+            $group = $type === 'generator' ? 'Generators' : 'CodeIgniter';
+        }
+
+        return $this->parseTemplate(
+            $class,
+            ['{group}', '{command}'],
+            [$group, $command],
+            ['type' => $type]
+        );
+    }
 }
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
index 00d520da9e50..606af47b33f0 100644
--- a/system/Commands/Generators/ConfigGenerator.php
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -19,87 +19,80 @@
  */
 class ConfigGenerator extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:config';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:config';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new config file.';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new config file.';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:config <name> [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:config <name> [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The config class name.',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The config class name.',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserConfig).',
-		'--force'     => 'Force overwrite existing file.',
-	];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserConfig).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Config';
-		$this->directory = 'Config';
-		$this->template  = 'config.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Config';
+        $this->directory = 'Config';
+        $this->template  = 'config.tpl.php';
 
-		$this->classNameLang = 'CLI.generator.className.config';
-		$this->execute($params);
-	}
+        $this->classNameLang = 'CLI.generator.className.config';
+        $this->execute($params);
+    }
 
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$namespace = $this->getOption('namespace') ?? APP_NAMESPACE;
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $namespace = $this->getOption('namespace') ?? APP_NAMESPACE;
 
-		if ($namespace === APP_NAMESPACE)
-		{
-			$class = substr($class, strlen($namespace . '\\'));
-		}
+        if ($namespace === APP_NAMESPACE) {
+            $class = substr($class, strlen($namespace . '\\'));
+        }
 
-		return $this->parseTemplate($class);
-	}
+        return $this->parseTemplate($class);
+    }
 }
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
index b2ecbd78569c..36a951cf0df0 100644
--- a/system/Commands/Generators/ControllerGenerator.php
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -20,126 +20,112 @@
  */
 class ControllerGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:controller';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new controller file.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:controller <name> [options]';
-
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The controller class name.',
-	];
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--bare'      => 'Extends from CodeIgniter\Controller instead of BaseController.',
-		'--restful'   => 'Extends from a RESTful resource, Options: [controller, presenter]. Default: "controller".',
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserController).',
-		'--force'     => 'Force overwrite existing file.',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Controller';
-		$this->directory = 'Controllers';
-		$this->template  = 'controller.tpl.php';
-
-		$this->classNameLang = 'CLI.generator.className.controller';
-		$this->execute($params);
-	}
-
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$bare = $this->getOption('bare');
-		$rest = $this->getOption('restful');
-
-		$useStatement = trim(APP_NAMESPACE, '\\') . '\Controllers\BaseController';
-		$extends      = 'BaseController';
-
-		// Gets the appropriate parent class to extend.
-		if ($bare || $rest)
-		{
-			if ($bare)
-			{
-				$useStatement = 'CodeIgniter\Controller';
-				$extends      = 'Controller';
-			}
-			elseif ($rest)
-			{
-				$rest = is_string($rest) ? $rest : 'controller';
-
-				if (! in_array($rest, ['controller', 'presenter'], true))
-				{
-					// @codeCoverageIgnoreStart
-					$rest = CLI::prompt(lang('CLI.generator.parentClass'), ['controller', 'presenter'], 'required');
-					CLI::newLine();
-					// @codeCoverageIgnoreEnd
-				}
-
-				if ($rest === 'controller')
-				{
-					$useStatement = 'CodeIgniter\RESTful\ResourceController';
-					$extends      = 'ResourceController';
-				}
-				elseif ($rest === 'presenter')
-				{
-					$useStatement = 'CodeIgniter\RESTful\ResourcePresenter';
-					$extends      = 'ResourcePresenter';
-				}
-			}
-		}
-
-		return $this->parseTemplate(
-			$class,
-			['{useStatement}', '{extends}'],
-			[$useStatement, $extends],
-			['type' => $rest]
-		);
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:controller';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new controller file.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:controller <name> [options]';
+
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The controller class name.',
+    ];
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--bare'      => 'Extends from CodeIgniter\Controller instead of BaseController.',
+        '--restful'   => 'Extends from a RESTful resource, Options: [controller, presenter]. Default: "controller".',
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserController).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Controller';
+        $this->directory = 'Controllers';
+        $this->template  = 'controller.tpl.php';
+
+        $this->classNameLang = 'CLI.generator.className.controller';
+        $this->execute($params);
+    }
+
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $bare = $this->getOption('bare');
+        $rest = $this->getOption('restful');
+
+        $useStatement = trim(APP_NAMESPACE, '\\') . '\Controllers\BaseController';
+        $extends      = 'BaseController';
+
+        // Gets the appropriate parent class to extend.
+        if ($bare || $rest) {
+            if ($bare) {
+                $useStatement = 'CodeIgniter\Controller';
+                $extends      = 'Controller';
+            } elseif ($rest) {
+                $rest = is_string($rest) ? $rest : 'controller';
+
+                if (! in_array($rest, ['controller', 'presenter'], true)) {
+                    // @codeCoverageIgnoreStart
+                    $rest = CLI::prompt(lang('CLI.generator.parentClass'), ['controller', 'presenter'], 'required');
+                    CLI::newLine();
+                    // @codeCoverageIgnoreEnd
+                }
+
+                if ($rest === 'controller') {
+                    $useStatement = 'CodeIgniter\RESTful\ResourceController';
+                    $extends      = 'ResourceController';
+                } elseif ($rest === 'presenter') {
+                    $useStatement = 'CodeIgniter\RESTful\ResourcePresenter';
+                    $extends      = 'ResourcePresenter';
+                }
+            }
+        }
+
+        return $this->parseTemplate(
+            $class,
+            ['{useStatement}', '{extends}'],
+            [$useStatement, $extends],
+            ['type' => $rest]
+        );
+    }
 }
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
index 2a3cff0341ba..8cd84785c311 100644
--- a/system/Commands/Generators/EntityGenerator.php
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -19,68 +19,66 @@
  */
 class EntityGenerator extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:entity';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:entity';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new entity file.';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new entity file.';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:entity <name> [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:entity <name> [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The entity class name.',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The entity class name.',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserEntity).',
-		'--force'     => 'Force overwrite existing file.',
-	];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserEntity).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Entity';
-		$this->directory = 'Entities';
-		$this->template  = 'entity.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Entity';
+        $this->directory = 'Entities';
+        $this->template  = 'entity.tpl.php';
 
-		$this->classNameLang = 'CLI.generator.className.entity';
-		$this->execute($params);
-	}
+        $this->classNameLang = 'CLI.generator.className.entity';
+        $this->execute($params);
+    }
 }
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
index 677337d3b87e..02060b020291 100644
--- a/system/Commands/Generators/FilterGenerator.php
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -19,68 +19,66 @@
  */
 class FilterGenerator extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:filter';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:filter';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new filter file.';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new filter file.';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:filter <name> [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:filter <name> [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The filter class name.',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The filter class name.',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserFilter).',
-		'--force'     => 'Force overwrite existing file.',
-	];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserFilter).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Filter';
-		$this->directory = 'Filters';
-		$this->template  = 'filter.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Filter';
+        $this->directory = 'Filters';
+        $this->template  = 'filter.tpl.php';
 
-		$this->classNameLang = 'CLI.generator.className.filter';
-		$this->execute($params);
-	}
+        $this->classNameLang = 'CLI.generator.className.filter';
+        $this->execute($params);
+    }
 }
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
index a4b36acce643..4803dc96db25 100644
--- a/system/Commands/Generators/MigrateCreate.php
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -23,71 +23,68 @@
  */
 class MigrateCreate extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'migrate:create';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'migrate:create';
 
-	/**
-	 * The Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = '[DEPRECATED] Creates a new migration file. Please use "make:migration" instead.';
+    /**
+     * The Command's short description
+     *
+     * @var string
+     */
+    protected $description = '[DEPRECATED] Creates a new migration file. Please use "make:migration" instead.';
 
-	/**
-	 * The Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate:create <name> [options]';
+    /**
+     * The Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'migrate:create <name> [options]';
 
-	/**
-	 * The Command's arguments.
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The migration file name.',
-	];
+    /**
+     * The Command's arguments.
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The migration file name.',
+    ];
 
-	/**
-	 * The Command's options.
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Defaults to APP_NAMESPACE',
-		'--force'     => 'Force overwrite existing files.',
-	];
+    /**
+     * The Command's options.
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Defaults to APP_NAMESPACE',
+        '--force'     => 'Force overwrite existing files.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		// Resolve arguments before passing to make:migration
-		$params[0] = $params[0] ?? CLI::getSegment(2);
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        // Resolve arguments before passing to make:migration
+        $params[0] = $params[0] ?? CLI::getSegment(2);
 
-		$params['namespace'] = $params['namespace'] ?? CLI::getOption('namespace') ?? APP_NAMESPACE;
+        $params['namespace'] = $params['namespace'] ?? CLI::getOption('namespace') ?? APP_NAMESPACE;
 
-		if (array_key_exists('force', $params) || CLI::getOption('force'))
-		{
-			$params['force'] = null;
-		}
+        if (array_key_exists('force', $params) || CLI::getOption('force')) {
+            $params['force'] = null;
+        }
 
-		$this->call('make:migration', $params);
-	}
+        $this->call('make:migration', $params);
+    }
 }
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
index fb2f0edc4d2a..1cd931e9e460 100644
--- a/system/Commands/Generators/MigrationGenerator.php
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -20,113 +20,101 @@
  */
 class MigrationGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:migration';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new migration file.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:migration <name> [options]';
-
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The migration class name.',
-	];
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--session'   => 'Generates the migration file for database sessions.',
-		'--table'     => 'Table name to use for database sessions. Default: "ci_sessions".',
-		'--dbgroup'   => 'Database group to use for database sessions. Default: "default".',
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserMigration).',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Migration';
-		$this->directory = 'Database\Migrations';
-		$this->template  = 'migration.tpl.php';
-
-		if (array_key_exists('session', $params) || CLI::getOption('session'))
-		{
-			$table     = $params['table'] ?? CLI::getOption('table') ?? 'ci_sessions';
-			$params[0] = "_create_{$table}_table";
-		}
-
-		$this->classNameLang = 'CLI.generator.className.migration';
-		$this->execute($params);
-	}
-
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$data['session'] = false;
-
-		if ($this->getOption('session'))
-		{
-			$table   = $this->getOption('table');
-			$DBGroup = $this->getOption('dbgroup');
-
-			$data['session'] = true;
-			$data['table']   = is_string($table) ? $table : 'ci_sessions';
-			$data['DBGroup'] = is_string($DBGroup) ? $DBGroup : 'default';
-			$data['matchIP'] = config('App')->sessionMatchIP;
-		}
-
-		return $this->parseTemplate($class, [], [], $data);
-	}
-
-	/**
-	 * Change file basename before saving.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string
-	 */
-	protected function basename(string $filename): string
-	{
-		return gmdate(config('Migrations')->timestampFormat) . basename($filename);
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:migration';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new migration file.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:migration <name> [options]';
+
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The migration class name.',
+    ];
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--session'   => 'Generates the migration file for database sessions.',
+        '--table'     => 'Table name to use for database sessions. Default: "ci_sessions".',
+        '--dbgroup'   => 'Database group to use for database sessions. Default: "default".',
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserMigration).',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Migration';
+        $this->directory = 'Database\Migrations';
+        $this->template  = 'migration.tpl.php';
+
+        if (array_key_exists('session', $params) || CLI::getOption('session')) {
+            $table     = $params['table'] ?? CLI::getOption('table') ?? 'ci_sessions';
+            $params[0] = "_create_{$table}_table";
+        }
+
+        $this->classNameLang = 'CLI.generator.className.migration';
+        $this->execute($params);
+    }
+
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $data['session'] = false;
+
+        if ($this->getOption('session')) {
+            $table   = $this->getOption('table');
+            $DBGroup = $this->getOption('dbgroup');
+
+            $data['session'] = true;
+            $data['table']   = is_string($table) ? $table : 'ci_sessions';
+            $data['DBGroup'] = is_string($DBGroup) ? $DBGroup : 'default';
+            $data['matchIP'] = config('App')->sessionMatchIP;
+        }
+
+        return $this->parseTemplate($class, [], [], $data);
+    }
+
+    /**
+     * Change file basename before saving.
+     */
+    protected function basename(string $filename): string
+    {
+        return gmdate(config('Migrations')->timestampFormat) . basename($filename);
+    }
 }
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
index b391da763c93..1ad8a75e1f8c 100644
--- a/system/Commands/Generators/ModelGenerator.php
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -20,119 +20,109 @@
  */
 class ModelGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:model';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new model file.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:model <name> [options]';
-
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The model class name.',
-	];
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--table'     => 'Supply a table name. Default: "the lowercased plural of the class name".',
-		'--dbgroup'   => 'Database group to use. Default: "default".',
-		'--return'    => 'Return type, Options: [array, object, entity]. Default: "array".',
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserModel).',
-		'--force'     => 'Force overwrite existing file.',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Model';
-		$this->directory = 'Models';
-		$this->template  = 'model.tpl.php';
-
-		$this->classNameLang = 'CLI.generator.className.model';
-		$this->execute($params);
-	}
-
-	/**
-	 * Prepare options and do the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$table   = $this->getOption('table');
-		$DBGroup = $this->getOption('dbgroup');
-		$return  = $this->getOption('return');
-
-		$baseClass = strtolower(str_replace(trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\') . '\\', '', $class));
-		$baseClass = strpos($baseClass, 'model') ? str_replace('model', '', $baseClass) : $baseClass;
-
-		$table   = is_string($table) ? $table : plural($baseClass);
-		$DBGroup = is_string($DBGroup) ? $DBGroup : 'default';
-		$return  = is_string($return) ? $return : 'array';
-
-		if (! in_array($return, ['array', 'object', 'entity'], true))
-		{
-			// @codeCoverageIgnoreStart
-			$return = CLI::prompt(lang('CLI.generator.returnType'), ['array', 'object', 'entity'], 'required');
-			CLI::newLine();
-			// @codeCoverageIgnoreEnd
-		}
-
-		if ($return === 'entity')
-		{
-			$return = str_replace('Models', 'Entities', $class);
-
-			if ($pos = strpos($return, 'Model'))
-			{
-				$return = substr($return, 0, $pos);
-
-				if ($this->getOption('suffix'))
-				{
-					$return .= 'Entity';
-				}
-			}
-
-			$this->call('make:entity', array_merge([$baseClass], $this->params));
-		}
-
-		return $this->parseTemplate($class, ['{table}', '{DBGroup}', '{return}'], [$table, $DBGroup, $return]);
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:model';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new model file.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:model <name> [options]';
+
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The model class name.',
+    ];
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--table'     => 'Supply a table name. Default: "the lowercased plural of the class name".',
+        '--dbgroup'   => 'Database group to use. Default: "default".',
+        '--return'    => 'Return type, Options: [array, object, entity]. Default: "array".',
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserModel).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Model';
+        $this->directory = 'Models';
+        $this->template  = 'model.tpl.php';
+
+        $this->classNameLang = 'CLI.generator.className.model';
+        $this->execute($params);
+    }
+
+    /**
+     * Prepare options and do the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $table   = $this->getOption('table');
+        $DBGroup = $this->getOption('dbgroup');
+        $return  = $this->getOption('return');
+
+        $baseClass = strtolower(str_replace(trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\') . '\\', '', $class));
+        $baseClass = strpos($baseClass, 'model') ? str_replace('model', '', $baseClass) : $baseClass;
+
+        $table   = is_string($table) ? $table : plural($baseClass);
+        $DBGroup = is_string($DBGroup) ? $DBGroup : 'default';
+        $return  = is_string($return) ? $return : 'array';
+
+        if (! in_array($return, ['array', 'object', 'entity'], true)) {
+            // @codeCoverageIgnoreStart
+            $return = CLI::prompt(lang('CLI.generator.returnType'), ['array', 'object', 'entity'], 'required');
+            CLI::newLine();
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ($return === 'entity') {
+            $return = str_replace('Models', 'Entities', $class);
+
+            if ($pos = strpos($return, 'Model')) {
+                $return = substr($return, 0, $pos);
+
+                if ($this->getOption('suffix')) {
+                    $return .= 'Entity';
+                }
+            }
+
+            $this->call('make:entity', array_merge([$baseClass], $this->params));
+        }
+
+        return $this->parseTemplate($class, ['{table}', '{DBGroup}', '{return}'], [$table, $DBGroup, $return]);
+    }
 }
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
index 6750b46f7cf4..351ee009459e 100644
--- a/system/Commands/Generators/ScaffoldGenerator.php
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -20,110 +20,102 @@
  */
 class ScaffoldGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:scaffold';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a complete set of scaffold files.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:scaffold <name> [options]';
-
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The class name',
-	];
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--bare'      => 'Add the "--bare" option to controller component.',
-		'--restful'   => 'Add the "--restful" option to controller component.',
-		'--table'     => 'Add the "--table" option to the model component.',
-		'--dbgroup'   => 'Add the "--dbgroup" option to model component.',
-		'--return'    => 'Add the "--return" option to the model component.',
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name.',
-		'--force'     => 'Force overwrite existing file.',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->params = $params;
-
-		$options = [];
-
-		if ($this->getOption('namespace'))
-		{
-			$options['namespace'] = $this->getOption('namespace');
-		}
-
-		if ($this->getOption('suffix'))
-		{
-			$options['suffix'] = null;
-		}
-
-		if ($this->getOption('force'))
-		{
-			$options['force'] = null;
-		}
-
-		$controllerOpts = [];
-
-		if ($this->getOption('bare'))
-		{
-			$controllerOpts['bare'] = null;
-		}
-		elseif ($this->getOption('restful'))
-		{
-			$controllerOpts['restful'] = $this->getOption('restful');
-		}
-
-		$modelOpts = [
-			'table'   => $this->getOption('table'),
-			'dbgroup' => $this->getOption('dbgroup'),
-			'return'  => $this->getOption('return'),
-		];
-
-		$class = $params[0] ?? CLI::getSegment(2);
-
-		// Call those commands!
-		$this->call('make:controller', array_merge([$class], $controllerOpts, $options));
-		$this->call('make:model', array_merge([$class], $modelOpts, $options));
-		$this->call('make:migration', array_merge([$class], $options));
-		$this->call('make:seeder', array_merge([$class], $options));
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:scaffold';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a complete set of scaffold files.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:scaffold <name> [options]';
+
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The class name',
+    ];
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--bare'      => 'Add the "--bare" option to controller component.',
+        '--restful'   => 'Add the "--restful" option to controller component.',
+        '--table'     => 'Add the "--table" option to the model component.',
+        '--dbgroup'   => 'Add the "--dbgroup" option to model component.',
+        '--return'    => 'Add the "--return" option to the model component.',
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name.',
+        '--force'     => 'Force overwrite existing file.',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->params = $params;
+
+        $options = [];
+
+        if ($this->getOption('namespace')) {
+            $options['namespace'] = $this->getOption('namespace');
+        }
+
+        if ($this->getOption('suffix')) {
+            $options['suffix'] = null;
+        }
+
+        if ($this->getOption('force')) {
+            $options['force'] = null;
+        }
+
+        $controllerOpts = [];
+
+        if ($this->getOption('bare')) {
+            $controllerOpts['bare'] = null;
+        } elseif ($this->getOption('restful')) {
+            $controllerOpts['restful'] = $this->getOption('restful');
+        }
+
+        $modelOpts = [
+            'table'   => $this->getOption('table'),
+            'dbgroup' => $this->getOption('dbgroup'),
+            'return'  => $this->getOption('return'),
+        ];
+
+        $class = $params[0] ?? CLI::getSegment(2);
+
+        // Call those commands!
+        $this->call('make:controller', array_merge([$class], $controllerOpts, $options));
+        $this->call('make:model', array_merge([$class], $modelOpts, $options));
+        $this->call('make:migration', array_merge([$class], $options));
+        $this->call('make:seeder', array_merge([$class], $options));
+    }
 }
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
index aaa2a65f7249..09a1037f0bdc 100644
--- a/system/Commands/Generators/SeederGenerator.php
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -19,68 +19,66 @@
  */
 class SeederGenerator extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:seeder';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:seeder';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new seeder file.';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new seeder file.';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:seeder <name> [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:seeder <name> [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The seeder class name.',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The seeder class name.',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserSeeder).',
-		'--force'     => 'Force overwrite existing file.',
-	];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserSeeder).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Seeder';
-		$this->directory = 'Database\Seeds';
-		$this->template  = 'seeder.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Seeder';
+        $this->directory = 'Database\Seeds';
+        $this->template  = 'seeder.tpl.php';
 
-		$this->classNameLang = 'CLI.generator.className.seeder';
-		$this->execute($params);
-	}
+        $this->classNameLang = 'CLI.generator.className.seeder';
+        $this->execute($params);
+    }
 }
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
index eec42fde0643..a1e02a131b63 100644
--- a/system/Commands/Generators/SessionMigrationGenerator.php
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -24,98 +24,87 @@
  */
 class SessionMigrationGenerator extends BaseCommand
 {
-	use GeneratorTrait;
-
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'session:migration';
-
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = '[DEPRECATED] Generates the migration file for database sessions, Please use  "make:migration --session" instead.';
-
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'session:migration [options]';
-
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-t' => 'Supply a table name.',
-		'-g' => 'Database group to use. Default: "default".',
-	];
-
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Migration';
-		$this->directory = 'Database\Migrations';
-		$this->template  = 'migration.tpl.php';
-
-		$table = 'ci_sessions';
-
-		if (array_key_exists('t', $params) || CLI::getOption('t'))
-		{
-			$table = $params['t'] ?? CLI::getOption('t');
-		}
-
-		$params[0] = "_create_{$table}_table";
-
-		$this->execute($params);
-	}
-
-	/**
-	 * Performs the necessary replacements.
-	 *
-	 * @param string $class
-	 *
-	 * @return string
-	 */
-	protected function prepare(string $class): string
-	{
-		$data['session'] = true;
-		$data['table']   = $this->getOption('t');
-		$data['DBGroup'] = $this->getOption('g');
-		$data['matchIP'] = config('App')->sessionMatchIP ?? false;
-
-		$data['table']   = is_string($data['table']) ? $data['table'] : 'ci_sessions';
-		$data['DBGroup'] = is_string($data['DBGroup']) ? $data['DBGroup'] : 'default';
-
-		return $this->parseTemplate($class, [], [], $data);
-	}
-
-	/**
-	 * Change file basename before saving.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string
-	 */
-	protected function basename(string $filename): string
-	{
-		return gmdate(config('Migrations')->timestampFormat) . basename($filename);
-	}
+    use GeneratorTrait;
+
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
+
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'session:migration';
+
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = '[DEPRECATED] Generates the migration file for database sessions, Please use  "make:migration --session" instead.';
+
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'session:migration [options]';
+
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '-t' => 'Supply a table name.',
+        '-g' => 'Database group to use. Default: "default".',
+    ];
+
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Migration';
+        $this->directory = 'Database\Migrations';
+        $this->template  = 'migration.tpl.php';
+
+        $table = 'ci_sessions';
+
+        if (array_key_exists('t', $params) || CLI::getOption('t')) {
+            $table = $params['t'] ?? CLI::getOption('t');
+        }
+
+        $params[0] = "_create_{$table}_table";
+
+        $this->execute($params);
+    }
+
+    /**
+     * Performs the necessary replacements.
+     */
+    protected function prepare(string $class): string
+    {
+        $data['session'] = true;
+        $data['table']   = $this->getOption('t');
+        $data['DBGroup'] = $this->getOption('g');
+        $data['matchIP'] = config('App')->sessionMatchIP ?? false;
+
+        $data['table']   = is_string($data['table']) ? $data['table'] : 'ci_sessions';
+        $data['DBGroup'] = is_string($data['DBGroup']) ? $data['DBGroup'] : 'default';
+
+        return $this->parseTemplate($class, [], [], $data);
+    }
+
+    /**
+     * Change file basename before saving.
+     */
+    protected function basename(string $filename): string
+    {
+        return gmdate(config('Migrations')->timestampFormat) . basename($filename);
+    }
 }
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
index 9a79d47f09fe..0c58ca5b0866 100644
--- a/system/Commands/Generators/ValidationGenerator.php
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
@@ -19,68 +19,66 @@
  */
 class ValidationGenerator extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:validation';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:validation';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates a new validation file.';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = 'Generates a new validation file.';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:validation <name> [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:validation <name> [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'The validation class name.',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'The validation class name.',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
-		'--suffix'    => 'Append the component title to the class name (e.g. User => UserValidation).',
-		'--force'     => 'Force overwrite existing file.',
-	];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--namespace' => 'Set root namespace. Default: "APP_NAMESPACE".',
+        '--suffix'    => 'Append the component title to the class name (e.g. User => UserValidation).',
+        '--force'     => 'Force overwrite existing file.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Validation';
-		$this->directory = 'Validation';
-		$this->template  = 'validation.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Validation';
+        $this->directory = 'Validation';
+        $this->template  = 'validation.tpl.php';
 
-		$this->classNameLang = 'CLI.generator.className.validation';
-		$this->execute($params);
-	}
+        $this->classNameLang = 'CLI.generator.className.validation';
+        $this->execute($params);
+    }
 }
diff --git a/system/Commands/Generators/Views/command.tpl.php b/system/Commands/Generators/Views/command.tpl.php
index 52da0d0ba012..bfbdcc4a1741 100644
--- a/system/Commands/Generators/Views/command.tpl.php
+++ b/system/Commands/Generators/Views/command.tpl.php
@@ -11,66 +11,66 @@
 class {class} extends BaseCommand
 {
 <?php if ($type === 'generator'): ?>
-	use GeneratorTrait;
+    use GeneratorTrait;
 
 <?php endif ?>
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = '{group}';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = '{group}';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = '{command}';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = '{command}';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = '';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = '';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = '{command} [arguments] [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = '{command} [arguments] [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
+    /**
+     * Actually execute a command.
+     *
+     * @param array $params
+     */
+    public function run(array $params)
+    {
 <?php if ($type === 'generator'): ?>
-		$this->component = 'Command';
-		$this->directory = 'Commands';
-		$this->template  = 'command.tpl.php';
+        $this->component = 'Command';
+        $this->directory = 'Commands';
+        $this->template  = 'command.tpl.php';
 
-		$this->execute($params);
+        $this->execute($params);
 <?php else: ?>
-		//
+        //
 <?php endif ?>
-	}
+    }
 }
diff --git a/system/Commands/Generators/Views/config.tpl.php b/system/Commands/Generators/Views/config.tpl.php
index 72e93ad01aa8..31c60cb5648c 100644
--- a/system/Commands/Generators/Views/config.tpl.php
+++ b/system/Commands/Generators/Views/config.tpl.php
@@ -6,5 +6,5 @@
 
 class {class} extends BaseConfig
 {
-	//
+    //
 }
diff --git a/system/Commands/Generators/Views/controller.tpl.php b/system/Commands/Generators/Views/controller.tpl.php
index f7859f2ed6ff..de4447c56268 100644
--- a/system/Commands/Generators/Views/controller.tpl.php
+++ b/system/Commands/Generators/Views/controller.tpl.php
@@ -7,171 +7,171 @@
 class {class} extends {extends}
 {
 <?php if ($type === 'controller'): ?>
-	/**
-	 * Return an array of resource objects, themselves in array format
-	 *
-	 * @return mixed
-	 */
-	public function index()
-	{
-		//
-	}
-
-	/**
-	 * Return the properties of a resource object
-	 *
-	 * @return mixed
-	 */
-	public function show($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Return a new resource object, with default properties
-	 *
-	 * @return mixed
-	 */
-	public function new()
-	{
-		//
-	}
-
-	/**
-	 * Create a new resource object, from "posted" parameters
-	 *
-	 * @return mixed
-	 */
-	public function create()
-	{
-		//
-	}
-
-	/**
-	 * Return the editable properties of a resource object
-	 *
-	 * @return mixed
-	 */
-	public function edit($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Add or update a model resource, from "posted" properties
-	 *
-	 * @return mixed
-	 */
-	public function update($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Delete the designated resource object from the model
-	 *
-	 * @return mixed
-	 */
-	public function delete($id = null)
-	{
-		//
-	}
+    /**
+     * Return an array of resource objects, themselves in array format
+     *
+     * @return mixed
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Return the properties of a resource object
+     *
+     * @return mixed
+     */
+    public function show($id = null)
+    {
+        //
+    }
+
+    /**
+     * Return a new resource object, with default properties
+     *
+     * @return mixed
+     */
+    public function new()
+    {
+        //
+    }
+
+    /**
+     * Create a new resource object, from "posted" parameters
+     *
+     * @return mixed
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Return the editable properties of a resource object
+     *
+     * @return mixed
+     */
+    public function edit($id = null)
+    {
+        //
+    }
+
+    /**
+     * Add or update a model resource, from "posted" properties
+     *
+     * @return mixed
+     */
+    public function update($id = null)
+    {
+        //
+    }
+
+    /**
+     * Delete the designated resource object from the model
+     *
+     * @return mixed
+     */
+    public function delete($id = null)
+    {
+        //
+    }
 <?php elseif ($type === 'presenter'): ?>
-	/**
-	 * Present a view of resource objects
-	 *
-	 * @return mixed
-	 */
-	public function index()
-	{
-		//
-	}
-
-	/**
-	 * Present a view to present a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function show($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Present a view to present a new single resource object
-	 *
-	 * @return mixed
-	 */
-	public function new()
-	{
-		//
-	}
-
-	/**
-	 * Process the creation/insertion of a new resource object.
-	 * This should be a POST.
-	 *
-	 * @return mixed
-	 */
-	public function create()
-	{
-		//
-	}
-
-	/**
-	 * Present a view to edit the properties of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function edit($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Process the updating, full or partial, of a specific resource object.
-	 * This should be a POST.
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function update($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Present a view to confirm the deletion of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function remove($id = null)
-	{
-		//
-	}
-
-	/**
-	 * Process the deletion of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function delete($id = null)
-	{
-		//
-	}
+    /**
+     * Present a view of resource objects
+     *
+     * @return mixed
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Present a view to present a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function show($id = null)
+    {
+        //
+    }
+
+    /**
+     * Present a view to present a new single resource object
+     *
+     * @return mixed
+     */
+    public function new()
+    {
+        //
+    }
+
+    /**
+     * Process the creation/insertion of a new resource object.
+     * This should be a POST.
+     *
+     * @return mixed
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Present a view to edit the properties of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function edit($id = null)
+    {
+        //
+    }
+
+    /**
+     * Process the updating, full or partial, of a specific resource object.
+     * This should be a POST.
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function update($id = null)
+    {
+        //
+    }
+
+    /**
+     * Present a view to confirm the deletion of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function remove($id = null)
+    {
+        //
+    }
+
+    /**
+     * Process the deletion of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function delete($id = null)
+    {
+        //
+    }
 <?php else: ?>
-	public function index()
-	{
-		//
-	}
+    public function index()
+    {
+        //
+    }
 <?php endif ?>
 }
diff --git a/system/Commands/Generators/Views/entity.tpl.php b/system/Commands/Generators/Views/entity.tpl.php
index 8de289f9905f..6623e2f14bbb 100644
--- a/system/Commands/Generators/Views/entity.tpl.php
+++ b/system/Commands/Generators/Views/entity.tpl.php
@@ -6,11 +6,11 @@
 
 class {class} extends Entity
 {
-	protected $datamap = [];
-	protected $dates   = [
-		'created_at',
-		'updated_at',
-		'deleted_at',
-	];
-	protected $casts   = [];
+    protected $datamap = [];
+    protected $dates   = [
+        'created_at',
+        'updated_at',
+        'deleted_at',
+    ];
+    protected $casts   = [];
 }
diff --git a/system/Commands/Generators/Views/filter.tpl.php b/system/Commands/Generators/Views/filter.tpl.php
index 19147bbaec8d..c080e920a021 100644
--- a/system/Commands/Generators/Views/filter.tpl.php
+++ b/system/Commands/Generators/Views/filter.tpl.php
@@ -8,40 +8,40 @@
 
 class {class} implements FilterInterface
 {
-	/**
-	 * Do whatever processing this filter needs to do.
-	 * By default it should not return anything during
-	 * normal execution. However, when an abnormal state
-	 * is found, it should return an instance of
-	 * CodeIgniter\HTTP\Response. If it does, script
-	 * execution will end and that Response will be
-	 * sent back to the client, allowing for error pages,
-	 * redirects, etc.
-	 *
-	 * @param RequestInterface $request
-	 * @param array|null       $arguments
-	 *
-	 * @return mixed
-	 */
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		//
-	}
+    /**
+     * Do whatever processing this filter needs to do.
+     * By default it should not return anything during
+     * normal execution. However, when an abnormal state
+     * is found, it should return an instance of
+     * CodeIgniter\HTTP\Response. If it does, script
+     * execution will end and that Response will be
+     * sent back to the client, allowing for error pages,
+     * redirects, etc.
+     *
+     * @param RequestInterface $request
+     * @param array|null       $arguments
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        //
+    }
 
-	/**
-	 * Allows After filters to inspect and modify the response
-	 * object as needed. This method does not allow any way
-	 * to stop execution of other after filters, short of
-	 * throwing an Exception or Error.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param array|null        $arguments
-	 *
-	 * @return mixed
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-		//
-	}
+    /**
+     * Allows After filters to inspect and modify the response
+     * object as needed. This method does not allow any way
+     * to stop execution of other after filters, short of
+     * throwing an Exception or Error.
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array|null        $arguments
+     *
+     * @return mixed
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        //
+    }
 }
diff --git a/system/Commands/Generators/Views/migration.tpl.php b/system/Commands/Generators/Views/migration.tpl.php
index 42bb77effe34..436ee85e04cc 100644
--- a/system/Commands/Generators/Views/migration.tpl.php
+++ b/system/Commands/Generators/Views/migration.tpl.php
@@ -7,38 +7,38 @@
 class {class} extends Migration
 {
 <?php if ($session): ?>
-	protected $DBGroup = '<?= $DBGroup ?>';
+    protected $DBGroup = '<?= $DBGroup ?>';
 
-	public function up()
-	{
-		$this->forge->addField([
-			'id'         => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
-			'ip_address' => ['type' => 'VARCHAR', 'constraint' => 45, 'null' => false],
-			'timestamp'  => ['type' => 'INT', 'unsigned' => true, 'null' => false, 'default' => 0],
-			'data'       => ['type' => 'TEXT', 'null' => false, 'default' => ''],
-		]);
-	<?php if ($matchIP) : ?>
-	$this->forge->addKey(['id', 'ip_address'], true);
-	<?php else: ?>
-	$this->forge->addKey('id', true);
-	<?php endif ?>
-	$this->forge->addKey('timestamp');
-		$this->forge->createTable('<?= $table ?>', true);
-	}
+    public function up()
+    {
+        $this->forge->addField([
+            'id'         => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+            'ip_address' => ['type' => 'VARCHAR', 'constraint' => 45, 'null' => false],
+            'timestamp'  => ['type' => 'INT', 'unsigned' => true, 'null' => false, 'default' => 0],
+            'data'       => ['type' => 'TEXT', 'null' => false, 'default' => ''],
+        ]);
+    <?php if ($matchIP) : ?>
+    $this->forge->addKey(['id', 'ip_address'], true);
+    <?php else: ?>
+    $this->forge->addKey('id', true);
+    <?php endif ?>
+    $this->forge->addKey('timestamp');
+        $this->forge->createTable('<?= $table ?>', true);
+    }
 
-	public function down()
-	{
-		$this->forge->dropTable('<?= $table ?>', true);
-	}
+    public function down()
+    {
+        $this->forge->dropTable('<?= $table ?>', true);
+    }
 <?php else: ?>
-	public function up()
-	{
-		//
-	}
+    public function up()
+    {
+        //
+    }
 
-	public function down()
-	{
-		//
-	}
+    public function down()
+    {
+        //
+    }
 <?php endif ?>
 }
diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
index 042bbc86d038..088ecb7e1161 100644
--- a/system/Commands/Generators/Views/model.tpl.php
+++ b/system/Commands/Generators/Views/model.tpl.php
@@ -6,37 +6,37 @@
 
 class {class} extends Model
 {
-	protected $DBGroup              = '{DBGroup}';
-	protected $table                = '{table}';
-	protected $primaryKey           = 'id';
-	protected $useAutoIncrement     = true;
-	protected $insertID             = 0;
-	protected $returnType           = '{return}';
-	protected $useSoftDeletes       = false;
-	protected $protectFields        = true;
-	protected $allowedFields        = [];
+    protected $DBGroup              = '{DBGroup}';
+    protected $table                = '{table}';
+    protected $primaryKey           = 'id';
+    protected $useAutoIncrement     = true;
+    protected $insertID             = 0;
+    protected $returnType           = '{return}';
+    protected $useSoftDeletes       = false;
+    protected $protectFields        = true;
+    protected $allowedFields        = [];
 
-	// Dates
-	protected $useTimestamps        = false;
-	protected $dateFormat           = 'datetime';
-	protected $createdField         = 'created_at';
-	protected $updatedField         = 'updated_at';
-	protected $deletedField         = 'deleted_at';
+    // Dates
+    protected $useTimestamps        = false;
+    protected $dateFormat           = 'datetime';
+    protected $createdField         = 'created_at';
+    protected $updatedField         = 'updated_at';
+    protected $deletedField         = 'deleted_at';
 
-	// Validation
-	protected $validationRules      = [];
-	protected $validationMessages   = [];
-	protected $skipValidation       = false;
-	protected $cleanValidationRules = true;
+    // Validation
+    protected $validationRules      = [];
+    protected $validationMessages   = [];
+    protected $skipValidation       = false;
+    protected $cleanValidationRules = true;
 
-	// Callbacks
-	protected $allowCallbacks       = true;
-	protected $beforeInsert         = [];
-	protected $afterInsert          = [];
-	protected $beforeUpdate         = [];
-	protected $afterUpdate          = [];
-	protected $beforeFind           = [];
-	protected $afterFind            = [];
-	protected $beforeDelete         = [];
-	protected $afterDelete          = [];
+    // Callbacks
+    protected $allowCallbacks       = true;
+    protected $beforeInsert         = [];
+    protected $afterInsert          = [];
+    protected $beforeUpdate         = [];
+    protected $afterUpdate          = [];
+    protected $beforeFind           = [];
+    protected $afterFind            = [];
+    protected $beforeDelete         = [];
+    protected $afterDelete          = [];
 }
diff --git a/system/Commands/Generators/Views/seeder.tpl.php b/system/Commands/Generators/Views/seeder.tpl.php
index bf80c7a7ad9d..6f216280e860 100644
--- a/system/Commands/Generators/Views/seeder.tpl.php
+++ b/system/Commands/Generators/Views/seeder.tpl.php
@@ -6,8 +6,8 @@
 
 class {class} extends Seeder
 {
-	public function run()
-	{
-		//
-	}
+    public function run()
+    {
+        //
+    }
 }
diff --git a/system/Commands/Generators/Views/validation.tpl.php b/system/Commands/Generators/Views/validation.tpl.php
index 60d78a3d63fe..e040a748e9f1 100644
--- a/system/Commands/Generators/Views/validation.tpl.php
+++ b/system/Commands/Generators/Views/validation.tpl.php
@@ -4,8 +4,8 @@
 
 class {class}
 {
-	// public function custom_rule(): bool
-	// {
-	// 	return true;
-	// }
+    // public function custom_rule(): bool
+    // {
+    //     return true;
+    // }
 }
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index a2899c7e0641..7562333a4f09 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
@@ -21,70 +21,65 @@
  */
 class Help extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'help';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'help';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Displays basic usage information.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Displays basic usage information.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'help command_name';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'help command_name';
 
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'command_name' => 'The command name [default: "help"]',
-	];
+    /**
+     * the Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'command_name' => 'The command name [default: "help"]',
+    ];
 
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * Displays the help for spark commands.
+     */
+    public function run(array $params)
+    {
+        $command  = array_shift($params);
+        $command  = $command ?? 'help';
+        $commands = $this->commands->getCommands();
 
-	/**
-	 * Displays the help for spark commands.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$command  = array_shift($params);
-		$command  = $command ?? 'help';
-		$commands = $this->commands->getCommands();
+        if (! $this->commands->verifyCommand($command, $commands)) {
+            return;
+        }
 
-		if (! $this->commands->verifyCommand($command, $commands))
-		{
-			return;
-		}
-
-		$class = new $commands[$command]['class']($this->logger, $this->commands);
-		$class->showHelp();
-	}
+        $class = new $commands[$command]['class']($this->logger, $this->commands);
+        $class->showHelp();
+    }
 }
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
index 3df1a4097b54..da6f76a47b55 100644
--- a/system/Commands/Housekeeping/ClearDebugbar.php
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Housekeeping;
@@ -19,56 +19,52 @@
  */
 class ClearDebugbar extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Housekeeping';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Housekeeping';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'debugbar:clear';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'debugbar:clear';
 
-	/**
-	 * The Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'debugbar:clear';
+    /**
+     * The Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'debugbar:clear';
 
-	/**
-	 * The Command's short description.
-	 *
-	 * @var string
-	 */
-	protected $description = 'Clears all debugbar JSON files.';
+    /**
+     * The Command's short description.
+     *
+     * @var string
+     */
+    protected $description = 'Clears all debugbar JSON files.';
 
-	/**
-	 * Actually runs the command.
-	 *
-	 * @param array $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		helper('filesystem');
+    /**
+     * Actually runs the command.
+     */
+    public function run(array $params)
+    {
+        helper('filesystem');
 
-		if (! delete_files(WRITEPATH . 'debugbar'))
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error('Error deleting the debugbar JSON files.');
-			CLI::newLine();
-			return;
-			// @codeCoverageIgnoreEnd
-		}
+        if (! delete_files(WRITEPATH . 'debugbar')) {
+            // @codeCoverageIgnoreStart
+            CLI::error('Error deleting the debugbar JSON files.');
+            CLI::newLine();
 
-		CLI::write('Debugbar cleared.', 'green');
-		CLI::newLine();
-	}
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        CLI::write('Debugbar cleared.', 'green');
+        CLI::newLine();
+    }
 }
diff --git a/system/Commands/Housekeeping/ClearLogs.php b/system/Commands/Housekeeping/ClearLogs.php
index 6b47d689755c..eb2489c5ea72 100644
--- a/system/Commands/Housekeeping/ClearLogs.php
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Housekeeping;
@@ -19,75 +19,73 @@
  */
 class ClearLogs extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Housekeeping';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Housekeeping';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'logs:clear';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'logs:clear';
 
-	/**
-	 * The Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Clears all log files.';
+    /**
+     * The Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Clears all log files.';
 
-	/**
-	 * The Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'logs:clear [option';
+    /**
+     * The Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'logs:clear [option';
 
-	/**
-	 * The Command's options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--force' => 'Force delete of all logs files without prompting.',
-	];
+    /**
+     * The Command's options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--force' => 'Force delete of all logs files without prompting.',
+    ];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$force = array_key_exists('force', $params) || CLI::getOption('force');
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $force = array_key_exists('force', $params) || CLI::getOption('force');
 
-		if (! $force && CLI::prompt('Are you sure you want to delete the logs?', ['n', 'y']) === 'n')
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error('Deleting logs aborted.', 'light_gray', 'red');
-			CLI::error('If you want, use the "-force" option to force delete all log files.', 'light_gray', 'red');
-			CLI::newLine();
-			return;
-			// @codeCoverageIgnoreEnd
-		}
+        if (! $force && CLI::prompt('Are you sure you want to delete the logs?', ['n', 'y']) === 'n') {
+            // @codeCoverageIgnoreStart
+            CLI::error('Deleting logs aborted.', 'light_gray', 'red');
+            CLI::error('If you want, use the "-force" option to force delete all log files.', 'light_gray', 'red');
+            CLI::newLine();
 
-		helper('filesystem');
+            return;
+            // @codeCoverageIgnoreEnd
+        }
 
-		if (! delete_files(WRITEPATH . 'logs', false, true))
-		{
-			// @codeCoverageIgnoreStart
-			CLI::error('Error in deleting the logs files.', 'light_gray', 'red');
-			CLI::newLine();
-			return;
-			// @codeCoverageIgnoreEnd
-		}
+        helper('filesystem');
 
-		CLI::write('Logs cleared.', 'green');
-		CLI::newLine();
-	}
+        if (! delete_files(WRITEPATH . 'logs', false, true)) {
+            // @codeCoverageIgnoreStart
+            CLI::error('Error in deleting the logs files.', 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        CLI::write('Logs cleared.', 'green');
+        CLI::newLine();
+    }
 }
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index 94b13de6e388..0c808322af6a 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
@@ -22,125 +22,113 @@
  */
 class ListCommands extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'list';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Lists the available commands.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'list';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--simple' => 'Prints a list of the commands with no other info',
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays the help for the spark cli script itself.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$commands = $this->commands->getCommands();
-		ksort($commands);
-
-		// Check for 'simple' format
-		return array_key_exists('simple', $params) || CLI::getOption('simple')
-			? $this->listSimple($commands)
-			: $this->listFull($commands);
-	}
-
-	/**
-	 * Lists the commands with accompanying info.
-	 *
-	 * @param array $commands
-	 */
-	protected function listFull(array $commands)
-	{
-		// Sort into buckets by group
-		$groups = [];
-
-		foreach ($commands as $title => $command)
-		{
-			if (! isset($groups[$command['group']]))
-			{
-				$groups[$command['group']] = [];
-			}
-
-			$groups[$command['group']][$title] = $command;
-		}
-
-		$length = max(array_map('strlen', array_keys($commands)));
-
-		ksort($groups);
-
-		// Display it all...
-		foreach ($groups as $group => $commands)
-		{
-			CLI::write($group, 'yellow');
-			foreach ($commands as $name => $command)
-			{
-				$name   = $this->setPad($name, $length, 2, 2);
-				$output = CLI::color($name, 'green');
-				if (isset($command['description']))
-				{
-					$output .= CLI::wrap($command['description'], 125, strlen($name));
-				}
-				CLI::write($output);
-			}
-
-			if ($group !== array_key_last($groups))
-			{
-				CLI::newLine();
-			}
-		}
-	}
-
-	/**
-	 * Lists the commands only.
-	 *
-	 * @param array $commands
-	 */
-	protected function listSimple(array $commands)
-	{
-		foreach (array_keys($commands) as $title)
-		{
-			CLI::write($title);
-		}
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'list';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Lists the available commands.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'list';
+
+    /**
+     * the Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--simple' => 'Prints a list of the commands with no other info',
+    ];
+
+    /**
+     * Displays the help for the spark cli script itself.
+     */
+    public function run(array $params)
+    {
+        $commands = $this->commands->getCommands();
+        ksort($commands);
+
+        // Check for 'simple' format
+        return array_key_exists('simple', $params) || CLI::getOption('simple')
+            ? $this->listSimple($commands)
+            : $this->listFull($commands);
+    }
+
+    /**
+     * Lists the commands with accompanying info.
+     */
+    protected function listFull(array $commands)
+    {
+        // Sort into buckets by group
+        $groups = [];
+
+        foreach ($commands as $title => $command) {
+            if (! isset($groups[$command['group']])) {
+                $groups[$command['group']] = [];
+            }
+
+            $groups[$command['group']][$title] = $command;
+        }
+
+        $length = max(array_map('strlen', array_keys($commands)));
+
+        ksort($groups);
+
+        // Display it all...
+        foreach ($groups as $group => $commands) {
+            CLI::write($group, 'yellow');
+
+            foreach ($commands as $name => $command) {
+                $name   = $this->setPad($name, $length, 2, 2);
+                $output = CLI::color($name, 'green');
+
+                if (isset($command['description'])) {
+                    $output .= CLI::wrap($command['description'], 125, strlen($name));
+                }
+
+                CLI::write($output);
+            }
+
+            if ($group !== array_key_last($groups)) {
+                CLI::newLine();
+            }
+        }
+    }
+
+    /**
+     * Lists the commands only.
+     */
+    protected function listSimple(array $commands)
+    {
+        foreach (array_keys($commands) as $title) {
+            CLI::write($title);
+        }
+    }
 }
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index cbcda32dd189..2dc9e5ddc8d8 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Server;
@@ -23,107 +23,95 @@
  */
 class Serve extends BaseCommand
 {
-	/**
-	 * Minimum PHP version
-	 *
-	 * @var string
-	 */
-	protected $minPHPVersion = '7.3';
-
-	/**
-	 * Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
-
-	/**
-	 * Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'serve';
-
-	/**
-	 * Description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Launches the CodeIgniter PHP-Development Server.';
-
-	/**
-	 * Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'serve';
-
-	/**
-	 * Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
-	 * The current port offset.
-	 *
-	 * @var integer
-	 */
-	protected $portOffset = 0;
-
-	/**
-	 * The max number of ports to attempt to serve from
-	 *
-	 * @var integer
-	 */
-	protected $tries = 10;
-
-	/**
-	 * Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'--php'  => 'The PHP Binary [default: "PHP_BINARY"]',
-		'--host' => 'The HTTP Host [default: "localhost"]',
-		'--port' => 'The HTTP Host Port [default: "8080"]',
-	];
-
-	/**
-	 * Run the server
-	 *
-	 * @param array $params Parameters
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		// Collect any user-supplied options and apply them.
-		$php  = escapeshellarg(CLI::getOption('php') ?? PHP_BINARY);
-		$host = CLI::getOption('host') ?? 'localhost';
-		$port = (int) (CLI::getOption('port') ?? 8080) + $this->portOffset;
-
-		// Get the party started.
-		CLI::write('CodeIgniter development server started on http://' . $host . ':' . $port, 'green');
-		CLI::write('Press Control-C to stop.');
-
-		// Set the Front Controller path as Document Root.
-		$docroot = escapeshellarg(FCPATH);
-
-		// Mimic Apache's mod_rewrite functionality with user settings.
-		$rewrite = escapeshellarg(__DIR__ . '/rewrite.php');
-
-		// Call PHP's built-in webserver, making sure to set our
-		// base path to the public folder, and to use the rewrite file
-		// to ensure our environment is set and it simulates basic mod_rewrite.
-		passthru($php . ' -S ' . $host . ':' . $port . ' -t ' . $docroot . ' ' . $rewrite, $status);
-
-		if ($status && $this->portOffset < $this->tries)
-		{
-			$this->portOffset++;
-
-			$this->run($params);
-		}
-	}
+    /**
+     * Group
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
+
+    /**
+     * Name
+     *
+     * @var string
+     */
+    protected $name = 'serve';
+
+    /**
+     * Description
+     *
+     * @var string
+     */
+    protected $description = 'Launches the CodeIgniter PHP-Development Server.';
+
+    /**
+     * Usage
+     *
+     * @var string
+     */
+    protected $usage = 'serve';
+
+    /**
+     * Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * The current port offset.
+     *
+     * @var int
+     */
+    protected $portOffset = 0;
+
+    /**
+     * The max number of ports to attempt to serve from
+     *
+     * @var int
+     */
+    protected $tries = 10;
+
+    /**
+     * Options
+     *
+     * @var array
+     */
+    protected $options = [
+        '--php'  => 'The PHP Binary [default: "PHP_BINARY"]',
+        '--host' => 'The HTTP Host [default: "localhost"]',
+        '--port' => 'The HTTP Host Port [default: "8080"]',
+    ];
+
+    /**
+     * Run the server
+     */
+    public function run(array $params)
+    {
+        // Collect any user-supplied options and apply them.
+        $php  = escapeshellarg(CLI::getOption('php') ?? PHP_BINARY);
+        $host = CLI::getOption('host') ?? 'localhost';
+        $port = (int) (CLI::getOption('port') ?? 8080) + $this->portOffset;
+
+        // Get the party started.
+        CLI::write('CodeIgniter development server started on http://' . $host . ':' . $port, 'green');
+        CLI::write('Press Control-C to stop.');
+
+        // Set the Front Controller path as Document Root.
+        $docroot = escapeshellarg(FCPATH);
+
+        // Mimic Apache's mod_rewrite functionality with user settings.
+        $rewrite = escapeshellarg(__DIR__ . '/rewrite.php');
+
+        // Call PHP's built-in webserver, making sure to set our
+        // base path to the public folder, and to use the rewrite file
+        // to ensure our environment is set and it simulates basic mod_rewrite.
+        passthru($php . ' -S ' . $host . ':' . $port . ' -t ' . $docroot . ' ' . $rewrite, $status);
+
+        if ($status && $this->portOffset < $this->tries) {
+            $this->portOffset++;
+
+            $this->run($params);
+        }
+    }
 }
diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index 89290be7db86..ef5dc0734f23 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 /*
@@ -20,9 +20,8 @@
 
 // @codeCoverageIgnoreStart
 // Avoid this file run when listing commands
-if (PHP_SAPI === 'cli')
-{
-	return;
+if (PHP_SAPI === 'cli') {
+    return;
 }
 
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
@@ -35,9 +34,8 @@
 
 // If $path is an existing file or folder within the public folder
 // then let the request handle it like normal.
-if ($uri !== '/' && (is_file($path) || is_dir($path)))
-{
-	return false;
+if ($uri !== '/' && (is_file($path) || is_dir($path))) {
+    return false;
 }
 
 // Otherwise, we'll load the index file and let
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index 1fa4331cce87..5586de575dbd 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands\Utilities;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -12,149 +21,135 @@
  */
 final class Environment extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'env';
-
-	/**
-	 * The Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Retrieves the current environment, or set a new one.';
-
-	/**
-	 * The Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'env [<environment>]';
-
-	/**
-	 * The Command's arguments
-	 *
-	 * @var array<string, string>
-	 */
-	protected $arguments = [
-		'environment' => '[Optional] The new environment to set. If none is provided, this will print the current environment.',
-	];
-
-	/**
-	 * The Command's options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
-
-	/**
-	 * Allowed values for environment. `testing` is excluded
-	 * since spark won't work on it.
-	 *
-	 * @var array<int, string>
-	 */
-	private static $knownTypes = [
-		'production',
-		'development',
-	];
-
-	/**
-	 * @inheritDoc
-	 *
-	 * @param array<string, mixed> $params
-	 *
-	 * @return void
-	 */
-	public function run(array $params)
-	{
-		if ($params === [])
-		{
-			CLI::write(sprintf('Your environment is currently set as %s.', CLI::color($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, 'green')));
-			CLI::newLine();
-
-			return;
-		}
-
-		$env = strtolower(array_shift($params));
-
-		if ($env === 'testing')
-		{
-			CLI::error('The "testing" environment is reserved for PHPUnit testing.', 'light_gray', 'red');
-			CLI::error('You will not be able to run spark under a "testing" environment.', 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-		}
-
-		if (! in_array($env, self::$knownTypes, true))
-		{
-			CLI::error(sprintf('Invalid environment type "%s". Expected one of "%s".', $env, implode('" and "', self::$knownTypes)), 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-		}
-
-		if (! $this->writeNewEnvironmentToEnvFile($env))
-		{
-			CLI::error('Error in writing new environment to .env file.', 'light_gray', 'red');
-			CLI::newLine();
-
-			return;
-		}
-
-		// force DotEnv to reload the new environment
-		// however we cannot redefine the ENVIRONMENT constant
-		putenv('CI_ENVIRONMENT');
-		unset($_ENV['CI_ENVIRONMENT'], $_SERVER['CI_ENVIRONMENT']);
-		(new DotEnv(ROOTPATH))->load();
-
-		CLI::write(sprintf('Environment is successfully changed to "%s".', $env), 'green');
-		CLI::write('The ENVIRONMENT constant will be changed in the next script execution.');
-		CLI::newLine();
-	}
-
-	/**
-	 * @see https://regex101.com/r/4sSORp/1 for the regex in action
-	 *
-	 * @param string $newEnv
-	 *
-	 * @return boolean
-	 */
-	private function writeNewEnvironmentToEnvFile(string $newEnv): bool
-	{
-		$baseEnv = ROOTPATH . 'env';
-		$envFile = ROOTPATH . '.env';
-
-		if (! is_file($envFile))
-		{
-			if (! is_file($baseEnv))
-			{
-				CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
-				CLI::write('It is impossible to write the new environment type.', 'yellow');
-				CLI::newLine();
-
-				return false;
-			}
-
-			copy($baseEnv, $envFile);
-		}
-
-		$pattern = preg_quote($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, '/');
-		$pattern = sprintf('/^[#\s]*CI_ENVIRONMENT[=\s]+%s$/m', $pattern);
-
-		return file_put_contents(
-			$envFile,
-			preg_replace($pattern, "\nCI_ENVIRONMENT = {$newEnv}", file_get_contents($envFile), -1, $count)
-		) !== false && $count > 0;
-	}
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'env';
+
+    /**
+     * The Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Retrieves the current environment, or set a new one.';
+
+    /**
+     * The Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'env [<environment>]';
+
+    /**
+     * The Command's arguments
+     *
+     * @var array<string, string>
+     */
+    protected $arguments = [
+        'environment' => '[Optional] The new environment to set. If none is provided, this will print the current environment.',
+    ];
+
+    /**
+     * The Command's options
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * Allowed values for environment. `testing` is excluded
+     * since spark won't work on it.
+     *
+     * @var array<int, string>
+     */
+    private static $knownTypes = [
+        'production',
+        'development',
+    ];
+
+    /**
+     * {@inheritDoc}
+     */
+    public function run(array $params)
+    {
+        if ($params === []) {
+            CLI::write(sprintf('Your environment is currently set as %s.', CLI::color($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, 'green')));
+            CLI::newLine();
+
+            return;
+        }
+
+        $env = strtolower(array_shift($params));
+
+        if ($env === 'testing') {
+            CLI::error('The "testing" environment is reserved for PHPUnit testing.', 'light_gray', 'red');
+            CLI::error('You will not be able to run spark under a "testing" environment.', 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        if (! in_array($env, self::$knownTypes, true)) {
+            CLI::error(sprintf('Invalid environment type "%s". Expected one of "%s".', $env, implode('" and "', self::$knownTypes)), 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        if (! $this->writeNewEnvironmentToEnvFile($env)) {
+            CLI::error('Error in writing new environment to .env file.', 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        // force DotEnv to reload the new environment
+        // however we cannot redefine the ENVIRONMENT constant
+        putenv('CI_ENVIRONMENT');
+        unset($_ENV['CI_ENVIRONMENT'], $_SERVER['CI_ENVIRONMENT']);
+        (new DotEnv(ROOTPATH))->load();
+
+        CLI::write(sprintf('Environment is successfully changed to "%s".', $env), 'green');
+        CLI::write('The ENVIRONMENT constant will be changed in the next script execution.');
+        CLI::newLine();
+    }
+
+    /**
+     * @see https://regex101.com/r/4sSORp/1 for the regex in action
+     */
+    private function writeNewEnvironmentToEnvFile(string $newEnv): bool
+    {
+        $baseEnv = ROOTPATH . 'env';
+        $envFile = ROOTPATH . '.env';
+
+        if (! is_file($envFile)) {
+            if (! is_file($baseEnv)) {
+                CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
+                CLI::write('It is impossible to write the new environment type.', 'yellow');
+                CLI::newLine();
+
+                return false;
+            }
+
+            copy($baseEnv, $envFile);
+        }
+
+        $pattern = preg_quote($_SERVER['CI_ENVIRONMENT'] ?? ENVIRONMENT, '/');
+        $pattern = sprintf('/^[#\s]*CI_ENVIRONMENT[=\s]+%s$/m', $pattern);
+
+        return file_put_contents(
+            $envFile,
+            preg_replace($pattern, "\nCI_ENVIRONMENT = {$newEnv}", file_get_contents($envFile), -1, $count)
+        ) !== false && $count > 0;
+    }
 }
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index c2c5dcf86d6a..989f02036e86 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
@@ -22,78 +22,74 @@
  */
 class Namespaces extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'namespaces';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'namespaces';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Verifies your namespaces are setup correctly.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Verifies your namespaces are setup correctly.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'namespaces';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'namespaces';
 
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+    /**
+     * the Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [];
 
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * Displays the help for the spark cli script itself.
+     */
+    public function run(array $params)
+    {
+        $config = new Autoload();
 
-	/**
-	 * Displays the help for the spark cli script itself.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$config = new Autoload();
+        $tbody = [];
 
-		$tbody = [];
-		foreach ($config->psr4 as $ns => $path)
-		{
-			$path = realpath($path) ?: $path;
+        foreach ($config->psr4 as $ns => $path) {
+            $path = realpath($path) ?: $path;
 
-			$tbody[] = [
-				$ns,
-				realpath($path) ?: $path,
-				is_dir($path) ? 'Yes' : 'MISSING',
-			];
-		}
+            $tbody[] = [
+                $ns,
+                realpath($path) ?: $path,
+                is_dir($path) ? 'Yes' : 'MISSING',
+            ];
+        }
 
-		$thead = [
-			'Namespace',
-			'Path',
-			'Found?',
-		];
+        $thead = [
+            'Namespace',
+            'Path',
+            'Found?',
+        ];
 
-		CLI::table($tbody, $thead);
-	}
+        CLI::table($tbody, $thead);
+    }
 }
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 92d240cc51fd..210d1e11c5f7 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
@@ -22,97 +22,91 @@
  */
 class Routes extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'routes';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'routes';
 
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Displays all of user-defined routes. Does NOT display auto-detected routes.';
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Displays all of user-defined routes. Does NOT display auto-detected routes.';
 
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'routes';
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'routes';
 
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+    /**
+     * the Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [];
 
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * Displays the help for the spark cli script itself.
+     */
+    public function run(array $params)
+    {
+        $collection = Services::routes(true);
+        $methods    = [
+            'get',
+            'head',
+            'post',
+            'patch',
+            'put',
+            'delete',
+            'options',
+            'trace',
+            'connect',
+            'cli',
+        ];
 
-	/**
-	 * Displays the help for the spark cli script itself.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$collection = Services::routes(true);
-		$methods    = [
-			'get',
-			'head',
-			'post',
-			'patch',
-			'put',
-			'delete',
-			'options',
-			'trace',
-			'connect',
-			'cli',
-		];
+        $tbody = [];
 
-		$tbody = [];
-		foreach ($methods as $method)
-		{
-			$routes = $collection->getRoutes($method);
+        foreach ($methods as $method) {
+            $routes = $collection->getRoutes($method);
 
-			foreach ($routes as $route => $handler)
-			{
-				// filter for strings, as callbacks aren't displayable
-				if (is_string($handler))
-				{
-					$tbody[] = [
-						strtoupper($method),
-						$route,
-						$handler,
-					];
-				}
-			}
-		}
+            foreach ($routes as $route => $handler) {
+                // filter for strings, as callbacks aren't displayable
+                if (is_string($handler)) {
+                    $tbody[] = [
+                        strtoupper($method),
+                        $route,
+                        $handler,
+                    ];
+                }
+            }
+        }
 
-		$thead = [
-			'Method',
-			'Route',
-			'Handler',
-		];
+        $thead = [
+            'Method',
+            'Route',
+            'Handler',
+        ];
 
-		CLI::table($tbody, $thead);
-	}
+        CLI::table($tbody, $thead);
+    }
 }
diff --git a/system/Common.php b/system/Common.php
index f975ab3afa06..19be6398a8e1 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Cache\CacheInterface;
@@ -32,1265 +32,1081 @@
 use Config\View;
 use Laminas\Escaper\Escaper;
 
-//--------------------------------------------------------------------
 // Services Convenience Functions
-//--------------------------------------------------------------------
-
-if (! function_exists('app_timezone'))
-{
-	/**
-	 * Returns the timezone the application has been set to display
-	 * dates in. This might be different than the timezone set
-	 * at the server level, as you often want to stores dates in UTC
-	 * and convert them on the fly for the user.
-	 *
-	 * @return string
-	 */
-	function app_timezone(): string
-	{
-		$config = config(App::class);
-
-		return $config->appTimezone;
-	}
+
+if (! function_exists('app_timezone')) {
+    /**
+     * Returns the timezone the application has been set to display
+     * dates in. This might be different than the timezone set
+     * at the server level, as you often want to stores dates in UTC
+     * and convert them on the fly for the user.
+     */
+    function app_timezone(): string
+    {
+        $config = config(App::class);
+
+        return $config->appTimezone;
+    }
 }
 
-if (! function_exists('cache'))
-{
-	/**
-	 * A convenience method that provides access to the Cache
-	 * object. If no parameter is provided, will return the object,
-	 * otherwise, will attempt to return the cached value.
-	 *
-	 * Examples:
-	 *    cache()->save('foo', 'bar');
-	 *    $foo = cache('bar');
-	 *
-	 * @param string|null $key
-	 *
-	 * @return CacheInterface|mixed
-	 */
-	function cache(string $key = null)
-	{
-		$cache = Services::cache();
-
-		// No params - return cache object
-		if (is_null($key))
-		{
-			return $cache;
-		}
-
-		// Still here? Retrieve the value.
-		return $cache->get($key);
-	}
+if (! function_exists('cache')) {
+    /**
+     * A convenience method that provides access to the Cache
+     * object. If no parameter is provided, will return the object,
+     * otherwise, will attempt to return the cached value.
+     *
+     * Examples:
+     *    cache()->save('foo', 'bar');
+     *    $foo = cache('bar');
+     *
+     * @return CacheInterface|mixed
+     */
+    function cache(?string $key = null)
+    {
+        $cache = Services::cache();
+
+        // No params - return cache object
+        if ($key === null) {
+            return $cache;
+        }
+
+        // Still here? Retrieve the value.
+        return $cache->get($key);
+    }
 }
 
-if (! function_exists('clean_path'))
-{
-	/**
-	 * A convenience method to clean paths for
-	 * a nicer looking output. Useful for exception
-	 * handling, error logging, etc.
-	 *
-	 * @param string $path
-	 *
-	 * @return string
-	 */
-	function clean_path(string $path): string
-	{
-		// Resolve relative paths
-		$path = realpath($path) ?: $path;
-
-		switch (true)
-		{
-			case strpos($path, APPPATH) === 0:
-				return 'APPPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(APPPATH));
-			case strpos($path, SYSTEMPATH) === 0:
-				return 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(SYSTEMPATH));
-			case strpos($path, FCPATH) === 0:
-				return 'FCPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(FCPATH));
-			case defined('VENDORPATH') && strpos($path, VENDORPATH) === 0:
-				return 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(VENDORPATH));
-			case strpos($path, ROOTPATH) === 0:
-				return 'ROOTPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(ROOTPATH));
-			default:
-				return $path;
-		}
-	}
+if (! function_exists('clean_path')) {
+    /**
+     * A convenience method to clean paths for
+     * a nicer looking output. Useful for exception
+     * handling, error logging, etc.
+     */
+    function clean_path(string $path): string
+    {
+        // Resolve relative paths
+        $path = realpath($path) ?: $path;
+
+        switch (true) {
+            case strpos($path, APPPATH) === 0:
+                return 'APPPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(APPPATH));
+
+            case strpos($path, SYSTEMPATH) === 0:
+                return 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(SYSTEMPATH));
+
+            case strpos($path, FCPATH) === 0:
+                return 'FCPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(FCPATH));
+
+            case defined('VENDORPATH') && strpos($path, VENDORPATH) === 0:
+                return 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(VENDORPATH));
+
+            case strpos($path, ROOTPATH) === 0:
+                return 'ROOTPATH' . DIRECTORY_SEPARATOR . substr($path, strlen(ROOTPATH));
+
+            default:
+                return $path;
+        }
+    }
 }
 
-if (! function_exists('command'))
-{
-	/**
-	 * Runs a single command.
-	 * Input expected in a single string as would
-	 * be used on the command line itself:
-	 *
-	 *  > command('migrate:create SomeMigration');
-	 *
-	 * @param string $command
-	 *
-	 * @return false|string
-	 */
-	function command(string $command)
-	{
-		$runner      = service('commands');
-		$regexString = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
-		$regexQuoted = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
-
-		$args   = [];
-		$length = strlen($command);
-		$cursor = 0;
-
-		/**
-		 * Adopted from Symfony's `StringInput::tokenize()` with few changes.
-		 *
-		 * @see https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Input/StringInput.php
-		 */
-		while ($cursor < $length)
-		{
-			if (preg_match('/\s+/A', $command, $match, 0, $cursor))
-			{
-				// nothing to do
-			}
-			elseif (preg_match('/' . $regexQuoted . '/A', $command, $match, 0, $cursor))
-			{
-				$args[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
-			}
-			elseif (preg_match('/' . $regexString . '/A', $command, $match, 0, $cursor))
-			{
-				$args[] = stripcslashes($match[1]);
-			}
-			else
-			{
-				// @codeCoverageIgnoreStart
-				throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($command, $cursor, 10)));
-				// @codeCoverageIgnoreEnd
-			}
-
-			$cursor += strlen($match[0]);
-		}
-
-		$command     = array_shift($args);
-		$params      = [];
-		$optionValue = false;
-
-		foreach ($args as $i => $arg)
-		{
-			if (mb_strpos($arg, '-') !== 0)
-			{
-				if ($optionValue)
-				{
-					// if this was an option value, it was already
-					// included in the previous iteration
-					$optionValue = false;
-				}
-				else
-				{
-					// add to segments if not starting with '-'
-					// and not an option value
-					$params[] = $arg;
-				}
-
-				continue;
-			}
-
-			$arg   = ltrim($arg, '-');
-			$value = null;
-
-			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
-			{
-				$value       = $args[$i + 1];
-				$optionValue = true;
-			}
-
-			$params[$arg] = $value;
-		}
-
-		ob_start();
-		$runner->run($command, $params);
-
-		return ob_get_clean();
-	}
+if (! function_exists('command')) {
+    /**
+     * Runs a single command.
+     * Input expected in a single string as would
+     * be used on the command line itself:
+     *
+     *  > command('migrate:create SomeMigration');
+     *
+     * @return false|string
+     */
+    function command(string $command)
+    {
+        $runner      = service('commands');
+        $regexString = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+        $regexQuoted = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
+
+        $args   = [];
+        $length = strlen($command);
+        $cursor = 0;
+
+        /**
+         * Adopted from Symfony's `StringInput::tokenize()` with few changes.
+         *
+         * @see https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Console/Input/StringInput.php
+         */
+        while ($cursor < $length) {
+            if (preg_match('/\s+/A', $command, $match, 0, $cursor)) {
+                // nothing to do
+            } elseif (preg_match('/' . $regexQuoted . '/A', $command, $match, 0, $cursor)) {
+                $args[] = stripcslashes(substr($match[0], 1, strlen($match[0]) - 2));
+            } elseif (preg_match('/' . $regexString . '/A', $command, $match, 0, $cursor)) {
+                $args[] = stripcslashes($match[1]);
+            } else {
+                // @codeCoverageIgnoreStart
+                throw new InvalidArgumentException(sprintf('Unable to parse input near "... %s ...".', substr($command, $cursor, 10)));
+                // @codeCoverageIgnoreEnd
+            }
+
+            $cursor += strlen($match[0]);
+        }
+
+        $command     = array_shift($args);
+        $params      = [];
+        $optionValue = false;
+
+        foreach ($args as $i => $arg) {
+            if (mb_strpos($arg, '-') !== 0) {
+                if ($optionValue) {
+                    // if this was an option value, it was already
+                    // included in the previous iteration
+                    $optionValue = false;
+                } else {
+                    // add to segments if not starting with '-'
+                    // and not an option value
+                    $params[] = $arg;
+                }
+
+                continue;
+            }
+
+            $arg   = ltrim($arg, '-');
+            $value = null;
+
+            if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
+                $value       = $args[$i + 1];
+                $optionValue = true;
+            }
+
+            $params[$arg] = $value;
+        }
+
+        ob_start();
+        $runner->run($command, $params);
+
+        return ob_get_clean();
+    }
 }
 
-if (! function_exists('config'))
-{
-	/**
-	 * More simple way of getting config instances from Factories
-	 *
-	 * @param string  $name
-	 * @param boolean $getShared
-	 *
-	 * @return mixed
-	 */
-	function config(string $name, bool $getShared = true)
-	{
-		return Factories::config($name, ['getShared' => $getShared]);
-	}
+if (! function_exists('config')) {
+    /**
+     * More simple way of getting config instances from Factories
+     *
+     * @return mixed
+     */
+    function config(string $name, bool $getShared = true)
+    {
+        return Factories::config($name, ['getShared' => $getShared]);
+    }
 }
 
-if (! function_exists('cookie'))
-{
-	/**
-	 * Simpler way to create a new Cookie instance.
-	 *
-	 * @param string $name    Name of the cookie
-	 * @param string $value   Value of the cookie
-	 * @param array  $options Array of options to be passed to the cookie
-	 *
-	 * @throws CookieException
-	 *
-	 * @return Cookie
-	 */
-	function cookie(string $name, string $value = '', array $options = []): Cookie
-	{
-		return new Cookie($name, $value, $options);
-	}
+if (! function_exists('cookie')) {
+    /**
+     * Simpler way to create a new Cookie instance.
+     *
+     * @param string $name    Name of the cookie
+     * @param string $value   Value of the cookie
+     * @param array  $options Array of options to be passed to the cookie
+     *
+     * @throws CookieException
+     */
+    function cookie(string $name, string $value = '', array $options = []): Cookie
+    {
+        return new Cookie($name, $value, $options);
+    }
 }
 
-if (! function_exists('cookies'))
-{
-	/**
-	 * Fetches the global `CookieStore` instance held by `Response`.
-	 *
-	 * @param Cookie[] $cookies   If `getGlobal` is false, this is passed to CookieStore's constructor
-	 * @param boolean  $getGlobal If false, creates a new instance of CookieStore
-	 *
-	 * @return CookieStore
-	 */
-	function cookies(array $cookies = [], bool $getGlobal = true): CookieStore
-	{
-		if ($getGlobal)
-		{
-			return Services::response()->getCookieStore();
-		}
-
-		return new CookieStore($cookies);
-	}
+if (! function_exists('cookies')) {
+    /**
+     * Fetches the global `CookieStore` instance held by `Response`.
+     *
+     * @param Cookie[] $cookies   If `getGlobal` is false, this is passed to CookieStore's constructor
+     * @param bool     $getGlobal If false, creates a new instance of CookieStore
+     */
+    function cookies(array $cookies = [], bool $getGlobal = true): CookieStore
+    {
+        if ($getGlobal) {
+            return Services::response()->getCookieStore();
+        }
+
+        return new CookieStore($cookies);
+    }
 }
 
-if (! function_exists('csrf_token'))
-{
-	/**
-	 * Returns the CSRF token name.
-	 * Can be used in Views when building hidden inputs manually,
-	 * or used in javascript vars when using APIs.
-	 *
-	 * @return string
-	 */
-	function csrf_token(): string
-	{
-		return Services::security()->getTokenName();
-	}
+if (! function_exists('csrf_token')) {
+    /**
+     * Returns the CSRF token name.
+     * Can be used in Views when building hidden inputs manually,
+     * or used in javascript vars when using APIs.
+     */
+    function csrf_token(): string
+    {
+        return Services::security()->getTokenName();
+    }
 }
 
-if (! function_exists('csrf_header'))
-{
-	/**
-	 * Returns the CSRF header name.
-	 * Can be used in Views by adding it to the meta tag
-	 * or used in javascript to define a header name when using APIs.
-	 *
-	 * @return string
-	 */
-	function csrf_header(): string
-	{
-		return Services::security()->getHeaderName();
-	}
+if (! function_exists('csrf_header')) {
+    /**
+     * Returns the CSRF header name.
+     * Can be used in Views by adding it to the meta tag
+     * or used in javascript to define a header name when using APIs.
+     */
+    function csrf_header(): string
+    {
+        return Services::security()->getHeaderName();
+    }
 }
 
-if (! function_exists('csrf_hash'))
-{
-	/**
-	 * Returns the current hash value for the CSRF protection.
-	 * Can be used in Views when building hidden inputs manually,
-	 * or used in javascript vars for API usage.
-	 *
-	 * @return string
-	 */
-	function csrf_hash(): string
-	{
-		return Services::security()->getHash();
-	}
+if (! function_exists('csrf_hash')) {
+    /**
+     * Returns the current hash value for the CSRF protection.
+     * Can be used in Views when building hidden inputs manually,
+     * or used in javascript vars for API usage.
+     */
+    function csrf_hash(): string
+    {
+        return Services::security()->getHash();
+    }
 }
 
-if (! function_exists('csrf_field'))
-{
-	/**
-	 * Generates a hidden input field for use within manually generated forms.
-	 *
-	 * @param string|null $id
-	 *
-	 * @return string
-	 */
-	function csrf_field(string $id = null): string
-	{
-		return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
-	}
+if (! function_exists('csrf_field')) {
+    /**
+     * Generates a hidden input field for use within manually generated forms.
+     */
+    function csrf_field(?string $id = null): string
+    {
+        return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
+    }
 }
 
-if (! function_exists('csrf_meta'))
-{
-	/**
-	 * Generates a meta tag for use within javascript calls.
-	 *
-	 * @param string|null $id
-	 *
-	 * @return string
-	 */
-	function csrf_meta(string $id = null): string
-	{
-		return '<meta' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '" />';
-	}
+if (! function_exists('csrf_meta')) {
+    /**
+     * Generates a meta tag for use within javascript calls.
+     */
+    function csrf_meta(?string $id = null): string
+    {
+        return '<meta' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '" />';
+    }
 }
 
-if (! function_exists('db_connect'))
-{
-	/**
-	 * Grabs a database connection and returns it to the user.
-	 *
-	 * This is a convenience wrapper for \Config\Database::connect()
-	 * and supports the same parameters. Namely:
-	 *
-	 * When passing in $db, you may pass any of the following to connect:
-	 * - group name
-	 * - existing connection instance
-	 * - array of database configuration values
-	 *
-	 * If $getShared === false then a new connection instance will be provided,
-	 * otherwise it will all calls will return the same instance.
-	 *
-	 * @param ConnectionInterface|array|string|null $db
-	 * @param boolean                               $getShared
-	 *
-	 * @return BaseConnection
-	 */
-	function db_connect($db = null, bool $getShared = true)
-	{
-		return Database::connect($db, $getShared);
-	}
+if (! function_exists('db_connect')) {
+    /**
+     * Grabs a database connection and returns it to the user.
+     *
+     * This is a convenience wrapper for \Config\Database::connect()
+     * and supports the same parameters. Namely:
+     *
+     * When passing in $db, you may pass any of the following to connect:
+     * - group name
+     * - existing connection instance
+     * - array of database configuration values
+     *
+     * If $getShared === false then a new connection instance will be provided,
+     * otherwise it will all calls will return the same instance.
+     *
+     * @param array|ConnectionInterface|string|null $db
+     *
+     * @return BaseConnection
+     */
+    function db_connect($db = null, bool $getShared = true)
+    {
+        return Database::connect($db, $getShared);
+    }
 }
 
-if (! function_exists('dd'))
-{
-	/**
-	 * Prints a Kint debug report and exits.
-	 *
-	 * @param array ...$vars
-	 *
-	 * @codeCoverageIgnore Can't be tested ... exits
-	 */
-	function dd(...$vars)
-	{
-		// @codeCoverageIgnoreStart
-		Kint::$aliases[] = 'dd';
-		Kint::dump(...$vars);
-		exit;
-		// @codeCoverageIgnoreEnd
-	}
+if (! function_exists('dd')) {
+    /**
+     * Prints a Kint debug report and exits.
+     *
+     * @param array ...$vars
+     *
+     * @codeCoverageIgnore Can't be tested ... exits
+     */
+    function dd(...$vars)
+    {
+        // @codeCoverageIgnoreStart
+        Kint::$aliases[] = 'dd';
+        Kint::dump(...$vars);
+
+        exit;
+        // @codeCoverageIgnoreEnd
+    }
 }
 
-if (! function_exists('env'))
-{
-	/**
-	 * Allows user to retrieve values from the environment
-	 * variables that have been set. Especially useful for
-	 * retrieving values set from the .env file for
-	 * use in config files.
-	 *
-	 * @param string      $key
-	 * @param string|null $default
-	 *
-	 * @return mixed
-	 */
-	function env(string $key, $default = null)
-	{
-		$value = $_ENV[$key] ?? $_SERVER[$key] ?? getenv($key);
-
-		// Not found? Return the default value
-		if ($value === false)
-		{
-			return $default;
-		}
-
-		// Handle any boolean values
-		switch (strtolower($value))
-		{
-			case 'true':
-				return true;
-			case 'false':
-				return false;
-			case 'empty':
-				return '';
-			case 'null':
-				return null;
-		}
-
-		return $value;
-	}
+if (! function_exists('env')) {
+    /**
+     * Allows user to retrieve values from the environment
+     * variables that have been set. Especially useful for
+     * retrieving values set from the .env file for
+     * use in config files.
+     *
+     * @param string|null $default
+     *
+     * @return mixed
+     */
+    function env(string $key, $default = null)
+    {
+        $value = $_ENV[$key] ?? $_SERVER[$key] ?? getenv($key);
+
+        // Not found? Return the default value
+        if ($value === false) {
+            return $default;
+        }
+
+        // Handle any boolean values
+        switch (strtolower($value)) {
+            case 'true':
+                return true;
+
+            case 'false':
+                return false;
+
+            case 'empty':
+                return '';
+
+            case 'null':
+                return null;
+        }
+
+        return $value;
+    }
 }
 
-if (! function_exists('esc'))
-{
-	/**
-	 * Performs simple auto-escaping of data for security reasons.
-	 * Might consider making this more complex at a later date.
-	 *
-	 * If $data is a string, then it simply escapes and returns it.
-	 * If $data is an array, then it loops over it, escaping each
-	 * 'value' of the key/value pairs.
-	 *
-	 * Valid context values: html, js, css, url, attr, raw, null
-	 *
-	 * @param string|array $data
-	 * @param string       $context
-	 * @param string       $encoding
-	 *
-	 * @return string|array
-	 * @throws InvalidArgumentException
-	 */
-	function esc($data, string $context = 'html', string $encoding = null)
-	{
-		if (is_array($data))
-		{
-			foreach ($data as &$value)
-			{
-				$value = esc($value, $context);
-			}
-		}
-
-		if (is_string($data))
-		{
-			$context = strtolower($context);
-
-			// Provide a way to NOT escape data since
-			// this could be called automatically by
-			// the View library.
-			if (empty($context) || $context === 'raw')
-			{
-				return $data;
-			}
-
-			if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true))
-			{
-				throw new InvalidArgumentException('Invalid escape context provided.');
-			}
-
-			$method = $context === 'attr' ? 'escapeHtmlAttr' : 'escape' . ucfirst($context);
-
-			static $escaper;
-			if (! $escaper)
-			{
-				$escaper = new Escaper($encoding);
-			}
-
-			if ($encoding && $escaper->getEncoding() !== $encoding)
-			{
-				$escaper = new Escaper($encoding);
-			}
-
-			$data = $escaper->$method($data);
-		}
-
-		return $data;
-	}
+if (! function_exists('esc')) {
+    /**
+     * Performs simple auto-escaping of data for security reasons.
+     * Might consider making this more complex at a later date.
+     *
+     * If $data is a string, then it simply escapes and returns it.
+     * If $data is an array, then it loops over it, escaping each
+     * 'value' of the key/value pairs.
+     *
+     * Valid context values: html, js, css, url, attr, raw, null
+     *
+     * @param array|string $data
+     * @param string       $encoding
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return array|string
+     */
+    function esc($data, string $context = 'html', ?string $encoding = null)
+    {
+        if (is_array($data)) {
+            foreach ($data as &$value) {
+                $value = esc($value, $context);
+            }
+        }
+
+        if (is_string($data)) {
+            $context = strtolower($context);
+
+            // Provide a way to NOT escape data since
+            // this could be called automatically by
+            // the View library.
+            if (empty($context) || $context === 'raw') {
+                return $data;
+            }
+
+            if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true)) {
+                throw new InvalidArgumentException('Invalid escape context provided.');
+            }
+
+            $method = $context === 'attr' ? 'escapeHtmlAttr' : 'escape' . ucfirst($context);
+
+            static $escaper;
+            if (! $escaper) {
+                $escaper = new Escaper($encoding);
+            }
+
+            if ($encoding && $escaper->getEncoding() !== $encoding) {
+                $escaper = new Escaper($encoding);
+            }
+
+            $data = $escaper->{$method}($data);
+        }
+
+        return $data;
+    }
 }
 
-if (! function_exists('force_https'))
-{
-	/**
-	 * Used to force a page to be accessed in via HTTPS.
-	 * Uses a standard redirect, plus will set the HSTS header
-	 * for modern browsers that support, which gives best
-	 * protection against man-in-the-middle attacks.
-	 *
-	 * @see https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security
-	 *
-	 * @param integer           $duration How long should the SSL header be set for? (in seconds)
-	 *                                    Defaults to 1 year.
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 *
-	 * @throws HTTPException
-	 */
-	function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null)
-	{
-		if (is_null($request))
-		{
-			$request = Services::request(null, true);
-		}
-		if (is_null($response))
-		{
-			$response = Services::response(null, true);
-		}
-
-		if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'test'))
-		{
-			// @codeCoverageIgnoreStart
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		// If the session status is active, we should regenerate
-		// the session ID for safety sake.
-		if (ENVIRONMENT !== 'testing' && session_status() === PHP_SESSION_ACTIVE)
-		{
-			// @codeCoverageIgnoreStart
-			Services::session(null, true)
-				->regenerate();
-			// @codeCoverageIgnoreEnd
-		}
-
-		$baseURL = config(App::class)->baseURL;
-
-		if (strpos($baseURL, 'https://') === 0)
-		{
-			$baseURL = (string) substr($baseURL, strlen('https://'));
-		}
-		elseif (strpos($baseURL, 'http://') === 0)
-		{
-			$baseURL = (string) substr($baseURL, strlen('http://'));
-		}
-
-		$uri = URI::createURIString(
-			'https', $baseURL, $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
-			$request->uri->getQuery(), $request->uri->getFragment()
-		);
-
-		// Set an HSTS header
-		$response->setHeader('Strict-Transport-Security', 'max-age=' . $duration);
-		$response->redirect($uri);
-		$response->sendHeaders();
-
-		if (ENVIRONMENT !== 'testing')
-		{
-			// @codeCoverageIgnoreStart
-			exit();
-			// @codeCoverageIgnoreEnd
-		}
-	}
+if (! function_exists('force_https')) {
+    /**
+     * Used to force a page to be accessed in via HTTPS.
+     * Uses a standard redirect, plus will set the HSTS header
+     * for modern browsers that support, which gives best
+     * protection against man-in-the-middle attacks.
+     *
+     * @see https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security
+     *
+     * @param int               $duration How long should the SSL header be set for? (in seconds)
+     *                                    Defaults to 1 year.
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     *
+     * @throws HTTPException
+     */
+    function force_https(int $duration = 31536000, ?RequestInterface $request = null, ?ResponseInterface $response = null)
+    {
+        if ($request === null) {
+            $request = Services::request(null, true);
+        }
+        if ($response === null) {
+            $response = Services::response(null, true);
+        }
+
+        if ((ENVIRONMENT !== 'testing' && (is_cli() || $request->isSecure())) || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'test')) {
+            // @codeCoverageIgnoreStart
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        // If the session status is active, we should regenerate
+        // the session ID for safety sake.
+        if (ENVIRONMENT !== 'testing' && session_status() === PHP_SESSION_ACTIVE) {
+            // @codeCoverageIgnoreStart
+            Services::session(null, true)
+                ->regenerate();
+            // @codeCoverageIgnoreEnd
+        }
+
+        $baseURL = config(App::class)->baseURL;
+
+        if (strpos($baseURL, 'https://') === 0) {
+            $baseURL = substr($baseURL, strlen('https://'));
+        } elseif (strpos($baseURL, 'http://') === 0) {
+            $baseURL = substr($baseURL, strlen('http://'));
+        }
+
+        $uri = URI::createURIString(
+            'https',
+            $baseURL,
+            $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
+            $request->uri->getQuery(),
+            $request->uri->getFragment()
+        );
+
+        // Set an HSTS header
+        $response->setHeader('Strict-Transport-Security', 'max-age=' . $duration);
+        $response->redirect($uri);
+        $response->sendHeaders();
+
+        if (ENVIRONMENT !== 'testing') {
+            // @codeCoverageIgnoreStart
+            exit();
+            // @codeCoverageIgnoreEnd
+        }
+    }
 }
 
-if (! function_exists('function_usable'))
-{
-	/**
-	 * Function usable
-	 *
-	 * Executes a function_exists() check, and if the Suhosin PHP
-	 * extension is loaded - checks whether the function that is
-	 * checked might be disabled in there as well.
-	 *
-	 * This is useful as function_exists() will return FALSE for
-	 * functions disabled via the *disable_functions* php.ini
-	 * setting, but not for *suhosin.executor.func.blacklist* and
-	 * *suhosin.executor.disable_eval*. These settings will just
-	 * terminate script execution if a disabled function is executed.
-	 *
-	 * The above described behavior turned out to be a bug in Suhosin,
-	 * but even though a fix was committed for 0.9.34 on 2012-02-12,
-	 * that version is yet to be released. This function will therefore
-	 * be just temporary, but would probably be kept for a few years.
-	 *
-	 * @link   http://www.hardened-php.net/suhosin/
-	 * @param  string $functionName Function to check for
-	 * @return boolean    TRUE if the function exists and is safe to call,
-	 *             FALSE otherwise.
-	 *
-	 * @codeCoverageIgnore This is too exotic
-	 */
-	function function_usable(string $functionName): bool
-	{
-		static $_suhosin_func_blacklist;
-
-		if (function_exists($functionName))
-		{
-			if (! isset($_suhosin_func_blacklist))
-			{
-				$_suhosin_func_blacklist = extension_loaded('suhosin') ? explode(',', trim(ini_get('suhosin.executor.func.blacklist'))) : [];
-			}
-
-			return ! in_array($functionName, $_suhosin_func_blacklist, true);
-		}
-
-		return false;
-	}
+if (! function_exists('function_usable')) {
+    /**
+     * Function usable
+     *
+     * Executes a function_exists() check, and if the Suhosin PHP
+     * extension is loaded - checks whether the function that is
+     * checked might be disabled in there as well.
+     *
+     * This is useful as function_exists() will return FALSE for
+     * functions disabled via the *disable_functions* php.ini
+     * setting, but not for *suhosin.executor.func.blacklist* and
+     * *suhosin.executor.disable_eval*. These settings will just
+     * terminate script execution if a disabled function is executed.
+     *
+     * The above described behavior turned out to be a bug in Suhosin,
+     * but even though a fix was committed for 0.9.34 on 2012-02-12,
+     * that version is yet to be released. This function will therefore
+     * be just temporary, but would probably be kept for a few years.
+     *
+     * @see   http://www.hardened-php.net/suhosin/
+     *
+     * @param string $functionName Function to check for
+     *
+     * @return bool TRUE if the function exists and is safe to call,
+     *              FALSE otherwise.
+     *
+     * @codeCoverageIgnore This is too exotic
+     */
+    function function_usable(string $functionName): bool
+    {
+        static $_suhosin_func_blacklist;
+
+        if (function_exists($functionName)) {
+            if (! isset($_suhosin_func_blacklist)) {
+                $_suhosin_func_blacklist = extension_loaded('suhosin') ? explode(',', trim(ini_get('suhosin.executor.func.blacklist'))) : [];
+            }
+
+            return ! in_array($functionName, $_suhosin_func_blacklist, true);
+        }
+
+        return false;
+    }
 }
 
-if (! function_exists('helper'))
-{
-	/**
-	 * Loads a helper file into memory. Supports namespaced helpers,
-	 * both in and out of the 'helpers' directory of a namespaced directory.
-	 *
-	 * Will load ALL helpers of the matching name, in the following order:
-	 *   1. app/Helpers
-	 *   2. {namespace}/Helpers
-	 *   3. system/Helpers
-	 *
-	 * @param  string|array $filenames
-	 * @throws FileNotFoundException
-	 */
-	function helper($filenames)
-	{
-		static $loaded = [];
-
-		$loader = Services::locator(true);
-
-		if (! is_array($filenames))
-		{
-			$filenames = [$filenames];
-		}
-
-		// Store a list of all files to include...
-		$includes = [];
-
-		foreach ($filenames as $filename)
-		{
-			// Store our system and application helper
-			// versions so that we can control the load ordering.
-			$systemHelper  = null;
-			$appHelper     = null;
-			$localIncludes = [];
-
-			if (strpos($filename, '_helper') === false)
-			{
-				$filename .= '_helper';
-			}
-
-			// Check if this helper has already been loaded
-			if (in_array($filename, $loaded, true))
-			{
-				continue;
-			}
-
-			// If the file is namespaced, we'll just grab that
-			// file and not search for any others
-			if (strpos($filename, '\\') !== false)
-			{
-				$path = $loader->locateFile($filename, 'Helpers');
-
-				if (empty($path))
-				{
-					throw FileNotFoundException::forFileNotFound($filename);
-				}
-
-				$includes[] = $path;
-				$loaded[]   = $filename;
-			}
-
-			// No namespaces, so search in all available locations
-			else
-			{
-				$paths = $loader->search('Helpers/' . $filename);
-
-				if (! empty($paths))
-				{
-					foreach ($paths as $path)
-					{
-						if (strpos($path, APPPATH) === 0)
-						{
-							// @codeCoverageIgnoreStart
-							$appHelper = $path;
-							// @codeCoverageIgnoreEnd
-						}
-						elseif (strpos($path, SYSTEMPATH) === 0)
-						{
-							$systemHelper = $path;
-						}
-						else
-						{
-							$localIncludes[] = $path;
-							$loaded[]        = $filename;
-						}
-					}
-				}
-
-				// App-level helpers should override all others
-				if (! empty($appHelper))
-				{
-					// @codeCoverageIgnoreStart
-					$includes[] = $appHelper;
-					$loaded[]   = $filename;
-					// @codeCoverageIgnoreEnd
-				}
-
-				// All namespaced files get added in next
-				$includes = array_merge($includes, $localIncludes);
-
-				// And the system default one should be added in last.
-				if (! empty($systemHelper))
-				{
-					$includes[] = $systemHelper;
-					$loaded[]   = $filename;
-				}
-			}
-		}
-
-		// Now actually include all of the files
-		if (! empty($includes))
-		{
-			foreach ($includes as $path)
-			{
-				include_once($path);
-			}
-		}
-	}
+if (! function_exists('helper')) {
+    /**
+     * Loads a helper file into memory. Supports namespaced helpers,
+     * both in and out of the 'helpers' directory of a namespaced directory.
+     *
+     * Will load ALL helpers of the matching name, in the following order:
+     *   1. app/Helpers
+     *   2. {namespace}/Helpers
+     *   3. system/Helpers
+     *
+     * @param array|string $filenames
+     *
+     * @throws FileNotFoundException
+     */
+    function helper($filenames)
+    {
+        static $loaded = [];
+
+        $loader = Services::locator(true);
+
+        if (! is_array($filenames)) {
+            $filenames = [$filenames];
+        }
+
+        // Store a list of all files to include...
+        $includes = [];
+
+        foreach ($filenames as $filename) {
+            // Store our system and application helper
+            // versions so that we can control the load ordering.
+            $systemHelper  = null;
+            $appHelper     = null;
+            $localIncludes = [];
+
+            if (strpos($filename, '_helper') === false) {
+                $filename .= '_helper';
+            }
+
+            // Check if this helper has already been loaded
+            if (in_array($filename, $loaded, true)) {
+                continue;
+            }
+
+            // If the file is namespaced, we'll just grab that
+            // file and not search for any others
+            if (strpos($filename, '\\') !== false) {
+                $path = $loader->locateFile($filename, 'Helpers');
+
+                if (empty($path)) {
+                    throw FileNotFoundException::forFileNotFound($filename);
+                }
+
+                $includes[] = $path;
+                $loaded[]   = $filename;
+            }
+
+            // No namespaces, so search in all available locations
+            else {
+                $paths = $loader->search('Helpers/' . $filename);
+
+                foreach ($paths as $path) {
+                    if (strpos($path, APPPATH) === 0) {
+                        // @codeCoverageIgnoreStart
+                        $appHelper = $path;
+                    // @codeCoverageIgnoreEnd
+                    } elseif (strpos($path, SYSTEMPATH) === 0) {
+                        $systemHelper = $path;
+                    } else {
+                        $localIncludes[] = $path;
+                        $loaded[]        = $filename;
+                    }
+                }
+
+                // App-level helpers should override all others
+                if (! empty($appHelper)) {
+                    // @codeCoverageIgnoreStart
+                    $includes[] = $appHelper;
+                    $loaded[]   = $filename;
+                    // @codeCoverageIgnoreEnd
+                }
+
+                // All namespaced files get added in next
+                $includes = array_merge($includes, $localIncludes);
+
+                // And the system default one should be added in last.
+                if (! empty($systemHelper)) {
+                    $includes[] = $systemHelper;
+                    $loaded[]   = $filename;
+                }
+            }
+        }
+
+        // Now actually include all of the files
+        foreach ($includes as $path) {
+            include_once $path;
+        }
+    }
 }
 
-if (! function_exists('is_cli'))
-{
-	/**
-	 * Check if PHP was invoked from the command line.
-	 *
-	 * @return boolean
-	 *
-	 * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
-	 */
-	function is_cli(): bool
-	{
-		if (PHP_SAPI === 'cli')
-		{
-			return true;
-		}
-
-		if (defined('STDIN'))
-		{
-			return true;
-		}
-
-		if (stristr(PHP_SAPI, 'cgi') && getenv('TERM'))
-		{
-			return true;
-		}
-
-		if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0)
-		{
-			return true;
-		}
-
-		// if source of request is from CLI, the `$_SERVER` array will not populate this key
-		return ! isset($_SERVER['REQUEST_METHOD']);
-	}
+if (! function_exists('is_cli')) {
+    /**
+     * Check if PHP was invoked from the command line.
+     *
+     * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
+     */
+    function is_cli(): bool
+    {
+        if (PHP_SAPI === 'cli') {
+            return true;
+        }
+
+        if (defined('STDIN')) {
+            return true;
+        }
+
+        if (stristr(PHP_SAPI, 'cgi') && getenv('TERM')) {
+            return true;
+        }
+
+        if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0) {
+            return true;
+        }
+
+        // if source of request is from CLI, the `$_SERVER` array will not populate this key
+        return ! isset($_SERVER['REQUEST_METHOD']);
+    }
 }
 
-if (! function_exists('is_really_writable'))
-{
-	/**
-	 * Tests for file writability
-	 *
-	 * is_writable() returns TRUE on Windows servers when you really can't write to
-	 * the file, based on the read-only attribute. is_writable() is also unreliable
-	 * on Unix servers if safe_mode is on.
-	 *
-	 * @link https://bugs.php.net/bug.php?id=54709
-	 *
-	 * @param string $file
-	 *
-	 * @return boolean
-	 *
-	 * @throws             Exception
-	 * @codeCoverageIgnore Not practical to test, as travis runs on linux
-	 */
-	function is_really_writable(string $file): bool
-	{
-		// If we're on a Unix server with safe_mode off we call is_writable
-		if (DIRECTORY_SEPARATOR === '/' || ! ini_get('safe_mode'))
-		{
-			return is_writable($file);
-		}
-
-		/* For Windows servers and safe_mode "on" installations we'll actually
-		 * write a file then read it. Bah...
-		 */
-		if (is_dir($file))
-		{
-			$file = rtrim($file, '/') . '/' . bin2hex(random_bytes(16));
-			if (($fp = @fopen($file, 'ab')) === false)
-			{
-				return false;
-			}
-
-			fclose($fp);
-			@chmod($file, 0777);
-			@unlink($file);
-
-			return true;
-		}
-
-		if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false)
-		{
-			return false;
-		}
-
-		fclose($fp);
-
-		return true;
-	}
+if (! function_exists('is_really_writable')) {
+    /**
+     * Tests for file writability
+     *
+     * is_writable() returns TRUE on Windows servers when you really can't write to
+     * the file, based on the read-only attribute. is_writable() is also unreliable
+     * on Unix servers if safe_mode is on.
+     *
+     * @see https://bugs.php.net/bug.php?id=54709
+     *
+     * @throws Exception
+     *
+     * @codeCoverageIgnore Not practical to test, as travis runs on linux
+     */
+    function is_really_writable(string $file): bool
+    {
+        // If we're on a Unix server we call is_writable
+        if (DIRECTORY_SEPARATOR === '/') {
+            return is_writable($file);
+        }
+
+        /* For Windows servers and safe_mode "on" installations we'll actually
+         * write a file then read it. Bah...
+         */
+        if (is_dir($file)) {
+            $file = rtrim($file, '/') . '/' . bin2hex(random_bytes(16));
+            if (($fp = @fopen($file, 'ab')) === false) {
+                return false;
+            }
+
+            fclose($fp);
+            @chmod($file, 0777);
+            @unlink($file);
+
+            return true;
+        }
+
+        if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false) {
+            return false;
+        }
+
+        fclose($fp);
+
+        return true;
+    }
 }
 
-if (! function_exists('lang'))
-{
-	/**
-	 * A convenience method to translate a string or array of them and format
-	 * the result with the intl extension's MessageFormatter.
-	 *
-	 * @param string      $line
-	 * @param array       $args
-	 * @param string|null $locale
-	 *
-	 * @return string
-	 */
-	function lang(string $line, array $args = [], string $locale = null)
-	{
-		return Services::language($locale)
-			->getLine($line, $args);
-	}
+if (! function_exists('lang')) {
+    /**
+     * A convenience method to translate a string or array of them and format
+     * the result with the intl extension's MessageFormatter.
+     *
+     * @return string
+     */
+    function lang(string $line, array $args = [], ?string $locale = null)
+    {
+        return Services::language($locale)
+            ->getLine($line, $args);
+    }
 }
 
-if (! function_exists('log_message'))
-{
-	/**
-	 * A convenience/compatibility method for logging events through
-	 * the Log system.
-	 *
-	 * Allowed log levels are:
-	 *  - emergency
-	 *  - alert
-	 *  - critical
-	 *  - error
-	 *  - warning
-	 *  - notice
-	 *  - info
-	 *  - debug
-	 *
-	 * @param string $level
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return mixed
-	 */
-	function log_message(string $level, string $message, array $context = [])
-	{
-		// When running tests, we want to always ensure that the
-		// TestLogger is running, which provides utilities for
-		// for asserting that logs were called in the test code.
-		if (ENVIRONMENT === 'testing')
-		{
-			$logger = new TestLogger(new Logger());
-
-			return $logger->log($level, $message, $context);
-		}
-
-		// @codeCoverageIgnoreStart
-		return Services::logger(true)
-			->log($level, $message, $context);
-		// @codeCoverageIgnoreEnd
-	}
+if (! function_exists('log_message')) {
+    /**
+     * A convenience/compatibility method for logging events through
+     * the Log system.
+     *
+     * Allowed log levels are:
+     *  - emergency
+     *  - alert
+     *  - critical
+     *  - error
+     *  - warning
+     *  - notice
+     *  - info
+     *  - debug
+     *
+     * @return mixed
+     */
+    function log_message(string $level, string $message, array $context = [])
+    {
+        // When running tests, we want to always ensure that the
+        // TestLogger is running, which provides utilities for
+        // for asserting that logs were called in the test code.
+        if (ENVIRONMENT === 'testing') {
+            $logger = new TestLogger(new Logger());
+
+            return $logger->log($level, $message, $context);
+        }
+
+        // @codeCoverageIgnoreStart
+        return Services::logger(true)
+            ->log($level, $message, $context);
+        // @codeCoverageIgnoreEnd
+    }
 }
 
-if (! function_exists('model'))
-{
-	/**
-	 * More simple way of getting model instances from Factories
-	 *
-	 * @param string                   $name
-	 * @param boolean                  $getShared
-	 * @param ConnectionInterface|null $conn
-	 *
-	 * @return mixed
-	 */
-	function model(string $name, bool $getShared = true, ConnectionInterface &$conn = null)
-	{
-		return Factories::models($name, ['getShared' => $getShared], $conn);
-	}
+if (! function_exists('model')) {
+    /**
+     * More simple way of getting model instances from Factories
+     *
+     * @return mixed
+     */
+    function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null)
+    {
+        return Factories::models($name, ['getShared' => $getShared], $conn);
+    }
 }
 
-if (! function_exists('old'))
-{
-	/**
-	 * Provides access to "old input" that was set in the session
-	 * during a redirect()->withInput().
-	 *
-	 * @param string         $key
-	 * @param null           $default
-	 * @param string|boolean $escape
-	 *
-	 * @return mixed|null
-	 */
-	function old(string $key, $default = null, $escape = 'html')
-	{
-		// Ensure the session is loaded
-		if (session_status() === PHP_SESSION_NONE && ENVIRONMENT !== 'testing')
-		{
-			// @codeCoverageIgnoreStart
-			session();
-			// @codeCoverageIgnoreEnd
-		}
-
-		$request = Services::request();
-
-		$value = $request->getOldInput($key);
-
-		// Return the default value if nothing
-		// found in the old input.
-		if (is_null($value))
-		{
-			return $default;
-		}
-
-		// If the result was serialized array or string, then unserialize it for use...
-		if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0))
-		{
-			$value = unserialize($value);
-		}
-
-		return $escape === false ? $value : esc($value, $escape);
-	}
+if (! function_exists('old')) {
+    /**
+     * Provides access to "old input" that was set in the session
+     * during a redirect()->withInput().
+     *
+     * @param null        $default
+     * @param bool|string $escape
+     *
+     * @return mixed|null
+     */
+    function old(string $key, $default = null, $escape = 'html')
+    {
+        // Ensure the session is loaded
+        if (session_status() === PHP_SESSION_NONE && ENVIRONMENT !== 'testing') {
+            // @codeCoverageIgnoreStart
+            session();
+            // @codeCoverageIgnoreEnd
+        }
+
+        $request = Services::request();
+
+        $value = $request->getOldInput($key);
+
+        // Return the default value if nothing
+        // found in the old input.
+        if ($value === null) {
+            return $default;
+        }
+
+        // If the result was serialized array or string, then unserialize it for use...
+        if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) {
+            $value = unserialize($value);
+        }
+
+        return $escape === false ? $value : esc($value, $escape);
+    }
 }
 
-if (! function_exists('redirect'))
-{
-	/**
-	 * Convenience method that works with the current global $request and
-	 * $router instances to redirect using named/reverse-routed routes
-	 * to determine the URL to go to. If nothing is found, will treat
-	 * as a traditional redirect and pass the string in, letting
-	 * $response->redirect() determine the correct method and code.
-	 *
-	 * If more control is needed, you must use $response->redirect explicitly.
-	 *
-	 * @param string $route
-	 *
-	 * @return RedirectResponse
-	 */
-	function redirect(string $route = null): RedirectResponse
-	{
-		$response = Services::redirectresponse(null, true);
-
-		if (! empty($route))
-		{
-			return $response->route($route);
-		}
-
-		return $response;
-	}
+if (! function_exists('redirect')) {
+    /**
+     * Convenience method that works with the current global $request and
+     * $router instances to redirect using named/reverse-routed routes
+     * to determine the URL to go to. If nothing is found, will treat
+     * as a traditional redirect and pass the string in, letting
+     * $response->redirect() determine the correct method and code.
+     *
+     * If more control is needed, you must use $response->redirect explicitly.
+     *
+     * @param string $route
+     */
+    function redirect(?string $route = null): RedirectResponse
+    {
+        $response = Services::redirectresponse(null, true);
+
+        if (! empty($route)) {
+            return $response->route($route);
+        }
+
+        return $response;
+    }
 }
 
-if (! function_exists('remove_invisible_characters'))
-{
-	/**
-	 * Remove Invisible Characters
-	 *
-	 * This prevents sandwiching null characters
-	 * between ascii characters, like Java\0script.
-	 *
-	 * @param string  $str
-	 * @param boolean $urlEncoded
-	 *
-	 * @return string
-	 */
-	function remove_invisible_characters(string $str, bool $urlEncoded = true): string
-	{
-		$nonDisplayables = [];
-
-		// every control character except newline (dec 10),
-		// carriage return (dec 13) and horizontal tab (dec 09)
-		if ($urlEncoded)
-		{
-			$nonDisplayables[] = '/%0[0-8bcef]/';  // url encoded 00-08, 11, 12, 14, 15
-			$nonDisplayables[] = '/%1[0-9a-f]/';   // url encoded 16-31
-		}
-
-		$nonDisplayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';   // 00-08, 11, 12, 14-31, 127
-
-		do
-		{
-			$str = preg_replace($nonDisplayables, '', $str, -1, $count);
-		}
-		while ($count);
-
-		return $str;
-	}
+if (! function_exists('remove_invisible_characters')) {
+    /**
+     * Remove Invisible Characters
+     *
+     * This prevents sandwiching null characters
+     * between ascii characters, like Java\0script.
+     */
+    function remove_invisible_characters(string $str, bool $urlEncoded = true): string
+    {
+        $nonDisplayables = [];
+
+        // every control character except newline (dec 10),
+        // carriage return (dec 13) and horizontal tab (dec 09)
+        if ($urlEncoded) {
+            $nonDisplayables[] = '/%0[0-8bcef]/';  // url encoded 00-08, 11, 12, 14, 15
+            $nonDisplayables[] = '/%1[0-9a-f]/';   // url encoded 16-31
+        }
+
+        $nonDisplayables[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S';   // 00-08, 11, 12, 14-31, 127
+
+        do {
+            $str = preg_replace($nonDisplayables, '', $str, -1, $count);
+        } while ($count);
+
+        return $str;
+    }
 }
 
-if (! function_exists('route_to'))
-{
-	/**
-	 * Given a controller/method string and any params,
-	 * will attempt to build the relative URL to the
-	 * matching route.
-	 *
-	 * NOTE: This requires the controller/method to
-	 * have a route defined in the routes Config file.
-	 *
-	 * @param string $method
-	 * @param mixed  ...$params
-	 *
-	 * @return false|string
-	 */
-	function route_to(string $method, ...$params)
-	{
-		return Services::routes()->reverseRoute($method, ...$params);
-	}
+if (! function_exists('route_to')) {
+    /**
+     * Given a controller/method string and any params,
+     * will attempt to build the relative URL to the
+     * matching route.
+     *
+     * NOTE: This requires the controller/method to
+     * have a route defined in the routes Config file.
+     *
+     * @param mixed ...$params
+     *
+     * @return false|string
+     */
+    function route_to(string $method, ...$params)
+    {
+        return Services::routes()->reverseRoute($method, ...$params);
+    }
 }
 
-if (! function_exists('session'))
-{
-	/**
-	 * A convenience method for accessing the session instance,
-	 * or an item that has been set in the session.
-	 *
-	 * Examples:
-	 *    session()->set('foo', 'bar');
-	 *    $foo = session('bar');
-	 *
-	 * @param string $val
-	 *
-	 * @return Session|mixed|null
-	 */
-	function session(string $val = null)
-	{
-		$session = Services::session();
-
-		// Returning a single item?
-		if (is_string($val))
-		{
-			return $session->get($val);
-		}
-
-		return $session;
-	}
+if (! function_exists('session')) {
+    /**
+     * A convenience method for accessing the session instance,
+     * or an item that has been set in the session.
+     *
+     * Examples:
+     *    session()->set('foo', 'bar');
+     *    $foo = session('bar');
+     *
+     * @param string $val
+     *
+     * @return mixed|Session|null
+     */
+    function session(?string $val = null)
+    {
+        $session = Services::session();
+
+        // Returning a single item?
+        if (is_string($val)) {
+            return $session->get($val);
+        }
+
+        return $session;
+    }
 }
 
-if (! function_exists('service'))
-{
-	/**
-	 * Allows cleaner access to the Services Config file.
-	 * Always returns a SHARED instance of the class, so
-	 * calling the function multiple times should always
-	 * return the same instance.
-	 *
-	 * These are equal:
-	 *  - $timer = service('timer')
-	 *  - $timer = \CodeIgniter\Config\Services::timer();
-	 *
-	 * @param string $name
-	 * @param mixed  ...$params
-	 *
-	 * @return mixed
-	 */
-	function service(string $name, ...$params)
-	{
-		return Services::$name(...$params);
-	}
+if (! function_exists('service')) {
+    /**
+     * Allows cleaner access to the Services Config file.
+     * Always returns a SHARED instance of the class, so
+     * calling the function multiple times should always
+     * return the same instance.
+     *
+     * These are equal:
+     *  - $timer = service('timer')
+     *  - $timer = \CodeIgniter\Config\Services::timer();
+     *
+     * @param mixed ...$params
+     *
+     * @return mixed
+     */
+    function service(string $name, ...$params)
+    {
+        return Services::$name(...$params);
+    }
 }
 
-if (! function_exists('single_service'))
-{
-	/**
-	 * Always returns a new instance of the class.
-	 *
-	 * @param string $name
-	 * @param mixed  ...$params
-	 *
-	 * @return mixed
-	 */
-	function single_service(string $name, ...$params)
-	{
-		$service = Services::serviceExists($name);
-
-		if ($service === null)
-		{
-			// The service is not defined anywhere so just return.
-			return null;
-		}
-
-		$method = new ReflectionMethod($service, $name);
-		$count  = $method->getNumberOfParameters();
-		$mParam = $method->getParameters();
-		$params = $params ?? [];
-
-		if ($count === 1)
-		{
-			// This service needs only one argument, which is the shared
-			// instance flag, so let's wrap up and pass false here.
-			return $service::$name(false);
-		}
-
-		// Fill in the params with the defaults, but stop before the last
-		for ($startIndex = count($params); $startIndex <= $count - 2; $startIndex++)
-		{
-			$params[$startIndex] = $mParam[$startIndex]->getDefaultValue();
-		}
-
-		// Ensure the last argument will not create a shared instance
-		$params[$count - 1] = false;
-
-		return $service::$name(...$params);
-	}
+if (! function_exists('single_service')) {
+    /**
+     * Always returns a new instance of the class.
+     *
+     * @param mixed ...$params
+     *
+     * @return mixed
+     */
+    function single_service(string $name, ...$params)
+    {
+        $service = Services::serviceExists($name);
+
+        if ($service === null) {
+            // The service is not defined anywhere so just return.
+            return null;
+        }
+
+        $method = new ReflectionMethod($service, $name);
+        $count  = $method->getNumberOfParameters();
+        $mParam = $method->getParameters();
+        $params = $params ?? [];
+
+        if ($count === 1) {
+            // This service needs only one argument, which is the shared
+            // instance flag, so let's wrap up and pass false here.
+            return $service::$name(false);
+        }
+
+        // Fill in the params with the defaults, but stop before the last
+        for ($startIndex = count($params); $startIndex <= $count - 2; $startIndex++) {
+            $params[$startIndex] = $mParam[$startIndex]->getDefaultValue();
+        }
+
+        // Ensure the last argument will not create a shared instance
+        $params[$count - 1] = false;
+
+        return $service::$name(...$params);
+    }
 }
 
-if (! function_exists('slash_item'))
-{
-	//Unlike CI3, this function is placed here because
-	//it's not a config, or part of a config.
-	/**
-	 * Fetch a config file item with slash appended (if not empty)
-	 *
-	 * @param string $item Config item name
-	 *
-	 * @return string|null The configuration item or NULL if
-	 * the item doesn't exist
-	 */
-	function slash_item(string $item): ?string
-	{
-		$config     = config(App::class);
-		$configItem = $config->{$item};
-
-		if (! isset($configItem) || empty(trim($configItem)))
-		{
-			return $configItem;
-		}
-
-		return rtrim($configItem, '/') . '/';
-	}
+if (! function_exists('slash_item')) {
+    // Unlike CI3, this function is placed here because
+    // it's not a config, or part of a config.
+    /**
+     * Fetch a config file item with slash appended (if not empty)
+     *
+     * @param string $item Config item name
+     *
+     * @return string|null The configuration item or NULL if
+     *                     the item doesn't exist
+     */
+    function slash_item(string $item): ?string
+    {
+        $config     = config(App::class);
+        $configItem = $config->{$item};
+
+        if (! isset($configItem) || empty(trim($configItem))) {
+            return $configItem;
+        }
+
+        return rtrim($configItem, '/') . '/';
+    }
 }
 
-if (! function_exists('stringify_attributes'))
-{
-	/**
-	 * Stringify attributes for use in HTML tags.
-	 *
-	 * Helper function used to convert a string, array, or object
-	 * of attributes to a string.
-	 *
-	 * @param mixed   $attributes string, array, object
-	 * @param boolean $js
-	 *
-	 * @return string
-	 */
-	function stringify_attributes($attributes, bool $js = false): string
-	{
-		$atts = '';
-
-		if (empty($attributes))
-		{
-			return $atts;
-		}
-
-		if (is_string($attributes))
-		{
-			return ' ' . $attributes;
-		}
-
-		$attributes = (array) $attributes;
-
-		foreach ($attributes as $key => $val)
-		{
-			$atts .= ($js) ? $key . '=' . esc($val, 'js') . ',' : ' ' . $key . '="' . esc($val) . '"';
-		}
-
-		return rtrim($atts, ',');
-	}
+if (! function_exists('stringify_attributes')) {
+    /**
+     * Stringify attributes for use in HTML tags.
+     *
+     * Helper function used to convert a string, array, or object
+     * of attributes to a string.
+     *
+     * @param mixed $attributes string, array, object
+     */
+    function stringify_attributes($attributes, bool $js = false): string
+    {
+        $atts = '';
+
+        if (empty($attributes)) {
+            return $atts;
+        }
+
+        if (is_string($attributes)) {
+            return ' ' . $attributes;
+        }
+
+        $attributes = (array) $attributes;
+
+        foreach ($attributes as $key => $val) {
+            $atts .= ($js) ? $key . '=' . esc($val, 'js') . ',' : ' ' . $key . '="' . esc($val) . '"';
+        }
+
+        return rtrim($atts, ',');
+    }
 }
 
-if (! function_exists('timer'))
-{
-	/**
-	 * A convenience method for working with the timer.
-	 * If no parameter is passed, it will return the timer instance,
-	 * otherwise will start or stop the timer intelligently.
-	 *
-	 * @param string|null $name
-	 *
-	 * @return Timer|mixed
-	 */
-	function timer(string $name = null)
-	{
-		$timer = Services::timer();
-
-		if (empty($name))
-		{
-			return $timer;
-		}
-
-		if ($timer->has($name))
-		{
-			return $timer->stop($name);
-		}
-
-		return $timer->start($name);
-	}
+if (! function_exists('timer')) {
+    /**
+     * A convenience method for working with the timer.
+     * If no parameter is passed, it will return the timer instance,
+     * otherwise will start or stop the timer intelligently.
+     *
+     * @return mixed|Timer
+     */
+    function timer(?string $name = null)
+    {
+        $timer = Services::timer();
+
+        if (empty($name)) {
+            return $timer;
+        }
+
+        if ($timer->has($name)) {
+            return $timer->stop($name);
+        }
+
+        return $timer->start($name);
+    }
 }
 
-if (! function_exists('trace'))
-{
-	/**
-	 * Provides a backtrace to the current execution point, from Kint.
-	 */
-	function trace()
-	{
-		Kint::$aliases[] = 'trace';
-		Kint::trace();
-	}
+if (! function_exists('trace')) {
+    /**
+     * Provides a backtrace to the current execution point, from Kint.
+     */
+    function trace()
+    {
+        Kint::$aliases[] = 'trace';
+        Kint::trace();
+    }
 }
 
-if (! function_exists('view'))
-{
-	/**
-	 * Grabs the current RendererInterface-compatible class
-	 * and tells it to render the specified view. Simply provides
-	 * a convenience method that can be used in Controllers,
-	 * libraries, and routed closures.
-	 *
-	 * NOTE: Does not provide any escaping of the data, so that must
-	 * all be handled manually by the developer.
-	 *
-	 * @param string $name
-	 * @param array  $data
-	 * @param array  $options Unused - reserved for third-party extensions.
-	 *
-	 * @return string
-	 */
-	function view(string $name, array $data = [], array $options = []): string
-	{
-		/**
-		 * @var CodeIgniter\View\View $renderer
-		 */
-		$renderer = Services::renderer();
-
-		$saveData = config(View::class)->saveData;
-
-		if (array_key_exists('saveData', $options))
-		{
-			$saveData = (bool) $options['saveData'];
-			unset($options['saveData']);
-		}
-
-		return $renderer->setData($data, 'raw')
-						->render($name, $options, $saveData);
-	}
+if (! function_exists('view')) {
+    /**
+     * Grabs the current RendererInterface-compatible class
+     * and tells it to render the specified view. Simply provides
+     * a convenience method that can be used in Controllers,
+     * libraries, and routed closures.
+     *
+     * NOTE: Does not provide any escaping of the data, so that must
+     * all be handled manually by the developer.
+     *
+     * @param array $options Unused - reserved for third-party extensions.
+     */
+    function view(string $name, array $data = [], array $options = []): string
+    {
+        /**
+         * @var CodeIgniter\View\View $renderer
+         */
+        $renderer = Services::renderer();
+
+        $saveData = config(View::class)->saveData;
+
+        if (array_key_exists('saveData', $options)) {
+            $saveData = (bool) $options['saveData'];
+            unset($options['saveData']);
+        }
+
+        return $renderer->setData($data, 'raw')->render($name, $options, $saveData);
+    }
 }
 
-if (! function_exists('view_cell'))
-{
-	/**
-	 * View cells are used within views to insert HTML chunks that are managed
-	 * by other classes.
-	 *
-	 * @param string      $library
-	 * @param null        $params
-	 * @param integer     $ttl
-	 * @param string|null $cacheName
-	 *
-	 * @return string
-	 * @throws ReflectionException
-	 */
-	function view_cell(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
-	{
-		return Services::viewcell()
-			->render($library, $params, $ttl, $cacheName);
-	}
+if (! function_exists('view_cell')) {
+    /**
+     * View cells are used within views to insert HTML chunks that are managed
+     * by other classes.
+     *
+     * @param null $params
+     *
+     * @throws ReflectionException
+     */
+    function view_cell(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
+    {
+        return Services::viewcell()
+            ->render($library, $params, $ttl, $cacheName);
+    }
 }
 
 /**
@@ -1299,75 +1115,69 @@ function view_cell(string $library, $params = null, int $ttl = 0, string $cacheN
  *
  * @see https://github.com/laravel/framework/blob/8.x/src/Illuminate/Support/helpers.php
  */
-if (! function_exists('class_basename'))
-{
-	/**
-	 * Get the class "basename" of the given object / class.
-	 *
-	 * @param string|object $class
-	 *
-	 * @return string
-	 *
-	 * @codeCoverageIgnore
-	 */
-	function class_basename($class)
-	{
-		$class = is_object($class) ? get_class($class) : $class;
-
-		return basename(str_replace('\\', '/', $class));
-	}
+if (! function_exists('class_basename')) {
+    /**
+     * Get the class "basename" of the given object / class.
+     *
+     * @param object|string $class
+     *
+     * @return string
+     *
+     * @codeCoverageIgnore
+     */
+    function class_basename($class)
+    {
+        $class = is_object($class) ? get_class($class) : $class;
+
+        return basename(str_replace('\\', '/', $class));
+    }
 }
 
-if (! function_exists('class_uses_recursive'))
-{
-	/**
-	 * Returns all traits used by a class, its parent classes and trait of their traits.
-	 *
-	 * @param object|string $class
-	 *
-	 * @return array
-	 *
-	 * @codeCoverageIgnore
-	 */
-	function class_uses_recursive($class)
-	{
-		if (is_object($class))
-		{
-			$class = get_class($class);
-		}
-
-		$results = [];
-
-		// @phpstan-ignore-next-line
-		foreach (array_reverse(class_parents($class)) + [$class => $class] as $class)
-		{
-			$results += trait_uses_recursive($class);
-		}
-
-		return array_unique($results);
-	}
+if (! function_exists('class_uses_recursive')) {
+    /**
+     * Returns all traits used by a class, its parent classes and trait of their traits.
+     *
+     * @param object|string $class
+     *
+     * @return array
+     *
+     * @codeCoverageIgnore
+     */
+    function class_uses_recursive($class)
+    {
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
+
+        $results = [];
+
+        // @phpstan-ignore-next-line
+        foreach (array_reverse(class_parents($class)) + [$class => $class] as $class) {
+            $results += trait_uses_recursive($class);
+        }
+
+        return array_unique($results);
+    }
 }
 
-if (! function_exists('trait_uses_recursive'))
-{
-	/**
-	 * Returns all traits used by a trait and its traits.
-	 *
-	 * @param string $trait
-	 *
-	 * @return array
-	 *
-	 * @codeCoverageIgnore
-	 */
-	function trait_uses_recursive($trait)
-	{
-		$traits = class_uses($trait) ?: [];
-
-		foreach ($traits as $trait)
-		{
-			$traits += trait_uses_recursive($trait);
-		}
-
-		return $traits;
-	}
+if (! function_exists('trait_uses_recursive')) {
+    /**
+     * Returns all traits used by a trait and its traits.
+     *
+     * @param string $trait
+     *
+     * @return array
+     *
+     * @codeCoverageIgnore
+     */
+    function trait_uses_recursive($trait)
+    {
+        $traits = class_uses($trait) ?: [];
+
+        foreach ($traits as $trait) {
+            $traits += trait_uses_recursive($trait);
+        }
+
+        return $traits;
+    }
 }
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 612cb8535f28..6972395b5444 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -28,153 +28,129 @@
  */
 final class ComposerScripts
 {
-	/**
-	 * Path to the ThirdParty directory.
-	 *
-	 * @var string
-	 */
-	private static $path = __DIR__ . '/ThirdParty/';
-
-	/**
-	 * Direct dependencies of CodeIgniter to copy
-	 * contents to `system/ThirdParty/`.
-	 *
-	 * @var array<string, array<string, string>>
-	 */
-	private static $dependencies = [
-		'kint-src' => [
-			'from' => __DIR__ . '/../vendor/kint-php/kint/src/',
-			'to'   => __DIR__ . '/ThirdParty/Kint/',
-		],
-		'kint-resources' => [
-			'from' => __DIR__ . '/../vendor/kint-php/kint/resources/',
-			'to'   => __DIR__ . '/ThirdParty/Kint/resources/',
-		],
-		'escaper' => [
-			'from' => __DIR__ . '/../vendor/laminas/laminas-escaper/src/',
-			'to'   => __DIR__ . '/ThirdParty/Escaper/',
-		],
-		'psr-log' => [
-			'from' => __DIR__ . '/../vendor/psr/log/Psr/Log/',
-			'to'   => __DIR__ . '/ThirdParty/PSR/Log/',
-		],
-	];
-
-	/**
-	 * This static method is called by Composer after every update event,
-	 * i.e., `composer install`, `composer update`, `composer remove`.
-	 *
-	 * @return void
-	 */
-	public static function postUpdate()
-	{
-		self::recursiveDelete(self::$path);
-
-		foreach (self::$dependencies as $dependency)
-		{
-			self::recursiveMirror($dependency['from'], $dependency['to']);
-		}
-
-		self::copyKintInitFiles();
-		self::recursiveDelete(self::$dependencies['psr-log']['to'] . 'Test/');
-	}
-
-	/**
-	 * Recursively remove the contents of the previous `system/ThirdParty`.
-	 *
-	 * @param string $directory
-	 *
-	 * @return void
-	 */
-	private static function recursiveDelete(string $directory): void
-	{
-		if (! is_dir($directory))
-		{
-			echo sprintf('Cannot recursively delete "%s" as it does not exist.', $directory);
-		}
-
-		/** @var SplFileInfo $file */
-		foreach (new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator(rtrim($directory, '\\/'), FilesystemIterator::SKIP_DOTS),
-			RecursiveIteratorIterator::CHILD_FIRST
-		) as $file)
-		{
-			$path = $file->getPathname();
-
-			if ($file->isDir())
-			{
-				@rmdir($path);
-			}
-			else
-			{
-				@unlink($path);
-			}
-		}
-	}
-
-	/**
-	 * Recursively copy the files and directories of the origin directory
-	 * into the target directory, i.e. "mirror" its contents.
-	 *
-	 * @param string $originDir
-	 * @param string $targetDir
-	 *
-	 * @return void
-	 */
-	private static function recursiveMirror(string $originDir, string $targetDir): void
-	{
-		$originDir = rtrim($originDir, '\\/');
-		$targetDir = rtrim($targetDir, '\\/');
-
-		if (! is_dir($originDir))
-		{
-			echo sprintf('The origin directory "%s" was not found.', $originDir);
-			exit(1);
-		}
-
-		if (is_dir($targetDir))
-		{
-			echo sprintf('The target directory "%s" is existing. Run %s::recursiveDelete(\'%s\') first.', $targetDir, self::class, $targetDir);
-			exit(1);
-		}
-
-		@mkdir($targetDir, 0755, true);
-
-		$dirLen = strlen($originDir);
-
-		/** @var SplFileInfo $file */
-		foreach (new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
-			RecursiveIteratorIterator::SELF_FIRST
-		) as $file)
-		{
-			$origin = $file->getPathname();
-			$target = $targetDir . substr($origin, $dirLen);
-
-			if ($file->isDir())
-			{
-				@mkdir($target, 0755);
-			}
-			else
-			{
-				@copy($origin, $target);
-			}
-		}
-	}
-
-	/**
-	 * Copy Kint's init files into `system/ThirdParty/Kint/`
-	 *
-	 * @return void
-	 */
-	private static function copyKintInitFiles(): void
-	{
-		$originDir = self::$dependencies['kint-src']['from'] . '../';
-		$targetDir = self::$dependencies['kint-src']['to'];
-
-		foreach (['init.php', 'init_helpers.php'] as $kintInit)
-		{
-			@copy($originDir . $kintInit, $targetDir . $kintInit);
-		}
-	}
+    /**
+     * Path to the ThirdParty directory.
+     *
+     * @var string
+     */
+    private static $path = __DIR__ . '/ThirdParty/';
+
+    /**
+     * Direct dependencies of CodeIgniter to copy
+     * contents to `system/ThirdParty/`.
+     *
+     * @var array<string, array<string, string>>
+     */
+    private static $dependencies = [
+        'kint-src' => [
+            'from' => __DIR__ . '/../vendor/kint-php/kint/src/',
+            'to'   => __DIR__ . '/ThirdParty/Kint/',
+        ],
+        'kint-resources' => [
+            'from' => __DIR__ . '/../vendor/kint-php/kint/resources/',
+            'to'   => __DIR__ . '/ThirdParty/Kint/resources/',
+        ],
+        'escaper' => [
+            'from' => __DIR__ . '/../vendor/laminas/laminas-escaper/src/',
+            'to'   => __DIR__ . '/ThirdParty/Escaper/',
+        ],
+        'psr-log' => [
+            'from' => __DIR__ . '/../vendor/psr/log/Psr/Log/',
+            'to'   => __DIR__ . '/ThirdParty/PSR/Log/',
+        ],
+    ];
+
+    /**
+     * This static method is called by Composer after every update event,
+     * i.e., `composer install`, `composer update`, `composer remove`.
+     */
+    public static function postUpdate()
+    {
+        self::recursiveDelete(self::$path);
+
+        foreach (self::$dependencies as $dependency) {
+            self::recursiveMirror($dependency['from'], $dependency['to']);
+        }
+
+        self::copyKintInitFiles();
+        self::recursiveDelete(self::$dependencies['psr-log']['to'] . 'Test/');
+    }
+
+    /**
+     * Recursively remove the contents of the previous `system/ThirdParty`.
+     */
+    private static function recursiveDelete(string $directory): void
+    {
+        if (! is_dir($directory)) {
+            echo sprintf('Cannot recursively delete "%s" as it does not exist.', $directory);
+        }
+
+        /** @var SplFileInfo $file */
+        foreach (new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(rtrim($directory, '\\/'), FilesystemIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::CHILD_FIRST
+        ) as $file) {
+            $path = $file->getPathname();
+
+            if ($file->isDir()) {
+                @rmdir($path);
+            } else {
+                @unlink($path);
+            }
+        }
+    }
+
+    /**
+     * Recursively copy the files and directories of the origin directory
+     * into the target directory, i.e. "mirror" its contents.
+     */
+    private static function recursiveMirror(string $originDir, string $targetDir): void
+    {
+        $originDir = rtrim($originDir, '\\/');
+        $targetDir = rtrim($targetDir, '\\/');
+
+        if (! is_dir($originDir)) {
+            echo sprintf('The origin directory "%s" was not found.', $originDir);
+
+            exit(1);
+        }
+
+        if (is_dir($targetDir)) {
+            echo sprintf('The target directory "%s" is existing. Run %s::recursiveDelete(\'%s\') first.', $targetDir, self::class, $targetDir);
+
+            exit(1);
+        }
+
+        @mkdir($targetDir, 0755, true);
+
+        $dirLen = strlen($originDir);
+
+        /** @var SplFileInfo $file */
+        foreach (new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::SELF_FIRST
+        ) as $file) {
+            $origin = $file->getPathname();
+            $target = $targetDir . substr($origin, $dirLen);
+
+            if ($file->isDir()) {
+                @mkdir($target, 0755);
+            } else {
+                @copy($origin, $target);
+            }
+        }
+    }
+
+    /**
+     * Copy Kint's init files into `system/ThirdParty/Kint/`
+     */
+    private static function copyKintInitFiles(): void
+    {
+        $originDir = self::$dependencies['kint-src']['from'] . '../';
+        $targetDir = self::$dependencies['kint-src']['to'];
+
+        foreach (['init.php', 'init_helpers.php'] as $kintInit) {
+            @copy($originDir . $kintInit, $targetDir . $kintInit);
+        }
+    }
 }
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index a90d99b08a70..0818271e002f 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -19,118 +19,117 @@
  */
 class AutoloadConfig
 {
-	/**
-	 * -------------------------------------------------------------------
-	 * Namespaces
-	 * -------------------------------------------------------------------
-	 * This maps the locations of any namespaces in your application to
-	 * their location on the file system. These are used by the autoloader
-	 * to locate files the first time they have been instantiated.
-	 *
-	 * The '/app' and '/system' directories are already mapped for you.
-	 * you may change the name of the 'App' namespace if you wish,
-	 * but this should be done prior to creating any namespaced classes,
-	 * else you will need to modify all of those classes for this to work.
-	 *
-	 * @var array<string, string>
-	 */
-	public $psr4 = [];
+    /**
+     * -------------------------------------------------------------------
+     * Namespaces
+     * -------------------------------------------------------------------
+     * This maps the locations of any namespaces in your application to
+     * their location on the file system. These are used by the autoloader
+     * to locate files the first time they have been instantiated.
+     *
+     * The '/app' and '/system' directories are already mapped for you.
+     * you may change the name of the 'App' namespace if you wish,
+     * but this should be done prior to creating any namespaced classes,
+     * else you will need to modify all of those classes for this to work.
+     *
+     * @var array<string, string>
+     */
+    public $psr4 = [];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Class Map
-	 * -------------------------------------------------------------------
-	 * The class map provides a map of class names and their exact
-	 * location on the drive. Classes loaded in this manner will have
-	 * slightly faster performance because they will not have to be
-	 * searched for within one or more directories as they would if they
-	 * were being autoloaded through a namespace.
-	 *
-	 * @var array<string, string>
-	 */
-	public $classmap = [];
+    /**
+     * -------------------------------------------------------------------
+     * Class Map
+     * -------------------------------------------------------------------
+     * The class map provides a map of class names and their exact
+     * location on the drive. Classes loaded in this manner will have
+     * slightly faster performance because they will not have to be
+     * searched for within one or more directories as they would if they
+     * were being autoloaded through a namespace.
+     *
+     * @var array<string, string>
+     */
+    public $classmap = [];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Files
-	 * -------------------------------------------------------------------
-	 * The files array provides a list of paths to __non-class__ files
-	 * that will be autoloaded. This can be useful for bootstrap operations
-	 * or for loading functions.
-	 *
-	 * @var array<int, string>
-	 */
-	public $files = [];
+    /**
+     * -------------------------------------------------------------------
+     * Files
+     * -------------------------------------------------------------------
+     * The files array provides a list of paths to __non-class__ files
+     * that will be autoloaded. This can be useful for bootstrap operations
+     * or for loading functions.
+     *
+     * @var array<int, string>
+     */
+    public $files = [];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Namespaces
-	 * -------------------------------------------------------------------
-	 * This maps the locations of any namespaces in your application to
-	 * their location on the file system. These are used by the autoloader
-	 * to locate files the first time they have been instantiated.
-	 *
-	 * Do not change the name of the CodeIgniter namespace or your application
-	 * will break.
-	 *
-	 * @var array<string, string>
-	 */
-	protected $corePsr4 = [
-		'CodeIgniter' => SYSTEMPATH,
-		'App'         => APPPATH, // To ensure filters, etc still found,
-	];
+    /**
+     * -------------------------------------------------------------------
+     * Namespaces
+     * -------------------------------------------------------------------
+     * This maps the locations of any namespaces in your application to
+     * their location on the file system. These are used by the autoloader
+     * to locate files the first time they have been instantiated.
+     *
+     * Do not change the name of the CodeIgniter namespace or your application
+     * will break.
+     *
+     * @var array<string, string>
+     */
+    protected $corePsr4 = [
+        'CodeIgniter' => SYSTEMPATH,
+        'App'         => APPPATH, // To ensure filters, etc still found,
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Class Map
-	 * -------------------------------------------------------------------
-	 * The class map provides a map of class names and their exact
-	 * location on the drive. Classes loaded in this manner will have
-	 * slightly faster performance because they will not have to be
-	 * searched for within one or more directories as they would if they
-	 * were being autoloaded through a namespace.
-	 *
-	 * @var array<string, string>
-	 */
-	protected $coreClassmap = [
-		'Psr\Log\AbstractLogger'           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
-		'Psr\Log\InvalidArgumentException' => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
-		'Psr\Log\LoggerAwareInterface'     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
-		'Psr\Log\LoggerAwareTrait'         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
-		'Psr\Log\LoggerInterface'          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
-		'Psr\Log\LoggerTrait'              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
-		'Psr\Log\LogLevel'                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
-		'Psr\Log\NullLogger'               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
-		'Laminas\Escaper\Escaper'          => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
-	];
+    /**
+     * -------------------------------------------------------------------
+     * Class Map
+     * -------------------------------------------------------------------
+     * The class map provides a map of class names and their exact
+     * location on the drive. Classes loaded in this manner will have
+     * slightly faster performance because they will not have to be
+     * searched for within one or more directories as they would if they
+     * were being autoloaded through a namespace.
+     *
+     * @var array<string, string>
+     */
+    protected $coreClassmap = [
+        'Psr\Log\AbstractLogger'           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+        'Psr\Log\InvalidArgumentException' => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
+        'Psr\Log\LoggerAwareInterface'     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
+        'Psr\Log\LoggerAwareTrait'         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
+        'Psr\Log\LoggerInterface'          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+        'Psr\Log\LoggerTrait'              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
+        'Psr\Log\LogLevel'                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+        'Psr\Log\NullLogger'               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
+        'Laminas\Escaper\Escaper'          => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
+    ];
 
-	/**
-	 * -------------------------------------------------------------------
-	 * Core Files
-	 * -------------------------------------------------------------------
-	 * List of files from the framework to be autoloaded early.
-	 *
-	 * @var array<int, string>
-	 */
-	protected $coreFiles = [];
+    /**
+     * -------------------------------------------------------------------
+     * Core Files
+     * -------------------------------------------------------------------
+     * List of files from the framework to be autoloaded early.
+     *
+     * @var array<int, string>
+     */
+    protected $coreFiles = [];
 
-	/**
-	 * Constructor.
-	 *
-	 * Merge the built-in and developer-configured psr4 and classmap,
-	 * with preference to the developer ones.
-	 */
-	public function __construct()
-	{
-		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
-		{
-			$this->psr4['Tests\Support']                  = SUPPORTPATH;
-			$this->classmap['CodeIgniter\Log\TestLogger'] = SYSTEMPATH . 'Test/TestLogger.php';
-			$this->classmap['CIDatabaseTestCase']         = SYSTEMPATH . 'Test/CIDatabaseTestCase.php';
-		}
+    /**
+     * Constructor.
+     *
+     * Merge the built-in and developer-configured psr4 and classmap,
+     * with preference to the developer ones.
+     */
+    public function __construct()
+    {
+        if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing') {
+            $this->psr4['Tests\Support']                  = SUPPORTPATH;
+            $this->classmap['CodeIgniter\Log\TestLogger'] = SYSTEMPATH . 'Test/TestLogger.php';
+            $this->classmap['CIDatabaseTestCase']         = SYSTEMPATH . 'Test/CIDatabaseTestCase.php';
+        }
 
-		$this->psr4     = array_merge($this->corePsr4, $this->psr4);
-		$this->classmap = array_merge($this->coreClassmap, $this->classmap);
-		$this->files    = array_merge($this->coreFiles, $this->files);
-	}
+        $this->psr4     = array_merge($this->corePsr4, $this->psr4);
+        $this->classmap = array_merge($this->coreClassmap, $this->classmap);
+        $this->files    = array_merge($this->coreFiles, $this->files);
+    }
 }
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index f5a08b5f4460..c543492f3348 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -29,188 +29,161 @@
  */
 class BaseConfig
 {
-	/**
-	 * An optional array of classes that will act as Registrars
-	 * for rapidly setting config class properties.
-	 *
-	 * @var array
-	 */
-	public static $registrars = [];
-
-	/**
-	 * Has module discovery happened yet?
-	 *
-	 * @var boolean
-	 */
-	protected static $didDiscovery = false;
-
-	/**
-	 * The modules configuration.
-	 *
-	 * @var Modules
-	 */
-	protected static $moduleConfig;
-
-	/**
-	 * Will attempt to get environment variables with names
-	 * that match the properties of the child class.
-	 *
-	 * The "shortPrefix" is the lowercase-only config class name.
-	 */
-	public function __construct()
-	{
-		static::$moduleConfig = config('Modules');
-
-		$this->registerProperties();
-
-		$properties  = array_keys(get_object_vars($this));
-		$prefix      = static::class;
-		$slashAt     = strrpos($prefix, '\\');
-		$shortPrefix = strtolower(substr($prefix, $slashAt === false ? 0 : $slashAt + 1));
-
-		foreach ($properties as $property)
-		{
-			$this->initEnvValue($this->$property, $property, $prefix, $shortPrefix);
-
-			if ($this instanceof Encryption && $property === 'key')
-			{
-				// Handle hex2bin prefix
-				if (strpos($this->$property, 'hex2bin:') === 0)
-				{
-					$this->$property = hex2bin(substr($this->$property, 8));
-				}
-				// Handle base64 prefix
-				elseif (strpos($this->$property, 'base64:') === 0)
-				{
-					$this->$property = base64_decode(substr($this->$property, 7), true);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Initialization an environment-specific configuration setting
-	 *
-	 * @param mixed  $property
-	 * @param string $name
-	 * @param string $prefix
-	 * @param string $shortPrefix
-	 *
-	 * @return mixed
-	 */
-	protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix)
-	{
-		if (is_array($property))
-		{
-			foreach (array_keys($property) as $key)
-			{
-				$this->initEnvValue($property[$key], "{$name}.{$key}", $prefix, $shortPrefix);
-			}
-		}
-		elseif (($value = $this->getEnvValue($name, $prefix, $shortPrefix)) !== false && ! is_null($value))
-		{
-			if ($value === 'false')
-			{
-				$value = false;
-			}
-			elseif ($value === 'true')
-			{
-				$value = true;
-			}
-			$property = is_bool($value) ? $value : trim($value, '\'"');
-		}
-		return $property;
-	}
-
-	/**
-	 * Retrieve an environment-specific configuration setting
-	 *
-	 * @param string $property
-	 * @param string $prefix
-	 * @param string $shortPrefix
-	 *
-	 * @return mixed
-	 */
-	protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
-	{
-		$shortPrefix = ltrim($shortPrefix, '\\');
-
-		switch (true)
-		{
-			case array_key_exists("{$shortPrefix}.{$property}", $_ENV):
-				return $_ENV["{$shortPrefix}.{$property}"];
-			case array_key_exists("{$shortPrefix}.{$property}", $_SERVER):
-				return $_SERVER["{$shortPrefix}.{$property}"];
-			case array_key_exists("{$prefix}.{$property}", $_ENV):
-				return $_ENV["{$prefix}.{$property}"];
-			case array_key_exists("{$prefix}.{$property}", $_SERVER):
-				return $_SERVER["{$prefix}.{$property}"];
-			default:
-				$value = getenv("{$shortPrefix}.{$property}");
-				$value = $value === false ? getenv("{$prefix}.{$property}") : $value;
-
-				return $value === false ? null : $value;
-		}
-	}
-
-	/**
-	 * Provides external libraries a simple way to register one or more
-	 * options into a config file.
-	 *
-	 * @throws ReflectionException
-	 */
-	protected function registerProperties()
-	{
-		if (! static::$moduleConfig->shouldDiscover('registrars'))
-		{
-			return;
-		}
-
-		if (! static::$didDiscovery)
-		{
-			$locator         = Services::locator();
-			$registrarsFiles = $locator->search('Config/Registrar.php');
-
-			foreach ($registrarsFiles as $file)
-			{
-				$className            = $locator->getClassname($file);
-				static::$registrars[] = new $className();
-			}
-
-			static::$didDiscovery = true;
-		}
-
-		$shortName = (new ReflectionClass($this))->getShortName();
-
-		// Check the registrar class for a method named after this class' shortName
-		foreach (static::$registrars as $callable)
-		{
-			// ignore non-applicable registrars
-			if (! method_exists($callable, $shortName))
-			{
-				// @codeCoverageIgnoreStart
-				continue;
-				// @codeCoverageIgnoreEnd
-			}
-
-			$properties = $callable::$shortName();
-
-			if (! is_array($properties))
-			{
-				throw new RuntimeException('Registrars must return an array of properties and their values.');
-			}
-
-			foreach ($properties as $property => $value)
-			{
-				if (isset($this->$property) && is_array($this->$property) && is_array($value))
-				{
-					$this->$property = array_merge($this->$property, $value);
-				}
-				else
-				{
-					$this->$property = $value;
-				}
-			}
-		}
-	}
+    /**
+     * An optional array of classes that will act as Registrars
+     * for rapidly setting config class properties.
+     *
+     * @var array
+     */
+    public static $registrars = [];
+
+    /**
+     * Has module discovery happened yet?
+     *
+     * @var bool
+     */
+    protected static $didDiscovery = false;
+
+    /**
+     * The modules configuration.
+     *
+     * @var Modules
+     */
+    protected static $moduleConfig;
+
+    /**
+     * Will attempt to get environment variables with names
+     * that match the properties of the child class.
+     *
+     * The "shortPrefix" is the lowercase-only config class name.
+     */
+    public function __construct()
+    {
+        static::$moduleConfig = config('Modules');
+
+        $this->registerProperties();
+
+        $properties  = array_keys(get_object_vars($this));
+        $prefix      = static::class;
+        $slashAt     = strrpos($prefix, '\\');
+        $shortPrefix = strtolower(substr($prefix, $slashAt === false ? 0 : $slashAt + 1));
+
+        foreach ($properties as $property) {
+            $this->initEnvValue($this->{$property}, $property, $prefix, $shortPrefix);
+
+            if ($this instanceof Encryption && $property === 'key') {
+                if (strpos($this->{$property}, 'hex2bin:') === 0) {
+                    // Handle hex2bin prefix
+                    $this->{$property} = hex2bin(substr($this->{$property}, 8));
+                } elseif (strpos($this->{$property}, 'base64:') === 0) {
+                    // Handle base64 prefix
+                    $this->{$property} = base64_decode(substr($this->{$property}, 7), true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Initialization an environment-specific configuration setting
+     *
+     * @param mixed $property
+     *
+     * @return mixed
+     */
+    protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix)
+    {
+        if (is_array($property)) {
+            foreach (array_keys($property) as $key) {
+                $this->initEnvValue($property[$key], "{$name}.{$key}", $prefix, $shortPrefix);
+            }
+        } elseif (($value = $this->getEnvValue($name, $prefix, $shortPrefix)) !== false && $value !== null) {
+            if ($value === 'false') {
+                $value = false;
+            } elseif ($value === 'true') {
+                $value = true;
+            }
+            $property = is_bool($value) ? $value : trim($value, '\'"');
+        }
+
+        return $property;
+    }
+
+    /**
+     * Retrieve an environment-specific configuration setting
+     *
+     * @return mixed
+     */
+    protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
+    {
+        $shortPrefix = ltrim($shortPrefix, '\\');
+
+        switch (true) {
+            case array_key_exists("{$shortPrefix}.{$property}", $_ENV):
+                return $_ENV["{$shortPrefix}.{$property}"];
+
+            case array_key_exists("{$shortPrefix}.{$property}", $_SERVER):
+                return $_SERVER["{$shortPrefix}.{$property}"];
+
+            case array_key_exists("{$prefix}.{$property}", $_ENV):
+                return $_ENV["{$prefix}.{$property}"];
+
+            case array_key_exists("{$prefix}.{$property}", $_SERVER):
+                return $_SERVER["{$prefix}.{$property}"];
+
+            default:
+                $value = getenv("{$shortPrefix}.{$property}");
+                $value = $value === false ? getenv("{$prefix}.{$property}") : $value;
+
+                return $value === false ? null : $value;
+        }
+    }
+
+    /**
+     * Provides external libraries a simple way to register one or more
+     * options into a config file.
+     *
+     * @throws ReflectionException
+     */
+    protected function registerProperties()
+    {
+        if (! static::$moduleConfig->shouldDiscover('registrars')) {
+            return;
+        }
+
+        if (! static::$didDiscovery) {
+            $locator         = Services::locator();
+            $registrarsFiles = $locator->search('Config/Registrar.php');
+
+            foreach ($registrarsFiles as $file) {
+                $className            = $locator->getClassname($file);
+                static::$registrars[] = new $className();
+            }
+
+            static::$didDiscovery = true;
+        }
+
+        $shortName = (new ReflectionClass($this))->getShortName();
+
+        // Check the registrar class for a method named after this class' shortName
+        foreach (static::$registrars as $callable) {
+            // ignore non-applicable registrars
+            if (! method_exists($callable, $shortName)) {
+                continue; // @codeCoverageIgnore
+            }
+
+            $properties = $callable::$shortName();
+
+            if (! is_array($properties)) {
+                throw new RuntimeException('Registrars must return an array of properties and their values.');
+            }
+
+            foreach ($properties as $property => $value) {
+                if (isset($this->{$property}) && is_array($this->{$property}) && is_array($value)) {
+                    $this->{$property} = array_merge($this->{$property}, $value);
+                } else {
+                    $this->{$property} = $value;
+                }
+            }
+        }
+    }
 }
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 21985e9bdb8a..d390807fc51f 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -109,312 +109,270 @@
  * @method static Negotiate negotiator(RequestInterface $request = null, $getShared = true)
  * @method static Pager pager(ConfigPager $config = null, RendererInterface $view = null, $getShared = true)
  * @method static Parser parser($viewPath = null, ConfigView $config = null, $getShared = true)
+ * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true)
  * @method static View renderer($viewPath = null, ConfigView $config = null, $getShared = true)
  * @method static IncomingRequest request(App $config = null, $getShared = true)
  * @method static Response response(App $config = null, $getShared = true)
- * @method static RedirectResponse redirectresponse(App $config = null, $getShared = true)
- * @method static RouteCollection routes($getShared = true)
  * @method static Router router(RouteCollectionInterface $routes = null, Request $request = null, $getShared = true)
+ * @method static RouteCollection routes($getShared = true)
  * @method static Security security(App $config = null, $getShared = true)
  * @method static Session session(App $config = null, $getShared = true)
  * @method static Throttler throttler($getShared = true)
  * @method static Timer timer($getShared = true)
  * @method static Toolbar toolbar(ConfigToolbar $config = null, $getShared = true)
+ * @method static Typography typography($getShared = true)
  * @method static URI uri($uri = null, $getShared = true)
  * @method static Validation validation(ConfigValidation $config = null, $getShared = true)
  * @method static Cell viewcell($getShared = true)
- * @method static Typography typography($getShared = true)
  */
 class BaseService
 {
-	/**
-	 * Cache for instance of any services that
-	 * have been requested as a "shared" instance.
-	 * Keys should be lowercase service names.
-	 *
-	 * @var array
-	 */
-	protected static $instances = [];
-
-	/**
-	 * Mock objects for testing which are returned if exist.
-	 *
-	 * @var array
-	 */
-	protected static $mocks = [];
-
-	/**
-	 * Have we already discovered other Services?
-	 *
-	 * @var boolean
-	 */
-	protected static $discovered = false;
-
-	/**
-	 * A cache of other service classes we've found.
-	 *
-	 * @var array
-	 */
-	protected static $services = [];
-
-	/**
-	 * A cache of the names of services classes found.
-	 *
-	 * @var array<string>
-	 */
-	private static $serviceNames = [];
-
-	/**
-	 * Returns a shared instance of any of the class' services.
-	 *
-	 * $key must be a name matching a service.
-	 *
-	 * @param string $key
-	 * @param mixed  ...$params
-	 *
-	 * @return mixed
-	 */
-	protected static function getSharedInstance(string $key, ...$params)
-	{
-		$key = strtolower($key);
-
-		// Returns mock if exists
-		if (isset(static::$mocks[$key]))
-		{
-			return static::$mocks[$key];
-		}
-
-		if (! isset(static::$instances[$key]))
-		{
-			// Make sure $getShared is false
-			$params[] = false;
-
-			static::$instances[$key] = AppServices::$key(...$params);
-		}
-
-		return static::$instances[$key];
-	}
-
-	/**
-	 * The Autoloader class is the central class that handles our
-	 * spl_autoload_register method, and helper methods.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Autoloader
-	 */
-	public static function autoloader(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			if (empty(static::$instances['autoloader']))
-			{
-				static::$instances['autoloader'] = new Autoloader();
-			}
-
-			return static::$instances['autoloader'];
-		}
-
-		return new Autoloader();
-	}
-
-	/**
-	 * The file locator provides utility methods for looking for non-classes
-	 * within namespaced folders, as well as convenience methods for
-	 * loading 'helpers', and 'libraries'.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return FileLocator
-	 */
-	public static function locator(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			if (empty(static::$instances['locator']))
-			{
-				static::$instances['locator'] = new FileLocator(static::autoloader());
-			}
-
-			return static::$mocks['locator'] ?? static::$instances['locator'];
-		}
-
-		return new FileLocator(static::autoloader());
-	}
-
-	/**
-	 * Provides the ability to perform case-insensitive calling of service
-	 * names.
-	 *
-	 * @param string $name
-	 * @param array  $arguments
-	 *
-	 * @return mixed
-	 */
-	public static function __callStatic(string $name, array $arguments)
-	{
-		$service = static::serviceExists($name);
-
-		if ($service === null)
-		{
-			return null;
-		}
-
-		return $service::$name(...$arguments);
-	}
-
-	/**
-	 * Check if the requested service is defined and return the declaring
-	 * class. Return null if not found.
-	 *
-	 * @param string $name
-	 *
-	 * @return string|null
-	 */
-	public static function serviceExists(string $name): ?string
-	{
-		static::buildServicesCache();
-		$services = array_merge(self::$serviceNames, [Services::class]);
-		$name     = strtolower($name);
-
-		foreach ($services as $service)
-		{
-			if (method_exists($service, $name))
-			{
-				return $service;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Reset shared instances and mocks for testing.
-	 *
-	 * @param boolean $initAutoloader Initializes autoloader instance
-	 */
-	public static function reset(bool $initAutoloader = false)
-	{
-		static::$mocks     = [];
-		static::$instances = [];
-
-		if ($initAutoloader)
-		{
-			static::autoloader()->initialize(new Autoload(), new Modules());
-		}
-	}
-
-	/**
-	 * Resets any mock and shared instances for a single service.
-	 *
-	 * @param string $name
-	 */
-	public static function resetSingle(string $name)
-	{
-		unset(static::$mocks[$name], static::$instances[$name]);
-	}
-
-	/**
-	 * Inject mock object for testing.
-	 *
-	 * @param string $name
-	 * @param mixed  $mock
-	 */
-	public static function injectMock(string $name, $mock)
-	{
-		static::$mocks[strtolower($name)] = $mock;
-	}
-
-	/**
-	 * Will scan all psr4 namespaces registered with system to look
-	 * for new Config\Services files. Caches a copy of each one, then
-	 * looks for the service method in each, returning an instance of
-	 * the service, if available.
-	 *
-	 * @param string $name
-	 * @param array  $arguments
-	 *
-	 * @return mixed
-	 *
-	 * @deprecated
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected static function discoverServices(string $name, array $arguments)
-	{
-		if (! static::$discovered)
-		{
-			$config = config('Modules');
-
-			if ($config->shouldDiscover('services'))
-			{
-				$locator = static::locator();
-				$files   = $locator->search('Config/Services');
-
-				if (empty($files))
-				{
-					// no files at all found - this would be really, really bad
-					return null;
-				}
-
-				// Get instances of all service classes and cache them locally.
-				foreach ($files as $file)
-				{
-					$classname = $locator->getClassname($file);
-
-					if (! in_array($classname, ['CodeIgniter\\Config\\Services'], true))
-					{
-						static::$services[] = new $classname();
-					}
-				}
-			}
-
-			static::$discovered = true;
-		}
-
-		if (! static::$services)
-		{
-			// we found stuff, but no services - this would be really bad
-			return null;
-		}
-
-		// Try to find the desired service method
-		foreach (static::$services as $class)
-		{
-			if (method_exists($class, $name))
-			{
-				return $class::$name(...$arguments);
-			}
-		}
-
-		return null;
-	}
-
-	protected static function buildServicesCache(): void
-	{
-		if (! static::$discovered)
-		{
-			$config = config('Modules');
-
-			if ($config->shouldDiscover('services'))
-			{
-				$locator = static::locator();
-				$files   = $locator->search('Config/Services');
-
-				// Get instances of all service classes and cache them locally.
-				foreach ($files as $file)
-				{
-					$classname = $locator->getClassname($file);
-
-					if ($classname !== 'CodeIgniter\\Config\\Services')
-					{
-						self::$serviceNames[] = $classname;
-						static::$services[]   = new $classname();
-					}
-				}
-			}
-
-			static::$discovered = true;
-		}
-	}
+    /**
+     * Cache for instance of any services that
+     * have been requested as a "shared" instance.
+     * Keys should be lowercase service names.
+     *
+     * @var array
+     */
+    protected static $instances = [];
+
+    /**
+     * Mock objects for testing which are returned if exist.
+     *
+     * @var array
+     */
+    protected static $mocks = [];
+
+    /**
+     * Have we already discovered other Services?
+     *
+     * @var bool
+     */
+    protected static $discovered = false;
+
+    /**
+     * A cache of other service classes we've found.
+     *
+     * @var array
+     */
+    protected static $services = [];
+
+    /**
+     * A cache of the names of services classes found.
+     *
+     * @var array<string>
+     */
+    private static $serviceNames = [];
+
+    /**
+     * Returns a shared instance of any of the class' services.
+     *
+     * $key must be a name matching a service.
+     *
+     * @param mixed ...$params
+     *
+     * @return mixed
+     */
+    protected static function getSharedInstance(string $key, ...$params)
+    {
+        $key = strtolower($key);
+
+        // Returns mock if exists
+        if (isset(static::$mocks[$key])) {
+            return static::$mocks[$key];
+        }
+
+        if (! isset(static::$instances[$key])) {
+            // Make sure $getShared is false
+            $params[] = false;
+
+            static::$instances[$key] = AppServices::$key(...$params);
+        }
+
+        return static::$instances[$key];
+    }
+
+    /**
+     * The Autoloader class is the central class that handles our
+     * spl_autoload_register method, and helper methods.
+     *
+     * @return Autoloader
+     */
+    public static function autoloader(bool $getShared = true)
+    {
+        if ($getShared) {
+            if (empty(static::$instances['autoloader'])) {
+                static::$instances['autoloader'] = new Autoloader();
+            }
+
+            return static::$instances['autoloader'];
+        }
+
+        return new Autoloader();
+    }
+
+    /**
+     * The file locator provides utility methods for looking for non-classes
+     * within namespaced folders, as well as convenience methods for
+     * loading 'helpers', and 'libraries'.
+     *
+     * @return FileLocator
+     */
+    public static function locator(bool $getShared = true)
+    {
+        if ($getShared) {
+            if (empty(static::$instances['locator'])) {
+                static::$instances['locator'] = new FileLocator(static::autoloader());
+            }
+
+            return static::$mocks['locator'] ?? static::$instances['locator'];
+        }
+
+        return new FileLocator(static::autoloader());
+    }
+
+    /**
+     * Provides the ability to perform case-insensitive calling of service
+     * names.
+     *
+     * @return mixed
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        $service = static::serviceExists($name);
+
+        if ($service === null) {
+            return null;
+        }
+
+        return $service::$name(...$arguments);
+    }
+
+    /**
+     * Check if the requested service is defined and return the declaring
+     * class. Return null if not found.
+     */
+    public static function serviceExists(string $name): ?string
+    {
+        static::buildServicesCache();
+        $services = array_merge(self::$serviceNames, [Services::class]);
+        $name     = strtolower($name);
+
+        foreach ($services as $service) {
+            if (method_exists($service, $name)) {
+                return $service;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Reset shared instances and mocks for testing.
+     */
+    public static function reset(bool $initAutoloader = false)
+    {
+        static::$mocks     = [];
+        static::$instances = [];
+
+        if ($initAutoloader) {
+            static::autoloader()->initialize(new Autoload(), new Modules());
+        }
+    }
+
+    /**
+     * Resets any mock and shared instances for a single service.
+     */
+    public static function resetSingle(string $name)
+    {
+        unset(static::$mocks[$name], static::$instances[$name]);
+    }
+
+    /**
+     * Inject mock object for testing.
+     *
+     * @param mixed $mock
+     */
+    public static function injectMock(string $name, $mock)
+    {
+        static::$mocks[strtolower($name)] = $mock;
+    }
+
+    /**
+     * Will scan all psr4 namespaces registered with system to look
+     * for new Config\Services files. Caches a copy of each one, then
+     * looks for the service method in each, returning an instance of
+     * the service, if available.
+     *
+     * @return mixed
+     *
+     * @deprecated
+     *
+     * @codeCoverageIgnore
+     */
+    protected static function discoverServices(string $name, array $arguments)
+    {
+        if (! static::$discovered) {
+            $config = config('Modules');
+
+            if ($config->shouldDiscover('services')) {
+                $locator = static::locator();
+                $files   = $locator->search('Config/Services');
+
+                if (empty($files)) {
+                    // no files at all found - this would be really, really bad
+                    return null;
+                }
+
+                // Get instances of all service classes and cache them locally.
+                foreach ($files as $file) {
+                    $classname = $locator->getClassname($file);
+
+                    if (! in_array($classname, ['CodeIgniter\\Config\\Services'], true)) {
+                        static::$services[] = new $classname();
+                    }
+                }
+            }
+
+            static::$discovered = true;
+        }
+
+        if (! static::$services) {
+            // we found stuff, but no services - this would be really bad
+            return null;
+        }
+
+        // Try to find the desired service method
+        foreach (static::$services as $class) {
+            if (method_exists($class, $name)) {
+                return $class::$name(...$arguments);
+            }
+        }
+
+        return null;
+    }
+
+    protected static function buildServicesCache(): void
+    {
+        if (! static::$discovered) {
+            $config = config('Modules');
+
+            if ($config->shouldDiscover('services')) {
+                $locator = static::locator();
+                $files   = $locator->search('Config/Services');
+
+                // Get instances of all service classes and cache them locally.
+                foreach ($files as $file) {
+                    $classname = $locator->getClassname($file);
+
+                    if ($classname !== 'CodeIgniter\\Config\\Services') {
+                        self::$serviceNames[] = $classname;
+                        static::$services[]   = new $classname();
+                    }
+                }
+            }
+
+            static::$discovered = true;
+        }
+    }
 }
diff --git a/system/Config/Config.php b/system/Config/Config.php
index 1265c35a9846..307f7ad82288 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -1,53 +1,50 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
 
 /**
- * Class Config
- *
  * @deprecated Use CodeIgniter\Config\Factories::config()
  */
 class Config
 {
-	/**
-	 * Create new configuration instances or return
-	 * a shared instance
-	 *
-	 * @param string  $name      Configuration name
-	 * @param boolean $getShared Use shared instance
-	 *
-	 * @return mixed|null
-	 */
-	public static function get(string $name, bool $getShared = true)
-	{
-		return Factories::config($name, ['getShared' => $getShared]);
-	}
+    /**
+     * Create new configuration instances or return
+     * a shared instance
+     *
+     * @param string $name      Configuration name
+     * @param bool   $getShared Use shared instance
+     *
+     * @return mixed|null
+     */
+    public static function get(string $name, bool $getShared = true)
+    {
+        return Factories::config($name, ['getShared' => $getShared]);
+    }
 
-	/**
-	 * Helper method for injecting mock instances while testing.
-	 *
-	 * @param string $name
-	 * @param object $instance
-	 */
-	public static function injectMock(string $name, $instance)
-	{
-		Factories::injectMock('config', $name, $instance);
-	}
+    /**
+     * Helper method for injecting mock instances while testing.
+     *
+     * @param object $instance
+     */
+    public static function injectMock(string $name, $instance)
+    {
+        Factories::injectMock('config', $name, $instance);
+    }
 
-	/**
-	 * Resets the static arrays
-	 */
-	public static function reset()
-	{
-		Factories::reset('config');
-	}
+    /**
+     * Resets the static arrays
+     */
+    public static function reset()
+    {
+        Factories::reset('config');
+    }
 }
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 54374add5c65..ddc590cd5986 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -18,276 +18,216 @@
  */
 class DotEnv
 {
-	/**
-	 * The directory where the .env file can be located.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Builds the path to our file.
-	 *
-	 * @param string $path
-	 * @param string $file
-	 */
-	public function __construct(string $path, string $file = '.env')
-	{
-		$this->path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The main entry point, will load the .env file and process it
-	 * so that we end up with all settings in the PHP environment vars
-	 * (i.e. getenv(), $_ENV, and $_SERVER)
-	 *
-	 * @return boolean
-	 */
-	public function load(): bool
-	{
-		$vars = $this->parse();
-
-		return $vars !== null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse the .env file into an array of key => value
-	 *
-	 * @return array|null
-	 */
-	public function parse(): ?array
-	{
-		// We don't want to enforce the presence of a .env file, they should be optional.
-		if (! is_file($this->path))
-		{
-			return null;
-		}
-
-		// Ensure the file is readable
-		if (! is_readable($this->path))
-		{
-			throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
-		}
-
-		$vars = [];
-
-		$lines = file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-
-		foreach ($lines as $line)
-		{
-			// Is it a comment?
-			if (strpos(trim($line), '#') === 0)
-			{
-				continue;
-			}
-
-			// If there is an equal sign, then we know we are assigning a variable.
-			if (strpos($line, '=') !== false)
-			{
-				[$name, $value] = $this->normaliseVariable($line);
-				$vars[$name]        = $value;
-				$this->setVariable($name, $value);
-			}
-		}
-
-		return $vars;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the variable into the environment. Will parse the string
-	 * first to look for {name}={value} pattern, ensure that nested
-	 * variables are handled, and strip it of single and double quotes.
-	 *
-	 * @param string $name
-	 * @param string $value
-	 */
-	protected function setVariable(string $name, string $value = '')
-	{
-		if (! getenv($name, true))
-		{
-			putenv("$name=$value");
-		}
-
-		if (empty($_ENV[$name]))
-		{
-			$_ENV[$name] = $value;
-		}
-
-		if (empty($_SERVER[$name]))
-		{
-			$_SERVER[$name] = $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses for assignment, cleans the $name and $value, and ensures
-	 * that nested variables are handled.
-	 *
-	 * @param string $name
-	 * @param string $value
-	 *
-	 * @return array
-	 */
-	public function normaliseVariable(string $name, string $value = ''): array
-	{
-		// Split our compound string into its parts.
-		if (strpos($name, '=') !== false)
-		{
-			[$name, $value] = explode('=', $name, 2);
-		}
-
-		$name  = trim($name);
-		$value = trim($value);
-
-		// Sanitize the name
-		$name = str_replace(['export', '\'', '"'], '', $name);
-
-		// Sanitize the value
-		$value = $this->sanitizeValue($value);
-
-		$value = $this->resolveNestedVariables($value);
-
-		return [
-			$name,
-			$value,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Strips quotes from the environment variable value.
-	 *
-	 * This was borrowed from the excellent phpdotenv with very few changes.
-	 * https://github.com/vlucas/phpdotenv
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 * @throws InvalidArgumentException
-	 */
-	protected function sanitizeValue(string $value): string
-	{
-		if (! $value)
-		{
-			return $value;
-		}
-
-		// Does it begin with a quote?
-		if (strpbrk($value[0], '"\'') !== false)
-		{
-			// value starts with a quote
-			$quote        = $value[0];
-			$regexPattern = sprintf(
-					'/^
-					%1$s          # match a quote at the start of the value
-					(             # capturing sub-pattern used
-								  (?:          # we do not need to capture this
-								   [^%1$s\\\\] # any character other than a quote or backslash
-								   |\\\\\\\\   # or two backslashes together
-								   |\\\\%1$s   # or an escaped quote e.g \"
-								  )*           # as many characters that match the previous rules
-					)             # end of the capturing sub-pattern
-					%1$s          # and the closing quote
-					.*$           # and discard any string after the closing quote
-					/mx', $quote
-			);
-
-			$value = preg_replace($regexPattern, '$1', $value);
-			$value = str_replace("\\$quote", $quote, $value);
-			$value = str_replace('\\\\', '\\', $value);
-		}
-		else
-		{
-			$parts = explode(' #', $value, 2);
-
-			$value = trim($parts[0]);
-
-			// Unquoted values cannot contain whitespace
-			if (preg_match('/\s+/', $value) > 0)
-			{
-				throw new InvalidArgumentException('.env values containing spaces must be surrounded by quotes.');
-			}
-		}
-
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 *  Resolve the nested variables.
-	 *
-	 * Look for ${varname} patterns in the variable value and replace with an existing
-	 * environment variable.
-	 *
-	 * This was borrowed from the excellent phpdotenv with very few changes.
-	 * https://github.com/vlucas/phpdotenv
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	protected function resolveNestedVariables(string $value): string
-	{
-		if (strpos($value, '$') !== false)
-		{
-			$value = preg_replace_callback(
-				'/\${([a-zA-Z0-9_\.]+)}/',
-				function ($matchedPatterns) {
-					$nestedVariable = $this->getVariable($matchedPatterns[1]);
-
-					if (is_null($nestedVariable))
-					{
-						return $matchedPatterns[0];
-					}
-
-					return $nestedVariable;
-				},
-				$value
-			);
-		}
-
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Search the different places for environment variables and return first value found.
-	 *
-	 * This was borrowed from the excellent phpdotenv with very few changes.
-	 * https://github.com/vlucas/phpdotenv
-	 *
-	 * @param string $name
-	 *
-	 * @return string|null
-	 */
-	protected function getVariable(string $name)
-	{
-		switch (true)
-		{
-			case array_key_exists($name, $_ENV):
-				return $_ENV[$name];
-			case array_key_exists($name, $_SERVER):
-				return $_SERVER[$name];
-			default:
-				$value = getenv($name);
-
-				// switch getenv default to null
-				return $value === false ? null : $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The directory where the .env file can be located.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Builds the path to our file.
+     */
+    public function __construct(string $path, string $file = '.env')
+    {
+        $this->path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+    }
+
+    /**
+     * The main entry point, will load the .env file and process it
+     * so that we end up with all settings in the PHP environment vars
+     * (i.e. getenv(), $_ENV, and $_SERVER)
+     */
+    public function load(): bool
+    {
+        $vars = $this->parse();
+
+        return $vars !== null;
+    }
+
+    /**
+     * Parse the .env file into an array of key => value
+     */
+    public function parse(): ?array
+    {
+        // We don't want to enforce the presence of a .env file, they should be optional.
+        if (! is_file($this->path)) {
+            return null;
+        }
+
+        // Ensure the file is readable
+        if (! is_readable($this->path)) {
+            throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
+        }
+
+        $vars = [];
+
+        $lines = file($this->path, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+        foreach ($lines as $line) {
+            // Is it a comment?
+            if (strpos(trim($line), '#') === 0) {
+                continue;
+            }
+
+            // If there is an equal sign, then we know we are assigning a variable.
+            if (strpos($line, '=') !== false) {
+                [$name, $value] = $this->normaliseVariable($line);
+                $vars[$name]    = $value;
+                $this->setVariable($name, $value);
+            }
+        }
+
+        return $vars;
+    }
+
+    /**
+     * Sets the variable into the environment. Will parse the string
+     * first to look for {name}={value} pattern, ensure that nested
+     * variables are handled, and strip it of single and double quotes.
+     */
+    protected function setVariable(string $name, string $value = '')
+    {
+        if (! getenv($name, true)) {
+            putenv("{$name}={$value}");
+        }
+
+        if (empty($_ENV[$name])) {
+            $_ENV[$name] = $value;
+        }
+
+        if (empty($_SERVER[$name])) {
+            $_SERVER[$name] = $value;
+        }
+    }
+
+    /**
+     * Parses for assignment, cleans the $name and $value, and ensures
+     * that nested variables are handled.
+     */
+    public function normaliseVariable(string $name, string $value = ''): array
+    {
+        // Split our compound string into its parts.
+        if (strpos($name, '=') !== false) {
+            [$name, $value] = explode('=', $name, 2);
+        }
+
+        $name  = trim($name);
+        $value = trim($value);
+
+        // Sanitize the name
+        $name = str_replace(['export', '\'', '"'], '', $name);
+
+        // Sanitize the value
+        $value = $this->sanitizeValue($value);
+        $value = $this->resolveNestedVariables($value);
+
+        return [$name, $value];
+    }
+
+    /**
+     * Strips quotes from the environment variable value.
+     *
+     * This was borrowed from the excellent phpdotenv with very few changes.
+     * https://github.com/vlucas/phpdotenv
+     *
+     * @throws InvalidArgumentException
+     */
+    protected function sanitizeValue(string $value): string
+    {
+        if (! $value) {
+            return $value;
+        }
+
+        // Does it begin with a quote?
+        if (strpbrk($value[0], '"\'') !== false) {
+            // value starts with a quote
+            $quote = $value[0];
+
+            $regexPattern = sprintf(
+                '/^
+                %1$s          # match a quote at the start of the value
+                (             # capturing sub-pattern used
+                 (?:          # we do not need to capture this
+                 [^%1$s\\\\] # any character other than a quote or backslash
+                 |\\\\\\\\   # or two backslashes together
+                 |\\\\%1$s   # or an escaped quote e.g \"
+                 )*           # as many characters that match the previous rules
+                )             # end of the capturing sub-pattern
+                %1$s          # and the closing quote
+                .*$           # and discard any string after the closing quote
+                /mx',
+                $quote
+            );
+
+            $value = preg_replace($regexPattern, '$1', $value);
+            $value = str_replace("\\{$quote}", $quote, $value);
+            $value = str_replace('\\\\', '\\', $value);
+        } else {
+            $parts = explode(' #', $value, 2);
+            $value = trim($parts[0]);
+
+            // Unquoted values cannot contain whitespace
+            if (preg_match('/\s+/', $value) > 0) {
+                throw new InvalidArgumentException('.env values containing spaces must be surrounded by quotes.');
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     *  Resolve the nested variables.
+     *
+     * Look for ${varname} patterns in the variable value and replace with an existing
+     * environment variable.
+     *
+     * This was borrowed from the excellent phpdotenv with very few changes.
+     * https://github.com/vlucas/phpdotenv
+     */
+    protected function resolveNestedVariables(string $value): string
+    {
+        if (strpos($value, '$') !== false) {
+            $value = preg_replace_callback(
+                '/\${([a-zA-Z0-9_\.]+)}/',
+                function ($matchedPatterns) {
+                    $nestedVariable = $this->getVariable($matchedPatterns[1]);
+
+                    if ($nestedVariable === null) {
+                        return $matchedPatterns[0];
+                    }
+
+                    return $nestedVariable;
+                },
+                $value
+            );
+        }
+
+        return $value;
+    }
+
+    /**
+     * Search the different places for environment variables and return first value found.
+     *
+     * This was borrowed from the excellent phpdotenv with very few changes.
+     * https://github.com/vlucas/phpdotenv
+     *
+     * @return string|null
+     */
+    protected function getVariable(string $name)
+    {
+        switch (true) {
+            case array_key_exists($name, $_ENV):
+                return $_ENV[$name];
+
+            case array_key_exists($name, $_SERVER):
+                return $_SERVER[$name];
+
+            default:
+                $value = getenv($name);
+
+                // switch getenv default to null
+                return $value === false ? null : $value;
+        }
+    }
 }
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 22a9a27b84a2..8aa779220aed 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -22,333 +22,295 @@
  * large performance boost and helps keep code clean of lengthy
  * instantiation checks.
  *
- * @method static Model models(...$arguments)
  * @method static BaseConfig config(...$arguments)
+ * @method static Model models(...$arguments)
  */
 class Factories
 {
-	/**
-	 * Store of component-specific options, usually
-	 * from CodeIgniter\Config\Factory.
-	 *
-	 * @var array<string, array>
-	 */
-	protected static $options = [];
-
-	/**
-	 * Explicit options for the Config
-	 * component to prevent logic loops.
-	 *
-	 * @var array<string, mixed>
-	 */
-	private static $configOptions = [
-		'component'  => 'config',
-		'path'       => 'Config',
-		'instanceOf' => null,
-		'getShared'  => true,
-		'preferApp'  => true,
-	];
-
-	/**
-	 * Mapping of class basenames (no namespace) to
-	 * their instances.
-	 *
-	 * @var array<string, string[]>
-	 */
-	protected static $basenames = [];
-
-	/**
-	 * Store for instances of any component that
-	 * has been requested as "shared".
-	 * A multi-dimensional array with components as
-	 * keys to the array of name-indexed instances.
-	 *
-	 * @var array<string, array>
-	 */
-	protected static $instances = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Loads instances based on the method component name. Either
-	 * creates a new instance or returns an existing shared instance.
-	 *
-	 * @param string $component
-	 * @param array  $arguments
-	 *
-	 * @return mixed
-	 */
-	public static function __callStatic(string $component, array $arguments)
-	{
-		// First argument is the name, second is options
-		$name    = trim(array_shift($arguments), '\\ ');
-		$options = array_shift($arguments) ?? [];
-
-		// Determine the component-specific options
-		$options = array_merge(self::getOptions(strtolower($component)), $options);
-
-		if (! $options['getShared'])
-		{
-			if ($class = self::locateClass($options, $name))
-			{
-				return new $class(...$arguments);
-			}
-
-			return null;
-		}
-
-		$basename = self::getBasename($name);
-
-		// Check for an existing instance
-		if (isset(self::$basenames[$options['component']][$basename]))
-		{
-			$class = self::$basenames[$options['component']][$basename];
-
-			// Need to verify if the shared instance matches the request
-			if (self::verifyInstanceOf($options, $class))
-			{
-				return self::$instances[$options['component']][$class];
-			}
-		}
-
-		// Try to locate the class
-		if (! $class = self::locateClass($options, $name))
-		{
-			return null;
-		}
-
-		self::$instances[$options['component']][$class]    = new $class(...$arguments);
-		self::$basenames[$options['component']][$basename] = $class;
-
-		return self::$instances[$options['component']][$class];
-	}
-
-	/**
-	 * Finds a component class
-	 *
-	 * @param array  $options The array of component-specific directives
-	 * @param string $name    Class name, namespace optional
-	 *
-	 * @return string|null
-	 */
-	protected static function locateClass(array $options, string $name): ?string
-	{
-		// Check for low-hanging fruit
-		if (class_exists($name, false) && self::verifyPreferApp($options, $name) && self::verifyInstanceOf($options, $name))
-		{
-			return $name;
-		}
-
-		// Determine the relative class names we need
-		$basename = self::getBasename($name);
-		$appname  = $options['component'] === 'config'
-			? 'Config\\' . $basename
-			: rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename;
-
-		// If an App version was requested then see if it verifies
-		if ($options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name))
-		{
-			return $appname;
-		}
-
-		// If we have ruled out an App version and the class exists then try it
-		if (class_exists($name) && self::verifyInstanceOf($options, $name))
-		{
-			return $name;
-		}
-
-		// Have to do this the hard way...
-		$locator = Services::locator();
-
-		// Check if the class was namespaced
-		if (strpos($name, '\\') !== false)
-		{
-			if (! $file = $locator->locateFile($name, $options['path']))
-			{
-				return null;
-			}
-			$files = [$file];
-		}
-		// No namespace? Search for it
-		// Check all namespaces, prioritizing App and modules
-		elseif (! $files = $locator->search($options['path'] . DIRECTORY_SEPARATOR . $name))
-		{
-			return null;
-		}
-
-		// Check all files for a valid class
-		foreach ($files as $file)
-		{
-			$class = $locator->getClassname($file);
-
-			if ($class && self::verifyInstanceOf($options, $class))
-			{
-				return $class;
-			}
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies that a class & config satisfy the "preferApp" option
-	 *
-	 * @param array  $options The array of component-specific directives
-	 * @param string $name    Class name, namespace optional
-	 *
-	 * @return boolean
-	 */
-	protected static function verifyPreferApp(array $options, string $name): bool
-	{
-		// Anything without that restriction passes
-		if (! $options['preferApp'])
-		{
-			return true;
-		}
-
-		// Special case for Config since its App namespace is actually \Config
-		if ($options['component'] === 'config')
-		{
-			return strpos($name, 'Config') === 0;
-		}
-
-		return strpos($name, APP_NAMESPACE) === 0;
-	}
-
-	/**
-	 * Verifies that a class & config satisfy the "instanceOf" option
-	 *
-	 * @param array  $options The array of component-specific directives
-	 * @param string $name    Class name, namespace optional
-	 *
-	 * @return boolean
-	 */
-	protected static function verifyInstanceOf(array $options, string $name): bool
-	{
-		// Anything without that restriction passes
-		if (! $options['instanceOf'])
-		{
-			return true;
-		}
-
-		return is_a($name, $options['instanceOf'], true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the component-specific configuration
-	 *
-	 * @param string $component Lowercase, plural component name
-	 *
-	 * @return array<string, mixed>
-	 */
-	public static function getOptions(string $component): array
-	{
-		$component = strtolower($component);
-
-		// Check for a stored version
-		if (isset(self::$options[$component]))
-		{
-			return self::$options[$component];
-		}
-
-		$values = $component === 'config'
-			// Handle Config as a special case to prevent logic loops
-			? self::$configOptions
-			// Load values from the best Factory configuration (will include Registrars)
-			: config('Factory')->$component ?? [];
-
-		return self::setOptions($component, $values);
-	}
-
-	/**
-	 * Normalizes, stores, and returns the configuration for a specific component
-	 *
-	 * @param string $component Lowercase, plural component name
-	 * @param array  $values
-	 *
-	 * @return array<string, mixed> The result after applying defaults and normalization
-	 */
-	public static function setOptions(string $component, array $values): array
-	{
-		// Allow the config to replace the component name, to support "aliases"
-		$values['component'] = strtolower($values['component'] ?? $component);
-
-		// Reset this component so instances can be rediscovered with the updated config
-		self::reset($values['component']);
-
-		// If no path was available then use the component
-		$values['path'] = trim($values['path'] ?? ucfirst($values['component']), '\\ ');
-
-		// Add defaults for any missing values
-		$values = array_merge(Factory::$default, $values);
-
-		// Store the result to the supplied name and potential alias
-		self::$options[$component]           = $values;
-		self::$options[$values['component']] = $values;
-
-		return $values;
-	}
-
-	/**
-	 * Resets the static arrays, optionally just for one component
-	 *
-	 * @param string $component Lowercase, plural component name
-	 */
-	public static function reset(string $component = null)
-	{
-		if ($component)
-		{
-			unset(static::$options[$component]);
-			unset(static::$basenames[$component]);
-			unset(static::$instances[$component]);
-
-			return;
-		}
-
-		static::$options   = [];
-		static::$basenames = [];
-		static::$instances = [];
-	}
-
-	/**
-	 * Helper method for injecting mock instances
-	 *
-	 * @param string $component Lowercase, plural component name
-	 * @param string $name      The name of the instance
-	 * @param object $instance
-	 */
-	public static function injectMock(string $component, string $name, object $instance)
-	{
-		// Force a configuration to exist for this component
-		$component = strtolower($component);
-		self::getOptions($component);
-
-		$class    = get_class($instance);
-		$basename = self::getBasename($name);
-
-		self::$instances[$component][$class]    = $instance;
-		self::$basenames[$component][$basename] = $class;
-	}
-
-	/**
-	 * Gets a basename from a class name, namespaced or not.
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	public static function getBasename(string $name): string
-	{
-		// Determine the basename
-		if ($basename = strrchr($name, '\\'))
-		{
-			return substr($basename, 1);
-		}
-
-		return $name;
-	}
+    /**
+     * Store of component-specific options, usually
+     * from CodeIgniter\Config\Factory.
+     *
+     * @var array<string, array>
+     */
+    protected static $options = [];
+
+    /**
+     * Explicit options for the Config
+     * component to prevent logic loops.
+     *
+     * @var array<string, mixed>
+     */
+    private static $configOptions = [
+        'component'  => 'config',
+        'path'       => 'Config',
+        'instanceOf' => null,
+        'getShared'  => true,
+        'preferApp'  => true,
+    ];
+
+    /**
+     * Mapping of class basenames (no namespace) to
+     * their instances.
+     *
+     * @var array<string, string[]>
+     */
+    protected static $basenames = [];
+
+    /**
+     * Store for instances of any component that
+     * has been requested as "shared".
+     * A multi-dimensional array with components as
+     * keys to the array of name-indexed instances.
+     *
+     * @var array<string, array>
+     */
+    protected static $instances = [];
+
+    /**
+     * Loads instances based on the method component name. Either
+     * creates a new instance or returns an existing shared instance.
+     *
+     * @return mixed
+     */
+    public static function __callStatic(string $component, array $arguments)
+    {
+        // First argument is the name, second is options
+        $name    = trim(array_shift($arguments), '\\ ');
+        $options = array_shift($arguments) ?? [];
+
+        // Determine the component-specific options
+        $options = array_merge(self::getOptions(strtolower($component)), $options);
+
+        if (! $options['getShared']) {
+            if ($class = self::locateClass($options, $name)) {
+                return new $class(...$arguments);
+            }
+
+            return null;
+        }
+
+        $basename = self::getBasename($name);
+
+        // Check for an existing instance
+        if (isset(self::$basenames[$options['component']][$basename])) {
+            $class = self::$basenames[$options['component']][$basename];
+
+            // Need to verify if the shared instance matches the request
+            if (self::verifyInstanceOf($options, $class)) {
+                return self::$instances[$options['component']][$class];
+            }
+        }
+
+        // Try to locate the class
+        if (! $class = self::locateClass($options, $name)) {
+            return null;
+        }
+
+        self::$instances[$options['component']][$class]    = new $class(...$arguments);
+        self::$basenames[$options['component']][$basename] = $class;
+
+        return self::$instances[$options['component']][$class];
+    }
+
+    /**
+     * Finds a component class
+     *
+     * @param array  $options The array of component-specific directives
+     * @param string $name    Class name, namespace optional
+     */
+    protected static function locateClass(array $options, string $name): ?string
+    {
+        // Check for low-hanging fruit
+        if (class_exists($name, false) && self::verifyPreferApp($options, $name) && self::verifyInstanceOf($options, $name)) {
+            return $name;
+        }
+
+        // Determine the relative class names we need
+        $basename = self::getBasename($name);
+        $appname  = $options['component'] === 'config'
+            ? 'Config\\' . $basename
+            : rtrim(APP_NAMESPACE, '\\') . '\\' . $options['path'] . '\\' . $basename;
+
+        // If an App version was requested then see if it verifies
+        if ($options['preferApp'] && class_exists($appname) && self::verifyInstanceOf($options, $name)) {
+            return $appname;
+        }
+
+        // If we have ruled out an App version and the class exists then try it
+        if (class_exists($name) && self::verifyInstanceOf($options, $name)) {
+            return $name;
+        }
+
+        // Have to do this the hard way...
+        $locator = Services::locator();
+
+        // Check if the class was namespaced
+        if (strpos($name, '\\') !== false) {
+            if (! $file = $locator->locateFile($name, $options['path'])) {
+                return null;
+            }
+            $files = [$file];
+        }
+        // No namespace? Search for it
+        // Check all namespaces, prioritizing App and modules
+        elseif (! $files = $locator->search($options['path'] . DIRECTORY_SEPARATOR . $name)) {
+            return null;
+        }
+
+        // Check all files for a valid class
+        foreach ($files as $file) {
+            $class = $locator->getClassname($file);
+
+            if ($class && self::verifyInstanceOf($options, $class)) {
+                return $class;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Verifies that a class & config satisfy the "preferApp" option
+     *
+     * @param array  $options The array of component-specific directives
+     * @param string $name    Class name, namespace optional
+     */
+    protected static function verifyPreferApp(array $options, string $name): bool
+    {
+        // Anything without that restriction passes
+        if (! $options['preferApp']) {
+            return true;
+        }
+
+        // Special case for Config since its App namespace is actually \Config
+        if ($options['component'] === 'config') {
+            return strpos($name, 'Config') === 0;
+        }
+
+        return strpos($name, APP_NAMESPACE) === 0;
+    }
+
+    /**
+     * Verifies that a class & config satisfy the "instanceOf" option
+     *
+     * @param array  $options The array of component-specific directives
+     * @param string $name    Class name, namespace optional
+     */
+    protected static function verifyInstanceOf(array $options, string $name): bool
+    {
+        // Anything without that restriction passes
+        if (! $options['instanceOf']) {
+            return true;
+        }
+
+        return is_a($name, $options['instanceOf'], true);
+    }
+
+    /**
+     * Returns the component-specific configuration
+     *
+     * @param string $component Lowercase, plural component name
+     *
+     * @return array<string, mixed>
+     */
+    public static function getOptions(string $component): array
+    {
+        $component = strtolower($component);
+
+        // Check for a stored version
+        if (isset(self::$options[$component])) {
+            return self::$options[$component];
+        }
+
+        $values = $component === 'config'
+            // Handle Config as a special case to prevent logic loops
+            ? self::$configOptions
+            // Load values from the best Factory configuration (will include Registrars)
+            : config('Factory')->{$component} ?? [];
+
+        return self::setOptions($component, $values);
+    }
+
+    /**
+     * Normalizes, stores, and returns the configuration for a specific component
+     *
+     * @param string $component Lowercase, plural component name
+     *
+     * @return array<string, mixed> The result after applying defaults and normalization
+     */
+    public static function setOptions(string $component, array $values): array
+    {
+        // Allow the config to replace the component name, to support "aliases"
+        $values['component'] = strtolower($values['component'] ?? $component);
+
+        // Reset this component so instances can be rediscovered with the updated config
+        self::reset($values['component']);
+
+        // If no path was available then use the component
+        $values['path'] = trim($values['path'] ?? ucfirst($values['component']), '\\ ');
+
+        // Add defaults for any missing values
+        $values = array_merge(Factory::$default, $values);
+
+        // Store the result to the supplied name and potential alias
+        self::$options[$component]           = $values;
+        self::$options[$values['component']] = $values;
+
+        return $values;
+    }
+
+    /**
+     * Resets the static arrays, optionally just for one component
+     *
+     * @param string $component Lowercase, plural component name
+     */
+    public static function reset(?string $component = null)
+    {
+        if ($component) {
+            unset(
+                static::$options[$component],
+                static::$basenames[$component],
+                static::$instances[$component]
+            );
+
+            return;
+        }
+
+        static::$options   = [];
+        static::$basenames = [];
+        static::$instances = [];
+    }
+
+    /**
+     * Helper method for injecting mock instances
+     *
+     * @param string $component Lowercase, plural component name
+     * @param string $name      The name of the instance
+     */
+    public static function injectMock(string $component, string $name, object $instance)
+    {
+        // Force a configuration to exist for this component
+        $component = strtolower($component);
+        self::getOptions($component);
+
+        $class    = get_class($instance);
+        $basename = self::getBasename($name);
+
+        self::$instances[$component][$class]    = $instance;
+        self::$basenames[$component][$basename] = $class;
+    }
+
+    /**
+     * Gets a basename from a class name, namespaced or not.
+     */
+    public static function getBasename(string $name): string
+    {
+        // Determine the basename
+        if ($basename = strrchr($name, '\\')) {
+            return substr($basename, 1);
+        }
+
+        return $name;
+    }
 }
diff --git a/system/Config/Factory.php b/system/Config/Factory.php
index 94fe7ad976ce..5889bf4d7336 100644
--- a/system/Config/Factory.php
+++ b/system/Config/Factory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -22,27 +22,27 @@
  */
 class Factory extends BaseConfig
 {
-	/**
-	 * Supplies a default set of options to merge for
-	 * all unspecified factory components.
-	 *
-	 * @var array
-	 */
-	public static $default = [
-		'component'  => null,
-		'path'       => null,
-		'instanceOf' => null,
-		'getShared'  => true,
-		'preferApp'  => true,
-	];
+    /**
+     * Supplies a default set of options to merge for
+     * all unspecified factory components.
+     *
+     * @var array
+     */
+    public static $default = [
+        'component'  => null,
+        'path'       => null,
+        'instanceOf' => null,
+        'getShared'  => true,
+        'preferApp'  => true,
+    ];
 
-	/**
-	 * Specifies that Models should always favor child
-	 * classes to allow easy extension of module Models.
-	 *
-	 * @var array
-	 */
-	public $models = [
-		'preferApp' => true,
-	];
+    /**
+     * Specifies that Models should always favor child
+     * classes to allow easy extension of module Models.
+     *
+     * @var array
+     */
+    public $models = [
+        'preferApp' => true,
+    ];
 }
diff --git a/system/Config/ForeignCharacters.php b/system/Config/ForeignCharacters.php
index 4f089532907a..f2e7cc57cabf 100644
--- a/system/Config/ForeignCharacters.php
+++ b/system/Config/ForeignCharacters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -16,98 +16,98 @@
  */
 class ForeignCharacters
 {
-	/**
-	 * Without further ado, the list of foreign characters.
-	 */
-	public $characterList = [
-		'/ä|æ|ǽ/'                                                     => 'ae',
-		'/ö|œ/'                                                       => 'oe',
-		'/ü/'                                                         => 'ue',
-		'/Ä/'                                                         => 'Ae',
-		'/Ü/'                                                         => 'Ue',
-		'/Ö/'                                                         => 'Oe',
-		'/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ|А/'         => 'A',
-		'/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ|а/'       => 'a',
-		'/Б/'                                                         => 'B',
-		'/б/'                                                         => 'b',
-		'/Ç|Ć|Ĉ|Ċ|Č/'                                                 => 'C',
-		'/ç|ć|ĉ|ċ|č/'                                                 => 'c',
-		'/Д/'                                                         => 'D',
-		'/д/'                                                         => 'd',
-		'/Ð|Ď|Đ|Δ/'                                                   => 'Dj',
-		'/ð|ď|đ|δ/'                                                   => 'dj',
-		'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/'                 => 'E',
-		'/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/'                 => 'e',
-		'/Ф/'                                                         => 'F',
-		'/ф/'                                                         => 'f',
-		'/Ĝ|Ğ|Ġ|Ģ|Γ|Г|Ґ/'                                             => 'G',
-		'/ĝ|ğ|ġ|ģ|γ|г|ґ/'                                             => 'g',
-		'/Ĥ|Ħ/'                                                       => 'H',
-		'/ĥ|ħ/'                                                       => 'h',
-		'/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Ы/'                     => 'I',
-		'/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/'                   => 'i',
-		'/Ĵ/'                                                         => 'J',
-		'/ĵ/'                                                         => 'j',
-		'/Ķ|Κ|К/'                                                     => 'K',
-		'/ķ|κ|к/'                                                     => 'k',
-		'/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/'                                             => 'L',
-		'/ĺ|ļ|ľ|ŀ|ł|λ|л/'                                             => 'l',
-		'/М/'                                                         => 'M',
-		'/м/'                                                         => 'm',
-		'/Ñ|Ń|Ņ|Ň|Ν|Н/'                                               => 'N',
-		'/ñ|ń|ņ|ň|ʼn|ν|н/'                                             => 'n',
-		'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ|Ỏ|Ọ|Ồ|Ố|Ỗ|Ổ|Ộ|Ờ|Ớ|Ỡ|Ở|Ợ|О/'   => 'O',
-		'/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ|ỏ|ọ|ồ|ố|ỗ|ổ|ộ|ờ|ớ|ỡ|ở|ợ|о/' => 'o',
-		'/П/'                                                         => 'P',
-		'/п/'                                                         => 'p',
-		'/Ŕ|Ŗ|Ř|Ρ|Р/'                                                 => 'R',
-		'/ŕ|ŗ|ř|ρ|р/'                                                 => 'r',
-		'/Ś|Ŝ|Ş|Ș|Š|Σ|С/'                                             => 'S',
-		'/ś|ŝ|ş|ș|š|ſ|σ|ς|с/'                                         => 's',
-		'/Ț|Ţ|Ť|Ŧ|τ|Т/'                                               => 'T',
-		'/ț|ţ|ť|ŧ|т/'                                                 => 't',
-		'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/'           => 'U',
-		'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/'       => 'u',
-		'/Ƴ|Ɏ|Ỵ|Ẏ|Ӳ|Ӯ|Ў|Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/'                       => 'Y',
-		'/ẙ|ʏ|ƴ|ɏ|ỵ|ẏ|ӳ|ӯ|ў|ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/'                         => 'y',
-		'/В/'                                                         => 'V',
-		'/в/'                                                         => 'v',
-		'/Ŵ/'                                                         => 'W',
-		'/ŵ/'                                                         => 'w',
-		'/Ź|Ż|Ž|Ζ|З/'                                                 => 'Z',
-		'/ź|ż|ž|ζ|з/'                                                 => 'z',
-		'/Æ|Ǽ/'                                                       => 'AE',
-		'/ß/'                                                         => 'ss',
-		'/IJ/'                                                         => 'IJ',
-		'/ij/'                                                         => 'ij',
-		'/Œ/'                                                         => 'OE',
-		'/ƒ/'                                                         => 'f',
-		'/ξ/'                                                         => 'ks',
-		'/π/'                                                         => 'p',
-		'/β/'                                                         => 'v',
-		'/μ/'                                                         => 'm',
-		'/ψ/'                                                         => 'ps',
-		'/Ё/'                                                         => 'Yo',
-		'/ё/'                                                         => 'yo',
-		'/Є/'                                                         => 'Ye',
-		'/є/'                                                         => 'ye',
-		'/Ї/'                                                         => 'Yi',
-		'/Ж/'                                                         => 'Zh',
-		'/ж/'                                                         => 'zh',
-		'/Х/'                                                         => 'Kh',
-		'/х/'                                                         => 'kh',
-		'/Ц/'                                                         => 'Ts',
-		'/ц/'                                                         => 'ts',
-		'/Ч/'                                                         => 'Ch',
-		'/ч/'                                                         => 'ch',
-		'/Ш/'                                                         => 'Sh',
-		'/ш/'                                                         => 'sh',
-		'/Щ/'                                                         => 'Shch',
-		'/щ/'                                                         => 'shch',
-		'/Ъ|ъ|Ь|ь/'                                                   => '',
-		'/Ю/'                                                         => 'Yu',
-		'/ю/'                                                         => 'yu',
-		'/Я/'                                                         => 'Ya',
-		'/я/'                                                         => 'ya',
-	];
+    /**
+     * Without further ado, the list of foreign characters.
+     */
+    public $characterList = [
+        '/ä|æ|ǽ/'                                                     => 'ae',
+        '/ö|œ/'                                                       => 'oe',
+        '/ü/'                                                         => 'ue',
+        '/Ä/'                                                         => 'Ae',
+        '/Ü/'                                                         => 'Ue',
+        '/Ö/'                                                         => 'Oe',
+        '/À|Á|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|Ǎ|Α|Ά|Ả|Ạ|Ầ|Ẫ|Ẩ|Ậ|Ằ|Ắ|Ẵ|Ẳ|Ặ|А/'         => 'A',
+        '/à|á|â|ã|å|ǻ|ā|ă|ą|ǎ|ª|α|ά|ả|ạ|ầ|ấ|ẫ|ẩ|ậ|ằ|ắ|ẵ|ẳ|ặ|а/'       => 'a',
+        '/Б/'                                                         => 'B',
+        '/б/'                                                         => 'b',
+        '/Ç|Ć|Ĉ|Ċ|Č/'                                                 => 'C',
+        '/ç|ć|ĉ|ċ|č/'                                                 => 'c',
+        '/Д/'                                                         => 'D',
+        '/д/'                                                         => 'd',
+        '/Ð|Ď|Đ|Δ/'                                                   => 'Dj',
+        '/ð|ď|đ|δ/'                                                   => 'dj',
+        '/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě|Ε|Έ|Ẽ|Ẻ|Ẹ|Ề|Ế|Ễ|Ể|Ệ|Е|Э/'                 => 'E',
+        '/è|é|ê|ë|ē|ĕ|ė|ę|ě|έ|ε|ẽ|ẻ|ẹ|ề|ế|ễ|ể|ệ|е|э/'                 => 'e',
+        '/Ф/'                                                         => 'F',
+        '/ф/'                                                         => 'f',
+        '/Ĝ|Ğ|Ġ|Ģ|Γ|Г|Ґ/'                                             => 'G',
+        '/ĝ|ğ|ġ|ģ|γ|г|ґ/'                                             => 'g',
+        '/Ĥ|Ħ/'                                                       => 'H',
+        '/ĥ|ħ/'                                                       => 'h',
+        '/Ì|Í|Î|Ï|Ĩ|Ī|Ĭ|Ǐ|Į|İ|Η|Ή|Ί|Ι|Ϊ|Ỉ|Ị|И|Ы/'                     => 'I',
+        '/ì|í|î|ï|ĩ|ī|ĭ|ǐ|į|ı|η|ή|ί|ι|ϊ|ỉ|ị|и|ы|ї/'                   => 'i',
+        '/Ĵ/'                                                         => 'J',
+        '/ĵ/'                                                         => 'j',
+        '/Ķ|Κ|К/'                                                     => 'K',
+        '/ķ|κ|к/'                                                     => 'k',
+        '/Ĺ|Ļ|Ľ|Ŀ|Ł|Λ|Л/'                                             => 'L',
+        '/ĺ|ļ|ľ|ŀ|ł|λ|л/'                                             => 'l',
+        '/М/'                                                         => 'M',
+        '/м/'                                                         => 'm',
+        '/Ñ|Ń|Ņ|Ň|Ν|Н/'                                               => 'N',
+        '/ñ|ń|ņ|ň|ʼn|ν|н/'                                             => 'n',
+        '/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|Ő|Ơ|Ø|Ǿ|Ο|Ό|Ω|Ώ|Ỏ|Ọ|Ồ|Ố|Ỗ|Ổ|Ộ|Ờ|Ớ|Ỡ|Ở|Ợ|О/'   => 'O',
+        '/ò|ó|ô|õ|ō|ŏ|ǒ|ő|ơ|ø|ǿ|º|ο|ό|ω|ώ|ỏ|ọ|ồ|ố|ỗ|ổ|ộ|ờ|ớ|ỡ|ở|ợ|о/' => 'o',
+        '/П/'                                                         => 'P',
+        '/п/'                                                         => 'p',
+        '/Ŕ|Ŗ|Ř|Ρ|Р/'                                                 => 'R',
+        '/ŕ|ŗ|ř|ρ|р/'                                                 => 'r',
+        '/Ś|Ŝ|Ş|Ș|Š|Σ|С/'                                             => 'S',
+        '/ś|ŝ|ş|ș|š|ſ|σ|ς|с/'                                         => 's',
+        '/Ț|Ţ|Ť|Ŧ|τ|Т/'                                               => 'T',
+        '/ț|ţ|ť|ŧ|т/'                                                 => 't',
+        '/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ|Ũ|Ủ|Ụ|Ừ|Ứ|Ữ|Ử|Ự|У/'           => 'U',
+        '/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ|υ|ύ|ϋ|ủ|ụ|ừ|ứ|ữ|ử|ự|у/'       => 'u',
+        '/Ƴ|Ɏ|Ỵ|Ẏ|Ӳ|Ӯ|Ў|Ý|Ÿ|Ŷ|Υ|Ύ|Ϋ|Ỳ|Ỹ|Ỷ|Ỵ|Й/'                       => 'Y',
+        '/ẙ|ʏ|ƴ|ɏ|ỵ|ẏ|ӳ|ӯ|ў|ý|ÿ|ŷ|ỳ|ỹ|ỷ|ỵ|й/'                         => 'y',
+        '/В/'                                                         => 'V',
+        '/в/'                                                         => 'v',
+        '/Ŵ/'                                                         => 'W',
+        '/ŵ/'                                                         => 'w',
+        '/Ź|Ż|Ž|Ζ|З/'                                                 => 'Z',
+        '/ź|ż|ž|ζ|з/'                                                 => 'z',
+        '/Æ|Ǽ/'                                                       => 'AE',
+        '/ß/'                                                         => 'ss',
+        '/IJ/'                                                         => 'IJ',
+        '/ij/'                                                         => 'ij',
+        '/Œ/'                                                         => 'OE',
+        '/ƒ/'                                                         => 'f',
+        '/ξ/'                                                         => 'ks',
+        '/π/'                                                         => 'p',
+        '/β/'                                                         => 'v',
+        '/μ/'                                                         => 'm',
+        '/ψ/'                                                         => 'ps',
+        '/Ё/'                                                         => 'Yo',
+        '/ё/'                                                         => 'yo',
+        '/Є/'                                                         => 'Ye',
+        '/є/'                                                         => 'ye',
+        '/Ї/'                                                         => 'Yi',
+        '/Ж/'                                                         => 'Zh',
+        '/ж/'                                                         => 'zh',
+        '/Х/'                                                         => 'Kh',
+        '/х/'                                                         => 'kh',
+        '/Ц/'                                                         => 'Ts',
+        '/ц/'                                                         => 'ts',
+        '/Ч/'                                                         => 'Ch',
+        '/ч/'                                                         => 'ch',
+        '/Ш/'                                                         => 'Sh',
+        '/ш/'                                                         => 'sh',
+        '/Щ/'                                                         => 'Shch',
+        '/щ/'                                                         => 'shch',
+        '/Ъ|ъ|Ь|ь/'                                                   => '',
+        '/Ю/'                                                         => 'Yu',
+        '/ю/'                                                         => 'yu',
+        '/Я/'                                                         => 'Ya',
+        '/я/'                                                         => 'ya',
+    ];
 }
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 1cab0bb2f0c7..4ace952bc3c8 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 
-/**
+/*
  * System URI Routing
  *
  * This file contains any routing to system tools, such as command-line
@@ -22,13 +22,13 @@
  */
 
 // Prevent access to BaseController
-$routes->add('BaseController(:any)', function () {
-	throw PageNotFoundException::forPageNotFound();
+$routes->add('BaseController(:any)', static function () {
+    throw PageNotFoundException::forPageNotFound();
 });
 
 // Prevent access to initController method
-$routes->add('(:any)/initController', function () {
-	throw PageNotFoundException::forPageNotFound();
+$routes->add('(:any)/initController', static function () {
+    throw PageNotFoundException::forPageNotFound();
 });
 
 // Migrations
diff --git a/system/Config/Services.php b/system/Config/Services.php
index fe6e6a3e7623..0b681f17ce17 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -65,10 +65,10 @@
 use Config\Images;
 use Config\Migrations;
 use Config\Pager as PagerConfig;
+use Config\Services as AppServices;
 use Config\Toolbar as ToolbarConfig;
 use Config\Validation as ValidationConfig;
 use Config\View as ViewConfig;
-use Config\Services as AppServices;
 
 /**
  * Services Configuration file.
@@ -89,796 +89,601 @@
  */
 class Services extends BaseService
 {
-	/**
-	 * The cache class provides a simple way to store and retrieve
-	 * complex data for later.
-	 *
-	 * @param Cache|null $config
-	 * @param boolean    $getShared
-	 *
-	 * @return CacheInterface
-	 */
-	public static function cache(Cache $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('cache', $config);
-		}
-
-		$config = $config ?? new Cache();
-
-		return CacheFactory::getHandler($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The CLI Request class provides for ways to interact with
-	 * a command line request.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return CLIRequest
-	 */
-	public static function clirequest(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('clirequest', $config);
-		}
-
-		$config = $config ?? config('App');
-
-		return new CLIRequest($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CodeIgniter, the core of the framework.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return CodeIgniter
-	 */
-	public static function codeigniter(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('codeigniter', $config);
-		}
-
-		$config = $config ?? config('App');
-
-		return new CodeIgniter($config);
-	}
-
-	/**
-	 * The commands utility for running and working with CLI commands.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Commands
-	 */
-	public static function commands(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('commands');
-		}
-
-		return new Commands();
-	}
-
-	/**
-	 * The CURL Request class acts as a simple HTTP client for interacting
-	 * with other servers, typically through APIs.
-	 *
-	 * @param array                  $options
-	 * @param ResponseInterface|null $response
-	 * @param App|null               $config
-	 * @param boolean                $getShared
-	 *
-	 * @return CURLRequest
-	 */
-	public static function curlrequest(array $options = [], ResponseInterface $response = null, App $config = null, bool $getShared = true)
-	{
-		if ($getShared === true)
-		{
-			return static::getSharedInstance('curlrequest', $options, $response, $config);
-		}
-
-		$config   = $config ?? config('App');
-		$response = $response ?? new Response($config);
-
-		return new CURLRequest(
-			$config,
-			new URI($options['base_uri'] ?? null),
-			$response,
-			$options
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Email class allows you to send email via mail, sendmail, SMTP.
-	 *
-	 * @param EmailConfig|array|null $config
-	 * @param boolean                $getShared
-	 *
-	 * @return Email
-	 */
-	public static function email($config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('email', $config);
-		}
-
-		if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig))
-		{
-			$config = config('Email');
-		}
-
-		return new Email($config);
-	}
-
-	/**
-	 * The Encryption class provides two-way encryption.
-	 *
-	 * @param EncryptionConfig|null $config
-	 * @param boolean               $getShared
-	 *
-	 * @return EncrypterInterface Encryption handler
-	 */
-	public static function encrypter(EncryptionConfig $config = null, $getShared = false)
-	{
-		if ($getShared === true)
-		{
-			return static::getSharedInstance('encrypter', $config);
-		}
-
-		$config     = $config ?? config('Encryption');
-		$encryption = new Encryption($config);
-
-		return $encryption->initialize($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Exceptions class holds the methods that handle:
-	 *
-	 *  - set_exception_handler
-	 *  - set_error_handler
-	 *  - register_shutdown_function
-	 *
-	 * @param ExceptionsConfig|null $config
-	 * @param IncomingRequest|null  $request
-	 * @param Response|null         $response
-	 * @param boolean               $getShared
-	 *
-	 * @return Exceptions
-	 */
-	public static function exceptions(
-		ExceptionsConfig $config = null,
-		IncomingRequest $request = null,
-		Response $response = null,
-		bool $getShared = true
-	)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('exceptions', $config, $request, $response);
-		}
-
-		$config   = $config ?? config('Exceptions');
-		$request  = $request ?? AppServices::request();
-		$response = $response ?? AppServices::response();
-
-		return new Exceptions($config, $request, $response);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Filters allow you to run tasks before and/or after a controller
-	 * is executed. During before filters, the request can be modified,
-	 * and actions taken based on the request, while after filters can
-	 * act on or modify the response itself before it is sent to the client.
-	 *
-	 * @param FiltersConfig|null $config
-	 * @param boolean            $getShared
-	 *
-	 * @return Filters
-	 */
-	public static function filters(FiltersConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('filters', $config);
-		}
-
-		$config = $config ?? config('Filters');
-
-		return new Filters($config, AppServices::request(), AppServices::response());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Format class is a convenient place to create Formatters.
-	 *
-	 * @param FormatConfig|null $config
-	 * @param boolean           $getShared
-	 *
-	 * @return Format
-	 */
-	public static function format(FormatConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('format', $config);
-		}
-
-		$config = $config ?? config('Format');
-
-		return new Format($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Honeypot provides a secret input on forms that bots should NOT
-	 * fill in, providing an additional safeguard when accepting user input.
-	 *
-	 * @param HoneypotConfig|null $config
-	 * @param boolean             $getShared
-	 *
-	 * @return Honeypot
-	 */
-	public static function honeypot(HoneypotConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('honeypot', $config);
-		}
-
-		$config = $config ?? config('Honeypot');
-
-		return new Honeypot($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Acts as a factory for ImageHandler classes and returns an instance
-	 * of the handler. Used like Services::image()->withFile($path)->rotate(90)->save();
-	 *
-	 * @param string|null $handler
-	 * @param Images|null $config
-	 * @param boolean     $getShared
-	 *
-	 * @return BaseHandler
-	 */
-	public static function image(string $handler = null, Images $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('image', $handler, $config);
-		}
-
-		$config  = $config ?? config('Images');
-		$handler = $handler ?: $config->defaultHandler;
-		$class   = $config->handlers[$handler];
-
-		return new $class($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Iterator class provides a simple way of looping over a function
-	 * and timing the results and memory usage. Used when debugging and
-	 * optimizing applications.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Iterator
-	 */
-	public static function iterator(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('iterator');
-		}
-
-		return new Iterator();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Responsible for loading the language string translations.
-	 *
-	 * @param string|null $locale
-	 * @param boolean     $getShared
-	 *
-	 * @return Language
-	 */
-	public static function language(string $locale = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('language', $locale)->setLocale($locale);
-		}
-
-		// Use '?:' for empty string check
-		$locale = $locale ?: AppServices::request()->getLocale();
-
-		return new Language($locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Logger class is a PSR-3 compatible Logging class that supports
-	 * multiple handlers that process the actual logging.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Logger
-	 */
-	public static function logger(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('logger');
-		}
-
-		return new Logger(config('Logger'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the appropriate Migration runner.
-	 *
-	 * @param Migrations|null          $config
-	 * @param ConnectionInterface|null $db
-	 * @param boolean                  $getShared
-	 *
-	 * @return MigrationRunner
-	 */
-	public static function migrations(Migrations $config = null, ConnectionInterface $db = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('migrations', $config, $db);
-		}
-
-		$config = $config ?? config('Migrations');
-
-		return new MigrationRunner($config, $db);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Negotiate class provides the content negotiation features for
-	 * working the request to determine correct language, encoding, charset,
-	 * and more.
-	 *
-	 * @param RequestInterface|null $request
-	 * @param boolean               $getShared
-	 *
-	 * @return Negotiate
-	 */
-	public static function negotiator(RequestInterface $request = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('negotiator', $request);
-		}
-
-		$request = $request ?? AppServices::request();
-
-		return new Negotiate($request);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the appropriate pagination handler.
-	 *
-	 * @param PagerConfig|null       $config
-	 * @param RendererInterface|null $view
-	 * @param boolean                $getShared
-	 *
-	 * @return Pager
-	 */
-	public static function pager(PagerConfig $config = null, RendererInterface $view = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('pager', $config, $view);
-		}
-
-		$config = $config ?? config('Pager');
-		$view   = $view ?? AppServices::renderer();
-
-		return new Pager($config, $view);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Parser is a simple template parser.
-	 *
-	 * @param string|null     $viewPath
-	 * @param ViewConfig|null $config
-	 * @param boolean         $getShared
-	 *
-	 * @return Parser
-	 */
-	public static function parser(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('parser', $viewPath, $config);
-		}
-
-		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
-		$config   = $config ?? config('View');
-
-		return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Renderer class is the class that actually displays a file to the user.
-	 * The default View class within CodeIgniter is intentionally simple, but this
-	 * service could easily be replaced by a template engine if the user needed to.
-	 *
-	 * @param string|null     $viewPath
-	 * @param ViewConfig|null $config
-	 * @param boolean         $getShared
-	 *
-	 * @return View
-	 */
-	public static function renderer(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('renderer', $viewPath, $config);
-		}
-
-		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
-		$config   = $config ?? config('View');
-
-		return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Request class models an HTTP request.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return IncomingRequest
-	 */
-	public static function request(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('request', $config);
-		}
-
-		$config = $config ?? config('App');
-
-		return new IncomingRequest(
-			$config,
-			AppServices::uri(),
-			'php://input',
-			new UserAgent()
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Response class models an HTTP response.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return Response
-	 */
-	public static function response(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('response', $config);
-		}
-
-		$config = $config ?? config('App');
-
-		return new Response($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Redirect class provides nice way of working with redirects.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return RedirectResponse
-	 */
-	public static function redirectresponse(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('redirectresponse', $config);
-		}
-
-		$config   = $config ?? config('App');
-		$response = new RedirectResponse($config);
-		$response->setProtocolVersion(AppServices::request()->getProtocolVersion());
-
-		return $response;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Routes service is a class that allows for easily building
-	 * a collection of routes.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return RouteCollection
-	 */
-	public static function routes(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('routes');
-		}
-
-		return new RouteCollection(AppServices::locator(), config('Modules'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Router class uses a RouteCollection's array of routes, and determines
-	 * the correct Controller and Method to execute.
-	 *
-	 * @param RouteCollectionInterface|null $routes
-	 * @param Request|null                  $request
-	 * @param boolean                       $getShared
-	 *
-	 * @return Router
-	 */
-	public static function router(RouteCollectionInterface $routes = null, Request $request = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('router', $routes, $request);
-		}
-
-		$routes  = $routes ?? AppServices::routes();
-		$request = $request ?? AppServices::request();
-
-		return new Router($routes, $request);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Security class provides a few handy tools for keeping the site
-	 * secure, most notably the CSRF protection tools.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return Security
-	 */
-	public static function security(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('security', $config);
-		}
-
-		$config = $config ?? config('App');
-
-		return new Security($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the session manager.
-	 *
-	 * @param App|null $config
-	 * @param boolean  $getShared
-	 *
-	 * @return Session
-	 */
-	public static function session(App $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('session', $config);
-		}
-
-		$config = $config ?? config('App');
-		$logger = AppServices::logger();
-
-		$driverName = $config->sessionDriver;
-		$driver     = new $driverName($config, AppServices::request()->getIPAddress());
-		$driver->setLogger($logger);
-
-		$session = new Session($driver, $config);
-		$session->setLogger($logger);
-
-		if (session_status() === PHP_SESSION_NONE)
-		{
-			$session->start();
-		}
-
-		return $session;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Throttler class provides a simple method for implementing
-	 * rate limiting in your applications.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Throttler
-	 */
-	public static function throttler(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('throttler');
-		}
-
-		return new Throttler(AppServices::cache());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Timer class provides a simple way to Benchmark portions of your
-	 * application.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Timer
-	 */
-	public static function timer(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('timer');
-		}
-
-		return new Timer();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the debug toolbar.
-	 *
-	 * @param ToolbarConfig|null $config
-	 * @param boolean            $getShared
-	 *
-	 * @return Toolbar
-	 */
-	public static function toolbar(ToolbarConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('toolbar', $config);
-		}
-
-		$config = $config ?? config('Toolbar');
-
-		return new Toolbar($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The URI class provides a way to model and manipulate URIs.
-	 *
-	 * @param string  $uri
-	 * @param boolean $getShared
-	 *
-	 * @return URI
-	 */
-	public static function uri(string $uri = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('uri', $uri);
-		}
-
-		return new URI($uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Validation class provides tools for validating input data.
-	 *
-	 * @param ValidationConfig|null $config
-	 * @param boolean               $getShared
-	 *
-	 * @return Validation
-	 */
-	public static function validation(ValidationConfig $config = null, bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('validation', $config);
-		}
-
-		$config = $config ?? config('Validation');
-
-		return new Validation($config, AppServices::renderer());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * View cells are intended to let you insert HTML into view
-	 * that has been generated by any callable in the system.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Cell
-	 */
-	public static function viewcell(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('viewcell');
-		}
-
-		return new Cell(AppServices::cache());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The Typography class provides a way to format text in semantically relevant ways.
-	 *
-	 * @param boolean $getShared
-	 *
-	 * @return Typography
-	 */
-	public static function typography(bool $getShared = true)
-	{
-		if ($getShared)
-		{
-			return static::getSharedInstance('typography');
-		}
-
-		return new Typography();
-	}
+    /**
+     * The cache class provides a simple way to store and retrieve
+     * complex data for later.
+     *
+     * @return CacheInterface
+     */
+    public static function cache(?Cache $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('cache', $config);
+        }
+
+        $config = $config ?? new Cache();
+
+        return CacheFactory::getHandler($config);
+    }
+
+    /**
+     * The CLI Request class provides for ways to interact with
+     * a command line request.
+     *
+     * @return CLIRequest
+     */
+    public static function clirequest(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('clirequest', $config);
+        }
+
+        $config = $config ?? config('App');
+
+        return new CLIRequest($config);
+    }
+
+    /**
+     * CodeIgniter, the core of the framework.
+     *
+     * @return CodeIgniter
+     */
+    public static function codeigniter(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('codeigniter', $config);
+        }
+
+        $config = $config ?? config('App');
+
+        return new CodeIgniter($config);
+    }
+
+    /**
+     * The commands utility for running and working with CLI commands.
+     *
+     * @return Commands
+     */
+    public static function commands(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('commands');
+        }
+
+        return new Commands();
+    }
+
+    /**
+     * The CURL Request class acts as a simple HTTP client for interacting
+     * with other servers, typically through APIs.
+     *
+     * @return CURLRequest
+     */
+    public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
+    {
+        if ($getShared === true) {
+            return static::getSharedInstance('curlrequest', $options, $response, $config);
+        }
+
+        $config   = $config ?? config('App');
+        $response = $response ?? new Response($config);
+
+        return new CURLRequest(
+            $config,
+            new URI($options['base_uri'] ?? null),
+            $response,
+            $options
+        );
+    }
+
+    /**
+     * The Email class allows you to send email via mail, sendmail, SMTP.
+     *
+     * @param array|EmailConfig|null $config
+     *
+     * @return Email
+     */
+    public static function email($config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('email', $config);
+        }
+
+        if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig)) {
+            $config = config('Email');
+        }
+
+        return new Email($config);
+    }
+
+    /**
+     * The Encryption class provides two-way encryption.
+     *
+     * @param bool $getShared
+     *
+     * @return EncrypterInterface Encryption handler
+     */
+    public static function encrypter(?EncryptionConfig $config = null, $getShared = false)
+    {
+        if ($getShared === true) {
+            return static::getSharedInstance('encrypter', $config);
+        }
+
+        $config     = $config ?? config('Encryption');
+        $encryption = new Encryption($config);
+
+        return $encryption->initialize($config);
+    }
+
+    /**
+     * The Exceptions class holds the methods that handle:
+     *
+     *  - set_exception_handler
+     *  - set_error_handler
+     *  - register_shutdown_function
+     *
+     * @return Exceptions
+     */
+    public static function exceptions(
+        ?ExceptionsConfig $config = null,
+        ?IncomingRequest $request = null,
+        ?Response $response = null,
+        bool $getShared = true
+    ) {
+        if ($getShared) {
+            return static::getSharedInstance('exceptions', $config, $request, $response);
+        }
+
+        $config   = $config ?? config('Exceptions');
+        $request  = $request ?? AppServices::request();
+        $response = $response ?? AppServices::response();
+
+        return new Exceptions($config, $request, $response);
+    }
+
+    /**
+     * Filters allow you to run tasks before and/or after a controller
+     * is executed. During before filters, the request can be modified,
+     * and actions taken based on the request, while after filters can
+     * act on or modify the response itself before it is sent to the client.
+     *
+     * @return Filters
+     */
+    public static function filters(?FiltersConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('filters', $config);
+        }
+
+        $config = $config ?? config('Filters');
+
+        return new Filters($config, AppServices::request(), AppServices::response());
+    }
+
+    /**
+     * The Format class is a convenient place to create Formatters.
+     *
+     * @return Format
+     */
+    public static function format(?FormatConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('format', $config);
+        }
+
+        $config = $config ?? config('Format');
+
+        return new Format($config);
+    }
+
+    /**
+     * The Honeypot provides a secret input on forms that bots should NOT
+     * fill in, providing an additional safeguard when accepting user input.
+     *
+     * @return Honeypot
+     */
+    public static function honeypot(?HoneypotConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('honeypot', $config);
+        }
+
+        $config = $config ?? config('Honeypot');
+
+        return new Honeypot($config);
+    }
+
+    /**
+     * Acts as a factory for ImageHandler classes and returns an instance
+     * of the handler. Used like Services::image()->withFile($path)->rotate(90)->save();
+     *
+     * @return BaseHandler
+     */
+    public static function image(?string $handler = null, ?Images $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('image', $handler, $config);
+        }
+
+        $config  = $config ?? config('Images');
+        $handler = $handler ?: $config->defaultHandler;
+        $class   = $config->handlers[$handler];
+
+        return new $class($config);
+    }
+
+    /**
+     * The Iterator class provides a simple way of looping over a function
+     * and timing the results and memory usage. Used when debugging and
+     * optimizing applications.
+     *
+     * @return Iterator
+     */
+    public static function iterator(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('iterator');
+        }
+
+        return new Iterator();
+    }
+
+    /**
+     * Responsible for loading the language string translations.
+     *
+     * @return Language
+     */
+    public static function language(?string $locale = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('language', $locale)->setLocale($locale);
+        }
+
+        // Use '?:' for empty string check
+        $locale = $locale ?: AppServices::request()->getLocale();
+
+        return new Language($locale);
+    }
+
+    /**
+     * The Logger class is a PSR-3 compatible Logging class that supports
+     * multiple handlers that process the actual logging.
+     *
+     * @return Logger
+     */
+    public static function logger(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('logger');
+        }
+
+        return new Logger(config('Logger'));
+    }
+
+    /**
+     * Return the appropriate Migration runner.
+     *
+     * @return MigrationRunner
+     */
+    public static function migrations(?Migrations $config = null, ?ConnectionInterface $db = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('migrations', $config, $db);
+        }
+
+        $config = $config ?? config('Migrations');
+
+        return new MigrationRunner($config, $db);
+    }
+
+    /**
+     * The Negotiate class provides the content negotiation features for
+     * working the request to determine correct language, encoding, charset,
+     * and more.
+     *
+     * @return Negotiate
+     */
+    public static function negotiator(?RequestInterface $request = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('negotiator', $request);
+        }
+
+        $request = $request ?? AppServices::request();
+
+        return new Negotiate($request);
+    }
+
+    /**
+     * Return the appropriate pagination handler.
+     *
+     * @return Pager
+     */
+    public static function pager(?PagerConfig $config = null, ?RendererInterface $view = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('pager', $config, $view);
+        }
+
+        $config = $config ?? config('Pager');
+        $view   = $view ?? AppServices::renderer();
+
+        return new Pager($config, $view);
+    }
+
+    /**
+     * The Parser is a simple template parser.
+     *
+     * @return Parser
+     */
+    public static function parser(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('parser', $viewPath, $config);
+        }
+
+        $viewPath = $viewPath ?: config('Paths')->viewDirectory;
+        $config   = $config ?? config('View');
+
+        return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
+    }
+
+    /**
+     * The Renderer class is the class that actually displays a file to the user.
+     * The default View class within CodeIgniter is intentionally simple, but this
+     * service could easily be replaced by a template engine if the user needed to.
+     *
+     * @return View
+     */
+    public static function renderer(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('renderer', $viewPath, $config);
+        }
+
+        $viewPath = $viewPath ?: config('Paths')->viewDirectory;
+        $config   = $config ?? config('View');
+
+        return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
+    }
+
+    /**
+     * The Request class models an HTTP request.
+     *
+     * @return IncomingRequest
+     */
+    public static function request(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('request', $config);
+        }
+
+        $config = $config ?? config('App');
+
+        return new IncomingRequest(
+            $config,
+            AppServices::uri(),
+            'php://input',
+            new UserAgent()
+        );
+    }
+
+    /**
+     * The Response class models an HTTP response.
+     *
+     * @return Response
+     */
+    public static function response(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('response', $config);
+        }
+
+        $config = $config ?? config('App');
+
+        return new Response($config);
+    }
+
+    /**
+     * The Redirect class provides nice way of working with redirects.
+     *
+     * @return RedirectResponse
+     */
+    public static function redirectresponse(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('redirectresponse', $config);
+        }
+
+        $config   = $config ?? config('App');
+        $response = new RedirectResponse($config);
+        $response->setProtocolVersion(AppServices::request()->getProtocolVersion());
+
+        return $response;
+    }
+
+    /**
+     * The Routes service is a class that allows for easily building
+     * a collection of routes.
+     *
+     * @return RouteCollection
+     */
+    public static function routes(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('routes');
+        }
+
+        return new RouteCollection(AppServices::locator(), config('Modules'));
+    }
+
+    /**
+     * The Router class uses a RouteCollection's array of routes, and determines
+     * the correct Controller and Method to execute.
+     *
+     * @return Router
+     */
+    public static function router(?RouteCollectionInterface $routes = null, ?Request $request = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('router', $routes, $request);
+        }
+
+        $routes  = $routes ?? AppServices::routes();
+        $request = $request ?? AppServices::request();
+
+        return new Router($routes, $request);
+    }
+
+    /**
+     * The Security class provides a few handy tools for keeping the site
+     * secure, most notably the CSRF protection tools.
+     *
+     * @return Security
+     */
+    public static function security(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('security', $config);
+        }
+
+        $config = $config ?? config('App');
+
+        return new Security($config);
+    }
+
+    /**
+     * Return the session manager.
+     *
+     * @return Session
+     */
+    public static function session(?App $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('session', $config);
+        }
+
+        $config = $config ?? config('App');
+        $logger = AppServices::logger();
+
+        $driverName = $config->sessionDriver;
+        $driver     = new $driverName($config, AppServices::request()->getIPAddress());
+        $driver->setLogger($logger);
+
+        $session = new Session($driver, $config);
+        $session->setLogger($logger);
+
+        if (session_status() === PHP_SESSION_NONE) {
+            $session->start();
+        }
+
+        return $session;
+    }
+
+    /**
+     * The Throttler class provides a simple method for implementing
+     * rate limiting in your applications.
+     *
+     * @return Throttler
+     */
+    public static function throttler(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('throttler');
+        }
+
+        return new Throttler(AppServices::cache());
+    }
+
+    /**
+     * The Timer class provides a simple way to Benchmark portions of your
+     * application.
+     *
+     * @return Timer
+     */
+    public static function timer(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('timer');
+        }
+
+        return new Timer();
+    }
+
+    /**
+     * Return the debug toolbar.
+     *
+     * @return Toolbar
+     */
+    public static function toolbar(?ToolbarConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('toolbar', $config);
+        }
+
+        $config = $config ?? config('Toolbar');
+
+        return new Toolbar($config);
+    }
+
+    /**
+     * The URI class provides a way to model and manipulate URIs.
+     *
+     * @param string $uri
+     *
+     * @return URI
+     */
+    public static function uri(?string $uri = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('uri', $uri);
+        }
+
+        return new URI($uri);
+    }
+
+    /**
+     * The Validation class provides tools for validating input data.
+     *
+     * @return Validation
+     */
+    public static function validation(?ValidationConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('validation', $config);
+        }
+
+        $config = $config ?? config('Validation');
+
+        return new Validation($config, AppServices::renderer());
+    }
+
+    /**
+     * View cells are intended to let you insert HTML into view
+     * that has been generated by any callable in the system.
+     *
+     * @return Cell
+     */
+    public static function viewcell(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('viewcell');
+        }
+
+        return new Cell(AppServices::cache());
+    }
+
+    /**
+     * The Typography class provides a way to format text in semantically relevant ways.
+     *
+     * @return Typography
+     */
+    public static function typography(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('typography');
+        }
+
+        return new Typography();
+    }
 }
diff --git a/system/Config/View.php b/system/Config/View.php
index b57d94167422..5a8baeac2d6a 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -16,87 +16,85 @@
  */
 class View extends BaseConfig
 {
-	/**
-	 * When false, the view method will clear the data between each
-	 * call.
-	 *
-	 * @var boolean
-	 */
-	public $saveData = true;
+    /**
+     * When false, the view method will clear the data between each
+     * call.
+     *
+     * @var bool
+     */
+    public $saveData = true;
 
-	/**
-	 * Parser Filters map a filter name with any PHP callable. When the
-	 * Parser prepares a variable for display, it will chain it
-	 * through the filters in the order defined, inserting any parameters.
-	 *
-	 * To prevent potential abuse, all filters MUST be defined here
-	 * in order for them to be available for use within the Parser.
-	 */
-	public $filters = [];
+    /**
+     * Parser Filters map a filter name with any PHP callable. When the
+     * Parser prepares a variable for display, it will chain it
+     * through the filters in the order defined, inserting any parameters.
+     *
+     * To prevent potential abuse, all filters MUST be defined here
+     * in order for them to be available for use within the Parser.
+     */
+    public $filters = [];
 
-	/**
-	 * Parser Plugins provide a way to extend the functionality provided
-	 * by the core Parser by creating aliases that will be replaced with
-	 * any callable. Can be single or tag pair.
-	 */
-	public $plugins = [];
+    /**
+     * Parser Plugins provide a way to extend the functionality provided
+     * by the core Parser by creating aliases that will be replaced with
+     * any callable. Can be single or tag pair.
+     */
+    public $plugins = [];
 
-	/**
-	 * Built-in View filters.
-	 *
-	 * @var array
-	 */
-	protected $coreFilters = [
-		'abs'            => '\abs',
-		'capitalize'     => '\CodeIgniter\View\Filters::capitalize',
-		'date'           => '\CodeIgniter\View\Filters::date',
-		'date_modify'    => '\CodeIgniter\View\Filters::date_modify',
-		'default'        => '\CodeIgniter\View\Filters::default',
-		'esc'            => '\CodeIgniter\View\Filters::esc',
-		'excerpt'        => '\CodeIgniter\View\Filters::excerpt',
-		'highlight'      => '\CodeIgniter\View\Filters::highlight',
-		'highlight_code' => '\CodeIgniter\View\Filters::highlight_code',
-		'limit_words'    => '\CodeIgniter\View\Filters::limit_words',
-		'limit_chars'    => '\CodeIgniter\View\Filters::limit_chars',
-		'local_currency' => '\CodeIgniter\View\Filters::local_currency',
-		'local_number'   => '\CodeIgniter\View\Filters::local_number',
-		'lower'          => '\strtolower',
-		'nl2br'          => '\CodeIgniter\View\Filters::nl2br',
-		'number_format'  => '\number_format',
-		'prose'          => '\CodeIgniter\View\Filters::prose',
-		'round'          => '\CodeIgniter\View\Filters::round',
-		'strip_tags'     => '\strip_tags',
-		'title'          => '\CodeIgniter\View\Filters::title',
-		'upper'          => '\strtoupper',
-	];
+    /**
+     * Built-in View filters.
+     *
+     * @var array
+     */
+    protected $coreFilters = [
+        'abs'            => '\abs',
+        'capitalize'     => '\CodeIgniter\View\Filters::capitalize',
+        'date'           => '\CodeIgniter\View\Filters::date',
+        'date_modify'    => '\CodeIgniter\View\Filters::date_modify',
+        'default'        => '\CodeIgniter\View\Filters::default',
+        'esc'            => '\CodeIgniter\View\Filters::esc',
+        'excerpt'        => '\CodeIgniter\View\Filters::excerpt',
+        'highlight'      => '\CodeIgniter\View\Filters::highlight',
+        'highlight_code' => '\CodeIgniter\View\Filters::highlight_code',
+        'limit_words'    => '\CodeIgniter\View\Filters::limit_words',
+        'limit_chars'    => '\CodeIgniter\View\Filters::limit_chars',
+        'local_currency' => '\CodeIgniter\View\Filters::local_currency',
+        'local_number'   => '\CodeIgniter\View\Filters::local_number',
+        'lower'          => '\strtolower',
+        'nl2br'          => '\CodeIgniter\View\Filters::nl2br',
+        'number_format'  => '\number_format',
+        'prose'          => '\CodeIgniter\View\Filters::prose',
+        'round'          => '\CodeIgniter\View\Filters::round',
+        'strip_tags'     => '\strip_tags',
+        'title'          => '\CodeIgniter\View\Filters::title',
+        'upper'          => '\strtoupper',
+    ];
 
-	/**
-	 * Built-in View plugins.
-	 *
-	 * @var array
-	 */
-	protected $corePlugins = [
-		'current_url'       => '\CodeIgniter\View\Plugins::currentURL',
-		'previous_url'      => '\CodeIgniter\View\Plugins::previousURL',
-		'mailto'            => '\CodeIgniter\View\Plugins::mailto',
-		'safe_mailto'       => '\CodeIgniter\View\Plugins::safeMailto',
-		'lang'              => '\CodeIgniter\View\Plugins::lang',
-		'validation_errors' => '\CodeIgniter\View\Plugins::validationErrors',
-		'route'             => '\CodeIgniter\View\Plugins::route',
-		'siteURL'           => '\CodeIgniter\View\Plugins::siteURL',
-	];
+    /**
+     * Built-in View plugins.
+     *
+     * @var array
+     */
+    protected $corePlugins = [
+        'current_url'       => '\CodeIgniter\View\Plugins::currentURL',
+        'previous_url'      => '\CodeIgniter\View\Plugins::previousURL',
+        'mailto'            => '\CodeIgniter\View\Plugins::mailto',
+        'safe_mailto'       => '\CodeIgniter\View\Plugins::safeMailto',
+        'lang'              => '\CodeIgniter\View\Plugins::lang',
+        'validation_errors' => '\CodeIgniter\View\Plugins::validationErrors',
+        'route'             => '\CodeIgniter\View\Plugins::route',
+        'siteURL'           => '\CodeIgniter\View\Plugins::siteURL',
+    ];
 
-	/**
-	 * Constructor.
-	 *
-	 * Merge the built-in and developer-configured filters and plugins,
-	 * with preference to the developer ones.
-	 */
-	public function __construct()
-	{
-		$this->filters = array_merge($this->coreFilters, $this->filters);
-		$this->plugins = array_merge($this->corePlugins, $this->plugins);
+    /**
+     * Merge the built-in and developer-configured filters and plugins,
+     * with preference to the developer ones.
+     */
+    public function __construct()
+    {
+        $this->filters = array_merge($this->coreFilters, $this->filters);
+        $this->plugins = array_merge($this->corePlugins, $this->plugins);
 
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 }
diff --git a/system/Controller.php b/system/Controller.php
index c397f6deb648..b50c8bcf3470 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -24,162 +24,139 @@
  */
 class Controller
 {
-	/**
-	 * Helpers that will be automatically loaded on class instantiation.
-	 *
-	 * @var array
-	 */
-	protected $helpers = [];
-
-	/**
-	 * Instance of the main Request object.
-	 *
-	 * @var RequestInterface
-	 */
-	protected $request;
-
-	/**
-	 * Instance of the main response object.
-	 *
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	/**
-	 * Instance of logger to use.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Should enforce HTTPS access for all methods in this controller.
-	 *
-	 * @var integer Number of seconds to set HSTS header
-	 */
-	protected $forceHTTPS = 0;
-
-	/**
-	 * Once validation has been run, will hold the Validation instance.
-	 *
-	 * @var Validation
-	 */
-	protected $validator;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param LoggerInterface   $logger
-	 *
-	 * @throws HTTPException
-	 */
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		$this->request  = $request;
-		$this->response = $response;
-		$this->logger   = $logger;
-
-		if ($this->forceHTTPS > 0)
-		{
-			$this->forceHTTPS($this->forceHTTPS);
-		}
-
-		// Autoload helper files.
-		helper($this->helpers);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A convenience method to use when you need to ensure that a single
-	 * method is reached only via HTTPS. If it isn't, then a redirect
-	 * will happen back to this method and HSTS header will be sent
-	 * to have modern browsers transform requests automatically.
-	 *
-	 * @param integer $duration The number of seconds this link should be
-	 *                          considered secure for. Only with HSTS header.
-	 *                          Default value is 1 year.
-	 *
-	 * @throws HTTPException
-	 */
-	protected function forceHTTPS(int $duration = 31536000)
-	{
-		force_https($duration, $this->request, $this->response);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provides a simple way to tie into the main CodeIgniter class and
-	 * tell it how long to cache the current page for.
-	 *
-	 * @param integer $time
-	 */
-	protected function cachePage(int $time)
-	{
-		CodeIgniter::cache($time);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles "auto-loading" helper files.
-	 *
-	 * @deprecated Use `helper` function instead of using this method.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function loadHelpers()
-	{
-		if (empty($this->helpers))
-		{
-			return;
-		}
-
-		helper($this->helpers);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A shortcut to performing validation on input data. If validation
-	 * is not successful, a $errors property will be set on this class.
-	 *
-	 * @param array|string $rules
-	 * @param array        $messages An array of custom error messages
-	 *
-	 * @return boolean
-	 */
-	protected function validate($rules, array $messages = []): bool
-	{
-		$this->validator = Services::validation();
-
-		// If you replace the $rules array with the name of the group
-		if (is_string($rules))
-		{
-			$validation = config('Validation');
-
-			// If the rule wasn't found in the \Config\Validation, we
-			// should throw an exception so the developer can find it.
-			if (! isset($validation->$rules))
-			{
-				throw ValidationException::forRuleNotFound($rules);
-			}
-
-			// If no error message is defined, use the error message in the Config\Validation file
-			if (! $messages)
-			{
-				$errorName = $rules . '_errors';
-				$messages  = $validation->$errorName ?? [];
-			}
-
-			$rules = $validation->$rules;
-		}
-
-		return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
-	}
+    /**
+     * Helpers that will be automatically loaded on class instantiation.
+     *
+     * @var array
+     */
+    protected $helpers = [];
+
+    /**
+     * Instance of the main Request object.
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Instance of the main response object.
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Instance of logger to use.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Should enforce HTTPS access for all methods in this controller.
+     *
+     * @var int Number of seconds to set HSTS header
+     */
+    protected $forceHTTPS = 0;
+
+    /**
+     * Once validation has been run, will hold the Validation instance.
+     *
+     * @var Validation
+     */
+    protected $validator;
+
+    /**
+     * Constructor.
+     *
+     * @throws HTTPException
+     */
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    {
+        $this->request  = $request;
+        $this->response = $response;
+        $this->logger   = $logger;
+
+        if ($this->forceHTTPS > 0) {
+            $this->forceHTTPS($this->forceHTTPS);
+        }
+
+        // Autoload helper files.
+        helper($this->helpers);
+    }
+
+    /**
+     * A convenience method to use when you need to ensure that a single
+     * method is reached only via HTTPS. If it isn't, then a redirect
+     * will happen back to this method and HSTS header will be sent
+     * to have modern browsers transform requests automatically.
+     *
+     * @param int $duration The number of seconds this link should be
+     *                      considered secure for. Only with HSTS header.
+     *                      Default value is 1 year.
+     *
+     * @throws HTTPException
+     */
+    protected function forceHTTPS(int $duration = 31536000)
+    {
+        force_https($duration, $this->request, $this->response);
+    }
+
+    /**
+     * Provides a simple way to tie into the main CodeIgniter class and
+     * tell it how long to cache the current page for.
+     */
+    protected function cachePage(int $time)
+    {
+        CodeIgniter::cache($time);
+    }
+
+    /**
+     * Handles "auto-loading" helper files.
+     *
+     * @deprecated Use `helper` function instead of using this method.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function loadHelpers()
+    {
+        if (empty($this->helpers)) {
+            return;
+        }
+
+        helper($this->helpers);
+    }
+
+    /**
+     * A shortcut to performing validation on input data. If validation
+     * is not successful, a $errors property will be set on this class.
+     *
+     * @param array|string $rules
+     * @param array        $messages An array of custom error messages
+     */
+    protected function validate($rules, array $messages = []): bool
+    {
+        $this->validator = Services::validation();
+
+        // If you replace the $rules array with the name of the group
+        if (is_string($rules)) {
+            $validation = config('Validation');
+
+            // If the rule wasn't found in the \Config\Validation, we
+            // should throw an exception so the developer can find it.
+            if (! isset($validation->{$rules})) {
+                throw ValidationException::forRuleNotFound($rules);
+            }
+
+            // If no error message is defined, use the error message in the Config\Validation file
+            if (! $messages) {
+                $errorName = $rules . '_errors';
+                $messages  = $validation->{$errorName} ?? [];
+            }
+
+            $rules = $validation->{$rules};
+        }
+
+        return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
+    }
 }
diff --git a/system/Cookie/CloneableCookieInterface.php b/system/Cookie/CloneableCookieInterface.php
index ea9fa9a214c2..508c1359970e 100644
--- a/system/Cookie/CloneableCookieInterface.php
+++ b/system/Cookie/CloneableCookieInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
@@ -19,107 +19,89 @@
  */
 interface CloneableCookieInterface extends CookieInterface
 {
-	/**
-	 * Creates a new Cookie with a new cookie prefix.
-	 *
-	 * @param string $prefix
-	 *
-	 * @return static
-	 */
-	public function withPrefix(string $prefix = '');
+    /**
+     * Creates a new Cookie with a new cookie prefix.
+     *
+     * @return static
+     */
+    public function withPrefix(string $prefix = '');
 
-	/**
-	 * Creates a new Cookie with a new name.
-	 *
-	 * @param string $name
-	 *
-	 * @return static
-	 */
-	public function withName(string $name);
+    /**
+     * Creates a new Cookie with a new name.
+     *
+     * @return static
+     */
+    public function withName(string $name);
 
-	/**
-	 * Creates a new Cookie with new value.
-	 *
-	 * @param string $value
-	 *
-	 * @return static
-	 */
-	public function withValue(string $value);
+    /**
+     * Creates a new Cookie with new value.
+     *
+     * @return static
+     */
+    public function withValue(string $value);
 
-	/**
-	 * Creates a new Cookie with a new cookie expires time.
-	 *
-	 * @param DateTimeInterface|integer|string $expires
-	 *
-	 * @return static
-	 */
-	public function withExpires($expires);
+    /**
+     * Creates a new Cookie with a new cookie expires time.
+     *
+     * @param DateTimeInterface|int|string $expires
+     *
+     * @return static
+     */
+    public function withExpires($expires);
 
-	/**
-	 * Creates a new Cookie that will expire the cookie from the browser.
-	 *
-	 * @return static
-	 */
-	public function withExpired();
+    /**
+     * Creates a new Cookie that will expire the cookie from the browser.
+     *
+     * @return static
+     */
+    public function withExpired();
 
-	/**
-	 * Creates a new Cookie that will virtually never expire from the browser.
-	 *
-	 * @return static
-	 */
-	public function withNeverExpiring();
+    /**
+     * Creates a new Cookie that will virtually never expire from the browser.
+     *
+     * @return static
+     */
+    public function withNeverExpiring();
 
-	/**
-	 * Creates a new Cookie with a new path on the server the cookie is available.
-	 *
-	 * @param string|null $path
-	 *
-	 * @return static
-	 */
-	public function withPath(?string $path);
+    /**
+     * Creates a new Cookie with a new path on the server the cookie is available.
+     *
+     * @return static
+     */
+    public function withPath(?string $path);
 
-	/**
-	 * Creates a new Cookie with a new domain the cookie is available.
-	 *
-	 * @param string|null $domain
-	 *
-	 * @return static
-	 */
-	public function withDomain(?string $domain);
+    /**
+     * Creates a new Cookie with a new domain the cookie is available.
+     *
+     * @return static
+     */
+    public function withDomain(?string $domain);
 
-	/**
-	 * Creates a new Cookie with a new "Secure" attribute.
-	 *
-	 * @param boolean $secure
-	 *
-	 * @return static
-	 */
-	public function withSecure(bool $secure = true);
+    /**
+     * Creates a new Cookie with a new "Secure" attribute.
+     *
+     * @return static
+     */
+    public function withSecure(bool $secure = true);
 
-	/**
-	 * Creates a new Cookie with a new "HttpOnly" attribute
-	 *
-	 * @param boolean $httponly
-	 *
-	 * @return static
-	 */
-	public function withHTTPOnly(bool $httponly = true);
+    /**
+     * Creates a new Cookie with a new "HttpOnly" attribute
+     *
+     * @return static
+     */
+    public function withHTTPOnly(bool $httponly = true);
 
-	/**
-	 * Creates a new Cookie with a new "SameSite" attribute.
-	 *
-	 * @param string $samesite
-	 *
-	 * @return static
-	 */
-	public function withSameSite(string $samesite);
+    /**
+     * Creates a new Cookie with a new "SameSite" attribute.
+     *
+     * @return static
+     */
+    public function withSameSite(string $samesite);
 
-	/**
-	 * Creates a new Cookie with URL encoding option updated.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return static
-	 */
-	public function withRaw(bool $raw = true);
+    /**
+     * Creates a new Cookie with URL encoding option updated.
+     *
+     * @return static
+     */
+    public function withRaw(bool $raw = true);
 }
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 614f327d64e7..150d42069949 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
@@ -17,6 +17,7 @@
 use DateTimeInterface;
 use InvalidArgumentException;
 use LogicException;
+use ReturnTypeWillChange;
 
 /**
  * A `Cookie` class represents an immutable HTTP cookie value object.
@@ -38,805 +39,745 @@
  */
 class Cookie implements ArrayAccess, CloneableCookieInterface
 {
-	/**
-	 * @var string
-	 */
-	protected $prefix = '';
-
-	/**
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * @var string
-	 */
-	protected $value;
-
-	/**
-	 * @var integer
-	 */
-	protected $expires;
-
-	/**
-	 * @var string
-	 */
-	protected $path = '/';
-
-	/**
-	 * @var string
-	 */
-	protected $domain = '';
-
-	/**
-	 * @var boolean
-	 */
-	protected $secure = false;
-
-	/**
-	 * @var boolean
-	 */
-	protected $httponly = true;
-
-	/**
-	 * @var string
-	 */
-	protected $samesite = self::SAMESITE_LAX;
-
-	/**
-	 * @var boolean
-	 */
-	protected $raw = false;
-
-	/**
-	 * Default attributes for a Cookie object. The keys here are the
-	 * lowercase attribute names. Do not camelCase!
-	 *
-	 * @var array<string, mixed>
-	 */
-	private static $defaults = [
-		'prefix'   => '',
-		'expires'  => 0,
-		'path'     => '/',
-		'domain'   => '',
-		'secure'   => false,
-		'httponly' => true,
-		'samesite' => self::SAMESITE_LAX,
-		'raw'      => false,
-	];
-
-	/**
-	 * A cookie name can be any US-ASCII characters, except control characters,
-	 * spaces, tabs, or separator characters.
-	 *
-	 * @var string
-	 *
-	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
-	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
-	 */
-	private static $reservedCharsList = "=,; \t\r\n\v\f()<>@:\\\"/[]?{}";
-
-	/**
-	 * Set the default attributes to a Cookie instance by injecting
-	 * the values from the `CookieConfig` config or an array.
-	 *
-	 * @param CookieConfig|array<string, mixed> $config
-	 *
-	 * @return array<string, mixed> The old defaults array. Useful for resetting.
-	 */
-	public static function setDefaults($config = [])
-	{
-		$oldDefaults = self::$defaults;
-		$newDefaults = [];
-
-		if ($config instanceof CookieConfig)
-		{
-			$newDefaults = [
-				'prefix'   => $config->prefix,
-				'expires'  => $config->expires,
-				'path'     => $config->path,
-				'domain'   => $config->domain,
-				'secure'   => $config->secure,
-				'httponly' => $config->httponly,
-				'samesite' => $config->samesite,
-				'raw'      => $config->raw,
-			];
-		}
-		elseif (is_array($config))
-		{
-			$newDefaults = $config;
-		}
-
-		// This array union ensures that even if passed `$config` is not
-		// `CookieConfig` or `array`, no empty defaults will occur.
-		self::$defaults = $newDefaults + $oldDefaults;
-
-		return $oldDefaults;
-	}
-
-	//=========================================================================
-	// CONSTRUCTORS
-	//=========================================================================
-
-	/**
-	 * Create a new Cookie instance from a `Set-Cookie` header.
-	 *
-	 * @param string  $cookie
-	 * @param boolean $raw
-	 *
-	 * @throws CookieException
-	 *
-	 * @return static
-	 */
-	public static function fromHeaderString(string $cookie, bool $raw = false)
-	{
-		$data        = self::$defaults;
-		$data['raw'] = $raw;
-
-		$parts = preg_split('/\;[\s]*/', $cookie);
-		$part  = explode('=', array_shift($parts), 2);
-
-		$name  = $raw ? $part[0] : urldecode($part[0]);
-		$value = isset($part[1]) ? ($raw ? $part[1] : urldecode($part[1])) : '';
-		unset($part);
-
-		foreach ($parts as $part)
-		{
-			if (strpos($part, '=') !== false)
-			{
-				[$attr, $val] = explode('=', $part);
-			}
-			else
-			{
-				$attr = $part;
-				$val  = true;
-			}
-
-			$data[strtolower($attr)] = $val;
-		}
-
-		return new static($name, $value, $data);
-	}
-
-	/**
-	 * Construct a new Cookie instance.
-	 *
-	 * @param string               $name    The cookie's name
-	 * @param string               $value   The cookie's value
-	 * @param array<string, mixed> $options The cookie's options
-	 *
-	 * @throws CookieException
-	 */
-	final public function __construct(string $name, string $value = '', array $options = [])
-	{
-		$options += self::$defaults;
-
-		$options['expires'] = static::convertExpiresTimestamp($options['expires']);
-
-		// If both `Expires` and `Max-Age` are set, `Max-Age` has precedence.
-		if (isset($options['max-age']) && is_numeric($options['max-age']))
-		{
-			$options['expires'] = time() + (int) $options['max-age'];
-			unset($options['max-age']);
-		}
-
-		// to preserve backward compatibility with array-based cookies in previous CI versions
-		$prefix = $options['prefix'] ?: self::$defaults['prefix'];
-		$path   = $options['path'] ?: self::$defaults['path'];
-		$domain = $options['domain'] ?: self::$defaults['domain'];
-
-		// empty string SameSite should use the default for browsers
-		$samesite = $options['samesite'] ?: self::$defaults['samesite'];
-
-		$raw      = $options['raw'];
-		$secure   = $options['secure'];
-		$httponly = $options['httponly'];
-
-		$this->validateName($name, $raw);
-		$this->validatePrefix($prefix, $secure, $path, $domain);
-		$this->validateSameSite($samesite, $secure);
-
-		$this->prefix   = $prefix;
-		$this->name     = $name;
-		$this->value    = $value;
-		$this->expires  = static::convertExpiresTimestamp($options['expires']);
-		$this->path     = $path;
-		$this->domain   = $domain;
-		$this->secure   = $secure;
-		$this->httponly = $httponly;
-		$this->samesite = ucfirst(strtolower($samesite));
-		$this->raw      = $raw;
-	}
-
-	//=========================================================================
-	// GETTERS
-	//=========================================================================
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getId(): string
-	{
-		return implode(';', [$this->getPrefixedName(), $this->getPath(), $this->getDomain()]);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getPrefix(): string
-	{
-		return $this->prefix;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getPrefixedName(): string
-	{
-		$name = $this->getPrefix();
-
-		if ($this->isRaw())
-		{
-			$name .= $this->getName();
-		}
-		else
-		{
-			$search  = str_split(self::$reservedCharsList);
-			$replace = array_map('rawurlencode', $search);
-
-			$name .= str_replace($search, $replace, $this->getName());
-		}
-
-		return $name;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getValue(): string
-	{
-		return $this->value;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getExpiresTimestamp(): int
-	{
-		return $this->expires;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getExpiresString(): string
-	{
-		return gmdate(self::EXPIRES_FORMAT, $this->expires);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isExpired(): bool
-	{
-		return $this->expires === 0 || $this->expires < time();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMaxAge(): int
-	{
-		$maxAge = $this->expires - time();
-
-		return $maxAge >= 0 ? $maxAge : 0;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getPath(): string
-	{
-		return $this->path;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getDomain(): string
-	{
-		return $this->domain;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isSecure(): bool
-	{
-		return $this->secure;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isHTTPOnly(): bool
-	{
-		return $this->httponly;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getSameSite(): string
-	{
-		return $this->samesite;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isRaw(): bool
-	{
-		return $this->raw;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getOptions(): array
-	{
-		// This is the order of options in `setcookie`. DO NOT CHANGE.
-		return [
-			'expires'  => $this->expires,
-			'path'     => $this->path,
-			'domain'   => $this->domain,
-			'secure'   => $this->secure,
-			'httponly' => $this->httponly,
-			'samesite' => $this->samesite ?: ucfirst(self::SAMESITE_LAX),
-		];
-	}
-
-	//=========================================================================
-	// CLONING
-	//=========================================================================
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withPrefix(string $prefix = '')
-	{
-		$this->validatePrefix($prefix, $this->secure, $this->path, $this->domain);
-
-		$cookie = clone $this;
-
-		$cookie->prefix = $prefix;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withName(string $name)
-	{
-		$this->validateName($name, $this->raw);
-
-		$cookie = clone $this;
-
-		$cookie->name = $name;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withValue(string $value)
-	{
-		$cookie = clone $this;
-
-		$cookie->value = $value;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withExpires($expires)
-	{
-		$cookie = clone $this;
-
-		$cookie->expires = static::convertExpiresTimestamp($expires);
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withExpired()
-	{
-		$cookie = clone $this;
-
-		$cookie->expires = 0;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withNeverExpiring()
-	{
-		$cookie = clone $this;
-
-		$cookie->expires = time() + 5 * YEAR;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withPath(?string $path)
-	{
-		$path = $path ?: self::$defaults['path'];
-		$this->validatePrefix($this->prefix, $this->secure, $path, $this->domain);
-
-		$cookie = clone $this;
-
-		$cookie->path = $path;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withDomain(?string $domain)
-	{
-		$domain = $domain ?? self::$defaults['domain'];
-		$this->validatePrefix($this->prefix, $this->secure, $this->path, $domain);
-
-		$cookie = clone $this;
-
-		$cookie->domain = $domain;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withSecure(bool $secure = true)
-	{
-		$this->validatePrefix($this->prefix, $secure, $this->path, $this->domain);
-		$this->validateSameSite($this->samesite, $secure);
-
-		$cookie = clone $this;
-
-		$cookie->secure = $secure;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withHTTPOnly(bool $httponly = true)
-	{
-		$cookie = clone $this;
-
-		$cookie->httponly = $httponly;
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withSameSite(string $samesite)
-	{
-		$this->validateSameSite($samesite, $this->secure);
-
-		$cookie = clone $this;
-
-		$cookie->samesite = ucfirst(strtolower($samesite));
-
-		return $cookie;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function withRaw(bool $raw = true)
-	{
-		$this->validateName($this->name, $raw);
-
-		$cookie = clone $this;
-
-		$cookie->raw = $raw;
-
-		return $cookie;
-	}
-
-	//=========================================================================
-	// ARRAY ACCESS FOR BC
-	//=========================================================================
-
-	/**
-	 * Whether an offset exists.
-	 *
-	 * @param string $offset
-	 *
-	 * @return boolean
-	 */
-	public function offsetExists($offset)
-	{
-		return $offset === 'expire' ? true : property_exists($this, $offset);
-	}
-
-	/**
-	 * Offset to retrieve.
-	 *
-	 * @param string $offset
-	 *
-	 * @throws InvalidArgumentException
-	 *
-	 * @return mixed
-	 */
-	public function offsetGet($offset)
-	{
-		if (! $this->offsetExists($offset))
-		{
-			throw new InvalidArgumentException(sprintf('Undefined offset "%s".', $offset));
-		}
-
-		return $offset === 'expire' ? $this->expires : $this->{$offset};
-	}
-
-	/**
-	 * Offset to set.
-	 *
-	 * @param string $offset
-	 * @param mixed  $value
-	 *
-	 * @throws LogicException
-	 *
-	 * @return void
-	 */
-	public function offsetSet($offset, $value)
-	{
-		throw new LogicException(sprintf('Cannot set values of properties of %s as it is immutable.', static::class));
-	}
-
-	/**
-	 * Offset to unset.
-	 *
-	 * @param string $offset
-	 *
-	 * @throws LogicException
-	 *
-	 * @return void
-	 */
-	public function offsetUnset($offset)
-	{
-		throw new LogicException(sprintf('Cannot unset values of properties of %s as it is immutable.', static::class));
-	}
-
-	//=========================================================================
-	// CONVERTERS
-	//=========================================================================
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function toHeaderString(): string
-	{
-		return $this->__toString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function __toString()
-	{
-		$cookieHeader = [];
-
-		if ($this->getValue() === '')
-		{
-			$cookieHeader[] = $this->getPrefixedName() . '=deleted';
-			$cookieHeader[] = 'Expires=' . gmdate(self::EXPIRES_FORMAT, 0);
-			$cookieHeader[] = 'Max-Age=0';
-		}
-		else
-		{
-			$value = $this->isRaw() ? $this->getValue() : rawurlencode($this->getValue());
-
-			$cookieHeader[] = sprintf('%s=%s', $this->getPrefixedName(), $value);
-
-			if ($this->getExpiresTimestamp() !== 0)
-			{
-				$cookieHeader[] = 'Expires=' . $this->getExpiresString();
-				$cookieHeader[] = 'Max-Age=' . $this->getMaxAge();
-			}
-		}
-
-		if ($this->getPath() !== '')
-		{
-			$cookieHeader[] = 'Path=' . $this->getPath();
-		}
-
-		if ($this->getDomain() !== '')
-		{
-			$cookieHeader[] = 'Domain=' . $this->getDomain();
-		}
-
-		if ($this->isSecure())
-		{
-			$cookieHeader[] = 'Secure';
-		}
-
-		if ($this->isHTTPOnly())
-		{
-			$cookieHeader[] = 'HttpOnly';
-		}
-
-		$samesite = $this->getSameSite();
-
-		if ($samesite === '')
-		{
-			// modern browsers warn in console logs that an empty SameSite attribute
-			// will be given the `Lax` value
-			$samesite = self::SAMESITE_LAX;
-		}
-
-		$cookieHeader[] = 'SameSite=' . ucfirst(strtolower($samesite));
-
-		return implode('; ', $cookieHeader);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function toArray(): array
-	{
-		return [
-			'name'   => $this->name,
-			'value'  => $this->value,
-			'prefix' => $this->prefix,
-			'raw'    => $this->raw,
-		] + $this->getOptions();
-	}
-
-	/**
-	 * Converts expires time to Unix format.
-	 *
-	 * @param DateTimeInterface|integer|string $expires
-	 *
-	 * @return integer
-	 */
-	protected static function convertExpiresTimestamp($expires = 0): int
-	{
-		if ($expires instanceof DateTimeInterface)
-		{
-			$expires = $expires->format('U');
-		}
-
-		if (! is_string($expires) && ! is_int($expires))
-		{
-			throw CookieException::forInvalidExpiresTime(gettype($expires));
-		}
-
-		if (! is_numeric($expires))
-		{
-			$expires = strtotime($expires);
-
-			if ($expires === false)
-			{
-				throw CookieException::forInvalidExpiresValue();
-			}
-		}
-
-		return $expires > 0 ? (int) $expires : 0;
-	}
-
-	//=========================================================================
-	// VALIDATION
-	//=========================================================================
-
-	/**
-	 * Validates the cookie name per RFC 2616.
-	 *
-	 * If `$raw` is true, names should not contain invalid characters
-	 * as `setrawcookie()` will reject this.
-	 *
-	 * @param string  $name
-	 * @param boolean $raw
-	 *
-	 * @throws CookieException
-	 *
-	 * @return void
-	 */
-	protected function validateName(string $name, bool $raw): void
-	{
-		if ($raw && strpbrk($name, self::$reservedCharsList) !== false)
-		{
-			throw CookieException::forInvalidCookieName($name);
-		}
-
-		if ($name === '')
-		{
-			throw CookieException::forEmptyCookieName();
-		}
-	}
-
-	/**
-	 * Validates the special prefixes if some attribute requirements are met.
-	 *
-	 * @param string  $prefix
-	 * @param boolean $secure
-	 * @param string  $path
-	 * @param string  $domain
-	 *
-	 * @throws CookieException
-	 *
-	 * @return void
-	 */
-	protected function validatePrefix(string $prefix, bool $secure, string $path, string $domain): void
-	{
-		if (strpos($prefix, '__Secure-') === 0 && ! $secure)
-		{
-			throw CookieException::forInvalidSecurePrefix();
-		}
-
-		if (strpos($prefix, '__Host-') === 0 && (! $secure || $domain !== '' || $path !== '/'))
-		{
-			throw CookieException::forInvalidHostPrefix();
-		}
-	}
-
-	/**
-	 * Validates the `SameSite` to be within the allowed types.
-	 *
-	 * @param string  $samesite
-	 * @param boolean $secure
-	 *
-	 * @throws CookieException
-	 *
-	 * @return void
-	 *
-	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
-	 */
-	protected function validateSameSite(string $samesite, bool $secure): void
-	{
-		if ($samesite === '')
-		{
-			$samesite = self::$defaults['samesite'];
-		}
-
-		if ($samesite === '')
-		{
-			$samesite = self::SAMESITE_LAX;
-		}
-
-		if (! in_array(strtolower($samesite), self::ALLOWED_SAMESITE_VALUES, true))
-		{
-			throw CookieException::forInvalidSameSite($samesite);
-		}
-
-		if (strtolower($samesite) === self::SAMESITE_NONE && ! $secure)
-		{
-			throw CookieException::forInvalidSameSiteNone();
-		}
-	}
+    /**
+     * @var string
+     */
+    protected $prefix = '';
+
+    /**
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * @var int
+     */
+    protected $expires;
+
+    /**
+     * @var string
+     */
+    protected $path = '/';
+
+    /**
+     * @var string
+     */
+    protected $domain = '';
+
+    /**
+     * @var bool
+     */
+    protected $secure = false;
+
+    /**
+     * @var bool
+     */
+    protected $httponly = true;
+
+    /**
+     * @var string
+     */
+    protected $samesite = self::SAMESITE_LAX;
+
+    /**
+     * @var bool
+     */
+    protected $raw = false;
+
+    /**
+     * Default attributes for a Cookie object. The keys here are the
+     * lowercase attribute names. Do not camelCase!
+     *
+     * @var array<string, mixed>
+     */
+    private static $defaults = [
+        'prefix'   => '',
+        'expires'  => 0,
+        'path'     => '/',
+        'domain'   => '',
+        'secure'   => false,
+        'httponly' => true,
+        'samesite' => self::SAMESITE_LAX,
+        'raw'      => false,
+    ];
+
+    /**
+     * A cookie name can be any US-ASCII characters, except control characters,
+     * spaces, tabs, or separator characters.
+     *
+     * @var string
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+     * @see https://tools.ietf.org/html/rfc2616#section-2.2
+     */
+    private static $reservedCharsList = "=,; \t\r\n\v\f()<>@:\\\"/[]?{}";
+
+    /**
+     * Set the default attributes to a Cookie instance by injecting
+     * the values from the `CookieConfig` config or an array.
+     *
+     * @param array<string, mixed>|CookieConfig $config
+     *
+     * @return array<string, mixed> The old defaults array. Useful for resetting.
+     */
+    public static function setDefaults($config = [])
+    {
+        $oldDefaults = self::$defaults;
+        $newDefaults = [];
+
+        if ($config instanceof CookieConfig) {
+            $newDefaults = [
+                'prefix'   => $config->prefix,
+                'expires'  => $config->expires,
+                'path'     => $config->path,
+                'domain'   => $config->domain,
+                'secure'   => $config->secure,
+                'httponly' => $config->httponly,
+                'samesite' => $config->samesite,
+                'raw'      => $config->raw,
+            ];
+        } elseif (is_array($config)) {
+            $newDefaults = $config;
+        }
+
+        // This array union ensures that even if passed `$config` is not
+        // `CookieConfig` or `array`, no empty defaults will occur.
+        self::$defaults = $newDefaults + $oldDefaults;
+
+        return $oldDefaults;
+    }
+
+    //=========================================================================
+    // CONSTRUCTORS
+    //=========================================================================
+
+    /**
+     * Create a new Cookie instance from a `Set-Cookie` header.
+     *
+     * @throws CookieException
+     *
+     * @return static
+     */
+    public static function fromHeaderString(string $cookie, bool $raw = false)
+    {
+        $data        = self::$defaults;
+        $data['raw'] = $raw;
+
+        $parts = preg_split('/\;[\s]*/', $cookie);
+        $part  = explode('=', array_shift($parts), 2);
+
+        $name  = $raw ? $part[0] : urldecode($part[0]);
+        $value = isset($part[1]) ? ($raw ? $part[1] : urldecode($part[1])) : '';
+        unset($part);
+
+        foreach ($parts as $part) {
+            if (strpos($part, '=') !== false) {
+                [$attr, $val] = explode('=', $part);
+            } else {
+                $attr = $part;
+                $val  = true;
+            }
+
+            $data[strtolower($attr)] = $val;
+        }
+
+        return new static($name, $value, $data);
+    }
+
+    /**
+     * Construct a new Cookie instance.
+     *
+     * @param string               $name    The cookie's name
+     * @param string               $value   The cookie's value
+     * @param array<string, mixed> $options The cookie's options
+     *
+     * @throws CookieException
+     */
+    final public function __construct(string $name, string $value = '', array $options = [])
+    {
+        $options += self::$defaults;
+
+        $options['expires'] = static::convertExpiresTimestamp($options['expires']);
+
+        // If both `Expires` and `Max-Age` are set, `Max-Age` has precedence.
+        if (isset($options['max-age']) && is_numeric($options['max-age'])) {
+            $options['expires'] = time() + (int) $options['max-age'];
+            unset($options['max-age']);
+        }
+
+        // to preserve backward compatibility with array-based cookies in previous CI versions
+        $prefix = $options['prefix'] ?: self::$defaults['prefix'];
+        $path   = $options['path'] ?: self::$defaults['path'];
+        $domain = $options['domain'] ?: self::$defaults['domain'];
+
+        // empty string SameSite should use the default for browsers
+        $samesite = $options['samesite'] ?: self::$defaults['samesite'];
+
+        $raw      = $options['raw'];
+        $secure   = $options['secure'];
+        $httponly = $options['httponly'];
+
+        $this->validateName($name, $raw);
+        $this->validatePrefix($prefix, $secure, $path, $domain);
+        $this->validateSameSite($samesite, $secure);
+
+        $this->prefix   = $prefix;
+        $this->name     = $name;
+        $this->value    = $value;
+        $this->expires  = static::convertExpiresTimestamp($options['expires']);
+        $this->path     = $path;
+        $this->domain   = $domain;
+        $this->secure   = $secure;
+        $this->httponly = $httponly;
+        $this->samesite = ucfirst(strtolower($samesite));
+        $this->raw      = $raw;
+    }
+
+    //=========================================================================
+    // GETTERS
+    //=========================================================================
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getId(): string
+    {
+        return implode(';', [$this->getPrefixedName(), $this->getPath(), $this->getDomain()]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPrefix(): string
+    {
+        return $this->prefix;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPrefixedName(): string
+    {
+        $name = $this->getPrefix();
+
+        if ($this->isRaw()) {
+            $name .= $this->getName();
+        } else {
+            $search  = str_split(self::$reservedCharsList);
+            $replace = array_map('rawurlencode', $search);
+
+            $name .= str_replace($search, $replace, $this->getName());
+        }
+
+        return $name;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpiresTimestamp(): int
+    {
+        return $this->expires;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getExpiresString(): string
+    {
+        return gmdate(self::EXPIRES_FORMAT, $this->expires);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isExpired(): bool
+    {
+        return $this->expires === 0 || $this->expires < time();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMaxAge(): int
+    {
+        $maxAge = $this->expires - time();
+
+        return $maxAge >= 0 ? $maxAge : 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDomain(): string
+    {
+        return $this->domain;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isSecure(): bool
+    {
+        return $this->secure;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isHTTPOnly(): bool
+    {
+        return $this->httponly;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getSameSite(): string
+    {
+        return $this->samesite;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isRaw(): bool
+    {
+        return $this->raw;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getOptions(): array
+    {
+        // This is the order of options in `setcookie`. DO NOT CHANGE.
+        return [
+            'expires'  => $this->expires,
+            'path'     => $this->path,
+            'domain'   => $this->domain,
+            'secure'   => $this->secure,
+            'httponly' => $this->httponly,
+            'samesite' => $this->samesite ?: ucfirst(self::SAMESITE_LAX),
+        ];
+    }
+
+    //=========================================================================
+    // CLONING
+    //=========================================================================
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withPrefix(string $prefix = '')
+    {
+        $this->validatePrefix($prefix, $this->secure, $this->path, $this->domain);
+
+        $cookie = clone $this;
+
+        $cookie->prefix = $prefix;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withName(string $name)
+    {
+        $this->validateName($name, $this->raw);
+
+        $cookie = clone $this;
+
+        $cookie->name = $name;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withValue(string $value)
+    {
+        $cookie = clone $this;
+
+        $cookie->value = $value;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withExpires($expires)
+    {
+        $cookie = clone $this;
+
+        $cookie->expires = static::convertExpiresTimestamp($expires);
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withExpired()
+    {
+        $cookie = clone $this;
+
+        $cookie->expires = 0;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withNeverExpiring()
+    {
+        $cookie = clone $this;
+
+        $cookie->expires = time() + 5 * YEAR;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withPath(?string $path)
+    {
+        $path = $path ?: self::$defaults['path'];
+        $this->validatePrefix($this->prefix, $this->secure, $path, $this->domain);
+
+        $cookie = clone $this;
+
+        $cookie->path = $path;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withDomain(?string $domain)
+    {
+        $domain = $domain ?? self::$defaults['domain'];
+        $this->validatePrefix($this->prefix, $this->secure, $this->path, $domain);
+
+        $cookie = clone $this;
+
+        $cookie->domain = $domain;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withSecure(bool $secure = true)
+    {
+        $this->validatePrefix($this->prefix, $secure, $this->path, $this->domain);
+        $this->validateSameSite($this->samesite, $secure);
+
+        $cookie = clone $this;
+
+        $cookie->secure = $secure;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withHTTPOnly(bool $httponly = true)
+    {
+        $cookie = clone $this;
+
+        $cookie->httponly = $httponly;
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withSameSite(string $samesite)
+    {
+        $this->validateSameSite($samesite, $this->secure);
+
+        $cookie = clone $this;
+
+        $cookie->samesite = ucfirst(strtolower($samesite));
+
+        return $cookie;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function withRaw(bool $raw = true)
+    {
+        $this->validateName($this->name, $raw);
+
+        $cookie = clone $this;
+
+        $cookie->raw = $raw;
+
+        return $cookie;
+    }
+
+    //=========================================================================
+    // ARRAY ACCESS FOR BC
+    //=========================================================================
+
+    /**
+     * Whether an offset exists.
+     *
+     * @param mixed $offset
+     */
+    public function offsetExists($offset): bool
+    {
+        return $offset === 'expire' ? true : property_exists($this, $offset);
+    }
+
+    /**
+     * Offset to retrieve.
+     *
+     * @param mixed $offset
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return mixed
+     */
+    #[ReturnTypeWillChange]
+    public function offsetGet($offset)
+    {
+        if (! $this->offsetExists($offset)) {
+            throw new InvalidArgumentException(sprintf('Undefined offset "%s".', $offset));
+        }
+
+        return $offset === 'expire' ? $this->expires : $this->{$offset};
+    }
+
+    /**
+     * Offset to set.
+     *
+     * @param mixed $offset
+     * @param mixed $value
+     *
+     * @throws LogicException
+     */
+    public function offsetSet($offset, $value): void
+    {
+        throw new LogicException(sprintf('Cannot set values of properties of %s as it is immutable.', static::class));
+    }
+
+    /**
+     * Offset to unset.
+     *
+     * @param mixed $offset
+     *
+     * @throws LogicException
+     */
+    public function offsetUnset($offset): void
+    {
+        throw new LogicException(sprintf('Cannot unset values of properties of %s as it is immutable.', static::class));
+    }
+
+    //=========================================================================
+    // CONVERTERS
+    //=========================================================================
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toHeaderString(): string
+    {
+        return $this->__toString();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __toString()
+    {
+        $cookieHeader = [];
+
+        if ($this->getValue() === '') {
+            $cookieHeader[] = $this->getPrefixedName() . '=deleted';
+            $cookieHeader[] = 'Expires=' . gmdate(self::EXPIRES_FORMAT, 0);
+            $cookieHeader[] = 'Max-Age=0';
+        } else {
+            $value = $this->isRaw() ? $this->getValue() : rawurlencode($this->getValue());
+
+            $cookieHeader[] = sprintf('%s=%s', $this->getPrefixedName(), $value);
+
+            if ($this->getExpiresTimestamp() !== 0) {
+                $cookieHeader[] = 'Expires=' . $this->getExpiresString();
+                $cookieHeader[] = 'Max-Age=' . $this->getMaxAge();
+            }
+        }
+
+        if ($this->getPath() !== '') {
+            $cookieHeader[] = 'Path=' . $this->getPath();
+        }
+
+        if ($this->getDomain() !== '') {
+            $cookieHeader[] = 'Domain=' . $this->getDomain();
+        }
+
+        if ($this->isSecure()) {
+            $cookieHeader[] = 'Secure';
+        }
+
+        if ($this->isHTTPOnly()) {
+            $cookieHeader[] = 'HttpOnly';
+        }
+
+        $samesite = $this->getSameSite();
+
+        if ($samesite === '') {
+            // modern browsers warn in console logs that an empty SameSite attribute
+            // will be given the `Lax` value
+            $samesite = self::SAMESITE_LAX;
+        }
+
+        $cookieHeader[] = 'SameSite=' . ucfirst(strtolower($samesite));
+
+        return implode('; ', $cookieHeader);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [
+            'name'   => $this->name,
+            'value'  => $this->value,
+            'prefix' => $this->prefix,
+            'raw'    => $this->raw,
+        ] + $this->getOptions();
+    }
+
+    /**
+     * Converts expires time to Unix format.
+     *
+     * @param DateTimeInterface|int|string $expires
+     */
+    protected static function convertExpiresTimestamp($expires = 0): int
+    {
+        if ($expires instanceof DateTimeInterface) {
+            $expires = $expires->format('U');
+        }
+
+        if (! is_string($expires) && ! is_int($expires)) {
+            throw CookieException::forInvalidExpiresTime(gettype($expires));
+        }
+
+        if (! is_numeric($expires)) {
+            $expires = strtotime($expires);
+
+            if ($expires === false) {
+                throw CookieException::forInvalidExpiresValue();
+            }
+        }
+
+        return $expires > 0 ? (int) $expires : 0;
+    }
+
+    //=========================================================================
+    // VALIDATION
+    //=========================================================================
+
+    /**
+     * Validates the cookie name per RFC 2616.
+     *
+     * If `$raw` is true, names should not contain invalid characters
+     * as `setrawcookie()` will reject this.
+     *
+     * @throws CookieException
+     */
+    protected function validateName(string $name, bool $raw): void
+    {
+        if ($raw && strpbrk($name, self::$reservedCharsList) !== false) {
+            throw CookieException::forInvalidCookieName($name);
+        }
+
+        if ($name === '') {
+            throw CookieException::forEmptyCookieName();
+        }
+    }
+
+    /**
+     * Validates the special prefixes if some attribute requirements are met.
+     *
+     * @throws CookieException
+     */
+    protected function validatePrefix(string $prefix, bool $secure, string $path, string $domain): void
+    {
+        if (strpos($prefix, '__Secure-') === 0 && ! $secure) {
+            throw CookieException::forInvalidSecurePrefix();
+        }
+
+        if (strpos($prefix, '__Host-') === 0 && (! $secure || $domain !== '' || $path !== '/')) {
+            throw CookieException::forInvalidHostPrefix();
+        }
+    }
+
+    /**
+     * Validates the `SameSite` to be within the allowed types.
+     *
+     * @throws CookieException
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+     */
+    protected function validateSameSite(string $samesite, bool $secure): void
+    {
+        if ($samesite === '') {
+            $samesite = self::$defaults['samesite'];
+        }
+
+        if ($samesite === '') {
+            $samesite = self::SAMESITE_LAX;
+        }
+
+        if (! in_array(strtolower($samesite), self::ALLOWED_SAMESITE_VALUES, true)) {
+            throw CookieException::forInvalidSameSite($samesite);
+        }
+
+        if (strtolower($samesite) === self::SAMESITE_NONE && ! $secure) {
+            throw CookieException::forInvalidSameSiteNone();
+        }
+    }
 }
diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php
index 550323fe89aa..0b2b75783c12 100644
--- a/system/Cookie/CookieInterface.php
+++ b/system/Cookie/CookieInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
@@ -18,183 +18,151 @@
  */
 interface CookieInterface
 {
-	/**
-	 * Cookies will be sent in all contexts, i.e in responses to both
-	 * first-party and cross-origin requests. If `SameSite=None` is set,
-	 * the cookie `Secure` attribute must also be set (or the cookie will be blocked).
-	 */
-	public const SAMESITE_NONE = 'none';
-
-	/**
-	 * Cookies are not sent on normal cross-site subrequests (for example to
-	 * load images or frames into a third party site), but are sent when a
-	 * user is navigating to the origin site (i.e. when following a link).
-	 */
-	public const SAMESITE_LAX = 'lax';
-
-	/**
-	 * Cookies will only be sent in a first-party context and not be sent
-	 * along with requests initiated by third party websites.
-	 */
-	public const SAMESITE_STRICT = 'strict';
-
-	/**
-	 * RFC 6265 allowed values for the "SameSite" attribute.
-	 *
-	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
-	 */
-	public const ALLOWED_SAMESITE_VALUES = [
-		self::SAMESITE_NONE,
-		self::SAMESITE_LAX,
-		self::SAMESITE_STRICT,
-	];
-
-	/**
-	 * Expires date format.
-	 *
-	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Date
-	 * @see https://tools.ietf.org/html/rfc7231#section-7.1.1.2
-	 */
-	public const EXPIRES_FORMAT = 'D, d-M-Y H:i:s T';
-
-	/**
-	 * Returns a unique identifier for the cookie consisting
-	 * of its prefixed name, path, and domain.
-	 *
-	 * @return string
-	 */
-	public function getId(): string;
-
-	/**
-	 * Gets the cookie prefix.
-	 *
-	 * @return string
-	 */
-	public function getPrefix(): string;
-
-	/**
-	 * Gets the cookie name.
-	 *
-	 * @return string
-	 */
-	public function getName(): string;
-
-	/**
-	 * Gets the cookie name prepended with the prefix, if any.
-	 *
-	 * @return string
-	 */
-	public function getPrefixedName(): string;
-
-	/**
-	 * Gets the cookie value.
-	 *
-	 * @return string
-	 */
-	public function getValue(): string;
-
-	/**
-	 * Gets the time in Unix timestamp the cookie expires.
-	 *
-	 * @return integer
-	 */
-	public function getExpiresTimestamp(): int;
-
-	/**
-	 * Gets the formatted expires time.
-	 *
-	 * @return string
-	 */
-	public function getExpiresString(): string;
-
-	/**
-	 * Checks if the cookie is expired.
-	 *
-	 * @return boolean
-	 */
-	public function isExpired(): bool;
-
-	/**
-	 * Gets the "Max-Age" cookie attribute.
-	 *
-	 * @return integer
-	 */
-	public function getMaxAge(): int;
-
-	/**
-	 * Gets the "Path" cookie attribute.
-	 *
-	 * @return string
-	 */
-	public function getPath(): string;
-
-	/**
-	 * Gets the "Domain" cookie attribute.
-	 *
-	 * @return string
-	 */
-	public function getDomain(): string;
-
-	/**
-	 * Gets the "Secure" cookie attribute.
-	 *
-	 * Checks if the cookie is only sent to the server when a request is made
-	 * with the `https:` scheme (except on `localhost`), and therefore is more
-	 * resistent to man-in-the-middle attacks.
-	 *
-	 * @return boolean
-	 */
-	public function isSecure(): bool;
-
-	/**
-	 * Gets the "HttpOnly" cookie attribute.
-	 *
-	 * Checks if JavaScript is forbidden from accessing the cookie.
-	 *
-	 * @return boolean
-	 */
-	public function isHTTPOnly(): bool;
-
-	/**
-	 * Gets the "SameSite" cookie attribute.
-	 *
-	 * @return string
-	 */
-	public function getSameSite(): string;
-
-	/**
-	 * Checks if the cookie should be sent with no URL encoding.
-	 *
-	 * @return boolean
-	 */
-	public function isRaw(): bool;
-
-	/**
-	 * Gets the options that are passable to the `setcookie` variant
-	 * available on PHP 7.3+
-	 *
-	 * @return array<string, mixed>
-	 */
-	public function getOptions(): array;
-
-	/**
-	 * Returns the Cookie as a header value.
-	 *
-	 * @return string
-	 */
-	public function toHeaderString(): string;
-
-	/**
-	 * Returns the string representation of the Cookie object.
-	 *
-	 * @return string
-	 */
-	public function __toString();
-
-	/**
-	 * Returns the array representation of the Cookie object.
-	 *
-	 * @return array<string, mixed>
-	 */
-	public function toArray(): array;
+    /**
+     * Cookies will be sent in all contexts, i.e in responses to both
+     * first-party and cross-origin requests. If `SameSite=None` is set,
+     * the cookie `Secure` attribute must also be set (or the cookie will be blocked).
+     */
+    public const SAMESITE_NONE = 'none';
+
+    /**
+     * Cookies are not sent on normal cross-site subrequests (for example to
+     * load images or frames into a third party site), but are sent when a
+     * user is navigating to the origin site (i.e. when following a link).
+     */
+    public const SAMESITE_LAX = 'lax';
+
+    /**
+     * Cookies will only be sent in a first-party context and not be sent
+     * along with requests initiated by third party websites.
+     */
+    public const SAMESITE_STRICT = 'strict';
+
+    /**
+     * RFC 6265 allowed values for the "SameSite" attribute.
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
+     */
+    public const ALLOWED_SAMESITE_VALUES = [
+        self::SAMESITE_NONE,
+        self::SAMESITE_LAX,
+        self::SAMESITE_STRICT,
+    ];
+
+    /**
+     * Expires date format.
+     *
+     * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Date
+     * @see https://tools.ietf.org/html/rfc7231#section-7.1.1.2
+     */
+    public const EXPIRES_FORMAT = 'D, d-M-Y H:i:s T';
+
+    /**
+     * Returns a unique identifier for the cookie consisting
+     * of its prefixed name, path, and domain.
+     */
+    public function getId(): string;
+
+    /**
+     * Gets the cookie prefix.
+     */
+    public function getPrefix(): string;
+
+    /**
+     * Gets the cookie name.
+     */
+    public function getName(): string;
+
+    /**
+     * Gets the cookie name prepended with the prefix, if any.
+     */
+    public function getPrefixedName(): string;
+
+    /**
+     * Gets the cookie value.
+     */
+    public function getValue(): string;
+
+    /**
+     * Gets the time in Unix timestamp the cookie expires.
+     */
+    public function getExpiresTimestamp(): int;
+
+    /**
+     * Gets the formatted expires time.
+     */
+    public function getExpiresString(): string;
+
+    /**
+     * Checks if the cookie is expired.
+     */
+    public function isExpired(): bool;
+
+    /**
+     * Gets the "Max-Age" cookie attribute.
+     */
+    public function getMaxAge(): int;
+
+    /**
+     * Gets the "Path" cookie attribute.
+     */
+    public function getPath(): string;
+
+    /**
+     * Gets the "Domain" cookie attribute.
+     */
+    public function getDomain(): string;
+
+    /**
+     * Gets the "Secure" cookie attribute.
+     *
+     * Checks if the cookie is only sent to the server when a request is made
+     * with the `https:` scheme (except on `localhost`), and therefore is more
+     * resistent to man-in-the-middle attacks.
+     */
+    public function isSecure(): bool;
+
+    /**
+     * Gets the "HttpOnly" cookie attribute.
+     *
+     * Checks if JavaScript is forbidden from accessing the cookie.
+     */
+    public function isHTTPOnly(): bool;
+
+    /**
+     * Gets the "SameSite" cookie attribute.
+     */
+    public function getSameSite(): string;
+
+    /**
+     * Checks if the cookie should be sent with no URL encoding.
+     */
+    public function isRaw(): bool;
+
+    /**
+     * Gets the options that are passable to the `setcookie` variant
+     * available on PHP 7.3+
+     *
+     * @return array<string, mixed>
+     */
+    public function getOptions(): array;
+
+    /**
+     * Returns the Cookie as a header value.
+     */
+    public function toHeaderString(): string;
+
+    /**
+     * Returns the string representation of the Cookie object.
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Returns the array representation of the Cookie object.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(): array;
 }
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index f34b8164213f..87dc472d1fe5 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
@@ -24,282 +24,227 @@
  */
 class CookieStore implements Countable, IteratorAggregate
 {
-	/**
-	 * The cookie collection.
-	 *
-	 * @var array<string, Cookie>
-	 */
-	protected $cookies = [];
-
-	/**
-	 * Creates a CookieStore from an array of `Set-Cookie` headers.
-	 *
-	 * @param string[] $headers
-	 * @param boolean  $raw
-	 *
-	 * @throws CookieException
-	 *
-	 * @return static
-	 */
-	public static function fromCookieHeaders(array $headers, bool $raw = false)
-	{
-		/**
-		 * @var Cookie[] $cookies
-		 */
-		$cookies = array_filter(array_map(function (string $header) use ($raw) {
-			try
-			{
-				return Cookie::fromHeaderString($header, $raw);
-			}
-			catch (CookieException $e)
-			{
-				log_message('error', $e->getMessage());
-				return false;
-			}
-		}, $headers));
-
-		return new static($cookies);
-	}
-
-	/**
-	 * @param Cookie[] $cookies
-	 *
-	 * @throws CookieException
-	 */
-	final public function __construct(array $cookies)
-	{
-		$this->validateCookies($cookies);
-
-		foreach ($cookies as $cookie)
-		{
-			$this->cookies[$cookie->getId()] = $cookie;
-		}
-	}
-
-	/**
-	 * Checks if a `Cookie` object identified by name and
-	 * prefix is present in the collection.
-	 *
-	 * @param string      $name
-	 * @param string      $prefix
-	 * @param string|null $value
-	 *
-	 * @return boolean
-	 */
-	public function has(string $name, string $prefix = '', string $value = null): bool
-	{
-		$name = $prefix . $name;
-
-		foreach ($this->cookies as $cookie)
-		{
-			if ($cookie->getPrefixedName() !== $name)
-			{
-				continue;
-			}
-
-			if ($value === null)
-			{
-				return true; // for BC
-			}
-
-			return $cookie->getValue() === $value;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Retrieves an instance of `Cookie` identified by a name and prefix.
-	 * This throws an exception if not found.
-	 *
-	 * @param string $name
-	 * @param string $prefix
-	 *
-	 * @throws CookieException
-	 *
-	 * @return Cookie
-	 */
-	public function get(string $name, string $prefix = ''): Cookie
-	{
-		$name = $prefix . $name;
-
-		foreach ($this->cookies as $cookie)
-		{
-			if ($cookie->getPrefixedName() === $name)
-			{
-				return $cookie;
-			}
-		}
-
-		throw CookieException::forUnknownCookieInstance([$name, $prefix]);
-	}
-
-	/**
-	 * Store a new cookie and return a new collection. The original collection
-	 * is left unchanged.
-	 *
-	 * @param Cookie $cookie
-	 *
-	 * @return static
-	 */
-	public function put(Cookie $cookie)
-	{
-		$store = clone $this;
-
-		$store->cookies[$cookie->getId()] = $cookie;
-
-		return $store;
-	}
-
-	/**
-	 * Removes a cookie from a collection and returns an updated collection.
-	 * The original collection is left unchanged.
-	 *
-	 * Removing a cookie from the store **DOES NOT** delete it from the browser.
-	 * If you intend to delete a cookie *from the browser*, you must put an empty
-	 * value cookie with the same name to the store.
-	 *
-	 * @param string $name
-	 * @param string $prefix
-	 *
-	 * @return static
-	 */
-	public function remove(string $name, string $prefix = '')
-	{
-		$default = Cookie::setDefaults();
-
-		$id = implode(';', [$prefix . $name, $default['path'], $default['domain']]);
-
-		$store = clone $this;
-
-		foreach (array_keys($store->cookies) as $index)
-		{
-			if ($index === $id)
-			{
-				unset($store->cookies[$index]);
-			}
-		}
-
-		return $store;
-	}
-
-	/**
-	 * Dispatches all cookies in store.
-	 *
-	 * @return void
-	 */
-	public function dispatch(): void
-	{
-		foreach ($this->cookies as $cookie)
-		{
-			$name    = $cookie->getPrefixedName();
-			$value   = $cookie->getValue();
-			$options = $cookie->getOptions();
-
-			if ($cookie->isRaw())
-			{
-				$this->setRawCookie($name, $value, $options);
-			}
-			else
-			{
-				$this->setCookie($name, $value, $options);
-			}
-		}
-
-		$this->clear();
-	}
-
-	/**
-	 * Returns all cookie instances in store.
-	 *
-	 * @return array<string, Cookie>
-	 */
-	public function display(): array
-	{
-		return $this->cookies;
-	}
-
-	/**
-	 * Clears the cookie collection.
-	 *
-	 * @return void
-	 */
-	public function clear(): void
-	{
-		$this->cookies = [];
-	}
-
-	/**
-	 * Gets the Cookie count in this collection.
-	 *
-	 * @return integer
-	 */
-	public function count(): int
-	{
-		return count($this->cookies);
-	}
-
-	/**
-	 * Gets the iterator for the cookie collection.
-	 *
-	 * @return Traversable<string, Cookie>
-	 */
-	public function getIterator()
-	{
-		return new ArrayIterator($this->cookies);
-	}
-
-	/**
-	 * Validates all cookies passed to be instances of Cookie.
-	 *
-	 * @param array $cookies
-	 *
-	 * @throws CookieException
-	 *
-	 * @return void
-	 */
-	protected function validateCookies(array $cookies): void
-	{
-		foreach ($cookies as $index => $cookie)
-		{
-			$type = is_object($cookie) ? get_class($cookie) : gettype($cookie);
-
-			if (! $cookie instanceof Cookie)
-			{
-				throw CookieException::forInvalidCookieInstance([static::class, Cookie::class, $type, $index]);
-			}
-		}
-	}
-
-	/**
-	 * Extracted call to `setrawcookie()` in order to run unit tests on it.
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @param string $name
-	 * @param string $value
-	 * @param array  $options
-	 *
-	 * @return void
-	 */
-	protected function setRawCookie(string $name, string $value, array $options): void
-	{
-		setrawcookie($name, $value, $options);
-	}
-
-	/**
-	 * Extracted call to `setcookie()` in order to run unit tests on it.
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @param string $name
-	 * @param string $value
-	 * @param array  $options
-	 *
-	 * @return void
-	 */
-	protected function setCookie(string $name, string $value, array $options): void
-	{
-		setcookie($name, $value, $options);
-	}
+    /**
+     * The cookie collection.
+     *
+     * @var array<string, Cookie>
+     */
+    protected $cookies = [];
+
+    /**
+     * Creates a CookieStore from an array of `Set-Cookie` headers.
+     *
+     * @param string[] $headers
+     *
+     * @throws CookieException
+     *
+     * @return static
+     */
+    public static function fromCookieHeaders(array $headers, bool $raw = false)
+    {
+        /**
+         * @var Cookie[] $cookies
+         */
+        $cookies = array_filter(array_map(static function (string $header) use ($raw) {
+            try {
+                return Cookie::fromHeaderString($header, $raw);
+            } catch (CookieException $e) {
+                log_message('error', $e->getMessage());
+
+                return false;
+            }
+        }, $headers));
+
+        return new static($cookies);
+    }
+
+    /**
+     * @param Cookie[] $cookies
+     *
+     * @throws CookieException
+     */
+    final public function __construct(array $cookies)
+    {
+        $this->validateCookies($cookies);
+
+        foreach ($cookies as $cookie) {
+            $this->cookies[$cookie->getId()] = $cookie;
+        }
+    }
+
+    /**
+     * Checks if a `Cookie` object identified by name and
+     * prefix is present in the collection.
+     */
+    public function has(string $name, string $prefix = '', ?string $value = null): bool
+    {
+        $name = $prefix . $name;
+
+        foreach ($this->cookies as $cookie) {
+            if ($cookie->getPrefixedName() !== $name) {
+                continue;
+            }
+
+            if ($value === null) {
+                return true; // for BC
+            }
+
+            return $cookie->getValue() === $value;
+        }
+
+        return false;
+    }
+
+    /**
+     * Retrieves an instance of `Cookie` identified by a name and prefix.
+     * This throws an exception if not found.
+     *
+     * @throws CookieException
+     */
+    public function get(string $name, string $prefix = ''): Cookie
+    {
+        $name = $prefix . $name;
+
+        foreach ($this->cookies as $cookie) {
+            if ($cookie->getPrefixedName() === $name) {
+                return $cookie;
+            }
+        }
+
+        throw CookieException::forUnknownCookieInstance([$name, $prefix]);
+    }
+
+    /**
+     * Store a new cookie and return a new collection. The original collection
+     * is left unchanged.
+     *
+     * @return static
+     */
+    public function put(Cookie $cookie)
+    {
+        $store = clone $this;
+
+        $store->cookies[$cookie->getId()] = $cookie;
+
+        return $store;
+    }
+
+    /**
+     * Removes a cookie from a collection and returns an updated collection.
+     * The original collection is left unchanged.
+     *
+     * Removing a cookie from the store **DOES NOT** delete it from the browser.
+     * If you intend to delete a cookie *from the browser*, you must put an empty
+     * value cookie with the same name to the store.
+     *
+     * @return static
+     */
+    public function remove(string $name, string $prefix = '')
+    {
+        $default = Cookie::setDefaults();
+
+        $id = implode(';', [$prefix . $name, $default['path'], $default['domain']]);
+
+        $store = clone $this;
+
+        foreach (array_keys($store->cookies) as $index) {
+            if ($index === $id) {
+                unset($store->cookies[$index]);
+            }
+        }
+
+        return $store;
+    }
+
+    /**
+     * Dispatches all cookies in store.
+     */
+    public function dispatch(): void
+    {
+        foreach ($this->cookies as $cookie) {
+            $name    = $cookie->getPrefixedName();
+            $value   = $cookie->getValue();
+            $options = $cookie->getOptions();
+
+            if ($cookie->isRaw()) {
+                $this->setRawCookie($name, $value, $options);
+            } else {
+                $this->setCookie($name, $value, $options);
+            }
+        }
+
+        $this->clear();
+    }
+
+    /**
+     * Returns all cookie instances in store.
+     *
+     * @return array<string, Cookie>
+     */
+    public function display(): array
+    {
+        return $this->cookies;
+    }
+
+    /**
+     * Clears the cookie collection.
+     */
+    public function clear(): void
+    {
+        $this->cookies = [];
+    }
+
+    /**
+     * Gets the Cookie count in this collection.
+     */
+    public function count(): int
+    {
+        return count($this->cookies);
+    }
+
+    /**
+     * Gets the iterator for the cookie collection.
+     *
+     * @return Traversable<string, Cookie>
+     */
+    public function getIterator(): Traversable
+    {
+        return new ArrayIterator($this->cookies);
+    }
+
+    /**
+     * Validates all cookies passed to be instances of Cookie.
+     *
+     * @throws CookieException
+     */
+    protected function validateCookies(array $cookies): void
+    {
+        foreach ($cookies as $index => $cookie) {
+            $type = is_object($cookie) ? get_class($cookie) : gettype($cookie);
+
+            if (! $cookie instanceof Cookie) {
+                throw CookieException::forInvalidCookieInstance([static::class, Cookie::class, $type, $index]);
+            }
+        }
+    }
+
+    /**
+     * Extracted call to `setrawcookie()` in order to run unit tests on it.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function setRawCookie(string $name, string $value, array $options): void
+    {
+        setrawcookie($name, $value, $options);
+    }
+
+    /**
+     * Extracted call to `setcookie()` in order to run unit tests on it.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function setCookie(string $name, string $value, array $options): void
+    {
+        setcookie($name, $value, $options);
+    }
 }
diff --git a/system/Cookie/Exceptions/CookieException.php b/system/Cookie/Exceptions/CookieException.php
index 31cf3056efbb..2e69a0e0f891 100644
--- a/system/Cookie/Exceptions/CookieException.php
+++ b/system/Cookie/Exceptions/CookieException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie\Exceptions;
@@ -18,116 +18,110 @@
  */
 class CookieException extends FrameworkException
 {
-	/**
-	 * Thrown for invalid type given for the "Expires" attribute.
-	 *
-	 * @param string $type
-	 *
-	 * @return static
-	 */
-	public static function forInvalidExpiresTime(string $type)
-	{
-		return new static(lang('Cookie.invalidExpiresTime', [$type]));
-	}
+    /**
+     * Thrown for invalid type given for the "Expires" attribute.
+     *
+     * @return static
+     */
+    public static function forInvalidExpiresTime(string $type)
+    {
+        return new static(lang('Cookie.invalidExpiresTime', [$type]));
+    }
 
-	/**
-	 * Thrown when the value provided for "Expires" is invalid.
-	 *
-	 * @return static
-	 */
-	public static function forInvalidExpiresValue()
-	{
-		return new static(lang('Cookie.invalidExpiresValue'));
-	}
+    /**
+     * Thrown when the value provided for "Expires" is invalid.
+     *
+     * @return static
+     */
+    public static function forInvalidExpiresValue()
+    {
+        return new static(lang('Cookie.invalidExpiresValue'));
+    }
 
-	/**
-	 * Thrown when the cookie name contains invalid characters per RFC 2616.
-	 *
-	 * @param string $name
-	 *
-	 * @return static
-	 */
-	public static function forInvalidCookieName(string $name)
-	{
-		return new static(lang('Cookie.invalidCookieName', [$name]));
-	}
+    /**
+     * Thrown when the cookie name contains invalid characters per RFC 2616.
+     *
+     * @return static
+     */
+    public static function forInvalidCookieName(string $name)
+    {
+        return new static(lang('Cookie.invalidCookieName', [$name]));
+    }
 
-	/**
-	 * Thrown when the cookie name is empty.
-	 *
-	 * @return static
-	 */
-	public static function forEmptyCookieName()
-	{
-		return new static(lang('Cookie.emptyCookieName'));
-	}
+    /**
+     * Thrown when the cookie name is empty.
+     *
+     * @return static
+     */
+    public static function forEmptyCookieName()
+    {
+        return new static(lang('Cookie.emptyCookieName'));
+    }
 
-	/**
-	 * Thrown when using the `__Secure-` prefix but the `Secure` attribute
-	 * is not set to true.
-	 *
-	 * @return static
-	 */
-	public static function forInvalidSecurePrefix()
-	{
-		return new static(lang('Cookie.invalidSecurePrefix'));
-	}
+    /**
+     * Thrown when using the `__Secure-` prefix but the `Secure` attribute
+     * is not set to true.
+     *
+     * @return static
+     */
+    public static function forInvalidSecurePrefix()
+    {
+        return new static(lang('Cookie.invalidSecurePrefix'));
+    }
 
-	/**
-	 * Thrown when using the `__Host-` prefix but the `Secure` flag is not
-	 * set, the `Domain` is set, and the `Path` is not `/`.
-	 *
-	 * @return static
-	 */
-	public static function forInvalidHostPrefix()
-	{
-		return new static(lang('Cookie.invalidHostPrefix'));
-	}
+    /**
+     * Thrown when using the `__Host-` prefix but the `Secure` flag is not
+     * set, the `Domain` is set, and the `Path` is not `/`.
+     *
+     * @return static
+     */
+    public static function forInvalidHostPrefix()
+    {
+        return new static(lang('Cookie.invalidHostPrefix'));
+    }
 
-	/**
-	 * Thrown when the `SameSite` attribute given is not of the valid types.
-	 *
-	 * @param string $sameSite
-	 *
-	 * @return static
-	 */
-	public static function forInvalidSameSite(string $sameSite)
-	{
-		return new static(lang('Cookie.invalidSameSite', [$sameSite]));
-	}
+    /**
+     * Thrown when the `SameSite` attribute given is not of the valid types.
+     *
+     * @return static
+     */
+    public static function forInvalidSameSite(string $sameSite)
+    {
+        return new static(lang('Cookie.invalidSameSite', [$sameSite]));
+    }
 
-	/**
-	 * Thrown when the `SameSite` attribute is set to `None` but the `Secure`
-	 * attribute is not set.
-	 *
-	 * @return static
-	 */
-	public static function forInvalidSameSiteNone()
-	{
-		return new static(lang('Cookie.invalidSameSiteNone'));
-	}
+    /**
+     * Thrown when the `SameSite` attribute is set to `None` but the `Secure`
+     * attribute is not set.
+     *
+     * @return static
+     */
+    public static function forInvalidSameSiteNone()
+    {
+        return new static(lang('Cookie.invalidSameSiteNone'));
+    }
 
-	/**
-	 * Thrown when the `CookieStore` class is filled with invalid Cookie objects.
-	 *
-	 * @param array<string|integer> $data
-	 *
-	 * @return static
-	 */
-	public static function forInvalidCookieInstance(array $data)
-	{
-		return new static(lang('Cookie.invalidCookieInstance', $data));
-	}
+    /**
+     * Thrown when the `CookieStore` class is filled with invalid Cookie objects.
+     *
+     * @param array<int|string> $data
+     *
+     * @return static
+     */
+    public static function forInvalidCookieInstance(array $data)
+    {
+        return new static(lang('Cookie.invalidCookieInstance', $data));
+    }
 
-	/**
-	 * Thrown when the queried Cookie object does not exist in the cookie collection.
-	 *
-	 * @param string[] $data
-	 *
-	 * @return static
-	 */
-	public static function forUnknownCookieInstance(array $data)
-	{
-		return new static(lang('Cookie.unknownCookieInstance', $data));
-	}
+    /**
+     * Thrown when the queried Cookie object does not exist in the cookie collection.
+     *
+     * @param string[] $data
+     *
+     * @return static
+     */
+    public static function forUnknownCookieInstance(array $data)
+    {
+        return new static(lang('Cookie.unknownCookieInstance', $data));
+    }
 }
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 127b918ae8d4..7c3253c52685 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -25,3500 +25,2653 @@
  */
 class BaseBuilder
 {
-	/**
-	 * Reset DELETE data flag
-	 *
-	 * @var boolean
-	 */
-	protected $resetDeleteData = false;
-
-	/**
-	 * QB SELECT data
-	 *
-	 * @var array
-	 */
-	protected $QBSelect = [];
-
-	/**
-	 * QB DISTINCT flag
-	 *
-	 * @var boolean
-	 */
-	protected $QBDistinct = false;
-
-	/**
-	 * QB FROM data
-	 *
-	 * @var array
-	 */
-	protected $QBFrom = [];
-
-	/**
-	 * QB JOIN data
-	 *
-	 * @var array
-	 */
-	protected $QBJoin = [];
-
-	/**
-	 * QB WHERE data
-	 *
-	 * @var array
-	 */
-	protected $QBWhere = [];
-
-	/**
-	 * QB GROUP BY data
-	 *
-	 * @var array
-	 */
-	public $QBGroupBy = [];
-
-	/**
-	 * QB HAVING data
-	 *
-	 * @var array
-	 */
-	protected $QBHaving = [];
-
-	/**
-	 * QB keys
-	 *
-	 * @var array
-	 */
-	protected $QBKeys = [];
-
-	/**
-	 * QB LIMIT data
-	 *
-	 * @var integer|boolean
-	 */
-	protected $QBLimit = false;
-
-	/**
-	 * QB OFFSET data
-	 *
-	 * @var integer|boolean
-	 */
-	protected $QBOffset = false;
-
-	/**
-	 * QB ORDER BY data
-	 *
-	 * @var array|null|string
-	 */
-	public $QBOrderBy = [];
-
-	/**
-	 * QB NO ESCAPE data
-	 *
-	 * @var array
-	 */
-	public $QBNoEscape = [];
-
-	/**
-	 * QB data sets
-	 *
-	 * @var array
-	 */
-	protected $QBSet = [];
-
-	/**
-	 * QB WHERE group started flag
-	 *
-	 * @var boolean
-	 */
-	protected $QBWhereGroupStarted = false;
-
-	/**
-	 * QB WHERE group count
-	 *
-	 * @var integer
-	 */
-	protected $QBWhereGroupCount = 0;
-
-	/**
-	 * Ignore data that cause certain
-	 * exceptions, for example in case of
-	 * duplicate keys.
-	 *
-	 * @var boolean
-	 */
-	protected $QBIgnore = false;
-
-	/**
-	 * A reference to the database connection.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * Name of the primary table for this instance.
-	 * Tracked separately because $QBFrom gets escaped
-	 * and prefixed.
-	 *
-	 * @var string
-	 */
-	protected $tableName;
-
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $randomKeyword = [
-		'RAND()',
-		'RAND(%d)',
-	];
-
-	/**
-	 * COUNT string
-	 *
-	 * @used-by CI_DB_driver::count_all()
-	 * @used-by BaseBuilder::count_all_results()
-	 *
-	 * @var string
-	 */
-	protected $countString = 'SELECT COUNT(*) AS ';
-
-	/**
-	 * Collects the named parameters and
-	 * their values for later binding
-	 * in the Query object.
-	 *
-	 * @var array
-	 */
-	protected $binds = [];
-
-	/**
-	 * Collects the key count for named parameters
-	 * in the Query object.
-	 *
-	 * @var array
-	 */
-	protected $bindsKeyCount = [];
-
-	/**
-	 * Some databases, like SQLite, do not by default
-	 * allow limiting of delete clauses.
-	 *
-	 * @var boolean
-	 */
-	protected $canLimitDeletes = true;
-
-	/**
-	 * Some databases do not by default
-	 * allow limit update queries with WHERE.
-	 *
-	 * @var boolean
-	 */
-	protected $canLimitWhereUpdates = true;
-
-	/**
-	 * Specifies which sql statements
-	 * support the ignore option.
-	 *
-	 * @var array
-	 */
-	protected $supportedIgnoreStatements = [];
-
-	/**
-	 * Builder testing mode status.
-	 *
-	 * @var boolean
-	 */
-	protected $testMode = false;
-
-	/**
-	 * Tables relation types
-	 *
-	 * @var array
-	 */
-	protected $joinTypes = [
-		'LEFT',
-		'RIGHT',
-		'OUTER',
-		'INNER',
-		'LEFT OUTER',
-		'RIGHT OUTER',
-	];
-
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @param  string|array        $tableName
-	 * @param  ConnectionInterface $db
-	 * @param  array               $options
-	 * @throws DatabaseException
-	 */
-	public function __construct($tableName, ConnectionInterface &$db, array $options = null)
-	{
-		if (empty($tableName))
-		{
-			throw new DatabaseException('A table must be specified when creating a new Query Builder.');
-		}
-
-		/**
-		 * @var BaseConnection $db
-		 */
-		$this->db = $db;
-
-		$this->tableName = $tableName;
-		$this->from($tableName);
-
-		if (! empty($options))
-		{
-			foreach ($options as $key => $value)
-			{
-				if (property_exists($this, $key))
-				{
-					$this->$key = $value;
-				}
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns the current database connection
-	 *
-	 * @return ConnectionInterface|BaseConnection
-	 */
-	public function db(): ConnectionInterface
-	{
-		return $this->db;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets a test mode status.
-	 *
-	 * @param boolean $mode Mode to set
-	 *
-	 * @return $this
-	 */
-	public function testMode(bool $mode = true)
-	{
-		$this->testMode = $mode;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the name of the primary table.
-	 *
-	 * @return string
-	 */
-	public function getTable(): string
-	{
-		return $this->tableName;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of bind values and their
-	 * named parameters for binding in the Query object later.
-	 *
-	 * @return array
-	 */
-	public function getBinds(): array
-	{
-		return $this->binds;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ignore
-	 *
-	 * Set ignore Flag for next insert,
-	 * update or delete query.
-	 *
-	 * @param boolean $ignore
-	 *
-	 * @return $this
-	 */
-	public function ignore(bool $ignore = true)
-	{
-		$this->QBIgnore = $ignore;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select
-	 *
-	 * Generates the SELECT portion of the query
-	 *
-	 * @param string|array $select
-	 * @param boolean      $escape
-	 *
-	 * @return $this
-	 */
-	public function select($select = '*', bool $escape = null)
-	{
-		if (is_string($select))
-		{
-			$select = explode(',', $select);
-		}
-
-		// If the escape value was not set, we will base it on the global setting
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		foreach ($select as $val)
-		{
-			$val = trim($val);
-
-			if ($val !== '')
-			{
-				$this->QBSelect[] = $val;
-
-				/*
-				 * When doing 'SELECT NULL as field_alias FROM table'
-				 * null gets taken as a field, and therefore escaped
-				 * with backticks.
-				 * This prevents NULL being escaped
-				 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1169
-				 */
-				if (mb_stripos(trim($val), 'NULL') === 0)
-				{
-					$escape = false;
-				}
-
-				$this->QBNoEscape[] = $escape;
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select Max
-	 *
-	 * Generates a SELECT MAX(field) portion of a query
-	 *
-	 * @param string $select The field
-	 * @param string $alias  An alias
-	 *
-	 * @return $this
-	 */
-	public function selectMax(string $select = '', string $alias = '')
-	{
-		return $this->maxMinAvgSum($select, $alias);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select Min
-	 *
-	 * Generates a SELECT MIN(field) portion of a query
-	 *
-	 * @param string $select The field
-	 * @param string $alias  An alias
-	 *
-	 * @return $this
-	 */
-	public function selectMin(string $select = '', string $alias = '')
-	{
-		return $this->maxMinAvgSum($select, $alias, 'MIN');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select Average
-	 *
-	 * Generates a SELECT AVG(field) portion of a query
-	 *
-	 * @param string $select The field
-	 * @param string $alias  An alias
-	 *
-	 * @return $this
-	 */
-	public function selectAvg(string $select = '', string $alias = '')
-	{
-		return $this->maxMinAvgSum($select, $alias, 'AVG');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select Sum
-	 *
-	 * Generates a SELECT SUM(field) portion of a query
-	 *
-	 * @param string $select The field
-	 * @param string $alias  An alias
-	 *
-	 * @return $this
-	 */
-	public function selectSum(string $select = '', string $alias = '')
-	{
-		return $this->maxMinAvgSum($select, $alias, 'SUM');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select Count
-	 *
-	 * Generates a SELECT COUNT(field) portion of a query
-	 *
-	 * @param string $select The field
-	 * @param string $alias  An alias
-	 *
-	 * @return $this
-	 */
-	public function selectCount(string $select = '', string $alias = '')
-	{
-		return $this->maxMinAvgSum($select, $alias, 'COUNT');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * SELECT [MAX|MIN|AVG|SUM|COUNT]()
-	 *
-	 * @used-by selectMax()
-	 * @used-by selectMin()
-	 * @used-by selectAvg()
-	 * @used-by selectSum()
-	 *
-	 * @param string $select Field name
-	 * @param string $alias
-	 * @param string $type
-	 *
-	 * @return $this
-	 * @throws DataException
-	 * @throws DatabaseException
-	 */
-	protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
-	{
-		if ($select === '')
-		{
-			throw DataException::forEmptyInputGiven('Select');
-		}
-
-		if (strpos($select, ',') !== false)
-		{
-			throw DataException::forInvalidArgument('column name not separated by comma');
-		}
-
-		$type = strtoupper($type);
-
-		if (! in_array($type, ['MAX', 'MIN', 'AVG', 'SUM', 'COUNT'], true))
-		{
-			throw new DatabaseException('Invalid function type: ' . $type);
-		}
-
-		if ($alias === '')
-		{
-			$alias = $this->createAliasFromTable(trim($select));
-		}
-
-		$sql = $type . '(' . $this->db->protectIdentifiers(trim($select)) . ') AS ' . $this->db->escapeIdentifiers(trim($alias));
-
-		$this->QBSelect[]   = $sql;
-		$this->QBNoEscape[] = null;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the alias name based on the table
-	 *
-	 * @param string $item
-	 *
-	 * @return string
-	 */
-	protected function createAliasFromTable(string $item): string
-	{
-		if (strpos($item, '.') !== false)
-		{
-			$item = explode('.', $item);
-
-			return end($item);
-		}
-
-		return $item;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * DISTINCT
-	 *
-	 * Sets a flag which tells the query string compiler to add DISTINCT
-	 *
-	 * @param boolean $val
-	 *
-	 * @return $this
-	 */
-	public function distinct(bool $val = true)
-	{
-		$this->QBDistinct = $val;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * From
-	 *
-	 * Generates the FROM portion of the query
-	 *
-	 * @param mixed   $from      can be a string or array
-	 * @param boolean $overwrite Should we remove the first table existing?
-	 *
-	 * @return $this
-	 */
-	public function from($from, bool $overwrite = false)
-	{
-		if ($overwrite === true)
-		{
-			$this->QBFrom = [];
-			$this->db->setAliasedTables([]);
-		}
-
-		foreach ((array) $from as $val)
-		{
-			if (strpos($val, ',') !== false)
-			{
-				foreach (explode(',', $val) as $v)
-				{
-					$v = trim($v);
-					$this->trackAliases($v);
-
-					$this->QBFrom[] = $v = $this->db->protectIdentifiers($v, true, null, false);
-				}
-			}
-			else
-			{
-				$val = trim($val);
-
-				// Extract any aliases that might exist. We use this information
-				// in the protectIdentifiers to know whether to add a table prefix
-				$this->trackAliases($val);
-
-				$this->QBFrom[] = $this->db->protectIdentifiers($val, true, null, false);
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * JOIN
-	 *
-	 * Generates the JOIN portion of the query
-	 *
-	 * @param string  $table
-	 * @param string  $cond   The join condition
-	 * @param string  $type   The type of join
-	 * @param boolean $escape Whether not to try to escape identifiers
-	 *
-	 * @return $this
-	 */
-	public function join(string $table, string $cond, string $type = '', bool $escape = null)
-	{
-		if ($type !== '')
-		{
-			$type = strtoupper(trim($type));
-
-			if (! in_array($type, $this->joinTypes, true))
-			{
-				$type = '';
-			}
-			else
-			{
-				$type .= ' ';
-			}
-		}
-
-		// Extract any aliases that might exist. We use this information
-		// in the protectIdentifiers to know whether to add a table prefix
-		$this->trackAliases($table);
-
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		if (! $this->hasOperator($cond))
-		{
-			$cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
-		}
-		elseif ($escape === false)
-		{
-			$cond = ' ON ' . $cond;
-		}
-		else
-		{
-			// Split multiple conditions
-			if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE))
-			{
-				$conditions = [];
-				$joints     = $joints[0];
-				array_unshift($joints, ['', 0]);
-
-				for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --)
-				{
-					$joints[$i][1] += strlen($joints[$i][0]); // offset
-					$conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
-					$pos            = $joints[$i][1] - strlen($joints[$i][0]);
-					$joints[$i]     = $joints[$i][0];
-				}
-				ksort($conditions);
-			}
-			else
-			{
-				$conditions = [$cond];
-				$joints     = [''];
-			}
-
-			$cond = ' ON ';
-			foreach ($conditions as $i => $condition)
-			{
-				$operator = $this->getOperator($condition);
-
-				$cond .= $joints[$i];
-				$cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
-			}
-		}
-
-		// Do we want to escape the table name?
-		if ($escape === true)
-		{
-			$table = $this->db->protectIdentifiers($table, true, null, false);
-		}
-
-		// Assemble the JOIN statement
-		$this->QBJoin[] = $join = $type . 'JOIN ' . $table . $cond;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * WHERE
-	 *
-	 * Generates the WHERE portion of the query.
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param mixed   $key
-	 * @param mixed   $value
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function where($key, $value = null, bool $escape = null)
-	{
-		return $this->whereHaving('QBWhere', $key, $value, 'AND ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR WHERE
-	 *
-	 * Generates the WHERE portion of the query.
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param mixed   $key
-	 * @param mixed   $value
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function orWhere($key, $value = null, bool $escape = null)
-	{
-		return $this->whereHaving('QBWhere', $key, $value, 'OR ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * WHERE, HAVING
-	 *
-	 * @used-by where()
-	 * @used-by orWhere()
-	 * @used-by having()
-	 * @used-by orHaving()
-	 *
-	 * @param string  $qbKey  'QBWhere' or 'QBHaving'
-	 * @param mixed   $key
-	 * @param mixed   $value
-	 * @param string  $type
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
-	{
-		if (! is_array($key))
-		{
-			$key = [$key => $value];
-		}
-
-		// If the escape value was not set will base it on the global setting
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		foreach ($key as $k => $v)
-		{
-			$prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
-
-			if ($v !== null)
-			{
-				$op = $this->getOperator($k, true);
-
-				if (! empty($op))
-				{
-					$k = trim($k);
-
-					end($op);
-
-					$op = trim(current($op));
-
-					if (substr($k, -1 * strlen($op)) === $op)
-					{
-						$k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
-					}
-				}
-
-				$bind = $this->setBind($k, $v, $escape);
-
-				if (empty($op))
-				{
-					$k .= ' =';
-				}
-				else
-				{
-					$k .= " $op";
-				}
-
-				if ($v instanceof Closure)
-				{
-					$builder = $this->cleanClone();
-					$v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
-				}
-				else
-				{
-					$v = " :$bind:";
-				}
-			}
-			elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving')
-			{
-				// value appears not to have been set, assign the test to IS NULL
-				$k .= ' IS NULL';
-			}
-			elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
-			{
-				$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
-			}
-
-			$this->{$qbKey}[] = [
-				'condition' => $prefix . $k . $v,
-				'escape'    => $escape,
-			];
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * WHERE IN
-	 *
-	 * Generates a WHERE field IN('item', 'item') SQL query,
-	 * joined with 'AND' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function whereIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, false, 'AND ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR WHERE IN
-	 *
-	 * Generates a WHERE field IN('item', 'item') SQL query,
-	 * joined with 'OR' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function orWhereIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, false, 'OR ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * WHERE NOT IN
-	 *
-	 * Generates a WHERE field NOT IN('item', 'item') SQL query,
-	 * joined with 'AND' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function whereNotIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, true, 'AND ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR WHERE NOT IN
-	 *
-	 * Generates a WHERE field NOT IN('item', 'item') SQL query,
-	 * joined with 'OR' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function orWhereNotIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, true, 'OR ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * HAVING IN
-	 *
-	 * Generates a HAVING field IN('item', 'item') SQL query,
-	 * joined with 'AND' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function havingIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, false, 'AND ', $escape, 'QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR HAVING IN
-	 *
-	 * Generates a HAVING field IN('item', 'item') SQL query,
-	 * joined with 'OR' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function orHavingIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, false, 'OR ', $escape, 'QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * HAVING NOT IN
-	 *
-	 * Generates a HAVING field NOT IN('item', 'item') SQL query,
-	 * joined with 'AND' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function havingNotIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, true, 'AND ', $escape, 'QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR HAVING NOT IN
-	 *
-	 * Generates a HAVING field NOT IN('item', 'item') SQL query,
-	 * joined with 'OR' if appropriate.
-	 *
-	 * @param string               $key    The field to search
-	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
-	 * @param boolean              $escape
-	 *
-	 * @return $this
-	 */
-	public function orHavingNotIn(string $key = null, $values = null, bool $escape = null)
-	{
-		return $this->_whereIn($key, $values, true, 'OR ', $escape, 'QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Internal WHERE IN
-	 *
-	 * @used-by WhereIn()
-	 * @used-by orWhereIn()
-	 * @used-by whereNotIn()
-	 * @used-by orWhereNotIn()
-	 *
-	 * @param  string             $key    The field to search
-	 * @param  array|Closure|null $values The values searched on, or anonymous function with subquery
-	 * @param  boolean            $not    If the statement would be IN or NOT IN
-	 * @param  string             $type
-	 * @param  boolean            $escape
-	 * @param  string             $clause (Internal use only)
-	 * @throws InvalidArgumentException
-	 *
-	 * @return $this
-	 */
-	protected function _whereIn(string $key = null, $values = null, bool $not = false, string $type = 'AND ', bool $escape = null, string $clause = 'QBWhere')
-	{
-		if (empty($key) || ! is_string($key))
-		{
-			if (CI_DEBUG)
-			{
-				throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
-			}
-			// @codeCoverageIgnoreStart
-			return $this;
-			// @codeCoverageIgnoreEnd
-		}
-
-		if ($values === null || (! is_array($values) && ! ($values instanceof Closure)))
-		{
-			if (CI_DEBUG)
-			{
-				throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
-			}
-			// @codeCoverageIgnoreStart
-			return $this;
-			// @codeCoverageIgnoreEnd
-		}
-
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		$ok = $key;
-
-		if ($escape === true)
-		{
-			$key = $this->db->protectIdentifiers($key);
-		}
-
-		$not = ($not) ? ' NOT' : '';
-
-		if ($values instanceof Closure)
-		{
-			$builder = $this->cleanClone();
-			$ok      = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
-		}
-		else
-		{
-			$whereIn = array_values($values);
-			$ok      = $this->setBind($ok, $whereIn, $escape);
-		}
-
-		$prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
-
-		$whereIn = [
-			'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ($ok)" : " IN :{$ok}:"),
-			'escape'    => false,
-		];
-
-		$this->{$clause}[] = $whereIn;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * LIKE
-	 *
-	 * Generates a %LIKE% portion of the query.
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
-	 *
-	 * @return $this
-	 */
-	public function like($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * NOT LIKE
-	 *
-	 * Generates a NOT LIKE portion of the query.
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
-	 *
-	 * @return $this
-	 */
-	public function notLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR LIKE
-	 *
-	 * Generates a %LIKE% portion of the query.
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
-	 *
-	 * @return $this
-	 */
-	public function orLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR NOT LIKE
-	 *
-	 * Generates a NOT LIKE portion of the query.
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
-	 *
-	 * @return $this
-	 */
-	public function orNotLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * LIKE with HAVING clause
-	 *
-	 * Generates a %LIKE% portion of the query.
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function havingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * NOT LIKE with HAVING clause
-	 *
-	 * Generates a NOT LIKE portion of the query.
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function notHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * OR LIKE with HAVING clause
-	 *
-	 * Generates a %LIKE% portion of the query.
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function orHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * OR NOT LIKE with HAVING clause
-	 *
-	 * Generates a NOT LIKE portion of the query.
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $side
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function orNotHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
-	{
-		return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Internal LIKE
-	 *
-	 * @used-by like()
-	 * @used-by orLike()
-	 * @used-by notLike()
-	 * @used-by orNotLike()
-	 * @used-by havingLike()
-	 * @used-by orHavingLike()
-	 * @used-by notHavingLike()
-	 * @used-by orNotHavingLike()
-	 *
-	 * @param mixed   $field
-	 * @param string  $match
-	 * @param string  $type
-	 * @param string  $side
-	 * @param string  $not
-	 * @param boolean $escape
-	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
-	 * @param string  $clause            (Internal use only)
-	 *
-	 * @return $this
-	 */
-	protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
-	{
-		if (! is_array($field))
-		{
-			$field = [$field => $match];
-		}
-
-		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
-
-		// lowercase $side in case somebody writes e.g. 'BEFORE' instead of 'before' (doh)
-		$side = strtolower($side);
-
-		foreach ($field as $k => $v)
-		{
-			if ($insensitiveSearch === true)
-			{
-				$v = strtolower($v);
-			}
-
-			$prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
-
-			if ($side === 'none')
-			{
-				$bind = $this->setBind($k, $v, $escape);
-			}
-			elseif ($side === 'before')
-			{
-				$bind = $this->setBind($k, "%$v", $escape);
-			}
-			elseif ($side === 'after')
-			{
-				$bind = $this->setBind($k, "$v%", $escape);
-			}
-			else
-			{
-				$bind = $this->setBind($k, "%$v%", $escape);
-			}
-
-			$likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
-
-			// some platforms require an escape sequence definition for LIKE wildcards
-			if ($escape === true && $this->db->likeEscapeStr !== '')
-			{
-				$likeStatement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
-			}
-
-			$this->{$clause}[] = [
-				'condition' => $likeStatement,
-				'escape'    => $escape,
-			];
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform independent LIKE statement builder.
-	 *
-	 * @param string|null $prefix
-	 * @param string      $column
-	 * @param string|null $not
-	 * @param string      $bind
-	 * @param boolean     $insensitiveSearch
-	 *
-	 * @return string     $like_statement
-	 */
-	protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
-	{
-		if ($insensitiveSearch === true)
-		{
-			return "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
-		}
-
-		return "{$prefix} {$column} {$not} LIKE :{$bind}:";
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Starts a query group.
-	 *
-	 * @return $this
-	 */
-	public function groupStart()
-	{
-		return $this->groupStartPrepare();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Starts a query group, but ORs the group
-	 *
-	 * @return $this
-	 */
-	public function orGroupStart()
-	{
-		return $this->groupStartPrepare('', 'OR ');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Starts a query group, but NOTs the group
-	 *
-	 * @return $this
-	 */
-	public function notGroupStart()
-	{
-		return $this->groupStartPrepare('NOT ');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Starts a query group, but OR NOTs the group
-	 *
-	 * @return $this
-	 */
-	public function orNotGroupStart()
-	{
-		return $this->groupStartPrepare('NOT ', 'OR ');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ends a query group
-	 *
-	 * @return $this
-	 */
-	public function groupEnd()
-	{
-		return $this->groupEndPrepare();
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Starts a query group for HAVING clause.
-	 *
-	 * @return $this
-	 */
-	public function havingGroupStart()
-	{
-		return $this->groupStartPrepare('', 'AND ', 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Starts a query group for HAVING clause, but ORs the group.
-	 *
-	 * @return $this
-	 */
-	public function orHavingGroupStart()
-	{
-		return $this->groupStartPrepare('', 'OR ', 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Starts a query group for HAVING clause, but NOTs the group.
-	 *
-	 * @return $this
-	 */
-	public function notHavingGroupStart()
-	{
-		return $this->groupStartPrepare('NOT ', 'AND ', 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Starts a query group for HAVING clause, but OR NOTs the group.
-	 *
-	 * @return $this
-	 */
-	public function orNotHavingGroupStart()
-	{
-		return $this->groupStartPrepare('NOT ', 'OR ', 'QBHaving');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Ends a query group for HAVING clause.
-	 *
-	 * @return $this
-	 */
-	public function havingGroupEnd()
-	{
-		return $this->groupEndPrepare('QBHaving');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepate a query group start.
-	 *
-	 * @param string $not
-	 * @param string $type
-	 * @param string $clause
-	 *
-	 * @return $this
-	 */
-	protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
-	{
-		$type = $this->groupGetType($type);
-
-		$this->QBWhereGroupStarted = true;
-		$prefix                    = empty($this->$clause) ? '' : $type;
-		$where                     = [
-			'condition' => $prefix . $not . str_repeat(' ', ++ $this->QBWhereGroupCount) . ' (',
-			'escape'    => false,
-		];
-
-		$this->{$clause}[] = $where;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepate a query group end.
-	 *
-	 * @param string $clause
-	 *
-	 * @return $this
-	 */
-	protected function groupEndPrepare(string $clause = 'QBWhere')
-	{
-		$this->QBWhereGroupStarted = false;
-		$where                     = [
-			'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',
-			'escape'    => false,
-		];
-
-		$this->{$clause}[] = $where;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Group_get_type
-	 *
-	 * @used-by groupStart()
-	 * @used-by _like()
-	 * @used-by whereHaving()
-	 * @used-by _whereIn()
-	 * @used-by havingGroupStart()
-	 *
-	 * @param string $type
-	 *
-	 * @return string
-	 */
-	protected function groupGetType(string $type): string
-	{
-		if ($this->QBWhereGroupStarted)
-		{
-			$type                      = '';
-			$this->QBWhereGroupStarted = false;
-		}
-
-		return $type;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * GROUP BY
-	 *
-	 * @param string|array $by
-	 * @param boolean      $escape
-	 *
-	 * @return $this
-	 */
-	public function groupBy($by, bool $escape = null)
-	{
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		if (is_string($by))
-		{
-			$by = ($escape === true) ? explode(',', $by) : [$by];
-		}
-
-		foreach ($by as $val)
-		{
-			$val = trim($val);
-
-			if ($val !== '')
-			{
-				$val = [
-					'field'  => $val,
-					'escape' => $escape,
-				];
-
-				$this->QBGroupBy[] = $val;
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * HAVING
-	 *
-	 * Separates multiple calls with 'AND'.
-	 *
-	 * @param string|array $key
-	 * @param mixed        $value
-	 * @param boolean      $escape
-	 *
-	 * @return $this
-	 */
-	public function having($key, $value = null, bool $escape = null)
-	{
-		return $this->whereHaving('QBHaving', $key, $value, 'AND ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * OR HAVING
-	 *
-	 * Separates multiple calls with 'OR'.
-	 *
-	 * @param string|array $key
-	 * @param mixed        $value
-	 * @param boolean      $escape
-	 *
-	 * @return $this
-	 */
-	public function orHaving($key, $value = null, bool $escape = null)
-	{
-		return $this->whereHaving('QBHaving', $key, $value, 'OR ', $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ORDER BY
-	 *
-	 * @param string  $orderBy
-	 * @param string  $direction ASC, DESC or RANDOM
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
-	{
-		$direction = strtoupper(trim($direction));
-
-		if ($direction === 'RANDOM')
-		{
-			$direction = '';
-
-			// Do we have a seed value?
-			$orderBy = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
-		}
-		elseif (empty($orderBy))
-		{
-			return $this;
-		}
-		elseif ($direction !== '')
-		{
-			$direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
-		}
-
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		if ($escape === false)
-		{
-			$qbOrderBy[] = [
-				'field'     => $orderBy,
-				'direction' => $direction,
-				'escape'    => false,
-			];
-		}
-		else
-		{
-			$qbOrderBy = [];
-			foreach (explode(',', $orderBy) as $field)
-			{
-				$qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
-					?
-					[
-						'field'     => ltrim(substr($field, 0, $match[0][1])),
-						'direction' => ' ' . $match[1][0],
-						'escape'    => true,
-					]
-					:
-					[
-						'field'     => trim($field),
-						'direction' => $direction,
-						'escape'    => true,
-					];
-			}
-		}
-
-		$this->QBOrderBy = array_merge($this->QBOrderBy, $qbOrderBy);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * LIMIT
-	 *
-	 * @param integer|null $value  LIMIT value
-	 * @param integer|null $offset OFFSET value
-	 *
-	 * @return $this
-	 */
-	public function limit(?int $value = null, ?int $offset = 0)
-	{
-		if (! is_null($value))
-		{
-			$this->QBLimit = $value;
-		}
-
-		if (! empty($offset))
-		{
-			$this->QBOffset = $offset;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the OFFSET value
-	 *
-	 * @param integer $offset OFFSET value
-	 *
-	 * @return $this
-	 */
-	public function offset(int $offset)
-	{
-		if (! empty($offset))
-		{
-			$this->QBOffset = (int) $offset;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * LIMIT string
-	 *
-	 * Generates a platform-specific LIMIT clause.
-	 *
-	 * @param string $sql SQL Query
-	 *
-	 * @return string
-	 */
-	protected function _limit(string $sql, bool $offsetIgnore = false): string
-	{
-		return $sql . ' LIMIT ' . (false === $offsetIgnore && $this->QBOffset ? $this->QBOffset . ', ' : '') . $this->QBLimit;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The "set" function.
-	 *
-	 * Allows key/value pairs to be set for insert(), update() or replace().
-	 *
-	 * @param string|array|object $key    Field name, or an array of field/value pairs
-	 * @param string              $value  Field value, if $key is a single field
-	 * @param boolean             $escape Whether to escape values and identifiers
-	 *
-	 * @return $this
-	 */
-	public function set($key, ?string $value = '', bool $escape = null)
-	{
-		$key = $this->objectToArray($key);
-
-		if (! is_array($key))
-		{
-			$key = [$key => $value];
-		}
-
-		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
-
-		foreach ($key as $k => $v)
-		{
-			if ($escape)
-			{
-				$bind                                                           = $this->setBind($k, $v, $escape);
-				$this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":$bind:";
-			}
-			else
-			{
-				$this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the previously set() data, alternatively resetting it
-	 * if needed.
-	 *
-	 * @param boolean $clean
-	 *
-	 * @return array
-	 */
-	public function getSetData(bool $clean = false): array
-	{
-		$data = $this->QBSet;
-
-		if ($clean)
-		{
-			$this->QBSet = [];
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get SELECT query string
-	 *
-	 * Compiles a SELECT query string and returns the sql.
-	 *
-	 * @param boolean $reset TRUE: resets QB values; FALSE: leave QB values alone
-	 *
-	 * @return string
-	 */
-	public function getCompiledSelect(bool $reset = true): string
-	{
-		$select = $this->compileSelect();
-
-		if ($reset === true)
-		{
-			$this->resetSelect();
-		}
-
-		return $this->compileFinalQuery($select);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a finalized, compiled query string with the bindings
-	 * inserted and prefixes swapped out.
-	 *
-	 * @param string $sql
-	 *
-	 * @return string
-	 */
-	protected function compileFinalQuery(string $sql): string
-	{
-		$query = new Query($this->db);
-		$query->setQuery($sql, $this->binds, false);
-
-		if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix))
-		{
-			$query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
-		}
-
-		return $query->getQuery();
-	}
-
-	/**
-	 * Get
-	 *
-	 * Compiles the select statement based on the other functions called
-	 * and runs the query
-	 *
-	 * @param integer $limit  The limit clause
-	 * @param integer $offset The offset clause
-	 * @param boolean $reset  Are we want to clear query builder values?
-	 *
-	 * @return ResultInterface|false
-	 */
-	public function get(int $limit = null, int $offset = 0, bool $reset = true)
-	{
-		if (! is_null($limit))
-		{
-			$this->limit($limit, $offset);
-		}
-
-		$result = $this->testMode
-			? $this->getCompiledSelect($reset)
-			: $this->db->query($this->compileSelect(), $this->binds, false);
-
-		if ($reset === true)
-		{
-			$this->resetSelect();
-
-			// Clear our binds so we don't eat up memory
-			$this->binds = [];
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * "Count All" query
-	 *
-	 * Generates a platform-specific query string that counts all records in
-	 * the particular table
-	 *
-	 * @param boolean $reset Are we want to clear query builder values?
-	 *
-	 * @return integer|string when $test = true
-	 */
-	public function countAll(bool $reset = true)
-	{
-		$table = $this->QBFrom[0];
-
-		$sql = $this->countString . $this->db->escapeIdentifiers('numrows') . ' FROM ' .
-				$this->db->protectIdentifiers($table, true, null, false);
-
-		if ($this->testMode)
-		{
-			return $sql;
-		}
-
-		$query = $this->db->query($sql, null, false);
-		if (empty($query->getResult()))
-		{
-			return 0;
-		}
-
-		$query = $query->getRow();
-
-		if ($reset === true)
-		{
-			$this->resetSelect();
-		}
-
-		return (int) $query->numrows;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * "Count All Results" query
-	 *
-	 * Generates a platform-specific query string that counts all records
-	 * returned by an Query Builder query.
-	 *
-	 * @param boolean $reset
-	 *
-	 * @return integer|string when $test = true
-	 */
-	public function countAllResults(bool $reset = true)
-	{
-		// ORDER BY usage is often problematic here (most notably
-		// on Microsoft SQL Server) and ultimately unnecessary
-		// for selecting COUNT(*) ...
-		$orderBy = [];
-		if (! empty($this->QBOrderBy))
-		{
-			$orderBy         = $this->QBOrderBy;
-			$this->QBOrderBy = null;
-		}
-
-		// We cannot use a LIMIT when getting the single row COUNT(*) result
-		$limit         = $this->QBLimit;
-		$this->QBLimit = false;
-
-		if ($this->QBDistinct === true || ! empty($this->QBGroupBy))
-		{
-			// We need to backup the original SELECT in case DBPrefix is used
-			$select = $this->QBSelect;
-			$sql    = $this->countString . $this->db->protectIdentifiers('numrows') . "\nFROM (\n" . $this->compileSelect() . "\n) CI_count_all_results";
-			// Restore SELECT part
-			$this->QBSelect = $select;
-			unset($select);
-		}
-		else
-		{
-			$sql = $this->compileSelect($this->countString . $this->db->protectIdentifiers('numrows'));
-		}
-
-		if ($this->testMode)
-		{
-			return $sql;
-		}
-
-		$result = $this->db->query($sql, $this->binds, false);
-
-		if ($reset === true)
-		{
-			$this->resetSelect();
-		}
-		// If we've previously reset the QBOrderBy values, get them back
-		elseif (! isset($this->QBOrderBy))
-		{
-			$this->QBOrderBy = $orderBy;
-		}
-
-		// Restore the LIMIT setting
-		$this->QBLimit = $limit;
-
-		$row = (! $result instanceof ResultInterface)
-			? null
-			: $result->getRow();
-
-		if (empty($row))
-		{
-			return 0;
-		}
-
-		return (int) $row->numrows;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get compiled 'where' condition string
-	 *
-	 * Compiles the set conditions and returns the sql statement
-	 *
-	 * @return array
-	 */
-	public function getCompiledQBWhere()
-	{
-		return $this->QBWhere;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Get_Where
-	 *
-	 * Allows the where clause, limit and offset to be added directly
-	 *
-	 * @param string|array $where  Where condition
-	 * @param integer      $limit  Limit value
-	 * @param integer      $offset Offset value
-	 * @param boolean      $reset  Are we want to clear query builder values?
-	 *
-	 * @return ResultInterface
-	 */
-	public function getWhere($where = null, int $limit = null, ?int $offset = 0, bool $reset = true)
-	{
-		if ($where !== null)
-		{
-			$this->where($where);
-		}
-
-		if (! empty($limit))
-		{
-			$this->limit($limit, $offset);
-		}
-
-		$result = $this->testMode
-			? $this->getCompiledSelect($reset)
-			: $this->db->query($this->compileSelect(), $this->binds, false);
-
-		if ($reset === true)
-		{
-			$this->resetSelect();
-
-			// Clear our binds so we don't eat up memory
-			$this->binds = [];
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert_Batch
-	 *
-	 * Compiles batch insert strings and runs the queries
-	 *
-	 * @param array   $set       An associative array of insert values
-	 * @param boolean $escape    Whether to escape values and identifiers
-	 * @param integer $batchSize Batch size
-	 *
-	 * @return integer|false Number of rows inserted or FALSE on failure
-	 * @throws DatabaseException
-	 */
-	public function insertBatch(array $set = null, bool $escape = null, int $batchSize = 100)
-	{
-		if ($set === null)
-		{
-			if (empty($this->QBSet))
-			{
-				if (CI_DEBUG)
-				{
-					throw new DatabaseException('You must use the "set" method to update an entry.');
-				}
-				// @codeCoverageIgnoreStart
-				return false;
-				// @codeCoverageIgnoreEnd
-			}
-		}
-		else
-		{
-			if (empty($set))
-			{
-				if (CI_DEBUG)
-				{
-					throw new DatabaseException('insertBatch() called with no data');
-				}
-
-				return false; // @codeCoverageIgnore
-			}
-
-			$this->setInsertBatch($set, '', $escape);
-		}
-
-		$table = $this->QBFrom[0];
-
-		// Batch this baby
-		$affectedRows = 0;
-		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
-		{
-			$sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
-
-			if ($this->testMode)
-			{
-				++$affectedRows;
-			}
-			else
-			{
-				$this->db->query($sql, $this->binds, false);
-				$affectedRows += $this->db->affectedRows();
-			}
-		}
-
-		if (! $this->testMode)
-		{
-			$this->resetWrite();
-		}
-
-		return $affectedRows;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert batch statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data.
-	 *
-	 * @param string $table  Table name
-	 * @param array  $keys   INSERT keys
-	 * @param array  $values INSERT values
-	 *
-	 * @return string
-	 */
-	protected function _insertBatch(string $table, array $keys, array $values): string
-	{
-		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The "setInsertBatch" function.  Allows key/value pairs to be set for batch inserts
-	 *
-	 * @param mixed   $key
-	 * @param string  $value
-	 * @param boolean $escape
-	 *
-	 * @return $this|null
-	 */
-	public function setInsertBatch($key, string $value = '', bool $escape = null)
-	{
-		$key = $this->batchObjectToArray($key);
-
-		if (! is_array($key))
-		{
-			$key = [$key => $value];
-		}
-
-		$escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
-
-		$keys = array_keys($this->objectToArray(current($key)));
-		sort($keys);
-
-		foreach ($key as $row)
-		{
-			$row = $this->objectToArray($row);
-			if (array_diff($keys, array_keys($row)) !== [] || array_diff(array_keys($row), $keys) !== [])
-			{
-				// batch function above returns an error on an empty array
-				$this->QBSet[] = [];
-
-				return null;
-			}
-
-			ksort($row); // puts $row in the same order as our keys
-
-			$clean = [];
-
-			foreach ($row as $k => $value)
-			{
-				$clean[] = ':' . $this->setBind($k, $value, $escape) . ':';
-			}
-
-			$row = $clean;
-
-			$this->QBSet[] = '(' . implode(',', $row) . ')';
-		}
-
-		foreach ($keys as $k)
-		{
-			$this->QBKeys[] = $this->db->protectIdentifiers($k, false, $escape);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get INSERT query string
-	 *
-	 * Compiles an insert query and returns the sql
-	 *
-	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return string|boolean
-	 */
-	public function getCompiledInsert(bool $reset = true)
-	{
-		if ($this->validateInsert() === false)
-		{
-			return false;
-		}
-
-		$sql = $this->_insert(
-				$this->db->protectIdentifiers(
-						$this->QBFrom[0], true, null, false
-				), array_keys($this->QBSet), array_values($this->QBSet)
-		);
-
-		if ($reset === true)
-		{
-			$this->resetWrite();
-		}
-
-		return $this->compileFinalQuery($sql);
-	}
-
-	/**
-	 * Insert
-	 *
-	 * Compiles an insert string and runs the query
-	 *
-	 * @param array   $set    An associative array of insert values
-	 * @param boolean $escape Whether to escape values and identifiers
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return Query|boolean
-	 */
-	public function insert(array $set = null, bool $escape = null)
-	{
-		if ($set !== null)
-		{
-			$this->set($set, '', $escape);
-		}
-
-		if ($this->validateInsert() === false)
-		{
-			return false;
-		}
-
-		$sql = $this->_insert(
-				$this->db->protectIdentifiers(
-						$this->QBFrom[0], true, $escape, false
-				), array_keys($this->QBSet), array_values($this->QBSet)
-		);
-
-		if (! $this->testMode)
-		{
-			$this->resetWrite();
-
-			$result = $this->db->query($sql, $this->binds, false);
-
-			// Clear our binds so we don't eat up memory
-			$this->binds = [];
-
-			return $result;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Validate Insert
-	 *
-	 * This method is used by both insert() and getCompiledInsert() to
-	 * validate that the there data is actually being set and that table
-	 * has been chosen to be inserted into.
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	protected function validateInsert(): bool
-	{
-		if (empty($this->QBSet))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must use the "set" method to update an entry.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data
-	 *
-	 * @param string $table         The table name
-	 * @param array  $keys          The insert keys
-	 * @param array  $unescapedKeys The insert values
-	 *
-	 * @return string
-	 */
-	protected function _insert(string $table, array $keys, array $unescapedKeys): string
-	{
-		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
-	}
-
-	/**
-	 * Replace
-	 *
-	 * Compiles an replace into string and runs the query
-	 *
-	 * @param array $set An associative array of insert values
-	 *
-	 * @return BaseResult|Query|string|false
-	 * @throws DatabaseException
-	 */
-	public function replace(array $set = null)
-	{
-		if ($set !== null)
-		{
-			$this->set($set);
-		}
-
-		if (empty($this->QBSet))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must use the "set" method to update an entry.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		$table = $this->QBFrom[0];
-
-		$sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
-
-		$this->resetWrite();
-
-		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replace statement
-	 *
-	 * Generates a platform-specific replace string from the supplied data
-	 *
-	 * @param string $table  The table name
-	 * @param array  $keys   The insert keys
-	 * @param array  $values The insert values
-	 *
-	 * @return string
-	 */
-	protected function _replace(string $table, array $keys, array $values): string
-	{
-		return 'REPLACE INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $values) . ')';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * FROM tables
-	 *
-	 * Groups tables in FROM clauses if needed, so there is no confusion
-	 * about operator precedence.
-	 *
-	 * Note: This is only used (and overridden) by MySQL and SQLSRV.
-	 *
-	 * @return string
-	 */
-	protected function _fromTables(): string
-	{
-		return implode(', ', $this->QBFrom);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get UPDATE query string
-	 *
-	 * Compiles an update query and returns the sql
-	 *
-	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
-	 *
-	 * @return string|boolean
-	 */
-	public function getCompiledUpdate(bool $reset = true)
-	{
-		if ($this->validateUpdate() === false)
-		{
-			return false;
-		}
-
-		$sql = $this->_update($this->QBFrom[0], $this->QBSet);
-
-		if ($reset === true)
-		{
-			$this->resetWrite();
-		}
-
-		return $this->compileFinalQuery($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * UPDATE
-	 *
-	 * Compiles an update string and runs the query.
-	 *
-	 * @param array   $set   An associative array of update values
-	 * @param mixed   $where
-	 * @param integer $limit
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return boolean    TRUE on success, FALSE on failure
-	 */
-	public function update(array $set = null, $where = null, int $limit = null): bool
-	{
-		if ($set !== null)
-		{
-			$this->set($set);
-		}
-
-		if ($this->validateUpdate() === false)
-		{
-			return false;
-		}
-
-		if ($where !== null)
-		{
-			$this->where($where);
-		}
-
-		if (! empty($limit))
-		{
-			if (! $this->canLimitWhereUpdates)
-			{
-				throw new DatabaseException('This driver does not allow LIMITs on UPDATE queries using WHERE.');
-			}
-
-			$this->limit($limit);
-		}
-
-		$sql = $this->_update($this->QBFrom[0], $this->QBSet);
-
-		if (! $this->testMode)
-		{
-			$this->resetWrite();
-
-			$result = $this->db->query($sql, $this->binds, false);
-
-			if ($result !== false)
-			{
-				// Clear our binds so we don't eat up memory
-				$this->binds = [];
-
-				return true;
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update statement
-	 *
-	 * Generates a platform-specific update string from the supplied data
-	 *
-	 * @param string $table  the Table name
-	 * @param array  $values the Update data
-	 *
-	 * @return string
-	 */
-	protected function _update(string $table, array $values): string
-	{
-		$valStr = [];
-
-		foreach ($values as $key => $val)
-		{
-			$valStr[] = $key . ' = ' . $val;
-		}
-
-		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
-				. $this->compileWhereHaving('QBWhere')
-				. $this->compileOrderBy()
-				. ($this->QBLimit ? $this->_limit(' ', true) : '');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Validate Update
-	 *
-	 * This method is used by both update() and getCompiledUpdate() to
-	 * validate that data is actually being set and that a table has been
-	 * chosen to be update.
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	protected function validateUpdate(): bool
-	{
-		if (empty($this->QBSet))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must use the "set" method to update an entry.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update_Batch
-	 *
-	 * Compiles an update string and runs the query
-	 *
-	 * @param array   $set       An associative array of update values
-	 * @param string  $index     The where key
-	 * @param integer $batchSize The size of the batch to run
-	 *
-	 * @return mixed    Number of rows affected, SQL string, or FALSE on failure
-	 * @throws DatabaseException
-	 */
-	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100)
-	{
-		if ($index === null)
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must specify an index to match on for batch updates.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		if ($set === null)
-		{
-			if (empty($this->QBSet))
-			{
-				if (CI_DEBUG)
-				{
-					throw new DatabaseException('You must use the "set" method to update an entry.');
-				}
-				// @codeCoverageIgnoreStart
-				return false;
-				// @codeCoverageIgnoreEnd
-			}
-		}
-		else
-		{
-			if (empty($set))
-			{
-				if (CI_DEBUG)
-				{
-					throw new DatabaseException('updateBatch() called with no data');
-				}
-				// @codeCoverageIgnoreStart
-				return false;
-				// @codeCoverageIgnoreEnd
-			}
-
-			$this->setUpdateBatch($set, $index);
-		}
-
-		$table = $this->QBFrom[0];
-
-		// Batch this baby
-		$affectedRows = 0;
-		$savedSQL     = [];
-		$savedQBWhere = $this->QBWhere;
-		for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize)
-		{
-			$sql = $this->_updateBatch($table, array_slice($this->QBSet, $i, $batchSize), $this->db->protectIdentifiers($index)
-			);
-
-			if ($this->testMode)
-			{
-				$savedSQL[] = $sql;
-			}
-			else
-			{
-				$this->db->query($sql, $this->binds, false);
-				$affectedRows += $this->db->affectedRows();
-			}
-
-			$this->QBWhere = $savedQBWhere;
-		}
-
-		$this->resetWrite();
-
-		return $this->testMode ? $savedSQL : $affectedRows;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update_Batch statement
-	 *
-	 * Generates a platform-specific batch update string from the supplied data
-	 *
-	 * @param string $table  Table name
-	 * @param array  $values Update data
-	 * @param string $index  WHERE key
-	 *
-	 * @return string
-	 */
-	protected function _updateBatch(string $table, array $values, string $index): string
-	{
-		$ids   = [];
-		$final = [];
-
-		foreach ($values as $val)
-		{
-			$ids[] = $val[$index];
-
-			foreach (array_keys($val) as $field)
-			{
-				if ($field !== $index)
-				{
-					$final[$field][] = 'WHEN ' . $index . ' = ' . $val[$index] . ' THEN ' . $val[$field];
-				}
-			}
-		}
-
-		$cases = '';
-		foreach ($final as $k => $v)
-		{
-			$cases .= $k . " = CASE \n"
-					. implode("\n", $v) . "\n"
-					. 'ELSE ' . $k . ' END, ';
-		}
-
-		$this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
-
-		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The "setUpdateBatch" function.  Allows key/value pairs to be set for batch updating
-	 *
-	 * @param array|object $key
-	 * @param string       $index
-	 * @param boolean      $escape
-	 *
-	 * @return $this|null
-	 * @throws DatabaseException
-	 */
-	public function setUpdateBatch($key, string $index = '', bool $escape = null)
-	{
-		$key = $this->batchObjectToArray($key);
-
-		if (! is_array($key))
-		{
-			return null;
-		}
-
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		foreach ($key as $v)
-		{
-			$indexSet = false;
-			$clean    = [];
-			foreach ($v as $k2 => $v2)
-			{
-				if ($k2 === $index)
-				{
-					$indexSet = true;
-				}
-
-				$bind = $this->setBind($k2, $v2, $escape);
-
-				$clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":$bind:";
-			}
-
-			if ($indexSet === false)
-			{
-				throw new DatabaseException('One or more rows submitted for batch updating is missing the specified index.');
-			}
-
-			$this->QBSet[] = $clean;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Empty Table
-	 *
-	 * Compiles a delete string and runs "DELETE FROM table"
-	 *
-	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
-	 */
-	public function emptyTable()
-	{
-		$table = $this->QBFrom[0];
-
-		$sql = $this->_delete($table);
-
-		if ($this->testMode)
-		{
-			return $sql;
-		}
-
-		$this->resetWrite();
-
-		return $this->db->query($sql, null, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncate
-	 *
-	 * Compiles a truncate string and runs the query
-	 * If the database does not support the truncate() command
-	 * This function maps to "DELETE FROM table"
-	 *
-	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
-	 */
-	public function truncate()
-	{
-		$table = $this->QBFrom[0];
-
-		$sql = $this->_truncate($table);
-
-		if ($this->testMode)
-		{
-			return $sql;
-		}
-
-		$this->resetWrite();
-
-		return $this->db->query($sql, null, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncate statement
-	 *
-	 * Generates a platform-specific truncate string from the supplied data
-	 *
-	 * If the database does not support the truncate() command,
-	 * then this method maps to 'DELETE FROM table'
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _truncate(string $table): string
-	{
-		return 'TRUNCATE ' . $table;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get DELETE query string
-	 *
-	 * Compiles a delete query string and returns the sql
-	 *
-	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
-	 *
-	 * @return string
-	 */
-	public function getCompiledDelete(bool $reset = true): string
-	{
-		$sql = $this->testMode()->delete('', null, $reset);
-		$this->testMode(false);
-
-		return $this->compileFinalQuery($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete
-	 *
-	 * Compiles a delete string and runs the query
-	 *
-	 * @param mixed   $where     The where clause
-	 * @param integer $limit     The limit clause
-	 * @param boolean $resetData
-	 *
-	 * @return string|boolean
-	 * @throws DatabaseException
-	 */
-	public function delete($where = '', int $limit = null, bool $resetData = true)
-	{
-		$table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
-
-		if ($where !== '')
-		{
-			$this->where($where);
-		}
-
-		if (empty($this->QBWhere))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		$sql = $this->_delete($table);
-
-		if (! empty($limit))
-		{
-			$this->QBLimit = $limit;
-		}
-
-		if (! empty($this->QBLimit))
-		{
-			if (! $this->canLimitDeletes)
-			{
-				throw new DatabaseException('SQLite3 does not allow LIMITs on DELETE queries.');
-			}
-
-			$sql = $this->_limit($sql, true);
-		}
-
-		if ($resetData)
-		{
-			$this->resetWrite();
-		}
-
-		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Increments a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @return boolean
-	 */
-	public function increment(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		$sql = $this->_update($this->QBFrom[0], [$column => "{$column} + {$value}"]);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Decrements a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @return boolean
-	 */
-	public function decrement(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		$sql = $this->_update($this->QBFrom[0], [$column => "{$column}-{$value}"]);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete statement
-	 *
-	 * Generates a platform-specific delete string from the supplied data
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _delete(string $table): string
-	{
-		return 'DELETE ' . $this->compileIgnore('delete') . 'FROM ' . $table . $this->compileWhereHaving('QBWhere');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Track Aliases
-	 *
-	 * Used to track SQL statements written with aliased tables.
-	 *
-	 * @param string|array $table The table to inspect
-	 *
-	 * @return string|void
-	 */
-	protected function trackAliases($table)
-	{
-		if (is_array($table))
-		{
-			foreach ($table as $t)
-			{
-				$this->trackAliases($t);
-			}
-			return;
-		}
-
-		// Does the string contain a comma?  If so, we need to separate
-		// the string into discreet statements
-		if (strpos($table, ',') !== false)
-		{
-			return $this->trackAliases(explode(',', $table));
-		}
-
-		// if a table alias is used we can recognize it by a space
-		if (strpos($table, ' ') !== false)
-		{
-			// if the alias is written with the AS keyword, remove it
-			$table = preg_replace('/\s+AS\s+/i', ' ', $table);
-
-			// Grab the alias
-			$table = trim(strrchr($table, ' '));
-
-			// Store the alias, if it doesn't already exist
-			$this->db->addTableAlias($table);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile the SELECT statement
-	 *
-	 * Generates a query string based on which functions were used.
-	 * Should not be called directly.
-	 *
-	 * @param mixed $selectOverride
-	 *
-	 * @return string
-	 */
-	protected function compileSelect($selectOverride = false): string
-	{
-		// Write the "select" portion of the query
-		if ($selectOverride !== false)
-		{
-			$sql = $selectOverride;
-		}
-		else
-		{
-			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
-
-			if (empty($this->QBSelect))
-			{
-				$sql .= '*';
-			}
-			else
-			{
-				// Cycle through the "select" portion of the query and prep each column name.
-				// The reason we protect identifiers here rather than in the select() function
-				// is because until the user calls the from() function we don't know if there are aliases
-				foreach ($this->QBSelect as $key => $val)
-				{
-					$noEscape             = $this->QBNoEscape[$key] ?? null;
-					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
-				}
-
-				$sql .= implode(', ', $this->QBSelect);
-			}
-		}
-
-		// Write the "FROM" portion of the query
-		if (! empty($this->QBFrom))
-		{
-			$sql .= "\nFROM " . $this->_fromTables();
-		}
-
-		// Write the "JOIN" portion of the query
-		if (! empty($this->QBJoin))
-		{
-			$sql .= "\n" . implode("\n", $this->QBJoin);
-		}
-
-		$sql .= $this->compileWhereHaving('QBWhere')
-				. $this->compileGroupBy()
-				. $this->compileWhereHaving('QBHaving')
-				. $this->compileOrderBy(); // ORDER BY
-		// LIMIT
-		if ($this->QBLimit)
-		{
-			return $this->_limit($sql . "\n");
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile Ignore Statement
-	 *
-	 * Checks if the ignore option is supported by
-	 * the Database Driver for the specific statement.
-	 *
-	 * @param string $statement
-	 *
-	 * @return string
-	 */
-	protected function compileIgnore(string $statement)
-	{
-		if ($this->QBIgnore &&
-			isset($this->supportedIgnoreStatements[$statement])
-		)
-		{
-			return trim($this->supportedIgnoreStatements[$statement]) . ' ';
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile WHERE, HAVING statements
-	 *
-	 * Escapes identifiers in WHERE and HAVING statements at execution time.
-	 *
-	 * Required so that aliases are tracked properly, regardless of whether
-	 * where(), orWhere(), having(), orHaving are called prior to from(),
-	 * join() and prefixTable is added only if needed.
-	 *
-	 * @param string $qbKey 'QBWhere' or 'QBHaving'
-	 *
-	 * @return string    SQL statement
-	 */
-	protected function compileWhereHaving(string $qbKey): string
-	{
-		if (! empty($this->$qbKey))
-		{
-			foreach ($this->$qbKey as &$qbkey)
-			{
-				// Is this condition already compiled?
-				if (is_string($qbkey))
-				{
-					continue;
-				}
-
-				if ($qbkey['escape'] === false)
-				{
-					$qbkey = $qbkey['condition'];
-					continue;
-				}
-
-				// Split multiple conditions
-				$conditions = preg_split(
-						'/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i', $qbkey['condition'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
-				);
-
-				foreach ($conditions as &$condition)
-				{
-					if (($op = $this->getOperator($condition)) === false
-							|| ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
-					)
-					{
-						continue;
-					}
-					// $matches = array(
-					//	0 => '(test <= foo)',	/* the whole thing */
-					//	1 => '(',		/* optional */
-					//	2 => 'test',		/* the field name */
-					//	3 => ' <= ',		/* $op */
-					//	4 => 'foo',		/* optional, if $op is e.g. 'IS NULL' */
-					//	5 => ')'		/* optional */
-					// );
-
-					if (! empty($matches[4]))
-					{
-						$protectIdentifiers = false;
-						if (strpos($matches[4], '.') !== false)
-						{
-							$protectIdentifiers = true;
-						}
-
-						if (strpos($matches[4], ':') === false)
-						{
-							$matches[4] = $this->db->protectIdentifiers(trim($matches[4]), false, $protectIdentifiers);
-						}
-
-						$matches[4] = ' ' . $matches[4];
-					}
-
-					$condition = $matches[1] . $this->db->protectIdentifiers(trim($matches[2]))
-							. ' ' . trim($matches[3]) . $matches[4] . $matches[5];
-				}
-
-				$qbkey = implode('', $conditions);
-			}
-
-			return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
-					. implode("\n", $this->$qbKey);
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile GROUP BY
-	 *
-	 * Escapes identifiers in GROUP BY statements at execution time.
-	 *
-	 * Required so that aliases are tracked properly, regardless of whether
-	 * groupBy() is called prior to from(), join() and prefixTable is added
-	 * only if needed.
-	 *
-	 * @return string    SQL statement
-	 */
-	protected function compileGroupBy(): string
-	{
-		if (! empty($this->QBGroupBy))
-		{
-			foreach ($this->QBGroupBy as &$groupBy)
-			{
-				// Is it already compiled?
-				if (is_string($groupBy))
-				{
-					continue;
-				}
-
-				$groupBy = ($groupBy['escape'] === false || $this->isLiteral($groupBy['field']))
-					? $groupBy['field']
-					: $this->db->protectIdentifiers($groupBy['field']);
-			}
-
-			return "\nGROUP BY " . implode(', ', $this->QBGroupBy);
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile ORDER BY
-	 *
-	 * Escapes identifiers in ORDER BY statements at execution time.
-	 *
-	 * Required so that aliases are tracked properly, regardless of whether
-	 * orderBy() is called prior to from(), join() and prefixTable is added
-	 * only if needed.
-	 *
-	 * @return string    SQL statement
-	 */
-	protected function compileOrderBy(): string
-	{
-		if (is_array($this->QBOrderBy) && ! empty($this->QBOrderBy))
-		{
-			foreach ($this->QBOrderBy as &$orderBy)
-			{
-				if ($orderBy['escape'] !== false && ! $this->isLiteral($orderBy['field']))
-				{
-					$orderBy['field'] = $this->db->protectIdentifiers($orderBy['field']);
-				}
-
-				$orderBy = $orderBy['field'] . $orderBy['direction'];
-			}
-
-			return $this->QBOrderBy = "\nORDER BY " . implode(', ', $this->QBOrderBy);
-		}
-
-		if (is_string($this->QBOrderBy))
-		{
-			return $this->QBOrderBy;
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Object to Array
-	 *
-	 * Takes an object as input and converts the class variables to array key/vals
-	 *
-	 * @param mixed $object
-	 *
-	 * @return mixed
-	 */
-	protected function objectToArray($object)
-	{
-		if (! is_object($object))
-		{
-			return $object;
-		}
-
-		$array = [];
-		foreach (get_object_vars($object) as $key => $val)
-		{
-			// There are some built in keys we need to ignore for this conversion
-			if (! is_object($val) && ! is_array($val) && $key !== '_parent_name')
-			{
-				$array[$key] = $val;
-			}
-		}
-
-		return $array;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Object to Array
-	 *
-	 * Takes an object as input and converts the class variables to array key/vals
-	 *
-	 * @param mixed $object
-	 *
-	 * @return mixed
-	 */
-	protected function batchObjectToArray($object)
-	{
-		if (! is_object($object))
-		{
-			return $object;
-		}
-
-		$array  = [];
-		$out    = get_object_vars($object);
-		$fields = array_keys($out);
-
-		foreach ($fields as $val)
-		{
-			// There are some built in keys we need to ignore for this conversion
-			if ($val !== '_parent_name')
-			{
-				$i = 0;
-				foreach ($out[$val] as $data)
-				{
-					$array[$i++][$val] = $data;
-				}
-			}
-		}
-
-		return $array;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Is literal
-	 *
-	 * Determines if a string represents a literal value or a field name
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	protected function isLiteral(string $str): bool
-	{
-		$str = trim($str);
-
-		if (empty($str)
-			|| ctype_digit($str)
-			|| (string) (float) $str === $str
-			|| in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
-		)
-		{
-			return true;
-		}
-
-		static $_str;
-
-		if (empty($_str))
-		{
-			$_str = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
-		}
-
-		return in_array($str[0], $_str, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset Query Builder values.
-	 *
-	 * Publicly-visible method to reset the QB values.
-	 *
-	 * @return $this
-	 */
-	public function resetQuery()
-	{
-		$this->resetSelect();
-		$this->resetWrite();
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resets the query builder values.  Called by the get() function
-	 *
-	 * @param array $qbResetItems An array of fields to reset
-	 *
-	 * @return void
-	 */
-	protected function resetRun(array $qbResetItems)
-	{
-		foreach ($qbResetItems as $item => $defaultValue)
-		{
-			$this->$item = $defaultValue;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resets the query builder values.  Called by the get() function
-	 */
-	protected function resetSelect()
-	{
-		$this->resetRun([
-			'QBSelect'   => [],
-			'QBJoin'     => [],
-			'QBWhere'    => [],
-			'QBGroupBy'  => [],
-			'QBHaving'   => [],
-			'QBOrderBy'  => [],
-			'QBNoEscape' => [],
-			'QBDistinct' => false,
-			'QBLimit'    => false,
-			'QBOffset'   => false,
-		]);
-
-		if (! empty($this->db))
-		{
-			$this->db->setAliasedTables([]);
-		}
-
-		// Reset QBFrom part
-		if (! empty($this->QBFrom))
-		{
-			$this->from(array_shift($this->QBFrom), true);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resets the query builder "write" values.
-	 *
-	 * Called by the insert() update() insertBatch() updateBatch() and delete() functions
-	 */
-	protected function resetWrite()
-	{
-		$this->resetRun([
-			'QBSet'     => [],
-			'QBJoin'    => [],
-			'QBWhere'   => [],
-			'QBOrderBy' => [],
-			'QBKeys'    => [],
-			'QBLimit'   => false,
-			'QBIgnore'  => false,
-		]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tests whether the string has an SQL operator
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	protected function hasOperator(string $str): bool
-	{
-		return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Returns the SQL string operator
-	 *
-	 * @param string  $str
-	 * @param boolean $list
-	 *
-	 * @return mixed
-	 */
-	protected function getOperator(string $str, bool $list = false)
-	{
-		static $_operators;
-
-		if (empty($_operators))
-		{
-			$_les       = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
-			$_operators = [
-				'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
-				'\s*<>?\s*', // <, <>
-				'\s*>\s*', // >
-				'\s+IS NULL', // IS NULL
-				'\s+IS NOT NULL', // IS NOT NULL
-				'\s+EXISTS\s*\(.*\)', // EXISTS(sql)
-				'\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql)
-				'\s+BETWEEN\s+', // BETWEEN value AND value
-				'\s+IN\s*\(.*\)', // IN(list)
-				'\s+NOT IN\s*\(.*\)', // NOT IN (list)
-				'\s+LIKE\s+\S.*(' . $_les . ')?', // LIKE 'expr'[ ESCAPE '%s']
-				'\s+NOT LIKE\s+\S.*(' . $_les . ')?', // NOT LIKE 'expr'[ ESCAPE '%s']
-			];
-		}
-
-		return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Stores a bind value after ensuring that it's unique.
-	 * While it might be nicer to have named keys for our binds array
-	 * with PHP 7+ we get a huge memory/performance gain with indexed
-	 * arrays instead, so lets take advantage of that here.
-	 *
-	 * @param string  $key
-	 * @param mixed   $value
-	 * @param boolean $escape
-	 *
-	 * @return string
-	 */
-	protected function setBind(string $key, $value = null, bool $escape = true): string
-	{
-		if (! array_key_exists($key, $this->binds))
-		{
-			$this->binds[$key] = [
-				$value,
-				$escape,
-			];
-
-			return $key;
-		}
-
-		if (! array_key_exists($key, $this->bindsKeyCount))
-		{
-			$this->bindsKeyCount[$key] = 1;
-		}
-
-		$count = $this->bindsKeyCount[$key]++;
-
-		$this->binds[$key . '.' . $count] = [
-			$value,
-			$escape,
-		];
-
-		return $key . '.' . $count;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a clone of a Base Builder with reset query builder values.
-	 *
-	 * @return $this
-	 */
-	protected function cleanClone()
-	{
-		return (clone $this)->from([], true)->resetQuery();
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Reset DELETE data flag
+     *
+     * @var bool
+     */
+    protected $resetDeleteData = false;
+
+    /**
+     * QB SELECT data
+     *
+     * @var array
+     */
+    protected $QBSelect = [];
+
+    /**
+     * QB DISTINCT flag
+     *
+     * @var bool
+     */
+    protected $QBDistinct = false;
+
+    /**
+     * QB FROM data
+     *
+     * @var array
+     */
+    protected $QBFrom = [];
+
+    /**
+     * QB JOIN data
+     *
+     * @var array
+     */
+    protected $QBJoin = [];
+
+    /**
+     * QB WHERE data
+     *
+     * @var array
+     */
+    protected $QBWhere = [];
+
+    /**
+     * QB GROUP BY data
+     *
+     * @var array
+     */
+    public $QBGroupBy = [];
+
+    /**
+     * QB HAVING data
+     *
+     * @var array
+     */
+    protected $QBHaving = [];
+
+    /**
+     * QB keys
+     *
+     * @var array
+     */
+    protected $QBKeys = [];
+
+    /**
+     * QB LIMIT data
+     *
+     * @var bool|int
+     */
+    protected $QBLimit = false;
+
+    /**
+     * QB OFFSET data
+     *
+     * @var bool|int
+     */
+    protected $QBOffset = false;
+
+    /**
+     * QB ORDER BY data
+     *
+     * @var array|string|null
+     */
+    public $QBOrderBy = [];
+
+    /**
+     * QB NO ESCAPE data
+     *
+     * @var array
+     */
+    public $QBNoEscape = [];
+
+    /**
+     * QB data sets
+     *
+     * @var array
+     */
+    protected $QBSet = [];
+
+    /**
+     * QB WHERE group started flag
+     *
+     * @var bool
+     */
+    protected $QBWhereGroupStarted = false;
+
+    /**
+     * QB WHERE group count
+     *
+     * @var int
+     */
+    protected $QBWhereGroupCount = 0;
+
+    /**
+     * Ignore data that cause certain
+     * exceptions, for example in case of
+     * duplicate keys.
+     *
+     * @var bool
+     */
+    protected $QBIgnore = false;
+
+    /**
+     * A reference to the database connection.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * Name of the primary table for this instance.
+     * Tracked separately because $QBFrom gets escaped
+     * and prefixed.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * ORDER BY random keyword
+     *
+     * @var array
+     */
+    protected $randomKeyword = [
+        'RAND()',
+        'RAND(%d)',
+    ];
+
+    /**
+     * COUNT string
+     *
+     * @used-by CI_DB_driver::count_all()
+     * @used-by BaseBuilder::count_all_results()
+     *
+     * @var string
+     */
+    protected $countString = 'SELECT COUNT(*) AS ';
+
+    /**
+     * Collects the named parameters and
+     * their values for later binding
+     * in the Query object.
+     *
+     * @var array
+     */
+    protected $binds = [];
+
+    /**
+     * Collects the key count for named parameters
+     * in the Query object.
+     *
+     * @var array
+     */
+    protected $bindsKeyCount = [];
+
+    /**
+     * Some databases, like SQLite, do not by default
+     * allow limiting of delete clauses.
+     *
+     * @var bool
+     */
+    protected $canLimitDeletes = true;
+
+    /**
+     * Some databases do not by default
+     * allow limit update queries with WHERE.
+     *
+     * @var bool
+     */
+    protected $canLimitWhereUpdates = true;
+
+    /**
+     * Specifies which sql statements
+     * support the ignore option.
+     *
+     * @var array
+     */
+    protected $supportedIgnoreStatements = [];
+
+    /**
+     * Builder testing mode status.
+     *
+     * @var bool
+     */
+    protected $testMode = false;
+
+    /**
+     * Tables relation types
+     *
+     * @var array
+     */
+    protected $joinTypes = [
+        'LEFT',
+        'RIGHT',
+        'OUTER',
+        'INNER',
+        'LEFT OUTER',
+        'RIGHT OUTER',
+    ];
+
+    /**
+     * Constructor
+     *
+     * @param array|string $tableName
+     *
+     * @throws DatabaseException
+     */
+    public function __construct($tableName, ConnectionInterface &$db, ?array $options = null)
+    {
+        if (empty($tableName)) {
+            throw new DatabaseException('A table must be specified when creating a new Query Builder.');
+        }
+
+        /**
+         * @var BaseConnection $db
+         */
+        $this->db = $db;
+
+        $this->tableName = $tableName;
+        $this->from($tableName);
+
+        if (! empty($options)) {
+            foreach ($options as $key => $value) {
+                if (property_exists($this, $key)) {
+                    $this->{$key} = $value;
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the current database connection
+     *
+     * @return BaseConnection|ConnectionInterface
+     */
+    public function db(): ConnectionInterface
+    {
+        return $this->db;
+    }
+
+    /**
+     * Sets a test mode status.
+     *
+     * @return $this
+     */
+    public function testMode(bool $mode = true)
+    {
+        $this->testMode = $mode;
+
+        return $this;
+    }
+
+    /**
+     * Gets the name of the primary table.
+     */
+    public function getTable(): string
+    {
+        return $this->tableName;
+    }
+
+    /**
+     * Returns an array of bind values and their
+     * named parameters for binding in the Query object later.
+     */
+    public function getBinds(): array
+    {
+        return $this->binds;
+    }
+
+    /**
+     * Ignore
+     *
+     * Set ignore Flag for next insert,
+     * update or delete query.
+     *
+     * @return $this
+     */
+    public function ignore(bool $ignore = true)
+    {
+        $this->QBIgnore = $ignore;
+
+        return $this;
+    }
+
+    /**
+     * Generates the SELECT portion of the query
+     *
+     * @param array|string $select
+     *
+     * @return $this
+     */
+    public function select($select = '*', ?bool $escape = null)
+    {
+        if (is_string($select)) {
+            $select = explode(',', $select);
+        }
+
+        // If the escape value was not set, we will base it on the global setting
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        foreach ($select as $val) {
+            $val = trim($val);
+
+            if ($val !== '') {
+                $this->QBSelect[] = $val;
+
+                /*
+                 * When doing 'SELECT NULL as field_alias FROM table'
+                 * null gets taken as a field, and therefore escaped
+                 * with backticks.
+                 * This prevents NULL being escaped
+                 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1169
+                 */
+                if (mb_stripos(trim($val), 'NULL') === 0) {
+                    $escape = false;
+                }
+
+                $this->QBNoEscape[] = $escape;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Generates a SELECT MAX(field) portion of a query
+     *
+     * @return $this
+     */
+    public function selectMax(string $select = '', string $alias = '')
+    {
+        return $this->maxMinAvgSum($select, $alias);
+    }
+
+    /**
+     * Generates a SELECT MIN(field) portion of a query
+     *
+     * @return $this
+     */
+    public function selectMin(string $select = '', string $alias = '')
+    {
+        return $this->maxMinAvgSum($select, $alias, 'MIN');
+    }
+
+    /**
+     * Generates a SELECT AVG(field) portion of a query
+     *
+     * @return $this
+     */
+    public function selectAvg(string $select = '', string $alias = '')
+    {
+        return $this->maxMinAvgSum($select, $alias, 'AVG');
+    }
+
+    /**
+     * Generates a SELECT SUM(field) portion of a query
+     *
+     * @return $this
+     */
+    public function selectSum(string $select = '', string $alias = '')
+    {
+        return $this->maxMinAvgSum($select, $alias, 'SUM');
+    }
+
+    /**
+     * Generates a SELECT COUNT(field) portion of a query
+     *
+     * @return $this
+     */
+    public function selectCount(string $select = '', string $alias = '')
+    {
+        return $this->maxMinAvgSum($select, $alias, 'COUNT');
+    }
+
+    /**
+     * SELECT [MAX|MIN|AVG|SUM|COUNT]()
+     *
+     * @used-by selectMax()
+     * @used-by selectMin()
+     * @used-by selectAvg()
+     * @used-by selectSum()
+     *
+     * @throws DatabaseException
+     * @throws DataException
+     *
+     * @return $this
+     */
+    protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
+    {
+        if ($select === '') {
+            throw DataException::forEmptyInputGiven('Select');
+        }
+
+        if (strpos($select, ',') !== false) {
+            throw DataException::forInvalidArgument('column name not separated by comma');
+        }
+
+        $type = strtoupper($type);
+
+        if (! in_array($type, ['MAX', 'MIN', 'AVG', 'SUM', 'COUNT'], true)) {
+            throw new DatabaseException('Invalid function type: ' . $type);
+        }
+
+        if ($alias === '') {
+            $alias = $this->createAliasFromTable(trim($select));
+        }
+
+        $sql = $type . '(' . $this->db->protectIdentifiers(trim($select)) . ') AS ' . $this->db->escapeIdentifiers(trim($alias));
+
+        $this->QBSelect[]   = $sql;
+        $this->QBNoEscape[] = null;
+
+        return $this;
+    }
+
+    /**
+     * Determines the alias name based on the table
+     */
+    protected function createAliasFromTable(string $item): string
+    {
+        if (strpos($item, '.') !== false) {
+            $item = explode('.', $item);
+
+            return end($item);
+        }
+
+        return $item;
+    }
+
+    /**
+     * Sets a flag which tells the query string compiler to add DISTINCT
+     *
+     * @return $this
+     */
+    public function distinct(bool $val = true)
+    {
+        $this->QBDistinct = $val;
+
+        return $this;
+    }
+
+    /**
+     * Generates the FROM portion of the query
+     *
+     * @param array|string $from
+     *
+     * @return $this
+     */
+    public function from($from, bool $overwrite = false)
+    {
+        if ($overwrite === true) {
+            $this->QBFrom = [];
+            $this->db->setAliasedTables([]);
+        }
+
+        foreach ((array) $from as $val) {
+            if (strpos($val, ',') !== false) {
+                foreach (explode(',', $val) as $v) {
+                    $v = trim($v);
+                    $this->trackAliases($v);
+
+                    $this->QBFrom[] = $this->db->protectIdentifiers($v, true, null, false);
+                }
+            } else {
+                $val = trim($val);
+
+                // Extract any aliases that might exist. We use this information
+                // in the protectIdentifiers to know whether to add a table prefix
+                $this->trackAliases($val);
+
+                $this->QBFrom[] = $this->db->protectIdentifiers($val, true, null, false);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Generates the JOIN portion of the query
+     *
+     * @return $this
+     */
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    {
+        if ($type !== '') {
+            $type = strtoupper(trim($type));
+
+            if (! in_array($type, $this->joinTypes, true)) {
+                $type = '';
+            } else {
+                $type .= ' ';
+            }
+        }
+
+        // Extract any aliases that might exist. We use this information
+        // in the protectIdentifiers to know whether to add a table prefix
+        $this->trackAliases($table);
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        if (! $this->hasOperator($cond)) {
+            $cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
+        } elseif ($escape === false) {
+            $cond = ' ON ' . $cond;
+        } else {
+            // Split multiple conditions
+            if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE)) {
+                $conditions = [];
+                $joints     = $joints[0];
+                array_unshift($joints, ['', 0]);
+
+                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
+                    $joints[$i][1] += strlen($joints[$i][0]); // offset
+                    $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
+                    $pos            = $joints[$i][1] - strlen($joints[$i][0]);
+                    $joints[$i]     = $joints[$i][0];
+                }
+                ksort($conditions);
+            } else {
+                $conditions = [$cond];
+                $joints     = [''];
+            }
+
+            $cond = ' ON ';
+
+            foreach ($conditions as $i => $condition) {
+                $operator = $this->getOperator($condition);
+
+                $cond .= $joints[$i];
+                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+            }
+        }
+
+        // Do we want to escape the table name?
+        if ($escape === true) {
+            $table = $this->db->protectIdentifiers($table, true, null, false);
+        }
+
+        // Assemble the JOIN statement
+        $this->QBJoin[] = $type . 'JOIN ' . $table . $cond;
+
+        return $this;
+    }
+
+    /**
+     * Generates the WHERE portion of the query.
+     * Separates multiple calls with 'AND'.
+     *
+     * @param mixed $key
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function where($key, $value = null, ?bool $escape = null)
+    {
+        return $this->whereHaving('QBWhere', $key, $value, 'AND ', $escape);
+    }
+
+    /**
+     * OR WHERE
+     *
+     * Generates the WHERE portion of the query.
+     * Separates multiple calls with 'OR'.
+     *
+     * @param mixed $key
+     * @param mixed $value
+     * @param bool  $escape
+     *
+     * @return $this
+     */
+    public function orWhere($key, $value = null, ?bool $escape = null)
+    {
+        return $this->whereHaving('QBWhere', $key, $value, 'OR ', $escape);
+    }
+
+    /**
+     * @used-by where()
+     * @used-by orWhere()
+     * @used-by having()
+     * @used-by orHaving()
+     *
+     * @param mixed $key
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
+    {
+        if (! is_array($key)) {
+            $key = [$key => $value];
+        }
+
+        // If the escape value was not set will base it on the global setting
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        foreach ($key as $k => $v) {
+            $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
+
+            if ($v !== null) {
+                $op = $this->getOperator($k, true);
+
+                if (! empty($op)) {
+                    $k = trim($k);
+
+                    end($op);
+
+                    $op = trim(current($op));
+
+                    if (substr($k, -1 * strlen($op)) === $op) {
+                        $k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
+                    }
+                }
+
+                $bind = $this->setBind($k, $v, $escape);
+
+                if (empty($op)) {
+                    $k .= ' =';
+                } else {
+                    $k .= " {$op}";
+                }
+
+                if ($v instanceof Closure) {
+                    $builder = $this->cleanClone();
+                    $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+                } else {
+                    $v = " :{$bind}:";
+                }
+            } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
+                // value appears not to have been set, assign the test to IS NULL
+                $k .= ' IS NULL';
+            } elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) {
+                $k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
+            }
+
+            $this->{$qbKey}[] = [
+                'condition' => $prefix . $k . $v,
+                'escape'    => $escape,
+            ];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Generates a WHERE field IN('item', 'item') SQL query,
+     * joined with 'AND' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function whereIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, false, 'AND ', $escape);
+    }
+
+    /**
+     * Generates a WHERE field IN('item', 'item') SQL query,
+     * joined with 'OR' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function orWhereIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, false, 'OR ', $escape);
+    }
+
+    /**
+     * Generates a WHERE field NOT IN('item', 'item') SQL query,
+     * joined with 'AND' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function whereNotIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, true, 'AND ', $escape);
+    }
+
+    /**
+     * Generates a WHERE field NOT IN('item', 'item') SQL query,
+     * joined with 'OR' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, true, 'OR ', $escape);
+    }
+
+    /**
+     * Generates a HAVING field IN('item', 'item') SQL query,
+     * joined with 'AND' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function havingIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, false, 'AND ', $escape, 'QBHaving');
+    }
+
+    /**
+     * Generates a HAVING field IN('item', 'item') SQL query,
+     * joined with 'OR' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function orHavingIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, false, 'OR ', $escape, 'QBHaving');
+    }
+
+    /**
+     * Generates a HAVING field NOT IN('item', 'item') SQL query,
+     * joined with 'AND' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function havingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, true, 'AND ', $escape, 'QBHaving');
+    }
+
+    /**
+     * Generates a HAVING field NOT IN('item', 'item') SQL query,
+     * joined with 'OR' if appropriate.
+     *
+     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     *
+     * @return $this
+     */
+    public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+    {
+        return $this->_whereIn($key, $values, true, 'OR ', $escape, 'QBHaving');
+    }
+
+    /**
+     * @used-by WhereIn()
+     * @used-by orWhereIn()
+     * @used-by whereNotIn()
+     * @used-by orWhereNotIn()
+     *
+     * @param array|Closure|null $values The values searched on, or anonymous function with subquery
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return $this
+     */
+    protected function _whereIn(?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null, string $clause = 'QBWhere')
+    {
+        if (empty($key) || ! is_string($key)) {
+            if (CI_DEBUG) {
+                throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
+            }
+
+            return $this; // @codeCoverageIgnore
+        }
+
+        if ($values === null || (! is_array($values) && ! ($values instanceof Closure))) {
+            if (CI_DEBUG) {
+                throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
+            }
+
+            return $this; // @codeCoverageIgnore
+        }
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        $ok = $key;
+
+        if ($escape === true) {
+            $key = $this->db->protectIdentifiers($key);
+        }
+
+        $not = ($not) ? ' NOT' : '';
+
+        if ($values instanceof Closure) {
+            $builder = $this->cleanClone();
+            $ok      = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
+        } else {
+            $whereIn = array_values($values);
+            $ok      = $this->setBind($ok, $whereIn, $escape);
+        }
+
+        $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
+
+        $whereIn = [
+            'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ({$ok})" : " IN :{$ok}:"),
+            'escape'    => false,
+        ];
+
+        $this->{$clause}[] = $whereIn;
+
+        return $this;
+    }
+
+    /**
+     * Generates a %LIKE% portion of the query.
+     * Separates multiple calls with 'AND'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function like($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch);
+    }
+
+    /**
+     * Generates a NOT LIKE portion of the query.
+     * Separates multiple calls with 'AND'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function notLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch);
+    }
+
+    /**
+     * Generates a %LIKE% portion of the query.
+     * Separates multiple calls with 'OR'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function orLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch);
+    }
+
+    /**
+     * Generates a NOT LIKE portion of the query.
+     * Separates multiple calls with 'OR'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function orNotLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch);
+    }
+
+    /**
+     * Generates a %LIKE% portion of the query.
+     * Separates multiple calls with 'AND'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function havingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
+    }
+
+    /**
+     * Generates a NOT LIKE portion of the query.
+     * Separates multiple calls with 'AND'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function notHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
+    }
+
+    /**
+     * Generates a %LIKE% portion of the query.
+     * Separates multiple calls with 'OR'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function orHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
+    }
+
+    /**
+     * Generates a NOT LIKE portion of the query.
+     * Separates multiple calls with 'OR'.
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    public function orNotHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+    {
+        return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
+    }
+
+    /**
+     * @used-by like()
+     * @used-by orLike()
+     * @used-by notLike()
+     * @used-by orNotLike()
+     * @used-by havingLike()
+     * @used-by orHavingLike()
+     * @used-by notHavingLike()
+     * @used-by orNotHavingLike()
+     *
+     * @param mixed $field
+     *
+     * @return $this
+     */
+    protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', ?bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
+    {
+        if (! is_array($field)) {
+            $field = [$field => $match];
+        }
+
+        $escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+        $side   = strtolower($side);
+
+        foreach ($field as $k => $v) {
+            if ($insensitiveSearch === true) {
+                $v = strtolower($v);
+            }
+
+            $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
+
+            if ($side === 'none') {
+                $bind = $this->setBind($k, $v, $escape);
+            } elseif ($side === 'before') {
+                $bind = $this->setBind($k, "%{$v}", $escape);
+            } elseif ($side === 'after') {
+                $bind = $this->setBind($k, "{$v}%", $escape);
+            } else {
+                $bind = $this->setBind($k, "%{$v}%", $escape);
+            }
+
+            $likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
+
+            // some platforms require an escape sequence definition for LIKE wildcards
+            if ($escape === true && $this->db->likeEscapeStr !== '') {
+                $likeStatement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
+            }
+
+            $this->{$clause}[] = [
+                'condition' => $likeStatement,
+                'escape'    => $escape,
+            ];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Platform independent LIKE statement builder.
+     */
+    protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
+    {
+        if ($insensitiveSearch === true) {
+            return "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
+        }
+
+        return "{$prefix} {$column} {$not} LIKE :{$bind}:";
+    }
+
+    /**
+     * Starts a query group.
+     *
+     * @return $this
+     */
+    public function groupStart()
+    {
+        return $this->groupStartPrepare();
+    }
+
+    /**
+     * Starts a query group, but ORs the group
+     *
+     * @return $this
+     */
+    public function orGroupStart()
+    {
+        return $this->groupStartPrepare('', 'OR ');
+    }
+
+    /**
+     * Starts a query group, but NOTs the group
+     *
+     * @return $this
+     */
+    public function notGroupStart()
+    {
+        return $this->groupStartPrepare('NOT ');
+    }
+
+    /**
+     * Starts a query group, but OR NOTs the group
+     *
+     * @return $this
+     */
+    public function orNotGroupStart()
+    {
+        return $this->groupStartPrepare('NOT ', 'OR ');
+    }
+
+    /**
+     * Ends a query group
+     *
+     * @return $this
+     */
+    public function groupEnd()
+    {
+        return $this->groupEndPrepare();
+    }
+
+    /**
+     * Starts a query group for HAVING clause.
+     *
+     * @return $this
+     */
+    public function havingGroupStart()
+    {
+        return $this->groupStartPrepare('', 'AND ', 'QBHaving');
+    }
+
+    /**
+     * Starts a query group for HAVING clause, but ORs the group.
+     *
+     * @return $this
+     */
+    public function orHavingGroupStart()
+    {
+        return $this->groupStartPrepare('', 'OR ', 'QBHaving');
+    }
+
+    /**
+     * Starts a query group for HAVING clause, but NOTs the group.
+     *
+     * @return $this
+     */
+    public function notHavingGroupStart()
+    {
+        return $this->groupStartPrepare('NOT ', 'AND ', 'QBHaving');
+    }
+
+    /**
+     * Starts a query group for HAVING clause, but OR NOTs the group.
+     *
+     * @return $this
+     */
+    public function orNotHavingGroupStart()
+    {
+        return $this->groupStartPrepare('NOT ', 'OR ', 'QBHaving');
+    }
+
+    /**
+     * Ends a query group for HAVING clause.
+     *
+     * @return $this
+     */
+    public function havingGroupEnd()
+    {
+        return $this->groupEndPrepare('QBHaving');
+    }
+
+    /**
+     * Prepate a query group start.
+     *
+     * @return $this
+     */
+    protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
+    {
+        $type = $this->groupGetType($type);
+
+        $this->QBWhereGroupStarted = true;
+        $prefix                    = empty($this->{$clause}) ? '' : $type;
+        $where                     = [
+            'condition' => $prefix . $not . str_repeat(' ', ++$this->QBWhereGroupCount) . ' (',
+            'escape'    => false,
+        ];
+
+        $this->{$clause}[] = $where;
+
+        return $this;
+    }
+
+    /**
+     * Prepate a query group end.
+     *
+     * @return $this
+     */
+    protected function groupEndPrepare(string $clause = 'QBWhere')
+    {
+        $this->QBWhereGroupStarted = false;
+        $where                     = [
+            'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',
+            'escape'    => false,
+        ];
+
+        $this->{$clause}[] = $where;
+
+        return $this;
+    }
+
+    /**
+     * @used-by groupStart()
+     * @used-by _like()
+     * @used-by whereHaving()
+     * @used-by _whereIn()
+     * @used-by havingGroupStart()
+     */
+    protected function groupGetType(string $type): string
+    {
+        if ($this->QBWhereGroupStarted) {
+            $type                      = '';
+            $this->QBWhereGroupStarted = false;
+        }
+
+        return $type;
+    }
+
+    /**
+     * @param array|string $by
+     *
+     * @return $this
+     */
+    public function groupBy($by, ?bool $escape = null)
+    {
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        if (is_string($by)) {
+            $by = ($escape === true) ? explode(',', $by) : [$by];
+        }
+
+        foreach ($by as $val) {
+            $val = trim($val);
+
+            if ($val !== '') {
+                $val = [
+                    'field'  => $val,
+                    'escape' => $escape,
+                ];
+
+                $this->QBGroupBy[] = $val;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Separates multiple calls with 'AND'.
+     *
+     * @param array|string $key
+     * @param mixed        $value
+     *
+     * @return $this
+     */
+    public function having($key, $value = null, ?bool $escape = null)
+    {
+        return $this->whereHaving('QBHaving', $key, $value, 'AND ', $escape);
+    }
+
+    /**
+     * Separates multiple calls with 'OR'.
+     *
+     * @param array|string $key
+     * @param mixed        $value
+     *
+     * @return $this
+     */
+    public function orHaving($key, $value = null, ?bool $escape = null)
+    {
+        return $this->whereHaving('QBHaving', $key, $value, 'OR ', $escape);
+    }
+
+    /**
+     * @param string $direction ASC, DESC or RANDOM
+     *
+     * @return $this
+     */
+    public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
+    {
+        if (empty($orderBy)) {
+            return $this;
+        }
+
+        $direction = strtoupper(trim($direction));
+
+        if ($direction === 'RANDOM') {
+            $direction = '';
+            $orderBy   = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
+        } elseif ($direction !== '') {
+            $direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
+        }
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        if ($escape === false) {
+            $qbOrderBy[] = [
+                'field'     => $orderBy,
+                'direction' => $direction,
+                'escape'    => false,
+            ];
+        } else {
+            $qbOrderBy = [];
+
+            foreach (explode(',', $orderBy) as $field) {
+                $qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
+                    ? [
+                        'field'     => ltrim(substr($field, 0, $match[0][1])),
+                        'direction' => ' ' . $match[1][0],
+                        'escape'    => true,
+                    ]
+                    : [
+                        'field'     => trim($field),
+                        'direction' => $direction,
+                        'escape'    => true,
+                    ];
+            }
+        }
+
+        $this->QBOrderBy = array_merge($this->QBOrderBy, $qbOrderBy);
+
+        return $this;
+    }
+
+    /**
+     * @return $this
+     */
+    public function limit(?int $value = null, ?int $offset = 0)
+    {
+        if ($value !== null) {
+            $this->QBLimit = $value;
+        }
+
+        if (! empty($offset)) {
+            $this->QBOffset = $offset;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets the OFFSET value
+     *
+     * @return $this
+     */
+    public function offset(int $offset)
+    {
+        if (! empty($offset)) {
+            $this->QBOffset = (int) $offset;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Generates a platform-specific LIMIT clause.
+     */
+    protected function _limit(string $sql, bool $offsetIgnore = false): string
+    {
+        return $sql . ' LIMIT ' . ($offsetIgnore === false && $this->QBOffset ? $this->QBOffset . ', ' : '') . $this->QBLimit;
+    }
+
+    /**
+     * Allows key/value pairs to be set for insert(), update() or replace().
+     *
+     * @param array|object|string $key    Field name, or an array of field/value pairs
+     * @param string|null         $value  Field value, if $key is a single field
+     * @param bool|null           $escape Whether to escape values and identifiers
+     *
+     * @return $this
+     */
+    public function set($key, ?string $value = '', ?bool $escape = null)
+    {
+        $key = $this->objectToArray($key);
+
+        if (! is_array($key)) {
+            $key = [$key => $value];
+        }
+
+        $escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+
+        foreach ($key as $k => $v) {
+            if ($escape) {
+                $bind = $this->setBind($k, $v, $escape);
+
+                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":{$bind}:";
+            } else {
+                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the previously set() data, alternatively resetting it if needed.
+     */
+    public function getSetData(bool $clean = false): array
+    {
+        $data = $this->QBSet;
+
+        if ($clean) {
+            $this->QBSet = [];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Compiles a SELECT query string and returns the sql.
+     */
+    public function getCompiledSelect(bool $reset = true): string
+    {
+        $select = $this->compileSelect();
+
+        if ($reset === true) {
+            $this->resetSelect();
+        }
+
+        return $this->compileFinalQuery($select);
+    }
+
+    /**
+     * Returns a finalized, compiled query string with the bindings
+     * inserted and prefixes swapped out.
+     */
+    protected function compileFinalQuery(string $sql): string
+    {
+        $query = new Query($this->db);
+        $query->setQuery($sql, $this->binds, false);
+
+        if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix)) {
+            $query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
+        }
+
+        return $query->getQuery();
+    }
+
+    /**
+     * Compiles the select statement based on the other functions called
+     * and runs the query
+     *
+     * @return false|ResultInterface
+     */
+    public function get(?int $limit = null, int $offset = 0, bool $reset = true)
+    {
+        if ($limit !== null) {
+            $this->limit($limit, $offset);
+        }
+
+        $result = $this->testMode
+            ? $this->getCompiledSelect($reset)
+            : $this->db->query($this->compileSelect(), $this->binds, false);
+
+        if ($reset === true) {
+            $this->resetSelect();
+
+            // Clear our binds so we don't eat up memory
+            $this->binds = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Generates a platform-specific query string that counts all records in
+     * the particular table
+     *
+     * @return int|string
+     */
+    public function countAll(bool $reset = true)
+    {
+        $table = $this->QBFrom[0];
+
+        $sql = $this->countString . $this->db->escapeIdentifiers('numrows') . ' FROM ' .
+            $this->db->protectIdentifiers($table, true, null, false);
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $query = $this->db->query($sql, null, false);
+
+        if (empty($query->getResult())) {
+            return 0;
+        }
+
+        $query = $query->getRow();
+
+        if ($reset === true) {
+            $this->resetSelect();
+        }
+
+        return (int) $query->numrows;
+    }
+
+    /**
+     * Generates a platform-specific query string that counts all records
+     * returned by an Query Builder query.
+     *
+     * @return int|string
+     */
+    public function countAllResults(bool $reset = true)
+    {
+        // ORDER BY usage is often problematic here (most notably
+        // on Microsoft SQL Server) and ultimately unnecessary
+        // for selecting COUNT(*) ...
+        $orderBy = [];
+
+        if (! empty($this->QBOrderBy)) {
+            $orderBy = $this->QBOrderBy;
+
+            $this->QBOrderBy = null;
+        }
+
+        // We cannot use a LIMIT when getting the single row COUNT(*) result
+        $limit = $this->QBLimit;
+
+        $this->QBLimit = false;
+
+        if ($this->QBDistinct === true || ! empty($this->QBGroupBy)) {
+            // We need to backup the original SELECT in case DBPrefix is used
+            $select = $this->QBSelect;
+            $sql    = $this->countString . $this->db->protectIdentifiers('numrows') . "\nFROM (\n" . $this->compileSelect() . "\n) CI_count_all_results";
+
+            // Restore SELECT part
+            $this->QBSelect = $select;
+            unset($select);
+        } else {
+            $sql = $this->compileSelect($this->countString . $this->db->protectIdentifiers('numrows'));
+        }
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $result = $this->db->query($sql, $this->binds, false);
+
+        if ($reset === true) {
+            $this->resetSelect();
+        } elseif (! isset($this->QBOrderBy)) {
+            $this->QBOrderBy = $orderBy;
+        }
+
+        // Restore the LIMIT setting
+        $this->QBLimit = $limit;
+
+        $row = ! $result instanceof ResultInterface ? null : $result->getRow();
+
+        if (empty($row)) {
+            return 0;
+        }
+
+        return (int) $row->numrows;
+    }
+
+    /**
+     * Compiles the set conditions and returns the sql statement
+     *
+     * @return array
+     */
+    public function getCompiledQBWhere()
+    {
+        return $this->QBWhere;
+    }
+
+    /**
+     * Allows the where clause, limit and offset to be added directly
+     *
+     * @param array|string $where
+     *
+     * @return ResultInterface
+     */
+    public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bool $reset = true)
+    {
+        if ($where !== null) {
+            $this->where($where);
+        }
+
+        if (! empty($limit)) {
+            $this->limit($limit, $offset);
+        }
+
+        $result = $this->testMode
+            ? $this->getCompiledSelect($reset)
+            : $this->db->query($this->compileSelect(), $this->binds, false);
+
+        if ($reset === true) {
+            $this->resetSelect();
+
+            // Clear our binds so we don't eat up memory
+            $this->binds = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Compiles batch insert strings and runs the queries
+     *
+     * @throws DatabaseException
+     *
+     * @return false|int Number of rows inserted or FALSE on failure
+     */
+    public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100)
+    {
+        if ($set === null) {
+            if (empty($this->QBSet)) {
+                if (CI_DEBUG) {
+                    throw new DatabaseException('You must use the "set" method to update an entry.');
+                }
+
+                return false; // @codeCoverageIgnore
+            }
+        } else {
+            if (empty($set)) {
+                if (CI_DEBUG) {
+                    throw new DatabaseException('insertBatch() called with no data');
+                }
+
+                return false; // @codeCoverageIgnore
+            }
+
+            $this->setInsertBatch($set, '', $escape);
+        }
+
+        $table = $this->QBFrom[0];
+
+        $affectedRows = 0;
+
+        for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
+            $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
+
+            if ($this->testMode) {
+                $affectedRows++;
+            } else {
+                $this->db->query($sql, $this->binds, false);
+                $affectedRows += $this->db->affectedRows();
+            }
+        }
+
+        if (! $this->testMode) {
+            $this->resetWrite();
+        }
+
+        return $affectedRows;
+    }
+
+    /**
+     * Generates a platform-specific insert string from the supplied data.
+     */
+    protected function _insertBatch(string $table, array $keys, array $values): string
+    {
+        return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
+    }
+
+    /**
+     * Allows key/value pairs to be set for batch inserts
+     *
+     * @param mixed $key
+     *
+     * @return $this|null
+     */
+    public function setInsertBatch($key, string $value = '', ?bool $escape = null)
+    {
+        $key = $this->batchObjectToArray($key);
+
+        if (! is_array($key)) {
+            $key = [$key => $value];
+        }
+
+        $escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
+
+        $keys = array_keys($this->objectToArray(current($key)));
+        sort($keys);
+
+        foreach ($key as $row) {
+            $row = $this->objectToArray($row);
+            if (array_diff($keys, array_keys($row)) !== [] || array_diff(array_keys($row), $keys) !== []) {
+                // batch function above returns an error on an empty array
+                $this->QBSet[] = [];
+
+                return null;
+            }
+
+            ksort($row); // puts $row in the same order as our keys
+
+            $clean = [];
+
+            foreach ($row as $k => $rowValue) {
+                $clean[] = ':' . $this->setBind($k, $rowValue, $escape) . ':';
+            }
+
+            $row = $clean;
+
+            $this->QBSet[] = '(' . implode(',', $row) . ')';
+        }
+
+        foreach ($keys as $k) {
+            $this->QBKeys[] = $this->db->protectIdentifiers($k, false, $escape);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Compiles an insert query and returns the sql
+     *
+     * @throws DatabaseException
+     *
+     * @return bool|string
+     */
+    public function getCompiledInsert(bool $reset = true)
+    {
+        if ($this->validateInsert() === false) {
+            return false;
+        }
+
+        $sql = $this->_insert(
+            $this->db->protectIdentifiers($this->QBFrom[0], true, null, false),
+            array_keys($this->QBSet),
+            array_values($this->QBSet)
+        );
+
+        if ($reset === true) {
+            $this->resetWrite();
+        }
+
+        return $this->compileFinalQuery($sql);
+    }
+
+    /**
+     * Compiles an insert string and runs the query
+     *
+     * @throws DatabaseException
+     *
+     * @return bool|Query
+     */
+    public function insert(?array $set = null, ?bool $escape = null)
+    {
+        if ($set !== null) {
+            $this->set($set, '', $escape);
+        }
+
+        if ($this->validateInsert() === false) {
+            return false;
+        }
+
+        $sql = $this->_insert(
+            $this->db->protectIdentifiers($this->QBFrom[0], true, $escape, false),
+            array_keys($this->QBSet),
+            array_values($this->QBSet)
+        );
+
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            $result = $this->db->query($sql, $this->binds, false);
+
+            // Clear our binds so we don't eat up memory
+            $this->binds = [];
+
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * This method is used by both insert() and getCompiledInsert() to
+     * validate that the there data is actually being set and that table
+     * has been chosen to be inserted into.
+     *
+     * @throws DatabaseException
+     */
+    protected function validateInsert(): bool
+    {
+        if (empty($this->QBSet)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must use the "set" method to update an entry.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        return true;
+    }
+
+    /**
+     * Generates a platform-specific insert string from the supplied data
+     */
+    protected function _insert(string $table, array $keys, array $unescapedKeys): string
+    {
+        return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
+    }
+
+    /**
+     * Compiles an replace into string and runs the query
+     *
+     * @throws DatabaseException
+     *
+     * @return BaseResult|false|Query|string
+     */
+    public function replace(?array $set = null)
+    {
+        if ($set !== null) {
+            $this->set($set);
+        }
+
+        if (empty($this->QBSet)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must use the "set" method to update an entry.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        $table = $this->QBFrom[0];
+
+        $sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
+
+        $this->resetWrite();
+
+        return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Generates a platform-specific replace string from the supplied data
+     */
+    protected function _replace(string $table, array $keys, array $values): string
+    {
+        return 'REPLACE INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $values) . ')';
+    }
+
+    /**
+     * Groups tables in FROM clauses if needed, so there is no confusion
+     * about operator precedence.
+     *
+     * Note: This is only used (and overridden) by MySQL and SQLSRV.
+     */
+    protected function _fromTables(): string
+    {
+        return implode(', ', $this->QBFrom);
+    }
+
+    /**
+     * Compiles an update query and returns the sql
+     *
+     * @return bool|string
+     */
+    public function getCompiledUpdate(bool $reset = true)
+    {
+        if ($this->validateUpdate() === false) {
+            return false;
+        }
+
+        $sql = $this->_update($this->QBFrom[0], $this->QBSet);
+
+        if ($reset === true) {
+            $this->resetWrite();
+        }
+
+        return $this->compileFinalQuery($sql);
+    }
+
+    /**
+     * Compiles an update string and runs the query.
+     *
+     * @param mixed $where
+     *
+     * @throws DatabaseException
+     */
+    public function update(?array $set = null, $where = null, ?int $limit = null): bool
+    {
+        if ($set !== null) {
+            $this->set($set);
+        }
+
+        if ($this->validateUpdate() === false) {
+            return false;
+        }
+
+        if ($where !== null) {
+            $this->where($where);
+        }
+
+        if (! empty($limit)) {
+            if (! $this->canLimitWhereUpdates) {
+                throw new DatabaseException('This driver does not allow LIMITs on UPDATE queries using WHERE.');
+            }
+
+            $this->limit($limit);
+        }
+
+        $sql = $this->_update($this->QBFrom[0], $this->QBSet);
+
+        if (! $this->testMode) {
+            $this->resetWrite();
+
+            $result = $this->db->query($sql, $this->binds, false);
+
+            if ($result !== false) {
+                // Clear our binds so we don't eat up memory
+                $this->binds = [];
+
+                return true;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Generates a platform-specific update string from the supplied data
+     */
+    protected function _update(string $table, array $values): string
+    {
+        $valStr = [];
+
+        foreach ($values as $key => $val) {
+            $valStr[] = $key . ' = ' . $val;
+        }
+
+        return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
+            . $this->compileWhereHaving('QBWhere')
+            . $this->compileOrderBy()
+            . ($this->QBLimit ? $this->_limit(' ', true) : '');
+    }
+
+    /**
+     * This method is used by both update() and getCompiledUpdate() to
+     * validate that data is actually being set and that a table has been
+     * chosen to be update.
+     *
+     * @throws DatabaseException
+     */
+    protected function validateUpdate(): bool
+    {
+        if (empty($this->QBSet)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must use the "set" method to update an entry.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        return true;
+    }
+
+    /**
+     * Compiles an update string and runs the query
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed Number of rows affected, SQL string, or FALSE on failure
+     */
+    public function updateBatch(?array $set = null, ?string $index = null, int $batchSize = 100)
+    {
+        if ($index === null) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must specify an index to match on for batch updates.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        if ($set === null) {
+            if (empty($this->QBSet)) {
+                if (CI_DEBUG) {
+                    throw new DatabaseException('You must use the "set" method to update an entry.');
+                }
+
+                return false; // @codeCoverageIgnore
+            }
+        } else {
+            if (empty($set)) {
+                if (CI_DEBUG) {
+                    throw new DatabaseException('updateBatch() called with no data');
+                }
+
+                return false; // @codeCoverageIgnore
+            }
+
+            $this->setUpdateBatch($set, $index);
+        }
+
+        $table = $this->QBFrom[0];
+
+        $affectedRows = 0;
+        $savedSQL     = [];
+        $savedQBWhere = $this->QBWhere;
+
+        for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
+            $sql = $this->_updateBatch(
+                $table,
+                array_slice($this->QBSet, $i, $batchSize),
+                $this->db->protectIdentifiers($index)
+            );
+
+            if ($this->testMode) {
+                $savedSQL[] = $sql;
+            } else {
+                $this->db->query($sql, $this->binds, false);
+                $affectedRows += $this->db->affectedRows();
+            }
+
+            $this->QBWhere = $savedQBWhere;
+        }
+
+        $this->resetWrite();
+
+        return $this->testMode ? $savedSQL : $affectedRows;
+    }
+
+    /**
+     * Generates a platform-specific batch update string from the supplied data
+     */
+    protected function _updateBatch(string $table, array $values, string $index): string
+    {
+        $ids   = [];
+        $final = [];
+
+        foreach ($values as $val) {
+            $ids[] = $val[$index];
+
+            foreach (array_keys($val) as $field) {
+                if ($field !== $index) {
+                    $final[$field][] = 'WHEN ' . $index . ' = ' . $val[$index] . ' THEN ' . $val[$field];
+                }
+            }
+        }
+
+        $cases = '';
+
+        foreach ($final as $k => $v) {
+            $cases .= $k . " = CASE \n"
+                . implode("\n", $v) . "\n"
+                . 'ELSE ' . $k . ' END, ';
+        }
+
+        $this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
+
+        return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+    }
+
+    /**
+     * Allows key/value pairs to be set for batch updating
+     *
+     * @param array|object $key
+     *
+     * @throws DatabaseException
+     *
+     * @return $this|null
+     */
+    public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
+    {
+        $key = $this->batchObjectToArray($key);
+
+        if (! is_array($key)) {
+            return null;
+        }
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        foreach ($key as $v) {
+            $indexSet = false;
+            $clean    = [];
+
+            foreach ($v as $k2 => $v2) {
+                if ($k2 === $index) {
+                    $indexSet = true;
+                }
+
+                $bind = $this->setBind($k2, $v2, $escape);
+
+                $clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":{$bind}:";
+            }
+
+            if ($indexSet === false) {
+                throw new DatabaseException('One or more rows submitted for batch updating is missing the specified index.');
+            }
+
+            $this->QBSet[] = $clean;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Compiles a delete string and runs "DELETE FROM table"
+     *
+     * @return bool|string TRUE on success, FALSE on failure, string on testMode
+     */
+    public function emptyTable()
+    {
+        $table = $this->QBFrom[0];
+
+        $sql = $this->_delete($table);
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $this->resetWrite();
+
+        return $this->db->query($sql, null, false);
+    }
+
+    /**
+     * Compiles a truncate string and runs the query
+     * If the database does not support the truncate() command
+     * This function maps to "DELETE FROM table"
+     *
+     * @return bool|string TRUE on success, FALSE on failure, string on testMode
+     */
+    public function truncate()
+    {
+        $table = $this->QBFrom[0];
+
+        $sql = $this->_truncate($table);
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $this->resetWrite();
+
+        return $this->db->query($sql, null, false);
+    }
+
+    /**
+     * Generates a platform-specific truncate string from the supplied data
+     *
+     * If the database does not support the truncate() command,
+     * then this method maps to 'DELETE FROM table'
+     */
+    protected function _truncate(string $table): string
+    {
+        return 'TRUNCATE ' . $table;
+    }
+
+    /**
+     * Compiles a delete query string and returns the sql
+     */
+    public function getCompiledDelete(bool $reset = true): string
+    {
+        $sql = $this->testMode()->delete('', null, $reset);
+        $this->testMode(false);
+
+        return $this->compileFinalQuery($sql);
+    }
+
+    /**
+     * Compiles a delete string and runs the query
+     *
+     * @param mixed $where
+     *
+     * @throws DatabaseException
+     *
+     * @return bool|string
+     */
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
+    {
+        $table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
+
+        if ($where !== '') {
+            $this->where($where);
+        }
+
+        if (empty($this->QBWhere)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        $sql = $this->_delete($table);
+
+        if (! empty($limit)) {
+            $this->QBLimit = $limit;
+        }
+
+        if (! empty($this->QBLimit)) {
+            if (! $this->canLimitDeletes) {
+                throw new DatabaseException('SQLite3 does not allow LIMITs on DELETE queries.');
+            }
+
+            $sql = $this->_limit($sql, true);
+        }
+
+        if ($resetData) {
+            $this->resetWrite();
+        }
+
+        return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Increments a numeric column by the specified value.
+     *
+     * @return bool
+     */
+    public function increment(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        $sql = $this->_update($this->QBFrom[0], [$column => "{$column} + {$value}"]);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Decrements a numeric column by the specified value.
+     *
+     * @return bool
+     */
+    public function decrement(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        $sql = $this->_update($this->QBFrom[0], [$column => "{$column}-{$value}"]);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Generates a platform-specific delete string from the supplied data
+     */
+    protected function _delete(string $table): string
+    {
+        return 'DELETE ' . $this->compileIgnore('delete') . 'FROM ' . $table . $this->compileWhereHaving('QBWhere');
+    }
+
+    /**
+     * Used to track SQL statements written with aliased tables.
+     *
+     * @param array|string $table The table to inspect
+     *
+     * @return string|void
+     */
+    protected function trackAliases($table)
+    {
+        if (is_array($table)) {
+            foreach ($table as $t) {
+                $this->trackAliases($t);
+            }
+
+            return;
+        }
+
+        // Does the string contain a comma?  If so, we need to separate
+        // the string into discreet statements
+        if (strpos($table, ',') !== false) {
+            return $this->trackAliases(explode(',', $table));
+        }
+
+        // if a table alias is used we can recognize it by a space
+        if (strpos($table, ' ') !== false) {
+            // if the alias is written with the AS keyword, remove it
+            $table = preg_replace('/\s+AS\s+/i', ' ', $table);
+
+            // Grab the alias
+            $table = trim(strrchr($table, ' '));
+
+            // Store the alias, if it doesn't already exist
+            $this->db->addTableAlias($table);
+        }
+    }
+
+    /**
+     * Compile the SELECT statement
+     *
+     * Generates a query string based on which functions were used.
+     * Should not be called directly.
+     *
+     * @param mixed $selectOverride
+     */
+    protected function compileSelect($selectOverride = false): string
+    {
+        if ($selectOverride !== false) {
+            $sql = $selectOverride;
+        } else {
+            $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+
+            if (empty($this->QBSelect)) {
+                $sql .= '*';
+            } else {
+                // Cycle through the "select" portion of the query and prep each column name.
+                // The reason we protect identifiers here rather than in the select() function
+                // is because until the user calls the from() function we don't know if there are aliases
+                foreach ($this->QBSelect as $key => $val) {
+                    $noEscape             = $this->QBNoEscape[$key] ?? null;
+                    $this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
+                }
+
+                $sql .= implode(', ', $this->QBSelect);
+            }
+        }
+
+        if (! empty($this->QBFrom)) {
+            $sql .= "\nFROM " . $this->_fromTables();
+        }
+
+        if (! empty($this->QBJoin)) {
+            $sql .= "\n" . implode("\n", $this->QBJoin);
+        }
+
+        $sql .= $this->compileWhereHaving('QBWhere')
+            . $this->compileGroupBy()
+            . $this->compileWhereHaving('QBHaving')
+            . $this->compileOrderBy();
+
+        if ($this->QBLimit) {
+            return $this->_limit($sql . "\n");
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Checks if the ignore option is supported by
+     * the Database Driver for the specific statement.
+     *
+     * @return string
+     */
+    protected function compileIgnore(string $statement)
+    {
+        if ($this->QBIgnore && isset($this->supportedIgnoreStatements[$statement])) {
+            return trim($this->supportedIgnoreStatements[$statement]) . ' ';
+        }
+
+        return '';
+    }
+
+    /**
+     * Escapes identifiers in WHERE and HAVING statements at execution time.
+     *
+     * Required so that aliases are tracked properly, regardless of whether
+     * where(), orWhere(), having(), orHaving are called prior to from(),
+     * join() and prefixTable is added only if needed.
+     *
+     * @param string $qbKey 'QBWhere' or 'QBHaving'
+     *
+     * @return string SQL statement
+     */
+    protected function compileWhereHaving(string $qbKey): string
+    {
+        if (! empty($this->{$qbKey})) {
+            foreach ($this->{$qbKey} as &$qbkey) {
+                // Is this condition already compiled?
+                if (is_string($qbkey)) {
+                    continue;
+                }
+
+                if ($qbkey['escape'] === false) {
+                    $qbkey = $qbkey['condition'];
+
+                    continue;
+                }
+
+                // Split multiple conditions
+                $conditions = preg_split(
+                    '/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i',
+                    $qbkey['condition'],
+                    -1,
+                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+                );
+
+                foreach ($conditions as &$condition) {
+                    if (($op = $this->getOperator($condition)) === false
+                        || ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
+                    ) {
+                        continue;
+                    }
+                    // $matches = array(
+                    //	0 => '(test <= foo)',	/* the whole thing */
+                    //	1 => '(',		/* optional */
+                    //	2 => 'test',		/* the field name */
+                    //	3 => ' <= ',		/* $op */
+                    //	4 => 'foo',		/* optional, if $op is e.g. 'IS NULL' */
+                    //	5 => ')'		/* optional */
+                    // );
+
+                    if (! empty($matches[4])) {
+                        $protectIdentifiers = false;
+                        if (strpos($matches[4], '.') !== false) {
+                            $protectIdentifiers = true;
+                        }
+
+                        if (strpos($matches[4], ':') === false) {
+                            $matches[4] = $this->db->protectIdentifiers(trim($matches[4]), false, $protectIdentifiers);
+                        }
+
+                        $matches[4] = ' ' . $matches[4];
+                    }
+
+                    $condition = $matches[1] . $this->db->protectIdentifiers(trim($matches[2]))
+                        . ' ' . trim($matches[3]) . $matches[4] . $matches[5];
+                }
+
+                $qbkey = implode('', $conditions);
+            }
+
+            return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
+                . implode("\n", $this->{$qbKey});
+        }
+
+        return '';
+    }
+
+    /**
+     * Escapes identifiers in GROUP BY statements at execution time.
+     *
+     * Required so that aliases are tracked properly, regardless of whether
+     * groupBy() is called prior to from(), join() and prefixTable is added
+     * only if needed.
+     */
+    protected function compileGroupBy(): string
+    {
+        if (! empty($this->QBGroupBy)) {
+            foreach ($this->QBGroupBy as &$groupBy) {
+                // Is it already compiled?
+                if (is_string($groupBy)) {
+                    continue;
+                }
+
+                $groupBy = ($groupBy['escape'] === false || $this->isLiteral($groupBy['field']))
+                    ? $groupBy['field']
+                    : $this->db->protectIdentifiers($groupBy['field']);
+            }
+
+            return "\nGROUP BY " . implode(', ', $this->QBGroupBy);
+        }
+
+        return '';
+    }
+
+    /**
+     * Escapes identifiers in ORDER BY statements at execution time.
+     *
+     * Required so that aliases are tracked properly, regardless of whether
+     * orderBy() is called prior to from(), join() and prefixTable is added
+     * only if needed.
+     */
+    protected function compileOrderBy(): string
+    {
+        if (is_array($this->QBOrderBy) && ! empty($this->QBOrderBy)) {
+            foreach ($this->QBOrderBy as &$orderBy) {
+                if ($orderBy['escape'] !== false && ! $this->isLiteral($orderBy['field'])) {
+                    $orderBy['field'] = $this->db->protectIdentifiers($orderBy['field']);
+                }
+
+                $orderBy = $orderBy['field'] . $orderBy['direction'];
+            }
+
+            return $this->QBOrderBy = "\nORDER BY " . implode(', ', $this->QBOrderBy);
+        }
+
+        if (is_string($this->QBOrderBy)) {
+            return $this->QBOrderBy;
+        }
+
+        return '';
+    }
+
+    /**
+     * Takes an object as input and converts the class variables to array key/vals
+     *
+     * @param object $object
+     *
+     * @return array
+     */
+    protected function objectToArray($object)
+    {
+        if (! is_object($object)) {
+            return $object;
+        }
+
+        $array = [];
+
+        foreach (get_object_vars($object) as $key => $val) {
+            // There are some built in keys we need to ignore for this conversion
+            if (! is_object($val) && ! is_array($val) && $key !== '_parent_name') {
+                $array[$key] = $val;
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Takes an object as input and converts the class variables to array key/vals
+     *
+     * @param object $object
+     *
+     * @return array
+     */
+    protected function batchObjectToArray($object)
+    {
+        if (! is_object($object)) {
+            return $object;
+        }
+
+        $array  = [];
+        $out    = get_object_vars($object);
+        $fields = array_keys($out);
+
+        foreach ($fields as $val) {
+            // There are some built in keys we need to ignore for this conversion
+            if ($val !== '_parent_name') {
+                $i = 0;
+
+                foreach ($out[$val] as $data) {
+                    $array[$i++][$val] = $data;
+                }
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * Determines if a string represents a literal value or a field name
+     */
+    protected function isLiteral(string $str): bool
+    {
+        $str = trim($str);
+
+        if (empty($str)
+            || ctype_digit($str)
+            || (string) (float) $str === $str
+            || in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
+        ) {
+            return true;
+        }
+
+        static $_str;
+
+        if (empty($_str)) {
+            $_str = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
+        }
+
+        return in_array($str[0], $_str, true);
+    }
+
+    /**
+     * Publicly-visible method to reset the QB values.
+     *
+     * @return $this
+     */
+    public function resetQuery()
+    {
+        $this->resetSelect();
+        $this->resetWrite();
+
+        return $this;
+    }
+
+    /**
+     * Resets the query builder values.  Called by the get() function
+     *
+     * @param array $qbResetItems An array of fields to reset
+     */
+    protected function resetRun(array $qbResetItems)
+    {
+        foreach ($qbResetItems as $item => $defaultValue) {
+            $this->{$item} = $defaultValue;
+        }
+    }
+
+    /**
+     * Resets the query builder values.  Called by the get() function
+     */
+    protected function resetSelect()
+    {
+        $this->resetRun([
+            'QBSelect'   => [],
+            'QBJoin'     => [],
+            'QBWhere'    => [],
+            'QBGroupBy'  => [],
+            'QBHaving'   => [],
+            'QBOrderBy'  => [],
+            'QBNoEscape' => [],
+            'QBDistinct' => false,
+            'QBLimit'    => false,
+            'QBOffset'   => false,
+        ]);
+
+        if (! empty($this->db)) {
+            $this->db->setAliasedTables([]);
+        }
+
+        // Reset QBFrom part
+        if (! empty($this->QBFrom)) {
+            $this->from(array_shift($this->QBFrom), true);
+        }
+    }
+
+    /**
+     * Resets the query builder "write" values.
+     *
+     * Called by the insert() update() insertBatch() updateBatch() and delete() functions
+     */
+    protected function resetWrite()
+    {
+        $this->resetRun([
+            'QBSet'     => [],
+            'QBJoin'    => [],
+            'QBWhere'   => [],
+            'QBOrderBy' => [],
+            'QBKeys'    => [],
+            'QBLimit'   => false,
+            'QBIgnore'  => false,
+        ]);
+    }
+
+    /**
+     * Tests whether the string has an SQL operator
+     */
+    protected function hasOperator(string $str): bool
+    {
+        return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+    }
+
+    /**
+     * Returns the SQL string operator
+     *
+     * @return mixed
+     */
+    protected function getOperator(string $str, bool $list = false)
+    {
+        static $_operators;
+
+        if (empty($_operators)) {
+            $_les       = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
+            $_operators = [
+                '\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
+                '\s*<>?\s*', // <, <>
+                '\s*>\s*', // >
+                '\s+IS NULL', // IS NULL
+                '\s+IS NOT NULL', // IS NOT NULL
+                '\s+EXISTS\s*\(.*\)', // EXISTS(sql)
+                '\s+NOT EXISTS\s*\(.*\)', // NOT EXISTS(sql)
+                '\s+BETWEEN\s+', // BETWEEN value AND value
+                '\s+IN\s*\(.*\)', // IN(list)
+                '\s+NOT IN\s*\(.*\)', // NOT IN (list)
+                '\s+LIKE\s+\S.*(' . $_les . ')?', // LIKE 'expr'[ ESCAPE '%s']
+                '\s+NOT LIKE\s+\S.*(' . $_les . ')?', // NOT LIKE 'expr'[ ESCAPE '%s']
+            ];
+        }
+
+        return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
+    }
+
+    /**
+     * Stores a bind value after ensuring that it's unique.
+     * While it might be nicer to have named keys for our binds array
+     * with PHP 7+ we get a huge memory/performance gain with indexed
+     * arrays instead, so lets take advantage of that here.
+     *
+     * @param mixed $value
+     */
+    protected function setBind(string $key, $value = null, bool $escape = true): string
+    {
+        if (! array_key_exists($key, $this->binds)) {
+            $this->binds[$key] = [
+                $value,
+                $escape,
+            ];
+
+            return $key;
+        }
+
+        if (! array_key_exists($key, $this->bindsKeyCount)) {
+            $this->bindsKeyCount[$key] = 1;
+        }
+
+        $count = $this->bindsKeyCount[$key]++;
+
+        $this->binds[$key . '.' . $count] = [
+            $value,
+            $escape,
+        ];
+
+        return $key . '.' . $count;
+    }
+
+    /**
+     * Returns a clone of a Base Builder with reset query builder values.
+     *
+     * @return $this
+     */
+    protected function cleanClone()
+    {
+        return (clone $this)->from([], true)->resetQuery();
+    }
 }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index a37ffaaa1025..70bde67b6d50 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -17,1874 +17,1554 @@
 use Throwable;
 
 /**
- * Class BaseConnection
+ * @property array      $aliasedTables
+ * @property string     $charset
+ * @property bool       $compress
+ * @property float      $connectDuration
+ * @property float      $connectTime
+ * @property string     $database
+ * @property string     $DBCollat
+ * @property bool       $DBDebug
+ * @property string     $DBDriver
+ * @property string     $DBPrefix
+ * @property string     $DSN
+ * @property mixed      $encrypt
+ * @property array      $failover
+ * @property string     $hostname
+ * @property mixed      $lastQuery
+ * @property string     $password
+ * @property bool       $pConnect
+ * @property int|string $port
+ * @property bool       $pretend
+ * @property string     $queryClass
+ * @property array      $reservedIdentifiers
+ * @property bool       $strictOn
+ * @property string     $subdriver
+ * @property string     $swapPre
+ * @property int        $transDepth
+ * @property bool       $transFailure
+ * @property bool       $transStatus
  */
 abstract class BaseConnection implements ConnectionInterface
 {
-	/**
-	 * Data Source Name / Connect string
-	 *
-	 * @var string
-	 */
-	protected $DSN;
-
-	/**
-	 * Database port
-	 *
-	 * @var integer|string
-	 */
-	protected $port = '';
-
-	/**
-	 * Hostname
-	 *
-	 * @var string
-	 */
-	protected $hostname;
-
-	/**
-	 * Username
-	 *
-	 * @var string
-	 */
-	protected $username;
-
-	/**
-	 * Password
-	 *
-	 * @var string
-	 */
-	protected $password;
-
-	/**
-	 * Database name
-	 *
-	 * @var string
-	 */
-	protected $database;
-
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	protected $DBDriver = 'MySQLi';
-
-	/**
-	 * Sub-driver
-	 *
-	 * @used-by CI_DB_pdo_driver
-	 * @var     string
-	 */
-	protected $subdriver;
-
-	/**
-	 * Table prefix
-	 *
-	 * @var string
-	 */
-	protected $DBPrefix = '';
-
-	/**
-	 * Persistent connection flag
-	 *
-	 * @var boolean
-	 */
-	protected $pConnect = false;
-
-	/**
-	 * Debug flag
-	 *
-	 * Whether to display error messages.
-	 *
-	 * @var boolean
-	 */
-	protected $DBDebug = false;
-
-	/**
-	 * Character set
-	 *
-	 * @var string
-	 */
-	protected $charset = 'utf8';
-
-	/**
-	 * Collation
-	 *
-	 * @var string
-	 */
-	protected $DBCollat = 'utf8_general_ci';
-
-	/**
-	 * Swap Prefix
-	 *
-	 * @var string
-	 */
-	protected $swapPre = '';
-
-	/**
-	 * Encryption flag/data
-	 *
-	 * @var mixed
-	 */
-	protected $encrypt = false;
-
-	/**
-	 * Compression flag
-	 *
-	 * @var boolean
-	 */
-	protected $compress = false;
-
-	/**
-	 * Strict ON flag
-	 *
-	 * Whether we're running in strict SQL mode.
-	 *
-	 * @var boolean
-	 */
-	protected $strictOn;
-
-	/**
-	 * Settings for a failover connection.
-	 *
-	 * @var array
-	 */
-	protected $failover = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The last query object that was executed
-	 * on this connection.
-	 *
-	 * @var mixed
-	 */
-	protected $lastQuery;
-
-	/**
-	 * Connection ID
-	 *
-	 * @var object|resource|boolean
-	 */
-	public $connID = false;
-
-	/**
-	 * Result ID
-	 *
-	 * @var object|resource|boolean
-	 */
-	public $resultID = false;
-
-	/**
-	 * Protect identifiers flag
-	 *
-	 * @var boolean
-	 */
-	public $protectIdentifiers = true;
-
-	/**
-	 * List of reserved identifiers
-	 *
-	 * Identifiers that must NOT be escaped.
-	 *
-	 * @var array
-	 */
-	protected $reservedIdentifiers = ['*'];
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string|array
-	 */
-	public $escapeChar = '"';
-
-	/**
-	 * ESCAPE statement string
-	 *
-	 * @var string
-	 */
-	public $likeEscapeStr = " ESCAPE '%s' ";
-
-	/**
-	 * ESCAPE character
-	 *
-	 * @var string
-	 */
-	public $likeEscapeChar = '!';
-
-	/**
-	 * Holds previously looked up data
-	 * for performance reasons.
-	 *
-	 * @var array
-	 */
-	public $dataCache = [];
-
-	/**
-	 * Microtime when connection was made
-	 *
-	 * @var float
-	 */
-	protected $connectTime;
-
-	/**
-	 * How long it took to establish connection.
-	 *
-	 * @var float
-	 */
-	protected $connectDuration;
-
-	/**
-	 * If true, no queries will actually be
-	 * ran against the database.
-	 *
-	 * @var boolean
-	 */
-	protected $pretend = false;
-
-	/**
-	 * Transaction enabled flag
-	 *
-	 * @var boolean
-	 */
-	public $transEnabled = true;
-
-	/**
-	 * Strict transaction mode flag
-	 *
-	 * @var boolean
-	 */
-	public $transStrict = true;
-
-	/**
-	 * Transaction depth level
-	 *
-	 * @var integer
-	 */
-	protected $transDepth = 0;
-
-	/**
-	 * Transaction status flag
-	 *
-	 * Used with transactions to determine if a rollback should occur.
-	 *
-	 * @var boolean
-	 */
-	protected $transStatus = true;
-
-	/**
-	 * Transaction failure flag
-	 *
-	 * Used with transactions to determine if a transaction has failed.
-	 *
-	 * @var boolean
-	 */
-	protected $transFailure = false;
-
-	/**
-	 * Array of table aliases.
-	 *
-	 * @var array
-	 */
-	protected $aliasedTables = [];
-
-	/**
-	 * Query Class
-	 *
-	 * @var string
-	 */
-	protected $queryClass = 'CodeIgniter\\Database\\Query';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves our connection settings.
-	 *
-	 * @param array $params
-	 */
-	public function __construct(array $params)
-	{
-		foreach ($params as $key => $value)
-		{
-			$this->$key = $value;
-		}
-
-		$queryClass = str_replace('Connection', 'Query', static::class);
-
-		if (class_exists($queryClass))
-		{
-			$this->queryClass = $queryClass;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Initializes the database connection/settings.
-	 *
-	 * @return mixed|void
-	 * @throws DatabaseException
-	 */
-	public function initialize()
-	{
-		/* If an established connection is available, then there's
-		 * no need to connect and select the database.
-		 *
-		 * Depending on the database driver, conn_id can be either
-		 * boolean TRUE, a resource or an object.
-		 */
-		if ($this->connID)
-		{
-			return;
-		}
-
-		//--------------------------------------------------------------------
-
-		$this->connectTime = microtime(true);
-		$connectionErrors  = [];
-
-		try
-		{
-			// Connect to the database and set the connection ID
-			$this->connID = $this->connect($this->pConnect);
-		}
-		catch (Throwable $e)
-		{
-			$connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage());
-			log_message('error', 'Error connecting to the database: ' . $e->getMessage());
-		}
-
-		// No connection resource? Check if there is a failover else throw an error
-		if (! $this->connID)
-		{
-			// Check if there is a failover set
-			if (! empty($this->failover) && is_array($this->failover))
-			{
-				// Go over all the failovers
-				foreach ($this->failover as $index => $failover)
-				{
-					// Replace the current settings with those of the failover
-					foreach ($failover as $key => $val)
-					{
-						if (property_exists($this, $key))
-						{
-							$this->$key = $val;
-						}
-					}
-
-					try
-					{
-						// Try to connect
-						$this->connID = $this->connect($this->pConnect);
-					}
-					catch (Throwable $e)
-					{
-						$connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage());
-						log_message('error', 'Error connecting to the database: ' . $e->getMessage());
-					}
-
-					// If a connection is made break the foreach loop
-					if ($this->connID)
-					{
-						break;
-					}
-				}
-			}
-
-			// We still don't have a connection?
-			if (! $this->connID)
-			{
-				throw new DatabaseException(sprintf(
-					'Unable to connect to the database.%s%s',
-					PHP_EOL,
-					implode(PHP_EOL, $connectionErrors)
-				));
-			}
-		}
-
-		$this->connectDuration = microtime(true) - $this->connectTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param  boolean $persistent
-	 * @return mixed
-	 */
-	abstract public function connect(bool $persistent = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	public function close()
-	{
-		if ($this->connID)
-		{
-			$this->_close();
-			$this->connID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent way method for closing the connection.
-	 *
-	 * @return mixed
-	 */
-	abstract protected function _close();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create a persistent database connection.
-	 *
-	 * @return mixed
-	 */
-	public function persistentConnect()
-	{
-		return $this->connect(true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return mixed
-	 */
-	abstract public function reconnect();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the actual connection object. If both a 'read' and 'write'
-	 * connection has been specified, you can pass either term in to
-	 * get that connection. If you pass either alias in and only a single
-	 * connection is present, it must return the sole connection.
-	 *
-	 * @param string|null $alias
-	 *
-	 * @return mixed
-	 */
-	public function getConnection(string $alias = null)
-	{
-		//@todo work with read/write connections
-		return $this->connID;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return mixed
-	 */
-	abstract public function setDatabase(string $databaseName);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the current database being used.
-	 *
-	 * @return string
-	 */
-	public function getDatabase(): string
-	{
-		return empty($this->database) ? '' : $this->database;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set DB Prefix
-	 *
-	 * Set's the DB Prefix to something new without needing to reconnect
-	 *
-	 * @param string $prefix The prefix
-	 *
-	 * @return string
-	 */
-	public function setPrefix(string $prefix = ''): string
-	{
-		return $this->DBPrefix = $prefix;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the database prefix.
-	 *
-	 * @return string
-	 */
-	public function getPrefix(): string
-	{
-		return $this->DBPrefix;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The name of the platform in use (MySQLi, mssql, etc)
-	 *
-	 * @return string
-	 */
-	public function getPlatform(): string
-	{
-		return $this->DBDriver;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	abstract public function getVersion(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the Table Aliases to use. These are typically
-	 * collected during use of the Builder, and set here
-	 * so queries are built correctly.
-	 *
-	 * @param array $aliases
-	 *
-	 * @return $this
-	 */
-	public function setAliasedTables(array $aliases)
-	{
-		$this->aliasedTables = $aliases;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add a table alias to our list.
-	 *
-	 * @param string $table
-	 *
-	 * @return $this
-	 */
-	public function addTableAlias(string $table)
-	{
-		if (! in_array($table, $this->aliasedTables, true))
-		{
-			$this->aliasedTables[] = $table;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	abstract protected function execute(string $sql);
-
-	/**
-	 * Orchestrates a query against the database. Queries must use
-	 * Database\Statement objects to store the query and build it.
-	 * This method works with the cache.
-	 *
-	 * Should automatically handle different connections for read/write
-	 * queries if needed.
-	 *
-	 * @param string  $sql
-	 * @param mixed   ...$binds
-	 * @param boolean $setEscapeFlags
-	 * @param string  $queryClass
-	 *
-	 * @return BaseResult|Query|boolean
-	 *
-	 * @todo BC set $queryClass default as null in 4.1
-	 */
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
-	{
-		$queryClass = $queryClass ?: $this->queryClass;
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		/**
-		 * @var Query $query
-		 */
-		$query = new $queryClass($this);
-
-		$query->setQuery($sql, $binds, $setEscapeFlags);
-
-		if (! empty($this->swapPre) && ! empty($this->DBPrefix))
-		{
-			$query->swapPrefix($this->DBPrefix, $this->swapPre);
-		}
-
-		$startTime = microtime(true);
-
-		// Always save the last query so we can use
-		// the getLastQuery() method.
-		$this->lastQuery = $query;
-
-		// Run the query for real
-		if (! $this->pretend && false === ($this->resultID = $this->simpleQuery($query->getQuery())))
-		{
-			$query->setDuration($startTime, $startTime);
-
-			// This will trigger a rollback if transactions are being used
-			if ($this->transDepth !== 0)
-			{
-				$this->transStatus = false;
-			}
-
-			if ($this->DBDebug)
-			{
-				// We call this function in order to roll-back queries
-				// if transactions are enabled. If we don't call this here
-				// the error message will trigger an exit, causing the
-				// transactions to remain in limbo.
-				while ($this->transDepth !== 0)
-				{
-					$transDepth = $this->transDepth;
-					$this->transComplete();
-
-					if ($transDepth === $this->transDepth)
-					{
-						log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
-						break;
-					}
-				}
-
-				return false;
-			}
-
-			if (! $this->pretend)
-			{
-				// Let others do something with this query.
-				Events::trigger('DBQuery', $query);
-			}
-
-			return false;
-		}
-
-		$query->setDuration($startTime);
-
-		if (! $this->pretend)
-		{
-			// Let others do something with this query
-			Events::trigger('DBQuery', $query);
-		}
-
-		// If $pretend is true, then we just want to return
-		// the actual query object here. There won't be
-		// any results to return.
-		if ($this->pretend)
-		{
-			return $query;
-		}
-
-		// resultID is not false, so it must be successful
-		if ($this->isWriteType($sql))
-		{
-			return true;
-		}
-
-		// query is not write-type, so it must be read-type query; return QueryResult
-		$resultClass = str_replace('Connection', 'Result', get_class($this));
-		return new $resultClass($this->connID, $this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs a basic query against the database. No binding or caching
-	 * is performed, nor are transactions handled. Simply takes a raw
-	 * query string and returns the database-specific result id.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	public function simpleQuery(string $sql)
-	{
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		return $this->execute($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Disable Transactions
-	 *
-	 * This permits transactions to be disabled at run-time.
-	 *
-	 * @return void
-	 */
-	public function transOff()
-	{
-		$this->transEnabled = false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Enable/disable Transaction Strict Mode
-	 *
-	 * When strict mode is enabled, if you are running multiple groups of
-	 * transactions, if one group fails all subsequent groups will be
-	 * rolled back.
-	 *
-	 * If strict mode is disabled, each group is treated autonomously,
-	 * meaning a failure of one group will not affect any others
-	 *
-	 * @param boolean $mode = true
-	 *
-	 * @return $this
-	 */
-	public function transStrict(bool $mode = true)
-	{
-		$this->transStrict = $mode;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Start Transaction
-	 *
-	 * @param  boolean $testMode = FALSE
-	 * @return boolean
-	 */
-	public function transStart(bool $testMode = false): bool
-	{
-		if (! $this->transEnabled)
-		{
-			return false;
-		}
-
-		return $this->transBegin($testMode);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Complete Transaction
-	 *
-	 * @return boolean
-	 */
-	public function transComplete(): bool
-	{
-		if (! $this->transEnabled)
-		{
-			return false;
-		}
-
-		// The query() function will set this flag to FALSE in the event that a query failed
-		if ($this->transStatus === false || $this->transFailure === true)
-		{
-			$this->transRollback();
-
-			// If we are NOT running in strict mode, we will reset
-			// the _trans_status flag so that subsequent groups of
-			// transactions will be permitted.
-			if ($this->transStrict === false)
-			{
-				$this->transStatus = true;
-			}
-
-			//            log_message('debug', 'DB Transaction Failure');
-			return false;
-		}
-
-		return $this->transCommit();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Lets you retrieve the transaction flag to determine if it has failed
-	 *
-	 * @return boolean
-	 */
-	public function transStatus(): bool
-	{
-		return $this->transStatus;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @param  boolean $testMode
-	 * @return boolean
-	 */
-	public function transBegin(bool $testMode = false): bool
-	{
-		if (! $this->transEnabled)
-		{
-			return false;
-		}
-
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->transDepth > 0)
-		{
-			$this->transDepth ++;
-			return true;
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		// Reset the transaction failure flag.
-		// If the $test_mode flag is set to TRUE transactions will be rolled back
-		// even if the queries produce a successful result.
-		$this->transFailure = ($testMode === true);
-
-		if ($this->_transBegin())
-		{
-			$this->transDepth ++;
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	public function transCommit(): bool
-	{
-		if (! $this->transEnabled || $this->transDepth === 0)
-		{
-			return false;
-		}
-
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->transDepth > 1 || $this->_transCommit())
-		{
-			$this->transDepth --;
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	public function transRollback(): bool
-	{
-		if (! $this->transEnabled || $this->transDepth === 0)
-		{
-			return false;
-		}
-
-		// When transactions are nested we only begin/commit/rollback the outermost ones
-		if ($this->transDepth > 1 || $this->_transRollback())
-		{
-			$this->transDepth --;
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	abstract protected function _transBegin(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	abstract protected function _transCommit(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	abstract protected function _transRollback(): bool;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns an instance of the query builder for this connection.
-	 *
-	 * @param string|array $tableName
-	 *
-	 * @return BaseBuilder
-	 * @throws DatabaseException
-	 */
-	public function table($tableName)
-	{
-		if (empty($tableName))
-		{
-			throw new DatabaseException('You must set the database table to be used with your query.');
-		}
-
-		$className = str_replace('Connection', 'Builder', get_class($this));
-
-		return new $className($tableName, $this);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Creates a prepared statement with the database that can then
-	 * be used to execute multiple statements against. Within the
-	 * closure, you would build the query in any normal way, though
-	 * the Query Builder is the expected manner.
-	 *
-	 * Example:
-	 *    $stmt = $db->prepare(function($db)
-	 *           {
-	 *             return $db->table('users')
-	 *                   ->where('id', 1)
-	 *                     ->get();
-	 *           })
-	 *
-	 * @param Closure $func
-	 * @param array   $options Passed to the prepare() method
-	 *
-	 * @return BasePreparedQuery|null
-	 */
-	public function prepare(Closure $func, array $options = [])
-	{
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		$this->pretend();
-
-		$sql = $func($this);
-
-		$this->pretend(false);
-
-		if ($sql instanceof QueryInterface)
-		{
-			// @phpstan-ignore-next-line
-			$sql = $sql->getOriginalQuery();
-		}
-
-		$class = str_ireplace('Connection', 'PreparedQuery', get_class($this));
-		/**
-		 * @var BasePreparedQuery $class
-		 */
-		$class = new $class($this);
-
-		return $class->prepare($sql, $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last query's statement object.
-	 *
-	 * @return mixed
-	 */
-	public function getLastQuery()
-	{
-		return $this->lastQuery;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string representation of the last query's statement object.
-	 *
-	 * @return string
-	 */
-	public function showLastQuery(): string
-	{
-		return (string) $this->lastQuery;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the time we started to connect to this database in
-	 * seconds with microseconds.
-	 *
-	 * Used by the Debug Toolbar's timeline.
-	 *
-	 * @return float|null
-	 */
-	public function getConnectStart(): ?float
-	{
-		return $this->connectTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of seconds with microseconds that it took
-	 * to connect to the database.
-	 *
-	 * Used by the Debug Toolbar's timeline.
-	 *
-	 * @param integer $decimals
-	 *
-	 * @return string
-	 */
-	public function getConnectDuration(int $decimals = 6): string
-	{
-		return number_format($this->connectDuration, $decimals);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Protect Identifiers
-	 *
-	 * This function is used extensively by the Query Builder class, and by
-	 * a couple functions in this class.
-	 * It takes a column or table name (optionally with an alias) and inserts
-	 * the table prefix onto it. Some logic is necessary in order to deal with
-	 * column names that include the path. Consider a query like this:
-	 *
-	 * SELECT hostname.database.table.column AS c FROM hostname.database.table
-	 *
-	 * Or a query with aliasing:
-	 *
-	 * SELECT m.member_id, m.member_name FROM members AS m
-	 *
-	 * Since the column name can include up to four segments (host, DB, table, column)
-	 * or also have an alias prefix, we need to do a bit of work to figure this out and
-	 * insert the table prefix (if it exists) in the proper position, and escape only
-	 * the correct identifiers.
-	 *
-	 * @param string|array $item
-	 * @param boolean      $prefixSingle
-	 * @param boolean      $protectIdentifiers
-	 * @param boolean      $fieldExists
-	 *
-	 * @return string|array
-	 */
-	public function protectIdentifiers($item, bool $prefixSingle = false, bool $protectIdentifiers = null, bool $fieldExists = true)
-	{
-		if (! is_bool($protectIdentifiers))
-		{
-			$protectIdentifiers = $this->protectIdentifiers;
-		}
-
-		if (is_array($item))
-		{
-			$escapedArray = [];
-			foreach ($item as $k => $v)
-			{
-				$escapedArray[$this->protectIdentifiers($k)] = $this->protectIdentifiers($v, $prefixSingle, $protectIdentifiers, $fieldExists);
-			}
-
-			return $escapedArray;
-		}
-
-		// This is basically a bug fix for queries that use MAX, MIN, etc.
-		// If a parenthesis is found we know that we do not need to
-		// escape the data or add a prefix. There's probably a more graceful
-		// way to deal with this, but I'm not thinking of it
-		//
-		// Added exception for single quotes as well, we don't want to alter
-		// literal strings.
-		if (strcspn($item, "()'") !== strlen($item))
-		{
-			return $item;
-		}
-
-		// Convert tabs or multiple spaces into single spaces
-		$item = preg_replace('/\s+/', ' ', trim($item));
-
-		// If the item has an alias declaration we remove it and set it aside.
-		// Note: strripos() is used in order to support spaces in table names
-		if ($offset = strripos($item, ' AS '))
-		{
-			$alias = ($protectIdentifiers) ? substr($item, $offset, 4) . $this->escapeIdentifiers(substr($item, $offset + 4)) : substr($item, $offset);
-			$item  = substr($item, 0, $offset);
-		}
-		elseif ($offset = strrpos($item, ' '))
-		{
-			$alias = ($protectIdentifiers) ? ' ' . $this->escapeIdentifiers(substr($item, $offset + 1)) : substr($item, $offset);
-			$item  = substr($item, 0, $offset);
-		}
-		else
-		{
-			$alias = '';
-		}
-
-		// Break the string apart if it contains periods, then insert the table prefix
-		// in the correct location, assuming the period doesn't indicate that we're dealing
-		// with an alias. While we're at it, we will escape the components
-		if (strpos($item, '.') !== false)
-		{
-			$parts = explode('.', $item);
-
-			// Does the first segment of the exploded item match
-			// one of the aliases previously identified? If so,
-			// we have nothing more to do other than escape the item
-			//
-			// NOTE: The ! empty() condition prevents this method
-			//       from breaking when QB isn't enabled.
-			if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true))
-			{
-				if ($protectIdentifiers === true)
-				{
-					foreach ($parts as $key => $val)
-					{
-						if (! in_array($val, $this->reservedIdentifiers, true))
-						{
-							$parts[$key] = $this->escapeIdentifiers($val);
-						}
-					}
-
-					$item = implode('.', $parts);
-				}
-
-				return $item . $alias;
-			}
-
-			// Is there a table prefix defined in the config file? If not, no need to do anything
-			if ($this->DBPrefix !== '')
-			{
-				// We now add the table prefix based on some logic.
-				// Do we have 4 segments (hostname.database.table.column)?
-				// If so, we add the table prefix to the column name in the 3rd segment.
-				if (isset($parts[3]))
-				{
-					$i = 2;
-				}
-				// Do we have 3 segments (database.table.column)?
-				// If so, we add the table prefix to the column name in 2nd position
-				elseif (isset($parts[2]))
-				{
-					$i = 1;
-				}
-				// Do we have 2 segments (table.column)?
-				// If so, we add the table prefix to the column name in 1st segment
-				else
-				{
-					$i = 0;
-				}
-
-				// This flag is set when the supplied $item does not contain a field name.
-				// This can happen when this function is being called from a JOIN.
-				if ($fieldExists === false)
-				{
-					$i++;
-				}
-
-				// Verify table prefix and replace if necessary
-				if ($this->swapPre !== '' && strpos($parts[$i], $this->swapPre) === 0)
-				{
-					$parts[$i] = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $parts[$i]);
-				}
-				// We only add the table prefix if it does not already exist
-				elseif (strpos($parts[$i], $this->DBPrefix) !== 0)
-				{
-					$parts[$i] = $this->DBPrefix . $parts[$i];
-				}
-
-				// Put the parts back together
-				$item = implode('.', $parts);
-			}
-
-			if ($protectIdentifiers === true)
-			{
-				$item = $this->escapeIdentifiers($item);
-			}
-
-			return $item . $alias;
-		}
-
-		// In some cases, especially 'from', we end up running through
-		// protect_identifiers twice. This algorithm won't work when
-		// it contains the escapeChar so strip it out.
-		$item = trim($item, $this->escapeChar);
-
-		// Is there a table prefix? If not, no need to insert it
-		if ($this->DBPrefix !== '')
-		{
-			// Verify table prefix and replace if necessary
-			if ($this->swapPre !== '' && strpos($item, $this->swapPre) === 0)
-			{
-				$item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
-			}
-			// Do we prefix an item with no segments?
-			elseif ($prefixSingle === true && strpos($item, $this->DBPrefix) !== 0)
-			{
-				$item = $this->DBPrefix . $item;
-			}
-		}
-
-		if ($protectIdentifiers === true && ! in_array($item, $this->reservedIdentifiers, true))
-		{
-			$item = $this->escapeIdentifiers($item);
-		}
-
-		return $item . $alias;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Escape the SQL Identifiers
-	 *
-	 * This function escapes column and table names
-	 *
-	 * @param mixed $item
-	 *
-	 * @return mixed
-	 */
-	public function escapeIdentifiers($item)
-	{
-		if ($this->escapeChar === '' || empty($item) || in_array($item, $this->reservedIdentifiers, true))
-		{
-			return $item;
-		}
-
-		if (is_array($item))
-		{
-			foreach ($item as $key => $value)
-			{
-				$item[$key] = $this->escapeIdentifiers($value);
-			}
-
-			return $item;
-		}
-
-		// Avoid breaking functions and literal values inside queries
-		if (ctype_digit($item)
-			|| $item[0] === "'"
-			|| ($this->escapeChar !== '"' && $item[0] === '"')
-			|| strpos($item, '(') !== false)
-		{
-			return $item;
-		}
-
-		static $pregEc = [];
-
-		if (empty($pregEc))
-		{
-			if (is_array($this->escapeChar))
-			{
-				$pregEc = [
-					preg_quote($this->escapeChar[0], '/'),
-					preg_quote($this->escapeChar[1], '/'),
-					$this->escapeChar[0],
-					$this->escapeChar[1],
-				];
-			}
-			else
-			{
-				$pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
-				$pregEc[2] = $pregEc[3] = $this->escapeChar;
-			}
-		}
-
-		foreach ($this->reservedIdentifiers as $id)
-		{
-			if (strpos($item, '.' . $id) !== false)
-			{
-				return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
-			}
-		}
-
-		return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepends a database prefix if one exists in configuration
-	 *
-	 * @param string $table the table
-	 *
-	 * @return string
-	 *
-	 * @throws DatabaseException
-	 */
-	public function prefixTable(string $table = ''): string
-	{
-		if ($table === '')
-		{
-			throw new DatabaseException('A table name is required for that operation.');
-		}
-
-		return $this->DBPrefix . $table;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	abstract public function affectedRows(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * "Smart" Escape String
-	 *
-	 * Escapes data based on type.
-	 * Sets boolean and null types
-	 *
-	 * @param mixed $str
-	 *
-	 * @return mixed
-	 */
-	public function escape($str)
-	{
-		if (is_array($str))
-		{
-			return array_map([&$this, 'escape'], $str);
-		}
-
-		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
-		{
-			return "'" . $this->escapeString($str) . "'";
-		}
-
-		if (is_bool($str))
-		{
-			return ($str === false) ? 0 : 1;
-		}
-
-		if (is_numeric($str) && $str < 0)
-		{
-			return "'{$str}'";
-		}
-
-		if ($str === null)
-		{
-			return 'NULL';
-		}
-
-		return $str;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Escape String
-	 *
-	 * @param  string|string[] $str  Input string
-	 * @param  boolean         $like Whether or not the string will be used in a LIKE condition
-	 * @return string|string[]
-	 */
-	public function escapeString($str, bool $like = false)
-	{
-		if (is_array($str))
-		{
-			foreach ($str as $key => $val)
-			{
-				$str[$key] = $this->escapeString($val, $like);
-			}
-
-			return $str;
-		}
-
-		$str = $this->_escapeString($str);
-
-		// escape LIKE condition wildcards
-		if ($like === true)
-		{
-			return str_replace([
-				$this->likeEscapeChar,
-				'%',
-				'_',
-			], [
-				$this->likeEscapeChar . $this->likeEscapeChar,
-				$this->likeEscapeChar . '%',
-				$this->likeEscapeChar . '_',
-			], $str
-			);
-		}
-
-		return $str;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Escape LIKE String
-	 *
-	 * Calls the individual driver for platform
-	 * specific escaping for LIKE conditions
-	 *
-	 * @param  string|string[] $str
-	 * @return string|string[]
-	 */
-	public function escapeLikeString($str)
-	{
-		return $this->escapeString($str, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform independent string escape.
-	 *
-	 * Will likely be overridden in child classes.
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		return str_replace("'", "''", remove_invisible_characters($str, false));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * This function enables you to call PHP database functions that are not natively included
-	 * in CodeIgniter, in a platform independent manner.
-	 *
-	 * @param string $functionName
-	 * @param array  ...$params
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function callFunction(string $functionName, ...$params): bool
-	{
-		$driver = strtolower($this->DBDriver);
-		$driver = ($driver === 'postgre' ? 'pg' : $driver) . '_';
-
-		if (false === strpos($driver, $functionName))
-		{
-			$functionName = $driver . $functionName;
-		}
-
-		if (! function_exists($functionName))
-		{
-			if ($this->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		return $functionName(...$params);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// META Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of table names
-	 *
-	 * @param  boolean $constrainByPrefix = FALSE
-	 * @return boolean|array
-	 * @throws DatabaseException
-	 */
-	public function listTables(bool $constrainByPrefix = false)
-	{
-		// Is there a cached result?
-		if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
-		{
-			return $constrainByPrefix ?
-				preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
-				: $this->dataCache['table_names'];
-		}
-
-		if (false === ($sql = $this->_listTables($constrainByPrefix)))
-		{
-			if ($this->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-			return false;
-		}
-
-		$this->dataCache['table_names'] = [];
-		$query                          = $this->query($sql);
-
-		foreach ($query->getResultArray() as $row)
-		{
-			// Do we know from which column to get the table name?
-			if (! isset($key))
-			{
-				if (isset($row['table_name']))
-				{
-					$key = 'table_name';
-				}
-				elseif (isset($row['TABLE_NAME']))
-				{
-					$key = 'TABLE_NAME';
-				}
-				else
-				{
-					/* We have no other choice but to just get the first element's key.
-					 * Due to array_shift() accepting its argument by reference, if
-					 * E_STRICT is on, this would trigger a warning. So we'll have to
-					 * assign it first.
-					 */
-					$key = array_keys($row);
-					$key = array_shift($key);
-				}
-			}
-
-			$this->dataCache['table_names'][] = $row[$key];
-		}
-
-		return $this->dataCache['table_names'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determine if a particular table exists
-	 *
-	 * @param  string $tableName
-	 * @return boolean
-	 */
-	public function tableExists(string $tableName): bool
-	{
-		return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch Field Names
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return array|false
-	 * @throws DatabaseException
-	 */
-	public function getFieldNames(string $table)
-	{
-		// Is there a cached result?
-		if (isset($this->dataCache['field_names'][$table]))
-		{
-			return $this->dataCache['field_names'][$table];
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		if (false === ($sql = $this->_listColumns($table)))
-		{
-			if ($this->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-			return false;
-		}
-
-		$query                                  = $this->query($sql);
-		$this->dataCache['field_names'][$table] = [];
-
-		foreach ($query->getResultArray() as $row)
-		{
-			// Do we know from where to get the column's name?
-			if (! isset($key))
-			{
-				if (isset($row['column_name']))
-				{
-					$key = 'column_name';
-				}
-				elseif (isset($row['COLUMN_NAME']))
-				{
-					$key = 'COLUMN_NAME';
-				}
-				else
-				{
-					// We have no other choice but to just get the first element's key.
-					$key = key($row);
-				}
-			}
-
-			$this->dataCache['field_names'][$table][] = $row[$key];
-		}
-
-		return $this->dataCache['field_names'][$table];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determine if a particular field exists
-	 *
-	 * @param  string $fieldName
-	 * @param  string $tableName
-	 * @return boolean
-	 */
-	public function fieldExists(string $fieldName, string $tableName): bool
-	{
-		return in_array($fieldName, $this->getFieldNames($tableName), true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an object with field data
-	 *
-	 * @param  string $table the table name
-	 * @return array
-	 */
-	public function getFieldData(string $table)
-	{
-		return $this->_fieldData($this->protectIdentifiers($table, true, false, false));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an object with key data
-	 *
-	 * @param  string $table the table name
-	 * @return array
-	 */
-	public function getIndexData(string $table)
-	{
-		return $this->_indexData($this->protectIdentifiers($table, true, false, false));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an object with foreign key data
-	 *
-	 * @param  string $table the table name
-	 * @return array
-	 */
-	public function getForeignKeyData(string $table)
-	{
-		return $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Disables foreign key checks temporarily.
-	 */
-	public function disableForeignKeyChecks()
-	{
-		$sql = $this->_disableForeignKeyChecks();
-
-		return $this->query($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Enables foreign key checks temporarily.
-	 */
-	public function enableForeignKeyChecks()
-	{
-		$sql = $this->_enableForeignKeyChecks();
-
-		return $this->query($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows the engine to be set into a mode where queries are not
-	 * actually executed, but they are still generated, timed, etc.
-	 *
-	 * This is primarily used by the prepared query functionality.
-	 *
-	 * @param boolean $pretend
-	 *
-	 * @return $this
-	 */
-	public function pretend(bool $pretend = true)
-	{
-		$this->pretend = $pretend;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Empties our data cache. Especially helpful during testing.
-	 *
-	 * @return $this
-	 */
-	public function resetDataCache()
-	{
-		$this->dataCache = [];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the statement is a write-type query or not.
-	 *
-	 * @param  string $sql
-	 * @return boolean
-	 */
-	public function isWriteType($sql): bool
-	{
-		return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 *
-	 * Must return an array with keys 'code' and 'message':
-	 *
-	 *  return ['code' => null, 'message' => null);
-	 *
-	 * @return array
-	 */
-	abstract public function error(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer|string
-	 */
-	abstract public function insertID();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $constrainByPrefix
-	 *
-	 * @return string|false
-	 */
-	abstract protected function _listTables(bool $constrainByPrefix = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string|false
-	 */
-	abstract protected function _listColumns(string $table = '');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-specific field data information.
-	 *
-	 * @param  string $table
-	 * @see    getFieldData()
-	 * @return array
-	 */
-	abstract protected function _fieldData(string $table): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-specific index data.
-	 *
-	 * @param  string $table
-	 * @see    getIndexData()
-	 * @return array
-	 */
-	abstract protected function _indexData(string $table): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-specific foreign keys data.
-	 *
-	 * @param  string $table
-	 * @see    getForeignKeyData()
-	 * @return array
-	 */
-	abstract protected function _foreignKeyData(string $table): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Accessor for properties if they exist.
-	 *
-	 * @param string $key
-	 *
-	 * @return mixed
-	 */
-	public function __get(string $key)
-	{
-		if (property_exists($this, $key))
-		{
-			return $this->$key;
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checker for properties existence.
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $key): bool
-	{
-		return property_exists($this, $key);
-	}
-
-	//--------------------------------------------------------------------
-
+    /**
+     * Data Source Name / Connect string
+     *
+     * @var string
+     */
+    protected $DSN;
+
+    /**
+     * Database port
+     *
+     * @var int|string
+     */
+    protected $port = '';
+
+    /**
+     * Hostname
+     *
+     * @var string
+     */
+    protected $hostname;
+
+    /**
+     * Username
+     *
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Password
+     *
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * Database name
+     *
+     * @var string
+     */
+    protected $database;
+
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    protected $DBDriver = 'MySQLi';
+
+    /**
+     * Sub-driver
+     *
+     * @used-by CI_DB_pdo_driver
+     *
+     * @var string
+     */
+    protected $subdriver;
+
+    /**
+     * Table prefix
+     *
+     * @var string
+     */
+    protected $DBPrefix = '';
+
+    /**
+     * Persistent connection flag
+     *
+     * @var bool
+     */
+    protected $pConnect = false;
+
+    /**
+     * Debug flag
+     *
+     * Whether to display error messages.
+     *
+     * @var bool
+     */
+    protected $DBDebug = false;
+
+    /**
+     * Character set
+     *
+     * @var string
+     */
+    protected $charset = 'utf8';
+
+    /**
+     * Collation
+     *
+     * @var string
+     */
+    protected $DBCollat = 'utf8_general_ci';
+
+    /**
+     * Swap Prefix
+     *
+     * @var string
+     */
+    protected $swapPre = '';
+
+    /**
+     * Encryption flag/data
+     *
+     * @var mixed
+     */
+    protected $encrypt = false;
+
+    /**
+     * Compression flag
+     *
+     * @var bool
+     */
+    protected $compress = false;
+
+    /**
+     * Strict ON flag
+     *
+     * Whether we're running in strict SQL mode.
+     *
+     * @var bool
+     */
+    protected $strictOn;
+
+    /**
+     * Settings for a failover connection.
+     *
+     * @var array
+     */
+    protected $failover = [];
+
+    /**
+     * The last query object that was executed
+     * on this connection.
+     *
+     * @var mixed
+     */
+    protected $lastQuery;
+
+    /**
+     * Connection ID
+     *
+     * @var bool|object|resource
+     */
+    public $connID = false;
+
+    /**
+     * Result ID
+     *
+     * @var bool|object|resource
+     */
+    public $resultID = false;
+
+    /**
+     * Protect identifiers flag
+     *
+     * @var bool
+     */
+    public $protectIdentifiers = true;
+
+    /**
+     * List of reserved identifiers
+     *
+     * Identifiers that must NOT be escaped.
+     *
+     * @var array
+     */
+    protected $reservedIdentifiers = ['*'];
+
+    /**
+     * Identifier escape character
+     *
+     * @var array|string
+     */
+    public $escapeChar = '"';
+
+    /**
+     * ESCAPE statement string
+     *
+     * @var string
+     */
+    public $likeEscapeStr = " ESCAPE '%s' ";
+
+    /**
+     * ESCAPE character
+     *
+     * @var string
+     */
+    public $likeEscapeChar = '!';
+
+    /**
+     * Holds previously looked up data
+     * for performance reasons.
+     *
+     * @var array
+     */
+    public $dataCache = [];
+
+    /**
+     * Microtime when connection was made
+     *
+     * @var float
+     */
+    protected $connectTime;
+
+    /**
+     * How long it took to establish connection.
+     *
+     * @var float
+     */
+    protected $connectDuration;
+
+    /**
+     * If true, no queries will actually be
+     * ran against the database.
+     *
+     * @var bool
+     */
+    protected $pretend = false;
+
+    /**
+     * Transaction enabled flag
+     *
+     * @var bool
+     */
+    public $transEnabled = true;
+
+    /**
+     * Strict transaction mode flag
+     *
+     * @var bool
+     */
+    public $transStrict = true;
+
+    /**
+     * Transaction depth level
+     *
+     * @var int
+     */
+    protected $transDepth = 0;
+
+    /**
+     * Transaction status flag
+     *
+     * Used with transactions to determine if a rollback should occur.
+     *
+     * @var bool
+     */
+    protected $transStatus = true;
+
+    /**
+     * Transaction failure flag
+     *
+     * Used with transactions to determine if a transaction has failed.
+     *
+     * @var bool
+     */
+    protected $transFailure = false;
+
+    /**
+     * Array of table aliases.
+     *
+     * @var array
+     */
+    protected $aliasedTables = [];
+
+    /**
+     * Query Class
+     *
+     * @var string
+     */
+    protected $queryClass = 'CodeIgniter\\Database\\Query';
+
+    /**
+     * Saves our connection settings.
+     */
+    public function __construct(array $params)
+    {
+        foreach ($params as $key => $value) {
+            $this->{$key} = $value;
+        }
+
+        $queryClass = str_replace('Connection', 'Query', static::class);
+
+        if (class_exists($queryClass)) {
+            $this->queryClass = $queryClass;
+        }
+    }
+
+    /**
+     * Initializes the database connection/settings.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function initialize()
+    {
+        /* If an established connection is available, then there's
+         * no need to connect and select the database.
+         *
+         * Depending on the database driver, conn_id can be either
+         * boolean TRUE, a resource or an object.
+         */
+        if ($this->connID) {
+            return;
+        }
+
+        $this->connectTime = microtime(true);
+        $connectionErrors  = [];
+
+        try {
+            // Connect to the database and set the connection ID
+            $this->connID = $this->connect($this->pConnect);
+        } catch (Throwable $e) {
+            $connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage());
+            log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+        }
+
+        // No connection resource? Check if there is a failover else throw an error
+        if (! $this->connID) {
+            // Check if there is a failover set
+            if (! empty($this->failover) && is_array($this->failover)) {
+                // Go over all the failovers
+                foreach ($this->failover as $index => $failover) {
+                    // Replace the current settings with those of the failover
+                    foreach ($failover as $key => $val) {
+                        if (property_exists($this, $key)) {
+                            $this->{$key} = $val;
+                        }
+                    }
+
+                    try {
+                        // Try to connect
+                        $this->connID = $this->connect($this->pConnect);
+                    } catch (Throwable $e) {
+                        $connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage());
+                        log_message('error', 'Error connecting to the database: ' . $e->getMessage());
+                    }
+
+                    // If a connection is made break the foreach loop
+                    if ($this->connID) {
+                        break;
+                    }
+                }
+            }
+
+            // We still don't have a connection?
+            if (! $this->connID) {
+                throw new DatabaseException(sprintf(
+                    'Unable to connect to the database.%s%s',
+                    PHP_EOL,
+                    implode(PHP_EOL, $connectionErrors)
+                ));
+            }
+        }
+
+        $this->connectDuration = microtime(true) - $this->connectTime;
+    }
+
+    /**
+     * Connect to the database.
+     *
+     * @return mixed
+     */
+    abstract public function connect(bool $persistent = false);
+
+    /**
+     * Close the database connection.
+     */
+    public function close()
+    {
+        if ($this->connID) {
+            $this->_close();
+            $this->connID = false;
+        }
+    }
+
+    /**
+     * Platform dependent way method for closing the connection.
+     *
+     * @return mixed
+     */
+    abstract protected function _close();
+
+    /**
+     * Create a persistent database connection.
+     *
+     * @return mixed
+     */
+    public function persistentConnect()
+    {
+        return $this->connect(true);
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     *
+     * @return mixed
+     */
+    abstract public function reconnect();
+
+    /**
+     * Returns the actual connection object. If both a 'read' and 'write'
+     * connection has been specified, you can pass either term in to
+     * get that connection. If you pass either alias in and only a single
+     * connection is present, it must return the sole connection.
+     *
+     * @return mixed
+     */
+    public function getConnection(?string $alias = null)
+    {
+        // @todo work with read/write connections
+        return $this->connID;
+    }
+
+    /**
+     * Select a specific database table to use.
+     *
+     * @return mixed
+     */
+    abstract public function setDatabase(string $databaseName);
+
+    /**
+     * Returns the name of the current database being used.
+     */
+    public function getDatabase(): string
+    {
+        return empty($this->database) ? '' : $this->database;
+    }
+
+    /**
+     * Set DB Prefix
+     *
+     * Set's the DB Prefix to something new without needing to reconnect
+     *
+     * @param string $prefix The prefix
+     */
+    public function setPrefix(string $prefix = ''): string
+    {
+        return $this->DBPrefix = $prefix;
+    }
+
+    /**
+     * Returns the database prefix.
+     */
+    public function getPrefix(): string
+    {
+        return $this->DBPrefix;
+    }
+
+    /**
+     * The name of the platform in use (MySQLi, mssql, etc)
+     */
+    public function getPlatform(): string
+    {
+        return $this->DBDriver;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    abstract public function getVersion(): string;
+
+    /**
+     * Sets the Table Aliases to use. These are typically
+     * collected during use of the Builder, and set here
+     * so queries are built correctly.
+     *
+     * @return $this
+     */
+    public function setAliasedTables(array $aliases)
+    {
+        $this->aliasedTables = $aliases;
+
+        return $this;
+    }
+
+    /**
+     * Add a table alias to our list.
+     *
+     * @return $this
+     */
+    public function addTableAlias(string $table)
+    {
+        if (! in_array($table, $this->aliasedTables, true)) {
+            $this->aliasedTables[] = $table;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return mixed
+     */
+    abstract protected function execute(string $sql);
+
+    /**
+     * Orchestrates a query against the database. Queries must use
+     * Database\Statement objects to store the query and build it.
+     * This method works with the cache.
+     *
+     * Should automatically handle different connections for read/write
+     * queries if needed.
+     *
+     * @param mixed ...$binds
+     *
+     * @return BaseResult|bool|Query
+     *
+     * @todo BC set $queryClass default as null in 4.1
+     */
+    public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
+    {
+        $queryClass = $queryClass ?: $this->queryClass;
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        /**
+         * @var Query $query
+         */
+        $query = new $queryClass($this);
+
+        $query->setQuery($sql, $binds, $setEscapeFlags);
+
+        if (! empty($this->swapPre) && ! empty($this->DBPrefix)) {
+            $query->swapPrefix($this->DBPrefix, $this->swapPre);
+        }
+
+        $startTime = microtime(true);
+
+        // Always save the last query so we can use
+        // the getLastQuery() method.
+        $this->lastQuery = $query;
+
+        // Run the query for real
+        if (! $this->pretend && false === ($this->resultID = $this->simpleQuery($query->getQuery()))) {
+            $query->setDuration($startTime, $startTime);
+
+            // This will trigger a rollback if transactions are being used
+            if ($this->transDepth !== 0) {
+                $this->transStatus = false;
+            }
+
+            if ($this->DBDebug) {
+                // We call this function in order to roll-back queries
+                // if transactions are enabled. If we don't call this here
+                // the error message will trigger an exit, causing the
+                // transactions to remain in limbo.
+                while ($this->transDepth !== 0) {
+                    $transDepth = $this->transDepth;
+                    $this->transComplete();
+
+                    if ($transDepth === $this->transDepth) {
+                        log_message('error', 'Database: Failure during an automated transaction commit/rollback!');
+                        break;
+                    }
+                }
+
+                return false;
+            }
+
+            if (! $this->pretend) {
+                // Let others do something with this query.
+                Events::trigger('DBQuery', $query);
+            }
+
+            return false;
+        }
+
+        $query->setDuration($startTime);
+
+        if (! $this->pretend) {
+            // Let others do something with this query
+            Events::trigger('DBQuery', $query);
+        }
+
+        // If $pretend is true, then we just want to return
+        // the actual query object here. There won't be
+        // any results to return.
+        if ($this->pretend) {
+            return $query;
+        }
+
+        // resultID is not false, so it must be successful
+        if ($this->isWriteType($sql)) {
+            return true;
+        }
+
+        // query is not write-type, so it must be read-type query; return QueryResult
+        $resultClass = str_replace('Connection', 'Result', static::class);
+
+        return new $resultClass($this->connID, $this->resultID);
+    }
+
+    /**
+     * Performs a basic query against the database. No binding or caching
+     * is performed, nor are transactions handled. Simply takes a raw
+     * query string and returns the database-specific result id.
+     *
+     * @return mixed
+     */
+    public function simpleQuery(string $sql)
+    {
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        return $this->execute($sql);
+    }
+
+    /**
+     * Disable Transactions
+     *
+     * This permits transactions to be disabled at run-time.
+     */
+    public function transOff()
+    {
+        $this->transEnabled = false;
+    }
+
+    /**
+     * Enable/disable Transaction Strict Mode
+     *
+     * When strict mode is enabled, if you are running multiple groups of
+     * transactions, if one group fails all subsequent groups will be
+     * rolled back.
+     *
+     * If strict mode is disabled, each group is treated autonomously,
+     * meaning a failure of one group will not affect any others
+     *
+     * @param bool $mode = true
+     *
+     * @return $this
+     */
+    public function transStrict(bool $mode = true)
+    {
+        $this->transStrict = $mode;
+
+        return $this;
+    }
+
+    /**
+     * Start Transaction
+     */
+    public function transStart(bool $testMode = false): bool
+    {
+        if (! $this->transEnabled) {
+            return false;
+        }
+
+        return $this->transBegin($testMode);
+    }
+
+    /**
+     * Complete Transaction
+     */
+    public function transComplete(): bool
+    {
+        if (! $this->transEnabled) {
+            return false;
+        }
+
+        // The query() function will set this flag to FALSE in the event that a query failed
+        if ($this->transStatus === false || $this->transFailure === true) {
+            $this->transRollback();
+
+            // If we are NOT running in strict mode, we will reset
+            // the _trans_status flag so that subsequent groups of
+            // transactions will be permitted.
+            if ($this->transStrict === false) {
+                $this->transStatus = true;
+            }
+
+            return false;
+        }
+
+        return $this->transCommit();
+    }
+
+    /**
+     * Lets you retrieve the transaction flag to determine if it has failed
+     */
+    public function transStatus(): bool
+    {
+        return $this->transStatus;
+    }
+
+    /**
+     * Begin Transaction
+     */
+    public function transBegin(bool $testMode = false): bool
+    {
+        if (! $this->transEnabled) {
+            return false;
+        }
+
+        // When transactions are nested we only begin/commit/rollback the outermost ones
+        if ($this->transDepth > 0) {
+            $this->transDepth++;
+
+            return true;
+        }
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        // Reset the transaction failure flag.
+        // If the $test_mode flag is set to TRUE transactions will be rolled back
+        // even if the queries produce a successful result.
+        $this->transFailure = ($testMode === true);
+
+        if ($this->_transBegin()) {
+            $this->transDepth++;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Commit Transaction
+     */
+    public function transCommit(): bool
+    {
+        if (! $this->transEnabled || $this->transDepth === 0) {
+            return false;
+        }
+
+        // When transactions are nested we only begin/commit/rollback the outermost ones
+        if ($this->transDepth > 1 || $this->_transCommit()) {
+            $this->transDepth--;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    public function transRollback(): bool
+    {
+        if (! $this->transEnabled || $this->transDepth === 0) {
+            return false;
+        }
+
+        // When transactions are nested we only begin/commit/rollback the outermost ones
+        if ($this->transDepth > 1 || $this->_transRollback()) {
+            $this->transDepth--;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Begin Transaction
+     */
+    abstract protected function _transBegin(): bool;
+
+    /**
+     * Commit Transaction
+     */
+    abstract protected function _transCommit(): bool;
+
+    /**
+     * Rollback Transaction
+     */
+    abstract protected function _transRollback(): bool;
+
+    /**
+     * Returns an instance of the query builder for this connection.
+     *
+     * @param array|string $tableName
+     *
+     * @throws DatabaseException
+     *
+     * @return BaseBuilder
+     */
+    public function table($tableName)
+    {
+        if (empty($tableName)) {
+            throw new DatabaseException('You must set the database table to be used with your query.');
+        }
+
+        $className = str_replace('Connection', 'Builder', static::class);
+
+        return new $className($tableName, $this);
+    }
+
+    /**
+     * Creates a prepared statement with the database that can then
+     * be used to execute multiple statements against. Within the
+     * closure, you would build the query in any normal way, though
+     * the Query Builder is the expected manner.
+     *
+     * Example:
+     *    $stmt = $db->prepare(function($db)
+     *           {
+     *             return $db->table('users')
+     *                   ->where('id', 1)
+     *                     ->get();
+     *           })
+     *
+     * @return BasePreparedQuery|null
+     */
+    public function prepare(Closure $func, array $options = [])
+    {
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        $this->pretend();
+
+        $sql = $func($this);
+
+        $this->pretend(false);
+
+        if ($sql instanceof QueryInterface) {
+            // @phpstan-ignore-next-line
+            $sql = $sql->getOriginalQuery();
+        }
+
+        $class = str_ireplace('Connection', 'PreparedQuery', static::class);
+        /** @var BasePreparedQuery $class */
+        $class = new $class($this);
+
+        return $class->prepare($sql, $options);
+    }
+
+    /**
+     * Returns the last query's statement object.
+     *
+     * @return mixed
+     */
+    public function getLastQuery()
+    {
+        return $this->lastQuery;
+    }
+
+    /**
+     * Returns a string representation of the last query's statement object.
+     */
+    public function showLastQuery(): string
+    {
+        return (string) $this->lastQuery;
+    }
+
+    /**
+     * Returns the time we started to connect to this database in
+     * seconds with microseconds.
+     *
+     * Used by the Debug Toolbar's timeline.
+     */
+    public function getConnectStart(): ?float
+    {
+        return $this->connectTime;
+    }
+
+    /**
+     * Returns the number of seconds with microseconds that it took
+     * to connect to the database.
+     *
+     * Used by the Debug Toolbar's timeline.
+     */
+    public function getConnectDuration(int $decimals = 6): string
+    {
+        return number_format($this->connectDuration, $decimals);
+    }
+
+    /**
+     * Protect Identifiers
+     *
+     * This function is used extensively by the Query Builder class, and by
+     * a couple functions in this class.
+     * It takes a column or table name (optionally with an alias) and inserts
+     * the table prefix onto it. Some logic is necessary in order to deal with
+     * column names that include the path. Consider a query like this:
+     *
+     * SELECT hostname.database.table.column AS c FROM hostname.database.table
+     *
+     * Or a query with aliasing:
+     *
+     * SELECT m.member_id, m.member_name FROM members AS m
+     *
+     * Since the column name can include up to four segments (host, DB, table, column)
+     * or also have an alias prefix, we need to do a bit of work to figure this out and
+     * insert the table prefix (if it exists) in the proper position, and escape only
+     * the correct identifiers.
+     *
+     * @param array|string $item
+     *
+     * @return array|string
+     */
+    public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $protectIdentifiers = null, bool $fieldExists = true)
+    {
+        if (! is_bool($protectIdentifiers)) {
+            $protectIdentifiers = $this->protectIdentifiers;
+        }
+
+        if (is_array($item)) {
+            $escapedArray = [];
+
+            foreach ($item as $k => $v) {
+                $escapedArray[$this->protectIdentifiers($k)] = $this->protectIdentifiers($v, $prefixSingle, $protectIdentifiers, $fieldExists);
+            }
+
+            return $escapedArray;
+        }
+
+        // This is basically a bug fix for queries that use MAX, MIN, etc.
+        // If a parenthesis is found we know that we do not need to
+        // escape the data or add a prefix. There's probably a more graceful
+        // way to deal with this, but I'm not thinking of it
+        //
+        // Added exception for single quotes as well, we don't want to alter
+        // literal strings.
+        if (strcspn($item, "()'") !== strlen($item)) {
+            return $item;
+        }
+
+        // Convert tabs or multiple spaces into single spaces
+        $item = preg_replace('/\s+/', ' ', trim($item));
+
+        // If the item has an alias declaration we remove it and set it aside.
+        // Note: strripos() is used in order to support spaces in table names
+        if ($offset = strripos($item, ' AS ')) {
+            $alias = ($protectIdentifiers) ? substr($item, $offset, 4) . $this->escapeIdentifiers(substr($item, $offset + 4)) : substr($item, $offset);
+            $item  = substr($item, 0, $offset);
+        } elseif ($offset = strrpos($item, ' ')) {
+            $alias = ($protectIdentifiers) ? ' ' . $this->escapeIdentifiers(substr($item, $offset + 1)) : substr($item, $offset);
+            $item  = substr($item, 0, $offset);
+        } else {
+            $alias = '';
+        }
+
+        // Break the string apart if it contains periods, then insert the table prefix
+        // in the correct location, assuming the period doesn't indicate that we're dealing
+        // with an alias. While we're at it, we will escape the components
+        if (strpos($item, '.') !== false) {
+            $parts = explode('.', $item);
+
+            // Does the first segment of the exploded item match
+            // one of the aliases previously identified? If so,
+            // we have nothing more to do other than escape the item
+            //
+            // NOTE: The ! empty() condition prevents this method
+            // from breaking when QB isn't enabled.
+            if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
+                if ($protectIdentifiers === true) {
+                    foreach ($parts as $key => $val) {
+                        if (! in_array($val, $this->reservedIdentifiers, true)) {
+                            $parts[$key] = $this->escapeIdentifiers($val);
+                        }
+                    }
+
+                    $item = implode('.', $parts);
+                }
+
+                return $item . $alias;
+            }
+
+            // Is there a table prefix defined in the config file? If not, no need to do anything
+            if ($this->DBPrefix !== '') {
+                // We now add the table prefix based on some logic.
+                // Do we have 4 segments (hostname.database.table.column)?
+                // If so, we add the table prefix to the column name in the 3rd segment.
+                if (isset($parts[3])) {
+                    $i = 2;
+                }
+                // Do we have 3 segments (database.table.column)?
+                // If so, we add the table prefix to the column name in 2nd position
+                elseif (isset($parts[2])) {
+                    $i = 1;
+                }
+                // Do we have 2 segments (table.column)?
+                // If so, we add the table prefix to the column name in 1st segment
+                else {
+                    $i = 0;
+                }
+
+                // This flag is set when the supplied $item does not contain a field name.
+                // This can happen when this function is being called from a JOIN.
+                if ($fieldExists === false) {
+                    $i++;
+                }
+
+                // Verify table prefix and replace if necessary
+                if ($this->swapPre !== '' && strpos($parts[$i], $this->swapPre) === 0) {
+                    $parts[$i] = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $parts[$i]);
+                }
+                // We only add the table prefix if it does not already exist
+                elseif (strpos($parts[$i], $this->DBPrefix) !== 0) {
+                    $parts[$i] = $this->DBPrefix . $parts[$i];
+                }
+
+                // Put the parts back together
+                $item = implode('.', $parts);
+            }
+
+            if ($protectIdentifiers === true) {
+                $item = $this->escapeIdentifiers($item);
+            }
+
+            return $item . $alias;
+        }
+
+        // In some cases, especially 'from', we end up running through
+        // protect_identifiers twice. This algorithm won't work when
+        // it contains the escapeChar so strip it out.
+        $item = trim($item, $this->escapeChar);
+
+        // Is there a table prefix? If not, no need to insert it
+        if ($this->DBPrefix !== '') {
+            // Verify table prefix and replace if necessary
+            if ($this->swapPre !== '' && strpos($item, $this->swapPre) === 0) {
+                $item = preg_replace('/^' . $this->swapPre . '(\S+?)/', $this->DBPrefix . '\\1', $item);
+            }
+            // Do we prefix an item with no segments?
+            elseif ($prefixSingle === true && strpos($item, $this->DBPrefix) !== 0) {
+                $item = $this->DBPrefix . $item;
+            }
+        }
+
+        if ($protectIdentifiers === true && ! in_array($item, $this->reservedIdentifiers, true)) {
+            $item = $this->escapeIdentifiers($item);
+        }
+
+        return $item . $alias;
+    }
+
+    /**
+     * Escape the SQL Identifiers
+     *
+     * This function escapes column and table names
+     *
+     * @param mixed $item
+     *
+     * @return mixed
+     */
+    public function escapeIdentifiers($item)
+    {
+        if ($this->escapeChar === '' || empty($item) || in_array($item, $this->reservedIdentifiers, true)) {
+            return $item;
+        }
+
+        if (is_array($item)) {
+            foreach ($item as $key => $value) {
+                $item[$key] = $this->escapeIdentifiers($value);
+            }
+
+            return $item;
+        }
+
+        // Avoid breaking functions and literal values inside queries
+        if (ctype_digit($item)
+            || $item[0] === "'"
+            || ($this->escapeChar !== '"' && $item[0] === '"')
+            || strpos($item, '(') !== false) {
+            return $item;
+        }
+
+        static $pregEc = [];
+
+        if (empty($pregEc)) {
+            if (is_array($this->escapeChar)) {
+                $pregEc = [
+                    preg_quote($this->escapeChar[0], '/'),
+                    preg_quote($this->escapeChar[1], '/'),
+                    $this->escapeChar[0],
+                    $this->escapeChar[1],
+                ];
+            } else {
+                $pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
+                $pregEc[2] = $pregEc[3] = $this->escapeChar;
+            }
+        }
+
+        foreach ($this->reservedIdentifiers as $id) {
+            if (strpos($item, '.' . $id) !== false) {
+                return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
+            }
+        }
+
+        return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
+    }
+
+    /**
+     * Prepends a database prefix if one exists in configuration
+     *
+     * @throws DatabaseException
+     */
+    public function prefixTable(string $table = ''): string
+    {
+        if ($table === '') {
+            throw new DatabaseException('A table name is required for that operation.');
+        }
+
+        return $this->DBPrefix . $table;
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    abstract public function affectedRows(): int;
+
+    /**
+     * "Smart" Escape String
+     *
+     * Escapes data based on type.
+     * Sets boolean and null types
+     *
+     * @param mixed $str
+     *
+     * @return mixed
+     */
+    public function escape($str)
+    {
+        if (is_array($str)) {
+            return array_map([&$this, 'escape'], $str);
+        }
+
+        if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
+            return "'" . $this->escapeString($str) . "'";
+        }
+
+        if (is_bool($str)) {
+            return ($str === false) ? 0 : 1;
+        }
+
+        if (is_numeric($str) && $str < 0) {
+            return "'{$str}'";
+        }
+
+        return $str ?? 'NULL';
+    }
+
+    /**
+     * Escape String
+     *
+     * @param string|string[] $str  Input string
+     * @param bool            $like Whether or not the string will be used in a LIKE condition
+     *
+     * @return string|string[]
+     */
+    public function escapeString($str, bool $like = false)
+    {
+        if (is_array($str)) {
+            foreach ($str as $key => $val) {
+                $str[$key] = $this->escapeString($val, $like);
+            }
+
+            return $str;
+        }
+
+        $str = $this->_escapeString($str);
+
+        // escape LIKE condition wildcards
+        if ($like === true) {
+            return str_replace(
+                [
+                    $this->likeEscapeChar,
+                    '%',
+                    '_',
+                ],
+                [
+                    $this->likeEscapeChar . $this->likeEscapeChar,
+                    $this->likeEscapeChar . '%',
+                    $this->likeEscapeChar . '_',
+                ],
+                $str
+            );
+        }
+
+        return $str;
+    }
+
+    /**
+     * Escape LIKE String
+     *
+     * Calls the individual driver for platform
+     * specific escaping for LIKE conditions
+     *
+     * @param string|string[] $str
+     *
+     * @return string|string[]
+     */
+    public function escapeLikeString($str)
+    {
+        return $this->escapeString($str, true);
+    }
+
+    /**
+     * Platform independent string escape.
+     *
+     * Will likely be overridden in child classes.
+     */
+    protected function _escapeString(string $str): string
+    {
+        return str_replace("'", "''", remove_invisible_characters($str, false));
+    }
+
+    /**
+     * This function enables you to call PHP database functions that are not natively included
+     * in CodeIgniter, in a platform independent manner.
+     *
+     * @param array ...$params
+     *
+     * @throws DatabaseException
+     */
+    public function callFunction(string $functionName, ...$params): bool
+    {
+        $driver = strtolower($this->DBDriver);
+        $driver = ($driver === 'postgre' ? 'pg' : $driver) . '_';
+
+        if (strpos($driver, $functionName) === false) {
+            $functionName = $driver . $functionName;
+        }
+
+        if (! function_exists($functionName)) {
+            if ($this->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        return $functionName(...$params);
+    }
+
+    //--------------------------------------------------------------------
+    // META Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns an array of table names
+     *
+     * @throws DatabaseException
+     *
+     * @return array|bool
+     */
+    public function listTables(bool $constrainByPrefix = false)
+    {
+        // Is there a cached result?
+        if (isset($this->dataCache['table_names']) && $this->dataCache['table_names']) {
+            return $constrainByPrefix ?
+                preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
+                : $this->dataCache['table_names'];
+        }
+
+        if (false === ($sql = $this->_listTables($constrainByPrefix))) {
+            if ($this->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        $this->dataCache['table_names'] = [];
+
+        $query = $this->query($sql);
+
+        foreach ($query->getResultArray() as $row) {
+            // Do we know from which column to get the table name?
+            if (! isset($key)) {
+                if (isset($row['table_name'])) {
+                    $key = 'table_name';
+                } elseif (isset($row['TABLE_NAME'])) {
+                    $key = 'TABLE_NAME';
+                } else {
+                    /* We have no other choice but to just get the first element's key.
+                     * Due to array_shift() accepting its argument by reference, if
+                     * E_STRICT is on, this would trigger a warning. So we'll have to
+                     * assign it first.
+                     */
+                    $key = array_keys($row);
+                    $key = array_shift($key);
+                }
+            }
+
+            $this->dataCache['table_names'][] = $row[$key];
+        }
+
+        return $this->dataCache['table_names'];
+    }
+
+    /**
+     * Determine if a particular table exists
+     */
+    public function tableExists(string $tableName): bool
+    {
+        return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
+    }
+
+    /**
+     * Fetch Field Names
+     *
+     * @throws DatabaseException
+     *
+     * @return array|false
+     */
+    public function getFieldNames(string $table)
+    {
+        // Is there a cached result?
+        if (isset($this->dataCache['field_names'][$table])) {
+            return $this->dataCache['field_names'][$table];
+        }
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        if (false === ($sql = $this->_listColumns($table))) {
+            if ($this->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        $query = $this->query($sql);
+
+        $this->dataCache['field_names'][$table] = [];
+
+        foreach ($query->getResultArray() as $row) {
+            // Do we know from where to get the column's name?
+            if (! isset($key)) {
+                if (isset($row['column_name'])) {
+                    $key = 'column_name';
+                } elseif (isset($row['COLUMN_NAME'])) {
+                    $key = 'COLUMN_NAME';
+                } else {
+                    // We have no other choice but to just get the first element's key.
+                    $key = key($row);
+                }
+            }
+
+            $this->dataCache['field_names'][$table][] = $row[$key];
+        }
+
+        return $this->dataCache['field_names'][$table];
+    }
+
+    /**
+     * Determine if a particular field exists
+     */
+    public function fieldExists(string $fieldName, string $tableName): bool
+    {
+        return in_array($fieldName, $this->getFieldNames($tableName), true);
+    }
+
+    /**
+     * Returns an object with field data
+     *
+     * @return array
+     */
+    public function getFieldData(string $table)
+    {
+        return $this->_fieldData($this->protectIdentifiers($table, true, false, false));
+    }
+
+    /**
+     * Returns an object with key data
+     *
+     * @return array
+     */
+    public function getIndexData(string $table)
+    {
+        return $this->_indexData($this->protectIdentifiers($table, true, false, false));
+    }
+
+    /**
+     * Returns an object with foreign key data
+     *
+     * @return array
+     */
+    public function getForeignKeyData(string $table)
+    {
+        return $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
+    }
+
+    /**
+     * Disables foreign key checks temporarily.
+     */
+    public function disableForeignKeyChecks()
+    {
+        $sql = $this->_disableForeignKeyChecks();
+
+        return $this->query($sql);
+    }
+
+    /**
+     * Enables foreign key checks temporarily.
+     */
+    public function enableForeignKeyChecks()
+    {
+        $sql = $this->_enableForeignKeyChecks();
+
+        return $this->query($sql);
+    }
+
+    /**
+     * Allows the engine to be set into a mode where queries are not
+     * actually executed, but they are still generated, timed, etc.
+     *
+     * This is primarily used by the prepared query functionality.
+     *
+     * @return $this
+     */
+    public function pretend(bool $pretend = true)
+    {
+        $this->pretend = $pretend;
+
+        return $this;
+    }
+
+    /**
+     * Empties our data cache. Especially helpful during testing.
+     *
+     * @return $this
+     */
+    public function resetDataCache()
+    {
+        $this->dataCache = [];
+
+        return $this;
+    }
+
+    /**
+     * Determines if the statement is a write-type query or not.
+     *
+     * @param string $sql
+     */
+    public function isWriteType($sql): bool
+    {
+        return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql);
+    }
+
+    /**
+     * Returns the last error code and message.
+     *
+     * Must return an array with keys 'code' and 'message':
+     *
+     *  return ['code' => null, 'message' => null);
+     */
+    abstract public function error(): array;
+
+    /**
+     * Insert ID
+     *
+     * @return int|string
+     */
+    abstract public function insertID();
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     *
+     * @return false|string
+     */
+    abstract protected function _listTables(bool $constrainByPrefix = false);
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     *
+     * @return false|string
+     */
+    abstract protected function _listColumns(string $table = '');
+
+    /**
+     * Platform-specific field data information.
+     *
+     * @see    getFieldData()
+     */
+    abstract protected function _fieldData(string $table): array;
+
+    /**
+     * Platform-specific index data.
+     *
+     * @see    getIndexData()
+     */
+    abstract protected function _indexData(string $table): array;
+
+    /**
+     * Platform-specific foreign keys data.
+     *
+     * @see    getForeignKeyData()
+     */
+    abstract protected function _foreignKeyData(string $table): array;
+
+    /**
+     * Accessor for properties if they exist.
+     *
+     * @return mixed
+     */
+    public function __get(string $key)
+    {
+        if (property_exists($this, $key)) {
+            return $this->{$key};
+        }
+
+        return null;
+    }
+
+    /**
+     * Checker for properties existence.
+     */
+    public function __isset(string $key): bool
+    {
+        return property_exists($this, $key);
+    }
 }
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index 00f477b65c9e..faf83d854d7b 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -19,226 +19,171 @@
  */
 abstract class BasePreparedQuery implements PreparedQueryInterface
 {
-	/**
-	 * The prepared statement itself.
-	 *
-	 * @var object|resource
-	 */
-	protected $statement;
-
-	/**
-	 * The error code, if any.
-	 *
-	 * @var integer
-	 */
-	protected $errorCode;
-
-	/**
-	 * The error message, if any.
-	 *
-	 * @var string
-	 */
-	protected $errorString;
-
-	/**
-	 * Holds the prepared query object
-	 * that is cloned during execute.
-	 *
-	 * @var Query
-	 */
-	protected $query;
-
-	/**
-	 * A reference to the db connection to use.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor.
-	 *
-	 * @param BaseConnection $db
-	 */
-	public function __construct(BaseConnection $db)
-	{
-		$this->db = &$db;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options    Passed to the connection's prepare statement.
-	 * @param string $queryClass
-	 *
-	 * @return mixed
-	 */
-	public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
-	{
-		// We only supports positional placeholders (?)
-		// in order to work with the execute method below, so we
-		// need to replace our named placeholders (:name)
-		$sql = preg_replace('/:[^\s,)]+/', '?', $sql);
-
-		/**
-		 * @var Query $query
-		 */
-		$query = new $queryClass($this->db);
-
-		$query->setQuery($sql);
-
-		if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix))
-		{
-			$query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
-		}
-
-		$this->query = $query;
-
-		return $this->_prepare($query->getOriginalQuery(), $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The database-dependent portion of the prepare statement.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *
-	 * @return mixed
-	 */
-	abstract public function _prepare(string $sql, array $options = []);
-
-	//--------------------------------------------------------------------
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return ResultInterface
-	 */
-	public function execute(...$data)
-	{
-		// Execute the Query.
-		$startTime = microtime(true);
-
-		$result = $this->_execute($data);
-
-		// Update our query object
-		$query = clone $this->query;
-		$query->setBinds($data);
-
-		$query->setDuration($startTime);
-
-		// Let others do something with this query
-		Events::trigger('DBQuery', $query);
-
-		// Return a result object
-		$resultClass = str_replace('PreparedQuery', 'Result', get_class($this));
-
-		$resultID = $this->_getResult();
-
-		return new $resultClass($this->db->connID, $resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The database dependant version of the execute method.
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	abstract public function _execute(array $data): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	abstract public function _getResult();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Explicitly closes the statement.
-	 *
-	 * @return void
-	 */
-	public function close()
-	{
-		if (! is_object($this->statement))
-		{
-			return;
-		}
-
-		$this->statement->close();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the SQL that has been prepared.
-	 *
-	 * @return string
-	 */
-	public function getQueryString(): string
-	{
-		if (! $this->query instanceof QueryInterface)
-		{
-			throw new BadMethodCallException('Cannot call getQueryString on a prepared query until after the query has been prepared.');
-		}
-
-		return $this->query->getQuery();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A helper to determine if any error exists.
-	 *
-	 * @return boolean
-	 */
-	public function hasError(): bool
-	{
-		return ! empty($this->errorString);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error code created while executing this statement.
-	 *
-	 * @return integer
-	 */
-	public function getErrorCode(): int
-	{
-		return $this->errorCode;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error message created while executing this statement.
-	 *
-	 * @return string
-	 */
-	public function getErrorMessage(): string
-	{
-		return $this->errorString;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The prepared statement itself.
+     *
+     * @var object|resource
+     */
+    protected $statement;
+
+    /**
+     * The error code, if any.
+     *
+     * @var int
+     */
+    protected $errorCode;
+
+    /**
+     * The error message, if any.
+     *
+     * @var string
+     */
+    protected $errorString;
+
+    /**
+     * Holds the prepared query object
+     * that is cloned during execute.
+     *
+     * @var Query
+     */
+    protected $query;
+
+    /**
+     * A reference to the db connection to use.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    public function __construct(BaseConnection $db)
+    {
+        $this->db = &$db;
+    }
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @return mixed
+     */
+    public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+    {
+        // We only supports positional placeholders (?)
+        // in order to work with the execute method below, so we
+        // need to replace our named placeholders (:name)
+        $sql = preg_replace('/:[^\s,)]+/', '?', $sql);
+
+        /** @var Query $query */
+        $query = new $queryClass($this->db);
+
+        $query->setQuery($sql);
+
+        if (! empty($this->db->swapPre) && ! empty($this->db->DBPrefix)) {
+            $query->swapPrefix($this->db->DBPrefix, $this->db->swapPre);
+        }
+
+        $this->query = $query;
+
+        return $this->_prepare($query->getOriginalQuery(), $options);
+    }
+
+    /**
+     * The database-dependent portion of the prepare statement.
+     *
+     * @return mixed
+     */
+    abstract public function _prepare(string $sql, array $options = []);
+
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     *
+     * @return ResultInterface
+     */
+    public function execute(...$data)
+    {
+        // Execute the Query.
+        $startTime = microtime(true);
+
+        $this->_execute($data);
+
+        // Update our query object
+        $query = clone $this->query;
+        $query->setBinds($data);
+
+        $query->setDuration($startTime);
+
+        // Let others do something with this query
+        Events::trigger('DBQuery', $query);
+
+        // Return a result object
+        $resultClass = str_replace('PreparedQuery', 'Result', static::class);
+
+        $resultID = $this->_getResult();
+
+        return new $resultClass($this->db->connID, $resultID);
+    }
+
+    /**
+     * The database dependant version of the execute method.
+     */
+    abstract public function _execute(array $data): bool;
+
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    abstract public function _getResult();
+
+    /**
+     * Explicitly closes the statement.
+     */
+    public function close()
+    {
+        if (! is_object($this->statement)) {
+            return;
+        }
+
+        $this->statement->close();
+    }
+
+    /**
+     * Returns the SQL that has been prepared.
+     */
+    public function getQueryString(): string
+    {
+        if (! $this->query instanceof QueryInterface) {
+            throw new BadMethodCallException('Cannot call getQueryString on a prepared query until after the query has been prepared.');
+        }
+
+        return $this->query->getQuery();
+    }
+
+    /**
+     * A helper to determine if any error exists.
+     */
+    public function hasError(): bool
+    {
+        return ! empty($this->errorString);
+    }
+
+    /**
+     * Returns the error code created while executing this statement.
+     */
+    public function getErrorCode(): int
+    {
+        return $this->errorCode;
+    }
+
+    /**
+     * Returns the error message created while executing this statement.
+     */
+    public function getErrorMessage(): string
+    {
+        return $this->errorString;
+    }
 }
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index c1bdecc139cb..3adbb592b24c 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -18,618 +18,497 @@
  */
 abstract class BaseResult implements ResultInterface
 {
-	/**
-	 * Connection ID
-	 *
-	 * @var resource|object
-	 */
-	public $connID;
-
-	/**
-	 * Result ID
-	 *
-	 * @var resource|object|boolean
-	 */
-	public $resultID;
-
-	/**
-	 * Result Array
-	 *
-	 * @var array[]
-	 */
-	public $resultArray = [];
-
-	/**
-	 * Result Object
-	 *
-	 * @var object[]
-	 */
-	public $resultObject = [];
-
-	/**
-	 * Custom Result Object
-	 *
-	 * @var array
-	 */
-	public $customResultObject = [];
-
-	/**
-	 * Current Row index
-	 *
-	 * @var integer
-	 */
-	public $currentRow = 0;
-
-	/**
-	 * The number of records in the query result
-	 *
-	 * @var integer|null
-	 */
-	protected $numRows = null;
-
-	/**
-	 * Row data
-	 *
-	 * @var array|null
-	 */
-	public $rowData;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param object|resource $connID
-	 * @param object|resource $resultID
-	 */
-	public function __construct(&$connID, &$resultID)
-	{
-		$this->connID   = $connID;
-		$this->resultID = $resultID;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the results of the query. Typically an array of
-	 * individual data rows, which can be either an 'array', an
-	 * 'object', or a custom class name.
-	 *
-	 * @param string $type The row type. Either 'array', 'object', or a class name to use
-	 *
-	 * @return array
-	 */
-	public function getResult(string $type = 'object'): array
-	{
-		if ($type === 'array')
-		{
-			return $this->getResultArray();
-		}
-
-		if ($type === 'object')
-		{
-			return $this->getResultObject();
-		}
-
-		return $this->getCustomResultObject($type);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of custom objects.
-	 *
-	 * @param string $className The name of the class to use.
-	 *
-	 * @return mixed
-	 */
-	public function getCustomResultObject(string $className)
-	{
-		if (isset($this->customResultObject[$className]))
-		{
-			return $this->customResultObject[$className];
-		}
-
-		if (is_bool($this->resultID) || ! $this->resultID)
-		{
-			return [];
-		}
-
-		// Don't fetch the result set again if we already have it
-		$_data = null;
-		if (($c = count($this->resultArray)) > 0)
-		{
-			$_data = 'resultArray';
-		}
-		elseif (($c = count($this->resultObject)) > 0)
-		{
-			$_data = 'resultObject';
-		}
-
-		if ($_data !== null)
-		{
-			for ($i = 0; $i < $c; $i ++)
-			{
-				$this->customResultObject[$className][$i] = new $className();
-
-				foreach ($this->{$_data}[$i] as $key => $value)
-				{
-					$this->customResultObject[$className][$i]->$key = $value;
-				}
-			}
-
-			return $this->customResultObject[$className];
-		}
-
-		is_null($this->rowData) || $this->dataSeek();
-		$this->customResultObject[$className] = [];
-
-		while ($row = $this->fetchObject($className))
-		{
-			if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal'))
-			{
-				$row->syncOriginal();
-			}
-
-			$this->customResultObject[$className][] = $row;
-		}
-
-		// @phpstan-ignore-next-line
-		return $this->customResultObject[$className];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of arrays.
-	 *
-	 * If no results, an empty array is returned.
-	 *
-	 * @return array
-	 */
-	public function getResultArray(): array
-	{
-		if (! empty($this->resultArray))
-		{
-			return $this->resultArray;
-		}
-
-		// In the event that query caching is on, the result_id variable
-		// will not be a valid resource so we'll simply return an empty
-		// array.
-		if (is_bool($this->resultID) || ! $this->resultID)
-		{
-			return [];
-		}
-
-		if ($this->resultObject)
-		{
-			foreach ($this->resultObject as $row)
-			{
-				$this->resultArray[] = (array) $row;
-			}
-
-			return $this->resultArray;
-		}
-
-		is_null($this->rowData) || $this->dataSeek();
-		while ($row = $this->fetchAssoc())
-		{
-			$this->resultArray[] = $row;
-		}
-
-		return $this->resultArray;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of objects.
-	 *
-	 * If no results, an empty array is returned.
-	 *
-	 * @return array
-	 */
-	public function getResultObject(): array
-	{
-		if (! empty($this->resultObject))
-		{
-			return $this->resultObject;
-		}
-
-		// In the event that query caching is on, the result_id variable
-		// will not be a valid resource so we'll simply return an empty
-		// array.
-		if (is_bool($this->resultID) || ! $this->resultID)
-		{
-			return [];
-		}
-
-		if ($this->resultArray)
-		{
-			foreach ($this->resultArray as $row)
-			{
-				$this->resultObject[] = (object) $row;
-			}
-
-			return $this->resultObject;
-		}
-
-		is_null($this->rowData) || $this->dataSeek();
-		while ($row = $this->fetchObject())
-		{
-			if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal'))
-			{
-				$row->syncOriginal();
-			}
-
-			$this->resultObject[] = $row;
-		}
-
-		// @phpstan-ignore-next-line
-		return $this->resultObject;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrapper object to return a row as either an array, an object, or
-	 * a custom class.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param mixed  $n    The index of the results to return
-	 * @param string $type The type of result object. 'array', 'object' or class name.
-	 *
-	 * @return mixed
-	 */
-	public function getRow($n = 0, string $type = 'object')
-	{
-		if (! is_numeric($n))
-		{
-			// We cache the row data for subsequent uses
-			if (! is_array($this->rowData))
-			{
-				$this->rowData = $this->getRowArray();
-			}
-
-			// array_key_exists() instead of isset() to allow for NULL values
-			if (empty($this->rowData) || ! array_key_exists($n, $this->rowData))
-			{
-				return null;
-			}
-
-			return $this->rowData[$n];
-		}
-
-		if ($type === 'object')
-		{
-			return $this->getRowObject($n);
-		}
-
-		if ($type === 'array')
-		{
-			return $this->getRowArray($n);
-		}
-
-		return $this->getCustomRowObject($n, $type);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a row as a custom class instance.
-	 *
-	 * If row doesn't exists, returns null.
-	 *
-	 * @param integer $n
-	 * @param string  $className
-	 *
-	 * @return mixed
-	 */
-	public function getCustomRowObject(int $n, string $className)
-	{
-		isset($this->customResultObject[$className]) || $this->getCustomResultObject($className);
-
-		if (empty($this->customResultObject[$className]))
-		{
-			return null;
-		}
-
-		if ($n !== $this->currentRow && isset($this->customResultObject[$className][$n]))
-		{
-			$this->currentRow = $n;
-		}
-
-		return $this->customResultObject[$className][$this->currentRow];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a single row from the results as an array.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function getRowArray(int $n = 0)
-	{
-		$result = $this->getResultArray();
-		if (empty($result))
-		{
-			return null;
-		}
-
-		if ($n !== $this->currentRow && isset($result[$n]))
-		{
-			$this->currentRow = $n;
-		}
-
-		return $result[$this->currentRow];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a single row from the results as an object.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function getRowObject(int $n = 0)
-	{
-		$result = $this->getResultObject();
-		if (empty($result))
-		{
-			return null;
-		}
-
-		if ($n !== $this->customResultObject && isset($result[$n]))
-		{
-			$this->currentRow = $n;
-		}
-
-		return $result[$this->currentRow];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Assigns an item into a particular column slot.
-	 *
-	 * @param mixed $key
-	 * @param mixed $value
-	 *
-	 * @return mixed
-	 */
-	public function setRow($key, $value = null)
-	{
-		// We cache the row data for subsequent uses
-		if (! is_array($this->rowData))
-		{
-			$this->rowData = $this->getRowArray();
-		}
-
-		if (is_array($key))
-		{
-			foreach ($key as $k => $v)
-			{
-				$this->rowData[$k] = $v;
-			}
-
-			return;
-		}
-
-		if ($key !== '' && $value !== null)
-		{
-			$this->rowData[$key] = $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "first" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getFirstRow(string $type = 'object')
-	{
-		$result = $this->getResult($type);
-
-		return (empty($result)) ? null : $result[0];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "last" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getLastRow(string $type = 'object')
-	{
-		$result = $this->getResult($type);
-
-		return (empty($result)) ? null : $result[count($result) - 1];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "next" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getNextRow(string $type = 'object')
-	{
-		$result = $this->getResult($type);
-		if (empty($result))
-		{
-			return null;
-		}
-
-		return isset($result[$this->currentRow + 1]) ? $result[++ $this->currentRow] : null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "previous" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getPreviousRow(string $type = 'object')
-	{
-		$result = $this->getResult($type);
-		if (empty($result))
-		{
-			return null;
-		}
-
-		if (isset($result[$this->currentRow - 1]))
-		{
-			-- $this->currentRow;
-		}
-
-		return $result[$this->currentRow];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an unbuffered row and move the pointer to the next row.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getUnbufferedRow(string $type = 'object')
-	{
-		if ($type === 'array')
-		{
-			return $this->fetchAssoc();
-		}
-
-		if ($type === 'object')
-		{
-			return $this->fetchObject();
-		}
-
-		return $this->fetchObject($type);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Number of rows in the result set; checks for previous count, falls
-	 * back on counting resultArray or resultObject, finally fetching resultArray
-	 * if nothing was previously fetched
-	 *
-	 * @return integer
-	 */
-	public function getNumRows(): int
-	{
-		if (is_int($this->numRows))
-		{
-			return $this->numRows;
-		}
-		if ($this->resultArray !== [])
-		{
-			return $this->numRows = count($this->resultArray);
-		}
-		if ($this->resultObject !== [])
-		{
-			return $this->numRows = count($this->resultObject);
-		}
-
-		return $this->numRows = count($this->getResultArray());
-	}
-
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	abstract public function getFieldCount(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	abstract public function getFieldNames(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	abstract public function getFieldData(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	abstract public function freeResult();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	abstract public function dataSeek(int $n = 0);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	abstract protected function fetchAssoc();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object
-	 */
-	abstract protected function fetchObject(string $className = 'stdClass');
-
-	//--------------------------------------------------------------------
+    /**
+     * Connection ID
+     *
+     * @var object|resource
+     */
+    public $connID;
+
+    /**
+     * Result ID
+     *
+     * @var bool|object|resource
+     */
+    public $resultID;
+
+    /**
+     * Result Array
+     *
+     * @var array[]
+     */
+    public $resultArray = [];
+
+    /**
+     * Result Object
+     *
+     * @var object[]
+     */
+    public $resultObject = [];
+
+    /**
+     * Custom Result Object
+     *
+     * @var array
+     */
+    public $customResultObject = [];
+
+    /**
+     * Current Row index
+     *
+     * @var int
+     */
+    public $currentRow = 0;
+
+    /**
+     * The number of records in the query result
+     *
+     * @var int|null
+     */
+    protected $numRows;
+
+    /**
+     * Row data
+     *
+     * @var array|null
+     */
+    public $rowData;
+
+    /**
+     * Constructor
+     *
+     * @param object|resource $connID
+     * @param object|resource $resultID
+     */
+    public function __construct(&$connID, &$resultID)
+    {
+        $this->connID   = $connID;
+        $this->resultID = $resultID;
+    }
+
+    /**
+     * Retrieve the results of the query. Typically an array of
+     * individual data rows, which can be either an 'array', an
+     * 'object', or a custom class name.
+     *
+     * @param string $type The row type. Either 'array', 'object', or a class name to use
+     */
+    public function getResult(string $type = 'object'): array
+    {
+        if ($type === 'array') {
+            return $this->getResultArray();
+        }
+
+        if ($type === 'object') {
+            return $this->getResultObject();
+        }
+
+        return $this->getCustomResultObject($type);
+    }
+
+    /**
+     * Returns the results as an array of custom objects.
+     *
+     * @return mixed
+     */
+    public function getCustomResultObject(string $className)
+    {
+        if (isset($this->customResultObject[$className])) {
+            return $this->customResultObject[$className];
+        }
+
+        if (is_bool($this->resultID) || ! $this->resultID) {
+            return [];
+        }
+
+        // Don't fetch the result set again if we already have it
+        $_data = null;
+        if (($c = count($this->resultArray)) > 0) {
+            $_data = 'resultArray';
+        } elseif (($c = count($this->resultObject)) > 0) {
+            $_data = 'resultObject';
+        }
+
+        if ($_data !== null) {
+            for ($i = 0; $i < $c; $i++) {
+                $this->customResultObject[$className][$i] = new $className();
+
+                foreach ($this->{$_data}[$i] as $key => $value) {
+                    $this->customResultObject[$className][$i]->{$key} = $value;
+                }
+            }
+
+            return $this->customResultObject[$className];
+        }
+
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
+        $this->customResultObject[$className] = [];
+
+        while ($row = $this->fetchObject($className)) {
+            if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) {
+                $row->syncOriginal();
+            }
+
+            $this->customResultObject[$className][] = $row;
+        }
+
+        // @phpstan-ignore-next-line
+        return $this->customResultObject[$className];
+    }
+
+    /**
+     * Returns the results as an array of arrays.
+     *
+     * If no results, an empty array is returned.
+     */
+    public function getResultArray(): array
+    {
+        if (! empty($this->resultArray)) {
+            return $this->resultArray;
+        }
+
+        // In the event that query caching is on, the result_id variable
+        // will not be a valid resource so we'll simply return an empty
+        // array.
+        if (is_bool($this->resultID) || ! $this->resultID) {
+            return [];
+        }
+
+        if ($this->resultObject) {
+            foreach ($this->resultObject as $row) {
+                $this->resultArray[] = (array) $row;
+            }
+
+            return $this->resultArray;
+        }
+
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
+
+        while ($row = $this->fetchAssoc()) {
+            $this->resultArray[] = $row;
+        }
+
+        return $this->resultArray;
+    }
+
+    /**
+     * Returns the results as an array of objects.
+     *
+     * If no results, an empty array is returned.
+     */
+    public function getResultObject(): array
+    {
+        if (! empty($this->resultObject)) {
+            return $this->resultObject;
+        }
+
+        // In the event that query caching is on, the result_id variable
+        // will not be a valid resource so we'll simply return an empty
+        // array.
+        if (is_bool($this->resultID) || ! $this->resultID) {
+            return [];
+        }
+
+        if ($this->resultArray) {
+            foreach ($this->resultArray as $row) {
+                $this->resultObject[] = (object) $row;
+            }
+
+            return $this->resultObject;
+        }
+
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
+
+        while ($row = $this->fetchObject()) {
+            if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) {
+                $row->syncOriginal();
+            }
+
+            $this->resultObject[] = $row;
+        }
+
+        // @phpstan-ignore-next-line
+        return $this->resultObject;
+    }
+
+    /**
+     * Wrapper object to return a row as either an array, an object, or
+     * a custom class.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @param mixed  $n    The index of the results to return
+     * @param string $type The type of result object. 'array', 'object' or class name.
+     *
+     * @return mixed
+     */
+    public function getRow($n = 0, string $type = 'object')
+    {
+        if (! is_numeric($n)) {
+            // We cache the row data for subsequent uses
+            if (! is_array($this->rowData)) {
+                $this->rowData = $this->getRowArray();
+            }
+
+            // array_key_exists() instead of isset() to allow for NULL values
+            if (empty($this->rowData) || ! array_key_exists($n, $this->rowData)) {
+                return null;
+            }
+
+            return $this->rowData[$n];
+        }
+
+        if ($type === 'object') {
+            return $this->getRowObject($n);
+        }
+
+        if ($type === 'array') {
+            return $this->getRowArray($n);
+        }
+
+        return $this->getCustomRowObject($n, $type);
+    }
+
+    /**
+     * Returns a row as a custom class instance.
+     *
+     * If row doesn't exists, returns null.
+     *
+     * @return mixed
+     */
+    public function getCustomRowObject(int $n, string $className)
+    {
+        if (! isset($this->customResultObject[$className])) {
+            $this->getCustomResultObject($className);
+        }
+
+        if (empty($this->customResultObject[$className])) {
+            return null;
+        }
+
+        if ($n !== $this->currentRow && isset($this->customResultObject[$className][$n])) {
+            $this->currentRow = $n;
+        }
+
+        return $this->customResultObject[$className][$this->currentRow];
+    }
+
+    /**
+     * Returns a single row from the results as an array.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @return mixed
+     */
+    public function getRowArray(int $n = 0)
+    {
+        $result = $this->getResultArray();
+        if (empty($result)) {
+            return null;
+        }
+
+        if ($n !== $this->currentRow && isset($result[$n])) {
+            $this->currentRow = $n;
+        }
+
+        return $result[$this->currentRow];
+    }
+
+    /**
+     * Returns a single row from the results as an object.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @return mixed
+     */
+    public function getRowObject(int $n = 0)
+    {
+        $result = $this->getResultObject();
+        if (empty($result)) {
+            return null;
+        }
+
+        if ($n !== $this->customResultObject && isset($result[$n])) {
+            $this->currentRow = $n;
+        }
+
+        return $result[$this->currentRow];
+    }
+
+    /**
+     * Assigns an item into a particular column slot.
+     *
+     * @param mixed $key
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    public function setRow($key, $value = null)
+    {
+        // We cache the row data for subsequent uses
+        if (! is_array($this->rowData)) {
+            $this->rowData = $this->getRowArray();
+        }
+
+        if (is_array($key)) {
+            foreach ($key as $k => $v) {
+                $this->rowData[$k] = $v;
+            }
+
+            return;
+        }
+
+        if ($key !== '' && $value !== null) {
+            $this->rowData[$key] = $value;
+        }
+    }
+
+    /**
+     * Returns the "first" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getFirstRow(string $type = 'object')
+    {
+        $result = $this->getResult($type);
+
+        return (empty($result)) ? null : $result[0];
+    }
+
+    /**
+     * Returns the "last" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getLastRow(string $type = 'object')
+    {
+        $result = $this->getResult($type);
+
+        return (empty($result)) ? null : $result[count($result) - 1];
+    }
+
+    /**
+     * Returns the "next" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getNextRow(string $type = 'object')
+    {
+        $result = $this->getResult($type);
+        if (empty($result)) {
+            return null;
+        }
+
+        return isset($result[$this->currentRow + 1]) ? $result[++$this->currentRow] : null;
+    }
+
+    /**
+     * Returns the "previous" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getPreviousRow(string $type = 'object')
+    {
+        $result = $this->getResult($type);
+        if (empty($result)) {
+            return null;
+        }
+
+        if (isset($result[$this->currentRow - 1])) {
+            $this->currentRow--;
+        }
+
+        return $result[$this->currentRow];
+    }
+
+    /**
+     * Returns an unbuffered row and move the pointer to the next row.
+     *
+     * @return mixed
+     */
+    public function getUnbufferedRow(string $type = 'object')
+    {
+        if ($type === 'array') {
+            return $this->fetchAssoc();
+        }
+
+        if ($type === 'object') {
+            return $this->fetchObject();
+        }
+
+        return $this->fetchObject($type);
+    }
+
+    /**
+     * Number of rows in the result set; checks for previous count, falls
+     * back on counting resultArray or resultObject, finally fetching resultArray
+     * if nothing was previously fetched
+     */
+    public function getNumRows(): int
+    {
+        if (is_int($this->numRows)) {
+            return $this->numRows;
+        }
+        if ($this->resultArray !== []) {
+            return $this->numRows = count($this->resultArray);
+        }
+        if ($this->resultObject !== []) {
+            return $this->numRows = count($this->resultObject);
+        }
+
+        return $this->numRows = count($this->getResultArray());
+    }
+
+    /**
+     * Gets the number of fields in the result set.
+     */
+    abstract public function getFieldCount(): int;
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    abstract public function getFieldNames(): array;
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    abstract public function getFieldData(): array;
+
+    /**
+     * Frees the current result.
+     */
+    abstract public function freeResult();
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    abstract public function dataSeek(int $n = 0);
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    abstract protected function fetchAssoc();
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @return object
+     */
+    abstract protected function fetchObject(string $className = 'stdClass');
 }
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 9922133a8cf6..5af2b54dbad7 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -18,376 +18,304 @@
  */
 abstract class BaseUtils
 {
-	/**
-	 * Database object
-	 *
-	 * @var object
-	 */
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * List databases statement
-	 *
-	 * @var string|boolean
-	 */
-	protected $listDatabases = false;
-
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string|boolean
-	 */
-	protected $optimizeTable = false;
-
-	/**
-	 * REPAIR TABLE statement
-	 *
-	 * @var string|boolean
-	 */
-	protected $repairTable = false;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Class constructor
-	 *
-	 * @param ConnectionInterface $db
-	 */
-	public function __construct(ConnectionInterface &$db)
-	{
-		$this->db = & $db;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * List databases
-	 *
-	 * @return array|boolean
-	 * @throws DatabaseException
-	 */
-	public function listDatabases()
-	{
-		// Is there a cached result?
-		if (isset($this->db->dataCache['db_names']))
-		{
-			return $this->db->dataCache['db_names'];
-		}
-
-		if ($this->listDatabases === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unsupported feature of the database platform you are using.');
-			}
-			return false;
-		}
-
-		$this->db->dataCache['db_names'] = [];
-
-		$query = $this->db->query($this->listDatabases);
-		if ($query === false)
-		{
-			return $this->db->dataCache['db_names'];
-		}
-
-		for ($i = 0, $query = $query->getResultArray(), $c = count($query); $i < $c; $i ++)
-		{
-			$this->db->dataCache['db_names'][] = current($query[$i]);
-		}
-
-		return $this->db->dataCache['db_names'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determine if a particular database exists
-	 *
-	 * @param  string $databaseName
-	 * @return boolean
-	 */
-	public function databaseExists(string $databaseName): bool
-	{
-		return in_array($databaseName, $this->listDatabases(), true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Optimize Table
-	 *
-	 * @param  string $tableName
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function optimizeTable(string $tableName)
-	{
-		if ($this->optimizeTable === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unsupported feature of the database platform you are using.');
-			}
-			return false;
-		}
-
-		$query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
-
-		return $query !== false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Optimize Database
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function optimizeDatabase()
-	{
-		if ($this->optimizeTable === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unsupported feature of the database platform you are using.');
-			}
-			return false;
-		}
-
-		$result = [];
-		foreach ($this->db->listTables() as $tableName)
-		{
-			$res = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
-			if (is_bool($res))
-			{
-				return $res;
-			}
-
-			// Build the result array...
-
-			$res = $res->getResultArray();
-
-			// Postgre & SQLite3 returns empty array
-			if (empty($res))
-			{
-				$key = $tableName;
-			}
-			else
-			{
-				$res  = current($res);
-				$key  = str_replace($this->db->database . '.', '', current($res));
-				$keys = array_keys($res);
-				unset($res[$keys[0]]);
-			}
-
-			$result[$key] = $res;
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Repair Table
-	 *
-	 * @param  string $tableName
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function repairTable(string $tableName)
-	{
-		if ($this->repairTable === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unsupported feature of the database platform you are using.');
-			}
-			return false;
-		}
-
-		$query = $this->db->query(sprintf($this->repairTable, $this->db->escapeIdentifiers($tableName)));
-		if (is_bool($query))
-		{
-			return $query;
-		}
-
-		$query = $query->getResultArray();
-		return current($query);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Generate CSV from a query result object
-	 *
-	 * @param ResultInterface $query     Query result object
-	 * @param string          $delim     Delimiter (default: ,)
-	 * @param string          $newline   Newline character (default: \n)
-	 * @param string          $enclosure Enclosure (default: ")
-	 *
-	 * @return string
-	 */
-	public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
-	{
-		$out = '';
-		// First generate the headings from the table column names
-		foreach ($query->getFieldNames() as $name)
-		{
-			$out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
-		}
-
-		$out = substr($out, 0, -strlen($delim)) . $newline;
-
-		// Next blast through the result array and build out the rows
-		while ($row = $query->getUnbufferedRow('array'))
-		{
-			$line = [];
-			foreach ($row as $item)
-			{
-				$line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
-			}
-			$out .= implode($delim, $line) . $newline;
-		}
-
-		return $out;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Generate XML data from a query result object
-	 *
-	 * @param ResultInterface $query  Query result object
-	 * @param array           $params Any preferences
-	 *
-	 * @return string
-	 */
-	public function getXMLFromResult(ResultInterface $query, array $params = []): string
-	{
-		// Set our default values
-		foreach (['root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t"] as $key => $val)
-		{
-			if (! isset($params[$key]))
-			{
-				$params[$key] = $val;
-			}
-		}
-
-		// Create variables for convenience
-		$root    = $params['root'];
-		$newline = $params['newline'];
-		$tab     = $params['tab'];
-		$element = $params['element'];
-
-		// Load the xml helper
-		helper('xml');
-		// Generate the result
-		$xml = '<' . $root . '>' . $newline;
-		while ($row = $query->getUnbufferedRow())
-		{
-			$xml .= $tab . '<' . $element . '>' . $newline;
-
-			foreach ($row as $key => $val)
-			{
-				$val = (! empty($val)) ? xml_convert($val) : '';
-
-				$xml .= $tab . $tab . '<' . $key . '>' . $val . '</' . $key . '>' . $newline;
-			}
-
-			$xml .= $tab . '</' . $element . '>' . $newline;
-		}
-
-		return $xml . '</' . $root . '>' . $newline;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Database Backup
-	 *
-	 * @param  array|string $params
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function backup($params = [])
-	{
-		// If the parameters have not been submitted as an
-		// array then we know that it is simply the table
-		// name, which is a valid short cut.
-		if (is_string($params))
-		{
-			$params = ['tables' => $params];
-		}
-
-		// Set up our default preferences
-		$prefs = [
-			'tables'             => [],
-			'ignore'             => [],
-			'filename'           => '',
-			'format'             => 'gzip', // gzip, txt
-			'add_drop'           => true,
-			'add_insert'         => true,
-			'newline'            => "\n",
-			'foreign_key_checks' => true,
-		];
-
-		// Did the user submit any preferences? If so set them....
-		if (! empty($params))
-		{
-			foreach (array_keys($prefs) as $key)
-			{
-				if (isset($params[$key]))
-				{
-					$prefs[$key] = $params[$key];
-				}
-			}
-		}
-
-		// Are we backing up a complete database or individual tables?
-		// If no table names were submitted we'll fetch the entire table list
-		if (empty($prefs['tables']))
-		{
-			$prefs['tables'] = $this->db->listTables();
-		}
-
-		// Validate the format
-		if (! in_array($prefs['format'], ['gzip', 'txt'], true))
-		{
-			$prefs['format'] = 'txt';
-		}
-
-		// Is the encoder supported? If not, we'll either issue an
-		// error or use plain text depending on the debug settings
-		if ($prefs['format'] === 'gzip' && ! function_exists('gzencode'))
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('The file compression format you chose is not supported by your server.');
-			}
-
-			$prefs['format'] = 'txt';
-		}
-
-		if ($prefs['format'] === 'txt') // Was a text file requested?
-		{
-			return $this->_backup($prefs);
-		}
-
-		return gzencode($this->_backup($prefs));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	abstract public function _backup(array $prefs = null);
-
-	//--------------------------------------------------------------------
+    /**
+     * Database object
+     *
+     * @var object
+     */
+    protected $db;
+
+    /**
+     * List databases statement
+     *
+     * @var bool|string
+     */
+    protected $listDatabases = false;
+
+    /**
+     * OPTIMIZE TABLE statement
+     *
+     * @var bool|string
+     */
+    protected $optimizeTable = false;
+
+    /**
+     * REPAIR TABLE statement
+     *
+     * @var bool|string
+     */
+    protected $repairTable = false;
+
+    /**
+     * Class constructor
+     */
+    public function __construct(ConnectionInterface &$db)
+    {
+        $this->db = &$db;
+    }
+
+    /**
+     * List databases
+     *
+     * @throws DatabaseException
+     *
+     * @return array|bool
+     */
+    public function listDatabases()
+    {
+        // Is there a cached result?
+        if (isset($this->db->dataCache['db_names'])) {
+            return $this->db->dataCache['db_names'];
+        }
+
+        if ($this->listDatabases === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unsupported feature of the database platform you are using.');
+            }
+
+            return false;
+        }
+
+        $this->db->dataCache['db_names'] = [];
+
+        $query = $this->db->query($this->listDatabases);
+        if ($query === false) {
+            return $this->db->dataCache['db_names'];
+        }
+
+        for ($i = 0, $query = $query->getResultArray(), $c = count($query); $i < $c; $i++) {
+            $this->db->dataCache['db_names'][] = current($query[$i]);
+        }
+
+        return $this->db->dataCache['db_names'];
+    }
+
+    /**
+     * Determine if a particular database exists
+     */
+    public function databaseExists(string $databaseName): bool
+    {
+        return in_array($databaseName, $this->listDatabases(), true);
+    }
+
+    /**
+     * Optimize Table
+     *
+     * @throws DatabaseException
+     *
+     * @return bool
+     */
+    public function optimizeTable(string $tableName)
+    {
+        if ($this->optimizeTable === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unsupported feature of the database platform you are using.');
+            }
+
+            return false;
+        }
+
+        $query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
+
+        return $query !== false;
+    }
+
+    /**
+     * Optimize Database
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function optimizeDatabase()
+    {
+        if ($this->optimizeTable === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unsupported feature of the database platform you are using.');
+            }
+
+            return false;
+        }
+
+        $result = [];
+
+        foreach ($this->db->listTables() as $tableName) {
+            $res = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
+            if (is_bool($res)) {
+                return $res;
+            }
+
+            // Build the result array...
+
+            $res = $res->getResultArray();
+
+            // Postgre & SQLite3 returns empty array
+            if (empty($res)) {
+                $key = $tableName;
+            } else {
+                $res  = current($res);
+                $key  = str_replace($this->db->database . '.', '', current($res));
+                $keys = array_keys($res);
+                unset($res[$keys[0]]);
+            }
+
+            $result[$key] = $res;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Repair Table
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function repairTable(string $tableName)
+    {
+        if ($this->repairTable === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unsupported feature of the database platform you are using.');
+            }
+
+            return false;
+        }
+
+        $query = $this->db->query(sprintf($this->repairTable, $this->db->escapeIdentifiers($tableName)));
+        if (is_bool($query)) {
+            return $query;
+        }
+
+        $query = $query->getResultArray();
+
+        return current($query);
+    }
+
+    /**
+     * Generate CSV from a query result object
+     *
+     * @return string
+     */
+    public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
+    {
+        $out = '';
+        // First generate the headings from the table column names
+        foreach ($query->getFieldNames() as $name) {
+            $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
+        }
+
+        $out = substr($out, 0, -strlen($delim)) . $newline;
+
+        // Next blast through the result array and build out the rows
+        while ($row = $query->getUnbufferedRow('array')) {
+            $line = [];
+
+            foreach ($row as $item) {
+                $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
+            }
+
+            $out .= implode($delim, $line) . $newline;
+        }
+
+        return $out;
+    }
+
+    /**
+     * Generate XML data from a query result object
+     */
+    public function getXMLFromResult(ResultInterface $query, array $params = []): string
+    {
+        foreach (['root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t"] as $key => $val) {
+            if (! isset($params[$key])) {
+                $params[$key] = $val;
+            }
+        }
+
+        $root    = $params['root'];
+        $newline = $params['newline'];
+        $tab     = $params['tab'];
+        $element = $params['element'];
+
+        helper('xml');
+        $xml = '<' . $root . '>' . $newline;
+
+        while ($row = $query->getUnbufferedRow()) {
+            $xml .= $tab . '<' . $element . '>' . $newline;
+
+            foreach ($row as $key => $val) {
+                $val = (! empty($val)) ? xml_convert($val) : '';
+
+                $xml .= $tab . $tab . '<' . $key . '>' . $val . '</' . $key . '>' . $newline;
+            }
+
+            $xml .= $tab . '</' . $element . '>' . $newline;
+        }
+
+        return $xml . '</' . $root . '>' . $newline;
+    }
+
+    /**
+     * Database Backup
+     *
+     * @param array|string $params
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function backup($params = [])
+    {
+        if (is_string($params)) {
+            $params = ['tables' => $params];
+        }
+
+        $prefs = [
+            'tables'             => [],
+            'ignore'             => [],
+            'filename'           => '',
+            'format'             => 'gzip', // gzip, txt
+            'add_drop'           => true,
+            'add_insert'         => true,
+            'newline'            => "\n",
+            'foreign_key_checks' => true,
+        ];
+
+        if (! empty($params)) {
+            foreach (array_keys($prefs) as $key) {
+                if (isset($params[$key])) {
+                    $prefs[$key] = $params[$key];
+                }
+            }
+        }
+
+        if (empty($prefs['tables'])) {
+            $prefs['tables'] = $this->db->listTables();
+        }
+
+        if (! in_array($prefs['format'], ['gzip', 'txt'], true)) {
+            $prefs['format'] = 'txt';
+        }
+
+        if ($prefs['format'] === 'gzip' && ! function_exists('gzencode')) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('The file compression format you chose is not supported by your server.');
+            }
+
+            $prefs['format'] = 'txt';
+        }
+
+        if ($prefs['format'] === 'txt') {
+            return $this->_backup($prefs);
+        }
+
+        return gzencode($this->_backup($prefs));
+    }
+
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    abstract public function _backup(?array $prefs = null);
 }
diff --git a/system/Database/Config.php b/system/Database/Config.php
index b84067d5a257..6d2e82bf1109 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -19,148 +19,127 @@
  */
 class Config extends BaseConfig
 {
-	/**
-	 * Cache for instance of any connections that
-	 * have been requested as a "shared" instance.
-	 *
-	 * @var array
-	 */
-	static protected $instances = [];
-
-	/**
-	 * The main instance used to manage all of
-	 * our open database connections.
-	 *
-	 * @var Database|null
-	 */
-	static protected $factory;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Creates the default
-	 *
-	 * @param string|array $group     The name of the connection group to use,
-	 *                                or an array of configuration settings.
-	 * @param boolean      $getShared Whether to return a shared instance of the connection.
-	 *
-	 * @return BaseConnection
-	 */
-	public static function connect($group = null, bool $getShared = true)
-	{
-		// If a DB connection is passed in, just pass it back
-		if ($group instanceof BaseConnection)
-		{
-			return $group;
-		}
-
-		if (is_array($group))
-		{
-			$config = $group;
-			$group  = 'custom-' . md5(json_encode($config));
-		}
-
-		$config = $config ?? config('Database');
-
-		if (empty($group))
-		{
-			$group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
-		}
-
-		if (is_string($group) && ! isset($config->$group) && strpos($group, 'custom-') !== 0)
-		{
-			throw new InvalidArgumentException($group . ' is not a valid database connection group.');
-		}
-
-		if ($getShared && isset(static::$instances[$group]))
-		{
-			return static::$instances[$group];
-		}
-
-		static::ensureFactory();
-
-		if (isset($config->$group))
-		{
-			$config = $config->$group;
-		}
-
-		$connection = static::$factory->load($config, $group);
-
-		static::$instances[$group] = &$connection;
-
-		return $connection;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of all db connections currently made.
-	 *
-	 * @return array
-	 */
-	public static function getConnections(): array
-	{
-		return static::$instances;
-	}
-
-	/**
-	 * Loads and returns an instance of the Forge for the specified
-	 * database group, and loads the group if it hasn't been loaded yet.
-	 *
-	 * @param ConnectionInterface|string|array|null $group
-	 *
-	 * @return Forge
-	 */
-	public static function forge($group = null)
-	{
-		$db = static::connect($group);
-
-		return static::$factory->loadForge($db);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns a new instance of the Database Utilities class.
-	 *
-	 * @param string|array|null $group
-	 *
-	 * @return BaseUtils
-	 */
-	public static function utils($group = null)
-	{
-		$db = static::connect($group);
-
-		return static::$factory->loadUtils($db);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns a new instance of the Database Seeder.
-	 *
-	 * @param string|null $group
-	 *
-	 * @return Seeder
-	 */
-	public static function seeder(string $group = null)
-	{
-		$config = config('Database');
-
-		return new Seeder($config, static::connect($group));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures the database Connection Manager/Factory is loaded and ready to use.
-	 */
-	protected static function ensureFactory()
-	{
-		if (static::$factory instanceof Database)
-		{
-			return;
-		}
-
-		static::$factory = new Database();
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Cache for instance of any connections that
+     * have been requested as a "shared" instance.
+     *
+     * @var array
+     */
+    protected static $instances = [];
+
+    /**
+     * The main instance used to manage all of
+     * our open database connections.
+     *
+     * @var Database|null
+     */
+    protected static $factory;
+
+    /**
+     * Creates the default
+     *
+     * @param array|string $group     The name of the connection group to use, or an array of configuration settings.
+     * @param bool         $getShared Whether to return a shared instance of the connection.
+     *
+     * @return BaseConnection
+     */
+    public static function connect($group = null, bool $getShared = true)
+    {
+        // If a DB connection is passed in, just pass it back
+        if ($group instanceof BaseConnection) {
+            return $group;
+        }
+
+        if (is_array($group)) {
+            $config = $group;
+            $group  = 'custom-' . md5(json_encode($config));
+        }
+
+        $config = $config ?? config('Database');
+
+        if (empty($group)) {
+            $group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+        }
+
+        if (is_string($group) && ! isset($config->{$group}) && strpos($group, 'custom-') !== 0) {
+            throw new InvalidArgumentException($group . ' is not a valid database connection group.');
+        }
+
+        if ($getShared && isset(static::$instances[$group])) {
+            return static::$instances[$group];
+        }
+
+        static::ensureFactory();
+
+        if (isset($config->{$group})) {
+            $config = $config->{$group};
+        }
+
+        $connection = static::$factory->load($config, $group);
+
+        static::$instances[$group] = &$connection;
+
+        return $connection;
+    }
+
+    /**
+     * Returns an array of all db connections currently made.
+     */
+    public static function getConnections(): array
+    {
+        return static::$instances;
+    }
+
+    /**
+     * Loads and returns an instance of the Forge for the specified
+     * database group, and loads the group if it hasn't been loaded yet.
+     *
+     * @param array|ConnectionInterface|string|null $group
+     *
+     * @return Forge
+     */
+    public static function forge($group = null)
+    {
+        $db = static::connect($group);
+
+        return static::$factory->loadForge($db);
+    }
+
+    /**
+     * Returns a new instance of the Database Utilities class.
+     *
+     * @param array|string|null $group
+     *
+     * @return BaseUtils
+     */
+    public static function utils($group = null)
+    {
+        $db = static::connect($group);
+
+        return static::$factory->loadUtils($db);
+    }
+
+    /**
+     * Returns a new instance of the Database Seeder.
+     *
+     * @return Seeder
+     */
+    public static function seeder(?string $group = null)
+    {
+        $config = config('Database');
+
+        return new Seeder($config, static::connect($group));
+    }
+
+    /**
+     * Ensures the database Connection Manager/Factory is loaded and ready to use.
+     */
+    protected static function ensureFactory()
+    {
+        if (static::$factory instanceof Database) {
+            return;
+        }
+
+        static::$factory = new Database();
+    }
 }
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index 43806adcb22c..a937800b3a2f 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -16,187 +16,141 @@
  */
 interface ConnectionInterface
 {
-	/**
-	 * Initializes the database connection/settings.
-	 *
-	 * @return mixed
-	 */
-	public function initialize();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param  boolean $persistent
-	 * @return mixed
-	 */
-	public function connect(bool $persistent = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create a persistent database connection.
-	 *
-	 * @return mixed
-	 */
-	public function persistentConnect();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return mixed
-	 */
-	public function reconnect();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the actual connection object. If both a 'read' and 'write'
-	 * connection has been specified, you can pass either term in to
-	 * get that connection. If you pass either alias in and only a single
-	 * connection is present, it must return the sole connection.
-	 *
-	 * @param string|null $alias
-	 *
-	 * @return mixed
-	 */
-	public function getConnection(string $alias = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return mixed
-	 */
-	public function setDatabase(string $databaseName);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the current database being used.
-	 *
-	 * @return string
-	 */
-	public function getDatabase(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error encountered by this connection.
-	 * Must return this format: ['code' => string|int, 'message' => string]
-	 * intval(code) === 0 means "no error".
-	 *
-	 * @return array<string,string|int>
-	 */
-	public function error(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The name of the platform in use (MySQLi, mssql, etc)
-	 *
-	 * @return string
-	 */
-	public function getPlatform(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Orchestrates a query against the database. Queries must use
-	 * Database\Statement objects to store the query and build it.
-	 * This method works with the cache.
-	 *
-	 * Should automatically handle different connections for read/write
-	 * queries if needed.
-	 *
-	 * @param string $sql
-	 * @param mixed  ...$binds
-	 *
-	 * @return BaseResult|Query|boolean
-	 */
-	public function query(string $sql, $binds = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs a basic query against the database. No binding or caching
-	 * is performed, nor are transactions handled. Simply takes a raw
-	 * query string and returns the database-specific result id.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	public function simpleQuery(string $sql);
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns an instance of the query builder for this connection.
-	 *
-	 * @param string|array $tableName Table name.
-	 *
-	 * @return BaseBuilder Builder.
-	 */
-	public function table($tableName);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last query's statement object.
-	 *
-	 * @return mixed
-	 */
-	public function getLastQuery();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * "Smart" Escaping
-	 *
-	 * Escapes data based on type.
-	 * Sets boolean and null types.
-	 *
-	 * @param mixed $str
-	 *
-	 * @return mixed
-	 */
-	public function escape($str);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows for custom calls to the database engine that are not
-	 * supported through our database layer.
-	 *
-	 * @param string $functionName
-	 * @param array  ...$params
-	 *
-	 * @return mixed
-	 */
-	public function callFunction(string $functionName, ...$params);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the statement is a write-type query or not.
-	 *
-	 * @param  string $sql
-	 * @return boolean
-	 */
-	public function isWriteType($sql): bool;
+    /**
+     * Initializes the database connection/settings.
+     *
+     * @return mixed
+     */
+    public function initialize();
+
+    /**
+     * Connect to the database.
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false);
+
+    /**
+     * Create a persistent database connection.
+     *
+     * @return mixed
+     */
+    public function persistentConnect();
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     *
+     * @return mixed
+     */
+    public function reconnect();
+
+    /**
+     * Returns the actual connection object. If both a 'read' and 'write'
+     * connection has been specified, you can pass either term in to
+     * get that connection. If you pass either alias in and only a single
+     * connection is present, it must return the sole connection.
+     *
+     * @return mixed
+     */
+    public function getConnection(?string $alias = null);
+
+    /**
+     * Select a specific database table to use.
+     *
+     * @return mixed
+     */
+    public function setDatabase(string $databaseName);
+
+    /**
+     * Returns the name of the current database being used.
+     */
+    public function getDatabase(): string;
+
+    /**
+     * Returns the last error encountered by this connection.
+     * Must return this format: ['code' => string|int, 'message' => string]
+     * intval(code) === 0 means "no error".
+     *
+     * @return array<string, int|string>
+     */
+    public function error(): array;
+
+    /**
+     * The name of the platform in use (MySQLi, mssql, etc)
+     */
+    public function getPlatform(): string;
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string;
+
+    /**
+     * Orchestrates a query against the database. Queries must use
+     * Database\Statement objects to store the query and build it.
+     * This method works with the cache.
+     *
+     * Should automatically handle different connections for read/write
+     * queries if needed.
+     *
+     * @param mixed ...$binds
+     *
+     * @return BaseResult|bool|Query
+     */
+    public function query(string $sql, $binds = null);
+
+    /**
+     * Performs a basic query against the database. No binding or caching
+     * is performed, nor are transactions handled. Simply takes a raw
+     * query string and returns the database-specific result id.
+     *
+     * @return mixed
+     */
+    public function simpleQuery(string $sql);
+
+    /**
+     * Returns an instance of the query builder for this connection.
+     *
+     * @param array|string $tableName Table name.
+     *
+     * @return BaseBuilder Builder.
+     */
+    public function table($tableName);
+
+    /**
+     * Returns the last query's statement object.
+     *
+     * @return mixed
+     */
+    public function getLastQuery();
+
+    /**
+     * "Smart" Escaping
+     *
+     * Escapes data based on type.
+     * Sets boolean and null types.
+     *
+     * @param mixed $str
+     *
+     * @return mixed
+     */
+    public function escape($str);
+
+    /**
+     * Allows for custom calls to the database engine that are not
+     * supported through our database layer.
+     *
+     * @param array ...$params
+     *
+     * @return mixed
+     */
+    public function callFunction(string $functionName, ...$params);
+
+    /**
+     * Determines if the statement is a write-type query or not.
+     *
+     * @param string $sql
+     */
+    public function isWriteType($sql): bool;
 }
diff --git a/system/Database/Database.php b/system/Database/Database.php
index e173907b712c..0d3c26c2e84b 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -20,164 +20,119 @@
  */
 class Database
 {
-	/**
-	 * Maintains an array of the instances of all connections that have
-	 * been created.
-	 *
-	 * Helps to keep track of all open connections for performance
-	 * monitoring, logging, etc.
-	 *
-	 * @var array
-	 */
-	protected $connections = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the connection binds and returns an instance of the driver
-	 * ready to go.
-	 *
-	 * @param array  $params
-	 * @param string $alias
-	 *
-	 * @return mixed
-	 *
-	 * @throws InvalidArgumentException
-	 *
-	 * @internal param bool $useBuilder
-	 */
-	public function load(array $params = [], string $alias = '')
-	{
-		if ($alias === '')
-		{
-			throw new InvalidArgumentException('You must supply the parameter: alias.');
-		}
-
-		// Handle universal DSN connection string
-		if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false)
-		{
-			$params = $this->parseDSN($params);
-		}
-
-		// No DB specified? Beat them senseless...
-		if (empty($params['DBDriver']))
-		{
-			throw new InvalidArgumentException('You have not selected a database type to connect to.');
-		}
-
-		// Store the connection
-		$this->connections[$alias] = $this->initDriver($params['DBDriver'], 'Connection', $params);
-
-		return $this->connections[$alias];
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Creates a Forge instance for the current database type.
-	 *
-	 * @param ConnectionInterface $db
-	 *
-	 * @return object
-	 */
-	public function loadForge(ConnectionInterface $db): object
-	{
-		// Initialize database connection if not exists.
-		if (! $db->connID)
-		{
-			$db->initialize();
-		}
-
-		return $this->initDriver($db->DBDriver, 'Forge', $db);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Creates a Utils instance for the current database type.
-	 *
-	 * @param ConnectionInterface $db
-	 *
-	 * @return object
-	 */
-	public function loadUtils(ConnectionInterface $db): object
-	{
-		// Initialize database connection if not exists.
-		if (! $db->connID)
-		{
-			$db->initialize();
-		}
-
-		return $this->initDriver($db->DBDriver, 'Utils', $db);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse universal DSN string
-	 *
-	 * @param array $params
-	 *
-	 * @return array
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	protected function parseDSN(array $params): array
-	{
-		$dsn = parse_url($params['DSN']);
-
-		if (! $dsn)
-		{
-			throw new InvalidArgumentException('Your DSN connection string is invalid.');
-		}
-
-		$dsnParams = [
-			'DSN'      => '',
-			'DBDriver' => $dsn['scheme'],
-			'hostname' => isset($dsn['host']) ? rawurldecode($dsn['host']) : '',
-			'port'     => isset($dsn['port']) ? rawurldecode((string) $dsn['port']) : '',
-			'username' => isset($dsn['user']) ? rawurldecode($dsn['user']) : '',
-			'password' => isset($dsn['pass']) ? rawurldecode($dsn['pass']) : '',
-			'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
-		];
-
-		// Do we have additional config items set?
-		if (! empty($dsn['query']))
-		{
-			parse_str($dsn['query'], $extra);
-
-			foreach ($extra as $key => $val)
-			{
-				if (is_string($val) && in_array(strtolower($val), ['true', 'false', 'null'], true))
-				{
-					$val = $val === 'null' ? null : filter_var($val, FILTER_VALIDATE_BOOLEAN);
-				}
-
-				$dsnParams[$key] = $val;
-			}
-		}
-
-		return array_merge($params, $dsnParams);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Initialize database driver.
-	 *
-	 * @param string       $driver   Database driver name (e.g. 'MySQLi')
-	 * @param string       $class    Database class name (e.g. 'Forge')
-	 * @param array|object $argument
-	 *
-	 * @return object
-	 */
-	protected function initDriver(string $driver, string $class, $argument): object
-	{
-		$class = $driver . '\\' . $class;
-
-		if (strpos($driver, '\\') === false)
-		{
-			$class = "CodeIgniter\Database\\{$class}";
-		}
-
-		return new $class($argument);
-	}
+    /**
+     * Maintains an array of the instances of all connections that have
+     * been created.
+     *
+     * Helps to keep track of all open connections for performance
+     * monitoring, logging, etc.
+     *
+     * @var array
+     */
+    protected $connections = [];
+
+    /**
+     * Parses the connection binds and returns an instance of the driver
+     * ready to go.
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return mixed
+     */
+    public function load(array $params = [], string $alias = '')
+    {
+        if ($alias === '') {
+            throw new InvalidArgumentException('You must supply the parameter: alias.');
+        }
+
+        if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false) {
+            $params = $this->parseDSN($params);
+        }
+
+        if (empty($params['DBDriver'])) {
+            throw new InvalidArgumentException('You have not selected a database type to connect to.');
+        }
+
+        $this->connections[$alias] = $this->initDriver($params['DBDriver'], 'Connection', $params);
+
+        return $this->connections[$alias];
+    }
+
+    /**
+     * Creates a Forge instance for the current database type.
+     */
+    public function loadForge(ConnectionInterface $db): object
+    {
+        if (! $db->connID) {
+            $db->initialize();
+        }
+
+        return $this->initDriver($db->DBDriver, 'Forge', $db);
+    }
+
+    /**
+     * Creates a Utils instance for the current database type.
+     */
+    public function loadUtils(ConnectionInterface $db): object
+    {
+        if (! $db->connID) {
+            $db->initialize();
+        }
+
+        return $this->initDriver($db->DBDriver, 'Utils', $db);
+    }
+
+    /**
+     * Parse universal DSN string
+     *
+     * @throws InvalidArgumentException
+     */
+    protected function parseDSN(array $params): array
+    {
+        $dsn = parse_url($params['DSN']);
+
+        if (! $dsn) {
+            throw new InvalidArgumentException('Your DSN connection string is invalid.');
+        }
+
+        $dsnParams = [
+            'DSN'      => '',
+            'DBDriver' => $dsn['scheme'],
+            'hostname' => isset($dsn['host']) ? rawurldecode($dsn['host']) : '',
+            'port'     => isset($dsn['port']) ? rawurldecode((string) $dsn['port']) : '',
+            'username' => isset($dsn['user']) ? rawurldecode($dsn['user']) : '',
+            'password' => isset($dsn['pass']) ? rawurldecode($dsn['pass']) : '',
+            'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
+        ];
+
+        if (! empty($dsn['query'])) {
+            parse_str($dsn['query'], $extra);
+
+            foreach ($extra as $key => $val) {
+                if (is_string($val) && in_array(strtolower($val), ['true', 'false', 'null'], true)) {
+                    $val = $val === 'null' ? null : filter_var($val, FILTER_VALIDATE_BOOLEAN);
+                }
+
+                $dsnParams[$key] = $val;
+            }
+        }
+
+        return array_merge($params, $dsnParams);
+    }
+
+    /**
+     * Initialize database driver.
+     *
+     * @param array|object $argument
+     */
+    protected function initDriver(string $driver, string $class, $argument): object
+    {
+        $class = $driver . '\\' . $class;
+
+        if (strpos($driver, '\\') === false) {
+            $class = "CodeIgniter\\Database\\{$class}";
+        }
+
+        return new $class($argument);
+    }
 }
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
index ff0f212920ca..09b9ff329708 100644
--- a/system/Database/Exceptions/DataException.php
+++ b/system/Database/Exceptions/DataException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
@@ -16,78 +16,70 @@
 
 class DataException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Used by the Model's trigger() method when the callback cannot be found.
-	 *
-	 * @param string $method
-	 *
-	 * @return DataException
-	 */
-	public static function forInvalidMethodTriggered(string $method)
-	{
-		return new static(lang('Database.invalidEvent', [$method]));
-	}
+    /**
+     * Used by the Model's trigger() method when the callback cannot be found.
+     *
+     * @return DataException
+     */
+    public static function forInvalidMethodTriggered(string $method)
+    {
+        return new static(lang('Database.invalidEvent', [$method]));
+    }
 
-	/**
-	 * Used by Model's insert/update methods when there isn't
-	 * any data to actually work with.
-	 *
-	 * @param string $mode
-	 *
-	 * @return DataException
-	 */
-	public static function forEmptyDataset(string $mode)
-	{
-		return new static(lang('Database.emptyDataset', [$mode]));
-	}
+    /**
+     * Used by Model's insert/update methods when there isn't
+     * any data to actually work with.
+     *
+     * @return DataException
+     */
+    public static function forEmptyDataset(string $mode)
+    {
+        return new static(lang('Database.emptyDataset', [$mode]));
+    }
 
-	/**
-	 * Used by Model's insert/update methods when there is no
-	 * primary key defined and Model has option `useAutoIncrement`
-	 * set to false.
-	 *
-	 * @param string $mode
-	 *
-	 * @return DataException
-	 */
-	public static function forEmptyPrimaryKey(string $mode)
-	{
-		return new static(lang('Database.emptyPrimaryKey', [$mode]));
-	}
+    /**
+     * Used by Model's insert/update methods when there is no
+     * primary key defined and Model has option `useAutoIncrement`
+     * set to false.
+     *
+     * @return DataException
+     */
+    public static function forEmptyPrimaryKey(string $mode)
+    {
+        return new static(lang('Database.emptyPrimaryKey', [$mode]));
+    }
 
-	/**
-	 * Thrown when an argument for one of the Model's methods
-	 * were empty or otherwise invalid, and they could not be
-	 * to work correctly for that method.
-	 *
-	 * @param string $argument
-	 *
-	 * @return DataException
-	 */
-	public static function forInvalidArgument(string $argument)
-	{
-		return new static(lang('Database.invalidArgument', [$argument]));
-	}
+    /**
+     * Thrown when an argument for one of the Model's methods
+     * were empty or otherwise invalid, and they could not be
+     * to work correctly for that method.
+     *
+     * @return DataException
+     */
+    public static function forInvalidArgument(string $argument)
+    {
+        return new static(lang('Database.invalidArgument', [$argument]));
+    }
 
-	public static function forInvalidAllowedFields(string $model)
-	{
-		return new static(lang('Database.invalidAllowedFields', [$model]));
-	}
+    public static function forInvalidAllowedFields(string $model)
+    {
+        return new static(lang('Database.invalidAllowedFields', [$model]));
+    }
 
-	public static function forTableNotFound(string $table)
-	{
-		return new static(lang('Database.tableNotFound', [$table]));
-	}
+    public static function forTableNotFound(string $table)
+    {
+        return new static(lang('Database.tableNotFound', [$table]));
+    }
 
-	public static function forEmptyInputGiven(string $argument)
-	{
-		return new static(lang('Database.forEmptyInputGiven', [$argument]));
-	}
+    public static function forEmptyInputGiven(string $argument)
+    {
+        return new static(lang('Database.forEmptyInputGiven', [$argument]));
+    }
 
-	public static function forFindColumnHaveMultipleColumns()
-	{
-		return new static(lang('Database.forFindColumnHaveMultipleColumns'));
-	}
+    public static function forFindColumnHaveMultipleColumns()
+    {
+        return new static(lang('Database.forFindColumnHaveMultipleColumns'));
+    }
 }
diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php
index 8717f3b89e19..a2b3b7637ce7 100644
--- a/system/Database/Exceptions/DatabaseException.php
+++ b/system/Database/Exceptions/DatabaseException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
@@ -15,10 +15,10 @@
 
 class DatabaseException extends Error implements ExceptionInterface
 {
-	/**
-	 * Exit status code
-	 *
-	 * @var integer
-	 */
-	protected $code = 8;
+    /**
+     * Exit status code
+     *
+     * @var int
+     */
+    protected $code = 8;
 }
diff --git a/system/Database/Exceptions/ExceptionInterface.php b/system/Database/Exceptions/ExceptionInterface.php
index 3820c555c025..815652349324 100644
--- a/system/Database/Exceptions/ExceptionInterface.php
+++ b/system/Database/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index f2e2ee511067..ba3423a890ea 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -22,1310 +22,1003 @@
  */
 class Forge
 {
-	/**
-	 * The active database connection.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * List of fields.
-	 *
-	 * @var array
-	 */
-	protected $fields = [];
-
-	/**
-	 * List of keys.
-	 *
-	 * @var array
-	 */
-	protected $keys = [];
-
-	/**
-	 * List of unique keys.
-	 *
-	 * @var array
-	 */
-	protected $uniqueKeys = [];
-
-	/**
-	 * List of primary keys.
-	 *
-	 * @var array
-	 */
-	protected $primaryKeys = [];
-
-	/**
-	 * List of foreign keys.
-	 *
-	 * @var array
-	 */
-	protected $foreignKeys = [];
-
-	/**
-	 * Character set used.
-	 *
-	 * @var string
-	 */
-	protected $charset = '';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CREATE DATABASE statement
-	 *
-	 * @var string|false
-	 */
-	protected $createDatabaseStr = 'CREATE DATABASE %s';
-
-	/**
-	 * CREATE DATABASE IF statement
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseIfStr;
-
-	/**
-	 * CHECK DATABASE EXIST statement
-	 *
-	 * @var string
-	 */
-	protected $checkDatabaseExistStr;
-
-	/**
-	 * DROP DATABASE statement
-	 *
-	 * @var string|false
-	 */
-	protected $dropDatabaseStr = 'DROP DATABASE %s';
-
-	/**
-	 * CREATE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $createTableStr = "%s %s (%s\n)";
-
-	/**
-	 * CREATE TABLE IF statement
-	 *
-	 * @var string|boolean
-	 */
-	protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS';
-
-	/**
-	 * CREATE TABLE keys flag
-	 *
-	 * Whether table keys are created from within the
-	 * CREATE TABLE statement.
-	 *
-	 * @var boolean
-	 */
-	protected $createTableKeys = false;
-
-	/**
-	 * DROP TABLE IF EXISTS statement
-	 *
-	 * @var string|boolean
-	 */
-	protected $dropTableIfStr = 'DROP TABLE IF EXISTS';
-
-	/**
-	 * RENAME TABLE statement
-	 *
-	 * @var string|false
-	 */
-	protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s;';
-
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var boolean|array
-	 */
-	protected $unsigned = true;
-
-	/**
-	 * NULL value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string
-	 *
-	 * @internal Used for marking nullable fields. Not covered by BC promise.
-	 */
-	protected $null = '';
-
-	/**
-	 * DEFAULT value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string|false
-	 */
-	protected $default = ' DEFAULT ';
-
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor.
-	 *
-	 * @param BaseConnection $db
-	 */
-	public function __construct(BaseConnection $db)
-	{
-		$this->db = &$db;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Provides access to the forge's current database connection.
-	 *
-	 * @return ConnectionInterface
-	 */
-	public function getConnection()
-	{
-		return $this->db;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create database
-	 *
-	 * @param string  $dbName
-	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function createDatabase(string $dbName, bool $ifNotExists = false): bool
-	{
-		if ($ifNotExists && $this->createDatabaseIfStr === null)
-		{
-			if ($this->databaseExists($dbName))
-			{
-				return true;
-			}
-
-			$ifNotExists = false;
-		}
-
-		if ($this->createDatabaseStr === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false; // @codeCoverageIgnore
-		}
-
-		try
-		{
-			if (! $this->db->query(sprintf($ifNotExists ? $this->createDatabaseIfStr : $this->createDatabaseStr, $dbName, $this->db->charset, $this->db->DBCollat)))
-			{
-				// @codeCoverageIgnoreStart
-				if ($this->db->DBDebug)
-				{
-					throw new DatabaseException('Unable to create the specified database.');
-				}
-
-				return false;
-				// @codeCoverageIgnoreEnd
-			}
-
-			if (! empty($this->db->dataCache['db_names']))
-			{
-				$this->db->dataCache['db_names'][] = $dbName;
-			}
-
-			return true;
-		}
-		catch (Throwable $e)
-		{
-			// @phpstan-ignore-next-line
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unable to create the specified database.', 0, $e);
-			}
-			return false; // @codeCoverageIgnore
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determine if a database exists
-	 *
-	 * @param string $dbName
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	private function databaseExists(string $dbName): bool
-	{
-		if ($this->checkDatabaseExistStr === null)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		return $this->db->query($this->checkDatabaseExistStr, $dbName)->getRow() !== null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop database
-	 *
-	 * @param string $dbName
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function dropDatabase(string $dbName): bool
-	{
-		if ($this->dropDatabaseStr === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		if (! $this->db->query(sprintf($this->dropDatabaseStr, $dbName)))
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unable to drop the specified database.');
-			}
-
-			return false;
-		}
-
-		if (! empty($this->db->dataCache['db_names']))
-		{
-			$key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
-			if ($key !== false)
-			{
-				unset($this->db->dataCache['db_names'][$key]);
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add Key
-	 *
-	 * @param string|array $key
-	 * @param boolean      $primary
-	 * @param boolean      $unique
-	 *
-	 * @return Forge
-	 */
-	public function addKey($key, bool $primary = false, bool $unique = false)
-	{
-		if ($primary)
-		{
-			foreach ((array) $key as $one)
-			{
-				$this->primaryKeys[] = $one;
-			}
-		}
-		else
-		{
-			$this->keys[] = $key;
-
-			if ($unique)
-			{
-				$this->uniqueKeys[] = count($this->keys) - 1;
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add Primary Key
-	 *
-	 * @param string|array $key
-	 *
-	 * @return Forge
-	 */
-	public function addPrimaryKey($key)
-	{
-		return $this->addKey($key, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add Unique Key
-	 *
-	 * @param string|array $key
-	 *
-	 * @return Forge
-	 */
-	public function addUniqueKey($key)
-	{
-		return $this->addKey($key, false, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add Field
-	 *
-	 * @param array|string $field
-	 *
-	 * @return Forge
-	 */
-	public function addField($field)
-	{
-		if (is_string($field))
-		{
-			if ($field === 'id')
-			{
-				$this->addField([
-					'id' => [
-						'type'           => 'INT',
-						'constraint'     => 9,
-						'auto_increment' => true,
-					],
-				]);
-				$this->addKey('id', true);
-			}
-			else
-			{
-				if (strpos($field, ' ') === false)
-				{
-					throw new InvalidArgumentException('Field information is required for that operation.');
-				}
-
-				$this->fields[] = $field;
-			}
-		}
-
-		if (is_array($field))
-		{
-			$this->fields = array_merge($this->fields, $field);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add Foreign Key
-	 *
-	 * @param string $fieldName
-	 * @param string $tableName
-	 * @param string $tableField
-	 * @param string $onUpdate
-	 * @param string $onDelete
-	 *
-	 * @return Forge
-	 * @throws DatabaseException
-	 */
-	public function addForeignKey(string $fieldName = '', string $tableName = '', string $tableField = '', string $onUpdate = '', string $onDelete = '')
-	{
-		if (! isset($this->fields[$fieldName]))
-		{
-			throw new DatabaseException(lang('Database.fieldNotExists', [$fieldName]));
-		}
-
-		$this->foreignKeys[$fieldName] = [
-			'table'    => $tableName,
-			'field'    => $tableField,
-			'onDelete' => strtoupper($onDelete),
-			'onUpdate' => strtoupper($onUpdate),
-		];
-
-		return $this;
-	}
-
-	/**
-	 * Foreign Key Drop
-	 *
-	 * @param string $table       Table name
-	 * @param string $foreignName Foreign name
-	 *
-	 * @return boolean|BaseResult|Query|false|mixed
-	 * @throws DatabaseException
-	 */
-	public function dropForeignKey(string $table, string $foreignName)
-	{
-		$sql = sprintf($this->dropConstraintStr, $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
-			$this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName));
-
-		if ($sql === false) // @phpstan-ignore-line
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		return $this->db->query($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create Table
-	 *
-	 * @param string  $table       Table name
-	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
-	 * @param array   $attributes  Associative array of table attributes
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function createTable(string $table, bool $ifNotExists = false, array $attributes = [])
-	{
-		if ($table === '')
-		{
-			throw new InvalidArgumentException('A table name is required for that operation.');
-		}
-
-		$table = $this->db->DBPrefix . $table;
-
-		if ($this->fields === [])
-		{
-			throw new RuntimeException('Field information is required.');
-		}
-
-		$sql = $this->_createTable($table, $ifNotExists, $attributes);
-
-		if (is_bool($sql))
-		{
-			$this->reset();
-			if ($sql === false)
-			{
-				if ($this->db->DBDebug)
-				{
-					throw new DatabaseException('This feature is not available for the database you are using.');
-				}
-
-				return false;
-			}
-		}
-
-		if (($result = $this->db->query($sql)) !== false)
-		{
-			if (isset($this->db->dataCache['table_names']) && ! in_array($table, $this->db->dataCache['table_names'], true))
-			{
-				$this->db->dataCache['table_names'][] = $table;
-			}
-
-			// Most databases don't support creating indexes from within the CREATE TABLE statement
-			if (! empty($this->keys))
-			{
-				for ($i = 0, $sqls = $this->_processIndexes($table), $c = count($sqls); $i < $c; $i++)
-				{
-					$this->db->query($sqls[$i]);
-				}
-			}
-		}
-
-		$this->reset();
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create Table
-	 *
-	 * @param string  $table       Table name
-	 * @param boolean $ifNotExists Whether to add 'IF NOT EXISTS' condition
-	 * @param array   $attributes  Associative array of table attributes
-	 *
-	 * @return mixed
-	 */
-	protected function _createTable(string $table, bool $ifNotExists, array $attributes)
-	{
-		// For any platforms that don't support Create If Not Exists...
-		if ($ifNotExists === true && $this->createTableIfStr === false)
-		{
-			if ($this->db->tableExists($table))
-			{
-				return true;
-			}
-
-			$ifNotExists = false;
-		}
-
-		$sql = ($ifNotExists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table))
-			: 'CREATE TABLE';
-
-		$columns = $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]);
-		}
-
-		$columns = implode(',', $columns);
-
-		$columns .= $this->_processPrimaryKeys($table);
-		$columns .= $this->_processForeignKeys($table);
-
-		// Are indexes created from within the CREATE TABLE statement? (e.g. in MySQL)
-		if ($this->createTableKeys === true)
-		{
-			$indexes = $this->_processIndexes($table);
-			if (is_string($indexes))
-			{
-				$columns .= $indexes;
-			}
-		}
-
-		// createTableStr will usually have the following format: "%s %s (%s\n)"
-		$sql = sprintf($this->createTableStr . '%s', $sql, $this->db->escapeIdentifiers($table), $columns,
-			$this->_createTableAttributes($attributes));
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CREATE TABLE attributes
-	 *
-	 * @param array $attributes Associative array of table attributes
-	 *
-	 * @return string
-	 */
-	protected function _createTableAttributes(array $attributes): string
-	{
-		$sql = '';
-
-		foreach (array_keys($attributes) as $key)
-		{
-			if (is_string($key))
-			{
-				$sql .= ' ' . strtoupper($key) . ' ' . $this->db->escape($attributes[$key]);
-			}
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 * @param string  $tableName Table name
-	 * @param boolean $ifExists  Whether to add an IF EXISTS condition
-	 * @param boolean $cascade   Whether to add an CASCADE condition
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function dropTable(string $tableName, bool $ifExists = false, bool $cascade = false)
-	{
-		if ($tableName === '')
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('A table name is required for that operation.');
-			}
-
-			return false;
-		}
-
-		// If the prefix is already starting the table name, remove it...
-		if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0)
-		{
-			$tableName = substr($tableName, strlen($this->db->DBPrefix));
-		}
-
-		if (($query = $this->_dropTable($this->db->DBPrefix . $tableName, $ifExists, $cascade)) === true)
-		{
-			return true;
-		}
-
-		$this->db->disableForeignKeyChecks();
-
-		$query = $this->db->query($query);
-
-		$this->db->enableForeignKeyChecks();
-
-		// Update table list cache
-		if ($query && ! empty($this->db->dataCache['table_names']))
-		{
-			$key = array_search(strtolower($this->db->DBPrefix . $tableName),
-				array_map('strtolower', $this->db->dataCache['table_names']), true);
-			if ($key !== false)
-			{
-				unset($this->db->dataCache['table_names'][$key]);
-			}
-		}
-
-		return $query;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 * Generates a platform-specific DROP TABLE string
-	 *
-	 * @param string  $table    Table name
-	 * @param boolean $ifExists Whether to add an IF EXISTS condition
-	 * @param boolean $cascade  Whether to add an CASCADE condition
-	 *
-	 * @return string|boolean
-	 */
-	protected function _dropTable(string $table, bool $ifExists, bool $cascade)
-	{
-		$sql = 'DROP TABLE';
-
-		if ($ifExists)
-		{
-			if ($this->dropTableIfStr === false)
-			{
-				if (! $this->db->tableExists($table))
-				{
-					return true;
-				}
-			}
-			else
-			{
-				$sql = sprintf($this->dropTableIfStr, $this->db->escapeIdentifiers($table));
-			}
-		}
-
-		return $sql . ' ' . $this->db->escapeIdentifiers($table);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rename Table
-	 *
-	 * @param string $tableName    Old table name
-	 * @param string $newTableName New table name
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function renameTable(string $tableName, string $newTableName)
-	{
-		if ($tableName === '' || $newTableName === '')
-		{
-			throw new InvalidArgumentException('A table name is required for that operation.');
-		}
-
-		if ($this->renameTableStr === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		$result = $this->db->query(sprintf($this->renameTableStr,
-				$this->db->escapeIdentifiers($this->db->DBPrefix . $tableName),
-				$this->db->escapeIdentifiers($this->db->DBPrefix . $newTableName))
-		);
-
-		if ($result && ! empty($this->db->dataCache['table_names']))
-		{
-			$key = array_search(strtolower($this->db->DBPrefix . $tableName),
-				array_map('strtolower', $this->db->dataCache['table_names']), true);
-			if ($key !== false)
-			{
-				$this->db->dataCache['table_names'][$key] = $this->db->DBPrefix . $newTableName;
-			}
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Column Add
-	 *
-	 * @param string       $table Table name
-	 * @param string|array $field Column definition
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function addColumn(string $table, $field): bool
-	{
-		// Work-around for literal column definitions
-		if (! is_array($field))
-		{
-			$field = [$field];
-		}
-
-		foreach (array_keys($field) as $k)
-		{
-			$this->addField([$k => $field[$k]]);
-		}
-
-		$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.');
-			}
-
-			return false;
-		}
-
-		foreach ($sqls as $sql)
-		{
-			if ($this->db->query($sql) === false)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Column Drop
-	 *
-	 * @param string       $table      Table name
-	 * @param string|array $columnName Column name Array or comma separated
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function dropColumn(string $table, $columnName)
-	{
-		$sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnName);
-		if ($sql === false)
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('This feature is not available for the database you are using.');
-			}
-
-			return false;
-		}
-
-		return $this->db->query($sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Column Modify
-	 *
-	 * @param string       $table Table name
-	 * @param string|array $field Column definition
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function modifyColumn(string $table, $field): bool
-	{
-		// Work-around for literal column definitions
-		if (! is_array($field))
-		{
-			$field = [$field];
-		}
-
-		foreach (array_keys($field) as $k)
-		{
-			$this->addField([$k => $field[$k]]);
-		}
-
-		if ($this->fields === [])
-		{
-			throw new RuntimeException('Field information is required');
-		}
-
-		$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.');
-			}
-
-			return false;
-		}
-
-		if ($sqls !== null)
-		{
-			foreach ($sqls as $sql)
-			{
-				if ($this->db->query($sql) === false)
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param string $alterType ALTER type
-	 * @param string $table     Table name
-	 * @param mixed  $fields    Column definition
-	 *
-	 * @return string|string[]|false
-	 */
-	protected function _alterTable(string $alterType, string $table, $fields)
-	{
-		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . ' ';
-
-		// DROP has everything it needs now.
-		if ($alterType === 'DROP')
-		{
-			if (is_string($fields))
-			{
-				$fields = explode(',', $fields);
-			}
-
-			$fields = array_map(function ($field) {
-				return 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field));
-			}, $fields);
-
-			return $sql . implode(', ', $fields);
-		}
-
-		$sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';
-
-		$sqls = [];
-		foreach ($fields as $data)
-		{
-			$sqls[] = $sql
-					  . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
-		}
-
-		return $sqls;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process fields
-	 *
-	 * @param boolean $createTable
-	 *
-	 * @return array
-	 */
-	protected function _processFields(bool $createTable = false): array
-	{
-		$fields = [];
-
-		foreach ($this->fields as $key => $attributes)
-		{
-			if (is_int($key) && ! is_array($attributes))
-			{
-				$fields[] = ['_literal' => $attributes];
-				continue;
-			}
-
-			$attributes = array_change_key_case($attributes, CASE_UPPER);
-
-			if ($createTable === true && empty($attributes['TYPE']))
-			{
-				continue;
-			}
-
-			// @phpstan-ignore-next-line
-			isset($attributes['TYPE']) && $this->_attributeType($attributes);
-
-			$field = [
-				'name'           => $key,
-				'new_name'       => $attributes['NAME'] ?? null,
-				'type'           => $attributes['TYPE'] ?? null,
-				'length'         => '',
-				'unsigned'       => '',
-				'null'           => '',
-				'unique'         => '',
-				'default'        => '',
-				'auto_increment' => '',
-				'_literal'       => false,
-			];
-
-			// @phpstan-ignore-next-line
-			isset($attributes['TYPE']) && $this->_attributeUnsigned($attributes, $field);
-
-			if ($createTable === false)
-			{
-				if (isset($attributes['AFTER']))
-				{
-					$field['after'] = $attributes['AFTER'];
-				}
-				elseif (isset($attributes['FIRST']))
-				{
-					$field['first'] = (bool) $attributes['FIRST'];
-				}
-			}
-
-			$this->_attributeDefault($attributes, $field);
-
-			if (isset($attributes['NULL']))
-			{
-				if ($attributes['NULL'] === true)
-				{
-					$field['null'] = empty($this->null) ? '' : ' ' . $this->null;
-				}
-				else
-				{
-					$field['null'] = ' NOT NULL';
-				}
-			}
-			elseif ($createTable === true)
-			{
-				$field['null'] = ' NOT NULL';
-			}
-
-			$this->_attributeAutoIncrement($attributes, $field);
-			$this->_attributeUnique($attributes, $field);
-
-			if (isset($attributes['COMMENT']))
-			{
-				$field['comment'] = $this->db->escape($attributes['COMMENT']);
-			}
-
-			if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT']))
-			{
-				if (is_array($attributes['CONSTRAINT']))
-				{
-					$attributes['CONSTRAINT'] = $this->db->escape($attributes['CONSTRAINT']);
-					$attributes['CONSTRAINT'] = implode(',', $attributes['CONSTRAINT']);
-				}
-
-				$field['length'] = '(' . $attributes['CONSTRAINT'] . ')';
-			}
-
-			$fields[] = $field;
-		}
-
-		return $fields;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process column
-	 *
-	 * @param array $field
-	 *
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
-		return $this->db->escapeIdentifiers($field['name'])
-			   . ' ' . $field['type'] . $field['length']
-			   . $field['unsigned']
-			   . $field['default']
-			   . $field['null']
-			   . $field['auto_increment']
-			   . $field['unique'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute TYPE
-	 *
-	 * Performs a data type mapping between different databases.
-	 *
-	 * @param array $attributes
-	 *
-	 * @return void
-	 */
-	protected function _attributeType(array &$attributes)
-	{
-		// Usually overridden by drivers
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute UNSIGNED
-	 *
-	 * Depending on the unsigned property value:
-	 *
-	 *    - TRUE will always set $field['unsigned'] to 'UNSIGNED'
-	 *    - FALSE will always set $field['unsigned'] to ''
-	 *    - array(TYPE) will set $field['unsigned'] to 'UNSIGNED',
-	 *        if $attributes['TYPE'] is found in the array
-	 *    - array(TYPE => UTYPE) will change $field['type'],
-	 *        from TYPE to UTYPE in case of a match
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return null|void
-	 */
-	protected function _attributeUnsigned(array &$attributes, array &$field)
-	{
-		if (empty($attributes['UNSIGNED']) || $attributes['UNSIGNED'] !== true)
-		{
-			return;
-		}
-
-		// Reset the attribute in order to avoid issues if we do type conversion
-		$attributes['UNSIGNED'] = false;
-
-		if (is_array($this->unsigned))
-		{
-			foreach (array_keys($this->unsigned) as $key)
-			{
-				if (is_int($key) && strcasecmp($attributes['TYPE'], $this->unsigned[$key]) === 0)
-				{
-					$field['unsigned'] = ' UNSIGNED';
-
-					return;
-				}
-
-				if (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
-				{
-					$field['type'] = $key;
-
-					return;
-				}
-			}
-
-			return;
-		}
-
-		$field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute DEFAULT
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return null|void
-	 */
-	protected function _attributeDefault(array &$attributes, array &$field)
-	{
-		if ($this->default === false)
-		{
-			return;
-		}
-
-		if (array_key_exists('DEFAULT', $attributes))
-		{
-			if ($attributes['DEFAULT'] === null)
-			{
-				$field['default'] = empty($this->null) ? '' : $this->default . $this->null;
-
-				// Override the NULL attribute if that's our default
-				$attributes['NULL'] = true;
-				$field['null']      = empty($this->null) ? '' : ' ' . $this->null;
-			}
-			else
-			{
-				$field['default'] = $this->default . $this->db->escape($attributes['DEFAULT']);
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute UNIQUE
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return void
-	 */
-	protected function _attributeUnique(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true)
-		{
-			$field['unique'] = ' UNIQUE';
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute AUTO_INCREMENT
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return void
-	 */
-	protected function _attributeAutoIncrement(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-			&& stripos($field['type'], 'int') !== false
-		)
-		{
-			$field['auto_increment'] = ' AUTO_INCREMENT';
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process primary keys
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return string
-	 */
-	protected function _processPrimaryKeys(string $table): string
-	{
-		$sql = '';
-
-		for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++)
-		{
-			if (! isset($this->fields[$this->primaryKeys[$i]]))
-			{
-				unset($this->primaryKeys[$i]);
-			}
-		}
-
-		if ($this->primaryKeys !== [])
-		{
-			$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
-					. ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process indexes
-	 *
-	 * @param string $table
-	 *
-	 * @return array|string
-	 */
-	protected function _processIndexes(string $table)
-	{
-		$sqls = [];
-
-		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
-		{
-			$this->keys[$i] = (array) $this->keys[$i];
-
-			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
-			{
-				if (! isset($this->fields[$this->keys[$i][$i2]]))
-				{
-					unset($this->keys[$i][$i2]);
-				}
-			}
-			if (count($this->keys[$i]) <= 0)
-			{
-				continue;
-			}
-
-			if (in_array($i, $this->uniqueKeys, true))
-			{
-				$sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
-						  . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-						  . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
-				continue;
-			}
-
-			$sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-					  . ' ON ' . $this->db->escapeIdentifiers($table)
-					  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
-		}
-
-		return $sqls;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process foreign keys
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return string
-	 */
-	protected function _processForeignKeys(string $table): string
-	{
-		$sql = '';
-
-		$allowActions = [
-			'CASCADE',
-			'SET NULL',
-			'NO ACTION',
-			'RESTRICT',
-			'SET DEFAULT',
-		];
-
-		if ($this->foreignKeys !== [])
-		{
-			foreach ($this->foreignKeys as $field => $fkey)
-			{
-				$nameIndex = $table . '_' . $field . '_foreign';
-
-				$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-					. ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
-
-				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true))
-				{
-					$sql .= ' ON DELETE ' . $fkey['onDelete'];
-				}
-
-				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true))
-				{
-					$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-				}
-			}
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset
-	 *
-	 * Resets table creation vars
-	 *
-	 * @return void
-	 */
-	public function reset()
-	{
-		$this->fields = $this->keys = $this->uniqueKeys = $this->primaryKeys = $this->foreignKeys = [];
-	}
+    /**
+     * The active database connection.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * List of fields.
+     *
+     * @var array
+     */
+    protected $fields = [];
+
+    /**
+     * List of keys.
+     *
+     * @var array
+     */
+    protected $keys = [];
+
+    /**
+     * List of unique keys.
+     *
+     * @var array
+     */
+    protected $uniqueKeys = [];
+
+    /**
+     * List of primary keys.
+     *
+     * @var array
+     */
+    protected $primaryKeys = [];
+
+    /**
+     * List of foreign keys.
+     *
+     * @var array
+     */
+    protected $foreignKeys = [];
+
+    /**
+     * Character set used.
+     *
+     * @var string
+     */
+    protected $charset = '';
+
+    /**
+     * CREATE DATABASE statement
+     *
+     * @var false|string
+     */
+    protected $createDatabaseStr = 'CREATE DATABASE %s';
+
+    /**
+     * CREATE DATABASE IF statement
+     *
+     * @var string
+     */
+    protected $createDatabaseIfStr;
+
+    /**
+     * CHECK DATABASE EXIST statement
+     *
+     * @var string
+     */
+    protected $checkDatabaseExistStr;
+
+    /**
+     * DROP DATABASE statement
+     *
+     * @var false|string
+     */
+    protected $dropDatabaseStr = 'DROP DATABASE %s';
+
+    /**
+     * CREATE TABLE statement
+     *
+     * @var string
+     */
+    protected $createTableStr = "%s %s (%s\n)";
+
+    /**
+     * CREATE TABLE IF statement
+     *
+     * @var bool|string
+     */
+    protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS';
+
+    /**
+     * CREATE TABLE keys flag
+     *
+     * Whether table keys are created from within the
+     * CREATE TABLE statement.
+     *
+     * @var bool
+     */
+    protected $createTableKeys = false;
+
+    /**
+     * DROP TABLE IF EXISTS statement
+     *
+     * @var bool|string
+     */
+    protected $dropTableIfStr = 'DROP TABLE IF EXISTS';
+
+    /**
+     * RENAME TABLE statement
+     *
+     * @var false|string
+     */
+    protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s;';
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array|bool
+     */
+    protected $unsigned = true;
+
+    /**
+     * NULL value representation in CREATE/ALTER TABLE statements
+     *
+     * @var string
+     *
+     * @internal Used for marking nullable fields. Not covered by BC promise.
+     */
+    protected $null = '';
+
+    /**
+     * DEFAULT value representation in CREATE/ALTER TABLE statements
+     *
+     * @var false|string
+     */
+    protected $default = ' DEFAULT ';
+
+    /**
+     * Constructor.
+     */
+    public function __construct(BaseConnection $db)
+    {
+        $this->db = &$db;
+    }
+
+    /**
+     * Provides access to the forge's current database connection.
+     *
+     * @return ConnectionInterface
+     */
+    public function getConnection()
+    {
+        return $this->db;
+    }
+
+    /**
+     * Create database
+     *
+     * @param bool $ifNotExists Whether to add IF NOT EXISTS condition
+     *
+     * @throws DatabaseException
+     */
+    public function createDatabase(string $dbName, bool $ifNotExists = false): bool
+    {
+        if ($ifNotExists && $this->createDatabaseIfStr === null) {
+            if ($this->databaseExists($dbName)) {
+                return true;
+            }
+
+            $ifNotExists = false;
+        }
+
+        if ($this->createDatabaseStr === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        try {
+            if (! $this->db->query(sprintf($ifNotExists ? $this->createDatabaseIfStr : $this->createDatabaseStr, $dbName, $this->db->charset, $this->db->DBCollat))) {
+                // @codeCoverageIgnoreStart
+                if ($this->db->DBDebug) {
+                    throw new DatabaseException('Unable to create the specified database.');
+                }
+
+                return false;
+                // @codeCoverageIgnoreEnd
+            }
+
+            if (! empty($this->db->dataCache['db_names'])) {
+                $this->db->dataCache['db_names'][] = $dbName;
+            }
+
+            return true;
+        } catch (Throwable $e) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unable to create the specified database.', 0, $e);
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+    }
+
+    /**
+     * Determine if a database exists
+     *
+     * @throws DatabaseException
+     */
+    private function databaseExists(string $dbName): bool
+    {
+        if ($this->checkDatabaseExistStr === null) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        return $this->db->query($this->checkDatabaseExistStr, $dbName)->getRow() !== null;
+    }
+
+    /**
+     * Drop database
+     *
+     * @throws DatabaseException
+     */
+    public function dropDatabase(string $dbName): bool
+    {
+        if ($this->dropDatabaseStr === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        if (! $this->db->query(sprintf($this->dropDatabaseStr, $dbName))) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unable to drop the specified database.');
+            }
+
+            return false;
+        }
+
+        if (! empty($this->db->dataCache['db_names'])) {
+            $key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
+            if ($key !== false) {
+                unset($this->db->dataCache['db_names'][$key]);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Add Key
+     *
+     * @param array|string $key
+     *
+     * @return Forge
+     */
+    public function addKey($key, bool $primary = false, bool $unique = false)
+    {
+        if ($primary) {
+            foreach ((array) $key as $one) {
+                $this->primaryKeys[] = $one;
+            }
+        } else {
+            $this->keys[] = $key;
+
+            if ($unique) {
+                $this->uniqueKeys[] = count($this->keys) - 1;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add Primary Key
+     *
+     * @param array|string $key
+     *
+     * @return Forge
+     */
+    public function addPrimaryKey($key)
+    {
+        return $this->addKey($key, true);
+    }
+
+    /**
+     * Add Unique Key
+     *
+     * @param array|string $key
+     *
+     * @return Forge
+     */
+    public function addUniqueKey($key)
+    {
+        return $this->addKey($key, false, true);
+    }
+
+    /**
+     * Add Field
+     *
+     * @param array|string $field
+     *
+     * @return Forge
+     */
+    public function addField($field)
+    {
+        if (is_string($field)) {
+            if ($field === 'id') {
+                $this->addField([
+                    'id' => [
+                        'type'           => 'INT',
+                        'constraint'     => 9,
+                        'auto_increment' => true,
+                    ],
+                ]);
+                $this->addKey('id', true);
+            } else {
+                if (strpos($field, ' ') === false) {
+                    throw new InvalidArgumentException('Field information is required for that operation.');
+                }
+
+                $this->fields[] = $field;
+            }
+        }
+
+        if (is_array($field)) {
+            $this->fields = array_merge($this->fields, $field);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add Foreign Key
+     *
+     * @throws DatabaseException
+     *
+     * @return Forge
+     */
+    public function addForeignKey(string $fieldName = '', string $tableName = '', string $tableField = '', string $onUpdate = '', string $onDelete = '')
+    {
+        if (! isset($this->fields[$fieldName])) {
+            throw new DatabaseException(lang('Database.fieldNotExists', [$fieldName]));
+        }
+
+        $this->foreignKeys[$fieldName] = [
+            'table'    => $tableName,
+            'field'    => $tableField,
+            'onDelete' => strtoupper($onDelete),
+            'onUpdate' => strtoupper($onUpdate),
+        ];
+
+        return $this;
+    }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return BaseResult|bool|false|mixed|Query
+     */
+    public function dropForeignKey(string $table, string $foreignName)
+    {
+        $sql = sprintf(
+            $this->dropConstraintStr,
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
+        );
+
+        if ($sql === false) { // @phpstan-ignore-line
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        return $this->db->query($sql);
+    }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function createTable(string $table, bool $ifNotExists = false, array $attributes = [])
+    {
+        if ($table === '') {
+            throw new InvalidArgumentException('A table name is required for that operation.');
+        }
+
+        $table = $this->db->DBPrefix . $table;
+
+        if ($this->fields === []) {
+            throw new RuntimeException('Field information is required.');
+        }
+
+        $sql = $this->_createTable($table, $ifNotExists, $attributes);
+
+        if (is_bool($sql)) {
+            $this->reset();
+            if ($sql === false) {
+                if ($this->db->DBDebug) {
+                    throw new DatabaseException('This feature is not available for the database you are using.');
+                }
+
+                return false;
+            }
+        }
+
+        if (($result = $this->db->query($sql)) !== false) {
+            if (isset($this->db->dataCache['table_names']) && ! in_array($table, $this->db->dataCache['table_names'], true)) {
+                $this->db->dataCache['table_names'][] = $table;
+            }
+
+            // Most databases don't support creating indexes from within the CREATE TABLE statement
+            if (! empty($this->keys)) {
+                for ($i = 0, $sqls = $this->_processIndexes($table), $c = count($sqls); $i < $c; $i++) {
+                    $this->db->query($sqls[$i]);
+                }
+            }
+        }
+
+        $this->reset();
+
+        return $result;
+    }
+
+    /**
+     * @return mixed
+     */
+    protected function _createTable(string $table, bool $ifNotExists, array $attributes)
+    {
+        // For any platforms that don't support Create If Not Exists...
+        if ($ifNotExists === true && $this->createTableIfStr === false) {
+            if ($this->db->tableExists($table)) {
+                return true;
+            }
+
+            $ifNotExists = false;
+        }
+
+        $sql = ($ifNotExists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table))
+            : 'CREATE TABLE';
+
+        $columns = $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]);
+        }
+
+        $columns = implode(',', $columns);
+
+        $columns .= $this->_processPrimaryKeys($table);
+        $columns .= $this->_processForeignKeys($table);
+
+        if ($this->createTableKeys === true) {
+            $indexes = $this->_processIndexes($table);
+            if (is_string($indexes)) {
+                $columns .= $indexes;
+            }
+        }
+
+        return sprintf(
+            $this->createTableStr . '%s',
+            $sql,
+            $this->db->escapeIdentifiers($table),
+            $columns,
+            $this->_createTableAttributes($attributes)
+        );
+    }
+
+    protected function _createTableAttributes(array $attributes): string
+    {
+        $sql = '';
+
+        foreach (array_keys($attributes) as $key) {
+            if (is_string($key)) {
+                $sql .= ' ' . strtoupper($key) . ' ' . $this->db->escape($attributes[$key]);
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function dropTable(string $tableName, bool $ifExists = false, bool $cascade = false)
+    {
+        if ($tableName === '') {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('A table name is required for that operation.');
+            }
+
+            return false;
+        }
+
+        if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0) {
+            $tableName = substr($tableName, strlen($this->db->DBPrefix));
+        }
+
+        if (($query = $this->_dropTable($this->db->DBPrefix . $tableName, $ifExists, $cascade)) === true) {
+            return true;
+        }
+
+        $this->db->disableForeignKeyChecks();
+
+        $query = $this->db->query($query);
+
+        $this->db->enableForeignKeyChecks();
+
+        if ($query && ! empty($this->db->dataCache['table_names'])) {
+            $key = array_search(
+                strtolower($this->db->DBPrefix . $tableName),
+                array_map('strtolower', $this->db->dataCache['table_names']),
+                true
+            );
+
+            if ($key !== false) {
+                unset($this->db->dataCache['table_names'][$key]);
+            }
+        }
+
+        return $query;
+    }
+
+    /**
+     * Generates a platform-specific DROP TABLE string
+     *
+     * @return bool|string
+     */
+    protected function _dropTable(string $table, bool $ifExists, bool $cascade)
+    {
+        $sql = 'DROP TABLE';
+
+        if ($ifExists) {
+            if ($this->dropTableIfStr === false) {
+                if (! $this->db->tableExists($table)) {
+                    return true;
+                }
+            } else {
+                $sql = sprintf($this->dropTableIfStr, $this->db->escapeIdentifiers($table));
+            }
+        }
+
+        return $sql . ' ' . $this->db->escapeIdentifiers($table);
+    }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function renameTable(string $tableName, string $newTableName)
+    {
+        if ($tableName === '' || $newTableName === '') {
+            throw new InvalidArgumentException('A table name is required for that operation.');
+        }
+
+        if ($this->renameTableStr === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        $result = $this->db->query(sprintf(
+            $this->renameTableStr,
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $tableName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $newTableName)
+        ));
+
+        if ($result && ! empty($this->db->dataCache['table_names'])) {
+            $key = array_search(
+                strtolower($this->db->DBPrefix . $tableName),
+                array_map('strtolower', $this->db->dataCache['table_names']),
+                true
+            );
+
+            if ($key !== false) {
+                $this->db->dataCache['table_names'][$key] = $this->db->DBPrefix . $newTableName;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param array|string $field
+     *
+     * @throws DatabaseException
+     */
+    public function addColumn(string $table, $field): bool
+    {
+        // Work-around for literal column definitions
+        if (! is_array($field)) {
+            $field = [$field];
+        }
+
+        foreach (array_keys($field) as $k) {
+            $this->addField([$k => $field[$k]]);
+        }
+
+        $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.');
+            }
+
+            return false;
+        }
+
+        foreach ($sqls as $sql) {
+            if ($this->db->query($sql) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array|string $columnName
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function dropColumn(string $table, $columnName)
+    {
+        $sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnName);
+        if ($sql === false) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        return $this->db->query($sql);
+    }
+
+    /**
+     * @param array|string $field
+     *
+     * @throws DatabaseException
+     */
+    public function modifyColumn(string $table, $field): bool
+    {
+        // Work-around for literal column definitions
+        if (! is_array($field)) {
+            $field = [$field];
+        }
+
+        foreach (array_keys($field) as $k) {
+            $this->addField([$k => $field[$k]]);
+        }
+
+        if ($this->fields === []) {
+            throw new RuntimeException('Field information is required');
+        }
+
+        $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.');
+            }
+
+            return false;
+        }
+
+        if ($sqls !== null) {
+            foreach ($sqls as $sql) {
+                if ($this->db->query($sql) === false) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param mixed $fields
+     *
+     * @return false|string|string[]
+     */
+    protected function _alterTable(string $alterType, string $table, $fields)
+    {
+        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . ' ';
+
+        // DROP has everything it needs now.
+        if ($alterType === 'DROP') {
+            if (is_string($fields)) {
+                $fields = explode(',', $fields);
+            }
+
+            $fields = array_map(function ($field) {
+                return 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field));
+            }, $fields);
+
+            return $sql . implode(', ', $fields);
+        }
+
+        $sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';
+
+        $sqls = [];
+
+        foreach ($fields as $data) {
+            $sqls[] = $sql . ($data['_literal'] !== false
+                ? $data['_literal']
+                : $this->_processColumn($data));
+        }
+
+        return $sqls;
+    }
+
+    /**
+     * Process fields
+     */
+    protected function _processFields(bool $createTable = false): array
+    {
+        $fields = [];
+
+        foreach ($this->fields as $key => $attributes) {
+            if (is_int($key) && ! is_array($attributes)) {
+                $fields[] = ['_literal' => $attributes];
+
+                continue;
+            }
+
+            $attributes = array_change_key_case($attributes, CASE_UPPER);
+
+            if ($createTable === true && empty($attributes['TYPE'])) {
+                continue;
+            }
+
+            if (isset($attributes['TYPE'])) {
+                $this->_attributeType($attributes);
+            }
+
+            $field = [
+                'name'           => $key,
+                'new_name'       => $attributes['NAME'] ?? null,
+                'type'           => $attributes['TYPE'] ?? null,
+                'length'         => '',
+                'unsigned'       => '',
+                'null'           => '',
+                'unique'         => '',
+                'default'        => '',
+                'auto_increment' => '',
+                '_literal'       => false,
+            ];
+
+            if (isset($attributes['TYPE'])) {
+                $this->_attributeUnsigned($attributes, $field);
+            }
+
+            if ($createTable === false) {
+                if (isset($attributes['AFTER'])) {
+                    $field['after'] = $attributes['AFTER'];
+                } elseif (isset($attributes['FIRST'])) {
+                    $field['first'] = (bool) $attributes['FIRST'];
+                }
+            }
+
+            $this->_attributeDefault($attributes, $field);
+
+            if (isset($attributes['NULL'])) {
+                if ($attributes['NULL'] === true) {
+                    $field['null'] = empty($this->null) ? '' : ' ' . $this->null;
+                } else {
+                    $field['null'] = ' NOT NULL';
+                }
+            } elseif ($createTable === true) {
+                $field['null'] = ' NOT NULL';
+            }
+
+            $this->_attributeAutoIncrement($attributes, $field);
+            $this->_attributeUnique($attributes, $field);
+
+            if (isset($attributes['COMMENT'])) {
+                $field['comment'] = $this->db->escape($attributes['COMMENT']);
+            }
+
+            if (isset($attributes['TYPE']) && ! empty($attributes['CONSTRAINT'])) {
+                if (is_array($attributes['CONSTRAINT'])) {
+                    $attributes['CONSTRAINT'] = $this->db->escape($attributes['CONSTRAINT']);
+                    $attributes['CONSTRAINT'] = implode(',', $attributes['CONSTRAINT']);
+                }
+
+                $field['length'] = '(' . $attributes['CONSTRAINT'] . ')';
+            }
+
+            $fields[] = $field;
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
+        return $this->db->escapeIdentifiers($field['name'])
+            . ' ' . $field['type'] . $field['length']
+            . $field['unsigned']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . $field['unique'];
+    }
+
+    /**
+     * Performs a data type mapping between different databases.
+     */
+    protected function _attributeType(array &$attributes)
+    {
+        // Usually overridden by drivers
+    }
+
+    /**
+     * Depending on the unsigned property value:
+     *
+     *    - TRUE will always set $field['unsigned'] to 'UNSIGNED'
+     *    - FALSE will always set $field['unsigned'] to ''
+     *    - array(TYPE) will set $field['unsigned'] to 'UNSIGNED',
+     *        if $attributes['TYPE'] is found in the array
+     *    - array(TYPE => UTYPE) will change $field['type'],
+     *        from TYPE to UTYPE in case of a match
+     */
+    protected function _attributeUnsigned(array &$attributes, array &$field)
+    {
+        if (empty($attributes['UNSIGNED']) || $attributes['UNSIGNED'] !== true) {
+            return;
+        }
+
+        // Reset the attribute in order to avoid issues if we do type conversion
+        $attributes['UNSIGNED'] = false;
+
+        if (is_array($this->unsigned)) {
+            foreach (array_keys($this->unsigned) as $key) {
+                if (is_int($key) && strcasecmp($attributes['TYPE'], $this->unsigned[$key]) === 0) {
+                    $field['unsigned'] = ' UNSIGNED';
+
+                    return;
+                }
+
+                if (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0) {
+                    $field['type'] = $key;
+
+                    return;
+                }
+            }
+
+            return;
+        }
+
+        $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
+    }
+
+    protected function _attributeDefault(array &$attributes, array &$field)
+    {
+        if ($this->default === false) {
+            return;
+        }
+
+        if (array_key_exists('DEFAULT', $attributes)) {
+            if ($attributes['DEFAULT'] === null) {
+                $field['default'] = empty($this->null) ? '' : $this->default . $this->null;
+
+                // Override the NULL attribute if that's our default
+                $attributes['NULL'] = true;
+                $field['null']      = empty($this->null) ? '' : ' ' . $this->null;
+            } else {
+                $field['default'] = $this->default . $this->db->escape($attributes['DEFAULT']);
+            }
+        }
+    }
+
+    protected function _attributeUnique(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
+            $field['unique'] = ' UNIQUE';
+        }
+    }
+
+    protected function _attributeAutoIncrement(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+            && stripos($field['type'], 'int') !== false
+        ) {
+            $field['auto_increment'] = ' AUTO_INCREMENT';
+        }
+    }
+
+    protected function _processPrimaryKeys(string $table): string
+    {
+        $sql = '';
+
+        for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++) {
+            if (! isset($this->fields[$this->primaryKeys[$i]])) {
+                unset($this->primaryKeys[$i]);
+            }
+        }
+
+        if ($this->primaryKeys !== []) {
+            $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
+                    . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
+        }
+
+        return $sql;
+    }
+
+    protected function _processIndexes(string $table)
+    {
+        $sqls = [];
+
+        for ($i = 0, $c = count($this->keys); $i < $c; $i++) {
+            $this->keys[$i] = (array) $this->keys[$i];
+
+            for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) {
+                if (! isset($this->fields[$this->keys[$i][$i2]])) {
+                    unset($this->keys[$i][$i2]);
+                }
+            }
+
+            if (count($this->keys[$i]) <= 0) {
+                continue;
+            }
+
+            if (in_array($i, $this->uniqueKeys, true)) {
+                $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
+                    . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                    . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+
+                continue;
+            }
+
+            $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                . ' ON ' . $this->db->escapeIdentifiers($table)
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+        }
+
+        return $sqls;
+    }
+
+    protected function _processForeignKeys(string $table): string
+    {
+        $sql = '';
+
+        $allowActions = [
+            'CASCADE',
+            'SET NULL',
+            'NO ACTION',
+            'RESTRICT',
+            'SET DEFAULT',
+        ];
+
+        foreach ($this->foreignKeys as $field => $fkey) {
+            $nameIndex = $table . '_' . $field . '_foreign';
+
+            $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+                . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
+
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Resets table creation vars
+     */
+    public function reset()
+    {
+        $this->fields = $this->keys = $this->uniqueKeys = $this->primaryKeys = $this->foreignKeys = [];
+    }
 }
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 670c2785c67b..6b1cf82d642d 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -18,65 +18,56 @@
  */
 abstract class Migration
 {
-	/**
-	 * The name of the database group to use.
-	 *
-	 * @var string
-	 */
-	protected $DBGroup;
+    /**
+     * The name of the database group to use.
+     *
+     * @var string
+     */
+    protected $DBGroup;
 
-	/**
-	 * Database Connection instance
-	 *
-	 * @var ConnectionInterface
-	 */
-	protected $db;
+    /**
+     * Database Connection instance
+     *
+     * @var ConnectionInterface
+     */
+    protected $db;
 
-	/**
-	 * Database Forge instance.
-	 *
-	 * @var Forge
-	 */
-	protected $forge;
+    /**
+     * Database Forge instance.
+     *
+     * @var Forge
+     */
+    protected $forge;
 
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor.
-	 *
-	 * @param Forge $forge
-	 */
-	public function __construct(Forge $forge = null)
-	{
-		$this->forge = ! is_null($forge) ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
+    /**
+     * Constructor.
+     *
+     * @param Forge $forge
+     */
+    public function __construct(?Forge $forge = null)
+    {
+        $this->forge = $forge ?? Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
 
-		$this->db = $this->forge->getConnection();
-	}
+        $this->db = $this->forge->getConnection();
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * Returns the database group name this migration uses.
+     *
+     * @return string
+     */
+    public function getDBGroup(): ?string
+    {
+        return $this->DBGroup;
+    }
 
-	/**
-	 * Returns the database group name this migration uses.
-	 *
-	 * @return string
-	 */
-	public function getDBGroup(): ?string
-	{
-		return $this->DBGroup;
-	}
+    /**
+     * Perform a migration step.
+     */
+    abstract public function up();
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Perform a migration step.
-	 */
-	abstract public function up();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Revert a migration step.
-	 */
-	abstract public function down();
-
-	//--------------------------------------------------------------------
+    /**
+     * Revert a migration step.
+     */
+    abstract public function down();
 }
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 861fd729ca90..517688889ec6 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -25,1046 +25,843 @@
  */
 class MigrationRunner
 {
-	/**
-	 * Whether or not migrations are allowed to run.
-	 *
-	 * @var boolean
-	 */
-	protected $enabled = false;
-
-	/**
-	 * Name of table to store meta information
-	 *
-	 * @var string
-	 */
-	protected $table;
-
-	/**
-	 * The Namespace  where migrations can be found.
-	 *
-	 * @var string|null
-	 */
-	protected $namespace;
-
-	/**
-	 * The database Group to migrate.
-	 *
-	 * @var string
-	 */
-	protected $group;
-
-	/**
-	 * The migration name.
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The pattern used to locate migration file versions.
-	 *
-	 * @var string
-	 */
-	protected $regex = '/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}_(\w+)$/';
-
-	/**
-	 * The main database connection. Used to store
-	 * migration information in.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * If true, will continue instead of throwing
-	 * exceptions.
-	 *
-	 * @var boolean
-	 */
-	protected $silent = false;
-
-	/**
-	 * used to return messages for CLI.
-	 *
-	 * @var array
-	 */
-	protected $cliMessages = [];
-
-	/**
-	 * Tracks whether we have already ensured
-	 * the table exists or not.
-	 *
-	 * @var boolean
-	 */
-	protected $tableChecked = false;
-
-	/**
-	 * The full path to locate migration files.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * The database Group filter.
-	 *
-	 * @var string|null
-	 */
-	protected $groupFilter;
-
-	/**
-	 * Used to skip current migration.
-	 *
-	 * @var boolean
-	 */
-	protected $groupSkip = false;
-
-	/**
-	 * Constructor.
-	 *
-	 * When passing in $db, you may pass any of the following to connect:
-	 * - group name
-	 * - existing connection instance
-	 * - array of database configuration values
-	 *
-	 * @param MigrationsConfig                      $config
-	 * @param ConnectionInterface|array|string|null $db
-	 *
-	 * @throws ConfigException
-	 */
-	public function __construct(MigrationsConfig $config, $db = null)
-	{
-		$this->enabled = $config->enabled ?? false;
-		$this->table   = $config->table ?? 'migrations';
-
-		// Default name space is the app namespace
-		$this->namespace = APP_NAMESPACE;
-
-		// get default database group
-		$config      = config('Database');
-		$this->group = $config->defaultGroup;
-		unset($config);
-
-		// If no db connection passed in, use
-		// default database group.
-		$this->db = db_connect($db);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Locate and run all new migrations
-	 *
-	 * @param string|null $group
-	 *
-	 * @throws ConfigException
-	 * @throws RuntimeException
-	 *
-	 * @return boolean
-	 */
-	public function latest(string $group = null)
-	{
-		if (! $this->enabled)
-		{
-			throw ConfigException::forDisabledMigrations();
-		}
-
-		$this->ensureTable();
-
-		// Set database group if not null
-		if (! is_null($group))
-		{
-			$this->groupFilter = $group;
-			$this->setGroup($group);
-		}
-
-		// Locate the migrations
-		$migrations = $this->findMigrations();
-
-		// If nothing was found then we're done
-		if (empty($migrations))
-		{
-			return true;
-		}
-
-		// Remove any migrations already in the history
-		foreach ($this->getHistory((string) $group) as $history)
-		{
-			unset($migrations[$this->getObjectUid($history)]);
-		}
-
-		// Start a new batch
-		$batch = $this->getLastBatch() + 1;
-
-		// Run each migration
-		foreach ($migrations as $migration)
-		{
-			if ($this->migrate('up', $migration))
-			{
-				if ($this->groupSkip === true)
-				{
-					$this->groupSkip = false;
-					continue;
-				}
-
-				$this->addHistory($migration, $batch);
-			}
-			// If a migration failed then try to back out what was done
-			else
-			{
-				$this->regress(-1);
-
-				$message = lang('Migrations.generalFault');
-
-				if ($this->silent)
-				{
-					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-					return false;
-				}
-
-				throw new RuntimeException($message);
-			}
-		}
-
-		$data           = get_object_vars($this);
-		$data['method'] = 'latest';
-		Events::trigger('migrate', $data);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Migrate down to a previous batch
-	 *
-	 * Calls each migration step required to get to the provided batch
-	 *
-	 * @param integer     $targetBatch Target batch number, or negative for a relative batch, 0 for all
-	 * @param string|null $group
-	 *
-	 * @throws ConfigException
-	 * @throws RuntimeException
-	 *
-	 * @return mixed Current batch number on success, FALSE on failure or no migrations are found
-	 */
-	public function regress(int $targetBatch = 0, string $group = null)
-	{
-		if (! $this->enabled)
-		{
-			throw ConfigException::forDisabledMigrations();
-		}
-
-		// Set database group if not null
-		if (! is_null($group))
-		{
-			$this->setGroup($group);
-		}
-
-		$this->ensureTable();
-
-		// Get all the batches
-		$batches = $this->getBatches();
-
-		// Convert a relative batch to its absolute
-		if ($targetBatch < 0)
-		{
-			$targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
-		}
-
-		// If the goal was rollback then check if it is done
-		if (empty($batches) && $targetBatch === 0)
-		{
-			return true;
-		}
-
-		// Make sure $targetBatch is found
-		if ($targetBatch !== 0 && ! in_array($targetBatch, $batches, true))
-		{
-			$message = lang('Migrations.batchNotFound') . $targetBatch;
-
-			if ($this->silent)
-			{
-				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-				return false;
-			}
-
-			throw new RuntimeException($message);
-		}
-
-		// Save the namespace to restore it after loading migrations
-		$tmpNamespace = $this->namespace;
-
-		// Get all migrations
-		$this->namespace = null;
-		$allMigrations   = $this->findMigrations();
-
-		// Gather migrations down through each batch until reaching the target
-		$migrations = [];
-
-		while ($batch = array_pop($batches))
-		{
-			// Check if reached target
-			if ($batch <= $targetBatch)
-			{
-				break;
-			}
-
-			// Get the migrations from each history
-			foreach ($this->getBatchHistory($batch, 'desc') as $history)
-			{
-				// Create a UID from the history to match its migration
-				$uid = $this->getObjectUid($history);
-
-				// Make sure the migration is still available
-				if (! isset($allMigrations[$uid]))
-				{
-					$message = lang('Migrations.gap') . ' ' . $history->version;
-
-					if ($this->silent)
-					{
-						$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-						return false;
-					}
-
-					throw new RuntimeException($message);
-				}
-
-				// Add the history and put it on the list
-				$migration          = $allMigrations[$uid];
-				$migration->history = $history;
-				$migrations[]       = $migration;
-			}
-		}
-
-		// Run each migration
-		foreach ($migrations as $migration)
-		{
-			if ($this->migrate('down', $migration))
-			{
-				$this->removeHistory($migration->history);
-			}
-			// If a migration failed then quit so as not to ruin the whole batch
-			else
-			{
-				$message = lang('Migrations.generalFault');
-
-				if ($this->silent)
-				{
-					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-					return false;
-				}
-
-				throw new RuntimeException($message);
-			}
-		}
-
-		$data           = get_object_vars($this);
-		$data['method'] = 'regress';
-		Events::trigger('migrate', $data);
-
-		// Restore the namespace
-		$this->namespace = $tmpNamespace;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Migrate a single file regardless of order or batches.
-	 * Method "up" or "down" determined by presence in history.
-	 * NOTE: This is not recommended and provided mostly for testing.
-	 *
-	 * @param string      $path  Full path to a valid migration file
-	 * @param string      $path  Namespace of the target migration
-	 * @param string|null $group
-	 */
-	public function force(string $path, string $namespace, string $group = null)
-	{
-		if (! $this->enabled)
-		{
-			throw ConfigException::forDisabledMigrations();
-		}
-
-		$this->ensureTable();
-
-		// Set database group if not null
-		if (! is_null($group))
-		{
-			$this->groupFilter = $group;
-			$this->setGroup($group);
-		}
-
-		// Create and validate the migration
-		$migration = $this->migrationFromFile($path, $namespace);
-		if (empty($migration))
-		{
-			$message = lang('Migrations.notFound');
-
-			if ($this->silent)
-			{
-				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-				return false;
-			}
-			throw new RuntimeException($message);
-		}
-
-		// Check the history for a match
-		$method = 'up';
-		$this->setNamespace($migration->namespace);
-		foreach ($this->getHistory($this->group) as $history)
-		{
-			if ($this->getObjectUid($history) === $migration->uid)
-			{
-				$method             = 'down';
-				$migration->history = $history;
-				break;
-			}
-		}
-
-		// up
-		if ($method === 'up')
-		{
-			// Start a new batch
-			$batch = $this->getLastBatch() + 1;
-
-			if ($this->migrate('up', $migration) && $this->groupSkip === false)
-			{
-				$this->addHistory($migration, $batch);
-				return true;
-			}
-
-			$this->groupSkip = false;
-		}
-
-		// down
-		elseif ($this->migrate('down', $migration))
-		{
-			$this->removeHistory($migration->history);
-			return true;
-		}
-
-		// If it came this far the migration failed
-		$message = lang('Migrations.generalFault');
-
-		if ($this->silent)
-		{
-			$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-			return false;
-		}
-		throw new RuntimeException($message);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieves list of available migration scripts
-	 *
-	 * @return array    List of all located migrations by their UID
-	 */
-	public function findMigrations(): array
-	{
-		// If a namespace is set then use it, otherwise load all namespaces from the autoloader
-		$namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
-
-		// Collect the migrations to run by their sortable UID
-		$migrations = [];
-		foreach ($namespaces as $namespace)
-		{
-			foreach ($this->findNamespaceMigrations($namespace) as $migration)
-			{
-				$migrations[$migration->uid] = $migration;
-			}
-		}
-
-		// Sort migrations ascending by their UID (version)
-		ksort($migrations);
-
-		return $migrations;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieves a list of available migration scripts for one namespace
-	 *
-	 * @param string $namespace The namespace to search for migrations
-	 *
-	 * @return array    List of unsorted migrations from the namespace
-	 */
-	public function findNamespaceMigrations(string $namespace): array
-	{
-		$migrations = [];
-		$locator    = Services::locator(true);
-
-		// If $this->path contains a valid directory use it.
-		if (! empty($this->path))
-		{
-			helper('filesystem');
-			$dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
-			$files = get_filenames($dir, true);
-		}
-		// Otherwise use FileLocator to search files in the subdirectory of the namespace
-		else
-		{
-			$files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
-		}
-
-		// Load all *_*.php files in the migrations path
-		// We can't use glob if we want it to be testable....
-		foreach ($files as $file)
-		{
-			// Clean up the file path
-			$file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);
-
-			// Create the migration object from the file and save it
-			if ($migration = $this->migrationFromFile($file, $namespace))
-			{
-				$migrations[] = $migration;
-			}
-		}
-
-		return $migrations;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create a migration object from a file path.
-	 *
-	 * @param string $path The path to the file
-	 * @param string $path The namespace of the target migration
-	 *
-	 * @return object|false    Returns the migration object, or false on failure
-	 */
-	protected function migrationFromFile(string $path, string $namespace)
-	{
-		if (substr($path, -4) !== '.php')
-		{
-			return false;
-		}
-
-		// Remove the extension
-		$name = basename($path, '.php');
-
-		// Filter out non-migration files
-		if (! preg_match($this->regex, $name))
-		{
-			return false;
-		}
-
-		$locator = Services::locator(true);
-
-		// Create migration object using stdClass
-		$migration = new stdClass();
-
-		// Get migration version number
-		$migration->version   = $this->getMigrationNumber($name);
-		$migration->name      = $this->getMigrationName($name);
-		$migration->path      = $path;
-		$migration->class     = $locator->getClassname($path);
-		$migration->namespace = $namespace;
-		$migration->uid       = $this->getObjectUid($migration);
-
-		return $migration;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set namespace.
-	 * Allows other scripts to modify on the fly as needed.
-	 *
-	 * @param string $namespace or null for "all"
-	 *
-	 * @return MigrationRunner
-	 */
-	public function setNamespace(?string $namespace)
-	{
-		$this->namespace = $namespace;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set database Group.
-	 * Allows other scripts to modify on the fly as needed.
-	 *
-	 * @param string $group
-	 *
-	 * @return MigrationRunner
-	 */
-	public function setGroup(string $group)
-	{
-		$this->group = $group;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set migration Name.
-	 *
-	 * @param string $name
-	 *
-	 * @return MigrationRunner
-	 */
-	public function setName(string $name)
-	{
-		$this->name = $name;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If $silent == true, then will not throw exceptions and will
-	 * attempt to continue gracefully.
-	 *
-	 * @param boolean $silent
-	 *
-	 * @return MigrationRunner
-	 */
-	public function setSilent(bool $silent)
-	{
-		$this->silent = $silent;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Extracts the migration number from a filename
-	 *
-	 * @param string $migration
-	 *
-	 * @return string    Numeric portion of a migration filename
-	 */
-	protected function getMigrationNumber(string $migration): string
-	{
-		preg_match('/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}/', $migration, $matches);
-
-		return count($matches) ? $matches[0] : '0';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Extracts the migration class name from a filename
-	 *
-	 * @param string $migration
-	 *
-	 * @return string    text portion of a migration filename
-	 */
-	protected function getMigrationName(string $migration): string
-	{
-		$parts = explode('_', $migration);
-		array_shift($parts);
-
-		return implode('_', $parts);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Uses the non-repeatable portions of a migration or history
-	 * to create a sortable unique key
-	 *
-	 * @param object $object migration or $history
-	 *
-	 * @return string
-	 */
-	public function getObjectUid($object): string
-	{
-		return preg_replace('/[^0-9]/', '', $object->version) . $object->class;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieves messages formatted for CLI output
-	 *
-	 * @return array    Current migration version
-	 */
-	public function getCliMessages(): array
-	{
-		return $this->cliMessages;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Clears any CLI messages.
-	 *
-	 * @return MigrationRunner
-	 */
-	public function clearCliMessages()
-	{
-		$this->cliMessages = [];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncates the history table.
-	 *
-	 * @return void
-	 */
-	public function clearHistory()
-	{
-		if ($this->db->tableExists($this->table))
-		{
-			$this->db->table($this->table)->truncate();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add a history to the table.
-	 *
-	 * @param object  $migration
-	 * @param integer $batch
-	 *
-	 * @return void
-	 */
-	protected function addHistory($migration, int $batch)
-	{
-		$this->db->table($this->table)->insert([
-			'version'   => $migration->version,
-			'class'     => $migration->class,
-			'group'     => $this->group,
-			'namespace' => $migration->namespace,
-			'time'      => time(),
-			'batch'     => $batch,
-		]);
-
-		if (is_cli())
-		{
-			$this->cliMessages[] = sprintf(
-				"\t%s(%s) %s_%s",
-				CLI::color(lang('Migrations.added'), 'yellow'),
-				$migration->namespace,
-				$migration->version,
-				$migration->class
-			);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes a single history
-	 *
-	 * @param object $history
-	 *
-	 * @return void
-	 */
-	protected function removeHistory($history)
-	{
-		$this->db->table($this->table)->where('id', $history->id)->delete();
-
-		if (is_cli())
-		{
-			$this->cliMessages[] = sprintf(
-				"\t%s(%s) %s_%s",
-				CLI::color(lang('Migrations.removed'), 'yellow'),
-				$history->namespace,
-				$history->version,
-				$history->class
-			);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the full migration history from the database for a group
-	 *
-	 * @param string $group
-	 *
-	 * @return array
-	 */
-	public function getHistory(string $group = 'default'): array
-	{
-		$this->ensureTable();
-
-		$builder = $this->db->table($this->table);
-
-		// If group was specified then use it
-		if (! empty($group))
-		{
-			$builder->where('group', $group);
-		}
-
-		// If a namespace was specified then use it
-		if ($this->namespace)
-		{
-			$builder->where('namespace', $this->namespace);
-		}
-
-		$query = $builder->orderBy('id', 'ASC')->get();
-
-		return ! empty($query) ? $query->getResultObject() : [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the migration history for a single batch.
-	 *
-	 * @param integer $batch
-	 *
-	 * @return array
-	 */
-	public function getBatchHistory(int $batch, $order = 'asc'): array
-	{
-		$this->ensureTable();
-
-		$query = $this->db->table($this->table)
-						  ->where('batch', $batch)
-						  ->orderBy('id', $order)
-						  ->get();
-
-		return ! empty($query) ? $query->getResultObject() : [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns all the batches from the database history in order
-	 *
-	 * @return array
-	 */
-	public function getBatches(): array
-	{
-		$this->ensureTable();
-
-		$batches = $this->db->table($this->table)
-						  ->select('batch')
-						  ->distinct()
-						  ->orderBy('batch', 'asc')
-						  ->get()
-						  ->getResultArray();
-
-		return array_map('intval', array_column($batches, 'batch'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the value of the last batch in the database.
-	 *
-	 * @return integer
-	 */
-	public function getLastBatch(): int
-	{
-		$this->ensureTable();
-
-		$batch = $this->db->table($this->table)
-						  ->selectMax('batch')
-						  ->get()
-						  ->getResultObject();
-
-		$batch = is_array($batch) && count($batch)
-			? end($batch)->batch
-			: 0;
-
-		return (int) $batch;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the version number of the first migration for a batch.
-	 * Mostly just for tests.
-	 *
-	 * @param integer $batch
-	 *
-	 * @return string
-	 */
-	public function getBatchStart(int $batch): string
-	{
-		// Convert a relative batch to its absolute
-		if ($batch < 0)
-		{
-			$batches = $this->getBatches();
-			$batch   = $batches[count($batches) - 1] ?? 0;
-		}
-
-		$migration = $this->db->table($this->table)
-			->where('batch', $batch)
-			->orderBy('id', 'asc')
-			->limit(1)
-			->get()
-			->getResultObject();
-
-		return count($migration) ? $migration[0]->version : '0';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the version number of the last migration for a batch.
-	 * Mostly just for tests.
-	 *
-	 * @param integer $batch
-	 *
-	 * @return string
-	 */
-	public function getBatchEnd(int $batch): string
-	{
-		// Convert a relative batch to its absolute
-		if ($batch < 0)
-		{
-			$batches = $this->getBatches();
-			$batch   = $batches[count($batches) - 1] ?? 0;
-		}
-
-		$migration = $this->db->table($this->table)
-			  ->where('batch', $batch)
-			  ->orderBy('id', 'desc')
-			  ->limit(1)
-			  ->get()
-			  ->getResultObject();
-
-		return count($migration) ? $migration[0]->version : 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures that we have created our migrations table
-	 * in the database.
-	 */
-	public function ensureTable()
-	{
-		if ($this->tableChecked || $this->db->tableExists($this->table))
-		{
-			return;
-		}
-
-		$forge = Database::forge($this->db);
-
-		$forge->addField([
-			'id'        => [
-				'type'           => 'BIGINT',
-				'constraint'     => 20,
-				'unsigned'       => true,
-				'auto_increment' => true,
-			],
-			'version'   => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'null'       => false,
-			],
-			'class'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'null'       => false,
-			],
-			'group'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'null'       => false,
-			],
-			'namespace' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'null'       => false,
-			],
-			'time'      => [
-				'type'       => 'INT',
-				'constraint' => 11,
-				'null'       => false,
-			],
-			'batch'     => [
-				'type'       => 'INT',
-				'constraint' => 11,
-				'unsigned'   => true,
-				'null'       => false,
-			],
-		]);
-
-		$forge->addPrimaryKey('id');
-		$forge->createTable($this->table, true);
-
-		$this->tableChecked = true;
-	}
-
-	/**
-	 * Handles the actual running of a migration.
-	 *
-	 * @param string $direction "up" or "down"
-	 * @param object $migration The migration to run
-	 *
-	 * @return boolean
-	 */
-	protected function migrate($direction, $migration): bool
-	{
-		include_once $migration->path;
-
-		$class = $migration->class;
-		$this->setName($migration->name);
-
-		// Validate the migration file structure
-		if (! class_exists($class, false))
-		{
-			$message = sprintf(lang('Migrations.classNotFound'), $class);
-
-			if ($this->silent)
-			{
-				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-				return false;
-			}
-			throw new RuntimeException($message);
-		}
-
-		// Initialize migration
-		$instance = new $class();
-		// Determine DBGroup to use
-		$group = $instance->getDBGroup() ?? config('Database')->defaultGroup;
-
-		// Skip tests db group when not running in testing environment
-		if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests')
-		{
-			// @codeCoverageIgnoreStart
-			$this->groupSkip = true;
-			return true;
-			// @codeCoverageIgnoreEnd
-		}
-
-		// Skip migration if group filtering was set
-		if ($direction === 'up' && ! is_null($this->groupFilter) && $this->groupFilter !== $group)
-		{
-			$this->groupSkip = true;
-			return true;
-		}
-
-		$this->setGroup($group);
-
-		if (! is_callable([$instance, $direction]))
-		{
-			$message = sprintf(lang('Migrations.missingMethod'), $direction);
-
-			if ($this->silent)
-			{
-				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
-				return false;
-			}
-			throw new RuntimeException($message);
-		}
-
-		$instance->{$direction}();
-
-		return true;
-	}
+    /**
+     * Whether or not migrations are allowed to run.
+     *
+     * @var bool
+     */
+    protected $enabled = false;
+
+    /**
+     * Name of table to store meta information
+     *
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * The Namespace  where migrations can be found.
+     *
+     * @var string|null
+     */
+    protected $namespace;
+
+    /**
+     * The database Group to migrate.
+     *
+     * @var string
+     */
+    protected $group;
+
+    /**
+     * The migration name.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The pattern used to locate migration file versions.
+     *
+     * @var string
+     */
+    protected $regex = '/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}_(\w+)$/';
+
+    /**
+     * The main database connection. Used to store
+     * migration information in.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * If true, will continue instead of throwing
+     * exceptions.
+     *
+     * @var bool
+     */
+    protected $silent = false;
+
+    /**
+     * used to return messages for CLI.
+     *
+     * @var array
+     */
+    protected $cliMessages = [];
+
+    /**
+     * Tracks whether we have already ensured
+     * the table exists or not.
+     *
+     * @var bool
+     */
+    protected $tableChecked = false;
+
+    /**
+     * The full path to locate migration files.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * The database Group filter.
+     *
+     * @var string|null
+     */
+    protected $groupFilter;
+
+    /**
+     * Used to skip current migration.
+     *
+     * @var bool
+     */
+    protected $groupSkip = false;
+
+    /**
+     * Constructor.
+     *
+     * When passing in $db, you may pass any of the following to connect:
+     * - group name
+     * - existing connection instance
+     * - array of database configuration values
+     *
+     * @param array|ConnectionInterface|string|null $db
+     *
+     * @throws ConfigException
+     */
+    public function __construct(MigrationsConfig $config, $db = null)
+    {
+        $this->enabled = $config->enabled ?? false;
+        $this->table   = $config->table ?? 'migrations';
+
+        // Default name space is the app namespace
+        $this->namespace = APP_NAMESPACE;
+
+        // get default database group
+        $config      = config('Database');
+        $this->group = $config->defaultGroup;
+        unset($config);
+
+        // If no db connection passed in, use
+        // default database group.
+        $this->db = db_connect($db);
+    }
+
+    /**
+     * Locate and run all new migrations
+     *
+     * @throws ConfigException
+     * @throws RuntimeException
+     *
+     * @return bool
+     */
+    public function latest(?string $group = null)
+    {
+        if (! $this->enabled) {
+            throw ConfigException::forDisabledMigrations();
+        }
+
+        $this->ensureTable();
+
+        if ($group !== null) {
+            $this->groupFilter = $group;
+            $this->setGroup($group);
+        }
+
+        $migrations = $this->findMigrations();
+
+        if (empty($migrations)) {
+            return true;
+        }
+
+        foreach ($this->getHistory((string) $group) as $history) {
+            unset($migrations[$this->getObjectUid($history)]);
+        }
+
+        $batch = $this->getLastBatch() + 1;
+
+        foreach ($migrations as $migration) {
+            if ($this->migrate('up', $migration)) {
+                if ($this->groupSkip === true) {
+                    $this->groupSkip = false;
+
+                    continue;
+                }
+
+                $this->addHistory($migration, $batch);
+            } else {
+                $this->regress(-1);
+
+                $message = lang('Migrations.generalFault');
+
+                if ($this->silent) {
+                    $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                    return false;
+                }
+
+                throw new RuntimeException($message);
+            }
+        }
+
+        $data           = get_object_vars($this);
+        $data['method'] = 'latest';
+        Events::trigger('migrate', $data);
+
+        return true;
+    }
+
+    /**
+     * Migrate down to a previous batch
+     *
+     * Calls each migration step required to get to the provided batch
+     *
+     * @param int $targetBatch Target batch number, or negative for a relative batch, 0 for all
+     *
+     * @throws ConfigException
+     * @throws RuntimeException
+     *
+     * @return mixed Current batch number on success, FALSE on failure or no migrations are found
+     */
+    public function regress(int $targetBatch = 0, ?string $group = null)
+    {
+        if (! $this->enabled) {
+            throw ConfigException::forDisabledMigrations();
+        }
+
+        // Set database group if not null
+        if ($group !== null) {
+            $this->setGroup($group);
+        }
+
+        $this->ensureTable();
+
+        $batches = $this->getBatches();
+
+        if ($targetBatch < 0) {
+            $targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
+        }
+
+        if (empty($batches) && $targetBatch === 0) {
+            return true;
+        }
+
+        if ($targetBatch !== 0 && ! in_array($targetBatch, $batches, true)) {
+            $message = lang('Migrations.batchNotFound') . $targetBatch;
+
+            if ($this->silent) {
+                $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                return false;
+            }
+
+            throw new RuntimeException($message);
+        }
+
+        $tmpNamespace = $this->namespace;
+
+        $this->namespace = null;
+        $allMigrations   = $this->findMigrations();
+
+        $migrations = [];
+
+        while ($batch = array_pop($batches)) {
+            if ($batch <= $targetBatch) {
+                break;
+            }
+
+            foreach ($this->getBatchHistory($batch, 'desc') as $history) {
+                $uid = $this->getObjectUid($history);
+
+                if (! isset($allMigrations[$uid])) {
+                    $message = lang('Migrations.gap') . ' ' . $history->version;
+
+                    if ($this->silent) {
+                        $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                        return false;
+                    }
+
+                    throw new RuntimeException($message);
+                }
+
+                $migration          = $allMigrations[$uid];
+                $migration->history = $history;
+                $migrations[]       = $migration;
+            }
+        }
+
+        foreach ($migrations as $migration) {
+            if ($this->migrate('down', $migration)) {
+                $this->removeHistory($migration->history);
+            } else {
+                $message = lang('Migrations.generalFault');
+
+                if ($this->silent) {
+                    $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                    return false;
+                }
+
+                throw new RuntimeException($message);
+            }
+        }
+
+        $data           = get_object_vars($this);
+        $data['method'] = 'regress';
+        Events::trigger('migrate', $data);
+
+        $this->namespace = $tmpNamespace;
+
+        return true;
+    }
+
+    /**
+     * Migrate a single file regardless of order or batches.
+     * Method "up" or "down" determined by presence in history.
+     * NOTE: This is not recommended and provided mostly for testing.
+     *
+     * @param string $path Full path to a valid migration file
+     * @param string $path Namespace of the target migration
+     */
+    public function force(string $path, string $namespace, ?string $group = null)
+    {
+        if (! $this->enabled) {
+            throw ConfigException::forDisabledMigrations();
+        }
+
+        $this->ensureTable();
+
+        if ($group !== null) {
+            $this->groupFilter = $group;
+            $this->setGroup($group);
+        }
+
+        $migration = $this->migrationFromFile($path, $namespace);
+        if (empty($migration)) {
+            $message = lang('Migrations.notFound');
+
+            if ($this->silent) {
+                $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                return false;
+            }
+
+            throw new RuntimeException($message);
+        }
+
+        $method = 'up';
+        $this->setNamespace($migration->namespace);
+
+        foreach ($this->getHistory($this->group) as $history) {
+            if ($this->getObjectUid($history) === $migration->uid) {
+                $method             = 'down';
+                $migration->history = $history;
+                break;
+            }
+        }
+
+        if ($method === 'up') {
+            $batch = $this->getLastBatch() + 1;
+
+            if ($this->migrate('up', $migration) && $this->groupSkip === false) {
+                $this->addHistory($migration, $batch);
+
+                return true;
+            }
+
+            $this->groupSkip = false;
+        } elseif ($this->migrate('down', $migration)) {
+            $this->removeHistory($migration->history);
+
+            return true;
+        }
+
+        $message = lang('Migrations.generalFault');
+
+        if ($this->silent) {
+            $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+            return false;
+        }
+
+        throw new RuntimeException($message);
+    }
+
+    /**
+     * Retrieves list of available migration scripts
+     *
+     * @return array List of all located migrations by their UID
+     */
+    public function findMigrations(): array
+    {
+        $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
+        $migrations = [];
+
+        foreach ($namespaces as $namespace) {
+            foreach ($this->findNamespaceMigrations($namespace) as $migration) {
+                $migrations[$migration->uid] = $migration;
+            }
+        }
+
+        // Sort migrations ascending by their UID (version)
+        ksort($migrations);
+
+        return $migrations;
+    }
+
+    /**
+     * Retrieves a list of available migration scripts for one namespace
+     */
+    public function findNamespaceMigrations(string $namespace): array
+    {
+        $migrations = [];
+        $locator    = Services::locator(true);
+
+        if (! empty($this->path)) {
+            helper('filesystem');
+            $dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
+            $files = get_filenames($dir, true);
+        } else {
+            $files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
+        }
+
+        foreach ($files as $file) {
+            $file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);
+
+            if ($migration = $this->migrationFromFile($file, $namespace)) {
+                $migrations[] = $migration;
+            }
+        }
+
+        return $migrations;
+    }
+
+    /**
+     * Create a migration object from a file path.
+     *
+     * @return false|object Returns the migration object, or false on failure
+     */
+    protected function migrationFromFile(string $path, string $namespace)
+    {
+        if (substr($path, -4) !== '.php') {
+            return false;
+        }
+
+        $name = basename($path, '.php');
+
+        if (! preg_match($this->regex, $name)) {
+            return false;
+        }
+
+        $locator = Services::locator(true);
+
+        $migration = new stdClass();
+
+        $migration->version   = $this->getMigrationNumber($name);
+        $migration->name      = $this->getMigrationName($name);
+        $migration->path      = $path;
+        $migration->class     = $locator->getClassname($path);
+        $migration->namespace = $namespace;
+        $migration->uid       = $this->getObjectUid($migration);
+
+        return $migration;
+    }
+
+    /**
+     * Allows other scripts to modify on the fly as needed.
+     *
+     * @return MigrationRunner
+     */
+    public function setNamespace(?string $namespace)
+    {
+        $this->namespace = $namespace;
+
+        return $this;
+    }
+
+    /**
+     * Allows other scripts to modify on the fly as needed.
+     *
+     * @return MigrationRunner
+     */
+    public function setGroup(string $group)
+    {
+        $this->group = $group;
+
+        return $this;
+    }
+
+    /**
+     * @return MigrationRunner
+     */
+    public function setName(string $name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * If $silent == true, then will not throw exceptions and will
+     * attempt to continue gracefully.
+     *
+     * @return MigrationRunner
+     */
+    public function setSilent(bool $silent)
+    {
+        $this->silent = $silent;
+
+        return $this;
+    }
+
+    /**
+     * Extracts the migration number from a filename
+     */
+    protected function getMigrationNumber(string $migration): string
+    {
+        preg_match('/^\d{4}[_-]?\d{2}[_-]?\d{2}[_-]?\d{6}/', $migration, $matches);
+
+        return count($matches) ? $matches[0] : '0';
+    }
+
+    /**
+     * Extracts the migration class name from a filename
+     */
+    protected function getMigrationName(string $migration): string
+    {
+        $parts = explode('_', $migration);
+        array_shift($parts);
+
+        return implode('_', $parts);
+    }
+
+    /**
+     * Uses the non-repeatable portions of a migration or history
+     * to create a sortable unique key
+     *
+     * @param object $object migration or $history
+     */
+    public function getObjectUid($object): string
+    {
+        return preg_replace('/[^0-9]/', '', $object->version) . $object->class;
+    }
+
+    /**
+     * Retrieves messages formatted for CLI output
+     */
+    public function getCliMessages(): array
+    {
+        return $this->cliMessages;
+    }
+
+    /**
+     * Clears any CLI messages.
+     *
+     * @return MigrationRunner
+     */
+    public function clearCliMessages()
+    {
+        $this->cliMessages = [];
+
+        return $this;
+    }
+
+    /**
+     * Truncates the history table.
+     */
+    public function clearHistory()
+    {
+        if ($this->db->tableExists($this->table)) {
+            $this->db->table($this->table)->truncate();
+        }
+    }
+
+    /**
+     * Add a history to the table.
+     *
+     * @param object $migration
+     */
+    protected function addHistory($migration, int $batch)
+    {
+        $this->db->table($this->table)->insert([
+            'version'   => $migration->version,
+            'class'     => $migration->class,
+            'group'     => $this->group,
+            'namespace' => $migration->namespace,
+            'time'      => time(),
+            'batch'     => $batch,
+        ]);
+
+        if (is_cli()) {
+            $this->cliMessages[] = sprintf(
+                "\t%s(%s) %s_%s",
+                CLI::color(lang('Migrations.added'), 'yellow'),
+                $migration->namespace,
+                $migration->version,
+                $migration->class
+            );
+        }
+    }
+
+    /**
+     * Removes a single history
+     *
+     * @param object $history
+     */
+    protected function removeHistory($history)
+    {
+        $this->db->table($this->table)->where('id', $history->id)->delete();
+
+        if (is_cli()) {
+            $this->cliMessages[] = sprintf(
+                "\t%s(%s) %s_%s",
+                CLI::color(lang('Migrations.removed'), 'yellow'),
+                $history->namespace,
+                $history->version,
+                $history->class
+            );
+        }
+    }
+
+    /**
+     * Grabs the full migration history from the database for a group
+     */
+    public function getHistory(string $group = 'default'): array
+    {
+        $this->ensureTable();
+
+        $builder = $this->db->table($this->table);
+
+        // If group was specified then use it
+        if (! empty($group)) {
+            $builder->where('group', $group);
+        }
+
+        // If a namespace was specified then use it
+        if ($this->namespace) {
+            $builder->where('namespace', $this->namespace);
+        }
+
+        $query = $builder->orderBy('id', 'ASC')->get();
+
+        return ! empty($query) ? $query->getResultObject() : [];
+    }
+
+    /**
+     * Returns the migration history for a single batch.
+     *
+     * @param string $order
+     */
+    public function getBatchHistory(int $batch, $order = 'asc'): array
+    {
+        $this->ensureTable();
+
+        $query = $this->db->table($this->table)
+            ->where('batch', $batch)
+            ->orderBy('id', $order)
+            ->get();
+
+        return ! empty($query) ? $query->getResultObject() : [];
+    }
+
+    /**
+     * Returns all the batches from the database history in order
+     */
+    public function getBatches(): array
+    {
+        $this->ensureTable();
+
+        $batches = $this->db->table($this->table)
+            ->select('batch')
+            ->distinct()
+            ->orderBy('batch', 'asc')
+            ->get()
+            ->getResultArray();
+
+        return array_map('intval', array_column($batches, 'batch'));
+    }
+
+    /**
+     * Returns the value of the last batch in the database.
+     */
+    public function getLastBatch(): int
+    {
+        $this->ensureTable();
+
+        $batch = $this->db->table($this->table)
+            ->selectMax('batch')
+            ->get()
+            ->getResultObject();
+
+        $batch = is_array($batch) && count($batch)
+            ? end($batch)->batch
+            : 0;
+
+        return (int) $batch;
+    }
+
+    /**
+     * Returns the version number of the first migration for a batch.
+     * Mostly just for tests.
+     */
+    public function getBatchStart(int $batch): string
+    {
+        if ($batch < 0) {
+            $batches = $this->getBatches();
+            $batch   = $batches[count($batches) - 1] ?? 0;
+        }
+
+        $migration = $this->db->table($this->table)
+            ->where('batch', $batch)
+            ->orderBy('id', 'asc')
+            ->limit(1)
+            ->get()
+            ->getResultObject();
+
+        return count($migration) ? $migration[0]->version : '0';
+    }
+
+    /**
+     * Returns the version number of the last migration for a batch.
+     * Mostly just for tests.
+     */
+    public function getBatchEnd(int $batch): string
+    {
+        if ($batch < 0) {
+            $batches = $this->getBatches();
+            $batch   = $batches[count($batches) - 1] ?? 0;
+        }
+
+        $migration = $this->db->table($this->table)
+            ->where('batch', $batch)
+            ->orderBy('id', 'desc')
+            ->limit(1)
+            ->get()
+            ->getResultObject();
+
+        return count($migration) ? $migration[0]->version : 0;
+    }
+
+    /**
+     * Ensures that we have created our migrations table
+     * in the database.
+     */
+    public function ensureTable()
+    {
+        if ($this->tableChecked || $this->db->tableExists($this->table)) {
+            return;
+        }
+
+        $forge = Database::forge($this->db);
+
+        $forge->addField([
+            'id' => [
+                'type'           => 'BIGINT',
+                'constraint'     => 20,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'version' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+            'class' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+            'group' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+            'namespace' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+            'time' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'null'       => false,
+            ],
+            'batch' => [
+                'type'       => 'INT',
+                'constraint' => 11,
+                'unsigned'   => true,
+                'null'       => false,
+            ],
+        ]);
+
+        $forge->addPrimaryKey('id');
+        $forge->createTable($this->table, true);
+
+        $this->tableChecked = true;
+    }
+
+    /**
+     * Handles the actual running of a migration.
+     *
+     * @param string $direction "up" or "down"
+     * @param object $migration The migration to run
+     */
+    protected function migrate($direction, $migration): bool
+    {
+        include_once $migration->path;
+
+        $class = $migration->class;
+        $this->setName($migration->name);
+
+        // Validate the migration file structure
+        if (! class_exists($class, false)) {
+            $message = sprintf(lang('Migrations.classNotFound'), $class);
+
+            if ($this->silent) {
+                $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                return false;
+            }
+
+            throw new RuntimeException($message);
+        }
+
+        $instance = new $class();
+        $group    = $instance->getDBGroup() ?? config('Database')->defaultGroup;
+
+        if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
+            // @codeCoverageIgnoreStart
+            $this->groupSkip = true;
+
+            return true;
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ($direction === 'up' && $this->groupFilter !== null && $this->groupFilter !== $group) {
+            $this->groupSkip = true;
+
+            return true;
+        }
+
+        $this->setGroup($group);
+
+        if (! is_callable([$instance, $direction])) {
+            $message = sprintf(lang('Migrations.missingMethod'), $direction);
+
+            if ($this->silent) {
+                $this->cliMessages[] = "\t" . CLI::color($message, 'red');
+
+                return false;
+            }
+
+            throw new RuntimeException($message);
+        }
+
+        $instance->{$direction}();
+
+        return true;
+    }
 }
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index 6900fa37b80e..ae088124d9f7 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -22,36 +22,31 @@
  */
 class ModelFactory
 {
-	/**
-	 * Creates new Model instances or returns a shared instance
-	 *
-	 * @param string              $name       Model name, namespace optional
-	 * @param boolean             $getShared  Use shared instance
-	 * @param ConnectionInterface $connection
-	 *
-	 * @return mixed|null
-	 */
-	public static function get(string $name, bool $getShared = true, ConnectionInterface $connection = null)
-	{
-		return Factories::models($name, ['getShared' => $getShared], $connection);
-	}
+    /**
+     * Creates new Model instances or returns a shared instance
+     *
+     * @return mixed
+     */
+    public static function get(string $name, bool $getShared = true, ?ConnectionInterface $connection = null)
+    {
+        return Factories::models($name, ['getShared' => $getShared], $connection);
+    }
 
-	/**
-	 * Helper method for injecting mock instances while testing.
-	 *
-	 * @param string $name
-	 * @param object $instance
-	 */
-	public static function injectMock(string $name, $instance)
-	{
-		Factories::injectMock('models', $name, $instance);
-	}
+    /**
+     * Helper method for injecting mock instances while testing.
+     *
+     * @param object $instance
+     */
+    public static function injectMock(string $name, $instance)
+    {
+        Factories::injectMock('models', $name, $instance);
+    }
 
-	/**
-	 * Resets the static arrays
-	 */
-	public static function reset()
-	{
-		Factories::reset('models');
-	}
+    /**
+     * Resets the static arrays
+     */
+    public static function reset()
+    {
+        Factories::reset('models');
+    }
 }
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
index a64b3ae93e74..abeb83f8e4dc 100644
--- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -18,42 +18,39 @@
  */
 class Builder extends BaseBuilder
 {
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	protected $escapeChar = '`';
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    protected $escapeChar = '`';
 
-	/**
-	 * Specifies which sql statements
-	 * support the ignore option.
-	 *
-	 * @var array
-	 */
-	protected $supportedIgnoreStatements = [
-		'update' => 'IGNORE',
-		'insert' => 'IGNORE',
-		'delete' => 'IGNORE',
-	];
+    /**
+     * Specifies which sql statements
+     * support the ignore option.
+     *
+     * @var array
+     */
+    protected $supportedIgnoreStatements = [
+        'update' => 'IGNORE',
+        'insert' => 'IGNORE',
+        'delete' => 'IGNORE',
+    ];
 
-	/**
-	 * FROM tables
-	 *
-	 * Groups tables in FROM clauses if needed, so there is no confusion
-	 * about operator precedence.
-	 *
-	 * Note: This is only used (and overridden) by MySQL.
-	 *
-	 * @return string
-	 */
-	protected function _fromTables(): string
-	{
-		if (! empty($this->QBJoin) && count($this->QBFrom) > 1)
-		{
-			return '(' . implode(', ', $this->QBFrom) . ')';
-		}
+    /**
+     * FROM tables
+     *
+     * Groups tables in FROM clauses if needed, so there is no confusion
+     * about operator precedence.
+     *
+     * Note: This is only used (and overridden) by MySQL.
+     */
+    protected function _fromTables(): string
+    {
+        if (! empty($this->QBJoin) && count($this->QBFrom) > 1) {
+            return '(' . implode(', ', $this->QBFrom) . ')';
+        }
 
-		return implode(', ', $this->QBFrom);
-	}
+        return implode(', ', $this->QBFrom);
+    }
 }
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index e3c2838d06ac..756057528450 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -24,555 +24,446 @@
  */
 class Connection extends BaseConnection
 {
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	public $DBDriver = 'MySQLi';
-
-	/**
-	 * DELETE hack flag
-	 *
-	 * Whether to use the MySQL "delete hack" which allows the number
-	 * of affected rows to be shown. Uses a preg_replace when enabled,
-	 * adding a bit more processing to all queries.
-	 *
-	 * @var boolean
-	 */
-	public $deleteHack = true;
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	public $escapeChar = '`';
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * MySQLi object
-	 *
-	 * Has to be preserved without being assigned to $conn_id.
-	 *
-	 * @var MySQLi
-	 */
-	public $mysqli;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param boolean $persistent
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function connect(bool $persistent = false)
-	{
-		// Do we have a socket path?
-		if ($this->hostname[0] === '/')
-		{
-			$hostname = null;
-			$port     = null;
-			$socket   = $this->hostname;
-		}
-		else
-		{
-			$hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
-			$port     = empty($this->port) ? null : $this->port;
-			$socket   = '';
-		}
-
-		$clientFlags  = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
-		$this->mysqli = mysqli_init();
-
-		mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
-
-		$this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);
-
-		if (isset($this->strictOn))
-		{
-			if ($this->strictOn)
-			{
-				$this->mysqli->options(MYSQLI_INIT_COMMAND,
-					'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
-			}
-			else
-			{
-				$this->mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode =
-						REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
-												@@sql_mode,
-												"STRICT_ALL_TABLES,", ""),
-											",STRICT_ALL_TABLES", ""),
-										"STRICT_ALL_TABLES", ""),
-									"STRICT_TRANS_TABLES,", ""),
-								",STRICT_TRANS_TABLES", ""),
-							"STRICT_TRANS_TABLES", "")'
-				);
-			}
-		}
-
-		if (is_array($this->encrypt))
-		{
-			$ssl = [];
-
-			if (! empty($this->encrypt['ssl_key']))
-			{
-				$ssl['key'] = $this->encrypt['ssl_key'];
-			}
-			if (! empty($this->encrypt['ssl_cert']))
-			{
-				$ssl['cert'] = $this->encrypt['ssl_cert'];
-			}
-			if (! empty($this->encrypt['ssl_ca']))
-			{
-				$ssl['ca'] = $this->encrypt['ssl_ca'];
-			}
-			if (! empty($this->encrypt['ssl_capath']))
-			{
-				$ssl['capath'] = $this->encrypt['ssl_capath'];
-			}
-			if (! empty($this->encrypt['ssl_cipher']))
-			{
-				$ssl['cipher'] = $this->encrypt['ssl_cipher'];
-			}
-
-			if (! empty($ssl))
-			{
-				if (isset($this->encrypt['ssl_verify']))
-				{
-					if ($this->encrypt['ssl_verify'])
-					{
-						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
-						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
-					}
-					// Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
-					// to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
-					// constant ...
-					//
-					// https://secure.php.net/ChangeLog-5.php#5.6.16
-					// https://bugs.php.net/bug.php?id=68344
-					elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, 'mysqlnd 5.6', '>='))
-					{
-						$clientFlags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
-					}
-				}
-
-				$clientFlags += MYSQLI_CLIENT_SSL;
-				$this->mysqli->ssl_set(
-					$ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
-					$ssl['capath'] ?? null, $ssl['cipher'] ?? null
-				);
-			}
-		}
-
-		try
-		{
-			if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
-				$this->database, $port, $socket, $clientFlags)
-			)
-			{
-				// Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
-				if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
-					&& empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
-										  ->fetch_object()->Value)
-				)
-				{
-					$this->mysqli->close();
-					$message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
-					log_message('error', $message);
-
-					if ($this->DBDebug)
-					{
-						throw new DatabaseException($message);
-					}
-
-					return false;
-				}
-
-				if (! $this->mysqli->set_charset($this->charset))
-				{
-					log_message('error',
-						"Database: Unable to set the configured connection charset ('{$this->charset}').");
-					$this->mysqli->close();
-
-					if ($this->DBDebug)
-					{
-						throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
-					}
-
-					return false;
-				}
-
-				return $this->mysqli;
-			}
-		}
-		catch (Throwable $e)
-		{
-			// Clean sensitive information from errors.
-			$msg = $e->getMessage();
-
-			$msg = str_replace($this->username, '****', $msg);
-			$msg = str_replace($this->password, '****', $msg);
-
-			throw new DatabaseException($msg, $e->getCode(), $e);
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return void
-	 */
-	public function reconnect()
-	{
-		$this->close();
-		$this->initialize();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	protected function _close()
-	{
-		$this->connID->close();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return boolean
-	 */
-	public function setDatabase(string $databaseName): bool
-	{
-		if ($databaseName === '')
-		{
-			$databaseName = $this->database;
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		if ($this->connID->select_db($databaseName))
-		{
-			$this->database = $databaseName;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		if (isset($this->dataCache['version']))
-		{
-			return $this->dataCache['version'];
-		}
-
-		if (empty($this->mysqli))
-		{
-			$this->initialize();
-		}
-
-		return $this->dataCache['version'] = $this->mysqli->server_info;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	public function execute(string $sql)
-	{
-		while ($this->connID->more_results())
-		{
-			$this->connID->next_result();
-			if ($res = $this->connID->store_result())
-			{
-				$res->free();
-			}
-		}
-		try
-		{
-			return $this->connID->query($this->prepQuery($sql));
-		}
-		catch (mysqli_sql_exception $e)
-		{
-			log_message('error', $e->getMessage());
-
-			if ($this->DBDebug)
-			{
-				throw $e;
-			}
-		}
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prep the query
-	 *
-	 * If needed, each database adapter can prep the query string
-	 *
-	 * @param string $sql an SQL query
-	 *
-	 * @return string
-	 */
-	protected function prepQuery(string $sql): string
-	{
-		// mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
-		// modifies the query so that it a proper number of affected rows is returned.
-		if ($this->deleteHack === true && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql))
-		{
-			return trim($sql) . ' WHERE 1=1';
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return $this->connID->affected_rows ?? 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-dependant string escape
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		if (! $this->connID)
-		{
-			$this->initialize();
-		}
-
-		return $this->connID->real_escape_string($str);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Escape Like String Direct
-	 * There are a few instances where MySQLi queries cannot take the
-	 * additional "ESCAPE x" parameter for specifying the escape character
-	 * in "LIKE" strings, and this handles those directly with a backslash.
-	 *
-	 * @param  string|string[] $str Input string
-	 * @return string|string[]
-	 */
-	public function escapeLikeStringDirect($str)
-	{
-		if (is_array($str))
-		{
-			foreach ($str as $key => $val)
-			{
-				$str[$key] = $this->escapeLikeStringDirect($val);
-			}
-
-			return $str;
-		}
-
-		$str = $this->_escapeString($str);
-
-		// Escape LIKE condition wildcards
-		return str_replace([
-			$this->likeEscapeChar,
-			'%',
-			'_',
-		], [
-			'\\' . $this->likeEscapeChar,
-			'\\' . '%',
-			'\\' . '_',
-		], $str
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 * Uses escapeLikeStringDirect().
-	 *
-	 * @param boolean $prefixLimit
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $prefixLimit = false): string
-	{
-		$sql = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->database);
-
-		if ($prefixLimit !== false && $this->DBPrefix !== '')
-		{
-			return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with field data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _fieldData(string $table): array
-	{
-		$table = $this->protectIdentifiers($table, true, null, false);
-
-		if (($query = $this->query('SHOW COLUMNS FROM ' . $table)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetFieldData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		for ($i = 0, $c = count($query); $i < $c; $i++)
-		{
-			$retVal[$i]       = new stdClass();
-			$retVal[$i]->name = $query[$i]->Field;
-
-			sscanf($query[$i]->Type, '%[a-z](%d)', $retVal[$i]->type, $retVal[$i]->max_length);
-
-			$retVal[$i]->nullable    = $query[$i]->Null === 'YES';
-			$retVal[$i]->default     = $query[$i]->Default;
-			$retVal[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with index data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 * @throws LogicException
-	 */
-	public function _indexData(string $table): array
-	{
-		$table = $this->protectIdentifiers($table, true, null, false);
-
-		if (($query = $this->query('SHOW INDEX FROM ' . $table)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
-		}
-
-		if (! $indexes = $query->getResultArray())
-		{
-			return [];
-		}
-
-		$keys = [];
-
-		foreach ($indexes as $index)
-		{
-			if (empty($keys[$index['Key_name']]))
-			{
-				$keys[$index['Key_name']]       = new stdClass();
-				$keys[$index['Key_name']]->name = $index['Key_name'];
-
-				if ($index['Key_name'] === 'PRIMARY')
-				{
-					$type = 'PRIMARY';
-				}
-				elseif ($index['Index_type'] === 'FULLTEXT')
-				{
-					$type = 'FULLTEXT';
-				}
-				elseif ($index['Non_unique'])
-				{
-					$type = $index['Index_type'] === 'SPATIAL' ? 'SPATIAL' : 'INDEX';
-				}
-				else
-				{
-					$type = 'UNIQUE';
-				}
-
-				$keys[$index['Key_name']]->type = $type;
-			}
-
-			$keys[$index['Key_name']]->fields[] = $index['Column_name'];
-		}
-
-		return $keys;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with Foreign key data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _foreignKeyData(string $table): array
-	{
-		$sql = '
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    public $DBDriver = 'MySQLi';
+
+    /**
+     * DELETE hack flag
+     *
+     * Whether to use the MySQL "delete hack" which allows the number
+     * of affected rows to be shown. Uses a preg_replace when enabled,
+     * adding a bit more processing to all queries.
+     *
+     * @var bool
+     */
+    public $deleteHack = true;
+
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    public $escapeChar = '`';
+
+    /**
+     * MySQLi object
+     *
+     * Has to be preserved without being assigned to $conn_id.
+     *
+     * @var MySQLi
+     */
+    public $mysqli;
+
+    /**
+     * Connect to the database.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        // Do we have a socket path?
+        if ($this->hostname[0] === '/') {
+            $hostname = null;
+            $port     = null;
+            $socket   = $this->hostname;
+        } else {
+            $hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
+            $port     = empty($this->port) ? null : $this->port;
+            $socket   = '';
+        }
+
+        $clientFlags  = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
+        $this->mysqli = mysqli_init();
+
+        mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
+
+        $this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);
+
+        if (isset($this->strictOn)) {
+            if ($this->strictOn) {
+                $this->mysqli->options(
+                    MYSQLI_INIT_COMMAND,
+                    'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")'
+                );
+            } else {
+                $this->mysqli->options(
+                    MYSQLI_INIT_COMMAND,
+                    'SET SESSION sql_mode = REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+                                        @@sql_mode,
+                                        "STRICT_ALL_TABLES,", ""),
+                                    ",STRICT_ALL_TABLES", ""),
+                                "STRICT_ALL_TABLES", ""),
+                            "STRICT_TRANS_TABLES,", ""),
+                        ",STRICT_TRANS_TABLES", ""),
+                    "STRICT_TRANS_TABLES", "")'
+                );
+            }
+        }
+
+        if (is_array($this->encrypt)) {
+            $ssl = [];
+
+            if (! empty($this->encrypt['ssl_key'])) {
+                $ssl['key'] = $this->encrypt['ssl_key'];
+            }
+            if (! empty($this->encrypt['ssl_cert'])) {
+                $ssl['cert'] = $this->encrypt['ssl_cert'];
+            }
+            if (! empty($this->encrypt['ssl_ca'])) {
+                $ssl['ca'] = $this->encrypt['ssl_ca'];
+            }
+            if (! empty($this->encrypt['ssl_capath'])) {
+                $ssl['capath'] = $this->encrypt['ssl_capath'];
+            }
+            if (! empty($this->encrypt['ssl_cipher'])) {
+                $ssl['cipher'] = $this->encrypt['ssl_cipher'];
+            }
+
+            if (! empty($ssl)) {
+                if (isset($this->encrypt['ssl_verify'])) {
+                    if ($this->encrypt['ssl_verify']) {
+                        if (defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')) {
+                            $this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
+                        }
+                    }
+                    // Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
+                    // to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
+                    // constant ...
+                    //
+                    // https://secure.php.net/ChangeLog-5.php#5.6.16
+                    // https://bugs.php.net/bug.php?id=68344
+                    elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, 'mysqlnd 5.6', '>=')) {
+                        $clientFlags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
+                    }
+                }
+
+                $clientFlags += MYSQLI_CLIENT_SSL;
+                $this->mysqli->ssl_set(
+                    $ssl['key'] ?? null,
+                    $ssl['cert'] ?? null,
+                    $ssl['ca'] ?? null,
+                    $ssl['capath'] ?? null,
+                    $ssl['cipher'] ?? null
+                );
+            }
+        }
+
+        try {
+            if ($this->mysqli->real_connect(
+                $hostname,
+                $this->username,
+                $this->password,
+                $this->database,
+                $port,
+                $socket,
+                $clientFlags
+            )) {
+                // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
+                if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
+                    && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")->fetch_object()->Value)
+                ) {
+                    $this->mysqli->close();
+                    $message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
+                    log_message('error', $message);
+
+                    if ($this->DBDebug) {
+                        throw new DatabaseException($message);
+                    }
+
+                    return false;
+                }
+
+                if (! $this->mysqli->set_charset($this->charset)) {
+                    log_message('error', "Database: Unable to set the configured connection charset ('{$this->charset}').");
+
+                    $this->mysqli->close();
+
+                    if ($this->DBDebug) {
+                        throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
+                    }
+
+                    return false;
+                }
+
+                return $this->mysqli;
+            }
+        } catch (Throwable $e) {
+            // Clean sensitive information from errors.
+            $msg = $e->getMessage();
+
+            $msg = str_replace($this->username, '****', $msg);
+            $msg = str_replace($this->password, '****', $msg);
+
+            throw new DatabaseException($msg, $e->getCode(), $e);
+        }
+
+        return false;
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     */
+    public function reconnect()
+    {
+        $this->close();
+        $this->initialize();
+    }
+
+    /**
+     * Close the database connection.
+     */
+    protected function _close()
+    {
+        $this->connID->close();
+    }
+
+    /**
+     * Select a specific database table to use.
+     */
+    public function setDatabase(string $databaseName): bool
+    {
+        if ($databaseName === '') {
+            $databaseName = $this->database;
+        }
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        if ($this->connID->select_db($databaseName)) {
+            $this->database = $databaseName;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        if (isset($this->dataCache['version'])) {
+            return $this->dataCache['version'];
+        }
+
+        if (empty($this->mysqli)) {
+            $this->initialize();
+        }
+
+        return $this->dataCache['version'] = $this->mysqli->server_info;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return mixed
+     */
+    protected function execute(string $sql)
+    {
+        while ($this->connID->more_results()) {
+            $this->connID->next_result();
+            if ($res = $this->connID->store_result()) {
+                $res->free();
+            }
+        }
+
+        try {
+            return $this->connID->query($this->prepQuery($sql));
+        } catch (mysqli_sql_exception $e) {
+            log_message('error', $e->getMessage());
+
+            if ($this->DBDebug) {
+                throw $e;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Prep the query. If needed, each database adapter can prep the query string
+     */
+    protected function prepQuery(string $sql): string
+    {
+        // mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
+        // modifies the query so that it a proper number of affected rows is returned.
+        if ($this->deleteHack === true && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql)) {
+            return trim($sql) . ' WHERE 1=1';
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return $this->connID->affected_rows ?? 0;
+    }
+
+    /**
+     * Platform-dependant string escape
+     */
+    protected function _escapeString(string $str): string
+    {
+        if (! $this->connID) {
+            $this->initialize();
+        }
+
+        return $this->connID->real_escape_string($str);
+    }
+
+    /**
+     * Escape Like String Direct
+     * There are a few instances where MySQLi queries cannot take the
+     * additional "ESCAPE x" parameter for specifying the escape character
+     * in "LIKE" strings, and this handles those directly with a backslash.
+     *
+     * @param string|string[] $str Input string
+     *
+     * @return string|string[]
+     */
+    public function escapeLikeStringDirect($str)
+    {
+        if (is_array($str)) {
+            foreach ($str as $key => $val) {
+                $str[$key] = $this->escapeLikeStringDirect($val);
+            }
+
+            return $str;
+        }
+
+        $str = $this->_escapeString($str);
+
+        // Escape LIKE condition wildcards
+        return str_replace(
+            [$this->likeEscapeChar, '%', '_'],
+            ['\\' . $this->likeEscapeChar, '\\' . '%', '\\' . '_'],
+            $str
+        );
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     * Uses escapeLikeStringDirect().
+     */
+    protected function _listTables(bool $prefixLimit = false): string
+    {
+        $sql = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->database);
+
+        if ($prefixLimit !== false && $this->DBPrefix !== '') {
+            return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
+    }
+
+    /**
+     * Returns an array of objects with field data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _fieldData(string $table): array
+    {
+        $table = $this->protectIdentifiers($table, true, null, false);
+
+        if (($query = $this->query('SHOW COLUMNS FROM ' . $table)) === false) {
+            throw new DatabaseException(lang('Database.failGetFieldData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
+            $retVal[$i]       = new stdClass();
+            $retVal[$i]->name = $query[$i]->Field;
+
+            sscanf($query[$i]->Type, '%[a-z](%d)', $retVal[$i]->type, $retVal[$i]->max_length);
+
+            $retVal[$i]->nullable    = $query[$i]->Null === 'YES';
+            $retVal[$i]->default     = $query[$i]->Default;
+            $retVal[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with index data
+     *
+     * @throws DatabaseException
+     * @throws LogicException
+     *
+     * @return stdClass[]
+     */
+    protected function _indexData(string $table): array
+    {
+        $table = $this->protectIdentifiers($table, true, null, false);
+
+        if (($query = $this->query('SHOW INDEX FROM ' . $table)) === false) {
+            throw new DatabaseException(lang('Database.failGetIndexData'));
+        }
+
+        if (! $indexes = $query->getResultArray()) {
+            return [];
+        }
+
+        $keys = [];
+
+        foreach ($indexes as $index) {
+            if (empty($keys[$index['Key_name']])) {
+                $keys[$index['Key_name']]       = new stdClass();
+                $keys[$index['Key_name']]->name = $index['Key_name'];
+
+                if ($index['Key_name'] === 'PRIMARY') {
+                    $type = 'PRIMARY';
+                } elseif ($index['Index_type'] === 'FULLTEXT') {
+                    $type = 'FULLTEXT';
+                } elseif ($index['Non_unique']) {
+                    $type = $index['Index_type'] === 'SPATIAL' ? 'SPATIAL' : 'INDEX';
+                } else {
+                    $type = 'UNIQUE';
+                }
+
+                $keys[$index['Key_name']]->type = $type;
+            }
+
+            $keys[$index['Key_name']]->fields[] = $index['Column_name'];
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Returns an array of objects with Foreign key data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _foreignKeyData(string $table): array
+    {
+        $sql = '
                     SELECT
                         tc.CONSTRAINT_NAME,
                         tc.TABLE_NAME,
@@ -589,140 +480,112 @@ public function _foreignKeyData(string $table): array
                         tc.TABLE_SCHEMA = ' . $this->escape($this->database) . ' AND
                         tc.TABLE_NAME = ' . $this->escape($table);
 
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj                      = new stdClass();
-			$obj->constraint_name     = $row->CONSTRAINT_NAME;
-			$obj->table_name          = $row->TABLE_NAME;
-			$obj->column_name         = $row->COLUMN_NAME;
-			$obj->foreign_table_name  = $row->REFERENCED_TABLE_NAME;
-			$obj->foreign_column_name = $row->REFERENCED_COLUMN_NAME;
-
-			$retVal[] = $obj;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _disableForeignKeyChecks()
-	{
-		return 'SET FOREIGN_KEY_CHECKS=0';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to enable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _enableForeignKeyChecks()
-	{
-		return 'SET FOREIGN_KEY_CHECKS=1';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 * Must return this format: ['code' => string|int, 'message' => string]
-	 * intval(code) === 0 means "no error".
-	 *
-	 * @return array<string,string|int>
-	 */
-	public function error(): array
-	{
-		if (! empty($this->mysqli->connect_errno))
-		{
-			return [
-				'code'    => $this->mysqli->connect_errno,
-				'message' => $this->mysqli->connect_error,
-			];
-		}
-
-		return [
-			'code'    => $this->connID->errno,
-			'message' => $this->connID->error,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer
-	 */
-	public function insertID(): int
-	{
-		return $this->connID->insert_id;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		$this->connID->autocommit(false);
-
-		return $this->connID->begin_transaction();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		if ($this->connID->commit())
-		{
-			$this->connID->autocommit(true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		if ($this->connID->rollback())
-		{
-			$this->connID->autocommit(true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj                      = new stdClass();
+            $obj->constraint_name     = $row->CONSTRAINT_NAME;
+            $obj->table_name          = $row->TABLE_NAME;
+            $obj->column_name         = $row->COLUMN_NAME;
+            $obj->foreign_table_name  = $row->REFERENCED_TABLE_NAME;
+            $obj->foreign_column_name = $row->REFERENCED_COLUMN_NAME;
+
+            $retVal[] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns platform-specific SQL to disable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return 'SET FOREIGN_KEY_CHECKS=0';
+    }
+
+    /**
+     * Returns platform-specific SQL to enable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return 'SET FOREIGN_KEY_CHECKS=1';
+    }
+
+    /**
+     * Returns the last error code and message.
+     * Must return this format: ['code' => string|int, 'message' => string]
+     * intval(code) === 0 means "no error".
+     *
+     * @return array<string, int|string>
+     */
+    public function error(): array
+    {
+        if (! empty($this->mysqli->connect_errno)) {
+            return [
+                'code'    => $this->mysqli->connect_errno,
+                'message' => $this->mysqli->connect_error,
+            ];
+        }
+
+        return [
+            'code'    => $this->connID->errno,
+            'message' => $this->connID->error,
+        ];
+    }
+
+    /**
+     * Insert ID
+     */
+    public function insertID(): int
+    {
+        return $this->connID->insert_id;
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        $this->connID->autocommit(false);
+
+        return $this->connID->begin_transaction();
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        if ($this->connID->commit()) {
+            $this->connID->autocommit(true);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        if ($this->connID->rollback()) {
+            $this->connID->autocommit(true);
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 4bb6e22fa8b0..094ae54264f9 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -18,238 +18,206 @@
  */
 class Forge extends BaseForge
 {
-	/**
-	 * CREATE DATABASE statement
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
-
-	/**
-	 * CREATE DATABASE IF statement
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseIfStr = 'CREATE DATABASE IF NOT EXISTS %s CHARACTER SET %s COLLATE %s';
-
-	/**
-	 * DROP CONSTRAINT statement
-	 *
-	 * @var string
-	 */
-	protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
-
-	/**
-	 * CREATE TABLE keys flag
-	 *
-	 * Whether table keys are created from within the
-	 * CREATE TABLE statement.
-	 *
-	 * @var boolean
-	 */
-	protected $createTableKeys = true;
-
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var array
-	 */
-	protected $_unsigned = [
-		'TINYINT',
-		'SMALLINT',
-		'MEDIUMINT',
-		'INT',
-		'INTEGER',
-		'BIGINT',
-		'REAL',
-		'DOUBLE',
-		'DOUBLE PRECISION',
-		'FLOAT',
-		'DECIMAL',
-		'NUMERIC',
-	];
-
-	/**
-	 * Table Options list which required to be quoted
-	 *
-	 * @var array
-	 */
-	protected $_quoted_table_options = [
-		'COMMENT',
-		'COMPRESSION',
-		'CONNECTION',
-		'DATA DIRECTORY',
-		'INDEX DIRECTORY',
-		'ENCRYPTION',
-		'PASSWORD',
-	];
-
-	/**
-	 * NULL value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string
-	 *
-	 * @internal
-	 */
-	protected $null = 'NULL';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CREATE TABLE attributes
-	 *
-	 * @param  array $attributes Associative array of table attributes
-	 * @return string
-	 */
-	protected function _createTableAttributes(array $attributes): string
-	{
-		$sql = '';
-
-		foreach (array_keys($attributes) as $key)
-		{
-			if (is_string($key))
-			{
-				$sql .= ' ' . strtoupper($key) . ' = ';
-
-				if (in_array(strtoupper($key), $this->_quoted_table_options, true))
-				{
-					$sql .= $this->db->escape($attributes[$key]);
-				}
-				else
-				{
-					$sql .= $this->db->escapeString($attributes[$key]);
-				}
-			}
-		}
-
-		if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET'))
-		{
-			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
-		}
-
-		if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE'))
-		{
-			$sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param  string $alterType ALTER type
-	 * @param  string $table     Table name
-	 * @param  mixed  $field     Column definition
-	 * @return string|string[]
-	 */
-	protected function _alterTable(string $alterType, string $table, $field)
-	{
-		if ($alterType === 'DROP')
-		{
-			return parent::_alterTable($alterType, $table, $field);
-		}
-
-		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-		foreach ($field as $i => $data)
-		{
-			if ($data['_literal'] !== false)
-			{
-				$field[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
-			}
-			else
-			{
-				if ($alterType === 'ADD')
-				{
-					$field[$i]['_literal'] = "\n\tADD ";
-				}
-				else
-				{
-					$field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
-				}
-
-				$field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
-			}
-		}
-
-		return [$sql . implode(',', $field)];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process column
-	 *
-	 * @param  array $field
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
-		$extraClause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
-
-		if (empty($extraClause) && isset($field['first']) && $field['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'])
-				. $extraClause;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process indexes
-	 *
-	 * @param  string $table (ignored)
-	 * @return string
-	 */
-	protected function _processIndexes(string $table): string
-	{
-		$sql = '';
-
-		for ($i = 0, $c = count($this->keys); $i < $c; $i ++)
-		{
-			if (is_array($this->keys[$i]))
-			{
-				for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2 ++)
-				{
-					if (! isset($this->fields[$this->keys[$i][$i2]]))
-					{
-						unset($this->keys[$i][$i2]);
-						continue;
-					}
-				}
-			}
-			elseif (! isset($this->fields[$this->keys[$i]]))
-			{
-				unset($this->keys[$i]);
-				continue;
-			}
-
-			if (! is_array($this->keys[$i]))
-			{
-				$this->keys[$i] = [$this->keys[$i]];
-			}
-
-			$unique = in_array($i, $this->uniqueKeys, true) ? 'UNIQUE ' : '';
-
-			$sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i]))
-				. ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
-		}
-
-		$this->keys = [];
-
-		return $sql;
-	}
+    /**
+     * CREATE DATABASE statement
+     *
+     * @var string
+     */
+    protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+
+    /**
+     * CREATE DATABASE IF statement
+     *
+     * @var string
+     */
+    protected $createDatabaseIfStr = 'CREATE DATABASE IF NOT EXISTS %s CHARACTER SET %s COLLATE %s';
+
+    /**
+     * DROP CONSTRAINT statement
+     *
+     * @var string
+     */
+    protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
+
+    /**
+     * CREATE TABLE keys flag
+     *
+     * Whether table keys are created from within the
+     * CREATE TABLE statement.
+     *
+     * @var bool
+     */
+    protected $createTableKeys = true;
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array
+     */
+    protected $_unsigned = [
+        'TINYINT',
+        'SMALLINT',
+        'MEDIUMINT',
+        'INT',
+        'INTEGER',
+        'BIGINT',
+        'REAL',
+        'DOUBLE',
+        'DOUBLE PRECISION',
+        'FLOAT',
+        'DECIMAL',
+        'NUMERIC',
+    ];
+
+    /**
+     * Table Options list which required to be quoted
+     *
+     * @var array
+     */
+    protected $_quoted_table_options = [
+        'COMMENT',
+        'COMPRESSION',
+        'CONNECTION',
+        'DATA DIRECTORY',
+        'INDEX DIRECTORY',
+        'ENCRYPTION',
+        'PASSWORD',
+    ];
+
+    /**
+     * NULL value representation in CREATE/ALTER TABLE statements
+     *
+     * @var string
+     *
+     * @internal
+     */
+    protected $null = 'NULL';
+
+    /**
+     * CREATE TABLE attributes
+     *
+     * @param array $attributes Associative array of table attributes
+     */
+    protected function _createTableAttributes(array $attributes): string
+    {
+        $sql = '';
+
+        foreach (array_keys($attributes) as $key) {
+            if (is_string($key)) {
+                $sql .= ' ' . strtoupper($key) . ' = ';
+
+                if (in_array(strtoupper($key), $this->_quoted_table_options, true)) {
+                    $sql .= $this->db->escape($attributes[$key]);
+                } else {
+                    $sql .= $this->db->escapeString($attributes[$key]);
+                }
+            }
+        }
+
+        if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET')) {
+            $sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
+        }
+
+        if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE')) {
+            $sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * ALTER TABLE
+     *
+     * @param string $alterType ALTER type
+     * @param string $table     Table name
+     * @param mixed  $field     Column definition
+     *
+     * @return string|string[]
+     */
+    protected function _alterTable(string $alterType, string $table, $field)
+    {
+        if ($alterType === 'DROP') {
+            return parent::_alterTable($alterType, $table, $field);
+        }
+
+        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+
+        foreach ($field as $i => $data) {
+            if ($data['_literal'] !== false) {
+                $field[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+            } else {
+                if ($alterType === 'ADD') {
+                    $field[$i]['_literal'] = "\n\tADD ";
+                } else {
+                    $field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+                }
+
+                $field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
+            }
+        }
+
+        return [$sql . implode(',', $field)];
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
+        $extraClause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+
+        if (empty($extraClause) && isset($field['first']) && $field['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'])
+                . $extraClause;
+    }
+
+    /**
+     * Process indexes
+     *
+     * @param string $table (ignored)
+     */
+    protected function _processIndexes(string $table): string
+    {
+        $sql = '';
+
+        for ($i = 0, $c = count($this->keys); $i < $c; $i++) {
+            if (is_array($this->keys[$i])) {
+                for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) {
+                    if (! isset($this->fields[$this->keys[$i][$i2]])) {
+                        unset($this->keys[$i][$i2]);
+
+                        continue;
+                    }
+                }
+            } elseif (! isset($this->fields[$this->keys[$i]])) {
+                unset($this->keys[$i]);
+
+                continue;
+            }
+
+            if (! is_array($this->keys[$i])) {
+                $this->keys[$i] = [$this->keys[$i]];
+            }
+
+            $unique = in_array($i, $this->uniqueKeys, true) ? 'UNIQUE ' : '';
+
+            $sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i]))
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
+        }
+
+        $this->keys = [];
+
+        return $sql;
+    }
 }
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
index efc9abee0868..cd351f2c51fa 100644
--- a/system/Database/MySQLi/PreparedQuery.php
+++ b/system/Database/MySQLi/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -19,82 +19,69 @@
  */
 class PreparedQuery extends BasePreparedQuery
 {
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
-	 *
-	 * @return mixed
-	 */
-	public function _prepare(string $sql, array $options = [])
-	{
-		// Mysqli driver doesn't like statements
-		// with terminating semicolons.
-		$sql = rtrim($sql, ';');
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
+     *
+     * @return mixed
+     */
+    public function _prepare(string $sql, array $options = [])
+    {
+        // Mysqli driver doesn't like statements
+        // with terminating semicolons.
+        $sql = rtrim($sql, ';');
 
-		if (! $this->statement = $this->db->mysqli->prepare($sql))
-		{
-			$this->errorCode   = $this->db->mysqli->errno;
-			$this->errorString = $this->db->mysqli->error;
-		}
+        if (! $this->statement = $this->db->mysqli->prepare($sql)) {
+            $this->errorCode   = $this->db->mysqli->errno;
+            $this->errorString = $this->db->mysqli->error;
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	public function _execute(array $data): bool
-	{
-		if (! isset($this->statement))
-		{
-			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
-		}
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     */
+    public function _execute(array $data): bool
+    {
+        if (! isset($this->statement)) {
+            throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+        }
 
-		// First off -bind the parameters
-		$bindTypes = '';
+        // First off -bind the parameters
+        $bindTypes = '';
 
-		// Determine the type string
-		foreach ($data as $item)
-		{
-			if (is_integer($item))
-			{
-				$bindTypes .= 'i';
-			}
-			elseif (is_numeric($item))
-			{
-				$bindTypes .= 'd';
-			}
-			else
-			{
-				$bindTypes .= 's';
-			}
-		}
+        // Determine the type string
+        foreach ($data as $item) {
+            if (is_int($item)) {
+                $bindTypes .= 'i';
+            } elseif (is_numeric($item)) {
+                $bindTypes .= 'd';
+            } else {
+                $bindTypes .= 's';
+            }
+        }
 
-		// Bind it
-		$this->statement->bind_param($bindTypes, ...$data);
+        // Bind it
+        $this->statement->bind_param($bindTypes, ...$data);
 
-		return $this->statement->execute();
-	}
+        return $this->statement->execute();
+    }
 
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	public function _getResult()
-	{
-		return $this->statement->get_result();
-	}
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    public function _getResult()
+    {
+        return $this->statement->get_result();
+    }
 }
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 4be7fc9f96af..7eab7d86c685 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -20,176 +20,143 @@
  */
 class Result extends BaseResult
 {
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return $this->resultID->field_count;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		$fieldNames = [];
-		$this->resultID->field_seek(0);
-		while ($field = $this->resultID->fetch_field())
-		{
-			$fieldNames[] = $field->name;
-		}
-
-		return $fieldNames;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		static $dataTypes = [
-			MYSQLI_TYPE_DECIMAL     => 'decimal',
-			MYSQLI_TYPE_NEWDECIMAL  => 'newdecimal',
-			MYSQLI_TYPE_FLOAT       => 'float',
-			MYSQLI_TYPE_DOUBLE      => 'double',
-
-			MYSQLI_TYPE_BIT         => 'bit',
-			MYSQLI_TYPE_SHORT       => 'short',
-			MYSQLI_TYPE_LONG        => 'long',
-			MYSQLI_TYPE_LONGLONG    => 'longlong',
-			MYSQLI_TYPE_INT24       => 'int24',
-
-			MYSQLI_TYPE_YEAR        => 'year',
-
-			MYSQLI_TYPE_TIMESTAMP   => 'timestamp',
-			MYSQLI_TYPE_DATE        => 'date',
-			MYSQLI_TYPE_TIME        => 'time',
-			MYSQLI_TYPE_DATETIME    => 'datetime',
-			MYSQLI_TYPE_NEWDATE     => 'newdate',
-
-			MYSQLI_TYPE_SET         => 'set',
-
-			MYSQLI_TYPE_VAR_STRING  => 'var_string',
-			MYSQLI_TYPE_STRING      => 'string',
-
-			MYSQLI_TYPE_GEOMETRY    => 'geometry',
-			MYSQLI_TYPE_TINY_BLOB   => 'tiny_blob',
-			MYSQLI_TYPE_MEDIUM_BLOB => 'medium_blob',
-			MYSQLI_TYPE_LONG_BLOB   => 'long_blob',
-			MYSQLI_TYPE_BLOB        => 'blob',
-		];
-
-		$retVal    = [];
-		$fieldData = $this->resultID->fetch_fields();
-
-		foreach ($fieldData as $i => $data)
-		{
-			$retVal[$i]              = new stdClass();
-			$retVal[$i]->name        = $data->name;
-			$retVal[$i]->type        = $data->type;
-			$retVal[$i]->type_name   = in_array($data->type, [1, 247], true) ? 'char' : ($dataTypes[$data->type] ?? null);
-			$retVal[$i]->max_length  = $data->max_length;
-			$retVal[$i]->primary_key = (int) ($data->flags & 2);
-			$retVal[$i]->length      = $data->length;
-			$retVal[$i]->default     = $data->def;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult()
-	{
-		if (is_object($this->resultID))
-		{
-			$this->resultID->free();
-			$this->resultID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek(int $n = 0)
-	{
-		return $this->resultID->data_seek($n);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-		return $this->resultID->fetch_assoc();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object|boolean|Entity
-	 */
-	protected function fetchObject(string $className = 'stdClass')
-	{
-		if (is_subclass_of($className, Entity::class))
-		{
-			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
-		}
-		return $this->resultID->fetch_object($className);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of rows in the resultID (i.e., mysqli_result object)
-	 *
-	 * @return integer number of rows in a query result
-	 */
-	public function getNumRows(): int
-	{
-		if (! is_int($this->numRows))
-		{
-			$this->numRows = $this->resultID->num_rows;
-		}
-
-		return $this->numRows;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return $this->resultID->field_count;
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        $fieldNames = [];
+        $this->resultID->field_seek(0);
+
+        while ($field = $this->resultID->fetch_field()) {
+            $fieldNames[] = $field->name;
+        }
+
+        return $fieldNames;
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        static $dataTypes = [
+            MYSQLI_TYPE_DECIMAL    => 'decimal',
+            MYSQLI_TYPE_NEWDECIMAL => 'newdecimal',
+            MYSQLI_TYPE_FLOAT      => 'float',
+            MYSQLI_TYPE_DOUBLE     => 'double',
+
+            MYSQLI_TYPE_BIT      => 'bit',
+            MYSQLI_TYPE_SHORT    => 'short',
+            MYSQLI_TYPE_LONG     => 'long',
+            MYSQLI_TYPE_LONGLONG => 'longlong',
+            MYSQLI_TYPE_INT24    => 'int24',
+
+            MYSQLI_TYPE_YEAR => 'year',
+
+            MYSQLI_TYPE_TIMESTAMP => 'timestamp',
+            MYSQLI_TYPE_DATE      => 'date',
+            MYSQLI_TYPE_TIME      => 'time',
+            MYSQLI_TYPE_DATETIME  => 'datetime',
+            MYSQLI_TYPE_NEWDATE   => 'newdate',
+
+            MYSQLI_TYPE_SET => 'set',
+
+            MYSQLI_TYPE_VAR_STRING => 'var_string',
+            MYSQLI_TYPE_STRING     => 'string',
+
+            MYSQLI_TYPE_GEOMETRY    => 'geometry',
+            MYSQLI_TYPE_TINY_BLOB   => 'tiny_blob',
+            MYSQLI_TYPE_MEDIUM_BLOB => 'medium_blob',
+            MYSQLI_TYPE_LONG_BLOB   => 'long_blob',
+            MYSQLI_TYPE_BLOB        => 'blob',
+        ];
+
+        $retVal    = [];
+        $fieldData = $this->resultID->fetch_fields();
+
+        foreach ($fieldData as $i => $data) {
+            $retVal[$i]              = new stdClass();
+            $retVal[$i]->name        = $data->name;
+            $retVal[$i]->type        = $data->type;
+            $retVal[$i]->type_name   = in_array($data->type, [1, 247], true) ? 'char' : ($dataTypes[$data->type] ?? null);
+            $retVal[$i]->max_length  = $data->max_length;
+            $retVal[$i]->primary_key = $data->flags & 2;
+            $retVal[$i]->length      = $data->length;
+            $retVal[$i]->default     = $data->def;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Frees the current result.
+     */
+    public function freeResult()
+    {
+        if (is_object($this->resultID)) {
+            $this->resultID->free();
+            $this->resultID = false;
+        }
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0)
+    {
+        return $this->resultID->data_seek($n);
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+        return $this->resultID->fetch_assoc();
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @return bool|Entity|object
+     */
+    protected function fetchObject(string $className = 'stdClass')
+    {
+        if (is_subclass_of($className, Entity::class)) {
+            return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+        }
+
+        return $this->resultID->fetch_object($className);
+    }
+
+    /**
+     * Returns the number of rows in the resultID (i.e., mysqli_result object)
+     */
+    public function getNumRows(): int
+    {
+        if (! is_int($this->numRows)) {
+            $this->numRows = $this->resultID->num_rows;
+        }
+
+        return $this->numRows;
+    }
 }
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index 773671851e2b..3fea64a0ebaf 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -19,33 +19,27 @@
  */
 class Utils extends BaseUtils
 {
-	/**
-	 * List databases statement
-	 *
-	 * @var string
-	 */
-	protected $listDatabases = 'SHOW DATABASES';
-
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $optimizeTable = 'OPTIMIZE TABLE %s';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	public function _backup(array $prefs = null)
-	{
-		throw new DatabaseException('Unsupported feature of the database platform you are using.');
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * List databases statement
+     *
+     * @var string
+     */
+    protected $listDatabases = 'SHOW DATABASES';
+
+    /**
+     * OPTIMIZE TABLE statement
+     *
+     * @var string
+     */
+    protected $optimizeTable = 'OPTIMIZE TABLE %s';
+
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    public function _backup(?array $prefs = null)
+    {
+        throw new DatabaseException('Unsupported feature of the database platform you are using.');
+    }
 }
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index f23d6dc9f685..2b7a5b3dee06 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -19,412 +19,290 @@
  */
 class Builder extends BaseBuilder
 {
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $randomKeyword = [
-		'RANDOM()',
-	];
-
-	/**
-	 * Specifies which sql statements
-	 * support the ignore option.
-	 *
-	 * @var array
-	 */
-	protected $supportedIgnoreStatements = [
-		'insert' => 'ON CONFLICT DO NOTHING',
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile Ignore Statement
-	 *
-	 * Checks if the ignore option is supported by
-	 * the Database Driver for the specific statement.
-	 *
-	 * @param string $statement
-	 *
-	 * @return string
-	 */
-	protected function compileIgnore(string $statement)
-	{
-		$sql = parent::compileIgnore($statement);
-
-		if (! empty($sql))
-		{
-			$sql = ' ' . trim($sql);
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ORDER BY
-	 *
-	 * @param string  $orderBy
-	 * @param string  $direction ASC, DESC or RANDOM
-	 * @param boolean $escape
-	 *
-	 * @return BaseBuilder
-	 */
-	public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
-	{
-		$direction = strtoupper(trim($direction));
-		if ($direction === 'RANDOM')
-		{
-			if (ctype_digit($orderBy))
-			{
-				$orderBy = (float) ($orderBy > 1 ? "0.{$orderBy}" : $orderBy);
-			}
-
-			if (is_float($orderBy))
-			{
-				$this->db->simpleQuery("SET SEED {$orderBy}");
-			}
-
-			$orderBy   = $this->randomKeyword[0];
-			$direction = '';
-			$escape    = false;
-		}
-
-		return parent::orderBy($orderBy, $direction, $escape);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Increments a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return mixed
-	 */
-	public function increment(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		$sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') + {$value}"]);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Decrements a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return mixed
-	 */
-	public function decrement(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		$sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') - {$value}"]);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replace
-	 *
-	 * Compiles an replace into string and runs the query.
-	 * Because PostgreSQL doesn't support the replace into command,
-	 * we simply do a DELETE and an INSERT on the first key/value
-	 * combo, assuming that it's either the primary key or a unique key.
-	 *
-	 * @param array $set An associative array of insert values
-	 *
-	 * @return   mixed
-	 * @throws   DatabaseException
-	 * @internal param true $bool returns the generated SQL, false executes the query.
-	 */
-	public function replace(array $set = null)
-	{
-		if ($set !== null)
-		{
-			$this->set($set);
-		}
-
-		if (! $this->QBSet)
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must use the "set" method to update an entry.');
-			}
-			// @codeCoverageIgnoreStart
-			return false;
-			// @codeCoverageIgnoreEnd
-		}
-
-		$table = $this->QBFrom[0];
-
-		$key   = array_key_first($set);
-		$value = $set[$key];
-
-		$builder = $this->db->table($table);
-		$exists  = $builder->where("$key = $value", null, false)->get()->getFirstRow();
-
-		if (empty($exists))
-		{
-			$result = $builder->insert($set);
-		}
-		else
-		{
-			array_pop($set);
-			$result = $builder->update($set, "$key = $value");
-		}
-
-		unset($builder);
-		$this->resetWrite();
-
-		return $result;
-	}
-
-	/**
-	 * Insert statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data
-	 *
-	 * @param string $table         The table name
-	 * @param array  $keys          The insert keys
-	 * @param array  $unescapedKeys The insert values
-	 *
-	 * @return string
-	 */
-	protected function _insert(string $table, array $keys, array $unescapedKeys): string
-	{
-		return trim(sprintf('INSERT INTO %s (%s) VALUES (%s) %s', $table, implode(', ', $keys), implode(', ', $unescapedKeys), $this->compileIgnore('insert')));
-	}
-
-	/**
-	 * Insert batch statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data.
-	 *
-	 * @param string $table  Table name
-	 * @param array  $keys   INSERT keys
-	 * @param array  $values INSERT values
-	 *
-	 * @return string
-	 */
-	protected function _insertBatch(string $table, array $keys, array $values): string
-	{
-		return trim(sprintf('INSERT INTO %s (%s) VALUES %s %s', $table, implode(', ', $keys), implode(', ', $values), $this->compileIgnore('insert')));
-	}
-
-	/**
-	 * Delete
-	 *
-	 * Compiles a delete string and runs the query
-	 *
-	 * @param mixed   $where
-	 * @param integer $limit
-	 * @param boolean $resetData
-	 *
-	 * @return   mixed
-	 * @throws   DatabaseException
-	 * @internal param the $mixed where clause
-	 * @internal param the $mixed limit clause
-	 * @internal param $bool
-	 */
-	public function delete($where = '', int $limit = null, bool $resetData = true)
-	{
-		if (! empty($limit) || ! empty($this->QBLimit))
-		{
-			throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
-		}
-
-		return parent::delete($where, $limit, $resetData);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * LIMIT string
-	 *
-	 * Generates a platform-specific LIMIT clause.
-	 *
-	 * @param string $sql SQL Query
-	 *
-	 * @return string
-	 */
-	protected function _limit(string $sql, bool $offsetIgnore = false): string
-	{
-		return $sql . ' LIMIT ' . $this->QBLimit . ($this->QBOffset ? " OFFSET {$this->QBOffset}" : '');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update statement
-	 *
-	 * Generates a platform-specific update string from the supplied data
-	 *
-	 * @param string $table
-	 * @param array  $values
-	 *
-	 * @return   string
-	 * @throws   DatabaseException
-	 * @internal param the $string table name
-	 * @internal param the $array update data
-	 */
-	protected function _update(string $table, array $values): string
-	{
-		if (! empty($this->QBLimit))
-		{
-			throw new DatabaseException('Postgres does not support LIMITs with UPDATE queries.');
-		}
-
-		$this->QBOrderBy = [];
-		return parent::_update($table, $values);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update_Batch statement
-	 *
-	 * Generates a platform-specific batch update string from the supplied data
-	 *
-	 * @param string $table  Table name
-	 * @param array  $values Update data
-	 * @param string $index  WHERE key
-	 *
-	 * @return string
-	 */
-	protected function _updateBatch(string $table, array $values, string $index): string
-	{
-		$ids   = [];
-		$final = [];
-		foreach ($values as $val)
-		{
-			$ids[] = $val[$index];
-
-			foreach (array_keys($val) as $field)
-			{
-				if ($field !== $index)
-				{
-					$final[$field] = $final[$field] ?? [];
-
-					$final[$field][] = "WHEN {$val[$index]} THEN {$val[$field]}";
-				}
-			}
-		}
-
-		$cases = '';
-		foreach ($final as $k => $v)
-		{
-			$cases .= "{$k} = (CASE {$index}\n"
-					. implode("\n", $v)
-					. "\nELSE {$k} END), ";
-		}
-
-		$this->where("{$index} IN(" . implode(',', $ids) . ')', null, false);
-
-		return "UPDATE {$table} SET " . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete statement
-	 *
-	 * Generates a platform-specific delete string from the supplied data
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _delete(string $table): string
-	{
-		$this->QBLimit = false;
-		return parent::_delete($table);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncate statement
-	 *
-	 * Generates a platform-specific truncate string from the supplied data
-	 *
-	 * If the database does not support the truncate() command,
-	 * then this method maps to 'DELETE FROM table'
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _truncate(string $table): string
-	{
-		return 'TRUNCATE ' . $table . ' RESTART IDENTITY';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform independent LIKE statement builder.
-	 *
-	 * In PostgreSQL, the ILIKE operator will perform case insensitive
-	 * searches according to the current locale.
-	 *
-	 * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
-	 *
-	 * @param string|null $prefix
-	 * @param string      $column
-	 * @param string|null $not
-	 * @param string      $bind
-	 * @param boolean     $insensitiveSearch
-	 *
-	 * @return string     $like_statement
-	 */
-	public function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
-	{
-		$op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
-
-		return "{$prefix} {$column} {$not} {$op} :{$bind}:";
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * JOIN
-	 *
-	 * Generates the JOIN portion of the query
-	 *
-	 * @param string  $table
-	 * @param string  $cond   The join condition
-	 * @param string  $type   The type of join
-	 * @param boolean $escape Whether not to try to escape identifiers
-	 *
-	 * @return BaseBuilder
-	 */
-	public function join(string $table, string $cond, string $type = '', bool $escape = null)
-	{
-		if (! in_array('FULL OUTER', $this->joinTypes, true))
-		{
-			$this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
-		}
-
-		return parent::join($table, $cond, $type, $escape);
-	}
-
-	//--------------------------------------------------------------------
-
+    /**
+     * ORDER BY random keyword
+     *
+     * @var array
+     */
+    protected $randomKeyword = [
+        'RANDOM()',
+    ];
+
+    /**
+     * Specifies which sql statements
+     * support the ignore option.
+     *
+     * @var array
+     */
+    protected $supportedIgnoreStatements = [
+        'insert' => 'ON CONFLICT DO NOTHING',
+    ];
+
+    /**
+     * Compile Ignore Statement
+     *
+     * Checks if the ignore option is supported by
+     * the Database Driver for the specific statement.
+     *
+     * @return string
+     */
+    protected function compileIgnore(string $statement)
+    {
+        $sql = parent::compileIgnore($statement);
+
+        if (! empty($sql)) {
+            $sql = ' ' . trim($sql);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * ORDER BY
+     *
+     * @param string $direction ASC, DESC or RANDOM
+     *
+     * @return BaseBuilder
+     */
+    public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
+    {
+        $direction = strtoupper(trim($direction));
+        if ($direction === 'RANDOM') {
+            if (ctype_digit($orderBy)) {
+                $orderBy = (float) ($orderBy > 1 ? "0.{$orderBy}" : $orderBy);
+            }
+
+            if (is_float($orderBy)) {
+                $this->db->simpleQuery("SET SEED {$orderBy}");
+            }
+
+            $orderBy   = $this->randomKeyword[0];
+            $direction = '';
+            $escape    = false;
+        }
+
+        return parent::orderBy($orderBy, $direction, $escape);
+    }
+
+    /**
+     * Increments a numeric column by the specified value.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function increment(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        $sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') + {$value}"]);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Decrements a numeric column by the specified value.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function decrement(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        $sql = $this->_update($this->QBFrom[0], [$column => "to_number({$column}, '9999999') - {$value}"]);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Compiles an replace into string and runs the query.
+     * Because PostgreSQL doesn't support the replace into command,
+     * we simply do a DELETE and an INSERT on the first key/value
+     * combo, assuming that it's either the primary key or a unique key.
+     *
+     * @param array $set An associative array of insert values
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     *
+     * @internal
+     */
+    public function replace(?array $set = null)
+    {
+        if ($set !== null) {
+            $this->set($set);
+        }
+
+        if (! $this->QBSet) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must use the "set" method to update an entry.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        $table = $this->QBFrom[0];
+
+        $key   = array_key_first($set);
+        $value = $set[$key];
+
+        $builder = $this->db->table($table);
+        $exists  = $builder->where("{$key} = {$value}", null, false)->get()->getFirstRow();
+
+        if (empty($exists)) {
+            $result = $builder->insert($set);
+        } else {
+            array_pop($set);
+            $result = $builder->update($set, "{$key} = {$value}");
+        }
+
+        unset($builder);
+        $this->resetWrite();
+
+        return $result;
+    }
+
+    /**
+     * Generates a platform-specific insert string from the supplied data
+     */
+    protected function _insert(string $table, array $keys, array $unescapedKeys): string
+    {
+        return trim(sprintf('INSERT INTO %s (%s) VALUES (%s) %s', $table, implode(', ', $keys), implode(', ', $unescapedKeys), $this->compileIgnore('insert')));
+    }
+
+    /**
+     * Generates a platform-specific insert string from the supplied data.
+     */
+    protected function _insertBatch(string $table, array $keys, array $values): string
+    {
+        return trim(sprintf('INSERT INTO %s (%s) VALUES %s %s', $table, implode(', ', $keys), implode(', ', $values), $this->compileIgnore('insert')));
+    }
+
+    /**
+     * Compiles a delete string and runs the query
+     *
+     * @param mixed $where
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
+    {
+        if (! empty($limit) || ! empty($this->QBLimit)) {
+            throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
+        }
+
+        return parent::delete($where, $limit, $resetData);
+    }
+
+    /**
+     * Generates a platform-specific LIMIT clause.
+     */
+    protected function _limit(string $sql, bool $offsetIgnore = false): string
+    {
+        return $sql . ' LIMIT ' . $this->QBLimit . ($this->QBOffset ? " OFFSET {$this->QBOffset}" : '');
+    }
+
+    /**
+     * Generates a platform-specific update string from the supplied data
+     *
+     * @throws DatabaseException
+     */
+    protected function _update(string $table, array $values): string
+    {
+        if (! empty($this->QBLimit)) {
+            throw new DatabaseException('Postgres does not support LIMITs with UPDATE queries.');
+        }
+
+        $this->QBOrderBy = [];
+
+        return parent::_update($table, $values);
+    }
+
+    /**
+     * Generates a platform-specific batch update string from the supplied data
+     */
+    protected function _updateBatch(string $table, array $values, string $index): string
+    {
+        $ids   = [];
+        $final = [];
+
+        foreach ($values as $val) {
+            $ids[] = $val[$index];
+
+            foreach (array_keys($val) as $field) {
+                if ($field !== $index) {
+                    $final[$field] = $final[$field] ?? [];
+
+                    $final[$field][] = "WHEN {$val[$index]} THEN {$val[$field]}";
+                }
+            }
+        }
+
+        $cases = '';
+
+        foreach ($final as $k => $v) {
+            $cases .= "{$k} = (CASE {$index}\n"
+                    . implode("\n", $v)
+                    . "\nELSE {$k} END), ";
+        }
+
+        $this->where("{$index} IN(" . implode(',', $ids) . ')', null, false);
+
+        return "UPDATE {$table} SET " . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+    }
+
+    /**
+     * Generates a platform-specific delete string from the supplied data
+     */
+    protected function _delete(string $table): string
+    {
+        $this->QBLimit = false;
+
+        return parent::_delete($table);
+    }
+
+    /**
+     * Generates a platform-specific truncate string from the supplied data
+     *
+     * If the database does not support the truncate() command,
+     * then this method maps to 'DELETE FROM table'
+     */
+    protected function _truncate(string $table): string
+    {
+        return 'TRUNCATE ' . $table . ' RESTART IDENTITY';
+    }
+
+    /**
+     * Platform independent LIKE statement builder.
+     *
+     * In PostgreSQL, the ILIKE operator will perform case insensitive
+     * searches according to the current locale.
+     *
+     * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
+     */
+    protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
+    {
+        $op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
+
+        return "{$prefix} {$column} {$not} {$op} :{$bind}:";
+    }
+
+    /**
+     * Generates the JOIN portion of the query
+     *
+     * @return BaseBuilder
+     */
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    {
+        if (! in_array('FULL OUTER', $this->joinTypes, true)) {
+            $this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
+        }
+
+        return parent::join($table, $cond, $type, $escape);
+    }
 }
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 010bf4876f2c..54b02dd1ca2c 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -21,612 +21,487 @@
  */
 class Connection extends BaseConnection
 {
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	public $DBDriver = 'Postgre';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Database schema
-	 *
-	 * @var string
-	 */
-	public $schema = 'public';
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	public $escapeChar = '"';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param  boolean $persistent
-	 * @return mixed
-	 */
-	public function connect(bool $persistent = false)
-	{
-		if (empty($this->DSN))
-		{
-			$this->buildDSN();
-		}
-
-		// Strip pgsql if exists
-		if (mb_strpos($this->DSN, 'pgsql:') === 0)
-		{
-			$this->DSN = mb_substr($this->DSN, 6);
-		}
-
-		// Convert semicolons to spaces.
-		$this->DSN = str_replace(';', ' ', $this->DSN);
-
-		$this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
-
-		if ($this->connID !== false)
-		{
-			if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false
-			)
-			{
-				return false;
-			}
-
-			empty($this->schema) || $this->simpleQuery("SET search_path TO {$this->schema},public");
-
-			if ($this->setClientEncoding($this->charset) === false)
-			{
-				return false;
-			}
-		}
-
-		return $this->connID;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return void
-	 */
-	public function reconnect()
-	{
-		if (pg_ping($this->connID) === false)
-		{
-			$this->connID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	protected function _close()
-	{
-		pg_close($this->connID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return boolean
-	 */
-	public function setDatabase(string $databaseName): bool
-	{
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		if (isset($this->dataCache['version']))
-		{
-			return $this->dataCache['version'];
-		}
-
-		// @phpstan-ignore-next-line
-		if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false)
-		{
-			$this->initialize();
-		}
-
-		return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	public function execute(string $sql)
-	{
-		try
-		{
-			return pg_query($this->connID, $sql);
-		}
-		catch (ErrorException $e)
-		{
-			log_message('error', $e);
-			if ($this->DBDebug)
-			{
-				throw $e;
-			}
-		}
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return pg_affected_rows($this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * "Smart" Escape String
-	 *
-	 * Escapes data based on type
-	 *
-	 * @param  mixed $str
-	 * @return mixed
-	 */
-	public function escape($str)
-	{
-		if (! $this->connID)
-		{
-			$this->initialize();
-		}
-
-		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
-		{
-			return pg_escape_literal($this->connID, $str);
-		}
-
-		if (is_bool($str))
-		{
-			return $str ? 'TRUE' : 'FALSE';
-		}
-
-		return parent::escape($str);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-dependant string escape
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		if (! $this->connID)
-		{
-			$this->initialize();
-		}
-
-		return pg_escape_string($this->connID, $str);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $prefixLimit
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $prefixLimit = false): string
-	{
-		$sql = 'SELECT "table_name" FROM "information_schema"."tables" WHERE "table_schema" = \'' . $this->schema . "'";
-
-		if ($prefixLimit !== false && $this->DBPrefix !== '')
-		{
-			return $sql . ' AND "table_name" LIKE \''
-					. $this->escapeLikeString($this->DBPrefix) . "%' "
-					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		return 'SELECT "column_name"
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    public $DBDriver = 'Postgre';
+
+    /**
+     * Database schema
+     *
+     * @var string
+     */
+    public $schema = 'public';
+
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    public $escapeChar = '"';
+
+    /**
+     * Connect to the database.
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        if (empty($this->DSN)) {
+            $this->buildDSN();
+        }
+
+        // Strip pgsql if exists
+        if (mb_strpos($this->DSN, 'pgsql:') === 0) {
+            $this->DSN = mb_substr($this->DSN, 6);
+        }
+
+        // Convert semicolons to spaces.
+        $this->DSN = str_replace(';', ' ', $this->DSN);
+
+        $this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
+
+        if ($this->connID !== false) {
+            if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false
+            ) {
+                return false;
+            }
+
+            if (! empty($this->schema)) {
+                $this->simpleQuery("SET search_path TO {$this->schema},public");
+            }
+
+            if ($this->setClientEncoding($this->charset) === false) {
+                return false;
+            }
+        }
+
+        return $this->connID;
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     */
+    public function reconnect()
+    {
+        if (pg_ping($this->connID) === false) {
+            $this->connID = false;
+        }
+    }
+
+    /**
+     * Close the database connection.
+     */
+    protected function _close()
+    {
+        pg_close($this->connID);
+    }
+
+    /**
+     * Select a specific database table to use.
+     */
+    public function setDatabase(string $databaseName): bool
+    {
+        return false;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        if (isset($this->dataCache['version'])) {
+            return $this->dataCache['version'];
+        }
+
+        // @phpstan-ignore-next-line
+        if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false) {
+            $this->initialize();
+        }
+
+        return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return mixed
+     */
+    protected function execute(string $sql)
+    {
+        try {
+            return pg_query($this->connID, $sql);
+        } catch (ErrorException $e) {
+            log_message('error', $e);
+            if ($this->DBDebug) {
+                throw $e;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return pg_affected_rows($this->resultID);
+    }
+
+    /**
+     * "Smart" Escape String
+     *
+     * Escapes data based on type
+     *
+     * @param mixed $str
+     *
+     * @return mixed
+     */
+    public function escape($str)
+    {
+        if (! $this->connID) {
+            $this->initialize();
+        }
+
+        if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
+            return pg_escape_literal($this->connID, $str);
+        }
+
+        if (is_bool($str)) {
+            return $str ? 'TRUE' : 'FALSE';
+        }
+
+        return parent::escape($str);
+    }
+
+    /**
+     * Platform-dependant string escape
+     */
+    protected function _escapeString(string $str): string
+    {
+        if (! $this->connID) {
+            $this->initialize();
+        }
+
+        return pg_escape_string($this->connID, $str);
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     */
+    protected function _listTables(bool $prefixLimit = false): string
+    {
+        $sql = 'SELECT "table_name" FROM "information_schema"."tables" WHERE "table_schema" = \'' . $this->schema . "'";
+
+        if ($prefixLimit !== false && $this->DBPrefix !== '') {
+            return $sql . ' AND "table_name" LIKE \''
+                . $this->escapeLikeString($this->DBPrefix) . "%' "
+                . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        return 'SELECT "column_name"
 			FROM "information_schema"."columns"
 			WHERE LOWER("table_name") = '
-				. $this->escape($this->DBPrefix . strtolower($table))
-				. ' ORDER BY "ordinal_position"';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with field data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _fieldData(string $table): array
-	{
-		$sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default"
+                . $this->escape($this->DBPrefix . strtolower($table))
+                . ' ORDER BY "ordinal_position"';
+    }
+
+    /**
+     * Returns an array of objects with field data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _fieldData(string $table): array
+    {
+        $sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default"
 			FROM "information_schema"."columns"
 			WHERE LOWER("table_name") = '
-				. $this->escape(strtolower($table))
-				. ' ORDER BY "ordinal_position"';
-
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetFieldData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		for ($i = 0, $c = count($query); $i < $c; $i ++)
-		{
-			$retVal[$i]             = new stdClass();
-			$retVal[$i]->name       = $query[$i]->column_name;
-			$retVal[$i]->type       = $query[$i]->data_type;
-			$retVal[$i]->default    = $query[$i]->column_default;
-			$retVal[$i]->max_length = $query[$i]->character_maximum_length > 0 ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with index data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _indexData(string $table): array
-	{
-		$sql = 'SELECT "indexname", "indexdef"
+                . $this->escape(strtolower($table))
+                . ' ORDER BY "ordinal_position"';
+
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetFieldData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
+            $retVal[$i] = new stdClass();
+
+            $retVal[$i]->name       = $query[$i]->column_name;
+            $retVal[$i]->type       = $query[$i]->data_type;
+            $retVal[$i]->default    = $query[$i]->column_default;
+            $retVal[$i]->max_length = $query[$i]->character_maximum_length > 0 ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with index data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _indexData(string $table): array
+    {
+        $sql = 'SELECT "indexname", "indexdef"
 			FROM "pg_indexes"
 			WHERE LOWER("tablename") = ' . $this->escape(strtolower($table)) . '
 			AND "schemaname" = ' . $this->escape('public');
 
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj         = new stdClass();
-			$obj->name   = $row->indexname;
-			$_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
-			$obj->fields = array_map(function ($v) {
-				return trim($v);
-			}, $_fields);
-
-			if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0)
-			{
-				$obj->type = 'PRIMARY';
-			}
-			else
-			{
-				$obj->type = (strpos($row->indexdef, 'CREATE UNIQUE') === 0) ? 'UNIQUE' : 'INDEX';
-			}
-
-			$retVal[$obj->name] = $obj;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with Foreign key data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _foreignKeyData(string $table): array
-	{
-		$sql = 'SELECT
-                            tc.constraint_name, tc.table_name, kcu.column_name,
-                            ccu.table_name AS foreign_table_name,
-                            ccu.column_name AS foreign_column_name
-                        FROM information_schema.table_constraints AS tc
-                        JOIN information_schema.key_column_usage AS kcu
-                            ON tc.constraint_name = kcu.constraint_name
-                        JOIN information_schema.constraint_column_usage AS ccu
-                            ON ccu.constraint_name = tc.constraint_name
-                        WHERE constraint_type = ' . $this->escape('FOREIGN KEY') . ' AND
-                            tc.table_name = ' . $this->escape($table);
-
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj                      = new stdClass();
-			$obj->constraint_name     = $row->constraint_name;
-			$obj->table_name          = $row->table_name;
-			$obj->column_name         = $row->column_name;
-			$obj->foreign_table_name  = $row->foreign_table_name;
-			$obj->foreign_column_name = $row->foreign_column_name;
-			$retVal[]                 = $obj;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _disableForeignKeyChecks()
-	{
-		return 'SET CONSTRAINTS ALL DEFERRED';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to enable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _enableForeignKeyChecks()
-	{
-		return 'SET CONSTRAINTS ALL IMMEDIATE;';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 * Must return this format: ['code' => string|int, 'message' => string]
-	 * intval(code) === 0 means "no error".
-	 *
-	 * @return array<string,string|int>
-	 */
-	public function error(): array
-	{
-		return [
-			'code'    => '',
-			'message' => pg_last_error($this->connID) ?: '',
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer|string
-	 */
-	public function insertID()
-	{
-		$v = pg_version($this->connID);
-		// 'server' key is only available since PostgreSQL 7.4
-		$v = explode(' ', $v['server'])[0] ?? 0;
-
-		$table  = func_num_args() > 0 ? func_get_arg(0) : null;
-		$column = func_num_args() > 1 ? func_get_arg(1) : null;
-
-		if ($table === null && $v >= '8.1')
-		{
-			$sql = 'SELECT LASTVAL() AS ins_id';
-		}
-		elseif ($table !== null)
-		{
-			if ($column !== null && $v >= '8.0')
-			{
-				$sql   = "SELECT pg_get_serial_sequence('{$table}', '{$column}') AS seq";
-				$query = $this->query($sql);
-				$query = $query->getRow();
-				$seq   = $query->seq;
-			}
-			else
-			{
-				// seq_name passed in table parameter
-				$seq = $table;
-			}
-
-			$sql = "SELECT CURRVAL('{$seq}') AS ins_id";
-		}
-		else
-		{
-			return pg_last_oid($this->resultID);
-		}
-
-		$query = $this->query($sql);
-		$query = $query->getRow();
-		return (int) $query->ins_id;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Build a DSN from the provided parameters
-	 *
-	 * @return void
-	 */
-	protected function buildDSN()
-	{
-		if ($this->DSN !== '')
-		{
-			$this->DSN = '';
-		}
-
-		// If UNIX sockets are used, we shouldn't set a port
-		if (strpos($this->hostname, '/') !== false)
-		{
-			$this->port = '';
-		}
-
-		if ($this->hostname !== '')
-		{
-			$this->DSN = "host={$this->hostname} ";
-		}
-
-		if (! empty($this->port) && ctype_digit($this->port))
-		{
-			$this->DSN .= "port={$this->port} ";
-		}
-
-		if ($this->username !== '')
-		{
-			$this->DSN .= "user={$this->username} ";
-
-			// An empty password is valid!
-			// password must be set to null to ignore it.
-			if ($this->password !== null)
-			{
-				$this->DSN .= "password='{$this->password}' ";
-			}
-		}
-
-		if ($this->database !== '')
-		{
-			$this->DSN .= "dbname={$this->database} ";
-		}
-
-		// We don't have these options as elements in our standard configuration
-		// array, but they might be set by parse_url() if the configuration was
-		// provided via string> Example:
-		//
-		// Postgre://username:password@localhost:5432/database?connect_timeout=5&sslmode=1
-		foreach (['connect_timeout', 'options', 'sslmode', 'service'] as $key)
-		{
-			if (isset($this->{$key}) && is_string($this->{$key}) && $this->{$key} !== '')
-			{
-				$this->DSN .= "{$key}='{$this->{$key}}' ";
-			}
-		}
-
-		$this->DSN = rtrim($this->DSN);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set client encoding
-	 *
-	 * @param  string $charset The client encoding to which the data will be converted.
-	 * @return boolean
-	 */
-	protected function setClientEncoding(string $charset): bool
-	{
-		return pg_set_client_encoding($this->connID, $charset) === 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		return (bool) pg_query($this->connID, 'BEGIN');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		return (bool) pg_query($this->connID, 'COMMIT');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		return (bool) pg_query($this->connID, 'ROLLBACK');
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Determines if a query is a "write" type.
-	 *
-	 * Overrides BaseConnection::isWriteType, adding additional read query types.
-	 *
-	 * @param  string $sql An SQL query string
-	 * @return boolean
-	 */
-	public function isWriteType($sql): bool
-	{
-		if (preg_match('#^(INSERT|UPDATE).*RETURNING\s.+(\,\s?.+)*$#is', $sql))
-		{
-			return false;
-		}
-
-		return parent::isWriteType($sql);
-	}
-
-	// --------------------------------------------------------------------
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetIndexData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj         = new stdClass();
+            $obj->name   = $row->indexname;
+            $_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
+            $obj->fields = array_map(static function ($v) {
+                return trim($v);
+            }, $_fields);
+
+            if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0) {
+                $obj->type = 'PRIMARY';
+            } else {
+                $obj->type = (strpos($row->indexdef, 'CREATE UNIQUE') === 0) ? 'UNIQUE' : 'INDEX';
+            }
+
+            $retVal[$obj->name] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with Foreign key data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _foreignKeyData(string $table): array
+    {
+        $sql = 'SELECT
+            tc.constraint_name, tc.table_name, kcu.column_name,
+            ccu.table_name AS foreign_table_name,
+            ccu.column_name AS foreign_column_name
+        FROM information_schema.table_constraints AS tc
+        JOIN information_schema.key_column_usage AS kcu
+            ON tc.constraint_name = kcu.constraint_name
+        JOIN information_schema.constraint_column_usage AS ccu
+            ON ccu.constraint_name = tc.constraint_name
+        WHERE constraint_type = ' . $this->escape('FOREIGN KEY') . ' AND
+            tc.table_name = ' . $this->escape($table);
+
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+        }
+
+        $query  = $query->getResultObject();
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj = new stdClass();
+
+            $obj->constraint_name     = $row->constraint_name;
+            $obj->table_name          = $row->table_name;
+            $obj->column_name         = $row->column_name;
+            $obj->foreign_table_name  = $row->foreign_table_name;
+            $obj->foreign_column_name = $row->foreign_column_name;
+
+            $retVal[] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns platform-specific SQL to disable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return 'SET CONSTRAINTS ALL DEFERRED';
+    }
+
+    /**
+     * Returns platform-specific SQL to enable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return 'SET CONSTRAINTS ALL IMMEDIATE;';
+    }
+
+    /**
+     * Returns the last error code and message.
+     * Must return this format: ['code' => string|int, 'message' => string]
+     * intval(code) === 0 means "no error".
+     *
+     * @return array<string, int|string>
+     */
+    public function error(): array
+    {
+        return [
+            'code'    => '',
+            'message' => pg_last_error($this->connID) ?: '',
+        ];
+    }
+
+    /**
+     * @return int|string
+     */
+    public function insertID()
+    {
+        $v = pg_version($this->connID);
+        // 'server' key is only available since PostgreSQL 7.4
+        $v = explode(' ', $v['server'])[0] ?? 0;
+
+        $table  = func_num_args() > 0 ? func_get_arg(0) : null;
+        $column = func_num_args() > 1 ? func_get_arg(1) : null;
+
+        if ($table === null && $v >= '8.1') {
+            $sql = 'SELECT LASTVAL() AS ins_id';
+        } elseif ($table !== null) {
+            if ($column !== null && $v >= '8.0') {
+                $sql   = "SELECT pg_get_serial_sequence('{$table}', '{$column}') AS seq";
+                $query = $this->query($sql);
+                $query = $query->getRow();
+                $seq   = $query->seq;
+            } else {
+                // seq_name passed in table parameter
+                $seq = $table;
+            }
+
+            $sql = "SELECT CURRVAL('{$seq}') AS ins_id";
+        } else {
+            return pg_last_oid($this->resultID);
+        }
+
+        $query = $this->query($sql);
+        $query = $query->getRow();
+
+        return (int) $query->ins_id;
+    }
+
+    /**
+     * Build a DSN from the provided parameters
+     */
+    protected function buildDSN()
+    {
+        if ($this->DSN !== '') {
+            $this->DSN = '';
+        }
+
+        // If UNIX sockets are used, we shouldn't set a port
+        if (strpos($this->hostname, '/') !== false) {
+            $this->port = '';
+        }
+
+        if ($this->hostname !== '') {
+            $this->DSN = "host={$this->hostname} ";
+        }
+
+        if (! empty($this->port) && ctype_digit($this->port)) {
+            $this->DSN .= "port={$this->port} ";
+        }
+
+        if ($this->username !== '') {
+            $this->DSN .= "user={$this->username} ";
+
+            // An empty password is valid!
+            // password must be set to null to ignore it.
+            if ($this->password !== null) {
+                $this->DSN .= "password='{$this->password}' ";
+            }
+        }
+
+        if ($this->database !== '') {
+            $this->DSN .= "dbname={$this->database} ";
+        }
+
+        // We don't have these options as elements in our standard configuration
+        // array, but they might be set by parse_url() if the configuration was
+        // provided via string> Example:
+        //
+        // Postgre://username:password@localhost:5432/database?connect_timeout=5&sslmode=1
+        foreach (['connect_timeout', 'options', 'sslmode', 'service'] as $key) {
+            if (isset($this->{$key}) && is_string($this->{$key}) && $this->{$key} !== '') {
+                $this->DSN .= "{$key}='{$this->{$key}}' ";
+            }
+        }
+
+        $this->DSN = rtrim($this->DSN);
+    }
+
+    /**
+     * Set client encoding
+     */
+    protected function setClientEncoding(string $charset): bool
+    {
+        return pg_set_client_encoding($this->connID, $charset) === 0;
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        return (bool) pg_query($this->connID, 'BEGIN');
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        return (bool) pg_query($this->connID, 'COMMIT');
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        return (bool) pg_query($this->connID, 'ROLLBACK');
+    }
+
+    /**
+     * Determines if a query is a "write" type.
+     *
+     * Overrides BaseConnection::isWriteType, adding additional read query types.
+     *
+     * @param mixed $sql
+     */
+    public function isWriteType($sql): bool
+    {
+        if (preg_match('#^(INSERT|UPDATE).*RETURNING\s.+(\,\s?.+)*$#is', $sql)) {
+            return false;
+        }
+
+        return parent::isWriteType($sql);
+    }
 }
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index ec163f41ff1e..2f1a0769bd07 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -18,216 +18,169 @@
  */
 class Forge extends BaseForge
 {
-	/**
-	 * CHECK DATABASE EXIST statement
-	 *
-	 * @var string
-	 */
-	protected $checkDatabaseExistStr = 'SELECT 1 FROM pg_database WHERE datname = ?';
-
-	/**
-	 * DROP CONSTRAINT statement
-	 *
-	 * @var string
-	 */
-	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
-
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var array
-	 */
-	protected $_unsigned = [
-		'INT2'     => 'INTEGER',
-		'SMALLINT' => 'INTEGER',
-		'INT'      => 'BIGINT',
-		'INT4'     => 'BIGINT',
-		'INTEGER'  => 'BIGINT',
-		'INT8'     => 'NUMERIC',
-		'BIGINT'   => 'NUMERIC',
-		'REAL'     => 'DOUBLE PRECISION',
-		'FLOAT'    => 'DOUBLE PRECISION',
-	];
-
-	/**
-	 * NULL value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string
-	 *
-	 * @internal
-	 */
-	protected $null = 'NULL';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CREATE TABLE attributes
-	 *
-	 * @param  array $attributes Associative array of table attributes
-	 * @return string
-	 */
-	protected function _createTableAttributes(array $attributes): string
-	{
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param string $alterType ALTER type
-	 * @param string $table     Table name
-	 * @param mixed  $field     Column definition
-	 *
-	 * @return string|array|boolean
-	 */
-	protected function _alterTable(string $alterType, string $table, $field)
-	{
-		if (in_array($alterType, ['DROP', 'ADD'], true))
-		{
-			return parent::_alterTable($alterType, $table, $field);
-		}
-
-		$sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-		$sqls = [];
-		foreach ($field as $data)
-		{
-			if ($data['_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 (! empty($data['default']))
-			{
-				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-						. " SET DEFAULT {$data['default']}";
-			}
-
-			if (isset($data['null']))
-			{
-				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-						. ($data['null'] === true ? ' DROP' : ' SET') . ' NOT NULL';
-			}
-
-			if (! empty($data['new_name']))
-			{
-				$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-						. ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
-			}
-
-			if (! empty($data['comment']))
-			{
-				$sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
-						. '.' . $this->db->escapeIdentifiers($data['name'])
-						. " IS {$data['comment']}";
-			}
-		}
-
-		return $sqls;
-	}
-
-		//--------------------------------------------------------------------
-
-	/**
-	 * Process column
-	 *
-	 * @param  array $field
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
-		return $this->db->escapeIdentifiers($field['name'])
-				. ' ' . $field['type'] . $field['length']
-				. $field['default']
-				. $field['null']
-				. $field['auto_increment']
-				. $field['unique'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute TYPE
-	 *
-	 * Performs a data type mapping between different databases.
-	 *
-	 * @param array $attributes
-	 *
-	 * @return void
-	 */
-	protected function _attributeType(array &$attributes)
-	{
-		// Reset field lengths for data types that don't support it
-		if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false)
-		{
-			$attributes['CONSTRAINT'] = null;
-		}
-
-		switch (strtoupper($attributes['TYPE']))
-		{
-			case 'TINYINT':
-				$attributes['TYPE']     = 'SMALLINT';
-				$attributes['UNSIGNED'] = false;
-				break;
-			case 'MEDIUMINT':
-				$attributes['TYPE']     = 'INTEGER';
-				$attributes['UNSIGNED'] = false;
-				break;
-			case 'DATETIME':
-				$attributes['TYPE'] = 'TIMESTAMP';
-				break;
-			default:
-				break;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute AUTO_INCREMENT
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return void
-	 */
-	protected function _attributeAutoIncrement(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true)
-		{
-			$field['type'] = $field['type'] === 'NUMERIC' || $field['type'] === 'BIGINT' ? 'BIGSERIAL' : 'SERIAL';
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 * Generates a platform-specific DROP TABLE string
-	 *
-	 * @param string  $table    Table name
-	 * @param boolean $ifExists Whether to add an IF EXISTS condition
-	 * @param boolean $cascade
-	 *
-	 * @return string
-	 */
-	protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
-	{
-		$sql = parent::_dropTable($table, $ifExists, $cascade);
-
-		if ($cascade === true)
-		{
-			$sql .= ' CASCADE';
-		}
-
-		return $sql;
-	}
+    /**
+     * CHECK DATABASE EXIST statement
+     *
+     * @var string
+     */
+    protected $checkDatabaseExistStr = 'SELECT 1 FROM pg_database WHERE datname = ?';
+
+    /**
+     * DROP CONSTRAINT statement
+     *
+     * @var string
+     */
+    protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array
+     */
+    protected $_unsigned = [
+        'INT2'     => 'INTEGER',
+        'SMALLINT' => 'INTEGER',
+        'INT'      => 'BIGINT',
+        'INT4'     => 'BIGINT',
+        'INTEGER'  => 'BIGINT',
+        'INT8'     => 'NUMERIC',
+        'BIGINT'   => 'NUMERIC',
+        'REAL'     => 'DOUBLE PRECISION',
+        'FLOAT'    => 'DOUBLE PRECISION',
+    ];
+
+    /**
+     * NULL value representation in CREATE/ALTER TABLE statements
+     *
+     * @var string
+     *
+     * @internal
+     */
+    protected $null = 'NULL';
+
+    /**
+     * CREATE TABLE attributes
+     *
+     * @param array $attributes Associative array of table attributes
+     */
+    protected function _createTableAttributes(array $attributes): string
+    {
+        return '';
+    }
+
+    /**
+     * @param mixed $field
+     *
+     * @return array|bool|string
+     */
+    protected function _alterTable(string $alterType, string $table, $field)
+    {
+        if (in_array($alterType, ['DROP', 'ADD'], true)) {
+            return parent::_alterTable($alterType, $table, $field);
+        }
+
+        $sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+        $sqls = [];
+
+        foreach ($field as $data) {
+            if ($data['_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 (! empty($data['default'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+                    . " SET DEFAULT {$data['default']}";
+            }
+
+            if (isset($data['null'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+                    . ($data['null'] === true ? ' DROP' : ' SET') . ' NOT NULL';
+            }
+
+            if (! empty($data['new_name'])) {
+                $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+                    . ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
+            }
+
+            if (! empty($data['comment'])) {
+                $sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
+                    . '.' . $this->db->escapeIdentifiers($data['name'])
+                    . " IS {$data['comment']}";
+            }
+        }
+
+        return $sqls;
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
+        return $this->db->escapeIdentifiers($field['name'])
+            . ' ' . $field['type'] . $field['length']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . $field['unique'];
+    }
+
+    /**
+     * Performs a data type mapping between different databases.
+     */
+    protected function _attributeType(array &$attributes)
+    {
+        // Reset field lengths for data types that don't support it
+        if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
+            $attributes['CONSTRAINT'] = null;
+        }
+
+        switch (strtoupper($attributes['TYPE'])) {
+            case 'TINYINT':
+                $attributes['TYPE']     = 'SMALLINT';
+                $attributes['UNSIGNED'] = false;
+                break;
+
+            case 'MEDIUMINT':
+                $attributes['TYPE']     = 'INTEGER';
+                $attributes['UNSIGNED'] = false;
+                break;
+
+            case 'DATETIME':
+                $attributes['TYPE'] = 'TIMESTAMP';
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Field attribute AUTO_INCREMENT
+     */
+    protected function _attributeAutoIncrement(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true) {
+            $field['type'] = $field['type'] === 'NUMERIC' || $field['type'] === 'BIGINT' ? 'BIGSERIAL' : 'SERIAL';
+        }
+    }
+
+    /**
+     * Generates a platform-specific DROP TABLE string
+     */
+    protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
+    {
+        $sql = parent::_dropTable($table, $ifExists, $cascade);
+
+        if ($cascade === true) {
+            $sql .= ' CASCADE';
+        }
+
+        return $sql;
+    }
 }
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index bb12cb00fb10..53e42b867f0f 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -20,101 +20,92 @@
  */
 class PreparedQuery extends BasePreparedQuery
 {
-	/**
-	 * Stores the name this query can be
-	 * used under by postgres. Only used internally.
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The result resource from a successful
-	 * pg_exec. Or false.
-	 *
-	 * @var Result|boolean
-	 */
-	protected $result;
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function _prepare(string $sql, array $options = [])
-	{
-		$this->name = (string) random_int(1, 10000000000000000);
-
-		$sql = $this->parameterize($sql);
-
-		// Update the query object since the parameters are slightly different
-		// than what was put in.
-		$this->query->setQuery($sql);
-
-		if (! $this->statement = pg_prepare($this->db->connID, $this->name, $sql))
-		{
-			$this->errorCode   = 0;
-			$this->errorString = pg_last_error($this->db->connID);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	public function _execute(array $data): bool
-	{
-		if (! isset($this->statement))
-		{
-			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
-		}
-
-		$this->result = pg_execute($this->db->connID, $this->name, $data);
-
-		return (bool) $this->result;
-	}
-
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	public function _getResult()
-	{
-		return $this->result;
-	}
-
-	/**
-	 * Replaces the ? placeholders with $1, $2, etc parameters for use
-	 * within the prepared query.
-	 *
-	 * @param string $sql
-	 *
-	 * @return string
-	 */
-	public function parameterize(string $sql): string
-	{
-		// Track our current value
-		$count = 0;
-
-		return preg_replace_callback('/\?/', function ($matches) use (&$count) {
-			$count ++;
-			return "\${$count}";
-		}, $sql);
-	}
+    /**
+     * Stores the name this query can be
+     * used under by postgres. Only used internally.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The result resource from a successful
+     * pg_exec. Or false.
+     *
+     * @var bool|Result
+     */
+    protected $result;
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
+     *
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function _prepare(string $sql, array $options = [])
+    {
+        $this->name = (string) random_int(1, 10000000000000000);
+
+        $sql = $this->parameterize($sql);
+
+        // Update the query object since the parameters are slightly different
+        // than what was put in.
+        $this->query->setQuery($sql);
+
+        if (! $this->statement = pg_prepare($this->db->connID, $this->name, $sql)) {
+            $this->errorCode   = 0;
+            $this->errorString = pg_last_error($this->db->connID);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     */
+    public function _execute(array $data): bool
+    {
+        if (! isset($this->statement)) {
+            throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+        }
+
+        $this->result = pg_execute($this->db->connID, $this->name, $data);
+
+        return (bool) $this->result;
+    }
+
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    public function _getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * Replaces the ? placeholders with $1, $2, etc parameters for use
+     * within the prepared query.
+     */
+    public function parameterize(string $sql): string
+    {
+        // Track our current value
+        $count = 0;
+
+        return preg_replace_callback('/\?/', static function () use (&$count) {
+            $count++;
+
+            return "\${$count}";
+        }, $sql);
+    }
 }
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 6964d7a08608..6f0fd9ac4ea1 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -20,141 +20,109 @@
  */
 class Result extends BaseResult
 {
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return pg_num_fields($this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		$fieldNames = [];
-		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
-		{
-			$fieldNames[] = pg_field_name($this->resultID, $i);
-		}
-
-		return $fieldNames;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		$retVal = [];
-
-		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
-		{
-			$retVal[$i]             = new stdClass();
-			$retVal[$i]->name       = pg_field_name($this->resultID, $i);
-			$retVal[$i]->type       = pg_field_type_oid($this->resultID, $i);
-			$retVal[$i]->type_name  = pg_field_type($this->resultID, $i);
-			$retVal[$i]->max_length = pg_field_size($this->resultID, $i);
-			$retVal[$i]->length     = $retVal[$i]->max_length;
-			// $retVal[$i]->primary_key = (int)($fieldData[$i]->flags & 2);
-			// $retVal[$i]->default     = $fieldData[$i]->def;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult()
-	{
-		if (is_resource($this->resultID))
-		{
-			pg_free_result($this->resultID);
-			$this->resultID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek(int $n = 0)
-	{
-		return pg_result_seek($this->resultID, $n);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-		return pg_fetch_assoc($this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object|boolean|Entity
-	 */
-	protected function fetchObject(string $className = 'stdClass')
-	{
-		if (is_subclass_of($className, Entity::class))
-		{
-			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
-		}
-		return pg_fetch_object($this->resultID, null, $className);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns the number of rows in the resultID (i.e., PostgreSQL query result resource)
-	 *
-	 * @return integer The number of rows in the query result
-	 */
-	public function getNumRows(): int
-	{
-		if (! is_int($this->numRows))
-		{
-			$this->numRows = pg_num_rows($this->resultID);
-		}
-
-		return $this->numRows;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return pg_num_fields($this->resultID);
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        $fieldNames = [];
+
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
+            $fieldNames[] = pg_field_name($this->resultID, $i);
+        }
+
+        return $fieldNames;
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        $retVal = [];
+
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
+            $retVal[$i]             = new stdClass();
+            $retVal[$i]->name       = pg_field_name($this->resultID, $i);
+            $retVal[$i]->type       = pg_field_type_oid($this->resultID, $i);
+            $retVal[$i]->type_name  = pg_field_type($this->resultID, $i);
+            $retVal[$i]->max_length = pg_field_size($this->resultID, $i);
+            $retVal[$i]->length     = $retVal[$i]->max_length;
+            // $retVal[$i]->primary_key = (int)($fieldData[$i]->flags & 2);
+            // $retVal[$i]->default     = $fieldData[$i]->def;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Frees the current result.
+     */
+    public function freeResult()
+    {
+        if (is_resource($this->resultID)) {
+            pg_free_result($this->resultID);
+            $this->resultID = false;
+        }
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0)
+    {
+        return pg_result_seek($this->resultID, $n);
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+        return pg_fetch_assoc($this->resultID);
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @return bool|Entity|object
+     */
+    protected function fetchObject(string $className = 'stdClass')
+    {
+        if (is_subclass_of($className, Entity::class)) {
+            return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+        }
+
+        return pg_fetch_object($this->resultID, null, $className);
+    }
+
+    /**
+     * Returns the number of rows in the resultID (i.e., PostgreSQL query result resource)
+     */
+    public function getNumRows(): int
+    {
+        if (! is_int($this->numRows)) {
+            $this->numRows = pg_num_rows($this->resultID);
+        }
+
+        return $this->numRows;
+    }
 }
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index 7e4fcfb16a4e..ba1df5d3b52a 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -19,33 +19,27 @@
  */
 class Utils extends BaseUtils
 {
-	/**
-	 * List databases statement
-	 *
-	 * @var string
-	 */
-	protected $listDatabases = 'SELECT datname FROM pg_database';
-
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $optimizeTable = 'REINDEX TABLE %s';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	public function _backup(array $prefs = null)
-	{
-		throw new DatabaseException('Unsupported feature of the database platform you are using.');
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * List databases statement
+     *
+     * @var string
+     */
+    protected $listDatabases = 'SELECT datname FROM pg_database';
+
+    /**
+     * OPTIMIZE TABLE statement
+     *
+     * @var string
+     */
+    protected $optimizeTable = 'REINDEX TABLE %s';
+
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    public function _backup(?array $prefs = null)
+    {
+        throw new DatabaseException('Unsupported feature of the database platform you are using.');
+    }
 }
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index e7d7e542be8b..318141027a9e 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -16,62 +16,39 @@
  */
 interface PreparedQueryInterface
 {
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return ResultInterface
-	 */
-	public function execute(...$data);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *
-	 * @return mixed
-	 */
-	public function prepare(string $sql, array $options = []);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Explicity closes the statement.
-	 */
-	public function close();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the SQL that has been prepared.
-	 *
-	 * @return string
-	 */
-	public function getQueryString(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error code created while executing this statement.
-	 *
-	 * @return integer
-	 */
-	public function getErrorCode(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error message created while executing this statement.
-	 *
-	 * @return string
-	 */
-	public function getErrorMessage(): string;
-
-	//--------------------------------------------------------------------
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     *
+     * @return ResultInterface
+     */
+    public function execute(...$data);
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * @return mixed
+     */
+    public function prepare(string $sql, array $options = []);
+
+    /**
+     * Explicity closes the statement.
+     */
+    public function close();
+
+    /**
+     * Returns the SQL that has been prepared.
+     */
+    public function getQueryString(): string;
+
+    /**
+     * Returns the error code created while executing this statement.
+     */
+    public function getErrorCode(): int;
+
+    /**
+     * Returns the error message created while executing this statement.
+     */
+    public function getErrorMessage(): string;
 }
diff --git a/system/Database/Query.php b/system/Database/Query.php
index ba84ac47e055..7f0873fdc40f 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -16,484 +16,406 @@
  */
 class Query implements QueryInterface
 {
-	/**
-	 * The query string, as provided by the user.
-	 *
-	 * @var string
-	 */
-	protected $originalQueryString;
-
-	/**
-	 * The final query string after binding, etc.
-	 *
-	 * @var string
-	 */
-	protected $finalQueryString;
-
-	/**
-	 * The binds and their values used for binding.
-	 *
-	 * @var array
-	 */
-	protected $binds = [];
-
-	/**
-	 * Bind marker
-	 *
-	 * Character used to identify values in a prepared statement.
-	 *
-	 * @var string
-	 */
-	protected $bindMarker = '?';
-
-	/**
-	 * The start time in seconds with microseconds
-	 * for when this query was executed.
-	 *
-	 * @var string|float
-	 */
-	protected $startTime;
-
-	/**
-	 * The end time in seconds with microseconds
-	 * for when this query was executed.
-	 *
-	 * @var float
-	 */
-	protected $endTime;
-
-	/**
-	 * The error code, if any.
-	 *
-	 * @var integer
-	 */
-	protected $errorCode;
-
-	/**
-	 * The error message, if any.
-	 *
-	 * @var string
-	 */
-	protected $errorString;
-
-	/**
-	 * Pointer to database connection.
-	 * Mainly for escaping features.
-	 *
-	 * @var ConnectionInterface
-	 */
-	public $db;
-
-	/**
-	 * BaseQuery constructor.
-	 *
-	 * @param ConnectionInterface $db
-	 */
-	public function __construct(ConnectionInterface &$db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Sets the raw query string to use for this statement.
-	 *
-	 * @param string  $sql
-	 * @param mixed   $binds
-	 * @param boolean $setEscape
-	 *
-	 * @return $this
-	 */
-	public function setQuery(string $sql, $binds = null, bool $setEscape = true)
-	{
-		$this->originalQueryString = $sql;
-
-		if (! is_null($binds))
-		{
-			if (! is_array($binds))
-			{
-				$binds = [$binds];
-			}
-
-			if ($setEscape)
-			{
-				array_walk($binds, function (&$item) {
-					$item = [
-						$item,
-						true,
-					];
-				});
-			}
-			$this->binds = $binds;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Will store the variables to bind into the query later.
-	 *
-	 * @param array   $binds
-	 * @param boolean $setEscape
-	 *
-	 * @return $this
-	 */
-	public function setBinds(array $binds, bool $setEscape = true)
-	{
-		if ($setEscape)
-		{
-			array_walk($binds, function (&$item) {
-				$item = [
-					$item,
-					true,
-				];
-			});
-		}
-
-		$this->binds = $binds;
-
-		return $this;
-	}
-
-	/**
-	 * Returns the final, processed query string after binding, etal
-	 * has been performed.
-	 *
-	 * @return string
-	 */
-	public function getQuery(): string
-	{
-		if (empty($this->finalQueryString))
-		{
-			$this->finalQueryString = $this->originalQueryString;
-		}
-
-		$this->compileBinds();
-
-		return $this->finalQueryString;
-	}
-
-	/**
-	 * Records the execution time of the statement using microtime(true)
-	 * for it's start and end values. If no end value is present, will
-	 * use the current time to determine total duration.
-	 *
-	 * @param float $start
-	 * @param float $end
-	 *
-	 * @return $this
-	 */
-	public function setDuration(float $start, float $end = null)
-	{
-		$this->startTime = $start;
-
-		if (is_null($end))
-		{
-			$end = microtime(true);
-		}
-
-		$this->endTime = $end;
-
-		return $this;
-	}
-
-	/**
-	 * Returns the start time in seconds with microseconds.
-	 *
-	 * @param boolean $returnRaw
-	 * @param integer $decimals
-	 *
-	 * @return string|float
-	 */
-	public function getStartTime(bool $returnRaw = false, int $decimals = 6)
-	{
-		if ($returnRaw)
-		{
-			return $this->startTime;
-		}
-
-		return number_format($this->startTime, $decimals);
-	}
-
-	/**
-	 * Returns the duration of this query during execution, or null if
-	 * the query has not been executed yet.
-	 *
-	 * @param integer $decimals The accuracy of the returned time.
-	 *
-	 * @return string
-	 */
-	public function getDuration(int $decimals = 6): string
-	{
-		return number_format(($this->endTime - $this->startTime), $decimals);
-	}
-
-	/**
-	 * Stores the error description that happened for this query.
-	 *
-	 * @param integer $code
-	 * @param string  $error
-	 *
-	 * @return $this
-	 */
-	public function setError(int $code, string $error)
-	{
-		$this->errorCode   = $code;
-		$this->errorString = $error;
-
-		return $this;
-	}
-
-	/**
-	 * Reports whether this statement created an error not.
-	 *
-	 * @return boolean
-	 */
-	public function hasError(): bool
-	{
-		return ! empty($this->errorString);
-	}
-
-	/**
-	 * Returns the error code created while executing this statement.
-	 *
-	 * @return integer
-	 */
-	public function getErrorCode(): int
-	{
-		return $this->errorCode;
-	}
-
-	/**
-	 * Returns the error message created while executing this statement.
-	 *
-	 * @return string
-	 */
-	public function getErrorMessage(): string
-	{
-		return $this->errorString;
-	}
-
-	/**
-	 * Determines if the statement is a write-type query or not.
-	 *
-	 * @return boolean
-	 */
-	public function isWriteType(): bool
-	{
-		return $this->db->isWriteType($this->originalQueryString);
-	}
-
-	/**
-	 * Swaps out one table prefix for a new one.
-	 *
-	 * @param string $orig
-	 * @param string $swap
-	 *
-	 * @return $this
-	 */
-	public function swapPrefix(string $orig, string $swap)
-	{
-		$sql = empty($this->finalQueryString) ? $this->originalQueryString : $this->finalQueryString;
-
-		$this->finalQueryString = preg_replace('/(\W)' . $orig . '(\S+?)/', '\\1' . $swap . '\\2', $sql);
-
-		return $this;
-	}
-
-	/**
-	 * Returns the original SQL that was passed into the system.
-	 *
-	 * @return string
-	 */
-	public function getOriginalQuery(): string
-	{
-		return $this->originalQueryString;
-	}
-
-	/**
-	 * Escapes and inserts any binds into the finalQueryString object.
-	 *
-	 * @return void
-	 *
-	 * @see https://regex101.com/r/EUEhay/4
-	 */
-	protected function compileBinds()
-	{
-		$sql = $this->finalQueryString;
-
-		$hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;
-
-		if (empty($this->binds)
-			|| empty($this->bindMarker)
-			|| (! $hasNamedBinds && strpos($sql, $this->bindMarker) === false)
-		)
-		{
-			return;
-		}
-
-		if (! is_array($this->binds))
-		{
-			$binds     = [$this->binds];
-			$bindCount = 1;
-		}
-		else
-		{
-			$binds     = $this->binds;
-			$bindCount = count($binds);
-		}
-
-		// Reverse the binds so that duplicate named binds
-		// will be processed prior to the original binds.
-		if (! is_numeric(key(array_slice($binds, 0, 1))))
-		{
-			$binds = array_reverse($binds);
-		}
-
-		// We'll need marker length later
-		$ml = strlen($this->bindMarker);
-
-		$sql = $hasNamedBinds ? $this->matchNamedBinds($sql, $binds) : $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
-
-		$this->finalQueryString = $sql;
-	}
-
-	/**
-	 * Match bindings
-	 *
-	 * @param  string $sql
-	 * @param  array  $binds
-	 * @return string
-	 */
-	protected function matchNamedBinds(string $sql, array $binds): string
-	{
-		$replacers = [];
-
-		foreach ($binds as $placeholder => $value)
-		{
-			// $value[1] contains the boolean whether should be escaped or not
-			$escapedValue = $value[1] ? $this->db->escape($value[0]) : $value[0];
-
-			// In order to correctly handle backlashes in saved strings
-			// we will need to preg_quote, so remove the wrapping escape characters
-			// otherwise it will get escaped.
-			if (is_array($value[0]))
-			{
-				$escapedValue = '(' . implode(',', $escapedValue) . ')';
-			}
-
-			$replacers[":{$placeholder}:"] = $escapedValue;
-		}
-
-		return strtr($sql, $replacers);
-	}
-
-	/**
-	 * Match bindings
-	 *
-	 * @param  string  $sql
-	 * @param  array   $binds
-	 * @param  integer $bindCount
-	 * @param  integer $ml
-	 * @return string
-	 */
-	protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, int $ml): string
-	{
-		// Make sure not to replace a chunk inside a string that happens to match the bind marker
-		if ($c = preg_match_all("/'[^']*'/", $sql, $matches))
-		{
-			$c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', str_replace($matches[0], str_replace($this->bindMarker, str_repeat(' ', $ml), $matches[0]), $sql, $c), $matches, PREG_OFFSET_CAPTURE);
-
-			// Bind values' count must match the count of markers in the query
-			if ($bindCount !== $c)
-			{
-				return $sql;
-			}
-		}
-		// Number of binds must match bindMarkers in the string.
-		elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
-		{
-			return $sql;
-		}
-
-		do
-		{
-			$c--;
-			$escapedValue = $binds[$c][1] ? $this->db->escape($binds[$c][0]) : $binds[$c][0];
-			if (is_array($escapedValue))
-			{
-				$escapedValue = '(' . implode(',', $escapedValue) . ')';
-			}
-			$sql = substr_replace($sql, $escapedValue, $matches[0][$c][1], $ml);
-		}
-		while ($c !== 0);
-
-		return $sql;
-	}
-
-	/**
-	 * Returns string to display in debug toolbar
-	 *
-	 * @return string
-	 */
-	public function debugToolbarDisplay(): string
-	{
-		// Key words we want bolded
-		static $highlight = [
-			'SELECT',
-			'DISTINCT',
-			'FROM',
-			'WHERE',
-			'AND',
-			'LEFT&nbsp;JOIN',
-			'RIGHT&nbsp;JOIN',
-			'JOIN',
-			'ORDER&nbsp;BY',
-			'GROUP&nbsp;BY',
-			'LIMIT',
-			'INSERT',
-			'INTO',
-			'VALUES',
-			'UPDATE',
-			'OR&nbsp;',
-			'HAVING',
-			'OFFSET',
-			'NOT&nbsp;IN',
-			'IN',
-			'LIKE',
-			'NOT&nbsp;LIKE',
-			'COUNT',
-			'MAX',
-			'MIN',
-			'ON',
-			'AS',
-			'AVG',
-			'SUM',
-			'(',
-			')',
-		];
-
-		if (empty($this->finalQueryString))
-		{
-			$this->compileBinds(); // @codeCoverageIgnore
-		}
-
-		$sql = $this->finalQueryString;
-
-		foreach ($highlight as $term)
-		{
-			$sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * Return text representation of the query
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return $this->getQuery();
-	}
+    /**
+     * The query string, as provided by the user.
+     *
+     * @var string
+     */
+    protected $originalQueryString;
+
+    /**
+     * The final query string after binding, etc.
+     *
+     * @var string
+     */
+    protected $finalQueryString;
+
+    /**
+     * The binds and their values used for binding.
+     *
+     * @var array
+     */
+    protected $binds = [];
+
+    /**
+     * Bind marker
+     *
+     * Character used to identify values in a prepared statement.
+     *
+     * @var string
+     */
+    protected $bindMarker = '?';
+
+    /**
+     * The start time in seconds with microseconds
+     * for when this query was executed.
+     *
+     * @var float|string
+     */
+    protected $startTime;
+
+    /**
+     * The end time in seconds with microseconds
+     * for when this query was executed.
+     *
+     * @var float
+     */
+    protected $endTime;
+
+    /**
+     * The error code, if any.
+     *
+     * @var int
+     */
+    protected $errorCode;
+
+    /**
+     * The error message, if any.
+     *
+     * @var string
+     */
+    protected $errorString;
+
+    /**
+     * Pointer to database connection.
+     * Mainly for escaping features.
+     *
+     * @var ConnectionInterface
+     */
+    public $db;
+
+    public function __construct(ConnectionInterface &$db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Sets the raw query string to use for this statement.
+     *
+     * @param mixed $binds
+     *
+     * @return $this
+     */
+    public function setQuery(string $sql, $binds = null, bool $setEscape = true)
+    {
+        $this->originalQueryString = $sql;
+
+        if ($binds !== null) {
+            if (! is_array($binds)) {
+                $binds = [$binds];
+            }
+
+            if ($setEscape) {
+                array_walk($binds, static function (&$item) {
+                    $item = [
+                        $item,
+                        true,
+                    ];
+                });
+            }
+            $this->binds = $binds;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Will store the variables to bind into the query later.
+     *
+     * @return $this
+     */
+    public function setBinds(array $binds, bool $setEscape = true)
+    {
+        if ($setEscape) {
+            array_walk($binds, static function (&$item) {
+                $item = [$item, true];
+            });
+        }
+
+        $this->binds = $binds;
+
+        return $this;
+    }
+
+    /**
+     * Returns the final, processed query string after binding, etal
+     * has been performed.
+     */
+    public function getQuery(): string
+    {
+        if (empty($this->finalQueryString)) {
+            $this->finalQueryString = $this->originalQueryString;
+        }
+
+        $this->compileBinds();
+
+        return $this->finalQueryString;
+    }
+
+    /**
+     * Records the execution time of the statement using microtime(true)
+     * for it's start and end values. If no end value is present, will
+     * use the current time to determine total duration.
+     *
+     * @param float $end
+     *
+     * @return $this
+     */
+    public function setDuration(float $start, ?float $end = null)
+    {
+        $this->startTime = $start;
+
+        if ($end === null) {
+            $end = microtime(true);
+        }
+
+        $this->endTime = $end;
+
+        return $this;
+    }
+
+    /**
+     * Returns the start time in seconds with microseconds.
+     *
+     * @return float|string
+     */
+    public function getStartTime(bool $returnRaw = false, int $decimals = 6)
+    {
+        if ($returnRaw) {
+            return $this->startTime;
+        }
+
+        return number_format($this->startTime, $decimals);
+    }
+
+    /**
+     * Returns the duration of this query during execution, or null if
+     * the query has not been executed yet.
+     *
+     * @param int $decimals The accuracy of the returned time.
+     */
+    public function getDuration(int $decimals = 6): string
+    {
+        return number_format(($this->endTime - $this->startTime), $decimals);
+    }
+
+    /**
+     * Stores the error description that happened for this query.
+     *
+     * @return $this
+     */
+    public function setError(int $code, string $error)
+    {
+        $this->errorCode   = $code;
+        $this->errorString = $error;
+
+        return $this;
+    }
+
+    /**
+     * Reports whether this statement created an error not.
+     */
+    public function hasError(): bool
+    {
+        return ! empty($this->errorString);
+    }
+
+    /**
+     * Returns the error code created while executing this statement.
+     */
+    public function getErrorCode(): int
+    {
+        return $this->errorCode;
+    }
+
+    /**
+     * Returns the error message created while executing this statement.
+     */
+    public function getErrorMessage(): string
+    {
+        return $this->errorString;
+    }
+
+    /**
+     * Determines if the statement is a write-type query or not.
+     */
+    public function isWriteType(): bool
+    {
+        return $this->db->isWriteType($this->originalQueryString);
+    }
+
+    /**
+     * Swaps out one table prefix for a new one.
+     *
+     * @return $this
+     */
+    public function swapPrefix(string $orig, string $swap)
+    {
+        $sql = empty($this->finalQueryString) ? $this->originalQueryString : $this->finalQueryString;
+
+        $this->finalQueryString = preg_replace('/(\W)' . $orig . '(\S+?)/', '\\1' . $swap . '\\2', $sql);
+
+        return $this;
+    }
+
+    /**
+     * Returns the original SQL that was passed into the system.
+     */
+    public function getOriginalQuery(): string
+    {
+        return $this->originalQueryString;
+    }
+
+    /**
+     * Escapes and inserts any binds into the finalQueryString object.
+     *
+     * @see https://regex101.com/r/EUEhay/4
+     */
+    protected function compileBinds()
+    {
+        $sql = $this->finalQueryString;
+
+        $hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;
+
+        if (empty($this->binds)
+            || empty($this->bindMarker)
+            || (! $hasNamedBinds && strpos($sql, $this->bindMarker) === false)
+        ) {
+            return;
+        }
+
+        if (! is_array($this->binds)) {
+            $binds     = [$this->binds];
+            $bindCount = 1;
+        } else {
+            $binds     = $this->binds;
+            $bindCount = count($binds);
+        }
+
+        // Reverse the binds so that duplicate named binds
+        // will be processed prior to the original binds.
+        if (! is_numeric(key(array_slice($binds, 0, 1)))) {
+            $binds = array_reverse($binds);
+        }
+
+        $ml  = strlen($this->bindMarker);
+        $sql = $hasNamedBinds ? $this->matchNamedBinds($sql, $binds) : $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
+
+        $this->finalQueryString = $sql;
+    }
+
+    /**
+     * Match bindings
+     */
+    protected function matchNamedBinds(string $sql, array $binds): string
+    {
+        $replacers = [];
+
+        foreach ($binds as $placeholder => $value) {
+            // $value[1] contains the boolean whether should be escaped or not
+            $escapedValue = $value[1] ? $this->db->escape($value[0]) : $value[0];
+
+            // In order to correctly handle backlashes in saved strings
+            // we will need to preg_quote, so remove the wrapping escape characters
+            // otherwise it will get escaped.
+            if (is_array($value[0])) {
+                $escapedValue = '(' . implode(',', $escapedValue) . ')';
+            }
+
+            $replacers[":{$placeholder}:"] = $escapedValue;
+        }
+
+        return strtr($sql, $replacers);
+    }
+
+    /**
+     * Match bindings
+     */
+    protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, int $ml): string
+    {
+        if ($c = preg_match_all("/'[^']*'/", $sql, $matches)) {
+            $c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', str_replace($matches[0], str_replace($this->bindMarker, str_repeat(' ', $ml), $matches[0]), $sql, $c), $matches, PREG_OFFSET_CAPTURE);
+
+            // Bind values' count must match the count of markers in the query
+            if ($bindCount !== $c) {
+                return $sql;
+            }
+        } elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount) {
+            return $sql;
+        }
+
+        do {
+            $c--;
+            $escapedValue = $binds[$c][1] ? $this->db->escape($binds[$c][0]) : $binds[$c][0];
+
+            if (is_array($escapedValue)) {
+                $escapedValue = '(' . implode(',', $escapedValue) . ')';
+            }
+
+            $sql = substr_replace($sql, $escapedValue, $matches[0][$c][1], $ml);
+        } while ($c !== 0);
+
+        return $sql;
+    }
+
+    /**
+     * Returns string to display in debug toolbar
+     */
+    public function debugToolbarDisplay(): string
+    {
+        // Key words we want bolded
+        static $highlight = [
+            'SELECT',
+            'DISTINCT',
+            'FROM',
+            'WHERE',
+            'AND',
+            'LEFT&nbsp;JOIN',
+            'RIGHT&nbsp;JOIN',
+            'JOIN',
+            'ORDER&nbsp;BY',
+            'GROUP&nbsp;BY',
+            'LIMIT',
+            'INSERT',
+            'INTO',
+            'VALUES',
+            'UPDATE',
+            'OR&nbsp;',
+            'HAVING',
+            'OFFSET',
+            'NOT&nbsp;IN',
+            'IN',
+            'LIKE',
+            'NOT&nbsp;LIKE',
+            'COUNT',
+            'MAX',
+            'MIN',
+            'ON',
+            'AS',
+            'AVG',
+            'SUM',
+            '(',
+            ')',
+        ];
+
+        if (empty($this->finalQueryString)) {
+            $this->compileBinds(); // @codeCoverageIgnore
+        }
+
+        $sql = $this->finalQueryString;
+
+        foreach ($highlight as $term) {
+            $sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Return text representation of the query
+     */
+    public function __toString(): string
+    {
+        return $this->getQuery();
+    }
 }
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index af52d4010e70..4f40f004f7e8 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -19,110 +19,69 @@
  */
 interface QueryInterface
 {
-	/**
-	 * Sets the raw query string to use for this statement.
-	 *
-	 * @param string  $sql
-	 * @param mixed   $binds
-	 * @param boolean $setEscape
-	 *
-	 * @return mixed
-	 */
-	public function setQuery(string $sql, $binds = null, bool $setEscape = true);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the final, processed query string after binding, etal
-	 * has been performed.
-	 *
-	 * @return mixed
-	 */
-	public function getQuery();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Records the execution time of the statement using microtime(true)
-	 * for it's start and end values. If no end value is present, will
-	 * use the current time to determine total duration.
-	 *
-	 * @param float $start
-	 * @param float $end
-	 *
-	 * @return mixed
-	 */
-	public function setDuration(float $start, float $end = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the duration of this query during execution, or null if
-	 * the query has not been executed yet.
-	 *
-	 * @param integer $decimals The accuracy of the returned time.
-	 *
-	 * @return string
-	 */
-	public function getDuration(int $decimals = 6): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stores the error description that happened for this query.
-	 *
-	 * @param integer $code
-	 * @param string  $error
-	 */
-	public function setError(int $code, string $error);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reports whether this statement created an error not.
-	 *
-	 * @return boolean
-	 */
-	public function hasError(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error code created while executing this statement.
-	 *
-	 * @return integer
-	 */
-	public function getErrorCode(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error message created while executing this statement.
-	 *
-	 * @return string
-	 */
-	public function getErrorMessage(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the statement is a write-type query or not.
-	 *
-	 * @return boolean
-	 */
-	public function isWriteType(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Swaps out one table prefix for a new one.
-	 *
-	 * @param string $orig
-	 * @param string $swap
-	 *
-	 * @return mixed
-	 */
-	public function swapPrefix(string $orig, string $swap);
-
-	//--------------------------------------------------------------------
+    /**
+     * Sets the raw query string to use for this statement.
+     *
+     * @param mixed $binds
+     *
+     * @return mixed
+     */
+    public function setQuery(string $sql, $binds = null, bool $setEscape = true);
+
+    /**
+     * Returns the final, processed query string after binding, etal
+     * has been performed.
+     *
+     * @return mixed
+     */
+    public function getQuery();
+
+    /**
+     * Records the execution time of the statement using microtime(true)
+     * for it's start and end values. If no end value is present, will
+     * use the current time to determine total duration.
+     *
+     * @return mixed
+     */
+    public function setDuration(float $start, ?float $end = null);
+
+    /**
+     * Returns the duration of this query during execution, or null if
+     * the query has not been executed yet.
+     *
+     * @param int $decimals The accuracy of the returned time.
+     */
+    public function getDuration(int $decimals = 6): string;
+
+    /**
+     * Stores the error description that happened for this query.
+     */
+    public function setError(int $code, string $error);
+
+    /**
+     * Reports whether this statement created an error not.
+     */
+    public function hasError(): bool;
+
+    /**
+     * Returns the error code created while executing this statement.
+     */
+    public function getErrorCode(): int;
+
+    /**
+     * Returns the error message created while executing this statement.
+     */
+    public function getErrorMessage(): string;
+
+    /**
+     * Determines if the statement is a write-type query or not.
+     */
+    public function isWriteType(): bool;
+
+    /**
+     * Swaps out one table prefix for a new one.
+     *
+     * @return mixed
+     */
+    public function swapPrefix(string $orig, string $swap);
 }
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index f28c412eccad..b676ea096998 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -16,220 +16,149 @@
  */
 interface ResultInterface
 {
-	/**
-	 * Retrieve the results of the query. Typically an array of
-	 * individual data rows, which can be either an 'array', an
-	 * 'object', or a custom class name.
-	 *
-	 * @param string $type The row type. Either 'array', 'object', or a class name to use
-	 *
-	 * @return array
-	 */
-	public function getResult(string $type = 'object'): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of custom objects.
-	 *
-	 * @param string $className The name of the class to use.
-	 *
-	 * @return mixed
-	 */
-	public function getCustomResultObject(string $className);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of arrays.
-	 *
-	 * If no results, an empty array is returned.
-	 *
-	 * @return array
-	 */
-	public function getResultArray(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the results as an array of objects.
-	 *
-	 * If no results, an empty array is returned.
-	 *
-	 * @return array
-	 */
-	public function getResultObject(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrapper object to return a row as either an array, an object, or
-	 * a custom class.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param mixed  $n    The index of the results to return
-	 * @param string $type The type of result object. 'array', 'object' or class name.
-	 *
-	 * @return mixed
-	 */
-	public function getRow($n = 0, string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a row as a custom class instance.
-	 *
-	 * If row doesn't exists, returns null.
-	 *
-	 * @param integer $n
-	 * @param string  $className
-	 *
-	 * @return mixed
-	 */
-	public function getCustomRowObject(int $n, string $className);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a single row from the results as an array.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function getRowArray(int $n = 0);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a single row from the results as an object.
-	 *
-	 * If row doesn't exist, returns null.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function getRowObject(int $n = 0);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Assigns an item into a particular column slot.
-	 *
-	 * @param string $key
-	 * @param null   $value
-	 *
-	 * @return mixed
-	 */
-	public function setRow($key, $value = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "first" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getFirstRow(string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "last" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getLastRow(string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "next" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getNextRow(string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the "previous" row of the current results.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getPreviousRow(string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an unbuffered row and move the pointer to the next row.
-	 *
-	 * @param string $type
-	 *
-	 * @return mixed
-	 */
-	public function getUnbufferedRow(string $type = 'object');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek(int $n = 0);
-
-	//--------------------------------------------------------------------
+    /**
+     * Retrieve the results of the query. Typically an array of
+     * individual data rows, which can be either an 'array', an
+     * 'object', or a custom class name.
+     *
+     * @param string $type The row type. Either 'array', 'object', or a class name to use
+     */
+    public function getResult(string $type = 'object'): array;
+
+    /**
+     * Returns the results as an array of custom objects.
+     *
+     * @param string $className The name of the class to use.
+     *
+     * @return mixed
+     */
+    public function getCustomResultObject(string $className);
+
+    /**
+     * Returns the results as an array of arrays.
+     *
+     * If no results, an empty array is returned.
+     */
+    public function getResultArray(): array;
+
+    /**
+     * Returns the results as an array of objects.
+     *
+     * If no results, an empty array is returned.
+     */
+    public function getResultObject(): array;
+
+    /**
+     * Wrapper object to return a row as either an array, an object, or
+     * a custom class.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @param mixed  $n    The index of the results to return
+     * @param string $type The type of result object. 'array', 'object' or class name.
+     *
+     * @return mixed
+     */
+    public function getRow($n = 0, string $type = 'object');
+
+    /**
+     * Returns a row as a custom class instance.
+     *
+     * If row doesn't exists, returns null.
+     *
+     * @return mixed
+     */
+    public function getCustomRowObject(int $n, string $className);
+
+    /**
+     * Returns a single row from the results as an array.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @return mixed
+     */
+    public function getRowArray(int $n = 0);
+
+    /**
+     * Returns a single row from the results as an object.
+     *
+     * If row doesn't exist, returns null.
+     *
+     * @return mixed
+     */
+    public function getRowObject(int $n = 0);
+
+    /**
+     * Assigns an item into a particular column slot.
+     *
+     * @param string $key
+     * @param mixed  $value
+     *
+     * @return mixed
+     */
+    public function setRow($key, $value = null);
+
+    /**
+     * Returns the "first" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getFirstRow(string $type = 'object');
+
+    /**
+     * Returns the "last" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getLastRow(string $type = 'object');
+
+    /**
+     * Returns the "next" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getNextRow(string $type = 'object');
+
+    /**
+     * Returns the "previous" row of the current results.
+     *
+     * @return mixed
+     */
+    public function getPreviousRow(string $type = 'object');
+
+    /**
+     * Returns an unbuffered row and move the pointer to the next row.
+     *
+     * @return mixed
+     */
+    public function getUnbufferedRow(string $type = 'object');
+
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int;
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array;
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array;
+
+    /**
+     * Frees the current result.
+     */
+    public function freeResult();
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0);
 }
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 07142bb1a362..cda4fac8a825 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -1,17 +1,16 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
 
-use Closure;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
@@ -26,750 +25,517 @@
  */
 class Builder extends BaseBuilder
 {
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $randomKeyword = [
-		'NEWID()',
-		'RAND(%d)',
-	];
-
-	/**
-	 * Quoted identifier flag
-	 *
-	 * Whether to use SQL-92 standard quoted identifier
-	 * (double quotes) or brackets for identifier escaping.
-	 *
-	 * @var boolean
-	 */
-	protected $_quoted_identifier = true;
-
-	/**
-	 * Handle increment/decrement on text
-	 *
-	 * @var boolean
-	 */
-	public $castTextToInt = true;
-
-	/**
-	 * Handle IDENTITY_INSERT property/
-	 *
-	 * @var boolean
-	 */
-	public $keyPermission = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * FROM tables
-	 *
-	 * Groups tables in FROM clauses if needed, so there is no confusion
-	 * about operator precedence.
-	 *
-	 * @return string
-	 */
-	protected function _fromTables(): string
-	{
-		$from = [];
-		foreach ($this->QBFrom as $value)
-		{
-			$from[] = $this->getFullName($value);
-		}
-
-		return implode(', ', $from);
-	}
-
-	/**
-	 * Truncate statement
-	 *
-	 * Generates a platform-specific truncate string from the supplied data
-	 *
-	 * If the database does not support the truncate() command,
-	 * then this method maps to 'DELETE FROM table'
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _truncate(string $table): string
-	{
-		return 'TRUNCATE TABLE ' . $this->getFullName($table);
-	}
-
-	/**
-	 * JOIN
-	 *
-	 * Generates the JOIN portion of the query
-	 *
-	 * @param string  $table
-	 * @param string  $cond   The join condition
-	 * @param string  $type   The type of join
-	 * @param boolean $escape Whether not to try to escape identifiers
-	 *
-	 * @return $this
-	 */
-	public function join(string $table, string $cond, string $type = '', bool $escape = null)
-	{
-		if ($type !== '')
-		{
-			$type = strtoupper(trim($type));
-
-			if (! in_array($type, $this->joinTypes, true))
-			{
-				$type = '';
-			}
-			else
-			{
-				$type .= ' ';
-			}
-		}
-
-		// Extract any aliases that might exist. We use this information
-		// in the protectIdentifiers to know whether to add a table prefix
-		$this->trackAliases($table);
-
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		if (! $this->hasOperator($cond))
-		{
-			$cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
-		}
-		elseif ($escape === false)
-		{
-			$cond = ' ON ' . $cond;
-		}
-		else
-		{
-			// Split multiple conditions
-			if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE))
-			{
-				$conditions = [];
-				$joints     = $joints[0];
-				array_unshift($joints, ['', 0]);
-
-				for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --)
-				{
-					$joints[$i][1] += strlen($joints[$i][0]); // offset
-					$conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
-					$pos            = $joints[$i][1] - strlen($joints[$i][0]);
-					$joints[$i]     = $joints[$i][0];
-				}
-				ksort($conditions);
-			}
-			else
-			{
-				$conditions = [$cond];
-				$joints     = [''];
-			}
-
-			$cond = ' ON ';
-			foreach ($conditions as $i => $condition)
-			{
-				$operator = $this->getOperator($condition);
-
-				$cond .= $joints[$i];
-				$cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator) . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
-			}
-		}
-
-		// Do we want to escape the table name?
-		if ($escape === true)
-		{
-			$table = $this->db->protectIdentifiers($table, true, null, false);
-		}
-
-		// Assemble the JOIN statement
-		$this->QBJoin[] = $join = $type . 'JOIN ' . $this->getFullName($table) . $cond;
-
-		return $this;
-	}
-
-	/**
-	 * Insert statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data
-	 * auto-enable
-	 *
-	 * @todo implement check for this instad static $insertKeyPermission
-	 *
-	 * @param string $table         The table name
-	 * @param array  $keys          The insert keys
-	 * @param array  $unescapedKeys The insert values
-	 *
-	 * @return string
-	 */
-	protected function _insert(string $table, array $keys, array $unescapedKeys): string
-	{
-		$fullTableName = $this->getFullName($table);
-
-		// insert statement
-		$statement = 'INSERT INTO ' . $fullTableName . ' (' . implode(',', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
-
-		return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
-	}
-
-	/**
-	 * Update statement
-	 *
-	 * Generates a platform-specific update string from the supplied data
-	 *
-	 * @param string $table  the Table name
-	 * @param array  $values the Update data
-	 *
-	 * @return string
-	 */
-	protected function _update(string $table, array $values): string
-	{
-		$valstr = [];
-
-		foreach ($values as $key => $val)
-		{
-			$valstr[] = $key . ' = ' . $val;
-		}
-
-		$fullTableName = $this->getFullName($table);
-
-		$statement = 'UPDATE ' . (empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ') . $fullTableName . ' SET '
-				. implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
-
-		return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
-	}
-
-	/**
-	 * Increments a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @return boolean
-	 */
-	public function increment(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		if ($this->castTextToInt)
-		{
-			$values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) + {$value})"];
-		}
-		else
-		{
-			$values = [$column => "{$column} + {$value}"];
-		}
-		$sql = $this->_update($this->QBFrom[0], $values);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	/**
-	 * Decrements a numeric column by the specified value.
-	 *
-	 * @param string  $column
-	 * @param integer $value
-	 *
-	 * @return boolean
-	 */
-	public function decrement(string $column, int $value = 1)
-	{
-		$column = $this->db->protectIdentifiers($column);
-
-		if ($this->castTextToInt)
-		{
-			$values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) - {$value})"];
-		}
-		else
-		{
-			$values = [$column => "{$column} + {$value}"];
-		}
-		$sql = $this->_update($this->QBFrom[0], $values);
-
-		return $this->db->query($sql, $this->binds, false);
-	}
-
-	/**
-	 * Get full name of the table
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	private function getFullName(string $table): string
-	{
-		$alias = '';
-
-		if (strpos($table, ' ') !== false)
-		{
-			$alias = explode(' ', $table);
-			$table = array_shift($alias);
-			$alias = ' ' . implode(' ', $alias);
-		}
-
-		if ($this->db->escapeChar === '"')
-		{
-			return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias;
-		}
-
-		return '[' . $this->db->getDatabase() . '].[' . $this->db->schema . '].[' . str_replace('"', '', $table) . ']' . str_replace('"', '', $alias);
-	}
-
-	/**
-	 * Add permision statements for index value inserts
-	 *
-	 * @param string $fullTable full table name
-	 * @param string $insert    statement
-	 *
-	 * @return string
-	 */
-	private function addIdentity(string $fullTable, string $insert): string
-	{
-		return 'SET IDENTITY_INSERT ' . $fullTable . " ON\n" . $insert . "\nSET IDENTITY_INSERT " . $fullTable . ' OFF';
-	}
-
-	/**
-	 * Local implementation of limit
-	 *
-	 * @param string  $sql
-	 * @param boolean $offsetIgnore
-	 *
-	 * @return string
-	 */
-	protected function _limit(string $sql, bool $offsetIgnore = false): string
-	{
-		if (empty($this->QBOrderBy))
-		{
-			$sql .= ' ORDER BY (SELECT NULL) ';
-		}
-
-		if ($offsetIgnore)
-		{
-			$sql .= ' OFFSET 0 ';
-		}
-		else
-		{
-			$sql .= is_int($this->QBOffset) ? ' OFFSET ' . $this->QBOffset : ' OFFSET 0 ';
-		}
-
-		return $sql .= ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY ';
-	}
-
-	/**
-	 * Replace
-	 *
-	 * Compiles a replace into string and runs the query
-	 *
-	 * @param array|null $set An associative array of insert values
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function replace(array $set = null)
-	{
-		if ($set !== null)
-		{
-			$this->set($set);
-		}
-
-		if (empty($this->QBSet))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('You must use the "set" method to update an entry.');
-			}
-
-			return false; // @codeCoverageIgnore
-		}
-
-		$table = $this->QBFrom[0];
-
-		$sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
-
-		$this->resetWrite();
-
-		if ($this->testMode)
-		{
-			return $sql;
-		}
-
-		$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' ON');
-		$result = $this->db->query($sql, $this->binds, false);
-		$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' OFF');
-
-		return $result;
-	}
-
-	/**
-	 * Replace statement
-	 *
-	 * Generates a platform-specific replace string from the supplied data
-	 *
-	 * on match delete and insert
-	 *
-	 * @param string $table  The table name
-	 * @param array  $keys   The insert keys
-	 * @param array  $values The insert values
-	 *
-	 * @return string
-	 */
-	protected function _replace(string $table, array $keys, array $values): string
-	{
-		// check whether the existing keys are part of the primary key.
-		// if so then use them for the "ON" part and exclude them from the $values and $keys
-		$pKeys     = $this->db->getIndexData($table);
-		$keyFields = [];
-
-		foreach ($pKeys as $key)
-		{
-			if ($key->type === 'PRIMARY')
-			{
-				$keyFields = array_merge($keyFields, $key->fields);
-			}
-
-			if ($key->type === 'UNIQUE')
-			{
-				$keyFields = array_merge($keyFields, $key->fields);
-			}
-		}
-
-		// Get the unique field names
-		$escKeyFields = array_map(function (string $field): string {
-			return $this->db->protectIdentifiers($field);
-		}, array_values(array_unique($keyFields)));
-
-		// Get the binds
-		$binds = $this->binds;
-		array_walk($binds, function (&$item) {
-			$item = $item[0];
-		});
-
-		// Get the common field and values from the keys data and index fields
-		$common = array_intersect($keys, $escKeyFields);
-		$bingo  = [];
-
-		foreach ($common as $v)
-		{
-			$k = array_search($v, $escKeyFields, true);
-
-			$bingo[$keyFields[$k]] = $binds[trim($values[$k], ':')];
-		}
-
-		// Querying existing data
-		$builder = $this->db->table($table);
-
-		foreach ($bingo as $k => $v)
-		{
-			$builder->where($k, $v);
-		}
-
-		$q = $builder->get()->getResult();
-
-		// Delete entries if we find them
-		if ($q !== [])
-		{
-			$delete = $this->db->table($table);
-
-			foreach ($bingo as $k => $v)
-			{
-				$delete->where($k, $v);
-			}
-
-			$delete->delete();
-		}
-
-		return sprintf('INSERT INTO %s (%s) VALUES (%s);', $this->getFullName($table), implode(',', $keys), implode(',', $values));
-	}
-
-	/**
-	 * SELECT [MAX|MIN|AVG|SUM|COUNT]()
-	 *
-	 * Handle float return value
-	 *
-	 * @param string $select Field name
-	 * @param string $alias
-	 * @param string $type
-	 *
-	 * @return BaseBuilder
-	 */
-	protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
-	{
-		// int functions can be handled by parent
-		if ($type !== 'AVG')
-		{
-			return parent::maxMinAvgSum($select, $alias, $type);
-		}
-
-		if ($select === '')
-		{
-			throw DataException::forEmptyInputGiven('Select');
-		}
-
-		if (strpos($select, ',') !== false)
-		{
-			throw DataException::forInvalidArgument('Column name not separated by comma');
-		}
-
-		if ($alias === '')
-		{
-			$alias = $this->createAliasFromTable(trim($select));
-		}
-
-		$sql = $type . '( CAST( ' . $this->db->protectIdentifiers(trim($select)) . ' AS FLOAT ) ) AS ' . $this->db->escapeIdentifiers(trim($alias));
-
-		$this->QBSelect[]   = $sql;
-		$this->QBNoEscape[] = null;
-
-		return $this;
-	}
-
-	/**
-	 * Delete statement
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _delete(string $table): string
-	{
-		return 'DELETE' . (empty($this->QBLimit) ? '' : ' TOP (' . $this->QBLimit . ') ') . ' FROM ' . $this->getFullName($table) . $this->compileWhereHaving('QBWhere');
-	}
-
-	/**
-	 * Delete
-	 *
-	 * Compiles a delete string and runs the query
-	 *
-	 * @param mixed   $where     The where clause
-	 * @param integer $limit     The limit clause
-	 * @param boolean $resetData
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function delete($where = '', int $limit = null, bool $resetData = true)
-	{
-		$table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
-
-		if ($where !== '')
-		{
-			$this->where($where);
-		}
-
-		if (empty($this->QBWhere))
-		{
-			if (CI_DEBUG)
-			{
-				throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
-			}
-
-			return false; // @codeCoverageIgnore
-		}
-
-		if (! empty($limit))
-		{
-			$this->QBLimit = $limit;
-		}
-
-		$sql = $this->_delete($table);
-
-		if ($resetData)
-		{
-			$this->resetWrite();
-		}
-
-		return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
-	}
-
-	/**
-	 * Compile the SELECT statement
-	 *
-	 * Generates a query string based on which functions were used.
-	 *
-	 * @param mixed $selectOverride
-	 *
-	 * @return string
-	 */
-	protected function compileSelect($selectOverride = false): string
-	{
-		// Write the "select" portion of the query
-		if ($selectOverride !== false)
-		{
-			$sql = $selectOverride;
-		}
-		else
-		{
-			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
-
-			// SQL Server can't work with select * if group by is specified
-			if (empty($this->QBSelect) && ! empty($this->QBGroupBy) && is_array($this->QBGroupBy))
-			{
-				foreach ($this->QBGroupBy as $field)
-				{
-					$this->QBSelect[] = is_array($field) ? $field['field'] : $field;
-				}
-			}
-
-			if (empty($this->QBSelect))
-			{
-				$sql .= '*';
-			}
-			else
-			{
-				// Cycle through the "select" portion of the query and prep each column name.
-				// The reason we protect identifiers here rather than in the select() function
-				// is because until the user calls the from() function we don't know if there are aliases
-				foreach ($this->QBSelect as $key => $val)
-				{
-					$noEscape             = $this->QBNoEscape[$key] ?? null;
-					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
-				}
-
-				$sql .= implode(', ', $this->QBSelect);
-			}
-		}
-
-		// Write the "FROM" portion of the query
-		if (! empty($this->QBFrom))
-		{
-			$sql .= "\nFROM " . $this->_fromTables();
-		}
-
-		// Write the "JOIN" portion of the query
-		if (! empty($this->QBJoin))
-		{
-			$sql .= "\n" . implode("\n", $this->QBJoin);
-		}
-
-		$sql .= $this->compileWhereHaving('QBWhere')
-				. $this->compileGroupBy()
-				. $this->compileWhereHaving('QBHaving')
-				. $this->compileOrderBy(); // ORDER BY
-		// LIMIT
-		if ($this->QBLimit)
-		{
-			return $sql = $this->_limit($sql . "\n");
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * WHERE, HAVING
-	 *
-	 * @param string  $qbKey  'QBWhere' or 'QBHaving'
-	 * @param mixed   $key
-	 * @param mixed   $value
-	 * @param string  $type
-	 * @param boolean $escape
-	 *
-	 * @return $this
-	 */
-	protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
-	{
-		if (! is_array($key))
-		{
-			$key = [$key => $value];
-		}
-
-		// If the escape value was not set will base it on the global setting
-		if (! is_bool($escape))
-		{
-			$escape = $this->db->protectIdentifiers;
-		}
-
-		foreach ($key as $k => $v)
-		{
-			$prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
-
-			if ($v !== null)
-			{
-				$op = $this->getOperator($k, true);
-
-				if (! empty($op))
-				{
-					$k = trim($k);
-
-					end($op);
-
-					$op = trim(current($op));
-
-					if (substr($k, -1 * strlen($op)) === $op)
-					{
-						$k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
-					}
-				}
-
-				$bind = $this->setBind($k, $v, $escape);
-
-				if (empty($op))
-				{
-					$k .= ' =';
-				}
-				else
-				{
-					$k .= " $op";
-				}
-
-				if ($v instanceof Closure)
-				{
-					$builder = $this->cleanClone();
-					$v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
-				}
-				else
-				{
-					$v = " :$bind:";
-				}
-			}
-			elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving')
-			{
-				// value appears not to have been set, assign the test to IS NULL
-				$k .= ' IS NULL';
-			}
-			elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE))
-			{
-				$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
-			}
-
-			$this->{$qbKey}[] = [
-				'condition' => $prefix . $k . $v,
-				'escape'    => $escape,
-			];
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Get
-	 *
-	 * Compiles the select statement based on the other functions called
-	 * and runs the query
-	 *
-	 * @param integer $limit  The limit clause
-	 * @param integer $offset The offset clause
-	 * @param boolean $reset  Are we want to clear query builder values?
-	 *
-	 * @return ResultInterface
-	 */
-	public function get(int $limit = null, int $offset = 0, bool $reset = true)
-	{
-		if (! is_null($limit))
-		{
-			$this->limit($limit, $offset);
-		}
-
-		$result = $this->testMode ? $this->getCompiledSelect($reset) : $this->db->query($this->compileSelect(), $this->binds, false);
-
-		if ($reset)
-		{
-			$this->resetSelect();
-
-			// Clear our binds so we don't eat up memory
-			$this->binds = [];
-		}
-
-		return $result;
-	}
+    /**
+     * ORDER BY random keyword
+     *
+     * @var array
+     */
+    protected $randomKeyword = [
+        'NEWID()',
+        'RAND(%d)',
+    ];
+
+    /**
+     * Quoted identifier flag
+     *
+     * Whether to use SQL-92 standard quoted identifier
+     * (double quotes) or brackets for identifier escaping.
+     *
+     * @var bool
+     */
+    protected $_quoted_identifier = true;
+
+    /**
+     * Handle increment/decrement on text
+     *
+     * @var bool
+     */
+    public $castTextToInt = true;
+
+    /**
+     * Handle IDENTITY_INSERT property/
+     *
+     * @var bool
+     */
+    public $keyPermission = false;
+
+    /**
+     * Groups tables in FROM clauses if needed, so there is no confusion
+     * about operator precedence.
+     */
+    protected function _fromTables(): string
+    {
+        $from = [];
+
+        foreach ($this->QBFrom as $value) {
+            $from[] = $this->getFullName($value);
+        }
+
+        return implode(', ', $from);
+    }
+
+    /**
+     * Generates a platform-specific truncate string from the supplied data
+     *
+     * If the database does not support the truncate() command,
+     * then this method maps to 'DELETE FROM table'
+     */
+    protected function _truncate(string $table): string
+    {
+        return 'TRUNCATE TABLE ' . $this->getFullName($table);
+    }
+
+    /**
+     * Generates the JOIN portion of the query
+     *
+     * @return $this
+     */
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    {
+        if ($type !== '') {
+            $type = strtoupper(trim($type));
+
+            if (! in_array($type, $this->joinTypes, true)) {
+                $type = '';
+            } else {
+                $type .= ' ';
+            }
+        }
+
+        // Extract any aliases that might exist. We use this information
+        // in the protectIdentifiers to know whether to add a table prefix
+        $this->trackAliases($table);
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        if (! $this->hasOperator($cond)) {
+            $cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
+        } elseif ($escape === false) {
+            $cond = ' ON ' . $cond;
+        } else {
+            // Split multiple conditions
+            if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE)) {
+                $conditions = [];
+                $joints     = $joints[0];
+                array_unshift($joints, ['', 0]);
+
+                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
+                    $joints[$i][1] += strlen($joints[$i][0]); // offset
+                    $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
+                    $pos            = $joints[$i][1] - strlen($joints[$i][0]);
+                    $joints[$i]     = $joints[$i][0];
+                }
+
+                ksort($conditions);
+            } else {
+                $conditions = [$cond];
+                $joints     = [''];
+            }
+
+            $cond = ' ON ';
+
+            foreach ($conditions as $i => $condition) {
+                $operator = $this->getOperator($condition);
+
+                $cond .= $joints[$i];
+                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+            }
+        }
+
+        // Do we want to escape the table name?
+        if ($escape === true) {
+            $table = $this->db->protectIdentifiers($table, true, null, false);
+        }
+
+        // Assemble the JOIN statement
+        $this->QBJoin[] = $type . 'JOIN ' . $this->getFullName($table) . $cond;
+
+        return $this;
+    }
+
+    /**
+     * Generates a platform-specific insert string from the supplied data
+     *
+     * @todo implement check for this instead static $insertKeyPermission
+     */
+    protected function _insert(string $table, array $keys, array $unescapedKeys): string
+    {
+        $fullTableName = $this->getFullName($table);
+
+        // insert statement
+        $statement = 'INSERT INTO ' . $fullTableName . ' (' . implode(',', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ')';
+
+        return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
+    }
+
+    /**
+     * Generates a platform-specific update string from the supplied data
+     */
+    protected function _update(string $table, array $values): string
+    {
+        $valstr = [];
+
+        foreach ($values as $key => $val) {
+            $valstr[] = $key . ' = ' . $val;
+        }
+
+        $fullTableName = $this->getFullName($table);
+
+        $statement = 'UPDATE ' . (empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ') . $fullTableName . ' SET '
+            . implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
+
+        return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
+    }
+
+    /**
+     * Increments a numeric column by the specified value.
+     *
+     * @return bool
+     */
+    public function increment(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        if ($this->castTextToInt) {
+            $values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) + {$value})"];
+        } else {
+            $values = [$column => "{$column} + {$value}"];
+        }
+        $sql = $this->_update($this->QBFrom[0], $values);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Decrements a numeric column by the specified value.
+     *
+     * @return bool
+     */
+    public function decrement(string $column, int $value = 1)
+    {
+        $column = $this->db->protectIdentifiers($column);
+
+        if ($this->castTextToInt) {
+            $values = [$column => "CONVERT(VARCHAR(MAX),CONVERT(INT,CONVERT(VARCHAR(MAX), {$column})) - {$value})"];
+        } else {
+            $values = [$column => "{$column} + {$value}"];
+        }
+        $sql = $this->_update($this->QBFrom[0], $values);
+
+        return $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Get full name of the table
+     */
+    private function getFullName(string $table): string
+    {
+        $alias = '';
+
+        if (strpos($table, ' ') !== false) {
+            $alias = explode(' ', $table);
+            $table = array_shift($alias);
+            $alias = ' ' . implode(' ', $alias);
+        }
+
+        if ($this->db->escapeChar === '"') {
+            return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias;
+        }
+
+        return '[' . $this->db->getDatabase() . '].[' . $this->db->schema . '].[' . str_replace('"', '', $table) . ']' . str_replace('"', '', $alias);
+    }
+
+    /**
+     * Add permision statements for index value inserts
+     */
+    private function addIdentity(string $fullTable, string $insert): string
+    {
+        return 'SET IDENTITY_INSERT ' . $fullTable . " ON\n" . $insert . "\nSET IDENTITY_INSERT " . $fullTable . ' OFF';
+    }
+
+    /**
+     * Local implementation of limit
+     */
+    protected function _limit(string $sql, bool $offsetIgnore = false): string
+    {
+        if (empty($this->QBOrderBy)) {
+            $sql .= ' ORDER BY (SELECT NULL) ';
+        }
+
+        if ($offsetIgnore) {
+            $sql .= ' OFFSET 0 ';
+        } else {
+            $sql .= is_int($this->QBOffset) ? ' OFFSET ' . $this->QBOffset : ' OFFSET 0 ';
+        }
+
+        return $sql . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY ';
+    }
+
+    /**
+     * Compiles a replace into string and runs the query
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function replace(?array $set = null)
+    {
+        if ($set !== null) {
+            $this->set($set);
+        }
+
+        if (empty($this->QBSet)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('You must use the "set" method to update an entry.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        $table = $this->QBFrom[0];
+
+        $sql = $this->_replace($table, array_keys($this->QBSet), array_values($this->QBSet));
+
+        $this->resetWrite();
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' ON');
+        $result = $this->db->query($sql, $this->binds, false);
+        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' OFF');
+
+        return $result;
+    }
+
+    /**
+     * Generates a platform-specific replace string from the supplied data
+     * on match delete and insert
+     */
+    protected function _replace(string $table, array $keys, array $values): string
+    {
+        // check whether the existing keys are part of the primary key.
+        // if so then use them for the "ON" part and exclude them from the $values and $keys
+        $pKeys     = $this->db->getIndexData($table);
+        $keyFields = [];
+
+        foreach ($pKeys as $key) {
+            if ($key->type === 'PRIMARY') {
+                $keyFields = array_merge($keyFields, $key->fields);
+            }
+
+            if ($key->type === 'UNIQUE') {
+                $keyFields = array_merge($keyFields, $key->fields);
+            }
+        }
+
+        // Get the unique field names
+        $escKeyFields = array_map(function (string $field): string {
+            return $this->db->protectIdentifiers($field);
+        }, array_values(array_unique($keyFields)));
+
+        // Get the binds
+        $binds = $this->binds;
+        array_walk($binds, static function (&$item) {
+            $item = $item[0];
+        });
+
+        // Get the common field and values from the keys data and index fields
+        $common = array_intersect($keys, $escKeyFields);
+        $bingo  = [];
+
+        foreach ($common as $v) {
+            $k = array_search($v, $escKeyFields, true);
+
+            $bingo[$keyFields[$k]] = $binds[trim($values[$k], ':')];
+        }
+
+        // Querying existing data
+        $builder = $this->db->table($table);
+
+        foreach ($bingo as $k => $v) {
+            $builder->where($k, $v);
+        }
+
+        $q = $builder->get()->getResult();
+
+        // Delete entries if we find them
+        if ($q !== []) {
+            $delete = $this->db->table($table);
+
+            foreach ($bingo as $k => $v) {
+                $delete->where($k, $v);
+            }
+
+            $delete->delete();
+        }
+
+        return sprintf('INSERT INTO %s (%s) VALUES (%s);', $this->getFullName($table), implode(',', $keys), implode(',', $values));
+    }
+
+    /**
+     * SELECT [MAX|MIN|AVG|SUM|COUNT]()
+     *
+     * Handle float return value
+     *
+     * @return BaseBuilder
+     */
+    protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
+    {
+        // int functions can be handled by parent
+        if ($type !== 'AVG') {
+            return parent::maxMinAvgSum($select, $alias, $type);
+        }
+
+        if ($select === '') {
+            throw DataException::forEmptyInputGiven('Select');
+        }
+
+        if (strpos($select, ',') !== false) {
+            throw DataException::forInvalidArgument('Column name not separated by comma');
+        }
+
+        if ($alias === '') {
+            $alias = $this->createAliasFromTable(trim($select));
+        }
+
+        $sql = $type . '( CAST( ' . $this->db->protectIdentifiers(trim($select)) . ' AS FLOAT ) ) AS ' . $this->db->escapeIdentifiers(trim($alias));
+
+        $this->QBSelect[]   = $sql;
+        $this->QBNoEscape[] = null;
+
+        return $this;
+    }
+
+    /**
+     * Delete statement
+     */
+    protected function _delete(string $table): string
+    {
+        return 'DELETE' . (empty($this->QBLimit) ? '' : ' TOP (' . $this->QBLimit . ') ') . ' FROM ' . $this->getFullName($table) . $this->compileWhereHaving('QBWhere');
+    }
+
+    /**
+     * Compiles a delete string and runs the query
+     *
+     * @param mixed $where
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
+    {
+        $table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
+
+        if ($where !== '') {
+            $this->where($where);
+        }
+
+        if (empty($this->QBWhere)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
+            }
+
+            return false; // @codeCoverageIgnore
+        }
+
+        if (! empty($limit)) {
+            $this->QBLimit = $limit;
+        }
+
+        $sql = $this->_delete($table);
+
+        if ($resetData) {
+            $this->resetWrite();
+        }
+
+        return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
+    }
+
+    /**
+     * Compile the SELECT statement
+     *
+     * Generates a query string based on which functions were used.
+     *
+     * @param bool $selectOverride
+     */
+    protected function compileSelect($selectOverride = false): string
+    {
+        // Write the "select" portion of the query
+        if ($selectOverride !== false) {
+            $sql = $selectOverride;
+        } else {
+            $sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+
+            // SQL Server can't work with select * if group by is specified
+            if (empty($this->QBSelect) && ! empty($this->QBGroupBy) && is_array($this->QBGroupBy)) {
+                foreach ($this->QBGroupBy as $field) {
+                    $this->QBSelect[] = is_array($field) ? $field['field'] : $field;
+                }
+            }
+
+            if (empty($this->QBSelect)) {
+                $sql .= '*';
+            } else {
+                // Cycle through the "select" portion of the query and prep each column name.
+                // The reason we protect identifiers here rather than in the select() function
+                // is because until the user calls the from() function we don't know if there are aliases
+                foreach ($this->QBSelect as $key => $val) {
+                    $noEscape             = $this->QBNoEscape[$key] ?? null;
+                    $this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
+                }
+
+                $sql .= implode(', ', $this->QBSelect);
+            }
+        }
+
+        // Write the "FROM" portion of the query
+        if (! empty($this->QBFrom)) {
+            $sql .= "\nFROM " . $this->_fromTables();
+        }
+
+        // Write the "JOIN" portion of the query
+        if (! empty($this->QBJoin)) {
+            $sql .= "\n" . implode("\n", $this->QBJoin);
+        }
+
+        $sql .= $this->compileWhereHaving('QBWhere')
+                . $this->compileGroupBy()
+                . $this->compileWhereHaving('QBHaving')
+                . $this->compileOrderBy(); // ORDER BY
+        // LIMIT
+        if ($this->QBLimit) {
+            $sql = $this->_limit($sql . "\n");
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Compiles the select statement based on the other functions called
+     * and runs the query
+     *
+     * @return ResultInterface
+     */
+    public function get(?int $limit = null, int $offset = 0, bool $reset = true)
+    {
+        if ($limit !== null) {
+            $this->limit($limit, $offset);
+        }
+
+        $result = $this->testMode ? $this->getCompiledSelect($reset) : $this->db->query($this->compileSelect(), $this->binds, false);
+
+        if ($reset) {
+            $this->resetSelect();
+
+            // Clear our binds so we don't eat up memory
+            $this->binds = [];
+        }
+
+        return $result;
+    }
 }
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 0e039a005669..f09a96d69213 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
@@ -21,585 +21,517 @@
  */
 class Connection extends BaseConnection
 {
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	public $DBDriver = 'SQLSRV';
-
-	/**
-	 * Database name
-	 *
-	 * @var string
-	 */
-	public $database;
-
-	/**
-	 * Scrollable flag
-	 *
-	 * Determines what cursor type to use when executing queries.
-	 *
-	 * FALSE or SQLSRV_CURSOR_FORWARD would increase performance,
-	 * but would disable num_rows() (and possibly insert_id())
-	 *
-	 * @var mixed
-	 */
-	public $scrollable;
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	public $escapeChar = '"';
-
-	/**
-	 * Database schema
-	 *
-	 * @var string
-	 */
-	public $schema = 'dbo';
-
-	/**
-	 * Quoted identifier flag
-	 *
-	 * Whether to use SQL-92 standard quoted identifier
-	 * (double quotes) or brackets for identifier escaping.
-	 *
-	 * @var boolean
-	 */
-	protected $_quoted_identifier = true;
-
-	/**
-	 * List of reserved identifiers
-	 *
-	 * Identifiers that must NOT be escaped.
-	 *
-	 * @var string[]
-	 */
-	protected $_reserved_identifiers = ['*'];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Class constructor
-	 *
-	 * @param  array $params
-	 * @return void
-	 */
-	public function __construct($params)
-	{
-		parent::__construct($params);
-
-		// This is only supported as of SQLSRV 3.0
-		if ($this->scrollable === null)
-		{
-			$this->scrollable = defined('SQLSRV_CURSOR_CLIENT_BUFFERED') ? SQLSRV_CURSOR_CLIENT_BUFFERED : false;
-		}
-	}
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param boolean $persistent
-	 *
-	 * @throws DatabaseException
-	 *
-	 * @return mixed
-	 */
-	public function connect(bool $persistent = false)
-	{
-		$charset = in_array(strtolower($this->charset), ['utf-8', 'utf8'], true) ? 'UTF-8' : SQLSRV_ENC_CHAR;
-
-		$connection = [
-			'UID'                  => empty($this->username) ? '' : $this->username,
-			'PWD'                  => empty($this->password) ? '' : $this->password,
-			'Database'             => $this->database,
-			'ConnectionPooling'    => $persistent ? 1 : 0,
-			'CharacterSet'         => $charset,
-			'Encrypt'              => $this->encrypt === true ? 1 : 0,
-			'ReturnDatesAsStrings' => 1,
-		];
-
-		// If the username and password are both empty, assume this is a
-		// 'Windows Authentication Mode' connection.
-		if (empty($connection['UID']) && empty($connection['PWD']))
-		{
-			unset($connection['UID'], $connection['PWD']);
-		}
-
-		sqlsrv_configure('WarningsReturnAsErrors', 0);
-		$this->connID = sqlsrv_connect($this->hostname, $connection);
-
-		if ($this->connID !== false)
-		{
-			// Determine how identifiers are escaped
-			$query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi');
-			$query = $query->getResultObject();
-
-			$this->_quoted_identifier = empty($query) ? false : (bool) $query[0]->qi;
-			$this->escapeChar         = ($this->_quoted_identifier) ? '"' : ['[', ']'];
-
-			return $this->connID;
-		}
-
-		$errors = [];
-
-		foreach (sqlsrv_errors(SQLSRV_ERR_ERRORS) as $error)
-		{
-			$errors[] = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
-		}
-
-		throw new DatabaseException(implode("\n", $errors));
-	}
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return void
-	 */
-	public function reconnect()
-	{
-		$this->close();
-		$this->initialize();
-	}
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	protected function _close()
-	{
-		sqlsrv_close($this->connID);
-	}
-
-	/**
-	 * Platform-dependant string escape
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		return str_replace("'", "''", remove_invisible_characters($str, false));
-	}
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer
-	 */
-	public function insertID(): int
-	{
-		return $this->query('SELECT SCOPE_IDENTITY() AS insert_id')->getRow()->insert_id ?? 0;
-	}
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $prefixLimit
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $prefixLimit = false): string
-	{
-		$sql = 'SELECT [TABLE_NAME] AS "name"'
-				. ' FROM [INFORMATION_SCHEMA].[TABLES] '
-				. ' WHERE '
-				. " [TABLE_SCHEMA] = '" . $this->schema . "'    ";
-
-		if ($prefixLimit === true && $this->DBPrefix !== '')
-		{
-			$sql .= " AND [TABLE_NAME] LIKE '" . $this->escapeLikeString($this->DBPrefix) . "%' "
-					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		return 'SELECT [COLUMN_NAME] '
-				. ' FROM [INFORMATION_SCHEMA].[COLUMNS]'
-				. ' WHERE  [TABLE_NAME] = ' . $this->escape($this->DBPrefix . $table)
-				. ' AND [TABLE_SCHEMA] = ' . $this->escape($this->schema);
-	}
-
-	/**
-	 * Returns an array of objects with index data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _indexData(string $table): array
-	{
-		$sql = 'EXEC sp_helpindex ' . $this->escape($table);
-
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj       = new stdClass();
-			$obj->name = $row->index_name;
-
-			$_fields     = explode(',', trim($row->index_keys));
-			$obj->fields = array_map(function ($v) {
-				return trim($v);
-			}, $_fields);
-
-			if (strpos($row->index_description, 'primary key located on') !== false)
-			{
-				$obj->type = 'PRIMARY';
-			}
-			else
-			{
-				$obj->type = (strpos($row->index_description, 'nonclustered, unique') !== false) ? 'UNIQUE' : 'INDEX';
-			}
-
-			$retVal[$obj->name] = $obj;
-		}
-
-		return $retVal;
-	}
-
-	/**
-	 * Returns an array of objects with Foreign key data
-	 * referenced_object_id  parent_object_id
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _foreignKeyData(string $table): array
-	{
-		$sql = 'SELECT '
-				. 'f.name as constraint_name, '
-				. 'OBJECT_NAME (f.parent_object_id) as table_name, '
-				. 'COL_NAME(fc.parent_object_id,fc.parent_column_id) column_name, '
-				. 'OBJECT_NAME(f.referenced_object_id) foreign_table_name, '
-				. 'COL_NAME(fc.referenced_object_id,fc.referenced_column_id) foreign_column_name '
-				. 'FROM  '
-				. 'sys.foreign_keys AS f '
-				. 'INNER JOIN  '
-				. 'sys.foreign_key_columns AS fc  '
-				. 'ON f.OBJECT_ID = fc.constraint_object_id '
-				. 'INNER JOIN  '
-				. 'sys.tables t  '
-				. 'ON t.OBJECT_ID = fc.referenced_object_id '
-				. 'WHERE  '
-				. 'OBJECT_NAME (f.parent_object_id) = ' . $this->escape($table);
-
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj                      = new stdClass();
-			$obj->constraint_name     = $row->constraint_name;
-			$obj->table_name          = $row->table_name;
-			$obj->column_name         = $row->column_name;
-			$obj->foreign_table_name  = $row->foreign_table_name;
-			$obj->foreign_column_name = $row->foreign_column_name;
-			$retVal[]                 = $obj;
-		}
-
-		return $retVal;
-	}
-
-	/**
-	 * Disables foreign key checks temporarily.
-	 *
-	 * @return string
-	 */
-	protected function _disableForeignKeyChecks()
-	{
-		return 'EXEC sp_MSforeachtable "ALTER TABLE ? NOCHECK CONSTRAINT ALL"';
-	}
-
-	/**
-	 * Enables foreign key checks temporarily.
-	 *
-	 * @return string
-	 */
-	protected function _enableForeignKeyChecks()
-	{
-		return 'EXEC sp_MSforeachtable "ALTER TABLE ? WITH CHECK CHECK CONSTRAINT ALL"';
-	}
-
-	/**
-	 * Returns an array of objects with field data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _fieldData(string $table): array
-	{
-		$sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, COLUMN_DEFAULT
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    public $DBDriver = 'SQLSRV';
+
+    /**
+     * Database name
+     *
+     * @var string
+     */
+    public $database;
+
+    /**
+     * Scrollable flag
+     *
+     * Determines what cursor type to use when executing queries.
+     *
+     * FALSE or SQLSRV_CURSOR_FORWARD would increase performance,
+     * but would disable num_rows() (and possibly insert_id())
+     *
+     * @var mixed
+     */
+    public $scrollable;
+
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    public $escapeChar = '"';
+
+    /**
+     * Database schema
+     *
+     * @var string
+     */
+    public $schema = 'dbo';
+
+    /**
+     * Quoted identifier flag
+     *
+     * Whether to use SQL-92 standard quoted identifier
+     * (double quotes) or brackets for identifier escaping.
+     *
+     * @var bool
+     */
+    protected $_quoted_identifier = true;
+
+    /**
+     * List of reserved identifiers
+     *
+     * Identifiers that must NOT be escaped.
+     *
+     * @var string[]
+     */
+    protected $_reserved_identifiers = ['*'];
+
+    /**
+     * Class constructor
+     */
+    public function __construct(array $params)
+    {
+        parent::__construct($params);
+
+        // This is only supported as of SQLSRV 3.0
+        if ($this->scrollable === null) {
+            $this->scrollable = defined('SQLSRV_CURSOR_CLIENT_BUFFERED') ? SQLSRV_CURSOR_CLIENT_BUFFERED : false;
+        }
+    }
+
+    /**
+     * Connect to the database.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        $charset = in_array(strtolower($this->charset), ['utf-8', 'utf8'], true) ? 'UTF-8' : SQLSRV_ENC_CHAR;
+
+        $connection = [
+            'UID'                  => empty($this->username) ? '' : $this->username,
+            'PWD'                  => empty($this->password) ? '' : $this->password,
+            'Database'             => $this->database,
+            'ConnectionPooling'    => $persistent ? 1 : 0,
+            'CharacterSet'         => $charset,
+            'Encrypt'              => $this->encrypt === true ? 1 : 0,
+            'ReturnDatesAsStrings' => 1,
+        ];
+
+        // If the username and password are both empty, assume this is a
+        // 'Windows Authentication Mode' connection.
+        if (empty($connection['UID']) && empty($connection['PWD'])) {
+            unset($connection['UID'], $connection['PWD']);
+        }
+
+        sqlsrv_configure('WarningsReturnAsErrors', 0);
+        $this->connID = sqlsrv_connect($this->hostname, $connection);
+
+        if ($this->connID !== false) {
+            // Determine how identifiers are escaped
+            $query = $this->query('SELECT CASE WHEN (@@OPTIONS | 256) = @@OPTIONS THEN 1 ELSE 0 END AS qi');
+            $query = $query->getResultObject();
+
+            $this->_quoted_identifier = empty($query) ? false : (bool) $query[0]->qi;
+            $this->escapeChar         = ($this->_quoted_identifier) ? '"' : ['[', ']'];
+
+            return $this->connID;
+        }
+
+        $errors = [];
+
+        foreach (sqlsrv_errors(SQLSRV_ERR_ERRORS) as $error) {
+            $errors[] = preg_replace('/(\[.+\]\[.+\](?:\[.+\])?)(.+)/', '$2', $error['message']);
+        }
+
+        throw new DatabaseException(implode("\n", $errors));
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     */
+    public function reconnect()
+    {
+        $this->close();
+        $this->initialize();
+    }
+
+    /**
+     * Close the database connection.
+     */
+    protected function _close()
+    {
+        sqlsrv_close($this->connID);
+    }
+
+    /**
+     * Platform-dependant string escape
+     */
+    protected function _escapeString(string $str): string
+    {
+        return str_replace("'", "''", remove_invisible_characters($str, false));
+    }
+
+    /**
+     * Insert ID
+     */
+    public function insertID(): int
+    {
+        return $this->query('SELECT SCOPE_IDENTITY() AS insert_id')->getRow()->insert_id ?? 0;
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     */
+    protected function _listTables(bool $prefixLimit = false): string
+    {
+        $sql = 'SELECT [TABLE_NAME] AS "name"'
+            . ' FROM [INFORMATION_SCHEMA].[TABLES] '
+            . ' WHERE '
+            . " [TABLE_SCHEMA] = '" . $this->schema . "'    ";
+
+        if ($prefixLimit === true && $this->DBPrefix !== '') {
+            $sql .= " AND [TABLE_NAME] LIKE '" . $this->escapeLikeString($this->DBPrefix) . "%' "
+                . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        return 'SELECT [COLUMN_NAME] '
+            . ' FROM [INFORMATION_SCHEMA].[COLUMNS]'
+            . ' WHERE  [TABLE_NAME] = ' . $this->escape($this->DBPrefix . $table)
+            . ' AND [TABLE_SCHEMA] = ' . $this->escape($this->schema);
+    }
+
+    /**
+     * Returns an array of objects with index data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _indexData(string $table): array
+    {
+        $sql = 'EXEC sp_helpindex ' . $this->escape($table);
+
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetIndexData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj       = new stdClass();
+            $obj->name = $row->index_name;
+
+            $_fields     = explode(',', trim($row->index_keys));
+            $obj->fields = array_map(static function ($v) {
+                return trim($v);
+            }, $_fields);
+
+            if (strpos($row->index_description, 'primary key located on') !== false) {
+                $obj->type = 'PRIMARY';
+            } else {
+                $obj->type = (strpos($row->index_description, 'nonclustered, unique') !== false) ? 'UNIQUE' : 'INDEX';
+            }
+
+            $retVal[$obj->name] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with Foreign key data
+     * referenced_object_id  parent_object_id
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _foreignKeyData(string $table): array
+    {
+        $sql = 'SELECT '
+            . 'f.name as constraint_name, '
+            . 'OBJECT_NAME (f.parent_object_id) as table_name, '
+            . 'COL_NAME(fc.parent_object_id,fc.parent_column_id) column_name, '
+            . 'OBJECT_NAME(f.referenced_object_id) foreign_table_name, '
+            . 'COL_NAME(fc.referenced_object_id,fc.referenced_column_id) foreign_column_name '
+            . 'FROM  '
+            . 'sys.foreign_keys AS f '
+            . 'INNER JOIN  '
+            . 'sys.foreign_key_columns AS fc  '
+            . 'ON f.OBJECT_ID = fc.constraint_object_id '
+            . 'INNER JOIN  '
+            . 'sys.tables t  '
+            . 'ON t.OBJECT_ID = fc.referenced_object_id '
+            . 'WHERE  '
+            . 'OBJECT_NAME (f.parent_object_id) = ' . $this->escape($table);
+
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+        }
+
+        $query  = $query->getResultObject();
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj = new stdClass();
+
+            $obj->constraint_name     = $row->constraint_name;
+            $obj->table_name          = $row->table_name;
+            $obj->column_name         = $row->column_name;
+            $obj->foreign_table_name  = $row->foreign_table_name;
+            $obj->foreign_column_name = $row->foreign_column_name;
+
+            $retVal[] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Disables foreign key checks temporarily.
+     *
+     * @return string
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return 'EXEC sp_MSforeachtable "ALTER TABLE ? NOCHECK CONSTRAINT ALL"';
+    }
+
+    /**
+     * Enables foreign key checks temporarily.
+     *
+     * @return string
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return 'EXEC sp_MSforeachtable "ALTER TABLE ? WITH CHECK CHECK CONSTRAINT ALL"';
+    }
+
+    /**
+     * Returns an array of objects with field data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _fieldData(string $table): array
+    {
+        $sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, COLUMN_DEFAULT
 			FROM INFORMATION_SCHEMA.COLUMNS
 			WHERE TABLE_NAME= ' . $this->escape(($table));
 
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetFieldData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		for ($i = 0, $c = count($query); $i < $c; $i++)
-		{
-			$retVal[$i]             = new stdClass();
-			$retVal[$i]->name       = $query[$i]->COLUMN_NAME;
-			$retVal[$i]->type       = $query[$i]->DATA_TYPE;
-			$retVal[$i]->default    = $query[$i]->COLUMN_DEFAULT;
-			$retVal[$i]->max_length = $query[$i]->CHARACTER_MAXIMUM_LENGTH > 0 ? $query[$i]->CHARACTER_MAXIMUM_LENGTH : $query[$i]->NUMERIC_PRECISION;
-		}
-
-		return $retVal;
-	}
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		return (bool) sqlsrv_begin_transaction($this->connID);
-	}
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		return (bool) sqlsrv_commit($this->connID);
-	}
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		return (bool) sqlsrv_rollback($this->connID);
-	}
-
-	/**
-	 * Returns the last error code and message.
-	 * Must return this format: ['code' => string|int, 'message' => string]
-	 * intval(code) === 0 means "no error".
-	 *
-	 * @return array<string,string|int>
-	 */
-	public function error(): array
-	{
-		$error = [
-			'code'    => '00000',
-			'message' => '',
-		];
-
-		$sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-
-		if (! is_array($sqlsrvErrors))
-		{
-			return $error;
-		}
-
-		$sqlsrvError = array_shift($sqlsrvErrors);
-		if (isset($sqlsrvError['SQLSTATE']))
-		{
-			$error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
-		}
-		elseif (isset($sqlsrvError['code']))
-		{
-			$error['code'] = $sqlsrvError['code'];
-		}
-
-		if (isset($sqlsrvError['message']))
-		{
-			$error['message'] = $sqlsrvError['message'];
-		}
-
-		return $error;
-	}
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return sqlsrv_rows_affected($this->resultID);
-	}
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string|null $databaseName
-	 *
-	 * @return mixed
-	 */
-	public function setDatabase(string $databaseName = null)
-	{
-		if (empty($databaseName))
-		{
-			$databaseName = $this->database;
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		if ($this->execute('USE ' . $this->_escapeString($databaseName)))
-		{
-			$this->database  = $databaseName;
-			$this->dataCache = [];
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	public function execute(string $sql)
-	{
-		$stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
-			sqlsrv_query($this->connID, $sql) :
-			sqlsrv_query($this->connID, $sql, [], ['Scrollable' => $this->scrollable]);
-
-		if ($stmt === false)
-		{
-			$error = $this->error();
-
-			log_message('error', $error['message']);
-			if ($this->DBDebug)
-			{
-				throw new Exception($error['message']);
-			}
-		}
-
-		return $stmt;
-	}
-
-	/**
-	 * Returns the last error encountered by this connection.
-	 *
-	 * @return mixed
-	 */
-	public function getError()
-	{
-		$error = [
-			'code'    => '00000',
-			'message' => '',
-		];
-
-		$sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
-
-		if (! is_array($sqlsrvErrors))
-		{
-			return $error;
-		}
-
-		$sqlsrvError = array_shift($sqlsrvErrors);
-		if (isset($sqlsrvError['SQLSTATE']))
-		{
-			$error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
-		}
-		elseif (isset($sqlsrvError['code']))
-		{
-			$error['code'] = $sqlsrvError['code'];
-		}
-
-		if (isset($sqlsrvError['message']))
-		{
-			$error['message'] = $sqlsrvError['message'];
-		}
-
-		return $error;
-	}
-
-	/**
-	 * The name of the platform in use (MySQLi, mssql, etc)
-	 *
-	 * @return string
-	 */
-	public function getPlatform(): string
-	{
-		return $this->DBDriver;
-	}
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		if (isset($this->dataCache['version']))
-		{
-			return $this->dataCache['version'];
-		}
-
-		if (! $this->connID || empty($info = sqlsrv_server_info($this->connID)))
-		{
-			$this->initialize();
-		}
-
-		return isset($info['SQLServerVersion']) ? $this->dataCache['version'] = $info['SQLServerVersion'] : false;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Determines if a query is a "write" type.
-	 *
-	 * Overrides BaseConnection::isWriteType, adding additional read query types.
-	 *
-	 * @param  string $sql An SQL query string
-	 * @return boolean
-	 */
-	public function isWriteType($sql): bool
-	{
-		if (preg_match('/^\s*"?(EXEC\s*sp_rename)\s/i', $sql))
-		{
-			return true;
-		}
-
-		return parent::isWriteType($sql);
-	}
-
-	// --------------------------------------------------------------------
-
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetFieldData'));
+        }
+
+        $query  = $query->getResultObject();
+        $retVal = [];
+
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
+            $retVal[$i] = new stdClass();
+
+            $retVal[$i]->name    = $query[$i]->COLUMN_NAME;
+            $retVal[$i]->type    = $query[$i]->DATA_TYPE;
+            $retVal[$i]->default = $query[$i]->COLUMN_DEFAULT;
+
+            $retVal[$i]->max_length = $query[$i]->CHARACTER_MAXIMUM_LENGTH > 0
+                ? $query[$i]->CHARACTER_MAXIMUM_LENGTH
+                : $query[$i]->NUMERIC_PRECISION;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        return sqlsrv_begin_transaction($this->connID);
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        return sqlsrv_commit($this->connID);
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        return sqlsrv_rollback($this->connID);
+    }
+
+    /**
+     * Returns the last error code and message.
+     * Must return this format: ['code' => string|int, 'message' => string]
+     * intval(code) === 0 means "no error".
+     *
+     * @return array<string, int|string>
+     */
+    public function error(): array
+    {
+        $error = [
+            'code'    => '00000',
+            'message' => '',
+        ];
+
+        $sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+
+        if (! is_array($sqlsrvErrors)) {
+            return $error;
+        }
+
+        $sqlsrvError = array_shift($sqlsrvErrors);
+        if (isset($sqlsrvError['SQLSTATE'])) {
+            $error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
+        } elseif (isset($sqlsrvError['code'])) {
+            $error['code'] = $sqlsrvError['code'];
+        }
+
+        if (isset($sqlsrvError['message'])) {
+            $error['message'] = $sqlsrvError['message'];
+        }
+
+        return $error;
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return sqlsrv_rows_affected($this->resultID);
+    }
+
+    /**
+     * Select a specific database table to use.
+     *
+     * @return mixed
+     */
+    public function setDatabase(?string $databaseName = null)
+    {
+        if (empty($databaseName)) {
+            $databaseName = $this->database;
+        }
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        if ($this->execute('USE ' . $this->_escapeString($databaseName))) {
+            $this->database  = $databaseName;
+            $this->dataCache = [];
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return mixed
+     */
+    protected function execute(string $sql)
+    {
+        $stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
+            sqlsrv_query($this->connID, $sql) :
+            sqlsrv_query($this->connID, $sql, [], ['Scrollable' => $this->scrollable]);
+
+        if ($stmt === false) {
+            $error = $this->error();
+
+            log_message('error', $error['message']);
+            if ($this->DBDebug) {
+                throw new Exception($error['message']);
+            }
+        }
+
+        return $stmt;
+    }
+
+    /**
+     * Returns the last error encountered by this connection.
+     *
+     * @return mixed
+     */
+    public function getError()
+    {
+        $error = [
+            'code'    => '00000',
+            'message' => '',
+        ];
+
+        $sqlsrvErrors = sqlsrv_errors(SQLSRV_ERR_ERRORS);
+
+        if (! is_array($sqlsrvErrors)) {
+            return $error;
+        }
+
+        $sqlsrvError = array_shift($sqlsrvErrors);
+        if (isset($sqlsrvError['SQLSTATE'])) {
+            $error['code'] = isset($sqlsrvError['code']) ? $sqlsrvError['SQLSTATE'] . '/' . $sqlsrvError['code'] : $sqlsrvError['SQLSTATE'];
+        } elseif (isset($sqlsrvError['code'])) {
+            $error['code'] = $sqlsrvError['code'];
+        }
+
+        if (isset($sqlsrvError['message'])) {
+            $error['message'] = $sqlsrvError['message'];
+        }
+
+        return $error;
+    }
+
+    /**
+     * The name of the platform in use (MySQLi, mssql, etc)
+     */
+    public function getPlatform(): string
+    {
+        return $this->DBDriver;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        if (isset($this->dataCache['version'])) {
+            return $this->dataCache['version'];
+        }
+
+        if (! $this->connID || empty($info = sqlsrv_server_info($this->connID))) {
+            $this->initialize();
+        }
+
+        return isset($info['SQLServerVersion']) ? $this->dataCache['version'] = $info['SQLServerVersion'] : false;
+    }
+
+    /**
+     * Determines if a query is a "write" type.
+     *
+     * Overrides BaseConnection::isWriteType, adding additional read query types.
+     *
+     * @param mixed $sql
+     */
+    public function isWriteType($sql): bool
+    {
+        if (preg_match('/^\s*"?(EXEC\s*sp_rename)\s/i', $sql)) {
+            return true;
+        }
+
+        return parent::isWriteType($sql);
+    }
 }
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 09f9a14b3d7d..43131698703f 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
@@ -18,393 +18,317 @@
  */
 class Forge extends BaseForge
 {
-	/**
-	 * DROP CONSTRAINT statement
-	 *
-	 * @var string
-	 */
-	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
-
-	/**
-	 * CREATE DATABASE IF statement
-	 *
-	 * @todo missing charset, collat & check for existent
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseIfStr = "DECLARE @DBName VARCHAR(255) = '%s'\nDECLARE @SQL VARCHAR(max) = 'IF DB_ID( ''' + @DBName + ''' ) IS NULL CREATE DATABASE ' + @DBName\nEXEC( @SQL )";
-
-	/**
-	 * CREATE DATABASE IF statement
-	 *
-	 * @todo missing charset & collat
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseStr = 'CREATE DATABASE %s ';
-
-	/**
-	 * CHECK DATABASE EXIST statement
-	 *
-	 * @var string
-	 */
-	protected $checkDatabaseExistStr = 'IF DB_ID( %s ) IS NOT NULL SELECT 1';
-
-	/**
-	 * RENAME TABLE statement
-	 *
-	 * While the below statement would work, it returns an error.
-	 * Also MS recommends dropping and dropping and re-creating the table.
-	 *
-	 * @see https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-rename-transact-sql?view=sql-server-2017
-	 * 'EXEC sp_rename %s , %s ;'
-	 *
-	 * @var string
-	 */
-	protected $renameTableStr = 'EXEC sp_rename %s , %s ;';
-
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var array
-	 */
-	protected $unsigned = [
-		'TINYINT'  => 'SMALLINT',
-		'SMALLINT' => 'INT',
-		'INT'      => 'BIGINT',
-		'REAL'     => 'FLOAT',
-	];
-
-	/**
-	 * CREATE TABLE IF statement
-	 *
-	 * @var string
-	 */
-	protected $createTableIfStr = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
-
-	/**
-	 * CREATE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $createTableStr = "%s %s (%s\n) ";
-
-	/**
-	 * DROP TABLE IF statement
-	 *
-	 * @var string
-	 */
-	protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * CREATE TABLE attributes
-	 *
-	 * @param  array $attributes Associative array of table attributes
-	 * @return string
-	 */
-	protected function _createTableAttributes(array $attributes): string
-	{
-		return '';
-	}
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param string $alterType ALTER type
-	 * @param string $table     Table name
-	 * @param mixed  $field     Column definition
-	 *
-	 * @return string|string[]|false
-	 */
-	protected function _alterTable(string $alterType, string $table, $field)
-	{
-		if ($alterType === 'ADD')
-		{
-			return parent::_alterTable($alterType, $table, $field);
-		}
-
-		// Handle DROP here
-		if ($alterType === 'DROP')
-		{
-			// check if fields are part of any indexes
-			$indexData = $this->db->getIndexData($table);
-
-			foreach ($indexData as $index)
-			{
-				if (is_string($field))
-				{
-					$field = explode(',', $field);
-				}
-
-				$fld = array_intersect($field, $index->fields);
-
-				// Drop index if field is part of an index
-				if (! empty($fld))
-				{
-					$this->_dropIndex($table, $index);
-				}
-			}
-
-			$sql = 'ALTER TABLE [' . $table . '] DROP ';
-
-			$fields = array_map(function ($item) {
-				return 'COLUMN [' . trim($item) . ']';
-			}, (array) $field);
-
-			return $sql .= implode(',', $fields);
-		}
-
-		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-
-		$sqls = [];
-		foreach ($field as $data)
-		{
-			if ($data['_literal'] !== false)
-			{
-				return false;
-			}
-
-			if (isset($data['type']))
-			{
-				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-						. " {$data['type']}{$data['length']}";
-			}
-
-			if (! empty($data['default']))
-			{
-				$sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($data['name']) . '_def'
-						. " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
-			}
-
-			if (isset($data['null']))
-			{
-				$sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-						. ($data['null'] === true ? ' DROP' : '') . " {$data['type']}{$data['length']} NOT NULL";
-			}
-
-			if (! empty($data['comment']))
-			{
-				$sqls[] = 'EXEC sys.sp_addextendedproperty '
-						. "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
-						. "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
-						. "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
-						. "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
-			}
-
-			if (! empty($data['new_name']))
-			{
-				// EXEC sp_rename '[dbo].[db_misc].[value]', 'valueasdasd', 'COLUMN';
-				$sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
-			}
-		}
-
-		return $sqls;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop index for table
-	 *
-	 * @param string $table
-	 * @param object $indexData
-	 *
-	 * @return mixed
-	 */
-	protected function _dropIndex(string $table, object $indexData)
-	{
-		if ($indexData->type === 'PRIMARY')
-		{
-			$sql = 'ALTER TABLE [' . $this->db->schema . '].[' . $table . '] DROP [' . $indexData->name . ']';
-		}
-		else
-		{
-			$sql = 'DROP INDEX [' . $indexData->name . '] ON [' . $this->db->schema . '].[' . $table . ']';
-		}
-
-		return $this->db->simpleQuery($sql);
-	}
-
-	/**
-	 * Process column
-	 *
-	 * @param  array $field
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
-		return $this->db->escapeIdentifiers($field['name'])
-				. (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
-				. ' ' . $field['type'] . $field['length']
-				. $field['default']
-				. $field['null']
-				. $field['auto_increment']
-				. '' // (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
-				. $field['unique'];
-	}
-
-	/**
-	 * Process foreign keys
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return string
-	 */
-	protected function _processForeignKeys(string $table): string
-	{
-		$sql = '';
-
-		$allowActions = [
-			'CASCADE',
-			'SET NULL',
-			'NO ACTION',
-			'RESTRICT',
-			'SET DEFAULT',
-		];
-
-		if ($this->foreignKeys !== [])
-		{
-			foreach ($this->foreignKeys as $field => $fkey)
-			{
-				$nameIndex = $table . '_' . $field . '_foreign';
-
-				$sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-						. ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
-						. ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
-
-				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true))
-				{
-					$sql .= ' ON DELETE ' . $fkey['onDelete'];
-				}
-
-				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true))
-				{
-					$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-				}
-			}
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * Process primary keys
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return string
-	 */
-	protected function _processPrimaryKeys(string $table): string
-	{
-		for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++)
-		{
-			if (! isset($this->fields[$this->primaryKeys[$i]]))
-			{
-				unset($this->primaryKeys[$i]);
-			}
-		}
-
-		if ($this->primaryKeys !== [])
-		{
-			$sql = ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
-					. ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
-		}
-
-		return $sql ?? '';
-	}
-
-	/**
-	 * Field attribute TYPE
-	 *
-	 * Performs a data type mapping between different databases.
-	 *
-	 * @param array $attributes
-	 *
-	 * @return void
-	 */
-	protected function _attributeType(array &$attributes)
-	{
-		// Reset field lengths for data types that don't support it
-		if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false)
-		{
-			$attributes['CONSTRAINT'] = null;
-		}
-
-		switch (strtoupper($attributes['TYPE']))
-		{
-			case 'MEDIUMINT':
-				$attributes['TYPE']     = 'INTEGER';
-				$attributes['UNSIGNED'] = false;
-				break;
-			case 'INTEGER':
-				$attributes['TYPE'] = 'INT';
-
-				break;
-			case 'ENUM':
-				$attributes['TYPE']       = 'TEXT';
-				$attributes['CONSTRAINT'] = null;
-
-				break;
-			/* case 'DATETIME':
-			  $attributes['TYPE'] = 'TIMESTAMP';
-			  break; */
-			case 'TIMESTAMP':
-				$attributes['TYPE'] = 'DATETIME';
-				break;
-			default:
-				break;
-		}
-	}
-
-	/**
-	 * Field attribute AUTO_INCREMENT
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return void
-	 */
-	protected function _attributeAutoIncrement(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false)
-		{
-			$field['auto_increment'] = ' IDENTITY(1,1)';
-		}
-	}
-
-	/**
-	 * Drop Table
-	 *
-	 * Generates a platform-specific DROP TABLE string
-	 *
-	 * @todo Support for cascade
-	 *
-	 * @param string  $table    Table name
-	 * @param boolean $ifExists Whether to add an IF EXISTS condition
-	 * @param boolean $cascade
-	 *
-	 * @return string
-	 */
-	protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
-	{
-		$sql = 'DROP TABLE';
-
-		if ($ifExists)
-		{
-			$sql .= ' IF EXISTS ';
-		}
-
-		$table = ' [' . $this->db->database . '].[' . $this->db->schema . '].[' . $table . '] ';
-
-		$sql .= $table;
-
-		if ($cascade)
-		{
-			$sql .= '';
-		}
-
-		return $sql;
-	}
+    /**
+     * DROP CONSTRAINT statement
+     *
+     * @var string
+     */
+    protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+
+    /**
+     * CREATE DATABASE IF statement
+     *
+     * @todo missing charset, collat & check for existent
+     *
+     * @var string
+     */
+    protected $createDatabaseIfStr = "DECLARE @DBName VARCHAR(255) = '%s'\nDECLARE @SQL VARCHAR(max) = 'IF DB_ID( ''' + @DBName + ''' ) IS NULL CREATE DATABASE ' + @DBName\nEXEC( @SQL )";
+
+    /**
+     * CREATE DATABASE IF statement
+     *
+     * @todo missing charset & collat
+     *
+     * @var string
+     */
+    protected $createDatabaseStr = 'CREATE DATABASE %s ';
+
+    /**
+     * CHECK DATABASE EXIST statement
+     *
+     * @var string
+     */
+    protected $checkDatabaseExistStr = 'IF DB_ID( %s ) IS NOT NULL SELECT 1';
+
+    /**
+     * RENAME TABLE statement
+     *
+     * While the below statement would work, it returns an error.
+     * Also MS recommends dropping and dropping and re-creating the table.
+     *
+     * @see https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-rename-transact-sql?view=sql-server-2017
+     * 'EXEC sp_rename %s , %s ;'
+     *
+     * @var string
+     */
+    protected $renameTableStr = 'EXEC sp_rename %s , %s ;';
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array
+     */
+    protected $unsigned = [
+        'TINYINT'  => 'SMALLINT',
+        'SMALLINT' => 'INT',
+        'INT'      => 'BIGINT',
+        'REAL'     => 'FLOAT',
+    ];
+
+    /**
+     * CREATE TABLE IF statement
+     *
+     * @var string
+     */
+    protected $createTableIfStr = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
+
+    /**
+     * CREATE TABLE statement
+     *
+     * @var string
+     */
+    protected $createTableStr = "%s %s (%s\n) ";
+
+    /**
+     * DROP TABLE IF statement
+     *
+     * @var string
+     */
+    protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
+
+    /**
+     * CREATE TABLE attributes
+     */
+    protected function _createTableAttributes(array $attributes): string
+    {
+        return '';
+    }
+
+    /**
+     * @param mixed $field
+     *
+     * @return false|string|string[]
+     */
+    protected function _alterTable(string $alterType, string $table, $field)
+    {
+        if ($alterType === 'ADD') {
+            return parent::_alterTable($alterType, $table, $field);
+        }
+
+        // Handle DROP here
+        if ($alterType === 'DROP') {
+            // check if fields are part of any indexes
+            $indexData = $this->db->getIndexData($table);
+
+            foreach ($indexData as $index) {
+                if (is_string($field)) {
+                    $field = explode(',', $field);
+                }
+
+                $fld = array_intersect($field, $index->fields);
+
+                // Drop index if field is part of an index
+                if (! empty($fld)) {
+                    $this->_dropIndex($table, $index);
+                }
+            }
+
+            $sql = 'ALTER TABLE [' . $table . '] DROP ';
+
+            $fields = array_map(static function ($item) {
+                return 'COLUMN [' . trim($item) . ']';
+            }, (array) $field);
+
+            return $sql . implode(',', $fields);
+        }
+
+        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+
+        $sqls = [];
+
+        foreach ($field as $data) {
+            if ($data['_literal'] !== false) {
+                return false;
+            }
+
+            if (isset($data['type'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+                    . " {$data['type']}{$data['length']}";
+            }
+
+            if (! empty($data['default'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($data['name']) . '_def'
+                    . " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
+            }
+
+            if (isset($data['null'])) {
+                $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
+                    . ($data['null'] === true ? ' DROP' : '') . " {$data['type']}{$data['length']} NOT NULL";
+            }
+
+            if (! empty($data['comment'])) {
+                $sqls[] = 'EXEC sys.sp_addextendedproperty '
+                    . "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
+                    . "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
+                    . "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
+                    . "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
+            }
+
+            if (! empty($data['new_name'])) {
+                $sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
+            }
+        }
+
+        return $sqls;
+    }
+
+    /**
+     * Drop index for table
+     *
+     * @return mixed
+     */
+    protected function _dropIndex(string $table, object $indexData)
+    {
+        if ($indexData->type === 'PRIMARY') {
+            $sql = 'ALTER TABLE [' . $this->db->schema . '].[' . $table . '] DROP [' . $indexData->name . ']';
+        } else {
+            $sql = 'DROP INDEX [' . $indexData->name . '] ON [' . $this->db->schema . '].[' . $table . ']';
+        }
+
+        return $this->db->simpleQuery($sql);
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
+        return $this->db->escapeIdentifiers($field['name'])
+            . (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
+            . ' ' . $field['type'] . $field['length']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . ''
+            . $field['unique'];
+    }
+
+    /**
+     * Process foreign keys
+     *
+     * @param string $table Table name
+     */
+    protected function _processForeignKeys(string $table): string
+    {
+        $sql = '';
+
+        $allowActions = ['CASCADE', 'SET NULL', 'NO ACTION', 'RESTRICT', 'SET DEFAULT'];
+
+        foreach ($this->foreignKeys as $field => $fkey) {
+            $nameIndex = $table . '_' . $field . '_foreign';
+
+            $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+                . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
+                . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
+
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Process primary keys
+     *
+     * @param string $table Table name
+     */
+    protected function _processPrimaryKeys(string $table): string
+    {
+        for ($i = 0, $c = count($this->primaryKeys); $i < $c; $i++) {
+            if (! isset($this->fields[$this->primaryKeys[$i]])) {
+                unset($this->primaryKeys[$i]);
+            }
+        }
+
+        if ($this->primaryKeys !== []) {
+            $sql = ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
+                . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
+        }
+
+        return $sql ?? '';
+    }
+
+    /**
+     * Performs a data type mapping between different databases.
+     */
+    protected function _attributeType(array &$attributes)
+    {
+        // Reset field lengths for data types that don't support it
+        if (isset($attributes['CONSTRAINT']) && stripos($attributes['TYPE'], 'int') !== false) {
+            $attributes['CONSTRAINT'] = null;
+        }
+
+        switch (strtoupper($attributes['TYPE'])) {
+            case 'MEDIUMINT':
+                $attributes['TYPE']     = 'INTEGER';
+                $attributes['UNSIGNED'] = false;
+                break;
+
+            case 'INTEGER':
+                $attributes['TYPE'] = 'INT';
+                break;
+
+            case 'ENUM':
+                $attributes['TYPE']       = 'TEXT';
+                $attributes['CONSTRAINT'] = null;
+                break;
+
+            case 'TIMESTAMP':
+                $attributes['TYPE'] = 'DATETIME';
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Field attribute AUTO_INCREMENT
+     */
+    protected function _attributeAutoIncrement(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true && stripos($field['type'], 'INT') !== false) {
+            $field['auto_increment'] = ' IDENTITY(1,1)';
+        }
+    }
+
+    /**
+     * Generates a platform-specific DROP TABLE string
+     *
+     * @todo Support for cascade
+     */
+    protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
+    {
+        $sql = 'DROP TABLE';
+
+        if ($ifExists) {
+            $sql .= ' IF EXISTS ';
+        }
+
+        $table = ' [' . $this->db->database . '].[' . $this->db->schema . '].[' . $table . '] ';
+
+        $sql .= $table;
+
+        if ($cascade) {
+            $sql .= '';
+        }
+
+        return $sql;
+    }
 }
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
index 4f3b5868a85f..e91fa78ea35f 100755
--- a/system/Database/SQLSRV/PreparedQuery.php
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
@@ -20,107 +20,95 @@
  */
 class PreparedQuery extends BasePreparedQuery
 {
-	/**
-	 * Parameters array used to store the dynamic variables.
-	 *
-	 * @var array
-	 */
-	protected $parameters = [];
-
-	/**
-	 * The result boolean from a sqlsrv_execute.
-	 *
-	 * @var boolean
-	 */
-	protected $result;
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options Options takes an associative array;
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function _prepare(string $sql, array $options = [])
-	{
-		/* Prepare parameters for the query */
-		$queryString = $this->getQueryString();
-
-		$parameters = $this->parameterize($queryString);
-
-		/* Prepare  the query */
-		$this->statement = sqlsrv_prepare($this->db->connID, $sql, $parameters);
-
-		if (! $this->statement)
-		{
-			$info              = $this->db->error();
-			$this->errorCode   = $info['code'];
-			$this->errorString = $info['message'];
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	public function _execute(array $data): bool
-	{
-		if (! isset($this->statement))
-		{
-			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
-		}
-
-		foreach ($data as $key => $value)
-		{
-			$this->parameters[$key] = $value;
-		}
-
-		$this->result = sqlsrv_execute($this->statement);
-
-		return (bool) $this->result;
-	}
-
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	public function _getResult()
-	{
-		return $this->result;
-	}
-
-	/**
-	 * Handle parameters
-	 *
-	 * @param string $queryString
-	 *
-	 * @return array
-	 */
-	protected function parameterize(string $queryString): array
-	{
-		$numberOfVariables = substr_count($queryString, '?');
-
-		$params = [];
-
-		for ($c = 0; $c < $numberOfVariables; $c++)
-		{
-			$this->parameters[$c] = null;
-			$params[]             = &$this->parameters[$c];
-		}
-
-		return $params;
-	}
+    /**
+     * Parameters array used to store the dynamic variables.
+     *
+     * @var array
+     */
+    protected $parameters = [];
+
+    /**
+     * The result boolean from a sqlsrv_execute.
+     *
+     * @var bool
+     */
+    protected $result;
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Options takes an associative array;
+     *
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function _prepare(string $sql, array $options = [])
+    {
+        // Prepare parameters for the query
+        $queryString = $this->getQueryString();
+
+        $parameters = $this->parameterize($queryString);
+
+        // Prepare the query
+        $this->statement = sqlsrv_prepare($this->db->connID, $sql, $parameters);
+
+        if (! $this->statement) {
+            $info              = $this->db->error();
+            $this->errorCode   = $info['code'];
+            $this->errorString = $info['message'];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     */
+    public function _execute(array $data): bool
+    {
+        if (! isset($this->statement)) {
+            throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+        }
+
+        foreach ($data as $key => $value) {
+            $this->parameters[$key] = $value;
+        }
+
+        $this->result = sqlsrv_execute($this->statement);
+
+        return (bool) $this->result;
+    }
+
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    public function _getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * Handle parameters
+     */
+    protected function parameterize(string $queryString): array
+    {
+        $numberOfVariables = substr_count($queryString, '?');
+
+        $params = [];
+
+        for ($c = 0; $c < $numberOfVariables; $c++) {
+            $this->parameters[$c] = null;
+            $params[]             = &$this->parameters[$c];
+        }
+
+        return $params;
+    }
 }
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index f5e771e5e614..2a55e452ac09 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
@@ -20,176 +20,151 @@
  */
 class Result extends BaseResult
 {
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return @sqlsrv_num_fields($this->resultID);
-	}
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		$fieldNames = [];
-		foreach (sqlsrv_field_metadata($this->resultID) as $field)
-		{
-			$fieldNames[] = $field['Name'];
-		}
-
-		return $fieldNames;
-	}
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		static $dataTypes = [
-			SQLSRV_SQLTYPE_BIGINT           => 'bigint',
-			SQLSRV_SQLTYPE_BIT              => 'bit',
-			SQLSRV_SQLTYPE_CHAR             => 'char',
-
-			SQLSRV_SQLTYPE_DATE             => 'date',
-			SQLSRV_SQLTYPE_DATETIME         => 'datetime',
-			SQLSRV_SQLTYPE_DATETIME2        => 'datetime2',
-			SQLSRV_SQLTYPE_DATETIMEOFFSET   => 'datetimeoffset',
-
-			SQLSRV_SQLTYPE_DECIMAL          => 'decimal',
-			SQLSRV_SQLTYPE_FLOAT            => 'float',
-
-			SQLSRV_SQLTYPE_IMAGE            => 'image',
-			SQLSRV_SQLTYPE_INT              => 'int',
-			SQLSRV_SQLTYPE_MONEY            => 'money',
-			SQLSRV_SQLTYPE_NCHAR            => 'nchar',
-			SQLSRV_SQLTYPE_NUMERIC          => 'numeric',
-
-			SQLSRV_SQLTYPE_NVARCHAR         => 'nvarchar',
-			SQLSRV_SQLTYPE_NTEXT            => 'ntext',
-
-			SQLSRV_SQLTYPE_REAL             => 'real',
-			SQLSRV_SQLTYPE_SMALLDATETIME    => 'smalldatetime',
-			SQLSRV_SQLTYPE_SMALLINT         => 'smallint',
-			SQLSRV_SQLTYPE_SMALLMONEY       => 'smallmoney',
-			SQLSRV_SQLTYPE_TEXT             => 'text',
-
-			SQLSRV_SQLTYPE_TIME             => 'time',
-			SQLSRV_SQLTYPE_TIMESTAMP        => 'timestamp',
-			SQLSRV_SQLTYPE_TINYINT          => 'tinyint',
-			SQLSRV_SQLTYPE_UNIQUEIDENTIFIER => 'uniqueidentifier',
-			SQLSRV_SQLTYPE_UDT              => 'udt',
-			SQLSRV_SQLTYPE_VARBINARY        => 'varbinary',
-			SQLSRV_SQLTYPE_VARCHAR          => 'varchar',
-			SQLSRV_SQLTYPE_XML              => 'xml',
-		];
-
-		$retVal = [];
-		foreach (sqlsrv_field_metadata($this->resultID) as $i => $field)
-		{
-			$retVal[$i]             = new stdClass();
-			$retVal[$i]->name       = $field['Name'];
-			$retVal[$i]->type       = $field['Type'];
-			$retVal[$i]->type_name  = $dataTypes[$field['Type']] ?? null;
-			$retVal[$i]->max_length = $field['Size'];
-		}
-
-		return $retVal;
-	}
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult()
-	{
-		if (is_resource($this->resultID))
-		{
-			sqlsrv_free_stmt($this->resultID);
-			$this->resultID = false;
-		}
-	}
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek(int $n = 0)
-	{
-		if ($n > 0)
-		{
-			for ($i = 0; $i < $n; $i++)
-			{
-				if (sqlsrv_fetch($this->resultID) === false)
-				{
-					return false;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-		return sqlsrv_fetch_array($this->resultID, SQLSRV_FETCH_ASSOC);
-	}
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object|boolean|Entity
-	 */
-	protected function fetchObject(string $className = 'stdClass')
-	{
-		if (is_subclass_of($className, Entity::class))
-		{
-			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
-		}
-		return sqlsrv_fetch_object($this->resultID, $className);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns the number of rows in the resultID (i.e., SQLSRV query result resource)
-	 *
-	 * @return integer Returns the number of rows retrieved on success
-	 */
-	public function getNumRows(): int
-	{
-		if (! is_int($this->numRows))
-		{
-			$this->numRows = sqlsrv_num_rows($this->resultID);
-		}
-
-		return $this->numRows;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return @sqlsrv_num_fields($this->resultID);
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        $fieldNames = [];
+
+        foreach (sqlsrv_field_metadata($this->resultID) as $field) {
+            $fieldNames[] = $field['Name'];
+        }
+
+        return $fieldNames;
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        static $dataTypes = [
+            SQLSRV_SQLTYPE_BIGINT => 'bigint',
+            SQLSRV_SQLTYPE_BIT    => 'bit',
+            SQLSRV_SQLTYPE_CHAR   => 'char',
+
+            SQLSRV_SQLTYPE_DATE           => 'date',
+            SQLSRV_SQLTYPE_DATETIME       => 'datetime',
+            SQLSRV_SQLTYPE_DATETIME2      => 'datetime2',
+            SQLSRV_SQLTYPE_DATETIMEOFFSET => 'datetimeoffset',
+
+            SQLSRV_SQLTYPE_DECIMAL => 'decimal',
+            SQLSRV_SQLTYPE_FLOAT   => 'float',
+
+            SQLSRV_SQLTYPE_IMAGE   => 'image',
+            SQLSRV_SQLTYPE_INT     => 'int',
+            SQLSRV_SQLTYPE_MONEY   => 'money',
+            SQLSRV_SQLTYPE_NCHAR   => 'nchar',
+            SQLSRV_SQLTYPE_NUMERIC => 'numeric',
+
+            SQLSRV_SQLTYPE_NVARCHAR => 'nvarchar',
+            SQLSRV_SQLTYPE_NTEXT    => 'ntext',
+
+            SQLSRV_SQLTYPE_REAL          => 'real',
+            SQLSRV_SQLTYPE_SMALLDATETIME => 'smalldatetime',
+            SQLSRV_SQLTYPE_SMALLINT      => 'smallint',
+            SQLSRV_SQLTYPE_SMALLMONEY    => 'smallmoney',
+            SQLSRV_SQLTYPE_TEXT          => 'text',
+
+            SQLSRV_SQLTYPE_TIME             => 'time',
+            SQLSRV_SQLTYPE_TIMESTAMP        => 'timestamp',
+            SQLSRV_SQLTYPE_TINYINT          => 'tinyint',
+            SQLSRV_SQLTYPE_UNIQUEIDENTIFIER => 'uniqueidentifier',
+            SQLSRV_SQLTYPE_UDT              => 'udt',
+            SQLSRV_SQLTYPE_VARBINARY        => 'varbinary',
+            SQLSRV_SQLTYPE_VARCHAR          => 'varchar',
+            SQLSRV_SQLTYPE_XML              => 'xml',
+        ];
+
+        $retVal = [];
+
+        foreach (sqlsrv_field_metadata($this->resultID) as $i => $field) {
+            $retVal[$i] = new stdClass();
+
+            $retVal[$i]->name       = $field['Name'];
+            $retVal[$i]->type       = $field['Type'];
+            $retVal[$i]->type_name  = $dataTypes[$field['Type']] ?? null;
+            $retVal[$i]->max_length = $field['Size'];
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Frees the current result.
+     */
+    public function freeResult()
+    {
+        if (is_resource($this->resultID)) {
+            sqlsrv_free_stmt($this->resultID);
+            $this->resultID = false;
+        }
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0)
+    {
+        if ($n > 0) {
+            for ($i = 0; $i < $n; $i++) {
+                if (sqlsrv_fetch($this->resultID) === false) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+        return sqlsrv_fetch_array($this->resultID, SQLSRV_FETCH_ASSOC);
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * @return bool|Entity|object
+     */
+    protected function fetchObject(string $className = 'stdClass')
+    {
+        if (is_subclass_of($className, Entity::class)) {
+            return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+        }
+
+        return sqlsrv_fetch_object($this->resultID, $className);
+    }
+
+    /**
+     * Returns the number of rows in the resultID (i.e., SQLSRV query result resource)
+     */
+    public function getNumRows(): int
+    {
+        if (! is_int($this->numRows)) {
+            $this->numRows = sqlsrv_num_rows($this->resultID);
+        }
+
+        return $this->numRows;
+    }
 }
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index 9bc853e4f9a7..da4ac8679b9e 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
@@ -19,31 +19,27 @@
  */
 class Utils extends BaseUtils
 {
-	/**
-	 * List databases statement
-	 *
-	 * @var string
-	 */
-	protected $listDatabases = 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
+    /**
+     * List databases statement
+     *
+     * @var string
+     */
+    protected $listDatabases = 'EXEC sp_helpdb'; // Can also be: EXEC sp_databases
 
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
+    /**
+     * OPTIMIZE TABLE statement
+     *
+     * @var string
+     */
+    protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	public function _backup(array $prefs = null)
-	{
-		throw new DatabaseException('Unsupported feature of the database platform you are using.');
-	}
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    public function _backup(?array $prefs = null)
+    {
+        throw new DatabaseException('Unsupported feature of the database platform you are using.');
+    }
 }
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index 4ec74d1a07db..588d2d0958e2 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -18,71 +18,56 @@
  */
 class Builder extends BaseBuilder
 {
-	/**
-	 * Default installs of SQLite typically do not
-	 * support limiting delete clauses.
-	 *
-	 * @var boolean
-	 */
-	protected $canLimitDeletes = false;
+    /**
+     * Default installs of SQLite typically do not
+     * support limiting delete clauses.
+     *
+     * @var bool
+     */
+    protected $canLimitDeletes = false;
 
-	/**
-	 * Default installs of SQLite do no support
-	 * limiting update queries in combo with WHERE.
-	 *
-	 * @var boolean
-	 */
-	protected $canLimitWhereUpdates = false;
+    /**
+     * Default installs of SQLite do no support
+     * limiting update queries in combo with WHERE.
+     *
+     * @var bool
+     */
+    protected $canLimitWhereUpdates = false;
 
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $randomKeyword = [
-		'RANDOM()',
-	];
+    /**
+     * ORDER BY random keyword
+     *
+     * @var array
+     */
+    protected $randomKeyword = [
+        'RANDOM()',
+    ];
 
-	/**
-	 * @var array
-	 */
-	protected $supportedIgnoreStatements = [
-		'insert' => 'OR IGNORE',
-	];
+    /**
+     * @var array
+     */
+    protected $supportedIgnoreStatements = [
+        'insert' => 'OR IGNORE',
+    ];
 
-	//--------------------------------------------------------------------
+    /**
+     * Replace statement
+     *
+     * Generates a platform-specific replace string from the supplied data
+     */
+    protected function _replace(string $table, array $keys, array $values): string
+    {
+        return 'INSERT OR ' . parent::_replace($table, $keys, $values);
+    }
 
-	/**
-	 * Replace statement
-	 *
-	 * Generates a platform-specific replace string from the supplied data
-	 *
-	 * @param string $table  the table name
-	 * @param array  $keys   the insert keys
-	 * @param array  $values the insert values
-	 *
-	 * @return string
-	 */
-	protected function _replace(string $table, array $keys, array $values): string
-	{
-		return 'INSERT OR ' . parent::_replace($table, $keys, $values);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncate statement
-	 *
-	 * Generates a platform-specific truncate string from the supplied data
-	 *
-	 * If the database does not support the TRUNCATE statement,
-	 * then this method maps to 'DELETE FROM table'
-	 *
-	 * @param  string $table
-	 * @return string
-	 */
-	protected function _truncate(string $table): string
-	{
-		return 'DELETE FROM ' . $table;
-	}
+    /**
+     * Generates a platform-specific truncate string from the supplied data
+     *
+     * If the database does not support the TRUNCATE statement,
+     * then this method maps to 'DELETE FROM table'
+     */
+    protected function _truncate(string $table): string
+    {
+        return 'DELETE FROM ' . $table;
+    }
 }
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 4547ad7c5937..39fbca8bcfea 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -23,483 +23,374 @@
  */
 class Connection extends BaseConnection
 {
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	public $DBDriver = 'SQLite3';
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	public $escapeChar = '`';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param boolean $persistent
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function connect(bool $persistent = false)
-	{
-		if ($persistent && $this->DBDebug)
-		{
-			throw new DatabaseException('SQLite3 doesn\'t support persistent connections.');
-		}
-		try
-		{
-			if ($this->database !== ':memory:' && strpos($this->database, DIRECTORY_SEPARATOR) === false)
-			{
-				$this->database = WRITEPATH . $this->database;
-			}
-
-			return (! $this->password)
-				? new SQLite3($this->database)
-				: new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
-		}
-		catch (Exception $e)
-		{
-			throw new DatabaseException('SQLite3 error: ' . $e->getMessage());
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return void
-	 */
-	public function reconnect()
-	{
-		$this->close();
-		$this->initialize();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	protected function _close()
-	{
-		$this->connID->close();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return boolean
-	 */
-	public function setDatabase(string $databaseName): bool
-	{
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		if (isset($this->dataCache['version']))
-		{
-			return $this->dataCache['version'];
-		}
-
-		$version = SQLite3::version();
-
-		return $this->dataCache['version'] = $version['versionString'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Execute the query
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed    \SQLite3Result object or bool
-	 */
-	public function execute(string $sql)
-	{
-		try
-		{
-			return $this->isWriteType($sql)
-				? $this->connID->exec($sql)
-				: $this->connID->query($sql);
-		}
-		catch (ErrorException $e)
-		{
-			log_message('error', $e);
-			if ($this->DBDebug)
-			{
-				throw $e;
-			}
-		}
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return $this->connID->changes();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform-dependant string escape
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		return $this->connID->escapeString($str);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $prefixLimit
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $prefixLimit = false): string
-	{
-		return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
-			   . ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''
-			   . (($prefixLimit !== false && $this->DBPrefix !== '')
-				? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr,
-					$this->likeEscapeChar)
-				: '');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		return 'PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')';
-	}
-
-	/**
-	 * Fetch Field Names
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return array|false
-	 * @throws DatabaseException
-	 */
-	public function getFieldNames(string $table)
-	{
-		// Is there a cached result?
-		if (isset($this->dataCache['field_names'][$table]))
-		{
-			return $this->dataCache['field_names'][$table];
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		$sql = $this->_listColumns($table);
-
-		$query                                  = $this->query($sql);
-		$this->dataCache['field_names'][$table] = [];
-
-		foreach ($query->getResultArray() as $row)
-		{
-			// Do we know from where to get the column's name?
-			if (! isset($key))
-			{
-				if (isset($row['column_name']))
-				{
-					$key = 'column_name';
-				}
-				elseif (isset($row['COLUMN_NAME']))
-				{
-					$key = 'COLUMN_NAME';
-				}
-				elseif (isset($row['name']))
-				{
-					$key = 'name';
-				}
-				else
-				{
-					// We have no other choice but to just get the first element's key.
-					$key = key($row);
-				}
-			}
-
-			$this->dataCache['field_names'][$table][] = $row[$key];
-		}
-
-		return $this->dataCache['field_names'][$table];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with field data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _fieldData(string $table): array
-	{
-		if (($query = $this->query('PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null,
-					false) . ')')) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetFieldData'));
-		}
-		$query = $query->getResultObject();
-
-		if (empty($query))
-		{
-			return [];
-		}
-		$retVal = [];
-		for ($i = 0, $c = count($query); $i < $c; $i++)
-		{
-			$retVal[$i]              = new stdClass();
-			$retVal[$i]->name        = $query[$i]->name;
-			$retVal[$i]->type        = $query[$i]->type;
-			$retVal[$i]->max_length  = null;
-			$retVal[$i]->default     = $query[$i]->dflt_value;
-			$retVal[$i]->primary_key = isset($query[$i]->pk) && (bool) $query[$i]->pk;
-			$retVal[$i]->nullable    = isset($query[$i]->notnull) && ! (bool) $query[$i]->notnull;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with index data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _indexData(string $table): array
-	{
-		// Get indexes
-		// Don't use PRAGMA index_list, so we can preserve index order
-		$sql = "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name=" . $this->escape(strtolower($table));
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj       = new stdClass();
-			$obj->name = $row->name;
-
-			// Get fields for index
-			$obj->fields = [];
-			if (($fields = $this->query('PRAGMA index_info(' . $this->escape(strtolower($row->name)) . ')')) === false)
-			{
-				throw new DatabaseException(lang('Database.failGetIndexData'));
-			}
-			$fields = $fields->getResultObject();
-
-			foreach ($fields as $field)
-			{
-				$obj->fields[] = $field->name;
-			}
-
-			$retVal[$obj->name] = $obj;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with Foreign key data
-	 *
-	 * @param  string $table
-	 * @return stdClass[]
-	 */
-	public function _foreignKeyData(string $table): array
-	{
-		if ($this->supportsForeignKeys() !== true)
-		{
-			return [];
-		}
-
-		$tables = $this->listTables();
-
-		if (empty($tables))
-		{
-			return [];
-		}
-
-		$retVal = [];
-
-		foreach ($tables as $table)
-		{
-			$query = $this->query("PRAGMA foreign_key_list({$table})")->getResult();
-
-			foreach ($query as $row)
-			{
-				$obj                     = new stdClass();
-				$obj->constraint_name    = $row->from . ' to ' . $row->table . '.' . $row->to;
-				$obj->table_name         = $table;
-				$obj->foreign_table_name = $row->table;
-				$obj->sequence           = $row->seq;
-
-				$retVal[] = $obj;
-			}
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _disableForeignKeyChecks()
-	{
-		return 'PRAGMA foreign_keys = OFF';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to enable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _enableForeignKeyChecks()
-	{
-		return 'PRAGMA foreign_keys = ON';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 * Must return this format: ['code' => string|int, 'message' => string]
-	 * intval(code) === 0 means "no error".
-	 *
-	 * @return array<string,string|int>
-	 */
-	public function error(): array
-	{
-		return [
-			'code'    => $this->connID->lastErrorCode(),
-			'message' => $this->connID->lastErrorMsg(),
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer
-	 */
-	public function insertID(): int
-	{
-		return $this->connID->lastInsertRowID();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		return $this->connID->exec('BEGIN TRANSACTION');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		return $this->connID->exec('END TRANSACTION');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		return $this->connID->exec('ROLLBACK');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if the current install supports Foreign Keys
-	 * and has them enabled.
-	 *
-	 * @return boolean
-	 */
-	public function supportsForeignKeys(): bool
-	{
-		$result = $this->simpleQuery('PRAGMA foreign_keys');
-
-		return (bool) $result;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    public $DBDriver = 'SQLite3';
+
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    public $escapeChar = '`';
+
+    /**
+     * Connect to the database.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        if ($persistent && $this->DBDebug) {
+            throw new DatabaseException('SQLite3 doesn\'t support persistent connections.');
+        }
+
+        try {
+            if ($this->database !== ':memory:' && strpos($this->database, DIRECTORY_SEPARATOR) === false) {
+                $this->database = WRITEPATH . $this->database;
+            }
+
+            return (! $this->password)
+                ? new SQLite3($this->database)
+                : new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
+        } catch (Exception $e) {
+            throw new DatabaseException('SQLite3 error: ' . $e->getMessage());
+        }
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     */
+    public function reconnect()
+    {
+        $this->close();
+        $this->initialize();
+    }
+
+    /**
+     * Close the database connection.
+     */
+    protected function _close()
+    {
+        $this->connID->close();
+    }
+
+    /**
+     * Select a specific database table to use.
+     */
+    public function setDatabase(string $databaseName): bool
+    {
+        return false;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        if (isset($this->dataCache['version'])) {
+            return $this->dataCache['version'];
+        }
+
+        $version = SQLite3::version();
+
+        return $this->dataCache['version'] = $version['versionString'];
+    }
+
+    /**
+     * Execute the query
+     *
+     * @return mixed \SQLite3Result object or bool
+     */
+    protected function execute(string $sql)
+    {
+        try {
+            return $this->isWriteType($sql)
+                ? $this->connID->exec($sql)
+                : $this->connID->query($sql);
+        } catch (ErrorException $e) {
+            log_message('error', $e);
+            if ($this->DBDebug) {
+                throw $e;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return $this->connID->changes();
+    }
+
+    /**
+     * Platform-dependant string escape
+     */
+    protected function _escapeString(string $str): string
+    {
+        return $this->connID->escapeString($str);
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     */
+    protected function _listTables(bool $prefixLimit = false): string
+    {
+        return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
+               . ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''
+               . (($prefixLimit !== false && $this->DBPrefix !== '')
+                    ? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr, $this->likeEscapeChar)
+                    : '');
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        return 'PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')';
+    }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return array|false
+     */
+    public function getFieldNames(string $table)
+    {
+        // Is there a cached result?
+        if (isset($this->dataCache['field_names'][$table])) {
+            return $this->dataCache['field_names'][$table];
+        }
+
+        if (empty($this->connID)) {
+            $this->initialize();
+        }
+
+        $sql = $this->_listColumns($table);
+
+        $query                                  = $this->query($sql);
+        $this->dataCache['field_names'][$table] = [];
+
+        foreach ($query->getResultArray() as $row) {
+            // Do we know from where to get the column's name?
+            if (! isset($key)) {
+                if (isset($row['column_name'])) {
+                    $key = 'column_name';
+                } elseif (isset($row['COLUMN_NAME'])) {
+                    $key = 'COLUMN_NAME';
+                } elseif (isset($row['name'])) {
+                    $key = 'name';
+                } else {
+                    // We have no other choice but to just get the first element's key.
+                    $key = key($row);
+                }
+            }
+
+            $this->dataCache['field_names'][$table][] = $row[$key];
+        }
+
+        return $this->dataCache['field_names'][$table];
+    }
+
+    /**
+     * Returns an array of objects with field data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _fieldData(string $table): array
+    {
+        if (false === $query = $this->query('PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')')) {
+            throw new DatabaseException(lang('Database.failGetFieldData'));
+        }
+
+        $query = $query->getResultObject();
+
+        if (empty($query)) {
+            return [];
+        }
+
+        $retVal = [];
+
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
+            $retVal[$i] = new stdClass();
+
+            $retVal[$i]->name        = $query[$i]->name;
+            $retVal[$i]->type        = $query[$i]->type;
+            $retVal[$i]->max_length  = null;
+            $retVal[$i]->default     = $query[$i]->dflt_value;
+            $retVal[$i]->primary_key = isset($query[$i]->pk) && (bool) $query[$i]->pk;
+            $retVal[$i]->nullable    = isset($query[$i]->notnull) && ! (bool) $query[$i]->notnull;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with index data
+     *
+     * @throws DatabaseException
+     *
+     * @return stdClass[]
+     */
+    protected function _indexData(string $table): array
+    {
+        // Get indexes
+        // Don't use PRAGMA index_list, so we can preserve index order
+        $sql = "SELECT name FROM sqlite_master WHERE type='index' AND tbl_name=" . $this->escape(strtolower($table));
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetIndexData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj = new stdClass();
+
+            $obj->name = $row->name;
+
+            // Get fields for index
+            $obj->fields = [];
+
+            if (false === $fields = $this->query('PRAGMA index_info(' . $this->escape(strtolower($row->name)) . ')')) {
+                throw new DatabaseException(lang('Database.failGetIndexData'));
+            }
+
+            $fields = $fields->getResultObject();
+
+            foreach ($fields as $field) {
+                $obj->fields[] = $field->name;
+            }
+
+            $retVal[$obj->name] = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with Foreign key data
+     *
+     * @return stdClass[]
+     */
+    protected function _foreignKeyData(string $table): array
+    {
+        if ($this->supportsForeignKeys() !== true) {
+            return [];
+        }
+
+        $tables = $this->listTables();
+
+        if (empty($tables)) {
+            return [];
+        }
+
+        $retVal = [];
+
+        foreach ($tables as $table) {
+            $query = $this->query("PRAGMA foreign_key_list({$table})")->getResult();
+
+            foreach ($query as $row) {
+                $obj                     = new stdClass();
+                $obj->constraint_name    = $row->from . ' to ' . $row->table . '.' . $row->to;
+                $obj->table_name         = $table;
+                $obj->foreign_table_name = $row->table;
+                $obj->sequence           = $row->seq;
+
+                $retVal[] = $obj;
+            }
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns platform-specific SQL to disable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return 'PRAGMA foreign_keys = OFF';
+    }
+
+    /**
+     * Returns platform-specific SQL to enable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return 'PRAGMA foreign_keys = ON';
+    }
+
+    /**
+     * Returns the last error code and message.
+     * Must return this format: ['code' => string|int, 'message' => string]
+     * intval(code) === 0 means "no error".
+     *
+     * @return array<string, int|string>
+     */
+    public function error(): array
+    {
+        return [
+            'code'    => $this->connID->lastErrorCode(),
+            'message' => $this->connID->lastErrorMsg(),
+        ];
+    }
+
+    /**
+     * Insert ID
+     */
+    public function insertID(): int
+    {
+        return $this->connID->lastInsertRowID();
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        return $this->connID->exec('BEGIN TRANSACTION');
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        return $this->connID->exec('END TRANSACTION');
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        return $this->connID->exec('ROLLBACK');
+    }
+
+    /**
+     * Checks to see if the current install supports Foreign Keys
+     * and has them enabled.
+     */
+    public function supportsForeignKeys(): bool
+    {
+        $result = $this->simpleQuery('PRAGMA foreign_keys');
+
+        return (bool) $result;
+    }
 }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index b6994115378d..4d118d04eb62 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -20,284 +20,224 @@
  */
 class Forge extends BaseForge
 {
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var boolean|array
-	 */
-	protected $_unsigned = false;
-
-	/**
-	 * NULL value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string
-	 *
-	 * @internal
-	 */
-	protected $null = 'NULL';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param BaseConnection $db
-	 */
-	public function __construct(BaseConnection $db)
-	{
-		parent::__construct($db);
-
-		if (version_compare($this->db->getVersion(), '3.3', '<'))
-		{
-			$this->createTableIfStr = false;
-			$this->dropTableIfStr   = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create database
-	 *
-	 * @param string  $dbName
-	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
-	 *
-	 * @return boolean
-	 */
-	public function createDatabase(string $dbName, bool $ifNotExists = false): bool
-	{
-		// In SQLite, a database is created when you connect to the database.
-		// We'll return TRUE so that an error isn't generated.
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop database
-	 *
-	 * @param string $dbName
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function dropDatabase(string $dbName): bool
-	{
-		// In SQLite, a database is dropped when we delete a file
-		if (! is_file($dbName))
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unable to drop the specified database.');
-			}
-
-			return false;
-		}
-
-		// We need to close the pseudo-connection first
-		$this->db->close();
-		if (! @unlink($dbName))
-		{
-			if ($this->db->DBDebug)
-			{
-				throw new DatabaseException('Unable to drop the specified database.');
-			}
-
-			return false;
-		}
-
-		if (! empty($this->db->dataCache['db_names']))
-		{
-			$key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
-			if ($key !== false)
-			{
-				unset($this->db->dataCache['db_names'][$key]);
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param string $alterType ALTER type
-	 * @param string $table     Table name
-	 * @param mixed  $field     Column definition
-	 *
-	 * @return string|array|null
-	 */
-	protected function _alterTable(string $alterType, string $table, $field)
-	{
-		switch ($alterType)
-		{
-			case 'DROP':
-				$sqlTable = new Table($this->db, $this);
-
-				$sqlTable->fromTable($table)
-					->dropColumn($field)
-					->run();
-
-				return '';
-			case 'CHANGE':
-				$sqlTable = new Table($this->db, $this);
-
-				$sqlTable->fromTable($table)
-						 ->modifyColumn($field)
-						 ->run();
-
-				return null;
-			default:
-				return parent::_alterTable($alterType, $table, $field);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process column
-	 *
-	 * @param array $field
-	 *
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
-		if ($field['type'] === 'TEXT' && strpos($field['length'], "('") === 0)
-		{
-			$field['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
-				. ' IN ' . $field['length'] . ')';
-		}
-
-		return $this->db->escapeIdentifiers($field['name'])
-			   . ' ' . $field['type']
-			   . $field['auto_increment']
-			   . $field['null']
-			   . $field['unique']
-			   . $field['default'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process indexes
-	 *
-	 * @param string $table
-	 *
-	 * @return array
-	 */
-	protected function _processIndexes(string $table): array
-	{
-		$sqls = [];
-
-		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
-		{
-			$this->keys[$i] = (array) $this->keys[$i];
-
-			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
-			{
-				if (! isset($this->fields[$this->keys[$i][$i2]]))
-				{
-					unset($this->keys[$i][$i2]);
-				}
-			}
-			if (count($this->keys[$i]) <= 0)
-			{
-				continue;
-			}
-
-			if (in_array($i, $this->uniqueKeys, true))
-			{
-				$sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-						  . ' ON ' . $this->db->escapeIdentifiers($table)
-						  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
-				continue;
-			}
-
-			$sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-					  . ' ON ' . $this->db->escapeIdentifiers($table)
-					  . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
-		}
-
-		return $sqls;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute TYPE
-	 *
-	 * Performs a data type mapping between different databases.
-	 *
-	 * @param array $attributes
-	 *
-	 * @return void
-	 */
-	protected function _attributeType(array &$attributes)
-	{
-		switch (strtoupper($attributes['TYPE']))
-		{
-			case 'ENUM':
-			case 'SET':
-				$attributes['TYPE'] = 'TEXT';
-				break;
-			default:
-				break;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute AUTO_INCREMENT
-	 *
-	 * @param array $attributes
-	 * @param array $field
-	 *
-	 * @return void
-	 */
-	protected function _attributeAutoIncrement(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-			&& stripos($field['type'], 'int') !== false)
-		{
-			$field['type']           = 'INTEGER PRIMARY KEY';
-			$field['default']        = '';
-			$field['null']           = '';
-			$field['unique']         = '';
-			$field['auto_increment'] = ' AUTOINCREMENT';
-
-			$this->primaryKeys = [];
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Foreign Key Drop
-	 *
-	 * @param string $table       Table name
-	 * @param string $foreignName Foreign name
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function dropForeignKey(string $table, string $foreignName): bool
-	{
-		// If this version of SQLite doesn't support it, we're done here
-		if ($this->db->supportsForeignKeys() !== true)
-		{
-			return true;
-		}
-
-		// Otherwise we have to copy the table and recreate
-		// without the foreign key being involved now
-		$sqlTable = new Table($this->db, $this);
-
-		return $sqlTable->fromTable($this->db->DBPrefix . $table)
-			->dropForeignKey($foreignName)
-			->run();
-	}
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array|bool
+     */
+    protected $_unsigned = false;
+
+    /**
+     * NULL value representation in CREATE/ALTER TABLE statements
+     *
+     * @var string
+     *
+     * @internal
+     */
+    protected $null = 'NULL';
+
+    /**
+     * Constructor.
+     */
+    public function __construct(BaseConnection $db)
+    {
+        parent::__construct($db);
+
+        if (version_compare($this->db->getVersion(), '3.3', '<')) {
+            $this->createTableIfStr = false;
+            $this->dropTableIfStr   = false;
+        }
+    }
+
+    /**
+     * Create database
+     *
+     * @param bool $ifNotExists Whether to add IF NOT EXISTS condition
+     */
+    public function createDatabase(string $dbName, bool $ifNotExists = false): bool
+    {
+        // In SQLite, a database is created when you connect to the database.
+        // We'll return TRUE so that an error isn't generated.
+        return true;
+    }
+
+    /**
+     * Drop database
+     *
+     * @throws DatabaseException
+     */
+    public function dropDatabase(string $dbName): bool
+    {
+        // In SQLite, a database is dropped when we delete a file
+        if (! is_file($dbName)) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unable to drop the specified database.');
+            }
+
+            return false;
+        }
+
+        // We need to close the pseudo-connection first
+        $this->db->close();
+        if (! @unlink($dbName)) {
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('Unable to drop the specified database.');
+            }
+
+            return false;
+        }
+
+        if (! empty($this->db->dataCache['db_names'])) {
+            $key = array_search(strtolower($dbName), array_map('strtolower', $this->db->dataCache['db_names']), true);
+            if ($key !== false) {
+                unset($this->db->dataCache['db_names'][$key]);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param mixed $field
+     *
+     * @return array|string|null
+     */
+    protected function _alterTable(string $alterType, string $table, $field)
+    {
+        switch ($alterType) {
+            case 'DROP':
+                $sqlTable = new Table($this->db, $this);
+
+                $sqlTable->fromTable($table)
+                    ->dropColumn($field)
+                    ->run();
+
+                return '';
+
+            case 'CHANGE':
+                (new Table($this->db, $this))
+                    ->fromTable($table)
+                    ->modifyColumn($field)
+                    ->run();
+
+                return null;
+
+            default:
+                return parent::_alterTable($alterType, $table, $field);
+        }
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
+        if ($field['type'] === 'TEXT' && strpos($field['length'], "('") === 0) {
+            $field['type'] .= ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
+                . ' IN ' . $field['length'] . ')';
+        }
+
+        return $this->db->escapeIdentifiers($field['name'])
+            . ' ' . $field['type']
+            . $field['auto_increment']
+            . $field['null']
+            . $field['unique']
+            . $field['default'];
+    }
+
+    /**
+     * Process indexes
+     */
+    protected function _processIndexes(string $table): array
+    {
+        $sqls = [];
+
+        for ($i = 0, $c = count($this->keys); $i < $c; $i++) {
+            $this->keys[$i] = (array) $this->keys[$i];
+
+            for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) {
+                if (! isset($this->fields[$this->keys[$i][$i2]])) {
+                    unset($this->keys[$i][$i2]);
+                }
+            }
+            if (count($this->keys[$i]) <= 0) {
+                continue;
+            }
+
+            if (in_array($i, $this->uniqueKeys, true)) {
+                $sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                    . ' ON ' . $this->db->escapeIdentifiers($table)
+                    . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+
+                continue;
+            }
+
+            $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                . ' ON ' . $this->db->escapeIdentifiers($table)
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+        }
+
+        return $sqls;
+    }
+
+    /**
+     * Field attribute TYPE
+     *
+     * Performs a data type mapping between different databases.
+     */
+    protected function _attributeType(array &$attributes)
+    {
+        switch (strtoupper($attributes['TYPE'])) {
+            case 'ENUM':
+            case 'SET':
+                $attributes['TYPE'] = 'TEXT';
+                break;
+
+            default:
+                break;
+        }
+    }
+
+    /**
+     * Field attribute AUTO_INCREMENT
+     */
+    protected function _attributeAutoIncrement(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+            && stripos($field['type'], 'int') !== false) {
+            $field['type']           = 'INTEGER PRIMARY KEY';
+            $field['default']        = '';
+            $field['null']           = '';
+            $field['unique']         = '';
+            $field['auto_increment'] = ' AUTOINCREMENT';
+
+            $this->primaryKeys = [];
+        }
+    }
+
+    /**
+     * Foreign Key Drop
+     *
+     * @throws DatabaseException
+     */
+    public function dropForeignKey(string $table, string $foreignName): bool
+    {
+        // If this version of SQLite doesn't support it, we're done here
+        if ($this->db->supportsForeignKeys() !== true) {
+            return true;
+        }
+
+        // Otherwise we have to copy the table and recreate
+        // without the foreign key being involved now
+        $sqlTable = new Table($this->db, $this);
+
+        return $sqlTable->fromTable($this->db->DBPrefix . $table)
+            ->dropForeignKey($foreignName)
+            ->run();
+    }
 }
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
index 333971da9ea8..7dada92b6226 100644
--- a/system/Database/SQLite3/PreparedQuery.php
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -19,86 +19,73 @@
  */
 class PreparedQuery extends BasePreparedQuery
 {
-	/**
-	 * The SQLite3Result resource, or false.
-	 *
-	 * @var Result|boolean
-	 */
-	protected $result;
+    /**
+     * The SQLite3Result resource, or false.
+     *
+     * @var bool|Result
+     */
+    protected $result;
 
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
-	 *
-	 * @return mixed
-	 */
-	public function _prepare(string $sql, array $options = [])
-	{
-		if (! ($this->statement = $this->db->connID->prepare($sql)))
-		{
-			$this->errorCode   = $this->db->connID->lastErrorCode();
-			$this->errorString = $this->db->connID->lastErrorMsg();
-		}
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
+     *
+     * @return $this
+     */
+    public function _prepare(string $sql, array $options = [])
+    {
+        if (! ($this->statement = $this->db->connID->prepare($sql))) {
+            $this->errorCode   = $this->db->connID->lastErrorCode();
+            $this->errorString = $this->db->connID->lastErrorMsg();
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @todo finalize()
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	public function _execute(array $data): bool
-	{
-		if (! isset($this->statement))
-		{
-			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
-		}
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     *
+     * @todo finalize()
+     */
+    public function _execute(array $data): bool
+    {
+        if (! isset($this->statement)) {
+            throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+        }
 
-		foreach ($data as $key => $item)
-		{
-			// Determine the type string
-			if (is_integer($item))
-			{
-				$bindType = SQLITE3_INTEGER;
-			}
-			elseif (is_float($item))
-			{
-				$bindType = SQLITE3_FLOAT;
-			}
-			else
-			{
-				$bindType = SQLITE3_TEXT;
-			}
+        foreach ($data as $key => $item) {
+            // Determine the type string
+            if (is_int($item)) {
+                $bindType = SQLITE3_INTEGER;
+            } elseif (is_float($item)) {
+                $bindType = SQLITE3_FLOAT;
+            } else {
+                $bindType = SQLITE3_TEXT;
+            }
 
-			// Bind it
-			$this->statement->bindValue($key + 1, $item, $bindType);
-		}
+            // Bind it
+            $this->statement->bindValue($key + 1, $item, $bindType);
+        }
 
-		$this->result = $this->statement->execute();
+        $this->result = $this->statement->execute();
 
-		return $this->result !== false;
-	}
+        return $this->result !== false;
+    }
 
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	public function _getResult()
-	{
-		return $this->result;
-	}
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    public function _getResult()
+    {
+        return $this->result;
+    }
 }
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index bd07eacff21f..6ad8e5dc939f 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -22,162 +22,131 @@
  */
 class Result extends BaseResult
 {
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return $this->resultID->numColumns(); // @phpstan-ignore-line
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		$fieldNames = [];
-		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
-		{
-			$fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
-		}
-
-		return $fieldNames;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		static $dataTypes = [
-			SQLITE3_INTEGER => 'integer',
-			SQLITE3_FLOAT   => 'float',
-			SQLITE3_TEXT    => 'text',
-			SQLITE3_BLOB    => 'blob',
-			SQLITE3_NULL    => 'null',
-		];
-
-		$retVal = [];
-		$this->resultID->fetchArray(SQLITE3_NUM); // @phpstan-ignore-line
-
-		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
-		{
-			$retVal[$i]             = new stdClass();
-			$retVal[$i]->name       = $this->resultID->columnName($i); // @phpstan-ignore-line
-			$type                   = $this->resultID->columnType($i); // @phpstan-ignore-line
-			$retVal[$i]->type       = $type;
-			$retVal[$i]->type_name  = $dataTypes[$type] ?? null;
-			$retVal[$i]->max_length = null;
-			$retVal[$i]->length     = null;
-		}
-		$this->resultID->reset(); // @phpstan-ignore-line
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult()
-	{
-		if (is_object($this->resultID))
-		{
-			$this->resultID->finalize();
-			$this->resultID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 * @throws DatabaseException
-	 */
-	public function dataSeek(int $n = 0)
-	{
-		if ($n !== 0)
-		{
-			throw new DatabaseException('SQLite3 doesn\'t support seeking to other offset.');
-		}
-
-		return $this->resultID->reset(); // @phpstan-ignore-line
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-		return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object|boolean
-	 */
-	protected function fetchObject(string $className = 'stdClass')
-	{
-		// No native support for fetching rows as objects
-		if (($row = $this->fetchAssoc()) === false)
-		{
-			return false;
-		}
-
-		if ($className === 'stdClass')
-		{
-			return (object) $row;
-		}
-
-		$classObj = new $className();
-
-		if (is_subclass_of($className, Entity::class))
-		{
-			return $classObj->setAttributes($row);
-		}
-
-		$classSet = Closure::bind(function ($key, $value) {
-			$this->$key = $value;
-		}, $classObj, $className
-		);
-		foreach (array_keys($row) as $key)
-		{
-			$classSet($key, $row[$key]);
-		}
-		return $classObj;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return $this->resultID->numColumns(); // @phpstan-ignore-line
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        $fieldNames = [];
+
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
+            $fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
+        }
+
+        return $fieldNames;
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        static $dataTypes = [
+            SQLITE3_INTEGER => 'integer',
+            SQLITE3_FLOAT   => 'float',
+            SQLITE3_TEXT    => 'text',
+            SQLITE3_BLOB    => 'blob',
+            SQLITE3_NULL    => 'null',
+        ];
+
+        $retVal = [];
+        $this->resultID->fetchArray(SQLITE3_NUM); // @phpstan-ignore-line
+
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
+            $retVal[$i]             = new stdClass();
+            $retVal[$i]->name       = $this->resultID->columnName($i); // @phpstan-ignore-line
+            $type                   = $this->resultID->columnType($i); // @phpstan-ignore-line
+            $retVal[$i]->type       = $type;
+            $retVal[$i]->type_name  = $dataTypes[$type] ?? null;
+            $retVal[$i]->max_length = null;
+            $retVal[$i]->length     = null;
+        }
+        $this->resultID->reset(); // @phpstan-ignore-line
+
+        return $retVal;
+    }
+
+    /**
+     * Frees the current result.
+     */
+    public function freeResult()
+    {
+        if (is_object($this->resultID)) {
+            $this->resultID->finalize();
+            $this->resultID = false;
+        }
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0)
+    {
+        if ($n !== 0) {
+            throw new DatabaseException('SQLite3 doesn\'t support seeking to other offset.');
+        }
+
+        return $this->resultID->reset(); // @phpstan-ignore-line
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+        return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @return bool|object
+     */
+    protected function fetchObject(string $className = 'stdClass')
+    {
+        // No native support for fetching rows as objects
+        if (($row = $this->fetchAssoc()) === false) {
+            return false;
+        }
+
+        if ($className === 'stdClass') {
+            return (object) $row;
+        }
+
+        $classObj = new $className();
+
+        if (is_subclass_of($className, Entity::class)) {
+            return $classObj->setAttributes($row);
+        }
+
+        $classSet = Closure::bind(function ($key, $value) {
+            $this->{$key} = $value;
+        }, $classObj, $className);
+
+        foreach (array_keys($row) as $key) {
+            $classSet($key, $row[$key]);
+        }
+
+        return $classObj;
+    }
 }
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 1183f4a2ef01..8f04c0f645f1 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -24,380 +24,340 @@
  */
 class Table
 {
-	/**
-	 * All of the fields this table represents.
-	 *
-	 * @var array
-	 */
-	protected $fields = [];
-
-	/**
-	 * All of the unique/primary keys in the table.
-	 *
-	 * @var array
-	 */
-	protected $keys = [];
-
-	/**
-	 * All of the foreign keys in the table.
-	 *
-	 * @var array
-	 */
-	protected $foreignKeys = [];
-
-	/**
-	 * The name of the table we're working with.
-	 *
-	 * @var string
-	 */
-	protected $tableName;
-
-	/**
-	 * The name of the table, with database prefix
-	 *
-	 * @var string
-	 */
-	protected $prefixedTableName;
-
-	/**
-	 * Database connection.
-	 *
-	 * @var Connection
-	 */
-	protected $db;
-
-	/**
-	 * Handle to our forge.
-	 *
-	 * @var Forge
-	 */
-	protected $forge;
-
-	/**
-	 * Table constructor.
-	 *
-	 * @param Connection $db
-	 * @param Forge      $forge
-	 */
-	public function __construct(Connection $db, Forge $forge)
-	{
-		$this->db    = $db;
-		$this->forge = $forge;
-	}
-
-	/**
-	 * Reads an existing database table and
-	 * collects all of the information needed to
-	 * recreate this table.
-	 *
-	 * @param string $table
-	 *
-	 * @return Table
-	 */
-	public function fromTable(string $table)
-	{
-		$this->prefixedTableName = $table;
-
-		// Remove the prefix, if any, since it's
-		// already been added by the time we get here...
-		$prefix = $this->db->DBPrefix; // @phpstan-ignore-line
-		if (! empty($prefix) && strpos($table, $prefix) === 0)
-		{
-			$table = substr($table, strlen($prefix));
-		}
-
-		if (! $this->db->tableExists($this->prefixedTableName))
-		{
-			throw DataException::forTableNotFound($this->prefixedTableName);
-		}
-
-		$this->tableName = $table;
-
-		$this->fields = $this->formatFields($this->db->getFieldData($table));
-
-		$this->keys = array_merge($this->keys, $this->formatKeys($this->db->getIndexData($table)));
-
-		$this->foreignKeys = $this->db->getForeignKeyData($table);
-
-		return $this;
-	}
-
-	/**
-	 * Called after `fromTable` and any actions, like `dropColumn`, etc,
-	 * to finalize the action. It creates a temp table, creates the new
-	 * table with modifications, and copies the data over to the new table.
-	 * Resets the connection dataCache to be sure changes are collected.
-	 *
-	 * @return boolean
-	 */
-	public function run(): bool
-	{
-		$this->db->query('PRAGMA foreign_keys = OFF');
-
-		$this->db->transStart();
-
-		$this->forge->renameTable($this->tableName, "temp_{$this->tableName}");
-
-		$this->forge->reset();
-
-		$this->createTable();
-
-		$this->copyData();
-
-		$this->forge->dropTable("temp_{$this->tableName}");
-
-		$success = $this->db->transComplete();
-
-		$this->db->query('PRAGMA foreign_keys = ON');
-
-		$this->db->resetDataCache();
-
-		return $success;
-	}
-
-	/**
-	 * Drops columns from the table.
-	 *
-	 * @param string|array $columns
-	 *
-	 * @return Table
-	 */
-	public function dropColumn($columns)
-	{
-		//unset($this->fields[$column]);
-
-		if (is_string($columns))
-		{
-			$columns = explode(',', $columns);
-		}
-
-		foreach ($columns as $column)
-		{
-			$column = trim($column);
-			if (isset($this->fields[$column]))
-			{
-				unset($this->fields[$column]);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Modifies a field, including changing data type,
-	 * renaming, etc.
-	 *
-	 * @param array $field
-	 *
-	 * @return Table
-	 */
-	public function modifyColumn(array $field)
-	{
-		$field = $field[0];
-
-		$oldName = $field['name'];
-		unset($field['name']);
-
-		$this->fields[$oldName] = $field;
-
-		return $this;
-	}
-
-	/**
-	 * Drops a foreign key from this table so that
-	 * it won't be recreated in the future.
-	 *
-	 * @param string $column
-	 *
-	 * @return Table
-	 */
-	public function dropForeignKey(string $column)
-	{
-		if (empty($this->foreignKeys))
-		{
-			return $this;
-		}
-
-		for ($i = 0; $i < count($this->foreignKeys); $i++)
-		{
-			if ($this->foreignKeys[$i]->table_name !== $this->tableName)
-			{
-				continue;
-			}
-
-			// The column name should be the first thing in the constraint name
-			if (strpos($this->foreignKeys[$i]->constraint_name, $column) !== 0)
-			{
-				continue;
-			}
-
-			unset($this->foreignKeys[$i]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Creates the new table based on our current fields.
-	 *
-	 * @return mixed
-	 */
-	protected function createTable()
-	{
-		$this->dropIndexes();
-		$this->db->resetDataCache();
-
-		// Handle any modified columns.
-		$fields = [];
-		foreach ($this->fields as $name => $field)
-		{
-			if (isset($field['new_name']))
-			{
-				$fields[$field['new_name']] = $field;
-				continue;
-			}
-
-			$fields[$name] = $field;
-		}
-
-		$this->forge->addField($fields);
-
-		// Unique/Index keys
-		if (is_array($this->keys))
-		{
-			foreach ($this->keys as $key)
-			{
-				switch ($key['type'])
-				{
-					case 'primary':
-						$this->forge->addPrimaryKey($key['fields']);
-						break;
-					case 'unique':
-						$this->forge->addUniqueKey($key['fields']);
-						break;
-					case 'index':
-						$this->forge->addKey($key['fields']);
-						break;
-				}
-			}
-		}
-
-		// Foreign Keys
-
-		return $this->forge->createTable($this->tableName);
-	}
-
-	/**
-	 * Copies data from our old table to the new one,
-	 * taking care map data correctly based on any columns
-	 * that have been renamed.
-	 *
-	 * @return void
-	 */
-	protected function copyData()
-	{
-		$exFields  = [];
-		$newFields = [];
-
-		foreach ($this->fields as $name => $details)
-		{
-			$newFields[] = $details['new_name'] ?? $name;
-			$exFields[]  = $name;
-		}
-
-		$exFields  = implode(', ', $exFields);
-		$newFields = implode(', ', $newFields);
-
-		// @phpstan-ignore-next-line
-		$this->db->query("INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}");
-	}
-
-	/**
-	 * Converts fields retrieved from the database to
-	 * the format needed for creating fields with Forge.
-	 *
-	 * @param array|boolean $fields
-	 *
-	 * @return mixed
-	 */
-	protected function formatFields($fields)
-	{
-		if (! is_array($fields))
-		{
-			return $fields;
-		}
-
-		$return = [];
-
-		foreach ($fields as $field)
-		{
-			$return[$field->name] = [
-				'type'    => $field->type,
-				'default' => $field->default,
-				'null'    => $field->nullable,
-			];
-
-			if ($field->primary_key)
-			{
-				$this->keys[$field->name] = [
-					'fields' => [$field->name],
-					'type'   => 'primary',
-				];
-			}
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Converts keys retrieved from the database to
-	 * the format needed to create later.
-	 *
-	 * @param mixed $keys
-	 *
-	 * @return mixed
-	 */
-	protected function formatKeys($keys)
-	{
-		if (! is_array($keys))
-		{
-			return $keys;
-		}
-
-		$return = [];
-
-		foreach ($keys as $name => $key)
-		{
-			$return[$name] = [
-				'fields' => $key->fields,
-				'type'   => 'index',
-			];
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Attempts to drop all indexes and constraints
-	 * from the database for this table.
-	 *
-	 * @return null|void
-	 */
-	protected function dropIndexes()
-	{
-		if (! is_array($this->keys) || $this->keys === [])
-		{
-			return;
-		}
-
-		foreach ($this->keys as $name => $key)
-		{
-			if ($key['type'] === 'primary' || $key['type'] === 'unique')
-			{
-				continue;
-			}
-
-			$this->db->query("DROP INDEX IF EXISTS '{$name}'");
-		}
-	}
+    /**
+     * All of the fields this table represents.
+     *
+     * @var array
+     */
+    protected $fields = [];
+
+    /**
+     * All of the unique/primary keys in the table.
+     *
+     * @var array
+     */
+    protected $keys = [];
+
+    /**
+     * All of the foreign keys in the table.
+     *
+     * @var array
+     */
+    protected $foreignKeys = [];
+
+    /**
+     * The name of the table we're working with.
+     *
+     * @var string
+     */
+    protected $tableName;
+
+    /**
+     * The name of the table, with database prefix
+     *
+     * @var string
+     */
+    protected $prefixedTableName;
+
+    /**
+     * Database connection.
+     *
+     * @var Connection
+     */
+    protected $db;
+
+    /**
+     * Handle to our forge.
+     *
+     * @var Forge
+     */
+    protected $forge;
+
+    /**
+     * Table constructor.
+     */
+    public function __construct(Connection $db, Forge $forge)
+    {
+        $this->db    = $db;
+        $this->forge = $forge;
+    }
+
+    /**
+     * Reads an existing database table and
+     * collects all of the information needed to
+     * recreate this table.
+     *
+     * @return Table
+     */
+    public function fromTable(string $table)
+    {
+        $this->prefixedTableName = $table;
+
+        $prefix = $this->db->DBPrefix;
+
+        if (! empty($prefix) && strpos($table, $prefix) === 0) {
+            $table = substr($table, strlen($prefix));
+        }
+
+        if (! $this->db->tableExists($this->prefixedTableName)) {
+            throw DataException::forTableNotFound($this->prefixedTableName);
+        }
+
+        $this->tableName = $table;
+
+        $this->fields = $this->formatFields($this->db->getFieldData($table));
+
+        $this->keys = array_merge($this->keys, $this->formatKeys($this->db->getIndexData($table)));
+
+        $this->foreignKeys = $this->db->getForeignKeyData($table);
+
+        return $this;
+    }
+
+    /**
+     * Called after `fromTable` and any actions, like `dropColumn`, etc,
+     * to finalize the action. It creates a temp table, creates the new
+     * table with modifications, and copies the data over to the new table.
+     * Resets the connection dataCache to be sure changes are collected.
+     */
+    public function run(): bool
+    {
+        $this->db->query('PRAGMA foreign_keys = OFF');
+
+        $this->db->transStart();
+
+        $this->forge->renameTable($this->tableName, "temp_{$this->tableName}");
+
+        $this->forge->reset();
+
+        $this->createTable();
+
+        $this->copyData();
+
+        $this->forge->dropTable("temp_{$this->tableName}");
+
+        $success = $this->db->transComplete();
+
+        $this->db->query('PRAGMA foreign_keys = ON');
+
+        $this->db->resetDataCache();
+
+        return $success;
+    }
+
+    /**
+     * Drops columns from the table.
+     *
+     * @param array|string $columns
+     *
+     * @return Table
+     */
+    public function dropColumn($columns)
+    {
+        if (is_string($columns)) {
+            $columns = explode(',', $columns);
+        }
+
+        foreach ($columns as $column) {
+            $column = trim($column);
+            if (isset($this->fields[$column])) {
+                unset($this->fields[$column]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Modifies a field, including changing data type,
+     * renaming, etc.
+     *
+     * @return Table
+     */
+    public function modifyColumn(array $field)
+    {
+        $field = $field[0];
+
+        $oldName = $field['name'];
+        unset($field['name']);
+
+        $this->fields[$oldName] = $field;
+
+        return $this;
+    }
+
+    /**
+     * Drops a foreign key from this table so that
+     * it won't be recreated in the future.
+     *
+     * @return Table
+     */
+    public function dropForeignKey(string $column)
+    {
+        if (empty($this->foreignKeys)) {
+            return $this;
+        }
+
+        for ($i = 0; $i < count($this->foreignKeys); $i++) {
+            if ($this->foreignKeys[$i]->table_name !== $this->tableName) {
+                continue;
+            }
+
+            // The column name should be the first thing in the constraint name
+            if (strpos($this->foreignKeys[$i]->constraint_name, $column) !== 0) {
+                continue;
+            }
+
+            unset($this->foreignKeys[$i]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Creates the new table based on our current fields.
+     *
+     * @return mixed
+     */
+    protected function createTable()
+    {
+        $this->dropIndexes();
+        $this->db->resetDataCache();
+
+        // Handle any modified columns.
+        $fields = [];
+
+        foreach ($this->fields as $name => $field) {
+            if (isset($field['new_name'])) {
+                $fields[$field['new_name']] = $field;
+
+                continue;
+            }
+
+            $fields[$name] = $field;
+        }
+
+        $this->forge->addField($fields);
+
+        // Unique/Index keys
+        if (is_array($this->keys)) {
+            foreach ($this->keys as $key) {
+                switch ($key['type']) {
+                    case 'primary':
+                        $this->forge->addPrimaryKey($key['fields']);
+                        break;
+
+                    case 'unique':
+                        $this->forge->addUniqueKey($key['fields']);
+                        break;
+
+                    case 'index':
+                        $this->forge->addKey($key['fields']);
+                        break;
+                }
+            }
+        }
+
+        return $this->forge->createTable($this->tableName);
+    }
+
+    /**
+     * Copies data from our old table to the new one,
+     * taking care map data correctly based on any columns
+     * that have been renamed.
+     */
+    protected function copyData()
+    {
+        $exFields  = [];
+        $newFields = [];
+
+        foreach ($this->fields as $name => $details) {
+            $newFields[] = $details['new_name'] ?? $name;
+            $exFields[]  = $name;
+        }
+
+        $exFields  = implode(', ', $exFields);
+        $newFields = implode(', ', $newFields);
+
+        $this->db->query("INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}");
+    }
+
+    /**
+     * Converts fields retrieved from the database to
+     * the format needed for creating fields with Forge.
+     *
+     * @param array|bool $fields
+     *
+     * @return mixed
+     */
+    protected function formatFields($fields)
+    {
+        if (! is_array($fields)) {
+            return $fields;
+        }
+
+        $return = [];
+
+        foreach ($fields as $field) {
+            $return[$field->name] = [
+                'type'    => $field->type,
+                'default' => $field->default,
+                'null'    => $field->nullable,
+            ];
+
+            if ($field->primary_key) {
+                $this->keys[$field->name] = [
+                    'fields' => [$field->name],
+                    'type'   => 'primary',
+                ];
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Converts keys retrieved from the database to
+     * the format needed to create later.
+     *
+     * @param mixed $keys
+     *
+     * @return mixed
+     */
+    protected function formatKeys($keys)
+    {
+        if (! is_array($keys)) {
+            return $keys;
+        }
+
+        $return = [];
+
+        foreach ($keys as $name => $key) {
+            $return[$name] = [
+                'fields' => $key->fields,
+                'type'   => 'index',
+            ];
+        }
+
+        return $return;
+    }
+
+    /**
+     * Attempts to drop all indexes and constraints
+     * from the database for this table.
+     */
+    protected function dropIndexes()
+    {
+        if (! is_array($this->keys) || $this->keys === []) {
+            return;
+        }
+
+        foreach ($this->keys as $name => $key) {
+            if ($key['type'] === 'primary' || $key['type'] === 'unique') {
+                continue;
+            }
+
+            $this->db->query("DROP INDEX IF EXISTS '{$name}'");
+        }
+    }
 }
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index 95cf9bad8974..f0cc5dfcf2dc 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -19,26 +19,20 @@
  */
 class Utils extends BaseUtils
 {
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $optimizeTable = 'REINDEX %s';
+    /**
+     * OPTIMIZE TABLE statement
+     *
+     * @var string
+     */
+    protected $optimizeTable = 'REINDEX %s';
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	public function _backup(array $prefs = null)
-	{
-		throw new DatabaseException('Unsupported feature of the database platform you are using.');
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    public function _backup(?array $prefs = null)
+    {
+        throw new DatabaseException('Unsupported feature of the database platform you are using.');
+    }
 }
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 6d32702f40e4..b6127af2cd91 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -22,191 +22,168 @@
  */
 class Seeder
 {
-	/**
-	 * The name of the database group to use.
-	 *
-	 * @var string
-	 */
-	protected $DBGroup;
-
-	/**
-	 * Where we can find the Seed files.
-	 *
-	 * @var string
-	 */
-	protected $seedPath;
-
-	/**
-	 * An instance of the main Database configuration
-	 *
-	 * @var Database
-	 */
-	protected $config;
-
-	/**
-	 * Database Connection instance
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * Database Forge instance.
-	 *
-	 * @var Forge
-	 */
-	protected $forge;
-
-	/**
-	 * If true, will not display CLI messages.
-	 *
-	 * @var boolean
-	 */
-	protected $silent = false;
-
-	/**
-	 * Faker Generator instance.
-	 *
-	 * @var Generator|null
-	 */
-	private static $faker;
-
-	/**
-	 * Seeder constructor.
-	 *
-	 * @param Database            $config
-	 * @param BaseConnection|null $db
-	 */
-	public function __construct(Database $config, BaseConnection $db = null)
-	{
-		$this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
-
-		if (empty($this->seedPath))
-		{
-			throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
-		}
-
-		$this->seedPath = rtrim($this->seedPath, '\\/') . '/Seeds/';
-
-		if (! is_dir($this->seedPath))
-		{
-			throw new InvalidArgumentException('Unable to locate the seeds directory. Please check Config\Database::filesPath');
-		}
-
-		$this->config = &$config;
-
-		$db = $db ?? Database::connect($this->DBGroup);
-
-		$this->db    = &$db;
-		$this->forge = Database::forge($this->DBGroup);
-	}
-
-	/**
-	 * Gets the Faker Generator instance.
-	 *
-	 * @return Generator|null
-	 */
-	public static function faker(): ?Generator
-	{
-		if (self::$faker === null && class_exists(Factory::class))
-		{
-			self::$faker = Factory::create();
-		}
-
-		return self::$faker;
-	}
-
-	/**
-	 * Loads the specified seeder and runs it.
-	 *
-	 * @param string $class
-	 *
-	 * @throws InvalidArgumentException
-	 *
-	 * @return void
-	 */
-	public function call(string $class)
-	{
-		$class = trim($class);
-
-		if ($class === '')
-		{
-			throw new InvalidArgumentException('No seeder was specified.');
-		}
-
-		if (strpos($class, '\\') === false)
-		{
-			$path = $this->seedPath . str_replace('.php', '', $class) . '.php';
-
-			if (! is_file($path))
-			{
-				throw new InvalidArgumentException('The specified seeder is not a valid file: ' . $path);
-			}
-
-			// Assume the class has the correct namespace
-			// @codeCoverageIgnoreStart
-			$class = APP_NAMESPACE . '\Database\Seeds\\' . $class;
-
-			if (! class_exists($class, false))
-			{
-				require_once $path;
-			}
-			// @codeCoverageIgnoreEnd
-		}
-
-		/**
-		 * @var Seeder
-		 */
-		$seeder = new $class($this->config);
-		$seeder->setSilent($this->silent)->run();
-
-		unset($seeder);
-
-		if (is_cli() && ! $this->silent)
-		{
-			CLI::write("Seeded: {$class}", 'green');
-		}
-	}
-
-	/**
-	 * Sets the location of the directory that seed files can be located in.
-	 *
-	 * @param string $path
-	 *
-	 * @return $this
-	 */
-	public function setPath(string $path)
-	{
-		$this->seedPath = rtrim($path, '\\/') . '/';
-
-		return $this;
-	}
-
-	/**
-	 * Sets the silent treatment.
-	 *
-	 * @param boolean $silent
-	 *
-	 * @return $this
-	 */
-	public function setSilent(bool $silent)
-	{
-		$this->silent = $silent;
-
-		return $this;
-	}
-
-	/**
-	 * Run the database seeds. This is where the magic happens.
-	 *
-	 * Child classes must implement this method and take care
-	 * of inserting their data here.
-	 *
-	 * @return mixed
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function run()
-	{
-	}
+    /**
+     * The name of the database group to use.
+     *
+     * @var string
+     */
+    protected $DBGroup;
+
+    /**
+     * Where we can find the Seed files.
+     *
+     * @var string
+     */
+    protected $seedPath;
+
+    /**
+     * An instance of the main Database configuration
+     *
+     * @var Database
+     */
+    protected $config;
+
+    /**
+     * Database Connection instance
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * Database Forge instance.
+     *
+     * @var Forge
+     */
+    protected $forge;
+
+    /**
+     * If true, will not display CLI messages.
+     *
+     * @var bool
+     */
+    protected $silent = false;
+
+    /**
+     * Faker Generator instance.
+     *
+     * @var Generator|null
+     */
+    private static $faker;
+
+    /**
+     * Seeder constructor.
+     */
+    public function __construct(Database $config, ?BaseConnection $db = null)
+    {
+        $this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
+
+        if (empty($this->seedPath)) {
+            throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
+        }
+
+        $this->seedPath = rtrim($this->seedPath, '\\/') . '/Seeds/';
+
+        if (! is_dir($this->seedPath)) {
+            throw new InvalidArgumentException('Unable to locate the seeds directory. Please check Config\Database::filesPath');
+        }
+
+        $this->config = &$config;
+
+        $db = $db ?? Database::connect($this->DBGroup);
+
+        $this->db    = &$db;
+        $this->forge = Database::forge($this->DBGroup);
+    }
+
+    /**
+     * Gets the Faker Generator instance.
+     */
+    public static function faker(): ?Generator
+    {
+        if (self::$faker === null && class_exists(Factory::class)) {
+            self::$faker = Factory::create();
+        }
+
+        return self::$faker;
+    }
+
+    /**
+     * Loads the specified seeder and runs it.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function call(string $class)
+    {
+        $class = trim($class);
+
+        if ($class === '') {
+            throw new InvalidArgumentException('No seeder was specified.');
+        }
+
+        if (strpos($class, '\\') === false) {
+            $path = $this->seedPath . str_replace('.php', '', $class) . '.php';
+
+            if (! is_file($path)) {
+                throw new InvalidArgumentException('The specified seeder is not a valid file: ' . $path);
+            }
+
+            // Assume the class has the correct namespace
+            // @codeCoverageIgnoreStart
+            $class = APP_NAMESPACE . '\Database\Seeds\\' . $class;
+
+            if (! class_exists($class, false)) {
+                require_once $path;
+            }
+            // @codeCoverageIgnoreEnd
+        }
+
+        /** @var Seeder $seeder */
+        $seeder = new $class($this->config);
+        $seeder->setSilent($this->silent)->run();
+
+        unset($seeder);
+
+        if (is_cli() && ! $this->silent) {
+            CLI::write("Seeded: {$class}", 'green');
+        }
+    }
+
+    /**
+     * Sets the location of the directory that seed files can be located in.
+     *
+     * @return $this
+     */
+    public function setPath(string $path)
+    {
+        $this->seedPath = rtrim($path, '\\/') . '/';
+
+        return $this;
+    }
+
+    /**
+     * Sets the silent treatment.
+     *
+     * @return $this
+     */
+    public function setSilent(bool $silent)
+    {
+        $this->silent = $silent;
+
+        return $this;
+    }
+
+    /**
+     * Run the database seeds. This is where the magic happens.
+     *
+     * Child classes must implement this method and take care
+     * of inserting their data here.
+     *
+     * @return mixed
+     *
+     * @codeCoverageIgnore
+     */
+    public function run()
+    {
+    }
 }
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 18e30b21f05f..5950148984ef 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -17,515 +17,421 @@
 use CodeIgniter\HTTP\Response;
 use Config\Exceptions as ExceptionsConfig;
 use Config\Paths;
-use function error_reporting;
 use ErrorException;
 use Throwable;
+use function error_reporting;
 
 /**
  * Exceptions manager
  */
 class Exceptions
 {
-	use ResponseTrait;
-
-	/**
-	 * Nesting level of the output buffering mechanism
-	 *
-	 * @var integer
-	 */
-	public $ob_level;
-
-	/**
-	 * The path to the directory containing the
-	 * cli and html error view directories.
-	 *
-	 * @var string
-	 */
-	protected $viewPath;
-
-	/**
-	 * Config for debug exceptions.
-	 *
-	 * @var ExceptionsConfig
-	 */
-	protected $config;
-
-	/**
-	 * The incoming request.
-	 *
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	/**
-	 * The outgoing response.
-	 *
-	 * @var Response
-	 */
-	protected $response;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param ExceptionsConfig $config
-	 * @param IncomingRequest  $request
-	 * @param Response         $response
-	 */
-	public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
-	{
-		$this->ob_level = ob_get_level();
-
-		$this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR;
-
-		$this->config = $config;
-
-		$this->request  = $request;
-		$this->response = $response;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Responsible for registering the error, exception and shutdown
-	 * handling of our application.
-	 */
-	public function initialize()
-	{
-		//Set the Exception Handler
-		set_exception_handler([$this, 'exceptionHandler']);
-
-		// Set the Error Handler
-		set_error_handler([$this, 'errorHandler']);
-
-		// Set the handler for shutdown to catch Parse errors
-		// Do we need this in PHP7?
-		register_shutdown_function([$this, 'shutdownHandler']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Catches any uncaught errors and exceptions, including most Fatal errors
-	 * (Yay PHP7!). Will log the error, display it if display_errors is on,
-	 * and fire an event that allows custom actions to be taken at this point.
-	 *
-	 * @param Throwable $exception
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function exceptionHandler(Throwable $exception)
-	{
-		[
-			$statusCode,
-			$exitCode,
-		] = $this->determineCodes($exception);
-
-		// Log it
-		if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true))
-		{
-			log_message('critical', $exception->getMessage() . "\n{trace}", [
-							'trace' => $exception->getTraceAsString(),
-						]);
-		}
-
-		if (! is_cli())
-		{
-			$this->response->setStatusCode($statusCode);
-			$header = "HTTP/{$this->request->getProtocolVersion()} {$this->response->getStatusCode()} {$this->response->getReason()}";
-			header($header, true, $statusCode);
-
-			if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false)
-			{
-				$this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();
-
-				exit($exitCode);
-			}
-		}
-
-		$this->render($exception, $statusCode);
-
-		exit($exitCode);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Even in PHP7, some errors make it through to the errorHandler, so
-	 * convert these to Exceptions and let the exception handler log it and
-	 * display it.
-	 *
-	 * This seems to be primarily when a user triggers it with trigger_error().
-	 *
-	 * @param integer      $severity
-	 * @param string       $message
-	 * @param string|null  $file
-	 * @param integer|null $line
-	 *
-	 * @throws ErrorException
-	 */
-	public function errorHandler(int $severity, string $message, string $file = null, int $line = null)
-	{
-		if (! (error_reporting() & $severity))
-		{
-			return;
-		}
-
-		// Convert it to an exception and pass it along.
-		throw new ErrorException($message, 0, $severity, $file, $line);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if any errors have happened during shutdown that
-	 * need to be caught and handle them.
-	 */
-	public function shutdownHandler()
-	{
-		$error = error_get_last();
-
-		// If we've got an error that hasn't been displayed, then convert
-		// it to an Exception and use the Exception handler to display it
-		// to the user.
-		// Fatal Error?
-		if (! is_null($error) && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true))
-		{
-			$this->exceptionHandler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the view to display based on the exception thrown,
-	 * whether an HTTP or CLI request, etc.
-	 *
-	 * @param Throwable $exception
-	 * @param string    $templatePath
-	 *
-	 * @return string       The path and filename of the view file to use
-	 */
-	protected function determineView(Throwable $exception, string $templatePath): string
-	{
-		// Production environments should have a custom exception file.
-		$view         = 'production.php';
-		$templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
-
-		if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')))
-		{
-			$view = 'error_exception.php';
-		}
-
-		// 404 Errors
-		if ($exception instanceof PageNotFoundException)
-		{
-			return 'error_404.php';
-		}
-
-		// Allow for custom views based upon the status code
-		if (is_file($templatePath . 'error_' . $exception->getCode() . '.php'))
-		{
-			return 'error_' . $exception->getCode() . '.php';
-		}
-
-		return $view;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given an exception and status code will display the error to the client.
-	 *
-	 * @param Throwable $exception
-	 * @param integer   $statusCode
-	 */
-	protected function render(Throwable $exception, int $statusCode)
-	{
-		// Determine possible directories of error views
-		$path    = $this->viewPath;
-		$altPath = rtrim((new Paths())->viewDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'errors' . DIRECTORY_SEPARATOR;
-
-		$path    .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
-		$altPath .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
-
-		// Determine the views
-		$view    = $this->determineView($exception, $path);
-		$altView = $this->determineView($exception, $altPath);
-
-		// Check if the view exists
-		if (is_file($path . $view))
-		{
-			$viewFile = $path . $view;
-		}
-		elseif (is_file($altPath . $altView))
-		{
-			$viewFile = $altPath . $altView;
-		}
-
-		// Prepare the vars
-		$vars = $this->collectVars($exception, $statusCode);
-		extract($vars);
-
-		// Render it
-		if (ob_get_level() > $this->ob_level + 1)
-		{
-			ob_end_clean();
-		}
-
-		ob_start();
-		include $viewFile; // @phpstan-ignore-line
-		$buffer = ob_get_contents();
-		ob_end_clean();
-		echo $buffer;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gathers the variables that will be made available to the view.
-	 *
-	 * @param Throwable $exception
-	 * @param integer   $statusCode
-	 *
-	 * @return array
-	 */
-	protected function collectVars(Throwable $exception, int $statusCode): array
-	{
-		$trace = $exception->getTrace();
-		if (! empty($this->config->sensitiveDataInTrace))
-		{
-			$this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);
-		}
-
-		return [
-			'title'   => get_class($exception),
-			'type'    => get_class($exception),
-			'code'    => $statusCode,
-			'message' => $exception->getMessage() ?? '(null)',
-			'file'    => $exception->getFile(),
-			'line'    => $exception->getLine(),
-			'trace'   => $trace,
-		];
-	}
-
-	/**
-	 * Mask sensitive data in the trace.
-	 *
-	 * @param array|object $trace
-	 * @param array        $keysToMask
-	 * @param string       $path
-	 */
-	protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '') 
-	{
-		foreach ($keysToMask as $keyToMask) 
-		{
-			$explode = explode('/', $keyToMask);
-			$index   = end($explode);
-
-			if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0)
-			{
-				if (is_array($trace) && array_key_exists($index, $trace)) 
-				{
-					$trace[$index] = '******************';
-				} 
-				elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->$index)) 
-				{
-					$trace->$index = '******************';
-				}
-			}
-		}
-
-		if (! is_iterable($trace) && is_object($trace)) 
-		{
-			$trace = get_object_vars($trace);
-		}
-
-		if (is_iterable($trace)) 
-		{
-			foreach ($trace as $pathKey => $subarray) 
-			{
-				$this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey);
-			}
-		}
-	}
-
-	/**
-	 * Determines the HTTP status code and the exit status code for this request.
-	 *
-	 * @param Throwable $exception
-	 *
-	 * @return array
-	 */
-	protected function determineCodes(Throwable $exception): array
-	{
-		$statusCode = abs($exception->getCode());
-
-		if ($statusCode < 100 || $statusCode > 599)
-		{
-			$exitStatus = $statusCode + EXIT__AUTO_MIN; // 9 is EXIT__AUTO_MIN
-			if ($exitStatus > EXIT__AUTO_MAX) // 125 is EXIT__AUTO_MAX
-			{
-				$exitStatus = EXIT_ERROR; // EXIT_ERROR
-			}
-			$statusCode = 500;
-		}
-		else
-		{
-			$exitStatus = 1; // EXIT_ERROR
-		}
-
-		return [
-			$statusCode ?: 500,
-			$exitStatus,
-		];
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Display Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Clean Path
-	 *
-	 * This makes nicer looking paths for the error output.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 */
-	public static function cleanPath(string $file): string
-	{
-		switch (true)
-		{
-			case strpos($file, APPPATH) === 0:
-				$file = 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH));
-				break;
-			case strpos($file, SYSTEMPATH) === 0:
-				$file = 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(SYSTEMPATH));
-				break;
-			case strpos($file, FCPATH) === 0:
-				$file = 'FCPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(FCPATH));
-				break;
-			case defined('VENDORPATH') && strpos($file, VENDORPATH) === 0:
-				$file = 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VENDORPATH));
-				break;
-		}
-
-		return $file;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Describes memory usage in real-world units. Intended for use
-	 * with memory_get_usage, etc.
-	 *
-	 * @param integer $bytes
-	 *
-	 * @return string
-	 */
-	public static function describeMemory(int $bytes): string
-	{
-		if ($bytes < 1024)
-		{
-			return $bytes . 'B';
-		}
-		if ($bytes < 1048576)
-		{
-			return round($bytes / 1024, 2) . 'KB';
-		}
-
-		return round($bytes / 1048576, 2) . 'MB';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Creates a syntax-highlighted version of a PHP file.
-	 *
-	 * @param string  $file
-	 * @param integer $lineNumber
-	 * @param integer $lines
-	 *
-	 * @return boolean|string
-	 */
-	public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
-	{
-		if (empty($file) || ! is_readable($file))
-		{
-			return false;
-		}
-
-		// Set our highlight colors:
-		if (function_exists('ini_set'))
-		{
-			ini_set('highlight.comment', '#767a7e; font-style: italic');
-			ini_set('highlight.default', '#c7c7c7');
-			ini_set('highlight.html', '#06B');
-			ini_set('highlight.keyword', '#f1ce61;');
-			ini_set('highlight.string', '#869d6a');
-		}
-
-		try
-		{
-			$source = file_get_contents($file);
-		}
-		catch (Throwable $e)
-		{
-			return false;
-		}
-
-		$source = str_replace(["\r\n", "\r"], "\n", $source);
-		$source = explode("\n", highlight_string($source, true));
-		$source = str_replace('<br />', "\n", $source[1]);
-
-		$source = explode("\n", str_replace("\r\n", "\n", $source));
-
-		// Get just the part to show
-		$start = $lineNumber - (int) round($lines / 2);
-		$start = $start < 0 ? 0 : $start;
-
-		// Get just the lines we need to display, while keeping line numbers...
-		$source = array_splice($source, $start, $lines, true); // @phpstan-ignore-line
-
-		// Used to format the line number in the source
-		$format = '% ' . strlen(sprintf('%s', $start + $lines)) . 'd';
-
-		$out = '';
-		// Because the highlighting may have an uneven number
-		// 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;
-
-		foreach ($source as $n => $row)
-		{
-			$spans += substr_count($row, '<span') - substr_count($row, '</span');
-
-			$row = str_replace(["\r", "\n"], ['', ''], $row);
-
-			if (($n + $start + 1) === $lineNumber)
-			{
-				preg_match_all('#<[^>]+>#', $row, $tags);
-				$out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s", $n + $start + 1, strip_tags($row), implode('', $tags[0])
-				);
-			}
-			else
-			{
-				$out .= sprintf('<span class="line"><span class="number">' . $format . '</span> %s', $n + $start + 1, $row) . "\n";
-			}
-		}
-
-		if ($spans > 0)
-		{
-			$out .= str_repeat('</span>', $spans);
-		}
-
-		return '<pre><code>' . $out . '</code></pre>';
-	}
-
-	//--------------------------------------------------------------------
+    use ResponseTrait;
+
+    /**
+     * Nesting level of the output buffering mechanism
+     *
+     * @var int
+     */
+    public $ob_level;
+
+    /**
+     * The path to the directory containing the
+     * cli and html error view directories.
+     *
+     * @var string
+     */
+    protected $viewPath;
+
+    /**
+     * Config for debug exceptions.
+     *
+     * @var ExceptionsConfig
+     */
+    protected $config;
+
+    /**
+     * The incoming request.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * The outgoing response.
+     *
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
+    {
+        $this->ob_level = ob_get_level();
+
+        $this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR;
+
+        $this->config = $config;
+
+        $this->request  = $request;
+        $this->response = $response;
+    }
+
+    /**
+     * Responsible for registering the error, exception and shutdown
+     * handling of our application.
+     */
+    public function initialize()
+    {
+        // Set the Exception Handler
+        set_exception_handler([$this, 'exceptionHandler']);
+
+        // Set the Error Handler
+        set_error_handler([$this, 'errorHandler']);
+
+        // Set the handler for shutdown to catch Parse errors
+        // Do we need this in PHP7?
+        register_shutdown_function([$this, 'shutdownHandler']);
+    }
+
+    /**
+     * Catches any uncaught errors and exceptions, including most Fatal errors
+     * (Yay PHP7!). Will log the error, display it if display_errors is on,
+     * and fire an event that allows custom actions to be taken at this point.
+     *
+     * @codeCoverageIgnore
+     */
+    public function exceptionHandler(Throwable $exception)
+    {
+        [
+            $statusCode,
+            $exitCode,
+        ] = $this->determineCodes($exception);
+
+        // Log it
+        if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
+            log_message('critical', $exception->getMessage() . "\n{trace}", [
+                'trace' => $exception->getTraceAsString(),
+            ]);
+        }
+
+        if (! is_cli()) {
+            $this->response->setStatusCode($statusCode);
+            $header = "HTTP/{$this->request->getProtocolVersion()} {$this->response->getStatusCode()} {$this->response->getReason()}";
+            header($header, true, $statusCode);
+
+            if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false) {
+                $this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();
+
+                exit($exitCode);
+            }
+        }
+
+        $this->render($exception, $statusCode);
+
+        exit($exitCode);
+    }
+
+    /**
+     * Even in PHP7, some errors make it through to the errorHandler, so
+     * convert these to Exceptions and let the exception handler log it and
+     * display it.
+     *
+     * This seems to be primarily when a user triggers it with trigger_error().
+     *
+     * @throws ErrorException
+     */
+    public function errorHandler(int $severity, string $message, ?string $file = null, ?int $line = null)
+    {
+        if (! (error_reporting() & $severity)) {
+            return;
+        }
+
+        // Convert it to an exception and pass it along.
+        throw new ErrorException($message, 0, $severity, $file, $line);
+    }
+
+    /**
+     * Checks to see if any errors have happened during shutdown that
+     * need to be caught and handle them.
+     */
+    public function shutdownHandler()
+    {
+        $error = error_get_last();
+
+        // If we've got an error that hasn't been displayed, then convert
+        // it to an Exception and use the Exception handler to display it
+        // to the user.
+        // Fatal Error?
+        if ($error !== null && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) {
+            $this->exceptionHandler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
+        }
+    }
+
+    /**
+     * Determines the view to display based on the exception thrown,
+     * whether an HTTP or CLI request, etc.
+     *
+     * @return string The path and filename of the view file to use
+     */
+    protected function determineView(Throwable $exception, string $templatePath): string
+    {
+        // Production environments should have a custom exception file.
+        $view         = 'production.php';
+        $templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
+
+        if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors'))) {
+            $view = 'error_exception.php';
+        }
+
+        // 404 Errors
+        if ($exception instanceof PageNotFoundException) {
+            return 'error_404.php';
+        }
+
+        // Allow for custom views based upon the status code
+        if (is_file($templatePath . 'error_' . $exception->getCode() . '.php')) {
+            return 'error_' . $exception->getCode() . '.php';
+        }
+
+        return $view;
+    }
+
+    /**
+     * Given an exception and status code will display the error to the client.
+     */
+    protected function render(Throwable $exception, int $statusCode)
+    {
+        // Determine possible directories of error views
+        $path    = $this->viewPath;
+        $altPath = rtrim((new Paths())->viewDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'errors' . DIRECTORY_SEPARATOR;
+
+        $path    .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
+        $altPath .= (is_cli() ? 'cli' : 'html') . DIRECTORY_SEPARATOR;
+
+        // Determine the views
+        $view    = $this->determineView($exception, $path);
+        $altView = $this->determineView($exception, $altPath);
+
+        // Check if the view exists
+        if (is_file($path . $view)) {
+            $viewFile = $path . $view;
+        } elseif (is_file($altPath . $altView)) {
+            $viewFile = $altPath . $altView;
+        }
+
+        // Prepare the vars
+        $vars = $this->collectVars($exception, $statusCode);
+        extract($vars);
+
+        // Render it
+        if (ob_get_level() > $this->ob_level + 1) {
+            ob_end_clean();
+        }
+
+        ob_start();
+        include $viewFile; // @phpstan-ignore-line
+        $buffer = ob_get_contents();
+        ob_end_clean();
+        echo $buffer;
+    }
+
+    /**
+     * Gathers the variables that will be made available to the view.
+     */
+    protected function collectVars(Throwable $exception, int $statusCode): array
+    {
+        $trace = $exception->getTrace();
+        if (! empty($this->config->sensitiveDataInTrace)) {
+            $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);
+        }
+
+        return [
+            'title'   => get_class($exception),
+            'type'    => get_class($exception),
+            'code'    => $statusCode,
+            'message' => $exception->getMessage() ?? '(null)',
+            'file'    => $exception->getFile(),
+            'line'    => $exception->getLine(),
+            'trace'   => $trace,
+        ];
+    }
+
+    /**
+     * Mask sensitive data in the trace.
+     *
+     * @param array|object $trace
+     */
+    protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '')
+    {
+        foreach ($keysToMask as $keyToMask) {
+            $explode = explode('/', $keyToMask);
+            $index   = end($explode);
+
+            if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) {
+                if (is_array($trace) && array_key_exists($index, $trace)) {
+                    $trace[$index] = '******************';
+                } elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->{$index})) {
+                    $trace->{$index} = '******************';
+                }
+            }
+        }
+
+        if (! is_iterable($trace) && is_object($trace)) {
+            $trace = get_object_vars($trace);
+        }
+
+        if (is_iterable($trace)) {
+            foreach ($trace as $pathKey => $subarray) {
+                $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey);
+            }
+        }
+    }
+
+    /**
+     * Determines the HTTP status code and the exit status code for this request.
+     */
+    protected function determineCodes(Throwable $exception): array
+    {
+        $statusCode = abs($exception->getCode());
+
+        if ($statusCode < 100 || $statusCode > 599) {
+            $exitStatus = $statusCode + EXIT__AUTO_MIN; // 9 is EXIT__AUTO_MIN
+            if ($exitStatus > EXIT__AUTO_MAX) { // 125 is EXIT__AUTO_MAX
+                $exitStatus = EXIT_ERROR; // EXIT_ERROR
+            }
+            $statusCode = 500;
+        } else {
+            $exitStatus = 1; // EXIT_ERROR
+        }
+
+        return [
+            $statusCode ?: 500,
+            $exitStatus,
+        ];
+    }
+
+    //--------------------------------------------------------------------
+    // Display Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Clean Path
+     *
+     * This makes nicer looking paths for the error output.
+     */
+    public static function cleanPath(string $file): string
+    {
+        switch (true) {
+            case strpos($file, APPPATH) === 0:
+                $file = 'APPPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(APPPATH));
+                break;
+
+            case strpos($file, SYSTEMPATH) === 0:
+                $file = 'SYSTEMPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(SYSTEMPATH));
+                break;
+
+            case strpos($file, FCPATH) === 0:
+                $file = 'FCPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(FCPATH));
+                break;
+
+            case defined('VENDORPATH') && strpos($file, VENDORPATH) === 0:
+                $file = 'VENDORPATH' . DIRECTORY_SEPARATOR . substr($file, strlen(VENDORPATH));
+                break;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Describes memory usage in real-world units. Intended for use
+     * with memory_get_usage, etc.
+     */
+    public static function describeMemory(int $bytes): string
+    {
+        if ($bytes < 1024) {
+            return $bytes . 'B';
+        }
+        if ($bytes < 1048576) {
+            return round($bytes / 1024, 2) . 'KB';
+        }
+
+        return round($bytes / 1048576, 2) . 'MB';
+    }
+
+    /**
+     * Creates a syntax-highlighted version of a PHP file.
+     *
+     * @return bool|string
+     */
+    public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
+    {
+        if (empty($file) || ! is_readable($file)) {
+            return false;
+        }
+
+        // Set our highlight colors:
+        if (function_exists('ini_set')) {
+            ini_set('highlight.comment', '#767a7e; font-style: italic');
+            ini_set('highlight.default', '#c7c7c7');
+            ini_set('highlight.html', '#06B');
+            ini_set('highlight.keyword', '#f1ce61;');
+            ini_set('highlight.string', '#869d6a');
+        }
+
+        try {
+            $source = file_get_contents($file);
+        } catch (Throwable $e) {
+            return false;
+        }
+
+        $source = str_replace(["\r\n", "\r"], "\n", $source);
+        $source = explode("\n", highlight_string($source, true));
+        $source = str_replace('<br />', "\n", $source[1]);
+
+        $source = explode("\n", str_replace("\r\n", "\n", $source));
+
+        // Get just the part to show
+        $start = $lineNumber - (int) round($lines / 2);
+        $start = $start < 0 ? 0 : $start;
+
+        // Get just the lines we need to display, while keeping line numbers...
+        $source = array_splice($source, $start, $lines, true); // @phpstan-ignore-line
+
+        // Used to format the line number in the source
+        $format = '% ' . strlen(sprintf('%s', $start + $lines)) . 'd';
+
+        $out = '';
+        // Because the highlighting may have an uneven number
+        // 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;
+
+        foreach ($source as $n => $row) {
+            $spans += substr_count($row, '<span') - substr_count($row, '</span');
+
+            $row = str_replace(["\r", "\n"], ['', ''], $row);
+
+            if (($n + $start + 1) === $lineNumber) {
+                preg_match_all('#<[^>]+>#', $row, $tags);
+                $out .= sprintf(
+                    "<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
+                    $n + $start + 1,
+                    strip_tags($row),
+                    implode('', $tags[0])
+                );
+            } else {
+                $out .= sprintf('<span class="line"><span class="number">' . $format . '</span> %s', $n + $start + 1, $row) . "\n";
+            }
+        }
+
+        if ($spans > 0) {
+            $out .= str_repeat('</span>', $spans);
+        }
+
+        return '<pre><code>' . $out . '</code></pre>';
+    }
 }
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index 62dec4f3c4a7..62343745b17b 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -18,106 +18,87 @@
  */
 class Iterator
 {
-	/**
-	 * Stores the tests that we are to run.
-	 *
-	 * @var array
-	 */
-	protected $tests = [];
-
-	/**
-	 * Stores the results of each of the tests.
-	 *
-	 * @var array
-	 */
-	protected $results = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Adds a test to run.
-	 *
-	 * Tests are simply closures that the user can define any sequence of
-	 * things to happen during the test.
-	 *
-	 * @param string  $name
-	 * @param Closure $closure
-	 *
-	 * @return $this
-	 */
-	public function add(string $name, Closure $closure)
-	{
-		$name = strtolower($name);
-
-		$this->tests[$name] = $closure;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Runs through all of the tests that have been added, recording
-	 * time to execute the desired number of iterations, and the approximate
-	 * memory usage used during those iterations.
-	 *
-	 * @param integer $iterations
-	 * @param boolean $output
-	 *
-	 * @return string|null
-	 */
-	public function run(int $iterations = 1000, bool $output = true)
-	{
-		foreach ($this->tests as $name => $test)
-		{
-			// clear memory before start
-			gc_collect_cycles();
-
-			$start    = microtime(true);
-			$startMem = $maxMemory = memory_get_usage(true);
-
-			for ($i = 0; $i < $iterations; $i ++)
-			{
-				$result = $test();
-
-				$maxMemory = max($maxMemory, memory_get_usage(true));
-
-				unset($result);
-			}
-
-			$this->results[$name] = [
-				'time'   => microtime(true) - $start,
-				'memory' => $maxMemory - $startMem,
-				'n'      => $iterations,
-			];
-		}
-
-		if ($output)
-		{
-			return $this->getReport();
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get results.
-	 *
-	 * @return string
-	 */
-	public function getReport(): string
-	{
-		if (empty($this->results))
-		{
-			return 'No results to display.';
-		}
-
-		helper('number');
-
-		// Template
-		$tpl = '<table>
+    /**
+     * Stores the tests that we are to run.
+     *
+     * @var array
+     */
+    protected $tests = [];
+
+    /**
+     * Stores the results of each of the tests.
+     *
+     * @var array
+     */
+    protected $results = [];
+
+    /**
+     * Adds a test to run.
+     *
+     * Tests are simply closures that the user can define any sequence of
+     * things to happen during the test.
+     *
+     * @return $this
+     */
+    public function add(string $name, Closure $closure)
+    {
+        $name = strtolower($name);
+
+        $this->tests[$name] = $closure;
+
+        return $this;
+    }
+
+    /**
+     * Runs through all of the tests that have been added, recording
+     * time to execute the desired number of iterations, and the approximate
+     * memory usage used during those iterations.
+     *
+     * @return string|null
+     */
+    public function run(int $iterations = 1000, bool $output = true)
+    {
+        foreach ($this->tests as $name => $test) {
+            // clear memory before start
+            gc_collect_cycles();
+
+            $start    = microtime(true);
+            $startMem = $maxMemory = memory_get_usage(true);
+
+            for ($i = 0; $i < $iterations; $i++) {
+                $result    = $test();
+                $maxMemory = max($maxMemory, memory_get_usage(true));
+
+                unset($result);
+            }
+
+            $this->results[$name] = [
+                'time'   => microtime(true) - $start,
+                'memory' => $maxMemory - $startMem,
+                'n'      => $iterations,
+            ];
+        }
+
+        if ($output) {
+            return $this->getReport();
+        }
+
+        return null;
+    }
+
+    /**
+     * Get results.
+     */
+    public function getReport(): string
+    {
+        if (empty($this->results)) {
+            return 'No results to display.';
+        }
+
+        helper('number');
+
+        // Template
+        $tpl = '<table>
 			<thead>
 				<tr>
 					<td>Test</td>
@@ -130,24 +111,20 @@ public function getReport(): string
 			</tbody>
 		</table>';
 
-		$rows = '';
+        $rows = '';
 
-		foreach ($this->results as $name => $result)
-		{
-			$memory = number_to_size($result['memory'], 4);
+        foreach ($this->results as $name => $result) {
+            $memory = number_to_size($result['memory'], 4);
 
-			$rows .= "<tr>
+            $rows .= "<tr>
 				<td>{$name}</td>
 				<td>" . number_format($result['time'], 4) . "</td>
 				<td>{$memory}</td>
 			</tr>";
-		}
+        }
 
-		$tpl = str_replace('{rows}', $rows, $tpl);
-
-		return $tpl . '<br/>';
-	}
-
-	//--------------------------------------------------------------------
+        $tpl = str_replace('{rows}', $rows, $tpl);
 
+        return $tpl . '<br/>';
+    }
 }
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 3474109a3580..5783c77aae72 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -21,132 +21,109 @@
  */
 class Timer
 {
-	/**
-	 * List of all timers.
-	 *
-	 * @var array
-	 */
-	protected $timers = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Starts a timer running.
-	 *
-	 * Multiple calls can be made to this method so that several
-	 * execution points can be measured.
-	 *
-	 * @param string $name The name of this timer.
-	 * @param float  $time Allows user to provide time.
-	 *
-	 * @return Timer
-	 */
-	public function start(string $name, float $time = null)
-	{
-		$this->timers[strtolower($name)] = [
-			'start' => ! empty($time) ? $time : microtime(true),
-			'end'   => null,
-		];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stops a running timer.
-	 *
-	 * If the timer is not stopped before the timers() method is called,
-	 * it will be automatically stopped at that point.
-	 *
-	 * @param string $name The name of this timer.
-	 *
-	 * @return Timer
-	 */
-	public function stop(string $name)
-	{
-		$name = strtolower($name);
-
-		if (empty($this->timers[$name]))
-		{
-			throw new RuntimeException('Cannot stop timer: invalid name given.');
-		}
-
-		$this->timers[$name]['end'] = microtime(true);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the duration of a recorded timer.
-	 *
-	 * @param string  $name     The name of the timer.
-	 * @param integer $decimals Number of decimal places.
-	 *
-	 * @return null|float       Returns null if timer exists by that name.
-	 *                          Returns a float representing the number of
-	 *                          seconds elapsed while that timer was running.
-	 */
-	public function getElapsedTime(string $name, int $decimals = 4)
-	{
-		$name = strtolower($name);
-
-		if (empty($this->timers[$name]))
-		{
-			return null;
-		}
-
-		$timer = $this->timers[$name];
-
-		if (empty($timer['end']))
-		{
-			$timer['end'] = microtime(true);
-		}
-
-		return (float) number_format($timer['end'] - $timer['start'], $decimals);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the array of timers, with the duration pre-calculated for you.
-	 *
-	 * @param integer $decimals Number of decimal places
-	 *
-	 * @return array
-	 */
-	public function getTimers(int $decimals = 4): array
-	{
-		$timers = $this->timers;
-
-		foreach ($timers as &$timer)
-		{
-			if (empty($timer['end']))
-			{
-				$timer['end'] = microtime(true);
-			}
-
-			$timer['duration'] = (float) number_format($timer['end'] - $timer['start'], $decimals);
-		}
-
-		return $timers;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks whether or not a timer with the specified name exists.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function has(string $name): bool
-	{
-		return array_key_exists(strtolower($name), $this->timers);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * List of all timers.
+     *
+     * @var array
+     */
+    protected $timers = [];
+
+    /**
+     * Starts a timer running.
+     *
+     * Multiple calls can be made to this method so that several
+     * execution points can be measured.
+     *
+     * @param string $name The name of this timer.
+     * @param float  $time Allows user to provide time.
+     *
+     * @return Timer
+     */
+    public function start(string $name, ?float $time = null)
+    {
+        $this->timers[strtolower($name)] = [
+            'start' => ! empty($time) ? $time : microtime(true),
+            'end'   => null,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Stops a running timer.
+     *
+     * If the timer is not stopped before the timers() method is called,
+     * it will be automatically stopped at that point.
+     *
+     * @param string $name The name of this timer.
+     *
+     * @return Timer
+     */
+    public function stop(string $name)
+    {
+        $name = strtolower($name);
+
+        if (empty($this->timers[$name])) {
+            throw new RuntimeException('Cannot stop timer: invalid name given.');
+        }
+
+        $this->timers[$name]['end'] = microtime(true);
+
+        return $this;
+    }
+
+    /**
+     * Returns the duration of a recorded timer.
+     *
+     * @param string $name     The name of the timer.
+     * @param int    $decimals Number of decimal places.
+     *
+     * @return float|null Returns null if timer exists by that name.
+     *                    Returns a float representing the number of
+     *                    seconds elapsed while that timer was running.
+     */
+    public function getElapsedTime(string $name, int $decimals = 4)
+    {
+        $name = strtolower($name);
+
+        if (empty($this->timers[$name])) {
+            return null;
+        }
+
+        $timer = $this->timers[$name];
+
+        if (empty($timer['end'])) {
+            $timer['end'] = microtime(true);
+        }
+
+        return (float) number_format($timer['end'] - $timer['start'], $decimals);
+    }
+
+    /**
+     * Returns the array of timers, with the duration pre-calculated for you.
+     *
+     * @param int $decimals Number of decimal places
+     */
+    public function getTimers(int $decimals = 4): array
+    {
+        $timers = $this->timers;
+
+        foreach ($timers as &$timer) {
+            if (empty($timer['end'])) {
+                $timer['end'] = microtime(true);
+            }
+
+            $timer['duration'] = (float) number_format($timer['end'] - $timer['start'], $decimals);
+        }
+
+        return $timers;
+    }
+
+    /**
+     * Checks whether or not a timer with the specified name exists.
+     */
+    public function has(string $name): bool
+    {
+        return array_key_exists(strtolower($name), $this->timers);
+    }
 }
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 54ace95b1f89..16432054d2e2 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -27,484 +27,404 @@
 use Kint\Kint;
 
 /**
- * Debug Toolbar
- *
  * Displays a toolbar with bits of stats to aid a developer in debugging.
  *
  * Inspiration: http://prophiler.fabfuel.de
  */
 class Toolbar
 {
-	/**
-	 * Toolbar configuration settings.
-	 *
-	 * @var ToolbarConfig
-	 */
-	protected $config;
-
-	/**
-	 * Collectors to be used and displayed.
-	 *
-	 * @var BaseCollector[]
-	 */
-	protected $collectors = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param ToolbarConfig $config
-	 */
-	public function __construct(ToolbarConfig $config)
-	{
-		$this->config = $config;
-
-		foreach ($config->collectors as $collector)
-		{
-			if (! class_exists($collector))
-			{
-				log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' .
-						'please check $collectors in the Config\Toolbar.php file.');
-				continue;
-			}
-
-			$this->collectors[] = new $collector();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns all the data required by Debug Bar
-	 *
-	 * @param float             $startTime App start time
-	 * @param float             $totalTime
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 *
-	 * @return string JSON encoded data
-	 */
-	public function run(float $startTime, float $totalTime, RequestInterface $request, ResponseInterface $response): string
-	{
-		/**
-		 * @var IncomingRequest $request
-		 * @var Response $response
-		 */
-
-		// Data items used within the view.
-		$data['url']             = current_url();
-		$data['method']          = $request->getMethod(true);
-		$data['isAJAX']          = $request->isAJAX();
-		$data['startTime']       = $startTime;
-		$data['totalTime']       = $totalTime * 1000;
-		$data['totalMemory']     = number_format((memory_get_peak_usage()) / 1024 / 1024, 3);
-		$data['segmentDuration'] = $this->roundTo($data['totalTime'] / 7);
-		$data['segmentCount']    = (int) ceil($data['totalTime'] / $data['segmentDuration']);
-		$data['CI_VERSION']      = CodeIgniter::CI_VERSION;
-		$data['collectors']      = [];
-
-		foreach ($this->collectors as $collector)
-		{
-			$data['collectors'][] = $collector->getAsArray();
-		}
-
-		foreach ($this->collectVarData() as $heading => $items)
-		{
-			$varData = [];
-
-			if (is_array($items))
-			{
-				foreach ($items as $key => $value)
-				{
-					if (is_string($value))
-					{
-						$varData[esc($key)] = esc($value);
-					}
-					else
-					{
-						$oldKintMode       = Kint::$mode_default;
-						$oldKintCalledFrom = Kint::$display_called_from;
-
-						Kint::$mode_default        = Kint::MODE_RICH;
-						Kint::$display_called_from = false;
-
-						$kint = @Kint::dump($value);
-						$kint = substr($kint, strpos($kint, '</style>') + 8 );
-
-						Kint::$mode_default        = $oldKintMode;
-						Kint::$display_called_from = $oldKintCalledFrom;
-
-						$varData[esc($key)] = $kint;
-					}
-				}
-			}
-
-			$data['vars']['varData'][esc($heading)] = $varData;
-		}
-
-		if (! empty($_SESSION))
-		{
-			foreach ($_SESSION as $key => $value)
-			{
-				// Replace the binary data with string to avoid json_encode failure.
-				if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value))
-				{
-					$value = 'binary data';
-				}
-
-				$data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc(print_r($value, true)) . '</pre>';
-			}
-		}
-
-		foreach ($request->getGet() as $name => $value)
-		{
-			$data['vars']['get'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
-		}
-
-		foreach ($request->getPost() as $name => $value)
-		{
-			$data['vars']['post'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
-		}
-
-		foreach ($request->headers() as $header)
-		{
-			$data['vars']['headers'][esc($header->getName())] = esc($header->getValueLine());
-		}
-
-		foreach ($request->getCookie() as $name => $value)
-		{
-			$data['vars']['cookies'][esc($name)] = esc($value);
-		}
-
-		$data['vars']['request'] = ($request->isSecure() ? 'HTTPS' : 'HTTP') . '/' . $request->getProtocolVersion();
-
-		$data['vars']['response'] = [
-			'statusCode'  => $response->getStatusCode(),
-			'reason'      => esc($response->getReason()),
-			'contentType' => esc($response->getHeaderLine('content-type')),
-		];
-
-		$data['config'] = Config::display();
-
-		if ($response->CSP !== null)
-		{
-			$response->CSP->addImageSrc('data:');
-		}
-
-		return json_encode($data);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-
-	/**
-	 * Called within the view to display the timeline itself.
-	 *
-	 * @param array   $collectors
-	 * @param float   $startTime
-	 * @param integer $segmentCount
-	 * @param integer $segmentDuration
-	 * @param array   $styles
-	 *
-	 * @return string
-	 */
-	protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
-	{
-		$displayTime = $segmentCount * $segmentDuration;
-		$rows        = $this->collectTimelineData($collectors);
-		$output      = '';
-		$styleCount  = 0;
-
-		foreach ($rows as $row)
-		{
-			$output .= '<tr>';
-			$output .= "<td>{$row['name']}</td>";
-			$output .= "<td>{$row['component']}</td>";
-			$output .= "<td class='debug-bar-alignRight'>" . number_format($row['duration'] * 1000, 2) . ' ms</td>';
-			$output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
-
-			$offset = ((((float) $row['start'] - $startTime) * 1000) / $displayTime) * 100;
-			$length = (((float) $row['duration'] * 1000) / $displayTime) * 100;
-
-			$styles['debug-bar-timeline-' . $styleCount] = "left: {$offset}%; width: {$length}%;";
-
-			$output .= "<span class='timer debug-bar-timeline-{$styleCount}' title='" . number_format($length, 2) . "%'></span>";
-			$output .= '</td>';
-			$output .= '</tr>';
-
-			$styleCount++;
-		}
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a sorted array of timeline data arrays from the collectors.
-	 *
-	 * @param array $collectors
-	 *
-	 * @return array
-	 */
-	protected function collectTimelineData($collectors): array
-	{
-		$data = [];
-
-		// Collect it
-		foreach ($collectors as $collector)
-		{
-			if (! $collector['hasTimelineData'])
-			{
-				continue;
-			}
-
-			$data = array_merge($data, $collector['timelineData']);
-		}
-
-		// Sort it
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of data from all of the modules
-	 * that should be displayed in the 'Vars' tab.
-	 *
-	 * @return array
-	 */
-	protected function collectVarData(): array
-	{
-		$data = [];
-
-		foreach ($this->collectors as $collector)
-		{
-			if (! $collector->hasVarData())
-			{
-				continue;
-			}
-
-			$data = array_merge($data, $collector->getVarData());
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rounds a number to the nearest incremental value.
-	 *
-	 * @param float   $number
-	 * @param integer $increments
-	 *
-	 * @return float
-	 */
-	protected function roundTo(float $number, int $increments = 5): float
-	{
-		$increments = 1 / $increments;
-
-		return (ceil($number * $increments) / $increments);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepare for debugging..
-	 *
-	 * @param  RequestInterface  $request
-	 * @param  ResponseInterface $response
-	 * @global \CodeIgniter\CodeIgniter $app
-	 * @return void
-	 */
-	public function prepare(RequestInterface $request = null, ResponseInterface $response = null)
-	{
-		/**
-		 * @var IncomingRequest $request
-		 * @var Response $response
-		 */
-
-		if (CI_DEBUG && ! is_cli())
-		{
-			global $app;
-
-			$request  = $request ?? Services::request();
-			$response = $response ?? Services::response();
-
-			// Disable the toolbar for downloads
-			if ($response instanceof DownloadResponse)
-			{
-				return;
-			}
-
-			$toolbar = Services::toolbar(config(Toolbar::class));
-			$stats   = $app->getPerformanceStats();
-			$data    = $toolbar->run(
-					$stats['startTime'],
-					$stats['totalTime'],
-					$request,
-					$response
-			);
-
-			helper('filesystem');
-
-			// Updated to time() so we can get history
-			$time = time();
-
-			if (! is_dir(WRITEPATH . 'debugbar'))
-			{
-				mkdir(WRITEPATH . 'debugbar', 0777);
-			}
-
-			write_file(WRITEPATH . 'debugbar/' . 'debugbar_' . $time . '.json', $data, 'w+');
-
-			$format = $response->getHeaderLine('content-type');
-
-			// Non-HTML formats should not include the debugbar
-			// then we send headers saying where to find the debug data
-			// for this response
-			if ($request->isAJAX() || strpos($format, 'html') === false)
-			{
-				$response->setHeader('Debugbar-Time', "$time")
-						->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
-						->getBody();
-
-				return;
-			}
-
-			$oldKintMode        = Kint::$mode_default;
-			Kint::$mode_default = Kint::MODE_RICH;
-			$kintScript         = @Kint::dump('');
-			Kint::$mode_default = $oldKintMode;
-			$kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8 );
-
-			$script = PHP_EOL
-					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
-					. 'data-time="' . $time . '" '
-					. 'src="' . site_url() . '?debugbar"></script>'
-					. '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
-					. '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
-					. $kintScript
-					. PHP_EOL;
-
-			if (strpos($response->getBody(), '<head>') !== false)
-			{
-				$response->setBody(preg_replace('/<head>/', '<head>' . $script, $response->getBody(), 1));
-				return;
-			}
-
-			$response->appendBody($script);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Inject debug toolbar into the response.
-	 */
-	public function respond()
-	{
-		if (ENVIRONMENT === 'testing')
-		{
-			return;
-		}
-
-		// @codeCoverageIgnoreStart
-		$request = Services::request();
-
-		// If the request contains '?debugbar then we're
-		// simply returning the loading script
-		if ($request->getGet('debugbar') !== null)
-		{
-			// Let the browser know that we are sending javascript
-			header('Content-Type: application/javascript');
-
-			ob_start();
-			include($this->config->viewsPath . 'toolbarloader.js.php');
-			$output = ob_get_clean();
-
-			exit($output);
-		}
-
-		// Otherwise, if it includes ?debugbar_time, then
-		// we should return the entire debugbar.
-		if ($request->getGet('debugbar_time'))
-		{
-			helper('security');
-
-			// Negotiate the content-type to format the output
-			$format = $request->negotiate('media', [
-				'text/html',
-				'application/json',
-				'application/xml',
-			]);
-			$format = explode('/', $format)[1];
-
-			$file     = sanitize_filename('debugbar_' . $request->getGet('debugbar_time'));
-			$filename = WRITEPATH . 'debugbar/' . $file . '.json';
-
-			// Show the toolbar
-			if (is_file($filename))
-			{
-				$contents = $this->format(file_get_contents($filename), $format);
-				exit($contents);
-			}
-
-			// File was not written or do not exists
-			http_response_code(404);
-			exit; // Exit here is needed to avoid load the index page
-		}
-		// @codeCoverageIgnoreEnd
-	}
-
-	/**
-	 * Format output
-	 *
-	 * @param string $data   JSON encoded Toolbar data
-	 * @param string $format html, json, xml
-	 *
-	 * @return string
-	 */
-	protected function format(string $data, string $format = 'html'): string
-	{
-		$data = json_decode($data, true);
-
-		if ($this->config->maxHistory !== 0)
-		{
-			$history = new History();
-			$history->setFiles(
-				(int) Services::request()->getGet('debugbar_time'),
-				$this->config->maxHistory
-			);
-
-			$data['collectors'][] = $history->getAsArray();
-		}
-
-		$output = '';
-
-		switch ($format)
-		{
-			case 'html':
-				$data['styles'] = [];
-				extract($data);
-				$parser = Services::parser($this->config->viewsPath, null, false);
-				ob_start();
-				include($this->config->viewsPath . 'toolbar.tpl.php');
-				$output = ob_get_clean();
-				break;
-			case 'json':
-				$formatter = new JSONFormatter();
-				$output    = $formatter->format($data);
-				break;
-			case 'xml':
-				$formatter = new XMLFormatter;
-				$output    = $formatter->format($data);
-				break;
-		}
-
-		return $output;
-	}
+    /**
+     * Toolbar configuration settings.
+     *
+     * @var ToolbarConfig
+     */
+    protected $config;
+
+    /**
+     * Collectors to be used and displayed.
+     *
+     * @var BaseCollector[]
+     */
+    protected $collectors = [];
+
+    public function __construct(ToolbarConfig $config)
+    {
+        $this->config = $config;
+
+        foreach ($config->collectors as $collector) {
+            if (! class_exists($collector)) {
+                log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' .
+                        'please check $collectors in the Config\Toolbar.php file.');
+
+                continue;
+            }
+
+            $this->collectors[] = new $collector();
+        }
+    }
+
+    /**
+     * Returns all the data required by Debug Bar
+     *
+     * @param float           $startTime App start time
+     * @param IncomingRequest $request
+     * @param Response        $response
+     *
+     * @return string JSON encoded data
+     */
+    public function run(float $startTime, float $totalTime, RequestInterface $request, ResponseInterface $response): string
+    {
+        // Data items used within the view.
+        $data['url']             = current_url();
+        $data['method']          = $request->getMethod(true);
+        $data['isAJAX']          = $request->isAJAX();
+        $data['startTime']       = $startTime;
+        $data['totalTime']       = $totalTime * 1000;
+        $data['totalMemory']     = number_format((memory_get_peak_usage()) / 1024 / 1024, 3);
+        $data['segmentDuration'] = $this->roundTo($data['totalTime'] / 7);
+        $data['segmentCount']    = (int) ceil($data['totalTime'] / $data['segmentDuration']);
+        $data['CI_VERSION']      = CodeIgniter::CI_VERSION;
+        $data['collectors']      = [];
+
+        foreach ($this->collectors as $collector) {
+            $data['collectors'][] = $collector->getAsArray();
+        }
+
+        foreach ($this->collectVarData() as $heading => $items) {
+            $varData = [];
+
+            if (is_array($items)) {
+                foreach ($items as $key => $value) {
+                    if (is_string($value)) {
+                        $varData[esc($key)] = esc($value);
+                    } else {
+                        $oldKintMode       = Kint::$mode_default;
+                        $oldKintCalledFrom = Kint::$display_called_from;
+
+                        Kint::$mode_default        = Kint::MODE_RICH;
+                        Kint::$display_called_from = false;
+
+                        $kint = @Kint::dump($value);
+                        $kint = substr($kint, strpos($kint, '</style>') + 8);
+
+                        Kint::$mode_default        = $oldKintMode;
+                        Kint::$display_called_from = $oldKintCalledFrom;
+
+                        $varData[esc($key)] = $kint;
+                    }
+                }
+            }
+
+            $data['vars']['varData'][esc($heading)] = $varData;
+        }
+
+        if (! empty($_SESSION)) {
+            foreach ($_SESSION as $key => $value) {
+                // Replace the binary data with string to avoid json_encode failure.
+                if (is_string($value) && preg_match('~[^\x20-\x7E\t\r\n]~', $value)) {
+                    $value = 'binary data';
+                }
+
+                $data['vars']['session'][esc($key)] = is_string($value) ? esc($value) : '<pre>' . esc(print_r($value, true)) . '</pre>';
+            }
+        }
+
+        foreach ($request->getGet() as $name => $value) {
+            $data['vars']['get'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
+        }
+
+        foreach ($request->getPost() as $name => $value) {
+            $data['vars']['post'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
+        }
+
+        foreach ($request->headers() as $header) {
+            $data['vars']['headers'][esc($header->getName())] = esc($header->getValueLine());
+        }
+
+        foreach ($request->getCookie() as $name => $value) {
+            $data['vars']['cookies'][esc($name)] = esc($value);
+        }
+
+        $data['vars']['request'] = ($request->isSecure() ? 'HTTPS' : 'HTTP') . '/' . $request->getProtocolVersion();
+
+        $data['vars']['response'] = [
+            'statusCode'  => $response->getStatusCode(),
+            'reason'      => esc($response->getReason()),
+            'contentType' => esc($response->getHeaderLine('content-type')),
+        ];
+
+        $data['config'] = Config::display();
+
+        if ($response->CSP !== null) {
+            $response->CSP->addImageSrc('data:');
+        }
+
+        return json_encode($data);
+    }
+
+    /**
+     * Called within the view to display the timeline itself.
+     */
+    protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
+    {
+        $displayTime = $segmentCount * $segmentDuration;
+        $rows        = $this->collectTimelineData($collectors);
+        $output      = '';
+        $styleCount  = 0;
+
+        foreach ($rows as $row) {
+            $output .= '<tr>';
+            $output .= "<td>{$row['name']}</td>";
+            $output .= "<td>{$row['component']}</td>";
+            $output .= "<td class='debug-bar-alignRight'>" . number_format($row['duration'] * 1000, 2) . ' ms</td>';
+            $output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
+
+            $offset = ((((float) $row['start'] - $startTime) * 1000) / $displayTime) * 100;
+            $length = (((float) $row['duration'] * 1000) / $displayTime) * 100;
+
+            $styles['debug-bar-timeline-' . $styleCount] = "left: {$offset}%; width: {$length}%;";
+
+            $output .= "<span class='timer debug-bar-timeline-{$styleCount}' title='" . number_format($length, 2) . "%'></span>";
+            $output .= '</td>';
+            $output .= '</tr>';
+
+            $styleCount++;
+        }
+
+        return $output;
+    }
+
+    /**
+     * Returns a sorted array of timeline data arrays from the collectors.
+     *
+     * @param array $collectors
+     */
+    protected function collectTimelineData($collectors): array
+    {
+        $data = [];
+
+        // Collect it
+        foreach ($collectors as $collector) {
+            if (! $collector['hasTimelineData']) {
+                continue;
+            }
+
+            $data = array_merge($data, $collector['timelineData']);
+        }
+
+        // Sort it
+
+        return $data;
+    }
+
+    /**
+     * Returns an array of data from all of the modules
+     * that should be displayed in the 'Vars' tab.
+     */
+    protected function collectVarData(): array
+    {
+        $data = [];
+
+        foreach ($this->collectors as $collector) {
+            if (! $collector->hasVarData()) {
+                continue;
+            }
+
+            $data = array_merge($data, $collector->getVarData());
+        }
+
+        return $data;
+    }
+
+    /**
+     * Rounds a number to the nearest incremental value.
+     */
+    protected function roundTo(float $number, int $increments = 5): float
+    {
+        $increments = 1 / $increments;
+
+        return ceil($number * $increments) / $increments;
+    }
+
+    /**
+     * Prepare for debugging..
+     *
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     *
+     * @global \CodeIgniter\CodeIgniter $app
+     */
+    public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null)
+    {
+        /**
+         * @var IncomingRequest $request
+         * @var Response        $response
+         */
+        if (CI_DEBUG && ! is_cli()) {
+            global $app;
+
+            $request  = $request ?? Services::request();
+            $response = $response ?? Services::response();
+
+            // Disable the toolbar for downloads
+            if ($response instanceof DownloadResponse) {
+                return;
+            }
+
+            $toolbar = Services::toolbar(config(self::class));
+            $stats   = $app->getPerformanceStats();
+            $data    = $toolbar->run(
+                $stats['startTime'],
+                $stats['totalTime'],
+                $request,
+                $response
+            );
+
+            helper('filesystem');
+
+            // Updated to time() so we can get history
+            $time = time();
+
+            if (! is_dir(WRITEPATH . 'debugbar')) {
+                mkdir(WRITEPATH . 'debugbar', 0777);
+            }
+
+            write_file(WRITEPATH . 'debugbar/' . 'debugbar_' . $time . '.json', $data, 'w+');
+
+            $format = $response->getHeaderLine('content-type');
+
+            // Non-HTML formats should not include the debugbar
+            // then we send headers saying where to find the debug data
+            // for this response
+            if ($request->isAJAX() || strpos($format, 'html') === false) {
+                $response->setHeader('Debugbar-Time', "{$time}")
+                    ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
+                    ->getBody();
+
+                return;
+            }
+
+            $oldKintMode        = Kint::$mode_default;
+            Kint::$mode_default = Kint::MODE_RICH;
+            $kintScript         = @Kint::dump('');
+            Kint::$mode_default = $oldKintMode;
+            $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
+
+            $script = PHP_EOL
+                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
+                . 'data-time="' . $time . '" '
+                . 'src="' . site_url() . '?debugbar"></script>'
+                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
+                . '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
+                . $kintScript
+                . PHP_EOL;
+
+            if (strpos($response->getBody(), '<head>') !== false) {
+                $response->setBody(preg_replace('/<head>/', '<head>' . $script, $response->getBody(), 1));
+
+                return;
+            }
+
+            $response->appendBody($script);
+        }
+    }
+
+    /**
+     * Inject debug toolbar into the response.
+     */
+    public function respond()
+    {
+        if (ENVIRONMENT === 'testing') {
+            return;
+        }
+
+        // @codeCoverageIgnoreStart
+        $request = Services::request();
+
+        // If the request contains '?debugbar then we're
+        // simply returning the loading script
+        if ($request->getGet('debugbar') !== null) {
+            // Let the browser know that we are sending javascript
+            header('Content-Type: application/javascript');
+
+            ob_start();
+            include $this->config->viewsPath . 'toolbarloader.js.php';
+            $output = ob_get_clean();
+
+            exit($output);
+        }
+
+        // Otherwise, if it includes ?debugbar_time, then
+        // we should return the entire debugbar.
+        if ($request->getGet('debugbar_time')) {
+            helper('security');
+
+            // Negotiate the content-type to format the output
+            $format = $request->negotiate('media', [
+                'text/html',
+                'application/json',
+                'application/xml',
+            ]);
+            $format = explode('/', $format)[1];
+
+            $file     = sanitize_filename('debugbar_' . $request->getGet('debugbar_time'));
+            $filename = WRITEPATH . 'debugbar/' . $file . '.json';
+
+            // Show the toolbar
+            if (is_file($filename)) {
+                $contents = $this->format(file_get_contents($filename), $format);
+
+                exit($contents);
+            }
+
+            // File was not written or do not exists
+            http_response_code(404);
+
+            exit; // Exit here is needed to avoid load the index page
+        }
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * Format output
+     */
+    protected function format(string $data, string $format = 'html'): string
+    {
+        $data = json_decode($data, true);
+
+        if ($this->config->maxHistory !== 0) {
+            $history = new History();
+            $history->setFiles(
+                (int) Services::request()->getGet('debugbar_time'),
+                $this->config->maxHistory
+            );
+
+            $data['collectors'][] = $history->getAsArray();
+        }
+
+        $output = '';
+
+        switch ($format) {
+            case 'html':
+                $data['styles'] = [];
+                extract($data);
+                $parser = Services::parser($this->config->viewsPath, null, false);
+                ob_start();
+                include $this->config->viewsPath . 'toolbar.tpl.php';
+                $output = ob_get_clean();
+                break;
+
+            case 'json':
+                $formatter = new JSONFormatter();
+                $output    = $formatter->format($data);
+                break;
+
+            case 'xml':
+                $formatter = new XMLFormatter();
+                $output    = $formatter->format($data);
+                break;
+        }
+
+        return $output;
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index e5824a77bb16..5d8d39ff169f 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -18,268 +18,217 @@
  */
 class BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * a label or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasLabel = false;
-
-	/**
-	 * Whether this collector has data that
-	 * should be shown in the Vars tab.
-	 *
-	 * @var boolean
-	 */
-	protected $hasVarData = false;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = '';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the Collector's title.
-	 *
-	 * @param  boolean $safe
-	 * @return string
-	 */
-	public function getTitle(bool $safe = false): string
-	{
-		if ($safe)
-		{
-			return str_replace(' ', '-', strtolower($this->title));
-		}
-
-		return $this->title;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns any information that should be shown next to the title.
-	 *
-	 * @return string
-	 */
-	public function getTitleDetails(): string
-	{
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this collector need it's own tab?
-	 *
-	 * @return boolean
-	 */
-	public function hasTabContent(): bool
-	{
-		return (bool) $this->hasTabContent;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this collector have a label?
-	 *
-	 * @return boolean
-	 */
-	public function hasLabel(): bool
-	{
-		return (bool) $this->hasLabel;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this collector have information for the timeline?
-	 *
-	 * @return boolean
-	 */
-	public function hasTimelineData(): bool
-	{
-		return (bool) $this->hasTimeline;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the data for the timeline, properly formatted,
-	 * or returns an empty array.
-	 *
-	 * @return array
-	 */
-	public function timelineData(): array
-	{
-		if (! $this->hasTimeline)
-		{
-			return [];
-		}
-
-		return $this->formatTimelineData();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this Collector have data that should be shown in the
-	 * 'Vars' tab?
-	 *
-	 * @return boolean
-	 */
-	public function hasVarData(): bool
-	{
-		return (bool) $this->hasVarData;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets a collection of data that should be shown in the 'Vars' tab.
-	 * The format is an array of sections, each with their own array
-	 * of key/value pairs:
-	 *
-	 *  $data = [
-	 *      'section 1' => [
-	 *          'foo' => 'bar,
-	 *          'bar' => 'baz'
-	 *      ],
-	 *      'section 2' => [
-	 *          'foo' => 'bar,
-	 *          'bar' => 'baz'
-	 *      ],
-	 *  ];
-	 */
-	public function getVarData()
-	{
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Child classes should implement this to return the timeline data
-	 * formatted for correct usage.
-	 *
-	 * Timeline data should be formatted into arrays that look like:
-	 *
-	 *  [
-	 *      'name'      => 'Database::Query',
-	 *      'component' => 'Database',
-	 *      'start'     => 10       // milliseconds
-	 *      'duration'  => 15       // milliseconds
-	 *  ]
-	 *
-	 * @return array
-	 */
-	protected function formatTimelineData(): array
-	{
-		return [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array|string
-	 */
-	public function display()
-	{
-		return [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Clean Path
-	 *
-	 * This makes nicer looking paths for the error output.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 */
-	public function cleanPath(string $file): string
-	{
-		return Exceptions::cleanPath($file);
-	}
-
-	/**
-	 * Gets the "badge" value for the button.
-	 */
-	public function getBadgeValue()
-	{
-		return null;
-	}
-
-	/**
-	 * Does this collector have any data collected?
-	 *
-	 * If not, then the toolbar button won't get shown.
-	 *
-	 * @return boolean
-	 */
-	public function isEmpty(): bool
-	{
-		return false;
-	}
-
-	/**
-	 * Returns the HTML to display the icon. Should either
-	 * be SVG, or a base-64 encoded.
-	 *
-	 * Recommended dimensions are 24px x 24px
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return '';
-	}
-
-	/**
-	 * Return settings as an array.
-	 *
-	 * @return array
-	 */
-	public function getAsArray(): array
-	{
-		return [
-			'title'           => $this->getTitle(),
-			'titleSafe'       => $this->getTitle(true),
-			'titleDetails'    => $this->getTitleDetails(),
-			'display'         => $this->display(),
-			'badgeValue'      => $this->getBadgeValue(),
-			'isEmpty'         => $this->isEmpty(),
-			'hasTabContent'   => $this->hasTabContent(),
-			'hasLabel'        => $this->hasLabel(),
-			'icon'            => $this->icon(),
-			'hasTimelineData' => $this->hasTimelineData(),
-			'timelineData'    => $this->timelineData(),
-		];
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = false;
+
+    /**
+     * Whether this collector needs to display
+     * a label or not.
+     *
+     * @var bool
+     */
+    protected $hasLabel = false;
+
+    /**
+     * Whether this collector has data that
+     * should be shown in the Vars tab.
+     *
+     * @var bool
+     */
+    protected $hasVarData = false;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = '';
+
+    /**
+     * Gets the Collector's title.
+     */
+    public function getTitle(bool $safe = false): string
+    {
+        if ($safe) {
+            return str_replace(' ', '-', strtolower($this->title));
+        }
+
+        return $this->title;
+    }
+
+    /**
+     * Returns any information that should be shown next to the title.
+     */
+    public function getTitleDetails(): string
+    {
+        return '';
+    }
+
+    /**
+     * Does this collector need it's own tab?
+     */
+    public function hasTabContent(): bool
+    {
+        return (bool) $this->hasTabContent;
+    }
+
+    /**
+     * Does this collector have a label?
+     */
+    public function hasLabel(): bool
+    {
+        return (bool) $this->hasLabel;
+    }
+
+    /**
+     * Does this collector have information for the timeline?
+     */
+    public function hasTimelineData(): bool
+    {
+        return (bool) $this->hasTimeline;
+    }
+
+    /**
+     * Grabs the data for the timeline, properly formatted,
+     * or returns an empty array.
+     */
+    public function timelineData(): array
+    {
+        if (! $this->hasTimeline) {
+            return [];
+        }
+
+        return $this->formatTimelineData();
+    }
+
+    /**
+     * Does this Collector have data that should be shown in the
+     * 'Vars' tab?
+     */
+    public function hasVarData(): bool
+    {
+        return (bool) $this->hasVarData;
+    }
+
+    /**
+     * Gets a collection of data that should be shown in the 'Vars' tab.
+     * The format is an array of sections, each with their own array
+     * of key/value pairs:
+     *
+     *  $data = [
+     *      'section 1' => [
+     *          'foo' => 'bar,
+     *          'bar' => 'baz'
+     *      ],
+     *      'section 2' => [
+     *          'foo' => 'bar,
+     *          'bar' => 'baz'
+     *      ],
+     *  ];
+     */
+    public function getVarData()
+    {
+        return null;
+    }
+
+    /**
+     * Child classes should implement this to return the timeline data
+     * formatted for correct usage.
+     *
+     * Timeline data should be formatted into arrays that look like:
+     *
+     *  [
+     *      'name'      => 'Database::Query',
+     *      'component' => 'Database',
+     *      'start'     => 10       // milliseconds
+     *      'duration'  => 15       // milliseconds
+     *  ]
+     */
+    protected function formatTimelineData(): array
+    {
+        return [];
+    }
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     *
+     * @return array|string
+     */
+    public function display()
+    {
+        return [];
+    }
+
+    /**
+     * Clean Path
+     *
+     * This makes nicer looking paths for the error output.
+     */
+    public function cleanPath(string $file): string
+    {
+        return Exceptions::cleanPath($file);
+    }
+
+    /**
+     * Gets the "badge" value for the button.
+     */
+    public function getBadgeValue()
+    {
+        return null;
+    }
+
+    /**
+     * Does this collector have any data collected?
+     *
+     * If not, then the toolbar button won't get shown.
+     */
+    public function isEmpty(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Returns the HTML to display the icon. Should either
+     * be SVG, or a base-64 encoded.
+     *
+     * Recommended dimensions are 24px x 24px
+     */
+    public function icon(): string
+    {
+        return '';
+    }
+
+    /**
+     * Return settings as an array.
+     */
+    public function getAsArray(): array
+    {
+        return [
+            'title'           => $this->getTitle(),
+            'titleSafe'       => $this->getTitle(true),
+            'titleDetails'    => $this->getTitleDetails(),
+            'display'         => $this->display(),
+            'badgeValue'      => $this->getBadgeValue(),
+            'isEmpty'         => $this->isEmpty(),
+            'hasTabContent'   => $this->hasTabContent(),
+            'hasLabel'        => $this->hasLabel(),
+            'icon'            => $this->icon(),
+            'hasTimelineData' => $this->hasTimelineData(),
+            'timelineData'    => $this->timelineData(),
+        ];
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
index b7aecb72df2e..faf7a19b7391 100644
--- a/system/Debug/Toolbar/Collectors/Config.php
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -20,24 +20,22 @@
  */
 class Config
 {
-	/**
-	 * Return toolbar config values as an array.
-	 *
-	 * @return array
-	 */
-	public static function display(): array
-	{
-		$config = config(App::class);
+    /**
+     * Return toolbar config values as an array.
+     */
+    public static function display(): array
+    {
+        $config = config(App::class);
 
-		return [
-			'ciVersion'   => CodeIgniter::CI_VERSION,
-			'phpVersion'  => phpversion(),
-			'phpSAPI'     => php_sapi_name(),
-			'environment' => ENVIRONMENT,
-			'baseURL'     => $config->baseURL,
-			'timezone'    => app_timezone(),
-			'locale'      => Services::request()->getLocale(),
-			'cspEnabled'  => $config->CSPEnabled,
-		];
-	}
+        return [
+            'ciVersion'   => CodeIgniter::CI_VERSION,
+            'phpVersion'  => PHP_VERSION,
+            'phpSAPI'     => PHP_SAPI,
+            'environment' => ENVIRONMENT,
+            'baseURL'     => $config->baseURL,
+            'timezone'    => app_timezone(),
+            'locale'      => Services::request()->getLocale(),
+            'cspEnabled'  => $config->CSPEnabled,
+        ];
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index a6c4458a9814..6fd5b263f4a3 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -18,184 +18,155 @@
  */
 class Database extends BaseCollector
 {
-	/**
-	 * Whether this collector has timeline data.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = true;
-
-	/**
-	 * Whether this collector should display its own tab.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * Whether this collector has data for the Vars tab.
-	 *
-	 * @var boolean
-	 */
-	protected $hasVarData = false;
-
-	/**
-	 * The name used to reference this collector in the toolbar.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Database';
-
-	/**
-	 * Array of database connections.
-	 *
-	 * @var array
-	 */
-	protected $connections;
-
-	/**
-	 * The query instances that have been collected
-	 * through the DBQuery Event.
-	 *
-	 * @var Query[]
-	 */
-	protected static $queries = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		$this->connections = \Config\Database::getConnections();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The static method used during Events to collect
-	 * data.
-	 *
-	 * @param Query $query
-	 *
-	 * @internal param $ array \CodeIgniter\Database\Query
-	 */
-	public static function collect(Query $query)
-	{
-		$config = config('Toolbar');
-
-		// Provide default in case it's not set
-		$max = $config->maxQueries ?: 100;
-
-		if (count(static::$queries) < $max)
-		{
-			static::$queries[] = $query;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns timeline data formatted for the toolbar.
-	 *
-	 * @return array The formatted data or an empty array.
-	 */
-	protected function formatTimelineData(): array
-	{
-		$data = [];
-
-		foreach ($this->connections as $alias => $connection)
-		{
-			// Connection Time
-			$data[] = [
-				'name'      => 'Connecting to Database: "' . $alias . '"',
-				'component' => 'Database',
-				'start'     => $connection->getConnectStart(),
-				'duration'  => $connection->getConnectDuration(),
-			];
-		}
-
-		foreach (static::$queries as $query)
-		{
-			$data[] = [
-				'name'      => 'Query',
-				'component' => 'Database',
-				'start'     => $query->getStartTime(true),
-				'duration'  => $query->getDuration(),
-			];
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 */
-	public function display(): array
-	{
-		$data['queries'] = array_map(function (Query $query) {
-			return [
-				'duration' => ((float) $query->getDuration(5) * 1000) . ' ms',
-				'sql'      => $query->debugToolbarDisplay(),
-			];
-		}, static::$queries);
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the "badge" value for the button.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		return count(static::$queries);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Information to be displayed next to the title.
-	 *
-	 * @return string The number of queries (in parentheses) or an empty string.
-	 */
-	public function getTitleDetails(): string
-	{
-		return '(' . count(static::$queries) . ' Queries across ' . ($countConnection = count($this->connections)) . ' Connection' .
-				($countConnection > 1 ? 's' : '') . ')';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this collector have any data collected?
-	 *
-	 * @return boolean
-	 */
-	public function isEmpty(): bool
-	{
-		return empty(static::$queries);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVEhLY6A3YExLSwsA4nIycQDIDIhRWEBqamo/UNF/SjDQjF6ocZgAKPkRiFeEhoYyQ4WIBiA9QAuWAPEHqBAmgLqgHcolGQD1V4DMgHIxwbCxYD+QBqcKINseKo6eWrBioPrtQBq/BcgY5ht0cUIYbBg2AJKkRxCNWkDQgtFUNJwtABr+F6igE8olGQD114HMgHIxAVDyAhA/AlpSA8RYUwoeXAPVex5qHCbIyMgwBCkAuQJIY00huDBUz/mUlBQDqHGjgBjAwAAACexpph6oHSQAAAAASUVORK5CYII=';
-	}
+    /**
+     * Whether this collector has timeline data.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = true;
+
+    /**
+     * Whether this collector should display its own tab.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * Whether this collector has data for the Vars tab.
+     *
+     * @var bool
+     */
+    protected $hasVarData = false;
+
+    /**
+     * The name used to reference this collector in the toolbar.
+     *
+     * @var string
+     */
+    protected $title = 'Database';
+
+    /**
+     * Array of database connections.
+     *
+     * @var array
+     */
+    protected $connections;
+
+    /**
+     * The query instances that have been collected
+     * through the DBQuery Event.
+     *
+     * @var Query[]
+     */
+    protected static $queries = [];
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->connections = \Config\Database::getConnections();
+    }
+
+    /**
+     * The static method used during Events to collect
+     * data.
+     *
+     * @internal param $ array \CodeIgniter\Database\Query
+     */
+    public static function collect(Query $query)
+    {
+        $config = config('Toolbar');
+
+        // Provide default in case it's not set
+        $max = $config->maxQueries ?: 100;
+
+        if (count(static::$queries) < $max) {
+            static::$queries[] = $query;
+        }
+    }
+
+    /**
+     * Returns timeline data formatted for the toolbar.
+     *
+     * @return array The formatted data or an empty array.
+     */
+    protected function formatTimelineData(): array
+    {
+        $data = [];
+
+        foreach ($this->connections as $alias => $connection) {
+            // Connection Time
+            $data[] = [
+                'name'      => 'Connecting to Database: "' . $alias . '"',
+                'component' => 'Database',
+                'start'     => $connection->getConnectStart(),
+                'duration'  => $connection->getConnectDuration(),
+            ];
+        }
+
+        foreach (static::$queries as $query) {
+            $data[] = [
+                'name'      => 'Query',
+                'component' => 'Database',
+                'start'     => $query->getStartTime(true),
+                'duration'  => $query->getDuration(),
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     */
+    public function display(): array
+    {
+        $data['queries'] = array_map(static function (Query $query) {
+            return [
+                'duration' => ((float) $query->getDuration(5) * 1000) . ' ms',
+                'sql'      => $query->debugToolbarDisplay(),
+            ];
+        }, static::$queries);
+
+        return $data;
+    }
+
+    /**
+     * Gets the "badge" value for the button.
+     */
+    public function getBadgeValue(): int
+    {
+        return count(static::$queries);
+    }
+
+    /**
+     * Information to be displayed next to the title.
+     *
+     * @return string The number of queries (in parentheses) or an empty string.
+     */
+    public function getTitleDetails(): string
+    {
+        return '(' . count(static::$queries) . ' Queries across ' . ($countConnection = count($this->connections)) . ' Connection' .
+                ($countConnection > 1 ? 's' : '') . ')';
+    }
+
+    /**
+     * Does this collector have any data collected?
+     */
+    public function isEmpty(): bool
+    {
+        return empty(static::$queries);
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVEhLY6A3YExLSwsA4nIycQDIDIhRWEBqamo/UNF/SjDQjF6ocZgAKPkRiFeEhoYyQ4WIBiA9QAuWAPEHqBAmgLqgHcolGQD1V4DMgHIxwbCxYD+QBqcKINseKo6eWrBioPrtQBq/BcgY5ht0cUIYbBg2AJKkRxCNWkDQgtFUNJwtABr+F6igE8olGQD114HMgHIxAVDyAhA/AlpSA8RYUwoeXAPVex5qHCbIyMgwBCkAuQJIY00huDBUz/mUlBQDqHGjgBjAwAAACexpph6oHSQAAAAASUVORK5CYII=';
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
index 03f7846ff570..b8c59f4566bb 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -19,145 +19,123 @@
  */
 class Events extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * Whether this collector has data that
-	 * should be shown in the Vars tab.
-	 *
-	 * @var boolean
-	 */
-	protected $hasVarData = false;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Events';
-
-	/**
-	 * Instance of the Renderer service
-	 *
-	 * @var RendererInterface
-	 */
-	protected $viewer;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct()
-	{
-		$this->viewer = Services::renderer();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Child classes should implement this to return the timeline data
-	 * formatted for correct usage.
-	 *
-	 * @return array
-	 */
-	protected function formatTimelineData(): array
-	{
-		$data = [];
-
-		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
-
-		foreach ($rows as $info)
-		{
-			$data[] = [
-				'name'      => 'View: ' . $info['view'],
-				'component' => 'Views',
-				'start'     => $info['start'],
-				'duration'  => $info['end'] - $info['start'],
-			];
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 */
-	public function display(): array
-	{
-		$data = [
-			'events' => [],
-		];
-
-		foreach (\CodeIgniter\Events\Events::getPerformanceLogs() as $row)
-		{
-			$key = $row['event'];
-
-			if (! array_key_exists($key, $data['events']))
-			{
-				$data['events'][$key] = [
-					'event'    => $key,
-					'duration' => ($row['end'] - $row['start']) * 1000,
-					'count'    => 1,
-				];
-
-				continue;
-			}
-
-			$data['events'][$key]['duration'] += ($row['end'] - $row['start']) * 1000;
-			$data['events'][$key]['count']++;
-		}
-
-		foreach ($data['events'] as &$row)
-		{
-			$row['duration'] = number_format($row['duration'], 2);
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the "badge" value for the button.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		return count(\CodeIgniter\Events\Events::getPerformanceLogs());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEASURBVEhL7ZXNDcIwDIVTsRBH1uDQDdquUA6IM1xgCA6MwJUN2hk6AQzAz0vl0ETUxC5VT3zSU5w81/mRMGZysixbFEVR0jSKNt8geQU9aRpFmp/keX6AbjZ5oB74vsaN5lSzA4tLSjpBFxsjeSuRy4d2mDdQTWU7YLbXTNN05mKyovj5KL6B7q3hoy3KwdZxBlT+Ipz+jPHrBqOIynZgcZonoukb/0ckiTHqNvDXtXEAaygRbaB9FvUTjRUHsIYS0QaSp+Dw6wT4hiTmYHOcYZsdLQ2CbXa4ftuuYR4x9vYZgdb4vsFYUdmABMYeukK9/SUme3KMFQ77+Yfzh8eYF8+orDuDWU5LAAAAAElFTkSuQmCC';
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * Whether this collector has data that
+     * should be shown in the Vars tab.
+     *
+     * @var bool
+     */
+    protected $hasVarData = false;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Events';
+
+    /**
+     * Instance of the Renderer service
+     *
+     * @var RendererInterface
+     */
+    protected $viewer;
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->viewer = Services::renderer();
+    }
+
+    /**
+     * Child classes should implement this to return the timeline data
+     * formatted for correct usage.
+     */
+    protected function formatTimelineData(): array
+    {
+        $data = [];
+
+        $rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+
+        foreach ($rows as $info) {
+            $data[] = [
+                'name'      => 'View: ' . $info['view'],
+                'component' => 'Views',
+                'start'     => $info['start'],
+                'duration'  => $info['end'] - $info['start'],
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     */
+    public function display(): array
+    {
+        $data = [
+            'events' => [],
+        ];
+
+        foreach (\CodeIgniter\Events\Events::getPerformanceLogs() as $row) {
+            $key = $row['event'];
+
+            if (! array_key_exists($key, $data['events'])) {
+                $data['events'][$key] = [
+                    'event'    => $key,
+                    'duration' => ($row['end'] - $row['start']) * 1000,
+                    'count'    => 1,
+                ];
+
+                continue;
+            }
+
+            $data['events'][$key]['duration'] += ($row['end'] - $row['start']) * 1000;
+            $data['events'][$key]['count']++;
+        }
+
+        foreach ($data['events'] as &$row) {
+            $row['duration'] = number_format($row['duration'], 2);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Gets the "badge" value for the button.
+     */
+    public function getBadgeValue(): int
+    {
+        return count(\CodeIgniter\Events\Events::getPerformanceLogs());
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEASURBVEhL7ZXNDcIwDIVTsRBH1uDQDdquUA6IM1xgCA6MwJUN2hk6AQzAz0vl0ETUxC5VT3zSU5w81/mRMGZysixbFEVR0jSKNt8geQU9aRpFmp/keX6AbjZ5oB74vsaN5lSzA4tLSjpBFxsjeSuRy4d2mDdQTWU7YLbXTNN05mKyovj5KL6B7q3hoy3KwdZxBlT+Ipz+jPHrBqOIynZgcZonoukb/0ckiTHqNvDXtXEAaygRbaB9FvUTjRUHsIYS0QaSp+Dw6wT4hiTmYHOcYZsdLQ2CbXa4ftuuYR4x9vYZgdb4vsFYUdmABMYeukK9/SUme3KMFQ77+Yfzh8eYF8+orDuDWU5LAAAAAElFTkSuQmCC';
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index 1c4ed7751738..d6aefd2c3fe9 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -16,107 +16,87 @@
  */
 class Files extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Files';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns any information that should be shown next to the title.
-	 *
-	 * @return string
-	 */
-	public function getTitleDetails(): string
-	{
-		return '( ' . (int) count(get_included_files()) . ' )';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 */
-	public function display(): array
-	{
-		$rawFiles  = get_included_files();
-		$coreFiles = [];
-		$userFiles = [];
-
-		foreach ($rawFiles as $file)
-		{
-			$path = $this->cleanPath($file);
-
-			if (strpos($path, 'SYSTEMPATH') !== false)
-			{
-				$coreFiles[] = [
-					'name' => basename($file),
-					'path' => $path,
-				];
-			}
-			else
-			{
-				$userFiles[] = [
-					'name' => basename($file),
-					'path' => $path,
-				];
-			}
-		}
-
-		sort($userFiles);
-		sort($coreFiles);
-
-		return [
-			'coreFiles' => $coreFiles,
-			'userFiles' => $userFiles,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays the number of included files as a badge in the tab button.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		return count(get_included_files());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGBSURBVEhL7ZQ9S8NQGIVTBQUncfMfCO4uLgoKbuKQOWg+OkXERRE1IAXrIHbVDrqIDuLiJgj+gro7S3dnpfq88b1FMTE3VZx64HBzzvvZWxKnj15QCcPwCD5HUfSWR+JtzgmtsUcQBEva5IIm9SwSu+95CAWbUuy67qBa32ByZEDpIaZYZSZMjjQuPcQUq8yEyYEb8FSerYeQVGbAFzJkX1PyQWLhgCz0BxTCekC1Wp0hsa6yokzhed4oje6Iz6rlJEkyIKfUEFtITVtQdAibn5rMyaYsMS+a5wTv8qeXMhcU16QZbKgl3hbs+L4/pnpdc87MElZgq10p5DxGdq8I7xrvUWUKvG3NbSK7ubngYzdJwSsF7TiOh9VOgfcEz1UayNe3JUPM1RWC5GXYgTfc75B4NBmXJnAtTfpABX0iPvEd9ezALwkplCFXcr9styiNOKc1RRZpaPM9tcqBwlWzGY1qPL9wjqRBgF5BH6j8HWh2S7MHlX8PrmbK+k/8PzjOOzx1D3i1pKTTAAAAAElFTkSuQmCC';
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Files';
+
+    /**
+     * Returns any information that should be shown next to the title.
+     */
+    public function getTitleDetails(): string
+    {
+        return '( ' . count(get_included_files()) . ' )';
+    }
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     */
+    public function display(): array
+    {
+        $rawFiles  = get_included_files();
+        $coreFiles = [];
+        $userFiles = [];
+
+        foreach ($rawFiles as $file) {
+            $path = $this->cleanPath($file);
+
+            if (strpos($path, 'SYSTEMPATH') !== false) {
+                $coreFiles[] = [
+                    'name' => basename($file),
+                    'path' => $path,
+                ];
+            } else {
+                $userFiles[] = [
+                    'name' => basename($file),
+                    'path' => $path,
+                ];
+            }
+        }
+
+        sort($userFiles);
+        sort($coreFiles);
+
+        return [
+            'coreFiles' => $coreFiles,
+            'userFiles' => $userFiles,
+        ];
+    }
+
+    /**
+     * Displays the number of included files as a badge in the tab button.
+     */
+    public function getBadgeValue(): int
+    {
+        return count(get_included_files());
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGBSURBVEhL7ZQ9S8NQGIVTBQUncfMfCO4uLgoKbuKQOWg+OkXERRE1IAXrIHbVDrqIDuLiJgj+gro7S3dnpfq88b1FMTE3VZx64HBzzvvZWxKnj15QCcPwCD5HUfSWR+JtzgmtsUcQBEva5IIm9SwSu+95CAWbUuy67qBa32ByZEDpIaZYZSZMjjQuPcQUq8yEyYEb8FSerYeQVGbAFzJkX1PyQWLhgCz0BxTCekC1Wp0hsa6yokzhed4oje6Iz6rlJEkyIKfUEFtITVtQdAibn5rMyaYsMS+a5wTv8qeXMhcU16QZbKgl3hbs+L4/pnpdc87MElZgq10p5DxGdq8I7xrvUWUKvG3NbSK7ubngYzdJwSsF7TiOh9VOgfcEz1UayNe3JUPM1RWC5GXYgTfc75B4NBmXJnAtTfpABX0iPvEd9ezALwkplCFXcr9styiNOKc1RRZpaPM9tcqBwlWzGY1qPL9wjqRBgF5BH6j8HWh2S7MHlX8PrmbK+k/8PzjOOzx1D3i1pKTTAAAAAElFTkSuQmCC';
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 818d2a8dc1cf..3c0f4268f65e 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -16,140 +16,122 @@
  */
 class History extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * Whether this collector needs to display
-	 * a label or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasLabel = true;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'History';
-
-	/**
-	 * @var array History files
-	 */
-	protected $files = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Specify time limit & file count for debug history.
-	 *
-	 * @param integer $current Current history time
-	 * @param integer $limit   Max history files
-	 */
-	public function setFiles(int $current, int $limit = 20)
-	{
-		$filenames = glob(WRITEPATH . 'debugbar/debugbar_*.json');
-
-		$files   = [];
-		$counter = 0;
-
-		foreach (array_reverse($filenames) as $filename)
-		{
-			$counter++;
-
-			// Oldest files will be deleted
-			if ($limit >= 0 && $counter > $limit)
-			{
-				unlink($filename);
-				continue;
-			}
-
-			// Get the contents of this specific history request
-			$contents = file_get_contents($filename);
-
-			$contents = @json_decode($contents);
-			if (json_last_error() === JSON_ERROR_NONE)
-			{
-				preg_match_all('/\d+/', $filename, $time);
-				$time = (int) end($time[0]);
-
-				// Debugbar files shown in History Collector
-				$files[] = [
-					'time'        => $time,
-					'datetime'    => date('Y-m-d H:i:s', $time),
-					'active'      => $time === $current,
-					'status'      => $contents->vars->response->statusCode,
-					'method'      => $contents->method,
-					'url'         => $contents->url,
-					'isAJAX'      => $contents->isAJAX ? 'Yes' : 'No',
-					'contentType' => $contents->vars->response->contentType,
-				];
-			}
-		}
-
-		$this->files = $files;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 */
-	public function display(): array
-	{
-		return ['files' => $this->files];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Displays the number of included files as a badge in the tab button.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		return count($this->files);
-	}
-
-	/**
-	 * Return true if there are no history files.
-	 *
-	 * @return boolean
-	 */
-	public function isEmpty(): bool
-	{
-		return empty($this->files);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJySURBVEhL3ZU7aJNhGIVTpV6i4qCIgkIHxcXLErS4FBwUFNwiCKGhuTYJGaIgnRoo4qRu6iCiiIuIXXTTIkIpuqoFwaGgonUQlC5KafU5ycmNP0lTdPLA4fu+8573/a4/f6hXpFKpwUwmc9fDfweKbk+n07fgEv33TLSbtt/hvwNFT1PsG/zdTE0Gp+GFfD6/2fbVIxqNrqPIRbjg4t/hY8aztcngfDabHXbKyiiXy2vcrcPH8oDCry2FKDrA+Ar6L01E/ypyXzXaARjDGGcoeNxSDZXE0dHRA5VRE5LJ5CFy5jzJuOX2wHRHRnjbklZ6isQ3tIctBaAd4vlK3jLtkOVWqABBXd47jGHLmjTmSScttQV5J+SjfcUweFQEbsjAas5aqoCLXutJl7vtQsAzpRowYqkBinyCC8Vicb2lOih8zoldd0F8RD7qTFiqAnGrAy8stUAvi/hbqDM+YzkAFrLPdR5ZqoLXsd+Bh5YCIH7JniVdquUWxOPxDfboHhrI5XJ7HHhiqQXox+APe/Qk64+gGYVCYZs8cMpSFQj9JOoFzVqqo7k4HIvFYpscCoAjOmLffUsNUGRaQUwDlmofUa34ecsdgXdcXo4wbakBgiUFafXJV8A4DJ/2UrxUKm3E95H8RbjLcgOJRGILhnmCP+FBy5XvwN2uIPcy1AJvWgqC4xm2aU4Xb3lF4I+Tpyf8hRe5w3J7YLymSeA8Z3nSclv4WLRyFdfOjzrUFX0klJUEtZtntCNc+F69cz/FiDzEPtjzmcUMOr83kDQEX6pAJxJfpL3OX22n01YN7SZCoQnaSdoZ+Jz+PZihH3wt/xlCoT9M6nEtmRSPCQAAAABJRU5ErkJggg==';
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * Whether this collector needs to display
+     * a label or not.
+     *
+     * @var bool
+     */
+    protected $hasLabel = true;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'History';
+
+    /**
+     * @var array History files
+     */
+    protected $files = [];
+
+    /**
+     * Specify time limit & file count for debug history.
+     *
+     * @param int $current Current history time
+     * @param int $limit   Max history files
+     */
+    public function setFiles(int $current, int $limit = 20)
+    {
+        $filenames = glob(WRITEPATH . 'debugbar/debugbar_*.json');
+
+        $files   = [];
+        $counter = 0;
+
+        foreach (array_reverse($filenames) as $filename) {
+            $counter++;
+
+            // Oldest files will be deleted
+            if ($limit >= 0 && $counter > $limit) {
+                unlink($filename);
+
+                continue;
+            }
+
+            // Get the contents of this specific history request
+            $contents = file_get_contents($filename);
+
+            $contents = @json_decode($contents);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                preg_match_all('/\d+/', $filename, $time);
+                $time = (int) end($time[0]);
+
+                // Debugbar files shown in History Collector
+                $files[] = [
+                    'time'        => $time,
+                    'datetime'    => date('Y-m-d H:i:s', $time),
+                    'active'      => $time === $current,
+                    'status'      => $contents->vars->response->statusCode,
+                    'method'      => $contents->method,
+                    'url'         => $contents->url,
+                    'isAJAX'      => $contents->isAJAX ? 'Yes' : 'No',
+                    'contentType' => $contents->vars->response->contentType,
+                ];
+            }
+        }
+
+        $this->files = $files;
+    }
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     */
+    public function display(): array
+    {
+        return ['files' => $this->files];
+    }
+
+    /**
+     * Displays the number of included files as a badge in the tab button.
+     */
+    public function getBadgeValue(): int
+    {
+        return count($this->files);
+    }
+
+    /**
+     * Return true if there are no history files.
+     */
+    public function isEmpty(): bool
+    {
+        return empty($this->files);
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJySURBVEhL3ZU7aJNhGIVTpV6i4qCIgkIHxcXLErS4FBwUFNwiCKGhuTYJGaIgnRoo4qRu6iCiiIuIXXTTIkIpuqoFwaGgonUQlC5KafU5ycmNP0lTdPLA4fu+8573/a4/f6hXpFKpwUwmc9fDfweKbk+n07fgEv33TLSbtt/hvwNFT1PsG/zdTE0Gp+GFfD6/2fbVIxqNrqPIRbjg4t/hY8aztcngfDabHXbKyiiXy2vcrcPH8oDCry2FKDrA+Ar6L01E/ypyXzXaARjDGGcoeNxSDZXE0dHRA5VRE5LJ5CFy5jzJuOX2wHRHRnjbklZ6isQ3tIctBaAd4vlK3jLtkOVWqABBXd47jGHLmjTmSScttQV5J+SjfcUweFQEbsjAas5aqoCLXutJl7vtQsAzpRowYqkBinyCC8Vicb2lOih8zoldd0F8RD7qTFiqAnGrAy8stUAvi/hbqDM+YzkAFrLPdR5ZqoLXsd+Bh5YCIH7JniVdquUWxOPxDfboHhrI5XJ7HHhiqQXox+APe/Qk64+gGYVCYZs8cMpSFQj9JOoFzVqqo7k4HIvFYpscCoAjOmLffUsNUGRaQUwDlmofUa34ecsdgXdcXo4wbakBgiUFafXJV8A4DJ/2UrxUKm3E95H8RbjLcgOJRGILhnmCP+FBy5XvwN2uIPcy1AJvWgqC4xm2aU4Xb3lF4I+Tpyf8hRe5w3J7YLymSeA8Z3nSclv4WLRyFdfOjzrUFX0klJUEtZtntCNc+F69cz/FiDzEPtjzmcUMOr83kDQEX6pAJxJfpL3OX22n01YN7SZCoQnaSdoZ+Jz+PZihH3wt/xlCoT9M6nEtmRSPCQAAAABJRU5ErkJggg==';
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
index acae3b7fa8f6..42d7307ab9d1 100644
--- a/system/Debug/Toolbar/Collectors/Logs.php
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -18,93 +18,76 @@
  */
 class Logs extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Logs';
-
-	/**
-	 * Our collected data.
-	 *
-	 * @var array
-	 */
-	protected $data;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 */
-	public function display(): array
-	{
-		return [
-			'logs' => $this->collectLogs(),
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does this collector actually have any data to display?
-	 *
-	 * @return boolean
-	 */
-	public function isEmpty(): bool
-	{
-		$this->collectLogs();
-
-		return empty($this->data);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVEhLYxgFJIHU1FSjtLS0i0D8AYj7gEKMEBkqAaAFF4D4ERCvAFrwH4gDoFIMKSkpFkB+OTEYqgUTACXfA/GqjIwMQyD9H2hRHlQKJFcBEiMGQ7VgAqCBvUgK32dmZspCpagGGNPT0/1BLqeF4bQHQJePpiIwhmrBBEADR1MRfgB0+WgqAmOoFkwANHA0FY0CUgEDAwCQ0PUpNB3kqwAAAABJRU5ErkJggg==';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures the data has been collected.
-	 */
-	protected function collectLogs()
-	{
-		if (! empty($this->data))
-		{
-			return $this->data;
-		}
-
-		return $this->data = Services::logger(true)->logCache ?? [];
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Logs';
+
+    /**
+     * Our collected data.
+     *
+     * @var array
+     */
+    protected $data;
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     */
+    public function display(): array
+    {
+        return [
+            'logs' => $this->collectLogs(),
+        ];
+    }
+
+    /**
+     * Does this collector actually have any data to display?
+     */
+    public function isEmpty(): bool
+    {
+        $this->collectLogs();
+
+        return empty($this->data);
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVEhLYxgFJIHU1FSjtLS0i0D8AYj7gEKMEBkqAaAFF4D4ERCvAFrwH4gDoFIMKSkpFkB+OTEYqgUTACXfA/GqjIwMQyD9H2hRHlQKJFcBEiMGQ7VgAqCBvUgK32dmZspCpagGGNPT0/1BLqeF4bQHQJePpiIwhmrBBEADR1MRfgB0+WgqAmOoFkwANHA0FY0CUgEDAwCQ0PUpNB3kqwAAAABJRU5ErkJggg==';
+    }
+
+    /**
+     * Ensures the data has been collected.
+     */
+    protected function collectLogs()
+    {
+        if (! empty($this->data)) {
+            return $this->data;
+        }
+
+        return $this->data = Services::logger(true)->logCache ?? [];
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 465148359e02..060d8b995872 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -21,157 +21,133 @@
  */
 class Routes extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = true;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Routes';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the data of this collector to be formatted in the toolbar
-	 *
-	 * @return array
-	 * @throws ReflectionException
-	 */
-	public function display(): array
-	{
-		$rawRoutes = Services::routes(true);
-		$router    = Services::router(null, null, true);
-
-		/*
-		 * Matched Route
-		 */
-		$route = $router->getMatchedRoute();
-
-		// Get our parameters
-		// Closure routes
-		if (is_callable($router->controllerName()))
-		{
-			$method = new ReflectionFunction($router->controllerName());
-		}
-		else
-		{
-			try
-			{
-				$method = new ReflectionMethod($router->controllerName(), $router->methodName());
-			}
-			catch (ReflectionException $e)
-			{
-				// If we're here, the method doesn't exist
-				// and is likely calculated in _remap.
-				$method = new ReflectionMethod($router->controllerName(), '_remap');
-			}
-		}
-
-		$rawParams = $method->getParameters();
-
-		$params = [];
-		foreach ($rawParams as $key => $param)
-		{
-			$params[] = [
-				'name'  => $param->getName(),
-				'value' => $router->params()[$key] ??
-					'&lt;empty&gt;&nbsp| default: ' . var_export($param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, true),
-			];
-		}
-
-		$matchedRoute = [
-			[
-				'directory'  => $router->directory(),
-				'controller' => $router->controllerName(),
-				'method'     => $router->methodName(),
-				'paramCount' => count($router->params()),
-				'truePCount' => count($params),
-				'params'     => $params,
-			],
-		];
-
-		/*
-		* Defined Routes
-		*/
-		$routes  = [];
-		$methods = [
-			'get',
-			'head',
-			'post',
-			'patch',
-			'put',
-			'delete',
-			'options',
-			'trace',
-			'connect',
-			'cli',
-		];
-
-		foreach ($methods as $method)
-		{
-			$raw = $rawRoutes->getRoutes($method);
-
-			foreach ($raw as $route => $handler)
-			{
-				// filter for strings, as callbacks aren't displayable
-				if (is_string($handler))
-				{
-					$routes[] = [
-						'method'  => strtoupper($method),
-						'route'   => $route,
-						'handler' => $handler,
-					];
-				}
-			}
-		}
-
-		return [
-			'matchedRoute' => $matchedRoute,
-			'routes'       => $routes,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a count of all the routes in the system.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		$rawRoutes = Services::routes(true);
-
-		return count($rawRoutes->getRoutes());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFDSURBVEhL7ZRNSsNQFIUjVXSiOFEcuQIHDpzpxC0IGYeE/BEInbWlCHEDLsSiuANdhKDjgm6ggtSJ+l25ldrmmTwIgtgDh/t37r1J+16cX0dRFMtpmu5pWAkrvYjjOB7AETzStBFW+inxu3KUJMmhludQpoflS1zXban4LYqiO224h6VLTHr8Z+z8EpIHFF9gG78nDVmW7UgTHKjsCyY98QP+pcq+g8Ku2s8G8X3f3/I8b038WZTp+bO38zxfFd+I6YY6sNUvFlSDk9CRhiAI1jX1I9Cfw7GG1UB8LAuwbU0ZwQnbRDeEN5qqBxZMLtE1ti9LtbREnMIuOXnyIf5rGIb7Wq8HmlZgwYBH7ORTcKH5E4mpjeGt9fBZcHE2GCQ3Vt7oTNPNg+FXLHnSsHkw/FR+Gg2bB8Ptzrst/v6C/wrH+QB+duli6MYJdQAAAABJRU5ErkJggg==';
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = false;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = true;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Routes';
+
+    /**
+     * Returns the data of this collector to be formatted in the toolbar
+     *
+     * @throws ReflectionException
+     */
+    public function display(): array
+    {
+        $rawRoutes = Services::routes(true);
+        $router    = Services::router(null, null, true);
+
+        // Matched Route
+        $route = $router->getMatchedRoute();
+
+        // Get our parameters
+        // Closure routes
+        if (is_callable($router->controllerName())) {
+            $method = new ReflectionFunction($router->controllerName());
+        } else {
+            try {
+                $method = new ReflectionMethod($router->controllerName(), $router->methodName());
+            } catch (ReflectionException $e) {
+                // If we're here, the method doesn't exist
+                // and is likely calculated in _remap.
+                $method = new ReflectionMethod($router->controllerName(), '_remap');
+            }
+        }
+
+        $rawParams = $method->getParameters();
+
+        $params = [];
+
+        foreach ($rawParams as $key => $param) {
+            $params[] = [
+                'name'  => $param->getName(),
+                'value' => $router->params()[$key] ??
+                    ('&lt;empty&gt;&nbsp| default: ' . var_export($param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, true)),
+            ];
+        }
+
+        $matchedRoute = [
+            [
+                'directory'  => $router->directory(),
+                'controller' => $router->controllerName(),
+                'method'     => $router->methodName(),
+                'paramCount' => count($router->params()),
+                'truePCount' => count($params),
+                'params'     => $params,
+            ],
+        ];
+
+        // Defined Routes
+        $routes  = [];
+        $methods = [
+            'get',
+            'head',
+            'post',
+            'patch',
+            'put',
+            'delete',
+            'options',
+            'trace',
+            'connect',
+            'cli',
+        ];
+
+        foreach ($methods as $method) {
+            $raw = $rawRoutes->getRoutes($method);
+
+            foreach ($raw as $route => $handler) {
+                // filter for strings, as callbacks aren't displayable
+                if (is_string($handler)) {
+                    $routes[] = [
+                        'method'  => strtoupper($method),
+                        'route'   => $route,
+                        'handler' => $handler,
+                    ];
+                }
+            }
+        }
+
+        return [
+            'matchedRoute' => $matchedRoute,
+            'routes'       => $routes,
+        ];
+    }
+
+    /**
+     * Returns a count of all the routes in the system.
+     */
+    public function getBadgeValue(): int
+    {
+        $rawRoutes = Services::routes(true);
+
+        return count($rawRoutes->getRoutes());
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFDSURBVEhL7ZRNSsNQFIUjVXSiOFEcuQIHDpzpxC0IGYeE/BEInbWlCHEDLsSiuANdhKDjgm6ggtSJ+l25ldrmmTwIgtgDh/t37r1J+16cX0dRFMtpmu5pWAkrvYjjOB7AETzStBFW+inxu3KUJMmhludQpoflS1zXban4LYqiO224h6VLTHr8Z+z8EpIHFF9gG78nDVmW7UgTHKjsCyY98QP+pcq+g8Ku2s8G8X3f3/I8b038WZTp+bO38zxfFd+I6YY6sNUvFlSDk9CRhiAI1jX1I9Cfw7GG1UB8LAuwbU0ZwQnbRDeEN5qqBxZMLtE1ti9LtbREnMIuOXnyIf5rGIb7Wq8HmlZgwYBH7ORTcKH5E4mpjeGt9fBZcHE2GCQ3Vt7oTNPNg+FXLHnSsHkw/FR+Gg2bB8Ptzrst/v6C/wrH+QB+duli6MYJdQAAAABJRU5ErkJggg==';
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
index bb364f97c77d..cfce9e617594 100644
--- a/system/Debug/Toolbar/Collectors/Timers.php
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -18,60 +18,54 @@
  */
 class Timers extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = true;
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = true;
 
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = false;
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = false;
 
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Timers';
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Timers';
 
-	//--------------------------------------------------------------------
+    /**
+     * Child classes should implement this to return the timeline data
+     * formatted for correct usage.
+     */
+    protected function formatTimelineData(): array
+    {
+        $data = [];
 
-	/**
-	 * Child classes should implement this to return the timeline data
-	 * formatted for correct usage.
-	 *
-	 * @return array
-	 */
-	protected function formatTimelineData(): array
-	{
-		$data = [];
+        $benchmark = Services::timer(true);
+        $rows      = $benchmark->getTimers(6);
 
-		$benchmark = Services::timer(true);
-		$rows      = $benchmark->getTimers(6);
+        foreach ($rows as $name => $info) {
+            if ($name === 'total_execution') {
+                continue;
+            }
 
-		foreach ($rows as $name => $info)
-		{
-			if ($name === 'total_execution')
-			{
-				continue;
-			}
+            $data[] = [
+                'name'      => ucwords(str_replace('_', ' ', $name)),
+                'component' => 'Timer',
+                'start'     => $info['start'],
+                'duration'  => $info['end'] - $info['start'],
+            ];
+        }
 
-			$data[] = [
-				'name'      => ucwords(str_replace('_', ' ', $name)),
-				'component' => 'Timer',
-				'start'     => $info['start'],
-				'duration'  => $info['end'] - $info['start'],
-			];
-		}
-
-		return $data;
-	}
+        return $data;
+    }
 }
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index c14c4501e6da..75fea1d6cc6d 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -19,146 +19,129 @@
  */
 class Views extends BaseCollector
 {
-	/**
-	 * Whether this collector has data that can
-	 * be displayed in the Timeline.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTimeline = true;
-
-	/**
-	 * Whether this collector needs to display
-	 * content in a tab or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasTabContent = false;
-
-	/**
-	 * Whether this collector needs to display
-	 * a label or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasLabel = true;
-
-	/**
-	 * Whether this collector has data that
-	 * should be shown in the Vars tab.
-	 *
-	 * @var boolean
-	 */
-	protected $hasVarData = true;
-
-	/**
-	 * The 'title' of this Collector.
-	 * Used to name things in the toolbar HTML.
-	 *
-	 * @var string
-	 */
-	protected $title = 'Views';
-
-	/**
-	 * Instance of the Renderer service
-	 *
-	 * @var RendererInterface
-	 */
-	protected $viewer;
-
-	/**
-	 * Views counter
-	 *
-	 * @var array
-	 */
-	protected $views = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 */
-	public function __construct()
-	{
-		$this->viewer = Services::renderer();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Child classes should implement this to return the timeline data
-	 * formatted for correct usage.
-	 *
-	 * @return array
-	 */
-	protected function formatTimelineData(): array
-	{
-		$data = [];
-
-		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
-
-		foreach ($rows as $info)
-		{
-			$data[] = [
-				'name'      => 'View: ' . $info['view'],
-				'component' => 'Views',
-				'start'     => $info['start'],
-				'duration'  => $info['end'] - $info['start'],
-			];
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets a collection of data that should be shown in the 'Vars' tab.
-	 * The format is an array of sections, each with their own array
-	 * of key/value pairs:
-	 *
-	 *  $data = [
-	 *      'section 1' => [
-	 *          'foo' => 'bar,
-	 *          'bar' => 'baz'
-	 *      ],
-	 *      'section 2' => [
-	 *          'foo' => 'bar,
-	 *          'bar' => 'baz'
-	 *      ],
-	 *  ];
-	 *
-	 * @return array
-	 */
-	public function getVarData(): array
-	{
-		return [
-			// @phpstan-ignore-next-line
-			'View Data' => $this->viewer->getData(),
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a count of all views.
-	 *
-	 * @return integer
-	 */
-	public function getBadgeValue(): int
-	{
-		return count($this->viewer->getPerformanceData()); // @phpstan-ignore-line
-	}
-
-	/**
-	 * Display the icon.
-	 *
-	 * Icon from https://icons8.com - 1em package
-	 *
-	 * @return string
-	 */
-	public function icon(): string
-	{
-		return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADeSURBVEhL7ZSxDcIwEEWNYA0YgGmgyAaJLTcUaaBzQQEVjMEabBQxAdw53zTHiThEovGTfnE/9rsoRUxhKLOmaa6Uh7X2+UvguLCzVxN1XW9x4EYHzik033Hp3X0LO+DaQG8MDQcuq6qao4qkHuMgQggLvkPLjqh00ZgFDBacMJYFkuwFlH1mshdkZ5JPJERA9JpI6xNCBESvibQ+IURA9JpI6xNCBESvibQ+IURA9DTsuHTOrVFFxixgB/eUFlU8uKJ0eDBFOu/9EvoeKnlJS2/08Tc8NOwQ8sIfMeYFjqKDjdU2sp4AAAAASUVORK5CYII=';
-	}
+    /**
+     * Whether this collector has data that can
+     * be displayed in the Timeline.
+     *
+     * @var bool
+     */
+    protected $hasTimeline = true;
+
+    /**
+     * Whether this collector needs to display
+     * content in a tab or not.
+     *
+     * @var bool
+     */
+    protected $hasTabContent = false;
+
+    /**
+     * Whether this collector needs to display
+     * a label or not.
+     *
+     * @var bool
+     */
+    protected $hasLabel = true;
+
+    /**
+     * Whether this collector has data that
+     * should be shown in the Vars tab.
+     *
+     * @var bool
+     */
+    protected $hasVarData = true;
+
+    /**
+     * The 'title' of this Collector.
+     * Used to name things in the toolbar HTML.
+     *
+     * @var string
+     */
+    protected $title = 'Views';
+
+    /**
+     * Instance of the Renderer service
+     *
+     * @var RendererInterface
+     */
+    protected $viewer;
+
+    /**
+     * Views counter
+     *
+     * @var array
+     */
+    protected $views = [];
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->viewer = Services::renderer();
+    }
+
+    /**
+     * Child classes should implement this to return the timeline data
+     * formatted for correct usage.
+     */
+    protected function formatTimelineData(): array
+    {
+        $data = [];
+
+        $rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+
+        foreach ($rows as $info) {
+            $data[] = [
+                'name'      => 'View: ' . $info['view'],
+                'component' => 'Views',
+                'start'     => $info['start'],
+                'duration'  => $info['end'] - $info['start'],
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Gets a collection of data that should be shown in the 'Vars' tab.
+     * The format is an array of sections, each with their own array
+     * of key/value pairs:
+     *
+     *  $data = [
+     *      'section 1' => [
+     *          'foo' => 'bar,
+     *          'bar' => 'baz'
+     *      ],
+     *      'section 2' => [
+     *          'foo' => 'bar,
+     *          'bar' => 'baz'
+     *      ],
+     *  ];
+     */
+    public function getVarData(): array
+    {
+        return [
+            // @phpstan-ignore-next-line
+            'View Data' => $this->viewer->getData(),
+        ];
+    }
+
+    /**
+     * Returns a count of all views.
+     */
+    public function getBadgeValue(): int
+    {
+        return count($this->viewer->getPerformanceData()); // @phpstan-ignore-line
+    }
+
+    /**
+     * Display the icon.
+     *
+     * Icon from https://icons8.com - 1em package
+     */
+    public function icon(): string
+    {
+        return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADeSURBVEhL7ZSxDcIwEEWNYA0YgGmgyAaJLTcUaaBzQQEVjMEabBQxAdw53zTHiThEovGTfnE/9rsoRUxhKLOmaa6Uh7X2+UvguLCzVxN1XW9x4EYHzik033Hp3X0LO+DaQG8MDQcuq6qao4qkHuMgQggLvkPLjqh00ZgFDBacMJYFkuwFlH1mshdkZ5JPJERA9JpI6xNCBESvibQ+IURA9JpI6xNCBESvibQ+IURA9DTsuHTOrVFFxixgB/eUFlU8uKJ0eDBFOu/9EvoeKnlJS2/08Tc8NOwQ8sIfMeYFjqKDjdU2sp4AAAAASUVORK5CYII=';
+    }
 }
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index ca38f9b47bb5..563cf21cd682 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -8,8 +8,6 @@ var ciDebugBar = {
 	toolbar : null,
 	icon : null,
 
-	//--------------------------------------------------------------------
-
 	init : function () {
 		this.toolbarContainer = document.getElementById('toolbarContainer');
 		this.toolbar          = document.getElementById('debug-bar');
@@ -53,8 +51,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	createListeners : function () {
 		var buttons = [].slice.call(document.querySelectorAll('#debug-bar .ci-label a'));
 
@@ -64,8 +60,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	showTab: function () {
 		// Get the target tab, if any
 		var tab = document.getElementById(this.getAttribute('data-tab'));
@@ -108,8 +102,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	addClass : function (el, className) {
 		if (el.classList)
 		{
@@ -121,8 +113,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	removeClass : function (el, className) {
 		if (el.classList)
 		{
@@ -134,8 +124,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Toggle display of a data table
 	 *
@@ -153,8 +141,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 *   Toggle tool bar from full to icon and icon to full
 	 */
@@ -169,8 +155,6 @@ var ciDebugBar = {
 		ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365);
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets the initial state of the toolbar (open or minimized) when
 	 * the page is first loaded to allow it to remember the state between refreshes.
@@ -182,8 +166,6 @@ var ciDebugBar = {
 		ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none';
 	},
 
-	//--------------------------------------------------------------------
-
 	toggleViewsHints: function () {
 		// Avoid toggle hints on history requests that are not the initial
 		if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new'))
@@ -475,8 +457,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	setToolbarPosition: function () {
 		var btnPosition = document.getElementById('toolbar-position');
 
@@ -506,8 +486,6 @@ var ciDebugBar = {
 		}, true);
 	},
 
-	//--------------------------------------------------------------------
-
 	setToolbarTheme: function () {
 		var btnTheme    = document.getElementById('toolbar-theme');
 		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
@@ -556,8 +534,6 @@ var ciDebugBar = {
 		}, true);
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Helper to create a cookie.
 	 *
@@ -582,8 +558,6 @@ var ciDebugBar = {
 		document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
 	},
 
-	//--------------------------------------------------------------------
-
 	readCookie : function (name) {
 		var nameEQ = name + "=";
 		var ca     = document.cookie.split(';');
@@ -603,8 +577,6 @@ var ciDebugBar = {
 		return null;
 	},
 
-	//--------------------------------------------------------------------
-
 	trimSlash: function (text) {
 		return text.replace(/^\/|\/$/g, '');
 	},
@@ -668,5 +640,4 @@ var ciDebugBar = {
 			})
 		}
 	}
-
 };
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 7c99914efd20..1c84ee541bd6 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -17,7 +17,6 @@
  * @var array                      $styles
  * @var \CodeIgniter\View\Parser   $parser
  */
-
 ?>
 <style type="text/css">
 	<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?>
@@ -49,7 +48,7 @@
 						<img src="<?= $c['icon'] ?>">
 						<span class="hide-sm">
 							<?= $c['title'] ?>
-							<?php if (! is_null($c['badgeValue'])) : ?>
+							<?php if ($c['badgeValue'] !== null) : ?>
 								<span class="badge"><?= $c['badgeValue'] ?></span>
 							<?php endif ?>
 						</span>
@@ -94,8 +93,7 @@
 			</tr>
 			</thead>
 			<tbody>
-			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration,
-				$styles) ?>
+			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?>
 			</tbody>
 		</table>
 	</div>
@@ -120,8 +118,7 @@
 		<?php if (isset($vars['varData'])) : ?>
 			<?php foreach ($vars['varData'] as $heading => $items) : ?>
 
-				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ',
-					'-', $heading)) ?>'); return false;">
+				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ', '-', $heading)) ?>'); return false;">
 					<h2><?= $heading ?></h2>
 				</a>
 
@@ -268,7 +265,7 @@
 	</div>
 </div>
 <style type="text/css">
-	<?php foreach($styles as $name => $style) : ?>
+	<?php foreach ($styles as $name => $style) : ?>
 	.<?= $name ?> {
 		<?= $style ?>
 	}
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 36720ba99c59..966c08e6f830 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Email;
@@ -22,2463 +22,2178 @@
  */
 class Email
 {
-	/**
-	 * Properties from the last successful send.
-	 *
-	 * @var array|null
-	 */
-	public $archive;
-
-	/**
-	 * Properties to be added to the next archive.
-	 *
-	 * @var array
-	 */
-	protected $tmpArchive = [];
-
-	/**
-	 * @var string
-	 */
-	public $fromEmail;
-
-	/**
-	 * @var string
-	 */
-	public $fromName;
-
-	/**
-	 * Used as the User-Agent and X-Mailer headers' value.
-	 *
-	 * @var string
-	 */
-	public $userAgent = 'CodeIgniter';
-
-	/**
-	 * Path to the Sendmail binary.
-	 *
-	 * @var string
-	 */
-	public $mailPath = '/usr/sbin/sendmail';
-
-	/**
-	 * Which method to use for sending e-mails.
-	 *
-	 * @var string 'mail', 'sendmail' or 'smtp'
-	 */
-	public $protocol = 'mail';
-
-	/**
-	 * STMP Server host
-	 *
-	 * @var string
-	 */
-	public $SMTPHost = '';
-
-	/**
-	 * SMTP Username
-	 *
-	 * @var string
-	 */
-	public $SMTPUser = '';
-
-	/**
-	 * SMTP Password
-	 *
-	 * @var string
-	 */
-	public $SMTPPass = '';
-
-	/**
-	 * SMTP Server port
-	 *
-	 * @var integer
-	 */
-	public $SMTPPort = 25;
-
-	/**
-	 * SMTP connection timeout in seconds
-	 *
-	 * @var integer
-	 */
-	public $SMTPTimeout = 5;
-
-	/**
-	 * SMTP persistent connection
-	 *
-	 * @var boolean
-	 */
-	public $SMTPKeepAlive = false;
-
-	/**
-	 * SMTP Encryption
-	 *
-	 * @var string Empty, 'tls' or 'ssl'
-	 */
-	public $SMTPCrypto = '';
-
-	/**
-	 * Whether to apply word-wrapping to the message body.
-	 *
-	 * @var boolean
-	 */
-	public $wordWrap = true;
-
-	/**
-	 * Number of characters to wrap at.
-	 *
-	 * @see Email::$wordWrap
-	 * @var integer
-	 */
-	public $wrapChars = 76;
-
-	/**
-	 * Message format.
-	 *
-	 * @var string 'text' or 'html'
-	 */
-	public $mailType = 'text';
-
-	/**
-	 * Character set (default: utf-8)
-	 *
-	 * @var string
-	 */
-	public $charset = 'utf-8';
-
-	/**
-	 * Alternative message (for HTML messages only)
-	 *
-	 * @var string
-	 */
-	public $altMessage = '';
-
-	/**
-	 * Whether to validate e-mail addresses.
-	 *
-	 * @var boolean
-	 */
-	public $validate = true;
-
-	/**
-	 * X-Priority header value.
-	 *
-	 * @var integer 1-5
-	 */
-	public $priority = 3;
-
-	/**
-	 * Newline character sequence.
-	 * Use "\r\n" to comply with RFC 822.
-	 *
-	 * @link http://www.ietf.org/rfc/rfc822.txt
-	 * @var  string "\r\n" or "\n"
-	 */
-	public $newline = "\n";
-
-	/**
-	 * CRLF character sequence
-	 *
-	 * RFC 2045 specifies that for 'quoted-printable' encoding,
-	 * "\r\n" must be used. However, it appears that some servers
-	 * (even on the receiving end) don't handle it properly and
-	 * switching to "\n", while improper, is the only solution
-	 * that seems to work for all environments.
-	 *
-	 * @link http://www.ietf.org/rfc/rfc822.txt
-	 * @var  string
-	 */
-	public $CRLF = "\n";
-
-	/**
-	 * Whether to use Delivery Status Notification.
-	 *
-	 * @var boolean
-	 */
-	public $DSN = false;
-
-	/**
-	 * Whether to send multipart alternatives.
-	 * Yahoo! doesn't seem to like these.
-	 *
-	 * @var boolean
-	 */
-	public $sendMultipart = true;
-
-	/**
-	 * Whether to send messages to BCC recipients in batches.
-	 *
-	 * @var boolean
-	 */
-	public $BCCBatchMode = false;
-
-	/**
-	 * BCC Batch max number size.
-	 *
-	 * @see Email::$BCCBatchMode
-	 * @var integer|string
-	 */
-	public $BCCBatchSize = 200;
-
-	/**
-	 * Subject header
-	 *
-	 * @var string
-	 */
-	protected $subject = '';
-
-	/**
-	 * Message body
-	 *
-	 * @var string
-	 */
-	protected $body = '';
-
-	/**
-	 * Final message body to be sent.
-	 *
-	 * @var string
-	 */
-	protected $finalBody = '';
-
-	/**
-	 * Final headers to send
-	 *
-	 * @var string
-	 */
-	protected $headerStr = '';
-
-	/**
-	 * SMTP Connection socket placeholder
-	 *
-	 * @var resource|null
-	 */
-	protected $SMTPConnect;
-
-	/**
-	 * Mail encoding
-	 *
-	 * @var string '8bit' or '7bit'
-	 */
-	protected $encoding = '8bit';
-
-	/**
-	 * Whether to perform SMTP authentication
-	 *
-	 * @var boolean
-	 */
-	protected $SMTPAuth = false;
-
-	/**
-	 * Whether to send a Reply-To header
-	 *
-	 * @var boolean
-	 */
-	protected $replyToFlag = false;
-
-	/**
-	 * Debug messages
-	 *
-	 * @see Email::printDebugger()
-	 * @var array
-	 */
-	protected $debugMessage = [];
-
-	/**
-	 * Recipients
-	 *
-	 * @var array|string
-	 */
-	protected $recipients = [];
-
-	/**
-	 * CC Recipients
-	 *
-	 * @var array
-	 */
-	protected $CCArray = [];
-
-	/**
-	 * BCC Recipients
-	 *
-	 * @var array
-	 */
-	protected $BCCArray = [];
-
-	/**
-	 * Message headers
-	 *
-	 * @var array
-	 */
-	protected $headers = [];
-
-	/**
-	 * Attachment data
-	 *
-	 * @var array
-	 */
-	protected $attachments = [];
-
-	/**
-	 * Valid $protocol values
-	 *
-	 * @see Email::$protocol
-	 * @var array
-	 */
-	protected $protocols = [
-		'mail',
-		'sendmail',
-		'smtp',
-	];
-
-	/**
-	 * Base charsets
-	 *
-	 * Character sets valid for 7-bit encoding,
-	 * excluding language suffix.
-	 *
-	 * @var array
-	 */
-	protected $baseCharsets = [
-		'us-ascii',
-		'iso-2022-',
-	];
-
-	/**
-	 * Bit depths
-	 *
-	 * Valid mail encodings
-	 *
-	 * @see Email::$encoding
-	 * @var array
-	 */
-	protected $bitDepths = [
-		'7bit',
-		'8bit',
-	];
-
-	/**
-	 * $priority translations
-	 *
-	 * Actual values to send with the X-Priority header
-	 *
-	 * @var array
-	 */
-	protected $priorities = [
-		1 => '1 (Highest)',
-		2 => '2 (High)',
-		3 => '3 (Normal)',
-		4 => '4 (Low)',
-		5 => '5 (Lowest)',
-	];
-
-	/**
-	 * mbstring.func_overload flag
-	 *
-	 * @var boolean
-	 */
-	protected static $func_overload;
-
-	/**
-	 * Constructor - Sets Email Preferences
-	 *
-	 * The constructor can be passed an array of config values
-	 *
-	 * @param array|null $config
-	 */
-	public function __construct($config = null)
-	{
-		$this->initialize($config);
-		if (! isset(static::$func_overload))
-		{
-			static::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
-		}
-	}
-
-	/**
-	 * Initialize preferences
-	 *
-	 * @param array|\Config\Email $config
-	 *
-	 * @return Email
-	 */
-	public function initialize($config)
-	{
-		$this->clear();
-
-		if ($config instanceof \Config\Email)
-		{
-			$config = get_object_vars($config);
-		}
-
-		foreach (array_keys(get_class_vars(get_class($this))) as $key)
-		{
-			if (property_exists($this, $key) && isset($config[$key]))
-			{
-				$method = 'set' . ucfirst($key);
-
-				if (method_exists($this, $method))
-				{
-					$this->$method($config[$key]);
-				}
-				else
-				{
-					$this->$key = $config[$key];
-				}
-			}
-		}
-
-		$this->charset  = strtoupper($this->charset);
-		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
-
-		return $this;
-	}
-
-	/**
-	 * Initialize the Email Data
-	 *
-	 * @param boolean $clearAttachments
-	 *
-	 * @return Email
-	 */
-	public function clear($clearAttachments = false)
-	{
-		$this->subject      = '';
-		$this->body         = '';
-		$this->finalBody    = '';
-		$this->headerStr    = '';
-		$this->replyToFlag  = false;
-		$this->recipients   = [];
-		$this->CCArray      = [];
-		$this->BCCArray     = [];
-		$this->headers      = [];
-		$this->debugMessage = [];
-
-		$this->setHeader('Date', $this->setDate());
-
-		if ($clearAttachments !== false)
-		{
-			$this->attachments = [];
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set FROM
-	 *
-	 * @param string      $from
-	 * @param string      $name
-	 * @param string|null $returnPath Return-Path
-	 *
-	 * @return Email
-	 */
-	public function setFrom($from, $name = '', $returnPath = null)
-	{
-		if (preg_match('/\<(.*)\>/', $from, $match))
-		{
-			$from = $match[1];
-		}
-
-		if ($this->validate)
-		{
-			$this->validateEmail($this->stringToArray($from));
-
-			if ($returnPath)
-			{
-				$this->validateEmail($this->stringToArray($returnPath));
-			}
-		}
-
-		// Store the plain text values
-		$this->tmpArchive['fromEmail'] = $from;
-		$this->tmpArchive['fromName']  = $name;
-
-		// prepare the display name
-		if ($name !== '')
-		{
-			// only use Q encoding if there are characters that would require it
-			if (! preg_match('/[\200-\377]/', $name))
-			{
-				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
-			}
-			else
-			{
-				$name = $this->prepQEncoding($name);
-			}
-		}
-
-		$this->setHeader('From', $name . ' <' . $from . '>');
-		if (! isset($returnPath))
-		{
-			$returnPath = $from;
-		}
-		$this->setHeader('Return-Path', '<' . $returnPath . '>');
-		$this->tmpArchive['returnPath'] = $returnPath;
-
-		return $this;
-	}
-
-	/**
-	 * Set Reply-to
-	 *
-	 * @param string $replyto
-	 * @param string $name
-	 *
-	 * @return Email
-	 */
-	public function setReplyTo($replyto, $name = '')
-	{
-		if (preg_match('/\<(.*)\>/', $replyto, $match))
-		{
-			$replyto = $match[1];
-		}
-
-		if ($this->validate)
-		{
-			$this->validateEmail($this->stringToArray($replyto));
-		}
-
-		if ($name !== '')
-		{
-			$this->tmpArchive['replyName'] = $name;
-
-			// only use Q encoding if there are characters that would require it
-			if (! preg_match('/[\200-\377]/', $name))
-			{
-				// add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
-				$name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
-			}
-			else
-			{
-				$name = $this->prepQEncoding($name);
-			}
-		}
-
-		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
-		$this->replyToFlag           = true;
-		$this->tmpArchive['replyTo'] = $replyto;
-
-		return $this;
-	}
-
-	/**
-	 * Set Recipients
-	 *
-	 * @param string|array $to
-	 *
-	 * @return Email
-	 */
-	public function setTo($to)
-	{
-		$to = $this->stringToArray($to);
-		$to = $this->cleanEmail($to);
-
-		if ($this->validate)
-		{
-			$this->validateEmail($to);
-		}
-
-		if ($this->getProtocol() !== 'mail')
-		{
-			$this->setHeader('To', implode(', ', $to));
-		}
-
-		$this->recipients = $to;
-
-		return $this;
-	}
-
-	/**
-	 * Set CC
-	 *
-	 * @param string $cc
-	 *
-	 * @return Email
-	 */
-	public function setCC($cc)
-	{
-		$cc = $this->cleanEmail($this->stringToArray($cc));
-
-		if ($this->validate)
-		{
-			$this->validateEmail($cc);
-		}
-
-		$this->setHeader('Cc', implode(', ', $cc));
-
-		if ($this->getProtocol() === 'smtp')
-		{
-			$this->CCArray = $cc;
-		}
-
-		$this->tmpArchive['CCArray'] = $cc;
-
-		return $this;
-	}
-
-	/**
-	 * Set BCC
-	 *
-	 * @param string $bcc
-	 * @param string $limit
-	 *
-	 * @return Email
-	 */
-	public function setBCC($bcc, $limit = '')
-	{
-		if ($limit !== '' && is_numeric($limit))
-		{
-			$this->BCCBatchMode = true;
-			$this->BCCBatchSize = $limit;
-		}
-
-		$bcc = $this->cleanEmail($this->stringToArray($bcc));
-
-		if ($this->validate)
-		{
-			$this->validateEmail($bcc);
-		}
-
-		if ($this->getProtocol() === 'smtp' || ($this->BCCBatchMode && count($bcc) > $this->BCCBatchSize))
-		{
-			$this->BCCArray = $bcc;
-		}
-		else
-		{
-			$this->setHeader('Bcc', implode(', ', $bcc));
-			$this->tmpArchive['BCCArray'] = $bcc;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Set Email Subject
-	 *
-	 * @param string $subject
-	 *
-	 * @return Email
-	 */
-	public function setSubject($subject)
-	{
-		$this->tmpArchive['subject'] = $subject;
-
-		$subject = $this->prepQEncoding($subject);
-		$this->setHeader('Subject', $subject);
-
-		return $this;
-	}
-
-	/**
-	 * Set Body
-	 *
-	 * @param string $body
-	 *
-	 * @return Email
-	 */
-	public function setMessage($body)
-	{
-		$this->body = rtrim(str_replace("\r", '', $body));
-
-		return $this;
-	}
-
-	/**
-	 * Assign file attachments
-	 *
-	 * @param string      $file        Can be local path, URL or buffered content
-	 * @param string      $disposition 'attachment'
-	 * @param string|null $newname
-	 * @param string      $mime
-	 *
-	 * @return Email|boolean
-	 */
-	public function attach($file, $disposition = '', $newname = null, $mime = '')
-	{
-		if ($mime === '')
-		{
-			if (strpos($file, '://') === false && ! is_file($file))
-			{
-				$this->setErrorMessage(lang('Email.attachmentMissing', [$file]));
-
-				return false;
-			}
-
-			if (! $fp = @fopen($file, 'rb'))
-			{
-				$this->setErrorMessage(lang('Email.attachmentUnreadable', [$file]));
-
-				return false;
-			}
-
-			$fileContent = stream_get_contents($fp);
-
-			$mime = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
-
-			fclose($fp);
-		}
-		else
-		{
-			$fileContent = & $file; // buffered file
-		}
-
-		// declare names on their own, to make phpcbf happy
-		$namesAttached = [
-			$file,
-			$newname,
-		];
-
-		$this->attachments[] = [
-			'name'        => $namesAttached,
-			'disposition' => empty($disposition) ? 'attachment' : $disposition,
-			// Can also be 'inline'  Not sure if it matters
-			'type'        => $mime,
-			'content'     => chunk_split(base64_encode($fileContent)),
-			'multipart'   => 'mixed',
-		];
-
-		return $this;
-	}
-
-	/**
-	 * Set and return attachment Content-ID
-	 *
-	 * Useful for attached inline pictures
-	 *
-	 * @param string $filename
-	 *
-	 * @return string|boolean
-	 */
-	public function setAttachmentCID($filename)
-	{
-		foreach ($this->attachments as $i => $attachment)
-		{
-			if ($attachment['name'][0] === $filename)
-			{
-				$this->attachments[$i]['multipart'] = 'related';
-
-				$this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][0]) . '@', true);
-
-				return $attachment['cid'];
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Add a Header Item
-	 *
-	 * @param string $header
-	 * @param string $value
-	 *
-	 * @return Email
-	 */
-	public function setHeader($header, $value)
-	{
-		$this->headers[$header] = str_replace(["\n", "\r"], '', $value);
-
-		return $this;
-	}
-
-	/**
-	 * Convert a String to an Array
-	 *
-	 * @param string $email
-	 *
-	 * @return array
-	 */
-	protected function stringToArray($email)
-	{
-		if (! is_array($email))
-		{
-			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
-		}
-
-		return $email;
-	}
-
-	/**
-	 * Set Multipart Value
-	 *
-	 * @param string $str
-	 *
-	 * @return Email
-	 */
-	public function setAltMessage($str)
-	{
-		$this->altMessage = (string) $str;
-
-		return $this;
-	}
-
-	/**
-	 * Set Mailtype
-	 *
-	 * @param string $type
-	 *
-	 * @return Email
-	 */
-	public function setMailType($type = 'text')
-	{
-		$this->mailType = ($type === 'html') ? 'html' : 'text';
-
-		return $this;
-	}
-
-	/**
-	 * Set Wordwrap
-	 *
-	 * @param boolean $wordWrap
-	 *
-	 * @return Email
-	 */
-	public function setWordWrap($wordWrap = true)
-	{
-		$this->wordWrap = (bool) $wordWrap;
-
-		return $this;
-	}
-
-	/**
-	 * Set Protocol
-	 *
-	 * @param string $protocol
-	 *
-	 * @return Email
-	 */
-	public function setProtocol($protocol = 'mail')
-	{
-		$this->protocol = in_array($protocol, $this->protocols, true) ? strtolower($protocol) : 'mail';
-
-		return $this;
-	}
-
-	/**
-	 * Set Priority
-	 *
-	 * @param integer $n
-	 *
-	 * @return Email
-	 */
-	public function setPriority($n = 3)
-	{
-		$this->priority = preg_match('/^[1-5]$/', (string) $n) ? (int) $n : 3;
-
-		return $this;
-	}
-
-	/**
-	 * Set Newline Character
-	 *
-	 * @param string $newline
-	 *
-	 * @return Email
-	 */
-	public function setNewline($newline = "\n")
-	{
-		$this->newline = in_array($newline, ["\n", "\r\n", "\r"], true) ? $newline : "\n";
-
-		return $this;
-	}
-
-	/**
-	 * Set CRLF
-	 *
-	 * @param string $CRLF
-	 *
-	 * @return Email
-	 */
-	public function setCRLF($CRLF = "\n")
-	{
-		$this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
-
-		return $this;
-	}
-
-	/**
-	 * Get the Message ID
-	 *
-	 * @return string
-	 */
-	protected function getMessageID()
-	{
-		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
-
-		return '<' . uniqid('', true) . strstr($from, '@') . '>';
-	}
-
-	/**
-	 * Get Mail Protocol
-	 *
-	 * @return string
-	 */
-	protected function getProtocol()
-	{
-		$this->protocol = strtolower($this->protocol);
-
-		if (! in_array($this->protocol, $this->protocols, true))
-		{
-			$this->protocol = 'mail';
-		}
-
-		return $this->protocol;
-	}
-
-	/**
-	 * Get Mail Encoding
-	 *
-	 * @return string
-	 */
-	protected function getEncoding()
-	{
-		if (! in_array($this->encoding, $this->bitDepths, true))
-		{
-			$this->encoding = '8bit';
-		}
-
-		foreach ($this->baseCharsets as $charset)
-		{
-			if (strpos($this->charset, $charset) === 0)
-			{
-				$this->encoding = '7bit';
-
-				break;
-			}
-		}
-
-		return $this->encoding;
-	}
-
-	/**
-	 * Get content type (text/html/attachment)
-	 *
-	 * @return string
-	 */
-	protected function getContentType()
-	{
-		if ($this->mailType === 'html')
-		{
-			return empty($this->attachments) ? 'html' : 'html-attach';
-		}
-
-		if ($this->mailType === 'text' && ! empty($this->attachments))
-		{
-			return 'plain-attach';
-		}
-
-		return 'plain';
-	}
-
-	/**
-	 * Set RFC 822 Date
-	 *
-	 * @return string
-	 */
-	protected function setDate()
-	{
-		$timezone = date('Z');
-		$operator = ($timezone[0] === '-') ? '-' : '+';
-		$timezone = abs($timezone);
-		$timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
-
-		return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
-	}
-
-	/**
-	 * Mime message
-	 *
-	 * @return string
-	 */
-	protected function getMimeMessage()
-	{
-		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
-	}
-
-	/**
-	 * Validate Email Address
-	 *
-	 * @param string|array $email
-	 *
-	 * @return boolean
-	 */
-	public function validateEmail($email)
-	{
-		if (! is_array($email))
-		{
-			$this->setErrorMessage(lang('Email.mustBeArray'));
-
-			return false;
-		}
-
-		foreach ($email as $val)
-		{
-			if (! $this->isValidEmail($val))
-			{
-				$this->setErrorMessage(lang('Email.invalidAddress', [$val]));
-
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Email Validation
-	 *
-	 * @param string $email
-	 *
-	 * @return boolean
-	 */
-	public function isValidEmail($email)
-	{
-		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@'))
-		{
-			$email = static::substr($email, 0, ++$atpos)
-				. idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
-		}
-
-		return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
-	}
-
-	/**
-	 * Clean Extended Email Address: Joe Smith <joe@smith.com>
-	 *
-	 * @param string|array $email
-	 *
-	 * @return array|string
-	 */
-	public function cleanEmail($email)
-	{
-		if (! is_array($email))
-		{
-			return preg_match('/\<(.*)\>/', $email, $match) ? $match[1] : $email;
-		}
-
-		$cleanEmail = [];
-
-		foreach ($email as $addy)
-		{
-			$cleanEmail[] = preg_match('/\<(.*)\>/', $addy, $match) ? $match[1] : $addy;
-		}
-
-		return $cleanEmail;
-	}
-
-	/**
-	 * Build alternative plain text message
-	 *
-	 * Provides the raw message for use in plain-text headers of
-	 * HTML-formatted emails.
-	 * If the user hasn't specified his own alternative message
-	 * it creates one by stripping the HTML
-	 *
-	 * @return string
-	 */
-	protected function getAltMessage()
-	{
-		if (! empty($this->altMessage))
-		{
-			return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
-		}
-
-		$body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
-		$body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
-
-		for ($i = 20; $i >= 3; $i --)
-		{
-			$body = str_replace(str_repeat("\n", $i), "\n\n", $body);
-		}
-
-		// Reduce multiple spaces
-		$body = preg_replace('| +|', ' ', $body);
-
-		return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
-	}
-
-	/**
-	 * Word Wrap
-	 *
-	 * @param string       $str
-	 * @param integer|null $charlim Line-length limit
-	 *
-	 * @return string
-	 */
-	public function wordWrap($str, $charlim = null)
-	{
-		// Set the character limit, if not already present
-		if (empty($charlim))
-		{
-			$charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
-		}
-
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-
-		// Reduce multiple spaces at end of line
-		$str = preg_replace('| +\n|', "\n", $str);
-
-		// If the current word is surrounded by {unwrap} tags we'll
-		// strip the entire chunk and replace it with a marker.
-		$unwrap = [];
-
-		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
-		{
-			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
-			{
-				$unwrap[] = $matches[1][$i];
-				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
-			}
-		}
-
-		// Use PHP's native function to do the initial wordwrap.
-		// We set the cut flag to FALSE so that any individual words that are
-		// too long get left alone. In the next step we'll deal with them.
-		$str = wordwrap($str, $charlim, "\n", false);
-
-		// Split the string into individual lines of text and cycle through them
-		$output = '';
-
-		foreach (explode("\n", $str) as $line)
-		{
-			// Is the line within the allowed character count?
-			// If so we'll join it to the output and continue
-			if (static::strlen($line) <= $charlim)
-			{
-				$output .= $line . $this->newline;
-
-				continue;
-			}
-
-			$temp = '';
-
-			do
-			{
-				// If the over-length word is a URL we won't wrap it
-				if (preg_match('!\[url.+\]|://|www\.!', $line))
-				{
-					break;
-				}
-
-				// Trim the word down
-				$temp .= static::substr($line, 0, $charlim - 1);
-				$line  = static::substr($line, $charlim - 1);
-			}
-			while (static::strlen($line) > $charlim);
-
-			// If $temp contains data it means we had to split up an over-length
-			// word into smaller chunks so we'll add it back to our current line
-			if ($temp !== '')
-			{
-				$output .= $temp . $this->newline;
-			}
-
-			$output .= $line . $this->newline;
-		}
-
-		// Put our markers back
-		if ($unwrap)
-		{
-			foreach ($unwrap as $key => $val)
-			{
-				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build final headers
-	 */
-	protected function buildHeaders()
-	{
-		$this->setHeader('User-Agent', $this->userAgent);
-		$this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
-		$this->setHeader('X-Mailer', $this->userAgent);
-		$this->setHeader('X-Priority', $this->priorities[$this->priority]);
-		$this->setHeader('Message-ID', $this->getMessageID());
-		$this->setHeader('Mime-Version', '1.0');
-	}
-
-	/**
-	 * Write Headers as a string
-	 */
-	protected function writeHeaders()
-	{
-		if ($this->protocol === 'mail' && isset($this->headers['Subject']))
-		{
-			$this->subject = $this->headers['Subject'];
-			unset($this->headers['Subject']);
-		}
-
-		reset($this->headers);
-		$this->headerStr = '';
-
-		foreach ($this->headers as $key => $val)
-		{
-			$val = trim($val);
-
-			if ($val !== '')
-			{
-				$this->headerStr .= $key . ': ' . $val . $this->newline;
-			}
-		}
-
-		if ($this->getProtocol() === 'mail')
-		{
-			$this->headerStr = rtrim($this->headerStr);
-		}
-	}
-
-	/**
-	 * Build Final Body and attachments
-	 */
-	protected function buildMessage()
-	{
-		if ($this->wordWrap === true && $this->mailType !== 'html')
-		{
-			$this->body = $this->wordWrap($this->body);
-		}
-
-		$this->writeHeaders();
-		$hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
-		$body = '';
-
-		switch ($this->getContentType())
-		{
-			case 'plain':
-				$hdr .= 'Content-Type: text/plain; charset='
-					. $this->charset
-					. $this->newline
-					. 'Content-Transfer-Encoding: '
-					. $this->getEncoding();
-
-				if ($this->getProtocol() === 'mail')
-				{
-					$this->headerStr .= $hdr;
-					$this->finalBody  = $this->body;
-				}
-				else
-				{
-					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
-				}
-
-				return;
-
-			case 'html':
-				$boundary = uniqid('B_ALT_', true);
-
-				if ($this->sendMultipart === false)
-				{
-					$hdr .= 'Content-Type: text/html; charset='
-						. $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: quoted-printable';
-				}
-				else
-				{
-					$hdr  .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
-					$body .= $this->getMimeMessage() . $this->newline . $this->newline
-						. '--' . $boundary . $this->newline
-						. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-						. $this->getAltMessage() . $this->newline . $this->newline
-						. '--' . $boundary . $this->newline
-						. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-						. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
-				}
-
-				$this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
-
-				if ($this->getProtocol() === 'mail')
-				{
-					  $this->headerStr .= $hdr;
-				}
-				else
-				{
-					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
-				}
-
-				if ($this->sendMultipart !== false)
-				{
-					$this->finalBody .= '--' . $boundary . '--';
-				}
-
-				return;
-
-			case 'plain-attach':
-				$boundary = uniqid('B_ATC_', true);
-				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
-
-				if ($this->getProtocol() === 'mail')
-				{
-					$this->headerStr .= $hdr;
-				}
-
-				$body .= $this->getMimeMessage() . $this->newline
-					. $this->newline
-					. '--' . $boundary . $this->newline
-					. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-					. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
-					. $this->newline
-					. $this->body . $this->newline . $this->newline;
-
-				$this->appendAttachments($body, $boundary);
-				break;
-
-			case 'html-attach':
-				$altBoundary  = uniqid('B_ALT_', true);
-				$lastBoundary = null;
-
-				if ($this->attachmentsHaveMultipart('mixed'))
-				{
-					$atcBoundary  = uniqid('B_ATC_', true);
-					$hdr         .= 'Content-Type: multipart/mixed; boundary="' . $atcBoundary . '"';
-					$lastBoundary = $atcBoundary;
-				}
-
-				if ($this->attachmentsHaveMultipart('related'))
-				{
-					$relBoundary = uniqid('B_REL_', true);
-
-					$relBoundaryHeader = 'Content-Type: multipart/related; boundary="' . $relBoundary . '"';
-
-					if (isset($lastBoundary))
-					{
-						$body .= '--' . $lastBoundary . $this->newline . $relBoundaryHeader;
-					}
-					else
-					{
-						$hdr .= $relBoundaryHeader;
-					}
-
-					$lastBoundary = $relBoundary;
-				}
-
-				if ($this->getProtocol() === 'mail')
-				{
-					$this->headerStr .= $hdr;
-				}
-
-				static::strlen($body) && $body .= $this->newline . $this->newline;
-
-				$body .= $this->getMimeMessage() . $this->newline . $this->newline
-					. '--' . $lastBoundary . $this->newline
-					. 'Content-Type: multipart/alternative; boundary="' . $altBoundary . '"' . $this->newline . $this->newline
-					. '--' . $altBoundary . $this->newline
-					. 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
-					. 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
-					. $this->getAltMessage() . $this->newline . $this->newline
-					. '--' . $altBoundary . $this->newline
-					. 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-					. 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
-					. $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
-					. '--' . $altBoundary . '--' . $this->newline . $this->newline;
-
-				if (! empty($relBoundary))
-				{
-					$body .= $this->newline . $this->newline;
-					$this->appendAttachments($body, $relBoundary, 'related');
-				}
-
-				// multipart/mixed attachments
-				if (! empty($atcBoundary))
-				{
-					$body .= $this->newline . $this->newline;
-					$this->appendAttachments($body, $atcBoundary, 'mixed');
-				}
-
-				break;
-		}
-
-		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	protected function attachmentsHaveMultipart($type)
-	{
-		foreach ($this->attachments as &$attachment)
-		{
-			if ($attachment['multipart'] === $type)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Prepares attachment string
-	 *
-	 * @param string      $body      Message body to append to
-	 * @param string      $boundary  Multipart boundary
-	 * @param string|null $multipart When provided, only attachments of this type will be processed
-	 *
-	 * @return void
-	 */
-	protected function appendAttachments(&$body, $boundary, $multipart = null)
-	{
-		foreach ($this->attachments as $attachment)
-		{
-			if (isset($multipart) && $attachment['multipart'] !== $multipart)
-			{
-				continue;
-			}
-			$name  = $attachment['name'][1] ?? basename($attachment['name'][0]);
-			$body .= '--' . $boundary . $this->newline
-				. 'Content-Type: ' . $attachment['type'] . '; name="' . $name . '"' . $this->newline
-				. 'Content-Disposition: ' . $attachment['disposition'] . ';' . $this->newline
-				. 'Content-Transfer-Encoding: base64' . $this->newline
-				. (empty($attachment['cid']) ? '' : 'Content-ID: <' . $attachment['cid'] . '>' . $this->newline)
-				. $this->newline
-				. $attachment['content'] . $this->newline;
-		}
-
-		// $name won't be set if no attachments were appended,
-		// and therefore a boundary wouldn't be necessary
-		if (! empty($name))
-		{
-			$body .= '--' . $boundary . '--';
-		}
-	}
-
-	/**
-	 * Prep Quoted Printable
-	 *
-	 * Prepares string for Quoted-Printable Content-Transfer-Encoding
-	 * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	protected function prepQuotedPrintable($str)
-	{
-		// ASCII code numbers for "safe" characters that can always be
-		// used literally, without encoding, as described in RFC 2049.
-		// http://www.ietf.org/rfc/rfc2049.txt
-		static $asciiSafeChars = [
-			// ' (  )   +   ,   -   .   /   :   =   ?
-			39,
-			40,
-			41,
-			43,
-			44,
-			45,
-			46,
-			47,
-			58,
-			61,
-			63,
-			// numbers
-			48,
-			49,
-			50,
-			51,
-			52,
-			53,
-			54,
-			55,
-			56,
-			57,
-			// upper-case letters
-			65,
-			66,
-			67,
-			68,
-			69,
-			70,
-			71,
-			72,
-			73,
-			74,
-			75,
-			76,
-			77,
-			78,
-			79,
-			80,
-			81,
-			82,
-			83,
-			84,
-			85,
-			86,
-			87,
-			88,
-			89,
-			90,
-			// lower-case letters
-			97,
-			98,
-			99,
-			100,
-			101,
-			102,
-			103,
-			104,
-			105,
-			106,
-			107,
-			108,
-			109,
-			110,
-			111,
-			112,
-			113,
-			114,
-			115,
-			116,
-			117,
-			118,
-			119,
-			120,
-			121,
-			122,
-		];
-
-		// We are intentionally wrapping so mail servers will encode characters
-		// properly and MUAs will behave, so {unwrap} must go!
-		$str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
-
-		// RFC 2045 specifies CRLF as "\r\n".
-		// However, many developers choose to override that and violate
-		// the RFC rules due to (apparently) a bug in MS Exchange,
-		// which only works with "\n".
-		if ($this->CRLF === "\r\n")
-		{
-			return quoted_printable_encode($str);
-		}
-
-		// Reduce multiple spaces & remove nulls
-		$str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
-
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-
-		$escape = '=';
-		$output = '';
-
-		foreach (explode("\n", $str) as $line)
-		{
-			$length = static::strlen($line);
-			$temp   = '';
-
-			// Loop through each character in the line to add soft-wrap
-			// characters at the end of a line " =\r\n" and add the newly
-			// processed line(s) to the output (see comment on $crlf class property)
-			for ($i = 0; $i < $length; $i ++)
-			{
-				// Grab the next character
-				$char  = $line[$i];
-				$ascii = ord($char);
-
-				// Convert spaces and tabs but only if it's the end of the line
-				if ($ascii === 32 || $ascii === 9)
-				{
-					if ($i === ($length - 1))
-					{
-						$char = $escape . sprintf('%02s', dechex($ascii));
-					}
-				}
-				// DO NOT move this below the $ascii_safe_chars line!
-				//
-				// = (equals) signs are allowed by RFC2049, but must be encoded
-				// as they are the encoding delimiter!
-				elseif ($ascii === 61)
-				{
-					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
-				}
-				elseif (! in_array($ascii, $asciiSafeChars, true))
-				{
-					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
-				}
-
-				// If we're at the character limit, add the line to the output,
-				// reset our temp variable, and keep on chuggin'
-				if ((static::strlen($temp) + static::strlen($char)) >= 76)
-				{
-					$output .= $temp . $escape . $this->CRLF;
-					$temp    = '';
-				}
-
-				// Add the character to our temporary line
-				$temp .= $char;
-			}
-
-			// Add our completed line to the output
-			$output .= $temp . $this->CRLF;
-		}
-
-		// get rid of extra CRLF tacked onto the end
-		return static::substr($output, 0, static::strlen($this->CRLF) * -1);
-	}
-
-	/**
-	 * Prep Q Encoding
-	 *
-	 * Performs "Q Encoding" on a string for use in email headers.
-	 * It's related but not identical to quoted-printable, so it has its
-	 * own method.
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	protected function prepQEncoding($str)
-	{
-		$str = str_replace(["\r", "\n"], '', $str);
-
-		if ($this->charset === 'UTF-8')
-		{
-			// Note: We used to have mb_encode_mimeheader() as the first choice
-			//       here, but it turned out to be buggy and unreliable. DO NOT
-			//       re-add it! -- Narf
-			if (extension_loaded('iconv'))
-			{
-				$output = @iconv_mime_encode('', $str, [
-					'scheme'           => 'Q',
-					'line-length'      => 76,
-					'input-charset'    => $this->charset,
-					'output-charset'   => $this->charset,
-					'line-break-chars' => $this->CRLF,
-				]);
-
-				// There are reports that iconv_mime_encode() might fail and return FALSE
-				if ($output !== false)
-				{
-					// iconv_mime_encode() will always put a header field name.
-					// We've passed it an empty one, but it still prepends our
-					// encoded string with ': ', so we need to strip it.
-					return static::substr($output, 2);
-				}
-
-				$chars = iconv_strlen($str, 'UTF-8');
-			}
-			elseif (extension_loaded('mbstring'))
-			{
-				$chars = mb_strlen($str, 'UTF-8');
-			}
-		}
-
-		// We might already have this set for UTF-8
-		if (! isset($chars))
-		{
-			$chars = static::strlen($str);
-		}
-
-		$output = '=?' . $this->charset . '?Q?';
-
-		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
-		{
-			$chr = ($this->charset === 'UTF-8' && extension_loaded('iconv')) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
-
-			// RFC 2045 sets a limit of 76 characters per line.
-			// We'll append ?= to the end of each line though.
-			if ($length + ($l = static::strlen($chr)) > 74)
-			{
-				$output .= '?=' . $this->CRLF // EOL
-					. ' =?' . $this->charset . '?Q?' . $chr; // New line
-
-				$length = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
-			}
-			else
-			{
-				$output .= $chr;
-				$length += $l;
-			}
-		}
-
-		// End the header
-		return $output . '?=';
-	}
-
-	/**
-	 * Send Email
-	 *
-	 * @param boolean $autoClear
-	 *
-	 * @return boolean
-	 */
-	public function send($autoClear = true)
-	{
-		if (! isset($this->headers['From']) && ! empty($this->fromEmail))
-		{
-			$this->setFrom($this->fromEmail, $this->fromName);
-		}
-
-		if (! isset($this->headers['From']))
-		{
-			$this->setErrorMessage(lang('Email.noFrom'));
-
-			return false;
-		}
-
-		if ($this->replyToFlag === false)
-		{
-			$this->setReplyTo($this->headers['From']);
-		}
-
-		if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc']))
-		{
-			$this->setErrorMessage(lang('Email.noRecipients'));
-
-			return false;
-		}
-
-		$this->buildHeaders();
-
-		if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize)
-		{
-			$this->batchBCCSend();
-
-			if ($autoClear)
-			{
-				$this->clear();
-			}
-
-			return true;
-		}
-
-		$this->buildMessage();
-		$result = $this->spoolEmail();
-
-		if ($result)
-		{
-			$this->setArchiveValues();
-
-			if ($autoClear)
-			{
-				$this->clear();
-			}
-
-			Events::trigger('email', $this->archive);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Batch Bcc Send. Sends groups of BCCs in batches
-	 */
-	public function batchBCCSend()
-	{
-		$float = $this->BCCBatchSize - 1;
-		$set   = '';
-		$chunk = [];
-
-		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i++)
-		{
-			if (isset($this->BCCArray[$i]))
-			{
-				$set .= ', ' . $this->BCCArray[$i];
-			}
-
-			if ($i === $float)
-			{
-				$chunk[] = static::substr($set, 1);
-				$float  += $this->BCCBatchSize;
-				$set     = '';
-			}
-
-			if ($i === $c - 1)
-			{
-				$chunk[] = static::substr($set, 1);
-			}
-		}
-
-		for ($i = 0, $c = count($chunk); $i < $c; $i ++)
-		{
-			unset($this->headers['Bcc']);
-			$bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
-
-			if ($this->protocol !== 'smtp')
-			{
-				$this->setHeader('Bcc', implode(', ', $bcc));
-			}
-			else
-			{
-				$this->BCCArray = $bcc;
-			}
-
-			$this->buildMessage();
-			$this->spoolEmail();
-		}
-
-		// Update the archive
-		$this->setArchiveValues();
-		Events::trigger('email', $this->archive);
-	}
-
-	/**
-	 * Unwrap special elements
-	 */
-	protected function unwrapSpecials()
-	{
-		$this->finalBody = preg_replace_callback(
-			'/\{unwrap\}(.*?)\{\/unwrap\}/si',
-			[
-				$this,
-				'removeNLCallback',
-			],
-			$this->finalBody
-		);
-	}
-
-	/**
-	 * Strip line-breaks via callback
-	 *
-	 * @param string $matches
-	 *
-	 * @return string
-	 */
-	protected function removeNLCallback($matches)
-	{
-		if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false)
-		{
-			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
-		}
-
-		return $matches[1];
-	}
-
-	/**
-	 * Spool mail to the mail server
-	 *
-	 * @return boolean
-	 */
-	protected function spoolEmail()
-	{
-		$this->unwrapSpecials();
-		$protocol = $this->getProtocol();
-		$method   = 'sendWith' . ucfirst($protocol);
-
-		try
-		{
-			$success = $this->$method();
-		}
-		catch (ErrorException $e)
-		{
-			$success = false;
-			log_message('error', 'Email: ' . $method . ' throwed ' . $e->getMessage());
-		}
-
-		if (! $success)
-		{
-			$this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
-
-			return false;
-		}
-
-		$this->setErrorMessage(lang('Email.sent', [$protocol]));
-
-		return true;
-	}
-
-	/**
-	 * Validate email for shell
-	 *
-	 * Applies stricter, shell-safe validation to email addresses.
-	 * Introduced to prevent RCE via sendmail's -f option.
-	 *
-	 * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
-	 * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
-	 * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
-	 *
-	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
-	 *
-	 * @param string $email
-	 *
-	 * @return boolean
-	 */
-	protected function validateEmailForShell(&$email)
-	{
-		if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@'))
-		{
-			$email = static::substr($email, 0, ++$atpos)
-				. idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
-		}
-
-		return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
-	}
-
-	/**
-	 * Send using mail()
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithMail()
-	{
-		$recipients = is_array($this->recipients) ? implode(', ', $this->recipients) : $this->recipients;
-
-		// _validate_email_for_shell() below accepts by reference,
-		// so this needs to be assigned to a variable
-		$from = $this->cleanEmail($this->headers['Return-Path']);
-
-		if (! $this->validateEmailForShell($from))
-		{
-			return mail($recipients, $this->subject, $this->finalBody, $this->headerStr);
-		}
-
-		// most documentation of sendmail using the "-f" flag lacks a space after it, however
-		// we've encountered servers that seem to require it to be in place.
-		return mail($recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
-	}
-
-	/**
-	 * Send using Sendmail
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithSendmail()
-	{
-		// _validate_email_for_shell() below accepts by reference,
-		// so this needs to be assigned to a variable
-		$from = $this->cleanEmail($this->headers['From']);
-
-		$from = $this->validateEmailForShell($from) ? '-f ' . $from : '';
-
-		// is popen() enabled?
-		if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w')))
-		{
-			// server probably has popen disabled, so nothing we can do to get a verbose error.
-			return false;
-		}
-
-		fputs($fp, $this->headerStr);
-		fputs($fp, $this->finalBody);
-		$status = pclose($fp);
-
-		if ($status !== 0)
-		{
-			$this->setErrorMessage(lang('Email.exitStatus', [$status]));
-			$this->setErrorMessage(lang('Email.noSocket'));
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send using SMTP
-	 *
-	 * @return boolean
-	 */
-	protected function sendWithSmtp()
-	{
-		if ($this->SMTPHost === '')
-		{
-			$this->setErrorMessage(lang('Email.noHostname'));
-
-			return false;
-		}
-
-		if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate())
-		{
-			return false;
-		}
-
-		if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From'])))
-		{
-			$this->SMTPEnd();
-
-			return false;
-		}
-
-		foreach ($this->recipients as $val)
-		{
-			if (! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-
-				return false;
-			}
-		}
-
-		foreach ($this->CCArray as $val)
-		{
-			if ($val !== '' && ! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-
-				return false;
-			}
-		}
-
-		foreach ($this->BCCArray as $val)
-		{
-			if ($val !== '' && ! $this->sendCommand('to', $val))
-			{
-				$this->SMTPEnd();
-
-				return false;
-			}
-		}
-
-		if (! $this->sendCommand('data'))
-		{
-			$this->SMTPEnd();
-
-			return false;
-		}
-
-		// perform dot transformation on any lines that begin with a dot
-		$this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
-		$this->sendData($this->newline . '.');
-		$reply = $this->getSMTPData();
-		$this->setErrorMessage($reply);
-		$this->SMTPEnd();
-
-		if (strpos($reply, '250') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * SMTP End
-	 *
-	 * Shortcut to send RSET or QUIT depending on keep-alive
-	 */
-	protected function SMTPEnd()
-	{
-		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
-	}
-
-	/**
-	 * SMTP Connect
-	 *
-	 * @return string|boolean
-	 */
-	protected function SMTPConnect()
-	{
-		if (is_resource($this->SMTPConnect))
-		{
-			return true;
-		}
-
-		$ssl = '';
-
-		if ($this->SMTPPort === 465)
-		{
-			$ssl = 'tls://';
-		}
-		elseif ($this->SMTPCrypto === 'ssl')
-		{
-			$ssl = 'ssl://';
-		}
-
-		$this->SMTPConnect = fsockopen(
-			$ssl . $this->SMTPHost,
-			$this->SMTPPort,
-			$errno,
-			$errstr,
-			$this->SMTPTimeout
-		);
-
-		if (! is_resource($this->SMTPConnect))
-		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
-
-			return false;
-		}
-
-		stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
-		$this->setErrorMessage($this->getSMTPData());
-
-		if ($this->SMTPCrypto === 'tls')
-		{
-			$this->sendCommand('hello');
-			$this->sendCommand('starttls');
-			$crypto = stream_socket_enable_crypto(
-				$this->SMTPConnect,
-				true,
-				STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
-			);
-
-			if ($crypto !== true)
-			{
-				$this->setErrorMessage(lang('Email.SMTPError', [$this->getSMTPData()]));
-
-				return false;
-			}
-		}
-
-		return $this->sendCommand('hello');
-	}
-
-	/**
-	 * Send SMTP command
-	 *
-	 * @param string $cmd
-	 * @param string $data
-	 *
-	 * @return boolean
-	 */
-	protected function sendCommand($cmd, $data = '')
-	{
-		switch ($cmd)
-		{
-			case 'hello':
-				if ($this->SMTPAuth || $this->getEncoding() === '8bit')
-				{
-					$this->sendData('EHLO ' . $this->getHostname());
-				}
-				else
-				{
-					$this->sendData('HELO ' . $this->getHostname());
-				}
-
-				$resp = 250;
-				break;
-
-			case 'starttls':
-				$this->sendData('STARTTLS');
-				$resp = 220;
-				break;
-
-			case 'from':
-				$this->sendData('MAIL FROM:<' . $data . '>');
-				$resp = 250;
-				break;
-
-			case 'to':
-				if ($this->DSN)
-				{
-					$this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
-				}
-				else
-				{
-					$this->sendData('RCPT TO:<' . $data . '>');
-				}
-				$resp = 250;
-				break;
-
-			case 'data':
-				$this->sendData('DATA');
-				$resp = 354;
-				break;
-
-			case 'reset':
-				$this->sendData('RSET');
-				$resp = 250;
-				break;
-
-			case 'quit':
-				$this->sendData('QUIT');
-				$resp = 221;
-				break;
-
-			default:
-				$resp = null;
-		}
-
-		$reply = $this->getSMTPData();
-
-		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
-
-		if ($resp === null || ((int) static::substr($reply, 0, 3) !== $resp))
-		{
-			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
-
-			return false;
-		}
-
-		if ($cmd === 'quit')
-		{
-			fclose($this->SMTPConnect);
-		}
-
-		return true;
-	}
-
-	/**
-	 * SMTP Authenticate
-	 *
-	 * @return boolean
-	 */
-	protected function SMTPAuthenticate()
-	{
-		if (! $this->SMTPAuth)
-		{
-			return true;
-		}
-
-		if ($this->SMTPUser === '' && $this->SMTPPass === '')
-		{
-			$this->setErrorMessage(lang('Email.noSMTPAuth'));
-
-			return false;
-		}
-
-		$this->sendData('AUTH LOGIN');
-		$reply = $this->getSMTPData();
-
-		if (strpos($reply, '503') === 0)    // Already authenticated
-		{
-			return true;
-		}
-
-		if (strpos($reply, '334') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.failedSMTPLogin', [$reply]));
-
-			return false;
-		}
-
-		$this->sendData(base64_encode($this->SMTPUser));
-		$reply = $this->getSMTPData();
-
-		if (strpos($reply, '334') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPAuthUsername', [$reply]));
-
-			return false;
-		}
-
-		$this->sendData(base64_encode($this->SMTPPass));
-		$reply = $this->getSMTPData();
-
-		if (strpos($reply, '235') !== 0)
-		{
-			$this->setErrorMessage(lang('Email.SMTPAuthPassword', [$reply]));
-
-			return false;
-		}
-
-		if ($this->SMTPKeepAlive)
-		{
-			$this->SMTPAuth = false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send SMTP data
-	 *
-	 * @param string $data
-	 *
-	 * @return boolean
-	 */
-	protected function sendData($data)
-	{
-		$data .= $this->newline;
-
-		$result = null;
-
-		for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result)
-		{
-			if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false)
-			{
-				break;
-			}
-
-			// See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
-			if ($result === 0)
-			{
-				if ($timestamp === 0)
-				{
-					$timestamp = time();
-				}
-				elseif ($timestamp < (time() - $this->SMTPTimeout))
-				{
-					$result = false;
-
-					break;
-				}
-
-				usleep(250000);
-
-				continue;
-			}
-
-			$timestamp = 0;
-		}
-
-		if (! is_int($result))
-		{
-			$this->setErrorMessage(lang('Email.SMTPDataFailure', [$data]));
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get SMTP data
-	 *
-	 * @return string
-	 */
-	protected function getSMTPData()
-	{
-		$data = '';
-
-		while ($str = fgets($this->SMTPConnect, 512))
-		{
-			$data .= $str;
-
-			if ($str[3] === ' ')
-			{
-				break;
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Get Hostname
-	 *
-	 * There are only two legal types of hostname - either a fully
-	 * qualified domain name (eg: "mail.example.com") or an IP literal
-	 * (eg: "[1.2.3.4]").
-	 *
-	 * @link https://tools.ietf.org/html/rfc5321#section-2.3.5
-	 * @link http://cbl.abuseat.org/namingproblems.html
-	 *
-	 * @return string
-	 */
-	protected function getHostname()
-	{
-		if (isset($_SERVER['SERVER_NAME']))
-		{
-			return $_SERVER['SERVER_NAME'];
-		}
-
-		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
-	}
-
-	/**
-	 * Get Debug Message
-	 *
-	 * @param array $include List of raw data chunks to include in the output
-	 *                       Valid options are: 'headers', 'subject', 'body'
-	 *
-	 * @return string
-	 */
-	public function printDebugger($include = ['headers', 'subject', 'body'])
-	{
-		$msg = implode('', $this->debugMessage);
-
-		// Determine which parts of our raw data needs to be printed
-		$rawData = '';
-
-		if (! is_array($include))
-		{
-			$include = [$include];
-		}
-
-		if (in_array('headers', $include, true))
-		{
-			$rawData = htmlspecialchars($this->headerStr) . "\n";
-		}
-		if (in_array('subject', $include, true))
-		{
-			$rawData .= htmlspecialchars($this->subject) . "\n";
-		}
-		if (in_array('body', $include, true))
-		{
-			$rawData .= htmlspecialchars($this->finalBody);
-		}
-
-		return $msg . ($rawData === '' ? '' : '<pre>' . $rawData . '</pre>');
-	}
-
-	/**
-	 * Set Message
-	 *
-	 * @param string $msg
-	 */
-	protected function setErrorMessage($msg)
-	{
-		$this->debugMessage[] = $msg . '<br />';
-	}
-
-	/**
-	 * Mime Types
-	 *
-	 * @param string $ext
-	 *
-	 * @return string
-	 */
-	protected function mimeTypes($ext = '')
-	{
-		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
-
-		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
-	}
-
-	/**
-	 * Destructor
-	 */
-	public function __destruct()
-	{
-		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
-	}
-
-	/**
-	 * Byte-safe strlen()
-	 *
-	 * @param string $str
-	 *
-	 * @return integer
-	 */
-	protected static function strlen($str)
-	{
-		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
-	}
-
-	/**
-	 * Byte-safe substr()
-	 *
-	 * @param string       $str
-	 * @param integer      $start
-	 * @param integer|null $length
-	 *
-	 * @return string
-	 */
-	protected static function substr($str, $start, $length = null)
-	{
-		if (static::$func_overload)
-		{
-			return mb_substr($str, $start, $length, '8bit');
-		}
-
-		return isset($length) ? substr($str, $start, $length) : substr($str, $start);
-	}
-
-	/**
-	 * Determines the values that should be stored in $archive.
-	 *
-	 * @return array The updated archive values
-	 */
-	protected function setArchiveValues(): array
-	{
-		// Get property values and add anything prepped in tmpArchive
-		$this->archive = array_merge(get_object_vars($this), $this->tmpArchive);
-		unset($this->archive['archive']);
-
-		// Clear tmpArchive for next run
-		$this->tmpArchive = [];
-
-		return $this->archive;
-	}
+    /**
+     * Properties from the last successful send.
+     *
+     * @var array|null
+     */
+    public $archive;
+
+    /**
+     * Properties to be added to the next archive.
+     *
+     * @var array
+     */
+    protected $tmpArchive = [];
+
+    /**
+     * @var string
+     */
+    public $fromEmail;
+
+    /**
+     * @var string
+     */
+    public $fromName;
+
+    /**
+     * Used as the User-Agent and X-Mailer headers' value.
+     *
+     * @var string
+     */
+    public $userAgent = 'CodeIgniter';
+
+    /**
+     * Path to the Sendmail binary.
+     *
+     * @var string
+     */
+    public $mailPath = '/usr/sbin/sendmail';
+
+    /**
+     * Which method to use for sending e-mails.
+     *
+     * @var string 'mail', 'sendmail' or 'smtp'
+     */
+    public $protocol = 'mail';
+
+    /**
+     * STMP Server host
+     *
+     * @var string
+     */
+    public $SMTPHost = '';
+
+    /**
+     * SMTP Username
+     *
+     * @var string
+     */
+    public $SMTPUser = '';
+
+    /**
+     * SMTP Password
+     *
+     * @var string
+     */
+    public $SMTPPass = '';
+
+    /**
+     * SMTP Server port
+     *
+     * @var int
+     */
+    public $SMTPPort = 25;
+
+    /**
+     * SMTP connection timeout in seconds
+     *
+     * @var int
+     */
+    public $SMTPTimeout = 5;
+
+    /**
+     * SMTP persistent connection
+     *
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * SMTP Encryption
+     *
+     * @var string Empty, 'tls' or 'ssl'
+     */
+    public $SMTPCrypto = '';
+
+    /**
+     * Whether to apply word-wrapping to the message body.
+     *
+     * @var bool
+     */
+    public $wordWrap = true;
+
+    /**
+     * Number of characters to wrap at.
+     *
+     * @see Email::$wordWrap
+     *
+     * @var int
+     */
+    public $wrapChars = 76;
+
+    /**
+     * Message format.
+     *
+     * @var string 'text' or 'html'
+     */
+    public $mailType = 'text';
+
+    /**
+     * Character set (default: utf-8)
+     *
+     * @var string
+     */
+    public $charset = 'utf-8';
+
+    /**
+     * Alternative message (for HTML messages only)
+     *
+     * @var string
+     */
+    public $altMessage = '';
+
+    /**
+     * Whether to validate e-mail addresses.
+     *
+     * @var bool
+     */
+    public $validate = true;
+
+    /**
+     * X-Priority header value.
+     *
+     * @var int 1-5
+     */
+    public $priority = 3;
+
+    /**
+     * Newline character sequence.
+     * Use "\r\n" to comply with RFC 822.
+     *
+     * @see http://www.ietf.org/rfc/rfc822.txt
+     *
+     * @var string "\r\n" or "\n"
+     */
+    public $newline = "\n";
+
+    /**
+     * CRLF character sequence
+     *
+     * RFC 2045 specifies that for 'quoted-printable' encoding,
+     * "\r\n" must be used. However, it appears that some servers
+     * (even on the receiving end) don't handle it properly and
+     * switching to "\n", while improper, is the only solution
+     * that seems to work for all environments.
+     *
+     * @see http://www.ietf.org/rfc/rfc822.txt
+     *
+     * @var string
+     */
+    public $CRLF = "\n";
+
+    /**
+     * Whether to use Delivery Status Notification.
+     *
+     * @var bool
+     */
+    public $DSN = false;
+
+    /**
+     * Whether to send multipart alternatives.
+     * Yahoo! doesn't seem to like these.
+     *
+     * @var bool
+     */
+    public $sendMultipart = true;
+
+    /**
+     * Whether to send messages to BCC recipients in batches.
+     *
+     * @var bool
+     */
+    public $BCCBatchMode = false;
+
+    /**
+     * BCC Batch max number size.
+     *
+     * @see Email::$BCCBatchMode
+     *
+     * @var int|string
+     */
+    public $BCCBatchSize = 200;
+
+    /**
+     * Subject header
+     *
+     * @var string
+     */
+    protected $subject = '';
+
+    /**
+     * Message body
+     *
+     * @var string
+     */
+    protected $body = '';
+
+    /**
+     * Final message body to be sent.
+     *
+     * @var string
+     */
+    protected $finalBody = '';
+
+    /**
+     * Final headers to send
+     *
+     * @var string
+     */
+    protected $headerStr = '';
+
+    /**
+     * SMTP Connection socket placeholder
+     *
+     * @var resource|null
+     */
+    protected $SMTPConnect;
+
+    /**
+     * Mail encoding
+     *
+     * @var string '8bit' or '7bit'
+     */
+    protected $encoding = '8bit';
+
+    /**
+     * Whether to perform SMTP authentication
+     *
+     * @var bool
+     */
+    protected $SMTPAuth = false;
+
+    /**
+     * Whether to send a Reply-To header
+     *
+     * @var bool
+     */
+    protected $replyToFlag = false;
+
+    /**
+     * Debug messages
+     *
+     * @see Email::printDebugger()
+     *
+     * @var array
+     */
+    protected $debugMessage = [];
+
+    /**
+     * Recipients
+     *
+     * @var array|string
+     */
+    protected $recipients = [];
+
+    /**
+     * CC Recipients
+     *
+     * @var array
+     */
+    protected $CCArray = [];
+
+    /**
+     * BCC Recipients
+     *
+     * @var array
+     */
+    protected $BCCArray = [];
+
+    /**
+     * Message headers
+     *
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Attachment data
+     *
+     * @var array
+     */
+    protected $attachments = [];
+
+    /**
+     * Valid $protocol values
+     *
+     * @see Email::$protocol
+     *
+     * @var array
+     */
+    protected $protocols = [
+        'mail',
+        'sendmail',
+        'smtp',
+    ];
+
+    /**
+     * Character sets valid for 7-bit encoding,
+     * excluding language suffix.
+     *
+     * @var array
+     */
+    protected $baseCharsets = [
+        'us-ascii',
+        'iso-2022-',
+    ];
+
+    /**
+     * Bit depths
+     *
+     * Valid mail encodings
+     *
+     * @see Email::$encoding
+     *
+     * @var array
+     */
+    protected $bitDepths = [
+        '7bit',
+        '8bit',
+    ];
+
+    /**
+     * $priority translations
+     *
+     * Actual values to send with the X-Priority header
+     *
+     * @var array
+     */
+    protected $priorities = [
+        1 => '1 (Highest)',
+        2 => '2 (High)',
+        3 => '3 (Normal)',
+        4 => '4 (Low)',
+        5 => '5 (Lowest)',
+    ];
+
+    /**
+     * mbstring.func_overload flag
+     *
+     * @var bool
+     */
+    protected static $func_overload;
+
+    /**
+     * @param array|null $config
+     */
+    public function __construct($config = null)
+    {
+        $this->initialize($config);
+        if (! isset(static::$func_overload)) {
+            static::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
+        }
+    }
+
+    /**
+     * Initialize preferences
+     *
+     * @param array|\Config\Email $config
+     *
+     * @return Email
+     */
+    public function initialize($config)
+    {
+        $this->clear();
+
+        if ($config instanceof \Config\Email) {
+            $config = get_object_vars($config);
+        }
+
+        foreach (array_keys(get_class_vars(static::class)) as $key) {
+            if (property_exists($this, $key) && isset($config[$key])) {
+                $method = 'set' . ucfirst($key);
+
+                if (method_exists($this, $method)) {
+                    $this->{$method}($config[$key]);
+                } else {
+                    $this->{$key} = $config[$key];
+                }
+            }
+        }
+
+        $this->charset  = strtoupper($this->charset);
+        $this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
+        return $this;
+    }
+
+    /**
+     * @param bool $clearAttachments
+     *
+     * @return Email
+     */
+    public function clear($clearAttachments = false)
+    {
+        $this->subject      = '';
+        $this->body         = '';
+        $this->finalBody    = '';
+        $this->headerStr    = '';
+        $this->replyToFlag  = false;
+        $this->recipients   = [];
+        $this->CCArray      = [];
+        $this->BCCArray     = [];
+        $this->headers      = [];
+        $this->debugMessage = [];
+
+        $this->setHeader('Date', $this->setDate());
+
+        if ($clearAttachments !== false) {
+            $this->attachments = [];
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string      $from
+     * @param string      $name
+     * @param string|null $returnPath Return-Path
+     *
+     * @return Email
+     */
+    public function setFrom($from, $name = '', $returnPath = null)
+    {
+        if (preg_match('/\<(.*)\>/', $from, $match)) {
+            $from = $match[1];
+        }
+
+        if ($this->validate) {
+            $this->validateEmail($this->stringToArray($from));
+
+            if ($returnPath) {
+                $this->validateEmail($this->stringToArray($returnPath));
+            }
+        }
+
+        $this->tmpArchive['fromEmail'] = $from;
+        $this->tmpArchive['fromName']  = $name;
+
+        if ($name !== '') {
+            // only use Q encoding if there are characters that would require it
+            if (! preg_match('/[\200-\377]/', $name)) {
+                $name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
+            } else {
+                $name = $this->prepQEncoding($name);
+            }
+        }
+
+        $this->setHeader('From', $name . ' <' . $from . '>');
+        if (! isset($returnPath)) {
+            $returnPath = $from;
+        }
+        $this->setHeader('Return-Path', '<' . $returnPath . '>');
+        $this->tmpArchive['returnPath'] = $returnPath;
+
+        return $this;
+    }
+
+    /**
+     * @param string $replyto
+     * @param string $name
+     *
+     * @return Email
+     */
+    public function setReplyTo($replyto, $name = '')
+    {
+        if (preg_match('/\<(.*)\>/', $replyto, $match)) {
+            $replyto = $match[1];
+        }
+
+        if ($this->validate) {
+            $this->validateEmail($this->stringToArray($replyto));
+        }
+
+        if ($name !== '') {
+            $this->tmpArchive['replyName'] = $name;
+
+            // only use Q encoding if there are characters that would require it
+            if (! preg_match('/[\200-\377]/', $name)) {
+                $name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
+            } else {
+                $name = $this->prepQEncoding($name);
+            }
+        }
+
+        $this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
+        $this->replyToFlag           = true;
+        $this->tmpArchive['replyTo'] = $replyto;
+
+        return $this;
+    }
+
+    /**
+     * @param array|string $to
+     *
+     * @return Email
+     */
+    public function setTo($to)
+    {
+        $to = $this->stringToArray($to);
+        $to = $this->cleanEmail($to);
+
+        if ($this->validate) {
+            $this->validateEmail($to);
+        }
+
+        if ($this->getProtocol() !== 'mail') {
+            $this->setHeader('To', implode(', ', $to));
+        }
+
+        $this->recipients = $to;
+
+        return $this;
+    }
+
+    /**
+     * @param string $cc
+     *
+     * @return Email
+     */
+    public function setCC($cc)
+    {
+        $cc = $this->cleanEmail($this->stringToArray($cc));
+
+        if ($this->validate) {
+            $this->validateEmail($cc);
+        }
+
+        $this->setHeader('Cc', implode(', ', $cc));
+
+        if ($this->getProtocol() === 'smtp') {
+            $this->CCArray = $cc;
+        }
+
+        $this->tmpArchive['CCArray'] = $cc;
+
+        return $this;
+    }
+
+    /**
+     * @param string $bcc
+     * @param string $limit
+     *
+     * @return Email
+     */
+    public function setBCC($bcc, $limit = '')
+    {
+        if ($limit !== '' && is_numeric($limit)) {
+            $this->BCCBatchMode = true;
+            $this->BCCBatchSize = $limit;
+        }
+
+        $bcc = $this->cleanEmail($this->stringToArray($bcc));
+
+        if ($this->validate) {
+            $this->validateEmail($bcc);
+        }
+
+        if ($this->getProtocol() === 'smtp' || ($this->BCCBatchMode && count($bcc) > $this->BCCBatchSize)) {
+            $this->BCCArray = $bcc;
+        } else {
+            $this->setHeader('Bcc', implode(', ', $bcc));
+            $this->tmpArchive['BCCArray'] = $bcc;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $subject
+     *
+     * @return Email
+     */
+    public function setSubject($subject)
+    {
+        $this->tmpArchive['subject'] = $subject;
+
+        $subject = $this->prepQEncoding($subject);
+        $this->setHeader('Subject', $subject);
+
+        return $this;
+    }
+
+    /**
+     * @param string $body
+     *
+     * @return Email
+     */
+    public function setMessage($body)
+    {
+        $this->body = rtrim(str_replace("\r", '', $body));
+
+        return $this;
+    }
+
+    /**
+     * @param string      $file        Can be local path, URL or buffered content
+     * @param string      $disposition 'attachment'
+     * @param string|null $newname
+     * @param string      $mime
+     *
+     * @return bool|Email
+     */
+    public function attach($file, $disposition = '', $newname = null, $mime = '')
+    {
+        if ($mime === '') {
+            if (strpos($file, '://') === false && ! is_file($file)) {
+                $this->setErrorMessage(lang('Email.attachmentMissing', [$file]));
+
+                return false;
+            }
+
+            if (! $fp = @fopen($file, 'rb')) {
+                $this->setErrorMessage(lang('Email.attachmentUnreadable', [$file]));
+
+                return false;
+            }
+
+            $fileContent = stream_get_contents($fp);
+
+            $mime = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
+
+            fclose($fp);
+        } else {
+            $fileContent = &$file; // buffered file
+        }
+
+        // declare names on their own, to make phpcbf happy
+        $namesAttached = [$file, $newname];
+
+        $this->attachments[] = [
+            'name'        => $namesAttached,
+            'disposition' => empty($disposition) ? 'attachment' : $disposition,
+            // Can also be 'inline'  Not sure if it matters
+            'type'      => $mime,
+            'content'   => chunk_split(base64_encode($fileContent)),
+            'multipart' => 'mixed',
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Set and return attachment Content-ID
+     * Useful for attached inline pictures
+     *
+     * @param string $filename
+     *
+     * @return bool|string
+     */
+    public function setAttachmentCID($filename)
+    {
+        foreach ($this->attachments as $i => $attachment) {
+            if ($attachment['name'][0] === $filename) {
+                $this->attachments[$i]['multipart'] = 'related';
+
+                $this->attachments[$i]['cid'] = uniqid(basename($attachment['name'][0]) . '@', true);
+
+                return $this->attachments[$i]['cid'];
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $header
+     * @param string $value
+     *
+     * @return Email
+     */
+    public function setHeader($header, $value)
+    {
+        $this->headers[$header] = str_replace(["\n", "\r"], '', $value);
+
+        return $this;
+    }
+
+    /**
+     * @param string $email
+     *
+     * @return array
+     */
+    protected function stringToArray($email)
+    {
+        if (! is_array($email)) {
+            return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
+        }
+
+        return $email;
+    }
+
+    /**
+     * @param string $str
+     *
+     * @return Email
+     */
+    public function setAltMessage($str)
+    {
+        $this->altMessage = (string) $str;
+
+        return $this;
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return Email
+     */
+    public function setMailType($type = 'text')
+    {
+        $this->mailType = ($type === 'html') ? 'html' : 'text';
+
+        return $this;
+    }
+
+    /**
+     * @param bool $wordWrap
+     *
+     * @return Email
+     */
+    public function setWordWrap($wordWrap = true)
+    {
+        $this->wordWrap = (bool) $wordWrap;
+
+        return $this;
+    }
+
+    /**
+     * @param string $protocol
+     *
+     * @return Email
+     */
+    public function setProtocol($protocol = 'mail')
+    {
+        $this->protocol = in_array($protocol, $this->protocols, true) ? strtolower($protocol) : 'mail';
+
+        return $this;
+    }
+
+    /**
+     * @param int $n
+     *
+     * @return Email
+     */
+    public function setPriority($n = 3)
+    {
+        $this->priority = preg_match('/^[1-5]$/', (string) $n) ? (int) $n : 3;
+
+        return $this;
+    }
+
+    /**
+     * @param string $newline
+     *
+     * @return Email
+     */
+    public function setNewline($newline = "\n")
+    {
+        $this->newline = in_array($newline, ["\n", "\r\n", "\r"], true) ? $newline : "\n";
+
+        return $this;
+    }
+
+    /**
+     * @param string $CRLF
+     *
+     * @return Email
+     */
+    public function setCRLF($CRLF = "\n")
+    {
+        $this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getMessageID()
+    {
+        $from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
+
+        return '<' . uniqid('', true) . strstr($from, '@') . '>';
+    }
+
+    /**
+     * @return string
+     */
+    protected function getProtocol()
+    {
+        $this->protocol = strtolower($this->protocol);
+
+        if (! in_array($this->protocol, $this->protocols, true)) {
+            $this->protocol = 'mail';
+        }
+
+        return $this->protocol;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getEncoding()
+    {
+        if (! in_array($this->encoding, $this->bitDepths, true)) {
+            $this->encoding = '8bit';
+        }
+
+        foreach ($this->baseCharsets as $charset) {
+            if (strpos($this->charset, $charset) === 0) {
+                $this->encoding = '7bit';
+
+                break;
+            }
+        }
+
+        return $this->encoding;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getContentType()
+    {
+        if ($this->mailType === 'html') {
+            return empty($this->attachments) ? 'html' : 'html-attach';
+        }
+
+        if ($this->mailType === 'text' && ! empty($this->attachments)) {
+            return 'plain-attach';
+        }
+
+        return 'plain';
+    }
+
+    /**
+     * Set RFC 822 Date
+     *
+     * @return string
+     */
+    protected function setDate()
+    {
+        $timezone = date('Z');
+        $operator = ($timezone[0] === '-') ? '-' : '+';
+        $timezone = abs($timezone);
+        $timezone = floor($timezone / 3600) * 100 + ($timezone % 3600) / 60;
+
+        return sprintf('%s %s%04d', date('D, j M Y H:i:s'), $operator, $timezone);
+    }
+
+    /**
+     * @return string
+     */
+    protected function getMimeMessage()
+    {
+        return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
+    }
+
+    /**
+     * @param array|string $email
+     *
+     * @return bool
+     */
+    public function validateEmail($email)
+    {
+        if (! is_array($email)) {
+            $this->setErrorMessage(lang('Email.mustBeArray'));
+
+            return false;
+        }
+
+        foreach ($email as $val) {
+            if (! $this->isValidEmail($val)) {
+                $this->setErrorMessage(lang('Email.invalidAddress', [$val]));
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $email
+     *
+     * @return bool
+     */
+    public function isValidEmail($email)
+    {
+        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && $atpos = strpos($email, '@')) {
+            $email = static::substr($email, 0, ++$atpos)
+                . idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
+        }
+
+        return (bool) filter_var($email, FILTER_VALIDATE_EMAIL);
+    }
+
+    /**
+     * @param array|string $email
+     *
+     * @return array|string
+     */
+    public function cleanEmail($email)
+    {
+        if (! is_array($email)) {
+            return preg_match('/\<(.*)\>/', $email, $match) ? $match[1] : $email;
+        }
+
+        $cleanEmail = [];
+
+        foreach ($email as $addy) {
+            $cleanEmail[] = preg_match('/\<(.*)\>/', $addy, $match) ? $match[1] : $addy;
+        }
+
+        return $cleanEmail;
+    }
+
+    /**
+     * Build alternative plain text message
+     *
+     * Provides the raw message for use in plain-text headers of
+     * HTML-formatted emails.
+     *
+     * If the user hasn't specified his own alternative message
+     * it creates one by stripping the HTML
+     *
+     * @return string
+     */
+    protected function getAltMessage()
+    {
+        if (! empty($this->altMessage)) {
+            return ($this->wordWrap) ? $this->wordWrap($this->altMessage, 76) : $this->altMessage;
+        }
+
+        $body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
+        $body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
+
+        for ($i = 20; $i >= 3; $i--) {
+            $body = str_replace(str_repeat("\n", $i), "\n\n", $body);
+        }
+
+        $body = preg_replace('| +|', ' ', $body);
+
+        return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
+    }
+
+    /**
+     * @param string   $str
+     * @param int|null $charlim Line-length limit
+     *
+     * @return string
+     */
+    public function wordWrap($str, $charlim = null)
+    {
+        if (empty($charlim)) {
+            $charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
+        }
+
+        if (strpos($str, "\r") !== false) {
+            $str = str_replace(["\r\n", "\r"], "\n", $str);
+        }
+
+        $str = preg_replace('| +\n|', "\n", $str);
+
+        $unwrap = [];
+
+        if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches)) {
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
+                $unwrap[] = $matches[1][$i];
+                $str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
+            }
+        }
+
+        // Use PHP's native function to do the initial wordwrap.
+        // We set the cut flag to FALSE so that any individual words that are
+        // too long get left alone. In the next step we'll deal with them.
+        $str = wordwrap($str, $charlim, "\n", false);
+
+        // Split the string into individual lines of text and cycle through them
+        $output = '';
+
+        foreach (explode("\n", $str) as $line) {
+            if (static::strlen($line) <= $charlim) {
+                $output .= $line . $this->newline;
+
+                continue;
+            }
+
+            $temp = '';
+
+            do {
+                if (preg_match('!\[url.+\]|://|www\.!', $line)) {
+                    break;
+                }
+
+                $temp .= static::substr($line, 0, $charlim - 1);
+                $line = static::substr($line, $charlim - 1);
+            } while (static::strlen($line) > $charlim);
+
+            if ($temp !== '') {
+                $output .= $temp . $this->newline;
+            }
+
+            $output .= $line . $this->newline;
+        }
+
+        if ($unwrap) {
+            foreach ($unwrap as $key => $val) {
+                $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build final headers
+     */
+    protected function buildHeaders()
+    {
+        $this->setHeader('User-Agent', $this->userAgent);
+        $this->setHeader('X-Sender', $this->cleanEmail($this->headers['From']));
+        $this->setHeader('X-Mailer', $this->userAgent);
+        $this->setHeader('X-Priority', $this->priorities[$this->priority]);
+        $this->setHeader('Message-ID', $this->getMessageID());
+        $this->setHeader('Mime-Version', '1.0');
+    }
+
+    /**
+     * Write Headers as a string
+     */
+    protected function writeHeaders()
+    {
+        if ($this->protocol === 'mail' && isset($this->headers['Subject'])) {
+            $this->subject = $this->headers['Subject'];
+            unset($this->headers['Subject']);
+        }
+
+        reset($this->headers);
+        $this->headerStr = '';
+
+        foreach ($this->headers as $key => $val) {
+            $val = trim($val);
+
+            if ($val !== '') {
+                $this->headerStr .= $key . ': ' . $val . $this->newline;
+            }
+        }
+
+        if ($this->getProtocol() === 'mail') {
+            $this->headerStr = rtrim($this->headerStr);
+        }
+    }
+
+    /**
+     * Build Final Body and attachments
+     */
+    protected function buildMessage()
+    {
+        if ($this->wordWrap === true && $this->mailType !== 'html') {
+            $this->body = $this->wordWrap($this->body);
+        }
+
+        $this->writeHeaders();
+        $hdr  = ($this->getProtocol() === 'mail') ? $this->newline : '';
+        $body = '';
+
+        switch ($this->getContentType()) {
+            case 'plain':
+                $hdr .= 'Content-Type: text/plain; charset='
+                    . $this->charset
+                    . $this->newline
+                    . 'Content-Transfer-Encoding: '
+                    . $this->getEncoding();
+
+                if ($this->getProtocol() === 'mail') {
+                    $this->headerStr .= $hdr;
+                    $this->finalBody = $this->body;
+                } else {
+                    $this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
+                }
+
+                return;
+
+            case 'html':
+                $boundary = uniqid('B_ALT_', true);
+
+                if ($this->sendMultipart === false) {
+                    $hdr .= 'Content-Type: text/html; charset='
+                        . $this->charset . $this->newline
+                        . 'Content-Transfer-Encoding: quoted-printable';
+                } else {
+                    $hdr  .= 'Content-Type: multipart/alternative; boundary="' . $boundary . '"';
+                    $body .= $this->getMimeMessage() . $this->newline . $this->newline
+                        . '--' . $boundary . $this->newline
+                        . 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+                        . 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+                        . $this->getAltMessage() . $this->newline . $this->newline
+                        . '--' . $boundary . $this->newline
+                        . 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+                        . 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline;
+                }
+
+                $this->finalBody = $body . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline;
+
+                if ($this->getProtocol() === 'mail') {
+                    $this->headerStr .= $hdr;
+                } else {
+                    $this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
+                }
+
+                if ($this->sendMultipart !== false) {
+                    $this->finalBody .= '--' . $boundary . '--';
+                }
+
+                return;
+
+            case 'plain-attach':
+                $boundary = uniqid('B_ATC_', true);
+                $hdr .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
+                if ($this->getProtocol() === 'mail') {
+                    $this->headerStr .= $hdr;
+                }
+
+                $body .= $this->getMimeMessage() . $this->newline
+                    . $this->newline
+                    . '--' . $boundary . $this->newline
+                    . 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+                    . 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline
+                    . $this->newline
+                    . $this->body . $this->newline . $this->newline;
+
+                $this->appendAttachments($body, $boundary);
+                break;
+
+            case 'html-attach':
+                $altBoundary  = uniqid('B_ALT_', true);
+                $lastBoundary = null;
+
+                if ($this->attachmentsHaveMultipart('mixed')) {
+                    $atcBoundary = uniqid('B_ATC_', true);
+                    $hdr .= 'Content-Type: multipart/mixed; boundary="' . $atcBoundary . '"';
+                    $lastBoundary = $atcBoundary;
+                }
+
+                if ($this->attachmentsHaveMultipart('related')) {
+                    $relBoundary = uniqid('B_REL_', true);
+
+                    $relBoundaryHeader = 'Content-Type: multipart/related; boundary="' . $relBoundary . '"';
+
+                    if (isset($lastBoundary)) {
+                        $body .= '--' . $lastBoundary . $this->newline . $relBoundaryHeader;
+                    } else {
+                        $hdr .= $relBoundaryHeader;
+                    }
+
+                    $lastBoundary = $relBoundary;
+                }
+
+                if ($this->getProtocol() === 'mail') {
+                    $this->headerStr .= $hdr;
+                }
+
+                static::strlen($body) && $body .= $this->newline . $this->newline;
+
+                $body .= $this->getMimeMessage() . $this->newline . $this->newline
+                    . '--' . $lastBoundary . $this->newline
+                    . 'Content-Type: multipart/alternative; boundary="' . $altBoundary . '"' . $this->newline . $this->newline
+                    . '--' . $altBoundary . $this->newline
+                    . 'Content-Type: text/plain; charset=' . $this->charset . $this->newline
+                    . 'Content-Transfer-Encoding: ' . $this->getEncoding() . $this->newline . $this->newline
+                    . $this->getAltMessage() . $this->newline . $this->newline
+                    . '--' . $altBoundary . $this->newline
+                    . 'Content-Type: text/html; charset=' . $this->charset . $this->newline
+                    . 'Content-Transfer-Encoding: quoted-printable' . $this->newline . $this->newline
+                    . $this->prepQuotedPrintable($this->body) . $this->newline . $this->newline
+                    . '--' . $altBoundary . '--' . $this->newline . $this->newline;
+
+                if (! empty($relBoundary)) {
+                    $body .= $this->newline . $this->newline;
+                    $this->appendAttachments($body, $relBoundary, 'related');
+                }
+
+                // multipart/mixed attachments
+                if (! empty($atcBoundary)) {
+                    $body .= $this->newline . $this->newline;
+                    $this->appendAttachments($body, $atcBoundary, 'mixed');
+                }
+
+                break;
+        }
+
+        $this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
+    }
+
+    /**
+     * @param mixed $type
+     *
+     * @return bool
+     */
+    protected function attachmentsHaveMultipart($type)
+    {
+        foreach ($this->attachments as &$attachment) {
+            if ($attachment['multipart'] === $type) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string      $body      Message body to append to
+     * @param string      $boundary  Multipart boundary
+     * @param string|null $multipart When provided, only attachments of this type will be processed
+     */
+    protected function appendAttachments(&$body, $boundary, $multipart = null)
+    {
+        foreach ($this->attachments as $attachment) {
+            if (isset($multipart) && $attachment['multipart'] !== $multipart) {
+                continue;
+            }
+
+            $name = $attachment['name'][1] ?? basename($attachment['name'][0]);
+            $body .= '--' . $boundary . $this->newline
+                . 'Content-Type: ' . $attachment['type'] . '; name="' . $name . '"' . $this->newline
+                . 'Content-Disposition: ' . $attachment['disposition'] . ';' . $this->newline
+                . 'Content-Transfer-Encoding: base64' . $this->newline
+                . (empty($attachment['cid']) ? '' : 'Content-ID: <' . $attachment['cid'] . '>' . $this->newline)
+                . $this->newline
+                . $attachment['content'] . $this->newline;
+        }
+
+        // $name won't be set if no attachments were appended,
+        // and therefore a boundary wouldn't be necessary
+        if (! empty($name)) {
+            $body .= '--' . $boundary . '--';
+        }
+    }
+
+    /**
+     * Prepares string for Quoted-Printable Content-Transfer-Encoding
+     * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
+     *
+     * @param string $str
+     *
+     * @return string
+     */
+    protected function prepQuotedPrintable($str)
+    {
+        // ASCII code numbers for "safe" characters that can always be
+        // used literally, without encoding, as described in RFC 2049.
+        // http://www.ietf.org/rfc/rfc2049.txt
+        static $asciiSafeChars = [
+            // ' (  )   +   ,   -   .   /   :   =   ?
+            39,
+            40,
+            41,
+            43,
+            44,
+            45,
+            46,
+            47,
+            58,
+            61,
+            63,
+            // numbers
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            // upper-case letters
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            // lower-case letters
+            97,
+            98,
+            99,
+            100,
+            101,
+            102,
+            103,
+            104,
+            105,
+            106,
+            107,
+            108,
+            109,
+            110,
+            111,
+            112,
+            113,
+            114,
+            115,
+            116,
+            117,
+            118,
+            119,
+            120,
+            121,
+            122,
+        ];
+
+        // We are intentionally wrapping so mail servers will encode characters
+        // properly and MUAs will behave, so {unwrap} must go!
+        $str = str_replace(['{unwrap}', '{/unwrap}'], '', $str);
+
+        // RFC 2045 specifies CRLF as "\r\n".
+        // However, many developers choose to override that and violate
+        // the RFC rules due to (apparently) a bug in MS Exchange,
+        // which only works with "\n".
+        if ($this->CRLF === "\r\n") {
+            return quoted_printable_encode($str);
+        }
+
+        // Reduce multiple spaces & remove nulls
+        $str = preg_replace(['| +|', '/\x00+/'], [' ', ''], $str);
+
+        // Standardize newlines
+        if (strpos($str, "\r") !== false) {
+            $str = str_replace(["\r\n", "\r"], "\n", $str);
+        }
+
+        $escape = '=';
+        $output = '';
+
+        foreach (explode("\n", $str) as $line) {
+            $length = static::strlen($line);
+            $temp   = '';
+
+            // Loop through each character in the line to add soft-wrap
+            // characters at the end of a line " =\r\n" and add the newly
+            // processed line(s) to the output (see comment on $crlf class property)
+            for ($i = 0; $i < $length; $i++) {
+                // Grab the next character
+                $char  = $line[$i];
+                $ascii = ord($char);
+
+                // Convert spaces and tabs but only if it's the end of the line
+                if ($ascii === 32 || $ascii === 9) {
+                    if ($i === ($length - 1)) {
+                        $char = $escape . sprintf('%02s', dechex($ascii));
+                    }
+                }
+                // DO NOT move this below the $ascii_safe_chars line!
+                //
+                // = (equals) signs are allowed by RFC2049, but must be encoded
+                // as they are the encoding delimiter!
+                elseif ($ascii === 61) {
+                    $char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
+                } elseif (! in_array($ascii, $asciiSafeChars, true)) {
+                    $char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));
+                }
+
+                // If we're at the character limit, add the line to the output,
+                // reset our temp variable, and keep on chuggin'
+                if ((static::strlen($temp) + static::strlen($char)) >= 76) {
+                    $output .= $temp . $escape . $this->CRLF;
+                    $temp = '';
+                }
+
+                // Add the character to our temporary line
+                $temp .= $char;
+            }
+
+            // Add our completed line to the output
+            $output .= $temp . $this->CRLF;
+        }
+
+        // get rid of extra CRLF tacked onto the end
+        return static::substr($output, 0, static::strlen($this->CRLF) * -1);
+    }
+
+    /**
+     * Performs "Q Encoding" on a string for use in email headers.
+     * It's related but not identical to quoted-printable, so it has its
+     * own method.
+     *
+     * @param string $str
+     *
+     * @return string
+     */
+    protected function prepQEncoding($str)
+    {
+        $str = str_replace(["\r", "\n"], '', $str);
+
+        if ($this->charset === 'UTF-8') {
+            // Note: We used to have mb_encode_mimeheader() as the first choice
+            // here, but it turned out to be buggy and unreliable. DO NOT
+            // re-add it! -- Narf
+            if (extension_loaded('iconv')) {
+                $output = @iconv_mime_encode('', $str, [
+                    'scheme'           => 'Q',
+                    'line-length'      => 76,
+                    'input-charset'    => $this->charset,
+                    'output-charset'   => $this->charset,
+                    'line-break-chars' => $this->CRLF,
+                ]);
+
+                // There are reports that iconv_mime_encode() might fail and return FALSE
+                if ($output !== false) {
+                    // iconv_mime_encode() will always put a header field name.
+                    // We've passed it an empty one, but it still prepends our
+                    // encoded string with ': ', so we need to strip it.
+                    return static::substr($output, 2);
+                }
+
+                $chars = iconv_strlen($str, 'UTF-8');
+            } elseif (extension_loaded('mbstring')) {
+                $chars = mb_strlen($str, 'UTF-8');
+            }
+        }
+
+        // We might already have this set for UTF-8
+        if (! isset($chars)) {
+            $chars = static::strlen($str);
+        }
+
+        $output = '=?' . $this->charset . '?Q?';
+
+        for ($i = 0, $length = static::strlen($output); $i < $chars; $i++) {
+            $chr = ($this->charset === 'UTF-8' && extension_loaded('iconv')) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
+
+            // RFC 2045 sets a limit of 76 characters per line.
+            // We'll append ?= to the end of each line though.
+            if ($length + ($l = static::strlen($chr)) > 74) {
+                $output .= '?=' . $this->CRLF // EOL
+                    . ' =?' . $this->charset . '?Q?' . $chr; // New line
+
+                $length = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
+            } else {
+                $output .= $chr;
+                $length += $l;
+            }
+        }
+
+        // End the header
+        return $output . '?=';
+    }
+
+    /**
+     * @param bool $autoClear
+     *
+     * @return bool
+     */
+    public function send($autoClear = true)
+    {
+        if (! isset($this->headers['From']) && ! empty($this->fromEmail)) {
+            $this->setFrom($this->fromEmail, $this->fromName);
+        }
+
+        if (! isset($this->headers['From'])) {
+            $this->setErrorMessage(lang('Email.noFrom'));
+
+            return false;
+        }
+
+        if ($this->replyToFlag === false) {
+            $this->setReplyTo($this->headers['From']);
+        }
+
+        if (empty($this->recipients) && ! isset($this->headers['To']) && empty($this->BCCArray) && ! isset($this->headers['Bcc']) && ! isset($this->headers['Cc'])) {
+            $this->setErrorMessage(lang('Email.noRecipients'));
+
+            return false;
+        }
+
+        $this->buildHeaders();
+
+        if ($this->BCCBatchMode && count($this->BCCArray) > $this->BCCBatchSize) {
+            $this->batchBCCSend();
+
+            if ($autoClear) {
+                $this->clear();
+            }
+
+            return true;
+        }
+
+        $this->buildMessage();
+        $result = $this->spoolEmail();
+
+        if ($result) {
+            $this->setArchiveValues();
+
+            if ($autoClear) {
+                $this->clear();
+            }
+
+            Events::trigger('email', $this->archive);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Batch Bcc Send. Sends groups of BCCs in batches
+     */
+    public function batchBCCSend()
+    {
+        $float = $this->BCCBatchSize - 1;
+        $set   = '';
+        $chunk = [];
+
+        for ($i = 0, $c = count($this->BCCArray); $i < $c; $i++) {
+            if (isset($this->BCCArray[$i])) {
+                $set .= ', ' . $this->BCCArray[$i];
+            }
+
+            if ($i === $float) {
+                $chunk[] = static::substr($set, 1);
+                $float += $this->BCCBatchSize;
+                $set = '';
+            }
+
+            if ($i === $c - 1) {
+                $chunk[] = static::substr($set, 1);
+            }
+        }
+
+        for ($i = 0, $c = count($chunk); $i < $c; $i++) {
+            unset($this->headers['Bcc']);
+            $bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
+
+            if ($this->protocol !== 'smtp') {
+                $this->setHeader('Bcc', implode(', ', $bcc));
+            } else {
+                $this->BCCArray = $bcc;
+            }
+
+            $this->buildMessage();
+            $this->spoolEmail();
+        }
+
+        // Update the archive
+        $this->setArchiveValues();
+        Events::trigger('email', $this->archive);
+    }
+
+    /**
+     * Unwrap special elements
+     */
+    protected function unwrapSpecials()
+    {
+        $this->finalBody = preg_replace_callback(
+            '/\{unwrap\}(.*?)\{\/unwrap\}/si',
+            [
+                $this,
+                'removeNLCallback',
+            ],
+            $this->finalBody
+        );
+    }
+
+    /**
+     * Strip line-breaks via callback
+     *
+     * @param string $matches
+     *
+     * @return string
+     */
+    protected function removeNLCallback($matches)
+    {
+        if (strpos($matches[1], "\r") !== false || strpos($matches[1], "\n") !== false) {
+            $matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
+        }
+
+        return $matches[1];
+    }
+
+    /**
+     * Spool mail to the mail server
+     *
+     * @return bool
+     */
+    protected function spoolEmail()
+    {
+        $this->unwrapSpecials();
+        $protocol = $this->getProtocol();
+        $method   = 'sendWith' . ucfirst($protocol);
+
+        try {
+            $success = $this->{$method}();
+        } catch (ErrorException $e) {
+            $success = false;
+            log_message('error', 'Email: ' . $method . ' throwed ' . $e->getMessage());
+        }
+
+        if (! $success) {
+            $this->setErrorMessage(lang('Email.sendFailure' . ($protocol === 'mail' ? 'PHPMail' : ucfirst($protocol))));
+
+            return false;
+        }
+
+        $this->setErrorMessage(lang('Email.sent', [$protocol]));
+
+        return true;
+    }
+
+    /**
+     * Validate email for shell
+     *
+     * Applies stricter, shell-safe validation to email addresses.
+     * Introduced to prevent RCE via sendmail's -f option.
+     *
+     * @see     https://github.com/codeigniter4/CodeIgniter/issues/4963
+     * @see     https://gist.github.com/Zenexer/40d02da5e07f151adeaeeaa11af9ab36
+     *
+     * @license https://creativecommons.org/publicdomain/zero/1.0/    CC0 1.0, Public Domain
+     *
+     * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
+     *
+     * @param string $email
+     *
+     * @return bool
+     */
+    protected function validateEmailForShell(&$email)
+    {
+        if (function_exists('idn_to_ascii') && $atpos = strpos($email, '@')) {
+            $email = static::substr($email, 0, ++$atpos)
+                . idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
+        }
+
+        return filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email);
+    }
+
+    /**
+     * Send using mail()
+     *
+     * @return bool
+     */
+    protected function sendWithMail()
+    {
+        $recipients = is_array($this->recipients) ? implode(', ', $this->recipients) : $this->recipients;
+
+        // _validate_email_for_shell() below accepts by reference,
+        // so this needs to be assigned to a variable
+        $from = $this->cleanEmail($this->headers['Return-Path']);
+
+        if (! $this->validateEmailForShell($from)) {
+            return mail($recipients, $this->subject, $this->finalBody, $this->headerStr);
+        }
+
+        // most documentation of sendmail using the "-f" flag lacks a space after it, however
+        // we've encountered servers that seem to require it to be in place.
+        return mail($recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
+    }
+
+    /**
+     * Send using Sendmail
+     *
+     * @return bool
+     */
+    protected function sendWithSendmail()
+    {
+        // _validate_email_for_shell() below accepts by reference,
+        // so this needs to be assigned to a variable
+        $from = $this->cleanEmail($this->headers['From']);
+
+        $from = $this->validateEmailForShell($from) ? '-f ' . $from : '';
+
+        if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w'))) {
+            return false;
+        }
+
+        fwrite($fp, $this->headerStr);
+        fwrite($fp, $this->finalBody);
+        $status = pclose($fp);
+
+        if ($status !== 0) {
+            $this->setErrorMessage(lang('Email.exitStatus', [$status]));
+            $this->setErrorMessage(lang('Email.noSocket'));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send using SMTP
+     *
+     * @return bool
+     */
+    protected function sendWithSmtp()
+    {
+        if ($this->SMTPHost === '') {
+            $this->setErrorMessage(lang('Email.noHostname'));
+
+            return false;
+        }
+
+        if (! $this->SMTPConnect() || ! $this->SMTPAuthenticate()) {
+            return false;
+        }
+
+        if (! $this->sendCommand('from', $this->cleanEmail($this->headers['From']))) {
+            $this->SMTPEnd();
+
+            return false;
+        }
+
+        foreach ($this->recipients as $val) {
+            if (! $this->sendCommand('to', $val)) {
+                $this->SMTPEnd();
+
+                return false;
+            }
+        }
+
+        foreach ($this->CCArray as $val) {
+            if ($val !== '' && ! $this->sendCommand('to', $val)) {
+                $this->SMTPEnd();
+
+                return false;
+            }
+        }
+
+        foreach ($this->BCCArray as $val) {
+            if ($val !== '' && ! $this->sendCommand('to', $val)) {
+                $this->SMTPEnd();
+
+                return false;
+            }
+        }
+
+        if (! $this->sendCommand('data')) {
+            $this->SMTPEnd();
+
+            return false;
+        }
+
+        // perform dot transformation on any lines that begin with a dot
+        $this->sendData($this->headerStr . preg_replace('/^\./m', '..$1', $this->finalBody));
+        $this->sendData($this->newline . '.');
+        $reply = $this->getSMTPData();
+        $this->setErrorMessage($reply);
+        $this->SMTPEnd();
+
+        if (strpos($reply, '250') !== 0) {
+            $this->setErrorMessage(lang('Email.SMTPError', [$reply]));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Shortcut to send RSET or QUIT depending on keep-alive
+     */
+    protected function SMTPEnd()
+    {
+        $this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
+    }
+
+    /**
+     * @return bool|string
+     */
+    protected function SMTPConnect()
+    {
+        if (is_resource($this->SMTPConnect)) {
+            return true;
+        }
+
+        $ssl = '';
+
+        if ($this->SMTPPort === 465) {
+            $ssl = 'tls://';
+        } elseif ($this->SMTPCrypto === 'ssl') {
+            $ssl = 'ssl://';
+        }
+
+        $this->SMTPConnect = fsockopen(
+            $ssl . $this->SMTPHost,
+            $this->SMTPPort,
+            $errno,
+            $errstr,
+            $this->SMTPTimeout
+        );
+
+        if (! is_resource($this->SMTPConnect)) {
+            $this->setErrorMessage(lang('Email.SMTPError', [$errno . ' ' . $errstr]));
+
+            return false;
+        }
+
+        stream_set_timeout($this->SMTPConnect, $this->SMTPTimeout);
+        $this->setErrorMessage($this->getSMTPData());
+
+        if ($this->SMTPCrypto === 'tls') {
+            $this->sendCommand('hello');
+            $this->sendCommand('starttls');
+            $crypto = stream_socket_enable_crypto(
+                $this->SMTPConnect,
+                true,
+                STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT
+            );
+
+            if ($crypto !== true) {
+                $this->setErrorMessage(lang('Email.SMTPError', [$this->getSMTPData()]));
+
+                return false;
+            }
+        }
+
+        return $this->sendCommand('hello');
+    }
+
+    /**
+     * @param string $cmd
+     * @param string $data
+     *
+     * @return bool
+     */
+    protected function sendCommand($cmd, $data = '')
+    {
+        switch ($cmd) {
+            case 'hello':
+                if ($this->SMTPAuth || $this->getEncoding() === '8bit') {
+                    $this->sendData('EHLO ' . $this->getHostname());
+                } else {
+                    $this->sendData('HELO ' . $this->getHostname());
+                }
+
+                $resp = 250;
+                break;
+
+            case 'starttls':
+                $this->sendData('STARTTLS');
+                $resp = 220;
+                break;
+
+            case 'from':
+                $this->sendData('MAIL FROM:<' . $data . '>');
+                $resp = 250;
+                break;
+
+            case 'to':
+                if ($this->DSN) {
+                    $this->sendData('RCPT TO:<' . $data . '> NOTIFY=SUCCESS,DELAY,FAILURE ORCPT=rfc822;' . $data);
+                } else {
+                    $this->sendData('RCPT TO:<' . $data . '>');
+                }
+                $resp = 250;
+                break;
+
+            case 'data':
+                $this->sendData('DATA');
+                $resp = 354;
+                break;
+
+            case 'reset':
+                $this->sendData('RSET');
+                $resp = 250;
+                break;
+
+            case 'quit':
+                $this->sendData('QUIT');
+                $resp = 221;
+                break;
+
+            default:
+                $resp = null;
+        }
+
+        $reply = $this->getSMTPData();
+
+        $this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
+
+        if ($resp === null || ((int) static::substr($reply, 0, 3) !== $resp)) {
+            $this->setErrorMessage(lang('Email.SMTPError', [$reply]));
+
+            return false;
+        }
+
+        if ($cmd === 'quit') {
+            fclose($this->SMTPConnect);
+        }
+
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function SMTPAuthenticate()
+    {
+        if (! $this->SMTPAuth) {
+            return true;
+        }
+
+        if ($this->SMTPUser === '' && $this->SMTPPass === '') {
+            $this->setErrorMessage(lang('Email.noSMTPAuth'));
+
+            return false;
+        }
+
+        $this->sendData('AUTH LOGIN');
+        $reply = $this->getSMTPData();
+
+        if (strpos($reply, '503') === 0) {    // Already authenticated
+            return true;
+        }
+
+        if (strpos($reply, '334') !== 0) {
+            $this->setErrorMessage(lang('Email.failedSMTPLogin', [$reply]));
+
+            return false;
+        }
+
+        $this->sendData(base64_encode($this->SMTPUser));
+        $reply = $this->getSMTPData();
+
+        if (strpos($reply, '334') !== 0) {
+            $this->setErrorMessage(lang('Email.SMTPAuthUsername', [$reply]));
+
+            return false;
+        }
+
+        $this->sendData(base64_encode($this->SMTPPass));
+        $reply = $this->getSMTPData();
+
+        if (strpos($reply, '235') !== 0) {
+            $this->setErrorMessage(lang('Email.SMTPAuthPassword', [$reply]));
+
+            return false;
+        }
+
+        if ($this->SMTPKeepAlive) {
+            $this->SMTPAuth = false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $data
+     *
+     * @return bool
+     */
+    protected function sendData($data)
+    {
+        $data .= $this->newline;
+
+        $result = null;
+
+        for ($written = $timestamp = 0, $length = static::strlen($data); $written < $length; $written += $result) {
+            if (($result = fwrite($this->SMTPConnect, static::substr($data, $written))) === false) {
+                break;
+            }
+
+            // See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951
+            if ($result === 0) {
+                if ($timestamp === 0) {
+                    $timestamp = time();
+                } elseif ($timestamp < (time() - $this->SMTPTimeout)) {
+                    $result = false;
+
+                    break;
+                }
+
+                usleep(250000);
+
+                continue;
+            }
+
+            $timestamp = 0;
+        }
+
+        if (! is_int($result)) {
+            $this->setErrorMessage(lang('Email.SMTPDataFailure', [$data]));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSMTPData()
+    {
+        $data = '';
+
+        while ($str = fgets($this->SMTPConnect, 512)) {
+            $data .= $str;
+
+            if ($str[3] === ' ') {
+                break;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * There are only two legal types of hostname - either a fully
+     * qualified domain name (eg: "mail.example.com") or an IP literal
+     * (eg: "[1.2.3.4]").
+     *
+     * @see https://tools.ietf.org/html/rfc5321#section-2.3.5
+     * @see http://cbl.abuseat.org/namingproblems.html
+     *
+     * @return string
+     */
+    protected function getHostname()
+    {
+        if (isset($_SERVER['SERVER_NAME'])) {
+            return $_SERVER['SERVER_NAME'];
+        }
+
+        if (isset($_SERVER['SERVER_ADDR'])) {
+            return '[' . $_SERVER['SERVER_ADDR'] . ']';
+        }
+
+        return '[127.0.0.1]';
+    }
+
+    /**
+     * @param array $include List of raw data chunks to include in the output
+     *                       Valid options are: 'headers', 'subject', 'body'
+     *
+     * @return string
+     */
+    public function printDebugger($include = ['headers', 'subject', 'body'])
+    {
+        $msg = implode('', $this->debugMessage);
+
+        // Determine which parts of our raw data needs to be printed
+        $rawData = '';
+
+        if (! is_array($include)) {
+            $include = [$include];
+        }
+
+        if (in_array('headers', $include, true)) {
+            $rawData = htmlspecialchars($this->headerStr) . "\n";
+        }
+        if (in_array('subject', $include, true)) {
+            $rawData .= htmlspecialchars($this->subject) . "\n";
+        }
+        if (in_array('body', $include, true)) {
+            $rawData .= htmlspecialchars($this->finalBody);
+        }
+
+        return $msg . ($rawData === '' ? '' : '<pre>' . $rawData . '</pre>');
+    }
+
+    /**
+     * @param string $msg
+     */
+    protected function setErrorMessage($msg)
+    {
+        $this->debugMessage[] = $msg . '<br />';
+    }
+
+    /**
+     * Mime Types
+     *
+     * @param string $ext
+     *
+     * @return string
+     */
+    protected function mimeTypes($ext = '')
+    {
+        $mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
+        return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
+    }
+
+    public function __destruct()
+    {
+        if (is_resource($this->SMTPConnect)) {
+            $this->sendCommand('quit');
+        }
+    }
+
+    /**
+     * Byte-safe strlen()
+     *
+     * @param string $str
+     *
+     * @return int
+     */
+    protected static function strlen($str)
+    {
+        return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
+    }
+
+    /**
+     * Byte-safe substr()
+     *
+     * @param string   $str
+     * @param int      $start
+     * @param int|null $length
+     *
+     * @return string
+     */
+    protected static function substr($str, $start, $length = null)
+    {
+        if (static::$func_overload) {
+            return mb_substr($str, $start, $length, '8bit');
+        }
+
+        return isset($length) ? substr($str, $start, $length) : substr($str, $start);
+    }
+
+    /**
+     * Determines the values that should be stored in $archive.
+     *
+     * @return array The updated archive values
+     */
+    protected function setArchiveValues(): array
+    {
+        // Get property values and add anything prepped in tmpArchive
+        $this->archive = array_merge(get_object_vars($this), $this->tmpArchive);
+        unset($this->archive['archive']);
+
+        // Clear tmpArchive for next run
+        $this->tmpArchive = [];
+
+        return $this->archive;
+    }
 }
diff --git a/system/Encryption/EncrypterInterface.php b/system/Encryption/EncrypterInterface.php
index 6fe653d04fce..32dc8644926d 100644
--- a/system/Encryption/EncrypterInterface.php
+++ b/system/Encryption/EncrypterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
@@ -20,27 +20,27 @@
  */
 interface EncrypterInterface
 {
-	/**
-	 * Encrypt - convert plaintext into ciphertext
-	 *
-	 * @param string            $data   Input data
-	 * @param array|string|null $params Overridden parameters, specifically the key
-	 *
-	 * @throws EncryptionException
-	 *
-	 * @return string
-	 */
-	public function encrypt($data, $params = null);
+    /**
+     * Encrypt - convert plaintext into ciphertext
+     *
+     * @param string            $data   Input data
+     * @param array|string|null $params Overridden parameters, specifically the key
+     *
+     * @throws EncryptionException
+     *
+     * @return string
+     */
+    public function encrypt($data, $params = null);
 
-	/**
-	 * Decrypt - convert ciphertext into plaintext
-	 *
-	 * @param string            $data   Encrypted data
-	 * @param array|string|null $params Overridden parameters, specifically the key
-	 *
-	 * @throws EncryptionException
-	 *
-	 * @return string
-	 */
-	public function decrypt($data, $params = null);
+    /**
+     * Decrypt - convert ciphertext into plaintext
+     *
+     * @param string            $data   Encrypted data
+     * @param array|string|null $params Overridden parameters, specifically the key
+     *
+     * @throws EncryptionException
+     *
+     * @return string
+     */
+    public function decrypt($data, $params = null);
 }
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index f09bbd048063..35c3568120ca 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
@@ -23,172 +23,150 @@
  */
 class Encryption
 {
-	/**
-	 * The encrypter we create
-	 *
-	 * @var EncrypterInterface
-	 */
-	protected $encrypter;
-
-	/**
-	 * The driver being used
-	 *
-	 * @var string
-	 */
-	protected $driver;
-
-	/**
-	 * The key/seed being used
-	 *
-	 * @var string
-	 */
-	protected $key;
-
-	/**
-	 * The derived HMAC key
-	 *
-	 * @var string
-	 */
-	protected $hmacKey;
-
-	/**
-	 * HMAC digest to use
-	 *
-	 * @var string
-	 */
-	protected $digest = 'SHA512';
-
-	/**
-	 * Map of drivers to handler classes, in preference order
-	 *
-	 * @var array
-	 */
-	protected $drivers = [
-		'OpenSSL',
-		'Sodium',
-	];
-
-	/**
-	 * Handlers that are to be installed
-	 *
-	 * @var array<string, boolean>
-	 */
-	protected $handlers = [];
-
-	/**
-	 * Class constructor
-	 *
-	 * @param EncryptionConfig $config Configuration parameters
-	 *
-	 * @throws EncryptionException
-	 *
-	 * @return void
-	 */
-	public function __construct(EncryptionConfig $config = null)
-	{
-		$config = $config ?? new EncryptionConfig();
-
-		$this->key    = $config->key;
-		$this->driver = $config->driver;
-		$this->digest = $config->digest ?? 'SHA512';
-
-		// Map what we have installed
-		$this->handlers = [
-			'OpenSSL' => extension_loaded('openssl'),
-			// the SodiumHandler uses some API (like sodium_pad) that is available only on v1.0.14+
-			'Sodium'  => extension_loaded('sodium') && version_compare(SODIUM_LIBRARY_VERSION, '1.0.14', '>='),
-		];
-
-		// If requested driver is not active, bail
-		if (! in_array($this->driver, $this->drivers, true) || (array_key_exists($this->driver, $this->handlers) && ! $this->handlers[$this->driver]))
-		{
-			// this should never happen in travis-ci
-			throw EncryptionException::forNoHandlerAvailable($this->driver);
-		}
-	}
-
-	/**
-	 * Initialize or re-initialize an encrypter
-	 *
-	 * @param EncryptionConfig $config Configuration parameters
-	 *
-	 * @throws EncryptionException
-	 *
-	 * @return EncrypterInterface
-	 */
-	public function initialize(EncryptionConfig $config = null)
-	{
-		// override config?
-		if ($config)
-		{
-			$this->key    = $config->key;
-			$this->driver = $config->driver;
-			$this->digest = $config->digest ?? 'SHA512';
-		}
-
-		// Insist on a driver
-		if (empty($this->driver))
-		{
-			throw EncryptionException::forNoDriverRequested();
-		}
-
-		// Check for an unknown driver
-		if (! in_array($this->driver, $this->drivers, true))
-		{
-			throw EncryptionException::forUnKnownHandler($this->driver);
-		}
-
-		if (empty($this->key))
-		{
-			throw EncryptionException::forNeedsStarterKey();
-		}
-
-		// Derive a secret key for the encrypter
-		$this->hmacKey = bin2hex(\hash_hkdf($this->digest, $this->key));
-
-		$handlerName     = 'CodeIgniter\\Encryption\\Handlers\\' . $this->driver . 'Handler';
-		$this->encrypter = new $handlerName($config);
-
-		return $this->encrypter;
-	}
-
-	/**
-	 * Create a random key
-	 *
-	 * @param integer $length Output length
-	 *
-	 * @return string
-	 */
-	public static function createKey($length = 32)
-	{
-		return random_bytes($length);
-	}
-
-	/**
-	 * __get() magic, providing readonly access to some of our protected properties
-	 *
-	 * @param string $key Property name
-	 *
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if ($this->__isset($key))
-		{
-			return $this->{$key};
-		}
-
-		return null;
-	}
-
-	/**
-	 * __isset() magic, providing checking for some of our protected properties
-	 *
-	 * @param  string $key Property name
-	 * @return boolean
-	 */
-	public function __isset($key): bool
-	{
-		return in_array($key, ['key', 'digest', 'driver', 'drivers'], true);
-	}
+    /**
+     * The encrypter we create
+     *
+     * @var EncrypterInterface
+     */
+    protected $encrypter;
+
+    /**
+     * The driver being used
+     *
+     * @var string
+     */
+    protected $driver;
+
+    /**
+     * The key/seed being used
+     *
+     * @var string
+     */
+    protected $key;
+
+    /**
+     * The derived HMAC key
+     *
+     * @var string
+     */
+    protected $hmacKey;
+
+    /**
+     * HMAC digest to use
+     *
+     * @var string
+     */
+    protected $digest = 'SHA512';
+
+    /**
+     * Map of drivers to handler classes, in preference order
+     *
+     * @var array
+     */
+    protected $drivers = [
+        'OpenSSL',
+        'Sodium',
+    ];
+
+    /**
+     * Handlers that are to be installed
+     *
+     * @var array<string, boolean>
+     */
+    protected $handlers = [];
+
+    /**
+     * @throws EncryptionException
+     */
+    public function __construct(?EncryptionConfig $config = null)
+    {
+        $config = $config ?? new EncryptionConfig();
+
+        $this->key    = $config->key;
+        $this->driver = $config->driver;
+        $this->digest = $config->digest ?? 'SHA512';
+
+        $this->handlers = [
+            'OpenSSL' => extension_loaded('openssl'),
+            // the SodiumHandler uses some API (like sodium_pad) that is available only on v1.0.14+
+            'Sodium' => extension_loaded('sodium') && version_compare(SODIUM_LIBRARY_VERSION, '1.0.14', '>='),
+        ];
+
+        if (! in_array($this->driver, $this->drivers, true) || (array_key_exists($this->driver, $this->handlers) && ! $this->handlers[$this->driver])) {
+            throw EncryptionException::forNoHandlerAvailable($this->driver);
+        }
+    }
+
+    /**
+     * Initialize or re-initialize an encrypter
+     *
+     * @throws EncryptionException
+     *
+     * @return EncrypterInterface
+     */
+    public function initialize(?EncryptionConfig $config = null)
+    {
+        if ($config) {
+            $this->key    = $config->key;
+            $this->driver = $config->driver;
+            $this->digest = $config->digest ?? 'SHA512';
+        }
+
+        if (empty($this->driver)) {
+            throw EncryptionException::forNoDriverRequested();
+        }
+
+        if (! in_array($this->driver, $this->drivers, true)) {
+            throw EncryptionException::forUnKnownHandler($this->driver);
+        }
+
+        if (empty($this->key)) {
+            throw EncryptionException::forNeedsStarterKey();
+        }
+
+        $this->hmacKey = bin2hex(\hash_hkdf($this->digest, $this->key));
+
+        $handlerName     = 'CodeIgniter\\Encryption\\Handlers\\' . $this->driver . 'Handler';
+        $this->encrypter = new $handlerName($config);
+
+        return $this->encrypter;
+    }
+
+    /**
+     * Create a random key
+     *
+     * @param int $length Output length
+     *
+     * @return string
+     */
+    public static function createKey($length = 32)
+    {
+        return random_bytes($length);
+    }
+
+    /**
+     * __get() magic, providing readonly access to some of our protected properties
+     *
+     * @param string $key Property name
+     *
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if ($this->__isset($key)) {
+            return $this->{$key};
+        }
+
+        return null;
+    }
+
+    /**
+     * __isset() magic, providing checking for some of our protected properties
+     *
+     * @param string $key Property name
+     */
+    public function __isset($key): bool
+    {
+        return in_array($key, ['key', 'digest', 'driver', 'drivers'], true);
+    }
 }
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index ddf50665364a..d226fd5dd08b 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Exceptions;
@@ -20,69 +20,67 @@
  */
 class EncryptionException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Thrown when no driver is present in the active encryption session.
-	 *
-	 * @return static
-	 */
-	public static function forNoDriverRequested()
-	{
-		return new static(lang('Encryption.noDriverRequested'));
-	}
+    /**
+     * Thrown when no driver is present in the active encryption session.
+     *
+     * @return static
+     */
+    public static function forNoDriverRequested()
+    {
+        return new static(lang('Encryption.noDriverRequested'));
+    }
 
-	/**
-	 * Thrown when the handler requested is not available.
-	 *
-	 * @param string $handler
-	 *
-	 * @return static
-	 */
-	public static function forNoHandlerAvailable(string $handler)
-	{
-		return new static(lang('Encryption.noHandlerAvailable', [$handler]));
-	}
+    /**
+     * Thrown when the handler requested is not available.
+     *
+     * @return static
+     */
+    public static function forNoHandlerAvailable(string $handler)
+    {
+        return new static(lang('Encryption.noHandlerAvailable', [$handler]));
+    }
 
-	/**
-	 * Thrown when the handler requested is unknown.
-	 *
-	 * @param string $driver
-	 *
-	 * @return static
-	 */
-	public static function forUnKnownHandler(string $driver = null)
-	{
-		return new static(lang('Encryption.unKnownHandler', [$driver]));
-	}
+    /**
+     * Thrown when the handler requested is unknown.
+     *
+     * @param string $driver
+     *
+     * @return static
+     */
+    public static function forUnKnownHandler(?string $driver = null)
+    {
+        return new static(lang('Encryption.unKnownHandler', [$driver]));
+    }
 
-	/**
-	 * Thrown when no starter key is provided for the current encryption session.
-	 *
-	 * @return static
-	 */
-	public static function forNeedsStarterKey()
-	{
-		return new static(lang('Encryption.starterKeyNeeded'));
-	}
+    /**
+     * Thrown when no starter key is provided for the current encryption session.
+     *
+     * @return static
+     */
+    public static function forNeedsStarterKey()
+    {
+        return new static(lang('Encryption.starterKeyNeeded'));
+    }
 
-	/**
-	 * Thrown during data decryption when a problem or error occurred.
-	 *
-	 * @return static
-	 */
-	public static function forAuthenticationFailed()
-	{
-		return new static(lang('Encryption.authenticationFailed'));
-	}
+    /**
+     * Thrown during data decryption when a problem or error occurred.
+     *
+     * @return static
+     */
+    public static function forAuthenticationFailed()
+    {
+        return new static(lang('Encryption.authenticationFailed'));
+    }
 
-	/**
-	 * Thrown during data encryption when a problem or error occurred.
-	 *
-	 * @return static
-	 */
-	public static function forEncryptionFailed()
-	{
-		return new static(lang('Encryption.encryptionFailed'));
-	}
+    /**
+     * Thrown during data encryption when a problem or error occurred.
+     *
+     * @return static
+     */
+    public static function forEncryptionFailed()
+    {
+        return new static(lang('Encryption.encryptionFailed'));
+    }
 }
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
index 50a1cd666b05..9fb28dff1c25 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
@@ -20,70 +20,65 @@
  */
 abstract class BaseHandler implements EncrypterInterface
 {
-	/**
-	 * Logger instance to record error messages and warnings.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
+    /**
+     * Logger instance to record error messages and warnings.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
 
-	/**
-	 * Constructor
-	 *
-	 * @param Encryption|null $config
-	 */
-	public function __construct(Encryption $config = null)
-	{
-		$config = $config ?? config('Encryption');
+    /**
+     * Constructor
+     */
+    public function __construct(?Encryption $config = null)
+    {
+        $config = $config ?? config('Encryption');
 
-		// make the parameters conveniently accessible
-		foreach (get_object_vars($config) as $key => $value)
-		{
-			if (property_exists($this, $key))
-			{
-				$this->{$key} = $value;
-			}
-		}
-	}
+        // make the parameters conveniently accessible
+        foreach (get_object_vars($config) as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->{$key} = $value;
+            }
+        }
+    }
 
-	/**
-	 * Byte-safe substr()
-	 *
-	 * @param string  $str
-	 * @param integer $start
-	 * @param integer $length
-	 *
-	 * @return string
-	 */
-	protected static function substr($str, $start, $length = null)
-	{
-		return mb_substr($str, $start, $length, '8bit');
-	}
+    /**
+     * Byte-safe substr()
+     *
+     * @param string $str
+     * @param int    $start
+     * @param int    $length
+     *
+     * @return string
+     */
+    protected static function substr($str, $start, $length = null)
+    {
+        return mb_substr($str, $start, $length, '8bit');
+    }
 
-	/**
-	 * __get() magic, providing readonly access to some of our properties
-	 *
-	 * @param  string $key Property name
-	 * @return mixed
-	 */
-	public function __get($key)
-	{
-		if ($this->__isset($key))
-		{
-			return $this->{$key};
-		}
+    /**
+     * __get() magic, providing readonly access to some of our properties
+     *
+     * @param string $key Property name
+     *
+     * @return mixed
+     */
+    public function __get($key)
+    {
+        if ($this->__isset($key)) {
+            return $this->{$key};
+        }
 
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * __isset() magic, providing checking for some of our properties
-	 *
-	 * @param  string $key Property name
-	 * @return boolean
-	 */
-	public function __isset($key): bool
-	{
-		return property_exists($this, $key);
-	}
+    /**
+     * __isset() magic, providing checking for some of our properties
+     *
+     * @param string $key Property name
+     */
+    public function __isset($key): bool
+    {
+        return property_exists($this, $key);
+    }
 }
diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php
index 3c6c3ef6c361..dac36dc71dc7 100644
--- a/system/Encryption/Handlers/OpenSSLHandler.php
+++ b/system/Encryption/Handlers/OpenSSLHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
@@ -18,102 +18,93 @@
  */
 class OpenSSLHandler extends BaseHandler
 {
-	/**
-	 * HMAC digest to use
-	 *
-	 * @var string
-	 */
-	protected $digest = 'SHA512';
-
-	/**
-	 * Cipher to use
-	 *
-	 * @var string
-	 */
-	protected $cipher = 'AES-256-CTR';
-
-	/**
-	 * Starter key
-	 *
-	 * @var string
-	 */
-	protected $key = '';
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function encrypt($data, $params = null)
-	{
-		// Allow key override
-		if ($params)
-		{
-			$this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
-		}
-
-		if (empty($this->key))
-		{
-			throw EncryptionException::forNeedsStarterKey();
-		}
-
-		// derive a secret key
-		$secret = \hash_hkdf($this->digest, $this->key);
-
-		// basic encryption
-		$iv = ($ivSize = \openssl_cipher_iv_length($this->cipher)) ? \openssl_random_pseudo_bytes($ivSize) : null;
-
-		$data = \openssl_encrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
-
-		if ($data === false)
-		{
-			throw EncryptionException::forEncryptionFailed();
-		}
-
-		$result = $iv . $data;
-
-		$hmacKey = \hash_hmac($this->digest, $result, $secret, true);
-
-		return $hmacKey . $result;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function decrypt($data, $params = null)
-	{
-		// Allow key override
-		if ($params)
-		{
-			$this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
-		}
-
-		if (empty($this->key))
-		{
-			throw EncryptionException::forNeedsStarterKey();
-		}
-
-		// derive a secret key
-		$secret = \hash_hkdf($this->digest, $this->key);
-
-		$hmacLength = self::substr($this->digest, 3) / 8;
-		$hmacKey    = self::substr($data, 0, $hmacLength);
-		$data       = self::substr($data, $hmacLength);
-		$hmacCalc   = \hash_hmac($this->digest, $data, $secret, true);
-
-		if (! hash_equals($hmacKey, $hmacCalc))
-		{
-			throw EncryptionException::forAuthenticationFailed();
-		}
-
-		if ($ivSize = \openssl_cipher_iv_length($this->cipher))
-		{
-			$iv   = self::substr($data, 0, $ivSize);
-			$data = self::substr($data, $ivSize);
-		}
-		else
-		{
-			$iv = null;
-		}
-
-		return \openssl_decrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
-	}
+    /**
+     * HMAC digest to use
+     *
+     * @var string
+     */
+    protected $digest = 'SHA512';
+
+    /**
+     * Cipher to use
+     *
+     * @var string
+     */
+    protected $cipher = 'AES-256-CTR';
+
+    /**
+     * Starter key
+     *
+     * @var string
+     */
+    protected $key = '';
+
+    /**
+     * {@inheritDoc}
+     */
+    public function encrypt($data, $params = null)
+    {
+        // Allow key override
+        if ($params) {
+            $this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
+        }
+
+        if (empty($this->key)) {
+            throw EncryptionException::forNeedsStarterKey();
+        }
+
+        // derive a secret key
+        $secret = \hash_hkdf($this->digest, $this->key);
+
+        // basic encryption
+        $iv = ($ivSize = \openssl_cipher_iv_length($this->cipher)) ? \openssl_random_pseudo_bytes($ivSize) : null;
+
+        $data = \openssl_encrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
+
+        if ($data === false) {
+            throw EncryptionException::forEncryptionFailed();
+        }
+
+        $result = $iv . $data;
+
+        $hmacKey = \hash_hmac($this->digest, $result, $secret, true);
+
+        return $hmacKey . $result;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrypt($data, $params = null)
+    {
+        // Allow key override
+        if ($params) {
+            $this->key = is_array($params) && isset($params['key']) ? $params['key'] : $params;
+        }
+
+        if (empty($this->key)) {
+            throw EncryptionException::forNeedsStarterKey();
+        }
+
+        // derive a secret key
+        $secret = \hash_hkdf($this->digest, $this->key);
+
+        $hmacLength = self::substr($this->digest, 3) / 8;
+        $hmacKey    = self::substr($data, 0, $hmacLength);
+        $data       = self::substr($data, $hmacLength);
+        $hmacCalc   = \hash_hmac($this->digest, $data, $secret, true);
+
+        if (! hash_equals($hmacKey, $hmacCalc)) {
+            throw EncryptionException::forAuthenticationFailed();
+        }
+
+        if ($ivSize = \openssl_cipher_iv_length($this->cipher)) {
+            $iv   = self::substr($data, 0, $ivSize);
+            $data = self::substr($data, $ivSize);
+        } else {
+            $iv = null;
+        }
+
+        return \openssl_decrypt($data, $this->cipher, $secret, OPENSSL_RAW_DATA, $iv);
+    }
 }
diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
index 49b49f51c5cf..9dc4cdbdec44 100644
--- a/system/Encryption/Handlers/SodiumHandler.php
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
@@ -20,130 +20,118 @@
  */
 class SodiumHandler extends BaseHandler
 {
-	/**
-	 * Starter key
-	 *
-	 * @var string
-	 */
-	protected $key = '';
-
-	/**
-	 * Block size for padding message.
-	 *
-	 * @var integer
-	 */
-	protected $blockSize = 16;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function encrypt($data, $params = null)
-	{
-		$this->parseParams($params);
-
-		if (empty($this->key))
-		{
-			throw EncryptionException::forNeedsStarterKey();
-		}
-
-		// create a nonce for this operation
-		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES); // 24 bytes
-
-		// add padding before we encrypt the data
-		if ($this->blockSize <= 0)
-		{
-			throw EncryptionException::forEncryptionFailed();
-		}
-
-		$data = sodium_pad($data, $this->blockSize);
-
-		// encrypt message and combine with nonce
-		$ciphertext = $nonce . sodium_crypto_secretbox($data, $nonce, $this->key);
-
-		// cleanup buffers
-		sodium_memzero($data);
-		sodium_memzero($this->key);
-
-		return $ciphertext;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function decrypt($data, $params = null)
-	{
-		$this->parseParams($params);
-
-		if (empty($this->key))
-		{
-			throw EncryptionException::forNeedsStarterKey();
-		}
-
-		if (mb_strlen($data, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
-		{
-			// message was truncated
-			throw EncryptionException::forAuthenticationFailed();
-		}
-
-		// Extract info from encrypted data
-		$nonce      = self::substr($data, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
-		$ciphertext = self::substr($data, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
-
-		// decrypt data
-		$data = sodium_crypto_secretbox_open($ciphertext, $nonce, $this->key);
-
-		if ($data === false)
-		{
-			// message was tampered in transit
-			throw EncryptionException::forAuthenticationFailed(); // @codeCoverageIgnore
-		}
-
-		// remove extra padding during encryption
-		if ($this->blockSize <= 0)
-		{
-			throw EncryptionException::forAuthenticationFailed();
-		}
-
-		$data = sodium_unpad($data, $this->blockSize);
-
-		// cleanup buffers
-		sodium_memzero($ciphertext);
-		sodium_memzero($this->key);
-
-		return $data;
-	}
-
-	/**
-	 * Parse the $params before doing assignment.
-	 *
-	 * @param array|string|null $params
-	 *
-	 * @throws EncryptionException If key is empty
-	 *
-	 * @return void
-	 */
-	protected function parseParams($params)
-	{
-		if ($params === null)
-		{
-			return;
-		}
-
-		if (is_array($params))
-		{
-			if (isset($params['key']))
-			{
-				$this->key = $params['key'];
-			}
-
-			if (isset($params['blockSize']))
-			{
-				$this->blockSize = $params['blockSize'];
-			}
-
-			return;
-		}
-
-		$this->key = (string) $params;
-	}
+    /**
+     * Starter key
+     *
+     * @var string
+     */
+    protected $key = '';
+
+    /**
+     * Block size for padding message.
+     *
+     * @var int
+     */
+    protected $blockSize = 16;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function encrypt($data, $params = null)
+    {
+        $this->parseParams($params);
+
+        if (empty($this->key)) {
+            throw EncryptionException::forNeedsStarterKey();
+        }
+
+        // create a nonce for this operation
+        $nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES); // 24 bytes
+
+        // add padding before we encrypt the data
+        if ($this->blockSize <= 0) {
+            throw EncryptionException::forEncryptionFailed();
+        }
+
+        $data = sodium_pad($data, $this->blockSize);
+
+        // encrypt message and combine with nonce
+        $ciphertext = $nonce . sodium_crypto_secretbox($data, $nonce, $this->key);
+
+        // cleanup buffers
+        sodium_memzero($data);
+        sodium_memzero($this->key);
+
+        return $ciphertext;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function decrypt($data, $params = null)
+    {
+        $this->parseParams($params);
+
+        if (empty($this->key)) {
+            throw EncryptionException::forNeedsStarterKey();
+        }
+
+        if (mb_strlen($data, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)) {
+            // message was truncated
+            throw EncryptionException::forAuthenticationFailed();
+        }
+
+        // Extract info from encrypted data
+        $nonce      = self::substr($data, 0, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+        $ciphertext = self::substr($data, SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+
+        // decrypt data
+        $data = sodium_crypto_secretbox_open($ciphertext, $nonce, $this->key);
+
+        if ($data === false) {
+            // message was tampered in transit
+            throw EncryptionException::forAuthenticationFailed(); // @codeCoverageIgnore
+        }
+
+        // remove extra padding during encryption
+        if ($this->blockSize <= 0) {
+            throw EncryptionException::forAuthenticationFailed();
+        }
+
+        $data = sodium_unpad($data, $this->blockSize);
+
+        // cleanup buffers
+        sodium_memzero($ciphertext);
+        sodium_memzero($this->key);
+
+        return $data;
+    }
+
+    /**
+     * Parse the $params before doing assignment.
+     *
+     * @param array|string|null $params
+     *
+     * @throws EncryptionException If key is empty
+     */
+    protected function parseParams($params)
+    {
+        if ($params === null) {
+            return;
+        }
+
+        if (is_array($params)) {
+            if (isset($params['key'])) {
+                $this->key = $params['key'];
+            }
+
+            if (isset($params['blockSize'])) {
+                $this->blockSize = $params['blockSize'];
+            }
+
+            return;
+        }
+
+        $this->key = (string) $params;
+    }
 }
diff --git a/system/Entity.php b/system/Entity.php
index e1a2be7002fa..94aa7241ffaf 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Entity/Cast/ArrayCast.php b/system/Entity/Cast/ArrayCast.php
index 0a5397fa4719..315f2e582fec 100644
--- a/system/Entity/Cast/ArrayCast.php
+++ b/system/Entity/Cast/ArrayCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,24 +16,23 @@
  */
 class ArrayCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): array
-	{
-		if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0))
-		{
-			$value = unserialize($value);
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): array
+    {
+        if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) {
+            $value = unserialize($value);
+        }
 
-		return (array) $value;
-	}
+        return (array) $value;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public static function set($value, array $params = []): string
-	{
-		return serialize($value);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function set($value, array $params = []): string
+    {
+        return serialize($value);
+    }
 }
diff --git a/system/Entity/Cast/BaseCast.php b/system/Entity/Cast/BaseCast.php
index bee314501611..c79dfc5f56b4 100644
--- a/system/Entity/Cast/BaseCast.php
+++ b/system/Entity/Cast/BaseCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,29 +16,29 @@
  */
 abstract class BaseCast implements CastInterface
 {
-	/**
-	 * Get
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function get($value, array $params = [])
-	{
-		return $value;
-	}
+    /**
+     * Get
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function get($value, array $params = [])
+    {
+        return $value;
+    }
 
-	/**
-	 * Set
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function set($value, array $params = [])
-	{
-		return $value;
-	}
+    /**
+     * Set
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function set($value, array $params = [])
+    {
+        return $value;
+    }
 }
diff --git a/system/Entity/Cast/BooleanCast.php b/system/Entity/Cast/BooleanCast.php
index cb353902ca32..f46f5f5326bb 100644
--- a/system/Entity/Cast/BooleanCast.php
+++ b/system/Entity/Cast/BooleanCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,11 +16,11 @@
  */
 class BooleanCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): bool
-	{
-		return (bool) $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): bool
+    {
+        return (bool) $value;
+    }
 }
diff --git a/system/Entity/Cast/CSVCast.php b/system/Entity/Cast/CSVCast.php
index 3fd84b8295b8..ba2414273543 100644
--- a/system/Entity/Cast/CSVCast.php
+++ b/system/Entity/Cast/CSVCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,19 +16,19 @@
  */
 class CSVCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): array
-	{
-		return explode(',', $value);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): array
+    {
+        return explode(',', $value);
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	public static function set($value, array $params = []): string
-	{
-		return implode(',', $value);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function set($value, array $params = []): string
+    {
+        return implode(',', $value);
+    }
 }
diff --git a/system/Entity/Cast/CastInterface.php b/system/Entity/Cast/CastInterface.php
index 66b2d8f54dfd..e4a36384dba0 100644
--- a/system/Entity/Cast/CastInterface.php
+++ b/system/Entity/Cast/CastInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,23 +16,23 @@
  */
 interface CastInterface
 {
-	/**
-	 * Get
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function get($value, array $params = []);
+    /**
+     * Get
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function get($value, array $params = []);
 
-	/**
-	 * Set
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function set($value, array $params = []);
+    /**
+     * Set
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function set($value, array $params = []);
 }
diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php
index 18fa0a5dfb82..4655b4e374e3 100644
--- a/system/Entity/Cast/DatetimeCast.php
+++ b/system/Entity/Cast/DatetimeCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -20,33 +20,29 @@
  */
 class DatetimeCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 *
-	 * @throws Exception
-	 */
-	public static function get($value, array $params = [])
-	{
-		if ($value instanceof Time)
-		{
-			return $value;
-		}
-
-		if ($value instanceof DateTime)
-		{
-			return Time::instance($value);
-		}
-
-		if (is_numeric($value))
-		{
-			return Time::createFromTimestamp($value);
-		}
-
-		if (is_string($value))
-		{
-			return Time::parse($value);
-		}
-
-		return $value;
-	}
+    /**
+     * {@inheritDoc}
+     *
+     * @throws Exception
+     */
+    public static function get($value, array $params = [])
+    {
+        if ($value instanceof Time) {
+            return $value;
+        }
+
+        if ($value instanceof DateTime) {
+            return Time::instance($value);
+        }
+
+        if (is_numeric($value)) {
+            return Time::createFromTimestamp($value);
+        }
+
+        if (is_string($value)) {
+            return Time::parse($value);
+        }
+
+        return $value;
+    }
 }
diff --git a/system/Entity/Cast/FloatCast.php b/system/Entity/Cast/FloatCast.php
index 2fc2a8ebb524..78f87570f32c 100644
--- a/system/Entity/Cast/FloatCast.php
+++ b/system/Entity/Cast/FloatCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,11 +16,11 @@
  */
 class FloatCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): float
-	{
-		return (float) $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): float
+    {
+        return (float) $value;
+    }
 }
diff --git a/system/Entity/Cast/IntegerCast.php b/system/Entity/Cast/IntegerCast.php
index 366d0217dfc5..b9357d7ed49b 100644
--- a/system/Entity/Cast/IntegerCast.php
+++ b/system/Entity/Cast/IntegerCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,11 +16,11 @@
  */
 class IntegerCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): int
-	{
-		return (int) $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): int
+    {
+        return (int) $value;
+    }
 }
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index 9c0c2fc5af1e..534631be6167 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -20,52 +20,46 @@
  */
 class JsonCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = [])
-	{
-		$associative = in_array('array', $params, true);
-		$tmp         = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = [])
+    {
+        $associative = in_array('array', $params, true);
 
-		if (function_exists('json_decode')
-			&& ((is_string($value)
-					&& strlen($value) > 1
-					&& in_array($value[0], ['[', '{', '"'], true))
-				|| is_numeric($value)
-			)
-		)
-		{
-			try
-			{
-				$tmp = json_decode($value, $associative, 512, JSON_THROW_ON_ERROR);
-			}
-			catch (JsonException $e)
-			{
-				throw CastException::forInvalidJsonFormat($e->getCode());
-			}
-		}
+        $tmp = $value !== null ? ($associative ? [] : new stdClass()) : null;
 
-		return $tmp;
-	}
+        if (function_exists('json_decode')
+            && (
+                (is_string($value)
+                    && strlen($value) > 1
+                    && in_array($value[0], ['[', '{', '"'], true))
+                || is_numeric($value)
+            )
+        ) {
+            try {
+                $tmp = json_decode($value, $associative, 512, JSON_THROW_ON_ERROR);
+            } catch (JsonException $e) {
+                throw CastException::forInvalidJsonFormat($e->getCode());
+            }
+        }
 
-	/**
-	 * @inheritDoc
-	 */
-	public static function set($value, array $params = []): string
-	{
-		if (function_exists('json_encode'))
-		{
-			try
-			{
-				$value = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR);
-			}
-			catch (JsonException $e)
-			{
-				throw CastException::forInvalidJsonFormat($e->getCode());
-			}
-		}
+        return $tmp;
+    }
 
-		return $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function set($value, array $params = []): string
+    {
+        if (function_exists('json_encode')) {
+            try {
+                $value = json_encode($value, JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR);
+            } catch (JsonException $e) {
+                throw CastException::forInvalidJsonFormat($e->getCode());
+            }
+        }
+
+        return $value;
+    }
 }
diff --git a/system/Entity/Cast/ObjectCast.php b/system/Entity/Cast/ObjectCast.php
index 0988abc03a1e..0a22ed8a4a36 100644
--- a/system/Entity/Cast/ObjectCast.php
+++ b/system/Entity/Cast/ObjectCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,11 +16,11 @@
  */
 class ObjectCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): object
-	{
-		return (object) $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): object
+    {
+        return (object) $value;
+    }
 }
diff --git a/system/Entity/Cast/StringCast.php b/system/Entity/Cast/StringCast.php
index 17c2442fa7b4..974567ccb62a 100644
--- a/system/Entity/Cast/StringCast.php
+++ b/system/Entity/Cast/StringCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -16,11 +16,11 @@
  */
 class StringCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): string
-	{
-		return (string) $value;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): string
+    {
+        return (string) $value;
+    }
 }
diff --git a/system/Entity/Cast/TimestampCast.php b/system/Entity/Cast/TimestampCast.php
index d87a15f42542..f9669d592eb7 100644
--- a/system/Entity/Cast/TimestampCast.php
+++ b/system/Entity/Cast/TimestampCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -18,18 +18,17 @@
  */
 class TimestampCast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = [])
-	{
-		$value = strtotime($value);
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = [])
+    {
+        $value = strtotime($value);
 
-		if ($value === false)
-		{
-			throw CastException::forInvalidTimestamp();
-		}
+        if ($value === false) {
+            throw CastException::forInvalidTimestamp();
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }
diff --git a/system/Entity/Cast/URICast.php b/system/Entity/Cast/URICast.php
index 337998877e9a..bb49e7454ddf 100644
--- a/system/Entity/Cast/URICast.php
+++ b/system/Entity/Cast/URICast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
@@ -18,11 +18,11 @@
  */
 class URICast extends BaseCast
 {
-	/**
-	 * @inheritDoc
-	 */
-	public static function get($value, array $params = []): URI
-	{
-		return $value instanceof URI ? $value : new URI($value);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public static function get($value, array $params = []): URI
+    {
+        return $value instanceof URI ? $value : new URI($value);
+    }
 }
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 9ae6d5e71441..7d44adf3e14c 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity;
@@ -27,588 +27,509 @@
 use CodeIgniter\I18n\Time;
 use Exception;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 /**
  * Entity encapsulation, for use with CodeIgniter\Model
  */
 class Entity implements JsonSerializable
 {
-	/**
-	 * Maps names used in sets and gets against unique
-	 * names within the class, allowing independence from
-	 * database column names.
-	 *
-	 * Example:
-	 *  $datamap = [
-	 *      'db_name' => 'class_name'
-	 *  ];
-	 */
-	protected $datamap = [];
-
-	protected $dates = [
-		'created_at',
-		'updated_at',
-		'deleted_at',
-	];
-
-	/**
-	 * Array of field names and the type of value to cast them as when
-	 * they are accessed.
-	 */
-	protected $casts = [];
-
-	/**
-	 * Custom convert handlers
-	 *
-	 * @var array<string, string>
-	 */
-	protected $castHandlers = [];
-
-	/**
-	 * Default convert handlers
-	 *
-	 * @var array<string, string>
-	 */
-	private $defaultCastHandlers = [
-		'array'     => ArrayCast::class,
-		'bool'      => BooleanCast::class,
-		'boolean'   => BooleanCast::class,
-		'csv'       => CSVCast::class,
-		'datetime'  => DatetimeCast::class,
-		'double'    => FloatCast::class,
-		'float'     => FloatCast::class,
-		'int'       => IntegerCast::class,
-		'integer'   => IntegerCast::class,
-		'json'      => JsonCast::class,
-		'object'    => ObjectCast::class,
-		'string'    => StringCast::class,
-		'timestamp' => TimestampCast::class,
-		'uri'       => URICast::class,
-	];
-
-	/**
-	 * Holds the current values of all class vars.
-	 *
-	 * @var array
-	 */
-	protected $attributes = [];
-
-	/**
-	 * Holds original copies of all class vars so we can determine
-	 * what's actually been changed and not accidentally write
-	 * nulls where we shouldn't.
-	 *
-	 * @var array
-	 */
-	protected $original = [];
-
-	/**
-	 * Holds info whenever properties have to be casted
-	 *
-	 * @var boolean
-	 **/
-	private $_cast = true;
-
-	/**
-	 * Allows filling in Entity parameters during construction.
-	 *
-	 * @param array|null $data
-	 */
-	public function __construct(array $data = null)
-	{
-		$this->syncOriginal();
-
-		$this->fill($data);
-	}
-
-	/**
-	 * Takes an array of key/value pairs and sets them as class
-	 * properties, using any `setCamelCasedProperty()` methods
-	 * that may or may not exist.
-	 *
-	 * @param array $data
-	 *
-	 * @return $this
-	 */
-	public function fill(array $data = null)
-	{
-		if (! is_array($data))
-		{
-			return $this;
-		}
-
-		foreach ($data as $key => $value)
-		{
-			$this->__set($key, $value);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * General method that will return all public and protected values
-	 * of this entity as an array. All values are accessed through the
-	 * __get() magic method so will have any casts, etc applied to them.
-	 *
-	 * @param boolean $onlyChanged If true, only return values that have changed since object creation
-	 * @param boolean $cast        If true, properties will be casted.
-	 * @param boolean $recursive   If true, inner entities will be casted as array as well.
-	 *
-	 * @return array
-	 */
-	public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
-	{
-		$this->_cast = $cast;
-
-		$keys = array_filter(array_keys($this->attributes), function ($key) {
-			return strpos($key, '_') !== 0;
-		});
-
-		if (is_array($this->datamap))
-		{
-			$keys = array_unique(
-				array_merge(array_diff($keys, $this->datamap), array_keys($this->datamap))
-			);
-		}
-
-		$return = [];
-
-		// Loop over the properties, to allow magic methods to do their thing.
-		foreach ($keys as $key)
-		{
-			if ($onlyChanged && ! $this->hasChanged($key))
-			{
-				continue;
-			}
-
-			$return[$key] = $this->__get($key);
-
-			if ($recursive)
-			{
-				if ($return[$key] instanceof Entity)
-				{
-					$return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
-				}
-				elseif (is_callable([$return[$key], 'toArray']))
-				{
-					$return[$key] = $return[$key]->toArray();
-				}
-			}
-		}
-
-		$this->_cast = true;
-
-		return $return;
-	}
-
-	/**
-	 * Returns the raw values of the current attributes.
-	 *
-	 * @param boolean $onlyChanged If true, only return values that have changed since object creation
-	 * @param boolean $recursive   If true, inner entities will be casted as array as well.
-	 *
-	 * @return array
-	 */
-	public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
-	{
-		$return = [];
-
-		if (! $onlyChanged)
-		{
-			if ($recursive)
-			{
-				return array_map(function ($value) use ($onlyChanged, $recursive) {
-					if ($value instanceof Entity)
-					{
-						$value = $value->toRawArray($onlyChanged, $recursive);
-					}
-					elseif (is_callable([$value, 'toRawArray']))
-					{
-						$value = $value->toRawArray();
-					}
-
-					return $value;
-				}, $this->attributes);
-			}
-
-			return $this->attributes;
-		}
-
-		foreach ($this->attributes as $key => $value)
-		{
-			if (! $this->hasChanged($key))
-			{
-				continue;
-			}
-
-			if ($recursive)
-			{
-				if ($value instanceof Entity)
-				{
-					$value = $value->toRawArray($onlyChanged, $recursive);
-				}
-				elseif (is_callable([$value, 'toRawArray']))
-				{
-					$value = $value->toRawArray();
-				}
-			}
-
-			$return[$key] = $value;
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Ensures our "original" values match the current values.
-	 *
-	 * @return $this
-	 */
-	public function syncOriginal()
-	{
-		$this->original = $this->attributes;
-
-		return $this;
-	}
-
-	/**
-	 * Checks a property to see if it has changed since the entity
-	 * was created. Or, without a parameter, checks if any
-	 * properties have changed.
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function hasChanged(string $key = null): bool
-	{
-		// If no parameter was given then check all attributes
-		if (is_null($key))
-		{
-			return $this->original !== $this->attributes;
-		}
-
-		// Key doesn't exist in either
-		if (! array_key_exists($key, $this->original) && ! array_key_exists($key, $this->attributes))
-		{
-			return false;
-		}
-
-		// It's a new element
-		if (! array_key_exists($key, $this->original) && array_key_exists($key, $this->attributes))
-		{
-			return true;
-		}
-
-		return $this->original[$key] !== $this->attributes[$key];
-	}
-
-	/**
-	 * Set raw data array without any mutations
-	 *
-	 * @param array $data
-	 *
-	 * @return $this
-	 */
-	public function setAttributes(array $data)
-	{
-		$this->attributes = $data;
-
-		$this->syncOriginal();
-
-		return $this;
-	}
-
-	/**
-	 * Checks the datamap to see if this column name is being mapped,
-	 * and returns the mapped name, if any, or the original name.
-	 *
-	 * @param string $key
-	 *
-	 * @return mixed|string
-	 */
-	protected function mapProperty(string $key)
-	{
-		if (empty($this->datamap))
-		{
-			return $key;
-		}
-
-		if (! empty($this->datamap[$key]))
-		{
-			return $this->datamap[$key];
-		}
-
-		return $key;
-	}
-
-	/**
-	 * Converts the given string|timestamp|DateTime|Time instance
-	 * into the "CodeIgniter\I18n\Time" object.
-	 *
-	 * @param mixed $value
-	 *
-	 * @throws Exception
-	 *
-	 * @return Time|mixed
-	 */
-	protected function mutateDate($value)
-	{
-		return DatetimeCast::get($value);
-	}
-
-	/**
-	 * Provides the ability to cast an item as a specific data type.
-	 * Add ? at the beginning of $type  (i.e. ?string) to get NULL
-	 * instead of casting $value if $value === null
-	 *
-	 * @param mixed  $value     Attribute value
-	 * @param string $attribute Attribute name
-	 * @param string $method    Allowed to "get" and "set"
-	 *
-	 * @throws CastException
-	 *
-	 * @return mixed
-	 */
-	protected function castAs($value, string $attribute, string $method = 'get')
-	{
-		if (empty($this->casts[$attribute]))
-		{
-			return $value;
-		}
-
-		$type = $this->casts[$attribute];
-
-		$isNullable = false;
-
-		if (strpos($type, '?') === 0)
-		{
-			$isNullable = true;
-
-			if (is_null($value))
-			{
-				return null;
-			}
-
-			$type = substr($type, 1);
-		}
-
-		//In order not to create a separate handler for the
-		// json-array type, we transform the required one.
-		$type = $type === 'json-array' ? 'json[array]' : $type;
-
-		if (! in_array($method, ['get', 'set'], true))
-		{
-			throw CastException::forInvalidMethod($method);
-		}
-
-		$params = [];
-
-		//Attempt to retrieve additional parameters if specified
-		// type[param, param2,param3]
-		if (preg_match('/^(.+)\[(.+)\]$/', $type, $matches))
-		{
-			$type   = $matches[1];
-			$params = array_map('trim', explode(',', $matches[2]));
-		}
-
-		if ($isNullable)
-		{
-			$params[] = 'nullable';
-		}
-
-		$type = trim($type, '[]');
-
-		$handlers = array_merge($this->defaultCastHandlers, $this->castHandlers);
-
-		if (empty($handlers[$type]))
-		{
-			return $value;
-		}
-
-		if (! is_subclass_of($handlers[$type], CastInterface::class))
-		{
-			throw CastException::forInvalidInterface($handlers[$type]);
-		}
-
-		return $handlers[$type]::$method($value, $params);
-	}
-
-	/**
-	 * Cast as JSON
-	 *
-	 * @param mixed   $value
-	 * @param boolean $asArray
-	 *
-	 * @throws CastException
-	 *
-	 * @return mixed
-	 */
-	private function castAsJson($value, bool $asArray = false)
-	{
-		return JsonCast::get($value, $asArray ? ['array'] : []);
-	}
-
-	/**
-	 * Support for json_encode()
-	 *
-	 * @return array|mixed
-	 */
-	public function jsonSerialize()
-	{
-		return $this->toArray();
-	}
-
-	/**
-	 * Change the value of the private $_cast property
-	 *
-	 * @param boolean|null $cast
-	 *
-	 * @return boolean|Entity
-	 */
-	public function cast(bool $cast = null)
-	{
-		if (is_null($cast))
-		{
-			return $this->_cast;
-		}
-
-		$this->_cast = $cast;
-
-		return $this;
-	}
-
-	/**
-	 * Magic method to all protected/private class properties to be
-	 * easily set, either through a direct access or a
-	 * `setCamelCasedProperty()` method.
-	 *
-	 * Examples:
-	 *  $this->my_property = $p;
-	 *  $this->setMyProperty() = $p;
-	 *
-	 * @param string     $key
-	 * @param mixed|null $value
-	 *
-	 * @throws Exception
-	 *
-	 * @return $this
-	 */
-	public function __set(string $key, $value = null)
-	{
-		$key = $this->mapProperty($key);
-
-		// Check if the field should be mutated into a date
-		if (in_array($key, $this->dates, true))
-		{
-			$value = $this->mutateDate($value);
-		}
-
-		$value = $this->castAs($value, $key, 'set');
-
-		// if a set* method exists for this key, use that method to
-		// insert this value. should be outside $isNullable check,
-		// so maybe wants to do sth with null value automatically
-		$method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
-
-		if (method_exists($this, $method))
-		{
-			$this->$method($value);
-
-			return $this;
-		}
-
-		// Otherwise, just the value. This allows for creation of new
-		// class properties that are undefined, though they cannot be
-		// saved. Useful for grabbing values through joins, assigning
-		// relationships, etc.
-		$this->attributes[$key] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Magic method to allow retrieval of protected and private class properties
-	 * either by their name, or through a `getCamelCasedProperty()` method.
-	 *
-	 * Examples:
-	 *  $p = $this->my_property
-	 *  $p = $this->getMyProperty()
-	 *
-	 * @param string $key
-	 *
-	 * @throws Exception
-	 *
-	 * @return mixed
-	 */
-	public function __get(string $key)
-	{
-		$key = $this->mapProperty($key);
-
-		$result = null;
-
-		// Convert to CamelCase for the method
-		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
-
-		// if a set* method exists for this key,
-		// use that method to insert this value.
-		if (method_exists($this, $method))
-		{
-			$result = $this->$method();
-		}
-
-		// Otherwise return the protected property
-		// if it exists.
-		elseif (array_key_exists($key, $this->attributes))
-		{
-			$result = $this->attributes[$key];
-		}
-
-		// Do we need to mutate this into a date?
-		if (in_array($key, $this->dates, true))
-		{
-			$result = $this->mutateDate($result);
-		}
-		// Or cast it as something?
-		elseif ($this->_cast)
-		{
-			$result = $this->castAs($result, $key);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Returns true if a property exists names $key, or a getter method
-	 * exists named like for __get().
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $key): bool
-	{
-		$key = $this->mapProperty($key);
-
-		$method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
-
-		if (method_exists($this, $method))
-		{
-			return true;
-		}
-
-		return isset($this->attributes[$key]);
-	}
-
-	/**
-	 * Unsets an attribute property.
-	 *
-	 * @param string $key
-	 *
-	 * @return void
-	 */
-	public function __unset(string $key): void
-	{
-		unset($this->attributes[$key]);
-	}
+    /**
+     * Maps names used in sets and gets against unique
+     * names within the class, allowing independence from
+     * database column names.
+     *
+     * Example:
+     *  $datamap = [
+     *      'db_name' => 'class_name'
+     *  ];
+     */
+    protected $datamap = [];
+
+    protected $dates = [
+        'created_at',
+        'updated_at',
+        'deleted_at',
+    ];
+
+    /**
+     * Array of field names and the type of value to cast them as when
+     * they are accessed.
+     */
+    protected $casts = [];
+
+    /**
+     * Custom convert handlers
+     *
+     * @var array<string, string>
+     */
+    protected $castHandlers = [];
+
+    /**
+     * Default convert handlers
+     *
+     * @var array<string, string>
+     */
+    private $defaultCastHandlers = [
+        'array'     => ArrayCast::class,
+        'bool'      => BooleanCast::class,
+        'boolean'   => BooleanCast::class,
+        'csv'       => CSVCast::class,
+        'datetime'  => DatetimeCast::class,
+        'double'    => FloatCast::class,
+        'float'     => FloatCast::class,
+        'int'       => IntegerCast::class,
+        'integer'   => IntegerCast::class,
+        'json'      => JsonCast::class,
+        'object'    => ObjectCast::class,
+        'string'    => StringCast::class,
+        'timestamp' => TimestampCast::class,
+        'uri'       => URICast::class,
+    ];
+
+    /**
+     * Holds the current values of all class vars.
+     *
+     * @var array
+     */
+    protected $attributes = [];
+
+    /**
+     * Holds original copies of all class vars so we can determine
+     * what's actually been changed and not accidentally write
+     * nulls where we shouldn't.
+     *
+     * @var array
+     */
+    protected $original = [];
+
+    /**
+     * Holds info whenever properties have to be casted
+     *
+     * @var bool
+     */
+    private $_cast = true;
+
+    /**
+     * Allows filling in Entity parameters during construction.
+     */
+    public function __construct(?array $data = null)
+    {
+        $this->syncOriginal();
+
+        $this->fill($data);
+    }
+
+    /**
+     * Takes an array of key/value pairs and sets them as class
+     * properties, using any `setCamelCasedProperty()` methods
+     * that may or may not exist.
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function fill(?array $data = null)
+    {
+        if (! is_array($data)) {
+            return $this;
+        }
+
+        foreach ($data as $key => $value) {
+            $this->__set($key, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * General method that will return all public and protected values
+     * of this entity as an array. All values are accessed through the
+     * __get() magic method so will have any casts, etc applied to them.
+     *
+     * @param bool $onlyChanged If true, only return values that have changed since object creation
+     * @param bool $cast        If true, properties will be casted.
+     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     */
+    public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
+    {
+        $this->_cast = $cast;
+
+        $keys = array_filter(array_keys($this->attributes), static function ($key) {
+            return strpos($key, '_') !== 0;
+        });
+
+        if (is_array($this->datamap)) {
+            $keys = array_unique(
+                array_merge(array_diff($keys, $this->datamap), array_keys($this->datamap))
+            );
+        }
+
+        $return = [];
+
+        // Loop over the properties, to allow magic methods to do their thing.
+        foreach ($keys as $key) {
+            if ($onlyChanged && ! $this->hasChanged($key)) {
+                continue;
+            }
+
+            $return[$key] = $this->__get($key);
+
+            if ($recursive) {
+                if ($return[$key] instanceof self) {
+                    $return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
+                } elseif (is_callable([$return[$key], 'toArray'])) {
+                    $return[$key] = $return[$key]->toArray();
+                }
+            }
+        }
+
+        $this->_cast = true;
+
+        return $return;
+    }
+
+    /**
+     * Returns the raw values of the current attributes.
+     *
+     * @param bool $onlyChanged If true, only return values that have changed since object creation
+     * @param bool $recursive   If true, inner entities will be casted as array as well.
+     */
+    public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
+    {
+        $return = [];
+
+        if (! $onlyChanged) {
+            if ($recursive) {
+                return array_map(static function ($value) use ($onlyChanged, $recursive) {
+                    if ($value instanceof self) {
+                        $value = $value->toRawArray($onlyChanged, $recursive);
+                    } elseif (is_callable([$value, 'toRawArray'])) {
+                        $value = $value->toRawArray();
+                    }
+
+                    return $value;
+                }, $this->attributes);
+            }
+
+            return $this->attributes;
+        }
+
+        foreach ($this->attributes as $key => $value) {
+            if (! $this->hasChanged($key)) {
+                continue;
+            }
+
+            if ($recursive) {
+                if ($value instanceof self) {
+                    $value = $value->toRawArray($onlyChanged, $recursive);
+                } elseif (is_callable([$value, 'toRawArray'])) {
+                    $value = $value->toRawArray();
+                }
+            }
+
+            $return[$key] = $value;
+        }
+
+        return $return;
+    }
+
+    /**
+     * Ensures our "original" values match the current values.
+     *
+     * @return $this
+     */
+    public function syncOriginal()
+    {
+        $this->original = $this->attributes;
+
+        return $this;
+    }
+
+    /**
+     * Checks a property to see if it has changed since the entity
+     * was created. Or, without a parameter, checks if any
+     * properties have changed.
+     *
+     * @param string $key
+     */
+    public function hasChanged(?string $key = null): bool
+    {
+        // If no parameter was given then check all attributes
+        if ($key === null) {
+            return $this->original !== $this->attributes;
+        }
+
+        // Key doesn't exist in either
+        if (! array_key_exists($key, $this->original) && ! array_key_exists($key, $this->attributes)) {
+            return false;
+        }
+
+        // It's a new element
+        if (! array_key_exists($key, $this->original) && array_key_exists($key, $this->attributes)) {
+            return true;
+        }
+
+        return $this->original[$key] !== $this->attributes[$key];
+    }
+
+    /**
+     * Set raw data array without any mutations
+     *
+     * @return $this
+     */
+    public function setAttributes(array $data)
+    {
+        $this->attributes = $data;
+
+        $this->syncOriginal();
+
+        return $this;
+    }
+
+    /**
+     * Checks the datamap to see if this column name is being mapped,
+     * and returns the mapped name, if any, or the original name.
+     *
+     * @return mixed|string
+     */
+    protected function mapProperty(string $key)
+    {
+        if (empty($this->datamap)) {
+            return $key;
+        }
+
+        if (! empty($this->datamap[$key])) {
+            return $this->datamap[$key];
+        }
+
+        return $key;
+    }
+
+    /**
+     * Converts the given string|timestamp|DateTime|Time instance
+     * into the "CodeIgniter\I18n\Time" object.
+     *
+     * @param mixed $value
+     *
+     * @throws Exception
+     *
+     * @return mixed|Time
+     */
+    protected function mutateDate($value)
+    {
+        return DatetimeCast::get($value);
+    }
+
+    /**
+     * Provides the ability to cast an item as a specific data type.
+     * Add ? at the beginning of $type  (i.e. ?string) to get NULL
+     * instead of casting $value if $value === null
+     *
+     * @param mixed  $value     Attribute value
+     * @param string $attribute Attribute name
+     * @param string $method    Allowed to "get" and "set"
+     *
+     * @throws CastException
+     *
+     * @return mixed
+     */
+    protected function castAs($value, string $attribute, string $method = 'get')
+    {
+        if (empty($this->casts[$attribute])) {
+            return $value;
+        }
+
+        $type = $this->casts[$attribute];
+
+        $isNullable = false;
+
+        if (strpos($type, '?') === 0) {
+            $isNullable = true;
+
+            if ($value === null) {
+                return null;
+            }
+
+            $type = substr($type, 1);
+        }
+
+        // In order not to create a separate handler for the
+        // json-array type, we transform the required one.
+        $type = $type === 'json-array' ? 'json[array]' : $type;
+
+        if (! in_array($method, ['get', 'set'], true)) {
+            throw CastException::forInvalidMethod($method);
+        }
+
+        $params = [];
+
+        // Attempt to retrieve additional parameters if specified
+        // type[param, param2,param3]
+        if (preg_match('/^(.+)\[(.+)\]$/', $type, $matches)) {
+            $type   = $matches[1];
+            $params = array_map('trim', explode(',', $matches[2]));
+        }
+
+        if ($isNullable) {
+            $params[] = 'nullable';
+        }
+
+        $type = trim($type, '[]');
+
+        $handlers = array_merge($this->defaultCastHandlers, $this->castHandlers);
+
+        if (empty($handlers[$type])) {
+            return $value;
+        }
+
+        if (! is_subclass_of($handlers[$type], CastInterface::class)) {
+            throw CastException::forInvalidInterface($handlers[$type]);
+        }
+
+        return $handlers[$type]::$method($value, $params);
+    }
+
+    /**
+     * Support for json_encode()
+     *
+     * @return array
+     */
+    #[ReturnTypeWillChange]
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * Change the value of the private $_cast property
+     *
+     * @return bool|Entity
+     */
+    public function cast(?bool $cast = null)
+    {
+        if ($cast === null) {
+            return $this->_cast;
+        }
+
+        $this->_cast = $cast;
+
+        return $this;
+    }
+
+    /**
+     * Magic method to all protected/private class properties to be
+     * easily set, either through a direct access or a
+     * `setCamelCasedProperty()` method.
+     *
+     * Examples:
+     *  $this->my_property = $p;
+     *  $this->setMyProperty() = $p;
+     *
+     * @param mixed|null $value
+     *
+     * @throws Exception
+     *
+     * @return $this
+     */
+    public function __set(string $key, $value = null)
+    {
+        $key = $this->mapProperty($key);
+
+        // Check if the field should be mutated into a date
+        if (in_array($key, $this->dates, true)) {
+            $value = $this->mutateDate($value);
+        }
+
+        $value = $this->castAs($value, $key, 'set');
+
+        // if a set* method exists for this key, use that method to
+        // insert this value. should be outside $isNullable check,
+        // so maybe wants to do sth with null value automatically
+        $method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+        if (method_exists($this, $method)) {
+            $this->{$method}($value);
+
+            return $this;
+        }
+
+        // Otherwise, just the value. This allows for creation of new
+        // class properties that are undefined, though they cannot be
+        // saved. Useful for grabbing values through joins, assigning
+        // relationships, etc.
+        $this->attributes[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Magic method to allow retrieval of protected and private class properties
+     * either by their name, or through a `getCamelCasedProperty()` method.
+     *
+     * Examples:
+     *  $p = $this->my_property
+     *  $p = $this->getMyProperty()
+     *
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function __get(string $key)
+    {
+        $key = $this->mapProperty($key);
+
+        $result = null;
+
+        // Convert to CamelCase for the method
+        $method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+        // if a set* method exists for this key,
+        // use that method to insert this value.
+        if (method_exists($this, $method)) {
+            $result = $this->{$method}();
+        }
+
+        // Otherwise return the protected property
+        // if it exists.
+        elseif (array_key_exists($key, $this->attributes)) {
+            $result = $this->attributes[$key];
+        }
+
+        // Do we need to mutate this into a date?
+        if (in_array($key, $this->dates, true)) {
+            $result = $this->mutateDate($result);
+        }
+        // Or cast it as something?
+        elseif ($this->_cast) {
+            $result = $this->castAs($result, $key);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns true if a property exists names $key, or a getter method
+     * exists named like for __get().
+     */
+    public function __isset(string $key): bool
+    {
+        $key = $this->mapProperty($key);
+
+        $method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
+
+        if (method_exists($this, $method)) {
+            return true;
+        }
+
+        return isset($this->attributes[$key]);
+    }
+
+    /**
+     * Unsets an attribute property.
+     */
+    public function __unset(string $key): void
+    {
+        unset($this->attributes[$key]);
+    }
 }
diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
index 420d6baaef28..2cda4d72238d 100644
--- a/system/Entity/Exceptions/CastException.php
+++ b/system/Entity/Exceptions/CastException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Exceptions;
@@ -18,63 +18,61 @@
  */
 class CastException extends FrameworkException
 {
-	/**
-	 * Thrown when the cast class does not extends BaseCast.
-	 *
-	 * @param string $class
-	 *
-	 * @return static
-	 */
-	public static function forInvalidInterface(string $class)
-	{
-		return new static(lang('Cast.baseCastMissing', [$class]));
-	}
+    /**
+     * Thrown when the cast class does not extends BaseCast.
+     *
+     * @return static
+     */
+    public static function forInvalidInterface(string $class)
+    {
+        return new static(lang('Cast.baseCastMissing', [$class]));
+    }
 
-	/**
-	 * Thrown when the Json format is invalid.
-	 *
-	 * @param integer $error
-	 *
-	 * @return static
-	 */
-	public static function forInvalidJsonFormat(int $error)
-	{
-		switch ($error)
-		{
-			case JSON_ERROR_DEPTH:
-				return new static(lang('Cast.jsonErrorDepth'));
-			case JSON_ERROR_STATE_MISMATCH:
-				return new static(lang('Cast.jsonErrorStateMismatch'));
-			case JSON_ERROR_CTRL_CHAR:
-				return new static(lang('Cast.jsonErrorCtrlChar'));
-			case JSON_ERROR_SYNTAX:
-				return new static(lang('Cast.jsonErrorSyntax'));
-			case JSON_ERROR_UTF8:
-				return new static(lang('Cast.jsonErrorUtf8'));
-			default:
-				return new static(lang('Cast.jsonErrorUnknown'));
-		}
-	}
+    /**
+     * Thrown when the Json format is invalid.
+     *
+     * @return static
+     */
+    public static function forInvalidJsonFormat(int $error)
+    {
+        switch ($error) {
+            case JSON_ERROR_DEPTH:
+                return new static(lang('Cast.jsonErrorDepth'));
 
-	/**
-	 * Thrown when the cast method is not `get` or `set`.
-	 *
-	 * @param string $method
-	 *
-	 * @return static
-	 */
-	public static function forInvalidMethod(string $method)
-	{
-		return new static(lang('Cast.invalidCastMethod', [$method]));
-	}
+            case JSON_ERROR_STATE_MISMATCH:
+                return new static(lang('Cast.jsonErrorStateMismatch'));
 
-	/**
-	 * Thrown when the casting timestamp is not correct timestamp.
-	 *
-	 * @return static
-	 */
-	public static function forInvalidTimestamp()
-	{
-		return new static(lang('Cast.invalidTimestamp'));
-	}
+            case JSON_ERROR_CTRL_CHAR:
+                return new static(lang('Cast.jsonErrorCtrlChar'));
+
+            case JSON_ERROR_SYNTAX:
+                return new static(lang('Cast.jsonErrorSyntax'));
+
+            case JSON_ERROR_UTF8:
+                return new static(lang('Cast.jsonErrorUtf8'));
+
+            default:
+                return new static(lang('Cast.jsonErrorUnknown'));
+        }
+    }
+
+    /**
+     * Thrown when the cast method is not `get` or `set`.
+     *
+     * @return static
+     */
+    public static function forInvalidMethod(string $method)
+    {
+        return new static(lang('Cast.invalidCastMethod', [$method]));
+    }
+
+    /**
+     * Thrown when the casting timestamp is not correct timestamp.
+     *
+     * @return static
+     */
+    public static function forInvalidTimestamp()
+    {
+        return new static(lang('Cast.invalidTimestamp'));
+    }
 }
diff --git a/system/Events/Events.php b/system/Events/Events.php
index 59489b60be8b..ac08107459ca 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Events;
@@ -23,291 +23,251 @@
  */
 class Events
 {
-	/**
-	 * The list of listeners.
-	 *
-	 * @var array
-	 */
-	protected static $listeners = [];
-
-	/**
-	 * Flag to let us know if we've read from the Config file(s)
-	 * and have all of the defined events.
-	 *
-	 * @var boolean
-	 */
-	protected static $initialized = false;
-
-	/**
-	 * If true, events will not actually be fired.
-	 * Useful during testing.
-	 *
-	 * @var boolean
-	 */
-	protected static $simulate = false;
-
-	/**
-	 * Stores information about the events
-	 * for display in the debug toolbar.
-	 *
-	 * @var array<array<string, float|string>>
-	 */
-	protected static $performanceLog = [];
-
-	/**
-	 * A list of found files.
-	 *
-	 * @var string[]
-	 */
-	protected static $files = [];
-
-	/**
-	 * Ensures that we have a events file ready.
-	 *
-	 * @return void
-	 */
-	public static function initialize()
-	{
-		// Don't overwrite anything....
-		if (static::$initialized)
-		{
-			return;
-		}
-
-		/**
-		 * @var Modules
-		 */
-		$config = config('Modules');
-		$events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
-		$files  = [];
-
-		if ($config->shouldDiscover('events'))
-		{
-			$files = Services::locator()->search('Config/Events.php');
-		}
-
-		$files = array_filter(array_map(static function (string $file) {
-			if (is_file($file))
-			{
-				return realpath($file) ?: $file;
-			}
-
-			return false; // @codeCoverageIgnore
-		}, $files));
-
-		static::$files = array_unique(array_merge($files, [$events]));
-
-		foreach (static::$files as $file)
-		{
-			include $file;
-		}
-
-		static::$initialized = true;
-	}
-
-	/**
-	 * Registers an action to happen on an event. The action can be any sort
-	 * of callable:
-	 *
-	 *  Events::on('create', 'myFunction');               // procedural function
-	 *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
-	 *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
-	 *  Events::on('create', function() {});              // Closure
-	 *
-	 * @param string   $eventName
-	 * @param callable $callback
-	 * @param integer  $priority
-	 *
-	 * @return void
-	 */
-	public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
-	{
-		if (! isset(static::$listeners[$eventName]))
-		{
-			static::$listeners[$eventName] = [
-				true, // If there's only 1 item, it's sorted.
-				[$priority],
-				[$callback],
-			];
-		}
-		else
-		{
-			static::$listeners[$eventName][0]   = false; // Not sorted
-			static::$listeners[$eventName][1][] = $priority;
-			static::$listeners[$eventName][2][] = $callback;
-		}
-	}
-
-	/**
-	 * Runs through all subscribed methods running them one at a time,
-	 * until either:
-	 *  a) All subscribers have finished or
-	 *  b) a method returns false, at which point execution of subscribers stops.
-	 *
-	 * @param string $eventName
-	 * @param mixed  $arguments
-	 *
-	 * @return boolean
-	 */
-	public static function trigger($eventName, ...$arguments): bool
-	{
-		// Read in our Config/Events file so that we have them all!
-		if (! static::$initialized)
-		{
-			static::initialize();
-		}
-
-		$listeners = static::listeners($eventName);
-
-		foreach ($listeners as $listener)
-		{
-			$start = microtime(true);
-
-			$result = static::$simulate === false ? call_user_func($listener, ...$arguments) : true;
-
-			if (CI_DEBUG)
-			{
-				static::$performanceLog[] = [
-					'start' => $start,
-					'end'   => microtime(true),
-					'event' => strtolower($eventName),
-				];
-			}
-
-			if ($result === false)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns an array of listeners for a single event. They are
-	 * sorted by priority.
-	 *
-	 * @param string $eventName
-	 *
-	 * @return array
-	 */
-	public static function listeners($eventName): array
-	{
-		if (! isset(static::$listeners[$eventName]))
-		{
-			return [];
-		}
-
-		// The list is not sorted
-		if (! static::$listeners[$eventName][0])
-		{
-			// Sort it!
-			array_multisort(static::$listeners[$eventName][1], SORT_NUMERIC, static::$listeners[$eventName][2]);
-
-			// Mark it as sorted already!
-			static::$listeners[$eventName][0] = true;
-		}
-
-		return static::$listeners[$eventName][2];
-	}
-
-	/**
-	 * Removes a single listener from an event.
-	 *
-	 * If the listener couldn't be found, returns FALSE, else TRUE if
-	 * it was removed.
-	 *
-	 * @param string   $eventName
-	 * @param callable $listener
-	 *
-	 * @return boolean
-	 */
-	public static function removeListener($eventName, callable $listener): bool
-	{
-		if (! isset(static::$listeners[$eventName]))
-		{
-			return false;
-		}
-
-		foreach (static::$listeners[$eventName][2] as $index => $check)
-		{
-			if ($check === $listener)
-			{
-				unset(static::$listeners[$eventName][1][$index]);
-				unset(static::$listeners[$eventName][2][$index]);
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Removes all listeners.
-	 *
-	 * If the event_name is specified, only listeners for that event will be
-	 * removed, otherwise all listeners for all events are removed.
-	 *
-	 * @param string|null $eventName
-	 *
-	 * @return void
-	 */
-	public static function removeAllListeners($eventName = null)
-	{
-		if (! is_null($eventName))
-		{
-			unset(static::$listeners[$eventName]);
-		}
-		else
-		{
-			static::$listeners = [];
-		}
-	}
-
-	/**
-	 * Sets the path to the file that routes are read from.
-	 *
-	 * @param array $files
-	 *
-	 * @return void
-	 */
-	public static function setFiles(array $files)
-	{
-		static::$files = $files;
-	}
-
-	/**
-	 * Returns the files that were found/loaded during this request.
-	 *
-	 * @return string[]
-	 */
-	public function getFiles()
-	{
-		return static::$files;
-	}
-
-	/**
-	 * Turns simulation on or off. When on, events will not be triggered,
-	 * simply logged. Useful during testing when you don't actually want
-	 * the tests to run.
-	 *
-	 * @param boolean $choice
-	 *
-	 * @return void
-	 */
-	public static function simulate(bool $choice = true)
-	{
-		static::$simulate = $choice;
-	}
-
-	/**
-	 * Getter for the performance log records.
-	 *
-	 * @return array<array<string, float|string>>
-	 */
-	public static function getPerformanceLogs()
-	{
-		return static::$performanceLog;
-	}
+    /**
+     * The list of listeners.
+     *
+     * @var array
+     */
+    protected static $listeners = [];
+
+    /**
+     * Flag to let us know if we've read from the Config file(s)
+     * and have all of the defined events.
+     *
+     * @var bool
+     */
+    protected static $initialized = false;
+
+    /**
+     * If true, events will not actually be fired.
+     * Useful during testing.
+     *
+     * @var bool
+     */
+    protected static $simulate = false;
+
+    /**
+     * Stores information about the events
+     * for display in the debug toolbar.
+     *
+     * @var array<array<string, float|string>>
+     */
+    protected static $performanceLog = [];
+
+    /**
+     * A list of found files.
+     *
+     * @var string[]
+     */
+    protected static $files = [];
+
+    /**
+     * Ensures that we have a events file ready.
+     */
+    public static function initialize()
+    {
+        // Don't overwrite anything....
+        if (static::$initialized) {
+            return;
+        }
+
+        /** @var Modules $config */
+        $config = config('Modules');
+        $events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
+        $files  = [];
+
+        if ($config->shouldDiscover('events')) {
+            $files = Services::locator()->search('Config/Events.php');
+        }
+
+        $files = array_filter(array_map(static function (string $file) {
+            if (is_file($file)) {
+                return realpath($file) ?: $file;
+            }
+
+            return false; // @codeCoverageIgnore
+        }, $files));
+
+        static::$files = array_unique(array_merge($files, [$events]));
+
+        foreach (static::$files as $file) {
+            include $file;
+        }
+
+        static::$initialized = true;
+    }
+
+    /**
+     * Registers an action to happen on an event. The action can be any sort
+     * of callable:
+     *
+     *  Events::on('create', 'myFunction');               // procedural function
+     *  Events::on('create', ['myClass', 'myMethod']);    // Class::method
+     *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
+     *  Events::on('create', function() {});              // Closure
+     *
+     * @param string   $eventName
+     * @param callable $callback
+     * @param int      $priority
+     */
+    public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
+    {
+        if (! isset(static::$listeners[$eventName])) {
+            static::$listeners[$eventName] = [
+                true, // If there's only 1 item, it's sorted.
+                [$priority],
+                [$callback],
+            ];
+        } else {
+            static::$listeners[$eventName][0]   = false; // Not sorted
+            static::$listeners[$eventName][1][] = $priority;
+            static::$listeners[$eventName][2][] = $callback;
+        }
+    }
+
+    /**
+     * Runs through all subscribed methods running them one at a time,
+     * until either:
+     *  a) All subscribers have finished or
+     *  b) a method returns false, at which point execution of subscribers stops.
+     *
+     * @param string $eventName
+     * @param mixed  $arguments
+     */
+    public static function trigger($eventName, ...$arguments): bool
+    {
+        // Read in our Config/Events file so that we have them all!
+        if (! static::$initialized) {
+            static::initialize();
+        }
+
+        $listeners = static::listeners($eventName);
+
+        foreach ($listeners as $listener) {
+            $start = microtime(true);
+
+            $result = static::$simulate === false ? $listener(...$arguments) : true;
+
+            if (CI_DEBUG) {
+                static::$performanceLog[] = [
+                    'start' => $start,
+                    'end'   => microtime(true),
+                    'event' => strtolower($eventName),
+                ];
+            }
+
+            if ($result === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns an array of listeners for a single event. They are
+     * sorted by priority.
+     *
+     * @param string $eventName
+     */
+    public static function listeners($eventName): array
+    {
+        if (! isset(static::$listeners[$eventName])) {
+            return [];
+        }
+
+        // The list is not sorted
+        if (! static::$listeners[$eventName][0]) {
+            // Sort it!
+            array_multisort(static::$listeners[$eventName][1], SORT_NUMERIC, static::$listeners[$eventName][2]);
+
+            // Mark it as sorted already!
+            static::$listeners[$eventName][0] = true;
+        }
+
+        return static::$listeners[$eventName][2];
+    }
+
+    /**
+     * Removes a single listener from an event.
+     *
+     * If the listener couldn't be found, returns FALSE, else TRUE if
+     * it was removed.
+     *
+     * @param string $eventName
+     */
+    public static function removeListener($eventName, callable $listener): bool
+    {
+        if (! isset(static::$listeners[$eventName])) {
+            return false;
+        }
+
+        foreach (static::$listeners[$eventName][2] as $index => $check) {
+            if ($check === $listener) {
+                unset(
+                    static::$listeners[$eventName][1][$index],
+                    static::$listeners[$eventName][2][$index]
+                );
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Removes all listeners.
+     *
+     * If the event_name is specified, only listeners for that event will be
+     * removed, otherwise all listeners for all events are removed.
+     *
+     * @param string|null $eventName
+     */
+    public static function removeAllListeners($eventName = null)
+    {
+        if ($eventName !== null) {
+            unset(static::$listeners[$eventName]);
+        } else {
+            static::$listeners = [];
+        }
+    }
+
+    /**
+     * Sets the path to the file that routes are read from.
+     */
+    public static function setFiles(array $files)
+    {
+        static::$files = $files;
+    }
+
+    /**
+     * Returns the files that were found/loaded during this request.
+     *
+     * @return string[]
+     */
+    public function getFiles()
+    {
+        return static::$files;
+    }
+
+    /**
+     * Turns simulation on or off. When on, events will not be triggered,
+     * simply logged. Useful during testing when you don't actually want
+     * the tests to run.
+     */
+    public static function simulate(bool $choice = true)
+    {
+        static::$simulate = $choice;
+    }
+
+    /**
+     * Getter for the performance log records.
+     *
+     * @return array<array<string, float|string>>
+     */
+    public static function getPerformanceLogs()
+    {
+        return static::$performanceLog;
+    }
 }
diff --git a/system/Exceptions/AlertError.php b/system/Exceptions/AlertError.php
index 7e2e8df7e2a1..274bb73c562f 100644
--- a/system/Exceptions/AlertError.php
+++ b/system/Exceptions/AlertError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
index 6e4527d5c9db..5e41631536c7 100644
--- a/system/Exceptions/CastException.php
+++ b/system/Exceptions/CastException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -20,31 +20,35 @@
  */
 class CastException extends CriticalError
 {
-	use DebugTraceableTrait;
-
-	/**
-	 * Error code
-	 *
-	 * @var integer
-	 */
-	protected $code = 3;
-
-	public static function forInvalidJsonFormatException(int $error)
-	{
-		switch ($error)
-		{
-			case JSON_ERROR_DEPTH:
-				return new static(lang('Cast.jsonErrorDepth'));
-			case JSON_ERROR_STATE_MISMATCH:
-				return new static(lang('Cast.jsonErrorStateMismatch'));
-			case JSON_ERROR_CTRL_CHAR:
-				return new static(lang('Cast.jsonErrorCtrlChar'));
-			case JSON_ERROR_SYNTAX:
-				return new static(lang('Cast.jsonErrorSyntax'));
-			case JSON_ERROR_UTF8:
-				return new static(lang('Cast.jsonErrorUtf8'));
-			default:
-				return new static(lang('Cast.jsonErrorUnknown'));
-		}
-	}
+    use DebugTraceableTrait;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    protected $code = 3;
+
+    public static function forInvalidJsonFormatException(int $error)
+    {
+        switch ($error) {
+            case JSON_ERROR_DEPTH:
+                return new static(lang('Cast.jsonErrorDepth'));
+
+            case JSON_ERROR_STATE_MISMATCH:
+                return new static(lang('Cast.jsonErrorStateMismatch'));
+
+            case JSON_ERROR_CTRL_CHAR:
+                return new static(lang('Cast.jsonErrorCtrlChar'));
+
+            case JSON_ERROR_SYNTAX:
+                return new static(lang('Cast.jsonErrorSyntax'));
+
+            case JSON_ERROR_UTF8:
+                return new static(lang('Cast.jsonErrorUtf8'));
+
+            default:
+                return new static(lang('Cast.jsonErrorUnknown'));
+        }
+    }
 }
diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php
index 39581110f745..41ae4959e594 100644
--- a/system/Exceptions/ConfigException.php
+++ b/system/Exceptions/ConfigException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -16,17 +16,17 @@
  */
 class ConfigException extends CriticalError
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Error code
-	 *
-	 * @var integer
-	 */
-	protected $code = 3;
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    protected $code = 3;
 
-	public static function forDisabledMigrations()
-	{
-		return new static(lang('Migrations.disabled'));
-	}
+    public static function forDisabledMigrations()
+    {
+        return new static(lang('Migrations.disabled'));
+    }
 }
diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php
index c8355721a8ff..b5129bde0c1c 100644
--- a/system/Exceptions/CriticalError.php
+++ b/system/Exceptions/CriticalError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
index 660cdcfaecfc..b5fb691d78b7 100644
--- a/system/Exceptions/DebugTraceableTrait.php
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Exceptions;
 
 use Throwable;
@@ -12,26 +21,21 @@
  */
 trait DebugTraceableTrait
 {
-	/**
-	 * Tweaks the exception's constructor to assign the file/line to where
-	 * it is actually raised rather than were it is instantiated.
-	 *
-	 * @param string         $message
-	 * @param integer        $code
-	 * @param Throwable|null $previous
-	 */
-	final public function __construct(string $message = '', int $code = 0, Throwable $previous = null)
-	{
-		parent::__construct($message, $code, $previous);
+    /**
+     * Tweaks the exception's constructor to assign the file/line to where
+     * it is actually raised rather than were it is instantiated.
+     */
+    final public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
 
-		$trace = $this->getTrace()[0];
+        $trace = $this->getTrace()[0];
 
-		if (isset($trace['class']) && $trace['class'] === static::class)
-		{
-			[
-				'line' => $this->line,
-				'file' => $this->file,
-			] = $trace;
-		}
-	}
+        if (isset($trace['class']) && $trace['class'] === static::class) {
+            [
+                'line' => $this->line,
+                'file' => $this->file,
+            ] = $trace;
+        }
+    }
 }
diff --git a/system/Exceptions/DownloadException.php b/system/Exceptions/DownloadException.php
index ee1ee2508042..c830891ed5a9 100644
--- a/system/Exceptions/DownloadException.php
+++ b/system/Exceptions/DownloadException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -18,30 +18,30 @@
  */
 class DownloadException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
-
-	public static function forCannotSetFilePath(string $path)
-	{
-		return new static(lang('HTTP.cannotSetFilepath', [$path]));
-	}
-
-	public static function forCannotSetBinary()
-	{
-		return new static(lang('HTTP.cannotSetBinary'));
-	}
-
-	public static function forNotFoundDownloadSource()
-	{
-		return new static(lang('HTTP.notFoundDownloadSource'));
-	}
-
-	public static function forCannotSetCache()
-	{
-		return new static(lang('HTTP.cannotSetCache'));
-	}
-
-	public static function forCannotSetStatusCode(int $code, string $reason)
-	{
-		return new static(lang('HTTP.cannotSetStatusCode', [$code, $reason]));
-	}
+    use DebugTraceableTrait;
+
+    public static function forCannotSetFilePath(string $path)
+    {
+        return new static(lang('HTTP.cannotSetFilepath', [$path]));
+    }
+
+    public static function forCannotSetBinary()
+    {
+        return new static(lang('HTTP.cannotSetBinary'));
+    }
+
+    public static function forNotFoundDownloadSource()
+    {
+        return new static(lang('HTTP.notFoundDownloadSource'));
+    }
+
+    public static function forCannotSetCache()
+    {
+        return new static(lang('HTTP.cannotSetCache'));
+    }
+
+    public static function forCannotSetStatusCode(int $code, string $reason)
+    {
+        return new static(lang('HTTP.cannotSetStatusCode', [$code, $reason]));
+    }
 }
diff --git a/system/Exceptions/EmergencyError.php b/system/Exceptions/EmergencyError.php
index 0ec9c5beaf87..db3e25e66877 100644
--- a/system/Exceptions/EmergencyError.php
+++ b/system/Exceptions/EmergencyError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/ExceptionInterface.php b/system/Exceptions/ExceptionInterface.php
index 75cf7868bacd..be8ac692663a 100644
--- a/system/Exceptions/ExceptionInterface.php
+++ b/system/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -17,7 +17,6 @@
  *
  * catch (\CodeIgniter\Exceptions\ExceptionInterface) { ... }
  */
-
 interface ExceptionInterface
 {
 }
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index 55b29a6daa74..744f4f906d89 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -21,49 +21,46 @@
  */
 class FrameworkException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	public static function forEnabledZlibOutputCompression()
-	{
-		return new static(lang('Core.enabledZlibOutputCompression'));
-	}
+    public static function forEnabledZlibOutputCompression()
+    {
+        return new static(lang('Core.enabledZlibOutputCompression'));
+    }
 
-	public static function forInvalidFile(string $path)
-	{
-		return new static(lang('Core.invalidFile', [$path]));
-	}
+    public static function forInvalidFile(string $path)
+    {
+        return new static(lang('Core.invalidFile', [$path]));
+    }
 
-	public static function forCopyError(string $path)
-	{
-		return new static(lang('Core.copyError', [$path]));
-	}
+    public static function forCopyError(string $path)
+    {
+        return new static(lang('Core.copyError', [$path]));
+    }
 
-	public static function forMissingExtension(string $extension)
-	{
-		if (strpos($extension, 'intl') !== false)
-		{
-			// @codeCoverageIgnoreStart
-			$message = sprintf(
-				'The framework needs the following extension(s) installed and loaded: %s.',
-				$extension
-			);
-			// @codeCoverageIgnoreEnd
-		}
-		else
-		{
-			$message = lang('Core.missingExtension', [$extension]);
-		}
+    public static function forMissingExtension(string $extension)
+    {
+        if (strpos($extension, 'intl') !== false) {
+            // @codeCoverageIgnoreStart
+            $message = sprintf(
+                'The framework needs the following extension(s) installed and loaded: %s.',
+                $extension
+            );
+        // @codeCoverageIgnoreEnd
+        } else {
+            $message = lang('Core.missingExtension', [$extension]);
+        }
 
-		return new static($message);
-	}
+        return new static($message);
+    }
 
-	public static function forNoHandlers(string $class)
-	{
-		return new static(lang('Core.noHandlers', [$class]));
-	}
+    public static function forNoHandlers(string $class)
+    {
+        return new static(lang('Core.noHandlers', [$class]));
+    }
 
-	public static function forFabricatorCreateFailed(string $table, string $reason)
-	{
-		return new static(lang('Fabricator.createFailed', [$table, $reason]));
-	}
+    public static function forFabricatorCreateFailed(string $table, string $reason)
+    {
+        return new static(lang('Fabricator.createFailed', [$table, $reason]));
+    }
 }
diff --git a/system/Exceptions/ModelException.php b/system/Exceptions/ModelException.php
index f42a1797b6dc..7ef6f7a808b9 100644
--- a/system/Exceptions/ModelException.php
+++ b/system/Exceptions/ModelException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -14,16 +14,15 @@
 /**
  * Model Exceptions.
  */
-
 class ModelException extends FrameworkException
 {
-	public static function forNoPrimaryKey(string $modelName)
-	{
-		return new static(lang('Database.noPrimaryKey', [$modelName]));
-	}
+    public static function forNoPrimaryKey(string $modelName)
+    {
+        return new static(lang('Database.noPrimaryKey', [$modelName]));
+    }
 
-	public static function forNoDateFormat(string $modelName)
-	{
-		return new static(lang('Database.noDateFormat', [$modelName]));
-	}
+    public static function forNoDateFormat(string $modelName)
+    {
+        return new static(lang('Database.noDateFormat', [$modelName]));
+    }
 }
diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
index 1ba5c6d0d58d..444776c087a2 100644
--- a/system/Exceptions/PageNotFoundException.php
+++ b/system/Exceptions/PageNotFoundException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -15,32 +15,32 @@
 
 class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
-
-	/**
-	 * Error code
-	 *
-	 * @var integer
-	 */
-	protected $code = 404;
-
-	public static function forPageNotFound(string $message = null)
-	{
-		return new static($message ?? lang('HTTP.pageNotFound'));
-	}
-
-	public static function forEmptyController()
-	{
-		return new static(lang('HTTP.emptyController'));
-	}
-
-	public static function forControllerNotFound(string $controller, string $method)
-	{
-		return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
-	}
-
-	public static function forMethodNotFound(string $method)
-	{
-		return new static(lang('HTTP.methodNotFound', [$method]));
-	}
+    use DebugTraceableTrait;
+
+    /**
+     * Error code
+     *
+     * @var int
+     */
+    protected $code = 404;
+
+    public static function forPageNotFound(?string $message = null)
+    {
+        return new static($message ?? lang('HTTP.pageNotFound'));
+    }
+
+    public static function forEmptyController()
+    {
+        return new static(lang('HTTP.emptyController'));
+    }
+
+    public static function forControllerNotFound(string $controller, string $method)
+    {
+        return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
+    }
+
+    public static function forMethodNotFound(string $method)
+    {
+        return new static(lang('HTTP.methodNotFound', [$method]));
+    }
 }
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index 31f0db04dd72..bbbdc1a3cbb1 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files\Exceptions;
@@ -17,10 +17,10 @@
 
 class FileException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	public static function forUnableToMove(string $from = null, string $to = null, string $error = null)
-	{
-		return new static(lang('Files.cannotMove', [$from, $to, $error]));
-	}
+    public static function forUnableToMove(?string $from = null, ?string $to = null, ?string $error = null)
+    {
+        return new static(lang('Files.cannotMove', [$from, $to, $error]));
+    }
 }
diff --git a/system/Files/Exceptions/FileNotFoundException.php b/system/Files/Exceptions/FileNotFoundException.php
index a5b977631eff..1e0a50f0bd3f 100644
--- a/system/Files/Exceptions/FileNotFoundException.php
+++ b/system/Files/Exceptions/FileNotFoundException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files\Exceptions;
@@ -17,10 +17,10 @@
 
 class FileNotFoundException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	public static function forFileNotFound(string $path)
-	{
-		return new static(lang('Files.fileNotFound', [$path]));
-	}
+    public static function forFileNotFound(string $path)
+    {
+        return new static(lang('Files.fileNotFound', [$path]));
+    }
 }
diff --git a/system/Files/File.php b/system/Files/File.php
index 88a3b4611c53..40d1247e7541 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files;
@@ -14,6 +14,7 @@
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Config\Mimes;
+use ReturnTypeWillChange;
 use SplFileInfo;
 
 /**
@@ -21,200 +22,165 @@
  */
 class File extends SplFileInfo
 {
-	/**
-	 * The files size in bytes
-	 *
-	 * @var integer
-	 */
-	protected $size;
-
-	/**
-	 * Original MimeType
-	 *
-	 * @var null|string
-	 */
-	protected $originalMimeType = null;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Run our SplFileInfo constructor with an optional verification
-	 * that the path is really a file.
-	 *
-	 * @param string  $path
-	 * @param boolean $checkFile
-	 */
-	public function __construct(string $path, bool $checkFile = false)
-	{
-		if ($checkFile && ! is_file($path))
-		{
-			throw FileNotFoundException::forFileNotFound($path);
-		}
-
-		parent::__construct($path);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the file size.
-	 *
-	 * Implementations SHOULD return the value stored in the "size" key of
-	 * the file in the $_FILES array if available, as PHP calculates this based
-	 * on the actual size transmitted.
-	 *
-	 * @return integer The file size in bytes
-	 */
-	public function getSize()
-	{
-		return $this->size ?? ($this->size = parent::getSize());
-	}
-
-	/**
-	 * Retrieve the file size by unit.
-	 *
-	 * @param string $unit
-	 *
-	 * @return integer|string
-	 */
-	public function getSizeByUnit(string $unit = 'b')
-	{
-		switch (strtolower($unit))
-		{
-			case 'kb':
-				return number_format($this->getSize() / 1024, 3);
-			case 'mb':
-				return number_format(($this->getSize() / 1024) / 1024, 3);
-			default:
-				return $this->getSize();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to determine the file extension based on the trusted
-	 * getType() method. If the mime type is unknown, will return null.
-	 *
-	 * @return string|null
-	 */
-	public function guessExtension(): ?string
-	{
-		return Mimes::guessExtensionFromType($this->getMimeType());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the media type of the file. SHOULD not use information from
-	 * the $_FILES array, but should use other methods to more accurately
-	 * determine the type of file, like finfo, or mime_content_type().
-	 *
-	 * @return string The media type we determined it to be.
-	 */
-	public function getMimeType(): string
-	{
-		if (! function_exists('finfo_open'))
-		{
-			// @codeCoverageIgnoreStart
-			return $this->originalMimeType ?? 'application/octet-stream';
-			// @codeCoverageIgnoreEnd
-		}
-
-		$finfo    = finfo_open(FILEINFO_MIME_TYPE);
-		$mimeType = finfo_file($finfo, $this->getRealPath() ?: $this->__toString());
-		finfo_close($finfo);
-		return $mimeType;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a random names based on a simple hash and the time, with
-	 * the correct file extension attached.
-	 *
-	 * @return string
-	 */
-	public function getRandomName(): string
-	{
-		$extension = $this->getExtension();
-		$extension = empty($extension) ? '' : '.' . $extension;
-		return time() . '_' . bin2hex(random_bytes(10)) . $extension;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves a file to a new location.
-	 *
-	 * @param string      $targetPath
-	 * @param string|null $name
-	 * @param boolean     $overwrite
-	 *
-	 * @return File
-	 */
-	public function move(string $targetPath, string $name = null, bool $overwrite = false)
-	{
-		$targetPath  = rtrim($targetPath, '/') . '/';
-		$name        = $name ?? $this->getBaseName();
-		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
-
-		$oldName = $this->getRealPath() ?: $this->__toString();
-
-		if (! @rename($oldName, $destination))
-		{
-			$error = error_get_last();
-			throw FileException::forUnableToMove($this->getBasename(), $targetPath, strip_tags($error['message']));
-		}
-
-		@chmod($destination, 0777 & ~umask());
-
-		return new File($destination);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the destination path for the move operation where overwriting is not expected.
-	 *
-	 * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
-	 * last element is an integer as there may be cases that the delimiter may be present in the filename.
-	 * For the all other cases, it appends an integer starting from zero before the file's extension.
-	 *
-	 * @param string  $destination
-	 * @param string  $delimiter
-	 * @param integer $i
-	 *
-	 * @return string
-	 */
-	public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string
-	{
-		while (is_file($destination))
-		{
-			$info      = pathinfo($destination);
-			$extension = isset($info['extension']) ? '.' . $info['extension'] : '';
-			if (strpos($info['filename'], $delimiter) !== false)
-			{
-				$parts = explode($delimiter, $info['filename']);
-				if (is_numeric(end($parts)))
-				{
-					$i = end($parts);
-					array_pop($parts);
-					$parts[]     = ++ $i;
-					$destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
-				}
-				else
-				{
-					$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
-				}
-			}
-			else
-			{
-				$destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
-			}
-		}
-		return $destination;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The files size in bytes
+     *
+     * @var int
+     */
+    protected $size;
+
+    /**
+     * @var string|null
+     */
+    protected $originalMimeType;
+
+    /**
+     * Run our SplFileInfo constructor with an optional verification
+     * that the path is really a file.
+     *
+     * @throws FileNotFoundException
+     */
+    public function __construct(string $path, bool $checkFile = false)
+    {
+        if ($checkFile && ! is_file($path)) {
+            throw FileNotFoundException::forFileNotFound($path);
+        }
+
+        parent::__construct($path);
+    }
+
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this based
+     * on the actual size transmitted.
+     *
+     * @return false|int The file size in bytes, or false on failure
+     */
+    #[ReturnTypeWillChange]
+    public function getSize()
+    {
+        return $this->size ?? ($this->size = parent::getSize());
+    }
+
+    /**
+     * Retrieve the file size by unit.
+     *
+     * @return false|int|string
+     */
+    public function getSizeByUnit(string $unit = 'b')
+    {
+        switch (strtolower($unit)) {
+            case 'kb':
+                return number_format($this->getSize() / 1024, 3);
+
+            case 'mb':
+                return number_format(($this->getSize() / 1024) / 1024, 3);
+
+            default:
+                return $this->getSize();
+        }
+    }
+
+    /**
+     * Attempts to determine the file extension based on the trusted
+     * getType() method. If the mime type is unknown, will return null.
+     */
+    public function guessExtension(): ?string
+    {
+        return Mimes::guessExtensionFromType($this->getMimeType());
+    }
+
+    /**
+     * Retrieve the media type of the file. SHOULD not use information from
+     * the $_FILES array, but should use other methods to more accurately
+     * determine the type of file, like finfo, or mime_content_type().
+     *
+     * @return string The media type we determined it to be.
+     */
+    public function getMimeType(): string
+    {
+        if (! function_exists('finfo_open')) {
+            return $this->originalMimeType ?? 'application/octet-stream'; // @codeCoverageIgnore
+        }
+
+        $finfo    = finfo_open(FILEINFO_MIME_TYPE);
+        $mimeType = finfo_file($finfo, $this->getRealPath() ?: $this->__toString());
+        finfo_close($finfo);
+
+        return $mimeType;
+    }
+
+    /**
+     * Generates a random names based on a simple hash and the time, with
+     * the correct file extension attached.
+     */
+    public function getRandomName(): string
+    {
+        $extension = $this->getExtension();
+        $extension = empty($extension) ? '' : '.' . $extension;
+
+        return time() . '_' . bin2hex(random_bytes(10)) . $extension;
+    }
+
+    /**
+     * Moves a file to a new location.
+     *
+     * @return File
+     */
+    public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
+    {
+        $targetPath  = rtrim($targetPath, '/') . '/';
+        $name        = $name ?? $this->getBaseName();
+        $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
+
+        $oldName = $this->getRealPath() ?: $this->__toString();
+
+        if (! @rename($oldName, $destination)) {
+            $error = error_get_last();
+
+            throw FileException::forUnableToMove($this->getBasename(), $targetPath, strip_tags($error['message']));
+        }
+
+        @chmod($destination, 0777 & ~umask());
+
+        return new self($destination);
+    }
+
+    /**
+     * Returns the destination path for the move operation where overwriting is not expected.
+     *
+     * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
+     * last element is an integer as there may be cases that the delimiter may be present in the filename.
+     * For the all other cases, it appends an integer starting from zero before the file's extension.
+     */
+    public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string
+    {
+        if ($delimiter === '') {
+            $delimiter = '_';
+        }
+
+        while (is_file($destination)) {
+            $info      = pathinfo($destination);
+            $extension = isset($info['extension']) ? '.' . $info['extension'] : '';
+
+            if (strpos($info['filename'], $delimiter) !== false) {
+                $parts = explode($delimiter, $info['filename']);
+
+                if (is_numeric(end($parts))) {
+                    $i = end($parts);
+                    array_pop($parts);
+                    $parts[]     = ++$i;
+                    $destination = $info['dirname'] . DIRECTORY_SEPARATOR . implode($delimiter, $parts) . $extension;
+                } else {
+                    $destination = $info['dirname'] . DIRECTORY_SEPARATOR . $info['filename'] . $delimiter . ++$i . $extension;
+                }
+            } else {
+                $destination = $info['dirname'] . DIRECTORY_SEPARATOR . $info['filename'] . $delimiter . ++$i . $extension;
+            }
+        }
+
+        return $destination;
+    }
 }
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 254d1f88c783..9d17b5e6e241 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -1,19 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
@@ -27,59 +25,49 @@
  */
 class CSRF implements FilterInterface
 {
-	/**
-	 * Do whatever processing this filter needs to do.
-	 * By default it should not return anything during
-	 * normal execution. However, when an abnormal state
-	 * is found, it should return an instance of
-	 * CodeIgniter\HTTP\Response. If it does, script
-	 * execution will end and that Response will be
-	 * sent back to the client, allowing for error pages,
-	 * redirects, etc.
-	 *
-	 * @param RequestInterface|IncomingRequest $request
-	 * @param array|null                       $arguments
-	 *
-	 * @return mixed
-	 * @throws SecurityException
-	 */
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		if ($request->isCLI())
-		{
-			return;
-		}
+    /**
+     * Do whatever processing this filter needs to do.
+     * By default it should not return anything during
+     * normal execution. However, when an abnormal state
+     * is found, it should return an instance of
+     * CodeIgniter\HTTP\Response. If it does, script
+     * execution will end and that Response will be
+     * sent back to the client, allowing for error pages,
+     * redirects, etc.
+     *
+     * @param array|null $arguments
+     *
+     * @throws SecurityException
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if ($request->isCLI()) {
+            return;
+        }
 
-		$security = Services::security();
+        $security = Services::security();
 
-		try
-		{
-			$security->verify($request);
-		}
-		catch (SecurityException $e)
-		{
-			if ($security->shouldRedirect() && ! $request->isAJAX())
-			{
-				return redirect()->back()->with('error', $e->getMessage());
-			}
+        try {
+            $security->verify($request);
+        } catch (SecurityException $e) {
+            if ($security->shouldRedirect() && ! $request->isAJAX()) {
+                return redirect()->back()->with('error', $e->getMessage());
+            }
 
-			throw $e;
-		}
-	}
+            throw $e;
+        }
+    }
 
-	//--------------------------------------------------------------------
-	/**
-	 * We don't have anything to do here.
-	 *
-	 * @param RequestInterface|IncomingRequest             $request
-	 * @param ResponseInterface|Response $response
-	 * @param array|null                                   $arguments
-	 *
-	 * @return mixed
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * We don't have anything to do here.
+     *
+     * @param array|null $arguments
+     *
+     * @return mixed
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index c012b14b98e5..ae4c09c8bf9c 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -1,19 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
@@ -22,34 +20,23 @@
  */
 class DebugToolbar implements FilterInterface
 {
-	/**
-	 * We don't need to do anything here.
-	 *
-	 * @param RequestInterface|IncomingRequest $request
-	 * @param array|null                       $arguments
-	 *
-	 * @return void
-	 */
-	public function before(RequestInterface $request, $arguments = null)
-	{
-	}
+    /**
+     * We don't need to do anything here.
+     *
+     * @param array|null $arguments
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+    }
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * If the debug flag is set (CI_DEBUG) then collect performance
-	 * and debug information and display it in a toolbar.
-	 *
-	 * @param RequestInterface|IncomingRequest $request
-	 * @param ResponseInterface|Response       $response
-	 * @param array|null                       $arguments
-	 *
-	 * @return void
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-		Services::toolbar()->prepare($request, $response);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * If the debug flag is set (CI_DEBUG) then collect performance
+     * and debug information and display it in a toolbar.
+     *
+     * @param array|null $arguments
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        Services::toolbar()->prepare($request, $response);
+    }
 }
diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php
index 22bbf20944da..04bb36bdc2c5 100644
--- a/system/Filters/Exceptions/FilterException.php
+++ b/system/Filters/Exceptions/FilterException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters\Exceptions;
@@ -19,28 +19,24 @@
  */
 class FilterException extends ConfigException implements ExceptionInterface
 {
-	/**
-	 * Thrown when the provided alias is not within
-	 * the list of configured filter aliases.
-	 *
-	 * @param string $alias
-	 *
-	 * @return static
-	 */
-	public static function forNoAlias(string $alias)
-	{
-		return new static(lang('Filters.noFilter', [$alias]));
-	}
+    /**
+     * Thrown when the provided alias is not within
+     * the list of configured filter aliases.
+     *
+     * @return static
+     */
+    public static function forNoAlias(string $alias)
+    {
+        return new static(lang('Filters.noFilter', [$alias]));
+    }
 
-	/**
-	 * Thrown when the filter class does not implement FilterInterface.
-	 *
-	 * @param string $class
-	 *
-	 * @return static
-	 */
-	public static function forIncorrectInterface(string $class)
-	{
-		return new static(lang('Filters.incorrectInterface', [$class]));
-	}
+    /**
+     * Thrown when the filter class does not implement FilterInterface.
+     *
+     * @return static
+     */
+    public static function forIncorrectInterface(string $class)
+    {
+        return new static(lang('Filters.incorrectInterface', [$class]));
+    }
 }
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
index 0a9440f2d86b..32a18de74682 100644
--- a/system/Filters/FilterInterface.php
+++ b/system/Filters/FilterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -19,38 +19,31 @@
  */
 interface FilterInterface
 {
-	/**
-	 * Do whatever processing this filter needs to do.
-	 * By default it should not return anything during
-	 * normal execution. However, when an abnormal state
-	 * is found, it should return an instance of
-	 * CodeIgniter\HTTP\Response. If it does, script
-	 * execution will end and that Response will be
-	 * sent back to the client, allowing for error pages,
-	 * redirects, etc.
-	 *
-	 * @param RequestInterface $request
-	 * @param null             $arguments
-	 *
-	 * @return mixed
-	 */
-	public function before(RequestInterface $request, $arguments = null);
+    /**
+     * Do whatever processing this filter needs to do.
+     * By default it should not return anything during
+     * normal execution. However, when an abnormal state
+     * is found, it should return an instance of
+     * CodeIgniter\HTTP\Response. If it does, script
+     * execution will end and that Response will be
+     * sent back to the client, allowing for error pages,
+     * redirects, etc.
+     *
+     * @param null $arguments
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $arguments = null);
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows After filters to inspect and modify the response
-	 * object as needed. This method does not allow any way
-	 * to stop execution of other after filters, short of
-	 * throwing an Exception or Error.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param null              $arguments
-	 *
-	 * @return mixed
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);
-
-	//--------------------------------------------------------------------
+    /**
+     * Allows After filters to inspect and modify the response
+     * object as needed. This method does not allow any way
+     * to stop execution of other after filters, short of
+     * throwing an Exception or Error.
+     *
+     * @param null $arguments
+     *
+     * @return mixed
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);
 }
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 1ba881fd78c9..9e3a0aa7913d 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -23,581 +23,504 @@
  */
 class Filters
 {
-	/**
-	 * The original config file
-	 *
-	 * @var FiltersConfig
-	 */
-	protected $config;
-
-	/**
-	 * The active IncomingRequest or CLIRequest
-	 *
-	 * @var RequestInterface
-	 */
-	protected $request;
-
-	/**
-	 * The active Response instance
-	 *
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	/**
-	 * Handle to the modules config.
-	 *
-	 * @var Modules
-	 */
-	protected $modules;
-
-	/**
-	 * Whether we've done initial processing
-	 * on the filter lists.
-	 *
-	 * @var boolean
-	 */
-	protected $initialized = false;
-
-	/**
-	 * The processed filters that will
-	 * be used to check against.
-	 *
-	 * @var array
-	 */
-	protected $filters = [
-		'before' => [],
-		'after'  => [],
-	];
-
-	/**
-	 * The collection of filters' class names that will
-	 * be used to execute in each position.
-	 *
-	 * @var array
-	 */
-	protected $filtersClass = [
-		'before' => [],
-		'after'  => [],
-	];
-
-	/**
-	 * Any arguments to be passed to filters.
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
-	 * Any arguments to be passed to filtersClass.
-	 *
-	 * @var array
-	 */
-	protected $argumentsClass = [];
-
-	/**
-	 * Constructor.
-	 *
-	 * @param FiltersConfig     $config
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param Modules|null      $modules
-	 */
-	public function __construct($config, RequestInterface $request, ResponseInterface $response, Modules $modules = null)
-	{
-		$this->config  = $config;
-		$this->request = &$request;
-		$this->setResponse($response);
-
-		$this->modules = $modules ?? config('Modules');
-	}
-
-	/**
-	 * If discoverFilters is enabled in Config then system will try to
-	 * auto-discover custom filters files in Namespaces and allow access to
-	 * the config object via the variable $customfilters as with the routes file
-	 *
-	 * Sample :
-	 * $filters->aliases['custom-auth'] = \Acme\Blob\Filters\BlobAuth::class;
-	 */
-	private function discoverFilters()
-	{
-		$locator = Services::locator();
-
-		// for access by custom filters
-		$filters = $this->config;
-
-		$files = $locator->search('Config/Filters.php');
-
-		foreach ($files as $file)
-		{
-			$className = $locator->getClassname($file);
-
-			// Don't include our main Filter config again...
-			if ($className === 'Config\\Filters')
-			{
-				continue;
-			}
-
-			include $file;
-		}
-	}
-
-	/**
-	 * Set the response explicity.
-	 *
-	 * @param ResponseInterface $response
-	 */
-	public function setResponse(ResponseInterface $response)
-	{
-		$this->response = &$response;
-	}
-
-	/**
-	 * Runs through all of the filters for the specified
-	 * uri and position.
-	 *
-	 * @param string $uri
-	 * @param string $position
-	 *
-	 * @return RequestInterface|ResponseInterface|mixed
-	 * @throws FilterException
-	 */
-	public function run(string $uri, string $position = 'before')
-	{
-		$this->initialize(strtolower($uri));
-
-		foreach ($this->filtersClass[$position] as $className)
-		{
-			$class = new $className();
-
-			if (! $class instanceof FilterInterface)
-			{
-				throw FilterException::forIncorrectInterface(get_class($class));
-			}
-
-			if ($position === 'before')
-			{
-				$result = $class->before($this->request, $this->argumentsClass[$className] ?? null);
-
-				if ($result instanceof RequestInterface)
-				{
-					$this->request = $result;
-					continue;
-				}
-
-				// If the response object was sent back,
-				// then send it and quit.
-				if ($result instanceof ResponseInterface)
-				{
-					// short circuit - bypass any other filters
-					return $result;
-				}
-				// Ignore an empty result
-				if (empty($result))
-				{
-					continue;
-				}
-
-				return $result;
-			}
-
-			if ($position === 'after')
-			{
-				$result = $class->after($this->request, $this->response, $this->argumentsClass[$className] ?? null);
-
-				if ($result instanceof ResponseInterface)
-				{
-					$this->response = $result;
-
-					continue;
-				}
-			}
-		}
-
-		return $position === 'before' ? $this->request : $this->response;
-	}
-
-	/**
-	 * Runs through our list of filters provided by the configuration
-	 * object to get them ready for use, including getting uri masks
-	 * to proper regex, removing those we can from the possibilities
-	 * based on HTTP method, etc.
-	 *
-	 * The resulting $this->filters is an array of only filters
-	 * that should be applied to this request.
-	 *
-	 * We go ahead an process the entire tree because we'll need to
-	 * run through both a before and after and don't want to double
-	 * process the rows.
-	 *
-	 * @param string $uri
-	 *
-	 * @return Filters
-	 */
-	public function initialize(string $uri = null)
-	{
-		if ($this->initialized === true)
-		{
-			return $this;
-		}
-
-		if ($this->modules->shouldDiscover('filters'))
-		{
-			$this->discoverFilters();
-		}
-
-		$this->processGlobals($uri);
-		$this->processMethods();
-		$this->processFilters($uri);
-
-		// Set the toolbar filter to the last position to be executed
-		if (in_array('toolbar', $this->filters['after'], true) &&
-			($count = count($this->filters['after'])) > 1 &&
-			$this->filters['after'][$count - 1] !== 'toolbar'
-		)
-		{
-			array_splice($this->filters['after'], array_search('toolbar', $this->filters['after'], true), 1);
-			$this->filters['after'][] = 'toolbar';
-		}
-
-		$this->processAliasesToClass('before');
-		$this->processAliasesToClass('after');
-
-		$this->initialized = true;
-
-		return $this;
-	}
-
-	/**
-	 * Restores instance to its pre-initialized state.
-	 * Most useful for testing so the service can be
-	 * re-initialized to a different path.
-	 *
-	 * @return $this
-	 */
-	public function reset(): self
-	{
-		$this->initialized = false;
-		$this->arguments   = $this->argumentsClass = [];
-		$this->filters     = $this->filtersClass = [
-			'before' => [],
-			'after'  => [],
-		];
-
-		return $this;
-	}
-
-	/**
-	 * Returns the processed filters array.
-	 *
-	 * @return array
-	 */
-	public function getFilters(): array
-	{
-		return $this->filters;
-	}
-
-	/**
-	 * Returns the filtersClass array.
-	 *
-	 * @return array
-	 */
-	public function getFiltersClass(): array
-	{
-		return $this->filtersClass;
-	}
-
-	/**
-	 * Adds a new alias to the config file.
-	 * MUST be called prior to initialize();
-	 * Intended for use within routes files.
-	 *
-	 * @param string      $class
-	 * @param string|null $alias
-	 * @param string      $when
-	 * @param string      $section
-	 *
-	 * @return $this
-	 */
-	public function addFilter(string $class, string $alias = null, string $when = 'before', string $section = 'globals')
-	{
-		$alias = $alias ?? md5($class);
-
-		if (! isset($this->config->{$section}))
-		{
-			$this->config->{$section} = [];
-		}
-
-		if (! isset($this->config->{$section}[$when]))
-		{
-			$this->config->{$section}[$when] = [];
-		}
-
-		$this->config->aliases[$alias] = $class;
-
-		$this->config->{$section}[$when][] = $alias;
-
-		return $this;
-	}
-
-	/**
-	 * Ensures that a specific filter is on and enabled for the current request.
-	 *
-	 * Filters can have "arguments". This is done by placing a colon immediately
-	 * after the filter name, followed by a comma-separated list of arguments that
-	 * are passed to the filter when executed.
-	 *
-	 * @param string $name
-	 * @param string $when
-	 *
-	 * @return Filters
-	 */
-	public function enableFilter(string $name, string $when = 'before')
-	{
-		// Get parameters and clean name
-		if (strpos($name, ':') !== false)
-		{
-			[$name, $params] = explode(':', $name);
-
-			$params = explode(',', $params);
-			array_walk($params, function (&$item) {
-				$item = trim($item);
-			});
-
-			$this->arguments[$name] = $params;
-		}
-
-		if (! array_key_exists($name, $this->config->aliases))
-		{
-			throw FilterException::forNoAlias($name);
-		}
-
-		$classNames = (array) $this->config->aliases[$name];
-
-		foreach ($classNames as $className)
-		{
-			$this->argumentsClass[$className] = $this->arguments[$name] ?? null;
-		}
-
-		if (! isset($this->filters[$when][$name]))
-		{
-			$this->filters[$when][]    = $name;
-			$this->filtersClass[$when] = array_merge($this->filtersClass[$when], $classNames);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the arguments for a specified key, or all.
-	 *
-	 * @param string|null $key
-	 *
-	 * @return mixed
-	 */
-	public function getArguments(string $key = null)
-	{
-		return is_null($key) ? $this->arguments : $this->arguments[$key];
-	}
-
-	//--------------------------------------------------------------------
-	// Processors
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add any applicable (not excluded) global filter settings to the mix.
-	 *
-	 * @param string $uri
-	 *
-	 * @return void
-	 */
-	protected function processGlobals(string $uri = null)
-	{
-		if (! isset($this->config->globals) || ! is_array($this->config->globals))
-		{
-			return;
-		}
-
-		$uri = strtolower(trim($uri, '/ '));
-
-		// Add any global filters, unless they are excluded for this URI
-		$sets = [
-			'before',
-			'after',
-		];
-
-		foreach ($sets as $set)
-		{
-			if (isset($this->config->globals[$set]))
-			{
-				// look at each alias in the group
-				foreach ($this->config->globals[$set] as $alias => $rules)
-				{
-					$keep = true;
-					if (is_array($rules))
-					{
-						// see if it should be excluded
-						if (isset($rules['except']))
-						{
-							// grab the exclusion rules
-							$check = $rules['except'];
-							if ($this->pathApplies($uri, $check))
-							{
-								$keep = false;
-							}
-						}
-					}
-					else
-					{
-						$alias = $rules; // simple name of filter to apply
-					}
-
-					if ($keep)
-					{
-						$this->filters[$set][] = $alias;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add any method-specific filters to the mix.
-	 *
-	 * @return void
-	 */
-	protected function processMethods()
-	{
-		if (! isset($this->config->methods) || ! is_array($this->config->methods))
-		{
-			return;
-		}
-
-		// Request method won't be set for CLI-based requests
-		$method = strtolower($_SERVER['REQUEST_METHOD'] ?? 'cli');
-
-		if (array_key_exists($method, $this->config->methods))
-		{
-			$this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
-			return;
-		}
-	}
-
-	/**
-	 * Add any applicable configured filters to the mix.
-	 *
-	 * @param string $uri
-	 *
-	 * @return void
-	 */
-	protected function processFilters(string $uri = null)
-	{
-		if (! isset($this->config->filters) || ! $this->config->filters)
-		{
-			return;
-		}
-
-		$uri = strtolower(trim($uri, '/ '));
-
-		// Add any filters that apply to this URI
-		foreach ($this->config->filters as $alias => $settings)
-		{
-			// Look for inclusion rules
-			if (isset($settings['before']))
-			{
-				$path = $settings['before'];
-				if ($this->pathApplies($uri, $path))
-				{
-					$this->filters['before'][] = $alias;
-				}
-			}
-
-			if (isset($settings['after']))
-			{
-				$path = $settings['after'];
-				if ($this->pathApplies($uri, $path))
-				{
-					$this->filters['after'][] = $alias;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Maps filter aliases to the equivalent filter classes
-	 *
-	 * @param  string $position
-	 * @throws FilterException
-	 *
-	 * @return void
-	 */
-	protected function processAliasesToClass(string $position)
-	{
-		foreach ($this->filters[$position] as $alias => $rules)
-		{
-			if (is_numeric($alias) && is_string($rules))
-			{
-				$alias = $rules;
-			}
-
-			if (! array_key_exists($alias, $this->config->aliases))
-			{
-				throw FilterException::forNoAlias($alias);
-			}
-
-			if (is_array($this->config->aliases[$alias]))
-			{
-				$this->filtersClass[$position] = array_merge($this->filtersClass[$position], $this->config->aliases[$alias]);
-			}
-			else
-			{
-				$this->filtersClass[$position][] = $this->config->aliases[$alias];
-			}
-		}
-
-		// when using enableFilter() we already write the class name in ->filtersClass as well as the
-		// alias in ->filters. This leads to duplicates when using route filters.
-		// Since some filters like rate limiters rely on being executed once a request we filter em here.
-		$this->filtersClass[$position] = array_unique($this->filtersClass[$position]);
-	}
-
-	/**
-	 * Check paths for match for URI
-	 *
-	 * @param string $uri   URI to test against
-	 * @param mixed  $paths The path patterns to test
-	 *
-	 * @return boolean True if any of the paths apply to the URI
-	 */
-	private function pathApplies(string $uri, $paths)
-	{
-		// empty path matches all
-		if (empty($paths))
-		{
-			return true;
-		}
-
-		// make sure the paths are iterable
-		if (is_string($paths))
-		{
-			$paths = [$paths];
-		}
-
-		// treat each paths as pseudo-regex
-		foreach ($paths as $path)
-		{
-			// need to escape path separators
-			$path = str_replace('/', '\/', trim($path, '/ '));
-			// need to make pseudo wildcard real
-			$path = strtolower(str_replace('*', '.*', $path));
-			// Does this rule apply here?
-			if (preg_match('#^' . $path . '$#', $uri, $match) === 1)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
+    /**
+     * The original config file
+     *
+     * @var FiltersConfig
+     */
+    protected $config;
+
+    /**
+     * The active IncomingRequest or CLIRequest
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * The active Response instance
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Handle to the modules config.
+     *
+     * @var Modules
+     */
+    protected $modules;
+
+    /**
+     * Whether we've done initial processing
+     * on the filter lists.
+     *
+     * @var bool
+     */
+    protected $initialized = false;
+
+    /**
+     * The processed filters that will
+     * be used to check against.
+     *
+     * @var array
+     */
+    protected $filters = [
+        'before' => [],
+        'after'  => [],
+    ];
+
+    /**
+     * The collection of filters' class names that will
+     * be used to execute in each position.
+     *
+     * @var array
+     */
+    protected $filtersClass = [
+        'before' => [],
+        'after'  => [],
+    ];
+
+    /**
+     * Any arguments to be passed to filters.
+     *
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Any arguments to be passed to filtersClass.
+     *
+     * @var array
+     */
+    protected $argumentsClass = [];
+
+    /**
+     * Constructor.
+     *
+     * @param FiltersConfig $config
+     */
+    public function __construct($config, RequestInterface $request, ResponseInterface $response, ?Modules $modules = null)
+    {
+        $this->config  = $config;
+        $this->request = &$request;
+        $this->setResponse($response);
+
+        $this->modules = $modules ?? config('Modules');
+    }
+
+    /**
+     * If discoverFilters is enabled in Config then system will try to
+     * auto-discover custom filters files in Namespaces and allow access to
+     * the config object via the variable $customfilters as with the routes file
+     *
+     * Sample :
+     * $filters->aliases['custom-auth'] = \Acme\Blob\Filters\BlobAuth::class;
+     */
+    private function discoverFilters()
+    {
+        $locator = Services::locator();
+
+        // for access by custom filters
+        $filters = $this->config;
+
+        $files = $locator->search('Config/Filters.php');
+
+        foreach ($files as $file) {
+            $className = $locator->getClassname($file);
+
+            // Don't include our main Filter config again...
+            if ($className === 'Config\\Filters') {
+                continue;
+            }
+
+            include $file;
+        }
+    }
+
+    /**
+     * Set the response explicity.
+     */
+    public function setResponse(ResponseInterface $response)
+    {
+        $this->response = &$response;
+    }
+
+    /**
+     * Runs through all of the filters for the specified
+     * uri and position.
+     *
+     * @throws FilterException
+     *
+     * @return mixed|RequestInterface|ResponseInterface
+     */
+    public function run(string $uri, string $position = 'before')
+    {
+        $this->initialize(strtolower($uri));
+
+        foreach ($this->filtersClass[$position] as $className) {
+            $class = new $className();
+
+            if (! $class instanceof FilterInterface) {
+                throw FilterException::forIncorrectInterface(get_class($class));
+            }
+
+            if ($position === 'before') {
+                $result = $class->before($this->request, $this->argumentsClass[$className] ?? null);
+
+                if ($result instanceof RequestInterface) {
+                    $this->request = $result;
+
+                    continue;
+                }
+
+                // If the response object was sent back,
+                // then send it and quit.
+                if ($result instanceof ResponseInterface) {
+                    // short circuit - bypass any other filters
+                    return $result;
+                }
+                // Ignore an empty result
+                if (empty($result)) {
+                    continue;
+                }
+
+                return $result;
+            }
+
+            if ($position === 'after') {
+                $result = $class->after($this->request, $this->response, $this->argumentsClass[$className] ?? null);
+
+                if ($result instanceof ResponseInterface) {
+                    $this->response = $result;
+
+                    continue;
+                }
+            }
+        }
+
+        return $position === 'before' ? $this->request : $this->response;
+    }
+
+    /**
+     * Runs through our list of filters provided by the configuration
+     * object to get them ready for use, including getting uri masks
+     * to proper regex, removing those we can from the possibilities
+     * based on HTTP method, etc.
+     *
+     * The resulting $this->filters is an array of only filters
+     * that should be applied to this request.
+     *
+     * We go ahead an process the entire tree because we'll need to
+     * run through both a before and after and don't want to double
+     * process the rows.
+     *
+     * @param string $uri
+     *
+     * @return Filters
+     */
+    public function initialize(?string $uri = null)
+    {
+        if ($this->initialized === true) {
+            return $this;
+        }
+
+        if ($this->modules->shouldDiscover('filters')) {
+            $this->discoverFilters();
+        }
+
+        $this->processGlobals($uri);
+        $this->processMethods();
+        $this->processFilters($uri);
+
+        // Set the toolbar filter to the last position to be executed
+        if (in_array('toolbar', $this->filters['after'], true)
+            && ($count = count($this->filters['after'])) > 1
+            && $this->filters['after'][$count - 1] !== 'toolbar'
+        ) {
+            array_splice($this->filters['after'], array_search('toolbar', $this->filters['after'], true), 1);
+            $this->filters['after'][] = 'toolbar';
+        }
+
+        $this->processAliasesToClass('before');
+        $this->processAliasesToClass('after');
+
+        $this->initialized = true;
+
+        return $this;
+    }
+
+    /**
+     * Restores instance to its pre-initialized state.
+     * Most useful for testing so the service can be
+     * re-initialized to a different path.
+     */
+    public function reset(): self
+    {
+        $this->initialized = false;
+
+        $this->arguments = $this->argumentsClass = [];
+
+        $this->filters = $this->filtersClass = [
+            'before' => [],
+            'after'  => [],
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Returns the processed filters array.
+     */
+    public function getFilters(): array
+    {
+        return $this->filters;
+    }
+
+    /**
+     * Returns the filtersClass array.
+     */
+    public function getFiltersClass(): array
+    {
+        return $this->filtersClass;
+    }
+
+    /**
+     * Adds a new alias to the config file.
+     * MUST be called prior to initialize();
+     * Intended for use within routes files.
+     *
+     * @return $this
+     */
+    public function addFilter(string $class, ?string $alias = null, string $when = 'before', string $section = 'globals')
+    {
+        $alias = $alias ?? md5($class);
+
+        if (! isset($this->config->{$section})) {
+            $this->config->{$section} = [];
+        }
+
+        if (! isset($this->config->{$section}[$when])) {
+            $this->config->{$section}[$when] = [];
+        }
+
+        $this->config->aliases[$alias] = $class;
+
+        $this->config->{$section}[$when][] = $alias;
+
+        return $this;
+    }
+
+    /**
+     * Ensures that a specific filter is on and enabled for the current request.
+     *
+     * Filters can have "arguments". This is done by placing a colon immediately
+     * after the filter name, followed by a comma-separated list of arguments that
+     * are passed to the filter when executed.
+     *
+     * @return Filters
+     */
+    public function enableFilter(string $name, string $when = 'before')
+    {
+        // Get parameters and clean name
+        if (strpos($name, ':') !== false) {
+            [$name, $params] = explode(':', $name);
+
+            $params = explode(',', $params);
+            array_walk($params, static function (&$item) {
+                $item = trim($item);
+            });
+
+            $this->arguments[$name] = $params;
+        }
+
+        if (! array_key_exists($name, $this->config->aliases)) {
+            throw FilterException::forNoAlias($name);
+        }
+
+        $classNames = (array) $this->config->aliases[$name];
+
+        foreach ($classNames as $className) {
+            $this->argumentsClass[$className] = $this->arguments[$name] ?? null;
+        }
+
+        if (! isset($this->filters[$when][$name])) {
+            $this->filters[$when][]    = $name;
+            $this->filtersClass[$when] = array_merge($this->filtersClass[$when], $classNames);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the arguments for a specified key, or all.
+     *
+     * @return mixed
+     */
+    public function getArguments(?string $key = null)
+    {
+        return $key === null ? $this->arguments : $this->arguments[$key];
+    }
+
+    //--------------------------------------------------------------------
+    // Processors
+    //--------------------------------------------------------------------
+
+    /**
+     * Add any applicable (not excluded) global filter settings to the mix.
+     *
+     * @param string $uri
+     */
+    protected function processGlobals(?string $uri = null)
+    {
+        if (! isset($this->config->globals) || ! is_array($this->config->globals)) {
+            return;
+        }
+
+        $uri = strtolower(trim($uri, '/ '));
+
+        // Add any global filters, unless they are excluded for this URI
+        $sets = [
+            'before',
+            'after',
+        ];
+
+        foreach ($sets as $set) {
+            if (isset($this->config->globals[$set])) {
+                // look at each alias in the group
+                foreach ($this->config->globals[$set] as $alias => $rules) {
+                    $keep = true;
+                    if (is_array($rules)) {
+                        // see if it should be excluded
+                        if (isset($rules['except'])) {
+                            // grab the exclusion rules
+                            $check = $rules['except'];
+                            if ($this->pathApplies($uri, $check)) {
+                                $keep = false;
+                            }
+                        }
+                    } else {
+                        $alias = $rules; // simple name of filter to apply
+                    }
+
+                    if ($keep) {
+                        $this->filters[$set][] = $alias;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Add any method-specific filters to the mix.
+     */
+    protected function processMethods()
+    {
+        if (! isset($this->config->methods) || ! is_array($this->config->methods)) {
+            return;
+        }
+
+        // Request method won't be set for CLI-based requests
+        $method = strtolower($_SERVER['REQUEST_METHOD'] ?? 'cli');
+
+        if (array_key_exists($method, $this->config->methods)) {
+            $this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
+        }
+    }
+
+    /**
+     * Add any applicable configured filters to the mix.
+     *
+     * @param string $uri
+     */
+    protected function processFilters(?string $uri = null)
+    {
+        if (! isset($this->config->filters) || ! $this->config->filters) {
+            return;
+        }
+
+        $uri = strtolower(trim($uri, '/ '));
+
+        // Add any filters that apply to this URI
+        foreach ($this->config->filters as $alias => $settings) {
+            // Look for inclusion rules
+            if (isset($settings['before'])) {
+                $path = $settings['before'];
+                if ($this->pathApplies($uri, $path)) {
+                    $this->filters['before'][] = $alias;
+                }
+            }
+
+            if (isset($settings['after'])) {
+                $path = $settings['after'];
+                if ($this->pathApplies($uri, $path)) {
+                    $this->filters['after'][] = $alias;
+                }
+            }
+        }
+    }
+
+    /**
+     * Maps filter aliases to the equivalent filter classes
+     *
+     * @throws FilterException
+     */
+    protected function processAliasesToClass(string $position)
+    {
+        foreach ($this->filters[$position] as $alias => $rules) {
+            if (is_numeric($alias) && is_string($rules)) {
+                $alias = $rules;
+            }
+
+            if (! array_key_exists($alias, $this->config->aliases)) {
+                throw FilterException::forNoAlias($alias);
+            }
+
+            if (is_array($this->config->aliases[$alias])) {
+                $this->filtersClass[$position] = array_merge($this->filtersClass[$position], $this->config->aliases[$alias]);
+            } else {
+                $this->filtersClass[$position][] = $this->config->aliases[$alias];
+            }
+        }
+
+        // when using enableFilter() we already write the class name in ->filtersClass as well as the
+        // alias in ->filters. This leads to duplicates when using route filters.
+        // Since some filters like rate limiters rely on being executed once a request we filter em here.
+        $this->filtersClass[$position] = array_unique($this->filtersClass[$position]);
+    }
+
+    /**
+     * Check paths for match for URI
+     *
+     * @param string $uri   URI to test against
+     * @param mixed  $paths The path patterns to test
+     *
+     * @return bool True if any of the paths apply to the URI
+     */
+    private function pathApplies(string $uri, $paths)
+    {
+        // empty path matches all
+        if (empty($paths)) {
+            return true;
+        }
+
+        // make sure the paths are iterable
+        if (is_string($paths)) {
+            $paths = [$paths];
+        }
+
+        // treat each paths as pseudo-regex
+        foreach ($paths as $path) {
+            // need to escape path separators
+            $path = str_replace('/', '\/', trim($path, '/ '));
+            // need to make pseudo wildcard real
+            $path = strtolower(str_replace('*', '.*', $path));
+            // Does this rule apply here?
+            if (preg_match('#^' . $path . '$#', $uri, $match) === 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index b6f0ef1451c1..539513e7cb8a 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -21,36 +21,28 @@
  */
 class Honeypot implements FilterInterface
 {
-	/**
-	 * Checks if Honeypot field is empty; if not
-	 * then the requester is a bot
-	 *
-	 * @param RequestInterface $request
-	 * @param array|null       $arguments
-	 *
-	 * @return void
-	 */
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$honeypot = Services::honeypot(new \Config\Honeypot());
-		if ($honeypot->hasContent($request))
-		{
-			throw HoneypotException::isBot();
-		}
-	}
+    /**
+     * Checks if Honeypot field is empty, if not then the
+     * requester is a bot
+     *
+     * @param array|null $arguments
+     *
+     * @throws HoneypotException
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if (Services::honeypot()->hasContent($request)) {
+            throw HoneypotException::isBot();
+        }
+    }
 
-	/**
-	 * Attach a honeypot to the current response.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param array|null        $arguments
-	 *
-	 * @return void
-	 */
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-		$honeypot = Services::honeypot(new \Config\Honeypot());
-		$honeypot->attachHoneypot($response);
-	}
+    /**
+     * Attach a honeypot to the current response.
+     *
+     * @param array|null $arguments
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        Services::honeypot()->attachHoneypot($response);
+    }
 }
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index fbe3abfc59e7..5fef64eae2a1 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format\Exceptions;
@@ -20,56 +20,52 @@
  */
 class FormatException extends RuntimeException implements ExceptionInterface
 {
-	use DebugTraceableTrait;
+    use DebugTraceableTrait;
 
-	/**
-	 * Thrown when the instantiated class does not exist.
-	 *
-	 * @param string $class
-	 *
-	 * @return FormatException
-	 */
-	public static function forInvalidFormatter(string $class)
-	{
-		return new static(lang('Format.invalidFormatter', [$class]));
-	}
+    /**
+     * Thrown when the instantiated class does not exist.
+     *
+     * @return FormatException
+     */
+    public static function forInvalidFormatter(string $class)
+    {
+        return new static(lang('Format.invalidFormatter', [$class]));
+    }
 
-	/**
-	 * Thrown in JSONFormatter when the json_encode produces
-	 * an error code other than JSON_ERROR_NONE and JSON_ERROR_RECURSION.
-	 *
-	 * @param string $error
-	 *
-	 * @return FormatException
-	 */
-	public static function forInvalidJSON(string $error = null)
-	{
-		return new static(lang('Format.invalidJSON', [$error]));
-	}
+    /**
+     * Thrown in JSONFormatter when the json_encode produces
+     * an error code other than JSON_ERROR_NONE and JSON_ERROR_RECURSION.
+     *
+     * @param string $error
+     *
+     * @return FormatException
+     */
+    public static function forInvalidJSON(?string $error = null)
+    {
+        return new static(lang('Format.invalidJSON', [$error]));
+    }
 
-	/**
-	 * Thrown when the supplied MIME type has no
-	 * defined Formatter class.
-	 *
-	 * @param string $mime
-	 *
-	 * @return FormatException
-	 */
-	public static function forInvalidMime(string $mime)
-	{
-		return new static(lang('Format.invalidMime', [$mime]));
-	}
+    /**
+     * Thrown when the supplied MIME type has no
+     * defined Formatter class.
+     *
+     * @return FormatException
+     */
+    public static function forInvalidMime(string $mime)
+    {
+        return new static(lang('Format.invalidMime', [$mime]));
+    }
 
-	/**
-	 * Thrown on XMLFormatter when the `simplexml` extension
-	 * is not installed.
-	 *
-	 * @return FormatException
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forMissingExtension()
-	{
-		return new static(lang('Format.missingExtension'));
-	}
+    /**
+     * Thrown on XMLFormatter when the `simplexml` extension
+     * is not installed.
+     *
+     * @return FormatException
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forMissingExtension()
+    {
+        return new static(lang('Format.missingExtension'));
+    }
 }
diff --git a/system/Format/Format.php b/system/Format/Format.php
index 6f5c0e465e4c..db05aca146d5 100644
--- a/system/Format/Format.php
+++ b/system/Format/Format.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -19,63 +19,54 @@
  */
 class Format
 {
-	/**
-	 * Configuration instance
-	 *
-	 * @var FormatConfig
-	 */
-	protected $config;
+    /**
+     * Configuration instance
+     *
+     * @var FormatConfig
+     */
+    protected $config;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param FormatConfig $config
-	 */
-	public function __construct(FormatConfig $config)
-	{
-		$this->config = $config;
-	}
+    /**
+     * Constructor.
+     */
+    public function __construct(FormatConfig $config)
+    {
+        $this->config = $config;
+    }
 
-	/**
-	 * Returns the current configuration instance.
-	 *
-	 * @return FormatConfig
-	 */
-	public function getConfig()
-	{
-		return $this->config;
-	}
+    /**
+     * Returns the current configuration instance.
+     *
+     * @return FormatConfig
+     */
+    public function getConfig()
+    {
+        return $this->config;
+    }
 
-	/**
-	 * A Factory method to return the appropriate formatter for the given mime type.
-	 *
-	 * @param string $mime
-	 *
-	 * @throws FormatException
-	 *
-	 * @return FormatterInterface
-	 */
-	public function getFormatter(string $mime): FormatterInterface
-	{
-		if (! array_key_exists($mime, $this->config->formatters))
-		{
-			throw FormatException::forInvalidMime($mime);
-		}
+    /**
+     * A Factory method to return the appropriate formatter for the given mime type.
+     *
+     * @throws FormatException
+     */
+    public function getFormatter(string $mime): FormatterInterface
+    {
+        if (! array_key_exists($mime, $this->config->formatters)) {
+            throw FormatException::forInvalidMime($mime);
+        }
 
-		$className = $this->config->formatters[$mime];
+        $className = $this->config->formatters[$mime];
 
-		if (! class_exists($className))
-		{
-			throw FormatException::forInvalidFormatter($className);
-		}
+        if (! class_exists($className)) {
+            throw FormatException::forInvalidFormatter($className);
+        }
 
-		$class = new $className();
+        $class = new $className();
 
-		if (! $class instanceof FormatterInterface)
-		{
-			throw FormatException::forInvalidFormatter($className);
-		}
+        if (! $class instanceof FormatterInterface) {
+            throw FormatException::forInvalidFormatter($className);
+        }
 
-		return $class;
-	}
+        return $class;
+    }
 }
diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php
index 6b4a119729f8..04ba3e8973e9 100644
--- a/system/Format/FormatterInterface.php
+++ b/system/Format/FormatterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -16,12 +16,12 @@
  */
 interface FormatterInterface
 {
-	/**
-	 * Takes the given data and formats it.
-	 *
-	 * @param string|array $data
-	 *
-	 * @return mixed
-	 */
-	public function format($data);
+    /**
+     * Takes the given data and formats it.
+     *
+     * @param array|string $data
+     *
+     * @return mixed
+     */
+    public function format($data);
 }
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
index aefc607ac9c9..b9b3daaebb25 100644
--- a/system/Format/JSONFormatter.php
+++ b/system/Format/JSONFormatter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -19,31 +19,28 @@
  */
 class JSONFormatter implements FormatterInterface
 {
-	/**
-	 * Takes the given data and formats it.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return string|boolean (JSON string | false)
-	 */
-	public function format($data)
-	{
-		$config = new Format();
-
-		$options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
-		$options = $options | JSON_PARTIAL_OUTPUT_ON_ERROR;
-
-		$options = ENVIRONMENT === 'production' ? $options : $options | JSON_PRETTY_PRINT;
-
-		$result = json_encode($data, $options, 512);
-
-		if (! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION], true))
-		{
-			throw FormatException::forInvalidJSON(json_last_error_msg());
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Takes the given data and formats it.
+     *
+     * @param mixed $data
+     *
+     * @return bool|string (JSON string | false)
+     */
+    public function format($data)
+    {
+        $config = new Format();
+
+        $options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
+        $options = $options | JSON_PARTIAL_OUTPUT_ON_ERROR;
+
+        $options = ENVIRONMENT === 'production' ? $options : $options | JSON_PRETTY_PRINT;
+
+        $result = json_encode($data, $options, 512);
+
+        if (! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION], true)) {
+            throw FormatException::forInvalidJSON(json_last_error_msg());
+        }
+
+        return $result;
+    }
 }
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index 249f916c4308..b32e148a7da9 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -20,86 +20,80 @@
  */
 class XMLFormatter implements FormatterInterface
 {
-	/**
-	 * Takes the given data and formats it.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return string|boolean (XML string | false)
-	 */
-	public function format($data)
-	{
-		$config = new Format();
+    /**
+     * Takes the given data and formats it.
+     *
+     * @param mixed $data
+     *
+     * @return bool|string (XML string | false)
+     */
+    public function format($data)
+    {
+        $config = new Format();
 
-		// SimpleXML is installed but default
-		// but best to check, and then provide a fallback.
-		if (! extension_loaded('simplexml'))
-		{
-			// never thrown in travis-ci
-			// @codeCoverageIgnoreStart
-			throw FormatException::forMissingExtension();
-			// @codeCoverageIgnoreEnd
-		}
+        // SimpleXML is installed but default
+        // but best to check, and then provide a fallback.
+        if (! extension_loaded('simplexml')) {
+            // never thrown in travis-ci
+            // @codeCoverageIgnoreStart
+            throw FormatException::forMissingExtension();
+            // @codeCoverageIgnoreEnd
+        }
 
-		$options = $config->formatterOptions['application/xml'] ?? 0;
-		$output  = new SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
+        $options = $config->formatterOptions['application/xml'] ?? 0;
+        $output  = new SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
 
-		$this->arrayToXML((array) $data, $output);
+        $this->arrayToXML((array) $data, $output);
 
-		return $output->asXML();
-	}
+        return $output->asXML();
+    }
 
-	/**
-	 * A recursive method to convert an array into a valid XML string.
-	 *
-	 * Written by CodexWorld. Received permission by email on Nov 24, 2016 to use this code.
-	 *
-	 * @see http://www.codexworld.com/convert-array-to-xml-in-php/
-	 *
-	 * @param array            $data
-	 * @param SimpleXMLElement $output
-	 */
-	protected function arrayToXML(array $data, &$output)
-	{
-		foreach ($data as $key => $value)
-		{
-			$key = $this->normalizeXMLTag($key);
+    /**
+     * A recursive method to convert an array into a valid XML string.
+     *
+     * Written by CodexWorld. Received permission by email on Nov 24, 2016 to use this code.
+     *
+     * @see http://www.codexworld.com/convert-array-to-xml-in-php/
+     *
+     * @param SimpleXMLElement $output
+     */
+    protected function arrayToXML(array $data, &$output)
+    {
+        foreach ($data as $key => $value) {
+            $key = $this->normalizeXMLTag($key);
 
-			if (is_array($value))
-			{
-				$subnode = $output->addChild("$key");
-				$this->arrayToXML($value, $subnode);
-			}
-			else
-			{
-				$output->addChild("$key", htmlspecialchars("$value"));
-			}
-		}
-	}
+            if (is_array($value)) {
+                $subnode = $output->addChild("{$key}");
+                $this->arrayToXML($value, $subnode);
+            } else {
+                $output->addChild("{$key}", htmlspecialchars("{$value}"));
+            }
+        }
+    }
 
-	/**
-	 * Normalizes tags into the allowed by W3C.
-	 * Regex adopted from this StackOverflow answer.
-	 *
-	 * @param string|integer $key
-	 *
-	 * @return string
-	 *
-	 * @see https://stackoverflow.com/questions/60001029/invalid-characters-in-xml-tag-name
-	 */
-	protected function normalizeXMLTag($key)
-	{
-		$startChar = 'A-Z_a-z' .
-			'\\x{C0}-\\x{D6}\\x{D8}-\\x{F6}\\x{F8}-\\x{2FF}\\x{370}-\\x{37D}' .
-			'\\x{37F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{2070}-\\x{218F}' .
-			'\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}' .
-			'\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}';
-		$validName = $startChar . '\\.\\d\\x{B7}\\x{300}-\\x{36F}\\x{203F}-\\x{2040}';
+    /**
+     * Normalizes tags into the allowed by W3C.
+     * Regex adopted from this StackOverflow answer.
+     *
+     * @param int|string $key
+     *
+     * @return string
+     *
+     * @see https://stackoverflow.com/questions/60001029/invalid-characters-in-xml-tag-name
+     */
+    protected function normalizeXMLTag($key)
+    {
+        $startChar = 'A-Z_a-z' .
+            '\\x{C0}-\\x{D6}\\x{D8}-\\x{F6}\\x{F8}-\\x{2FF}\\x{370}-\\x{37D}' .
+            '\\x{37F}-\\x{1FFF}\\x{200C}-\\x{200D}\\x{2070}-\\x{218F}' .
+            '\\x{2C00}-\\x{2FEF}\\x{3001}-\\x{D7FF}\\x{F900}-\\x{FDCF}' .
+            '\\x{FDF0}-\\x{FFFD}\\x{10000}-\\x{EFFFF}';
+        $validName = $startChar . '\\.\\d\\x{B7}\\x{300}-\\x{36F}\\x{203F}-\\x{2040}';
 
-		$key = trim($key);
-		$key = preg_replace("/[^{$validName}-]+/u", '', $key);
-		$key = preg_replace("/^[^{$startChar}]+/u", 'item$0', $key);
+        $key = trim($key);
+        $key = preg_replace("/[^{$validName}-]+/u", '', $key);
+        $key = preg_replace("/^[^{$startChar}]+/u", 'item$0', $key);
 
-		return preg_replace('/^(xml).*/iu', 'item$0', $key); // XML is a reserved starting word
-	}
+        return preg_replace('/^(xml).*/iu', 'item$0', $key); // XML is a reserved starting word
+    }
 }
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 0cf3bce4a783..b8db857fce54 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -29,209 +29,172 @@
  */
 class CLIRequest extends Request
 {
-	/**
-	 * Stores the segments of our cli "URI" command.
-	 *
-	 * @var array
-	 */
-	protected $segments = [];
-
-	/**
-	 * Command line options and their values.
-	 *
-	 * @var array
-	 */
-	protected $options = [];
-
-	/**
-	 * Set the expected HTTP verb
-	 *
-	 * @var string
-	 */
-	protected $method = 'cli';
-
-	/**
-	 * Constructor
-	 *
-	 * @param App $config
-	 */
-	public function __construct(App $config)
-	{
-		if (! is_cli())
-		{
-			throw new RuntimeException(static::class . ' needs to run from the command line.'); // @codeCoverageIgnore
-		}
-
-		parent::__construct($config);
-
-		// Don't terminate the script when the cli's tty goes away
-		ignore_user_abort(true);
-
-		$this->parseCommand();
-	}
-
-	/**
-	 * Returns the "path" of the request script so that it can be used
-	 * in routing to the appropriate controller/method.
-	 *
-	 * The path is determined by treating the command line arguments
-	 * as if it were a URL - up until we hit our first option.
-	 *
-	 * Example:
-	 *      php index.php users 21 profile -foo bar
-	 *
-	 *      // Routes to /users/21/profile (index is removed for routing sake)
-	 *      // with the option foo = bar.
-	 *
-	 * @return string
-	 */
-	public function getPath(): string
-	{
-		$path = implode('/', $this->segments);
-
-		return empty($path) ? '' : $path;
-	}
-
-	/**
-	 * Returns an associative array of all CLI options found, with
-	 * their values.
-	 *
-	 * @return array
-	 */
-	public function getOptions(): array
-	{
-		return $this->options;
-	}
-
-	/**
-	 * Returns the path segments.
-	 *
-	 * @return array
-	 */
-	public function getSegments(): array
-	{
-		return $this->segments;
-	}
-
-	/**
-	 * Returns the value for a single CLI option that was passed in.
-	 *
-	 * @param string $key
-	 *
-	 * @return string|null
-	 */
-	public function getOption(string $key)
-	{
-		return $this->options[$key] ?? null;
-	}
-
-	/**
-	 * Returns the options as a string, suitable for passing along on
-	 * the CLI to other commands.
-	 *
-	 * Example:
-	 *      $options = [
-	 *          'foo' => 'bar',
-	 *          'baz' => 'queue some stuff'
-	 *      ];
-	 *
-	 *      getOptionString() = '-foo bar -baz "queue some stuff"'
-	 *
-	 * @param boolean $useLongOpts
-	 *
-	 * @return string
-	 */
-	public function getOptionString(bool $useLongOpts = false): string
-	{
-		if (empty($this->options))
-		{
-			return '';
-		}
-
-		$out = '';
-
-		foreach ($this->options as $name => $value)
-		{
-			if ($useLongOpts && mb_strlen($name) > 1)
-			{
-				$out .= "--{$name} ";
-			}
-			else
-			{
-				$out .= "-{$name} ";
-			}
-
-			// If there's a space, we need to group
-			// so it will pass correctly.
-			if (mb_strpos($value, ' ') !== false)
-			{
-				$out .= '"' . $value . '" ';
-			}
-			elseif ($value !== null)
-			{
-				$out .= "{$value} ";
-			}
-		}
-
-		return trim($out);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the command line it was called from and collects all options
-	 * and valid segments.
-	 *
-	 * NOTE: I tried to use getopt but had it fail occasionally to find
-	 * any options, where argv has always had our back.
-	 */
-	protected function parseCommand()
-	{
-		$args = $this->getServer('argv');
-		array_shift($args); // Scrap index.php
-
-		$optionValue = false;
-
-		foreach ($args as $i => $arg)
-		{
-			if (mb_strpos($arg, '-') !== 0)
-			{
-				if ($optionValue)
-				{
-					$optionValue = false;
-				}
-				else
-				{
-					$this->segments[] = filter_var($arg, FILTER_SANITIZE_STRING);
-				}
-
-				continue;
-			}
-
-			$arg   = filter_var(ltrim($arg, '-'), FILTER_SANITIZE_STRING);
-			$value = null;
-
-			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
-			{
-				$value       = filter_var($args[$i + 1], FILTER_SANITIZE_STRING);
-				$optionValue = true;
-			}
-
-			$this->options[$arg] = $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if this request was made from the command line (CLI).
-	 *
-	 * @return boolean
-	 */
-	public function isCLI(): bool
-	{
-		return is_cli();
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Stores the segments of our cli "URI" command.
+     *
+     * @var array
+     */
+    protected $segments = [];
+
+    /**
+     * Command line options and their values.
+     *
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * Set the expected HTTP verb
+     *
+     * @var string
+     */
+    protected $method = 'cli';
+
+    /**
+     * Constructor
+     */
+    public function __construct(App $config)
+    {
+        if (! is_cli()) {
+            throw new RuntimeException(static::class . ' needs to run from the command line.'); // @codeCoverageIgnore
+        }
+
+        parent::__construct($config);
+
+        // Don't terminate the script when the cli's tty goes away
+        ignore_user_abort(true);
+
+        $this->parseCommand();
+    }
+
+    /**
+     * Returns the "path" of the request script so that it can be used
+     * in routing to the appropriate controller/method.
+     *
+     * The path is determined by treating the command line arguments
+     * as if it were a URL - up until we hit our first option.
+     *
+     * Example:
+     *      php index.php users 21 profile -foo bar
+     *
+     *      // Routes to /users/21/profile (index is removed for routing sake)
+     *      // with the option foo = bar.
+     */
+    public function getPath(): string
+    {
+        $path = implode('/', $this->segments);
+
+        return empty($path) ? '' : $path;
+    }
+
+    /**
+     * Returns an associative array of all CLI options found, with
+     * their values.
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * Returns the path segments.
+     */
+    public function getSegments(): array
+    {
+        return $this->segments;
+    }
+
+    /**
+     * Returns the value for a single CLI option that was passed in.
+     *
+     * @return string|null
+     */
+    public function getOption(string $key)
+    {
+        return $this->options[$key] ?? null;
+    }
+
+    /**
+     * Returns the options as a string, suitable for passing along on
+     * the CLI to other commands.
+     *
+     * Example:
+     *      $options = [
+     *          'foo' => 'bar',
+     *          'baz' => 'queue some stuff'
+     *      ];
+     *
+     *      getOptionString() = '-foo bar -baz "queue some stuff"'
+     */
+    public function getOptionString(bool $useLongOpts = false): string
+    {
+        if (empty($this->options)) {
+            return '';
+        }
+
+        $out = '';
+
+        foreach ($this->options as $name => $value) {
+            if ($useLongOpts && mb_strlen($name) > 1) {
+                $out .= "--{$name} ";
+            } else {
+                $out .= "-{$name} ";
+            }
+
+            // If there's a space, we need to group
+            // so it will pass correctly.
+            if (mb_strpos($value, ' ') !== false) {
+                $out .= '"' . $value . '" ';
+            } elseif ($value !== null) {
+                $out .= "{$value} ";
+            }
+        }
+
+        return trim($out);
+    }
+
+    /**
+     * Parses the command line it was called from and collects all options
+     * and valid segments.
+     *
+     * NOTE: I tried to use getopt but had it fail occasionally to find
+     * any options, where argv has always had our back.
+     */
+    protected function parseCommand()
+    {
+        $args = $this->getServer('argv');
+        array_shift($args); // Scrap index.php
+
+        $optionValue = false;
+
+        foreach ($args as $i => $arg) {
+            if (mb_strpos($arg, '-') !== 0) {
+                if ($optionValue) {
+                    $optionValue = false;
+                } else {
+                    $this->segments[] = filter_var($arg, FILTER_SANITIZE_STRING);
+                }
+
+                continue;
+            }
+
+            $arg   = filter_var(ltrim($arg, '-'), FILTER_SANITIZE_STRING);
+            $value = null;
+
+            if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
+                $value       = filter_var($args[$i + 1], FILTER_SANITIZE_STRING);
+                $optionValue = true;
+            }
+
+            $this->options[$arg] = $value;
+        }
+    }
+
+    /**
+     * Determines if this request was made from the command line (CLI).
+     */
+    public function isCLI(): bool
+    {
+        return is_cli();
+    }
 }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 55797e06c646..3be8214d42b4 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -23,783 +23,606 @@
  */
 class CURLRequest extends Request
 {
-	/**
-	 * The response object associated with this request
-	 *
-	 * @var ResponseInterface|null
-	 */
-	protected $response;
-
-	/**
-	 * The URI associated with this request
-	 *
-	 * @var URI
-	 */
-	protected $baseURI;
-
-	/**
-	 * The setting values
-	 *
-	 * @var array
-	 */
-	protected $config = [
-		'timeout'         => 0.0,
-		'connect_timeout' => 150,
-		'debug'           => false,
-		'verify'          => true,
-	];
-
-	/**
-	 * Default values for when 'allow_redirects'
-	 * option is true.
-	 *
-	 * @var array
-	 */
-	protected $redirectDefaults = [
-		'max'       => 5,
-		'strict'    => true,
-		'protocols' => [
-			'http',
-			'https',
-		],
-	];
-
-	/**
-	 * The number of milliseconds to delay before
-	 * sending the request.
-	 *
-	 * @var float
-	 */
-	protected $delay = 0.0;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Takes an array of options to set the following possible class properties:
-	 *
-	 *  - baseURI
-	 *  - timeout
-	 *  - any other request options to use as defaults.
-	 *
-	 * @param App               $config
-	 * @param URI               $uri
-	 * @param ResponseInterface $response
-	 * @param array             $options
-	 */
-	public function __construct(App $config, URI $uri, ResponseInterface $response = null, array $options = [])
-	{
-		if (! function_exists('curl_version'))
-		{
-			// we won't see this during travis-CI
-			// @codeCoverageIgnoreStart
-			throw HTTPException::forMissingCurl();
-			// @codeCoverageIgnoreEnd
-		}
-
-		parent::__construct($config);
-
-		$this->response = $response;
-		$this->baseURI  = $uri->useRawQueryString();
-
-		$this->parseOptions($options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sends an HTTP request to the specified $url. If this is a relative
-	 * URL, it will be merged with $this->baseURI to form a complete URL.
-	 *
-	 * @param string $method
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function request($method, string $url, array $options = []): ResponseInterface
-	{
-		$this->parseOptions($options);
-
-		$url = $this->prepareURL($url);
-
-		$method = filter_var($method, FILTER_SANITIZE_STRING);
-
-		$this->send($method, $url);
-
-		return $this->response;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a GET request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function get(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('get', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a DELETE request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function delete(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('delete', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a HEAD request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function head(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('head', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending an OPTIONS request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function options(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('options', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a PATCH request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function patch(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('patch', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a POST request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function post(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('post', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Convenience method for sending a PUT request.
-	 *
-	 * @param string $url
-	 * @param array  $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function put(string $url, array $options = []): ResponseInterface
-	{
-		return $this->request('put', $url, $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the HTTP Authentication.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @param string $type     basic or digest
-	 *
-	 * @return $this
-	 */
-	public function setAuth(string $username, string $password, string $type = 'basic')
-	{
-		$this->config['auth'] = [
-			$username,
-			$password,
-			$type,
-		];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set form data to be sent.
-	 *
-	 * @param array   $params
-	 * @param boolean $multipart Set TRUE if you are sending CURLFiles
-	 *
-	 * @return $this
-	 */
-	public function setForm(array $params, bool $multipart = false)
-	{
-		if ($multipart)
-		{
-			$this->config['multipart'] = $params;
-		}
-		else
-		{
-			$this->config['form_params'] = $params;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set JSON data to be sent.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return $this
-	 */
-	public function setJSON($data)
-	{
-		$this->config['json'] = $data;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the correct settings based on the options array
-	 * passed in.
-	 *
-	 * @param array $options
-	 */
-	protected function parseOptions(array $options)
-	{
-		if (array_key_exists('baseURI', $options))
-		{
-			$this->baseURI = $this->baseURI->setURI($options['baseURI']);
-			unset($options['baseURI']);
-		}
-
-		if (array_key_exists('headers', $options) && is_array($options['headers']))
-		{
-			foreach ($options['headers'] as $name => $value)
-			{
-				$this->setHeader($name, $value);
-			}
-
-			unset($options['headers']);
-		}
-
-		if (array_key_exists('delay', $options))
-		{
-			// Convert from the milliseconds passed in
-			// to the seconds that sleep requires.
-			$this->delay = (float) $options['delay'] / 1000;
-			unset($options['delay']);
-		}
-
-		foreach ($options as $key => $value)
-		{
-			$this->config[$key] = $value;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If the $url is a relative URL, will attempt to create
-	 * a full URL by prepending $this->baseURI to it.
-	 *
-	 * @param string $url
-	 *
-	 * @return string
-	 */
-	protected function prepareURL(string $url): string
-	{
-		// If it's a full URI, then we have nothing to do here...
-		if (strpos($url, '://') !== false)
-		{
-			return $url;
-		}
-
-		$uri = $this->baseURI->resolveRelativeURI($url);
-
-		// Create the string instead of casting to prevent baseURL muddling
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the request method. Overrides the Request class' method
-	 * since users expect a different answer here.
-	 *
-	 * @param boolean|false $upper Whether to return in upper or lower case.
-	 *
-	 * @return string
-	 */
-	public function getMethod(bool $upper = false): string
-	{
-		return ($upper) ? strtoupper($this->method) : strtolower($this->method);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Fires the actual cURL request.
-	 *
-	 * @param string $method
-	 * @param string $url
-	 *
-	 * @return ResponseInterface
-	 */
-	public function send(string $method, string $url)
-	{
-		// Reset our curl options so we're on a fresh slate.
-		$curlOptions = [];
-
-		if (! empty($this->config['query']) && is_array($this->config['query']))
-		{
-			// This is likely too naive a solution.
-			// Should look into handling when $url already
-			// has query vars on it.
-			$url .= '?' . http_build_query($this->config['query']);
-			unset($this->config['query']);
-		}
-
-		$curlOptions[CURLOPT_URL]            = $url;
-		$curlOptions[CURLOPT_RETURNTRANSFER] = true;
-		$curlOptions[CURLOPT_HEADER]         = true;
-		$curlOptions[CURLOPT_FRESH_CONNECT]  = true;
-		// Disable @file uploads in post data.
-		$curlOptions[CURLOPT_SAFE_UPLOAD] = true;
-
-		$curlOptions = $this->setCURLOptions($curlOptions, $this->config);
-		$curlOptions = $this->applyMethod($method, $curlOptions);
-		$curlOptions = $this->applyRequestHeaders($curlOptions);
-
-		// Do we need to delay this request?
-		if ($this->delay > 0)
-		{
-			sleep($this->delay); // @phpstan-ignore-line
-		}
-
-		$output = $this->sendRequest($curlOptions);
-
-		// Set the string we want to break our response from
-		$breakString = "\r\n\r\n";
-
-		if (strpos($output, 'HTTP/1.1 100 Continue') === 0)
-		{
-			$output = substr($output, strpos($output, $breakString) + 4);
-		}
-
-		 // If request and response have Digest
-		if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && strpos($output, 'WWW-Authenticate: Digest') !== false)
-		{
-				$output = substr($output, strpos($output, $breakString) + 4);
-		}
-
-		// Split out our headers and body
-		$break = strpos($output, $breakString);
-
-		if ($break !== false)
-		{
-			// Our headers
-			$headers = explode("\n", substr($output, 0, $break));
-
-			$this->setResponseHeaders($headers);
-
-			// Our body
-			$body = substr($output, $break + 4);
-			$this->response->setBody($body);
-		}
-		else
-		{
-			$this->response->setBody($output);
-		}
-
-		return $this->response;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes all headers current part of this request and adds them
-	 * to the cURL request.
-	 *
-	 * @param array $curlOptions
-	 *
-	 * @return array
-	 */
-	protected function applyRequestHeaders(array $curlOptions = []): array
-	{
-		if (empty($this->headers))
-		{
-			$this->populateHeaders();
-			// Otherwise, it will corrupt the request
-			$this->removeHeader('Host');
-			$this->removeHeader('Accept-Encoding');
-		}
-
-		$headers = $this->headers();
-
-		if (empty($headers))
-		{
-			return $curlOptions;
-		}
-
-		$set = [];
-
-		foreach (array_keys($headers) as $name)
-		{
-			$set[] = $name . ': ' . $this->getHeaderLine($name);
-		}
-
-		$curlOptions[CURLOPT_HTTPHEADER] = $set;
-
-		return $curlOptions;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Apply method
-	 *
-	 * @param string $method
-	 * @param array  $curlOptions
-	 *
-	 * @return array
-	 */
-	protected function applyMethod(string $method, array $curlOptions): array
-	{
-		$method = strtoupper($method);
-
-		$this->method                       = $method;
-		$curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
-
-		$size = strlen($this->body);
-
-		// Have content?
-		if ($size > 0)
-		{
-			return $this->applyBody($curlOptions);
-		}
-
-		if ($method === 'PUT' || $method === 'POST')
-		{
-			// See http://tools.ietf.org/html/rfc7230#section-3.3.2
-			if (is_null($this->header('content-length')) && ! isset($this->config['multipart']))
-			{
-				$this->setHeader('Content-Length', '0');
-			}
-		}
-		elseif ($method === 'HEAD')
-		{
-			$curlOptions[CURLOPT_NOBODY] = 1;
-		}
-
-		return $curlOptions;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Apply body
-	 *
-	 * @param array $curlOptions
-	 *
-	 * @return array
-	 */
-	protected function applyBody(array $curlOptions = []): array
-	{
-		if (! empty($this->body))
-		{
-			$curlOptions[CURLOPT_POSTFIELDS] = (string) $this->getBody();
-		}
-
-		return $curlOptions;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the header retrieved from the cURL response into
-	 * our Response object.
-	 *
-	 * @param array $headers
-	 */
-	protected function setResponseHeaders(array $headers = [])
-	{
-		foreach ($headers as $header)
-		{
-			if (($pos = strpos($header, ':')) !== false)
-			{
-				$title = substr($header, 0, $pos);
-				$value = substr($header, $pos + 1);
-
-				$this->response->setHeader($title, $value);
-			}
-			elseif (strpos($header, 'HTTP') === 0)
-			{
-				preg_match('#^HTTP\/([12](?:\.[01])?) ([0-9]+) (.+)#', $header, $matches);
-
-				if (isset($matches[1]))
-				{
-					$this->response->setProtocolVersion($matches[1]);
-				}
-
-				if (isset($matches[2]))
-				{
-					$this->response->setStatusCode($matches[2], $matches[3] ?? null);
-				}
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set CURL options
-	 *
-	 * @param  array $curlOptions
-	 * @param  array $config
-	 * @return array
-	 * @throws InvalidArgumentException
-	 */
-	protected function setCURLOptions(array $curlOptions = [], array $config = [])
-	{
-		// Auth Headers
-		if (! empty($config['auth']))
-		{
-			$curlOptions[CURLOPT_USERPWD] = $config['auth'][0] . ':' . $config['auth'][1];
-
-			if (! empty($config['auth'][2]) && strtolower($config['auth'][2]) === 'digest')
-			{
-				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
-			}
-			else
-			{
-				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
-			}
-		}
-
-		// Certificate
-		if (! empty($config['cert']))
-		{
-			$cert = $config['cert'];
-
-			if (is_array($cert))
-			{
-				$curlOptions[CURLOPT_SSLCERTPASSWD] = $cert[1];
-				$cert                               = $cert[0];
-			}
-
-			if (! is_file($cert))
-			{
-				throw HTTPException::forSSLCertNotFound($cert);
-			}
-
-			$curlOptions[CURLOPT_SSLCERT] = $cert;
-		}
-
-		// SSL Verification
-		if (isset($config['verify']))
-		{
-			if (is_string($config['verify']))
-			{
-				$file = realpath($config['ssl_key']) ?: $config['ssl_key'];
-
-				if (! is_file($file))
-				{
-					throw HTTPException::forInvalidSSLKey($config['ssl_key']);
-				}
-
-				$curlOptions[CURLOPT_CAINFO]         = $file;
-				$curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
-			}
-			elseif (is_bool($config['verify']))
-			{
-				$curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
-			}
-		}
-
-		// Debug
-		if ($config['debug'])
-		{
-			$curlOptions[CURLOPT_VERBOSE] = 1;
-			$curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://stderr', 'w');
-		}
-
-		// Decode Content
-		if (! empty($config['decode_content']))
-		{
-			$accept = $this->getHeaderLine('Accept-Encoding');
-
-			if ($accept)
-			{
-				$curlOptions[CURLOPT_ENCODING] = $accept;
-			}
-			else
-			{
-				$curlOptions[CURLOPT_ENCODING]   = '';
-				$curlOptions[CURLOPT_HTTPHEADER] = 'Accept-Encoding';
-			}
-		}
-
-		// Allow Redirects
-		if (array_key_exists('allow_redirects', $config))
-		{
-			$settings = $this->redirectDefaults;
-
-			if (is_array($config['allow_redirects']))
-			{
-				$settings = array_merge($settings, $config['allow_redirects']);
-			}
-
-			if ($config['allow_redirects'] === false)
-			{
-				$curlOptions[CURLOPT_FOLLOWLOCATION] = 0;
-			}
-			else
-			{
-				$curlOptions[CURLOPT_FOLLOWLOCATION] = 1;
-				$curlOptions[CURLOPT_MAXREDIRS]      = $settings['max'];
-
-				if ($settings['strict'] === true)
-				{
-					$curlOptions[CURLOPT_POSTREDIR] = 1 | 2 | 4;
-				}
-
-				$protocols = 0;
-				foreach ($settings['protocols'] as $proto)
-				{
-					$protocols += constant('CURLPROTO_' . strtoupper($proto));
-				}
-
-				$curlOptions[CURLOPT_REDIR_PROTOCOLS] = $protocols;
-			}
-		}
-
-		// Timeout
-		$curlOptions[CURLOPT_TIMEOUT_MS] = (float) $config['timeout'] * 1000;
-
-		// Connection Timeout
-		$curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = (float) $config['connect_timeout'] * 1000;
-
-		// Post Data - application/x-www-form-urlencoded
-		if (! empty($config['form_params']) && is_array($config['form_params']))
-		{
-			$postFields                      = http_build_query($config['form_params']);
-			$curlOptions[CURLOPT_POSTFIELDS] = $postFields;
-
-			// Ensure content-length is set, since CURL doesn't seem to
-			// calculate it when HTTPHEADER is set.
-			$this->setHeader('Content-Length', (string) strlen($postFields));
-			$this->setHeader('Content-Type', 'application/x-www-form-urlencoded');
-		}
-
-		// Post Data - multipart/form-data
-		if (! empty($config['multipart']) && is_array($config['multipart']))
-		{
-			// setting the POSTFIELDS option automatically sets multipart
-			$curlOptions[CURLOPT_POSTFIELDS] = $config['multipart'];
-		}
-
-		// HTTP Errors
-		$curlOptions[CURLOPT_FAILONERROR] = array_key_exists('http_errors', $config) ? (bool) $config['http_errors'] : true;
-
-		// JSON
-		if (isset($config['json']))
-		{
-			// Will be set as the body in `applyBody()`
-			$json = json_encode($config['json']);
-			$this->setBody($json);
-			$this->setHeader('Content-Type', 'application/json');
-			$this->setHeader('Content-Length', (string) strlen($json));
-		}
-
-		// version
-		if (! empty($config['version']))
-		{
-			if ($config['version'] === 1.0)
-			{
-				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
-			}
-			elseif ($config['version'] === 1.1)
-			{
-				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
-			}
-		}
-
-		// Cookie
-		if (isset($config['cookie']))
-		{
-			$curlOptions[CURLOPT_COOKIEJAR]  = $config['cookie'];
-			$curlOptions[CURLOPT_COOKIEFILE] = $config['cookie'];
-		}
-
-		// User Agent
-		if (isset($config['user_agent']))
-		{
-			$curlOptions[CURLOPT_USERAGENT] = $config['user_agent'];
-		}
-
-		return $curlOptions;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the actual work of initializing cURL, setting the options,
-	 * and grabbing the output.
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @param array $curlOptions
-	 *
-	 * @return string
-	 */
-	protected function sendRequest(array $curlOptions = []): string
-	{
-		$ch = curl_init();
-
-		curl_setopt_array($ch, $curlOptions);
-
-		// Send the request and wait for a response.
-		$output = curl_exec($ch);
-
-		if ($output === false)
-		{
-			throw HTTPException::forCurlError((string) curl_errno($ch), curl_error($ch));
-		}
-
-		curl_close($ch);
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The response object associated with this request
+     *
+     * @var ResponseInterface|null
+     */
+    protected $response;
+
+    /**
+     * The URI associated with this request
+     *
+     * @var URI
+     */
+    protected $baseURI;
+
+    /**
+     * The setting values
+     *
+     * @var array
+     */
+    protected $config = [
+        'timeout'         => 0.0,
+        'connect_timeout' => 150,
+        'debug'           => false,
+        'verify'          => true,
+    ];
+
+    /**
+     * Default values for when 'allow_redirects'
+     * option is true.
+     *
+     * @var array
+     */
+    protected $redirectDefaults = [
+        'max'       => 5,
+        'strict'    => true,
+        'protocols' => [
+            'http',
+            'https',
+        ],
+    ];
+
+    /**
+     * The number of milliseconds to delay before
+     * sending the request.
+     *
+     * @var float
+     */
+    protected $delay = 0.0;
+
+    /**
+     * Takes an array of options to set the following possible class properties:
+     *
+     *  - baseURI
+     *  - timeout
+     *  - any other request options to use as defaults.
+     *
+     * @param ResponseInterface $response
+     */
+    public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = [])
+    {
+        if (! function_exists('curl_version')) {
+            // we won't see this during travis-CI
+            // @codeCoverageIgnoreStart
+            throw HTTPException::forMissingCurl();
+            // @codeCoverageIgnoreEnd
+        }
+
+        parent::__construct($config);
+
+        $this->response = $response;
+        $this->baseURI  = $uri->useRawQueryString();
+
+        $this->parseOptions($options);
+    }
+
+    /**
+     * Sends an HTTP request to the specified $url. If this is a relative
+     * URL, it will be merged with $this->baseURI to form a complete URL.
+     *
+     * @param string $method
+     */
+    public function request($method, string $url, array $options = []): ResponseInterface
+    {
+        $this->parseOptions($options);
+
+        $url = $this->prepareURL($url);
+
+        $method = filter_var($method, FILTER_SANITIZE_STRING);
+
+        $this->send($method, $url);
+
+        return $this->response;
+    }
+
+    /**
+     * Convenience method for sending a GET request.
+     */
+    public function get(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('get', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending a DELETE request.
+     */
+    public function delete(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('delete', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending a HEAD request.
+     */
+    public function head(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('head', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending an OPTIONS request.
+     */
+    public function options(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('options', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending a PATCH request.
+     */
+    public function patch(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('patch', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending a POST request.
+     */
+    public function post(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('post', $url, $options);
+    }
+
+    /**
+     * Convenience method for sending a PUT request.
+     */
+    public function put(string $url, array $options = []): ResponseInterface
+    {
+        return $this->request('put', $url, $options);
+    }
+
+    /**
+     * Set the HTTP Authentication.
+     *
+     * @param string $type basic or digest
+     *
+     * @return $this
+     */
+    public function setAuth(string $username, string $password, string $type = 'basic')
+    {
+        $this->config['auth'] = [
+            $username,
+            $password,
+            $type,
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Set form data to be sent.
+     *
+     * @param bool $multipart Set TRUE if you are sending CURLFiles
+     *
+     * @return $this
+     */
+    public function setForm(array $params, bool $multipart = false)
+    {
+        if ($multipart) {
+            $this->config['multipart'] = $params;
+        } else {
+            $this->config['form_params'] = $params;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set JSON data to be sent.
+     *
+     * @param mixed $data
+     *
+     * @return $this
+     */
+    public function setJSON($data)
+    {
+        $this->config['json'] = $data;
+
+        return $this;
+    }
+
+    /**
+     * Sets the correct settings based on the options array
+     * passed in.
+     */
+    protected function parseOptions(array $options)
+    {
+        if (array_key_exists('baseURI', $options)) {
+            $this->baseURI = $this->baseURI->setURI($options['baseURI']);
+            unset($options['baseURI']);
+        }
+
+        if (array_key_exists('headers', $options) && is_array($options['headers'])) {
+            foreach ($options['headers'] as $name => $value) {
+                $this->setHeader($name, $value);
+            }
+
+            unset($options['headers']);
+        }
+
+        if (array_key_exists('delay', $options)) {
+            // Convert from the milliseconds passed in
+            // to the seconds that sleep requires.
+            $this->delay = (float) $options['delay'] / 1000;
+            unset($options['delay']);
+        }
+
+        foreach ($options as $key => $value) {
+            $this->config[$key] = $value;
+        }
+    }
+
+    /**
+     * If the $url is a relative URL, will attempt to create
+     * a full URL by prepending $this->baseURI to it.
+     */
+    protected function prepareURL(string $url): string
+    {
+        // If it's a full URI, then we have nothing to do here...
+        if (strpos($url, '://') !== false) {
+            return $url;
+        }
+
+        $uri = $this->baseURI->resolveRelativeURI($url);
+
+        // Create the string instead of casting to prevent baseURL muddling
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Get the request method. Overrides the Request class' method
+     * since users expect a different answer here.
+     *
+     * @param bool|false $upper Whether to return in upper or lower case.
+     */
+    public function getMethod(bool $upper = false): string
+    {
+        return ($upper) ? strtoupper($this->method) : strtolower($this->method);
+    }
+
+    /**
+     * Fires the actual cURL request.
+     *
+     * @return ResponseInterface
+     */
+    public function send(string $method, string $url)
+    {
+        // Reset our curl options so we're on a fresh slate.
+        $curlOptions = [];
+
+        if (! empty($this->config['query']) && is_array($this->config['query'])) {
+            // This is likely too naive a solution.
+            // Should look into handling when $url already
+            // has query vars on it.
+            $url .= '?' . http_build_query($this->config['query']);
+            unset($this->config['query']);
+        }
+
+        $curlOptions[CURLOPT_URL]            = $url;
+        $curlOptions[CURLOPT_RETURNTRANSFER] = true;
+        $curlOptions[CURLOPT_HEADER]         = true;
+        $curlOptions[CURLOPT_FRESH_CONNECT]  = true;
+        // Disable @file uploads in post data.
+        $curlOptions[CURLOPT_SAFE_UPLOAD] = true;
+
+        $curlOptions = $this->setCURLOptions($curlOptions, $this->config);
+        $curlOptions = $this->applyMethod($method, $curlOptions);
+        $curlOptions = $this->applyRequestHeaders($curlOptions);
+
+        // Do we need to delay this request?
+        if ($this->delay > 0) {
+            sleep($this->delay); // @phpstan-ignore-line
+        }
+
+        $output = $this->sendRequest($curlOptions);
+
+        // Set the string we want to break our response from
+        $breakString = "\r\n\r\n";
+
+        if (strpos($output, 'HTTP/1.1 100 Continue') === 0) {
+            $output = substr($output, strpos($output, $breakString) + 4);
+        }
+
+        // If request and response have Digest
+        if (isset($this->config['auth'][2]) && $this->config['auth'][2] === 'digest' && strpos($output, 'WWW-Authenticate: Digest') !== false) {
+            $output = substr($output, strpos($output, $breakString) + 4);
+        }
+
+        // Split out our headers and body
+        $break = strpos($output, $breakString);
+
+        if ($break !== false) {
+            // Our headers
+            $headers = explode("\n", substr($output, 0, $break));
+
+            $this->setResponseHeaders($headers);
+
+            // Our body
+            $body = substr($output, $break + 4);
+            $this->response->setBody($body);
+        } else {
+            $this->response->setBody($output);
+        }
+
+        return $this->response;
+    }
+
+    /**
+     * Takes all headers current part of this request and adds them
+     * to the cURL request.
+     */
+    protected function applyRequestHeaders(array $curlOptions = []): array
+    {
+        if (empty($this->headers)) {
+            $this->populateHeaders();
+            // Otherwise, it will corrupt the request
+            $this->removeHeader('Host');
+            $this->removeHeader('Accept-Encoding');
+        }
+
+        $headers = $this->headers();
+
+        if (empty($headers)) {
+            return $curlOptions;
+        }
+
+        $set = [];
+
+        foreach (array_keys($headers) as $name) {
+            $set[] = $name . ': ' . $this->getHeaderLine($name);
+        }
+
+        $curlOptions[CURLOPT_HTTPHEADER] = $set;
+
+        return $curlOptions;
+    }
+
+    /**
+     * Apply method
+     */
+    protected function applyMethod(string $method, array $curlOptions): array
+    {
+        $method = strtoupper($method);
+
+        $this->method                       = $method;
+        $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
+
+        $size = strlen($this->body);
+
+        // Have content?
+        if ($size > 0) {
+            return $this->applyBody($curlOptions);
+        }
+
+        if ($method === 'PUT' || $method === 'POST') {
+            // See http://tools.ietf.org/html/rfc7230#section-3.3.2
+            if ($this->header('content-length') === null && ! isset($this->config['multipart'])) {
+                $this->setHeader('Content-Length', '0');
+            }
+        } elseif ($method === 'HEAD') {
+            $curlOptions[CURLOPT_NOBODY] = 1;
+        }
+
+        return $curlOptions;
+    }
+
+    /**
+     * Apply body
+     */
+    protected function applyBody(array $curlOptions = []): array
+    {
+        if (! empty($this->body)) {
+            $curlOptions[CURLOPT_POSTFIELDS] = (string) $this->getBody();
+        }
+
+        return $curlOptions;
+    }
+
+    /**
+     * Parses the header retrieved from the cURL response into
+     * our Response object.
+     */
+    protected function setResponseHeaders(array $headers = [])
+    {
+        foreach ($headers as $header) {
+            if (($pos = strpos($header, ':')) !== false) {
+                $title = substr($header, 0, $pos);
+                $value = substr($header, $pos + 1);
+
+                $this->response->setHeader($title, $value);
+            } elseif (strpos($header, 'HTTP') === 0) {
+                preg_match('#^HTTP\/([12](?:\.[01])?) (\d+) (.+)#', $header, $matches);
+
+                if (isset($matches[1])) {
+                    $this->response->setProtocolVersion($matches[1]);
+                }
+
+                if (isset($matches[2])) {
+                    $this->response->setStatusCode($matches[2], $matches[3] ?? null);
+                }
+            }
+        }
+    }
+
+    /**
+     * Set CURL options
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return array
+     */
+    protected function setCURLOptions(array $curlOptions = [], array $config = [])
+    {
+        // Auth Headers
+        if (! empty($config['auth'])) {
+            $curlOptions[CURLOPT_USERPWD] = $config['auth'][0] . ':' . $config['auth'][1];
+
+            if (! empty($config['auth'][2]) && strtolower($config['auth'][2]) === 'digest') {
+                $curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
+            } else {
+                $curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+            }
+        }
+
+        // Certificate
+        if (! empty($config['cert'])) {
+            $cert = $config['cert'];
+
+            if (is_array($cert)) {
+                $curlOptions[CURLOPT_SSLCERTPASSWD] = $cert[1];
+                $cert                               = $cert[0];
+            }
+
+            if (! is_file($cert)) {
+                throw HTTPException::forSSLCertNotFound($cert);
+            }
+
+            $curlOptions[CURLOPT_SSLCERT] = $cert;
+        }
+
+        // SSL Verification
+        if (isset($config['verify'])) {
+            if (is_string($config['verify'])) {
+                $file = realpath($config['ssl_key']) ?: $config['ssl_key'];
+
+                if (! is_file($file)) {
+                    throw HTTPException::forInvalidSSLKey($config['ssl_key']);
+                }
+
+                $curlOptions[CURLOPT_CAINFO]         = $file;
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
+            } elseif (is_bool($config['verify'])) {
+                $curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+            }
+        }
+
+        // Debug
+        if ($config['debug']) {
+            $curlOptions[CURLOPT_VERBOSE] = 1;
+            $curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+b') : fopen('php://stderr', 'wb');
+        }
+
+        // Decode Content
+        if (! empty($config['decode_content'])) {
+            $accept = $this->getHeaderLine('Accept-Encoding');
+
+            if ($accept) {
+                $curlOptions[CURLOPT_ENCODING] = $accept;
+            } else {
+                $curlOptions[CURLOPT_ENCODING]   = '';
+                $curlOptions[CURLOPT_HTTPHEADER] = 'Accept-Encoding';
+            }
+        }
+
+        // Allow Redirects
+        if (array_key_exists('allow_redirects', $config)) {
+            $settings = $this->redirectDefaults;
+
+            if (is_array($config['allow_redirects'])) {
+                $settings = array_merge($settings, $config['allow_redirects']);
+            }
+
+            if ($config['allow_redirects'] === false) {
+                $curlOptions[CURLOPT_FOLLOWLOCATION] = 0;
+            } else {
+                $curlOptions[CURLOPT_FOLLOWLOCATION] = 1;
+                $curlOptions[CURLOPT_MAXREDIRS]      = $settings['max'];
+
+                if ($settings['strict'] === true) {
+                    $curlOptions[CURLOPT_POSTREDIR] = 1 | 2 | 4;
+                }
+
+                $protocols = 0;
+
+                foreach ($settings['protocols'] as $proto) {
+                    $protocols += constant('CURLPROTO_' . strtoupper($proto));
+                }
+
+                $curlOptions[CURLOPT_REDIR_PROTOCOLS] = $protocols;
+            }
+        }
+
+        // Timeout
+        $curlOptions[CURLOPT_TIMEOUT_MS] = (float) $config['timeout'] * 1000;
+
+        // Connection Timeout
+        $curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = (float) $config['connect_timeout'] * 1000;
+
+        // Post Data - application/x-www-form-urlencoded
+        if (! empty($config['form_params']) && is_array($config['form_params'])) {
+            $postFields                      = http_build_query($config['form_params']);
+            $curlOptions[CURLOPT_POSTFIELDS] = $postFields;
+
+            // Ensure content-length is set, since CURL doesn't seem to
+            // calculate it when HTTPHEADER is set.
+            $this->setHeader('Content-Length', (string) strlen($postFields));
+            $this->setHeader('Content-Type', 'application/x-www-form-urlencoded');
+        }
+
+        // Post Data - multipart/form-data
+        if (! empty($config['multipart']) && is_array($config['multipart'])) {
+            // setting the POSTFIELDS option automatically sets multipart
+            $curlOptions[CURLOPT_POSTFIELDS] = $config['multipart'];
+        }
+
+        // HTTP Errors
+        $curlOptions[CURLOPT_FAILONERROR] = array_key_exists('http_errors', $config) ? (bool) $config['http_errors'] : true;
+
+        // JSON
+        if (isset($config['json'])) {
+            // Will be set as the body in `applyBody()`
+            $json = json_encode($config['json']);
+            $this->setBody($json);
+            $this->setHeader('Content-Type', 'application/json');
+            $this->setHeader('Content-Length', (string) strlen($json));
+        }
+
+        // version
+        if (! empty($config['version'])) {
+            if ($config['version'] === 1.0) {
+                $curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+            } elseif ($config['version'] === 1.1) {
+                $curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+            }
+        }
+
+        // Cookie
+        if (isset($config['cookie'])) {
+            $curlOptions[CURLOPT_COOKIEJAR]  = $config['cookie'];
+            $curlOptions[CURLOPT_COOKIEFILE] = $config['cookie'];
+        }
+
+        // User Agent
+        if (isset($config['user_agent'])) {
+            $curlOptions[CURLOPT_USERAGENT] = $config['user_agent'];
+        }
+
+        return $curlOptions;
+    }
+
+    /**
+     * Does the actual work of initializing cURL, setting the options,
+     * and grabbing the output.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function sendRequest(array $curlOptions = []): string
+    {
+        $ch = curl_init();
+
+        curl_setopt_array($ch, $curlOptions);
+
+        // Send the request and wait for a response.
+        $output = curl_exec($ch);
+
+        if ($output === false) {
+            throw HTTPException::forCurlError((string) curl_errno($ch), curl_error($ch));
+        }
+
+        curl_close($ch);
+
+        return $output;
+    }
 }
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 89538c461774..3b18fc8bf1df 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -24,787 +24,710 @@
  */
 class ContentSecurityPolicy
 {
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $baseURI = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $childSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array
-	 */
-	protected $connectSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $defaultSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $fontSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $formAction = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $frameAncestors = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $frameSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $imageSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $mediaSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $objectSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $pluginTypes = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var string
-	 */
-	protected $reportURI;
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $sandbox = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $scriptSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $styleSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array|string
-	 */
-	protected $manifestSrc = [];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var boolean
-	 */
-	protected $upgradeInsecureRequests = false;
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var boolean
-	 */
-	protected $reportOnly = false;
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array
-	 */
-	protected $validSources = [
-		'self',
-		'none',
-		'unsafe-inline',
-		'unsafe-eval',
-	];
-
-	/**
-	 * Used for security enforcement
-	 *
-	 * @var array
-	 */
-	protected $nonces = [];
-
-	/**
-	 * An array of header info since we have
-	 * to build ourself before passing to Response.
-	 *
-	 * @var array
-	 */
-	protected $tempHeaders = [];
-
-	/**
-	 * An array of header info to build
-	 * that should only be reported.
-	 *
-	 * @var array
-	 */
-	protected $reportOnlyHeaders = [];
-
-	/**
-	 * Constructor.
-	 *
-	 * Stores our default values from the Config file.
-	 *
-	 * @param ContentSecurityPolicyConfig $config
-	 */
-	public function __construct(ContentSecurityPolicyConfig $config)
-	{
-		foreach (get_object_vars($config) as $setting => $value)
-		{
-			if (property_exists($this, $setting))
-			{
-				$this->{$setting} = $value;
-			}
-		}
-	}
-
-	/**
-	 * Compiles and sets the appropriate headers in the request.
-	 *
-	 * Should be called just prior to sending the response to the user agent.
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return void
-	 */
-	public function finalize(ResponseInterface &$response)
-	{
-		$this->generateNonces($response);
-		$this->buildHeaders($response);
-	}
-
-	/**
-	 * If TRUE, nothing will be restricted. Instead all violations will
-	 * be reported to the reportURI for monitoring. This is useful when
-	 * you are just starting to implement the policy, and will help
-	 * determine what errors need to be addressed before you turn on
-	 * all filtering.
-	 *
-	 * @param boolean $value
-	 *
-	 * @return $this
-	 */
-	public function reportOnly(bool $value = true)
-	{
-		$this->reportOnly = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new base_uri value. Can be either a URI class or a simple string.
-	 *
-	 * base_uri restricts the URLs that can appear in a page’s <base> element.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-base-uri
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addBaseURI($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'baseURI', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for a form's action. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * child-src lists the URLs for workers and embedded frame contents.
-	 * For example: child-src https://youtube.com would enable embedding
-	 * videos from YouTube but not from other origins.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-child-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addChildSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'childSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for a form's action. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * connect-src limits the origins to which you can connect
-	 * (via XHR, WebSockets, and EventSource).
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addConnectSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'connectSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for a form's action. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * default_src is the URI that is used for many of the settings when
-	 * no other source has been set.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-default-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function setDefaultSrc($uri, bool $explicitReporting = null)
-	{
-		$this->defaultSrc = [(string) $uri => $explicitReporting ?? $this->reportOnly];
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for a form's action. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * font-src specifies the origins that can serve web fonts.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-font-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addFontSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'fontSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for a form's action. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-form-action
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addFormAction($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'formAction', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new resource that should allow embedding the resource using
-	 * <frame>, <iframe>, <object>, <embed>, or <applet>
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-frame-ancestors
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addFrameAncestor($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'frameAncestors', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for valid frame sources. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-frame-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addFrameSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'frameSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Adds a new valid endpoint for valid image sources. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-img-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addImageSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'imageSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for valid video and audio. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-media-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addMediaSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'mediaSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for manifest sources. Can be either
-	 * a URI class or simple string.
-	 *
-	 * @see https://www.w3.org/TR/CSP/#directive-manifest-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addManifestSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'manifestSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for Flash and other plugin sources. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-object-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addObjectSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'objectSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Limits the types of plugins that can be used. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-plugin-types
-	 *
-	 * @param string|array $mime              One or more plugin mime types, separate by spaces
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addPluginType($mime, bool $explicitReporting = null)
-	{
-		$this->addOption($mime, 'pluginTypes', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a URL where a browser will send reports when a content
-	 * security policy is violated. Can be either a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-report-uri
-	 *
-	 * @param string $uri
-	 *
-	 * @return $this
-	 */
-	public function setReportURI(string $uri)
-	{
-		$this->reportURI = $uri;
-
-		return $this;
-	}
-
-	/**
-	 * specifies an HTML sandbox policy that the user agent applies to
-	 * the protected resource.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-sandbox
-	 *
-	 * @param string|array $flags             An array of sandbox flags that can be added to the directive.
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addSandbox($flags, bool $explicitReporting = null)
-	{
-		$this->addOption($flags, 'sandbox', $explicitReporting ?? $this->reportOnly);
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for javascript file sources. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addScriptSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'scriptSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a new valid endpoint for CSS file sources. Can be either
-	 * a URI class or a simple string.
-	 *
-	 * @see http://www.w3.org/TR/CSP/#directive-connect-src
-	 *
-	 * @param string|array $uri
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return $this
-	 */
-	public function addStyleSrc($uri, bool $explicitReporting = null)
-	{
-		$this->addOption($uri, 'styleSrc', $explicitReporting ?? $this->reportOnly);
-
-		return $this;
-	}
-
-	/**
-	 * Sets whether the user agents should rewrite URL schemes, changing
-	 * HTTP to HTTPS.
-	 *
-	 * @param boolean $value
-	 *
-	 * @return $this
-	 */
-	public function upgradeInsecureRequests(bool $value = true)
-	{
-		$this->upgradeInsecureRequests = $value;
-
-		return $this;
-	}
-
-	//-------------------------------------------------------------------------
-	// Utility
-	//-------------------------------------------------------------------------
-
-	/**
-	 * DRY method to add an string or array to a class property.
-	 *
-	 * @param string|array $options
-	 * @param string       $target
-	 * @param boolean|null $explicitReporting
-	 *
-	 * @return void
-	 */
-	protected function addOption($options, string $target, bool $explicitReporting = null)
-	{
-		// Ensure we have an array to work with...
-		if (is_string($this->{$target}))
-		{
-			$this->{$target} = [$this->{$target}];
-		}
-
-		if (is_array($options))
-		{
-			foreach ($options as $opt)
-			{
-				$this->{$target}[$opt] = $explicitReporting ?? $this->reportOnly;
-			}
-		}
-		else
-		{
-			$this->{$target}[$options] = $explicitReporting ?? $this->reportOnly;
-		}
-	}
-
-	/**
-	 * Scans the body of the request message and replaces any nonce
-	 * placeholders with actual nonces, that we'll then add to our
-	 * headers.
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return void
-	 */
-	protected function generateNonces(ResponseInterface &$response)
-	{
-		$body = $response->getBody();
-
-		if (empty($body))
-		{
-			return;
-		}
-
-		if (! is_array($this->styleSrc))
-		{
-			$this->styleSrc = [$this->styleSrc];
-		}
-
-		if (! is_array($this->scriptSrc))
-		{
-			$this->scriptSrc = [$this->scriptSrc];
-		}
-
-		// Replace style placeholders with nonces
-		$body = preg_replace_callback('/{csp-style-nonce}/', function ($matches) {
-			$nonce = bin2hex(random_bytes(12));
-
-			$this->styleSrc[] = 'nonce-' . $nonce;
-
-			return "nonce=\"{$nonce}\"";
-		}, $body);
-
-		// Replace script placeholders with nonces
-		$body = preg_replace_callback('/{csp-script-nonce}/', function ($matches) {
-			$nonce = bin2hex(random_bytes(12));
-
-			$this->scriptSrc[] = 'nonce-' . $nonce;
-
-			return "nonce=\"{$nonce}\"";
-		}, $body);
-
-		$response->setBody($body);
-	}
-
-	/**
-	 * Based on the current state of the elements, will add the appropriate
-	 * Content-Security-Policy and Content-Security-Policy-Report-Only headers
-	 * with their values to the response object.
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return void
-	 */
-	protected function buildHeaders(ResponseInterface &$response)
-	{
-		/**
-		 * Ensure both headers are available and arrays...
-		 *
-		 * @var Response $response
-		 */
-		$response->setHeader('Content-Security-Policy', []);
-		$response->setHeader('Content-Security-Policy-Report-Only', []);
-
-		$directives = [
-			'base-uri'        => 'baseURI',
-			'child-src'       => 'childSrc',
-			'connect-src'     => 'connectSrc',
-			'default-src'     => 'defaultSrc',
-			'font-src'        => 'fontSrc',
-			'form-action'     => 'formAction',
-			'frame-ancestors' => 'frameAncestors',
-			'frame-src'       => 'frameSrc',
-			'img-src'         => 'imageSrc',
-			'media-src'       => 'mediaSrc',
-			'object-src'      => 'objectSrc',
-			'plugin-types'    => 'pluginTypes',
-			'script-src'      => 'scriptSrc',
-			'style-src'       => 'styleSrc',
-			'manifest-src'    => 'manifestSrc',
-			'sandbox'         => 'sandbox',
-			'report-uri'      => 'reportURI',
-		];
-
-		// inject default base & default URIs if needed
-		if (empty($this->baseURI))
-		{
-			$this->baseURI = 'self';
-		}
-
-		if (empty($this->defaultSrc))
-		{
-			$this->defaultSrc = 'self';
-		}
-
-		foreach ($directives as $name => $property)
-		{
-			if (! empty($this->{$property}))
-			{
-				$this->addToHeader($name, $this->{$property});
-			}
-		}
-
-		// Compile our own header strings here since if we just
-		// append it to the response, it will be joined with
-		// commas, not semi-colons as we need.
-		if (! empty($this->tempHeaders))
-		{
-			$header = '';
-
-			foreach ($this->tempHeaders as $name => $value)
-			{
-				$header .= " {$name} {$value};";
-			}
-
-			// add token only if needed
-			if ($this->upgradeInsecureRequests)
-			{
-				$header .= ' upgrade-insecure-requests;';
-			}
-
-			$response->appendHeader('Content-Security-Policy', $header);
-		}
-
-		if (! empty($this->reportOnlyHeaders))
-		{
-			$header = '';
-
-			foreach ($this->reportOnlyHeaders as $name => $value)
-			{
-				$header .= " {$name} {$value};";
-			}
-
-			$response->appendHeader('Content-Security-Policy-Report-Only', $header);
-		}
-
-		$this->tempHeaders       = [];
-		$this->reportOnlyHeaders = [];
-	}
-
-	/**
-	 * Adds a directive and it's options to the appropriate header. The $values
-	 * array might have options that are geared toward either the regular or the
-	 * reportOnly header, since it's viable to have both simultaneously.
-	 *
-	 * @param string            $name
-	 * @param array|string|null $values
-	 *
-	 * @return void
-	 */
-	protected function addToHeader(string $name, $values = null)
-	{
-		if (is_string($values))
-		{
-			$values = [$values => 0];
-		}
-
-		$sources       = [];
-		$reportSources = [];
-
-		foreach ($values as $value => $reportOnly)
-		{
-			if (is_numeric($value) && is_string($reportOnly) && ! empty($reportOnly))
-			{
-				$value      = $reportOnly;
-				$reportOnly = 0;
-			}
-
-			if ($reportOnly === true)
-			{
-				$reportSources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
-			}
-			elseif (strpos($value, 'nonce-') === 0)
-			{
-				$sources[] = "'{$value}'";
-			}
-			else
-				{
-					$sources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
-			}
-		}
-
-		if (! empty($sources))
-		{
-			$this->tempHeaders[$name] = implode(' ', $sources);
-		}
-
-		if (! empty($reportSources))
-		{
-			$this->reportOnlyHeaders[$name] = implode(' ', $reportSources);
-		}
-	}
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $baseURI = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $childSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array
+     */
+    protected $connectSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $defaultSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $fontSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $formAction = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $frameAncestors = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $frameSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $imageSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $mediaSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $objectSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $pluginTypes = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var string
+     */
+    protected $reportURI;
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $sandbox = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $scriptSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $styleSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array|string
+     */
+    protected $manifestSrc = [];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var bool
+     */
+    protected $upgradeInsecureRequests = false;
+
+    /**
+     * Used for security enforcement
+     *
+     * @var bool
+     */
+    protected $reportOnly = false;
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array
+     */
+    protected $validSources = [
+        'self',
+        'none',
+        'unsafe-inline',
+        'unsafe-eval',
+    ];
+
+    /**
+     * Used for security enforcement
+     *
+     * @var array
+     */
+    protected $nonces = [];
+
+    /**
+     * An array of header info since we have
+     * to build ourself before passing to Response.
+     *
+     * @var array
+     */
+    protected $tempHeaders = [];
+
+    /**
+     * An array of header info to build
+     * that should only be reported.
+     *
+     * @var array
+     */
+    protected $reportOnlyHeaders = [];
+
+    /**
+     * Constructor.
+     *
+     * Stores our default values from the Config file.
+     */
+    public function __construct(ContentSecurityPolicyConfig $config)
+    {
+        foreach (get_object_vars($config) as $setting => $value) {
+            if (property_exists($this, $setting)) {
+                $this->{$setting} = $value;
+            }
+        }
+    }
+
+    /**
+     * Compiles and sets the appropriate headers in the request.
+     *
+     * Should be called just prior to sending the response to the user agent.
+     */
+    public function finalize(ResponseInterface &$response)
+    {
+        $this->generateNonces($response);
+        $this->buildHeaders($response);
+    }
+
+    /**
+     * If TRUE, nothing will be restricted. Instead all violations will
+     * be reported to the reportURI for monitoring. This is useful when
+     * you are just starting to implement the policy, and will help
+     * determine what errors need to be addressed before you turn on
+     * all filtering.
+     *
+     * @return $this
+     */
+    public function reportOnly(bool $value = true)
+    {
+        $this->reportOnly = $value;
+
+        return $this;
+    }
+
+    /**
+     * Adds a new base_uri value. Can be either a URI class or a simple string.
+     *
+     * base_uri restricts the URLs that can appear in a page’s <base> element.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-base-uri
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addBaseURI($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'baseURI', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for a form's action. Can be either
+     * a URI class or a simple string.
+     *
+     * child-src lists the URLs for workers and embedded frame contents.
+     * For example: child-src https://youtube.com would enable embedding
+     * videos from YouTube but not from other origins.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-child-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addChildSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'childSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for a form's action. Can be either
+     * a URI class or a simple string.
+     *
+     * connect-src limits the origins to which you can connect
+     * (via XHR, WebSockets, and EventSource).
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-connect-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addConnectSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'connectSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for a form's action. Can be either
+     * a URI class or a simple string.
+     *
+     * default_src is the URI that is used for many of the settings when
+     * no other source has been set.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-default-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function setDefaultSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->defaultSrc = [(string) $uri => $explicitReporting ?? $this->reportOnly];
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for a form's action. Can be either
+     * a URI class or a simple string.
+     *
+     * font-src specifies the origins that can serve web fonts.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-font-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addFontSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'fontSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for a form's action. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-form-action
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addFormAction($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'formAction', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new resource that should allow embedding the resource using
+     * <frame>, <iframe>, <object>, <embed>, or <applet>
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-frame-ancestors
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addFrameAncestor($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'frameAncestors', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for valid frame sources. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-frame-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addFrameSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'frameSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for valid image sources. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-img-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addImageSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'imageSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for valid video and audio. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-media-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addMediaSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'mediaSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for manifest sources. Can be either
+     * a URI class or simple string.
+     *
+     * @see https://www.w3.org/TR/CSP/#directive-manifest-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addManifestSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'manifestSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for Flash and other plugin sources. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-object-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addObjectSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'objectSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Limits the types of plugins that can be used. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-plugin-types
+     *
+     * @param array|string $mime One or more plugin mime types, separate by spaces
+     *
+     * @return $this
+     */
+    public function addPluginType($mime, ?bool $explicitReporting = null)
+    {
+        $this->addOption($mime, 'pluginTypes', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a URL where a browser will send reports when a content
+     * security policy is violated. Can be either a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-report-uri
+     *
+     * @return $this
+     */
+    public function setReportURI(string $uri)
+    {
+        $this->reportURI = $uri;
+
+        return $this;
+    }
+
+    /**
+     * specifies an HTML sandbox policy that the user agent applies to
+     * the protected resource.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-sandbox
+     *
+     * @param array|string $flags An array of sandbox flags that can be added to the directive.
+     *
+     * @return $this
+     */
+    public function addSandbox($flags, ?bool $explicitReporting = null)
+    {
+        $this->addOption($flags, 'sandbox', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for javascript file sources. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-connect-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addScriptSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'scriptSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Adds a new valid endpoint for CSS file sources. Can be either
+     * a URI class or a simple string.
+     *
+     * @see http://www.w3.org/TR/CSP/#directive-connect-src
+     *
+     * @param array|string $uri
+     *
+     * @return $this
+     */
+    public function addStyleSrc($uri, ?bool $explicitReporting = null)
+    {
+        $this->addOption($uri, 'styleSrc', $explicitReporting ?? $this->reportOnly);
+
+        return $this;
+    }
+
+    /**
+     * Sets whether the user agents should rewrite URL schemes, changing
+     * HTTP to HTTPS.
+     *
+     * @return $this
+     */
+    public function upgradeInsecureRequests(bool $value = true)
+    {
+        $this->upgradeInsecureRequests = $value;
+
+        return $this;
+    }
+
+    /**
+     * DRY method to add an string or array to a class property.
+     *
+     * @param array|string $options
+     */
+    protected function addOption($options, string $target, ?bool $explicitReporting = null)
+    {
+        // Ensure we have an array to work with...
+        if (is_string($this->{$target})) {
+            $this->{$target} = [$this->{$target}];
+        }
+
+        if (is_array($options)) {
+            foreach ($options as $opt) {
+                $this->{$target}[$opt] = $explicitReporting ?? $this->reportOnly;
+            }
+        } else {
+            $this->{$target}[$options] = $explicitReporting ?? $this->reportOnly;
+        }
+    }
+
+    /**
+     * Scans the body of the request message and replaces any nonce
+     * placeholders with actual nonces, that we'll then add to our
+     * headers.
+     */
+    protected function generateNonces(ResponseInterface &$response)
+    {
+        $body = $response->getBody();
+
+        if (empty($body)) {
+            return;
+        }
+
+        if (! is_array($this->styleSrc)) {
+            $this->styleSrc = [$this->styleSrc];
+        }
+
+        if (! is_array($this->scriptSrc)) {
+            $this->scriptSrc = [$this->scriptSrc];
+        }
+
+        // Replace style placeholders with nonces
+        $body = preg_replace_callback('/{csp-style-nonce}/', function () {
+            $nonce = bin2hex(random_bytes(12));
+
+            $this->styleSrc[] = 'nonce-' . $nonce;
+
+            return "nonce=\"{$nonce}\"";
+        }, $body);
+
+        // Replace script placeholders with nonces
+        $body = preg_replace_callback('/{csp-script-nonce}/', function () {
+            $nonce = bin2hex(random_bytes(12));
+
+            $this->scriptSrc[] = 'nonce-' . $nonce;
+
+            return "nonce=\"{$nonce}\"";
+        }, $body);
+
+        $response->setBody($body);
+    }
+
+    /**
+     * Based on the current state of the elements, will add the appropriate
+     * Content-Security-Policy and Content-Security-Policy-Report-Only headers
+     * with their values to the response object.
+     */
+    protected function buildHeaders(ResponseInterface &$response)
+    {
+        /**
+         * Ensure both headers are available and arrays...
+         *
+         * @var Response $response
+         */
+        $response->setHeader('Content-Security-Policy', []);
+        $response->setHeader('Content-Security-Policy-Report-Only', []);
+
+        $directives = [
+            'base-uri'        => 'baseURI',
+            'child-src'       => 'childSrc',
+            'connect-src'     => 'connectSrc',
+            'default-src'     => 'defaultSrc',
+            'font-src'        => 'fontSrc',
+            'form-action'     => 'formAction',
+            'frame-ancestors' => 'frameAncestors',
+            'frame-src'       => 'frameSrc',
+            'img-src'         => 'imageSrc',
+            'media-src'       => 'mediaSrc',
+            'object-src'      => 'objectSrc',
+            'plugin-types'    => 'pluginTypes',
+            'script-src'      => 'scriptSrc',
+            'style-src'       => 'styleSrc',
+            'manifest-src'    => 'manifestSrc',
+            'sandbox'         => 'sandbox',
+            'report-uri'      => 'reportURI',
+        ];
+
+        // inject default base & default URIs if needed
+        if (empty($this->baseURI)) {
+            $this->baseURI = 'self';
+        }
+
+        if (empty($this->defaultSrc)) {
+            $this->defaultSrc = 'self';
+        }
+
+        foreach ($directives as $name => $property) {
+            if (! empty($this->{$property})) {
+                $this->addToHeader($name, $this->{$property});
+            }
+        }
+
+        // Compile our own header strings here since if we just
+        // append it to the response, it will be joined with
+        // commas, not semi-colons as we need.
+        if (! empty($this->tempHeaders)) {
+            $header = '';
+
+            foreach ($this->tempHeaders as $name => $value) {
+                $header .= " {$name} {$value};";
+            }
+
+            // add token only if needed
+            if ($this->upgradeInsecureRequests) {
+                $header .= ' upgrade-insecure-requests;';
+            }
+
+            $response->appendHeader('Content-Security-Policy', $header);
+        }
+
+        if (! empty($this->reportOnlyHeaders)) {
+            $header = '';
+
+            foreach ($this->reportOnlyHeaders as $name => $value) {
+                $header .= " {$name} {$value};";
+            }
+
+            $response->appendHeader('Content-Security-Policy-Report-Only', $header);
+        }
+
+        $this->tempHeaders       = [];
+        $this->reportOnlyHeaders = [];
+    }
+
+    /**
+     * Adds a directive and it's options to the appropriate header. The $values
+     * array might have options that are geared toward either the regular or the
+     * reportOnly header, since it's viable to have both simultaneously.
+     *
+     * @param array|string|null $values
+     */
+    protected function addToHeader(string $name, $values = null)
+    {
+        if (is_string($values)) {
+            $values = [$values => 0];
+        }
+
+        $sources       = [];
+        $reportSources = [];
+
+        foreach ($values as $value => $reportOnly) {
+            if (is_numeric($value) && is_string($reportOnly) && ! empty($reportOnly)) {
+                $value      = $reportOnly;
+                $reportOnly = 0;
+            }
+
+            if ($reportOnly === true) {
+                $reportSources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
+            } elseif (strpos($value, 'nonce-') === 0) {
+                $sources[] = "'{$value}'";
+            } else {
+                $sources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
+            }
+        }
+
+        if (! empty($sources)) {
+            $this->tempHeaders[$name] = implode(' ', $sources);
+        }
+
+        if (! empty($reportSources)) {
+            $this->reportOnlyHeaders[$name] = implode(' ', $reportSources);
+        }
+    }
 }
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index 97f0bb979f86..ed343dbe4b08 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -20,361 +20,316 @@
  */
 class DownloadResponse extends Response
 {
-	/**
-	 * Download file name
-	 *
-	 * @var string
-	 */
-	private $filename;
-
-	/**
-	 * Download for file
-	 *
-	 * @var File|null
-	 */
-	private $file;
-
-	/**
-	 * mime set flag
-	 *
-	 * @var boolean
-	 */
-	private $setMime;
-
-	/**
-	 * Download for binary
-	 *
-	 * @var string|null
-	 */
-	private $binary;
-
-	/**
-	 * Download charset
-	 *
-	 * @var string
-	 */
-	private $charset = 'UTF-8';
-
-	/**
-	 * Download reason
-	 *
-	 * @var string
-	 */
-	protected $reason = 'OK';
-
-	/**
-	 * The current status code for this response.
-	 *
-	 * @var integer
-	 */
-	protected $statusCode = 200;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param string  $filename
-	 * @param boolean $setMime
-	 */
-	public function __construct(string $filename, bool $setMime)
-	{
-		parent::__construct(config('App'));
-
-		$this->filename = $filename;
-		$this->setMime  = $setMime;
-
-		// Make sure the content type is either specified or detected
-		$this->removeHeader('Content-Type');
-	}
-
-	/**
-	 * set download for binary string.
-	 *
-	 * @param string $binary
-	 */
-	public function setBinary(string $binary)
-	{
-		if ($this->file !== null)
-		{
-			throw DownloadException::forCannotSetBinary();
-		}
-
-		$this->binary = $binary;
-	}
-
-	/**
-	 * set download for file.
-	 *
-	 * @param string $filepath
-	 */
-	public function setFilePath(string $filepath)
-	{
-		if ($this->binary !== null)
-		{
-			throw DownloadException::forCannotSetFilePath($filepath);
-		}
-
-		$this->file = new File($filepath, true);
-	}
-
-	/**
-	 * set name for the download.
-	 *
-	 * @param string $filename
-	 *
-	 * @return $this
-	 */
-	public function setFileName(string $filename)
-	{
-		$this->filename = $filename;
-		return $this;
-	}
-
-	/**
-	 * get content length.
-	 *
-	 * @return integer
-	 */
-	public function getContentLength() : int
-	{
-		if (is_string($this->binary))
-		{
-			return strlen($this->binary);
-		}
-
-		if ($this->file instanceof File)
-		{
-			return $this->file->getSize();
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Set content type by guessing mime type from file extension
-	 */
-	private function setContentTypeByMimeType()
-	{
-		$mime    = null;
-		$charset = '';
-
-		if ($this->setMime === true && ($lastDotPosition = strrpos($this->filename, '.')) !== false)
-		{
-			$mime    = Mimes::guessTypeFromExtension(substr($this->filename, $lastDotPosition + 1));
-			$charset = $this->charset;
-		}
-
-		if (! is_string($mime))
-		{
-			// Set the default MIME type to send
-			$mime    = 'application/octet-stream';
-			$charset = '';
-		}
-
-		$this->setContentType($mime, $charset);
-	}
-
-	/**
-	 * get download filename.
-	 *
-	 * @return string
-	 */
-	private function getDownloadFileName(): string
-	{
-		$filename  = $this->filename;
-		$x         = explode('.', $this->filename);
-		$extension = end($x);
-
-		/* It was reported that browsers on Android 2.1 (and possibly older as well)
-		 * need to have the filename extension upper-cased in order to be able to
-		 * download it.
-		 *
-		 * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
-		 */
-		// @todo: depend super global
-		if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])
-				&& preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT']))
-		{
-			$x[count($x) - 1] = strtoupper($extension);
-			$filename         = implode('.', $x);
-		}
-
-		return $filename;
-	}
-
-	/**
-	 * get Content-Disposition Header string.
-	 *
-	 * @return string
-	 */
-	private function getContentDisposition() : string
-	{
-		$downloadFilename = $this->getDownloadFileName();
-
-		$utf8Filename = $downloadFilename;
-
-		if (strtoupper($this->charset) !== 'UTF-8')
-		{
-			$utf8Filename = mb_convert_encoding($downloadFilename, 'UTF-8', $this->charset);
-		}
-
-		$result = sprintf('attachment; filename="%s"', $downloadFilename);
-
-		if ($utf8Filename)
-		{
-			$result .= '; filename*=UTF-8\'\'' . rawurlencode($utf8Filename);
-		}
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Disallows status changing.
-	 *
-	 * @param integer $code
-	 * @param string  $reason
-	 *
-	 * @throws DownloadException
-	 */
-	public function setStatusCode(int $code, string $reason = '')
-	{
-		throw DownloadException::forCannotSetStatusCode($code, $reason);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the Content Type header for this response with the mime type
-	 * and, optionally, the charset.
-	 *
-	 * @param string $mime
-	 * @param string $charset
-	 *
-	 * @return ResponseInterface
-	 */
-	public function setContentType(string $mime, string $charset = 'UTF-8')
-	{
-		parent::setContentType($mime, $charset);
-
-		if ($charset !== '')
-		{
-			$this->charset = $charset;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sets the appropriate headers to ensure this response
-	 * is not cached by the browsers.
-	 */
-	public function noCache(): self
-	{
-		$this->removeHeader('Cache-control');
-
-		$this->setHeader('Cache-control', ['private', 'no-transform', 'no-store', 'must-revalidate']);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Disables cache configuration.
-	 *
-	 * @param array $options
-	 *
-	 * @throws DownloadException
-	 */
-	public function setCache(array $options = [])
-	{
-		throw DownloadException::forCannotSetCache();
-	}
-
-	//--------------------------------------------------------------------
-	// Output Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send()
-	 */
-	public function send()
-	{
-		$this->buildHeaders();
-		$this->sendHeaders();
-		$this->sendBody();
-
-		return $this;
-	}
-
-	/**
-	 * set header for file download.
-	 */
-	public function buildHeaders()
-	{
-		if (! $this->hasHeader('Content-Type'))
-		{
-			$this->setContentTypeByMimeType();
-		}
-
-		$this->setHeader('Content-Disposition', $this->getContentDisposition());
-		$this->setHeader('Expires-Disposition', '0');
-		$this->setHeader('Content-Transfer-Encoding', 'binary');
-		$this->setHeader('Content-Length', (string) $this->getContentLength());
-		$this->noCache();
-	}
-
-	/**
-	 * output download file text.
-	 *
-	 * @throws DownloadException
-	 *
-	 * @return DownloadResponse
-	 */
-	public function sendBody()
-	{
-		if ($this->binary !== null)
-		{
-			return $this->sendBodyByBinary();
-		}
-
-		if ($this->file !== null)
-		{
-			return $this->sendBodyByFilePath();
-		}
-
-		throw DownloadException::forNotFoundDownloadSource();
-	}
-
-	/**
-	 * output download text by file.
-	 *
-	 * @return DownloadResponse
-	 */
-	private function sendBodyByFilePath()
-	{
-		$splFileObject = $this->file->openFile('rb');
-
-		// Flush 1MB chunks of data
-		while (! $splFileObject->eof() && ($data = $splFileObject->fread(1048576)) !== false)
-		{
-			echo $data;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * output download text by binary
-	 *
-	 * @return DownloadResponse
-	 */
-	private function sendBodyByBinary()
-	{
-		echo $this->binary;
-
-		return $this;
-	}
+    /**
+     * Download file name
+     *
+     * @var string
+     */
+    private $filename;
+
+    /**
+     * Download for file
+     *
+     * @var File|null
+     */
+    private $file;
+
+    /**
+     * mime set flag
+     *
+     * @var bool
+     */
+    private $setMime;
+
+    /**
+     * Download for binary
+     *
+     * @var string|null
+     */
+    private $binary;
+
+    /**
+     * Download charset
+     *
+     * @var string
+     */
+    private $charset = 'UTF-8';
+
+    /**
+     * Download reason
+     *
+     * @var string
+     */
+    protected $reason = 'OK';
+
+    /**
+     * The current status code for this response.
+     *
+     * @var int
+     */
+    protected $statusCode = 200;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(string $filename, bool $setMime)
+    {
+        parent::__construct(config('App'));
+
+        $this->filename = $filename;
+        $this->setMime  = $setMime;
+
+        // Make sure the content type is either specified or detected
+        $this->removeHeader('Content-Type');
+    }
+
+    /**
+     * set download for binary string.
+     */
+    public function setBinary(string $binary)
+    {
+        if ($this->file !== null) {
+            throw DownloadException::forCannotSetBinary();
+        }
+
+        $this->binary = $binary;
+    }
+
+    /**
+     * set download for file.
+     */
+    public function setFilePath(string $filepath)
+    {
+        if ($this->binary !== null) {
+            throw DownloadException::forCannotSetFilePath($filepath);
+        }
+
+        $this->file = new File($filepath, true);
+    }
+
+    /**
+     * set name for the download.
+     *
+     * @return $this
+     */
+    public function setFileName(string $filename)
+    {
+        $this->filename = $filename;
+
+        return $this;
+    }
+
+    /**
+     * get content length.
+     */
+    public function getContentLength(): int
+    {
+        if (is_string($this->binary)) {
+            return strlen($this->binary);
+        }
+
+        if ($this->file instanceof File) {
+            return $this->file->getSize();
+        }
+
+        return 0;
+    }
+
+    /**
+     * Set content type by guessing mime type from file extension
+     */
+    private function setContentTypeByMimeType()
+    {
+        $mime    = null;
+        $charset = '';
+
+        if ($this->setMime === true && ($lastDotPosition = strrpos($this->filename, '.')) !== false) {
+            $mime    = Mimes::guessTypeFromExtension(substr($this->filename, $lastDotPosition + 1));
+            $charset = $this->charset;
+        }
+
+        if (! is_string($mime)) {
+            // Set the default MIME type to send
+            $mime    = 'application/octet-stream';
+            $charset = '';
+        }
+
+        $this->setContentType($mime, $charset);
+    }
+
+    /**
+     * get download filename.
+     */
+    private function getDownloadFileName(): string
+    {
+        $filename  = $this->filename;
+        $x         = explode('.', $this->filename);
+        $extension = end($x);
+
+        /* It was reported that browsers on Android 2.1 (and possibly older as well)
+         * need to have the filename extension upper-cased in order to be able to
+         * download it.
+         *
+         * Reference: http://digiblog.de/2011/04/19/android-and-the-download-file-headers/
+         */
+        // @todo: depend super global
+        if (count($x) !== 1 && isset($_SERVER['HTTP_USER_AGENT'])
+                && preg_match('/Android\s(1|2\.[01])/', $_SERVER['HTTP_USER_AGENT'])) {
+            $x[count($x) - 1] = strtoupper($extension);
+            $filename         = implode('.', $x);
+        }
+
+        return $filename;
+    }
+
+    /**
+     * get Content-Disposition Header string.
+     */
+    private function getContentDisposition(): string
+    {
+        $downloadFilename = $this->getDownloadFileName();
+
+        $utf8Filename = $downloadFilename;
+
+        if (strtoupper($this->charset) !== 'UTF-8') {
+            $utf8Filename = mb_convert_encoding($downloadFilename, 'UTF-8', $this->charset);
+        }
+
+        $result = sprintf('attachment; filename="%s"', $downloadFilename);
+
+        if ($utf8Filename) {
+            $result .= '; filename*=UTF-8\'\'' . rawurlencode($utf8Filename);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Disallows status changing.
+     *
+     * @throws DownloadException
+     */
+    public function setStatusCode(int $code, string $reason = '')
+    {
+        throw DownloadException::forCannotSetStatusCode($code, $reason);
+    }
+
+    /**
+     * Sets the Content Type header for this response with the mime type
+     * and, optionally, the charset.
+     *
+     * @return ResponseInterface
+     */
+    public function setContentType(string $mime, string $charset = 'UTF-8')
+    {
+        parent::setContentType($mime, $charset);
+
+        if ($charset !== '') {
+            $this->charset = $charset;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets the appropriate headers to ensure this response
+     * is not cached by the browsers.
+     */
+    public function noCache(): self
+    {
+        $this->removeHeader('Cache-control');
+
+        $this->setHeader('Cache-control', ['private', 'no-transform', 'no-store', 'must-revalidate']);
+
+        return $this;
+    }
+
+    /**
+     * Disables cache configuration.
+     *
+     * @throws DownloadException
+     */
+    public function setCache(array $options = [])
+    {
+        throw DownloadException::forCannotSetCache();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send()
+     */
+    public function send()
+    {
+        $this->buildHeaders();
+        $this->sendHeaders();
+        $this->sendBody();
+
+        return $this;
+    }
+
+    /**
+     * set header for file download.
+     */
+    public function buildHeaders()
+    {
+        if (! $this->hasHeader('Content-Type')) {
+            $this->setContentTypeByMimeType();
+        }
+
+        $this->setHeader('Content-Disposition', $this->getContentDisposition());
+        $this->setHeader('Expires-Disposition', '0');
+        $this->setHeader('Content-Transfer-Encoding', 'binary');
+        $this->setHeader('Content-Length', (string) $this->getContentLength());
+        $this->noCache();
+    }
+
+    /**
+     * output download file text.
+     *
+     * @throws DownloadException
+     *
+     * @return DownloadResponse
+     */
+    public function sendBody()
+    {
+        if ($this->binary !== null) {
+            return $this->sendBodyByBinary();
+        }
+
+        if ($this->file !== null) {
+            return $this->sendBodyByFilePath();
+        }
+
+        throw DownloadException::forNotFoundDownloadSource();
+    }
+
+    /**
+     * output download text by file.
+     *
+     * @return DownloadResponse
+     */
+    private function sendBodyByFilePath()
+    {
+        $splFileObject = $this->file->openFile('rb');
+
+        // Flush 1MB chunks of data
+        while (! $splFileObject->eof() && ($data = $splFileObject->fread(1048576)) !== false) {
+            echo $data;
+        }
+
+        return $this;
+    }
+
+    /**
+     * output download text by binary
+     *
+     * @return DownloadResponse
+     */
+    private function sendBodyByBinary()
+    {
+        echo $this->binary;
+
+        return $this;
+    }
 }
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index d2d12aba58b6..966c3c7fd7e5 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Exceptions;
@@ -18,232 +18,201 @@
  */
 class HTTPException extends FrameworkException
 {
-	/**
-	 * For CurlRequest
-	 *
-	 * @return HTTPException
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forMissingCurl()
-	{
-		return new static(lang('HTTP.missingCurl'));
-	}
-
-	/**
-	 * For CurlRequest
-	 *
-	 * @param string $cert
-	 *
-	 * @return HTTPException
-	 */
-	public static function forSSLCertNotFound(string $cert)
-	{
-		return new static(lang('HTTP.sslCertNotFound', [$cert]));
-	}
-
-	/**
-	 * For CurlRequest
-	 *
-	 * @param string $key
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidSSLKey(string $key)
-	{
-		return new static(lang('HTTP.invalidSSLKey', [$key]));
-	}
-
-	/**
-	 * For CurlRequest
-	 *
-	 * @param string $errorNum
-	 * @param string $error
-	 *
-	 * @return HTTPException
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forCurlError(string $errorNum, string $error)
-	{
-		return new static(lang('HTTP.curlError', [$errorNum, $error]));
-	}
-
-	/**
-	 * For IncomingRequest
-	 *
-	 * @param string $type
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidNegotiationType(string $type)
-	{
-		return new static(lang('HTTP.invalidNegotiationType', [$type]));
-	}
-
-	/**
-	 * For Message
-	 *
-	 * @param string $protocols
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidHTTPProtocol(string $protocols)
-	{
-		return new static(lang('HTTP.invalidHTTPProtocol', [$protocols]));
-	}
-
-	/**
-	 * For Negotiate
-	 *
-	 * @return HTTPException
-	 */
-	public static function forEmptySupportedNegotiations()
-	{
-		return new static(lang('HTTP.emptySupportedNegotiations'));
-	}
-
-	/**
-	 * For RedirectResponse
-	 *
-	 * @param string $route
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidRedirectRoute(string $route)
-	{
-		return new static(lang('HTTP.invalidRoute', [$route]));
-	}
-
-	/**
-	 * For Response
-	 *
-	 * @return HTTPException
-	 */
-	public static function forMissingResponseStatus()
-	{
-		return new static(lang('HTTP.missingResponseStatus'));
-	}
-
-	/**
-	 * For Response
-	 *
-	 * @param integer $code
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidStatusCode(int $code)
-	{
-		return new static(lang('HTTP.invalidStatusCode', [$code]));
-	}
-
-	/**
-	 * For Response
-	 *
-	 * @param integer $code
-	 *
-	 * @return HTTPException
-	 */
-	public static function forUnkownStatusCode(int $code)
-	{
-		return new static(lang('HTTP.unknownStatusCode', [$code]));
-	}
-
-	/**
-	 * For URI
-	 *
-	 * @param string $uri
-	 *
-	 * @return HTTPException
-	 */
-	public static function forUnableToParseURI(string $uri)
-	{
-		return new static(lang('HTTP.cannotParseURI', [$uri]));
-	}
-
-	/**
-	 * For URI
-	 *
-	 * @param integer $segment
-	 *
-	 * @return HTTPException
-	 */
-	public static function forURISegmentOutOfRange(int $segment)
-	{
-		return new static(lang('HTTP.segmentOutOfRange', [$segment]));
-	}
-
-	/**
-	 * For URI
-	 *
-	 * @param integer $port
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidPort(int $port)
-	{
-		return new static(lang('HTTP.invalidPort', [$port]));
-	}
-
-	/**
-	 * For URI
-	 *
-	 * @return HTTPException
-	 */
-	public static function forMalformedQueryString()
-	{
-		return new static(lang('HTTP.malformedQueryString'));
-	}
-
-	/**
-	 * For Uploaded file move
-	 *
-	 * @return HTTPException
-	 */
-	public static function forAlreadyMoved()
-	{
-		return new static(lang('HTTP.alreadyMoved'));
-	}
-
-	/**
-	 * For Uploaded file move
-	 *
-	 * @param string|null $path
-	 *
-	 * @return HTTPException
-	 */
-	public static function forInvalidFile(string $path = null)
-	{
-		return new static(lang('HTTP.invalidFile'));
-	}
-
-	/**
-	 * For Uploaded file move
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @param string $error
-	 *
-	 * @return HTTPException
-	 */
-	public static function forMoveFailed(string $source, string $target, string $error)
-	{
-		return new static(lang('HTTP.moveFailed', [$source, $target, $error]));
-	}
-
-	/**
-	 * For Invalid SameSite attribute setting
-	 *
-	 * @param string $samesite
-	 *
-	 * @return HTTPException
-	 *
-	 * @deprecated Use `CookieException::forInvalidSameSite()` instead.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forInvalidSameSiteSetting(string $samesite)
-	{
-		return new static(lang('Security.invalidSameSiteSetting', [$samesite]));
-	}
+    /**
+     * For CurlRequest
+     *
+     * @return HTTPException
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forMissingCurl()
+    {
+        return new static(lang('HTTP.missingCurl'));
+    }
+
+    /**
+     * For CurlRequest
+     *
+     * @return HTTPException
+     */
+    public static function forSSLCertNotFound(string $cert)
+    {
+        return new static(lang('HTTP.sslCertNotFound', [$cert]));
+    }
+
+    /**
+     * For CurlRequest
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidSSLKey(string $key)
+    {
+        return new static(lang('HTTP.invalidSSLKey', [$key]));
+    }
+
+    /**
+     * For CurlRequest
+     *
+     * @return HTTPException
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forCurlError(string $errorNum, string $error)
+    {
+        return new static(lang('HTTP.curlError', [$errorNum, $error]));
+    }
+
+    /**
+     * For IncomingRequest
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidNegotiationType(string $type)
+    {
+        return new static(lang('HTTP.invalidNegotiationType', [$type]));
+    }
+
+    /**
+     * For Message
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidHTTPProtocol(string $protocols)
+    {
+        return new static(lang('HTTP.invalidHTTPProtocol', [$protocols]));
+    }
+
+    /**
+     * For Negotiate
+     *
+     * @return HTTPException
+     */
+    public static function forEmptySupportedNegotiations()
+    {
+        return new static(lang('HTTP.emptySupportedNegotiations'));
+    }
+
+    /**
+     * For RedirectResponse
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidRedirectRoute(string $route)
+    {
+        return new static(lang('HTTP.invalidRoute', [$route]));
+    }
+
+    /**
+     * For Response
+     *
+     * @return HTTPException
+     */
+    public static function forMissingResponseStatus()
+    {
+        return new static(lang('HTTP.missingResponseStatus'));
+    }
+
+    /**
+     * For Response
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidStatusCode(int $code)
+    {
+        return new static(lang('HTTP.invalidStatusCode', [$code]));
+    }
+
+    /**
+     * For Response
+     *
+     * @return HTTPException
+     */
+    public static function forUnkownStatusCode(int $code)
+    {
+        return new static(lang('HTTP.unknownStatusCode', [$code]));
+    }
+
+    /**
+     * For URI
+     *
+     * @return HTTPException
+     */
+    public static function forUnableToParseURI(string $uri)
+    {
+        return new static(lang('HTTP.cannotParseURI', [$uri]));
+    }
+
+    /**
+     * For URI
+     *
+     * @return HTTPException
+     */
+    public static function forURISegmentOutOfRange(int $segment)
+    {
+        return new static(lang('HTTP.segmentOutOfRange', [$segment]));
+    }
+
+    /**
+     * For URI
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidPort(int $port)
+    {
+        return new static(lang('HTTP.invalidPort', [$port]));
+    }
+
+    /**
+     * For URI
+     *
+     * @return HTTPException
+     */
+    public static function forMalformedQueryString()
+    {
+        return new static(lang('HTTP.malformedQueryString'));
+    }
+
+    /**
+     * For Uploaded file move
+     *
+     * @return HTTPException
+     */
+    public static function forAlreadyMoved()
+    {
+        return new static(lang('HTTP.alreadyMoved'));
+    }
+
+    /**
+     * For Uploaded file move
+     *
+     * @return HTTPException
+     */
+    public static function forInvalidFile(?string $path = null)
+    {
+        return new static(lang('HTTP.invalidFile'));
+    }
+
+    /**
+     * For Uploaded file move
+     *
+     * @return HTTPException
+     */
+    public static function forMoveFailed(string $source, string $target, string $error)
+    {
+        return new static(lang('HTTP.moveFailed', [$source, $target, $error]));
+    }
+
+    /**
+     * For Invalid SameSite attribute setting
+     *
+     * @return HTTPException
+     *
+     * @deprecated Use `CookieException::forInvalidSameSite()` instead.
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forInvalidSameSiteSetting(string $samesite)
+    {
+        return new static(lang('Security.invalidSameSiteSetting', [$samesite]));
+    }
 }
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 717d32aa0539..10e58c2eb824 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
@@ -21,271 +21,231 @@
  */
 class FileCollection
 {
-	/**
-	 * An array of UploadedFile instances for any files
-	 * uploaded as part of this request.
-	 * Populated the first time either files(), file(), or hasFile()
-	 * is called.
-	 *
-	 * @var array|null
-	 */
-	protected $files;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of all uploaded files that were found.
-	 * Each element in the array will be an instance of UploadedFile.
-	 * The key of each element will be the client filename.
-	 *
-	 * @return array|null
-	 */
-	public function all()
-	{
-		$this->populateFiles();
-
-		return $this->files;
-	}
-
-	/**
-	 * Attempts to get a single file from the collection of uploaded files.
-	 *
-	 * @param string $name
-	 *
-	 * @return UploadedFile|null
-	 */
-	public function getFile(string $name)
-	{
-		$this->populateFiles();
-
-		if ($this->hasFile($name))
-		{
-			if (strpos($name, '.') !== false)
-			{
-				$name         = explode('.', $name);
-				$uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
-				return ($uploadedFile instanceof UploadedFile) ?
-					 $uploadedFile : null;
-			}
-
-			if (array_key_exists($name, $this->files))
-			{
-				$uploadedFile = $this->files[$name];
-				return  ($uploadedFile instanceof UploadedFile) ?
-					$uploadedFile : null;
-			}
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
-	 *
-	 * @param string $name
-	 *
-	 * @return array|null
-	 */
-	public function getFileMultiple(string $name)
-	{
-		$this->populateFiles();
-
-		if ($this->hasFile($name))
-		{
-			if (strpos($name, '.') !== false)
-			{
-				$name         = explode('.', $name);
-				$uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
-
-				return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
-					$uploadedFile : null;
-			}
-
-			if (array_key_exists($name, $this->files))
-			{
-				$uploadedFile = $this->files[$name];
-				return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
-					$uploadedFile : null;
-			}
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks whether an uploaded file with name $fileID exists in
-	 * this request.
-	 *
-	 * @param string $fileID The name of the uploaded file (from the input)
-	 *
-	 * @return boolean
-	 */
-	public function hasFile(string $fileID): bool
-	{
-		$this->populateFiles();
-
-		if (strpos($fileID, '.') !== false)
-		{
-			$segments = explode('.', $fileID);
-
-			$el = $this->files;
-
-			foreach ($segments as $segment)
-			{
-				if (! array_key_exists($segment, $el))
-				{
-					return false;
-				}
-
-				$el = $el[$segment];
-			}
-
-			return true;
-		}
-
-		return isset($this->files[$fileID]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Taking information from the $_FILES array, it creates an instance
-	 * of UploadedFile for each one, saving the results to this->files.
-	 *
-	 * Called by files(), file(), and hasFile()
-	 */
-	protected function populateFiles()
-	{
-		if (is_array($this->files))
-		{
-			return;
-		}
-
-		$this->files = [];
-
-		if (empty($_FILES))
-		{
-			return;
-		}
-
-		$files = $this->fixFilesArray($_FILES);
-
-		foreach ($files as $name => $file)
-		{
-			$this->files[$name] = $this->createFileObject($file);
-		}
-	}
-
-	/**
-	 * Given a file array, will create UploadedFile instances. Will
-	 * loop over an array and create objects for each.
-	 *
-	 * @param array $array
-	 *
-	 * @return array|UploadedFile
-	 */
-	protected function createFileObject(array $array)
-	{
-		if (! isset($array['name']))
-		{
-			$output = [];
-
-			foreach ($array as $key => $values)
-			{
-				if (! is_array($values))
-				{
-					continue;
-				}
-
-				$output[$key] = $this->createFileObject($values);
-			}
-
-			return $output;
-		}
-
-		return new UploadedFile(
-				$array['tmp_name'] ?? null, $array['name'] ?? null, $array['type'] ?? null, $array['size'] ?? null, $array['error'] ?? null
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reformats the odd $_FILES array into something much more like
-	 * we would expect, with each object having its own array.
-	 *
-	 * Thanks to Jack Sleight on the PHP Manual page for the basis
-	 * of this method.
-	 *
-	 * @see http://php.net/manual/en/reserved.variables.files.php#118294
-	 *
-	 * @param array $data
-	 *
-	 * @return array
-	 */
-	protected function fixFilesArray(array $data): array
-	{
-		$output = [];
-
-		foreach ($data as $name => $array)
-		{
-			foreach ($array as $field => $value)
-			{
-				$pointer = &$output[$name];
-
-				if (! is_array($value))
-				{
-					$pointer[$field] = $value;
-					continue;
-				}
-
-				$stack    = [&$pointer];
-				$iterator = new RecursiveIteratorIterator(
-						new RecursiveArrayIterator($value), RecursiveIteratorIterator::SELF_FIRST
-				);
-
-				foreach ($iterator as $key => $val)
-				{
-					array_splice($stack, $iterator->getDepth() + 1);
-					$pointer = &$stack[count($stack) - 1];
-					$pointer = &$pointer[$key];
-					$stack[] = &$pointer;
-					if (! $iterator->hasChildren())
-					{
-						$pointer[$field] = $val;
-					}
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Navigate through a array looking for a particular index
-	 *
-	 * @param array $index The index sequence we are navigating down
-	 * @param array $value The portion of the array to process
-	 *
-	 * @return mixed
-	 */
-	protected function getValueDotNotationSyntax(array $index, array $value)
-	{
-		if (! empty($index))
-		{
-			$currentIndex = array_shift($index);
-		}
-		if (isset($currentIndex) && is_array($index) && $index && is_array($value[$currentIndex]) && $value[$currentIndex])
-		{
-			return $this->getValueDotNotationSyntax($index, $value[$currentIndex]);
-		}
-
-		return (isset($currentIndex) && isset($value[$currentIndex])) ? $value[$currentIndex] : null;
-	}
+    /**
+     * An array of UploadedFile instances for any files
+     * uploaded as part of this request.
+     * Populated the first time either files(), file(), or hasFile()
+     * is called.
+     *
+     * @var array|null
+     */
+    protected $files;
+
+    /**
+     * Returns an array of all uploaded files that were found.
+     * Each element in the array will be an instance of UploadedFile.
+     * The key of each element will be the client filename.
+     *
+     * @return array|null
+     */
+    public function all()
+    {
+        $this->populateFiles();
+
+        return $this->files;
+    }
+
+    /**
+     * Attempts to get a single file from the collection of uploaded files.
+     *
+     * @return UploadedFile|null
+     */
+    public function getFile(string $name)
+    {
+        $this->populateFiles();
+
+        if ($this->hasFile($name)) {
+            if (strpos($name, '.') !== false) {
+                $name         = explode('.', $name);
+                $uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
+
+                return $uploadedFile instanceof UploadedFile ? $uploadedFile : null;
+            }
+
+            if (array_key_exists($name, $this->files)) {
+                $uploadedFile = $this->files[$name];
+
+                return $uploadedFile instanceof UploadedFile ? $uploadedFile : null;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
+     *
+     * @return array|null
+     */
+    public function getFileMultiple(string $name)
+    {
+        $this->populateFiles();
+
+        if ($this->hasFile($name)) {
+            if (strpos($name, '.') !== false) {
+                $name         = explode('.', $name);
+                $uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
+
+                return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
+                    $uploadedFile : null;
+            }
+
+            if (array_key_exists($name, $this->files)) {
+                $uploadedFile = $this->files[$name];
+
+                return (is_array($uploadedFile) && ($uploadedFile[array_key_first($uploadedFile)] instanceof UploadedFile)) ?
+                    $uploadedFile : null;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks whether an uploaded file with name $fileID exists in
+     * this request.
+     *
+     * @param string $fileID The name of the uploaded file (from the input)
+     */
+    public function hasFile(string $fileID): bool
+    {
+        $this->populateFiles();
+
+        if (strpos($fileID, '.') !== false) {
+            $segments = explode('.', $fileID);
+
+            $el = $this->files;
+
+            foreach ($segments as $segment) {
+                if (! array_key_exists($segment, $el)) {
+                    return false;
+                }
+
+                $el = $el[$segment];
+            }
+
+            return true;
+        }
+
+        return isset($this->files[$fileID]);
+    }
+
+    /**
+     * Taking information from the $_FILES array, it creates an instance
+     * of UploadedFile for each one, saving the results to this->files.
+     *
+     * Called by files(), file(), and hasFile()
+     */
+    protected function populateFiles()
+    {
+        if (is_array($this->files)) {
+            return;
+        }
+
+        $this->files = [];
+
+        if (empty($_FILES)) {
+            return;
+        }
+
+        $files = $this->fixFilesArray($_FILES);
+
+        foreach ($files as $name => $file) {
+            $this->files[$name] = $this->createFileObject($file);
+        }
+    }
+
+    /**
+     * Given a file array, will create UploadedFile instances. Will
+     * loop over an array and create objects for each.
+     *
+     * @return array|UploadedFile
+     */
+    protected function createFileObject(array $array)
+    {
+        if (! isset($array['name'])) {
+            $output = [];
+
+            foreach ($array as $key => $values) {
+                if (! is_array($values)) {
+                    continue;
+                }
+
+                $output[$key] = $this->createFileObject($values);
+            }
+
+            return $output;
+        }
+
+        return new UploadedFile(
+            $array['tmp_name'] ?? null,
+            $array['name'] ?? null,
+            $array['type'] ?? null,
+            $array['size'] ?? null,
+            $array['error'] ?? null
+        );
+    }
+
+    /**
+     * Reformats the odd $_FILES array into something much more like
+     * we would expect, with each object having its own array.
+     *
+     * Thanks to Jack Sleight on the PHP Manual page for the basis
+     * of this method.
+     *
+     * @see http://php.net/manual/en/reserved.variables.files.php#118294
+     */
+    protected function fixFilesArray(array $data): array
+    {
+        $output = [];
+
+        foreach ($data as $name => $array) {
+            foreach ($array as $field => $value) {
+                $pointer = &$output[$name];
+
+                if (! is_array($value)) {
+                    $pointer[$field] = $value;
+
+                    continue;
+                }
+
+                $stack    = [&$pointer];
+                $iterator = new RecursiveIteratorIterator(
+                    new RecursiveArrayIterator($value),
+                    RecursiveIteratorIterator::SELF_FIRST
+                );
+
+                foreach ($iterator as $key => $val) {
+                    array_splice($stack, $iterator->getDepth() + 1);
+                    $pointer = &$stack[count($stack) - 1];
+                    $pointer = &$pointer[$key];
+                    $stack[] = &$pointer;
+                    if (! $iterator->hasChildren()) {
+                        $pointer[$field] = $val;
+                    }
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Navigate through a array looking for a particular index
+     *
+     * @param array $index The index sequence we are navigating down
+     * @param array $value The portion of the array to process
+     *
+     * @return mixed
+     */
+    protected function getValueDotNotationSyntax(array $index, array $value)
+    {
+        $currentIndex = array_shift($index);
+
+        if (isset($currentIndex) && is_array($index) && $index && is_array($value[$currentIndex]) && $value[$currentIndex]) {
+            return $this->getValueDotNotationSyntax($index, $value[$currentIndex]);
+        }
+
+        return $value[$currentIndex] ?? null;
+    }
 }
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 38926f646abc..6455a5106d8d 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
@@ -27,359 +27,314 @@
  */
 class UploadedFile extends File implements UploadedFileInterface
 {
-	/**
-	 * The path to the temporary file.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * The original filename as provided by the client.
-	 *
-	 * @var string
-	 */
-	protected $originalName;
-
-	/**
-	 * The filename given to a file during a move.
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The type of file as provided by PHP
-	 *
-	 * @var string
-	 */
-	protected $originalMimeType;
-
-	/**
-	 * The error constant of the upload
-	 * (one of PHP's UPLOADERRXXX constants)
-	 *
-	 * @var integer
-	 */
-	protected $error;
-
-	/**
-	 * Whether the file has been moved already or not.
-	 *
-	 * @var boolean
-	 */
-	protected $hasMoved = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Accepts the file information as would be filled in from the $_FILES array.
-	 *
-	 * @param string  $path         The temporary location of the uploaded file.
-	 * @param string  $originalName The client-provided filename.
-	 * @param string  $mimeType     The type of file as provided by PHP
-	 * @param integer $size         The size of the file, in bytes
-	 * @param integer $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
-	 */
-	public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null)
-	{
-		$this->path             = $path;
-		$this->name             = $originalName;
-		$this->originalName     = $originalName;
-		$this->originalMimeType = $mimeType;
-		$this->size             = $size;
-		$this->error            = $error;
-
-		parent::__construct($path, false);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Move the uploaded file to a new location.
-	 *
-	 * $targetPath may be an absolute path, or a relative path. If it is a
-	 * relative path, resolution should be the same as used by PHP's rename()
-	 * function.
-	 *
-	 * The original file MUST be removed on completion.
-	 *
-	 * If this method is called more than once, any subsequent calls MUST raise
-	 * an exception.
-	 *
-	 * When used in an SAPI environment where $_FILES is populated, when writing
-	 * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
-	 * used to ensure permissions and upload status are verified correctly.
-	 *
-	 * If you wish to move to a stream, use getStream(), as SAPI operations
-	 * cannot guarantee writing to stream destinations.
-	 *
-	 * @see http://php.net/is_uploaded_file
-	 * @see http://php.net/move_uploaded_file
-	 *
-	 * @param string  $targetPath Path to which to move the uploaded file.
-	 * @param string  $name       the name to rename the file to.
-	 * @param boolean $overwrite  State for indicating whether to overwrite the previously generated file with the same
-	 *                            name or not.
-	 *
-	 * @return boolean
-	 *
-	 * @throws InvalidArgumentException if the $path specified is invalid.
-	 * @throws RuntimeException on any error during the move operation.
-	 * @throws RuntimeException on the second or subsequent call to the method.
-	 */
-	public function move(string $targetPath, string $name = null, bool $overwrite = false)
-	{
-		$targetPath = rtrim($targetPath, '/') . '/';
-		$targetPath = $this->setPath($targetPath); //set the target path
-
-		if ($this->hasMoved)
-		{
-			throw HTTPException::forAlreadyMoved();
-		}
-
-		if (! $this->isValid())
-		{
-			throw HTTPException::forInvalidFile();
-		}
-
-		$name        = is_null($name) ? $this->getName() : $name;
-		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
-
-		try
-		{
-			move_uploaded_file($this->path, $destination);
-		}
-		catch (Exception $e)
-		{
-			$error   = error_get_last();
-			$message = isset($error['message']) ? strip_tags($error['message']) : '';
-			throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
-		}
-
-		@chmod($targetPath, 0777 & ~umask());
-
-		// Success, so store our new information
-		$this->path     = $targetPath;
-		$this->name     = basename($destination);
-		$this->hasMoved = true;
-
-		return true;
-	}
-
-	/**
-	 * create file target path if
-	 * the set path does not exist
-	 *
-	 * @param string $path
-	 *
-	 * @return string The path set or created.
-	 */
-	protected function setPath(string $path): string
-	{
-		if (! is_dir($path))
-		{
-			mkdir($path, 0777, true);
-			//create the index.html file
-			if (! is_file($path . 'index.html'))
-			{
-				$file = fopen($path . 'index.html', 'x+');
-				fclose($file);
-			}
-		}
-		return $path;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether the file has been moved or not. If it has,
-	 * the move() method will not work and certain properties, like
-	 * the tempName, will no longer be available.
-	 *
-	 * @return boolean
-	 */
-	public function hasMoved(): bool
-	{
-		return $this->hasMoved;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the error associated with the uploaded file.
-	 *
-	 * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
-	 *
-	 * If the file was uploaded successfully, this method MUST return
-	 * UPLOAD_ERR_OK.
-	 *
-	 * Implementations SHOULD return the value stored in the "error" key of
-	 * the file in the $_FILES array.
-	 *
-	 * @see    http://php.net/manual/en/features.file-upload.errors.php
-	 * @return integer One of PHP's UPLOAD_ERR_XXX constants.
-	 */
-	public function getError(): int
-	{
-		return $this->error ?? UPLOAD_ERR_OK;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get error string
-	 *
-	 * @return string
-	 */
-	public function getErrorString(): string
-	{
-		$errors = [
-			UPLOAD_ERR_OK         => lang('HTTP.uploadErrOk'),
-			UPLOAD_ERR_INI_SIZE   => lang('HTTP.uploadErrIniSize'),
-			UPLOAD_ERR_FORM_SIZE  => lang('HTTP.uploadErrFormSize'),
-			UPLOAD_ERR_PARTIAL    => lang('HTTP.uploadErrPartial'),
-			UPLOAD_ERR_NO_FILE    => lang('HTTP.uploadErrNoFile'),
-			UPLOAD_ERR_CANT_WRITE => lang('HTTP.uploadErrCantWrite'),
-			UPLOAD_ERR_NO_TMP_DIR => lang('HTTP.uploadErrNoTmpDir'),
-			UPLOAD_ERR_EXTENSION  => lang('HTTP.uploadErrExtension'),
-		];
-
-		$error = $this->error ?? UPLOAD_ERR_OK;
-
-		return sprintf($errors[$error] ?? lang('HTTP.uploadErrUnknown'), $this->getName());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the mime type as provided by the client.
-	 * This is NOT a trusted value.
-	 * For a trusted version, use getMimeType() instead.
-	 *
-	 * @return string The media type sent by the client or null if none was provided.
-	 */
-	public function getClientMimeType(): string
-	{
-		return $this->originalMimeType;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the filename. This will typically be the filename sent
-	 * by the client, and should not be trusted. If the file has been
-	 * moved, this will return the final name of the moved file.
-	 *
-	 * @return string The filename sent by the client or null if none was provided.
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the file as provided by the client during upload.
-	 *
-	 * @return string
-	 */
-	public function getClientName(): string
-	{
-		return $this->originalName;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the temporary filename where the file was uploaded to.
-	 *
-	 * @return string
-	 */
-	public function getTempName(): string
-	{
-		return $this->path;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Overrides SPLFileInfo's to work with uploaded files, since
-	 * the temp file that's been uploaded doesn't have an extension.
-	 *
-	 * This method tries to guess the extension from the files mime
-	 * type but will return the clientExtension if it fails to do so.
-	 *
-	 * This method will always return a more or less helpfull extension
-	 * but might be insecure if the mime type is not machted. Consider
-	 * using guessExtension for a more safe version.
-	 */
-	public function getExtension(): string
-	{
-		return $this->guessExtension() ?: $this->getClientExtension();
-	}
-
-	/**
-	 * Attempts to determine the best file extension from the file's
-	 * mime type. In contrast to getExtension, this method will return
-	 * an empty string if it fails to determine an extension instead of
-	 * falling back to the unsecure clientExtension.
-	 *
-	 * @return string
-	 */
-	public function guessExtension(): string
-	{
-		return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the original file extension, based on the file name that
-	 * was uploaded. This is NOT a trusted source.
-	 * For a trusted version, use guessExtension() instead.
-	 *
-	 * @return string
-	 */
-	public function getClientExtension(): string
-	{
-		return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether the file was uploaded successfully, based on whether
-	 * it was uploaded via HTTP and has no errors.
-	 *
-	 * @return boolean
-	 */
-	public function isValid(): bool
-	{
-		return is_uploaded_file($this->path) && $this->error === UPLOAD_ERR_OK;
-	}
-
-	/**
-	 * Save the uploaded file to a new location.
-	 *
-	 * By default, upload files are saved in writable/uploads directory. The YYYYMMDD folder
-	 * and random file name will be created.
-	 *
-	 * @param  string $folderName the folder name to writable/uploads directory.
-	 * @param  string $fileName   the name to rename the file to.
-	 * @return string file full path
-	 */
-	public function store(string $folderName = null, string $fileName = null): string
-	{
-		$folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
-		$fileName   = $fileName ?? $this->getRandomName();
-
-		// Move the uploaded file to a new location.
-		$this->move(WRITEPATH . 'uploads/' . $folderName, $fileName);
-
-		return $folderName . $this->name;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The path to the temporary file.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * The original filename as provided by the client.
+     *
+     * @var string
+     */
+    protected $originalName;
+
+    /**
+     * The filename given to a file during a move.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The type of file as provided by PHP
+     *
+     * @var string
+     */
+    protected $originalMimeType;
+
+    /**
+     * The error constant of the upload
+     * (one of PHP's UPLOADERRXXX constants)
+     *
+     * @var int
+     */
+    protected $error;
+
+    /**
+     * Whether the file has been moved already or not.
+     *
+     * @var bool
+     */
+    protected $hasMoved = false;
+
+    /**
+     * Accepts the file information as would be filled in from the $_FILES array.
+     *
+     * @param string $path         The temporary location of the uploaded file.
+     * @param string $originalName The client-provided filename.
+     * @param string $mimeType     The type of file as provided by PHP
+     * @param int    $size         The size of the file, in bytes
+     * @param int    $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
+     */
+    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $size = null, ?int $error = null)
+    {
+        $this->path             = $path;
+        $this->name             = $originalName;
+        $this->originalName     = $originalName;
+        $this->originalMimeType = $mimeType;
+        $this->size             = $size;
+        $this->error            = $error;
+
+        parent::__construct($path, false);
+    }
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     *
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @param string $name       the name to rename the file to.
+     * @param bool   $overwrite  State for indicating whether to overwrite the previously generated file with the same
+     *                           name or not.
+     *
+     * @throws InvalidArgumentException if the $path specified is invalid.
+     * @throws RuntimeException         on any error during the move operation.
+     * @throws RuntimeException         on the second or subsequent call to the method.
+     *
+     * @return bool
+     */
+    public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
+    {
+        $targetPath = rtrim($targetPath, '/') . '/';
+        $targetPath = $this->setPath($targetPath); // set the target path
+
+        if ($this->hasMoved) {
+            throw HTTPException::forAlreadyMoved();
+        }
+
+        if (! $this->isValid()) {
+            throw HTTPException::forInvalidFile();
+        }
+
+        $name        = $name ?? $this->getName();
+        $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
+
+        try {
+            move_uploaded_file($this->path, $destination);
+        } catch (Exception $e) {
+            $error   = error_get_last();
+            $message = isset($error['message']) ? strip_tags($error['message']) : '';
+
+            throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
+        }
+
+        @chmod($targetPath, 0777 & ~umask());
+
+        // Success, so store our new information
+        $this->path     = $targetPath;
+        $this->name     = basename($destination);
+        $this->hasMoved = true;
+
+        return true;
+    }
+
+    /**
+     * create file target path if
+     * the set path does not exist
+     *
+     * @return string The path set or created.
+     */
+    protected function setPath(string $path): string
+    {
+        if (! is_dir($path)) {
+            mkdir($path, 0777, true);
+            // create the index.html file
+            if (! is_file($path . 'index.html')) {
+                $file = fopen($path . 'index.html', 'x+b');
+                fclose($file);
+            }
+        }
+
+        return $path;
+    }
+
+    /**
+     * Returns whether the file has been moved or not. If it has,
+     * the move() method will not work and certain properties, like
+     * the tempName, will no longer be available.
+     */
+    public function hasMoved(): bool
+    {
+        return $this->hasMoved;
+    }
+
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see    http://php.net/manual/en/features.file-upload.errors.php
+     *
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError(): int
+    {
+        return $this->error ?? UPLOAD_ERR_OK;
+    }
+
+    /**
+     * Get error string
+     */
+    public function getErrorString(): string
+    {
+        $errors = [
+            UPLOAD_ERR_OK         => lang('HTTP.uploadErrOk'),
+            UPLOAD_ERR_INI_SIZE   => lang('HTTP.uploadErrIniSize'),
+            UPLOAD_ERR_FORM_SIZE  => lang('HTTP.uploadErrFormSize'),
+            UPLOAD_ERR_PARTIAL    => lang('HTTP.uploadErrPartial'),
+            UPLOAD_ERR_NO_FILE    => lang('HTTP.uploadErrNoFile'),
+            UPLOAD_ERR_CANT_WRITE => lang('HTTP.uploadErrCantWrite'),
+            UPLOAD_ERR_NO_TMP_DIR => lang('HTTP.uploadErrNoTmpDir'),
+            UPLOAD_ERR_EXTENSION  => lang('HTTP.uploadErrExtension'),
+        ];
+
+        $error = $this->error ?? UPLOAD_ERR_OK;
+
+        return sprintf($errors[$error] ?? lang('HTTP.uploadErrUnknown'), $this->getName());
+    }
+
+    /**
+     * Returns the mime type as provided by the client.
+     * This is NOT a trusted value.
+     * For a trusted version, use getMimeType() instead.
+     *
+     * @return string The media type sent by the client or null if none was provided.
+     */
+    public function getClientMimeType(): string
+    {
+        return $this->originalMimeType;
+    }
+
+    /**
+     * Retrieve the filename. This will typically be the filename sent
+     * by the client, and should not be trusted. If the file has been
+     * moved, this will return the final name of the moved file.
+     *
+     * @return string The filename sent by the client or null if none was provided.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Returns the name of the file as provided by the client during upload.
+     */
+    public function getClientName(): string
+    {
+        return $this->originalName;
+    }
+
+    /**
+     * Gets the temporary filename where the file was uploaded to.
+     */
+    public function getTempName(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * Overrides SPLFileInfo's to work with uploaded files, since
+     * the temp file that's been uploaded doesn't have an extension.
+     *
+     * This method tries to guess the extension from the files mime
+     * type but will return the clientExtension if it fails to do so.
+     *
+     * This method will always return a more or less helpfull extension
+     * but might be insecure if the mime type is not machted. Consider
+     * using guessExtension for a more safe version.
+     */
+    public function getExtension(): string
+    {
+        return $this->guessExtension() ?: $this->getClientExtension();
+    }
+
+    /**
+     * Attempts to determine the best file extension from the file's
+     * mime type. In contrast to getExtension, this method will return
+     * an empty string if it fails to determine an extension instead of
+     * falling back to the unsecure clientExtension.
+     */
+    public function guessExtension(): string
+    {
+        return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? '';
+    }
+
+    /**
+     * Returns the original file extension, based on the file name that
+     * was uploaded. This is NOT a trusted source.
+     * For a trusted version, use guessExtension() instead.
+     */
+    public function getClientExtension(): string
+    {
+        return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
+    }
+
+    /**
+     * Returns whether the file was uploaded successfully, based on whether
+     * it was uploaded via HTTP and has no errors.
+     */
+    public function isValid(): bool
+    {
+        return is_uploaded_file($this->path) && $this->error === UPLOAD_ERR_OK;
+    }
+
+    /**
+     * Save the uploaded file to a new location.
+     *
+     * By default, upload files are saved in writable/uploads directory. The YYYYMMDD folder
+     * and random file name will be created.
+     *
+     * @param string $folderName the folder name to writable/uploads directory.
+     * @param string $fileName   the name to rename the file to.
+     *
+     * @return string file full path
+     */
+    public function store(?string $folderName = null, ?string $fileName = null): string
+    {
+        $folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
+        $fileName   = $fileName ?? $this->getRandomName();
+
+        // Move the uploaded file to a new location.
+        $this->move(WRITEPATH . 'uploads/' . $folderName, $fileName);
+
+        return $folderName . $this->name;
+    }
 }
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
index 8ad7eaa03138..37c18554a106 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
@@ -23,153 +23,118 @@
  */
 interface UploadedFileInterface
 {
-	/**
-	 * Accepts the file information as would be filled in from the $_FILES array.
-	 *
-	 * @param string  $path         The temporary location of the uploaded file.
-	 * @param string  $originalName The client-provided filename.
-	 * @param string  $mimeType     The type of file as provided by PHP
-	 * @param integer $size         The size of the file, in bytes
-	 * @param integer $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
-	 */
-	public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Move the uploaded file to a new location.
-	 *
-	 * $targetPath may be an absolute path, or a relative path. If it is a
-	 * relative path, resolution should be the same as used by PHP's rename()
-	 * function.
-	 *
-	 * The original file MUST be removed on completion.
-	 *
-	 * If this method is called more than once, any subsequent calls MUST raise
-	 * an exception.
-	 *
-	 * When used in an SAPI environment where $_FILES is populated, when writing
-	 * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
-	 * used to ensure permissions and upload status are verified correctly.
-	 *
-	 * If you wish to move to a stream, use getStream(), as SAPI operations
-	 * cannot guarantee writing to stream destinations.
-	 *
-	 * @see http://php.net/is_uploaded_file
-	 * @see http://php.net/move_uploaded_file
-	 *
-	 * @param string $targetPath Path to which to move the uploaded file.
-	 * @param string $name       the name to rename the file to.
-	 *
-	 * @throws InvalidArgumentException if the $path specified is invalid.
-	 * @throws RuntimeException on any error during the move operation.
-	 * @throws RuntimeException on the second or subsequent call to the method.
-	 */
-	public function move(string $targetPath, string $name = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether the file has been moved or not. If it has,
-	 * the move() method will not work and certain properties, like
-	 * the tempName, will no longer be available.
-	 *
-	 * @return boolean
-	 */
-	public function hasMoved(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the error associated with the uploaded file.
-	 *
-	 * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
-	 *
-	 * If the file was uploaded successfully, this method MUST return
-	 * UPLOAD_ERR_OK.
-	 *
-	 * Implementations SHOULD return the value stored in the "error" key of
-	 * the file in the $_FILES array.
-	 *
-	 * @see    http://php.net/manual/en/features.file-upload.errors.php
-	 * @return integer One of PHP's UPLOAD_ERR_XXX constants.
-	 */
-	public function getError(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the filename sent by the client.
-	 *
-	 * Do not trust the value returned by this method. A client could send
-	 * a malicious filename with the intention to corrupt or hack your
-	 * application.
-	 *
-	 * Implementations SHOULD return the value stored in the "name" key of
-	 * the file in the $_FILES array.
-	 *
-	 * @return string The filename sent by the client or null if none
-	 *     was provided.
-	 */
-	public function getName(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the temporary filename where the file was uploaded to.
-	 *
-	 * @return string
-	 */
-	public function getTempName(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the original file extension, based on the file name that
-	 * was uploaded. This is NOT a trusted source.
-	 * For a trusted version, use guessExtension() instead.
-	 *
-	 * @return string
-	 */
-	public function getClientExtension(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the mime type as provided by the client.
-	 * This is NOT a trusted value.
-	 * For a trusted version, use getMimeType() instead.
-	 *
-	 * @return string
-	 */
-	public function getClientMimeType(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether the file was uploaded successfully, based on whether
-	 * it was uploaded via HTTP and has no errors.
-	 *
-	 * @return boolean
-	 */
-	public function isValid(): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the destination path for the move operation where overwriting is not expected.
-	 *
-	 * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
-	 * last element is an integer as there may be cases that the delimiter may be present in the filename.
-	 * For the all other cases, it appends an integer starting from zero before the file's extension.
-	 *
-	 * @param string  $destination
-	 * @param string  $delimiter
-	 * @param integer $i
-	 *
-	 * @return string
-	 */
-	public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string;
-
-	//--------------------------------------------------------------------
+    /**
+     * Accepts the file information as would be filled in from the $_FILES array.
+     *
+     * @param string $path         The temporary location of the uploaded file.
+     * @param string $originalName The client-provided filename.
+     * @param string $mimeType     The type of file as provided by PHP
+     * @param int    $size         The size of the file, in bytes
+     * @param int    $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
+     */
+    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $size = null, ?int $error = null);
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     *
+     * @param string $targetPath Path to which to move the uploaded file.
+     * @param string $name       the name to rename the file to.
+     *
+     * @throws InvalidArgumentException if the $path specified is invalid.
+     * @throws RuntimeException         on any error during the move operation.
+     * @throws RuntimeException         on the second or subsequent call to the method.
+     */
+    public function move(string $targetPath, ?string $name = null);
+
+    /**
+     * Returns whether the file has been moved or not. If it has,
+     * the move() method will not work and certain properties, like
+     * the tempName, will no longer be available.
+     */
+    public function hasMoved(): bool;
+
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see    http://php.net/manual/en/features.file-upload.errors.php
+     *
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError(): int;
+
+    /**
+     * Retrieve the filename sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious filename with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "name" key of
+     * the file in the $_FILES array.
+     *
+     * @return string The filename sent by the client or null if none
+     *                was provided.
+     */
+    public function getName(): string;
+
+    /**
+     * Gets the temporary filename where the file was uploaded to.
+     */
+    public function getTempName(): string;
+
+    /**
+     * Returns the original file extension, based on the file name that
+     * was uploaded. This is NOT a trusted source.
+     * For a trusted version, use guessExtension() instead.
+     */
+    public function getClientExtension(): string;
+
+    /**
+     * Returns the mime type as provided by the client.
+     * This is NOT a trusted value.
+     * For a trusted version, use getMimeType() instead.
+     */
+    public function getClientMimeType(): string;
+
+    /**
+     * Returns whether the file was uploaded successfully, based on whether
+     * it was uploaded via HTTP and has no errors.
+     */
+    public function isValid(): bool;
+
+    /**
+     * Returns the destination path for the move operation where overwriting is not expected.
+     *
+     * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
+     * last element is an integer as there may be cases that the delimiter may be present in the filename.
+     * For the all other cases, it appends an integer starting from zero before the file's extension.
+     */
+    public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string;
 }
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 2f5ce014ef07..9cab888d4473 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -18,205 +18,165 @@
  */
 class Header
 {
-	/**
-	 * The name of the header.
-	 *
-	 * @var string
-	 */
-	protected $name;
-
-	/**
-	 * The value of the header. May have more than one
-	 * value. If so, will be an array of strings.
-	 *
-	 * @var string|array
-	 */
-	protected $value;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Header constructor. name is mandatory, if a value is provided, it will be set.
-	 *
-	 * @param string            $name
-	 * @param string|array|null $value
-	 */
-	public function __construct(string $name, $value = null)
-	{
-		$this->name = $name;
-		$this->setValue($value);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the header, in the same case it was set.
-	 *
-	 * @return string
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the raw value of the header. This may return either a string
-	 * of an array, depending on whether the header has multiple values or not.
-	 *
-	 * @return array|string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the name of the header, overwriting any previous value.
-	 *
-	 * @param string $name
-	 *
-	 * @return $this
-	 */
-	public function setName(string $name)
-	{
-		$this->name = $name;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the value of the header, overwriting any previous value(s).
-	 *
-	 * @param string|array|null $value
-	 *
-	 * @return $this
-	 */
-	public function setValue($value = null)
-	{
-		$this->value = $value ?? '';
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Appends a value to the list of values for this header. If the
-	 * header is a single value string, it will be converted to an array.
-	 *
-	 * @param string|array|null $value
-	 *
-	 * @return $this
-	 */
-	public function appendValue($value = null)
-	{
-		if ($value === null)
-		{
-			return $this;
-		}
-
-		if (! is_array($this->value))
-		{
-			$this->value = [$this->value];
-		}
-
-		if (! in_array($value, $this->value, true))
-		{
-			$this->value[] = $value;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prepends a value to the list of values for this header. If the
-	 * header is a single value string, it will be converted to an array.
-	 *
-	 * @param string|array|null $value
-	 *
-	 * @return $this
-	 */
-	public function prependValue($value = null)
-	{
-		if ($value === null)
-		{
-			return $this;
-		}
-
-		if (! is_array($this->value))
-		{
-			$this->value = [$this->value];
-		}
-
-		array_unshift($this->value, $value);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieves a comma-separated string of the values for a single header.
-	 *
-	 * NOTE: Not all header values may be appropriately represented using
-	 * comma concatenation. For such headers, use getHeader() instead
-	 * and supply your own delimiter when concatenating.
-	 *
-	 * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
-	 */
-	public function getValueLine(): string
-	{
-		if (is_string($this->value))
-		{
-			return $this->value;
-		}
-		if (! is_array($this->value))
-		{
-			return '';
-		}
-
-		$options = [];
-
-		foreach ($this->value as $key => $value)
-		{
-			if (is_string($key) && ! is_array($value))
-			{
-				$options[] = $key . '=' . $value;
-			}
-			elseif (is_array($value))
-			{
-				$key       = key($value);
-				$options[] = $key . '=' . $value[$key];
-			}
-			elseif (is_numeric($key))
-			{
-				$options[] = $value;
-			}
-		}
-
-		return implode(', ', $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a representation of the entire header string, including
-	 * the header name and all values converted to the proper format.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return $this->name . ': ' . $this->getValueLine();
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The name of the header.
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * The value of the header. May have more than one
+     * value. If so, will be an array of strings.
+     *
+     * @var array|string
+     */
+    protected $value;
+
+    /**
+     * Header constructor. name is mandatory, if a value is provided, it will be set.
+     *
+     * @param array|string|null $value
+     */
+    public function __construct(string $name, $value = null)
+    {
+        $this->name = $name;
+        $this->setValue($value);
+    }
+
+    /**
+     * Returns the name of the header, in the same case it was set.
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Gets the raw value of the header. This may return either a string
+     * of an array, depending on whether the header has multiple values or not.
+     *
+     * @return array|string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Sets the name of the header, overwriting any previous value.
+     *
+     * @return $this
+     */
+    public function setName(string $name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Sets the value of the header, overwriting any previous value(s).
+     *
+     * @param array|string|null $value
+     *
+     * @return $this
+     */
+    public function setValue($value = null)
+    {
+        $this->value = $value ?? '';
+
+        return $this;
+    }
+
+    /**
+     * Appends a value to the list of values for this header. If the
+     * header is a single value string, it will be converted to an array.
+     *
+     * @param array|string|null $value
+     *
+     * @return $this
+     */
+    public function appendValue($value = null)
+    {
+        if ($value === null) {
+            return $this;
+        }
+
+        if (! is_array($this->value)) {
+            $this->value = [$this->value];
+        }
+
+        if (! in_array($value, $this->value, true)) {
+            $this->value[] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Prepends a value to the list of values for this header. If the
+     * header is a single value string, it will be converted to an array.
+     *
+     * @param array|string|null $value
+     *
+     * @return $this
+     */
+    public function prependValue($value = null)
+    {
+        if ($value === null) {
+            return $this;
+        }
+
+        if (! is_array($this->value)) {
+            $this->value = [$this->value];
+        }
+
+        array_unshift($this->value, $value);
+
+        return $this;
+    }
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2
+     */
+    public function getValueLine(): string
+    {
+        if (is_string($this->value)) {
+            return $this->value;
+        }
+        if (! is_array($this->value)) {
+            return '';
+        }
+
+        $options = [];
+
+        foreach ($this->value as $key => $value) {
+            if (is_string($key) && ! is_array($value)) {
+                $options[] = $key . '=' . $value;
+            } elseif (is_array($value)) {
+                $key       = key($value);
+                $options[] = $key . '=' . $value[$key];
+            } elseif (is_numeric($key)) {
+                $options[] = $value;
+            }
+        }
+
+        return implode(', ', $options);
+    }
+
+    /**
+     * Returns a representation of the entire header string, including
+     * the header name and all values converted to the proper format.
+     */
+    public function __toString(): string
+    {
+        return $this->name . ': ' . $this->getValueLine();
+    }
 }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 9d3e72277ab5..4dec7ebc610f 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -44,817 +44,711 @@
  */
 class IncomingRequest extends Request
 {
-	/**
-	 * Enable CSRF flag
-	 *
-	 * Enables a CSRF cookie token to be set.
-	 * Set automatically based on Config setting.
-	 *
-	 * @var boolean
-	 */
-	protected $enableCSRF = false;
-
-	/**
-	 * The URI for this request.
-	 *
-	 * Note: This WILL NOT match the actual URL in the browser since for
-	 * everything this cares about (and the router, etc) is the portion
-	 * AFTER the script name. So, if hosted in a sub-folder this will
-	 * appear different than actual URL. If you need that use getPath().
-	 *
-	 * @var URI
-	 */
-	public $uri;
-
-	/**
-	 * The detected path (relative to SCRIPT_NAME).
-	 *
-	 * Note: current_url() uses this to build its URI,
-	 * so this becomes the source for the "current URL"
-	 * when working with the share request instance.
-	 *
-	 * @var string|null
-	 */
-	protected $path;
-
-	/**
-	 * File collection
-	 *
-	 * @var FileCollection|null
-	 */
-	protected $files;
-
-	/**
-	 * Negotiator
-	 *
-	 * @var Negotiate|null
-	 */
-	protected $negotiator;
-
-	/**
-	 * The default Locale this request
-	 * should operate under.
-	 *
-	 * @var string
-	 */
-	protected $defaultLocale;
-
-	/**
-	 * The current locale of the application.
-	 * Default value is set in Config\App.php
-	 *
-	 * @var string
-	 */
-	protected $locale;
-
-	/**
-	 * Stores the valid locale codes.
-	 *
-	 * @var array
-	 */
-	protected $validLocales = [];
-
-	/**
-	 * Configuration settings.
-	 *
-	 * @var App
-	 */
-	public $config;
-
-	/**
-	 * Holds the old data from a redirect.
-	 *
-	 * @var array
-	 */
-	protected $oldInput = [];
-
-	/**
-	 * The user agent this request is from.
-	 *
-	 * @var UserAgent
-	 */
-	protected $userAgent;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @param App         $config
-	 * @param URI         $uri
-	 * @param string|null $body
-	 * @param UserAgent   $userAgent
-	 */
-	public function __construct($config, URI $uri = null, $body = 'php://input', UserAgent $userAgent = null)
-	{
-		if (empty($uri) || empty($userAgent))
-		{
-			throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
-		}
-
-		// Get our body from php://input
-		if ($body === 'php://input')
-		{
-			$body = file_get_contents('php://input');
-		}
-
-		$this->config       = $config;
-		$this->uri          = $uri;
-		$this->body         = ! empty($body) ? $body : null;
-		$this->userAgent    = $userAgent;
-		$this->validLocales = $config->supportedLocales;
-
-		parent::__construct($config);
-
-		$this->populateHeaders();
-		$this->detectURI($config->uriProtocol, $config->baseURL);
-		$this->detectLocale($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles setting up the locale, perhaps auto-detecting through
-	 * content negotiation.
-	 *
-	 * @param App $config
-	 */
-	public function detectLocale($config)
-	{
-		$this->locale = $this->defaultLocale = $config->defaultLocale;
-
-		if (! $config->negotiateLocale)
-		{
-			return;
-		}
-
-		$this->setLocale($this->negotiate('language', $config->supportedLocales));
-	}
-
-	/**
-	 * Sets up our URI object based on the information we have. This is
-	 * either provided by the user in the baseURL Config setting, or
-	 * determined from the environment as needed.
-	 *
-	 * @param string $protocol
-	 * @param string $baseURL
-	 */
-	protected function detectURI(string $protocol, string $baseURL)
-	{
-		// Passing the config is unnecessary but left for legacy purposes
-		$config          = clone $this->config;
-		$config->baseURL = $baseURL;
-
-		$this->setPath($this->detectPath($protocol), $config);
-	}
-
-	/**
-	 * Detects the relative path based on
-	 * the URIProtocol Config setting.
-	 *
-	 * @param string $protocol
-	 *
-	 * @return string
-	 */
-	public function detectPath(string $protocol = ''): string
-	{
-		if (empty($protocol))
-		{
-			$protocol = 'REQUEST_URI';
-		}
-
-		switch ($protocol)
-		{
-			case 'REQUEST_URI':
-				$this->path = $this->parseRequestURI();
-				break;
-			case 'QUERY_STRING':
-				$this->path = $this->parseQueryString();
-				break;
-			case 'PATH_INFO':
-			default:
-				$this->path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
-				break;
-		}
-
-		return $this->path;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will parse the REQUEST_URI and automatically detect the URI from it,
-	 * fixing the query string if necessary.
-	 *
-	 * @return string The URI it found.
-	 */
-	protected function parseRequestURI(): string
-	{
-		if (! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']))
-		{
-			return '';
-		}
-
-		// parse_url() returns false if no host is present, but the path or query string
-		// contains a colon followed by a number. So we attach a dummy host since
-		// REQUEST_URI does not include the host. This allows us to parse out the query string and path.
-		$parts = parse_url('http://dummy' . $_SERVER['REQUEST_URI']);
-		$query = $parts['query'] ?? '';
-		$uri   = $parts['path'] ?? '';
-
-		// Strip the SCRIPT_NAME path from the URI
-		if ($uri !== '' && isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php')
-		{
-			// Compare each segment, dropping them until there is no match
-			$segments = $keep = explode('/', $uri);
-			foreach (explode('/', $_SERVER['SCRIPT_NAME']) as $i => $segment)
-			{
-				// If these segments are not the same then we're done
-				if (! isset($segments[$i]) || $segment !== $segments[$i])
-				{
-					break;
-				}
-
-				array_shift($keep);
-			}
-
-			$uri = implode('/', $keep);
-		}
-
-		// This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
-		// URI is found, and also fixes the QUERY_STRING getServer var and $_GET array.
-		if (trim($uri, '/') === '' && strncmp($query, '/', 1) === 0)
-		{
-			$query                   = explode('?', $query, 2);
-			$uri                     = $query[0];
-			$_SERVER['QUERY_STRING'] = $query[1] ?? '';
-		}
-		else
-		{
-			$_SERVER['QUERY_STRING'] = $query;
-		}
-
-		// Update our globals for values likely to been have changed
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
-		$this->populateGlobals('server');
-		$this->populateGlobals('get');
-
-		$uri = URI::removeDotSegments($uri);
-
-		return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
-	}
-
-	/**
-	 * Parse QUERY_STRING
-	 *
-	 * Will parse QUERY_STRING and automatically detect the URI from it.
-	 *
-	 * @return string
-	 */
-	protected function parseQueryString(): string
-	{
-		$uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
-
-		if (trim($uri, '/') === '')
-		{
-			return '';
-		}
-
-		if (strncmp($uri, '/', 1) === 0)
-		{
-			$uri                     = explode('?', $uri, 2);
-			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
-			$uri                     = $uri[0];
-		}
-
-		// Update our globals for values likely to been have changed
-		parse_str($_SERVER['QUERY_STRING'], $_GET);
-		$this->populateGlobals('server');
-		$this->populateGlobals('get');
-
-		$uri = URI::removeDotSegments($uri);
-
-		return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provides a convenient way to work with the Negotiate class
-	 * for content negotiation.
-	 *
-	 * @param string  $type
-	 * @param array   $supported
-	 * @param boolean $strictMatch
-	 *
-	 * @return string
-	 */
-	public function negotiate(string $type, array $supported, bool $strictMatch = false): string
-	{
-		if (is_null($this->negotiator))
-		{
-			$this->negotiator = Services::negotiator($this, true);
-		}
-
-		switch (strtolower($type))
-		{
-			case 'media':
-				return $this->negotiator->media($supported, $strictMatch);
-			case 'charset':
-				return $this->negotiator->charset($supported);
-			case 'encoding':
-				return $this->negotiator->encoding($supported);
-			case 'language':
-				return $this->negotiator->language($supported);
-		}
-
-		throw HTTPException::forInvalidNegotiationType($type);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if this request was made from the command line (CLI).
-	 *
-	 * @return boolean
-	 */
-	public function isCLI(): bool
-	{
-		return is_cli();
-	}
-
-	/**
-	 * Test to see if a request contains the HTTP_X_REQUESTED_WITH header.
-	 *
-	 * @return boolean
-	 */
-	public function isAJAX(): bool
-	{
-		return $this->hasHeader('X-Requested-With') && strtolower($this->header('X-Requested-With')->getValue()) === 'xmlhttprequest';
-	}
-
-	/**
-	 * Attempts to detect if the current connection is secure through
-	 * a few different methods.
-	 *
-	 * @return boolean
-	 */
-	public function isSecure(): bool
-	{
-		if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
-		{
-			return true;
-		}
-
-		if ($this->hasHeader('X-Forwarded-Proto') && $this->header('X-Forwarded-Proto')->getValue() === 'https')
-		{
-			return true;
-		}
-		return $this->hasHeader('Front-End-Https') && ! empty($this->header('Front-End-Https')->getValue()) && strtolower($this->header('Front-End-Https')->getValue()) !== 'off';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the relative path and updates the URI object.
-	 * Note: Since current_url() accesses the shared request
-	 * instance, this can be used to change the "current URL"
-	 * for testing.
-	 *
-	 * @param string $path   URI path relative to SCRIPT_NAME
-	 * @param App    $config Optional alternate config to use
-	 *
-	 * @return $this
-	 */
-	public function setPath(string $path, App $config = null)
-	{
-		$this->path = $path;
-		$this->uri->setPath($path);
-
-		$config = $config ?? $this->config;
-
-		// It's possible the user forgot a trailing slash on their
-		// baseURL, so let's help them out.
-		$baseURL = $config->baseURL === '' ? $config->baseURL : rtrim($config->baseURL, '/ ') . '/';
-
-		// Based on our baseURL provided by the developer
-		// set our current domain name, scheme
-		if ($baseURL !== '')
-		{
-			$this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
-			$this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
-			$this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));
-
-			// Ensure we have any query vars
-			$this->uri->setQuery($_SERVER['QUERY_STRING'] ?? '');
-
-			// Check if the baseURL scheme needs to be coerced into its secure version
-			if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http')
-			{
-				$this->uri->setScheme('https');
-			}
-		}
-		// @codeCoverageIgnoreStart
-		elseif (! is_cli())
-		{
-			die('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
-		}
-		// @codeCoverageIgnoreEnd
-
-		return $this;
-	}
-
-	/**
-	 * Returns the path relative to SCRIPT_NAME,
-	 * running detection as necessary.
-	 *
-	 * @return string
-	 */
-	public function getPath(): string
-	{
-		if (is_null($this->path))
-		{
-			$this->detectPath($this->config->uriProtocol);
-		}
-
-		return $this->path;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the locale string for this request.
-	 *
-	 * @param string $locale
-	 *
-	 * @return IncomingRequest
-	 */
-	public function setLocale(string $locale)
-	{
-		// If it's not a valid locale, set it
-		// to the default locale for the site.
-		if (! in_array($locale, $this->validLocales, true))
-		{
-			$locale = $this->defaultLocale;
-		}
-
-		$this->locale = $locale;
-		Locale::setDefault($locale);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the current locale, with a fallback to the default
-	 * locale if none is set.
-	 *
-	 * @return string
-	 */
-	public function getLocale(): string
-	{
-		return $this->locale ?? $this->defaultLocale;
-	}
-
-	/**
-	 * Returns the default locale as set in Config\App.php
-	 *
-	 * @return string
-	 */
-	public function getDefaultLocale(): string
-	{
-		return $this->defaultLocale;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from JSON input stream with fallback to $_REQUEST object. This is the simplest way
-	 * to grab data from the request object and can be used in lieu of the
-	 * other get* methods in most cases.
-	 *
-	 * @param string|array|null $index
-	 * @param integer|null      $filter Filter constant
-	 * @param mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function getVar($index = null, $filter = null, $flags = null)
-	{
-		if (strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false && ! is_null($this->body))
-		{
-			if (is_null($index))
-			{
-				return $this->getJSON();
-			}
-
-			if (is_array($index))
-			{
-				$output = [];
-				foreach ($index as $key)
-				{
-					$output[$key] = $this->getJsonVar($key, false, $filter, $flags);
-				}
-				return $output;
-			}
-
-			return $this->getJsonVar($index, false, $filter, $flags);
-		}
-		return $this->fetchGlobal('request', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A convenience method that grabs the raw input stream and decodes
-	 * the JSON into an array.
-	 *
-	 * If $assoc == true, then all objects in the response will be converted
-	 * to associative arrays.
-	 *
-	 * @param boolean $assoc   Whether to return objects as associative arrays
-	 * @param integer $depth   How many levels deep to decode
-	 * @param integer $options Bitmask of options
-	 *
-	 * @see http://php.net/manual/en/function.json-decode.php
-	 *
-	 * @return mixed
-	 */
-	public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
-	{
-		return json_decode($this->body, $assoc, $depth, $options);
-	}
-
-	/**
-	 * Get a specific variable from a JSON input stream
-	 *
-	 * @param  string             $index  The variable that you want which can use dot syntax for getting specific values.
-	 * @param  boolean            $assoc  If true, return the result as an associative array.
-	 * @param  integer|null       $filter Filter Constant
-	 * @param  array|integer|null $flags  Option
-	 * @return mixed
-	 */
-	public function getJsonVar(string $index, bool $assoc = false, ?int $filter = null, $flags = null)
-	{
-		helper('array');
-
-		$data = dot_array_search($index, $this->getJSON(true));
-
-		if (! is_array($data))
-		{
-			$filter = $filter ?? FILTER_DEFAULT;
-			$flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
-
-			return filter_var($data, $filter, $flags);
-		}
-
-		if (! $assoc)
-		{
-			return json_decode(json_encode($data));
-		}
-
-		return $data;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes
-	 * the String into an array.
-	 *
-	 * @return mixed
-	 */
-	public function getRawInput()
-	{
-		parse_str($this->body, $output);
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from GET data.
-	 *
-	 * @param string|array|null $index  Index for item to fetch from $_GET.
-	 * @param integer|null      $filter A filter name to apply.
-	 * @param mixed|null        $flags
-	 *
-	 * @return mixed
-	 */
-	public function getGet($index = null, $filter = null, $flags = null)
-	{
-		return $this->fetchGlobal('get', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from POST.
-	 *
-	 * @param string|array|null $index  Index for item to fetch from $_POST.
-	 * @param integer|null      $filter A filter name to apply
-	 * @param mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function getPost($index = null, $filter = null, $flags = null)
-	{
-		return $this->fetchGlobal('post', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from POST data with fallback to GET.
-	 *
-	 * @param string|array|null $index  Index for item to fetch from $_POST or $_GET
-	 * @param integer|null      $filter A filter name to apply
-	 * @param mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function getPostGet($index = null, $filter = null, $flags = null)
-	{
-		// Use $_POST directly here, since filter_has_var only
-		// checks the initial POST data, not anything that might
-		// have been added since.
-		return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from GET data with fallback to POST.
-	 *
-	 * @param string|array|null $index  Index for item to be fetched from $_GET or $_POST
-	 * @param integer|null      $filter A filter name to apply
-	 * @param mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function getGetPost($index = null, $filter = null, $flags = null)
-	{
-		// Use $_GET directly here, since filter_has_var only
-		// checks the initial GET data, not anything that might
-		// have been added since.
-		return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from the COOKIE array.
-	 *
-	 * @param string|array|null $index  Index for item to be fetched from $_COOKIE
-	 * @param integer|null      $filter A filter name to be applied
-	 * @param mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function getCookie($index = null, $filter = null, $flags = null)
-	{
-		return $this->fetchGlobal('cookie', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Fetch the user agent string
-	 *
-	 * @return UserAgent
-	 */
-	public function getUserAgent()
-	{
-		return $this->userAgent;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to get old Input data that has been flashed to the session
-	 * with redirect_with_input(). It first checks for the data in the old
-	 * POST data, then the old GET data and finally check for dot arrays
-	 *
-	 * @param string $key
-	 *
-	 * @return mixed
-	 */
-	public function getOldInput(string $key)
-	{
-		// If the session hasn't been started, or no
-		// data was previously saved, we're done.
-		if (empty($_SESSION['_ci_old_input']))
-		{
-			return null;
-		}
-
-		// Check for the value in the POST array first.
-		if (isset($_SESSION['_ci_old_input']['post'][$key]))
-		{
-			return $_SESSION['_ci_old_input']['post'][$key];
-		}
-
-		// Next check in the GET array.
-		if (isset($_SESSION['_ci_old_input']['get'][$key]))
-		{
-			return $_SESSION['_ci_old_input']['get'][$key];
-		}
-
-		helper('array');
-
-		// Check for an array value in POST.
-		if (isset($_SESSION['_ci_old_input']['post']))
-		{
-			$value = dot_array_search($key, $_SESSION['_ci_old_input']['post']);
-			if (! is_null($value))
-			{
-				return $value;
-			}
-		}
-
-		// Check for an array value in GET.
-		if (isset($_SESSION['_ci_old_input']['get']))
-		{
-			$value = dot_array_search($key, $_SESSION['_ci_old_input']['get']);
-			if (! is_null($value))
-			{
-				return $value;
-			}
-		}
-
-		// requested session key not found
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of all files that have been uploaded with this
-	 * request. Each file is represented by an UploadedFile instance.
-	 *
-	 * @return array
-	 */
-	public function getFiles(): array
-	{
-		if (is_null($this->files))
-		{
-			$this->files = new FileCollection();
-		}
-
-		return $this->files->all(); // return all files
-	}
-
-	/**
-	 * Verify if a file exist, by the name of the input field used to upload it, in the collection
-	 * of uploaded files and if is have been uploaded with multiple option.
-	 *
-	 * @param string $fileID
-	 *
-	 * @return array|null
-	 */
-	public function getFileMultiple(string $fileID)
-	{
-		if (is_null($this->files))
-		{
-			$this->files = new FileCollection();
-		}
-
-		return $this->files->getFileMultiple($fileID);
-	}
-
-	/**
-	 * Retrieves a single file by the name of the input field used
-	 * to upload it.
-	 *
-	 * @param string $fileID
-	 *
-	 * @return UploadedFile|null
-	 */
-	public function getFile(string $fileID)
-	{
-		if (is_null($this->files))
-		{
-			$this->files = new FileCollection();
-		}
-
-		return $this->files->getFile($fileID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Remove relative directory (../) and multi slashes (///)
-	 *
-	 * Do some final cleaning of the URI and return it, currently only used in static::_parse_request_uri()
-	 *
-	 * @param string $uri
-	 *
-	 * @return string
-	 *
-	 * @deprecated Use URI::removeDotSegments() directly
-	 */
-	protected function removeRelativeDirectory(string $uri): string
-	{
-		$uri = URI::removeDotSegments($uri);
-
-		return $uri === '/' ? $uri : ltrim($uri, '/');
-	}
+    /**
+     * Enable CSRF flag
+     *
+     * Enables a CSRF cookie token to be set.
+     * Set automatically based on Config setting.
+     *
+     * @var bool
+     */
+    protected $enableCSRF = false;
+
+    /**
+     * The URI for this request.
+     *
+     * Note: This WILL NOT match the actual URL in the browser since for
+     * everything this cares about (and the router, etc) is the portion
+     * AFTER the script name. So, if hosted in a sub-folder this will
+     * appear different than actual URL. If you need that use getPath().
+     *
+     * @var URI
+     */
+    public $uri;
+
+    /**
+     * The detected path (relative to SCRIPT_NAME).
+     *
+     * Note: current_url() uses this to build its URI,
+     * so this becomes the source for the "current URL"
+     * when working with the share request instance.
+     *
+     * @var string|null
+     */
+    protected $path;
+
+    /**
+     * File collection
+     *
+     * @var FileCollection|null
+     */
+    protected $files;
+
+    /**
+     * Negotiator
+     *
+     * @var Negotiate|null
+     */
+    protected $negotiator;
+
+    /**
+     * The default Locale this request
+     * should operate under.
+     *
+     * @var string
+     */
+    protected $defaultLocale;
+
+    /**
+     * The current locale of the application.
+     * Default value is set in Config\App.php
+     *
+     * @var string
+     */
+    protected $locale;
+
+    /**
+     * Stores the valid locale codes.
+     *
+     * @var array
+     */
+    protected $validLocales = [];
+
+    /**
+     * Configuration settings.
+     *
+     * @var App
+     */
+    public $config;
+
+    /**
+     * Holds the old data from a redirect.
+     *
+     * @var array
+     */
+    protected $oldInput = [];
+
+    /**
+     * The user agent this request is from.
+     *
+     * @var UserAgent
+     */
+    protected $userAgent;
+
+    /**
+     * Constructor
+     *
+     * @param App         $config
+     * @param URI         $uri
+     * @param string|null $body
+     * @param UserAgent   $userAgent
+     */
+    public function __construct($config, ?URI $uri = null, $body = 'php://input', ?UserAgent $userAgent = null)
+    {
+        if (empty($uri) || empty($userAgent)) {
+            throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
+        }
+
+        // Get our body from php://input
+        if ($body === 'php://input') {
+            $body = file_get_contents('php://input');
+        }
+
+        $this->config       = $config;
+        $this->uri          = $uri;
+        $this->body         = ! empty($body) ? $body : null;
+        $this->userAgent    = $userAgent;
+        $this->validLocales = $config->supportedLocales;
+
+        parent::__construct($config);
+
+        $this->populateHeaders();
+        $this->detectURI($config->uriProtocol, $config->baseURL);
+        $this->detectLocale($config);
+    }
+
+    /**
+     * Handles setting up the locale, perhaps auto-detecting through
+     * content negotiation.
+     *
+     * @param App $config
+     */
+    public function detectLocale($config)
+    {
+        $this->locale = $this->defaultLocale = $config->defaultLocale;
+
+        if (! $config->negotiateLocale) {
+            return;
+        }
+
+        $this->setLocale($this->negotiate('language', $config->supportedLocales));
+    }
+
+    /**
+     * Sets up our URI object based on the information we have. This is
+     * either provided by the user in the baseURL Config setting, or
+     * determined from the environment as needed.
+     */
+    protected function detectURI(string $protocol, string $baseURL)
+    {
+        // Passing the config is unnecessary but left for legacy purposes
+        $config          = clone $this->config;
+        $config->baseURL = $baseURL;
+
+        $this->setPath($this->detectPath($protocol), $config);
+    }
+
+    /**
+     * Detects the relative path based on
+     * the URIProtocol Config setting.
+     */
+    public function detectPath(string $protocol = ''): string
+    {
+        if (empty($protocol)) {
+            $protocol = 'REQUEST_URI';
+        }
+
+        switch ($protocol) {
+            case 'REQUEST_URI':
+                $this->path = $this->parseRequestURI();
+                break;
+
+            case 'QUERY_STRING':
+                $this->path = $this->parseQueryString();
+                break;
+
+            case 'PATH_INFO':
+            default:
+                $this->path = $this->fetchGlobal('server', $protocol) ?? $this->parseRequestURI();
+                break;
+        }
+
+        return $this->path;
+    }
+
+    /**
+     * Will parse the REQUEST_URI and automatically detect the URI from it,
+     * fixing the query string if necessary.
+     *
+     * @return string The URI it found.
+     */
+    protected function parseRequestURI(): string
+    {
+        if (! isset($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])) {
+            return '';
+        }
+
+        // parse_url() returns false if no host is present, but the path or query string
+        // contains a colon followed by a number. So we attach a dummy host since
+        // REQUEST_URI does not include the host. This allows us to parse out the query string and path.
+        $parts = parse_url('http://dummy' . $_SERVER['REQUEST_URI']);
+        $query = $parts['query'] ?? '';
+        $uri   = $parts['path'] ?? '';
+
+        // Strip the SCRIPT_NAME path from the URI
+        if ($uri !== '' && isset($_SERVER['SCRIPT_NAME'][0]) && pathinfo($_SERVER['SCRIPT_NAME'], PATHINFO_EXTENSION) === 'php') {
+            // Compare each segment, dropping them until there is no match
+            $segments = $keep = explode('/', $uri);
+
+            foreach (explode('/', $_SERVER['SCRIPT_NAME']) as $i => $segment) {
+                // If these segments are not the same then we're done
+                if (! isset($segments[$i]) || $segment !== $segments[$i]) {
+                    break;
+                }
+
+                array_shift($keep);
+            }
+
+            $uri = implode('/', $keep);
+        }
+
+        // This section ensures that even on servers that require the URI to contain the query string (Nginx) a correct
+        // URI is found, and also fixes the QUERY_STRING getServer var and $_GET array.
+        if (trim($uri, '/') === '' && strncmp($query, '/', 1) === 0) {
+            $query                   = explode('?', $query, 2);
+            $uri                     = $query[0];
+            $_SERVER['QUERY_STRING'] = $query[1] ?? '';
+        } else {
+            $_SERVER['QUERY_STRING'] = $query;
+        }
+
+        // Update our globals for values likely to been have changed
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
+        $this->populateGlobals('server');
+        $this->populateGlobals('get');
+
+        $uri = URI::removeDotSegments($uri);
+
+        return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
+    }
+
+    /**
+     * Parse QUERY_STRING
+     *
+     * Will parse QUERY_STRING and automatically detect the URI from it.
+     */
+    protected function parseQueryString(): string
+    {
+        $uri = $_SERVER['QUERY_STRING'] ?? @getenv('QUERY_STRING');
+
+        if (trim($uri, '/') === '') {
+            return '';
+        }
+
+        if (strncmp($uri, '/', 1) === 0) {
+            $uri                     = explode('?', $uri, 2);
+            $_SERVER['QUERY_STRING'] = $uri[1] ?? '';
+            $uri                     = $uri[0];
+        }
+
+        // Update our globals for values likely to been have changed
+        parse_str($_SERVER['QUERY_STRING'], $_GET);
+        $this->populateGlobals('server');
+        $this->populateGlobals('get');
+
+        $uri = URI::removeDotSegments($uri);
+
+        return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
+    }
+
+    /**
+     * Provides a convenient way to work with the Negotiate class
+     * for content negotiation.
+     */
+    public function negotiate(string $type, array $supported, bool $strictMatch = false): string
+    {
+        if ($this->negotiator === null) {
+            $this->negotiator = Services::negotiator($this, true);
+        }
+
+        switch (strtolower($type)) {
+            case 'media':
+                return $this->negotiator->media($supported, $strictMatch);
+
+            case 'charset':
+                return $this->negotiator->charset($supported);
+
+            case 'encoding':
+                return $this->negotiator->encoding($supported);
+
+            case 'language':
+                return $this->negotiator->language($supported);
+        }
+
+        throw HTTPException::forInvalidNegotiationType($type);
+    }
+
+    /**
+     * Determines if this request was made from the command line (CLI).
+     */
+    public function isCLI(): bool
+    {
+        return is_cli();
+    }
+
+    /**
+     * Test to see if a request contains the HTTP_X_REQUESTED_WITH header.
+     */
+    public function isAJAX(): bool
+    {
+        return $this->hasHeader('X-Requested-With') && strtolower($this->header('X-Requested-With')->getValue()) === 'xmlhttprequest';
+    }
+
+    /**
+     * Attempts to detect if the current connection is secure through
+     * a few different methods.
+     */
+    public function isSecure(): bool
+    {
+        if (! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+            return true;
+        }
+
+        if ($this->hasHeader('X-Forwarded-Proto') && $this->header('X-Forwarded-Proto')->getValue() === 'https') {
+            return true;
+        }
+
+        return $this->hasHeader('Front-End-Https') && ! empty($this->header('Front-End-Https')->getValue()) && strtolower($this->header('Front-End-Https')->getValue()) !== 'off';
+    }
+
+    /**
+     * Sets the relative path and updates the URI object.
+     * Note: Since current_url() accesses the shared request
+     * instance, this can be used to change the "current URL"
+     * for testing.
+     *
+     * @param string $path   URI path relative to SCRIPT_NAME
+     * @param App    $config Optional alternate config to use
+     *
+     * @return $this
+     */
+    public function setPath(string $path, ?App $config = null)
+    {
+        $this->path = $path;
+        $this->uri->setPath($path);
+
+        $config = $config ?? $this->config;
+
+        // It's possible the user forgot a trailing slash on their
+        // baseURL, so let's help them out.
+        $baseURL = $config->baseURL === '' ? $config->baseURL : rtrim($config->baseURL, '/ ') . '/';
+
+        // Based on our baseURL provided by the developer
+        // set our current domain name, scheme
+        if ($baseURL !== '') {
+            $this->uri->setScheme(parse_url($baseURL, PHP_URL_SCHEME));
+            $this->uri->setHost(parse_url($baseURL, PHP_URL_HOST));
+            $this->uri->setPort(parse_url($baseURL, PHP_URL_PORT));
+
+            // Ensure we have any query vars
+            $this->uri->setQuery($_SERVER['QUERY_STRING'] ?? '');
+
+            // Check if the baseURL scheme needs to be coerced into its secure version
+            if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http') {
+                $this->uri->setScheme('https');
+            }
+        } elseif (! is_cli()) {
+            // @codeCoverageIgnoreStart
+            exit('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
+            // @codeCoverageIgnoreEnd
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the path relative to SCRIPT_NAME,
+     * running detection as necessary.
+     */
+    public function getPath(): string
+    {
+        if ($this->path === null) {
+            $this->detectPath($this->config->uriProtocol);
+        }
+
+        return $this->path;
+    }
+
+    /**
+     * Sets the locale string for this request.
+     *
+     * @return IncomingRequest
+     */
+    public function setLocale(string $locale)
+    {
+        // If it's not a valid locale, set it
+        // to the default locale for the site.
+        if (! in_array($locale, $this->validLocales, true)) {
+            $locale = $this->defaultLocale;
+        }
+
+        $this->locale = $locale;
+        Locale::setDefault($locale);
+
+        return $this;
+    }
+
+    /**
+     * Gets the current locale, with a fallback to the default
+     * locale if none is set.
+     */
+    public function getLocale(): string
+    {
+        return $this->locale ?? $this->defaultLocale;
+    }
+
+    /**
+     * Returns the default locale as set in Config\App.php
+     */
+    public function getDefaultLocale(): string
+    {
+        return $this->defaultLocale;
+    }
+
+    /**
+     * Fetch an item from JSON input stream with fallback to $_REQUEST object. This is the simplest way
+     * to grab data from the request object and can be used in lieu of the
+     * other get* methods in most cases.
+     *
+     * @param array|string|null $index
+     * @param int|null          $filter Filter constant
+     * @param mixed             $flags
+     *
+     * @return mixed
+     */
+    public function getVar($index = null, $filter = null, $flags = null)
+    {
+        if (strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false && $this->body !== null) {
+            if ($index === null) {
+                return $this->getJSON();
+            }
+
+            if (is_array($index)) {
+                $output = [];
+
+                foreach ($index as $key) {
+                    $output[$key] = $this->getJsonVar($key, false, $filter, $flags);
+                }
+
+                return $output;
+            }
+
+            return $this->getJsonVar($index, false, $filter, $flags);
+        }
+
+        return $this->fetchGlobal('request', $index, $filter, $flags);
+    }
+
+    /**
+     * A convenience method that grabs the raw input stream and decodes
+     * the JSON into an array.
+     *
+     * If $assoc == true, then all objects in the response will be converted
+     * to associative arrays.
+     *
+     * @param bool $assoc   Whether to return objects as associative arrays
+     * @param int  $depth   How many levels deep to decode
+     * @param int  $options Bitmask of options
+     *
+     * @see http://php.net/manual/en/function.json-decode.php
+     *
+     * @return mixed
+     */
+    public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
+    {
+        return json_decode($this->body, $assoc, $depth, $options);
+    }
+
+    /**
+     * Get a specific variable from a JSON input stream
+     *
+     * @param string         $index  The variable that you want which can use dot syntax for getting specific values.
+     * @param bool           $assoc  If true, return the result as an associative array.
+     * @param int|null       $filter Filter Constant
+     * @param array|int|null $flags  Option
+     *
+     * @return mixed
+     */
+    public function getJsonVar(string $index, bool $assoc = false, ?int $filter = null, $flags = null)
+    {
+        helper('array');
+
+        $data = dot_array_search($index, $this->getJSON(true));
+
+        if (! is_array($data)) {
+            $filter = $filter ?? FILTER_DEFAULT;
+            $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+
+            return filter_var($data, $filter, $flags);
+        }
+
+        if (! $assoc) {
+            return json_decode(json_encode($data));
+        }
+
+        return $data;
+    }
+
+    /**
+     * A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes
+     * the String into an array.
+     *
+     * @return mixed
+     */
+    public function getRawInput()
+    {
+        parse_str($this->body, $output);
+
+        return $output;
+    }
+
+    /**
+     * Fetch an item from GET data.
+     *
+     * @param array|string|null $index  Index for item to fetch from $_GET.
+     * @param int|null          $filter A filter name to apply.
+     * @param mixed|null        $flags
+     *
+     * @return mixed
+     */
+    public function getGet($index = null, $filter = null, $flags = null)
+    {
+        return $this->fetchGlobal('get', $index, $filter, $flags);
+    }
+
+    /**
+     * Fetch an item from POST.
+     *
+     * @param array|string|null $index  Index for item to fetch from $_POST.
+     * @param int|null          $filter A filter name to apply
+     * @param mixed             $flags
+     *
+     * @return mixed
+     */
+    public function getPost($index = null, $filter = null, $flags = null)
+    {
+        return $this->fetchGlobal('post', $index, $filter, $flags);
+    }
+
+    /**
+     * Fetch an item from POST data with fallback to GET.
+     *
+     * @param array|string|null $index  Index for item to fetch from $_POST or $_GET
+     * @param int|null          $filter A filter name to apply
+     * @param mixed             $flags
+     *
+     * @return mixed
+     */
+    public function getPostGet($index = null, $filter = null, $flags = null)
+    {
+        // Use $_POST directly here, since filter_has_var only
+        // checks the initial POST data, not anything that might
+        // have been added since.
+        return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
+    }
+
+    /**
+     * Fetch an item from GET data with fallback to POST.
+     *
+     * @param array|string|null $index  Index for item to be fetched from $_GET or $_POST
+     * @param int|null          $filter A filter name to apply
+     * @param mixed             $flags
+     *
+     * @return mixed
+     */
+    public function getGetPost($index = null, $filter = null, $flags = null)
+    {
+        // Use $_GET directly here, since filter_has_var only
+        // checks the initial GET data, not anything that might
+        // have been added since.
+        return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
+    }
+
+    /**
+     * Fetch an item from the COOKIE array.
+     *
+     * @param array|string|null $index  Index for item to be fetched from $_COOKIE
+     * @param int|null          $filter A filter name to be applied
+     * @param mixed             $flags
+     *
+     * @return mixed
+     */
+    public function getCookie($index = null, $filter = null, $flags = null)
+    {
+        return $this->fetchGlobal('cookie', $index, $filter, $flags);
+    }
+
+    /**
+     * Fetch the user agent string
+     *
+     * @return UserAgent
+     */
+    public function getUserAgent()
+    {
+        return $this->userAgent;
+    }
+
+    /**
+     * Attempts to get old Input data that has been flashed to the session
+     * with redirect_with_input(). It first checks for the data in the old
+     * POST data, then the old GET data and finally check for dot arrays
+     *
+     * @return mixed
+     */
+    public function getOldInput(string $key)
+    {
+        // If the session hasn't been started, or no
+        // data was previously saved, we're done.
+        if (empty($_SESSION['_ci_old_input'])) {
+            return null;
+        }
+
+        // Check for the value in the POST array first.
+        if (isset($_SESSION['_ci_old_input']['post'][$key])) {
+            return $_SESSION['_ci_old_input']['post'][$key];
+        }
+
+        // Next check in the GET array.
+        if (isset($_SESSION['_ci_old_input']['get'][$key])) {
+            return $_SESSION['_ci_old_input']['get'][$key];
+        }
+
+        helper('array');
+
+        // Check for an array value in POST.
+        if (isset($_SESSION['_ci_old_input']['post'])) {
+            $value = dot_array_search($key, $_SESSION['_ci_old_input']['post']);
+            if ($value !== null) {
+                return $value;
+            }
+        }
+
+        // Check for an array value in GET.
+        if (isset($_SESSION['_ci_old_input']['get'])) {
+            $value = dot_array_search($key, $_SESSION['_ci_old_input']['get']);
+            if ($value !== null) {
+                return $value;
+            }
+        }
+
+        // requested session key not found
+        return null;
+    }
+
+    /**
+     * Returns an array of all files that have been uploaded with this
+     * request. Each file is represented by an UploadedFile instance.
+     */
+    public function getFiles(): array
+    {
+        if ($this->files === null) {
+            $this->files = new FileCollection();
+        }
+
+        return $this->files->all(); // return all files
+    }
+
+    /**
+     * Verify if a file exist, by the name of the input field used to upload it, in the collection
+     * of uploaded files and if is have been uploaded with multiple option.
+     *
+     * @return array|null
+     */
+    public function getFileMultiple(string $fileID)
+    {
+        if ($this->files === null) {
+            $this->files = new FileCollection();
+        }
+
+        return $this->files->getFileMultiple($fileID);
+    }
+
+    /**
+     * Retrieves a single file by the name of the input field used
+     * to upload it.
+     *
+     * @return UploadedFile|null
+     */
+    public function getFile(string $fileID)
+    {
+        if ($this->files === null) {
+            $this->files = new FileCollection();
+        }
+
+        return $this->files->getFile($fileID);
+    }
+
+    /**
+     * Remove relative directory (../) and multi slashes (///)
+     *
+     * Do some final cleaning of the URI and return it, currently only used in static::_parse_request_uri()
+     *
+     * @deprecated Use URI::removeDotSegments() directly
+     */
+    protected function removeRelativeDirectory(string $uri): string
+    {
+        $uri = URI::removeDotSegments($uri);
+
+        return $uri === '/' ? $uri : ltrim($uri, '/');
+    }
 }
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 91c472cd9af6..99a4e39588b9 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -16,124 +16,109 @@
  */
 class Message implements MessageInterface
 {
-	use MessageTrait;
-
-	/**
-	 * Protocol version
-	 *
-	 * @var string
-	 */
-	protected $protocolVersion;
-
-	/**
-	 * List of valid protocol versions
-	 *
-	 * @var array
-	 */
-	protected $validProtocolVersions = [
-		'1.0',
-		'1.1',
-		'2.0',
-	];
-
-	/**
-	 * Message body
-	 *
-	 * @var mixed
-	 */
-	protected $body;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the Message's body.
-	 *
-	 * @return mixed
-	 */
-	public function getBody()
-	{
-		return $this->body;
-	}
-
-	/**
-	 * Returns an array containing all headers.
-	 *
-	 * @return array<string, Header> An array of the request headers
-	 *
-	 * @deprecated Use Message::headers() to make room for PSR-7
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getHeaders(): array
-	{
-		return $this->headers();
-	}
-
-	/**
-	 * Returns a single header object. If multiple headers with the same
-	 * name exist, then will return an array of header objects.
-	 *
-	 * @param string $name
-	 *
-	 * @return array|Header|null
-	 *
-	 * @deprecated Use Message::header() to make room for PSR-7
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getHeader(string $name)
-	{
-		return $this->header($name);
-	}
-
-	/**
-	 * Determines whether a header exists.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function hasHeader(string $name): bool
-	{
-		$origName = $this->getHeaderName($name);
-
-		return isset($this->headers[$origName]);
-	}
-
-	/**
-	 * Retrieves a comma-separated string of the values for a single header.
-	 *
-	 * This method returns all of the header values of the given
-	 * case-insensitive header name as a string concatenated together using
-	 * a comma.
-	 *
-	 * NOTE: Not all header values may be appropriately represented using
-	 * comma concatenation. For such headers, use getHeader() instead
-	 * and supply your own delimiter when concatenating.
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	public function getHeaderLine(string $name): string
-	{
-		$origName = $this->getHeaderName($name);
-
-		if (! array_key_exists($origName, $this->headers))
-		{
-			return '';
-		}
-
-		return $this->headers[$origName]->getValueLine();
-	}
-
-	/**
-	 * Returns the HTTP Protocol Version.
-	 *
-	 * @return string
-	 */
-	public function getProtocolVersion(): string
-	{
-		return $this->protocolVersion ?? '1.1';
-	}
+    use MessageTrait;
+
+    /**
+     * Protocol version
+     *
+     * @var string
+     */
+    protected $protocolVersion;
+
+    /**
+     * List of valid protocol versions
+     *
+     * @var array
+     */
+    protected $validProtocolVersions = [
+        '1.0',
+        '1.1',
+        '2.0',
+    ];
+
+    /**
+     * Message body
+     *
+     * @var mixed
+     */
+    protected $body;
+
+    /**
+     * Returns the Message's body.
+     *
+     * @return mixed
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * Returns an array containing all headers.
+     *
+     * @return array<string, Header> An array of the request headers
+     *
+     * @deprecated Use Message::headers() to make room for PSR-7
+     *
+     * @codeCoverageIgnore
+     */
+    public function getHeaders(): array
+    {
+        return $this->headers();
+    }
+
+    /**
+     * Returns a single header object. If multiple headers with the same
+     * name exist, then will return an array of header objects.
+     *
+     * @return array|Header|null
+     *
+     * @deprecated Use Message::header() to make room for PSR-7
+     *
+     * @codeCoverageIgnore
+     */
+    public function getHeader(string $name)
+    {
+        return $this->header($name);
+    }
+
+    /**
+     * Determines whether a header exists.
+     */
+    public function hasHeader(string $name): bool
+    {
+        $origName = $this->getHeaderName($name);
+
+        return isset($this->headers[$origName]);
+    }
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     */
+    public function getHeaderLine(string $name): string
+    {
+        $origName = $this->getHeaderName($name);
+
+        if (! array_key_exists($origName, $this->headers)) {
+            return '';
+        }
+
+        return $this->headers[$origName]->getValueLine();
+    }
+
+    /**
+     * Returns the HTTP Protocol Version.
+     */
+    public function getProtocolVersion(): string
+    {
+        return $this->protocolVersion ?? '1.1';
+    }
 }
diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php
index 982e3caad9a7..2addc2b2a80a 100644
--- a/system/HTTP/MessageInterface.php
+++ b/system/HTTP/MessageInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -18,95 +18,84 @@
  */
 interface MessageInterface
 {
-	/**
-	 * Sets the body of the current message.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return $this
-	 */
-	public function setBody($data);
+    /**
+     * Sets the body of the current message.
+     *
+     * @param mixed $data
+     *
+     * @return $this
+     */
+    public function setBody($data);
 
-	/**
-	 * Appends data to the body of the current message.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return $this
-	 */
-	public function appendBody($data);
+    /**
+     * Appends data to the body of the current message.
+     *
+     * @param mixed $data
+     *
+     * @return $this
+     */
+    public function appendBody($data);
 
-	/**
-	 * Populates the $headers array with any headers the getServer knows about.
-	 */
-	public function populateHeaders(): void;
+    /**
+     * Populates the $headers array with any headers the getServer knows about.
+     */
+    public function populateHeaders(): void;
 
-	/**
-	 * Returns an array containing all Headers.
-	 *
-	 * @return array<string, Header> An array of the Header objects
-	 */
-	public function headers(): array;
+    /**
+     * Returns an array containing all Headers.
+     *
+     * @return array<string, Header> An array of the Header objects
+     */
+    public function headers(): array;
 
-	/**
-	 * Returns a single Header object. If multiple headers with the same
-	 * name exist, then will return an array of header objects.
-	 *
-	 * @param string $name
-	 *
-	 * @return array|Header|null
-	 */
-	public function header($name);
+    /**
+     * Returns a single Header object. If multiple headers with the same
+     * name exist, then will return an array of header objects.
+     *
+     * @param string $name
+     *
+     * @return array|Header|null
+     */
+    public function header($name);
 
-	/**
-	 * Sets a header and it's value.
-	 *
-	 * @param string            $name
-	 * @param array|null|string $value
-	 *
-	 * @return $this
-	 */
-	public function setHeader(string $name, $value);
+    /**
+     * Sets a header and it's value.
+     *
+     * @param array|string|null $value
+     *
+     * @return $this
+     */
+    public function setHeader(string $name, $value);
 
-	/**
-	 * Removes a header from the list of headers we track.
-	 *
-	 * @param string $name
-	 *
-	 * @return $this
-	 */
-	public function removeHeader(string $name);
+    /**
+     * Removes a header from the list of headers we track.
+     *
+     * @return $this
+     */
+    public function removeHeader(string $name);
 
-	/**
-	 * Adds an additional header value to any headers that accept
-	 * multiple values (i.e. are an array or implement ArrayAccess)
-	 *
-	 * @param string      $name
-	 * @param string|null $value
-	 *
-	 * @return $this
-	 */
-	public function appendHeader(string $name, ?string $value);
+    /**
+     * Adds an additional header value to any headers that accept
+     * multiple values (i.e. are an array or implement ArrayAccess)
+     *
+     * @return $this
+     */
+    public function appendHeader(string $name, ?string $value);
 
-	/**
-	 * Adds an additional header value to any headers that accept
-	 * multiple values (i.e. are an array or implement ArrayAccess)
-	 *
-	 * @param string $name
-	 * @param string $value
-	 *
-	 * @return $this
-	 */
-	public function prependHeader(string $name, string $value);
+    /**
+     * Adds an additional header value to any headers that accept
+     * multiple values (i.e. are an array or implement ArrayAccess)
+     *
+     * @return $this
+     */
+    public function prependHeader(string $name, string $value);
 
-	/**
-	 * Sets the HTTP protocol version.
-	 *
-	 * @param string $version
-	 *
-	 * @return $this
-	 *
-	 * @throws HTTPException For invalid protocols
-	 */
-	public function setProtocolVersion(string $version);
+    /**
+     * Sets the HTTP protocol version.
+     *
+     * @throws HTTPException For invalid protocols
+     *
+     * @return $this
+     */
+    public function setProtocolVersion(string $version);
 }
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
index aea8fe2bab32..e4fb73841c1d 100644
--- a/system/HTTP/MessageTrait.php
+++ b/system/HTTP/MessageTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -22,248 +22,218 @@
  */
 trait MessageTrait
 {
-	/**
-	 * List of all HTTP request headers.
-	 *
-	 * @var array<string, Header>
-	 */
-	protected $headers = [];
-
-	/**
-	 * Holds a map of lower-case header names
-	 * and their normal-case key as it is in $headers.
-	 * Used for case-insensitive header access.
-	 *
-	 * @var array
-	 */
-	protected $headerMap = [];
-
-	//--------------------------------------------------------------------
-	// Body
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the body of the current message.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return $this
-	 */
-	public function setBody($data): self
-	{
-		$this->body = $data;
-
-		return $this;
-	}
-
-	/**
-	 * Appends data to the body of the current message.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return $this
-	 */
-	public function appendBody($data): self
-	{
-		$this->body .= (string) $data;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// Headers
-	//--------------------------------------------------------------------
-
-	/**
-	 * Populates the $headers array with any headers the getServer knows about.
-	 */
-	public function populateHeaders(): void
-	{
-		$contentType = $_SERVER['CONTENT_TYPE'] ?? getenv('CONTENT_TYPE');
-		if (! empty($contentType))
-		{
-			$this->setHeader('Content-Type', $contentType);
-		}
-		unset($contentType);
-
-		foreach (array_keys($_SERVER) as $key)
-		{
-			if (sscanf($key, 'HTTP_%s', $header) === 1)
-			{
-				// take SOME_HEADER and turn it into Some-Header
-				$header = str_replace('_', ' ', strtolower($header));
-				$header = str_replace(' ', '-', ucwords($header));
-
-				$this->setHeader($header, $_SERVER[$key]);
-
-				// Add us to the header map so we can find them case-insensitively
-				$this->headerMap[strtolower($header)] = $header;
-			}
-		}
-	}
-
-	/**
-	 * Returns an array containing all Headers.
-	 *
-	 * @return array<string, Header> An array of the Header objects
-	 */
-	public function headers(): array
-	{
-		// If no headers are defined, but the user is
-		// requesting it, then it's likely they want
-		// it to be populated so do that...
-		if (empty($this->headers))
-		{
-			$this->populateHeaders();
-		}
-
-		return $this->headers;
-	}
-
-	/**
-	 * Returns a single Header object. If multiple headers with the same
-	 * name exist, then will return an array of header objects.
-	 *
-	 * @param string $name
-	 *
-	 * @return array|Header|null
-	 */
-	public function header($name)
-	{
-		$origName = $this->getHeaderName($name);
-
-		return $this->headers[$origName] ?? null;
-	}
-
-	/**
-	 * Sets a header and it's value.
-	 *
-	 * @param string            $name
-	 * @param array|null|string $value
-	 *
-	 * @return $this
-	 */
-	public function setHeader(string $name, $value): self
-	{
-		$origName = $this->getHeaderName($name);
-
-		if (isset($this->headers[$origName]) && is_array($this->headers[$origName]->getValue()))
-		{
-			if (! is_array($value))
-			{
-				$value = [$value];
-			}
-
-			foreach ($value as $v)
-			{
-				$this->appendHeader($origName, $v);
-			}
-		}
-		else
-		{
-			$this->headers[$origName]               = new Header($origName, $value);
-			$this->headerMap[strtolower($origName)] = $origName;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Removes a header from the list of headers we track.
-	 *
-	 * @param string $name
-	 *
-	 * @return $this
-	 */
-	public function removeHeader(string $name): self
-	{
-		$origName = $this->getHeaderName($name);
-
-		unset($this->headers[$origName]);
-		unset($this->headerMap[strtolower($name)]);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an additional header value to any headers that accept
-	 * multiple values (i.e. are an array or implement ArrayAccess)
-	 *
-	 * @param string      $name
-	 * @param string|null $value
-	 *
-	 * @return $this
-	 */
-	public function appendHeader(string $name, ?string $value): self
-	{
-		$origName = $this->getHeaderName($name);
-
-		array_key_exists($origName, $this->headers)
-			? $this->headers[$origName]->appendValue($value)
-			: $this->setHeader($name, $value);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an additional header value to any headers that accept
-	 * multiple values (i.e. are an array or implement ArrayAccess)
-	 *
-	 * @param string $name
-	 * @param string $value
-	 *
-	 * @return $this
-	 */
-	public function prependHeader(string $name, string $value): self
-	{
-		$origName = $this->getHeaderName($name);
-
-		$this->headers[$origName]->prependValue($value);
-
-		return $this;
-	}
-
-	/**
-	 * Takes a header name in any case, and returns the
-	 * normal-case version of the header.
-	 *
-	 * @param string $name
-	 *
-	 * @return string
-	 */
-	protected function getHeaderName(string $name): string
-	{
-		return $this->headerMap[strtolower($name)] ?? $name;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the HTTP protocol version.
-	 *
-	 * @param string $version
-	 *
-	 * @return $this
-	 *
-	 * @throws HTTPException For invalid protocols
-	 */
-	public function setProtocolVersion(string $version): self
-	{
-		if (! is_numeric($version))
-		{
-			$version = substr($version, strpos($version, '/') + 1);
-		}
-
-		// Make sure that version is in the correct format
-		$version = number_format((float) $version, 1);
-
-		if (! in_array($version, $this->validProtocolVersions, true))
-		{
-			throw HTTPException::forInvalidHTTPProtocol(implode(', ', $this->validProtocolVersions));
-		}
-
-		$this->protocolVersion = $version;
-
-		return $this;
-	}
+    /**
+     * List of all HTTP request headers.
+     *
+     * @var array<string, Header>
+     */
+    protected $headers = [];
+
+    /**
+     * Holds a map of lower-case header names
+     * and their normal-case key as it is in $headers.
+     * Used for case-insensitive header access.
+     *
+     * @var array
+     */
+    protected $headerMap = [];
+
+    //--------------------------------------------------------------------
+    // Body
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the body of the current message.
+     *
+     * @param mixed $data
+     *
+     * @return $this
+     */
+    public function setBody($data): self
+    {
+        $this->body = $data;
+
+        return $this;
+    }
+
+    /**
+     * Appends data to the body of the current message.
+     *
+     * @param mixed $data
+     *
+     * @return $this
+     */
+    public function appendBody($data): self
+    {
+        $this->body .= (string) $data;
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Headers
+    //--------------------------------------------------------------------
+
+    /**
+     * Populates the $headers array with any headers the getServer knows about.
+     */
+    public function populateHeaders(): void
+    {
+        $contentType = $_SERVER['CONTENT_TYPE'] ?? getenv('CONTENT_TYPE');
+        if (! empty($contentType)) {
+            $this->setHeader('Content-Type', $contentType);
+        }
+        unset($contentType);
+
+        foreach (array_keys($_SERVER) as $key) {
+            if (sscanf($key, 'HTTP_%s', $header) === 1) {
+                // take SOME_HEADER and turn it into Some-Header
+                $header = str_replace('_', ' ', strtolower($header));
+                $header = str_replace(' ', '-', ucwords($header));
+
+                $this->setHeader($header, $_SERVER[$key]);
+
+                // Add us to the header map so we can find them case-insensitively
+                $this->headerMap[strtolower($header)] = $header;
+            }
+        }
+    }
+
+    /**
+     * Returns an array containing all Headers.
+     *
+     * @return array<string, Header> An array of the Header objects
+     */
+    public function headers(): array
+    {
+        // If no headers are defined, but the user is
+        // requesting it, then it's likely they want
+        // it to be populated so do that...
+        if (empty($this->headers)) {
+            $this->populateHeaders();
+        }
+
+        return $this->headers;
+    }
+
+    /**
+     * Returns a single Header object. If multiple headers with the same
+     * name exist, then will return an array of header objects.
+     *
+     * @param string $name
+     *
+     * @return array|Header|null
+     */
+    public function header($name)
+    {
+        $origName = $this->getHeaderName($name);
+
+        return $this->headers[$origName] ?? null;
+    }
+
+    /**
+     * Sets a header and it's value.
+     *
+     * @param array|string|null $value
+     *
+     * @return $this
+     */
+    public function setHeader(string $name, $value): self
+    {
+        $origName = $this->getHeaderName($name);
+
+        if (isset($this->headers[$origName]) && is_array($this->headers[$origName]->getValue())) {
+            if (! is_array($value)) {
+                $value = [$value];
+            }
+
+            foreach ($value as $v) {
+                $this->appendHeader($origName, $v);
+            }
+        } else {
+            $this->headers[$origName]               = new Header($origName, $value);
+            $this->headerMap[strtolower($origName)] = $origName;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes a header from the list of headers we track.
+     *
+     * @return $this
+     */
+    public function removeHeader(string $name): self
+    {
+        $origName = $this->getHeaderName($name);
+        unset($this->headers[$origName], $this->headerMap[strtolower($name)]);
+
+        return $this;
+    }
+
+    /**
+     * Adds an additional header value to any headers that accept
+     * multiple values (i.e. are an array or implement ArrayAccess)
+     *
+     * @return $this
+     */
+    public function appendHeader(string $name, ?string $value): self
+    {
+        $origName = $this->getHeaderName($name);
+
+        array_key_exists($origName, $this->headers)
+            ? $this->headers[$origName]->appendValue($value)
+            : $this->setHeader($name, $value);
+
+        return $this;
+    }
+
+    /**
+     * Adds an additional header value to any headers that accept
+     * multiple values (i.e. are an array or implement ArrayAccess)
+     *
+     * @return $this
+     */
+    public function prependHeader(string $name, string $value): self
+    {
+        $origName = $this->getHeaderName($name);
+
+        $this->headers[$origName]->prependValue($value);
+
+        return $this;
+    }
+
+    /**
+     * Takes a header name in any case, and returns the
+     * normal-case version of the header.
+     */
+    protected function getHeaderName(string $name): string
+    {
+        return $this->headerMap[strtolower($name)] ?? $name;
+    }
+
+    /**
+     * Sets the HTTP protocol version.
+     *
+     * @throws HTTPException For invalid protocols
+     *
+     * @return $this
+     */
+    public function setProtocolVersion(string $version): self
+    {
+        if (! is_numeric($version)) {
+            $version = substr($version, strpos($version, '/') + 1);
+        }
+
+        // Make sure that version is in the correct format
+        $version = number_format((float) $version, 1);
+
+        if (! in_array($version, $this->validProtocolVersions, true)) {
+            throw HTTPException::forInvalidHTTPProtocol(implode(', ', $this->validProtocolVersions));
+        }
+
+        $this->protocolVersion = $version;
+
+        return $this;
+    }
 }
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index fb2608f3239e..b379a6e16999 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -24,412 +24,323 @@
  */
 class Negotiate
 {
-	/**
-	 * Request
-	 *
-	 * @var RequestInterface|IncomingRequest
-	 */
-	protected $request;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Constructor
-	 *
-	 * @param RequestInterface|null $request
-	 */
-	public function __construct(RequestInterface $request = null)
-	{
-		if (! is_null($request))
-		{
-			$this->request = $request;
-		}
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Stores the request instance to grab the headers from.
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return $this
-	 */
-	public function setRequest(RequestInterface $request)
-	{
-		$this->request = $request;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the best content-type to use based on the $supported
-	 * types the application says it supports, and the types requested
-	 * by the client.
-	 *
-	 * If no match is found, the first, highest-ranking client requested
-	 * type is returned.
-	 *
-	 * @param array   $supported
-	 * @param boolean $strictMatch If TRUE, will return an empty string when no match found.
-	 *                             If FALSE, will return the first supported element.
-	 *
-	 * @return string
-	 */
-	public function media(array $supported, bool $strictMatch = false): string
-	{
-		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept'), true, $strictMatch);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the best charset to use based on the $supported
-	 * types the application says it supports, and the types requested
-	 * by the client.
-	 *
-	 * If no match is found, the first, highest-ranking client requested
-	 * type is returned.
-	 *
-	 * @param array $supported
-	 *
-	 * @return string
-	 */
-	public function charset(array $supported): string
-	{
-		$match = $this->getBestMatch($supported, $this->request->getHeaderLine('accept-charset'), false, true);
-
-		// If no charset is shown as a match, ignore the directive
-		// as allowed by the RFC, and tell it a default value.
-		if (empty($match))
-		{
-			return 'utf-8';
-		}
-
-		return $match;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the best encoding type to use based on the $supported
-	 * types the application says it supports, and the types requested
-	 * by the client.
-	 *
-	 * If no match is found, the first, highest-ranking client requested
-	 * type is returned.
-	 *
-	 * @param array $supported
-	 *
-	 * @return string
-	 */
-	public function encoding(array $supported = []): string
-	{
-		$supported[] = 'identity';
-
-		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-encoding'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the best language to use based on the $supported
-	 * types the application says it supports, and the types requested
-	 * by the client.
-	 *
-	 * If no match is found, the first, highest-ranking client requested
-	 * type is returned.
-	 *
-	 * @param array $supported
-	 *
-	 * @return string
-	 */
-	public function language(array $supported): string
-	{
-		return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-language'), false, false, true);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Utility Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the grunt work of comparing any of the app-supported values
-	 * against a given Accept* header string.
-	 *
-	 * Portions of this code base on Aura.Accept library.
-	 *
-	 * @param array   $supported    App-supported values
-	 * @param string  $header       header string
-	 * @param boolean $enforceTypes If TRUE, will compare media types and sub-types.
-	 * @param boolean $strictMatch  If TRUE, will return empty string on no match.
-	 *                              If FALSE, will return the first supported element.
-	 * @param boolean $matchLocales If TRUE, will match locale sub-types to a broad type (fr-FR = fr)
-	 *
-	 * @return string Best match
-	 */
-	protected function getBestMatch(array $supported, string $header = null, bool $enforceTypes = false, bool $strictMatch = false, bool $matchLocales = false): string
-	{
-		if (empty($supported))
-		{
-			throw HTTPException::forEmptySupportedNegotiations();
-		}
-
-		if (empty($header))
-		{
-			return $strictMatch ? '' : $supported[0];
-		}
-
-		$acceptable = $this->parseHeader($header);
-
-		foreach ($acceptable as $accept)
-		{
-			// if acceptable quality is zero, skip it.
-			if ($accept['q'] === 0.0)
-			{
-				continue;
-			}
-
-			// if acceptable value is "anything", return the first available
-			if ($accept['value'] === '*' || $accept['value'] === '*/*')
-			{
-				return $supported[0];
-			}
-
-			// If an acceptable value is supported, return it
-			foreach ($supported as $available)
-			{
-				if ($this->match($accept, $available, $enforceTypes, $matchLocales))
-				{
-					return $available;
-				}
-			}
-		}
-
-		// No matches? Return the first supported element.
-		return $strictMatch ? '' : $supported[0];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses an Accept* header into it's multiple values.
-	 *
-	 * This is based on code from Aura.Accept library.
-	 *
-	 * @param string $header
-	 *
-	 * @return array
-	 */
-	public function parseHeader(string $header): array
-	{
-		$results    = [];
-		$acceptable = explode(',', $header);
-
-		foreach ($acceptable as $value)
-		{
-			$pairs = explode(';', $value);
-
-			$value = $pairs[0];
-
-			unset($pairs[0]);
-
-			$parameters = [];
-
-			foreach ($pairs as $pair)
-			{
-				if (preg_match(
-					'/^(?P<name>.+?)=(?P<quoted>"|\')?(?P<value>.*?)(?:\k<quoted>)?$/',
-					$pair,
-					$param
-				))
-				{
-					$parameters[trim($param['name'])] = trim($param['value']);
-				}
-			}
-
-			$quality = 1.0;
-
-			if (array_key_exists('q', $parameters))
-			{
-				$quality = $parameters['q'];
-				unset($parameters['q']);
-			}
-
-			$results[] = [
-				'value'  => trim($value),
-				'q'      => (float) $quality,
-				'params' => $parameters,
-			];
-		}
-
-		// Sort to get the highest results first
-		usort($results, function ($a, $b) {
-			if ($a['q'] === $b['q'])
-			{
-				$aAst = substr_count($a['value'], '*');
-				$bAst = substr_count($b['value'], '*');
-
-				// '*/*' has lower precedence than 'text/*',
-				// and 'text/*' has lower priority than 'text/plain'
-				//
-				// This seems backwards, but needs to be that way
-				// due to the way PHP7 handles ordering or array
-				// elements created by reference.
-				if ($aAst > $bAst)
-				{
-					return 1;
-				}
-
-				// If the counts are the same, but one element
-				// has more params than another, it has higher precedence.
-				//
-				// This seems backwards, but needs to be that way
-				// due to the way PHP7 handles ordering or array
-				// elements created by reference.
-				if ($aAst === $bAst)
-				{
-					return count($b['params']) - count($a['params']);
-				}
-
-				return 0;
-			}
-
-			// Still here? Higher q values have precedence.
-			return ($a['q'] > $b['q']) ? -1 : 1;
-		});
-
-		return $results;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Match-maker
-	 *
-	 * @param array   $acceptable
-	 * @param string  $supported
-	 * @param boolean $enforceTypes
-	 * @param boolean $matchLocales
-	 *
-	 * @return boolean
-	 */
-	protected function match(array $acceptable, string $supported, bool $enforceTypes = false, $matchLocales = false): bool
-	{
-		$supported = $this->parseHeader($supported);
-		if (is_array($supported) && count($supported) === 1)
-		{
-			$supported = $supported[0];
-		}
-
-		// Is it an exact match?
-		if ($acceptable['value'] === $supported['value'])
-		{
-			return $this->matchParameters($acceptable, $supported);
-		}
-
-		// Do we need to compare types/sub-types? Only used
-		// by negotiateMedia().
-		if ($enforceTypes)
-		{
-			return $this->matchTypes($acceptable, $supported);
-		}
-
-		// Do we need to match locales against broader locales?
-		if ($matchLocales)
-		{
-			return $this->matchLocales($acceptable, $supported);
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks two Accept values with matching 'values' to see if their
-	 * 'params' are the same.
-	 *
-	 * @param array $acceptable
-	 * @param array $supported
-	 *
-	 * @return boolean
-	 */
-	protected function matchParameters(array $acceptable, array $supported): bool
-	{
-		if (count($acceptable['params']) !== count($supported['params']))
-		{
-			return false;
-		}
-
-		foreach ($supported['params'] as $label => $value)
-		{
-			if (! isset($acceptable['params'][$label])
-				|| $acceptable['params'][$label] !== $value
-			)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compares the types/subtypes of an acceptable Media type and
-	 * the supported string.
-	 *
-	 * @param array $acceptable
-	 * @param array $supported
-	 *
-	 * @return boolean
-	 */
-	public function matchTypes(array $acceptable, array $supported): bool
-	{
-		// PHPDocumentor v2 cannot parse yet the shorter list syntax,
-		// causing no API generation for the file.
-		[$aType, $aSubType] = explode('/', $acceptable['value']);
-		[$sType, $sSubType] = explode('/', $supported['value']);
-
-		// If the types don't match, we're done.
-		if ($aType !== $sType)
-		{
-			return false;
-		}
-
-		// If there's an asterisk, we're cool
-		if ($aSubType === '*')
-		{
-			return true;
-		}
-
-		// Otherwise, subtypes must match also.
-		return $aSubType === $sSubType;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will match locales against their broader pairs, so that fr-FR would
-	 * match a supported localed of fr
-	 *
-	 * @param array $acceptable
-	 * @param array $supported
-	 *
-	 * @return boolean
-	 */
-	public function matchLocales(array $acceptable, array $supported): bool
-	{
-		$aBroad = mb_strpos($acceptable['value'], '-') > 0
-			? mb_substr($acceptable['value'], 0, mb_strpos($acceptable['value'], '-'))
-			: $acceptable['value'];
-		$sBroad = mb_strpos($supported['value'], '-') > 0
-			? mb_substr($supported['value'], 0, mb_strpos($supported['value'], '-'))
-			: $supported['value'];
-
-		return strtolower($aBroad) === strtolower($sBroad);
-	}
+    /**
+     * Request
+     *
+     * @var IncomingRequest|RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Constructor
+     */
+    public function __construct(?RequestInterface $request = null)
+    {
+        if ($request !== null) {
+            $this->request = $request;
+        }
+    }
+
+    /**
+     * Stores the request instance to grab the headers from.
+     *
+     * @return $this
+     */
+    public function setRequest(RequestInterface $request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Determines the best content-type to use based on the $supported
+     * types the application says it supports, and the types requested
+     * by the client.
+     *
+     * If no match is found, the first, highest-ranking client requested
+     * type is returned.
+     *
+     * @param bool $strictMatch If TRUE, will return an empty string when no match found.
+     *                          If FALSE, will return the first supported element.
+     */
+    public function media(array $supported, bool $strictMatch = false): string
+    {
+        return $this->getBestMatch($supported, $this->request->getHeaderLine('accept'), true, $strictMatch);
+    }
+
+    /**
+     * Determines the best charset to use based on the $supported
+     * types the application says it supports, and the types requested
+     * by the client.
+     *
+     * If no match is found, the first, highest-ranking client requested
+     * type is returned.
+     */
+    public function charset(array $supported): string
+    {
+        $match = $this->getBestMatch($supported, $this->request->getHeaderLine('accept-charset'), false, true);
+
+        // If no charset is shown as a match, ignore the directive
+        // as allowed by the RFC, and tell it a default value.
+        if (empty($match)) {
+            return 'utf-8';
+        }
+
+        return $match;
+    }
+
+    /**
+     * Determines the best encoding type to use based on the $supported
+     * types the application says it supports, and the types requested
+     * by the client.
+     *
+     * If no match is found, the first, highest-ranking client requested
+     * type is returned.
+     */
+    public function encoding(array $supported = []): string
+    {
+        $supported[] = 'identity';
+
+        return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-encoding'));
+    }
+
+    /**
+     * Determines the best language to use based on the $supported
+     * types the application says it supports, and the types requested
+     * by the client.
+     *
+     * If no match is found, the first, highest-ranking client requested
+     * type is returned.
+     */
+    public function language(array $supported): string
+    {
+        return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-language'), false, false, true);
+    }
+
+    //--------------------------------------------------------------------
+    // Utility Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Does the grunt work of comparing any of the app-supported values
+     * against a given Accept* header string.
+     *
+     * Portions of this code base on Aura.Accept library.
+     *
+     * @param array  $supported    App-supported values
+     * @param string $header       header string
+     * @param bool   $enforceTypes If TRUE, will compare media types and sub-types.
+     * @param bool   $strictMatch  If TRUE, will return empty string on no match.
+     *                             If FALSE, will return the first supported element.
+     * @param bool   $matchLocales If TRUE, will match locale sub-types to a broad type (fr-FR = fr)
+     *
+     * @return string Best match
+     */
+    protected function getBestMatch(array $supported, ?string $header = null, bool $enforceTypes = false, bool $strictMatch = false, bool $matchLocales = false): string
+    {
+        if (empty($supported)) {
+            throw HTTPException::forEmptySupportedNegotiations();
+        }
+
+        if (empty($header)) {
+            return $strictMatch ? '' : $supported[0];
+        }
+
+        $acceptable = $this->parseHeader($header);
+
+        foreach ($acceptable as $accept) {
+            // if acceptable quality is zero, skip it.
+            if ($accept['q'] === 0.0) {
+                continue;
+            }
+
+            // if acceptable value is "anything", return the first available
+            if ($accept['value'] === '*' || $accept['value'] === '*/*') {
+                return $supported[0];
+            }
+
+            // If an acceptable value is supported, return it
+            foreach ($supported as $available) {
+                if ($this->match($accept, $available, $enforceTypes, $matchLocales)) {
+                    return $available;
+                }
+            }
+        }
+
+        // No matches? Return the first supported element.
+        return $strictMatch ? '' : $supported[0];
+    }
+
+    /**
+     * Parses an Accept* header into it's multiple values.
+     *
+     * This is based on code from Aura.Accept library.
+     */
+    public function parseHeader(string $header): array
+    {
+        $results    = [];
+        $acceptable = explode(',', $header);
+
+        foreach ($acceptable as $value) {
+            $pairs = explode(';', $value);
+
+            $value = $pairs[0];
+
+            unset($pairs[0]);
+
+            $parameters = [];
+
+            foreach ($pairs as $pair) {
+                if (preg_match(
+                    '/^(?P<name>.+?)=(?P<quoted>"|\')?(?P<value>.*?)(?:\k<quoted>)?$/',
+                    $pair,
+                    $param
+                )) {
+                    $parameters[trim($param['name'])] = trim($param['value']);
+                }
+            }
+
+            $quality = 1.0;
+
+            if (array_key_exists('q', $parameters)) {
+                $quality = $parameters['q'];
+                unset($parameters['q']);
+            }
+
+            $results[] = [
+                'value'  => trim($value),
+                'q'      => (float) $quality,
+                'params' => $parameters,
+            ];
+        }
+
+        // Sort to get the highest results first
+        usort($results, static function ($a, $b) {
+            if ($a['q'] === $b['q']) {
+                $aAst = substr_count($a['value'], '*');
+                $bAst = substr_count($b['value'], '*');
+
+                // '*/*' has lower precedence than 'text/*',
+                // and 'text/*' has lower priority than 'text/plain'
+                //
+                // This seems backwards, but needs to be that way
+                // due to the way PHP7 handles ordering or array
+                // elements created by reference.
+                if ($aAst > $bAst) {
+                    return 1;
+                }
+
+                // If the counts are the same, but one element
+                // has more params than another, it has higher precedence.
+                //
+                // This seems backwards, but needs to be that way
+                // due to the way PHP7 handles ordering or array
+                // elements created by reference.
+                if ($aAst === $bAst) {
+                    return count($b['params']) - count($a['params']);
+                }
+
+                return 0;
+            }
+
+            // Still here? Higher q values have precedence.
+            return ($a['q'] > $b['q']) ? -1 : 1;
+        });
+
+        return $results;
+    }
+
+    /**
+     * Match-maker
+     *
+     * @param bool $matchLocales
+     */
+    protected function match(array $acceptable, string $supported, bool $enforceTypes = false, $matchLocales = false): bool
+    {
+        $supported = $this->parseHeader($supported);
+        if (is_array($supported) && count($supported) === 1) {
+            $supported = $supported[0];
+        }
+
+        // Is it an exact match?
+        if ($acceptable['value'] === $supported['value']) {
+            return $this->matchParameters($acceptable, $supported);
+        }
+
+        // Do we need to compare types/sub-types? Only used
+        // by negotiateMedia().
+        if ($enforceTypes) {
+            return $this->matchTypes($acceptable, $supported);
+        }
+
+        // Do we need to match locales against broader locales?
+        if ($matchLocales) {
+            return $this->matchLocales($acceptable, $supported);
+        }
+
+        return false;
+    }
+
+    /**
+     * Checks two Accept values with matching 'values' to see if their
+     * 'params' are the same.
+     */
+    protected function matchParameters(array $acceptable, array $supported): bool
+    {
+        if (count($acceptable['params']) !== count($supported['params'])) {
+            return false;
+        }
+
+        foreach ($supported['params'] as $label => $value) {
+            if (! isset($acceptable['params'][$label])
+                || $acceptable['params'][$label] !== $value
+            ) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Compares the types/subtypes of an acceptable Media type and
+     * the supported string.
+     */
+    public function matchTypes(array $acceptable, array $supported): bool
+    {
+        // PHPDocumentor v2 cannot parse yet the shorter list syntax,
+        // causing no API generation for the file.
+        [$aType, $aSubType] = explode('/', $acceptable['value']);
+        [$sType, $sSubType] = explode('/', $supported['value']);
+
+        // If the types don't match, we're done.
+        if ($aType !== $sType) {
+            return false;
+        }
+
+        // If there's an asterisk, we're cool
+        if ($aSubType === '*') {
+            return true;
+        }
+
+        // Otherwise, subtypes must match also.
+        return $aSubType === $sSubType;
+    }
+
+    /**
+     * Will match locales against their broader pairs, so that fr-FR would
+     * match a supported localed of fr
+     */
+    public function matchLocales(array $acceptable, array $supported): bool
+    {
+        $aBroad = mb_strpos($acceptable['value'], '-') > 0
+            ? mb_substr($acceptable['value'], 0, mb_strpos($acceptable['value'], '-'))
+            : $acceptable['value'];
+        $sBroad = mb_strpos($supported['value'], '-') > 0
+            ? mb_substr($supported['value'], 0, mb_strpos($supported['value'], '-'))
+            : $supported['value'];
+
+        return strtolower($aBroad) === strtolower($sBroad);
+    }
 }
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 4f31e901e1fe..54e1ae12f36d 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -20,146 +20,132 @@
  */
 class RedirectResponse extends Response
 {
-	/**
-	 * Sets the URI to redirect to and, optionally, the HTTP status code to use.
-	 * If no code is provided it will be automatically determined.
-	 *
-	 * @param string       $uri    The URI to redirect to
-	 * @param integer|null $code   HTTP status code
-	 * @param string       $method
-	 *
-	 * @return $this
-	 */
-	public function to(string $uri, int $code = null, string $method = 'auto')
-	{
-		// If it appears to be a relative URL, then convert to full URL
-		// for better security.
-		if (strpos($uri, 'http') !== 0)
-		{
-			$uri = site_url($uri);
-		}
-
-		return $this->redirect($uri, $method, $code);
-	}
-
-	/**
-	 * Sets the URI to redirect to but as a reverse-routed or named route
-	 * instead of a raw URI.
-	 *
-	 * @param string  $route
-	 * @param array   $params
-	 * @param integer $code
-	 * @param string  $method
-	 *
-	 * @throws HTTPException
-	 *
-	 * @return $this
-	 */
-	public function route(string $route, array $params = [], int $code = 302, string $method = 'auto')
-	{
-		$route = Services::routes()->reverseRoute($route, ...$params);
-
-		if (! $route)
-		{
-			throw HTTPException::forInvalidRedirectRoute($route);
-		}
-
-		return $this->redirect(site_url($route), $method, $code);
-	}
-
-	/**
-	 * Helper function to return to previous page.
-	 *
-	 * Example:
-	 *  return redirect()->back();
-	 *
-	 * @param integer|null $code
-	 * @param string       $method
-	 *
-	 * @return $this
-	 */
-	public function back(int $code = null, string $method = 'auto')
-	{
-		Services::session();
-
-		return $this->redirect(previous_url(), $method, $code);
-	}
-
-	/**
-	 * Specifies that the current $_GET and $_POST arrays should be
-	 * packaged up with the response.
-	 *
-	 * It will then be available via the 'old()' helper function.
-	 *
-	 * @return $this
-	 */
-	public function withInput()
-	{
-		$session = Services::session();
-
-		$session->setFlashdata('_ci_old_input', [
-			'get'  => $_GET ?? [],
-			'post' => $_POST ?? [],
-		]);
-
-		// If the validation has any errors, transmit those back
-		// so they can be displayed when the validation is handled
-		// within a method different than displaying the form.
-		$validation = Services::validation();
-
-		if ($validation->getErrors())
-		{
-			$session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors()));
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Adds a key and message to the session as Flashdata.
-	 *
-	 * @param string       $key
-	 * @param string|array $message
-	 *
-	 * @return $this
-	 */
-	public function with(string $key, $message)
-	{
-		Services::session()->setFlashdata($key, $message);
-
-		return $this;
-	}
-
-	/**
-	 * Copies any cookies from the global Response instance
-	 * into this RedirectResponse. Useful when you've just
-	 * set a cookie but need ensure that's actually sent
-	 * with the response instead of lost.
-	 *
-	 * @return $this|RedirectResponse
-	 */
-	public function withCookies()
-	{
-		$this->cookieStore = new CookieStore(Services::response()->getCookies());
-
-		return $this;
-	}
-
-	/**
-	 * Copies any headers from the global Response instance
-	 * into this RedirectResponse. Useful when you've just
-	 * set a header be need to ensure its actually sent
-	 * with the redirect response.
-	 *
-	 * @return $this|RedirectResponse
-	 */
-	public function withHeaders()
-	{
-		foreach (Services::response()->headers() as $name => $header)
-		{
-			$this->setHeader($name, $header->getValue());
-		}
-
-		return $this;
-	}
+    /**
+     * Sets the URI to redirect to and, optionally, the HTTP status code to use.
+     * If no code is provided it will be automatically determined.
+     *
+     * @param string   $uri  The URI to redirect to
+     * @param int|null $code HTTP status code
+     *
+     * @return $this
+     */
+    public function to(string $uri, ?int $code = null, string $method = 'auto')
+    {
+        // If it appears to be a relative URL, then convert to full URL
+        // for better security.
+        if (strpos($uri, 'http') !== 0) {
+            $uri = site_url($uri);
+        }
+
+        return $this->redirect($uri, $method, $code);
+    }
+
+    /**
+     * Sets the URI to redirect to but as a reverse-routed or named route
+     * instead of a raw URI.
+     *
+     * @throws HTTPException
+     *
+     * @return $this
+     */
+    public function route(string $route, array $params = [], int $code = 302, string $method = 'auto')
+    {
+        $route = Services::routes()->reverseRoute($route, ...$params);
+
+        if (! $route) {
+            throw HTTPException::forInvalidRedirectRoute($route);
+        }
+
+        return $this->redirect(site_url($route), $method, $code);
+    }
+
+    /**
+     * Helper function to return to previous page.
+     *
+     * Example:
+     *  return redirect()->back();
+     *
+     * @return $this
+     */
+    public function back(?int $code = null, string $method = 'auto')
+    {
+        Services::session();
+
+        return $this->redirect(previous_url(), $method, $code);
+    }
+
+    /**
+     * Specifies that the current $_GET and $_POST arrays should be
+     * packaged up with the response.
+     *
+     * It will then be available via the 'old()' helper function.
+     *
+     * @return $this
+     */
+    public function withInput()
+    {
+        $session = Services::session();
+
+        $session->setFlashdata('_ci_old_input', [
+            'get'  => $_GET ?? [],
+            'post' => $_POST ?? [],
+        ]);
+
+        // If the validation has any errors, transmit those back
+        // so they can be displayed when the validation is handled
+        // within a method different than displaying the form.
+        $validation = Services::validation();
+
+        if ($validation->getErrors()) {
+            $session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors()));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a key and message to the session as Flashdata.
+     *
+     * @param array|string $message
+     *
+     * @return $this
+     */
+    public function with(string $key, $message)
+    {
+        Services::session()->setFlashdata($key, $message);
+
+        return $this;
+    }
+
+    /**
+     * Copies any cookies from the global Response instance
+     * into this RedirectResponse. Useful when you've just
+     * set a cookie but need ensure that's actually sent
+     * with the response instead of lost.
+     *
+     * @return $this|RedirectResponse
+     */
+    public function withCookies()
+    {
+        $this->cookieStore = new CookieStore(Services::response()->getCookies());
+
+        return $this;
+    }
+
+    /**
+     * Copies any headers from the global Response instance
+     * into this RedirectResponse. Useful when you've just
+     * set a header be need to ensure its actually sent
+     * with the redirect response.
+     *
+     * @return $this|RedirectResponse
+     */
+    public function withHeaders()
+    {
+        foreach (Services::response()->headers() as $name => $header) {
+            $this->setHeader($name, $header->getValue());
+        }
+
+        return $this;
+    }
 }
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index d0d4009709b0..6294295db4df 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -18,130 +18,122 @@
  */
 class Request extends Message implements MessageInterface, RequestInterface
 {
-	use RequestTrait;
-
-	/**
-	 * Proxy IPs
-	 *
-	 * @var string|array
-	 *
-	 * @deprecated Check the App config directly
-	 */
-	protected $proxyIPs;
-
-	/**
-	 * Request method.
-	 *
-	 * @var string
-	 */
-	protected $method;
-
-	/**
-	 * A URI instance.
-	 *
-	 * @var URI
-	 */
-	protected $uri;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param object $config
-	 *
-	 * @deprecated The $config is no longer needed and will be removed in a future version
-	 */
-	public function __construct($config = null)
-	{
-		/**
-		 * @deprecated $this->proxyIps property will be removed in the future
-		 */
-		$this->proxyIPs = $config->proxyIPs;
-
-		if (empty($this->method))
-		{
-			$this->method = $this->getServer('REQUEST_METHOD') ?? 'GET';
-		}
-
-		if (empty($this->uri))
-		{
-			$this->uri = new URI();
-		}
-	}
-
-	/**
-	 * Validate an IP address
-	 *
-	 * @param string $ip    IP Address
-	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
-	 *
-	 * @return boolean
-	 *
-	 * @deprecated Use Validation instead
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function isValidIP(string $ip = null, string $which = null): bool
-	{
-		return (new FormatRules())->valid_ip($ip, $which);
-	}
-
-	/**
-	 * Get the request method.
-	 *
-	 * @param boolean $upper Whether to return in upper or lower case.
-	 *
-	 * @return string
-	 *
-	 * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getMethod(bool $upper = false): string
-	{
-		return ($upper) ? strtoupper($this->method) : strtolower($this->method);
-	}
-
-	/**
-	 * Sets the request method. Used when spoofing the request.
-	 *
-	 * @param string $method
-	 *
-	 * @return Request
-	 *
-	 * @deprecated Use withMethod() instead for immutability
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function setMethod(string $method)
-	{
-		$this->method = $method;
-
-		return $this;
-	}
-
-	/**
-	 * Returns an instance with the specified method.
-	 *
-	 * @param string $method
-	 *
-	 * @return static
-	 */
-	public function withMethod($method)
-	{
-		$request = clone $this;
-
-		$request->method = $method;
-
-		return $request;
-	}
-
-	/**
-	 * Retrieves the URI instance.
-	 *
-	 * @return URI
-	 */
-	public function getUri()
-	{
-		return $this->uri;
-	}
+    use RequestTrait;
+
+    /**
+     * Proxy IPs
+     *
+     * @var array|string
+     *
+     * @deprecated Check the App config directly
+     */
+    protected $proxyIPs;
+
+    /**
+     * Request method.
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * A URI instance.
+     *
+     * @var URI
+     */
+    protected $uri;
+
+    /**
+     * Constructor.
+     *
+     * @param object $config
+     *
+     * @deprecated The $config is no longer needed and will be removed in a future version
+     */
+    public function __construct($config = null)
+    {
+        /**
+         * @deprecated $this->proxyIps property will be removed in the future
+         */
+        $this->proxyIPs = $config->proxyIPs;
+
+        if (empty($this->method)) {
+            $this->method = $this->getServer('REQUEST_METHOD') ?? 'GET';
+        }
+
+        if (empty($this->uri)) {
+            $this->uri = new URI();
+        }
+    }
+
+    /**
+     * Validate an IP address
+     *
+     * @param string $ip    IP Address
+     * @param string $which IP protocol: 'ipv4' or 'ipv6'
+     *
+     * @deprecated Use Validation instead
+     *
+     * @codeCoverageIgnore
+     */
+    public function isValidIP(?string $ip = null, ?string $which = null): bool
+    {
+        return (new FormatRules())->valid_ip($ip, $which);
+    }
+
+    /**
+     * Get the request method.
+     *
+     * @param bool $upper Whether to return in upper or lower case.
+     *
+     * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
+     *
+     * @codeCoverageIgnore
+     */
+    public function getMethod(bool $upper = false): string
+    {
+        return ($upper) ? strtoupper($this->method) : strtolower($this->method);
+    }
+
+    /**
+     * Sets the request method. Used when spoofing the request.
+     *
+     * @return Request
+     *
+     * @deprecated Use withMethod() instead for immutability
+     *
+     * @codeCoverageIgnore
+     */
+    public function setMethod(string $method)
+    {
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Returns an instance with the specified method.
+     *
+     * @param string $method
+     *
+     * @return static
+     */
+    public function withMethod($method)
+    {
+        $request = clone $this;
+
+        $request->method = $method;
+
+        return $request;
+    }
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * @return URI
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
 }
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index 6f10dd460d90..e7bc14a3f361 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -20,53 +20,42 @@
  */
 interface RequestInterface
 {
-	/**
-	 * Gets the user's IP address.
-	 * Supplied by RequestTrait.
-	 *
-	 * @return string IP address
-	 */
-	public function getIPAddress(): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Validate an IP address
-	 *
-	 * @param string $ip    IP Address
-	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
-	 *
-	 * @return boolean
-	 *
-	 * @deprecated Use Validation instead
-	 */
-	public function isValidIP(string $ip, string $which = null): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the request method.
-	 * An extension of PSR-7's getMethod to allow casing.
-	 *
-	 * @param boolean $upper Whether to return in upper or lower case.
-	 *
-	 * @return string
-	 *
-	 * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
-	 */
-	public function getMethod(bool $upper = false): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from the $_SERVER array.
-	 * Supplied by RequestTrait.
-	 *
-	 * @param  string $index  Index for item to be fetched from $_SERVER
-	 * @param  null   $filter A filter name to be applied
-	 * @return mixed
-	 */
-	public function getServer($index = null, $filter = null);
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the user's IP address.
+     * Supplied by RequestTrait.
+     *
+     * @return string IP address
+     */
+    public function getIPAddress(): string;
+
+    /**
+     * Validate an IP address
+     *
+     * @param string $ip    IP Address
+     * @param string $which IP protocol: 'ipv4' or 'ipv6'
+     *
+     * @deprecated Use Validation instead
+     */
+    public function isValidIP(string $ip, ?string $which = null): bool;
+
+    /**
+     * Get the request method.
+     * An extension of PSR-7's getMethod to allow casing.
+     *
+     * @param bool $upper Whether to return in upper or lower case.
+     *
+     * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
+     */
+    public function getMethod(bool $upper = false): string;
+
+    /**
+     * Fetch an item from the $_SERVER array.
+     * Supplied by RequestTrait.
+     *
+     * @param string $index  Index for item to be fetched from $_SERVER
+     * @param null   $filter A filter name to be applied
+     *
+     * @return mixed
+     */
+    public function getServer($index = null, $filter = null);
 }
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 2c9a0f963e9f..50444a481acf 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -23,359 +23,314 @@
  */
 trait RequestTrait
 {
-	/**
-	 * IP address of the current user.
-	 *
-	 * @var string
-	 *
-	 * @deprecated Will become private in a future release
-	 */
-	protected $ipAddress = '';
-
-	/**
-	 * Stores values we've retrieved from
-	 * PHP globals.
-	 *
-	 * @var array
-	 */
-	protected $globals = [];
-
-	/**
-	 * Gets the user's IP address.
-	 *
-	 * @return string IP address
-	 */
-	public function getIPAddress(): string
-	{
-		if ($this->ipAddress)
-		{
-			return $this->ipAddress;
-		}
-
-		$ipValidator = [
-			new FormatRules(),
-			'valid_ip',
-		];
-
-		/**
-		 * @deprecated $this->proxyIPs property will be removed in the future
-		 */
-		$proxyIPs = $this->proxyIPs ?? config('App')->proxyIPs;
-		if (! empty($proxyIPs) && ! is_array($proxyIPs))
-		{
-			$proxyIPs = explode(',', str_replace(' ', '', $proxyIPs));
-		}
-
-		$this->ipAddress = $this->getServer('REMOTE_ADDR');
-
-		if ($proxyIPs)
-		{
-			foreach (['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_CLIENT_IP', 'HTTP_X_CLUSTER_CLIENT_IP'] as $header)
-			{
-				if (($spoof = $this->getServer($header)) !== null)
-				{
-					// Some proxies typically list the whole chain of IP
-					// addresses through which the client has reached us.
-					// e.g. client_ip, proxy_ip1, proxy_ip2, etc.
-					sscanf($spoof, '%[^,]', $spoof);
-
-					if (! $ipValidator($spoof))
-					{
-						$spoof = null;
-					}
-					else
-					{
-						break;
-					}
-				}
-			}
-
-			if ($spoof)
-			{
-				foreach ($proxyIPs as $proxyIP)
-				{
-					// Check if we have an IP address or a subnet
-					if (strpos($proxyIP, '/') === false)
-					{
-						// An IP address (and not a subnet) is specified.
-						// We can compare right away.
-						if ($proxyIP === $this->ipAddress)
-						{
-							$this->ipAddress = $spoof;
-							break;
-						}
-
-						continue;
-					}
-
-					// We have a subnet ... now the heavy lifting begins
-					if (! isset($separator))
-					{
-						$separator = $ipValidator($this->ipAddress, 'ipv6') ? ':' : '.';
-					}
-
-					// If the proxy entry doesn't match the IP protocol - skip it
-					if (strpos($proxyIP, $separator) === false)
-					{
-						continue;
-					}
-
-					// Convert the REMOTE_ADDR IP address to binary, if needed
-					if (! isset($ip, $sprintf))
-					{
-						if ($separator === ':')
-						{
-							// Make sure we're have the "full" IPv6 format
-							$ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress));
-
-							for ($j = 0; $j < 8; $j ++)
-							{
-								$ip[$j] = intval($ip[$j], 16);
-							}
-
-							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
-						{
-							$ip      = explode('.', $this->ipAddress);
-							$sprintf = '%08b%08b%08b%08b';
-						}
-
-						$ip = vsprintf($sprintf, $ip);
-					}
-
-					// Split the netmask length off the network address
-					sscanf($proxyIP, '%[^/]/%d', $netaddr, $masklen);
-
-					// Again, an IPv6 address is most likely in a compressed form
-					if ($separator === ':')
-					{
-						$netaddr = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($netaddr, ':')), $netaddr));
-						for ($i = 0; $i < 8; $i++)
-						{
-							$netaddr[$i] = intval($netaddr[$i], 16);
-						}
-					}
-					else
-					{
-						$netaddr = explode('.', $netaddr);
-					}
-
-					// Convert to binary and finally compare
-					if (strncmp($ip, vsprintf($sprintf, $netaddr), $masklen) === 0)
-					{
-						$this->ipAddress = $spoof;
-						break;
-					}
-				}
-			}
-		}
-
-		if (! $ipValidator($this->ipAddress))
-		{
-			return $this->ipAddress = '0.0.0.0';
-		}
-
-		return empty($this->ipAddress) ? '' : $this->ipAddress;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from the $_SERVER array.
-	 *
-	 * @param string|array|null $index  Index for item to be fetched from $_SERVER
-	 * @param integer|null      $filter A filter name to be applied
-	 * @param null              $flags
-	 *
-	 * @return mixed
-	 */
-	public function getServer($index = null, $filter = null, $flags = null)
-	{
-		return $this->fetchGlobal('server', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetch an item from the $_ENV array.
-	 *
-	 * @param null $index  Index for item to be fetched from $_ENV
-	 * @param null $filter A filter name to be applied
-	 * @param null $flags
-	 *
-	 * @return mixed
-	 */
-	public function getEnv($index = null, $filter = null, $flags = null)
-	{
-		return $this->fetchGlobal('env', $index, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
-	 *
-	 * @param string $method
-	 * @param mixed  $value
-	 *
-	 * @return $this
-	 */
-	public function setGlobal(string $method, $value)
-	{
-		$this->globals[$method] = $value;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fetches one or more items from a global, like cookies, get, post, etc.
-	 * Can optionally filter the input when you retrieve it by passing in
-	 * a filter.
-	 *
-	 * If $type is an array, it must conform to the input allowed by the
-	 * filter_input_array method.
-	 *
-	 * http://php.net/manual/en/filter.filters.sanitize.php
-	 *
-	 * @param string             $method Input filter constant
-	 * @param string|array|null  $index
-	 * @param integer|null       $filter Filter constant
-	 * @param array|integer|null $flags  Options
-	 *
-	 * @return mixed
-	 */
-	public function fetchGlobal(string $method, $index = null, ?int $filter = null, $flags = null)
-	{
-		$method = strtolower($method);
-
-		if (! isset($this->globals[$method]))
-		{
-			$this->populateGlobals($method);
-		}
-
-		// Null filters cause null values to return.
-		$filter = $filter ?? FILTER_DEFAULT;
-		$flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
-
-		// Return all values when $index is null
-		if (is_null($index))
-		{
-			$values = [];
-			foreach ($this->globals[$method] as $key => $value)
-			{
-				$values[$key] = is_array($value)
-					? $this->fetchGlobal($method, $key, $filter, $flags)
-					: filter_var($value, $filter, $flags);
-			}
-
-			return $values;
-		}
-
-		// allow fetching multiple keys at once
-		if (is_array($index))
-		{
-			$output = [];
-
-			foreach ($index as $key)
-			{
-				$output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
-			}
-
-			return $output;
-		}
-
-		// Does the index contain array notation?
-		if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1)
-		{
-			$value = $this->globals[$method];
-			for ($i = 0; $i < $count; $i++)
-			{
-				$key = trim($matches[0][$i], '[]');
-
-				if ($key === '') // Empty notation will return the value as array
-				{
-					break;
-				}
-
-				if (isset($value[$key]))
-				{
-					$value = $value[$key];
-				}
-				else
-				{
-					return null;
-				}
-			}
-		}
-
-		if (! isset($value))
-		{
-			$value = $this->globals[$method][$index] ?? null;
-		}
-
-		// @phpstan-ignore-next-line
-		if (is_array($value)
-			&& ($filter !== FILTER_DEFAULT
-				|| ((is_numeric($flags) && $flags !== 0)
-					|| is_array($flags) && count($flags) > 0
-				)
-			)
-		)
-		{
-			// Iterate over array and append filter and flags
-			array_walk_recursive($value, function (&$val) use ($filter, $flags) {
-				$val = filter_var($val, $filter, $flags);
-			});
-
-			return $value;
-		}
-
-		// Cannot filter these types of data automatically...
-		if (is_array($value) || is_object($value) || is_null($value))
-		{
-			return $value;
-		}
-
-		return filter_var($value, $filter, $flags);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves a copy of the current state of one of several PHP globals
-	 * so we can retrieve them later.
-	 *
-	 * @param string $method
-	 */
-	protected function populateGlobals(string $method)
-	{
-		if (! isset($this->globals[$method]))
-		{
-			$this->globals[$method] = [];
-		}
-
-		// Don't populate ENV as it might contain
-		// sensitive data that we don't want to get logged.
-		switch($method)
-		{
-			case 'get':
-				$this->globals['get'] = $_GET;
-				break;
-			case 'post':
-				$this->globals['post'] = $_POST;
-				break;
-			case 'request':
-				$this->globals['request'] = $_REQUEST;
-				break;
-			case 'cookie':
-				$this->globals['cookie'] = $_COOKIE;
-				break;
-			case 'server':
-				$this->globals['server'] = $_SERVER;
-				break;
-		}
-	}
+    /**
+     * IP address of the current user.
+     *
+     * @var string
+     *
+     * @deprecated Will become private in a future release
+     */
+    protected $ipAddress = '';
+
+    /**
+     * Stores values we've retrieved from
+     * PHP globals.
+     *
+     * @var array
+     */
+    protected $globals = [];
+
+    /**
+     * Gets the user's IP address.
+     *
+     * @return string IP address
+     */
+    public function getIPAddress(): string
+    {
+        if ($this->ipAddress) {
+            return $this->ipAddress;
+        }
+
+        $ipValidator = [
+            new FormatRules(),
+            'valid_ip',
+        ];
+
+        /**
+         * @deprecated $this->proxyIPs property will be removed in the future
+         */
+        $proxyIPs = $this->proxyIPs ?? config('App')->proxyIPs;
+        if (! empty($proxyIPs) && ! is_array($proxyIPs)) {
+            $proxyIPs = explode(',', str_replace(' ', '', $proxyIPs));
+        }
+
+        $this->ipAddress = $this->getServer('REMOTE_ADDR');
+
+        if ($proxyIPs) {
+            foreach (['HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_X_CLIENT_IP', 'HTTP_X_CLUSTER_CLIENT_IP'] as $header) {
+                if (($spoof = $this->getServer($header)) !== null) {
+                    // Some proxies typically list the whole chain of IP
+                    // addresses through which the client has reached us.
+                    // e.g. client_ip, proxy_ip1, proxy_ip2, etc.
+                    sscanf($spoof, '%[^,]', $spoof);
+
+                    if (! $ipValidator($spoof)) {
+                        $spoof = null;
+                    } else {
+                        break;
+                    }
+                }
+            }
+
+            if ($spoof) {
+                foreach ($proxyIPs as $proxyIP) {
+                    // Check if we have an IP address or a subnet
+                    if (strpos($proxyIP, '/') === false) {
+                        // An IP address (and not a subnet) is specified.
+                        // We can compare right away.
+                        if ($proxyIP === $this->ipAddress) {
+                            $this->ipAddress = $spoof;
+                            break;
+                        }
+
+                        continue;
+                    }
+
+                    // We have a subnet ... now the heavy lifting begins
+                    if (! isset($separator)) {
+                        $separator = $ipValidator($this->ipAddress, 'ipv6') ? ':' : '.';
+                    }
+
+                    // If the proxy entry doesn't match the IP protocol - skip it
+                    if (strpos($proxyIP, $separator) === false) {
+                        continue;
+                    }
+
+                    // Convert the REMOTE_ADDR IP address to binary, if needed
+                    if (! isset($ip, $sprintf)) {
+                        if ($separator === ':') {
+                            // Make sure we're have the "full" IPv6 format
+                            $ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress));
+
+                            for ($j = 0; $j < 8; $j++) {
+                                $ip[$j] = intval($ip[$j], 16);
+                            }
+
+                            $sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
+                        } else {
+                            $ip      = explode('.', $this->ipAddress);
+                            $sprintf = '%08b%08b%08b%08b';
+                        }
+
+                        $ip = vsprintf($sprintf, $ip);
+                    }
+
+                    // Split the netmask length off the network address
+                    sscanf($proxyIP, '%[^/]/%d', $netaddr, $masklen);
+
+                    // Again, an IPv6 address is most likely in a compressed form
+                    if ($separator === ':') {
+                        $netaddr = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($netaddr, ':')), $netaddr));
+
+                        for ($i = 0; $i < 8; $i++) {
+                            $netaddr[$i] = intval($netaddr[$i], 16);
+                        }
+                    } else {
+                        $netaddr = explode('.', $netaddr);
+                    }
+
+                    // Convert to binary and finally compare
+                    if (strncmp($ip, vsprintf($sprintf, $netaddr), $masklen) === 0) {
+                        $this->ipAddress = $spoof;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (! $ipValidator($this->ipAddress)) {
+            return $this->ipAddress = '0.0.0.0';
+        }
+
+        return empty($this->ipAddress) ? '' : $this->ipAddress;
+    }
+
+    /**
+     * Fetch an item from the $_SERVER array.
+     *
+     * @param array|string|null $index  Index for item to be fetched from $_SERVER
+     * @param int|null          $filter A filter name to be applied
+     * @param null              $flags
+     *
+     * @return mixed
+     */
+    public function getServer($index = null, $filter = null, $flags = null)
+    {
+        return $this->fetchGlobal('server', $index, $filter, $flags);
+    }
+
+    /**
+     * Fetch an item from the $_ENV array.
+     *
+     * @param null $index  Index for item to be fetched from $_ENV
+     * @param null $filter A filter name to be applied
+     * @param null $flags
+     *
+     * @return mixed
+     */
+    public function getEnv($index = null, $filter = null, $flags = null)
+    {
+        return $this->fetchGlobal('env', $index, $filter, $flags);
+    }
+
+    /**
+     * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
+     *
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function setGlobal(string $method, $value)
+    {
+        $this->globals[$method] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Fetches one or more items from a global, like cookies, get, post, etc.
+     * Can optionally filter the input when you retrieve it by passing in
+     * a filter.
+     *
+     * If $type is an array, it must conform to the input allowed by the
+     * filter_input_array method.
+     *
+     * http://php.net/manual/en/filter.filters.sanitize.php
+     *
+     * @param string            $method Input filter constant
+     * @param array|string|null $index
+     * @param int|null          $filter Filter constant
+     * @param array|int|null    $flags  Options
+     *
+     * @return mixed
+     */
+    public function fetchGlobal(string $method, $index = null, ?int $filter = null, $flags = null)
+    {
+        $method = strtolower($method);
+
+        if (! isset($this->globals[$method])) {
+            $this->populateGlobals($method);
+        }
+
+        // Null filters cause null values to return.
+        $filter = $filter ?? FILTER_DEFAULT;
+        $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+
+        // Return all values when $index is null
+        if ($index === null) {
+            $values = [];
+
+            foreach ($this->globals[$method] as $key => $value) {
+                $values[$key] = is_array($value)
+                    ? $this->fetchGlobal($method, $key, $filter, $flags)
+                    : filter_var($value, $filter, $flags);
+            }
+
+            return $values;
+        }
+
+        // allow fetching multiple keys at once
+        if (is_array($index)) {
+            $output = [];
+
+            foreach ($index as $key) {
+                $output[$key] = $this->fetchGlobal($method, $key, $filter, $flags);
+            }
+
+            return $output;
+        }
+
+        // Does the index contain array notation?
+        if (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
+            $value = $this->globals[$method];
+
+            for ($i = 0; $i < $count; $i++) {
+                $key = trim($matches[0][$i], '[]');
+
+                if ($key === '') { // Empty notation will return the value as array
+                    break;
+                }
+
+                if (isset($value[$key])) {
+                    $value = $value[$key];
+                } else {
+                    return null;
+                }
+            }
+        }
+
+        if (! isset($value)) {
+            $value = $this->globals[$method][$index] ?? null;
+        }
+
+        // @phpstan-ignore-next-line
+        if (is_array($value)
+            && (
+                $filter !== FILTER_DEFAULT
+                || (
+                    (is_numeric($flags) && $flags !== 0)
+                    || is_array($flags) && count($flags) > 0
+                )
+            )
+        ) {
+            // Iterate over array and append filter and flags
+            array_walk_recursive($value, static function (&$val) use ($filter, $flags) {
+                $val = filter_var($val, $filter, $flags);
+            });
+
+            return $value;
+        }
+
+        // Cannot filter these types of data automatically...
+        if (is_array($value) || is_object($value) || $value === null) {
+            return $value;
+        }
+
+        return filter_var($value, $filter, $flags);
+    }
+
+    /**
+     * Saves a copy of the current state of one of several PHP globals
+     * so we can retrieve them later.
+     */
+    protected function populateGlobals(string $method)
+    {
+        if (! isset($this->globals[$method])) {
+            $this->globals[$method] = [];
+        }
+
+        // Don't populate ENV as it might contain
+        // sensitive data that we don't want to get logged.
+        switch ($method) {
+            case 'get':
+                $this->globals['get'] = $_GET;
+                break;
+
+            case 'post':
+                $this->globals['post'] = $_POST;
+                break;
+
+            case 'request':
+                $this->globals['request'] = $_REQUEST;
+                break;
+
+            case 'cookie':
+                $this->globals['cookie'] = $_COOKIE;
+                break;
+
+            case 'server':
+                $this->globals['server'] = $_SERVER;
+                break;
+        }
+    }
 }
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index c2c1d4d26403..70f31bd35f72 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -31,235 +31,226 @@
  */
 class Response extends Message implements MessageInterface, ResponseInterface
 {
-	use ResponseTrait;
+    use ResponseTrait;
 
-	/**
-	 * HTTP status codes
-	 *
-	 * @var array
-	 */
-	protected static $statusCodes = [
-		// 1xx: Informational
-		100 => 'Continue',
-		101 => 'Switching Protocols',
-		102 => 'Processing', // http://www.iana.org/go/rfc2518
-		103 => 'Early Hints', // http://www.ietf.org/rfc/rfc8297.txt
-		// 2xx: Success
-		200 => 'OK',
-		201 => 'Created',
-		202 => 'Accepted',
-		203 => 'Non-Authoritative Information', // 1.1
-		204 => 'No Content',
-		205 => 'Reset Content',
-		206 => 'Partial Content',
-		207 => 'Multi-Status', // http://www.iana.org/go/rfc4918
-		208 => 'Already Reported', // http://www.iana.org/go/rfc5842
-		226 => 'IM Used', // 1.1; http://www.ietf.org/rfc/rfc3229.txt
-		// 3xx: Redirection
-		300 => 'Multiple Choices',
-		301 => 'Moved Permanently',
-		302 => 'Found', // Formerly 'Moved Temporarily'
-		303 => 'See Other', // 1.1
-		304 => 'Not Modified',
-		305 => 'Use Proxy', // 1.1
-		306 => 'Switch Proxy', // No longer used
-		307 => 'Temporary Redirect', // 1.1
-		308 => 'Permanent Redirect', // 1.1; Experimental; http://www.ietf.org/rfc/rfc7238.txt
-		// 4xx: Client error
-		400 => 'Bad Request',
-		401 => 'Unauthorized',
-		402 => 'Payment Required',
-		403 => 'Forbidden',
-		404 => 'Not Found',
-		405 => 'Method Not Allowed',
-		406 => 'Not Acceptable',
-		407 => 'Proxy Authentication Required',
-		408 => 'Request Timeout',
-		409 => 'Conflict',
-		410 => 'Gone',
-		411 => 'Length Required',
-		412 => 'Precondition Failed',
-		413 => 'Request Entity Too Large',
-		414 => 'Request-URI Too Long',
-		415 => 'Unsupported Media Type',
-		416 => 'Requested Range Not Satisfiable',
-		417 => 'Expectation Failed',
-		418 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
-		// 419 (Authentication Timeout) is a non-standard status code with unknown origin
-		421 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
-		422 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
-		423 => 'Locked', // http://www.iana.org/go/rfc4918
-		424 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
-		425 => 'Too Early', // https://datatracker.ietf.org/doc/draft-ietf-httpbis-replay/
-		426 => 'Upgrade Required',
-		428 => 'Precondition Required', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-		429 => 'Too Many Requests', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-		431 => 'Request Header Fields Too Large', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
-		451 => 'Unavailable For Legal Reasons', // http://tools.ietf.org/html/rfc7725
-		499 => 'Client Closed Request', // http://lxr.nginx.org/source/src/http/ngx_http_request.h#0133
-		// 5xx: Server error
-		500 => 'Internal Server Error',
-		501 => 'Not Implemented',
-		502 => 'Bad Gateway',
-		503 => 'Service Unavailable',
-		504 => 'Gateway Timeout',
-		505 => 'HTTP Version Not Supported',
-		506 => 'Variant Also Negotiates', // 1.1; http://www.ietf.org/rfc/rfc2295.txt
-		507 => 'Insufficient Storage', // http://www.iana.org/go/rfc4918
-		508 => 'Loop Detected', // http://www.iana.org/go/rfc5842
-		510 => 'Not Extended', // http://www.ietf.org/rfc/rfc2774.txt
-		511 => 'Network Authentication Required', // http://www.ietf.org/rfc/rfc6585.txt
-		599 => 'Network Connect Timeout Error', // https://httpstatuses.com/599
-	];
+    /**
+     * HTTP status codes
+     *
+     * @var array
+     */
+    protected static $statusCodes = [
+        // 1xx: Informational
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing', // http://www.iana.org/go/rfc2518
+        103 => 'Early Hints', // http://www.ietf.org/rfc/rfc8297.txt
+        // 2xx: Success
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information', // 1.1
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status', // http://www.iana.org/go/rfc4918
+        208 => 'Already Reported', // http://www.iana.org/go/rfc5842
+        226 => 'IM Used', // 1.1; http://www.ietf.org/rfc/rfc3229.txt
+        // 3xx: Redirection
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found', // Formerly 'Moved Temporarily'
+        303 => 'See Other', // 1.1
+        304 => 'Not Modified',
+        305 => 'Use Proxy', // 1.1
+        306 => 'Switch Proxy', // No longer used
+        307 => 'Temporary Redirect', // 1.1
+        308 => 'Permanent Redirect', // 1.1; Experimental; http://www.ietf.org/rfc/rfc7238.txt
+        // 4xx: Client error
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        418 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
+        // 419 (Authentication Timeout) is a non-standard status code with unknown origin
+        421 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
+        422 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
+        423 => 'Locked', // http://www.iana.org/go/rfc4918
+        424 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
+        425 => 'Too Early', // https://datatracker.ietf.org/doc/draft-ietf-httpbis-replay/
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+        429 => 'Too Many Requests', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+        431 => 'Request Header Fields Too Large', // 1.1; http://www.ietf.org/rfc/rfc6585.txt
+        451 => 'Unavailable For Legal Reasons', // http://tools.ietf.org/html/rfc7725
+        499 => 'Client Closed Request', // http://lxr.nginx.org/source/src/http/ngx_http_request.h#0133
+        // 5xx: Server error
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        506 => 'Variant Also Negotiates', // 1.1; http://www.ietf.org/rfc/rfc2295.txt
+        507 => 'Insufficient Storage', // http://www.iana.org/go/rfc4918
+        508 => 'Loop Detected', // http://www.iana.org/go/rfc5842
+        510 => 'Not Extended', // http://www.ietf.org/rfc/rfc2774.txt
+        511 => 'Network Authentication Required', // http://www.ietf.org/rfc/rfc6585.txt
+        599 => 'Network Connect Timeout Error', // https://httpstatuses.com/599
+    ];
 
-	/**
-	 * The current reason phrase for this response.
-	 * If empty string, will use the default provided for the status code.
-	 *
-	 * @var string
-	 */
-	protected $reason = '';
+    /**
+     * The current reason phrase for this response.
+     * If empty string, will use the default provided for the status code.
+     *
+     * @var string
+     */
+    protected $reason = '';
 
-	/**
-	 * The current status code for this response.
-	 * The status code is a 3-digit integer result code of the server's attempt
-	 * to understand and satisfy the request.
-	 *
-	 * @var integer
-	 */
-	protected $statusCode = 200;
+    /**
+     * The current status code for this response.
+     * The status code is a 3-digit integer result code of the server's attempt
+     * to understand and satisfy the request.
+     *
+     * @var int
+     */
+    protected $statusCode = 200;
 
-	/**
-	 * If true, will not write output. Useful during testing.
-	 *
-	 * @var boolean
-	 *
-	 * @internal Used for framework testing, should not be relied on otherwise
-	 */
-	protected $pretend = false;
+    /**
+     * If true, will not write output. Useful during testing.
+     *
+     * @var bool
+     *
+     * @internal Used for framework testing, should not be relied on otherwise
+     */
+    protected $pretend = false;
 
-	/**
-	 * Constructor
-	 *
-	 * @param App $config
-	 *
-	 * @todo Recommend removing reliance on config injection
-	 */
-	public function __construct($config)
-	{
-		// Default to a non-caching page.
-		// Also ensures that a Cache-control header exists.
-		$this->noCache();
+    /**
+     * Constructor
+     *
+     * @param App $config
+     *
+     * @todo Recommend removing reliance on config injection
+     */
+    public function __construct($config)
+    {
+        // Default to a non-caching page.
+        // Also ensures that a Cache-control header exists.
+        $this->noCache();
 
-		// We need CSP object even if not enabled to avoid calls to non existing methods
-		$this->CSP = new ContentSecurityPolicy(new CSPConfig());
+        // We need CSP object even if not enabled to avoid calls to non existing methods
+        $this->CSP = new ContentSecurityPolicy(new CSPConfig());
 
-		$this->CSPEnabled = $config->CSPEnabled;
+        $this->CSPEnabled = $config->CSPEnabled;
 
-		//---------------------------------------------------------------------
-		// DEPRECATED COOKIE MANAGEMENT
-		//---------------------------------------------------------------------
-		$this->cookiePrefix   = $config->cookiePrefix;
-		$this->cookieDomain   = $config->cookieDomain;
-		$this->cookiePath     = $config->cookiePath;
-		$this->cookieSecure   = $config->cookieSecure;
-		$this->cookieHTTPOnly = $config->cookieHTTPOnly;
-		$this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+        // DEPRECATED COOKIE MANAGEMENT
 
-		$config->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+        $this->cookiePrefix   = $config->cookiePrefix;
+        $this->cookieDomain   = $config->cookieDomain;
+        $this->cookiePath     = $config->cookiePath;
+        $this->cookieSecure   = $config->cookieSecure;
+        $this->cookieHTTPOnly = $config->cookieHTTPOnly;
+        $this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
 
-		if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true))
-		{
-			throw CookieException::forInvalidSameSite($config->cookieSameSite);
-		}
+        $config->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
 
-		$this->cookieStore = new CookieStore([]);
-		Cookie::setDefaults(config('Cookie') ?? [
-			// @todo Remove this fallback when deprecated `App` members are removed
-			'prefix'   => $config->cookiePrefix,
-			'path'     => $config->cookiePath,
-			'domain'   => $config->cookieDomain,
-			'secure'   => $config->cookieSecure,
-			'httponly' => $config->cookieHTTPOnly,
-			'samesite' => $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
-		]);
+        if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true)) {
+            throw CookieException::forInvalidSameSite($config->cookieSameSite);
+        }
 
-		// Default to an HTML Content-Type. Devs can override if needed.
-		$this->setContentType('text/html');
-	}
+        $this->cookieStore = new CookieStore([]);
+        Cookie::setDefaults(config('Cookie') ?? [
+            // @todo Remove this fallback when deprecated `App` members are removed
+            'prefix'   => $config->cookiePrefix,
+            'path'     => $config->cookiePath,
+            'domain'   => $config->cookieDomain,
+            'secure'   => $config->cookieSecure,
+            'httponly' => $config->cookieHTTPOnly,
+            'samesite' => $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
+        ]);
 
-	/**
-	 * Turns "pretend" mode on or off to aid in testing.
-	 * Note that this is not a part of the interface so
-	 * should not be relied on outside of internal testing.
-	 *
-	 * @param boolean $pretend
-	 *
-	 * @return $this
-	 */
-	public function pretend(bool $pretend = true)
-	{
-		$this->pretend = $pretend;
+        // Default to an HTML Content-Type. Devs can override if needed.
+        $this->setContentType('text/html');
+    }
 
-		return $this;
-	}
+    /**
+     * Turns "pretend" mode on or off to aid in testing.
+     * Note that this is not a part of the interface so
+     * should not be relied on outside of internal testing.
+     *
+     * @return $this
+     */
+    public function pretend(bool $pretend = true)
+    {
+        $this->pretend = $pretend;
 
-	/**
-	 * Gets the response status code.
-	 *
-	 * The status code is a 3-digit integer result code of the getServer's attempt
-	 * to understand and satisfy the request.
-	 *
-	 * @return integer Status code.
-	 */
-	public function getStatusCode(): int
-	{
-		if (empty($this->statusCode))
-		{
-			throw HTTPException::forMissingResponseStatus();
-		}
+        return $this;
+    }
 
-		return $this->statusCode;
-	}
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the getServer's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode(): int
+    {
+        if (empty($this->statusCode)) {
+            throw HTTPException::forMissingResponseStatus();
+        }
 
-	/**
-	 * Gets the response response phrase associated with the status code.
-	 *
-	 * @see http://tools.ietf.org/html/rfc7231#section-6
-	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-	 *
-	 * @return string
-	 *
-	 * @deprecated Use getReasonPhrase()
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getReason(): string
-	{
-		return $this->getReasonPhrase();
-	}
+        return $this->statusCode;
+    }
 
-	/**
-	 * Gets the response reason phrase associated with the status code.
-	 *
-	 * Because a reason phrase is not a required element in a response
-	 * status line, the reason phrase value MAY be null. Implementations MAY
-	 * choose to return the default RFC 7231 recommended reason phrase (or those
-	 * listed in the IANA HTTP Status Code Registry) for the response's
-	 * status code.
-	 *
-	 * @link http://tools.ietf.org/html/rfc7231#section-6
-	 * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-	 *
-	 * @return string Reason phrase; must return an empty string if none present.
-	 */
-	public function getReasonPhrase()
-	{
-		if ($this->reason === '')
-		{
-			return ! empty($this->statusCode) ? static::$statusCodes[$this->statusCode] : '';
-		}
+    /**
+     * Gets the response response phrase associated with the status code.
+     *
+     * @see http://tools.ietf.org/html/rfc7231#section-6
+     * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @deprecated Use getReasonPhrase()
+     *
+     * @codeCoverageIgnore
+     */
+    public function getReason(): string
+    {
+        return $this->getReasonPhrase();
+    }
 
-		return $this->reason;
-	}
+    /**
+     * Gets the response reason phrase associated with the status code.
+     *
+     * Because a reason phrase is not a required element in a response
+     * status line, the reason phrase value MAY be null. Implementations MAY
+     * choose to return the default RFC 7231 recommended reason phrase (or those
+     * listed in the IANA HTTP Status Code Registry) for the response's
+     * status code.
+     *
+     * @see http://tools.ietf.org/html/rfc7231#section-6
+     * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     *
+     * @return string Reason phrase; must return an empty string if none present.
+     */
+    public function getReasonPhrase()
+    {
+        if ($this->reason === '') {
+            return ! empty($this->statusCode) ? static::$statusCodes[$this->statusCode] : '';
+        }
+
+        return $this->reason;
+    }
 }
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index c1f2ed0e5bf3..c1d615c515a8 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -33,379 +33,350 @@
  */
 interface ResponseInterface
 {
-	/**
-	 * Constants for status codes.
-	 * From  https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
-	 */
-	// Informational
-	const HTTP_CONTINUE                        = 100;
-	const HTTP_SWITCHING_PROTOCOLS             = 101;
-	const HTTP_PROCESSING                      = 102;
-	const HTTP_EARLY_HINTS                     = 103;
-	const HTTP_OK                              = 200;
-	const HTTP_CREATED                         = 201;
-	const HTTP_ACCEPTED                        = 202;
-	const HTTP_NONAUTHORITATIVE_INFORMATION    = 203;
-	const HTTP_NO_CONTENT                      = 204;
-	const HTTP_RESET_CONTENT                   = 205;
-	const HTTP_PARTIAL_CONTENT                 = 206;
-	const HTTP_MULTI_STATUS                    = 207;
-	const HTTP_ALREADY_REPORTED                = 208;
-	const HTTP_IM_USED                         = 226;
-	const HTTP_MULTIPLE_CHOICES                = 300;
-	const HTTP_MOVED_PERMANENTLY               = 301;
-	const HTTP_FOUND                           = 302;
-	const HTTP_SEE_OTHER                       = 303;
-	const HTTP_NOT_MODIFIED                    = 304;
-	const HTTP_USE_PROXY                       = 305;
-	const HTTP_SWITCH_PROXY                    = 306;
-	const HTTP_TEMPORARY_REDIRECT              = 307;
-	const HTTP_PERMANENT_REDIRECT              = 308;
-	const HTTP_BAD_REQUEST                     = 400;
-	const HTTP_UNAUTHORIZED                    = 401;
-	const HTTP_PAYMENT_REQUIRED                = 402;
-	const HTTP_FORBIDDEN                       = 403;
-	const HTTP_NOT_FOUND                       = 404;
-	const HTTP_METHOD_NOT_ALLOWED              = 405;
-	const HTTP_NOT_ACCEPTABLE                  = 406;
-	const HTTP_PROXY_AUTHENTICATION_REQUIRED   = 407;
-	const HTTP_REQUEST_TIMEOUT                 = 408;
-	const HTTP_CONFLICT                        = 409;
-	const HTTP_GONE                            = 410;
-	const HTTP_LENGTH_REQUIRED                 = 411;
-	const HTTP_PRECONDITION_FAILED             = 412;
-	const HTTP_PAYLOAD_TOO_LARGE               = 413;
-	const HTTP_URI_TOO_LONG                    = 414;
-	const HTTP_UNSUPPORTED_MEDIA_TYPE          = 415;
-	const HTTP_RANGE_NOT_SATISFIABLE           = 416;
-	const HTTP_EXPECTATION_FAILED              = 417;
-	const HTTP_IM_A_TEAPOT                     = 418;
-	const HTTP_MISDIRECTED_REQUEST             = 421;
-	const HTTP_UNPROCESSABLE_ENTITY            = 422;
-	const HTTP_LOCKED                          = 423;
-	const HTTP_FAILED_DEPENDENCY               = 424;
-	const HTTP_TOO_EARLY                       = 425;
-	const HTTP_UPGRADE_REQUIRED                = 426;
-	const HTTP_PRECONDITION_REQUIRED           = 428;
-	const HTTP_TOO_MANY_REQUESTS               = 429;
-	const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS   = 451;
-	const HTTP_CLIENT_CLOSED_REQUEST           = 499;
-	const HTTP_INTERNAL_SERVER_ERROR           = 500;
-	const HTTP_NOT_IMPLEMENTED                 = 501;
-	const HTTP_BAD_GATEWAY                     = 502;
-	const HTTP_SERVICE_UNAVAILABLE             = 503;
-	const HTTP_GATEWAY_TIMEOUT                 = 504;
-	const HTTP_HTTP_VERSION_NOT_SUPPORTED      = 505;
-	const HTTP_VARIANT_ALSO_NEGOTIATES         = 506;
-	const HTTP_INSUFFICIENT_STORAGE            = 507;
-	const HTTP_LOOP_DETECTED                   = 508;
-	const HTTP_NOT_EXTENDED                    = 510;
-	const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
-	const HTTP_NETWORK_CONNECT_TIMEOUT_ERROR   = 599;
-
-	/**
-	 * Gets the response status code.
-	 *
-	 * The status code is a 3-digit integer result code of the getServer's attempt
-	 * to understand and satisfy the request.
-	 *
-	 * @return integer Status code.
-	 *
-	 * @deprecated To be replaced by the PSR-7 version (compatible)
-	 */
-	public function getStatusCode(): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return an instance with the specified status code and, optionally, reason phrase.
-	 *
-	 * If no reason phrase is specified, will default recommended reason phrase for
-	 * the response's status code.
-	 *
-	 * @see http://tools.ietf.org/html/rfc7231#section-6
-	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-	 *
-	 * @param integer $code   The 3-digit integer result code to set.
-	 * @param string  $reason The reason phrase to use with the
-	 *                        provided status code; if none is provided, will
-	 *                        default to the IANA name.
-	 *
-	 * @return self
-	 * @throws InvalidArgumentException For invalid status code arguments.
-	 */
-	public function setStatusCode(int $code, string $reason = '');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the response response phrase associated with the status code.
-	 *
-	 * @see http://tools.ietf.org/html/rfc7231#section-6
-	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-	 *
-	 * @return string
-	 *
-	 * @deprecated Use getReasonPhrase()
-	 */
-	public function getReason(): string;
-
-	//--------------------------------------------------------------------
-	// Convenience Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the date header
-	 *
-	 * @param DateTime $date
-	 *
-	 * @return ResponseInterface
-	 */
-	public function setDate(DateTime $date);
-
-	/**
-	 * Sets the Last-Modified date header.
-	 *
-	 * $date can be either a string representation of the date or,
-	 * preferably, an instance of DateTime.
-	 *
-	 * @param string|DateTime $date
-	 */
-	public function setLastModified($date);
-
-	/**
-	 * Set the Link Header
-	 *
-	 * @param PagerInterface $pager
-	 *
-	 * @see http://tools.ietf.org/html/rfc5988
-	 *
-	 * @return Response
-	 *
-	 * @todo Recommend moving to Pager
-	 */
-	public function setLink(PagerInterface $pager);
-
-	/**
-	 * Sets the Content Type header for this response with the mime type
-	 * and, optionally, the charset.
-	 *
-	 * @param string $mime
-	 * @param string $charset
-	 *
-	 * @return ResponseInterface
-	 */
-	public function setContentType(string $mime, string $charset = 'UTF-8');
-
-	//--------------------------------------------------------------------
-	// Formatter Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Converts the $body into JSON and sets the Content Type header.
-	 *
-	 * @param array|string $body
-	 * @param boolean      $unencoded
-	 *
-	 * @return $this
-	 */
-	public function setJSON($body, bool $unencoded = false);
-
-	/**
-	 * Returns the current body, converted to JSON is it isn't already.
-	 *
-	 * @return mixed|string
-	 *
-	 * @throws InvalidArgumentException If the body property is not array.
-	 */
-	public function getJSON();
-
-	/**
-	 * Converts $body into XML, and sets the correct Content-Type.
-	 *
-	 * @param array|string $body
-	 *
-	 * @return $this
-	 */
-	public function setXML($body);
-
-	/**
-	 * Retrieves the current body into XML and returns it.
-	 *
-	 * @return mixed|string
-	 * @throws InvalidArgumentException If the body property is not array.
-	 */
-	public function getXML();
-
-	//--------------------------------------------------------------------
-	// Cache Control Methods
-	//
-	// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the appropriate headers to ensure this response
-	 * is not cached by the browsers.
-	 */
-	public function noCache();
-
-	/**
-	 * A shortcut method that allows the developer to set all of the
-	 * cache-control headers in one method call.
-	 *
-	 * The options array is used to provide the cache-control directives
-	 * for the header. It might look something like:
-	 *
-	 *      $options = [
-	 *          'max-age'  => 300,
-	 *          's-maxage' => 900
-	 *          'etag'     => 'abcde',
-	 *      ];
-	 *
-	 * Typical options are:
-	 *  - etag
-	 *  - last-modified
-	 *  - max-age
-	 *  - s-maxage
-	 *  - private
-	 *  - public
-	 *  - must-revalidate
-	 *  - proxy-revalidate
-	 *  - no-transform
-	 *
-	 * @param array $options
-	 *
-	 * @return ResponseInterface
-	 */
-	public function setCache(array $options = []);
-
-	//--------------------------------------------------------------------
-	// Output Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sends the output to the browser.
-	 *
-	 * @return ResponseInterface
-	 */
-	public function send();
-
-	/**
-	 * Sends the headers of this HTTP request to the browser.
-	 *
-	 * @return Response
-	 */
-	public function sendHeaders();
-
-	/**
-	 * Sends the Body of the message to the browser.
-	 *
-	 * @return Response
-	 */
-	public function sendBody();
-
-	//--------------------------------------------------------------------
-	// Cookie Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set a cookie
-	 *
-	 * Accepts an arbitrary number of binds (up to 7) or an associative
-	 * array in the first parameter containing all the values.
-	 *
-	 * @param string|array $name     Cookie name or array containing binds
-	 * @param string       $value    Cookie value
-	 * @param string       $expire   Cookie expiration time in seconds
-	 * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
-	 * @param string       $path     Cookie path (default: '/')
-	 * @param string       $prefix   Cookie name prefix
-	 * @param boolean      $secure   Whether to only transfer cookies via SSL
-	 * @param boolean      $httponly Whether only make the cookie accessible via HTTP (no javascript)
-	 * @param string|null  $samesite
-	 *
-	 * @return $this
-	 */
-	public function setCookie(
-		$name,
-		$value = '',
-		$expire = '',
-		$domain = '',
-		$path = '/',
-		$prefix = '',
-		$secure = false,
-		$httponly = false,
-		$samesite = null
-	);
-
-	/**
-	 * Checks to see if the Response has a specified cookie or not.
-	 *
-	 * @param string      $name
-	 * @param string|null $value
-	 * @param string      $prefix
-	 *
-	 * @return boolean
-	 */
-	public function hasCookie(string $name, string $value = null, string $prefix = ''): bool;
-
-	/**
-	 * Returns the cookie
-	 *
-	 * @param string|null $name
-	 * @param string      $prefix
-	 *
-	 * @return Cookie[]|Cookie|null
-	 */
-	public function getCookie(string $name = null, string $prefix = '');
-
-	/**
-	 * Sets a cookie to be deleted when the response is sent.
-	 *
-	 * @param string $name
-	 * @param string $domain
-	 * @param string $path
-	 * @param string $prefix
-	 *
-	 * @return $this
-	 */
-	public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '');
-
-	/**
-	 * Returns all cookies currently set.
-	 *
-	 * @return Cookie[]
-	 */
-	public function getCookies();
-
-	//--------------------------------------------------------------------
-	// Response Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Perform a redirect to a new URL, in two flavors: header or location.
-	 *
-	 * @param string  $uri    The URI to redirect to
-	 * @param string  $method
-	 * @param integer $code   The type of redirection, defaults to 302
-	 *
-	 * @return $this
-	 * @throws HTTPException For invalid status code.
-	 */
-	public function redirect(string $uri, string $method = 'auto', int $code = null);
-
-	/**
-	 * Force a download.
-	 *
-	 * Generates the headers that force a download to happen. And
-	 * sends the file to the browser.
-	 *
-	 * @param string      $filename The path to the file to send
-	 * @param string|null $data     The data to be downloaded
-	 * @param boolean     $setMime  Whether to try and send the actual MIME type
-	 *
-	 * @return DownloadResponse|null
-	 */
-	public function download(string $filename = '', $data = '', bool $setMime = false);
+    /**
+     * Constants for status codes.
+     * From  https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
+     */
+    // Informational
+    public const HTTP_CONTINUE                        = 100;
+    public const HTTP_SWITCHING_PROTOCOLS             = 101;
+    public const HTTP_PROCESSING                      = 102;
+    public const HTTP_EARLY_HINTS                     = 103;
+    public const HTTP_OK                              = 200;
+    public const HTTP_CREATED                         = 201;
+    public const HTTP_ACCEPTED                        = 202;
+    public const HTTP_NONAUTHORITATIVE_INFORMATION    = 203;
+    public const HTTP_NO_CONTENT                      = 204;
+    public const HTTP_RESET_CONTENT                   = 205;
+    public const HTTP_PARTIAL_CONTENT                 = 206;
+    public const HTTP_MULTI_STATUS                    = 207;
+    public const HTTP_ALREADY_REPORTED                = 208;
+    public const HTTP_IM_USED                         = 226;
+    public const HTTP_MULTIPLE_CHOICES                = 300;
+    public const HTTP_MOVED_PERMANENTLY               = 301;
+    public const HTTP_FOUND                           = 302;
+    public const HTTP_SEE_OTHER                       = 303;
+    public const HTTP_NOT_MODIFIED                    = 304;
+    public const HTTP_USE_PROXY                       = 305;
+    public const HTTP_SWITCH_PROXY                    = 306;
+    public const HTTP_TEMPORARY_REDIRECT              = 307;
+    public const HTTP_PERMANENT_REDIRECT              = 308;
+    public const HTTP_BAD_REQUEST                     = 400;
+    public const HTTP_UNAUTHORIZED                    = 401;
+    public const HTTP_PAYMENT_REQUIRED                = 402;
+    public const HTTP_FORBIDDEN                       = 403;
+    public const HTTP_NOT_FOUND                       = 404;
+    public const HTTP_METHOD_NOT_ALLOWED              = 405;
+    public const HTTP_NOT_ACCEPTABLE                  = 406;
+    public const HTTP_PROXY_AUTHENTICATION_REQUIRED   = 407;
+    public const HTTP_REQUEST_TIMEOUT                 = 408;
+    public const HTTP_CONFLICT                        = 409;
+    public const HTTP_GONE                            = 410;
+    public const HTTP_LENGTH_REQUIRED                 = 411;
+    public const HTTP_PRECONDITION_FAILED             = 412;
+    public const HTTP_PAYLOAD_TOO_LARGE               = 413;
+    public const HTTP_URI_TOO_LONG                    = 414;
+    public const HTTP_UNSUPPORTED_MEDIA_TYPE          = 415;
+    public const HTTP_RANGE_NOT_SATISFIABLE           = 416;
+    public const HTTP_EXPECTATION_FAILED              = 417;
+    public const HTTP_IM_A_TEAPOT                     = 418;
+    public const HTTP_MISDIRECTED_REQUEST             = 421;
+    public const HTTP_UNPROCESSABLE_ENTITY            = 422;
+    public const HTTP_LOCKED                          = 423;
+    public const HTTP_FAILED_DEPENDENCY               = 424;
+    public const HTTP_TOO_EARLY                       = 425;
+    public const HTTP_UPGRADE_REQUIRED                = 426;
+    public const HTTP_PRECONDITION_REQUIRED           = 428;
+    public const HTTP_TOO_MANY_REQUESTS               = 429;
+    public const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    public const HTTP_UNAVAILABLE_FOR_LEGAL_REASONS   = 451;
+    public const HTTP_CLIENT_CLOSED_REQUEST           = 499;
+    public const HTTP_INTERNAL_SERVER_ERROR           = 500;
+    public const HTTP_NOT_IMPLEMENTED                 = 501;
+    public const HTTP_BAD_GATEWAY                     = 502;
+    public const HTTP_SERVICE_UNAVAILABLE             = 503;
+    public const HTTP_GATEWAY_TIMEOUT                 = 504;
+    public const HTTP_HTTP_VERSION_NOT_SUPPORTED      = 505;
+    public const HTTP_VARIANT_ALSO_NEGOTIATES         = 506;
+    public const HTTP_INSUFFICIENT_STORAGE            = 507;
+    public const HTTP_LOOP_DETECTED                   = 508;
+    public const HTTP_NOT_EXTENDED                    = 510;
+    public const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
+    public const HTTP_NETWORK_CONNECT_TIMEOUT_ERROR   = 599;
+
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the getServer's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     *
+     * @deprecated To be replaced by the PSR-7 version (compatible)
+     */
+    public function getStatusCode(): int;
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, will default recommended reason phrase for
+     * the response's status code.
+     *
+     * @see http://tools.ietf.org/html/rfc7231#section-6
+     * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     *
+     * @param int    $code   The 3-digit integer result code to set.
+     * @param string $reason The reason phrase to use with the
+     *                       provided status code; if none is provided, will
+     *                       default to the IANA name.
+     *
+     * @throws InvalidArgumentException For invalid status code arguments.
+     *
+     * @return self
+     */
+    public function setStatusCode(int $code, string $reason = '');
+
+    /**
+     * Gets the response response phrase associated with the status code.
+     *
+     * @see http://tools.ietf.org/html/rfc7231#section-6
+     * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @deprecated Use getReasonPhrase()
+     */
+    public function getReason(): string;
+
+    //--------------------------------------------------------------------
+    // Convenience Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the date header
+     *
+     * @return ResponseInterface
+     */
+    public function setDate(DateTime $date);
+
+    /**
+     * Sets the Last-Modified date header.
+     *
+     * $date can be either a string representation of the date or,
+     * preferably, an instance of DateTime.
+     *
+     * @param DateTime|string $date
+     */
+    public function setLastModified($date);
+
+    /**
+     * Set the Link Header
+     *
+     * @see http://tools.ietf.org/html/rfc5988
+     *
+     * @return Response
+     *
+     * @todo Recommend moving to Pager
+     */
+    public function setLink(PagerInterface $pager);
+
+    /**
+     * Sets the Content Type header for this response with the mime type
+     * and, optionally, the charset.
+     *
+     * @return ResponseInterface
+     */
+    public function setContentType(string $mime, string $charset = 'UTF-8');
+
+    //--------------------------------------------------------------------
+    // Formatter Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Converts the $body into JSON and sets the Content Type header.
+     *
+     * @param array|string $body
+     *
+     * @return $this
+     */
+    public function setJSON($body, bool $unencoded = false);
+
+    /**
+     * Returns the current body, converted to JSON is it isn't already.
+     *
+     * @throws InvalidArgumentException If the body property is not array.
+     *
+     * @return mixed|string
+     */
+    public function getJSON();
+
+    /**
+     * Converts $body into XML, and sets the correct Content-Type.
+     *
+     * @param array|string $body
+     *
+     * @return $this
+     */
+    public function setXML($body);
+
+    /**
+     * Retrieves the current body into XML and returns it.
+     *
+     * @throws InvalidArgumentException If the body property is not array.
+     *
+     * @return mixed|string
+     */
+    public function getXML();
+
+    //--------------------------------------------------------------------
+    // Cache Control Methods
+    //
+    // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the appropriate headers to ensure this response
+     * is not cached by the browsers.
+     */
+    public function noCache();
+
+    /**
+     * A shortcut method that allows the developer to set all of the
+     * cache-control headers in one method call.
+     *
+     * The options array is used to provide the cache-control directives
+     * for the header. It might look something like:
+     *
+     *      $options = [
+     *          'max-age'  => 300,
+     *          's-maxage' => 900
+     *          'etag'     => 'abcde',
+     *      ];
+     *
+     * Typical options are:
+     *  - etag
+     *  - last-modified
+     *  - max-age
+     *  - s-maxage
+     *  - private
+     *  - public
+     *  - must-revalidate
+     *  - proxy-revalidate
+     *  - no-transform
+     *
+     * @return ResponseInterface
+     */
+    public function setCache(array $options = []);
+
+    //--------------------------------------------------------------------
+    // Output Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Sends the output to the browser.
+     *
+     * @return ResponseInterface
+     */
+    public function send();
+
+    /**
+     * Sends the headers of this HTTP request to the browser.
+     *
+     * @return Response
+     */
+    public function sendHeaders();
+
+    /**
+     * Sends the Body of the message to the browser.
+     *
+     * @return Response
+     */
+    public function sendBody();
+
+    //--------------------------------------------------------------------
+    // Cookie Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Set a cookie
+     *
+     * Accepts an arbitrary number of binds (up to 7) or an associative
+     * array in the first parameter containing all the values.
+     *
+     * @param array|string $name     Cookie name or array containing binds
+     * @param string       $value    Cookie value
+     * @param string       $expire   Cookie expiration time in seconds
+     * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
+     * @param string       $path     Cookie path (default: '/')
+     * @param string       $prefix   Cookie name prefix
+     * @param bool         $secure   Whether to only transfer cookies via SSL
+     * @param bool         $httponly Whether only make the cookie accessible via HTTP (no javascript)
+     * @param string|null  $samesite
+     *
+     * @return $this
+     */
+    public function setCookie(
+        $name,
+        $value = '',
+        $expire = '',
+        $domain = '',
+        $path = '/',
+        $prefix = '',
+        $secure = false,
+        $httponly = false,
+        $samesite = null
+    );
+
+    /**
+     * Checks to see if the Response has a specified cookie or not.
+     */
+    public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool;
+
+    /**
+     * Returns the cookie
+     *
+     * @return Cookie|Cookie[]|null
+     */
+    public function getCookie(?string $name = null, string $prefix = '');
+
+    /**
+     * Sets a cookie to be deleted when the response is sent.
+     *
+     * @return $this
+     */
+    public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '');
+
+    /**
+     * Returns all cookies currently set.
+     *
+     * @return Cookie[]
+     */
+    public function getCookies();
+
+    //--------------------------------------------------------------------
+    // Response Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Perform a redirect to a new URL, in two flavors: header or location.
+     *
+     * @param string $uri  The URI to redirect to
+     * @param int    $code The type of redirection, defaults to 302
+     *
+     * @throws HTTPException For invalid status code.
+     *
+     * @return $this
+     */
+    public function redirect(string $uri, string $method = 'auto', ?int $code = null);
+
+    /**
+     * Force a download.
+     *
+     * Generates the headers that force a download to happen. And
+     * sends the file to the browser.
+     *
+     * @param string      $filename The path to the file to send
+     * @param string|null $data     The data to be downloaded
+     * @param bool        $setMime  Whether to try and send the actual MIME type
+     *
+     * @return DownloadResponse|null
+     */
+    public function download(string $filename = '', $data = '', bool $setMime = false);
 }
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 0938c5915882..2b1205a5d47a 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -33,763 +33,698 @@
  */
 trait ResponseTrait
 {
-	/**
-	 * Whether Content Security Policy is being enforced.
-	 *
-	 * @var boolean
-	 */
-	protected $CSPEnabled = false;
-
-	/**
-	 * Content security policy handler
-	 *
-	 * @var ContentSecurityPolicy
-	 */
-	public $CSP;
-
-	/**
-	 * CookieStore instance.
-	 *
-	 * @var CookieStore
-	 */
-	protected $cookieStore;
-
-	/**
-	 * Set a cookie name prefix if you need to avoid collisions
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookiePrefix = '';
-
-	/**
-	 * Set to .your-domain.com for site-wide cookies
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookieDomain = '';
-
-	/**
-	 * Typically will be a forward slash
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookiePath = '/';
-
-	/**
-	 * Cookie will only be set if a secure HTTPS connection exists.
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookieSecure = false;
-
-	/**
-	 * Cookie will only be accessible via HTTP(S) (no javascript)
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookieHTTPOnly = false;
-
-	/**
-	 * Cookie SameSite setting
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookieSameSite = Cookie::SAMESITE_LAX;
-
-	/**
-	 * Stores all cookies that were set in the response.
-	 *
-	 * @var array
-	 *
-	 * @deprecated Use the dedicated Cookie class instead.
-	 */
-	protected $cookies = [];
-
-	/**
-	 * Type of format the body is in.
-	 * Valid: html, json, xml
-	 *
-	 * @var string
-	 */
-	protected $bodyFormat = 'html';
-
-	/**
-	 * Return an instance with the specified status code and, optionally, reason phrase.
-	 *
-	 * If no reason phrase is specified, will default recommended reason phrase for
-	 * the response's status code.
-	 *
-	 * @see http://tools.ietf.org/html/rfc7231#section-6
-	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-	 *
-	 * @param integer $code   The 3-digit integer result code to set.
-	 * @param string  $reason The reason phrase to use with the
-	 *                        provided status code; if none is provided, will
-	 *                        default to the IANA name.
-	 *
-	 * @return $this
-	 * @throws HTTPException For invalid status code arguments.
-	 */
-	public function setStatusCode(int $code, string $reason = '')
-	{
-		// Valid range?
-		if ($code < 100 || $code > 599)
-		{
-			throw HTTPException::forInvalidStatusCode($code);
-		}
-
-		// Unknown and no message?
-		if (! array_key_exists($code, static::$statusCodes) && empty($reason))
-		{
-			throw HTTPException::forUnkownStatusCode($code);
-		}
-
-		$this->statusCode = $code;
-
-		$this->reason = ! empty($reason) ? $reason : static::$statusCodes[$code];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// Convenience Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the date header
-	 *
-	 * @param DateTime $date
-	 *
-	 * @return Response
-	 */
-	public function setDate(DateTime $date)
-	{
-		$date->setTimezone(new DateTimeZone('UTC'));
-
-		$this->setHeader('Date', $date->format('D, d M Y H:i:s') . ' GMT');
-
-		return $this;
-	}
-
-	/**
-	 * Set the Link Header
-	 *
-	 * @param PagerInterface $pager
-	 *
-	 * @see http://tools.ietf.org/html/rfc5988
-	 *
-	 * @return Response
-	 *
-	 * @todo Recommend moving to Pager
-	 */
-	public function setLink(PagerInterface $pager)
-	{
-		$links = '';
-
-		if ($previous = $pager->getPreviousPageURI())
-		{
-			$links .= '<' . $pager->getPageURI($pager->getFirstPage()) . '>; rel="first",';
-			$links .= '<' . $previous . '>; rel="prev"';
-		}
-
-		if (($next = $pager->getNextPageURI()) && $previous)
-		{
-			$links .= ',';
-		}
-
-		if ($next)
-		{
-			$links .= '<' . $next . '>; rel="next",';
-			$links .= '<' . $pager->getPageURI($pager->getLastPage()) . '>; rel="last"';
-		}
-
-		$this->setHeader('Link', $links);
-
-		return $this;
-	}
-
-	/**
-	 * Sets the Content Type header for this response with the mime type
-	 * and, optionally, the charset.
-	 *
-	 * @param string $mime
-	 * @param string $charset
-	 *
-	 * @return Response
-	 */
-	public function setContentType(string $mime, string $charset = 'UTF-8')
-	{
-		// add charset attribute if not already there and provided as parm
-		if ((strpos($mime, 'charset=') < 1) && ! empty($charset))
-		{
-			$mime .= '; charset=' . $charset;
-		}
-
-		$this->removeHeader('Content-Type'); // replace existing content type
-		$this->setHeader('Content-Type', $mime);
-
-		return $this;
-	}
-
-	/**
-	 * Converts the $body into JSON and sets the Content Type header.
-	 *
-	 * @param array|string $body
-	 * @param boolean      $unencoded
-	 *
-	 * @return $this
-	 */
-	public function setJSON($body, bool $unencoded = false)
-	{
-		$this->body = $this->formatBody($body, 'json' . ($unencoded ? '-unencoded' : ''));
-
-		return $this;
-	}
-
-	/**
-	 * Returns the current body, converted to JSON is it isn't already.
-	 *
-	 * @return mixed|string
-	 *
-	 * @throws InvalidArgumentException If the body property is not array.
-	 */
-	public function getJSON()
-	{
-		$body = $this->body;
-
-		if ($this->bodyFormat !== 'json')
-		{
-			$body = Services::format()->getFormatter('application/json')->format($body);
-		}
-
-		return $body ?: null;
-	}
-
-	/**
-	 * Converts $body into XML, and sets the correct Content-Type.
-	 *
-	 * @param array|string $body
-	 *
-	 * @return $this
-	 */
-	public function setXML($body)
-	{
-		$this->body = $this->formatBody($body, 'xml');
-
-		return $this;
-	}
-
-	/**
-	 * Retrieves the current body into XML and returns it.
-	 *
-	 * @return mixed|string
-	 * @throws InvalidArgumentException If the body property is not array.
-	 */
-	public function getXML()
-	{
-		$body = $this->body;
-
-		if ($this->bodyFormat !== 'xml')
-		{
-			$body = Services::format()->getFormatter('application/xml')->format($body);
-		}
-
-		return $body;
-	}
-
-	/**
-	 * Handles conversion of the of the data into the appropriate format,
-	 * and sets the correct Content-Type header for our response.
-	 *
-	 * @param string|array $body
-	 * @param string       $format Valid: json, xml
-	 *
-	 * @return mixed
-	 * @throws InvalidArgumentException If the body property is not string or array.
-	 */
-	protected function formatBody($body, string $format)
-	{
-		$this->bodyFormat = ($format === 'json-unencoded' ? 'json' : $format);
-		$mime             = "application/{$this->bodyFormat}";
-		$this->setContentType($mime);
-
-		// Nothing much to do for a string...
-		if (! is_string($body) || $format === 'json-unencoded')
-		{
-			$body = Services::format()->getFormatter($mime)->format($body);
-		}
-
-		return $body;
-	}
-
-	//--------------------------------------------------------------------
-	// Cache Control Methods
-	//
-	// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the appropriate headers to ensure this response
-	 * is not cached by the browsers.
-	 *
-	 * @return Response
-	 *
-	 * @todo Recommend researching these directives, might need: 'private', 'no-transform', 'no-store', 'must-revalidate'
-	 *
-	 * @see DownloadResponse::noCache()
-	 */
-	public function noCache()
-	{
-		$this->removeHeader('Cache-control');
-		$this->setHeader('Cache-control', ['no-store', 'max-age=0', 'no-cache']);
-
-		return $this;
-	}
-
-	/**
-	 * A shortcut method that allows the developer to set all of the
-	 * cache-control headers in one method call.
-	 *
-	 * The options array is used to provide the cache-control directives
-	 * for the header. It might look something like:
-	 *
-	 *      $options = [
-	 *          'max-age'  => 300,
-	 *          's-maxage' => 900
-	 *          'etag'     => 'abcde',
-	 *      ];
-	 *
-	 * Typical options are:
-	 *  - etag
-	 *  - last-modified
-	 *  - max-age
-	 *  - s-maxage
-	 *  - private
-	 *  - public
-	 *  - must-revalidate
-	 *  - proxy-revalidate
-	 *  - no-transform
-	 *
-	 * @param array $options
-	 *
-	 * @return Response
-	 */
-	public function setCache(array $options = [])
-	{
-		if (empty($options))
-		{
-			return $this;
-		}
-
-		$this->removeHeader('Cache-Control');
-		$this->removeHeader('ETag');
-
-		// ETag
-		if (isset($options['etag']))
-		{
-			$this->setHeader('ETag', $options['etag']);
-			unset($options['etag']);
-		}
-
-		// Last Modified
-		if (isset($options['last-modified']))
-		{
-			$this->setLastModified($options['last-modified']);
-
-			unset($options['last-modified']);
-		}
-
-		$this->setHeader('Cache-control', $options);
-
-		return $this;
-	}
-
-	/**
-	 * Sets the Last-Modified date header.
-	 *
-	 * $date can be either a string representation of the date or,
-	 * preferably, an instance of DateTime.
-	 *
-	 * @param DateTime|string $date
-	 *
-	 * @return Response
-	 */
-	public function setLastModified($date)
-	{
-		if ($date instanceof DateTime)
-		{
-			$date->setTimezone(new DateTimeZone('UTC'));
-			$this->setHeader('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
-		}
-		elseif (is_string($date))
-		{
-			$this->setHeader('Last-Modified', $date);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// Output Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sends the output to the browser.
-	 *
-	 * @return Response
-	 */
-	public function send()
-	{
-		// If we're enforcing a Content Security Policy,
-		// we need to give it a chance to build out it's headers.
-		if ($this->CSPEnabled === true)
-		{
-			$this->CSP->finalize($this);
-		}
-		else
-		{
-			$this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
-		}
-
-		$this->sendHeaders();
-		$this->sendCookies();
-		$this->sendBody();
-
-		return $this;
-	}
-
-	/**
-	 * Sends the headers of this HTTP request to the browser.
-	 *
-	 * @return Response
-	 */
-	public function sendHeaders()
-	{
-		// Have the headers already been sent?
-		if ($this->pretend || headers_sent())
-		{
-			return $this;
-		}
-
-		// Per spec, MUST be sent with each request, if possible.
-		// http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
-		if (! isset($this->headers['Date']) && php_sapi_name() !== 'cli-server')
-		{
-			$this->setDate(DateTime::createFromFormat('U', (string) time()));
-		}
-
-		// HTTP Status
-		header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReason()), true, $this->getStatusCode());
-
-		// Send all of our headers
-		foreach (array_keys($this->getHeaders()) as $name)
-		{
-			header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sends the Body of the message to the browser.
-	 *
-	 * @return Response
-	 */
-	public function sendBody()
-	{
-		echo $this->body;
-
-		return $this;
-	}
-
-	/**
-	 * Perform a redirect to a new URL, in two flavors: header or location.
-	 *
-	 * @param string  $uri    The URI to redirect to
-	 * @param string  $method
-	 * @param integer $code   The type of redirection, defaults to 302
-	 *
-	 * @return $this
-	 * @throws HTTPException For invalid status code.
-	 */
-	public function redirect(string $uri, string $method = 'auto', int $code = null)
-	{
-		// Assume 302 status code response; override if needed
-		if (empty($code))
-		{
-			$code = 302;
-		}
-
-		// IIS environment likely? Use 'refresh' for better compatibility
-		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false)
-		{
-			$method = 'refresh';
-		}
-
-		// override status code for HTTP/1.1 & higher
-		// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
-		if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $this->getProtocolVersion() >= 1.1 && $method !== 'refresh')
-		{
-			$code = ($_SERVER['REQUEST_METHOD'] !== 'GET') ? 303 : ($code === 302 ? 307 : $code);
-		}
-
-		switch ($method)
-		{
-			case 'refresh':
-				$this->setHeader('Refresh', '0;url=' . $uri);
-				break;
-			default:
-				$this->setHeader('Location', $uri);
-				break;
-		}
-
-		$this->setStatusCode($code);
-
-		return $this;
-	}
-
-	/**
-	 * Set a cookie
-	 *
-	 * Accepts an arbitrary number of binds (up to 7) or an associative
-	 * array in the first parameter containing all the values.
-	 *
-	 * @param string|array $name     Cookie name or array containing binds
-	 * @param string       $value    Cookie value
-	 * @param string       $expire   Cookie expiration time in seconds
-	 * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
-	 * @param string       $path     Cookie path (default: '/')
-	 * @param string       $prefix   Cookie name prefix
-	 * @param boolean      $secure   Whether to only transfer cookies via SSL
-	 * @param boolean      $httponly Whether only make the cookie accessible via HTTP (no javascript)
-	 * @param string|null  $samesite
-	 *
-	 * @return $this
-	 */
-	public function setCookie(
-		$name,
-		$value = '',
-		$expire = '',
-		$domain = '',
-		$path = '/',
-		$prefix = '',
-		$secure = false,
-		$httponly = false,
-		$samesite = null
-	)
-	{
-		if (is_array($name))
-		{
-			// always leave 'name' in last place, as the loop will break otherwise, due to $$item
-			foreach (['samesite', 'value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item)
-			{
-				if (isset($name[$item]))
-				{
-					$$item = $name[$item];
-				}
-			}
-		}
-
-		if (is_numeric($expire))
-		{
-			$expire = $expire > 0 ? time() + $expire : 0;
-		}
-
-		$cookie = new Cookie($name, $value, [
-			'expires'  => $expire ?: 0,
-			'domain'   => $domain,
-			'path'     => $path,
-			'prefix'   => $prefix,
-			'secure'   => $secure,
-			'httponly' => $httponly,
-			'samesite' => $samesite ?? '',
-		]);
-
-		$this->cookieStore = $this->cookieStore->put($cookie);
-
-		return $this;
-	}
-
-	/**
-	 * Returns the `CookieStore` instance.
-	 *
-	 * @return CookieStore
-	 */
-	public function getCookieStore()
-	{
-		return $this->cookieStore;
-	}
-
-	/**
-	 * Checks to see if the Response has a specified cookie or not.
-	 *
-	 * @param string      $name
-	 * @param string|null $value
-	 * @param string      $prefix
-	 *
-	 * @return boolean
-	 */
-	public function hasCookie(string $name, string $value = null, string $prefix = ''): bool
-	{
-		$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
-
-		return $this->cookieStore->has($name, $prefix, $value);
-	}
-
-	/**
-	 * Returns the cookie
-	 *
-	 * @param string|null $name
-	 * @param string      $prefix
-	 *
-	 * @return Cookie[]|Cookie|null
-	 */
-	public function getCookie(string $name = null, string $prefix = '')
-	{
-		if ((string) $name === '')
-		{
-			return $this->cookieStore->display();
-		}
-
-		try
-		{
-			$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
-
-			return $this->cookieStore->get($name, $prefix);
-		}
-		catch (CookieException $e)
-		{
-			log_message('error', $e->getMessage());
-			return null;
-		}
-	}
-
-	/**
-	 * Sets a cookie to be deleted when the response is sent.
-	 *
-	 * @param string $name
-	 * @param string $domain
-	 * @param string $path
-	 * @param string $prefix
-	 *
-	 * @return $this
-	 */
-	public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '')
-	{
-		if ($name === '')
-		{
-			return $this;
-		}
-
-		$prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
-
-		$prefixed = $prefix . $name;
-		$store    = $this->cookieStore;
-		$found    = false;
-
-		foreach ($store as $cookie)
-		{
-			if ($cookie->getPrefixedName() === $prefixed)
-			{
-				if ($domain !== $cookie->getDomain())
-				{
-					continue;
-				}
-
-				if ($path !== $cookie->getPath())
-				{
-					continue;
-				}
-
-				$cookie = $cookie->withValue('')->withExpired();
-				$found  = true;
-
-				$this->cookieStore = $store->put($cookie);
-				break;
-			}
-		}
-
-		if (! $found)
-		{
-			$this->setCookie($name, '', '', $domain, $path, $prefix);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns all cookies currently set.
-	 *
-	 * @return Cookie[]
-	 */
-	public function getCookies()
-	{
-		return $this->cookieStore->display();
-	}
-
-	/**
-	 * Actually sets the cookies.
-	 */
-	protected function sendCookies()
-	{
-		if ($this->pretend)
-		{
-			return;
-		}
-
-		$this->cookieStore->dispatch();
-	}
-
-	/**
-	 * Force a download.
-	 *
-	 * Generates the headers that force a download to happen. And
-	 * sends the file to the browser.
-	 *
-	 * @param string      $filename The path to the file to send
-	 * @param string|null $data     The data to be downloaded
-	 * @param boolean     $setMime  Whether to try and send the actual MIME type
-	 *
-	 * @return DownloadResponse|null
-	 */
-	public function download(string $filename = '', $data = '', bool $setMime = false)
-	{
-		if ($filename === '' || $data === '')
-		{
-			return null;
-		}
-
-		$filepath = '';
-		if ($data === null)
-		{
-			$filepath = $filename;
-			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
-			$filename = end($filename);
-		}
-
-		$response = new DownloadResponse($filename, $setMime);
-
-		if ($filepath !== '')
-		{
-			$response->setFilePath($filepath);
-		}
-		elseif ($data !== null)
-		{
-			$response->setBinary($data);
-		}
-
-		return $response;
-	}
+    /**
+     * Whether Content Security Policy is being enforced.
+     *
+     * @var bool
+     */
+    protected $CSPEnabled = false;
+
+    /**
+     * Content security policy handler
+     *
+     * @var ContentSecurityPolicy
+     */
+    public $CSP;
+
+    /**
+     * CookieStore instance.
+     *
+     * @var CookieStore
+     */
+    protected $cookieStore;
+
+    /**
+     * Set a cookie name prefix if you need to avoid collisions
+     *
+     * @var string
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookiePrefix = '';
+
+    /**
+     * Set to .your-domain.com for site-wide cookies
+     *
+     * @var string
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookieDomain = '';
+
+    /**
+     * Typically will be a forward slash
+     *
+     * @var string
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookiePath = '/';
+
+    /**
+     * Cookie will only be set if a secure HTTPS connection exists.
+     *
+     * @var bool
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookieSecure = false;
+
+    /**
+     * Cookie will only be accessible via HTTP(S) (no javascript)
+     *
+     * @var bool
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookieHTTPOnly = false;
+
+    /**
+     * Cookie SameSite setting
+     *
+     * @var string
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookieSameSite = Cookie::SAMESITE_LAX;
+
+    /**
+     * Stores all cookies that were set in the response.
+     *
+     * @var array
+     *
+     * @deprecated Use the dedicated Cookie class instead.
+     */
+    protected $cookies = [];
+
+    /**
+     * Type of format the body is in.
+     * Valid: html, json, xml
+     *
+     * @var string
+     */
+    protected $bodyFormat = 'html';
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, will default recommended reason phrase for
+     * the response's status code.
+     *
+     * @see http://tools.ietf.org/html/rfc7231#section-6
+     * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     *
+     * @param int    $code   The 3-digit integer result code to set.
+     * @param string $reason The reason phrase to use with the
+     *                       provided status code; if none is provided, will
+     *                       default to the IANA name.
+     *
+     * @throws HTTPException For invalid status code arguments.
+     *
+     * @return $this
+     */
+    public function setStatusCode(int $code, string $reason = '')
+    {
+        // Valid range?
+        if ($code < 100 || $code > 599) {
+            throw HTTPException::forInvalidStatusCode($code);
+        }
+
+        // Unknown and no message?
+        if (! array_key_exists($code, static::$statusCodes) && empty($reason)) {
+            throw HTTPException::forUnkownStatusCode($code);
+        }
+
+        $this->statusCode = $code;
+
+        $this->reason = ! empty($reason) ? $reason : static::$statusCodes[$code];
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Convenience Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the date header
+     *
+     * @return Response
+     */
+    public function setDate(DateTime $date)
+    {
+        $date->setTimezone(new DateTimeZone('UTC'));
+
+        $this->setHeader('Date', $date->format('D, d M Y H:i:s') . ' GMT');
+
+        return $this;
+    }
+
+    /**
+     * Set the Link Header
+     *
+     * @see http://tools.ietf.org/html/rfc5988
+     *
+     * @return Response
+     *
+     * @todo Recommend moving to Pager
+     */
+    public function setLink(PagerInterface $pager)
+    {
+        $links = '';
+
+        if ($previous = $pager->getPreviousPageURI()) {
+            $links .= '<' . $pager->getPageURI($pager->getFirstPage()) . '>; rel="first",';
+            $links .= '<' . $previous . '>; rel="prev"';
+        }
+
+        if (($next = $pager->getNextPageURI()) && $previous) {
+            $links .= ',';
+        }
+
+        if ($next) {
+            $links .= '<' . $next . '>; rel="next",';
+            $links .= '<' . $pager->getPageURI($pager->getLastPage()) . '>; rel="last"';
+        }
+
+        $this->setHeader('Link', $links);
+
+        return $this;
+    }
+
+    /**
+     * Sets the Content Type header for this response with the mime type
+     * and, optionally, the charset.
+     *
+     * @return Response
+     */
+    public function setContentType(string $mime, string $charset = 'UTF-8')
+    {
+        // add charset attribute if not already there and provided as parm
+        if ((strpos($mime, 'charset=') < 1) && ! empty($charset)) {
+            $mime .= '; charset=' . $charset;
+        }
+
+        $this->removeHeader('Content-Type'); // replace existing content type
+        $this->setHeader('Content-Type', $mime);
+
+        return $this;
+    }
+
+    /**
+     * Converts the $body into JSON and sets the Content Type header.
+     *
+     * @param array|string $body
+     *
+     * @return $this
+     */
+    public function setJSON($body, bool $unencoded = false)
+    {
+        $this->body = $this->formatBody($body, 'json' . ($unencoded ? '-unencoded' : ''));
+
+        return $this;
+    }
+
+    /**
+     * Returns the current body, converted to JSON is it isn't already.
+     *
+     * @throws InvalidArgumentException If the body property is not array.
+     *
+     * @return mixed|string
+     */
+    public function getJSON()
+    {
+        $body = $this->body;
+
+        if ($this->bodyFormat !== 'json') {
+            $body = Services::format()->getFormatter('application/json')->format($body);
+        }
+
+        return $body ?: null;
+    }
+
+    /**
+     * Converts $body into XML, and sets the correct Content-Type.
+     *
+     * @param array|string $body
+     *
+     * @return $this
+     */
+    public function setXML($body)
+    {
+        $this->body = $this->formatBody($body, 'xml');
+
+        return $this;
+    }
+
+    /**
+     * Retrieves the current body into XML and returns it.
+     *
+     * @throws InvalidArgumentException If the body property is not array.
+     *
+     * @return mixed|string
+     */
+    public function getXML()
+    {
+        $body = $this->body;
+
+        if ($this->bodyFormat !== 'xml') {
+            $body = Services::format()->getFormatter('application/xml')->format($body);
+        }
+
+        return $body;
+    }
+
+    /**
+     * Handles conversion of the of the data into the appropriate format,
+     * and sets the correct Content-Type header for our response.
+     *
+     * @param array|string $body
+     * @param string       $format Valid: json, xml
+     *
+     * @throws InvalidArgumentException If the body property is not string or array.
+     *
+     * @return mixed
+     */
+    protected function formatBody($body, string $format)
+    {
+        $this->bodyFormat = ($format === 'json-unencoded' ? 'json' : $format);
+        $mime             = "application/{$this->bodyFormat}";
+        $this->setContentType($mime);
+
+        // Nothing much to do for a string...
+        if (! is_string($body) || $format === 'json-unencoded') {
+            $body = Services::format()->getFormatter($mime)->format($body);
+        }
+
+        return $body;
+    }
+
+    //--------------------------------------------------------------------
+    // Cache Control Methods
+    //
+    // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the appropriate headers to ensure this response
+     * is not cached by the browsers.
+     *
+     * @return Response
+     *
+     * @todo Recommend researching these directives, might need: 'private', 'no-transform', 'no-store', 'must-revalidate'
+     *
+     * @see DownloadResponse::noCache()
+     */
+    public function noCache()
+    {
+        $this->removeHeader('Cache-control');
+        $this->setHeader('Cache-control', ['no-store', 'max-age=0', 'no-cache']);
+
+        return $this;
+    }
+
+    /**
+     * A shortcut method that allows the developer to set all of the
+     * cache-control headers in one method call.
+     *
+     * The options array is used to provide the cache-control directives
+     * for the header. It might look something like:
+     *
+     *      $options = [
+     *          'max-age'  => 300,
+     *          's-maxage' => 900
+     *          'etag'     => 'abcde',
+     *      ];
+     *
+     * Typical options are:
+     *  - etag
+     *  - last-modified
+     *  - max-age
+     *  - s-maxage
+     *  - private
+     *  - public
+     *  - must-revalidate
+     *  - proxy-revalidate
+     *  - no-transform
+     *
+     * @return Response
+     */
+    public function setCache(array $options = [])
+    {
+        if (empty($options)) {
+            return $this;
+        }
+
+        $this->removeHeader('Cache-Control');
+        $this->removeHeader('ETag');
+
+        // ETag
+        if (isset($options['etag'])) {
+            $this->setHeader('ETag', $options['etag']);
+            unset($options['etag']);
+        }
+
+        // Last Modified
+        if (isset($options['last-modified'])) {
+            $this->setLastModified($options['last-modified']);
+
+            unset($options['last-modified']);
+        }
+
+        $this->setHeader('Cache-control', $options);
+
+        return $this;
+    }
+
+    /**
+     * Sets the Last-Modified date header.
+     *
+     * $date can be either a string representation of the date or,
+     * preferably, an instance of DateTime.
+     *
+     * @param DateTime|string $date
+     *
+     * @return Response
+     */
+    public function setLastModified($date)
+    {
+        if ($date instanceof DateTime) {
+            $date->setTimezone(new DateTimeZone('UTC'));
+            $this->setHeader('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
+        } elseif (is_string($date)) {
+            $this->setHeader('Last-Modified', $date);
+        }
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Output Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Sends the output to the browser.
+     *
+     * @return Response
+     */
+    public function send()
+    {
+        // If we're enforcing a Content Security Policy,
+        // we need to give it a chance to build out it's headers.
+        if ($this->CSPEnabled === true) {
+            $this->CSP->finalize($this);
+        } else {
+            $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
+        }
+
+        $this->sendHeaders();
+        $this->sendCookies();
+        $this->sendBody();
+
+        return $this;
+    }
+
+    /**
+     * Sends the headers of this HTTP request to the browser.
+     *
+     * @return Response
+     */
+    public function sendHeaders()
+    {
+        // Have the headers already been sent?
+        if ($this->pretend || headers_sent()) {
+            return $this;
+        }
+
+        // Per spec, MUST be sent with each request, if possible.
+        // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html
+        if (! isset($this->headers['Date']) && PHP_SAPI !== 'cli-server') {
+            $this->setDate(DateTime::createFromFormat('U', (string) time()));
+        }
+
+        // HTTP Status
+        header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReason()), true, $this->getStatusCode());
+
+        // Send all of our headers
+        foreach (array_keys($this->getHeaders()) as $name) {
+            header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sends the Body of the message to the browser.
+     *
+     * @return Response
+     */
+    public function sendBody()
+    {
+        echo $this->body;
+
+        return $this;
+    }
+
+    /**
+     * Perform a redirect to a new URL, in two flavors: header or location.
+     *
+     * @param string $uri  The URI to redirect to
+     * @param int    $code The type of redirection, defaults to 302
+     *
+     * @throws HTTPException For invalid status code.
+     *
+     * @return $this
+     */
+    public function redirect(string $uri, string $method = 'auto', ?int $code = null)
+    {
+        // Assume 302 status code response; override if needed
+        if (empty($code)) {
+            $code = 302;
+        }
+
+        // IIS environment likely? Use 'refresh' for better compatibility
+        if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== false) {
+            $method = 'refresh';
+        }
+
+        // override status code for HTTP/1.1 & higher
+        // reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
+        if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $this->getProtocolVersion() >= 1.1 && $method !== 'refresh') {
+            $code = ($_SERVER['REQUEST_METHOD'] !== 'GET') ? 303 : ($code === 302 ? 307 : $code);
+        }
+
+        switch ($method) {
+            case 'refresh':
+                $this->setHeader('Refresh', '0;url=' . $uri);
+                break;
+
+            default:
+                $this->setHeader('Location', $uri);
+                break;
+        }
+
+        $this->setStatusCode($code);
+
+        return $this;
+    }
+
+    /**
+     * Set a cookie
+     *
+     * Accepts an arbitrary number of binds (up to 7) or an associative
+     * array in the first parameter containing all the values.
+     *
+     * @param array|string $name     Cookie name or array containing binds
+     * @param string       $value    Cookie value
+     * @param string       $expire   Cookie expiration time in seconds
+     * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
+     * @param string       $path     Cookie path (default: '/')
+     * @param string       $prefix   Cookie name prefix
+     * @param bool         $secure   Whether to only transfer cookies via SSL
+     * @param bool         $httponly Whether only make the cookie accessible via HTTP (no javascript)
+     * @param string|null  $samesite
+     *
+     * @return $this
+     */
+    public function setCookie(
+        $name,
+        $value = '',
+        $expire = '',
+        $domain = '',
+        $path = '/',
+        $prefix = '',
+        $secure = false,
+        $httponly = false,
+        $samesite = null
+    ) {
+        if (is_array($name)) {
+            // always leave 'name' in last place, as the loop will break otherwise, due to $$item
+            foreach (['samesite', 'value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item) {
+                if (isset($name[$item])) {
+                    ${$item} = $name[$item];
+                }
+            }
+        }
+
+        if (is_numeric($expire)) {
+            $expire = $expire > 0 ? time() + $expire : 0;
+        }
+
+        $cookie = new Cookie($name, $value, [
+            'expires'  => $expire ?: 0,
+            'domain'   => $domain,
+            'path'     => $path,
+            'prefix'   => $prefix,
+            'secure'   => $secure,
+            'httponly' => $httponly,
+            'samesite' => $samesite ?? '',
+        ]);
+
+        $this->cookieStore = $this->cookieStore->put($cookie);
+
+        return $this;
+    }
+
+    /**
+     * Returns the `CookieStore` instance.
+     *
+     * @return CookieStore
+     */
+    public function getCookieStore()
+    {
+        return $this->cookieStore;
+    }
+
+    /**
+     * Checks to see if the Response has a specified cookie or not.
+     */
+    public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool
+    {
+        $prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+        return $this->cookieStore->has($name, $prefix, $value);
+    }
+
+    /**
+     * Returns the cookie
+     *
+     * @return Cookie|Cookie[]|null
+     */
+    public function getCookie(?string $name = null, string $prefix = '')
+    {
+        if ((string) $name === '') {
+            return $this->cookieStore->display();
+        }
+
+        try {
+            $prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+            return $this->cookieStore->get($name, $prefix);
+        } catch (CookieException $e) {
+            log_message('error', $e->getMessage());
+
+            return null;
+        }
+    }
+
+    /**
+     * Sets a cookie to be deleted when the response is sent.
+     *
+     * @return $this
+     */
+    public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '')
+    {
+        if ($name === '') {
+            return $this;
+        }
+
+        $prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
+
+        $prefixed = $prefix . $name;
+        $store    = $this->cookieStore;
+        $found    = false;
+
+        foreach ($store as $cookie) {
+            if ($cookie->getPrefixedName() === $prefixed) {
+                if ($domain !== $cookie->getDomain()) {
+                    continue;
+                }
+
+                if ($path !== $cookie->getPath()) {
+                    continue;
+                }
+
+                $cookie = $cookie->withValue('')->withExpired();
+                $found  = true;
+
+                $this->cookieStore = $store->put($cookie);
+                break;
+            }
+        }
+
+        if (! $found) {
+            $this->setCookie($name, '', '', $domain, $path, $prefix);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns all cookies currently set.
+     *
+     * @return Cookie[]
+     */
+    public function getCookies()
+    {
+        return $this->cookieStore->display();
+    }
+
+    /**
+     * Actually sets the cookies.
+     */
+    protected function sendCookies()
+    {
+        if ($this->pretend) {
+            return;
+        }
+
+        $this->cookieStore->dispatch();
+    }
+
+    /**
+     * Force a download.
+     *
+     * Generates the headers that force a download to happen. And
+     * sends the file to the browser.
+     *
+     * @param string      $filename The path to the file to send
+     * @param string|null $data     The data to be downloaded
+     * @param bool        $setMime  Whether to try and send the actual MIME type
+     *
+     * @return DownloadResponse|null
+     */
+    public function download(string $filename = '', $data = '', bool $setMime = false)
+    {
+        if ($filename === '' || $data === '') {
+            return null;
+        }
+
+        $filepath = '';
+        if ($data === null) {
+            $filepath = $filename;
+            $filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
+            $filename = end($filename);
+        }
+
+        $response = new DownloadResponse($filename, $setMime);
+
+        if ($filepath !== '') {
+            $response->setFilePath($filepath);
+        } elseif ($data !== null) {
+            $response->setBinary($data);
+        }
+
+        return $response;
+    }
 }
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 3fc44343f73a..c7bdbb135354 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -19,1228 +19,1027 @@
  */
 class URI
 {
-	/**
-	 * Sub-delimiters used in query strings and fragments.
-	 */
-	const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
-
-	/**
-	 * Unreserved characters used in paths, query strings, and fragments.
-	 */
-	const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
-
-	/**
-	 * Current URI string
-	 *
-	 * @var string
-	 */
-	protected $uriString;
-
-	/**
-	 * List of URI segments.
-	 *
-	 * Starts at 1 instead of 0
-	 *
-	 * @var array
-	 */
-	protected $segments = [];
-
-	/**
-	 * The URI Scheme.
-	 *
-	 * @var string
-	 */
-	protected $scheme = 'http';
-
-	/**
-	 * URI User Info
-	 *
-	 * @var string
-	 */
-	protected $user;
-
-	/**
-	 * URI User Password
-	 *
-	 * @var string
-	 */
-	protected $password;
-
-	/**
-	 * URI Host
-	 *
-	 * @var string
-	 */
-	protected $host;
-
-	/**
-	 * URI Port
-	 *
-	 * @var integer
-	 */
-	protected $port;
-
-	/**
-	 * URI path.
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * The name of any fragment.
-	 *
-	 * @var string
-	 */
-	protected $fragment = '';
-
-	/**
-	 * The query string.
-	 *
-	 * @var array
-	 */
-	protected $query = [];
-
-	/**
-	 * Default schemes/ports.
-	 *
-	 * @var array
-	 */
-	protected $defaultPorts = [
-		'http'  => 80,
-		'https' => 443,
-		'ftp'   => 21,
-		'sftp'  => 22,
-	];
-
-	/**
-	 * Whether passwords should be shown in userInfo/authority calls.
-	 * Default to false because URIs often show up in logs
-	 *
-	 * @var boolean
-	 */
-	protected $showPassword = false;
-
-	/**
-	 * If true, will continue instead of throwing exceptions.
-	 *
-	 * @var boolean
-	 */
-	protected $silent = false;
-
-	/**
-	 * If true, will use raw query string.
-	 *
-	 * @var boolean
-	 */
-	protected $rawQueryString = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Builds a representation of the string from the component parts.
-	 *
-	 * @param string $scheme
-	 * @param string $authority
-	 * @param string $path
-	 * @param string $query
-	 * @param string $fragment
-	 *
-	 * @return string
-	 */
-	public static function createURIString(string $scheme = null, string $authority = null, string $path = null, string $query = null, string $fragment = null): string
-	{
-		$uri = '';
-		if (! empty($scheme))
-		{
-			$uri .= $scheme . '://';
-		}
-
-		if (! empty($authority))
-		{
-			$uri .= $authority;
-		}
-
-		if (isset($path) && $path !== '')
-		{
-			$uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
-		}
-
-		if ($query)
-		{
-			$uri .= '?' . $query;
-		}
-
-		if ($fragment)
-		{
-			$uri .= '#' . $fragment;
-		}
-
-		return $uri;
-	}
-
-	/**
-	 * Used when resolving and merging paths to correctly interpret and
-	 * remove single and double dot segments from the path per
-	 * RFC 3986 Section 5.2.4
-	 *
-	 * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
-	 *
-	 * @param string $path
-	 *
-	 * @return   string
-	 * @internal
-	 */
-	public static function removeDotSegments(string $path): string
-	{
-		if ($path === '' || $path === '/')
-		{
-			return $path;
-		}
-
-		$output = [];
-
-		$input = explode('/', $path);
-
-		if ($input[0] === '')
-		{
-			unset($input[0]);
-			$input = array_values($input);
-		}
-
-		// This is not a perfect representation of the
-		// RFC, but matches most cases and is pretty
-		// much what Guzzle uses. Should be good enough
-		// for almost every real use case.
-		foreach ($input as $segment)
-		{
-			if ($segment === '..')
-			{
-				array_pop($output);
-			}
-			elseif ($segment !== '.' && $segment !== '')
-			{
-				$output[] = $segment;
-			}
-		}
-
-		$output = implode('/', $output);
-		$output = trim($output, '/ ');
-
-		// Add leading slash if necessary
-		if (strpos($path, '/') === 0)
-		{
-			$output = '/' . $output;
-		}
-
-		// Add trailing slash if necessary
-		if ($output !== '/' && substr($path, -1, 1) === '/')
-		{
-			$output .= '/';
-		}
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param string $uri
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function __construct(string $uri = null)
-	{
-		if (! is_null($uri))
-		{
-			$this->setURI($uri);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If $silent == true, then will not throw exceptions and will
-	 * attempt to continue gracefully.
-	 *
-	 * @param boolean $silent
-	 *
-	 * @return URI
-	 */
-	public function setSilent(bool $silent = true)
-	{
-		$this->silent = $silent;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If $raw == true, then will use parseStr() method
-	 * instead of native parse_str() function.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return URI
-	 */
-	public function useRawQueryString(bool $raw = true)
-	{
-		$this->rawQueryString = $raw;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets and overwrites any current URI information.
-	 *
-	 * @param string|null $uri
-	 *
-	 * @return URI
-	 */
-	public function setURI(string $uri = null)
-	{
-		if (! is_null($uri))
-		{
-			$parts = parse_url($uri);
-
-			if ($parts === false)
-			{
-				if ($this->silent)
-				{
-					return $this;
-				}
-
-				throw HTTPException::forUnableToParseURI($uri);
-			}
-
-			$this->applyParts($parts);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the scheme component of the URI.
-	 *
-	 * If no scheme is present, this method MUST return an empty string.
-	 *
-	 * The value returned MUST be normalized to lowercase, per RFC 3986
-	 * Section 3.1.
-	 *
-	 * The trailing ":" character is not part of the scheme and MUST NOT be
-	 * added.
-	 *
-	 * @see    https://tools.ietf.org/html/rfc3986#section-3.1
-	 * @return string The URI scheme.
-	 */
-	public function getScheme(): string
-	{
-		return $this->scheme;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the authority component of the URI.
-	 *
-	 * If no authority information is present, this method MUST return an empty
-	 * string.
-	 *
-	 * The authority syntax of the URI is:
-	 *
-	 * <pre>
-	 * [user-info@]host[:port]
-	 * </pre>
-	 *
-	 * If the port component is not set or is the standard port for the current
-	 * scheme, it SHOULD NOT be included.
-	 *
-	 * @see https://tools.ietf.org/html/rfc3986#section-3.2
-	 *
-	 * @param boolean $ignorePort
-	 *
-	 * @return string The URI authority, in "[user-info@]host[:port]" format.
-	 */
-	public function getAuthority(bool $ignorePort = false): string
-	{
-		if (empty($this->host))
-		{
-			return '';
-		}
-
-		$authority = $this->host;
-
-		if (! empty($this->getUserInfo()))
-		{
-			$authority = $this->getUserInfo() . '@' . $authority;
-		}
-
-		// Don't add port if it's a standard port for
-		// this scheme
-		if (! empty($this->port) && ! $ignorePort && $this->port !== $this->defaultPorts[$this->scheme])
-		{
-			$authority .= ':' . $this->port;
-		}
-
-		$this->showPassword = false;
-
-		return $authority;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the user information component of the URI.
-	 *
-	 * If no user information is present, this method MUST return an empty
-	 * string.
-	 *
-	 * If a user is present in the URI, this will return that value;
-	 * additionally, if the password is also present, it will be appended to the
-	 * user value, with a colon (":") separating the values.
-	 *
-	 * NOTE that be default, the password, if available, will NOT be shown
-	 * as a security measure as discussed in RFC 3986, Section 7.5. If you know
-	 * the password is not a security issue, you can force it to be shown
-	 * with $this->showPassword();
-	 *
-	 * The trailing "@" character is not part of the user information and MUST
-	 * NOT be added.
-	 *
-	 * @return string|null The URI user information, in "username[:password]" format.
-	 */
-	public function getUserInfo()
-	{
-		$userInfo = $this->user;
-
-		if ($this->showPassword === true && ! empty($this->password))
-		{
-			$userInfo .= ':' . $this->password;
-		}
-
-		return $userInfo;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Temporarily sets the URI to show a password in userInfo. Will
-	 * reset itself after the first call to authority().
-	 *
-	 * @param boolean $val
-	 *
-	 * @return URI
-	 */
-	public function showPassword(bool $val = true)
-	{
-		$this->showPassword = $val;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the host component of the URI.
-	 *
-	 * If no host is present, this method MUST return an empty string.
-	 *
-	 * The value returned MUST be normalized to lowercase, per RFC 3986
-	 * Section 3.2.2.
-	 *
-	 * @see    http://tools.ietf.org/html/rfc3986#section-3.2.2
-	 * @return string The URI host.
-	 */
-	public function getHost(): string
-	{
-		return $this->host ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the port component of the URI.
-	 *
-	 * If a port is present, and it is non-standard for the current scheme,
-	 * this method MUST return it as an integer. If the port is the standard port
-	 * used with the current scheme, this method SHOULD return null.
-	 *
-	 * If no port is present, and no scheme is present, this method MUST return
-	 * a null value.
-	 *
-	 * If no port is present, but a scheme is present, this method MAY return
-	 * the standard port for that scheme, but SHOULD return null.
-	 *
-	 * @return null|integer The URI port.
-	 */
-	public function getPort()
-	{
-		return $this->port;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the path component of the URI.
-	 *
-	 * The path can either be empty or absolute (starting with a slash) or
-	 * rootless (not starting with a slash). Implementations MUST support all
-	 * three syntaxes.
-	 *
-	 * Normally, the empty path "" and absolute path "/" are considered equal as
-	 * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
-	 * do this normalization because in contexts with a trimmed base path, e.g.
-	 * the front controller, this difference becomes significant. It's the task
-	 * of the user to handle both "" and "/".
-	 *
-	 * The value returned MUST be percent-encoded, but MUST NOT double-encode
-	 * any characters. To determine what characters to encode, please refer to
-	 * RFC 3986, Sections 2 and 3.3.
-	 *
-	 * As an example, if the value should include a slash ("/") not intended as
-	 * delimiter between path segments, that value MUST be passed in encoded
-	 * form (e.g., "%2F") to the instance.
-	 *
-	 * @see    https://tools.ietf.org/html/rfc3986#section-2
-	 * @see    https://tools.ietf.org/html/rfc3986#section-3.3
-	 * @return string The URI path.
-	 */
-	public function getPath(): string
-	{
-		return $this->path ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the query string
-	 *
-	 * @param array $options
-	 *
-	 * @return string
-	 */
-	public function getQuery(array $options = []): string
-	{
-		$vars = $this->query;
-
-		if (array_key_exists('except', $options))
-		{
-			if (! is_array($options['except']))
-			{
-				$options['except'] = [$options['except']];
-			}
-
-			foreach ($options['except'] as $var)
-			{
-				unset($vars[$var]);
-			}
-		}
-		elseif (array_key_exists('only', $options))
-		{
-			$temp = [];
-
-			if (! is_array($options['only']))
-			{
-				$options['only'] = [$options['only']];
-			}
-
-			foreach ($options['only'] as $var)
-			{
-				if (array_key_exists($var, $vars))
-				{
-					$temp[$var] = $vars[$var];
-				}
-			}
-
-			$vars = $temp;
-		}
-
-		return empty($vars) ? '' : http_build_query($vars);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve a URI fragment
-	 *
-	 * @return string
-	 */
-	public function getFragment(): string
-	{
-		return $this->fragment ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the segments of the path as an array.
-	 *
-	 * @return array
-	 */
-	public function getSegments(): array
-	{
-		return $this->segments;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the value of a specific segment of the URI path.
-	 *
-	 * @param integer $number  Segment number
-	 * @param string  $default Default value
-	 *
-	 * @return string     The value of the segment. If no segment is found,
-	 *                    throws InvalidArgumentError
-	 */
-	public function getSegment(int $number, string $default = ''): string
-	{
-		// The segment should treat the array as 1-based for the user
-		// but we still have to deal with a zero-based array.
-		$number -= 1;
-
-		if ($number > count($this->segments) && ! $this->silent)
-		{
-			throw HTTPException::forURISegmentOutOfRange($number);
-		}
-
-		return $this->segments[$number] ?? $default;
-	}
-
-	/**
-	 * Set the value of a specific segment of the URI path.
-	 * Allows to set only existing segments or add new one.
-	 *
-	 * @param integer $number
-	 * @param mixed   $value  (string or int)
-	 *
-	 * @return $this
-	 */
-	public function setSegment(int $number, $value)
-	{
-		// The segment should treat the array as 1-based for the user
-		// but we still have to deal with a zero-based array.
-		$number -= 1;
-
-		if ($number > count($this->segments) + 1)
-		{
-			if ($this->silent)
-			{
-				return $this;
-			}
-
-			throw HTTPException::forURISegmentOutOfRange($number);
-		}
-
-		$this->segments[$number] = $value;
-		$this->refreshPath();
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of segments.
-	 *
-	 * @return integer
-	 */
-	public function getTotalSegments(): int
-	{
-		return count($this->segments);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Formats the URI as a string.
-	 *
-	 * Warning: For backwards-compatability this method
-	 * assumes URIs with the same host as baseURL should
-	 * be relative to the project's configuration.
-	 * This aspect of __toString() is deprecated and should be avoided.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		$path   = $this->getPath();
-		$scheme = $this->getScheme();
-
-		// Check if this is an internal URI
-		$config  = config('App');
-		$baseUri = new self($config->baseURL);
-
-		// If the hosts matches then assume this should be relative to baseURL
-		if ($this->getHost() === $baseUri->getHost())
-		{
-			// Check for additional segments
-			$basePath = trim($baseUri->getPath(), '/') . '/';
-			$trimPath = ltrim($path, '/');
-
-			if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
-			{
-				$path = $basePath . $trimPath;
-			}
-
-			// Check for forced HTTPS
-			if ($config->forceGlobalSecureRequests)
-			{
-				$scheme = 'https';
-			}
-		}
-
-		return static::createURIString(
-			$scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
-			$this->getQuery(), $this->getFragment()
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the given string and saves the appropriate authority pieces.
-	 *
-	 * @param string $str
-	 *
-	 * @return $this
-	 */
-	public function setAuthority(string $str)
-	{
-		$parts = parse_url($str);
-
-		if (! isset($parts['path']))
-		{
-			$parts['path'] = $this->getPath();
-		}
-
-		if (empty($parts['host']) && $parts['path'] !== '')
-		{
-			$parts['host'] = $parts['path'];
-			unset($parts['path']); // @phpstan-ignore-line
-		}
-
-		$this->applyParts($parts);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the scheme for this URI.
-	 *
-	 * Because of the large number of valid schemes we cannot limit this
-	 * to only http or https.
-	 *
-	 * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
-	 *
-	 * @param string $str
-	 *
-	 * @return $this
-	 */
-	public function setScheme(string $str)
-	{
-		$str = strtolower($str);
-		$str = preg_replace('#:(//)?$#', '', $str);
-
-		$this->scheme = $str;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the userInfo/Authority portion of the URI.
-	 *
-	 * @param string $user The user's username
-	 * @param string $pass The user's password
-	 *
-	 * @return $this
-	 */
-	public function setUserInfo(string $user, string $pass)
-	{
-		$this->user     = trim($user);
-		$this->password = trim($pass);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the host name to use.
-	 *
-	 * @param string $str
-	 *
-	 * @return $this
-	 */
-	public function setHost(string $str)
-	{
-		$this->host = trim($str);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the port portion of the URI.
-	 *
-	 * @param integer $port
-	 *
-	 * @return $this
-	 */
-	public function setPort(int $port = null)
-	{
-		if (is_null($port))
-		{
-			return $this;
-		}
-
-		if ($port <= 0 || $port > 65535)
-		{
-			if ($this->silent)
-			{
-				return $this;
-			}
-
-			throw HTTPException::forInvalidPort($port);
-		}
-
-		$this->port = $port;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the path portion of the URI.
-	 *
-	 * @param string $path
-	 *
-	 * @return $this
-	 */
-	public function setPath(string $path)
-	{
-		$this->path = $this->filterPath($path);
-
-		$tempPath = trim($this->path, '/');
-
-		$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
-
-		return $this;
-	}
-
-	/**
-	 * Sets the path portion of the URI based on segments.
-	 *
-	 * @return $this
-	 */
-	public function refreshPath()
-	{
-		$this->path = $this->filterPath(implode('/', $this->segments));
-
-		$tempPath = trim($this->path, '/');
-
-		$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the query portion of the URI, while attempting
-	 * to clean the various parts of the query keys and values.
-	 *
-	 * @param string $query
-	 *
-	 * @return $this
-	 */
-	public function setQuery(string $query)
-	{
-		if (strpos($query, '#') !== false)
-		{
-			if ($this->silent)
-			{
-				return $this;
-			}
-
-			throw HTTPException::forMalformedQueryString();
-		}
-
-		// Can't have leading ?
-		if (! empty($query) && strpos($query, '?') === 0)
-		{
-			$query = substr($query, 1);
-		}
-
-		if ($this->rawQueryString)
-		{
-			$this->query = $this->parseStr($query);
-		}
-		else
-		{
-			parse_str($query, $this->query);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A convenience method to pass an array of items in as the Query
-	 * portion of the URI.
-	 *
-	 * @param array $query
-	 *
-	 * @return URI
-	 */
-	public function setQueryArray(array $query)
-	{
-		$query = http_build_query($query);
-
-		return $this->setQuery($query);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Adds a single new element to the query vars.
-	 *
-	 * @param string $key
-	 * @param mixed  $value
-	 *
-	 * @return $this
-	 */
-	public function addQuery(string $key, $value = null)
-	{
-		$this->query[$key] = $value;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes one or more query vars from the URI.
-	 *
-	 * @param string ...$params
-	 *
-	 * @return $this
-	 */
-	public function stripQuery(...$params)
-	{
-		foreach ($params as $param)
-		{
-			unset($this->query[$param]);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Filters the query variables so that only the keys passed in
-	 * are kept. The rest are removed from the object.
-	 *
-	 * @param string ...$params
-	 *
-	 * @return $this
-	 */
-	public function keepQuery(...$params)
-	{
-		$temp = [];
-
-		foreach ($this->query as $key => $value)
-		{
-			if (! in_array($key, $params, true))
-			{
-				continue;
-			}
-
-			$temp[$key] = $value;
-		}
-
-		$this->query = $temp;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the fragment portion of the URI.
-	 *
-	 * @see https://tools.ietf.org/html/rfc3986#section-3.5
-	 *
-	 * @param string $string
-	 *
-	 * @return $this
-	 */
-	public function setFragment(string $string)
-	{
-		$this->fragment = trim($string, '# ');
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Encodes any dangerous characters, and removes dot segments.
-	 * While dot segments have valid uses according to the spec,
-	 * this URI class does not allow them.
-	 *
-	 * @param string|null $path
-	 *
-	 * @return string
-	 */
-	protected function filterPath(string $path = null): string
-	{
-		$orig = $path;
-
-		// Decode/normalize percent-encoded chars so
-		// we can always have matching for Routes, etc.
-		$path = urldecode($path);
-
-		// Remove dot segments
-		$path = self::removeDotSegments($path);
-
-		// Fix up some leading slash edge cases...
-		if (strpos($orig, './') === 0)
-		{
-			$path = '/' . $path;
-		}
-		if (strpos($orig, '../') === 0)
-		{
-			$path = '/' . $path;
-		}
-
-		// Encode characters
-		$path = preg_replace_callback(
-				'/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/', function (array $matches) {
-					return rawurlencode($matches[0]);
-				}, $path
-		);
-
-		return $path;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves our parts from a parse_url call.
-	 *
-	 * @param array $parts
-	 */
-	protected function applyParts(array $parts)
-	{
-		if (! empty($parts['host']))
-		{
-			$this->host = $parts['host'];
-		}
-		if (! empty($parts['user']))
-		{
-			$this->user = $parts['user'];
-		}
-		if (isset($parts['path']) && $parts['path'] !== '')
-		{
-			$this->path = $this->filterPath($parts['path']);
-		}
-		if (! empty($parts['query']))
-		{
-			$this->setQuery($parts['query']);
-		}
-		if (! empty($parts['fragment']))
-		{
-			$this->fragment = $parts['fragment'];
-		}
-
-		// Scheme
-		if (isset($parts['scheme']))
-		{
-			$this->setScheme(rtrim($parts['scheme'], ':/'));
-		}
-		else
-		{
-			$this->setScheme('http');
-		}
-
-		// Port
-		if (isset($parts['port']) && ! is_null($parts['port']))
-		{
-			// Valid port numbers are enforced by earlier parse_url or setPort()
-			$port       = $parts['port'];
-			$this->port = $port;
-		}
-
-		if (isset($parts['pass']))
-		{
-			$this->password = $parts['pass'];
-		}
-
-		// Populate our segments array
-		if (isset($parts['path']) && $parts['path'] !== '')
-		{
-			$tempPath = trim($parts['path'], '/');
-
-			$this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Combines one URI string with this one based on the rules set out in
-	 * RFC 3986 Section 2
-	 *
-	 * @see http://tools.ietf.org/html/rfc3986#section-5.2
-	 *
-	 * @param string $uri
-	 *
-	 * @return URI
-	 */
-	public function resolveRelativeURI(string $uri)
-	{
-		/*
-		 * NOTE: We don't use removeDotSegments in this
-		 * algorithm since it's already done by this line!
-		 */
-		$relative = new self();
-		$relative->setURI($uri);
-
-		if ($relative->getScheme() === $this->getScheme())
-		{
-			$relative->setScheme('');
-		}
-
-		$transformed = clone $relative;
-
-		// 5.2.2 Transform References in a non-strict method (no scheme)
-		if (! empty($relative->getAuthority()))
-		{
-			$transformed->setAuthority($relative->getAuthority())
-					->setPath($relative->getPath())
-					->setQuery($relative->getQuery());
-		}
-		else
-		{
-			if ($relative->getPath() === '')
-			{
-				$transformed->setPath($this->getPath());
-
-				if ($relative->getQuery())
-				{
-					$transformed->setQuery($relative->getQuery());
-				}
-				else
-				{
-					$transformed->setQuery($this->getQuery());
-				}
-			}
-			else
-			{
-				if (strpos($relative->getPath(), '/') === 0)
-				{
-					$transformed->setPath($relative->getPath());
-				}
-				else
-				{
-					$transformed->setPath($this->mergePaths($this, $relative));
-				}
-
-				$transformed->setQuery($relative->getQuery());
-			}
-
-			$transformed->setAuthority($this->getAuthority());
-		}
-
-		$transformed->setScheme($this->getScheme());
-
-		$transformed->setFragment($relative->getFragment());
-
-		return $transformed;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given 2 paths, will merge them according to rules set out in RFC 2986,
-	 * Section 5.2
-	 *
-	 * @see http://tools.ietf.org/html/rfc3986#section-5.2.3
-	 *
-	 * @param URI $base
-	 * @param URI $reference
-	 *
-	 * @return string
-	 */
-	protected function mergePaths(URI $base, URI $reference): string
-	{
-		if (! empty($base->getAuthority()) && $base->getPath() === '')
-		{
-			return '/' . ltrim($reference->getPath(), '/ ');
-		}
-
-		$path = explode('/', $base->getPath());
-
-		if ($path[0] === '')
-		{
-			unset($path[0]);
-		}
-
-		array_pop($path);
-		$path[] = $reference->getPath();
-
-		return implode('/', $path);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * This is equivalent to the native PHP parse_str() function.
-	 * This version allows the dot to be used as a key of the query string.
-	 *
-	 * @param string $query
-	 *
-	 * @return array
-	 */
-	protected function parseStr(string $query): array
-	{
-		$return = [];
-		$query  = explode('&', $query);
-
-		$params = array_map(function (string $chunk) {
-			return preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', function (array $match) {
-				return str_replace($match['key'], bin2hex($match['key']), $match[0]);
-			}, urldecode($chunk));
-		}, $query);
-
-		$params = implode('&', $params);
-		parse_str($params, $params);
-
-		foreach ($params as $key => $value)
-		{
-			$return[hex2bin($key)] = $value;
-		}
-
-		$query = $params = null;
-
-		return $return;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Sub-delimiters used in query strings and fragments.
+     */
+    public const CHAR_SUB_DELIMS = '!\$&\'\(\)\*\+,;=';
+
+    /**
+     * Unreserved characters used in paths, query strings, and fragments.
+     */
+    public const CHAR_UNRESERVED = 'a-zA-Z0-9_\-\.~';
+
+    /**
+     * Current URI string
+     *
+     * @var string
+     */
+    protected $uriString;
+
+    /**
+     * List of URI segments.
+     *
+     * Starts at 1 instead of 0
+     *
+     * @var array
+     */
+    protected $segments = [];
+
+    /**
+     * The URI Scheme.
+     *
+     * @var string
+     */
+    protected $scheme = 'http';
+
+    /**
+     * URI User Info
+     *
+     * @var string
+     */
+    protected $user;
+
+    /**
+     * URI User Password
+     *
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * URI Host
+     *
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * URI Port
+     *
+     * @var int
+     */
+    protected $port;
+
+    /**
+     * URI path.
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * The name of any fragment.
+     *
+     * @var string
+     */
+    protected $fragment = '';
+
+    /**
+     * The query string.
+     *
+     * @var array
+     */
+    protected $query = [];
+
+    /**
+     * Default schemes/ports.
+     *
+     * @var array
+     */
+    protected $defaultPorts = [
+        'http'  => 80,
+        'https' => 443,
+        'ftp'   => 21,
+        'sftp'  => 22,
+    ];
+
+    /**
+     * Whether passwords should be shown in userInfo/authority calls.
+     * Default to false because URIs often show up in logs
+     *
+     * @var bool
+     */
+    protected $showPassword = false;
+
+    /**
+     * If true, will continue instead of throwing exceptions.
+     *
+     * @var bool
+     */
+    protected $silent = false;
+
+    /**
+     * If true, will use raw query string.
+     *
+     * @var bool
+     */
+    protected $rawQueryString = false;
+
+    /**
+     * Builds a representation of the string from the component parts.
+     *
+     * @param string $scheme
+     * @param string $authority
+     * @param string $path
+     * @param string $query
+     * @param string $fragment
+     */
+    public static function createURIString(?string $scheme = null, ?string $authority = null, ?string $path = null, ?string $query = null, ?string $fragment = null): string
+    {
+        $uri = '';
+        if (! empty($scheme)) {
+            $uri .= $scheme . '://';
+        }
+
+        if (! empty($authority)) {
+            $uri .= $authority;
+        }
+
+        if (isset($path) && $path !== '') {
+            $uri .= substr($uri, -1, 1) !== '/' ? '/' . ltrim($path, '/') : ltrim($path, '/');
+        }
+
+        if ($query) {
+            $uri .= '?' . $query;
+        }
+
+        if ($fragment) {
+            $uri .= '#' . $fragment;
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Used when resolving and merging paths to correctly interpret and
+     * remove single and double dot segments from the path per
+     * RFC 3986 Section 5.2.4
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
+     *
+     * @internal
+     */
+    public static function removeDotSegments(string $path): string
+    {
+        if ($path === '' || $path === '/') {
+            return $path;
+        }
+
+        $output = [];
+
+        $input = explode('/', $path);
+
+        if ($input[0] === '') {
+            unset($input[0]);
+            $input = array_values($input);
+        }
+
+        // This is not a perfect representation of the
+        // RFC, but matches most cases and is pretty
+        // much what Guzzle uses. Should be good enough
+        // for almost every real use case.
+        foreach ($input as $segment) {
+            if ($segment === '..') {
+                array_pop($output);
+            } elseif ($segment !== '.' && $segment !== '') {
+                $output[] = $segment;
+            }
+        }
+
+        $output = implode('/', $output);
+        $output = trim($output, '/ ');
+
+        // Add leading slash if necessary
+        if (strpos($path, '/') === 0) {
+            $output = '/' . $output;
+        }
+
+        // Add trailing slash if necessary
+        if ($output !== '/' && substr($path, -1, 1) === '/') {
+            $output .= '/';
+        }
+
+        return $output;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param string $uri
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct(?string $uri = null)
+    {
+        if ($uri !== null) {
+            $this->setURI($uri);
+        }
+    }
+
+    /**
+     * If $silent == true, then will not throw exceptions and will
+     * attempt to continue gracefully.
+     *
+     * @return URI
+     */
+    public function setSilent(bool $silent = true)
+    {
+        $this->silent = $silent;
+
+        return $this;
+    }
+
+    /**
+     * If $raw == true, then will use parseStr() method
+     * instead of native parse_str() function.
+     *
+     * @return URI
+     */
+    public function useRawQueryString(bool $raw = true)
+    {
+        $this->rawQueryString = $raw;
+
+        return $this;
+    }
+
+    /**
+     * Sets and overwrites any current URI information.
+     *
+     * @return URI
+     */
+    public function setURI(?string $uri = null)
+    {
+        if ($uri !== null) {
+            $parts = parse_url($uri);
+
+            if ($parts === false) {
+                if ($this->silent) {
+                    return $this;
+                }
+
+                throw HTTPException::forUnableToParseURI($uri);
+            }
+
+            $this->applyParts($parts);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the scheme component of the URI.
+     *
+     * If no scheme is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.1.
+     *
+     * The trailing ":" character is not part of the scheme and MUST NOT be
+     * added.
+     *
+     * @see    https://tools.ietf.org/html/rfc3986#section-3.1
+     *
+     * @return string The URI scheme.
+     */
+    public function getScheme(): string
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Retrieve the authority component of the URI.
+     *
+     * If no authority information is present, this method MUST return an empty
+     * string.
+     *
+     * The authority syntax of the URI is:
+     *
+     * <pre>
+     * [user-info@]host[:port]
+     * </pre>
+     *
+     * If the port component is not set or is the standard port for the current
+     * scheme, it SHOULD NOT be included.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.2
+     *
+     * @return string The URI authority, in "[user-info@]host[:port]" format.
+     */
+    public function getAuthority(bool $ignorePort = false): string
+    {
+        if (empty($this->host)) {
+            return '';
+        }
+
+        $authority = $this->host;
+
+        if (! empty($this->getUserInfo())) {
+            $authority = $this->getUserInfo() . '@' . $authority;
+        }
+
+        // Don't add port if it's a standard port for
+        // this scheme
+        if (! empty($this->port) && ! $ignorePort && $this->port !== $this->defaultPorts[$this->scheme]) {
+            $authority .= ':' . $this->port;
+        }
+
+        $this->showPassword = false;
+
+        return $authority;
+    }
+
+    /**
+     * Retrieve the user information component of the URI.
+     *
+     * If no user information is present, this method MUST return an empty
+     * string.
+     *
+     * If a user is present in the URI, this will return that value;
+     * additionally, if the password is also present, it will be appended to the
+     * user value, with a colon (":") separating the values.
+     *
+     * NOTE that be default, the password, if available, will NOT be shown
+     * as a security measure as discussed in RFC 3986, Section 7.5. If you know
+     * the password is not a security issue, you can force it to be shown
+     * with $this->showPassword();
+     *
+     * The trailing "@" character is not part of the user information and MUST
+     * NOT be added.
+     *
+     * @return string|null The URI user information, in "username[:password]" format.
+     */
+    public function getUserInfo()
+    {
+        $userInfo = $this->user;
+
+        if ($this->showPassword === true && ! empty($this->password)) {
+            $userInfo .= ':' . $this->password;
+        }
+
+        return $userInfo;
+    }
+
+    /**
+     * Temporarily sets the URI to show a password in userInfo. Will
+     * reset itself after the first call to authority().
+     *
+     * @return URI
+     */
+    public function showPassword(bool $val = true)
+    {
+        $this->showPassword = $val;
+
+        return $this;
+    }
+
+    /**
+     * Retrieve the host component of the URI.
+     *
+     * If no host is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.2.2.
+     *
+     * @see    http://tools.ietf.org/html/rfc3986#section-3.2.2
+     *
+     * @return string The URI host.
+     */
+    public function getHost(): string
+    {
+        return $this->host ?? '';
+    }
+
+    /**
+     * Retrieve the port component of the URI.
+     *
+     * If a port is present, and it is non-standard for the current scheme,
+     * this method MUST return it as an integer. If the port is the standard port
+     * used with the current scheme, this method SHOULD return null.
+     *
+     * If no port is present, and no scheme is present, this method MUST return
+     * a null value.
+     *
+     * If no port is present, but a scheme is present, this method MAY return
+     * the standard port for that scheme, but SHOULD return null.
+     *
+     * @return int|null The URI port.
+     */
+    public function getPort()
+    {
+        return $this->port;
+    }
+
+    /**
+     * Retrieve the path component of the URI.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * Normally, the empty path "" and absolute path "/" are considered equal as
+     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+     * do this normalization because in contexts with a trimmed base path, e.g.
+     * the front controller, this difference becomes significant. It's the task
+     * of the user to handle both "" and "/".
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.3.
+     *
+     * As an example, if the value should include a slash ("/") not intended as
+     * delimiter between path segments, that value MUST be passed in encoded
+     * form (e.g., "%2F") to the instance.
+     *
+     * @see    https://tools.ietf.org/html/rfc3986#section-2
+     * @see    https://tools.ietf.org/html/rfc3986#section-3.3
+     *
+     * @return string The URI path.
+     */
+    public function getPath(): string
+    {
+        return $this->path ?? '';
+    }
+
+    /**
+     * Retrieve the query string
+     */
+    public function getQuery(array $options = []): string
+    {
+        $vars = $this->query;
+
+        if (array_key_exists('except', $options)) {
+            if (! is_array($options['except'])) {
+                $options['except'] = [$options['except']];
+            }
+
+            foreach ($options['except'] as $var) {
+                unset($vars[$var]);
+            }
+        } elseif (array_key_exists('only', $options)) {
+            $temp = [];
+
+            if (! is_array($options['only'])) {
+                $options['only'] = [$options['only']];
+            }
+
+            foreach ($options['only'] as $var) {
+                if (array_key_exists($var, $vars)) {
+                    $temp[$var] = $vars[$var];
+                }
+            }
+
+            $vars = $temp;
+        }
+
+        return empty($vars) ? '' : http_build_query($vars);
+    }
+
+    /**
+     * Retrieve a URI fragment
+     */
+    public function getFragment(): string
+    {
+        return $this->fragment ?? '';
+    }
+
+    /**
+     * Returns the segments of the path as an array.
+     */
+    public function getSegments(): array
+    {
+        return $this->segments;
+    }
+
+    /**
+     * Returns the value of a specific segment of the URI path.
+     *
+     * @param int    $number  Segment number
+     * @param string $default Default value
+     *
+     * @return string The value of the segment. If no segment is found,
+     *                throws InvalidArgumentError
+     */
+    public function getSegment(int $number, string $default = ''): string
+    {
+        // The segment should treat the array as 1-based for the user
+        // but we still have to deal with a zero-based array.
+        $number--;
+
+        if ($number > count($this->segments) && ! $this->silent) {
+            throw HTTPException::forURISegmentOutOfRange($number);
+        }
+
+        return $this->segments[$number] ?? $default;
+    }
+
+    /**
+     * Set the value of a specific segment of the URI path.
+     * Allows to set only existing segments or add new one.
+     *
+     * @param mixed $value (string or int)
+     *
+     * @return $this
+     */
+    public function setSegment(int $number, $value)
+    {
+        // The segment should treat the array as 1-based for the user
+        // but we still have to deal with a zero-based array.
+        $number--;
+
+        if ($number > count($this->segments) + 1) {
+            if ($this->silent) {
+                return $this;
+            }
+
+            throw HTTPException::forURISegmentOutOfRange($number);
+        }
+
+        $this->segments[$number] = $value;
+        $this->refreshPath();
+
+        return $this;
+    }
+
+    /**
+     * Returns the total number of segments.
+     */
+    public function getTotalSegments(): int
+    {
+        return count($this->segments);
+    }
+
+    /**
+     * Formats the URI as a string.
+     *
+     * Warning: For backwards-compatability this method
+     * assumes URIs with the same host as baseURL should
+     * be relative to the project's configuration.
+     * This aspect of __toString() is deprecated and should be avoided.
+     */
+    public function __toString(): string
+    {
+        $path   = $this->getPath();
+        $scheme = $this->getScheme();
+
+        // Check if this is an internal URI
+        $config  = config('App');
+        $baseUri = new self($config->baseURL);
+
+        // If the hosts matches then assume this should be relative to baseURL
+        if ($this->getHost() === $baseUri->getHost()) {
+            // Check for additional segments
+            $basePath = trim($baseUri->getPath(), '/') . '/';
+            $trimPath = ltrim($path, '/');
+
+            if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0) {
+                $path = $basePath . $trimPath;
+            }
+
+            // Check for forced HTTPS
+            if ($config->forceGlobalSecureRequests) {
+                $scheme = 'https';
+            }
+        }
+
+        return static::createURIString(
+            $scheme,
+            $this->getAuthority(),
+            $path, // Absolute URIs should use a "/" for an empty path
+            $this->getQuery(),
+            $this->getFragment()
+        );
+    }
+
+    /**
+     * Parses the given string and saves the appropriate authority pieces.
+     *
+     * @return $this
+     */
+    public function setAuthority(string $str)
+    {
+        $parts = parse_url($str);
+
+        if (! isset($parts['path'])) {
+            $parts['path'] = $this->getPath();
+        }
+
+        if (empty($parts['host']) && $parts['path'] !== '') {
+            $parts['host'] = $parts['path'];
+            unset($parts['path']); // @phpstan-ignore-line
+        }
+
+        $this->applyParts($parts);
+
+        return $this;
+    }
+
+    /**
+     * Sets the scheme for this URI.
+     *
+     * Because of the large number of valid schemes we cannot limit this
+     * to only http or https.
+     *
+     * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
+     *
+     * @return $this
+     */
+    public function setScheme(string $str)
+    {
+        $str = strtolower($str);
+        $str = preg_replace('#:(//)?$#', '', $str);
+
+        $this->scheme = $str;
+
+        return $this;
+    }
+
+    /**
+     * Sets the userInfo/Authority portion of the URI.
+     *
+     * @param string $user The user's username
+     * @param string $pass The user's password
+     *
+     * @return $this
+     */
+    public function setUserInfo(string $user, string $pass)
+    {
+        $this->user     = trim($user);
+        $this->password = trim($pass);
+
+        return $this;
+    }
+
+    /**
+     * Sets the host name to use.
+     *
+     * @return $this
+     */
+    public function setHost(string $str)
+    {
+        $this->host = trim($str);
+
+        return $this;
+    }
+
+    /**
+     * Sets the port portion of the URI.
+     *
+     * @param int $port
+     *
+     * @return $this
+     */
+    public function setPort(?int $port = null)
+    {
+        if ($port === null) {
+            return $this;
+        }
+
+        if ($port <= 0 || $port > 65535) {
+            if ($this->silent) {
+                return $this;
+            }
+
+            throw HTTPException::forInvalidPort($port);
+        }
+
+        $this->port = $port;
+
+        return $this;
+    }
+
+    /**
+     * Sets the path portion of the URI.
+     *
+     * @return $this
+     */
+    public function setPath(string $path)
+    {
+        $this->path = $this->filterPath($path);
+
+        $tempPath = trim($this->path, '/');
+
+        $this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+
+        return $this;
+    }
+
+    /**
+     * Sets the path portion of the URI based on segments.
+     *
+     * @return $this
+     */
+    public function refreshPath()
+    {
+        $this->path = $this->filterPath(implode('/', $this->segments));
+
+        $tempPath = trim($this->path, '/');
+
+        $this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+
+        return $this;
+    }
+
+    /**
+     * Sets the query portion of the URI, while attempting
+     * to clean the various parts of the query keys and values.
+     *
+     * @return $this
+     */
+    public function setQuery(string $query)
+    {
+        if (strpos($query, '#') !== false) {
+            if ($this->silent) {
+                return $this;
+            }
+
+            throw HTTPException::forMalformedQueryString();
+        }
+
+        // Can't have leading ?
+        if (! empty($query) && strpos($query, '?') === 0) {
+            $query = substr($query, 1);
+        }
+
+        if ($this->rawQueryString) {
+            $this->query = $this->parseStr($query);
+        } else {
+            parse_str($query, $this->query);
+        }
+
+        return $this;
+    }
+
+    /**
+     * A convenience method to pass an array of items in as the Query
+     * portion of the URI.
+     *
+     * @return URI
+     */
+    public function setQueryArray(array $query)
+    {
+        $query = http_build_query($query);
+
+        return $this->setQuery($query);
+    }
+
+    /**
+     * Adds a single new element to the query vars.
+     *
+     * @param mixed $value
+     *
+     * @return $this
+     */
+    public function addQuery(string $key, $value = null)
+    {
+        $this->query[$key] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Removes one or more query vars from the URI.
+     *
+     * @param string ...$params
+     *
+     * @return $this
+     */
+    public function stripQuery(...$params)
+    {
+        foreach ($params as $param) {
+            unset($this->query[$param]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Filters the query variables so that only the keys passed in
+     * are kept. The rest are removed from the object.
+     *
+     * @param string ...$params
+     *
+     * @return $this
+     */
+    public function keepQuery(...$params)
+    {
+        $temp = [];
+
+        foreach ($this->query as $key => $value) {
+            if (! in_array($key, $params, true)) {
+                continue;
+            }
+
+            $temp[$key] = $value;
+        }
+
+        $this->query = $temp;
+
+        return $this;
+    }
+
+    /**
+     * Sets the fragment portion of the URI.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.5
+     *
+     * @return $this
+     */
+    public function setFragment(string $string)
+    {
+        $this->fragment = trim($string, '# ');
+
+        return $this;
+    }
+
+    /**
+     * Encodes any dangerous characters, and removes dot segments.
+     * While dot segments have valid uses according to the spec,
+     * this URI class does not allow them.
+     */
+    protected function filterPath(?string $path = null): string
+    {
+        $orig = $path;
+
+        // Decode/normalize percent-encoded chars so
+        // we can always have matching for Routes, etc.
+        $path = urldecode($path);
+
+        // Remove dot segments
+        $path = self::removeDotSegments($path);
+
+        // Fix up some leading slash edge cases...
+        if (strpos($orig, './') === 0) {
+            $path = '/' . $path;
+        }
+        if (strpos($orig, '../') === 0) {
+            $path = '/' . $path;
+        }
+
+        // Encode characters
+        $path = preg_replace_callback(
+            '/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
+            static function (array $matches) {
+                return rawurlencode($matches[0]);
+            },
+            $path
+        );
+
+        return $path;
+    }
+
+    /**
+     * Saves our parts from a parse_url call.
+     */
+    protected function applyParts(array $parts)
+    {
+        if (! empty($parts['host'])) {
+            $this->host = $parts['host'];
+        }
+        if (! empty($parts['user'])) {
+            $this->user = $parts['user'];
+        }
+        if (isset($parts['path']) && $parts['path'] !== '') {
+            $this->path = $this->filterPath($parts['path']);
+        }
+        if (! empty($parts['query'])) {
+            $this->setQuery($parts['query']);
+        }
+        if (! empty($parts['fragment'])) {
+            $this->fragment = $parts['fragment'];
+        }
+
+        // Scheme
+        if (isset($parts['scheme'])) {
+            $this->setScheme(rtrim($parts['scheme'], ':/'));
+        } else {
+            $this->setScheme('http');
+        }
+
+        // Port
+        if (isset($parts['port']) && $parts['port'] !== null) {
+            // Valid port numbers are enforced by earlier parse_url or setPort()
+            $port       = $parts['port'];
+            $this->port = $port;
+        }
+
+        if (isset($parts['pass'])) {
+            $this->password = $parts['pass'];
+        }
+
+        // Populate our segments array
+        if (isset($parts['path']) && $parts['path'] !== '') {
+            $tempPath = trim($parts['path'], '/');
+
+            $this->segments = ($tempPath === '') ? [] : explode('/', $tempPath);
+        }
+    }
+
+    /**
+     * Combines one URI string with this one based on the rules set out in
+     * RFC 3986 Section 2
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-5.2
+     *
+     * @return URI
+     */
+    public function resolveRelativeURI(string $uri)
+    {
+        /*
+         * NOTE: We don't use removeDotSegments in this
+         * algorithm since it's already done by this line!
+         */
+        $relative = new self();
+        $relative->setURI($uri);
+
+        if ($relative->getScheme() === $this->getScheme()) {
+            $relative->setScheme('');
+        }
+
+        $transformed = clone $relative;
+
+        // 5.2.2 Transform References in a non-strict method (no scheme)
+        if (! empty($relative->getAuthority())) {
+            $transformed
+                ->setAuthority($relative->getAuthority())
+                ->setPath($relative->getPath())
+                ->setQuery($relative->getQuery());
+        } else {
+            if ($relative->getPath() === '') {
+                $transformed->setPath($this->getPath());
+
+                if ($relative->getQuery()) {
+                    $transformed->setQuery($relative->getQuery());
+                } else {
+                    $transformed->setQuery($this->getQuery());
+                }
+            } else {
+                if (strpos($relative->getPath(), '/') === 0) {
+                    $transformed->setPath($relative->getPath());
+                } else {
+                    $transformed->setPath($this->mergePaths($this, $relative));
+                }
+
+                $transformed->setQuery($relative->getQuery());
+            }
+
+            $transformed->setAuthority($this->getAuthority());
+        }
+
+        $transformed->setScheme($this->getScheme());
+
+        $transformed->setFragment($relative->getFragment());
+
+        return $transformed;
+    }
+
+    /**
+     * Given 2 paths, will merge them according to rules set out in RFC 2986,
+     * Section 5.2
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-5.2.3
+     */
+    protected function mergePaths(self $base, self $reference): string
+    {
+        if (! empty($base->getAuthority()) && $base->getPath() === '') {
+            return '/' . ltrim($reference->getPath(), '/ ');
+        }
+
+        $path = explode('/', $base->getPath());
+
+        if ($path[0] === '') {
+            unset($path[0]);
+        }
+
+        array_pop($path);
+        $path[] = $reference->getPath();
+
+        return implode('/', $path);
+    }
+
+    /**
+     * This is equivalent to the native PHP parse_str() function.
+     * This version allows the dot to be used as a key of the query string.
+     */
+    protected function parseStr(string $query): array
+    {
+        $return = [];
+        $query  = explode('&', $query);
+
+        $params = array_map(static function (string $chunk) {
+            return preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static function (array $match) {
+                return str_replace($match['key'], bin2hex($match['key']), $match[0]);
+            }, urldecode($chunk));
+        }, $query);
+
+        $params = implode('&', $params);
+        parse_str($params, $params);
+
+        foreach ($params as $key => $value) {
+            $return[hex2bin($key)] = $value;
+        }
+
+        $query = $params = null;
+
+        return $return;
+    }
 }
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 029775ed95fc..10088111cec1 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -18,458 +18,354 @@
  */
 class UserAgent
 {
-	/**
-	 * Current user-agent
-	 *
-	 * @var string
-	 */
-	protected $agent = '';
-
-	/**
-	 * Flag for if the user-agent belongs to a browser
-	 *
-	 * @var boolean
-	 */
-	protected $isBrowser = false;
-
-	/**
-	 * Flag for if the user-agent is a robot
-	 *
-	 * @var boolean
-	 */
-	protected $isRobot = false;
-
-	/**
-	 * Flag for if the user-agent is a mobile browser
-	 *
-	 * @var boolean
-	 */
-	protected $isMobile = false;
-
-	/**
-	 * Holds the config file contents.
-	 *
-	 * @var UserAgents
-	 */
-	protected $config;
-
-	/**
-	 * Current user-agent platform
-	 *
-	 * @var string
-	 */
-	protected $platform = '';
-
-	/**
-	 * Current user-agent browser
-	 *
-	 * @var string
-	 */
-	protected $browser = '';
-
-	/**
-	 * Current user-agent version
-	 *
-	 * @var string
-	 */
-	protected $version = '';
-
-	/**
-	 * Current user-agent mobile name
-	 *
-	 * @var string
-	 */
-	protected $mobile = '';
-
-	/**
-	 * Current user-agent robot name
-	 *
-	 * @var string
-	 */
-	protected $robot = '';
-
-	/**
-	 * HTTP Referer
-	 *
-	 * @var mixed
-	 */
-	protected $referrer;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * Sets the User Agent and runs the compilation routine
-	 *
-	 * @param null|UserAgents $config
-	 */
-	public function __construct(UserAgents $config = null)
-	{
-		$this->config = $config ?? new UserAgents();
-
-		if (isset($_SERVER['HTTP_USER_AGENT']))
-		{
-			$this->agent = trim($_SERVER['HTTP_USER_AGENT']);
-			$this->compileData();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Is Browser
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function isBrowser(string $key = null): bool
-	{
-		if (! $this->isBrowser)
-		{
-			return false;
-		}
-
-		// No need to be specific, it's a browser
-		if ($key === null)
-		{
-			return true;
-		}
-
-		// Check for a specific browser
-		return (isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Is Robot
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function isRobot(string $key = null): bool
-	{
-		if (! $this->isRobot)
-		{
-			return false;
-		}
-
-		// No need to be specific, it's a robot
-		if ($key === null)
-		{
-			return true;
-		}
-
-		// Check for a specific robot
-		return (isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Is Mobile
-	 *
-	 * @param string $key
-	 *
-	 * @return boolean
-	 */
-	public function isMobile(string $key = null): bool
-	{
-		if (! $this->isMobile)
-		{
-			return false;
-		}
-
-		// No need to be specific, it's a mobile
-		if ($key === null)
-		{
-			return true;
-		}
-
-		// Check for a specific robot
-		return (isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Is this a referral from another site?
-	 *
-	 * @return boolean
-	 */
-	public function isReferral(): bool
-	{
-		if (! isset($this->referrer))
-		{
-			if (empty($_SERVER['HTTP_REFERER']))
-			{
-				$this->referrer = false;
-			}
-			else
-			{
-				$refererHost = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
-				$ownHost     = parse_url(\base_url(), PHP_URL_HOST);
-
-				$this->referrer = ($refererHost && $refererHost !== $ownHost);
-			}
-		}
-
-		return $this->referrer;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Agent String
-	 *
-	 * @return string
-	 */
-	public function getAgentString(): string
-	{
-		return $this->agent;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get Platform
-	 *
-	 * @return string
-	 */
-	public function getPlatform(): string
-	{
-		return $this->platform;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get Browser Name
-	 *
-	 * @return string
-	 */
-	public function getBrowser(): string
-	{
-		return $this->browser;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the Browser Version
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		return $this->version;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get The Robot Name
-	 *
-	 * @return string
-	 */
-	public function getRobot(): string
-	{
-		return $this->robot;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the Mobile Device
-	 *
-	 * @return string
-	 */
-	public function getMobile(): string
-	{
-		return $this->mobile;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the referrer
-	 *
-	 * @return string
-	 */
-	public function getReferrer(): string
-	{
-		return empty($_SERVER['HTTP_REFERER']) ? '' : trim($_SERVER['HTTP_REFERER']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a custom user-agent string
-	 *
-	 * @param string $string
-	 *
-	 * @return void
-	 */
-	public function parse(string $string)
-	{
-		// Reset values
-		$this->isBrowser = false;
-		$this->isRobot   = false;
-		$this->isMobile  = false;
-		$this->browser   = '';
-		$this->version   = '';
-		$this->mobile    = '';
-		$this->robot     = '';
-
-		// Set the new user-agent string and parse it, unless empty
-		$this->agent = $string;
-
-		if (! empty($string))
-		{
-			$this->compileData();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compile the User Agent Data
-	 *
-	 * @return void
-	 */
-	protected function compileData()
-	{
-		$this->setPlatform();
-
-		foreach (['setRobot', 'setBrowser', 'setMobile'] as $function)
-		{
-			if ($this->$function() === true)
-			{
-				break;
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the Platform
-	 *
-	 * @return boolean
-	 */
-	protected function setPlatform(): bool
-	{
-		if (is_array($this->config->platforms) && $this->config->platforms)
-		{
-			foreach ($this->config->platforms as $key => $val)
-			{
-				if (preg_match('|' . preg_quote($key) . '|i', $this->agent))
-				{
-					$this->platform = $val;
-
-					return true;
-				}
-			}
-		}
-
-		$this->platform = 'Unknown Platform';
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the Browser
-	 *
-	 * @return boolean
-	 */
-	protected function setBrowser(): bool
-	{
-		if (is_array($this->config->browsers) && $this->config->browsers)
-		{
-			foreach ($this->config->browsers as $key => $val)
-			{
-				if (preg_match('|' . $key . '.*?([0-9\.]+)|i', $this->agent, $match))
-				{
-					$this->isBrowser = true;
-					$this->version   = $match[1];
-					$this->browser   = $val;
-					$this->setMobile();
-
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the Robot
-	 *
-	 * @return boolean
-	 */
-	protected function setRobot(): bool
-	{
-		if (is_array($this->config->robots) && $this->config->robots)
-		{
-			foreach ($this->config->robots as $key => $val)
-			{
-				if (preg_match('|' . preg_quote($key) . '|i', $this->agent))
-				{
-					$this->isRobot = true;
-					$this->robot   = $val;
-					$this->setMobile();
-
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the Mobile Device
-	 *
-	 * @return boolean
-	 */
-	protected function setMobile(): bool
-	{
-		if (is_array($this->config->mobiles) && $this->config->mobiles)
-		{
-			foreach ($this->config->mobiles as $key => $val)
-			{
-				if (false !== (stripos($this->agent, $key)))
-				{
-					$this->isMobile = true;
-					$this->mobile   = $val;
-
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Outputs the original Agent String when cast as a string.
-	 *
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-		return $this->getAgentString();
-	}
+    /**
+     * Current user-agent
+     *
+     * @var string
+     */
+    protected $agent = '';
+
+    /**
+     * Flag for if the user-agent belongs to a browser
+     *
+     * @var bool
+     */
+    protected $isBrowser = false;
+
+    /**
+     * Flag for if the user-agent is a robot
+     *
+     * @var bool
+     */
+    protected $isRobot = false;
+
+    /**
+     * Flag for if the user-agent is a mobile browser
+     *
+     * @var bool
+     */
+    protected $isMobile = false;
+
+    /**
+     * Holds the config file contents.
+     *
+     * @var UserAgents
+     */
+    protected $config;
+
+    /**
+     * Current user-agent platform
+     *
+     * @var string
+     */
+    protected $platform = '';
+
+    /**
+     * Current user-agent browser
+     *
+     * @var string
+     */
+    protected $browser = '';
+
+    /**
+     * Current user-agent version
+     *
+     * @var string
+     */
+    protected $version = '';
+
+    /**
+     * Current user-agent mobile name
+     *
+     * @var string
+     */
+    protected $mobile = '';
+
+    /**
+     * Current user-agent robot name
+     *
+     * @var string
+     */
+    protected $robot = '';
+
+    /**
+     * HTTP Referer
+     *
+     * @var mixed
+     */
+    protected $referrer;
+
+    /**
+     * Constructor
+     *
+     * Sets the User Agent and runs the compilation routine
+     */
+    public function __construct(?UserAgents $config = null)
+    {
+        $this->config = $config ?? new UserAgents();
+
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
+            $this->agent = trim($_SERVER['HTTP_USER_AGENT']);
+            $this->compileData();
+        }
+    }
+
+    /**
+     * Is Browser
+     *
+     * @param string $key
+     */
+    public function isBrowser(?string $key = null): bool
+    {
+        if (! $this->isBrowser) {
+            return false;
+        }
+
+        // No need to be specific, it's a browser
+        if ($key === null) {
+            return true;
+        }
+
+        // Check for a specific browser
+        return isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key];
+    }
+
+    /**
+     * Is Robot
+     *
+     * @param string $key
+     */
+    public function isRobot(?string $key = null): bool
+    {
+        if (! $this->isRobot) {
+            return false;
+        }
+
+        // No need to be specific, it's a robot
+        if ($key === null) {
+            return true;
+        }
+
+        // Check for a specific robot
+        return isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key];
+    }
+
+    /**
+     * Is Mobile
+     *
+     * @param string $key
+     */
+    public function isMobile(?string $key = null): bool
+    {
+        if (! $this->isMobile) {
+            return false;
+        }
+
+        // No need to be specific, it's a mobile
+        if ($key === null) {
+            return true;
+        }
+
+        // Check for a specific robot
+        return isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key];
+    }
+
+    /**
+     * Is this a referral from another site?
+     */
+    public function isReferral(): bool
+    {
+        if (! isset($this->referrer)) {
+            if (empty($_SERVER['HTTP_REFERER'])) {
+                $this->referrer = false;
+            } else {
+                $refererHost = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
+                $ownHost     = parse_url(\base_url(), PHP_URL_HOST);
+
+                $this->referrer = ($refererHost && $refererHost !== $ownHost);
+            }
+        }
+
+        return $this->referrer;
+    }
+
+    /**
+     * Agent String
+     */
+    public function getAgentString(): string
+    {
+        return $this->agent;
+    }
+
+    /**
+     * Get Platform
+     */
+    public function getPlatform(): string
+    {
+        return $this->platform;
+    }
+
+    /**
+     * Get Browser Name
+     */
+    public function getBrowser(): string
+    {
+        return $this->browser;
+    }
+
+    /**
+     * Get the Browser Version
+     */
+    public function getVersion(): string
+    {
+        return $this->version;
+    }
+
+    /**
+     * Get The Robot Name
+     */
+    public function getRobot(): string
+    {
+        return $this->robot;
+    }
+
+    /**
+     * Get the Mobile Device
+     */
+    public function getMobile(): string
+    {
+        return $this->mobile;
+    }
+
+    /**
+     * Get the referrer
+     */
+    public function getReferrer(): string
+    {
+        return empty($_SERVER['HTTP_REFERER']) ? '' : trim($_SERVER['HTTP_REFERER']);
+    }
+
+    /**
+     * Parse a custom user-agent string
+     */
+    public function parse(string $string)
+    {
+        // Reset values
+        $this->isBrowser = false;
+        $this->isRobot   = false;
+        $this->isMobile  = false;
+        $this->browser   = '';
+        $this->version   = '';
+        $this->mobile    = '';
+        $this->robot     = '';
+
+        // Set the new user-agent string and parse it, unless empty
+        $this->agent = $string;
+
+        if (! empty($string)) {
+            $this->compileData();
+        }
+    }
+
+    /**
+     * Compile the User Agent Data
+     */
+    protected function compileData()
+    {
+        $this->setPlatform();
+
+        foreach (['setRobot', 'setBrowser', 'setMobile'] as $function) {
+            if ($this->{$function}() === true) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Set the Platform
+     */
+    protected function setPlatform(): bool
+    {
+        if (is_array($this->config->platforms) && $this->config->platforms) {
+            foreach ($this->config->platforms as $key => $val) {
+                if (preg_match('|' . preg_quote($key, '|') . '|i', $this->agent)) {
+                    $this->platform = $val;
+
+                    return true;
+                }
+            }
+        }
+
+        $this->platform = 'Unknown Platform';
+
+        return false;
+    }
+
+    /**
+     * Set the Browser
+     */
+    protected function setBrowser(): bool
+    {
+        if (is_array($this->config->browsers) && $this->config->browsers) {
+            foreach ($this->config->browsers as $key => $val) {
+                if (preg_match('|' . $key . '.*?([0-9\.]+)|i', $this->agent, $match)) {
+                    $this->isBrowser = true;
+                    $this->version   = $match[1];
+                    $this->browser   = $val;
+                    $this->setMobile();
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the Robot
+     */
+    protected function setRobot(): bool
+    {
+        if (is_array($this->config->robots) && $this->config->robots) {
+            foreach ($this->config->robots as $key => $val) {
+                if (preg_match('|' . preg_quote($key, '|') . '|i', $this->agent)) {
+                    $this->isRobot = true;
+                    $this->robot   = $val;
+                    $this->setMobile();
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the Mobile Device
+     */
+    protected function setMobile(): bool
+    {
+        if (is_array($this->config->mobiles) && $this->config->mobiles) {
+            foreach ($this->config->mobiles as $key => $val) {
+                if (false !== (stripos($this->agent, $key))) {
+                    $this->isMobile = true;
+                    $this->mobile   = $val;
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Outputs the original Agent String when cast as a string.
+     */
+    public function __toString(): string
+    {
+        return $this->getAgentString();
+    }
 }
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index b818ff6008a5..a06d4bb96c6e 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -1,243 +1,209 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter Array Helpers
- */
-
-if (! function_exists('dot_array_search'))
-{
-	/**
-	 * Searches an array through dot syntax. Supports
-	 * wildcard searches, like foo.*.bar
-	 *
-	 * @param string $index
-	 * @param array  $array
-	 *
-	 * @return mixed
-	 */
-	function dot_array_search(string $index, array $array)
-	{
-		$segments = preg_split('/(?<!\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
-
-		$segments = array_map(static function ($key) {
-			return str_replace('\.', '.', $key);
-		}, $segments);
-
-		return _array_search_dot($segments, $array);
-	}
+// CodeIgniter Array Helpers
+
+if (! function_exists('dot_array_search')) {
+    /**
+     * Searches an array through dot syntax. Supports
+     * wildcard searches, like foo.*.bar
+     *
+     * @return mixed
+     */
+    function dot_array_search(string $index, array $array)
+    {
+        $segments = preg_split('/(?<!\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
+
+        $segments = array_map(static function ($key) {
+            return str_replace('\.', '.', $key);
+        }, $segments);
+
+        return _array_search_dot($segments, $array);
+    }
 }
 
-if (! function_exists('_array_search_dot'))
-{
-	/**
-	 * Used by `dot_array_search` to recursively search the
-	 * array with wildcards.
-	 *
-	 * @internal This should not be used on its own.
-	 *
-	 * @param array $indexes
-	 * @param array $array
-	 *
-	 * @return mixed
-	 */
-	function _array_search_dot(array $indexes, array $array)
-	{
-		// Grab the current index
-		$currentIndex = $indexes ? array_shift($indexes) : null;
-
-		if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*'))
-		{
-			return null;
-		}
-
-		// Handle Wildcard (*)
-		if ($currentIndex === '*')
-		{
-			$answer = [];
-
-			foreach ($array as $value)
-			{
-				$answer[] = _array_search_dot($indexes, $value);
-			}
-
-			$answer = array_filter($answer, static function ($value) {
-				return $value !== null;
-			});
-
-			if ($answer !== [])
-			{
-				if (count($answer) === 1)
-				{
-					// If array only has one element, we return that element for BC.
-					return current($answer);
-				}
-
-				return $answer;
-			}
-
-			return null;
-		}
-
-		// If this is the last index, make sure to return it now,
-		// and not try to recurse through things.
-		if (empty($indexes))
-		{
-			return $array[$currentIndex];
-		}
-
-		// Do we need to recursively search this value?
-		if (is_array($array[$currentIndex]) && $array[$currentIndex] !== [])
-		{
-			return _array_search_dot($indexes, $array[$currentIndex]);
-		}
-
-		// Otherwise we've found our match!
-		return $array[$currentIndex];
-	}
+if (! function_exists('_array_search_dot')) {
+    /**
+     * Used by `dot_array_search` to recursively search the
+     * array with wildcards.
+     *
+     * @internal This should not be used on its own.
+     *
+     * @return mixed
+     */
+    function _array_search_dot(array $indexes, array $array)
+    {
+        // Grab the current index
+        $currentIndex = $indexes ? array_shift($indexes) : null;
+
+        if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*')) {
+            return null;
+        }
+
+        // Handle Wildcard (*)
+        if ($currentIndex === '*') {
+            $answer = [];
+
+            foreach ($array as $value) {
+                $answer[] = _array_search_dot($indexes, $value);
+            }
+
+            $answer = array_filter($answer, static function ($value) {
+                return $value !== null;
+            });
+
+            if ($answer !== []) {
+                if (count($answer) === 1) {
+                    // If array only has one element, we return that element for BC.
+                    return current($answer);
+                }
+
+                return $answer;
+            }
+
+            return null;
+        }
+
+        // If this is the last index, make sure to return it now,
+        // and not try to recurse through things.
+        if (empty($indexes)) {
+            return $array[$currentIndex];
+        }
+
+        // Do we need to recursively search this value?
+        if (is_array($array[$currentIndex]) && $array[$currentIndex] !== []) {
+            return _array_search_dot($indexes, $array[$currentIndex]);
+        }
+
+        // Otherwise we've found our match!
+        return $array[$currentIndex];
+    }
 }
 
-if (! function_exists('array_deep_search'))
-{
-	/**
-	 * Returns the value of an element at a key in an array of uncertain depth.
-	 *
-	 * @param mixed $key
-	 * @param array $array
-	 *
-	 * @return mixed|null
-	 */
-	function array_deep_search($key, array $array)
-	{
-		if (isset($array[$key]))
-		{
-			return $array[$key];
-		}
-
-		foreach ($array as $value)
-		{
-			if (is_array($value) && ($result = array_deep_search($key, $value)))
-			{
-				return $result;
-			}
-		}
-
-		return null;
-	}
+if (! function_exists('array_deep_search')) {
+    /**
+     * Returns the value of an element at a key in an array of uncertain depth.
+     *
+     * @param mixed $key
+     *
+     * @return mixed|null
+     */
+    function array_deep_search($key, array $array)
+    {
+        if (isset($array[$key])) {
+            return $array[$key];
+        }
+
+        foreach ($array as $value) {
+            if (is_array($value) && ($result = array_deep_search($key, $value))) {
+                return $result;
+            }
+        }
+
+        return null;
+    }
 }
 
-if (! function_exists('array_sort_by_multiple_keys'))
-{
-	/**
-	 * Sorts a multidimensional array by its elements values. The array
-	 * columns to be used for sorting are passed as an associative
-	 * array of key names and sorting flags.
-	 *
-	 * Both arrays of objects and arrays of array can be sorted.
-	 *
-	 * Example:
-	 *     array_sort_by_multiple_keys($players, [
-	 *         'team.hierarchy' => SORT_ASC,
-	 *         'position'       => SORT_ASC,
-	 *         'name'           => SORT_STRING,
-	 *     ]);
-	 *
-	 * The '.' dot operator in the column name indicates a deeper array or
-	 * object level. In principle, any number of sublevels could be used,
-	 * as long as the level and column exist in every array element.
-	 *
-	 * For information on multi-level array sorting, refer to Example #3 here:
-	 * https://www.php.net/manual/de/function.array-multisort.php
-	 *
-	 * @param array $array       the reference of the array to be sorted
-	 * @param array $sortColumns an associative array of columns to sort
-	 *                           after and their sorting flags
-	 *
-	 * @return boolean
-	 */
-	function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
-	{
-		// Check if there really are columns to sort after
-		if (empty($sortColumns) || empty($array))
-		{
-			return false;
-		}
-
-		// Group sorting indexes and data
-		$tempArray = [];
-		foreach ($sortColumns as $key => $sortFlag)
-		{
-			// Get sorting values
-			$carry = $array;
-
-			// The '.' operator separates nested elements
-			foreach (explode('.', $key) as $keySegment)
-			{
-				// Loop elements if they are objects
-				if (is_object(reset($carry)))
-				{
-					// Extract the object attribute
-					foreach ($carry as $index => $object)
-					{
-						$carry[$index] = $object->$keySegment;
-					}
-
-					continue;
-				}
-
-				// Extract the target column if elements are arrays
-				$carry = array_column($carry, $keySegment);
-			}
-
-			// Store the collected sorting parameters
-			$tempArray[] = $carry;
-			$tempArray[] = $sortFlag;
-		}
-
-		// Append the array as reference
-		$tempArray[] = &$array;
-
-		// Pass sorting arrays and flags as an argument list.
-		return array_multisort(...$tempArray);
-	}
+if (! function_exists('array_sort_by_multiple_keys')) {
+    /**
+     * Sorts a multidimensional array by its elements values. The array
+     * columns to be used for sorting are passed as an associative
+     * array of key names and sorting flags.
+     *
+     * Both arrays of objects and arrays of array can be sorted.
+     *
+     * Example:
+     *     array_sort_by_multiple_keys($players, [
+     *         'team.hierarchy' => SORT_ASC,
+     *         'position'       => SORT_ASC,
+     *         'name'           => SORT_STRING,
+     *     ]);
+     *
+     * The '.' dot operator in the column name indicates a deeper array or
+     * object level. In principle, any number of sublevels could be used,
+     * as long as the level and column exist in every array element.
+     *
+     * For information on multi-level array sorting, refer to Example #3 here:
+     * https://www.php.net/manual/de/function.array-multisort.php
+     *
+     * @param array $array       the reference of the array to be sorted
+     * @param array $sortColumns an associative array of columns to sort
+     *                           after and their sorting flags
+     */
+    function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
+    {
+        // Check if there really are columns to sort after
+        if (empty($sortColumns) || empty($array)) {
+            return false;
+        }
+
+        // Group sorting indexes and data
+        $tempArray = [];
+
+        foreach ($sortColumns as $key => $sortFlag) {
+            // Get sorting values
+            $carry = $array;
+
+            // The '.' operator separates nested elements
+            foreach (explode('.', $key) as $keySegment) {
+                // Loop elements if they are objects
+                if (is_object(reset($carry))) {
+                    // Extract the object attribute
+                    foreach ($carry as $index => $object) {
+                        $carry[$index] = $object->{$keySegment};
+                    }
+
+                    continue;
+                }
+
+                // Extract the target column if elements are arrays
+                $carry = array_column($carry, $keySegment);
+            }
+
+            // Store the collected sorting parameters
+            $tempArray[] = $carry;
+            $tempArray[] = $sortFlag;
+        }
+
+        // Append the array as reference
+        $tempArray[] = &$array;
+
+        // Pass sorting arrays and flags as an argument list.
+        return array_multisort(...$tempArray);
+    }
 }
 
-if (! function_exists('array_flatten_with_dots'))
-{
-	/**
-	 * Flatten a multidimensional array using dots as separators.
-	 *
-	 * @param iterable $array The multi-dimensional array
-	 * @param string   $id    Something to initially prepend to the flattened keys
-	 *
-	 * @return array The flattened array
-	 */
-	function array_flatten_with_dots(iterable $array, string $id = ''): array
-	{
-		$flattened = [];
-
-		foreach ($array as $key => $value)
-		{
-			$newKey = $id . $key;
-
-			if (is_array($value))
-			{
-				$flattened = array_merge($flattened, array_flatten_with_dots($value, $newKey . '.'));
-			}
-			else
-			{
-				$flattened[$newKey] = $value;
-			}
-		}
-
-		return $flattened;
-	}
+if (! function_exists('array_flatten_with_dots')) {
+    /**
+     * Flatten a multidimensional array using dots as separators.
+     *
+     * @param iterable $array The multi-dimensional array
+     * @param string   $id    Something to initially prepend to the flattened keys
+     *
+     * @return array The flattened array
+     */
+    function array_flatten_with_dots(iterable $array, string $id = ''): array
+    {
+        $flattened = [];
+
+        foreach ($array as $key => $value) {
+            $newKey = $id . $key;
+
+            if (is_array($value)) {
+                $flattened = array_merge($flattened, array_flatten_with_dots($value, $newKey . '.'));
+            } else {
+                $flattened[$newKey] = $value;
+            }
+        }
+
+        return $flattened;
+    }
 }
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index ed47c5efd8c2..e47a86356dbf 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\App;
@@ -16,98 +16,84 @@
 // CodeIgniter Cookie Helpers
 //=============================================================================
 
-if (! function_exists('set_cookie'))
-{
-	/**
-	 * Set cookie
-	 *
-	 * Accepts seven parameters, or you can submit an associative
-	 * array in the first parameter containing all the values.
-	 *
-	 * @param string|array $name     Cookie name or array containing binds
-	 * @param string       $value    The value of the cookie
-	 * @param string       $expire   The number of seconds until expiration
-	 * @param string       $domain   For site-wide cookie. Usually: .yourdomain.com
-	 * @param string       $path     The cookie path
-	 * @param string       $prefix   The cookie prefix
-	 * @param boolean      $secure   True makes the cookie secure
-	 * @param boolean      $httpOnly True makes the cookie accessible via http(s) only (no javascript)
-	 * @param string|null  $sameSite The cookie SameSite value
-	 *
-	 * @see \CodeIgniter\HTTP\Response::setCookie()
-	 */
-	function set_cookie(
-		$name,
-		string $value = '',
-		string $expire = '',
-		string $domain = '',
-		string $path = '/',
-		string $prefix = '',
-		bool $secure = false,
-		bool $httpOnly = false,
-		string $sameSite = null
-	)
-	{
-		$response = Services::response();
-		$response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly, $sameSite);
-	}
+if (! function_exists('set_cookie')) {
+    /**
+     * Set cookie
+     *
+     * Accepts seven parameters, or you can submit an associative
+     * array in the first parameter containing all the values.
+     *
+     * @param array|string $name     Cookie name or array containing binds
+     * @param string       $value    The value of the cookie
+     * @param string       $expire   The number of seconds until expiration
+     * @param string       $domain   For site-wide cookie. Usually: .yourdomain.com
+     * @param string       $path     The cookie path
+     * @param string       $prefix   The cookie prefix
+     * @param bool         $secure   True makes the cookie secure
+     * @param bool         $httpOnly True makes the cookie accessible via http(s) only (no javascript)
+     * @param string|null  $sameSite The cookie SameSite value
+     *
+     * @see \CodeIgniter\HTTP\Response::setCookie()
+     */
+    function set_cookie(
+        $name,
+        string $value = '',
+        string $expire = '',
+        string $domain = '',
+        string $path = '/',
+        string $prefix = '',
+        bool $secure = false,
+        bool $httpOnly = false,
+        ?string $sameSite = null
+    ) {
+        $response = Services::response();
+        $response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly, $sameSite);
+    }
 }
 
-if (! function_exists('get_cookie'))
-{
-	/**
-	 * Fetch an item from the $_COOKIE array
-	 *
-	 * @param string  $index
-	 * @param boolean $xssClean
-	 *
-	 * @return mixed
-	 *
-	 * @see \CodeIgniter\HTTP\IncomingRequest::getCookie()
-	 */
-	function get_cookie($index, bool $xssClean = false)
-	{
-		$prefix  = isset($_COOKIE[$index]) ? '' : config(App::class)->cookiePrefix;
-		$request = Services::request();
-		$filter  = $xssClean ? FILTER_SANITIZE_STRING : FILTER_DEFAULT;
+if (! function_exists('get_cookie')) {
+    /**
+     * Fetch an item from the $_COOKIE array
+     *
+     * @param string $index
+     *
+     * @return mixed
+     *
+     * @see \CodeIgniter\HTTP\IncomingRequest::getCookie()
+     */
+    function get_cookie($index, bool $xssClean = false)
+    {
+        $prefix  = isset($_COOKIE[$index]) ? '' : config(App::class)->cookiePrefix;
+        $request = Services::request();
+        $filter  = $xssClean ? FILTER_SANITIZE_STRING : FILTER_DEFAULT;
 
-		return $request->getCookie($prefix . $index, $filter);
-	}
+        return $request->getCookie($prefix . $index, $filter);
+    }
 }
 
-if (! function_exists('delete_cookie'))
-{
-	/**
-	 * Delete a cookie
-	 *
-	 * @param mixed  $name
-	 * @param string $domain the cookie domain. Usually: .yourdomain.com
-	 * @param string $path   the cookie path
-	 * @param string $prefix the cookie prefix
-	 *
-	 * @return void
-	 *
-	 * @see \CodeIgniter\HTTP\Response::deleteCookie()
-	 */
-	function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
-	{
-		Services::response()->deleteCookie($name, $domain, $path, $prefix);
-	}
+if (! function_exists('delete_cookie')) {
+    /**
+     * Delete a cookie
+     *
+     * @param mixed  $name
+     * @param string $domain the cookie domain. Usually: .yourdomain.com
+     * @param string $path   the cookie path
+     * @param string $prefix the cookie prefix
+     *
+     * @see \CodeIgniter\HTTP\Response::deleteCookie()
+     */
+    function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
+    {
+        Services::response()->deleteCookie($name, $domain, $path, $prefix);
+    }
 }
 
-if (! function_exists('has_cookie'))
-{
-	/**
-	 * Checks if a cookie exists by name.
-	 *
-	 * @param string      $name
-	 * @param string|null $value
-	 * @param string      $prefix
-	 *
-	 * @return boolean
-	 */
-	function has_cookie(string $name, string $value = null, string $prefix = ''): bool
-	{
-		return Services::response()->hasCookie($name, $value, $prefix);
-	}
+if (! function_exists('has_cookie')) {
+    /**
+     * Checks if a cookie exists by name.
+     */
+    function has_cookie(string $name, ?string $value = null, string $prefix = ''): bool
+    {
+        return Services::response()->hasCookie($name, $value, $prefix);
+    }
 }
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 11e8d478b9ef..31fcdfb90a52 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -1,73 +1,66 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter Date Helpers
- */
+// CodeIgniter Date Helpers
 
-if (! function_exists('now'))
-{
-	/**
-	 * Get "now" time
-	 *
-	 * Returns time() based on the timezone parameter or on the
-	 * app_timezone() setting
-	 *
-	 * @param string $timezone
-	 *
-	 * @return integer
-	 * @throws Exception
-	 */
-	function now(string $timezone = null): int
-	{
-		$timezone = empty($timezone) ? app_timezone() : $timezone;
+if (! function_exists('now')) {
+    /**
+     * Get "now" time
+     *
+     * Returns time() based on the timezone parameter or on the
+     * app_timezone() setting
+     *
+     * @param string $timezone
+     *
+     * @throws Exception
+     */
+    function now(?string $timezone = null): int
+    {
+        $timezone = empty($timezone) ? app_timezone() : $timezone;
 
-		if ($timezone === 'local' || $timezone === date_default_timezone_get())
-		{
-			return time();
-		}
+        if ($timezone === 'local' || $timezone === date_default_timezone_get()) {
+            return time();
+        }
 
-		$datetime = new DateTime('now', new DateTimeZone($timezone));
-		sscanf($datetime->format('j-n-Y G:i:s'), '%d-%d-%d %d:%d:%d', $day, $month, $year, $hour, $minute, $second);
+        $datetime = new DateTime('now', new DateTimeZone($timezone));
+        sscanf($datetime->format('j-n-Y G:i:s'), '%d-%d-%d %d:%d:%d', $day, $month, $year, $hour, $minute, $second);
 
-		return mktime($hour, $minute, $second, $month, $day, $year);
-	}
+        return mktime($hour, $minute, $second, $month, $day, $year);
+    }
 }
 
-if (! function_exists('timezone_select'))
-{
-	/**
-	 * Generates a select field of all available timezones
-	 *
-	 * Returns a string with the formatted HTML
-	 *
-	 * @param string  $class   Optional class to apply to the select field
-	 * @param string  $default Default value for initial selection
-	 * @param integer $what    One of the DateTimeZone class constants (for listIdentifiers)
-	 * @param string  $country A two-letter ISO 3166-1 compatible country code (for listIdentifiers)
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, string $country = null): string
-	{
-		$timezones = DateTimeZone::listIdentifiers($what, $country);
+if (! function_exists('timezone_select')) {
+    /**
+     * Generates a select field of all available timezones
+     *
+     * Returns a string with the formatted HTML
+     *
+     * @param string $class   Optional class to apply to the select field
+     * @param string $default Default value for initial selection
+     * @param int    $what    One of the DateTimeZone class constants (for listIdentifiers)
+     * @param string $country A two-letter ISO 3166-1 compatible country code (for listIdentifiers)
+     *
+     * @throws Exception
+     */
+    function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, ?string $country = null): string
+    {
+        $timezones = DateTimeZone::listIdentifiers($what, $country);
+
+        $buffer = "<select name='timezone' class='{$class}'>" . PHP_EOL;
 
-		$buffer = "<select name='timezone' class='{$class}'>" . PHP_EOL;
-		foreach ($timezones as $timezone)
-		{
-			$selected = ($timezone === $default) ? 'selected' : '';
-			$buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
-		}
+        foreach ($timezones as $timezone) {
+            $selected = ($timezone === $default) ? 'selected' : '';
+            $buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
+        }
 
-		return $buffer . ('</select>' . PHP_EOL);
-	}
+        return $buffer . ('</select>' . PHP_EOL);
+    }
 }
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 57355370b55d..52341b848e06 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -1,555 +1,441 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter File System Helpers
- */
-// ------------------------------------------------------------------------
-
-if (! function_exists('directory_map'))
-{
-	/**
-	 * Create a Directory Map
-	 *
-	 * Reads the specified directory and builds an array
-	 * representation of it. Sub-folders contained with the
-	 * directory will be mapped as well.
-	 *
-	 * @param string  $sourceDir      Path to source
-	 * @param integer $directoryDepth Depth of directories to traverse
-	 *                                 (0 = fully recursive, 1 = current dir, etc)
-	 * @param boolean $hidden         Whether to show hidden files
-	 *
-	 * @return array
-	 */
-	function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden = false): array
-	{
-		try
-		{
-			$fp = opendir($sourceDir);
-
-			$fileData  = [];
-			$newDepth  = $directoryDepth - 1;
-			$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-			while (false !== ($file = readdir($fp)))
-			{
-				// Remove '.', '..', and hidden files [optional]
-				if ($file === '.' || $file === '..' || ($hidden === false && $file[0] === '.'))
-				{
-					continue;
-				}
-
-				if (is_dir($sourceDir . $file))
-				{
-					$file .= DIRECTORY_SEPARATOR;
-				}
-
-				if (($directoryDepth < 1 || $newDepth > 0) && is_dir($sourceDir . $file))
-				{
-					$fileData[$file] = directory_map($sourceDir . $file, $newDepth, $hidden);
-				}
-				else
-				{
-					$fileData[] = $file;
-				}
-			}
-
-			closedir($fp);
-			return $fileData;
-		}
-		catch (Throwable $e)
-		{
-			return [];
-		}
-	}
+// CodeIgniter File System Helpers
+
+if (! function_exists('directory_map')) {
+    /**
+     * Create a Directory Map
+     *
+     * Reads the specified directory and builds an array
+     * representation of it. Sub-folders contained with the
+     * directory will be mapped as well.
+     *
+     * @param string $sourceDir      Path to source
+     * @param int    $directoryDepth Depth of directories to traverse
+     *                               (0 = fully recursive, 1 = current dir, etc)
+     * @param bool   $hidden         Whether to show hidden files
+     */
+    function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden = false): array
+    {
+        try {
+            $fp = opendir($sourceDir);
+
+            $fileData  = [];
+            $newDepth  = $directoryDepth - 1;
+            $sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+            while (false !== ($file = readdir($fp))) {
+                // Remove '.', '..', and hidden files [optional]
+                if ($file === '.' || $file === '..' || ($hidden === false && $file[0] === '.')) {
+                    continue;
+                }
+
+                if (is_dir($sourceDir . $file)) {
+                    $file .= DIRECTORY_SEPARATOR;
+                }
+
+                if (($directoryDepth < 1 || $newDepth > 0) && is_dir($sourceDir . $file)) {
+                    $fileData[$file] = directory_map($sourceDir . $file, $newDepth, $hidden);
+                } else {
+                    $fileData[] = $file;
+                }
+            }
+
+            closedir($fp);
+
+            return $fileData;
+        } catch (Throwable $e) {
+            return [];
+        }
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('directory_mirror'))
-{
-	/**
-	 * Recursively copies the files and directories of the origin directory
-	 * into the target directory, i.e. "mirror" its contents.
-	 *
-	 * @param string  $originDir
-	 * @param string  $targetDir
-	 * @param boolean $overwrite Whether individual files overwrite on collision
-	 *
-	 * @return void
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	function directory_mirror(string $originDir, string $targetDir, bool $overwrite = true): void
-	{
-		if (! is_dir($originDir = rtrim($originDir, '\\/')))
-		{
-			throw new InvalidArgumentException(sprintf('The origin directory "%s" was not found.', $originDir));
-		}
-
-		if (! is_dir($targetDir = rtrim($targetDir, '\\/')))
-		{
-			@mkdir($targetDir, 0755, true);
-		}
-
-		$dirLen = strlen($originDir);
-
-		/**
-		 * @var SplFileInfo $file
-		 */
-		foreach (new RecursiveIteratorIterator(
-			new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
-			RecursiveIteratorIterator::SELF_FIRST
-		) as $file)
-		{
-			$origin = $file->getPathname();
-			$target = $targetDir . substr($origin, $dirLen);
-
-			if ($file->isDir())
-			{
-				mkdir($target, 0755);
-			}
-			elseif (! is_file($target) || ($overwrite && is_file($target)))
-			{
-				copy($origin, $target);
-			}
-		}
-	}
+if (! function_exists('directory_mirror')) {
+    /**
+     * Recursively copies the files and directories of the origin directory
+     * into the target directory, i.e. "mirror" its contents.
+     *
+     * @param bool $overwrite Whether individual files overwrite on collision
+     *
+     * @throws InvalidArgumentException
+     */
+    function directory_mirror(string $originDir, string $targetDir, bool $overwrite = true): void
+    {
+        if (! is_dir($originDir = rtrim($originDir, '\\/'))) {
+            throw new InvalidArgumentException(sprintf('The origin directory "%s" was not found.', $originDir));
+        }
+
+        if (! is_dir($targetDir = rtrim($targetDir, '\\/'))) {
+            @mkdir($targetDir, 0755, true);
+        }
+
+        $dirLen = strlen($originDir);
+
+        /**
+         * @var SplFileInfo $file
+         */
+        foreach (new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($originDir, FilesystemIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::SELF_FIRST
+        ) as $file) {
+            $origin = $file->getPathname();
+            $target = $targetDir . substr($origin, $dirLen);
+
+            if ($file->isDir()) {
+                mkdir($target, 0755);
+            } elseif (! is_file($target) || ($overwrite && is_file($target))) {
+                copy($origin, $target);
+            }
+        }
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('write_file'))
-{
-	/**
-	 * Write File
-	 *
-	 * Writes data to the file specified in the path.
-	 * Creates a new file if non-existent.
-	 *
-	 * @param string $path File path
-	 * @param string $data Data to write
-	 * @param string $mode fopen() mode (default: 'wb')
-	 *
-	 * @return boolean
-	 */
-	function write_file(string $path, string $data, string $mode = 'wb'): bool
-	{
-		try
-		{
-			$fp = fopen($path, $mode);
-
-			flock($fp, LOCK_EX);
-
-			for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result)
-			{
-				if (($result = fwrite($fp, substr($data, $written))) === false)
-				{
-					break;
-				}
-			}
-
-			flock($fp, LOCK_UN);
-			fclose($fp);
-
-			return is_int($result);
-		}
-		catch (Throwable $e)
-		{
-			return false;
-		}
-	}
+if (! function_exists('write_file')) {
+    /**
+     * Write File
+     *
+     * Writes data to the file specified in the path.
+     * Creates a new file if non-existent.
+     *
+     * @param string $path File path
+     * @param string $data Data to write
+     * @param string $mode fopen() mode (default: 'wb')
+     */
+    function write_file(string $path, string $data, string $mode = 'wb'): bool
+    {
+        try {
+            $fp = fopen($path, $mode);
+
+            flock($fp, LOCK_EX);
+
+            for ($result = $written = 0, $length = strlen($data); $written < $length; $written += $result) {
+                if (($result = fwrite($fp, substr($data, $written))) === false) {
+                    break;
+                }
+            }
+
+            flock($fp, LOCK_UN);
+            fclose($fp);
+
+            return is_int($result);
+        } catch (Throwable $e) {
+            return false;
+        }
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('delete_files'))
-{
-	/**
-	 * Delete Files
-	 *
-	 * Deletes all files contained in the supplied directory path.
-	 * Files must be writable or owned by the system in order to be deleted.
-	 * If the second parameter is set to true, any directories contained
-	 * within the supplied base directory will be nuked as well.
-	 *
-	 * @param string  $path   File path
-	 * @param boolean $delDir Whether to delete any directories found in the path
-	 * @param boolean $htdocs Whether to skip deleting .htaccess and index page files
-	 * @param boolean $hidden Whether to include hidden files (files beginning with a period)
-	 *
-	 * @return boolean
-	 */
-	function delete_files(string $path, bool $delDir = false, bool $htdocs = false, bool $hidden = false): bool
-	{
-		$path = realpath($path) ?: $path;
-		$path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-		try
-		{
-			foreach (new RecursiveIteratorIterator(
-				new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
-				RecursiveIteratorIterator::CHILD_FIRST
-			) as $object)
-			{
-				$filename = $object->getFilename();
-				if (! $hidden && $filename[0] === '.')
-				{
-					continue;
-				}
-
-				if (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
-				{
-					$isDir = $object->isDir();
-					if ($isDir && $delDir)
-					{
-						rmdir($object->getPathname());
-						continue;
-					}
-					if (! $isDir)
-					{
-						unlink($object->getPathname());
-					}
-				}
-			}
-
-			return true;
-		}
-		catch (Throwable $e)
-		{
-			return false;
-		}
-	}
+if (! function_exists('delete_files')) {
+    /**
+     * Delete Files
+     *
+     * Deletes all files contained in the supplied directory path.
+     * Files must be writable or owned by the system in order to be deleted.
+     * If the second parameter is set to true, any directories contained
+     * within the supplied base directory will be nuked as well.
+     *
+     * @param string $path   File path
+     * @param bool   $delDir Whether to delete any directories found in the path
+     * @param bool   $htdocs Whether to skip deleting .htaccess and index page files
+     * @param bool   $hidden Whether to include hidden files (files beginning with a period)
+     */
+    function delete_files(string $path, bool $delDir = false, bool $htdocs = false, bool $hidden = false): bool
+    {
+        $path = realpath($path) ?: $path;
+        $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        try {
+            foreach (new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::CHILD_FIRST
+            ) as $object) {
+                $filename = $object->getFilename();
+                if (! $hidden && $filename[0] === '.') {
+                    continue;
+                }
+
+                if (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename)) {
+                    $isDir = $object->isDir();
+                    if ($isDir && $delDir) {
+                        rmdir($object->getPathname());
+
+                        continue;
+                    }
+                    if (! $isDir) {
+                        unlink($object->getPathname());
+                    }
+                }
+            }
+
+            return true;
+        } catch (Throwable $e) {
+            return false;
+        }
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('get_filenames'))
-{
-	/**
-	 * Get Filenames
-	 *
-	 * Reads the specified directory and builds an array containing the filenames.
-	 * Any sub-folders contained within the specified path are read as well.
-	 *
-	 * @param string       $sourceDir   Path to source
-	 * @param boolean|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path
-	 * @param boolean      $hidden      Whether to include hidden files (files beginning with a period)
-	 *
-	 * @return array
-	 */
-	function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
-	{
-		$files = [];
-
-		$sourceDir = realpath($sourceDir) ?: $sourceDir;
-		$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-		try
-		{
-			foreach (new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
-					RecursiveIteratorIterator::SELF_FIRST
-				) as $name => $object)
-			{
-				$basename = pathinfo($name, PATHINFO_BASENAME);
-				if (! $hidden && $basename[0] === '.')
-				{
-					continue;
-				}
-
-				if ($includePath === false)
-				{
-					$files[] = $basename;
-				}
-				elseif (is_null($includePath))
-				{
-					$files[] = str_replace($sourceDir, '', $name);
-				}
-				else
-				{
-					$files[] = $name;
-				}
-			}
-		}
-		catch (Throwable $e)
-		{
-			return [];
-		}
-
-		sort($files);
-
-		return $files;
-	}
+if (! function_exists('get_filenames')) {
+    /**
+     * Get Filenames
+     *
+     * Reads the specified directory and builds an array containing the filenames.
+     * Any sub-folders contained within the specified path are read as well.
+     *
+     * @param string    $sourceDir   Path to source
+     * @param bool|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path
+     * @param bool      $hidden      Whether to include hidden files (files beginning with a period)
+     */
+    function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
+    {
+        $files = [];
+
+        $sourceDir = realpath($sourceDir) ?: $sourceDir;
+        $sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        try {
+            foreach (new RecursiveIteratorIterator(
+                new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::SELF_FIRST
+            ) as $name => $object) {
+                $basename = pathinfo($name, PATHINFO_BASENAME);
+                if (! $hidden && $basename[0] === '.') {
+                    continue;
+                }
+
+                if ($includePath === false) {
+                    $files[] = $basename;
+                } elseif ($includePath === null) {
+                    $files[] = str_replace($sourceDir, '', $name);
+                } else {
+                    $files[] = $name;
+                }
+            }
+        } catch (Throwable $e) {
+            return [];
+        }
+
+        sort($files);
+
+        return $files;
+    }
 }
 
-// --------------------------------------------------------------------
-
-if (! function_exists('get_dir_file_info'))
-{
-	/**
-	 * Get Directory File Information
-	 *
-	 * Reads the specified directory and builds an array containing the filenames,
-	 * filesize, dates, and permissions
-	 *
-	 * Any sub-folders contained within the specified path are read as well.
-	 *
-	 * @param string  $sourceDir    Path to source
-	 * @param boolean $topLevelOnly Look only at the top level directory specified?
-	 * @param boolean $recursion    Internal variable to determine recursion status - do not use in calls
-	 *
-	 * @return array
-	 */
-	function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $recursion = false): array
-	{
-		static $fileData = [];
-		$relativePath    = $sourceDir;
-
-		try
-		{
-			$fp = opendir($sourceDir); {
-				// reset the array and make sure $source_dir has a trailing slash on the initial call
-			if ($recursion === false)
-				{
-				$fileData  = [];
-				$sourceDir = rtrim(realpath($sourceDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-			}
-
-				// Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
-			while (false !== ($file = readdir($fp)))
-				{
-				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
-				{
-					get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
-				}
-				elseif ($file[0] !== '.')
-				{
-					$fileData[$file]                  = get_file_info($sourceDir . $file);
-					$fileData[$file]['relative_path'] = $relativePath;
-				}
-			}
-
-				closedir($fp);
-				return $fileData;
-			}
-		}
-		catch (Throwable $fe)
-		{
-			return [];
-		}
-	}
+if (! function_exists('get_dir_file_info')) {
+    /**
+     * Get Directory File Information
+     *
+     * Reads the specified directory and builds an array containing the filenames,
+     * filesize, dates, and permissions
+     *
+     * Any sub-folders contained within the specified path are read as well.
+     *
+     * @param string $sourceDir    Path to source
+     * @param bool   $topLevelOnly Look only at the top level directory specified?
+     * @param bool   $recursion    Internal variable to determine recursion status - do not use in calls
+     */
+    function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $recursion = false): array
+    {
+        static $fileData = [];
+        $relativePath    = $sourceDir;
+
+        try {
+            $fp = opendir($sourceDir);
+
+            // reset the array and make sure $source_dir has a trailing slash on the initial call
+            if ($recursion === false) {
+                $fileData  = [];
+                $sourceDir = rtrim(realpath($sourceDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+            }
+
+            // Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
+            while (false !== ($file = readdir($fp))) {
+                if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
+                    get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
+                } elseif ($file[0] !== '.') {
+                    $fileData[$file]                  = get_file_info($sourceDir . $file);
+                    $fileData[$file]['relative_path'] = $relativePath;
+                }
+            }
+
+            closedir($fp);
+
+            return $fileData;
+        } catch (Throwable $fe) {
+            return [];
+        }
+    }
 }
 
-// --------------------------------------------------------------------
-
-if (! function_exists('get_file_info'))
-{
-	/**
-	 * Get File Info
-	 *
-	 * Given a file and path, returns the name, path, size, date modified
-	 * Second parameter allows you to explicitly declare what information you want returned
-	 * Options are: name, server_path, size, date, readable, writable, executable, fileperms
-	 * Returns false if the file cannot be found.
-	 *
-	 * @param string $file           Path to file
-	 * @param mixed  $returnedValues Array or comma separated string of information returned
-	 *
-	 * @return array|null
-	 */
-	function get_file_info(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
-	{
-		if (! is_file($file))
-		{
-			return null;
-		}
-
-		$fileInfo = [];
-
-		if (is_string($returnedValues))
-		{
-			$returnedValues = explode(',', $returnedValues);
-		}
-
-		foreach ($returnedValues as $key)
-		{
-			switch ($key) {
-				case 'name':
-					$fileInfo['name'] = basename($file);
-					break;
-				case 'server_path':
-					$fileInfo['server_path'] = $file;
-					break;
-				case 'size':
-					$fileInfo['size'] = filesize($file);
-					break;
-				case 'date':
-					$fileInfo['date'] = filemtime($file);
-					break;
-				case 'readable':
-					$fileInfo['readable'] = is_readable($file);
-					break;
-				case 'writable':
-					$fileInfo['writable'] = is_really_writable($file);
-					break;
-				case 'executable':
-					$fileInfo['executable'] = is_executable($file);
-					break;
-				case 'fileperms':
-					$fileInfo['fileperms'] = fileperms($file);
-					break;
-			}
-		}
-
-		return $fileInfo;
-	}
+if (! function_exists('get_file_info')) {
+    /**
+     * Get File Info
+     *
+     * Given a file and path, returns the name, path, size, date modified
+     * Second parameter allows you to explicitly declare what information you want returned
+     * Options are: name, server_path, size, date, readable, writable, executable, fileperms
+     * Returns false if the file cannot be found.
+     *
+     * @param string $file           Path to file
+     * @param mixed  $returnedValues Array or comma separated string of information returned
+     *
+     * @return array|null
+     */
+    function get_file_info(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
+    {
+        if (! is_file($file)) {
+            return null;
+        }
+
+        $fileInfo = [];
+
+        if (is_string($returnedValues)) {
+            $returnedValues = explode(',', $returnedValues);
+        }
+
+        foreach ($returnedValues as $key) {
+            switch ($key) {
+                case 'name':
+                    $fileInfo['name'] = basename($file);
+                    break;
+
+                case 'server_path':
+                    $fileInfo['server_path'] = $file;
+                    break;
+
+                case 'size':
+                    $fileInfo['size'] = filesize($file);
+                    break;
+
+                case 'date':
+                    $fileInfo['date'] = filemtime($file);
+                    break;
+
+                case 'readable':
+                    $fileInfo['readable'] = is_readable($file);
+                    break;
+
+                case 'writable':
+                    $fileInfo['writable'] = is_really_writable($file);
+                    break;
+
+                case 'executable':
+                    $fileInfo['executable'] = is_executable($file);
+                    break;
+
+                case 'fileperms':
+                    $fileInfo['fileperms'] = fileperms($file);
+                    break;
+            }
+        }
+
+        return $fileInfo;
+    }
 }
 
-// --------------------------------------------------------------------
-
-if (! function_exists('symbolic_permissions'))
-{
-	/**
-	 * Symbolic Permissions
-	 *
-	 * Takes a numeric value representing a file's permissions and returns
-	 * standard symbolic notation representing that value
-	 *
-	 * @param  integer $perms Permissions
-	 * @return string
-	 */
-	function symbolic_permissions(int $perms): string
-	{
-		if (($perms & 0xC000) === 0xC000)
-		{
-			$symbolic = 's'; // Socket
-		}
-		elseif (($perms & 0xA000) === 0xA000)
-		{
-			$symbolic = 'l'; // Symbolic Link
-		}
-		elseif (($perms & 0x8000) === 0x8000)
-		{
-			$symbolic = '-'; // Regular
-		}
-		elseif (($perms & 0x6000) === 0x6000)
-		{
-			$symbolic = 'b'; // Block special
-		}
-		elseif (($perms & 0x4000) === 0x4000)
-		{
-			$symbolic = 'd'; // Directory
-		}
-		elseif (($perms & 0x2000) === 0x2000)
-		{
-			$symbolic = 'c'; // Character special
-		}
-		elseif (($perms & 0x1000) === 0x1000)
-		{
-			$symbolic = 'p'; // FIFO pipe
-		}
-		else
-		{
-			$symbolic = 'u'; // Unknown
-		}
-
-		// Owner
-		$symbolic .= (($perms & 0x0100) ? 'r' : '-')
-				. (($perms & 0x0080) ? 'w' : '-')
-				. (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
-
-		// Group
-		$symbolic .= (($perms & 0x0020) ? 'r' : '-')
-				. (($perms & 0x0010) ? 'w' : '-')
-				. (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
-
-		// World
-		$symbolic .= (($perms & 0x0004) ? 'r' : '-')
-				. (($perms & 0x0002) ? 'w' : '-')
-				. (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
-
-		return $symbolic;
-	}
+if (! function_exists('symbolic_permissions')) {
+    /**
+     * Symbolic Permissions
+     *
+     * Takes a numeric value representing a file's permissions and returns
+     * standard symbolic notation representing that value
+     *
+     * @param int $perms Permissions
+     */
+    function symbolic_permissions(int $perms): string
+    {
+        if (($perms & 0xC000) === 0xC000) {
+            $symbolic = 's'; // Socket
+        } elseif (($perms & 0xA000) === 0xA000) {
+            $symbolic = 'l'; // Symbolic Link
+        } elseif (($perms & 0x8000) === 0x8000) {
+            $symbolic = '-'; // Regular
+        } elseif (($perms & 0x6000) === 0x6000) {
+            $symbolic = 'b'; // Block special
+        } elseif (($perms & 0x4000) === 0x4000) {
+            $symbolic = 'd'; // Directory
+        } elseif (($perms & 0x2000) === 0x2000) {
+            $symbolic = 'c'; // Character special
+        } elseif (($perms & 0x1000) === 0x1000) {
+            $symbolic = 'p'; // FIFO pipe
+        } else {
+            $symbolic = 'u'; // Unknown
+        }
+
+        // Owner
+        $symbolic .= (($perms & 0x0100) ? 'r' : '-')
+                . (($perms & 0x0080) ? 'w' : '-')
+                . (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x') : (($perms & 0x0800) ? 'S' : '-'));
+
+        // Group
+        $symbolic .= (($perms & 0x0020) ? 'r' : '-')
+                . (($perms & 0x0010) ? 'w' : '-')
+                . (($perms & 0x0008) ? (($perms & 0x0400) ? 's' : 'x') : (($perms & 0x0400) ? 'S' : '-'));
+
+        // World
+        $symbolic .= (($perms & 0x0004) ? 'r' : '-')
+                . (($perms & 0x0002) ? 'w' : '-')
+                . (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
+
+        return $symbolic;
+    }
 }
 
-// --------------------------------------------------------------------
-
-if (! function_exists('octal_permissions'))
-{
-	/**
-	 * Octal Permissions
-	 *
-	 * Takes a numeric value representing a file's permissions and returns
-	 * a three character string representing the file's octal permissions
-	 *
-	 * @param  integer $perms Permissions
-	 * @return string
-	 */
-	function octal_permissions(int $perms): string
-	{
-		return substr(sprintf('%o', $perms), -3);
-	}
+if (! function_exists('octal_permissions')) {
+    /**
+     * Octal Permissions
+     *
+     * Takes a numeric value representing a file's permissions and returns
+     * a three character string representing the file's octal permissions
+     *
+     * @param int $perms Permissions
+     */
+    function octal_permissions(int $perms): string
+    {
+        return substr(sprintf('%o', $perms), -3);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('same_file'))
-{
-	/**
-	 * Checks if two files both exist and have identical hashes
-	 *
-	 * @param string $file1
-	 * @param string $file2
-	 *
-	 * @return boolean  Same or not
-	 */
-	function same_file(string $file1, string $file2): bool
-	{
-		return is_file($file1) && is_file($file2) && md5_file($file1) === md5_file($file2);
-	}
+if (! function_exists('same_file')) {
+    /**
+     * Checks if two files both exist and have identical hashes
+     *
+     * @return bool Same or not
+     */
+    function same_file(string $file1, string $file2): bool
+    {
+        return is_file($file1) && is_file($file2) && md5_file($file1) === md5_file($file2);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('set_realpath'))
-{
-	/**
-	 * Set Realpath
-	 *
-	 * @param string  $path
-	 * @param boolean $checkExistence Checks to see if the path exists
-	 *
-	 * @return string
-	 */
-	function set_realpath(string $path, bool $checkExistence = false): string
-	{
-		// Security check to make sure the path is NOT a URL. No remote file inclusion!
-		if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp)#i', $path) || filter_var($path, FILTER_VALIDATE_IP) === $path)
-		{
-			throw new InvalidArgumentException('The path you submitted must be a local server path, not a URL');
-		}
-
-		// Resolve the path
-		if (realpath($path) !== false)
-		{
-			$path = realpath($path);
-		}
-		elseif ($checkExistence && ! is_dir($path) && ! is_file($path))
-		{
-			throw new InvalidArgumentException('Not a valid path: ' . $path);
-		}
-
-		// Add a trailing slash, if this is a directory
-		return is_dir($path) ? rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path;
-	}
+if (! function_exists('set_realpath')) {
+    /**
+     * Set Realpath
+     *
+     * @param bool $checkExistence Checks to see if the path exists
+     */
+    function set_realpath(string $path, bool $checkExistence = false): string
+    {
+        // Security check to make sure the path is NOT a URL. No remote file inclusion!
+        if (preg_match('#^(http:\/\/|https:\/\/|www\.|ftp)#i', $path) || filter_var($path, FILTER_VALIDATE_IP) === $path) {
+            throw new InvalidArgumentException('The path you submitted must be a local server path, not a URL');
+        }
+
+        // Resolve the path
+        if (realpath($path) !== false) {
+            $path = realpath($path);
+        } elseif ($checkExistence && ! is_dir($path) && ! is_file($path)) {
+            throw new InvalidArgumentException('Not a valid path: ' . $path);
+        }
+
+        // Add a trailing slash, if this is a directory
+        return is_dir($path) ? rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path;
+    }
 }
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 8bfb4221847d..e33ec2e89137 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -1,963 +1,726 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\App;
-
-/**
- * CodeIgniter Form Helpers
- */
-
 use Config\Services;
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_open'))
-{
-	/**
-	 * Form Declaration
-	 *
-	 * Creates the opening portion of the form.
-	 *
-	 * @param string       $action     the URI segments of the form destination
-	 * @param array|string $attributes a key/value pair of attributes, or string representation
-	 * @param array        $hidden     a key/value pair hidden data
-	 *
-	 * @return string
-	 */
-	function form_open(string $action = '', $attributes = [], array $hidden = []): string
-	{
-		// If no action is provided then set to the current url
-		if (! $action)
-		{
-			$action = current_url(true);
-		} // If an action is not a full URL then turn it into one
-		elseif (strpos($action, '://') === false)
-		{
-			// If an action has {locale}
-			if (strpos($action, '{locale}') !== false)
-			{
-				$action = str_replace('{locale}', Services::request()->getLocale(), $action);
-			}
-
-			$action = site_url($action);
-		}
-
-		if (is_array($attributes) && array_key_exists('csrf_id', $attributes))
-		{
-			$csrfId = $attributes['csrf_id'];
-			unset($attributes['csrf_id']);
-		}
-
-		$attributes = stringify_attributes($attributes);
-
-		if (stripos($attributes, 'method=') === false)
-		{
-			$attributes .= ' method="post"';
-		}
-		if (stripos($attributes, 'accept-charset=') === false)
-		{
-			$config      = config(App::class);
-			$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
-		}
-
-		$form = '<form action="' . $action . '"' . $attributes . ">\n";
-
-		// Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
-		$before = Services::filters()->getFilters()['before'];
-
-		if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"'))
-		{
-			$form .= csrf_field($csrfId ?? null);
-		}
-
-		if (is_array($hidden))
-		{
-			foreach ($hidden as $name => $value)
-			{
-				$form .= form_hidden($name, $value);
-			}
-		}
-
-		return $form;
-	}
+// CodeIgniter Form Helpers
+
+if (! function_exists('form_open')) {
+    /**
+     * Form Declaration
+     *
+     * Creates the opening portion of the form.
+     *
+     * @param string       $action     the URI segments of the form destination
+     * @param array|string $attributes a key/value pair of attributes, or string representation
+     * @param array        $hidden     a key/value pair hidden data
+     */
+    function form_open(string $action = '', $attributes = [], array $hidden = []): string
+    {
+        // If no action is provided then set to the current url
+        if (! $action) {
+            $action = current_url(true);
+        } // If an action is not a full URL then turn it into one
+        elseif (strpos($action, '://') === false) {
+            // If an action has {locale}
+            if (strpos($action, '{locale}') !== false) {
+                $action = str_replace('{locale}', Services::request()->getLocale(), $action);
+            }
+
+            $action = site_url($action);
+        }
+
+        if (is_array($attributes) && array_key_exists('csrf_id', $attributes)) {
+            $csrfId = $attributes['csrf_id'];
+            unset($attributes['csrf_id']);
+        }
+
+        $attributes = stringify_attributes($attributes);
+
+        if (stripos($attributes, 'method=') === false) {
+            $attributes .= ' method="post"';
+        }
+        if (stripos($attributes, 'accept-charset=') === false) {
+            $config = config(App::class);
+            $attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
+        }
+
+        $form = '<form action="' . $action . '"' . $attributes . ">\n";
+
+        // Add CSRF field if enabled, but leave it out for GET requests and requests to external websites
+        $before = Services::filters()->getFilters()['before'];
+
+        if ((in_array('csrf', $before, true) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"')) {
+            $form .= csrf_field($csrfId ?? null);
+        }
+
+        if (is_array($hidden)) {
+            foreach ($hidden as $name => $value) {
+                $form .= form_hidden($name, $value);
+            }
+        }
+
+        return $form;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_open_multipart'))
-{
-	/**
-	 * Form Declaration - Multipart type
-	 *
-	 * Creates the opening portion of the form, but with "multipart/form-data".
-	 *
-	 * @param string       $action     The URI segments of the form destination
-	 * @param array|string $attributes A key/value pair of attributes, or the same as a string
-	 * @param array        $hidden     A key/value pair hidden data
-	 *
-	 * @return string
-	 */
-	function form_open_multipart(string $action = '', $attributes = [], array $hidden = []): string
-	{
-		if (is_string($attributes))
-		{
-			$attributes .= ' enctype="' . esc('multipart/form-data') . '"';
-		}
-		else
-		{
-			$attributes['enctype'] = 'multipart/form-data';
-		}
-
-		return form_open($action, $attributes, $hidden);
-	}
+if (! function_exists('form_open_multipart')) {
+    /**
+     * Form Declaration - Multipart type
+     *
+     * Creates the opening portion of the form, but with "multipart/form-data".
+     *
+     * @param string       $action     The URI segments of the form destination
+     * @param array|string $attributes A key/value pair of attributes, or the same as a string
+     * @param array        $hidden     A key/value pair hidden data
+     */
+    function form_open_multipart(string $action = '', $attributes = [], array $hidden = []): string
+    {
+        if (is_string($attributes)) {
+            $attributes .= ' enctype="' . esc('multipart/form-data') . '"';
+        } else {
+            $attributes['enctype'] = 'multipart/form-data';
+        }
+
+        return form_open($action, $attributes, $hidden);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_hidden'))
-{
-	/**
-	 * Hidden Input Field
-	 *
-	 * Generates hidden fields. You can pass a simple key/value string or
-	 * an associative array with multiple values.
-	 *
-	 * @param string|array $name      Field name or associative array to create multiple fields
-	 * @param string|array $value     Field value
-	 * @param boolean      $recursing
-	 *
-	 * @return string
-	 */
-	function form_hidden($name, $value = '', bool $recursing = false): string
-	{
-		static $form;
-
-		if ($recursing === false)
-		{
-			$form = "\n";
-		}
-
-		if (is_array($name))
-		{
-			foreach ($name as $key => $val)
-			{
-				form_hidden($key, $val, true);
-			}
-
-			return $form;
-		}
-
-		if (! is_array($value))
-		{
-			$form .= form_input($name, $value, '', 'hidden');
-		}
-		else
-		{
-			foreach ($value as $k => $v)
-			{
-				$k = is_int($k) ? '' : $k;
-				form_hidden($name . '[' . $k . ']', $v, true);
-			}
-		}
-
-		return $form;
-	}
+if (! function_exists('form_hidden')) {
+    /**
+     * Hidden Input Field
+     *
+     * Generates hidden fields. You can pass a simple key/value string or
+     * an associative array with multiple values.
+     *
+     * @param array|string $name  Field name or associative array to create multiple fields
+     * @param array|string $value Field value
+     */
+    function form_hidden($name, $value = '', bool $recursing = false): string
+    {
+        static $form;
+
+        if ($recursing === false) {
+            $form = "\n";
+        }
+
+        if (is_array($name)) {
+            foreach ($name as $key => $val) {
+                form_hidden($key, $val, true);
+            }
+
+            return $form;
+        }
+
+        if (! is_array($value)) {
+            $form .= form_input($name, $value, '', 'hidden');
+        } else {
+            foreach ($value as $k => $v) {
+                $k = is_int($k) ? '' : $k;
+                form_hidden($name . '[' . $k . ']', $v, true);
+            }
+        }
+
+        return $form;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_input'))
-{
-	/**
-	 * Text Input Field. If 'type' is passed in the $type field, it will be
-	 * used as the input type, for making 'email', 'phone', etc input fields.
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 * @param string $type
-	 *
-	 * @return string
-	 */
-	function form_input($data = '', string $value = '', $extra = '', string $type = 'text'): string
-	{
-		$defaults = [
-			'type'  => $type,
-			'name'  => is_array($data) ? '' : $data,
-			'value' => $value,
-		];
-
-		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
-	}
+if (! function_exists('form_input')) {
+    /**
+     * Text Input Field. If 'type' is passed in the $type field, it will be
+     * used as the input type, for making 'email', 'phone', etc input fields.
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_input($data = '', string $value = '', $extra = '', string $type = 'text'): string
+    {
+        $defaults = [
+            'type'  => $type,
+            'name'  => is_array($data) ? '' : $data,
+            'value' => $value,
+        ];
+
+        return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_password'))
-{
-	/**
-	 * Password Field
-	 *
-	 * Identical to the input function but adds the "password" type
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_password($data = '', string $value = '', $extra = ''): string
-	{
-		if (! is_array($data))
-		{
-			$data = ['name' => $data];
-		}
-		$data['type'] = 'password';
-
-		return form_input($data, $value, $extra);
-	}
+if (! function_exists('form_password')) {
+    /**
+     * Password Field
+     *
+     * Identical to the input function but adds the "password" type
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_password($data = '', string $value = '', $extra = ''): string
+    {
+        if (! is_array($data)) {
+            $data = ['name' => $data];
+        }
+        $data['type'] = 'password';
+
+        return form_input($data, $value, $extra);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_upload'))
-{
-	/**
-	 * Upload Field
-	 *
-	 * Identical to the input function but adds the "file" type
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_upload($data = '', string $value = '', $extra = ''): string
-	{
-		$defaults = [
-			'type' => 'file',
-			'name' => '',
-		];
-
-		if (! is_array($data))
-		{
-			$data = ['name' => $data];
-		}
-
-		$data['type'] = 'file';
-
-		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
-	}
+if (! function_exists('form_upload')) {
+    /**
+     * Upload Field
+     *
+     * Identical to the input function but adds the "file" type
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_upload($data = '', string $value = '', $extra = ''): string
+    {
+        $defaults = [
+            'type' => 'file',
+            'name' => '',
+        ];
+
+        if (! is_array($data)) {
+            $data = ['name' => $data];
+        }
+
+        $data['type'] = 'file';
+
+        return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_textarea'))
-{
-	/**
-	 * Textarea field
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_textarea($data = '', string $value = '', $extra = ''): string
-	{
-		$defaults = [
-			'name' => is_array($data) ? '' : $data,
-			'cols' => '40',
-			'rows' => '10',
-		];
-		if (! is_array($data) || ! isset($data['value']))
-		{
-			$val = $value;
-		}
-		else
-		{
-			$val = $data['value'];
-			unset($data['value']); // textareas don't use the value attribute
-		}
-
-		// Unsets default rows and cols if defined in extra field as array or string.
-		if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false))
-		{
-			unset($defaults['rows']);
-		}
-
-		if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false))
-		{
-			unset($defaults['cols']);
-		}
-
-		return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes($extra) . '>'
-				. htmlspecialchars($val)
-				. "</textarea>\n";
-	}
+if (! function_exists('form_textarea')) {
+    /**
+     * Textarea field
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_textarea($data = '', string $value = '', $extra = ''): string
+    {
+        $defaults = [
+            'name' => is_array($data) ? '' : $data,
+            'cols' => '40',
+            'rows' => '10',
+        ];
+        if (! is_array($data) || ! isset($data['value'])) {
+            $val = $value;
+        } else {
+            $val = $data['value'];
+            unset($data['value']); // textareas don't use the value attribute
+        }
+
+        // Unsets default rows and cols if defined in extra field as array or string.
+        if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'rows=') !== false)) {
+            unset($defaults['rows']);
+        }
+
+        if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(preg_replace('/\s+/', '', $extra), 'cols=') !== false)) {
+            unset($defaults['cols']);
+        }
+
+        return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes($extra) . '>'
+                . htmlspecialchars($val)
+                . "</textarea>\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_multiselect'))
-{
-	/**
-	 * Multi-select menu
-	 *
-	 * @param mixed $name
-	 * @param array $options
-	 * @param array $selected
-	 * @param mixed $extra
-	 *
-	 * @return string
-	 */
-	function form_multiselect($name = '', array $options = [], array $selected = [], $extra = ''): string
-	{
-		$extra = stringify_attributes($extra);
-
-		if (stripos($extra, 'multiple') === false)
-		{
-			$extra .= ' multiple="multiple"';
-		}
-
-		return form_dropdown($name, $options, $selected, $extra);
-	}
+if (! function_exists('form_multiselect')) {
+    /**
+     * Multi-select menu
+     *
+     * @param mixed $name
+     * @param mixed $extra
+     */
+    function form_multiselect($name = '', array $options = [], array $selected = [], $extra = ''): string
+    {
+        $extra = stringify_attributes($extra);
+
+        if (stripos($extra, 'multiple') === false) {
+            $extra .= ' multiple="multiple"';
+        }
+
+        return form_dropdown($name, $options, $selected, $extra);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_dropdown'))
-{
-	/**
-	 * Drop-down Menu
-	 *
-	 * @param mixed $data
-	 * @param mixed $options
-	 * @param mixed $selected
-	 * @param mixed $extra
-	 *
-	 * @return string
-	 */
-	function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
-	{
-		$defaults = [];
-		if (is_array($data))
-		{
-			if (isset($data['selected']))
-			{
-				$selected = $data['selected'];
-				unset($data['selected']); // select tags don't have a selected attribute
-			}
-			if (isset($data['options']))
-			{
-				$options = $data['options'];
-				unset($data['options']); // select tags don't use an options attribute
-			}
-		}
-		else
-		{
-			$defaults = ['name' => $data];
-		}
-
-		if (! is_array($selected))
-		{
-			$selected = [$selected];
-		}
-		if (! is_array($options))
-		{
-			$options = [$options];
-		}
-
-		// If no selected state was submitted we will attempt to set it automatically
-		if (empty($selected))
-		{
-			if (is_array($data))
-			{
-				if (isset($data['name'], $_POST[$data['name']]))
-				{
-					$selected = [$_POST[$data['name']]];
-				}
-			}
-			elseif (isset($_POST[$data]))
-			{
-				$selected = [$_POST[$data]];
-			}
-		}
-
-		// standardize selected as strings, like  the option keys will be.
-		foreach ($selected as $key => $item)
-		{
-			$selected[$key] = (string) $item;
-		}
-
-		$extra    = stringify_attributes($extra);
-		$multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
-		$form     = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";
-		foreach ($options as $key => $val)
-		{
-			$key = (string) $key;
-			if (is_array($val))
-			{
-				if (empty($val))
-				{
-					continue;
-				}
-				$form .= '<optgroup label="' . $key . "\">\n";
-				foreach ($val as $optgroupKey => $optgroupVal)
-				{
-					$sel   = in_array($optgroupKey, $selected, true) ? ' selected="selected"' : '';
-					$form .= '<option value="' . htmlspecialchars($optgroupKey) . '"' . $sel . '>'
-							. $optgroupVal . "</option>\n";
-				}
-				$form .= "</optgroup>\n";
-			}
-			else
-			{
-				$form .= '<option value="' . htmlspecialchars($key) . '"'
-						. (in_array($key, $selected, true) ? ' selected="selected"' : '') . '>'
-						. $val . "</option>\n";
-			}
-		}
-
-		return $form . "</select>\n";
-	}
+if (! function_exists('form_dropdown')) {
+    /**
+     * Drop-down Menu
+     *
+     * @param mixed $data
+     * @param mixed $options
+     * @param mixed $selected
+     * @param mixed $extra
+     */
+    function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
+    {
+        $defaults = [];
+        if (is_array($data)) {
+            if (isset($data['selected'])) {
+                $selected = $data['selected'];
+                unset($data['selected']); // select tags don't have a selected attribute
+            }
+            if (isset($data['options'])) {
+                $options = $data['options'];
+                unset($data['options']); // select tags don't use an options attribute
+            }
+        } else {
+            $defaults = ['name' => $data];
+        }
+
+        if (! is_array($selected)) {
+            $selected = [$selected];
+        }
+        if (! is_array($options)) {
+            $options = [$options];
+        }
+
+        // If no selected state was submitted we will attempt to set it automatically
+        if (empty($selected)) {
+            if (is_array($data)) {
+                if (isset($data['name'], $_POST[$data['name']])) {
+                    $selected = [$_POST[$data['name']]];
+                }
+            } elseif (isset($_POST[$data])) {
+                $selected = [$_POST[$data]];
+            }
+        }
+
+        // Standardize selected as strings, like the option keys will be
+        foreach ($selected as $key => $item) {
+            $selected[$key] = (string) $item;
+        }
+
+        $extra    = stringify_attributes($extra);
+        $multiple = (count($selected) > 1 && stripos($extra, 'multiple') === false) ? ' multiple="multiple"' : '';
+        $form     = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";
+
+        foreach ($options as $key => $val) {
+            // Keys should always be strings for strict comparison
+            $key = (string) $key;
+
+            if (is_array($val)) {
+                if (empty($val)) {
+                    continue;
+                }
+
+                $form .= '<optgroup label="' . $key . "\">\n";
+
+                foreach ($val as $optgroupKey => $optgroupVal) {
+                    // Keys should always be strings for strict comparison
+                    $optgroupKey = (string) $optgroupKey;
+
+                    $sel = in_array($optgroupKey, $selected, true) ? ' selected="selected"' : '';
+                    $form .= '<option value="' . htmlspecialchars($optgroupKey) . '"' . $sel . '>' . $optgroupVal . "</option>\n";
+                }
+
+                $form .= "</optgroup>\n";
+            } else {
+                $form .= '<option value="' . htmlspecialchars($key) . '"'
+                    . (in_array($key, $selected, true) ? ' selected="selected"' : '') . '>'
+                    . $val . "</option>\n";
+            }
+        }
+
+        return $form . "</select>\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_checkbox'))
-{
-	/**
-	 * Checkbox Field
-	 *
-	 * @param mixed   $data
-	 * @param string  $value
-	 * @param boolean $checked
-	 * @param mixed   $extra
-	 *
-	 * @return string
-	 */
-	function form_checkbox($data = '', string $value = '', bool $checked = false, $extra = ''): string
-	{
-		$defaults = [
-			'type'  => 'checkbox',
-			'name'  => (! is_array($data) ? $data : ''),
-			'value' => $value,
-		];
-
-		if (is_array($data) && array_key_exists('checked', $data))
-		{
-			$checked = $data['checked'];
-			if ($checked === false)
-			{
-				unset($data['checked']);
-			}
-			else
-			{
-				$data['checked'] = 'checked';
-			}
-		}
-
-		if ($checked === true)
-		{
-			$defaults['checked'] = 'checked';
-		}
-		elseif (isset($defaults['checked']))
-		{
-			unset($defaults['checked']);
-		}
-
-		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
-	}
+if (! function_exists('form_checkbox')) {
+    /**
+     * Checkbox Field
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_checkbox($data = '', string $value = '', bool $checked = false, $extra = ''): string
+    {
+        $defaults = [
+            'type'  => 'checkbox',
+            'name'  => (! is_array($data) ? $data : ''),
+            'value' => $value,
+        ];
+
+        if (is_array($data) && array_key_exists('checked', $data)) {
+            $checked = $data['checked'];
+            if ($checked === false) {
+                unset($data['checked']);
+            } else {
+                $data['checked'] = 'checked';
+            }
+        }
+
+        if ($checked === true) {
+            $defaults['checked'] = 'checked';
+        } elseif (isset($defaults['checked'])) {
+            unset($defaults['checked']);
+        }
+
+        return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_radio'))
-{
-	/**
-	 * Radio Button
-	 *
-	 * @param mixed   $data
-	 * @param string  $value
-	 * @param boolean $checked
-	 * @param mixed   $extra
-	 *
-	 * @return string
-	 */
-	function form_radio($data = '', string $value = '', bool $checked = false, $extra = ''): string
-	{
-		if (! is_array($data))
-		{
-			$data = ['name' => $data];
-		}
-		$data['type'] = 'radio';
-
-		return form_checkbox($data, $value, $checked, $extra);
-	}
+if (! function_exists('form_radio')) {
+    /**
+     * Radio Button
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_radio($data = '', string $value = '', bool $checked = false, $extra = ''): string
+    {
+        if (! is_array($data)) {
+            $data = ['name' => $data];
+        }
+        $data['type'] = 'radio';
+
+        return form_checkbox($data, $value, $checked, $extra);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_submit'))
-{
-	/**
-	 * Submit Button
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_submit($data = '', string $value = '', $extra = ''): string
-	{
-		return form_input($data, $value, $extra, 'submit');
-	}
+if (! function_exists('form_submit')) {
+    /**
+     * Submit Button
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_submit($data = '', string $value = '', $extra = ''): string
+    {
+        return form_input($data, $value, $extra, 'submit');
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_reset'))
-{
-	/**
-	 * Reset Button
-	 *
-	 * @param mixed  $data
-	 * @param string $value
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_reset($data = '', string $value = '', $extra = ''): string
-	{
-		return form_input($data, $value, $extra, 'reset');
-	}
+if (! function_exists('form_reset')) {
+    /**
+     * Reset Button
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_reset($data = '', string $value = '', $extra = ''): string
+    {
+        return form_input($data, $value, $extra, 'reset');
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_button'))
-{
-	/**
-	 * Form Button
-	 *
-	 * @param mixed  $data
-	 * @param string $content
-	 * @param mixed  $extra
-	 *
-	 * @return string
-	 */
-	function form_button($data = '', string $content = '', $extra = ''): string
-	{
-		$defaults = [
-			'name' => is_array($data) ? '' : $data,
-			'type' => 'button',
-		];
-
-		if (is_array($data) && isset($data['content']))
-		{
-			$content = $data['content'];
-			unset($data['content']); // content is not an attribute
-		}
-
-		return '<button ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . '>'
-				. $content
-				. "</button>\n";
-	}
+if (! function_exists('form_button')) {
+    /**
+     * Form Button
+     *
+     * @param mixed $data
+     * @param mixed $extra
+     */
+    function form_button($data = '', string $content = '', $extra = ''): string
+    {
+        $defaults = [
+            'name' => is_array($data) ? '' : $data,
+            'type' => 'button',
+        ];
+
+        if (is_array($data) && isset($data['content'])) {
+            $content = $data['content'];
+            unset($data['content']); // content is not an attribute
+        }
+
+        return '<button ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . '>'
+                . $content
+                . "</button>\n";
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_label'))
-{
-	/**
-	 * Form Label Tag
-	 *
-	 * @param string $labelText  The text to appear onscreen
-	 * @param string $id         The id the label applies to
-	 * @param array  $attributes Additional attributes
-	 *
-	 * @return string
-	 */
-	function form_label(string $labelText = '', string $id = '', array $attributes = []): string
-	{
-		$label = '<label';
-
-		if ($id !== '')
-		{
-			$label .= ' for="' . $id . '"';
-		}
-
-		if (is_array($attributes) && $attributes)
-		{
-			foreach ($attributes as $key => $val)
-			{
-				$label .= ' ' . $key . '="' . $val . '"';
-			}
-		}
-
-		return $label . '>' . $labelText . '</label>';
-	}
+if (! function_exists('form_label')) {
+    /**
+     * Form Label Tag
+     *
+     * @param string $labelText  The text to appear onscreen
+     * @param string $id         The id the label applies to
+     * @param array  $attributes Additional attributes
+     */
+    function form_label(string $labelText = '', string $id = '', array $attributes = []): string
+    {
+        $label = '<label';
+
+        if ($id !== '') {
+            $label .= ' for="' . $id . '"';
+        }
+
+        if (is_array($attributes) && $attributes) {
+            foreach ($attributes as $key => $val) {
+                $label .= ' ' . $key . '="' . $val . '"';
+            }
+        }
+
+        return $label . '>' . $labelText . '</label>';
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_datalist'))
-{
-	/**
-	 * Datalist
-	 *
-	 * The <datalist> element specifies a list of pre-defined options for an <input> element.
-	 * Users will see a drop-down list of pre-defined options as they input data.
-	 * The list attribute of the <input> element, must refer to the id attribute of the <datalist> element.
-	 *
-	 * @param string $name
-	 * @param string $value
-	 * @param array  $options
-	 *
-	 * @return string
-	 */
-	function form_datalist(string $name, string $value, array $options): string
-	{
-		$data = [
-			'type'  => 'text',
-			'name'  => $name,
-			'list'  => $name . '_list',
-			'value' => $value,
-		];
-
-		$out = form_input($data) . "\n";
-
-		$out .= "<datalist id='" . $name . '_list' . "'>";
-
-		foreach ($options as $option)
-		{
-			$out .= "<option value='$option'>" . "\n";
-		}
-
-		return $out . ('</datalist>' . "\n");
-	}
+if (! function_exists('form_datalist')) {
+    /**
+     * Datalist
+     *
+     * The <datalist> element specifies a list of pre-defined options for an <input> element.
+     * Users will see a drop-down list of pre-defined options as they input data.
+     * The list attribute of the <input> element, must refer to the id attribute of the <datalist> element.
+     */
+    function form_datalist(string $name, string $value, array $options): string
+    {
+        $data = [
+            'type'  => 'text',
+            'name'  => $name,
+            'list'  => $name . '_list',
+            'value' => $value,
+        ];
+
+        $out = form_input($data) . "\n";
+
+        $out .= "<datalist id='" . $name . '_list' . "'>";
+
+        foreach ($options as $option) {
+            $out .= "<option value='{$option}'>" . "\n";
+        }
+
+        return $out . ('</datalist>' . "\n");
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_fieldset'))
-{
-	/**
-	 * Fieldset Tag
-	 *
-	 * Used to produce <fieldset><legend>text</legend>.  To close fieldset
-	 * use form_fieldset_close()
-	 *
-	 * @param string $legendText The legend text
-	 * @param array  $attributes Additional attributes
-	 *
-	 * @return string
-	 */
-	function form_fieldset(string $legendText = '', array $attributes = []): string
-	{
-		$fieldset = '<fieldset' . stringify_attributes($attributes) . ">\n";
-
-		if ($legendText !== '')
-		{
-			return $fieldset . '<legend>' . $legendText . "</legend>\n";
-		}
-
-		return $fieldset;
-	}
+if (! function_exists('form_fieldset')) {
+    /**
+     * Fieldset Tag
+     *
+     * Used to produce <fieldset><legend>text</legend>.  To close fieldset
+     * use form_fieldset_close()
+     *
+     * @param string $legendText The legend text
+     * @param array  $attributes Additional attributes
+     */
+    function form_fieldset(string $legendText = '', array $attributes = []): string
+    {
+        $fieldset = '<fieldset' . stringify_attributes($attributes) . ">\n";
+
+        if ($legendText !== '') {
+            return $fieldset . '<legend>' . $legendText . "</legend>\n";
+        }
+
+        return $fieldset;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_fieldset_close'))
-{
-	/**
-	 * Fieldset Close Tag
-	 *
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	function form_fieldset_close(string $extra = ''): string
-	{
-		return '</fieldset>' . $extra;
-	}
+if (! function_exists('form_fieldset_close')) {
+    /**
+     * Fieldset Close Tag
+     */
+    function form_fieldset_close(string $extra = ''): string
+    {
+        return '</fieldset>' . $extra;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('form_close'))
-{
-	/**
-	 * Form Close Tag
-	 *
-	 * @param string $extra
-	 *
-	 * @return string
-	 */
-	function form_close(string $extra = ''): string
-	{
-		return '</form>' . $extra;
-	}
+if (! function_exists('form_close')) {
+    /**
+     * Form Close Tag
+     */
+    function form_close(string $extra = ''): string
+    {
+        return '</form>' . $extra;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('set_value'))
-{
-	/**
-	 * Form Value
-	 *
-	 * Grabs a value from the POST array for the specified field so you can
-	 * re-populate an input field or textarea
-	 *
-	 * @param string          $field      Field name
-	 * @param string|string[] $default    Default value
-	 * @param boolean         $htmlEscape Whether to escape HTML special characters or not
-	 *
-	 * @return string|string[]
-	 */
-	function set_value(string $field, $default = '', bool $htmlEscape = true)
-	{
-		$request = Services::request();
-
-		// Try any old input data we may have first
-		$value = $request->getOldInput($field);
-
-		if ($value === null)
-		{
-			$value = $request->getPost($field) ?? $default;
-		}
-
-		return ($htmlEscape) ? esc($value) : $value;
-	}
+if (! function_exists('set_value')) {
+    /**
+     * Form Value
+     *
+     * Grabs a value from the POST array for the specified field so you can
+     * re-populate an input field or textarea
+     *
+     * @param string          $field      Field name
+     * @param string|string[] $default    Default value
+     * @param bool            $htmlEscape Whether to escape HTML special characters or not
+     *
+     * @return string|string[]
+     */
+    function set_value(string $field, $default = '', bool $htmlEscape = true)
+    {
+        $request = Services::request();
+
+        // Try any old input data we may have first
+        $value = $request->getOldInput($field);
+
+        if ($value === null) {
+            $value = $request->getPost($field) ?? $default;
+        }
+
+        return ($htmlEscape) ? esc($value) : $value;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('set_select'))
-{
-	/**
-	 * Set Select
-	 *
-	 * Let's you set the selected value of a <select> menu via data in the POST array.
-	 * If Form Validation is active it retrieves the info from the validation class
-	 *
-	 * @param string  $field
-	 * @param string  $value
-	 * @param boolean $default
-	 *
-	 * @return string
-	 */
-	function set_select(string $field, string $value = '', bool $default = false): string
-	{
-		$request = Services::request();
-
-		// Try any old input data we may have first
-		$input = $request->getOldInput($field);
-
-		if ($input === null)
-		{
-			$input = $request->getPost($field);
-		}
-
-		if ($input === null)
-		{
-			return ($default === true) ? ' selected="selected"' : '';
-		}
-
-		if (is_array($input))
-		{
-			// Note: in_array('', array(0)) returns TRUE, do not use it
-			foreach ($input as &$v)
-			{
-				if ($value === $v)
-				{
-					return ' selected="selected"';
-				}
-			}
-
-			return '';
-		}
-
-		return ($input === $value) ? ' selected="selected"' : '';
-	}
+if (! function_exists('set_select')) {
+    /**
+     * Set Select
+     *
+     * Let's you set the selected value of a <select> menu via data in the POST array.
+     * If Form Validation is active it retrieves the info from the validation class
+     */
+    function set_select(string $field, string $value = '', bool $default = false): string
+    {
+        $request = Services::request();
+
+        // Try any old input data we may have first
+        $input = $request->getOldInput($field);
+
+        if ($input === null) {
+            $input = $request->getPost($field);
+        }
+
+        if ($input === null) {
+            return ($default === true) ? ' selected="selected"' : '';
+        }
+
+        if (is_array($input)) {
+            // Note: in_array('', array(0)) returns TRUE, do not use it
+            foreach ($input as &$v) {
+                if ($value === $v) {
+                    return ' selected="selected"';
+                }
+            }
+
+            return '';
+        }
+
+        return ($input === $value) ? ' selected="selected"' : '';
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('set_checkbox'))
-{
-	/**
-	 * Set Checkbox
-	 *
-	 * Let's you set the selected value of a checkbox via the value in the POST array.
-	 * If Form Validation is active it retrieves the info from the validation class
-	 *
-	 * @param string  $field
-	 * @param string  $value
-	 * @param boolean $default
-	 *
-	 * @return string
-	 */
-	function set_checkbox(string $field, string $value = '', bool $default = false): string
-	{
-		$request = Services::request();
-
-		// Try any old input data we may have first
-		$input = $request->getOldInput($field);
-
-		if ($input === null)
-		{
-			$input = $request->getPost($field);
-		}
-
-		if (is_array($input))
-		{
-			// Note: in_array('', array(0)) returns TRUE, do not use it
-			foreach ($input as &$v)
-			{
-				if ($value === $v)
-				{
-					return ' checked="checked"';
-				}
-			}
-
-			return '';
-		}
-
-		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
-		if ((string) $input === '0' || ! empty($request->getPost()) || ! empty(old($field)))
-		{
-			return ($input === $value) ? ' checked="checked"' : '';
-		}
-
-		return ($default === true) ? ' checked="checked"' : '';
-	}
+if (! function_exists('set_checkbox')) {
+    /**
+     * Set Checkbox
+     *
+     * Let's you set the selected value of a checkbox via the value in the POST array.
+     * If Form Validation is active it retrieves the info from the validation class
+     */
+    function set_checkbox(string $field, string $value = '', bool $default = false): string
+    {
+        $request = Services::request();
+
+        // Try any old input data we may have first
+        $input = $request->getOldInput($field);
+
+        if ($input === null) {
+            $input = $request->getPost($field);
+        }
+
+        if (is_array($input)) {
+            // Note: in_array('', array(0)) returns TRUE, do not use it
+            foreach ($input as &$v) {
+                if ($value === $v) {
+                    return ' checked="checked"';
+                }
+            }
+
+            return '';
+        }
+
+        // Unchecked checkbox and radio inputs are not even submitted by browsers ...
+        if ((string) $input === '0' || ! empty($request->getPost()) || ! empty(old($field))) {
+            return ($input === $value) ? ' checked="checked"' : '';
+        }
+
+        return ($default === true) ? ' checked="checked"' : '';
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('set_radio'))
-{
-	/**
-	 * Set Radio
-	 *
-	 * Let's you set the selected value of a radio field via info in the POST array.
-	 * If Form Validation is active it retrieves the info from the validation class
-	 *
-	 * @param string  $field
-	 * @param string  $value
-	 * @param boolean $default
-	 *
-	 * @return string
-	 */
-	function set_radio(string $field, string $value = '', bool $default = false): string
-	{
-		$request = Services::request();
-
-		// Try any old input data we may have first
-		$input = $request->getOldInput($field);
-		if ($input === null)
-		{
-			$input = $request->getPost($field) ?? $default;
-		}
-
-		if (is_array($input))
-		{
-			// Note: in_array('', array(0)) returns TRUE, do not use it
-			foreach ($input as &$v)
-			{
-				if ($value === $v)
-				{
-					return ' checked="checked"';
-				}
-			}
-
-			return '';
-		}
-
-		// Unchecked checkbox and radio inputs are not even submitted by browsers ...
-		$result = '';
-		if ((string) $input === '0' || ! empty($input = $request->getPost($field)) || ! empty($input = old($field)))
-		{
-			$result = ($input === $value) ? ' checked="checked"' : '';
-		}
-
-		if (empty($result))
-		{
-			$result = ($default === true) ? ' checked="checked"' : '';
-		}
-		return $result;
-	}
+if (! function_exists('set_radio')) {
+    /**
+     * Set Radio
+     *
+     * Let's you set the selected value of a radio field via info in the POST array.
+     * If Form Validation is active it retrieves the info from the validation class
+     */
+    function set_radio(string $field, string $value = '', bool $default = false): string
+    {
+        $request = Services::request();
+
+        // Try any old input data we may have first
+        $input = $request->getOldInput($field);
+        if ($input === null) {
+            $input = $request->getPost($field) ?? $default;
+        }
+
+        if (is_array($input)) {
+            // Note: in_array('', array(0)) returns TRUE, do not use it
+            foreach ($input as &$v) {
+                if ($value === $v) {
+                    return ' checked="checked"';
+                }
+            }
+
+            return '';
+        }
+
+        // Unchecked checkbox and radio inputs are not even submitted by browsers ...
+        $result = '';
+        if ((string) $input === '0' || ! empty($input = $request->getPost($field)) || ! empty($input = old($field))) {
+            $result = ($input === $value) ? ' checked="checked"' : '';
+        }
+
+        if (empty($result)) {
+            $result = ($default === true) ? ' checked="checked"' : '';
+        }
+
+        return $result;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('parse_form_attributes'))
-{
-	/**
-	 * Parse the form attributes
-	 *
-	 * Helper function used by some of the form helpers
-	 *
-	 * @param string|array $attributes List of attributes
-	 * @param array        $default    Default values
-	 *
-	 * @return string
-	 */
-	function parse_form_attributes($attributes, array $default): string
-	{
-		if (is_array($attributes))
-		{
-			foreach (array_keys($default) as $key)
-			{
-				if (isset($attributes[$key]))
-				{
-					$default[$key] = $attributes[$key];
-					unset($attributes[$key]);
-				}
-			}
-			if (! empty($attributes))
-			{
-				$default = array_merge($default, $attributes);
-			}
-		}
-
-		$att = '';
-
-		foreach ($default as $key => $val)
-		{
-			if (! is_bool($val))
-			{
-				if ($key === 'value')
-				{
-					$val = esc($val);
-				}
-				elseif ($key === 'name' && ! strlen($default['name']))
-				{
-					continue;
-				}
-				$att .= $key . '="' . $val . '"' . ($key === array_key_last($default) ? '' : ' ');
-			}
-			else
-			{
-				$att .= $key . ' ';
-			}
-		}
-
-		return $att;
-	}
-
-	//--------------------------------------------------------------------
+if (! function_exists('parse_form_attributes')) {
+    /**
+     * Parse the form attributes
+     *
+     * Helper function used by some of the form helpers
+     *
+     * @param array|string $attributes List of attributes
+     * @param array        $default    Default values
+     */
+    function parse_form_attributes($attributes, array $default): string
+    {
+        if (is_array($attributes)) {
+            foreach (array_keys($default) as $key) {
+                if (isset($attributes[$key])) {
+                    $default[$key] = $attributes[$key];
+                    unset($attributes[$key]);
+                }
+            }
+            if (! empty($attributes)) {
+                $default = array_merge($default, $attributes);
+            }
+        }
+
+        $att = '';
+
+        foreach ($default as $key => $val) {
+            if (! is_bool($val)) {
+                if ($key === 'value') {
+                    $val = esc($val);
+                } elseif ($key === 'name' && ! strlen($default['name'])) {
+                    continue;
+                }
+                $att .= $key . '="' . $val . '"' . ($key === array_key_last($default) ? '' : ' ');
+            } else {
+                $att .= $key . ' ';
+            }
+        }
+
+        return $att;
+    }
 }
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index be71619df40d..a1a51af11955 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -1,733 +1,542 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Config\DocTypes;
 use Config\Mimes;
 
-// --------------------------------------------------------------------
-
-/**
- * CodeIgniter HTML Helpers
- */
-if (! function_exists('ul'))
-{
-	/**
-	 * Unordered List
-	 *
-	 * Generates an HTML unordered list from an single or
-	 * multi-dimensional array.
-	 *
-	 * @param array $list
-	 * @param mixed $attributes HTML attributes string, array, object
-	 *
-	 * @return string
-	 */
-	function ul(array $list, $attributes = ''): string
-	{
-		return _list('ul', $list, $attributes);
-	}
+// CodeIgniter HTML Helpers
+
+if (! function_exists('ul')) {
+    /**
+     * Unordered List
+     *
+     * Generates an HTML unordered list from an single or
+     * multi-dimensional array.
+     *
+     * @param mixed $attributes HTML attributes string, array, object
+     */
+    function ul(array $list, $attributes = ''): string
+    {
+        return _list('ul', $list, $attributes);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('ol'))
-{
-	/**
-	 * Ordered List
-	 *
-	 * Generates an HTML ordered list from an single or multi-dimensional array.
-	 *
-	 * @param array $list
-	 * @param mixed $attributes HTML attributes string, array, object
-	 *
-	 * @return string
-	 */
-	function ol(array $list, $attributes = ''): string
-	{
-		return _list('ol', $list, $attributes);
-	}
+if (! function_exists('ol')) {
+    /**
+     * Ordered List
+     *
+     * Generates an HTML ordered list from an single or multi-dimensional array.
+     *
+     * @param mixed $attributes HTML attributes string, array, object
+     */
+    function ol(array $list, $attributes = ''): string
+    {
+        return _list('ol', $list, $attributes);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('_list'))
-{
-	/**
-	 * Generates the list
-	 *
-	 * Generates an HTML ordered list from an single or multi-dimensional array.
-	 *
-	 * @param string  $type
-	 * @param mixed   $list
-	 * @param mixed   $attributes string, array, object
-	 * @param integer $depth
-	 *
-	 * @return string
-	 */
-	function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
-	{
-		// Set the indentation based on the depth
-		$out = str_repeat(' ', $depth)
-				// Write the opening list tag
-				. '<' . $type . stringify_attributes($attributes) . ">\n";
-
-		// Cycle through the list elements.  If an array is
-		// encountered we will recursively call _list()
-
-		static $_last_list_item = '';
-		foreach ($list as $key => $val)
-		{
-			$_last_list_item = $key;
-
-			$out .= str_repeat(' ', $depth + 2) . '<li>';
-
-			if (! is_array($val))
-			{
-				$out .= $val;
-			}
-			else
-			{
-				$out .= $_last_list_item
-						. "\n"
-						. _list($type, $val, '', $depth + 4)
-						. str_repeat(' ', $depth + 2);
-			}
-
-			$out .= "</li>\n";
-		}
-
-		// Set the indentation for the closing tag and apply it
-		return $out . str_repeat(' ', $depth) . '</' . $type . ">\n";
-	}
+if (! function_exists('_list')) {
+    /**
+     * Generates the list
+     *
+     * Generates an HTML ordered list from an single or multi-dimensional array.
+     *
+     * @param mixed $list
+     * @param mixed $attributes string, array, object
+     */
+    function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
+    {
+        // Set the indentation based on the depth
+        $out = str_repeat(' ', $depth)
+                // Write the opening list tag
+                . '<' . $type . stringify_attributes($attributes) . ">\n";
+
+        // Cycle through the list elements.  If an array is
+        // encountered we will recursively call _list()
+
+        foreach ($list as $key => $val) {
+            $out .= str_repeat(' ', $depth + 2) . '<li>';
+
+            if (! is_array($val)) {
+                $out .= $val;
+            } else {
+                $out .= $key
+                        . "\n"
+                        . _list($type, $val, '', $depth + 4)
+                        . str_repeat(' ', $depth + 2);
+            }
+
+            $out .= "</li>\n";
+        }
+
+        // Set the indentation for the closing tag and apply it
+        return $out . str_repeat(' ', $depth) . '</' . $type . ">\n";
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('img'))
-{
-	/**
-	 * Image
-	 *
-	 * Generates an image element
-	 *
-	 * @param string|array        $src        Image source URI, or array of attributes and values
-	 * @param boolean             $indexPage  Whether to treat $src as a routed URI string
-	 * @param string|array|object $attributes Additional HTML attributes
-	 *
-	 * @return string
-	 */
-	function img($src = '', bool $indexPage = false, $attributes = ''): string
-	{
-		if (! is_array($src))
-		{
-			$src = ['src' => $src];
-		}
-		if (! isset($src['src']))
-		{
-			$src['src'] = $attributes['src'] ?? '';
-		}
-		if (! isset($src['alt']))
-		{
-			$src['alt'] = $attributes['alt'] ?? '';
-		}
-
-		$img = '<img';
-
-		// Check for a relative URI
-		if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && strpos($src['src'], 'data:') !== 0)
-		{
-			if ($indexPage === true)
-			{
-				$img .= ' src="' . site_url($src['src']) . '"';
-			}
-			else
-			{
-				$img .= ' src="' . slash_item('baseURL') . $src['src'] . '"';
-			}
-
-			unset($src['src']);
-		}
-
-		// Append any other values
-		foreach ($src as $key => $value)
-		{
-			$img .= ' ' . $key . '="' . $value . '"';
-		}
-
-		// Prevent passing completed values to stringify_attributes
-		if (is_array($attributes))
-		{
-			unset($attributes['alt'], $attributes['src']);
-		}
-
-		return $img . stringify_attributes($attributes) . ' />';
-	}
+if (! function_exists('img')) {
+    /**
+     * Image
+     *
+     * Generates an image element
+     *
+     * @param array|string        $src        Image source URI, or array of attributes and values
+     * @param bool                $indexPage  Whether to treat $src as a routed URI string
+     * @param array|object|string $attributes Additional HTML attributes
+     */
+    function img($src = '', bool $indexPage = false, $attributes = ''): string
+    {
+        if (! is_array($src)) {
+            $src = ['src' => $src];
+        }
+        if (! isset($src['src'])) {
+            $src['src'] = $attributes['src'] ?? '';
+        }
+        if (! isset($src['alt'])) {
+            $src['alt'] = $attributes['alt'] ?? '';
+        }
+
+        $img = '<img';
+
+        // Check for a relative URI
+        if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && strpos($src['src'], 'data:') !== 0) {
+            if ($indexPage === true) {
+                $img .= ' src="' . site_url($src['src']) . '"';
+            } else {
+                $img .= ' src="' . slash_item('baseURL') . $src['src'] . '"';
+            }
+
+            unset($src['src']);
+        }
+
+        // Append any other values
+        foreach ($src as $key => $value) {
+            $img .= ' ' . $key . '="' . $value . '"';
+        }
+
+        // Prevent passing completed values to stringify_attributes
+        if (is_array($attributes)) {
+            unset($attributes['alt'], $attributes['src']);
+        }
+
+        return $img . stringify_attributes($attributes) . ' />';
+    }
 }
 
-if (! function_exists('img_data'))
-{
-	/**
-	 * Image (data)
-	 *
-	 * Generates a src-ready string from an image using the "data:" protocol
-	 *
-	 * @param string      $path Image source path
-	 * @param string|null $mime MIME type to use, or null to guess
-	 *
-	 * @return string
-	 */
-	function img_data(string $path, string $mime = null): string
-	{
-		if (! is_file($path) || ! is_readable($path))
-		{
-			throw FileNotFoundException::forFileNotFound($path);
-		}
-
-		// Read in file binary data
-		$handle = fopen($path, 'rb');
-		$data   = fread($handle, filesize($path));
-		fclose($handle);
-
-		// Encode as base64
-		$data = base64_encode($data);
-
-		// Figure out the type (Hail Mary to JPEG)
-		$mime = $mime ?? Mimes::guessTypeFromExtension(pathinfo($path, PATHINFO_EXTENSION)) ?? 'image/jpg';
-
-		return 'data:' . $mime . ';base64,' . $data;
-	}
+if (! function_exists('img_data')) {
+    /**
+     * Image (data)
+     *
+     * Generates a src-ready string from an image using the "data:" protocol
+     *
+     * @param string      $path Image source path
+     * @param string|null $mime MIME type to use, or null to guess
+     */
+    function img_data(string $path, ?string $mime = null): string
+    {
+        if (! is_file($path) || ! is_readable($path)) {
+            throw FileNotFoundException::forFileNotFound($path);
+        }
+
+        // Read in file binary data
+        $handle = fopen($path, 'rb');
+        $data   = fread($handle, filesize($path));
+        fclose($handle);
+
+        // Encode as base64
+        $data = base64_encode($data);
+
+        // Figure out the type (Hail Mary to JPEG)
+        $mime = $mime ?? Mimes::guessTypeFromExtension(pathinfo($path, PATHINFO_EXTENSION)) ?? 'image/jpg';
+
+        return 'data:' . $mime . ';base64,' . $data;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('doctype'))
-{
-	/**
-	 * Doctype
-	 *
-	 * Generates a page document type declaration
-	 *
-	 * Examples of valid options: html5, xhtml-11, xhtml-strict, xhtml-trans,
-	 * xhtml-frame, html4-strict, html4-trans, and html4-frame.
-	 * All values are saved in the doctypes config file.
-	 *
-	 * @param string $type The doctype to be generated
-	 *
-	 * @return string
-	 */
-	function doctype(string $type = 'html5'): string
-	{
-		$config   = new DocTypes();
-		$doctypes = $config->list;
-		return $doctypes[$type] ?? false;
-	}
+if (! function_exists('doctype')) {
+    /**
+     * Doctype
+     *
+     * Generates a page document type declaration
+     *
+     * Examples of valid options: html5, xhtml-11, xhtml-strict, xhtml-trans,
+     * xhtml-frame, html4-strict, html4-trans, and html4-frame.
+     * All values are saved in the doctypes config file.
+     *
+     * @param string $type The doctype to be generated
+     */
+    function doctype(string $type = 'html5'): string
+    {
+        $config   = new DocTypes();
+        $doctypes = $config->list;
+
+        return $doctypes[$type] ?? false;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('script_tag'))
-{
-	/**
-	 * Script
-	 *
-	 * Generates link to a JS file
-	 *
-	 * @param mixed   $src       Script source or an array
-	 * @param boolean $indexPage Should indexPage be added to the JS path
-	 *
-	 * @return string
-	 */
-	function script_tag($src = '', bool $indexPage = false): string
-	{
-		$script = '<script ';
-		if (! is_array($src))
-		{
-			$src = ['src' => $src];
-		}
-
-		foreach ($src as $k => $v)
-		{
-			if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v))
-			{
-				if ($indexPage === true)
-				{
-					$script .= 'src="' . site_url($v) . '" ';
-				}
-				else
-				{
-					$script .= 'src="' . slash_item('baseURL') . $v . '" ';
-				}
-			}
-			else
-			{
-				$script .= $k . '="' . $v . '" ';
-			}
-		}
-
-		return $script . 'type="text/javascript"' . '></script>';
-	}
+if (! function_exists('script_tag')) {
+    /**
+     * Script
+     *
+     * Generates link to a JS file
+     *
+     * @param mixed $src       Script source or an array
+     * @param bool  $indexPage Should indexPage be added to the JS path
+     */
+    function script_tag($src = '', bool $indexPage = false): string
+    {
+        $script = '<script ';
+        if (! is_array($src)) {
+            $src = ['src' => $src];
+        }
+
+        foreach ($src as $k => $v) {
+            if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v)) {
+                if ($indexPage === true) {
+                    $script .= 'src="' . site_url($v) . '" ';
+                } else {
+                    $script .= 'src="' . slash_item('baseURL') . $v . '" ';
+                }
+            } else {
+                $script .= $k . '="' . $v . '" ';
+            }
+        }
+
+        return $script . 'type="text/javascript"' . '></script>';
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('link_tag'))
-{
-	/**
-	 * Link
-	 *
-	 * Generates link to a CSS file
-	 *
-	 * @param mixed   $href      Stylesheet href or an array
-	 * @param string  $rel
-	 * @param string  $type
-	 * @param string  $title
-	 * @param string  $media
-	 * @param boolean $indexPage should indexPage be added to the CSS path.
-	 * @param string  $hreflang
-	 *
-	 * @return string
-	 */
-	function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false, string $hreflang = ''): string
-	{
-		$link = '<link ';
-
-		// extract fields if needed
-		if (is_array($href))
-		{
-			$rel       = $href['rel'] ?? $rel;
-			$type      = $href['type'] ?? $type;
-			$title     = $href['title'] ?? $title;
-			$media     = $href['media'] ?? $media;
-			$hreflang  = $href['hreflang'] ?? '';
-			$indexPage = $href['indexPage'] ?? $indexPage;
-			$href      = $href['href'] ?? '';
-		}
-
-		if (! preg_match('#^([a-z]+:)?//#i', $href))
-		{
-			if ($indexPage === true)
-			{
-				$link .= 'href="' . site_url($href) . '" ';
-			}
-			else
-			{
-				$link .= 'href="' . slash_item('baseURL') . $href . '" ';
-			}
-		}
-		else
-		{
-			$link .= 'href="' . $href . '" ';
-		}
-
-		if ($hreflang !== '')
-		{
-			$link .= 'hreflang="' . $hreflang . '" ';
-		}
-
-		$link .= 'rel="' . $rel . '" ';
-
-		if (! in_array($rel, ['alternate', 'canonical'], true))
-		{
-			$link .= 'type="' . $type . '" ';
-		}
-
-		if ($media !== '')
-		{
-			$link .= 'media="' . $media . '" ';
-		}
-
-		if ($title !== '')
-		{
-			$link .= 'title="' . $title . '" ';
-		}
-
-		return $link . '/>';
-	}
+if (! function_exists('link_tag')) {
+    /**
+     * Link
+     *
+     * Generates link to a CSS file
+     *
+     * @param mixed $href      Stylesheet href or an array
+     * @param bool  $indexPage should indexPage be added to the CSS path.
+     */
+    function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false, string $hreflang = ''): string
+    {
+        $link = '<link ';
+
+        // extract fields if needed
+        if (is_array($href)) {
+            $rel       = $href['rel'] ?? $rel;
+            $type      = $href['type'] ?? $type;
+            $title     = $href['title'] ?? $title;
+            $media     = $href['media'] ?? $media;
+            $hreflang  = $href['hreflang'] ?? '';
+            $indexPage = $href['indexPage'] ?? $indexPage;
+            $href      = $href['href'] ?? '';
+        }
+
+        if (! preg_match('#^([a-z]+:)?//#i', $href)) {
+            if ($indexPage === true) {
+                $link .= 'href="' . site_url($href) . '" ';
+            } else {
+                $link .= 'href="' . slash_item('baseURL') . $href . '" ';
+            }
+        } else {
+            $link .= 'href="' . $href . '" ';
+        }
+
+        if ($hreflang !== '') {
+            $link .= 'hreflang="' . $hreflang . '" ';
+        }
+
+        $link .= 'rel="' . $rel . '" ';
+
+        if (! in_array($rel, ['alternate', 'canonical'], true)) {
+            $link .= 'type="' . $type . '" ';
+        }
+
+        if ($media !== '') {
+            $link .= 'media="' . $media . '" ';
+        }
+
+        if ($title !== '') {
+            $link .= 'title="' . $title . '" ';
+        }
+
+        return $link . '/>';
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('video'))
-{
-	/**
-	 * Video
-	 *
-	 * Generates a video element to embed videos. The video element can
-	 * contain one or more video sources
-	 *
-	 * @param mixed   $src                Either a source string or an array of sources
-	 * @param string  $unsupportedMessage The message to display if the media tag is not supported by the browser
-	 * @param string  $attributes         HTML attributes
-	 * @param array   $tracks
-	 * @param boolean $indexPage
-	 *
-	 * @return string
-	 */
-	function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
-	{
-		if (is_array($src))
-		{
-			return _media('video', $src, $unsupportedMessage, $attributes, $tracks);
-		}
-
-		$video = '<video';
-
-		if (_has_protocol($src))
-		{
-			$video .= ' src="' . $src . '"';
-		}
-		elseif ($indexPage === true)
-		{
-			$video .= ' src="' . site_url($src) . '"';
-		}
-		else
-		{
-			$video .= ' src="' . slash_item('baseURL') . $src . '"';
-		}
-
-		if ($attributes !== '')
-		{
-			$video .= ' ' . $attributes;
-		}
-
-		$video .= ">\n";
-
-		if (! empty($tracks))
-		{
-			foreach ($tracks as $track)
-			{
-				$video .= _space_indent() . $track . "\n";
-			}
-		}
-
-		if (! empty($unsupportedMessage))
-		{
-			$video .= _space_indent()
-					. $unsupportedMessage
-					. "\n";
-		}
-
-		return $video . "</video>\n";
-	}
+if (! function_exists('video')) {
+    /**
+     * Video
+     *
+     * Generates a video element to embed videos. The video element can
+     * contain one or more video sources
+     *
+     * @param mixed  $src                Either a source string or an array of sources
+     * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser
+     * @param string $attributes         HTML attributes
+     */
+    function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
+    {
+        if (is_array($src)) {
+            return _media('video', $src, $unsupportedMessage, $attributes, $tracks);
+        }
+
+        $video = '<video';
+
+        if (_has_protocol($src)) {
+            $video .= ' src="' . $src . '"';
+        } elseif ($indexPage === true) {
+            $video .= ' src="' . site_url($src) . '"';
+        } else {
+            $video .= ' src="' . slash_item('baseURL') . $src . '"';
+        }
+
+        if ($attributes !== '') {
+            $video .= ' ' . $attributes;
+        }
+
+        $video .= ">\n";
+
+        foreach ($tracks as $track) {
+            $video .= _space_indent() . $track . "\n";
+        }
+
+        if (! empty($unsupportedMessage)) {
+            $video .= _space_indent()
+                    . $unsupportedMessage
+                    . "\n";
+        }
+
+        return $video . "</video>\n";
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('audio'))
-{
-	/**
-	 * Audio
-	 *
-	 * Generates an audio element to embed sounds
-	 *
-	 * @param mixed   $src                Either a source string or an array of sources
-	 * @param string  $unsupportedMessage The message to display if the media tag is not supported by the browser.
-	 * @param string  $attributes         HTML attributes
-	 * @param array   $tracks
-	 * @param boolean $indexPage
-	 *
-	 * @return string
-	 */
-	function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
-	{
-		if (is_array($src))
-		{
-			return _media('audio', $src, $unsupportedMessage, $attributes, $tracks);
-		}
-
-		$audio = '<audio';
-
-		if (_has_protocol($src))
-		{
-			$audio .= ' src="' . $src . '"';
-		}
-		elseif ($indexPage === true)
-		{
-			$audio .= ' src="' . site_url($src) . '"';
-		}
-		else
-		{
-			$audio .= ' src="' . slash_item('baseURL') . $src . '"';
-		}
-
-		if ($attributes !== '')
-		{
-			$audio .= ' ' . $attributes;
-		}
-
-		$audio .= '>';
-
-		if (! empty($tracks))
-		{
-			foreach ($tracks as $track)
-			{
-				$audio .= "\n" . _space_indent() . $track;
-			}
-		}
-
-		if (! empty($unsupportedMessage))
-		{
-			$audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
-		}
-
-		return $audio . "</audio>\n";
-	}
+if (! function_exists('audio')) {
+    /**
+     * Audio
+     *
+     * Generates an audio element to embed sounds
+     *
+     * @param mixed  $src                Either a source string or an array of sources
+     * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
+     * @param string $attributes         HTML attributes
+     */
+    function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
+    {
+        if (is_array($src)) {
+            return _media('audio', $src, $unsupportedMessage, $attributes, $tracks);
+        }
+
+        $audio = '<audio';
+
+        if (_has_protocol($src)) {
+            $audio .= ' src="' . $src . '"';
+        } elseif ($indexPage === true) {
+            $audio .= ' src="' . site_url($src) . '"';
+        } else {
+            $audio .= ' src="' . slash_item('baseURL') . $src . '"';
+        }
+
+        if ($attributes !== '') {
+            $audio .= ' ' . $attributes;
+        }
+
+        $audio .= '>';
+
+        foreach ($tracks as $track) {
+            $audio .= "\n" . _space_indent() . $track;
+        }
+
+        if (! empty($unsupportedMessage)) {
+            $audio .= "\n" . _space_indent() . $unsupportedMessage . "\n";
+        }
+
+        return $audio . "</audio>\n";
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('_media'))
-{
-	/**
-	 * Generate media based tag
-	 *
-	 * @param string $name
-	 * @param array  $types
-	 * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
-	 * @param string $attributes
-	 * @param array  $tracks
-	 *
-	 * @return string
-	 */
-	function _media(string $name, array $types = [], string $unsupportedMessage = '', string $attributes = '', array $tracks = []): string
-	{
-		$media = '<' . $name;
-
-		if (empty($attributes))
-		{
-			$media .= '>';
-		}
-		else
-		{
-			$media .= ' ' . $attributes . '>';
-		}
-
-		$media .= "\n";
-
-		foreach ($types as $option)
-		{
-			$media .= _space_indent() . $option . "\n";
-		}
-
-		if (! empty($tracks))
-		{
-			foreach ($tracks as $track)
-			{
-				$media .= _space_indent() . $track . "\n";
-			}
-		}
-
-		if (! empty($unsupportedMessage))
-		{
-			$media .= _space_indent() . $unsupportedMessage . "\n";
-		}
-
-		return $media . ('</' . $name . ">\n");
-	}
+if (! function_exists('_media')) {
+    /**
+     * Generate media based tag
+     *
+     * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
+     */
+    function _media(string $name, array $types = [], string $unsupportedMessage = '', string $attributes = '', array $tracks = []): string
+    {
+        $media = '<' . $name;
+
+        if (empty($attributes)) {
+            $media .= '>';
+        } else {
+            $media .= ' ' . $attributes . '>';
+        }
+
+        $media .= "\n";
+
+        foreach ($types as $option) {
+            $media .= _space_indent() . $option . "\n";
+        }
+
+        foreach ($tracks as $track) {
+            $media .= _space_indent() . $track . "\n";
+        }
+
+        if (! empty($unsupportedMessage)) {
+            $media .= _space_indent() . $unsupportedMessage . "\n";
+        }
+
+        return $media . ('</' . $name . ">\n");
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('source'))
-{
-	/**
-	 * Source
-	 *
-	 * Generates a source element that specifies multiple media resources
-	 * for either audio or video element
-	 *
-	 * @param string  $src        The path of the media resource
-	 * @param string  $type       The MIME-type of the resource with optional codecs parameters
-	 * @param string  $attributes HTML attributes
-	 * @param boolean $indexPage
-	 *
-	 * @return string
-	 */
-	function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
-	{
-		if (! _has_protocol($src))
-		{
-			$src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
-		}
-
-		$source = '<source src="' . $src
-				. '" type="' . $type . '"';
-
-		if (! empty($attributes))
-		{
-			$source .= ' ' . $attributes;
-		}
-
-		return $source . ' />';
-	}
+if (! function_exists('source')) {
+    /**
+     * Source
+     *
+     * Generates a source element that specifies multiple media resources
+     * for either audio or video element
+     *
+     * @param string $src        The path of the media resource
+     * @param string $type       The MIME-type of the resource with optional codecs parameters
+     * @param string $attributes HTML attributes
+     */
+    function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
+    {
+        if (! _has_protocol($src)) {
+            $src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
+        }
+
+        $source = '<source src="' . $src
+                . '" type="' . $type . '"';
+
+        if (! empty($attributes)) {
+            $source .= ' ' . $attributes;
+        }
+
+        return $source . ' />';
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('track'))
-{
-	/**
-	 * Track
-	 *
-	 * Generates a track element to specify timed tracks. The tracks are
-	 * formatted in WebVTT format.
-	 *
-	 * @param string $src         The path of the .VTT file
-	 * @param string $kind
-	 * @param string $srcLanguage
-	 * @param string $label
-	 *
-	 * @return string
-	 */
-	function track(string $src, string $kind, string $srcLanguage, string $label): string
-	{
-		return '<track src="' . $src
-				. '" kind="' . $kind
-				. '" srclang="' . $srcLanguage
-				. '" label="' . $label
-				. '" />';
-	}
+if (! function_exists('track')) {
+    /**
+     * Track
+     *
+     * Generates a track element to specify timed tracks. The tracks are
+     * formatted in WebVTT format.
+     *
+     * @param string $src The path of the .VTT file
+     */
+    function track(string $src, string $kind, string $srcLanguage, string $label): string
+    {
+        return '<track src="' . $src
+                . '" kind="' . $kind
+                . '" srclang="' . $srcLanguage
+                . '" label="' . $label
+                . '" />';
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('object'))
-{
-	/**
-	 * Object
-	 *
-	 * Generates an object element that represents the media
-	 * as either image or a resource plugin such as audio, video,
-	 * Java applets, ActiveX, PDF and Flash
-	 *
-	 * @param string  $data       A resource URL
-	 * @param string  $type       Content-type of the resource
-	 * @param string  $attributes HTML attributes
-	 * @param array   $params
-	 * @param boolean $indexPage
-	 *
-	 * @return string
-	 */
-	function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
-	{
-		if (! _has_protocol($data))
-		{
-			$data = $indexPage === true ? site_url($data) : slash_item('baseURL') . $data;
-		}
-
-		$object = '<object data="' . $data . '" '
-				. $attributes . '>';
-
-		if (! empty($params))
-		{
-			$object .= "\n";
-		}
-
-		foreach ($params as $param)
-		{
-			$object .= _space_indent() . $param . "\n";
-		}
-
-		return $object . "</object>\n";
-	}
+if (! function_exists('object')) {
+    /**
+     * Object
+     *
+     * Generates an object element that represents the media
+     * as either image or a resource plugin such as audio, video,
+     * Java applets, ActiveX, PDF and Flash
+     *
+     * @param string $data       A resource URL
+     * @param string $type       Content-type of the resource
+     * @param string $attributes HTML attributes
+     */
+    function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
+    {
+        if (! _has_protocol($data)) {
+            $data = $indexPage === true ? site_url($data) : slash_item('baseURL') . $data;
+        }
+
+        $object = '<object data="' . $data . '" '
+                . $attributes . '>';
+
+        if (! empty($params)) {
+            $object .= "\n";
+        }
+
+        foreach ($params as $param) {
+            $object .= _space_indent() . $param . "\n";
+        }
+
+        return $object . "</object>\n";
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('param'))
-{
-	/**
-	 * Param
-	 *
-	 * Generates a param element that defines parameters
-	 * for the object element.
-	 *
-	 * @param string $name       The name of the parameter
-	 * @param string $value      The value of the parameter
-	 * @param string $type       The MIME-type
-	 * @param string $attributes HTML attributes
-	 *
-	 * @return string
-	 */
-	function param(string $name, string $value, string $type = 'ref', string $attributes = ''): string
-	{
-		return '<param name="' . $name
-				. '" type="' . $type
-				. '" value="' . $value
-				. '" ' . $attributes . ' />';
-	}
+if (! function_exists('param')) {
+    /**
+     * Param
+     *
+     * Generates a param element that defines parameters
+     * for the object element.
+     *
+     * @param string $name       The name of the parameter
+     * @param string $value      The value of the parameter
+     * @param string $type       The MIME-type
+     * @param string $attributes HTML attributes
+     */
+    function param(string $name, string $value, string $type = 'ref', string $attributes = ''): string
+    {
+        return '<param name="' . $name
+                . '" type="' . $type
+                . '" value="' . $value
+                . '" ' . $attributes . ' />';
+    }
 }
 
-	// ------------------------------------------------------------------------
-
-if (! function_exists('embed'))
-{
-	/**
-	 * Embed
-	 *
-	 * Generates an embed element
-	 *
-	 * @param string  $src        The path of the resource to embed
-	 * @param string  $type       MIME-type
-	 * @param string  $attributes HTML attributes
-	 * @param boolean $indexPage
-	 *
-	 * @return string
-	 */
-	function embed(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
-	{
-		if (! _has_protocol($src))
-		{
-			$src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
-		}
-
-		return '<embed src="' . $src
-				. '" type="' . $type . '" '
-				. $attributes . " />\n";
-	}
+if (! function_exists('embed')) {
+    /**
+     * Embed
+     *
+     * Generates an embed element
+     *
+     * @param string $src        The path of the resource to embed
+     * @param string $type       MIME-type
+     * @param string $attributes HTML attributes
+     */
+    function embed(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
+    {
+        if (! _has_protocol($src)) {
+            $src = $indexPage === true ? site_url($src) : slash_item('baseURL') . $src;
+        }
+
+        return '<embed src="' . $src
+                . '" type="' . $type . '" '
+                . $attributes . " />\n";
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('_has_protocol'))
-{
-	/**
-	 * Test the protocol of a URI.
-	 *
-	 * @param string $url
-	 *
-	 * @return false|integer
-	 */
-	function _has_protocol(string $url)
-	{
-		return preg_match('#^([a-z]+:)?//#i', $url);
-	}
+if (! function_exists('_has_protocol')) {
+    /**
+     * Test the protocol of a URI.
+     *
+     * @return false|int
+     */
+    function _has_protocol(string $url)
+    {
+        return preg_match('#^([a-z]+:)?//#i', $url);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('_space_indent'))
-{
-	/**
-	 * Provide space indenting.
-	 *
-	 * @param integer $depth
-	 *
-	 * @return string
-	 */
-	function _space_indent(int $depth = 2): string
-	{
-		return str_repeat(' ', $depth);
-	}
+if (! function_exists('_space_indent')) {
+    /**
+     * Provide space indenting.
+     */
+    function _space_indent(int $depth = 2): string
+    {
+        return str_repeat(' ', $depth);
+    }
 }
-
-// ------------------------------------------------------------------------
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 36ea9b5c1334..b4d38015564f 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -1,384 +1,322 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-// --------------------------------------------------------------------
-
-/**
- * CodeIgniter Inflector Helpers
- */
-if (! function_exists('singular'))
-{
-	/**
-	 * Singular
-	 *
-	 * Takes a plural word and makes it singular
-	 *
-	 * @param string $string Input string
-	 *
-	 * @return string
-	 */
-	function singular(string $string): string
-	{
-		$result = $string;
-
-		if (! is_pluralizable($result))
-		{
-			return $result;
-		}
-
-		//Arranged in order.
-		$singularRules = [
-			'/(matr)ices$/'                                                   => '\1ix',
-			'/(vert|ind)ices$/'                                               => '\1ex',
-			'/^(ox)en/'                                                       => '\1',
-			'/(alias)es$/'                                                    => '\1',
-			'/([octop|vir])i$/'                                               => '\1us',
-			'/(cris|ax|test)es$/'                                             => '\1is',
-			'/(shoe)s$/'                                                      => '\1',
-			'/(o)es$/'                                                        => '\1',
-			'/(bus|campus)es$/'                                               => '\1',
-			'/([m|l])ice$/'                                                   => '\1ouse',
-			'/(x|ch|ss|sh)es$/'                                               => '\1',
-			'/(m)ovies$/'                                                     => '\1\2ovie',
-			'/(s)eries$/'                                                     => '\1\2eries',
-			'/([^aeiouy]|qu)ies$/'                                            => '\1y',
-			'/([lr])ves$/'                                                    => '\1f',
-			'/(tive)s$/'                                                      => '\1',
-			'/(hive)s$/'                                                      => '\1',
-			'/([^f])ves$/'                                                    => '\1fe',
-			'/(^analy)ses$/'                                                  => '\1sis',
-			'/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis',
-			'/([ti])a$/'                                                      => '\1um',
-			'/(p)eople$/'                                                     => '\1\2erson',
-			'/(m)en$/'                                                        => '\1an',
-			'/(s)tatuses$/'                                                   => '\1\2tatus',
-			'/(c)hildren$/'                                                   => '\1\2hild',
-			'/(n)ews$/'                                                       => '\1\2ews',
-			'/(quiz)zes$/'                                                    => '\1',
-			'/([^us])s$/'                                                     => '\1',
-		];
-
-		foreach ($singularRules as $rule => $replacement)
-		{
-			if (preg_match($rule, $result))
-			{
-				$result = preg_replace($rule, $replacement, $result);
-				break;
-			}
-		}
-
-		return $result;
-	}
+// CodeIgniter Inflector Helpers
+
+if (! function_exists('singular')) {
+    /**
+     * Singular
+     *
+     * Takes a plural word and makes it singular
+     *
+     * @param string $string Input string
+     */
+    function singular(string $string): string
+    {
+        $result = $string;
+
+        if (! is_pluralizable($result)) {
+            return $result;
+        }
+
+        // Arranged in order.
+        $singularRules = [
+            '/(matr)ices$/'                                                   => '\1ix',
+            '/(vert|ind)ices$/'                                               => '\1ex',
+            '/^(ox)en/'                                                       => '\1',
+            '/(alias)es$/'                                                    => '\1',
+            '/([octop|vir])i$/'                                               => '\1us',
+            '/(cris|ax|test)es$/'                                             => '\1is',
+            '/(shoe)s$/'                                                      => '\1',
+            '/(o)es$/'                                                        => '\1',
+            '/(bus|campus)es$/'                                               => '\1',
+            '/([m|l])ice$/'                                                   => '\1ouse',
+            '/(x|ch|ss|sh)es$/'                                               => '\1',
+            '/(m)ovies$/'                                                     => '\1\2ovie',
+            '/(s)eries$/'                                                     => '\1\2eries',
+            '/([^aeiouy]|qu)ies$/'                                            => '\1y',
+            '/([lr])ves$/'                                                    => '\1f',
+            '/(tive)s$/'                                                      => '\1',
+            '/(hive)s$/'                                                      => '\1',
+            '/([^f])ves$/'                                                    => '\1fe',
+            '/(^analy)ses$/'                                                  => '\1sis',
+            '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/' => '\1\2sis',
+            '/([ti])a$/'                                                      => '\1um',
+            '/(p)eople$/'                                                     => '\1\2erson',
+            '/(m)en$/'                                                        => '\1an',
+            '/(s)tatuses$/'                                                   => '\1\2tatus',
+            '/(c)hildren$/'                                                   => '\1\2hild',
+            '/(n)ews$/'                                                       => '\1\2ews',
+            '/(quiz)zes$/'                                                    => '\1',
+            '/([^us])s$/'                                                     => '\1',
+        ];
+
+        foreach ($singularRules as $rule => $replacement) {
+            if (preg_match($rule, $result)) {
+                $result = preg_replace($rule, $replacement, $result);
+                break;
+            }
+        }
+
+        return $result;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('plural'))
-{
-	/**
-	 * Plural
-	 *
-	 * Takes a singular word and makes it plural
-	 *
-	 * @param string $string Input string
-	 *
-	 * @return string
-	 */
-	function plural(string $string): string
-	{
-		$result = $string;
-
-		if (! is_pluralizable($result))
-		{
-			return $result;
-		}
-
-		$pluralRules = [
-			'/(quiz)$/'               => '\1zes',    // quizzes
-			'/^(ox)$/'                => '\1\2en', // ox
-			'/([m|l])ouse$/'          => '\1ice', // mouse, louse
-			'/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index
-			'/(x|ch|ss|sh)$/'         => '\1es', // search, switch, fix, box, process, address
-			'/([^aeiouy]|qu)y$/'      => '\1ies', // query, ability, agency
-			'/(hive)$/'               => '\1s', // archive, hive
-			'/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife
-			'/sis$/'                  => 'ses', // basis, diagnosis
-			'/([ti])um$/'             => '\1a', // datum, medium
-			'/(p)erson$/'             => '\1eople', // person, salesperson
-			'/(m)an$/'                => '\1en', // man, woman, spokesman
-			'/(c)hild$/'              => '\1hildren', // child
-			'/(buffal|tomat)o$/'      => '\1\2oes', // buffalo, tomato
-			'/(bu|campu)s$/'          => '\1\2ses', // bus, campus
-			'/(alias|status|virus)$/' => '\1es', // alias
-			'/(octop)us$/'            => '\1i', // octopus
-			'/(ax|cris|test)is$/'     => '\1es', // axis, crisis
-			'/s$/'                    => 's', // no change (compatibility)
-			'/$/'                     => 's',
-		];
-
-		foreach ($pluralRules as $rule => $replacement)
-		{
-			if (preg_match($rule, $result))
-			{
-				$result = preg_replace($rule, $replacement, $result);
-				break;
-			}
-		}
-
-		return $result;
-	}
+if (! function_exists('plural')) {
+    /**
+     * Plural
+     *
+     * Takes a singular word and makes it plural
+     *
+     * @param string $string Input string
+     */
+    function plural(string $string): string
+    {
+        $result = $string;
+
+        if (! is_pluralizable($result)) {
+            return $result;
+        }
+
+        $pluralRules = [
+            '/(quiz)$/'               => '\1zes',    // quizzes
+            '/^(ox)$/'                => '\1\2en', // ox
+            '/([m|l])ouse$/'          => '\1ice', // mouse, louse
+            '/(matr|vert|ind)ix|ex$/' => '\1ices', // matrix, vertex, index
+            '/(x|ch|ss|sh)$/'         => '\1es', // search, switch, fix, box, process, address
+            '/([^aeiouy]|qu)y$/'      => '\1ies', // query, ability, agency
+            '/(hive)$/'               => '\1s', // archive, hive
+            '/(?:([^f])fe|([lr])f)$/' => '\1\2ves', // half, safe, wife
+            '/sis$/'                  => 'ses', // basis, diagnosis
+            '/([ti])um$/'             => '\1a', // datum, medium
+            '/(p)erson$/'             => '\1eople', // person, salesperson
+            '/(m)an$/'                => '\1en', // man, woman, spokesman
+            '/(c)hild$/'              => '\1hildren', // child
+            '/(buffal|tomat)o$/'      => '\1\2oes', // buffalo, tomato
+            '/(bu|campu)s$/'          => '\1\2ses', // bus, campus
+            '/(alias|status|virus)$/' => '\1es', // alias
+            '/(octop)us$/'            => '\1i', // octopus
+            '/(ax|cris|test)is$/'     => '\1es', // axis, crisis
+            '/s$/'                    => 's', // no change (compatibility)
+            '/$/'                     => 's',
+        ];
+
+        foreach ($pluralRules as $rule => $replacement) {
+            if (preg_match($rule, $result)) {
+                $result = preg_replace($rule, $replacement, $result);
+                break;
+            }
+        }
+
+        return $result;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('counted'))
-{
-	/**
-	 * Counted
-	 *
-	 * Takes a number and a word to return the plural or not
-	 * E.g. 0 cats, 1 cat, 2 cats, ...
-	 *
-	 * @param integer $count  Number of items
-	 * @param string  $string Input string
-	 *
-	 * @return string
-	 */
-	function counted(int $count, string $string): string
-	{
-		$result = "{$count} ";
-
-		return $result . ($count === 1 ? singular($string) : plural($string));
-	}
+if (! function_exists('counted')) {
+    /**
+     * Counted
+     *
+     * Takes a number and a word to return the plural or not
+     * E.g. 0 cats, 1 cat, 2 cats, ...
+     *
+     * @param int    $count  Number of items
+     * @param string $string Input string
+     */
+    function counted(int $count, string $string): string
+    {
+        $result = "{$count} ";
+
+        return $result . ($count === 1 ? singular($string) : plural($string));
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('camelize'))
-{
-	/**
-	 * Camelize
-	 *
-	 * Takes multiple words separated by spaces or
-	 * underscores and converts them to camel case.
-	 *
-	 * @param  string $string Input string
-	 * @return string
-	 */
-	function camelize(string $string): string
-	{
-		return lcfirst(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $string))));
-	}
+if (! function_exists('camelize')) {
+    /**
+     * Camelize
+     *
+     * Takes multiple words separated by spaces or
+     * underscores and converts them to camel case.
+     *
+     * @param string $string Input string
+     */
+    function camelize(string $string): string
+    {
+        return lcfirst(str_replace(' ', '', ucwords(preg_replace('/[\s_]+/', ' ', $string))));
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('pascalize'))
-{
-	/**
-	 * Pascalize
-	 *
-	 * Takes multiple words separated by spaces or
-	 * underscores and converts them to Pascal case,
-	 * which is camel case with an uppercase first letter.
-	 *
-	 * @param string $string Input string
-	 *
-	 * @return string
-	 */
-	function pascalize(string $string): string
-	{
-		return ucfirst(camelize($string));
-	}
+if (! function_exists('pascalize')) {
+    /**
+     * Pascalize
+     *
+     * Takes multiple words separated by spaces or
+     * underscores and converts them to Pascal case,
+     * which is camel case with an uppercase first letter.
+     *
+     * @param string $string Input string
+     */
+    function pascalize(string $string): string
+    {
+        return ucfirst(camelize($string));
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('underscore'))
-{
-	/**
-	 * Underscore
-	 *
-	 * Takes multiple words separated by spaces and underscores them
-	 *
-	 * @param string $string Input string
-	 *
-	 * @return string
-	 */
-	function underscore(string $string): string
-	{
-		$replacement = trim($string);
-
-		return preg_replace('/[\s]+/', '_', $replacement);
-	}
+if (! function_exists('underscore')) {
+    /**
+     * Underscore
+     *
+     * Takes multiple words separated by spaces and underscores them
+     *
+     * @param string $string Input string
+     */
+    function underscore(string $string): string
+    {
+        $replacement = trim($string);
+
+        return preg_replace('/[\s]+/', '_', $replacement);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('humanize'))
-{
-	/**
-	 * Humanize
-	 *
-	 * Takes multiple words separated by the separator,
-	 * camelizes and changes them to spaces
-	 *
-	 * @param string $string    Input string
-	 * @param string $separator Input separator
-	 *
-	 * @return string
-	 */
-	function humanize(string $string, string $separator = '_'): string
-	{
-		$replacement = trim($string);
-
-		return ucwords
-				(
-				preg_replace('/[' . $separator . ']+/', ' ', $replacement)
-		);
-	}
+if (! function_exists('humanize')) {
+    /**
+     * Humanize
+     *
+     * Takes multiple words separated by the separator,
+     * camelizes and changes them to spaces
+     *
+     * @param string $string    Input string
+     * @param string $separator Input separator
+     */
+    function humanize(string $string, string $separator = '_'): string
+    {
+        $replacement = trim($string);
+
+        return ucwords(preg_replace('/[' . $separator . ']+/', ' ', $replacement));
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('is_pluralizable'))
-{
-	/**
-	 * Checks if the given word has a plural version.
-	 *
-	 * @param string $word Word to check
-	 *
-	 * @return boolean
-	 */
-	function is_pluralizable(string $word): bool
-	{
-		$uncountables = in_array
-				(
-			strtolower($word), [
-						   'advice',
-						   'bravery',
-						   'butter',
-						   'chaos',
-						   'clarity',
-						   'coal',
-						   'courage',
-						   'cowardice',
-						   'curiosity',
-						   'education',
-						   'equipment',
-						   'evidence',
-						   'fish',
-						   'fun',
-						   'furniture',
-						   'greed',
-						   'help',
-						   'homework',
-						   'honesty',
-						   'information',
-						   'insurance',
-						   'jewelry',
-						   'knowledge',
-						   'livestock',
-						   'love',
-						   'luck',
-						   'marketing',
-						   'meta',
-						   'money',
-						   'mud',
-						   'news',
-						   'patriotism',
-						   'racism',
-						   'rice',
-						   'satisfaction',
-						   'scenery',
-						   'series',
-						   'sexism',
-						   'silence',
-						   'species',
-						   'spelling',
-						   'sugar',
-						   'water',
-						   'weather',
-						   'wisdom',
-						   'work',
-					   ], true);
-
-		return ! $uncountables;
-	}
+if (! function_exists('is_pluralizable')) {
+    /**
+     * Checks if the given word has a plural version.
+     *
+     * @param string $word Word to check
+     */
+    function is_pluralizable(string $word): bool
+    {
+        $uncountables = in_array(
+            strtolower($word),
+            [
+                'advice',
+                'bravery',
+                'butter',
+                'chaos',
+                'clarity',
+                'coal',
+                'courage',
+                'cowardice',
+                'curiosity',
+                'education',
+                'equipment',
+                'evidence',
+                'fish',
+                'fun',
+                'furniture',
+                'greed',
+                'help',
+                'homework',
+                'honesty',
+                'information',
+                'insurance',
+                'jewelry',
+                'knowledge',
+                'livestock',
+                'love',
+                'luck',
+                'marketing',
+                'meta',
+                'money',
+                'mud',
+                'news',
+                'patriotism',
+                'racism',
+                'rice',
+                'satisfaction',
+                'scenery',
+                'series',
+                'sexism',
+                'silence',
+                'species',
+                'spelling',
+                'sugar',
+                'water',
+                'weather',
+                'wisdom',
+                'work',
+            ],
+            true
+        );
+
+        return ! $uncountables;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('dasherize'))
-{
-	/**
-	 * Replaces underscores with dashes in the string.
-	 *
-	 * @param string $string Input string
-	 *
-	 * @return string
-	 */
-	function dasherize(string $string): string
-	{
-		return str_replace('_', '-', $string);
-	}
+if (! function_exists('dasherize')) {
+    /**
+     * Replaces underscores with dashes in the string.
+     *
+     * @param string $string Input string
+     */
+    function dasherize(string $string): string
+    {
+        return str_replace('_', '-', $string);
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('ordinal'))
-{
-	/**
-	 * Returns the suffix that should be added to a
-	 * number to denote the position in an ordered
-	 * sequence such as 1st, 2nd, 3rd, 4th.
-	 *
-	 * @param integer $integer The integer to determine the suffix
-	 *
-	 * @return string
-	 */
-	function ordinal(int $integer): string
-	{
-		$suffixes = [
-			'th',
-			'st',
-			'nd',
-			'rd',
-			'th',
-			'th',
-			'th',
-			'th',
-			'th',
-			'th',
-		];
-
-		return $integer % 100 >= 11 && $integer % 100 <= 13 ? 'th' : $suffixes[$integer % 10];
-	}
+if (! function_exists('ordinal')) {
+    /**
+     * Returns the suffix that should be added to a
+     * number to denote the position in an ordered
+     * sequence such as 1st, 2nd, 3rd, 4th.
+     *
+     * @param int $integer The integer to determine the suffix
+     */
+    function ordinal(int $integer): string
+    {
+        $suffixes = [
+            'th',
+            'st',
+            'nd',
+            'rd',
+            'th',
+            'th',
+            'th',
+            'th',
+            'th',
+            'th',
+        ];
+
+        return $integer % 100 >= 11 && $integer % 100 <= 13 ? 'th' : $suffixes[$integer % 10];
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('ordinalize'))
-{
-	/**
-	 * Turns a number into an ordinal string used
-	 * to denote the position in an ordered sequence
-	 * such as 1st, 2nd, 3rd, 4th.
-	 *
-	 * @param integer $integer The integer to ordinalize
-	 *
-	 * @return string
-	 */
-	function ordinalize(int $integer): string
-	{
-		return $integer . ordinal($integer);
-	}
+if (! function_exists('ordinalize')) {
+    /**
+     * Turns a number into an ordinal string used
+     * to denote the position in an ordered sequence
+     * such as 1st, 2nd, 3rd, 4th.
+     *
+     * @param int $integer The integer to ordinalize
+     */
+    function ordinalize(int $integer): string
+    {
+        return $integer . ordinal($integer);
+    }
 }
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 4262ee69beef..6e1391556c49 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -1,313 +1,260 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\Services;
 
-/**
- * CodeIgniter Number Helpers
- */
+// CodeIgniter Number Helpers
+
+if (! function_exists('number_to_size')) {
+    /**
+     * Formats a numbers as bytes, based on size, and adds the appropriate suffix
+     *
+     * @param mixed  $num    Will be cast as int
+     * @param string $locale
+     *
+     * @return bool|string
+     */
+    function number_to_size($num, int $precision = 1, ?string $locale = null)
+    {
+        // Strip any formatting & ensure numeric input
+        try {
+            $num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+        } catch (ErrorException $ee) {
+            return false;
+        }
+
+        // ignore sub part
+        $generalLocale = $locale;
+        if (! empty($locale) && ($underscorePos = strpos($locale, '_'))) {
+            $generalLocale = substr($locale, 0, $underscorePos);
+        }
 
-if (! function_exists('number_to_size'))
-{
-	/**
-	 * Formats a numbers as bytes, based on size, and adds the appropriate suffix
-	 *
-	 * @param mixed   $num       Will be cast as int
-	 * @param integer $precision
-	 * @param string  $locale
-	 *
-	 * @return boolean|string
-	 */
-	function number_to_size($num, int $precision = 1, string $locale = null)
-	{
-		// Strip any formatting & ensure numeric input
-		try
-		{
-			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
-		}
-		catch (ErrorException $ee)
-		{
-			return false;
-		}
-
-		// ignore sub part
-		$generalLocale = $locale;
-		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
-		{
-			$generalLocale = substr($locale, 0, $underscorePos);
-		}
-
-		if ($num >= 1000000000000)
-		{
-			$num  = round($num / 1099511627776, $precision);
-			$unit = lang('Number.terabyteAbbr', [], $generalLocale);
-		}
-		elseif ($num >= 1000000000)
-		{
-			$num  = round($num / 1073741824, $precision);
-			$unit = lang('Number.gigabyteAbbr', [], $generalLocale);
-		}
-		elseif ($num >= 1000000)
-		{
-			$num  = round($num / 1048576, $precision);
-			$unit = lang('Number.megabyteAbbr', [], $generalLocale);
-		}
-		elseif ($num >= 1000)
-		{
-			$num  = round($num / 1024, $precision);
-			$unit = lang('Number.kilobyteAbbr', [], $generalLocale);
-		}
-		else
-		{
-			$unit = lang('Number.bytes', [], $generalLocale);
-		}
-
-		return format_number($num, $precision, $locale, ['after' => ' ' . $unit]);
-	}
+        if ($num >= 1000000000000) {
+            $num  = round($num / 1099511627776, $precision);
+            $unit = lang('Number.terabyteAbbr', [], $generalLocale);
+        } elseif ($num >= 1000000000) {
+            $num  = round($num / 1073741824, $precision);
+            $unit = lang('Number.gigabyteAbbr', [], $generalLocale);
+        } elseif ($num >= 1000000) {
+            $num  = round($num / 1048576, $precision);
+            $unit = lang('Number.megabyteAbbr', [], $generalLocale);
+        } elseif ($num >= 1000) {
+            $num  = round($num / 1024, $precision);
+            $unit = lang('Number.kilobyteAbbr', [], $generalLocale);
+        } else {
+            $unit = lang('Number.bytes', [], $generalLocale);
+        }
+
+        return format_number($num, $precision, $locale, ['after' => ' ' . $unit]);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('number_to_amount'))
-{
-	/**
-	 * Converts numbers to a more readable representation
-	 * when dealing with very large numbers (in the thousands or above),
-	 * up to the quadrillions, because you won't often deal with numbers
-	 * larger than that.
-	 *
-	 * It uses the "short form" numbering system as this is most commonly
-	 * used within most English-speaking countries today.
-	 *
-	 * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers
-	 *
-	 * @param string      $num
-	 * @param integer     $precision
-	 * @param string|null $locale
-	 *
-	 * @return boolean|string
-	 */
-	function number_to_amount($num, int $precision = 0, string $locale = null)
-	{
-		// Strip any formatting & ensure numeric input
-		try
-		{
-			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
-		}
-		catch (ErrorException $ee)
-		{
-			return false;
-		}
-
-		$suffix = '';
-
-		// ignore sub part
-		$generalLocale = $locale;
-		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
-		{
-			$generalLocale = substr($locale, 0, $underscorePos);
-		}
-
-		if ($num > 1000000000000000)
-		{
-			$suffix = lang('Number.quadrillion', [], $generalLocale);
-			$num    = round(($num / 1000000000000000), $precision);
-		}
-		elseif ($num > 1000000000000)
-		{
-			$suffix = lang('Number.trillion', [], $generalLocale);
-			$num    = round(($num / 1000000000000), $precision);
-		}
-		elseif ($num > 1000000000)
-		{
-			$suffix = lang('Number.billion', [], $generalLocale);
-			$num    = round(($num / 1000000000), $precision);
-		}
-		elseif ($num > 1000000)
-		{
-			$suffix = lang('Number.million', [], $generalLocale);
-			$num    = round(($num / 1000000), $precision);
-		}
-		elseif ($num > 1000)
-		{
-			$suffix = lang('Number.thousand', [], $generalLocale);
-			$num    = round(($num / 1000), $precision);
-		}
-
-		return format_number($num, $precision, $locale, ['after' => $suffix]);
-	}
+if (! function_exists('number_to_amount')) {
+    /**
+     * Converts numbers to a more readable representation
+     * when dealing with very large numbers (in the thousands or above),
+     * up to the quadrillions, because you won't often deal with numbers
+     * larger than that.
+     *
+     * It uses the "short form" numbering system as this is most commonly
+     * used within most English-speaking countries today.
+     *
+     * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers
+     *
+     * @param string $num
+     *
+     * @return bool|string
+     */
+    function number_to_amount($num, int $precision = 0, ?string $locale = null)
+    {
+        // Strip any formatting & ensure numeric input
+        try {
+            $num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+        } catch (ErrorException $ee) {
+            return false;
+        }
+
+        $suffix = '';
+
+        // ignore sub part
+        $generalLocale = $locale;
+        if (! empty($locale) && ($underscorePos = strpos($locale, '_'))) {
+            $generalLocale = substr($locale, 0, $underscorePos);
+        }
+
+        if ($num > 1000000000000000) {
+            $suffix = lang('Number.quadrillion', [], $generalLocale);
+            $num    = round(($num / 1000000000000000), $precision);
+        } elseif ($num > 1000000000000) {
+            $suffix = lang('Number.trillion', [], $generalLocale);
+            $num    = round(($num / 1000000000000), $precision);
+        } elseif ($num > 1000000000) {
+            $suffix = lang('Number.billion', [], $generalLocale);
+            $num    = round(($num / 1000000000), $precision);
+        } elseif ($num > 1000000) {
+            $suffix = lang('Number.million', [], $generalLocale);
+            $num    = round(($num / 1000000), $precision);
+        } elseif ($num > 1000) {
+            $suffix = lang('Number.thousand', [], $generalLocale);
+            $num    = round(($num / 1000), $precision);
+        }
+
+        return format_number($num, $precision, $locale, ['after' => $suffix]);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('number_to_currency'))
-{
-	/**
-	 * @param float   $num
-	 * @param string  $currency
-	 * @param string  $locale
-	 * @param integer $fraction
-	 *
-	 * @return string
-	 */
-	function number_to_currency(float $num, string $currency, string $locale = null, int $fraction = null): string
-	{
-		return format_number($num, 1, $locale, [
-			'type'     => NumberFormatter::CURRENCY,
-			'currency' => $currency,
-			'fraction' => $fraction,
-		]);
-	}
+if (! function_exists('number_to_currency')) {
+    /**
+     * @param string $locale
+     * @param int    $fraction
+     */
+    function number_to_currency(float $num, string $currency, ?string $locale = null, ?int $fraction = null): string
+    {
+        return format_number($num, 1, $locale, [
+            'type'     => NumberFormatter::CURRENCY,
+            'currency' => $currency,
+            'fraction' => $fraction,
+        ]);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('format_number'))
-{
-	/**
-	 * A general purpose, locale-aware, number_format method.
-	 * Used by all of the functions of the number_helper.
-	 *
-	 * @param float       $num
-	 * @param integer     $precision
-	 * @param string|null $locale
-	 * @param array       $options
-	 *
-	 * @return string
-	 */
-	function format_number(float $num, int $precision = 1, string $locale = null, array $options = []): string
-	{
-		// Locale is either passed in here, negotiated with client, or grabbed from our config file.
-		$locale = $locale ?? Services::request()->getLocale();
-
-		// Type can be any of the NumberFormatter options, but provide a default.
-		$type = (int) ($options['type'] ?? NumberFormatter::DECIMAL);
-
-		$formatter = new NumberFormatter($locale, $type);
-
-		// Try to format it per the locale
-		if ($type === NumberFormatter::CURRENCY)
-		{
-			$formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, $options['fraction']);
-			$output = $formatter->formatCurrency($num, $options['currency']);
-		}
-		else
-		{
-			// In order to specify a precision, we'll have to modify
-			// the pattern used by NumberFormatter.
-			$pattern = '#,##0.' . str_repeat('#', $precision);
-
-			$formatter->setPattern($pattern);
-			$output = $formatter->format($num);
-		}
-
-		// This might lead a trailing period if $precision == 0
-		$output = trim($output, '. ');
-
-		if (intl_is_failure($formatter->getErrorCode()))
-		{
-			throw new BadFunctionCallException($formatter->getErrorMessage());
-		}
-
-		// Add on any before/after text.
-		if (isset($options['before']) && is_string($options['before']))
-		{
-			$output = $options['before'] . $output;
-		}
-
-		if (isset($options['after']) && is_string($options['after']))
-		{
-			$output .= $options['after'];
-		}
-
-		return $output;
-	}
+if (! function_exists('format_number')) {
+    /**
+     * A general purpose, locale-aware, number_format method.
+     * Used by all of the functions of the number_helper.
+     */
+    function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string
+    {
+        // Locale is either passed in here, negotiated with client, or grabbed from our config file.
+        $locale = $locale ?? Services::request()->getLocale();
+
+        // Type can be any of the NumberFormatter options, but provide a default.
+        $type = (int) ($options['type'] ?? NumberFormatter::DECIMAL);
+
+        $formatter = new NumberFormatter($locale, $type);
+
+        // Try to format it per the locale
+        if ($type === NumberFormatter::CURRENCY) {
+            $formatter->setAttribute(NumberFormatter::FRACTION_DIGITS, $options['fraction']);
+            $output = $formatter->formatCurrency($num, $options['currency']);
+        } else {
+            // In order to specify a precision, we'll have to modify
+            // the pattern used by NumberFormatter.
+            $pattern = '#,##0.' . str_repeat('#', $precision);
+
+            $formatter->setPattern($pattern);
+            $output = $formatter->format($num);
+        }
+
+        // This might lead a trailing period if $precision == 0
+        $output = trim($output, '. ');
+
+        if (intl_is_failure($formatter->getErrorCode())) {
+            throw new BadFunctionCallException($formatter->getErrorMessage());
+        }
+
+        // Add on any before/after text.
+        if (isset($options['before']) && is_string($options['before'])) {
+            $output = $options['before'] . $output;
+        }
+
+        if (isset($options['after']) && is_string($options['after'])) {
+            $output .= $options['after'];
+        }
+
+        return $output;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('number_to_roman'))
-{
-	/**
-	 * Convert a number to a roman numeral.
-	 *
-	 * @param string $num it will convert to int
-	 *
-	 * @return string|null
-	 */
-	function number_to_roman(string $num): ?string
-	{
-		$num = (int) $num;
-		if ($num < 1 || $num > 3999)
-		{
-			return null;
-		}
-
-		$_number_to_roman = function ($num, $th) use (&$_number_to_roman) {
-			$return = '';
-			$key1   = null;
-			$key2   = null;
-			switch ($th) {
-				case 1:
-					$key1 = 'I';
-					$key2 = 'V';
-					$keyF = 'X';
-					break;
-				case 2:
-					$key1 = 'X';
-					$key2 = 'L';
-					$keyF = 'C';
-					break;
-				case 3:
-					$key1 = 'C';
-					$key2 = 'D';
-					$keyF = 'M';
-					break;
-				case 4:
-					$key1 = 'M';
-					break;
-			}
-			$n = $num % 10;
-			switch ($n) {
-				case 1:
-				case 2:
-				case 3:
-					$return = str_repeat($key1, $n);
-					break;
-				case 4:
-					$return = $key1 . $key2;
-					break;
-				case 5:
-					$return = $key2;
-					break;
-				case 6:
-				case 7:
-				case 8:
-					$return = $key2 . str_repeat($key1, $n - 5);
-					break;
-				case 9:
-					$return = $key1 . $keyF; // @phpstan-ignore-line
-					break;
-			}
-			switch ($num) {
-				case 10:
-					$return = $keyF; // @phpstan-ignore-line
-					break;
-			}
-			if ($num > 10)
-			{
-				$return = $_number_to_roman($num / 10, ++ $th) . $return;
-			}
-			return $return;
-		};
-		return $_number_to_roman($num, 1);
-	}
+if (! function_exists('number_to_roman')) {
+    /**
+     * Convert a number to a roman numeral.
+     *
+     * @param string $num it will convert to int
+     */
+    function number_to_roman(string $num): ?string
+    {
+        $num = (int) $num;
+        if ($num < 1 || $num > 3999) {
+            return null;
+        }
+
+        $_number_to_roman = static function ($num, $th) use (&$_number_to_roman) {
+            $return = '';
+            $key1   = null;
+            $key2   = null;
+
+            switch ($th) {
+                case 1:
+                    $key1 = 'I';
+                    $key2 = 'V';
+                    $keyF = 'X';
+                    break;
+
+                case 2:
+                    $key1 = 'X';
+                    $key2 = 'L';
+                    $keyF = 'C';
+                    break;
+
+                case 3:
+                    $key1 = 'C';
+                    $key2 = 'D';
+                    $keyF = 'M';
+                    break;
+
+                case 4:
+                    $key1 = 'M';
+                    break;
+            }
+            $n = $num % 10;
+
+            switch ($n) {
+                case 1:
+                case 2:
+                case 3:
+                    $return = str_repeat($key1, $n);
+                    break;
+
+                case 4:
+                    $return = $key1 . $key2;
+                    break;
+
+                case 5:
+                    $return = $key2;
+                    break;
+
+                case 6:
+                case 7:
+                case 8:
+                    $return = $key2 . str_repeat($key1, $n - 5);
+                    break;
+
+                case 9:
+                    $return = $key1 . $keyF; // @phpstan-ignore-line
+                    break;
+            }
+
+            switch ($num) {
+                case 10:
+                    $return = $keyF; // @phpstan-ignore-line
+                    break;
+            }
+            if ($num > 10) {
+                $return = $_number_to_roman($num / 10, ++$th) . $return;
+            }
+
+            return $return;
+        };
+
+        return $_number_to_roman($num, 1);
+    }
 }
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index d74365608d8a..eba12de59ad8 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -1,71 +1,51 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\Services;
 
-/**
- * CodeIgniter Security Helpers
- */
+// CodeIgniter Security Helpers
 
-if (! function_exists('sanitize_filename'))
-{
-	/**
-	 * Sanitize a filename to use in a URI.
-	 *
-	 * @param string $filename
-	 *
-	 * @return string
-	 */
-	function sanitize_filename(string $filename): string
-	{
-		return Services::security()->sanitizeFilename($filename);
-	}
+if (! function_exists('sanitize_filename')) {
+    /**
+     * Sanitize a filename to use in a URI.
+     */
+    function sanitize_filename(string $filename): string
+    {
+        return Services::security()->sanitizeFilename($filename);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('strip_image_tags'))
-{
-	/**
-	 * Strip Image Tags
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function strip_image_tags(string $str): string
-	{
-		return preg_replace([
-			'#<img[\s/]+.*?src\s*=\s*(["\'])([^\\1]+?)\\1.*?\>#i',
-			'#<img[\s/]+.*?src\s*=\s*?(([^\s"\'=<>`]+)).*?\>#i',
-		], '\\2', $str
-		);
-	}
+if (! function_exists('strip_image_tags')) {
+    /**
+     * Strip Image Tags
+     */
+    function strip_image_tags(string $str): string
+    {
+        return preg_replace(
+            [
+                '#<img[\s/]+.*?src\s*=\s*(["\'])([^\\1]+?)\\1.*?\>#i',
+                '#<img[\s/]+.*?src\s*=\s*?(([^\s"\'=<>`]+)).*?\>#i',
+            ],
+            '\\2',
+            $str
+        );
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('encode_php_tags'))
-{
-	/**
-	 * Convert PHP tags to entities
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function encode_php_tags(string $str): string
-	{
-		return str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $str);
-	}
+if (! function_exists('encode_php_tags')) {
+    /**
+     * Convert PHP tags to entities
+     */
+    function encode_php_tags(string $str): string
+    {
+        return str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $str);
+    }
 }
-
-//--------------------------------------------------------------------
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index e051d9d44eda..e20054ab6893 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -1,48 +1,43 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Model;
 use CodeIgniter\Test\Fabricator;
 
-/**
- * CodeIgniter Test Helpers
- */
-//--------------------------------------------------------------------
+// CodeIgniter Test Helpers
 
-if (! function_exists('fake'))
-{
-	/**
-	 * Creates a single item using Fabricator.
-	 *
-	 * @param Model|object|string $model     Instance or name of the model
-	 * @param array|null          $overrides Overriding data to pass to Fabricator::setOverrides()
-	 *
-	 * @return object|array
-	 */
-	function fake($model, array $overrides = null, $persist = true)
-	{
-		// Get a model-appropriate Fabricator instance
-		$fabricator = new Fabricator($model);
+if (! function_exists('fake')) {
+    /**
+     * Creates a single item using Fabricator.
+     *
+     * @param Model|object|string $model     Instance or name of the model
+     * @param array|null          $overrides Overriding data to pass to Fabricator::setOverrides()
+     * @param mixed               $persist
+     *
+     * @return array|object
+     */
+    function fake($model, ?array $overrides = null, $persist = true)
+    {
+        // Get a model-appropriate Fabricator instance
+        $fabricator = new Fabricator($model);
 
-		// Set overriding data, if necessary
-		if ($overrides)
-		{
-			$fabricator->setOverrides($overrides);
-		}
+        // Set overriding data, if necessary
+        if ($overrides) {
+            $fabricator->setOverrides($overrides);
+        }
 
-		if ($persist)
-		{
-			return $fabricator->create();
-		}
+        if ($persist) {
+            return $fabricator->create();
+        }
 
-		return $fabricator->make();
-	}
+        return $fabricator->make();
+    }
 }
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 0e3baed7e434..5f0738421908 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -1,853 +1,675 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\ForeignCharacters;
 
-/**
- * CodeIgniter Text Helpers
- */
-//--------------------------------------------------------------------
-
-if (! function_exists('word_limiter'))
-{
-	/**
-	 * Word Limiter
-	 *
-	 * Limits a string to X number of words.
-	 *
-	 * @param string  $str
-	 * @param integer $limit
-	 * @param string  $endChar the end character. Usually an ellipsis
-	 *
-	 * @return string
-	 */
-	function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'): string
-	{
-		if (trim($str) === '')
-		{
-			return $str;
-		}
-
-		preg_match('/^\s*+(?:\S++\s*+){1,' . $limit . '}/', $str, $matches);
-
-		if (strlen($str) === strlen($matches[0]))
-		{
-			$endChar = '';
-		}
-
-		return rtrim($matches[0]) . $endChar;
-	}
+// CodeIgniter Text Helpers
+
+if (! function_exists('word_limiter')) {
+    /**
+     * Word Limiter
+     *
+     * Limits a string to X number of words.
+     *
+     * @param string $endChar the end character. Usually an ellipsis
+     */
+    function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'): string
+    {
+        if (trim($str) === '') {
+            return $str;
+        }
+
+        preg_match('/^\s*+(?:\S++\s*+){1,' . $limit . '}/', $str, $matches);
+
+        if (strlen($str) === strlen($matches[0])) {
+            $endChar = '';
+        }
+
+        return rtrim($matches[0]) . $endChar;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('character_limiter'))
-{
-	/**
-	 * Character Limiter
-	 *
-	 * Limits the string based on the character count.  Preserves complete words
-	 * so the character count may not be exactly as specified.
-	 *
-	 * @param string  $str
-	 * @param integer $n
-	 * @param string  $endChar the end character. Usually an ellipsis
-	 *
-	 * @return string
-	 */
-	function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;'): string
-	{
-		if (mb_strlen($str) < $n)
-		{
-			return $str;
-		}
-
-		// a bit complicated, but faster than preg_replace with \s+
-		$str = preg_replace('/ {2,}/', ' ', str_replace(["\r", "\n", "\t", "\x0B", "\x0C"], ' ', $str));
-
-		if (mb_strlen($str) <= $n)
-		{
-			return $str;
-		}
-
-		$out = '';
-
-		foreach (explode(' ', trim($str)) as $val)
-		{
-			$out .= $val . ' ';
-			if (mb_strlen($out) >= $n)
-			{
-				$out = trim($out);
-				break;
-			}
-		}
-		return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $endChar;
-	}
+if (! function_exists('character_limiter')) {
+    /**
+     * Character Limiter
+     *
+     * Limits the string based on the character count.  Preserves complete words
+     * so the character count may not be exactly as specified.
+     *
+     * @param string $endChar the end character. Usually an ellipsis
+     */
+    function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;'): string
+    {
+        if (mb_strlen($str) < $n) {
+            return $str;
+        }
+
+        // a bit complicated, but faster than preg_replace with \s+
+        $str = preg_replace('/ {2,}/', ' ', str_replace(["\r", "\n", "\t", "\x0B", "\x0C"], ' ', $str));
+
+        if (mb_strlen($str) <= $n) {
+            return $str;
+        }
+
+        $out = '';
+
+        foreach (explode(' ', trim($str)) as $val) {
+            $out .= $val . ' ';
+            if (mb_strlen($out) >= $n) {
+                $out = trim($out);
+                break;
+            }
+        }
+
+        return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $endChar;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('ascii_to_entities'))
-{
-	/**
-	 * High ASCII to Entities
-	 *
-	 * Converts high ASCII text and MS Word special characters to character entities
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function ascii_to_entities(string $str): string
-	{
-		$out = '';
-
-		for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i ++)
-		{
-			$ordinal = ord($str[$i]);
-
-			if ($ordinal < 128)
-			{
-				/*
-				  If the $temp array has a value but we have moved on, then it seems only
-				  fair that we output that entity and restart $temp before continuing.
-				 */
-				if (count($temp) === 1)
-				{
-					$out  .= '&#' . array_shift($temp) . ';';
-					$count = 1;
-				}
-
-				$out .= $str[$i];
-			}
-			else
-			{
-				if (empty($temp))
-				{
-					$count = ($ordinal < 224) ? 2 : 3;
-				}
-
-				$temp[] = $ordinal;
-
-				if (count($temp) === $count)
-				{
-					$number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
-					$out   .= '&#' . $number . ';';
-					$count  = 1;
-					$temp   = [];
-				}
-				// If this is the last iteration, just output whatever we have
-				elseif ($i === $s)
-				{
-					$out .= '&#' . implode(';', $temp) . ';';
-				}
-			}
-		}
-
-		return $out;
-	}
+if (! function_exists('ascii_to_entities')) {
+    /**
+     * High ASCII to Entities
+     *
+     * Converts high ASCII text and MS Word special characters to character entities
+     */
+    function ascii_to_entities(string $str): string
+    {
+        $out = '';
+
+        for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i++) {
+            $ordinal = ord($str[$i]);
+
+            if ($ordinal < 128) {
+                /*
+                  If the $temp array has a value but we have moved on, then it seems only
+                  fair that we output that entity and restart $temp before continuing.
+                 */
+                if (count($temp) === 1) {
+                    $out .= '&#' . array_shift($temp) . ';';
+                    $count = 1;
+                }
+
+                $out .= $str[$i];
+            } else {
+                if (empty($temp)) {
+                    $count = ($ordinal < 224) ? 2 : 3;
+                }
+
+                $temp[] = $ordinal;
+
+                if (count($temp) === $count) {
+                    $number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
+                    $out .= '&#' . $number . ';';
+                    $count = 1;
+                    $temp  = [];
+                }
+                // If this is the last iteration, just output whatever we have
+                elseif ($i === $s) {
+                    $out .= '&#' . implode(';', $temp) . ';';
+                }
+            }
+        }
+
+        return $out;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('entities_to_ascii'))
-{
-	/**
-	 * Entities to ASCII
-	 *
-	 * Converts character entities back to ASCII
-	 *
-	 * @param string  $str
-	 * @param boolean $all
-	 *
-	 * @return string
-	 */
-	function entities_to_ascii(string $str, bool $all = true): string
-	{
-		if (preg_match_all('/\&#(\d+)\;/', $str, $matches))
-		{
-			for ($i = 0, $s = count($matches[0]); $i < $s; $i ++)
-			{
-				$digits = $matches[1][$i];
-				$out    = '';
-				if ($digits < 128)
-				{
-					$out .= chr($digits);
-				}
-				elseif ($digits < 2048)
-				{
-					$out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
-				}
-				else
-				{
-					$out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
-							. chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
-							. chr(128 + ($digits % 64));
-				}
-				$str = str_replace($matches[0][$i], $out, $str);
-			}
-		}
-
-		if ($all)
-		{
-			return str_replace([
-				'&amp;',
-				'&lt;',
-				'&gt;',
-				'&quot;',
-				'&apos;',
-				'&#45;',
-			], [
-				'&',
-				'<',
-				'>',
-				'"',
-				"'",
-				'-',
-			], $str
-			);
-		}
-
-		return $str;
-	}
+if (! function_exists('entities_to_ascii')) {
+    /**
+     * Entities to ASCII
+     *
+     * Converts character entities back to ASCII
+     */
+    function entities_to_ascii(string $str, bool $all = true): string
+    {
+        if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) {
+            for ($i = 0, $s = count($matches[0]); $i < $s; $i++) {
+                $digits = $matches[1][$i];
+                $out    = '';
+                if ($digits < 128) {
+                    $out .= chr($digits);
+                } elseif ($digits < 2048) {
+                    $out .= chr(192 + (($digits - ($digits % 64)) / 64)) . chr(128 + ($digits % 64));
+                } else {
+                    $out .= chr(224 + (($digits - ($digits % 4096)) / 4096))
+                            . chr(128 + ((($digits % 4096) - ($digits % 64)) / 64))
+                            . chr(128 + ($digits % 64));
+                }
+                $str = str_replace($matches[0][$i], $out, $str);
+            }
+        }
+
+        if ($all) {
+            return str_replace(
+                ['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#45;'],
+                ['&', '<', '>', '"', "'",  '-'],
+                $str
+            );
+        }
+
+        return $str;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('word_censor'))
-{
-	/**
-	 * Word Censoring Function
-	 *
-	 * Supply a string and an array of disallowed words and any
-	 * matched words will be converted to #### or to the replacement
-	 * word you've submitted.
-	 *
-	 * @param string $str         the text string
-	 * @param array  $censored    the array of censored words
-	 * @param string $replacement the optional replacement value
-	 *
-	 * @return string
-	 */
-	function word_censor(string $str, array $censored, string $replacement = ''): string
-	{
-		if (empty($censored))
-		{
-			return $str;
-		}
-
-		$str = ' ' . $str . ' ';
-
-		// \w, \b and a few others do not match on a unicode character
-		// set for performance reasons. As a result words like über
-		// will not match on a word boundary. Instead, we'll assume that
-		// a bad word will be bookended by any of these characters.
-		$delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]';
-
-		foreach ($censored as $badword)
-		{
-			$badword = str_replace('\*', '\w*?', preg_quote($badword, '/'));
-
-			if ($replacement !== '')
-			{
-				$str = preg_replace(
-						"/({$delim})(" . $badword . ")({$delim})/i", "\\1{$replacement}\\3", $str
-				);
-			}
-			elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE))
-			{
-				$matches = $matches[1];
-
-				for ($i = count($matches) - 1; $i >= 0; $i --)
-				{
-					$length = strlen($matches[$i][0]);
-					$str    = substr_replace(
-							$str, str_repeat('#', $length), $matches[$i][1], $length
-					);
-				}
-			}
-		}
-
-		return trim($str);
-	}
+if (! function_exists('word_censor')) {
+    /**
+     * Word Censoring Function
+     *
+     * Supply a string and an array of disallowed words and any
+     * matched words will be converted to #### or to the replacement
+     * word you've submitted.
+     *
+     * @param string $str         the text string
+     * @param array  $censored    the array of censored words
+     * @param string $replacement the optional replacement value
+     */
+    function word_censor(string $str, array $censored, string $replacement = ''): string
+    {
+        if (empty($censored)) {
+            return $str;
+        }
+
+        $str = ' ' . $str . ' ';
+
+        // \w, \b and a few others do not match on a unicode character
+        // set for performance reasons. As a result words like über
+        // will not match on a word boundary. Instead, we'll assume that
+        // a bad word will be bookended by any of these characters.
+        $delim = '[-_\'\"`(){}<>\[\]|!?@#%&,.:;^~*+=\/ 0-9\n\r\t]';
+
+        foreach ($censored as $badword) {
+            $badword = str_replace('\*', '\w*?', preg_quote($badword, '/'));
+
+            if ($replacement !== '') {
+                $str = preg_replace(
+                    "/({$delim})(" . $badword . ")({$delim})/i",
+                    "\\1{$replacement}\\3",
+                    $str
+                );
+            } elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
+                $matches = $matches[1];
+
+                for ($i = count($matches) - 1; $i >= 0; $i--) {
+                    $length = strlen($matches[$i][0]);
+
+                    $str = substr_replace(
+                        $str,
+                        str_repeat('#', $length),
+                        $matches[$i][1],
+                        $length
+                    );
+                }
+            }
+        }
+
+        return trim($str);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('highlight_code'))
-{
-	/**
-	 * Code Highlighter
-	 *
-	 * Colorizes code strings
-	 *
-	 * @param string $str the text string
-	 *
-	 * @return string
-	 */
-	function highlight_code(string $str): string
-	{
-		/* The highlight string function encodes and highlights
-		 * brackets so we need them to start raw.
-		 *
-		 * Also replace any existing PHP tags to temporary markers
-		 * so they don't accidentally break the string out of PHP,
-		 * and thus, thwart the highlighting.
-		 */
-		$str = str_replace([
-			'&lt;',
-			'&gt;',
-			'<?',
-			'?>',
-			'<%',
-			'%>',
-			'\\',
-			'</script>',
-		], [
-			'<',
-			'>',
-			'phptagopen',
-			'phptagclose',
-			'asptagopen',
-			'asptagclose',
-			'backslashtmp',
-			'scriptclose',
-		], $str
-		);
-
-		// The highlight_string function requires that the text be surrounded
-		// by PHP tags, which we will remove later
-		$str = highlight_string('<?php ' . $str . ' ?>', true);
-
-		// Remove our artificially added PHP, and the syntax highlighting that came with it
-		$str = preg_replace([
-			'/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
-			'/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
-			'/<span style="color: #[A-Z0-9]+"\><\/span>/i',
-		], [
-			'<span style="color: #$1">',
-			"$1</span>\n</span>\n</code>",
-			'',
-		], $str
-		);
-
-		// Replace our markers back to PHP tags.
-		return str_replace([
-			'phptagopen',
-			'phptagclose',
-			'asptagopen',
-			'asptagclose',
-			'backslashtmp',
-			'scriptclose',
-		], [
-			'&lt;?',
-			'?&gt;',
-			'&lt;%',
-			'%&gt;',
-			'\\',
-			'&lt;/script&gt;',
-		], $str
-		);
-	}
+if (! function_exists('highlight_code')) {
+    /**
+     * Code Highlighter
+     *
+     * Colorizes code strings
+     *
+     * @param string $str the text string
+     */
+    function highlight_code(string $str): string
+    {
+        /* The highlight string function encodes and highlights
+         * brackets so we need them to start raw.
+         *
+         * Also replace any existing PHP tags to temporary markers
+         * so they don't accidentally break the string out of PHP,
+         * and thus, thwart the highlighting.
+         */
+        $str = str_replace(
+            ['&lt;', '&gt;', '<?', '?>', '<%', '%>', '\\', '</script>'],
+            ['<', '>', 'phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'],
+            $str
+        );
+
+        // The highlight_string function requires that the text be surrounded
+        // by PHP tags, which we will remove later
+        $str = highlight_string('<?php ' . $str . ' ?>', true);
+
+        // Remove our artificially added PHP, and the syntax highlighting that came with it
+        $str = preg_replace(
+            [
+                '/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
+                '/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
+                '/<span style="color: #[A-Z0-9]+"\><\/span>/i',
+            ],
+            [
+                '<span style="color: #$1">',
+                "$1</span>\n</span>\n</code>",
+                '',
+            ],
+            $str
+        );
+
+        // Replace our markers back to PHP tags.
+        return str_replace(
+            [
+                'phptagopen',
+                'phptagclose',
+                'asptagopen',
+                'asptagclose',
+                'backslashtmp',
+                'scriptclose',
+            ],
+            [
+                '&lt;?',
+                '?&gt;',
+                '&lt;%',
+                '%&gt;',
+                '\\',
+                '&lt;/script&gt;',
+            ],
+            $str
+        );
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('highlight_phrase'))
-{
-	/**
-	 * Phrase Highlighter
-	 *
-	 * Highlights a phrase within a text string
-	 *
-	 * @param string $str      the text string
-	 * @param string $phrase   the phrase you'd like to highlight
-	 * @param string $tagOpen  the opening tag to precede the phrase with
-	 * @param string $tagClose the closing tag to end the phrase with
-	 *
-	 * @return string
-	 */
-	function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>', string $tagClose = '</mark>'): string
-	{
-		return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tagOpen . '\\1' . $tagClose, $str) : $str;
-	}
+if (! function_exists('highlight_phrase')) {
+    /**
+     * Phrase Highlighter
+     *
+     * Highlights a phrase within a text string
+     *
+     * @param string $str      the text string
+     * @param string $phrase   the phrase you'd like to highlight
+     * @param string $tagOpen  the opening tag to precede the phrase with
+     * @param string $tagClose the closing tag to end the phrase with
+     */
+    function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>', string $tagClose = '</mark>'): string
+    {
+        return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tagOpen . '\\1' . $tagClose, $str) : $str;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('convert_accented_characters'))
-{
-	/**
-	 * Convert Accented Foreign Characters to ASCII
-	 *
-	 * @param string $str Input string
-	 *
-	 * @return string
-	 */
-	function convert_accented_characters(string $str): string
-	{
-		static $arrayFrom, $arrayTo;
-
-		if (! is_array($arrayFrom))
-		{
-			$config = new ForeignCharacters();
-
-			if (empty($config->characterList) || ! is_array($config->characterList))
-			{
-				$arrayFrom = [];
-				$arrayTo   = [];
-
-				return $str;
-			}
-			$arrayFrom = array_keys($config->characterList);
-			$arrayTo   = array_values($config->characterList);
-
-			unset($config);
-		}
-
-		return preg_replace($arrayFrom, $arrayTo, $str);
-	}
+if (! function_exists('convert_accented_characters')) {
+    /**
+     * Convert Accented Foreign Characters to ASCII
+     *
+     * @param string $str Input string
+     */
+    function convert_accented_characters(string $str): string
+    {
+        static $arrayFrom, $arrayTo;
+
+        if (! is_array($arrayFrom)) {
+            $config = new ForeignCharacters();
+
+            if (empty($config->characterList) || ! is_array($config->characterList)) {
+                $arrayFrom = [];
+                $arrayTo   = [];
+
+                return $str;
+            }
+            $arrayFrom = array_keys($config->characterList);
+            $arrayTo   = array_values($config->characterList);
+
+            unset($config);
+        }
+
+        return preg_replace($arrayFrom, $arrayTo, $str);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('word_wrap'))
-{
-	/**
-	 * Word Wrap
-	 *
-	 * Wraps text at the specified character. Maintains the integrity of words.
-	 * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor
-	 * will URLs.
-	 *
-	 * @param string  $str     the text string
-	 * @param integer $charlim = 76    the number of characters to wrap at
-	 *
-	 * @return string
-	 */
-	function word_wrap(string $str, int $charlim = 76): string
-	{
-		// Reduce multiple spaces
-		$str = preg_replace('| +|', ' ', $str);
-
-		// Standardize newlines
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-
-		// If the current word is surrounded by {unwrap} tags we'll
-		// strip the entire chunk and replace it with a marker.
-		$unwrap = [];
-
-		if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches))
-		{
-			for ($i = 0, $c = count($matches[0]); $i < $c; $i ++)
-			{
-				$unwrap[] = $matches[1][$i];
-				$str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
-			}
-		}
-
-		// Use PHP's native function to do the initial wordwrap.
-		// We set the cut flag to FALSE so that any individual words that are
-		// too long get left alone. In the next step we'll deal with them.
-		$str = wordwrap($str, $charlim, "\n", false);
-
-		// Split the string into individual lines of text and cycle through them
-		$output = '';
-
-		foreach (explode("\n", $str) as $line)
-		{
-			// Is the line within the allowed character count?
-			// If so we'll join it to the output and continue
-			if (mb_strlen($line) <= $charlim)
-			{
-				$output .= $line . "\n";
-				continue;
-			}
-
-			$temp = '';
-
-			while (mb_strlen($line) > $charlim)
-			{
-				// If the over-length word is a URL we won't wrap it
-				if (preg_match('!\[url.+\]|://|www\.!', $line))
-				{
-					break;
-				}
-				// Trim the word down
-				$temp .= mb_substr($line, 0, $charlim - 1);
-				$line  = mb_substr($line, $charlim - 1);
-			}
-
-			// If $temp contains data it means we had to split up an over-length
-			// word into smaller chunks so we'll add it back to our current line
-			if ($temp !== '')
-			{
-				$output .= $temp . "\n" . $line . "\n";
-			}
-			else
-			{
-				$output .= $line . "\n";
-			}
-		}
-
-		// Put our markers back
-		if (! empty($unwrap))
-		{
-			foreach ($unwrap as $key => $val)
-			{
-				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
-			}
-		}
-
-		// remove any trailing newline
-		$output = rtrim($output);
-
-		return $output;
-	}
+if (! function_exists('word_wrap')) {
+    /**
+     * Word Wrap
+     *
+     * Wraps text at the specified character. Maintains the integrity of words.
+     * Anything placed between {unwrap}{/unwrap} will not be word wrapped, nor
+     * will URLs.
+     *
+     * @param string $str     the text string
+     * @param int    $charlim = 76    the number of characters to wrap at
+     */
+    function word_wrap(string $str, int $charlim = 76): string
+    {
+        // Reduce multiple spaces
+        $str = preg_replace('| +|', ' ', $str);
+
+        // Standardize newlines
+        if (strpos($str, "\r") !== false) {
+            $str = str_replace(["\r\n", "\r"], "\n", $str);
+        }
+
+        // If the current word is surrounded by {unwrap} tags we'll
+        // strip the entire chunk and replace it with a marker.
+        $unwrap = [];
+
+        if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches)) {
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
+                $unwrap[] = $matches[1][$i];
+                $str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
+            }
+        }
+
+        // Use PHP's native function to do the initial wordwrap.
+        // We set the cut flag to FALSE so that any individual words that are
+        // too long get left alone. In the next step we'll deal with them.
+        $str = wordwrap($str, $charlim, "\n", false);
+
+        // Split the string into individual lines of text and cycle through them
+        $output = '';
+
+        foreach (explode("\n", $str) as $line) {
+            // Is the line within the allowed character count?
+            // If so we'll join it to the output and continue
+            if (mb_strlen($line) <= $charlim) {
+                $output .= $line . "\n";
+
+                continue;
+            }
+
+            $temp = '';
+
+            while (mb_strlen($line) > $charlim) {
+                // If the over-length word is a URL we won't wrap it
+                if (preg_match('!\[url.+\]|://|www\.!', $line)) {
+                    break;
+                }
+                // Trim the word down
+                $temp .= mb_substr($line, 0, $charlim - 1);
+                $line = mb_substr($line, $charlim - 1);
+            }
+
+            // If $temp contains data it means we had to split up an over-length
+            // word into smaller chunks so we'll add it back to our current line
+            if ($temp !== '') {
+                $output .= $temp . "\n" . $line . "\n";
+            } else {
+                $output .= $line . "\n";
+            }
+        }
+
+        // Put our markers back
+        foreach ($unwrap as $key => $val) {
+            $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
+        }
+
+        // remove any trailing newline
+        return rtrim($output);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('ellipsize'))
-{
-	/**
-	 * Ellipsize String
-	 *
-	 * This function will strip tags from a string, split it at its max_length and ellipsize
-	 *
-	 * @param string  $str       String to ellipsize
-	 * @param integer $maxLength Max length of string
-	 * @param mixed   $position  int (1|0) or float, .5, .2, etc for position to split
-	 * @param string  $ellipsis  ellipsis ; Default '...'
-	 *
-	 * @return string    Ellipsized string
-	 */
-	function ellipsize(string $str, int $maxLength, $position = 1, string $ellipsis = '&hellip;'): string
-	{
-		// Strip tags
-		$str = trim(strip_tags($str));
-
-		// Is the string long enough to ellipsize?
-		if (mb_strlen($str) <= $maxLength)
-		{
-			return $str;
-		}
-
-		$beg      = mb_substr($str, 0, (int) floor($maxLength * $position));
-		$position = ($position > 1) ? 1 : $position;
-
-		if ($position === 1)
-		{
-			$end = mb_substr($str, 0, -($maxLength - mb_strlen($beg)));
-		}
-		else
-		{
-			$end = mb_substr($str, -($maxLength - mb_strlen($beg)));
-		}
-
-		return $beg . $ellipsis . $end;
-	}
+if (! function_exists('ellipsize')) {
+    /**
+     * Ellipsize String
+     *
+     * This function will strip tags from a string, split it at its max_length and ellipsize
+     *
+     * @param string $str       String to ellipsize
+     * @param int    $maxLength Max length of string
+     * @param mixed  $position  int (1|0) or float, .5, .2, etc for position to split
+     * @param string $ellipsis  ellipsis ; Default '...'
+     *
+     * @return string Ellipsized string
+     */
+    function ellipsize(string $str, int $maxLength, $position = 1, string $ellipsis = '&hellip;'): string
+    {
+        // Strip tags
+        $str = trim(strip_tags($str));
+
+        // Is the string long enough to ellipsize?
+        if (mb_strlen($str) <= $maxLength) {
+            return $str;
+        }
+
+        $beg      = mb_substr($str, 0, (int) floor($maxLength * $position));
+        $position = ($position > 1) ? 1 : $position;
+
+        if ($position === 1) {
+            $end = mb_substr($str, 0, -($maxLength - mb_strlen($beg)));
+        } else {
+            $end = mb_substr($str, -($maxLength - mb_strlen($beg)));
+        }
+
+        return $beg . $ellipsis . $end;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('strip_slashes'))
-{
-	/**
-	 * Strip Slashes
-	 *
-	 * Removes slashes contained in a string or in an array
-	 *
-	 * @param mixed $str string or array
-	 *
-	 * @return mixed  string or array
-	 */
-	function strip_slashes($str)
-	{
-		if (! is_array($str))
-		{
-			return stripslashes($str);
-		}
-		foreach ($str as $key => $val)
-		{
-			$str[$key] = strip_slashes($val);
-		}
-
-		return $str;
-	}
+if (! function_exists('strip_slashes')) {
+    /**
+     * Strip Slashes
+     *
+     * Removes slashes contained in a string or in an array
+     *
+     * @param mixed $str string or array
+     *
+     * @return mixed string or array
+     */
+    function strip_slashes($str)
+    {
+        if (! is_array($str)) {
+            return stripslashes($str);
+        }
+
+        foreach ($str as $key => $val) {
+            $str[$key] = strip_slashes($val);
+        }
+
+        return $str;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('strip_quotes'))
-{
-	/**
-	 * Strip Quotes
-	 *
-	 * Removes single and double quotes from a string
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function strip_quotes(string $str): string
-	{
-		return str_replace(['"', "'"], '', $str);
-	}
+if (! function_exists('strip_quotes')) {
+    /**
+     * Strip Quotes
+     *
+     * Removes single and double quotes from a string
+     */
+    function strip_quotes(string $str): string
+    {
+        return str_replace(['"', "'"], '', $str);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('quotes_to_entities'))
-{
-	/**
-	 * Quotes to Entities
-	 *
-	 * Converts single and double quotes to entities
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function quotes_to_entities(string $str): string
-	{
-		return str_replace(["\'", '"', "'", '"'], ['&#39;', '&quot;', '&#39;', '&quot;'], $str);
-	}
+if (! function_exists('quotes_to_entities')) {
+    /**
+     * Quotes to Entities
+     *
+     * Converts single and double quotes to entities
+     */
+    function quotes_to_entities(string $str): string
+    {
+        return str_replace(["\\'", '"', "'", '"'], ['&#39;', '&quot;', '&#39;', '&quot;'], $str);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('reduce_double_slashes'))
-{
-	/**
-	 * Reduce Double Slashes
-	 *
-	 * Converts double slashes in a string to a single slash,
-	 * except those found in http://
-	 *
-	 * http://www.some-site.com//index.php
-	 *
-	 * becomes:
-	 *
-	 * http://www.some-site.com/index.php
-	 *
-	 * @param string $str
-	 *
-	 * @return string
-	 */
-	function reduce_double_slashes(string $str): string
-	{
-		return preg_replace('#(^|[^:])//+#', '\\1/', $str);
-	}
+if (! function_exists('reduce_double_slashes')) {
+    /**
+     * Reduce Double Slashes
+     *
+     * Converts double slashes in a string to a single slash,
+     * except those found in http://
+     *
+     * http://www.some-site.com//index.php
+     *
+     * becomes:
+     *
+     * http://www.some-site.com/index.php
+     */
+    function reduce_double_slashes(string $str): string
+    {
+        return preg_replace('#(^|[^:])//+#', '\\1/', $str);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('reduce_multiples'))
-{
-	/**
-	 * Reduce Multiples
-	 *
-	 * Reduces multiple instances of a particular character.  Example:
-	 *
-	 * Fred, Bill,, Joe, Jimmy
-	 *
-	 * becomes:
-	 *
-	 * Fred, Bill, Joe, Jimmy
-	 *
-	 * @param string  $str
-	 * @param string  $character the character you wish to reduce
-	 * @param boolean $trim      TRUE/FALSE - whether to trim the character from the beginning/end
-	 *
-	 * @return string
-	 */
-	function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
-	{
-		$str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
-
-		return ($trim) ? trim($str, $character) : $str;
-	}
+if (! function_exists('reduce_multiples')) {
+    /**
+     * Reduce Multiples
+     *
+     * Reduces multiple instances of a particular character.  Example:
+     *
+     * Fred, Bill,, Joe, Jimmy
+     *
+     * becomes:
+     *
+     * Fred, Bill, Joe, Jimmy
+     *
+     * @param string $character the character you wish to reduce
+     * @param bool   $trim      TRUE/FALSE - whether to trim the character from the beginning/end
+     */
+    function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
+    {
+        $str = preg_replace('#' . preg_quote($character, '#') . '{2,}#', $character, $str);
+
+        return ($trim) ? trim($str, $character) : $str;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('random_string'))
-{
-	/**
-	 * Create a Random String
-	 *
-	 * Useful for generating passwords or hashes.
-	 *
-	 * @param string  $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
-	 * @param integer $len  Number of characters
-	 *
-	 * @return string
-	 */
-	function random_string(string $type = 'alnum', int $len = 8): string
-	{
-		switch ($type)
-		{
-			case 'alnum':
-			case 'numeric':
-			case 'nozero':
-			case 'alpha':
-				switch ($type)
-				{
-					case 'alpha':
-						$pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-						break;
-					case 'alnum':
-						$pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-						break;
-					case 'numeric':
-						$pool = '0123456789';
-						break;
-					case 'nozero':
-						$pool = '123456789';
-						break;
-				}
-
-				// @phpstan-ignore-next-line
-				return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
-			case 'md5':
-				return md5(uniqid((string) mt_rand(), true));
-			case 'sha1':
-				return sha1(uniqid((string) mt_rand(), true));
-			case 'crypto':
-				return bin2hex(random_bytes($len / 2));
-		}
-		// 'basic' type treated as default
-		return (string) mt_rand();
-	}
+if (! function_exists('random_string')) {
+    /**
+     * Create a Random String
+     *
+     * Useful for generating passwords or hashes.
+     *
+     * @param string $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
+     * @param int    $len  Number of characters
+     */
+    function random_string(string $type = 'alnum', int $len = 8): string
+    {
+        switch ($type) {
+            case 'alnum':
+            case 'numeric':
+            case 'nozero':
+            case 'alpha':
+                switch ($type) {
+                    case 'alpha':
+                        $pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                        break;
+
+                    case 'alnum':
+                        $pool = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                        break;
+
+                    case 'numeric':
+                        $pool = '0123456789';
+                        break;
+
+                    case 'nozero':
+                        $pool = '123456789';
+                        break;
+                }
+
+                // @phpstan-ignore-next-line
+                return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
+
+            case 'md5':
+                return md5(uniqid((string) mt_rand(), true));
+
+            case 'sha1':
+                return sha1(uniqid((string) mt_rand(), true));
+
+            case 'crypto':
+                return bin2hex(random_bytes($len / 2));
+        }
+        // 'basic' type treated as default
+        return (string) mt_rand();
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('increment_string'))
-{
-	/**
-	 * Add's _1 to a string or increment the ending number to allow _2, _3, etc
-	 *
-	 * @param string  $str       Required
-	 * @param string  $separator What should the duplicate number be appended with
-	 * @param integer $first     Which number should be used for the first dupe increment
-	 *
-	 * @return string
-	 */
-	function increment_string(string $str, string $separator = '_', int $first = 1): string
-	{
-		preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
-
-		return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
-	}
+if (! function_exists('increment_string')) {
+    /**
+     * Add's _1 to a string or increment the ending number to allow _2, _3, etc
+     *
+     * @param string $str       Required
+     * @param string $separator What should the duplicate number be appended with
+     * @param int    $first     Which number should be used for the first dupe increment
+     */
+    function increment_string(string $str, string $separator = '_', int $first = 1): string
+    {
+        preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
+
+        return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('alternator'))
-{
-	/**
-	 * Alternator
-	 *
-	 * Allows strings to be alternated. See docs...
-	 *
-	 * @phpstan-ignore-next-line
-	 * @param                    string (as many parameters as needed)
-	 *
-	 * @return string
-	 */
-	function alternator(): string
-	{
-		static $i;
-
-		if (func_num_args() === 0)
-		{
-			$i = 0;
-
-			return '';
-		}
-
-		$args = func_get_args();
-
-		return $args[($i++ % count($args))];
-	}
+if (! function_exists('alternator')) {
+    /**
+     * Alternator
+     *
+     * Allows strings to be alternated. See docs...
+     *
+     * @param string ...$args (as many parameters as needed)
+     */
+    function alternator(...$args): string
+    {
+        static $i;
+
+        if (func_num_args() === 0) {
+            $i = 0;
+
+            return '';
+        }
+
+        return $args[($i++ % count($args))];
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('excerpt'))
-{
-	/**
-	 * Excerpt.
-	 *
-	 * Allows to extract a piece of text surrounding a word or phrase.
-	 *
-	 * @param string  $text     String to search the phrase
-	 * @param string  $phrase   Phrase that will be searched for.
-	 * @param integer $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.
-	 */
-	function excerpt(string $text, string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
-	{
-		if (isset($phrase))
-		{
-			$phrasePos = stripos($text, $phrase);
-			$phraseLen = strlen($phrase);
-		}
-		else
-		{
-			$phrasePos = $radius / 2;
-			$phraseLen = 1;
-		}
-
-		$pre = explode(' ', substr($text, 0, $phrasePos));
-		$pos = explode(' ', substr($text, $phrasePos + $phraseLen));
-
-		$prev  = ' ';
-		$post  = ' ';
-		$count = 0;
-
-		foreach (array_reverse($pre) as $e)
-		{
-			if ((strlen($e) + $count + 1) < $radius)
-			{
-				$prev = ' ' . $e . $prev;
-			}
-			$count = ++ $count + strlen($e);
-		}
-
-		$count = 0;
-
-		foreach ($pos as $s)
-		{
-			if ((strlen($s) + $count + 1) < $radius)
-			{
-				$post .= $s . ' ';
-			}
-			$count = ++ $count + strlen($s);
-		}
-
-		$ellPre = $phrase ? $ellipsis : '';
-
-		return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
-	}
-
-	//--------------------------------------------------------------------
+if (! function_exists('excerpt')) {
+    /**
+     * Excerpt.
+     *
+     * Allows to extract a piece of text surrounding a word or phrase.
+     *
+     * @param string $text     String to search the phrase
+     * @param string $phrase   Phrase that will be searched for.
+     * @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.
+     */
+    function excerpt(string $text, ?string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
+    {
+        if (isset($phrase)) {
+            $phrasePos = stripos($text, $phrase);
+            $phraseLen = strlen($phrase);
+        } else {
+            $phrasePos = $radius / 2;
+            $phraseLen = 1;
+        }
+
+        $pre = explode(' ', substr($text, 0, $phrasePos));
+        $pos = explode(' ', substr($text, $phrasePos + $phraseLen));
+
+        $prev  = ' ';
+        $post  = ' ';
+        $count = 0;
+
+        foreach (array_reverse($pre) as $e) {
+            if ((strlen($e) + $count + 1) < $radius) {
+                $prev = ' ' . $e . $prev;
+            }
+            $count = ++$count + strlen($e);
+        }
+
+        $count = 0;
+
+        foreach ($pos as $s) {
+            if ((strlen($s) + $count + 1) < $radius) {
+                $post .= $s . ' ';
+            }
+            $count = ++$count + strlen($s);
+        }
+
+        $ellPre = $phrase ? $ellipsis : '';
+
+        return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
+    }
 }
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 2424a98c0291..8d089083eddd 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\HTTP\IncomingRequest;
@@ -15,671 +15,548 @@
 use Config\App;
 use Config\Services;
 
-/**
- * CodeIgniter URL Helpers
- */
-
-if (! function_exists('_get_uri'))
-{
-	/**
-	 * Used by the other URL functions to build a
-	 * framework-specific URI based on the App config.
-	 *
-	 * @internal Outside of the framework this should not be used directly.
-	 *
-	 * @param string   $relativePath May include queries or fragments
-	 * @param App|null $config
-	 *
-	 * @return URI
-	 *
-	 * @throws InvalidArgumentException For invalid paths or config
-	 */
-	function _get_uri(string $relativePath = '', App $config = null): URI
-	{
-		$config = $config ?? config('App');
-
-		if ($config->baseURL === '')
-		{
-			throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
-		}
-
-		// If a full URI was passed then convert it
-		if (is_int(strpos($relativePath, '://')))
-		{
-			$full         = new URI($relativePath);
-			$relativePath = URI::createURIString(null, null, $full->getPath(), $full->getQuery(), $full->getFragment());
-		}
-
-		$relativePath = URI::removeDotSegments($relativePath);
-
-		// Build the full URL based on $config and $relativePath
-		$url = rtrim($config->baseURL, '/ ') . '/';
-
-		// Check for an index page
-		if ($config->indexPage !== '')
-		{
-			$url .= $config->indexPage;
-
-			// Check if we need a separator
-			if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?')
-			{
-				$url .= '/';
-			}
-		}
-
-		$url .= $relativePath;
-
-		$uri = new URI($url);
-
-		// Check if the baseURL scheme needs to be coerced into its secure version
-		if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http')
-		{
-			$uri->setScheme('https');
-		}
-
-		return $uri;
-	}
+// CodeIgniter URL Helpers
+
+if (! function_exists('_get_uri')) {
+    /**
+     * Used by the other URL functions to build a
+     * framework-specific URI based on the App config.
+     *
+     * @internal Outside of the framework this should not be used directly.
+     *
+     * @param string $relativePath May include queries or fragments
+     *
+     * @throws InvalidArgumentException For invalid paths or config
+     */
+    function _get_uri(string $relativePath = '', ?App $config = null): URI
+    {
+        $config = $config ?? config('App');
+
+        if ($config->baseURL === '') {
+            throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
+        }
+
+        // If a full URI was passed then convert it
+        if (is_int(strpos($relativePath, '://'))) {
+            $full         = new URI($relativePath);
+            $relativePath = URI::createURIString(null, null, $full->getPath(), $full->getQuery(), $full->getFragment());
+        }
+
+        $relativePath = URI::removeDotSegments($relativePath);
+
+        // Build the full URL based on $config and $relativePath
+        $url = rtrim($config->baseURL, '/ ') . '/';
+
+        // Check for an index page
+        if ($config->indexPage !== '') {
+            $url .= $config->indexPage;
+
+            // Check if we need a separator
+            if ($relativePath !== '' && $relativePath[0] !== '/' && $relativePath[0] !== '?') {
+                $url .= '/';
+            }
+        }
+
+        $url .= $relativePath;
+
+        $uri = new URI($url);
+
+        // Check if the baseURL scheme needs to be coerced into its secure version
+        if ($config->forceGlobalSecureRequests && $uri->getScheme() === 'http') {
+            $uri->setScheme('https');
+        }
+
+        return $uri;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('site_url'))
-{
-	/**
-	 * Returns a site URL as defined by the App config.
-	 *
-	 * @param mixed       $relativePath URI string or array of URI segments
-	 * @param string|null $scheme
-	 * @param App|null    $config       Alternate configuration to use
-	 *
-	 * @return string
-	 */
-	function site_url($relativePath = '', string $scheme = null, App $config = null): string
-	{
-		// Convert array of segments to a string
-		if (is_array($relativePath))
-		{
-			$relativePath = implode('/', $relativePath);
-		}
-
-		$uri = _get_uri($relativePath, $config);
-
-		return URI::createURIString($scheme ?? $uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
+if (! function_exists('site_url')) {
+    /**
+     * Returns a site URL as defined by the App config.
+     *
+     * @param mixed    $relativePath URI string or array of URI segments
+     * @param App|null $config       Alternate configuration to use
+     */
+    function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string
+    {
+        // Convert array of segments to a string
+        if (is_array($relativePath)) {
+            $relativePath = implode('/', $relativePath);
+        }
+
+        $uri = _get_uri($relativePath, $config);
+
+        return URI::createURIString($scheme ?? $uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('base_url'))
-{
-	/**
-	 * Returns the base URL as defined by the App config.
-	 * Base URLs are trimmed site URLs without the index page.
-	 *
-	 * @param  mixed  $relativePath URI string or array of URI segments
-	 * @param  string $scheme
-	 * @return string
-	 */
-	function base_url($relativePath = '', string $scheme = null): string
-	{
-		$config            = clone config('App');
-		$config->indexPage = '';
-
-		return rtrim(site_url($relativePath, $scheme, $config), '/');
-	}
+if (! function_exists('base_url')) {
+    /**
+     * Returns the base URL as defined by the App config.
+     * Base URLs are trimmed site URLs without the index page.
+     *
+     * @param mixed  $relativePath URI string or array of URI segments
+     * @param string $scheme
+     */
+    function base_url($relativePath = '', ?string $scheme = null): string
+    {
+        $config            = clone config('App');
+        $config->indexPage = '';
+
+        return rtrim(site_url($relativePath, $scheme, $config), '/');
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('current_url'))
-{
-	/**
-	 * Returns the current full URL based on the IncomingRequest.
-	 * String returns ignore query and fragment parts.
-	 *
-	 * @param boolean              $returnObject True to return an object instead of a string
-	 * @param IncomingRequest|null $request      A request to use when retrieving the path
-	 *
-	 * @return string|URI
-	 */
-	function current_url(bool $returnObject = false, IncomingRequest $request = null)
-	{
-		$request = $request ?? Services::request();
-		$path    = $request->getPath();
-
-		// Append queries and fragments
-		if ($query = $request->getUri()->getQuery())
-		{
-			$path .= '?' . $query;
-		}
-		if ($fragment = $request->getUri()->getFragment())
-		{
-			$path .= '#' . $fragment;
-		}
-
-		$uri = _get_uri($path);
-
-		return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
-	}
+if (! function_exists('current_url')) {
+    /**
+     * Returns the current full URL based on the IncomingRequest.
+     * String returns ignore query and fragment parts.
+     *
+     * @param bool                 $returnObject True to return an object instead of a string
+     * @param IncomingRequest|null $request      A request to use when retrieving the path
+     *
+     * @return string|URI
+     */
+    function current_url(bool $returnObject = false, ?IncomingRequest $request = null)
+    {
+        $request = $request ?? Services::request();
+        $path    = $request->getPath();
+
+        // Append queries and fragments
+        if ($query = $request->getUri()->getQuery()) {
+            $path .= '?' . $query;
+        }
+        if ($fragment = $request->getUri()->getFragment()) {
+            $path .= '#' . $fragment;
+        }
+
+        $uri = _get_uri($path);
+
+        return $returnObject ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('previous_url'))
-{
-	/**
-	 * Returns the previous URL the current visitor was on. For security reasons
-	 * we first check in a saved session variable, if it exists, and use that.
-	 * If that's not available, however, we'll use a sanitized url from $_SERVER['HTTP_REFERER']
-	 * which can be set by the user so is untrusted and not set by certain browsers/servers.
-	 *
-	 * @param boolean $returnObject
-	 *
-	 * @return URI|mixed|string
-	 */
-	function previous_url(bool $returnObject = false)
-	{
-		// Grab from the session first, if we have it,
-		// since it's more reliable and safer.
-		// Otherwise, grab a sanitized version from $_SERVER.
-		$referer = $_SESSION['_ci_previous_url'] ?? Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
-
-		$referer = $referer ?? site_url('/');
-
-		return $returnObject ? new URI($referer) : $referer;
-	}
+if (! function_exists('previous_url')) {
+    /**
+     * Returns the previous URL the current visitor was on. For security reasons
+     * we first check in a saved session variable, if it exists, and use that.
+     * If that's not available, however, we'll use a sanitized url from $_SERVER['HTTP_REFERER']
+     * which can be set by the user so is untrusted and not set by certain browsers/servers.
+     *
+     * @return mixed|string|URI
+     */
+    function previous_url(bool $returnObject = false)
+    {
+        // Grab from the session first, if we have it,
+        // since it's more reliable and safer.
+        // Otherwise, grab a sanitized version from $_SERVER.
+        $referer = $_SESSION['_ci_previous_url'] ?? Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
+
+        $referer = $referer ?? site_url('/');
+
+        return $returnObject ? new URI($referer) : $referer;
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('uri_string'))
-{
-	/**
-	 * URL String
-	 *
-	 * Returns the path part of the current URL
-	 *
-	 * @param boolean $relative Whether the resulting path should be relative to baseURL
-	 *
-	 * @return string
-	 */
-	function uri_string(bool $relative = false): string
-	{
-		return $relative
-			? ltrim(Services::request()->getPath(), '/')
-			: Services::request()->getUri()->getPath();
-	}
+if (! function_exists('uri_string')) {
+    /**
+     * URL String
+     *
+     * Returns the path part of the current URL
+     *
+     * @param bool $relative Whether the resulting path should be relative to baseURL
+     */
+    function uri_string(bool $relative = false): string
+    {
+        return $relative
+            ? ltrim(Services::request()->getPath(), '/')
+            : Services::request()->getUri()->getPath();
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('index_page'))
-{
-	/**
-	 * Index page
-	 *
-	 * Returns the "index_page" from your config file
-	 *
-	 * @param  App|null $altConfig Alternate configuration to use
-	 * @return string
-	 */
-	function index_page(App $altConfig = null): string
-	{
-		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(App::class);
-
-		return $config->indexPage;
-	}
+if (! function_exists('index_page')) {
+    /**
+     * Index page
+     *
+     * Returns the "index_page" from your config file
+     *
+     * @param App|null $altConfig Alternate configuration to use
+     */
+    function index_page(?App $altConfig = null): string
+    {
+        // use alternate config if provided, else default one
+        $config = $altConfig ?? config(App::class);
+
+        return $config->indexPage;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('anchor'))
-{
-	/**
-	 * Anchor Link
-	 *
-	 * Creates an anchor based on the local URL.
-	 *
-	 * @param mixed    $uri        URI string or array of URI segments
-	 * @param string   $title      The link title
-	 * @param mixed    $attributes Any attributes
-	 * @param App|null $altConfig  Alternate configuration to use
-	 *
-	 * @return string
-	 */
-	function anchor($uri = '', string $title = '', $attributes = '', App $altConfig = null): string
-	{
-		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(App::class);
-
-		$siteUrl = is_array($uri) ? site_url($uri, null, $config) : (preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config));
-		// eliminate trailing slash
-		$siteUrl = rtrim($siteUrl, '/');
-
-		if ($title === '')
-		{
-			$title = $siteUrl;
-		}
-
-		if ($attributes !== '')
-		{
-			$attributes = stringify_attributes($attributes);
-		}
-
-		return '<a href="' . $siteUrl . '"' . $attributes . '>' . $title . '</a>';
-	}
+if (! function_exists('anchor')) {
+    /**
+     * Anchor Link
+     *
+     * Creates an anchor based on the local URL.
+     *
+     * @param mixed    $uri        URI string or array of URI segments
+     * @param string   $title      The link title
+     * @param mixed    $attributes Any attributes
+     * @param App|null $altConfig  Alternate configuration to use
+     */
+    function anchor($uri = '', string $title = '', $attributes = '', ?App $altConfig = null): string
+    {
+        // use alternate config if provided, else default one
+        $config = $altConfig ?? config(App::class);
+
+        $siteUrl = is_array($uri) ? site_url($uri, null, $config) : (preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config));
+        // eliminate trailing slash
+        $siteUrl = rtrim($siteUrl, '/');
+
+        if ($title === '') {
+            $title = $siteUrl;
+        }
+
+        if ($attributes !== '') {
+            $attributes = stringify_attributes($attributes);
+        }
+
+        return '<a href="' . $siteUrl . '"' . $attributes . '>' . $title . '</a>';
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('anchor_popup'))
-{
-	/**
-	 * Anchor Link - Pop-up version
-	 *
-	 * Creates an anchor based on the local URL. The link
-	 * opens a new window based on the attributes specified.
-	 *
-	 * @param string   $uri        the URL
-	 * @param string   $title      the link title
-	 * @param mixed    $attributes any attributes
-	 * @param App|null $altConfig  Alternate configuration to use
-	 *
-	 * @return string
-	 */
-	function anchor_popup($uri = '', string $title = '', $attributes = false, App $altConfig = null): string
-	{
-		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(App::class);
-
-		$siteUrl = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config);
-		$siteUrl = rtrim($siteUrl, '/');
-
-		if ($title === '')
-		{
-			$title = $siteUrl;
-		}
-
-		if ($attributes === false)
-		{
-			return '<a href="' . $siteUrl . '" onclick="window.open(\'' . $siteUrl . "', '_blank'); return false;\">" . $title . '</a>';
-		}
-
-		if (! is_array($attributes))
-		{
-			$attributes = [$attributes];
-
-			// Ref: http://www.w3schools.com/jsref/met_win_open.asp
-			$windowName = '_blank';
-		}
-		elseif (! empty($attributes['window_name']))
-		{
-			$windowName = $attributes['window_name'];
-			unset($attributes['window_name']);
-		}
-		else
-		{
-			$windowName = '_blank';
-		}
-
-		foreach (['width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'menubar' => 'no', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0'] as $key => $val)
-		{
-			$atts[$key] = $attributes[$key] ?? $val;
-			unset($attributes[$key]);
-		}
-
-		$attributes = stringify_attributes($attributes);
-
-		return '<a href="' . $siteUrl
-				. '" onclick="window.open(\'' . $siteUrl . "', '" . $windowName . "', '" . stringify_attributes($atts, true) . "'); return false;\""
-				. $attributes . '>' . $title . '</a>';
-	}
+if (! function_exists('anchor_popup')) {
+    /**
+     * Anchor Link - Pop-up version
+     *
+     * Creates an anchor based on the local URL. The link
+     * opens a new window based on the attributes specified.
+     *
+     * @param string   $uri        the URL
+     * @param string   $title      the link title
+     * @param mixed    $attributes any attributes
+     * @param App|null $altConfig  Alternate configuration to use
+     */
+    function anchor_popup($uri = '', string $title = '', $attributes = false, ?App $altConfig = null): string
+    {
+        // use alternate config if provided, else default one
+        $config = $altConfig ?? config(App::class);
+
+        $siteUrl = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config);
+        $siteUrl = rtrim($siteUrl, '/');
+
+        if ($title === '') {
+            $title = $siteUrl;
+        }
+
+        if ($attributes === false) {
+            return '<a href="' . $siteUrl . '" onclick="window.open(\'' . $siteUrl . "', '_blank'); return false;\">" . $title . '</a>';
+        }
+
+        if (! is_array($attributes)) {
+            $attributes = [$attributes];
+
+            // Ref: http://www.w3schools.com/jsref/met_win_open.asp
+            $windowName = '_blank';
+        } elseif (! empty($attributes['window_name'])) {
+            $windowName = $attributes['window_name'];
+            unset($attributes['window_name']);
+        } else {
+            $windowName = '_blank';
+        }
+
+        foreach (['width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'menubar' => 'no', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0'] as $key => $val) {
+            $atts[$key] = $attributes[$key] ?? $val;
+            unset($attributes[$key]);
+        }
+
+        $attributes = stringify_attributes($attributes);
+
+        return '<a href="' . $siteUrl
+                . '" onclick="window.open(\'' . $siteUrl . "', '" . $windowName . "', '" . stringify_attributes($atts, true) . "'); return false;\""
+                . $attributes . '>' . $title . '</a>';
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('mailto'))
-{
-	/**
-	 * Mailto Link
-	 *
-	 * @param string $email      the email address
-	 * @param string $title      the link title
-	 * @param mixed  $attributes any attributes
-	 *
-	 * @return string
-	 */
-	function mailto(string $email, string $title = '', $attributes = ''): string
-	{
-		if (trim($title) === '')
-		{
-			$title = $email;
-		}
-
-		return '<a href="mailto:' . $email . '"' . stringify_attributes($attributes) . '>' . $title . '</a>';
-	}
+if (! function_exists('mailto')) {
+    /**
+     * Mailto Link
+     *
+     * @param string $email      the email address
+     * @param string $title      the link title
+     * @param mixed  $attributes any attributes
+     */
+    function mailto(string $email, string $title = '', $attributes = ''): string
+    {
+        if (trim($title) === '') {
+            $title = $email;
+        }
+
+        return '<a href="mailto:' . $email . '"' . stringify_attributes($attributes) . '>' . $title . '</a>';
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('safe_mailto'))
-{
-	/**
-	 * Encoded Mailto Link
-	 *
-	 * Create a spam-protected mailto link written in Javascript
-	 *
-	 * @param string $email      the email address
-	 * @param string $title      the link title
-	 * @param mixed  $attributes any attributes
-	 *
-	 * @return string
-	 */
-	function safe_mailto(string $email, string $title = '', $attributes = ''): string
-	{
-		if (trim($title) === '')
-		{
-			$title = $email;
-		}
-
-		$x = str_split('<a href="mailto:', 1);
-
-		for ($i = 0, $l = strlen($email); $i < $l; $i ++)
-		{
-			$x[] = '|' . ord($email[$i]);
-		}
-
-		$x[] = '"';
-
-		if ($attributes !== '')
-		{
-			if (is_array($attributes))
-			{
-				foreach ($attributes as $key => $val)
-				{
-					$x[] = ' ' . $key . '="';
-					for ($i = 0, $l = strlen($val); $i < $l; $i ++)
-					{
-						$x[] = '|' . ord($val[$i]);
-					}
-					$x[] = '"';
-				}
-			}
-			else
-			{
-				for ($i = 0, $l = mb_strlen($attributes); $i < $l; $i ++)
-				{
-					$x[] = mb_substr($attributes, $i, 1);
-				}
-			}
-		}
-
-		$x[] = '>';
-
-		$temp = [];
-		for ($i = 0, $l = strlen($title); $i < $l; $i ++)
-		{
-			$ordinal = ord($title[$i]);
-
-			if ($ordinal < 128)
-			{
-				$x[] = '|' . $ordinal;
-			}
-			else
-			{
-				if (empty($temp))
-				{
-					$count = ($ordinal < 224) ? 2 : 3;
-				}
-
-				$temp[] = $ordinal;
-				if (count($temp) === $count) // @phpstan-ignore-line
-				{
-					$number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
-					$x[]    = '|' . $number;
-					$count  = 1;
-					$temp   = [];
-				}
-			}
-		}
-
-		$x[] = '<';
-		$x[] = '/';
-		$x[] = 'a';
-		$x[] = '>';
-
-		$x = array_reverse($x);
-
-		// improve obfuscation by eliminating newlines & whitespace
-		$output = '<script type="text/javascript">'
-				. 'var l=new Array();';
-
-		foreach ($x as $i => $value)
-		{
-			$output .= 'l[' . $i . "] = '" . $value . "';";
-		}
-
-		return $output . ('for (var i = l.length-1; i >= 0; i=i-1) {'
-				. "if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");"
-				. 'else document.write(unescape(l[i]));'
-				. '}'
-				. '</script>');
-	}
+if (! function_exists('safe_mailto')) {
+    /**
+     * Encoded Mailto Link
+     *
+     * Create a spam-protected mailto link written in Javascript
+     *
+     * @param string $email      the email address
+     * @param string $title      the link title
+     * @param mixed  $attributes any attributes
+     */
+    function safe_mailto(string $email, string $title = '', $attributes = ''): string
+    {
+        if (trim($title) === '') {
+            $title = $email;
+        }
+
+        $x = str_split('<a href="mailto:', 1);
+
+        for ($i = 0, $l = strlen($email); $i < $l; $i++) {
+            $x[] = '|' . ord($email[$i]);
+        }
+
+        $x[] = '"';
+
+        if ($attributes !== '') {
+            if (is_array($attributes)) {
+                foreach ($attributes as $key => $val) {
+                    $x[] = ' ' . $key . '="';
+
+                    for ($i = 0, $l = strlen($val); $i < $l; $i++) {
+                        $x[] = '|' . ord($val[$i]);
+                    }
+
+                    $x[] = '"';
+                }
+            } else {
+                for ($i = 0, $l = mb_strlen($attributes); $i < $l; $i++) {
+                    $x[] = mb_substr($attributes, $i, 1);
+                }
+            }
+        }
+
+        $x[] = '>';
+
+        $temp = [];
+
+        for ($i = 0, $l = strlen($title); $i < $l; $i++) {
+            $ordinal = ord($title[$i]);
+
+            if ($ordinal < 128) {
+                $x[] = '|' . $ordinal;
+            } else {
+                if (empty($temp)) {
+                    $count = ($ordinal < 224) ? 2 : 3;
+                }
+
+                $temp[] = $ordinal;
+
+                if (count($temp) === $count) { // @phpstan-ignore-line
+                    $number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
+                    $x[]    = '|' . $number;
+                    $count  = 1;
+                    $temp   = [];
+                }
+            }
+        }
+
+        $x[] = '<';
+        $x[] = '/';
+        $x[] = 'a';
+        $x[] = '>';
+
+        $x = array_reverse($x);
+
+        // improve obfuscation by eliminating newlines & whitespace
+        $output = '<script type="text/javascript">'
+                . 'var l=new Array();';
+
+        foreach ($x as $i => $value) {
+            $output .= 'l[' . $i . "] = '" . $value . "';";
+        }
+
+        return $output . ('for (var i = l.length-1; i >= 0; i=i-1) {'
+                . "if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");"
+                . 'else document.write(unescape(l[i]));'
+                . '}'
+                . '</script>');
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('auto_link'))
-{
-	/**
-	 * Auto-linker
-	 *
-	 * Automatically links URL and Email addresses.
-	 * Note: There's a bit of extra code here to deal with
-	 * URLs or emails that end in a period. We'll strip these
-	 * off and add them after the link.
-	 *
-	 * @param string  $str   the string
-	 * @param string  $type  the type: email, url, or both
-	 * @param boolean $popup whether to create pop-up links
-	 *
-	 * @return string
-	 */
-	function auto_link(string $str, string $type = 'both', bool $popup = false): string
-	{
-		// Find and replace any URLs.
-		if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER))
-		{
-			// Set our target HTML if using popup links.
-			$target = ($popup) ? ' target="_blank"' : '';
-
-			// We process the links in reverse order (last -> first) so that
-			// the returned string offsets from preg_match_all() are not
-			// moved as we add more HTML.
-			foreach (array_reverse($matches) as $match)
-			{
-				// $match[0] is the matched string/link
-				// $match[1] is either a protocol prefix or 'www.'
-				//
-				// With PREG_OFFSET_CAPTURE, both of the above is an array,
-				// where the actual value is held in [0] and its offset at the [1] index.
-				$a   = '<a href="' . (strpos($match[1][0], '/') ? '' : 'http://') . $match[0][0] . '"' . $target . '>' . $match[0][0] . '</a>';
-				$str = substr_replace($str, $a, $match[0][1], strlen($match[0][0]));
-			}
-		}
-
-		// Find and replace any emails.
-		if ($type !== 'url' && preg_match_all('#([\w\.\-\+]+@[a-z0-9\-]+\.[a-z0-9\-\.]+[^[:punct:]\s])#i', $str, $matches, PREG_OFFSET_CAPTURE))
-		{
-			foreach (array_reverse($matches[0]) as $match)
-			{
-				if (filter_var($match[0], FILTER_VALIDATE_EMAIL) !== false)
-				{
-					$str = substr_replace($str, safe_mailto($match[0]), $match[1], strlen($match[0]));
-				}
-			}
-		}
-
-		return $str;
-	}
+if (! function_exists('auto_link')) {
+    /**
+     * Auto-linker
+     *
+     * Automatically links URL and Email addresses.
+     * Note: There's a bit of extra code here to deal with
+     * URLs or emails that end in a period. We'll strip these
+     * off and add them after the link.
+     *
+     * @param string $str   the string
+     * @param string $type  the type: email, url, or both
+     * @param bool   $popup whether to create pop-up links
+     */
+    function auto_link(string $str, string $type = 'both', bool $popup = false): string
+    {
+        // Find and replace any URLs.
+        if ($type !== 'email' && preg_match_all('#(\w*://|www\.)[^\s()<>;]+\w#i', $str, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
+            // Set our target HTML if using popup links.
+            $target = ($popup) ? ' target="_blank"' : '';
+
+            // We process the links in reverse order (last -> first) so that
+            // the returned string offsets from preg_match_all() are not
+            // moved as we add more HTML.
+            foreach (array_reverse($matches) as $match) {
+                // $match[0] is the matched string/link
+                // $match[1] is either a protocol prefix or 'www.'
+                //
+                // With PREG_OFFSET_CAPTURE, both of the above is an array,
+                // where the actual value is held in [0] and its offset at the [1] index.
+                $a   = '<a href="' . (strpos($match[1][0], '/') ? '' : 'http://') . $match[0][0] . '"' . $target . '>' . $match[0][0] . '</a>';
+                $str = substr_replace($str, $a, $match[0][1], strlen($match[0][0]));
+            }
+        }
+
+        // Find and replace any emails.
+        if ($type !== 'url' && preg_match_all('#([\w\.\-\+]+@[a-z0-9\-]+\.[a-z0-9\-\.]+[^[:punct:]\s])#i', $str, $matches, PREG_OFFSET_CAPTURE)) {
+            foreach (array_reverse($matches[0]) as $match) {
+                if (filter_var($match[0], FILTER_VALIDATE_EMAIL) !== false) {
+                    $str = substr_replace($str, safe_mailto($match[0]), $match[1], strlen($match[0]));
+                }
+            }
+        }
+
+        return $str;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('prep_url'))
-{
-	/**
-	 * Prep URL - Simply adds the http:// or https:// part if no scheme is included.
-	 *
-	 * Formerly used URI, but that does not play nicely with URIs missing
-	 * the scheme.
-	 *
-	 * @param  string  $str    the URL
-	 * @param  boolean $secure set true if you want to force https://
-	 * @return string
-	 */
-	function prep_url(string $str = '', bool $secure = false): string
-	{
-		if (in_array($str, ['http://', 'https://', '//', ''], true))
-		{
-			return '';
-		}
-
-		if (parse_url($str, PHP_URL_SCHEME) === null)
-		{
-			$str = 'http://' . ltrim($str, '/');
-		}
-
-		// force replace http:// with https://
-		if ($secure)
-		{
-			$str = preg_replace('/^(?:http):/i', 'https:', $str);
-		}
-
-		return $str;
-	}
+if (! function_exists('prep_url')) {
+    /**
+     * Prep URL - Simply adds the http:// or https:// part if no scheme is included.
+     *
+     * Formerly used URI, but that does not play nicely with URIs missing
+     * the scheme.
+     *
+     * @param string $str    the URL
+     * @param bool   $secure set true if you want to force https://
+     */
+    function prep_url(string $str = '', bool $secure = false): string
+    {
+        if (in_array($str, ['http://', 'https://', '//', ''], true)) {
+            return '';
+        }
+
+        if (parse_url($str, PHP_URL_SCHEME) === null) {
+            $str = 'http://' . ltrim($str, '/');
+        }
+
+        // force replace http:// with https://
+        if ($secure) {
+            $str = preg_replace('/^(?:http):/i', 'https:', $str);
+        }
+
+        return $str;
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('url_title'))
-{
-	/**
-	 * Create URL Title
-	 *
-	 * Takes a "title" string as input and creates a
-	 * human-friendly URL string with a "separator" string
-	 * as the word separator.
-	 *
-	 * @param  string  $str       Input string
-	 * @param  string  $separator Word separator (usually '-' or '_')
-	 * @param  boolean $lowercase Whether to transform the output string to lowercase
-	 * @return string
-	 */
-	function url_title(string $str, string $separator = '-', bool $lowercase = false): string
-	{
-		$qSeparator = preg_quote($separator, '#');
-
-		$trans = [
-			'&.+?;'                  => '',
-			'[^\w\d\pL\pM _-]'       => '',
-			'\s+'                    => $separator,
-			'(' . $qSeparator . ')+' => $separator,
-		];
-
-		$str = strip_tags($str);
-		foreach ($trans as $key => $val)
-		{
-			$str = preg_replace('#' . $key . '#iu', $val, $str);
-		}
-
-		if ($lowercase === true)
-		{
-			$str = mb_strtolower($str);
-		}
-
-		return trim(trim($str, $separator));
-	}
+if (! function_exists('url_title')) {
+    /**
+     * Create URL Title
+     *
+     * Takes a "title" string as input and creates a
+     * human-friendly URL string with a "separator" string
+     * as the word separator.
+     *
+     * @param string $str       Input string
+     * @param string $separator Word separator (usually '-' or '_')
+     * @param bool   $lowercase Whether to transform the output string to lowercase
+     */
+    function url_title(string $str, string $separator = '-', bool $lowercase = false): string
+    {
+        $qSeparator = preg_quote($separator, '#');
+
+        $trans = [
+            '&.+?;'                  => '',
+            '[^\w\d\pL\pM _-]'       => '',
+            '\s+'                    => $separator,
+            '(' . $qSeparator . ')+' => $separator,
+        ];
+
+        $str = strip_tags($str);
+
+        foreach ($trans as $key => $val) {
+            $str = preg_replace('#' . $key . '#iu', $val, $str);
+        }
+
+        if ($lowercase === true) {
+            $str = mb_strtolower($str);
+        }
+
+        return trim(trim($str, $separator));
+    }
 }
 
-// ------------------------------------------------------------------------
-
-if (! function_exists('mb_url_title'))
-{
-	/**
-	 * Create URL Title that takes into account accented characters
-	 *
-	 * Takes a "title" string as input and creates a
-	 * human-friendly URL string with a "separator" string
-	 * as the word separator.
-	 *
-	 * @param  string  $str       Input string
-	 * @param  string  $separator Word separator (usually '-' or '_')
-	 * @param  boolean $lowercase Whether to transform the output string to lowercase
-	 * @return string
-	 */
-	function mb_url_title(string $str, string $separator = '-', bool $lowercase = false): string
-	{
-		helper('text');
-
-		return url_title(convert_accented_characters($str), $separator, $lowercase);
-	}
+if (! function_exists('mb_url_title')) {
+    /**
+     * Create URL Title that takes into account accented characters
+     *
+     * Takes a "title" string as input and creates a
+     * human-friendly URL string with a "separator" string
+     * as the word separator.
+     *
+     * @param string $str       Input string
+     * @param string $separator Word separator (usually '-' or '_')
+     * @param bool   $lowercase Whether to transform the output string to lowercase
+     */
+    function mb_url_title(string $str, string $separator = '-', bool $lowercase = false): string
+    {
+        helper('text');
+
+        return url_title(convert_accented_characters($str), $separator, $lowercase);
+    }
 }
 
-//--------------------------------------------------------------------
-
-if (! function_exists('url_to'))
-{
-	/**
-	 * Get the full, absolute URL to a controller method
-	 * (with additional arguments)
-	 *
-	 * @param string $controller
-	 * @param mixed  ...$args
-	 *
-	 * @throws RouterException
-	 *
-	 * @return string
-	 */
-	function url_to(string $controller, ...$args): string
-	{
-		if (! $route = route_to($controller, ...$args))
-		{
-			$explode = explode('::', $controller);
-
-			if (isset($explode[1]))
-			{
-				throw RouterException::forControllerNotFound($explode[0], $explode[1]);
-			}
-
-			throw RouterException::forInvalidRoute($controller);
-		}
-
-		return site_url($route);
-	}
+if (! function_exists('url_to')) {
+    /**
+     * Get the full, absolute URL to a controller method
+     * (with additional arguments)
+     *
+     * @param mixed ...$args
+     *
+     * @throws RouterException
+     */
+    function url_to(string $controller, ...$args): string
+    {
+        if (! $route = route_to($controller, ...$args)) {
+            $explode = explode('::', $controller);
+
+            if (isset($explode[1])) {
+                throw RouterException::forControllerNotFound($explode[0], $explode[1]);
+            }
+
+            throw RouterException::forInvalidRoute($controller);
+        }
+
+        return site_url($route);
+    }
 }
 
-if (! function_exists('url_is'))
-{
-	/**
-	 * Determines if current url path contains
-	 * the given path. It may contain a wildcard (*)
-	 * which will allow any valid character.
-	 *
-	 * Example:
-	 *   if (url_is('admin*)) ...
-	 *
-	 * @param string $path
-	 *
-	 * @return boolean
-	 */
-	function url_is(string $path): bool
-	{
-		// Setup our regex to allow wildcards
-		$path        = '/' . trim(str_replace('*', '(\S)*', $path), '/ ');
-		$currentPath = '/' . trim(uri_string(true), '/ ');
-
-		return (bool) preg_match("|^{$path}$|", $currentPath, $matches);
-	}
+if (! function_exists('url_is')) {
+    /**
+     * Determines if current url path contains
+     * the given path. It may contain a wildcard (*)
+     * which will allow any valid character.
+     *
+     * Example:
+     *   if (url_is('admin*)) ...
+     */
+    function url_is(string $path): bool
+    {
+        // Setup our regex to allow wildcards
+        $path        = '/' . trim(str_replace('*', '(\S)*', $path), '/ ');
+        $currentPath = '/' . trim(uri_string(true), '/ ');
+
+        return (bool) preg_match("|^{$path}$|", $currentPath, $matches);
+    }
 }
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
index 4f42bb395b88..ece282013721 100644
--- a/system/Helpers/xml_helper.php
+++ b/system/Helpers/xml_helper.php
@@ -1,68 +1,59 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter XML Helpers
- */
-
-if (! function_exists('xml_convert'))
-{
-	/**
-	 * Convert Reserved XML characters to Entities
-	 *
-	 * @param  string  $str
-	 * @param  boolean $protectAll
-	 * @return string
-	 */
-	function xml_convert(string $str, bool $protectAll = false): string
-	{
-		$temp = '__TEMP_AMPERSANDS__';
-
-		// Replace entities to temporary markers so that
-		// ampersands won't get messed up
-		$str = preg_replace('/&#(\d+);/', $temp . '\\1;', $str);
-
-		if ($protectAll === true)
-		{
-			$str = preg_replace('/&(\w+);/', $temp . '\\1;', $str);
-		}
-
-		$original = [
-			'&',
-			'<',
-			'>',
-			'"',
-			"'",
-			'-',
-		];
-
-		$replacement = [
-			'&amp;',
-			'&lt;',
-			'&gt;',
-			'&quot;',
-			'&apos;',
-			'&#45;',
-		];
-
-		$str = str_replace($original, $replacement, $str);
-
-		// Decode the temp markers back to entities
-		$str = preg_replace('/' . $temp . '(\d+);/', '&#\\1;', $str);
-
-		if ($protectAll === true)
-		{
-			return preg_replace('/' . $temp . '(\w+);/', '&\\1;', $str);
-		}
-
-		return $str;
-	}
+// CodeIgniter XML Helpers
+
+if (! function_exists('xml_convert')) {
+    /**
+     * Convert Reserved XML characters to Entities
+     */
+    function xml_convert(string $str, bool $protectAll = false): string
+    {
+        $temp = '__TEMP_AMPERSANDS__';
+
+        // Replace entities to temporary markers so that
+        // ampersands won't get messed up
+        $str = preg_replace('/&#(\d+);/', $temp . '\\1;', $str);
+
+        if ($protectAll === true) {
+            $str = preg_replace('/&(\w+);/', $temp . '\\1;', $str);
+        }
+
+        $original = [
+            '&',
+            '<',
+            '>',
+            '"',
+            "'",
+            '-',
+        ];
+
+        $replacement = [
+            '&amp;',
+            '&lt;',
+            '&gt;',
+            '&quot;',
+            '&apos;',
+            '&#45;',
+        ];
+
+        $str = str_replace($original, $replacement, $str);
+
+        // Decode the temp markers back to entities
+        $str = preg_replace('/' . $temp . '(\d+);/', '&#\\1;', $str);
+
+        if ($protectAll === true) {
+            return preg_replace('/' . $temp . '(\w+);/', '&\\1;', $str);
+        }
+
+        return $str;
+    }
 }
diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php
index 6e63690025fa..8d8510eca8fa 100644
--- a/system/Honeypot/Exceptions/HoneypotException.php
+++ b/system/Honeypot/Exceptions/HoneypotException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Honeypot\Exceptions;
@@ -16,23 +16,23 @@
 
 class HoneypotException extends ConfigException implements ExceptionInterface
 {
-	public static function forNoTemplate()
-	{
-		return new static(lang('Honeypot.noTemplate'));
-	}
+    public static function forNoTemplate()
+    {
+        return new static(lang('Honeypot.noTemplate'));
+    }
 
-	public static function forNoNameField()
-	{
-		return new static(lang('Honeypot.noNameField'));
-	}
+    public static function forNoNameField()
+    {
+        return new static(lang('Honeypot.noNameField'));
+    }
 
-	public static function forNoHiddenValue()
-	{
-		return new static(lang('Honeypot.noHiddenValue'));
-	}
+    public static function forNoHiddenValue()
+    {
+        return new static(lang('Honeypot.noHiddenValue'));
+    }
 
-	public static function isBot()
-	{
-		return new static(lang('Honeypot.theClientIsABot'));
-	}
+    public static function isBot()
+    {
+        return new static(lang('Honeypot.theClientIsABot'));
+    }
 }
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index bc0068a67111..178f56621618 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Honeypot;
@@ -21,89 +21,72 @@
  */
 class Honeypot
 {
-	/**
-	 * Our configuration.
-	 *
-	 * @var HoneypotConfig
-	 */
-	protected $config;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param  HoneypotConfig $config
-	 * @throws HoneypotException
-	 */
-	public function __construct(HoneypotConfig $config)
-	{
-		$this->config = $config;
-
-		if (! $this->config->hidden)
-		{
-			throw HoneypotException::forNoHiddenValue();
-		}
-
-		if (empty($this->config->container) || strpos($this->config->container, '{template}') === false)
-		{
-			$this->config->container = '<div style="display:none">{template}</div>';
-		}
-
-		if ($this->config->template === '')
-		{
-			throw HoneypotException::forNoTemplate();
-		}
-
-		if ($this->config->name === '')
-		{
-			throw HoneypotException::forNoNameField();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks the request if honeypot field has data.
-	 *
-	 * @param RequestInterface $request
-	 */
-	public function hasContent(RequestInterface $request)
-	{
-		return ! empty($request->getPost($this->config->name));
-	}
-
-	/**
-	 * Attaches Honeypot template to response.
-	 *
-	 * @param ResponseInterface $response
-	 */
-	public function attachHoneypot(ResponseInterface $response)
-	{
-		$prepField = $this->prepareTemplate($this->config->template);
-
-		$body = $response->getBody();
-		$body = str_ireplace('</form>', $prepField . '</form>', $body);
-		$response->setBody($body);
-	}
-
-	/**
-	 * Prepares the template by adding label
-	 * content and field name.
-	 *
-	 * @param  string $template
-	 * @return string
-	 */
-	protected function prepareTemplate(string $template): string
-	{
-		$template = str_ireplace('{label}', $this->config->label, $template);
-		$template = str_ireplace('{name}', $this->config->name, $template);
-
-		if ($this->config->hidden)
-		{
-			$template = str_ireplace('{template}', $template, $this->config->container);
-		}
-
-		return $template;
-	}
+    /**
+     * Our configuration.
+     *
+     * @var HoneypotConfig
+     */
+    protected $config;
+
+    /**
+     * Constructor.
+     *
+     * @throws HoneypotException
+     */
+    public function __construct(HoneypotConfig $config)
+    {
+        $this->config = $config;
+
+        if (! $this->config->hidden) {
+            throw HoneypotException::forNoHiddenValue();
+        }
+
+        if (empty($this->config->container) || strpos($this->config->container, '{template}') === false) {
+            $this->config->container = '<div style="display:none">{template}</div>';
+        }
+
+        if ($this->config->template === '') {
+            throw HoneypotException::forNoTemplate();
+        }
+
+        if ($this->config->name === '') {
+            throw HoneypotException::forNoNameField();
+        }
+    }
+
+    /**
+     * Checks the request if honeypot field has data.
+     */
+    public function hasContent(RequestInterface $request)
+    {
+        return ! empty($request->getPost($this->config->name));
+    }
+
+    /**
+     * Attaches Honeypot template to response.
+     */
+    public function attachHoneypot(ResponseInterface $response)
+    {
+        $prepField = $this->prepareTemplate($this->config->template);
+
+        $body = $response->getBody();
+        $body = str_ireplace('</form>', $prepField . '</form>', $body);
+        $response->setBody($body);
+    }
+
+    /**
+     * Prepares the template by adding label
+     * content and field name.
+     */
+    protected function prepareTemplate(string $template): string
+    {
+        $template = str_ireplace('{label}', $this->config->label, $template);
+        $template = str_ireplace('{name}', $this->config->name, $template);
+
+        if ($this->config->hidden) {
+            $template = str_ireplace('{template}', $template, $this->config->container);
+        }
+
+        return $template;
+    }
 }
diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php
index 8ccaf8baa743..a0af50782889 100644
--- a/system/I18n/Exceptions/I18nException.php
+++ b/system/I18n/Exceptions/I18nException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n\Exceptions;
@@ -18,95 +18,80 @@
  */
 class I18nException extends FrameworkException
 {
-	/**
-	 * Thrown when createFromFormat fails to receive a valid
-	 * DateTime back from DateTime::createFromFormat.
-	 *
-	 * @param string $format
-	 *
-	 * @return static
-	 */
-	public static function forInvalidFormat(string $format)
-	{
-		return new static(lang('Time.invalidFormat', [$format]));
-	}
+    /**
+     * Thrown when createFromFormat fails to receive a valid
+     * DateTime back from DateTime::createFromFormat.
+     *
+     * @return static
+     */
+    public static function forInvalidFormat(string $format)
+    {
+        return new static(lang('Time.invalidFormat', [$format]));
+    }
 
-	/**
-	 * Thrown when the numeric representation of the month falls
-	 * outside the range of allowed months.
-	 *
-	 * @param string $month
-	 *
-	 * @return static
-	 */
-	public static function forInvalidMonth(string $month)
-	{
-		return new static(lang('Time.invalidMonth', [$month]));
-	}
+    /**
+     * Thrown when the numeric representation of the month falls
+     * outside the range of allowed months.
+     *
+     * @return static
+     */
+    public static function forInvalidMonth(string $month)
+    {
+        return new static(lang('Time.invalidMonth', [$month]));
+    }
 
-	/**
-	 * Thrown when the supplied day falls outside the range
-	 * of allowed days.
-	 *
-	 * @param string $day
-	 *
-	 * @return static
-	 */
-	public static function forInvalidDay(string $day)
-	{
-		return new static(lang('Time.invalidDay', [$day]));
-	}
+    /**
+     * Thrown when the supplied day falls outside the range
+     * of allowed days.
+     *
+     * @return static
+     */
+    public static function forInvalidDay(string $day)
+    {
+        return new static(lang('Time.invalidDay', [$day]));
+    }
 
-	/**
-	 * Thrown when the day provided falls outside the allowed
-	 * last day for the given month.
-	 *
-	 * @param string $lastDay
-	 * @param string $day
-	 *
-	 * @return static
-	 */
-	public static function forInvalidOverDay(string $lastDay, string $day)
-	{
-		return new static(lang('Time.invalidOverDay', [$lastDay, $day]));
-	}
+    /**
+     * Thrown when the day provided falls outside the allowed
+     * last day for the given month.
+     *
+     * @return static
+     */
+    public static function forInvalidOverDay(string $lastDay, string $day)
+    {
+        return new static(lang('Time.invalidOverDay', [$lastDay, $day]));
+    }
 
-	/**
-	 * Thrown when the supplied hour falls outside the
-	 * range of allowed hours.
-	 *
-	 * @param string $hour
-	 *
-	 * @return static
-	 */
-	public static function forInvalidHour(string $hour)
-	{
-		return new static(lang('Time.invalidHour', [$hour]));
-	}
+    /**
+     * Thrown when the supplied hour falls outside the
+     * range of allowed hours.
+     *
+     * @return static
+     */
+    public static function forInvalidHour(string $hour)
+    {
+        return new static(lang('Time.invalidHour', [$hour]));
+    }
 
-	/**
-	 * Thrown when the supplied minutes falls outside the
-	 * range of allowed minutes.
-	 *
-	 * @param string $minutes
-	 *
-	 * @return static
-	 */
-	public static function forInvalidMinutes(string $minutes)
-	{
-		return new static(lang('Time.invalidMinutes', [$minutes]));
-	}
+    /**
+     * Thrown when the supplied minutes falls outside the
+     * range of allowed minutes.
+     *
+     * @return static
+     */
+    public static function forInvalidMinutes(string $minutes)
+    {
+        return new static(lang('Time.invalidMinutes', [$minutes]));
+    }
 
-	/**
-	 * Thrown when the supplied seconds falls outside the
-	 * range of allowed seconds.
-	 *
-	 * @param string $seconds
-	 *
-	 * @return static
-	 */
-	public static function forInvalidSeconds(string $seconds)
-	{
-		return new static(lang('Time.invalidSeconds', [$seconds]));
-	}
+    /**
+     * Thrown when the supplied seconds falls outside the
+     * range of allowed seconds.
+     *
+     * @return static
+     */
+    public static function forInvalidSeconds(string $seconds)
+    {
+        return new static(lang('Time.invalidSeconds', [$seconds]));
+    }
 }
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index c50f8f4691b4..919a5a391534 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
@@ -21,10 +21,9 @@
 use IntlCalendar;
 use IntlDateFormatter;
 use Locale;
+use ReturnTypeWillChange;
 
 /**
- * Class Time
- *
  * A localized date/time package inspired
  * by Nesbot/Carbon and CakePHP/Chronos.
  *
@@ -34,1349 +33,1166 @@
  */
 class Time extends DateTime
 {
-	/**
-	 * @var DateTimeZone
-	 */
-	protected $timezone;
-
-	/**
-	 * @var string
-	 */
-	protected $locale;
-
-	/**
-	 * Format to use when displaying datetime through __toString
-	 *
-	 * @var string
-	 */
-	protected $toStringFormat = 'yyyy-MM-dd HH:mm:ss';
-
-	/**
-	 * Used to check time string to determine if it is relative time or not....
-	 *
-	 * @var string
-	 */
-	protected static $relativePattern = '/this|next|last|tomorrow|yesterday|midnight|today|[+-]|first|last|ago/i';
-
-	/**
-	 * @var static|DateTimeInterface|null
-	 */
-	protected static $testNow;
-
-	//--------------------------------------------------------------------
-	// Constructors
-	//--------------------------------------------------------------------
-
-	/**
-	 * Time constructor.
-	 *
-	 * @param string|null              $time
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @throws Exception
-	 */
-	public function __construct(string $time = null, $timezone = null, string $locale = null)
-	{
-		// If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
-		$this->locale = ! empty($locale) ? $locale : Locale::getDefault();
-
-		// If a test instance has been provided, use it instead.
-		if (is_null($time) && static::$testNow instanceof Time)
-		{
-			if (empty($timezone))
-			{
-				$timezone = static::$testNow->getTimezone();
-			}
-
-			$time = static::$testNow->toDateTimeString();
-		}
-
-		$timezone       = ! empty($timezone) ? $timezone : date_default_timezone_get();
-		$this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-
-		// If the time string was a relative string (i.e. 'next Tuesday')
-		// then we need to adjust the time going in so that we have a current
-		// timezone to work with.
-		if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time)))
-		{
-			$instance = new DateTime('now', $this->timezone);
-			$instance->modify($time);
-			$time = $instance->format('Y-m-d H:i:s');
-		}
-
-		parent::__construct($time, $this->timezone);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new Time instance with the timezone set.
-	 *
-	 * @param string|DateTimeZone|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function now($timezone = null, string $locale = null)
-	{
-		return new Time(null, $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new Time instance while parsing a datetime string.
-	 *
-	 * Example:
-	 *  $time = Time::parse('first day of December 2008');
-	 *
-	 * @param string                   $datetime
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function parse(string $datetime, $timezone = null, string $locale = null)
-	{
-		return new Time($datetime, $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return a new time with the time set to midnight.
-	 *
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function today($timezone = null, string $locale = null)
-	{
-		return new Time(date('Y-m-d 00:00:00'), $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an instance set to midnight yesterday morning.
-	 *
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function yesterday($timezone = null, string $locale = null)
-	{
-		return new Time(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an instance set to midnight tomorrow morning.
-	 *
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function tomorrow($timezone = null, string $locale = null)
-	{
-		return new Time(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new instance based on the year, month and day. If any of those three
-	 * are left empty, will default to the current value.
-	 *
-	 * @param integer|null             $year
-	 * @param integer|null             $month
-	 * @param integer|null             $day
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function createFromDate(int $year = null, int $month = null, int $day = null, $timezone = null, string $locale = null)
-	{
-		return static::create($year, $month, $day, null, null, null, $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new instance with the date set to today, and the time set to the values passed in.
-	 *
-	 * @param integer|null             $hour
-	 * @param integer|null             $minutes
-	 * @param integer|null             $seconds
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function createFromTime(int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
-	{
-		return static::create(null, null, null, $hour, $minutes, $seconds, $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new instance with the date time values individually set.
-	 *
-	 * @param integer|null             $year
-	 * @param integer|null             $month
-	 * @param integer|null             $day
-	 * @param integer|null             $hour
-	 * @param integer|null             $minutes
-	 * @param integer|null             $seconds
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function create(int $year = null, int $month = null, int $day = null, int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
-	{
-		$year    = is_null($year) ? date('Y') : $year;
-		$month   = is_null($month) ? date('m') : $month;
-		$day     = is_null($day) ? date('d') : $day;
-		$hour    = empty($hour) ? 0 : $hour;
-		$minutes = empty($minutes) ? 0 : $minutes;
-		$seconds = empty($seconds) ? 0 : $seconds;
-
-		return new Time(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provides a replacement for DateTime's own createFromFormat function, that provides
-	 * more flexible timeZone handling
-	 *
-	 * @param string                   $format
-	 * @param string                   $datetime
-	 * @param DateTimeZone|string|null $timeZone
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function createFromFormat($format, $datetime, $timeZone = null)
-	{
-		if (! $date = parent::createFromFormat($format, $datetime))
-		{
-			throw I18nException::forInvalidFormat($format);
-		}
-
-		return new Time($date->format('Y-m-d H:i:s'), $timeZone);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new instance with the datetime set based on the provided UNIX timestamp.
-	 *
-	 * @param integer                  $timestamp
-	 * @param DateTimeZone|string|null $timezone
-	 * @param string|null              $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function createFromTimestamp(int $timestamp, $timezone = null, string $locale = null)
-	{
-		return new Time(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes an instance of DateTimeInterface and returns an instance of Time with it's same values.
-	 *
-	 * @param DateTimeInterface $dateTime
-	 * @param string|null       $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public static function createFromInstance(DateTimeInterface $dateTime, string $locale = null)
-	{
-		$date     = $dateTime->format('Y-m-d H:i:s');
-		$timezone = $dateTime->getTimezone();
-
-		return new Time($date, $timezone, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes an instance of DateTime and returns an instance of Time with it's same values.
-	 *
-	 * @param DateTime    $dateTime
-	 * @param string|null $locale
-	 *
-	 * @return Time
-	 * @throws Exception
-	 *
-	 * @deprecated         Use createFromInstance() instead
-	 * @codeCoverageIgnore
-	 */
-	public static function instance(DateTime $dateTime, string $locale = null)
-	{
-		return self::createFromInstance($dateTime, $locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Converts the current instance to a mutable DateTime object.
-	 *
-	 * @return DateTime
-	 * @throws Exception
-	 */
-	public function toDateTime()
-	{
-		$dateTime = new DateTime('', $this->getTimezone());
-		$dateTime->setTimestamp(parent::getTimestamp());
-
-		return $dateTime;
-	}
-
-	//--------------------------------------------------------------------
-	// For Testing
-	//--------------------------------------------------------------------
-
-	/**
-	 * Creates an instance of Time that will be returned during testing
-	 * when calling 'Time::now' instead of the current time.
-	 *
-	 * @param Time|DateTimeInterface|string|null $datetime
-	 * @param DateTimeZone|string|null           $timezone
-	 * @param string|null                        $locale
-	 *
-	 * @throws Exception
-	 */
-	public static function setTestNow($datetime = null, $timezone = null, string $locale = null)
-	{
-		// Reset the test instance
-		if (is_null($datetime))
-		{
-			static::$testNow = null;
-			return;
-		}
-
-		// Convert to a Time instance
-		if (is_string($datetime))
-		{
-			$datetime = new Time($datetime, $timezone, $locale);
-		}
-		elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof Time)
-		{
-			$datetime = new Time($datetime->format('Y-m-d H:i:s'), $timezone);
-		}
-
-		static::$testNow = $datetime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether we have a testNow instance saved.
-	 *
-	 * @return boolean
-	 */
-	public static function hasTestNow(): bool
-	{
-		return ! is_null(static::$testNow);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Getters
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the localized Year
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getYear(): string
-	{
-		return $this->toLocalizedString('y');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the localized Month
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getMonth(): string
-	{
-		return $this->toLocalizedString('M');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the localized day of the month.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getDay(): string
-	{
-		return $this->toLocalizedString('d');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the localized hour (in 24-hour format).
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getHour(): string
-	{
-		return $this->toLocalizedString('H');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the localized minutes in the hour.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getMinute(): string
-	{
-		return $this->toLocalizedString('m');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the localized seconds
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getSecond(): string
-	{
-		return $this->toLocalizedString('s');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the index of the day of the week
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getDayOfWeek(): string
-	{
-		return $this->toLocalizedString('c');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the index of the day of the year
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getDayOfYear(): string
-	{
-		return $this->toLocalizedString('D');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the index of the week in the month
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getWeekOfMonth(): string
-	{
-		return $this->toLocalizedString('W');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the index of the week in the year
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getWeekOfYear(): string
-	{
-		return $this->toLocalizedString('w');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the age in years from the "current" date and 'now'
-	 *
-	 * @return integer
-	 * @throws Exception
-	 */
-	public function getAge()
-	{
-		$now  = Time::now()->getTimestamp();
-		$time = $this->getTimestamp();
-
-		// future dates have no age
-		return max(0, date('Y', $now) - date('Y', $time));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of the current quarter for the year.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function getQuarter(): string
-	{
-		return $this->toLocalizedString('Q');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Are we in daylight savings time currently?
-	 *
-	 * @return boolean
-	 */
-	public function getDst(): bool
-	{
-		// grab the transactions that would affect today
-		$start       = strtotime('-1 year', $this->getTimestamp());
-		$end         = strtotime('+2 year', $start);
-		$transitions = $this->timezone->getTransitions($start, $end);
-
-		$daylightSaving = false;
-		foreach ($transitions as $transition)
-		{
-			if ($transition['time'] > $this->format('U'))
-			{
-				$daylightSaving = (bool) $transition['isdst'] ?? $daylightSaving;
-				break;
-			}
-		}
-		return $daylightSaving;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns boolean whether the passed timezone is the same as
-	 * the local timezone.
-	 *
-	 * @return boolean
-	 */
-	public function getLocal(): bool
-	{
-		$local = date_default_timezone_get();
-
-		return $local === $this->timezone->getName();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns boolean whether object is in UTC.
-	 *
-	 * @return boolean
-	 */
-	public function getUtc(): bool
-	{
-		return $this->getOffset() === 0;
-	}
-
-	/**
-	 * Returns the name of the current timezone.
-	 *
-	 * @return string
-	 */
-	public function getTimezoneName(): string
-	{
-		return $this->timezone->getName();
-	}
-
-	//--------------------------------------------------------------------
-	// Setters
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the current year for this instance.
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setYear($value)
-	{
-		return $this->setValue('year', $value);
-	}
-
-	/**
-	 * Sets the month of the year.
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setMonth($value)
-	{
-		if (is_numeric($value) && ($value < 1 || $value > 12))
-		{
-			throw I18nException::forInvalidMonth($value);
-		}
-
-		if (is_string($value) && ! is_numeric($value))
-		{
-			$value = date('m', strtotime("{$value} 1 2017"));
-		}
-
-		return $this->setValue('month', $value);
-	}
-
-	/**
-	 * Sets the day of the month.
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setDay($value)
-	{
-		if ($value < 1 || $value > 31)
-		{
-			throw I18nException::forInvalidDay($value);
-		}
-
-		$date    = $this->getYear() . '-' . $this->getMonth();
-		$lastDay = date('t', strtotime($date));
-		if ($value > $lastDay)
-		{
-			throw I18nException::forInvalidOverDay($lastDay, $value);
-		}
-
-		return $this->setValue('day', $value);
-	}
-
-	/**
-	 * Sets the hour of the day (24 hour cycle)
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setHour($value)
-	{
-		if ($value < 0 || $value > 23)
-		{
-			throw I18nException::forInvalidHour($value);
-		}
-
-		return $this->setValue('hour', $value);
-	}
-
-	/**
-	 * Sets the minute of the hour
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setMinute($value)
-	{
-		if ($value < 0 || $value > 59)
-		{
-			throw I18nException::forInvalidMinutes($value);
-		}
-
-		return $this->setValue('minute', $value);
-	}
-
-	/**
-	 * Sets the second of the minute.
-	 *
-	 * @param integer|string $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setSecond($value)
-	{
-		if ($value < 0 || $value > 59)
-		{
-			throw I18nException::forInvalidSeconds($value);
-		}
-
-		return $this->setValue('second', $value);
-	}
-
-	/**
-	 * Helper method to do the heavy lifting of the 'setX' methods.
-	 *
-	 * @param string  $name
-	 * @param integer $value
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	protected function setValue(string $name, $value)
-	{
-		[$year, $month, $day, $hour, $minute, $second] = explode('-', $this->format('Y-n-j-G-i-s'));
-		$$name                                             = $value;
-
-		return Time::create(
-			(int) $year,
-			(int) $month,
-			(int) $day,
-			(int) $hour,
-			(int) $minute,
-			(int) $second,
-			$this->getTimezoneName(),
-			$this->locale
-		);
-	}
-
-	/**
-	 * Returns a new instance with the revised timezone.
-	 *
-	 * @param string|DateTimeZone $timezone
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setTimezone($timezone)
-	{
-		$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-		return Time::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
-	}
-
-	/**
-	 * Returns a new instance with the date set to the new timestamp.
-	 *
-	 * @param integer $timestamp
-	 *
-	 * @return Time
-	 * @throws Exception
-	 */
-	public function setTimestamp($timestamp)
-	{
-		$time = date('Y-m-d H:i:s', $timestamp);
-
-		return Time::parse($time, $this->timezone, $this->locale);
-	}
-
-	//--------------------------------------------------------------------
-	// Add/Subtract
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a new Time instance with $seconds added to the time.
-	 *
-	 * @param integer $seconds
-	 *
-	 * @return static
-	 */
-	public function addSeconds(int $seconds)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$seconds} seconds"));
-	}
-
-	/**
-	 * Returns a new Time instance with $minutes added to the time.
-	 *
-	 * @param integer $minutes
-	 *
-	 * @return static
-	 */
-	public function addMinutes(int $minutes)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$minutes} minutes"));
-	}
-
-	/**
-	 * Returns a new Time instance with $hours added to the time.
-	 *
-	 * @param integer $hours
-	 *
-	 * @return static
-	 */
-	public function addHours(int $hours)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$hours} hours"));
-	}
-
-	/**
-	 * Returns a new Time instance with $days added to the time.
-	 *
-	 * @param integer $days
-	 *
-	 * @return static
-	 */
-	public function addDays(int $days)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$days} days"));
-	}
-
-	/**
-	 * Returns a new Time instance with $months added to the time.
-	 *
-	 * @param integer $months
-	 *
-	 * @return static
-	 */
-	public function addMonths(int $months)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$months} months"));
-	}
-
-	/**
-	 * Returns a new Time instance with $years added to the time.
-	 *
-	 * @param integer $years
-	 *
-	 * @return static
-	 */
-	public function addYears(int $years)
-	{
-		$time = clone($this);
-
-		return $time->add(DateInterval::createFromDateString("{$years} years"));
-	}
-
-	/**
-	 * Returns a new Time instance with $seconds subtracted from the time.
-	 *
-	 * @param integer $seconds
-	 *
-	 * @return static
-	 */
-	public function subSeconds(int $seconds)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$seconds} seconds"));
-	}
-
-	/**
-	 * Returns a new Time instance with $minutes subtracted from the time.
-	 *
-	 * @param integer $minutes
-	 *
-	 * @return static
-	 */
-	public function subMinutes(int $minutes)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$minutes} minutes"));
-	}
-
-	/**
-	 * Returns a new Time instance with $hours subtracted from the time.
-	 *
-	 * @param integer $hours
-	 *
-	 * @return static
-	 */
-	public function subHours(int $hours)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$hours} hours"));
-	}
-
-	/**
-	 * Returns a new Time instance with $days subtracted from the time.
-	 *
-	 * @param integer $days
-	 *
-	 * @return static
-	 */
-	public function subDays(int $days)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$days} days"));
-	}
-
-	/**
-	 * Returns a new Time instance with $months subtracted from the time.
-	 *
-	 * @param integer $months
-	 *
-	 * @return static
-	 */
-	public function subMonths(int $months)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$months} months"));
-	}
-
-	/**
-	 * Returns a new Time instance with $hours subtracted from the time.
-	 *
-	 * @param integer $years
-	 *
-	 * @return static
-	 */
-	public function subYears(int $years)
-	{
-		$time = clone($this);
-
-		return $time->sub(DateInterval::createFromDateString("{$years} years"));
-	}
-
-	//--------------------------------------------------------------------
-	// Formatters
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the localized value of the date in the format 'Y-m-d H:i:s'
-	 *
-	 * @throws Exception
-	 */
-	public function toDateTimeString()
-	{
-		return $this->toLocalizedString('yyyy-MM-dd HH:mm:ss');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a localized version of the date in Y-m-d format.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function toDateString()
-	{
-		return $this->toLocalizedString('yyyy-MM-dd');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a localized version of the date in nicer date format:
-	 *
-	 *  i.e. Apr 1, 2017
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function toFormattedDateString()
-	{
-		return $this->toLocalizedString('MMM d, yyyy');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a localized version of the time in nicer date format:
-	 *
-	 *  i.e. 13:20:33
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function toTimeString()
-	{
-		return $this->toLocalizedString('HH:mm:ss');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the localized value of this instance in $format.
-	 *
-	 * @param string|null $format
-	 *
-	 * @return string|boolean
-	 * @throws Exception
-	 */
-	public function toLocalizedString(string $format = null)
-	{
-		$format = $format ?? $this->toStringFormat;
-
-		return IntlDateFormatter::formatObject($this->toDateTime(), $format, $this->locale);
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Comparison
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the datetime passed in is equal to the current instance.
-	 * Equal in this case means that they represent the same moment in time,
-	 * and are not required to be in the same timezone, as both times are
-	 * converted to UTC and compared that way.
-	 *
-	 * @param Time|DateTimeInterface|string $testTime
-	 * @param string|null                   $timezone
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function equals($testTime, string $timezone = null): bool
-	{
-		$testTime = $this->getUTCObject($testTime, $timezone);
-
-		$ourTime = $this->toDateTime()
-				->setTimezone(new DateTimeZone('UTC'))
-				->format('Y-m-d H:i:s');
-
-		return $testTime->format('Y-m-d H:i:s') === $ourTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures that the times are identical, taking timezone into account.
-	 *
-	 * @param Time|DateTimeInterface|string $testTime
-	 * @param string|null                   $timezone
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function sameAs($testTime, string $timezone = null): bool
-	{
-		if ($testTime instanceof DateTimeInterface)
-		{
-			$testTime = $testTime->format('Y-m-d H:i:s');
-		}
-		elseif (is_string($testTime))
-		{
-			$timezone = $timezone ?: $this->timezone;
-			$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-			$testTime = new DateTime($testTime, $timezone);
-			$testTime = $testTime->format('Y-m-d H:i:s');
-		}
-
-		$ourTime = $this->toDateTimeString();
-
-		return $testTime === $ourTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the current instance's time is before $testTime,
-	 * after converting to UTC.
-	 *
-	 * @param mixed       $testTime
-	 * @param string|null $timezone
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function isBefore($testTime, string $timezone = null): bool
-	{
-		$testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
-		$ourTime  = $this->getTimestamp();
-
-		return $ourTime < $testTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the current instance's time is after $testTime,
-	 * after converting in UTC.
-	 *
-	 * @param mixed       $testTime
-	 * @param string|null $timezone
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function isAfter($testTime, string $timezone = null): bool
-	{
-		$testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
-		$ourTime  = $this->getTimestamp();
-
-		return $ourTime > $testTime;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Differences
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a text string that is easily readable that describes
-	 * how long ago, or how long from now, a date is, like:
-	 *
-	 *  - 3 weeks ago
-	 *  - in 4 days
-	 *  - 6 hours ago
-	 *
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function humanize()
-	{
-		$now  = IntlCalendar::fromDateTime(Time::now($this->timezone)->toDateTimeString());
-		$time = $this->getCalendar()->getTime();
-
-		$years   = $now->fieldDifference($time, IntlCalendar::FIELD_YEAR);
-		$months  = $now->fieldDifference($time, IntlCalendar::FIELD_MONTH);
-		$days    = $now->fieldDifference($time, IntlCalendar::FIELD_DAY_OF_YEAR);
-		$hours   = $now->fieldDifference($time, IntlCalendar::FIELD_HOUR_OF_DAY);
-		$minutes = $now->fieldDifference($time, IntlCalendar::FIELD_MINUTE);
-
-		$phrase = null;
-
-		if ($years !== 0)
-		{
-			$phrase = lang('Time.years', [abs($years)]);
-			$before = $years < 0;
-		}
-		elseif ($months !== 0)
-		{
-			$phrase = lang('Time.months', [abs($months)]);
-			$before = $months < 0;
-		}
-		elseif ($days !== 0 && (abs($days) >= 7))
-		{
-			$weeks  = ceil($days / 7);
-			$phrase = lang('Time.weeks', [abs($weeks)]);
-			$before = $days < 0;
-		}
-		elseif ($days !== 0)
-		{
-			$before = $days < 0;
-
-			// Yesterday/Tomorrow special cases
-			if (abs($days) === 1)
-			{
-				return $before ? lang('Time.yesterday') : lang('Time.tomorrow');
-			}
-
-			$phrase = lang('Time.days', [abs($days)]);
-		}
-		elseif ($hours !== 0)
-		{
-			$phrase = lang('Time.hours', [abs($hours)]);
-			$before = $hours < 0;
-		}
-		elseif ($minutes !== 0)
-		{
-			$phrase = lang('Time.minutes', [abs($minutes)]);
-			$before = $minutes < 0;
-		}
-		else
-		{
-			return lang('Time.now');
-		}
-
-		return $before ? lang('Time.ago', [$phrase]) : lang('Time.inFuture', [$phrase]);
-	}
-
-	/**
-	 * @param mixed       $testTime
-	 * @param string|null $timezone
-	 *
-	 * @return TimeDifference
-	 * @throws Exception
-	 */
-	public function difference($testTime, string $timezone = null)
-	{
-		$testTime = $this->getUTCObject($testTime, $timezone);
-		$ourTime  = $this->getUTCObject($this);
-
-		return new TimeDifference($ourTime, $testTime);
-	}
-
-	//--------------------------------------------------------------------
-	// Utilities
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a Time instance with the timezone converted to UTC.
-	 *
-	 * @param mixed       $time
-	 * @param string|null $timezone
-	 *
-	 * @return DateTime|static
-	 * @throws Exception
-	 */
-	public function getUTCObject($time, string $timezone = null)
-	{
-		if ($time instanceof Time)
-		{
-			$time = $time->toDateTime();
-		}
-		elseif (is_string($time))
-		{
-			$timezone = $timezone ?: $this->timezone;
-			$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-			$time     = new DateTime($time, $timezone);
-		}
-
-		if ($time instanceof DateTime || $time instanceof DateTimeImmutable)
-		{
-			$time = $time->setTimezone(new DateTimeZone('UTC'));
-		}
-
-		return $time;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the IntlCalendar object used for this object,
-	 * taking into account the locale, date, etc.
-	 *
-	 * Primarily used internally to provide the difference and comparison functions,
-	 * but available for public consumption if they need it.
-	 *
-	 * @return IntlCalendar
-	 * @throws Exception
-	 */
-	public function getCalendar()
-	{
-		return IntlCalendar::fromDateTime($this->toDateTimeString());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Check a time string to see if it includes a relative date (like 'next Tuesday').
-	 *
-	 * @param string $time
-	 *
-	 * @return boolean
-	 */
-	protected static function hasRelativeKeywords(string $time): bool
-	{
-		// skip common format with a '-' in it
-		if (preg_match('/[0-9]{4}-[0-9]{1,2}-[0-9]{1,2}/', $time) !== 1)
-		{
-			return preg_match(static::$relativePattern, $time) > 0;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Outputs a short format version of the datetime.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function __toString(): string
-	{
-		return IntlDateFormatter::formatObject($this->toDateTime(), $this->toStringFormat, $this->locale);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allow for property-type access to any getX method...
-	 *
-	 * Note that we cannot use this for any of our setX methods,
-	 * as they return new Time objects, but the __set ignores
-	 * return values.
-	 * See http://php.net/manual/en/language.oop5.overloading.php
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	public function __get($name)
-	{
-		$method = 'get' . ucfirst($name);
-
-		if (method_exists($this, $method))
-		{
-			return $this->$method();
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allow for property-type checking to any getX method...
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function __isset($name): bool
-	{
-		$method = 'get' . ucfirst($name);
-
-		return method_exists($this, $method);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * This is called when we unserialize the Time object.
-	 */
-	public function __wakeup()
-	{
-		/**
-		 * Prior to unserialization, this is a string.
-		 *
-		 * @var string $timezone
-		 */
-		$timezone = $this->timezone;
-
-		$this->timezone = new DateTimeZone($timezone);
-		parent::__construct($this->date, $this->timezone);
-	}
+    /**
+     * @var DateTimeZone
+     */
+    protected $timezone;
+
+    /**
+     * @var string
+     */
+    protected $locale;
+
+    /**
+     * Format to use when displaying datetime through __toString
+     *
+     * @var string
+     */
+    protected $toStringFormat = 'yyyy-MM-dd HH:mm:ss';
+
+    /**
+     * Used to check time string to determine if it is relative time or not....
+     *
+     * @var string
+     */
+    protected static $relativePattern = '/this|next|last|tomorrow|yesterday|midnight|today|[+-]|first|last|ago/i';
+
+    /**
+     * @var DateTimeInterface|static|null
+     */
+    protected static $testNow;
+
+    //--------------------------------------------------------------------
+    // Constructors
+    //--------------------------------------------------------------------
+
+    /**
+     * Time constructor.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     */
+    public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
+    {
+        // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
+        $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
+
+        // If a test instance has been provided, use it instead.
+        if ($time === null && static::$testNow instanceof self) {
+            if (empty($timezone)) {
+                $timezone = static::$testNow->getTimezone();
+            }
+
+            $time = static::$testNow->toDateTimeString();
+        }
+
+        $timezone       = ! empty($timezone) ? $timezone : date_default_timezone_get();
+        $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+
+        // If the time string was a relative string (i.e. 'next Tuesday')
+        // then we need to adjust the time going in so that we have a current
+        // timezone to work with.
+        if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
+            $instance = new DateTime('now', $this->timezone);
+            $instance->modify($time);
+            $time = $instance->format('Y-m-d H:i:s');
+        }
+
+        parent::__construct($time, $this->timezone);
+    }
+
+    /**
+     * Returns a new Time instance with the timezone set.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function now($timezone = null, ?string $locale = null)
+    {
+        return new self(null, $timezone, $locale);
+    }
+
+    /**
+     * Returns a new Time instance while parsing a datetime string.
+     *
+     * Example:
+     *  $time = Time::parse('first day of December 2008');
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function parse(string $datetime, $timezone = null, ?string $locale = null)
+    {
+        return new self($datetime, $timezone, $locale);
+    }
+
+    /**
+     * Return a new time with the time set to midnight.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function today($timezone = null, ?string $locale = null)
+    {
+        return new self(date('Y-m-d 00:00:00'), $timezone, $locale);
+    }
+
+    /**
+     * Returns an instance set to midnight yesterday morning.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function yesterday($timezone = null, ?string $locale = null)
+    {
+        return new self(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
+    }
+
+    /**
+     * Returns an instance set to midnight tomorrow morning.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function tomorrow($timezone = null, ?string $locale = null)
+    {
+        return new self(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
+    }
+
+    /**
+     * Returns a new instance based on the year, month and day. If any of those three
+     * are left empty, will default to the current value.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function createFromDate(?int $year = null, ?int $month = null, ?int $day = null, $timezone = null, ?string $locale = null)
+    {
+        return static::create($year, $month, $day, null, null, null, $timezone, $locale);
+    }
+
+    /**
+     * Returns a new instance with the date set to today, and the time set to the values passed in.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function createFromTime(?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
+    {
+        return static::create(null, null, null, $hour, $minutes, $seconds, $timezone, $locale);
+    }
+
+    /**
+     * Returns a new instance with the date time values individually set.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function create(?int $year = null, ?int $month = null, ?int $day = null, ?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
+    {
+        $year    = $year ?? date('Y');
+        $month   = $month ?? date('m');
+        $day     = $day ?? date('d');
+        $hour    = empty($hour) ? 0 : $hour;
+        $minutes = empty($minutes) ? 0 : $minutes;
+        $seconds = empty($seconds) ? 0 : $seconds;
+
+        return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
+    }
+
+    /**
+     * Provides a replacement for DateTime's own createFromFormat function, that provides
+     * more flexible timeZone handling
+     *
+     * @param string                   $format
+     * @param string                   $datetime
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    #[ReturnTypeWillChange]
+    public static function createFromFormat($format, $datetime, $timezone = null)
+    {
+        if (! $date = parent::createFromFormat($format, $datetime)) {
+            throw I18nException::forInvalidFormat($format);
+        }
+
+        return new self($date->format('Y-m-d H:i:s'), $timezone);
+    }
+
+    /**
+     * Returns a new instance with the datetime set based on the provided UNIX timestamp.
+     *
+     * @param DateTimeZone|string|null $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
+    {
+        return new self(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
+    }
+
+    /**
+     * Takes an instance of DateTimeInterface and returns an instance of Time with it's same values.
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public static function createFromInstance(DateTimeInterface $dateTime, ?string $locale = null)
+    {
+        $date     = $dateTime->format('Y-m-d H:i:s');
+        $timezone = $dateTime->getTimezone();
+
+        return new self($date, $timezone, $locale);
+    }
+
+    /**
+     * Takes an instance of DateTime and returns an instance of Time with it's same values.
+     *
+     * @throws Exception
+     *
+     * @return Time
+     *
+     * @deprecated         Use createFromInstance() instead
+     * @codeCoverageIgnore
+     */
+    public static function instance(DateTime $dateTime, ?string $locale = null)
+    {
+        return self::createFromInstance($dateTime, $locale);
+    }
+
+    /**
+     * Converts the current instance to a mutable DateTime object.
+     *
+     * @throws Exception
+     *
+     * @return DateTime
+     */
+    public function toDateTime()
+    {
+        $dateTime = new DateTime('', $this->getTimezone());
+        $dateTime->setTimestamp(parent::getTimestamp());
+
+        return $dateTime;
+    }
+
+    //--------------------------------------------------------------------
+    // For Testing
+    //--------------------------------------------------------------------
+
+    /**
+     * Creates an instance of Time that will be returned during testing
+     * when calling 'Time::now' instead of the current time.
+     *
+     * @param DateTimeInterface|string|Time|null $datetime
+     * @param DateTimeZone|string|null           $timezone
+     *
+     * @throws Exception
+     */
+    public static function setTestNow($datetime = null, $timezone = null, ?string $locale = null)
+    {
+        // Reset the test instance
+        if ($datetime === null) {
+            static::$testNow = null;
+
+            return;
+        }
+
+        // Convert to a Time instance
+        if (is_string($datetime)) {
+            $datetime = new self($datetime, $timezone, $locale);
+        } elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof self) {
+            $datetime = new self($datetime->format('Y-m-d H:i:s'), $timezone);
+        }
+
+        static::$testNow = $datetime;
+    }
+
+    /**
+     * Returns whether we have a testNow instance saved.
+     */
+    public static function hasTestNow(): bool
+    {
+        return static::$testNow !== null;
+    }
+
+    //--------------------------------------------------------------------
+    // Getters
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the localized Year
+     *
+     * @throws Exception
+     */
+    public function getYear(): string
+    {
+        return $this->toLocalizedString('y');
+    }
+
+    /**
+     * Returns the localized Month
+     *
+     * @throws Exception
+     */
+    public function getMonth(): string
+    {
+        return $this->toLocalizedString('M');
+    }
+
+    /**
+     * Return the localized day of the month.
+     *
+     * @throws Exception
+     */
+    public function getDay(): string
+    {
+        return $this->toLocalizedString('d');
+    }
+
+    /**
+     * Return the localized hour (in 24-hour format).
+     *
+     * @throws Exception
+     */
+    public function getHour(): string
+    {
+        return $this->toLocalizedString('H');
+    }
+
+    /**
+     * Return the localized minutes in the hour.
+     *
+     * @throws Exception
+     */
+    public function getMinute(): string
+    {
+        return $this->toLocalizedString('m');
+    }
+
+    /**
+     * Return the localized seconds
+     *
+     * @throws Exception
+     */
+    public function getSecond(): string
+    {
+        return $this->toLocalizedString('s');
+    }
+
+    /**
+     * Return the index of the day of the week
+     *
+     * @throws Exception
+     */
+    public function getDayOfWeek(): string
+    {
+        return $this->toLocalizedString('c');
+    }
+
+    /**
+     * Return the index of the day of the year
+     *
+     * @throws Exception
+     */
+    public function getDayOfYear(): string
+    {
+        return $this->toLocalizedString('D');
+    }
+
+    /**
+     * Return the index of the week in the month
+     *
+     * @throws Exception
+     */
+    public function getWeekOfMonth(): string
+    {
+        return $this->toLocalizedString('W');
+    }
+
+    /**
+     * Return the index of the week in the year
+     *
+     * @throws Exception
+     */
+    public function getWeekOfYear(): string
+    {
+        return $this->toLocalizedString('w');
+    }
+
+    /**
+     * Returns the age in years from the "current" date and 'now'
+     *
+     * @throws Exception
+     *
+     * @return int
+     */
+    public function getAge()
+    {
+        $now  = self::now()->getTimestamp();
+        $time = $this->getTimestamp();
+
+        // future dates have no age
+        return max(0, date('Y', $now) - date('Y', $time));
+    }
+
+    /**
+     * Returns the number of the current quarter for the year.
+     *
+     * @throws Exception
+     */
+    public function getQuarter(): string
+    {
+        return $this->toLocalizedString('Q');
+    }
+
+    /**
+     * Are we in daylight savings time currently?
+     */
+    public function getDst(): bool
+    {
+        // grab the transactions that would affect today
+        $start       = strtotime('-1 year', $this->getTimestamp());
+        $end         = strtotime('+2 year', $start);
+        $transitions = $this->timezone->getTransitions($start, $end);
+
+        $daylightSaving = false;
+
+        foreach ($transitions as $transition) {
+            if ($transition['time'] > $this->format('U')) {
+                $daylightSaving = (bool) ($transition['isdst'] ?? $daylightSaving);
+                break;
+            }
+        }
+
+        return $daylightSaving;
+    }
+
+    /**
+     * Returns boolean whether the passed timezone is the same as
+     * the local timezone.
+     */
+    public function getLocal(): bool
+    {
+        $local = date_default_timezone_get();
+
+        return $local === $this->timezone->getName();
+    }
+
+    /**
+     * Returns boolean whether object is in UTC.
+     */
+    public function getUtc(): bool
+    {
+        return $this->getOffset() === 0;
+    }
+
+    /**
+     * Returns the name of the current timezone.
+     */
+    public function getTimezoneName(): string
+    {
+        return $this->timezone->getName();
+    }
+
+    //--------------------------------------------------------------------
+    // Setters
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the current year for this instance.
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setYear($value)
+    {
+        return $this->setValue('year', $value);
+    }
+
+    /**
+     * Sets the month of the year.
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setMonth($value)
+    {
+        if (is_numeric($value) && ($value < 1 || $value > 12)) {
+            throw I18nException::forInvalidMonth($value);
+        }
+
+        if (is_string($value) && ! is_numeric($value)) {
+            $value = date('m', strtotime("{$value} 1 2017"));
+        }
+
+        return $this->setValue('month', $value);
+    }
+
+    /**
+     * Sets the day of the month.
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setDay($value)
+    {
+        if ($value < 1 || $value > 31) {
+            throw I18nException::forInvalidDay($value);
+        }
+
+        $date    = $this->getYear() . '-' . $this->getMonth();
+        $lastDay = date('t', strtotime($date));
+        if ($value > $lastDay) {
+            throw I18nException::forInvalidOverDay($lastDay, $value);
+        }
+
+        return $this->setValue('day', $value);
+    }
+
+    /**
+     * Sets the hour of the day (24 hour cycle)
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setHour($value)
+    {
+        if ($value < 0 || $value > 23) {
+            throw I18nException::forInvalidHour($value);
+        }
+
+        return $this->setValue('hour', $value);
+    }
+
+    /**
+     * Sets the minute of the hour
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setMinute($value)
+    {
+        if ($value < 0 || $value > 59) {
+            throw I18nException::forInvalidMinutes($value);
+        }
+
+        return $this->setValue('minute', $value);
+    }
+
+    /**
+     * Sets the second of the minute.
+     *
+     * @param int|string $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    public function setSecond($value)
+    {
+        if ($value < 0 || $value > 59) {
+            throw I18nException::forInvalidSeconds($value);
+        }
+
+        return $this->setValue('second', $value);
+    }
+
+    /**
+     * Helper method to do the heavy lifting of the 'setX' methods.
+     *
+     * @param int $value
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    protected function setValue(string $name, $value)
+    {
+        [$year, $month, $day, $hour, $minute, $second] = explode('-', $this->format('Y-n-j-G-i-s'));
+
+        ${$name} = $value;
+
+        return self::create(
+            (int) $year,
+            (int) $month,
+            (int) $day,
+            (int) $hour,
+            (int) $minute,
+            (int) $second,
+            $this->getTimezoneName(),
+            $this->locale
+        );
+    }
+
+    /**
+     * Returns a new instance with the revised timezone.
+     *
+     * @param DateTimeZone|string $timezone
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    #[ReturnTypeWillChange]
+    public function setTimezone($timezone)
+    {
+        $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+
+        return self::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
+    }
+
+    /**
+     * Returns a new instance with the date set to the new timestamp.
+     *
+     * @param int $timestamp
+     *
+     * @throws Exception
+     *
+     * @return Time
+     */
+    #[ReturnTypeWillChange]
+    public function setTimestamp($timestamp)
+    {
+        $time = date('Y-m-d H:i:s', $timestamp);
+
+        return self::parse($time, $this->timezone, $this->locale);
+    }
+
+    //--------------------------------------------------------------------
+    // Add/Subtract
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns a new Time instance with $seconds added to the time.
+     *
+     * @return static
+     */
+    public function addSeconds(int $seconds)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$seconds} seconds"));
+    }
+
+    /**
+     * Returns a new Time instance with $minutes added to the time.
+     *
+     * @return static
+     */
+    public function addMinutes(int $minutes)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$minutes} minutes"));
+    }
+
+    /**
+     * Returns a new Time instance with $hours added to the time.
+     *
+     * @return static
+     */
+    public function addHours(int $hours)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$hours} hours"));
+    }
+
+    /**
+     * Returns a new Time instance with $days added to the time.
+     *
+     * @return static
+     */
+    public function addDays(int $days)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$days} days"));
+    }
+
+    /**
+     * Returns a new Time instance with $months added to the time.
+     *
+     * @return static
+     */
+    public function addMonths(int $months)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$months} months"));
+    }
+
+    /**
+     * Returns a new Time instance with $years added to the time.
+     *
+     * @return static
+     */
+    public function addYears(int $years)
+    {
+        $time = clone $this;
+
+        return $time->add(DateInterval::createFromDateString("{$years} years"));
+    }
+
+    /**
+     * Returns a new Time instance with $seconds subtracted from the time.
+     *
+     * @return static
+     */
+    public function subSeconds(int $seconds)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$seconds} seconds"));
+    }
+
+    /**
+     * Returns a new Time instance with $minutes subtracted from the time.
+     *
+     * @return static
+     */
+    public function subMinutes(int $minutes)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$minutes} minutes"));
+    }
+
+    /**
+     * Returns a new Time instance with $hours subtracted from the time.
+     *
+     * @return static
+     */
+    public function subHours(int $hours)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$hours} hours"));
+    }
+
+    /**
+     * Returns a new Time instance with $days subtracted from the time.
+     *
+     * @return static
+     */
+    public function subDays(int $days)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$days} days"));
+    }
+
+    /**
+     * Returns a new Time instance with $months subtracted from the time.
+     *
+     * @return static
+     */
+    public function subMonths(int $months)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$months} months"));
+    }
+
+    /**
+     * Returns a new Time instance with $hours subtracted from the time.
+     *
+     * @return static
+     */
+    public function subYears(int $years)
+    {
+        $time = clone $this;
+
+        return $time->sub(DateInterval::createFromDateString("{$years} years"));
+    }
+
+    //--------------------------------------------------------------------
+    // Formatters
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the localized value of the date in the format 'Y-m-d H:i:s'
+     *
+     * @throws Exception
+     */
+    public function toDateTimeString()
+    {
+        return $this->toLocalizedString('yyyy-MM-dd HH:mm:ss');
+    }
+
+    /**
+     * Returns a localized version of the date in Y-m-d format.
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    public function toDateString()
+    {
+        return $this->toLocalizedString('yyyy-MM-dd');
+    }
+
+    /**
+     * Returns a localized version of the date in nicer date format:
+     *
+     *  i.e. Apr 1, 2017
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    public function toFormattedDateString()
+    {
+        return $this->toLocalizedString('MMM d, yyyy');
+    }
+
+    /**
+     * Returns a localized version of the time in nicer date format:
+     *
+     *  i.e. 13:20:33
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    public function toTimeString()
+    {
+        return $this->toLocalizedString('HH:mm:ss');
+    }
+
+    /**
+     * Returns the localized value of this instance in $format.
+     *
+     * @throws Exception
+     *
+     * @return bool|string
+     */
+    public function toLocalizedString(?string $format = null)
+    {
+        $format = $format ?? $this->toStringFormat;
+
+        return IntlDateFormatter::formatObject($this->toDateTime(), $format, $this->locale);
+    }
+
+    //--------------------------------------------------------------------
+    // Comparison
+    //--------------------------------------------------------------------
+
+    /**
+     * Determines if the datetime passed in is equal to the current instance.
+     * Equal in this case means that they represent the same moment in time,
+     * and are not required to be in the same timezone, as both times are
+     * converted to UTC and compared that way.
+     *
+     * @param DateTimeInterface|string|Time $testTime
+     *
+     * @throws Exception
+     */
+    public function equals($testTime, ?string $timezone = null): bool
+    {
+        $testTime = $this->getUTCObject($testTime, $timezone);
+
+        $ourTime = $this->toDateTime()
+            ->setTimezone(new DateTimeZone('UTC'))
+            ->format('Y-m-d H:i:s');
+
+        return $testTime->format('Y-m-d H:i:s') === $ourTime;
+    }
+
+    /**
+     * Ensures that the times are identical, taking timezone into account.
+     *
+     * @param DateTimeInterface|string|Time $testTime
+     *
+     * @throws Exception
+     */
+    public function sameAs($testTime, ?string $timezone = null): bool
+    {
+        if ($testTime instanceof DateTimeInterface) {
+            $testTime = $testTime->format('Y-m-d H:i:s');
+        } elseif (is_string($testTime)) {
+            $timezone = $timezone ?: $this->timezone;
+            $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+            $testTime = new DateTime($testTime, $timezone);
+            $testTime = $testTime->format('Y-m-d H:i:s');
+        }
+
+        $ourTime = $this->toDateTimeString();
+
+        return $testTime === $ourTime;
+    }
+
+    /**
+     * Determines if the current instance's time is before $testTime,
+     * after converting to UTC.
+     *
+     * @param mixed $testTime
+     *
+     * @throws Exception
+     */
+    public function isBefore($testTime, ?string $timezone = null): bool
+    {
+        $testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
+        $ourTime  = $this->getTimestamp();
+
+        return $ourTime < $testTime;
+    }
+
+    /**
+     * Determines if the current instance's time is after $testTime,
+     * after converting in UTC.
+     *
+     * @param mixed $testTime
+     *
+     * @throws Exception
+     */
+    public function isAfter($testTime, ?string $timezone = null): bool
+    {
+        $testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
+        $ourTime  = $this->getTimestamp();
+
+        return $ourTime > $testTime;
+    }
+
+    //--------------------------------------------------------------------
+    // Differences
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns a text string that is easily readable that describes
+     * how long ago, or how long from now, a date is, like:
+     *
+     *  - 3 weeks ago
+     *  - in 4 days
+     *  - 6 hours ago
+     *
+     * @throws Exception
+     *
+     * @return mixed
+     */
+    public function humanize()
+    {
+        $now  = IntlCalendar::fromDateTime(self::now($this->timezone)->toDateTimeString());
+        $time = $this->getCalendar()->getTime();
+
+        $years   = $now->fieldDifference($time, IntlCalendar::FIELD_YEAR);
+        $months  = $now->fieldDifference($time, IntlCalendar::FIELD_MONTH);
+        $days    = $now->fieldDifference($time, IntlCalendar::FIELD_DAY_OF_YEAR);
+        $hours   = $now->fieldDifference($time, IntlCalendar::FIELD_HOUR_OF_DAY);
+        $minutes = $now->fieldDifference($time, IntlCalendar::FIELD_MINUTE);
+
+        $phrase = null;
+
+        if ($years !== 0) {
+            $phrase = lang('Time.years', [abs($years)]);
+            $before = $years < 0;
+        } elseif ($months !== 0) {
+            $phrase = lang('Time.months', [abs($months)]);
+            $before = $months < 0;
+        } elseif ($days !== 0 && (abs($days) >= 7)) {
+            $weeks  = ceil($days / 7);
+            $phrase = lang('Time.weeks', [abs($weeks)]);
+            $before = $days < 0;
+        } elseif ($days !== 0) {
+            $before = $days < 0;
+
+            // Yesterday/Tomorrow special cases
+            if (abs($days) === 1) {
+                return $before ? lang('Time.yesterday') : lang('Time.tomorrow');
+            }
+
+            $phrase = lang('Time.days', [abs($days)]);
+        } elseif ($hours !== 0) {
+            $phrase = lang('Time.hours', [abs($hours)]);
+            $before = $hours < 0;
+        } elseif ($minutes !== 0) {
+            $phrase = lang('Time.minutes', [abs($minutes)]);
+            $before = $minutes < 0;
+        } else {
+            return lang('Time.now');
+        }
+
+        return $before ? lang('Time.ago', [$phrase]) : lang('Time.inFuture', [$phrase]);
+    }
+
+    /**
+     * @param mixed $testTime
+     *
+     * @throws Exception
+     *
+     * @return TimeDifference
+     */
+    public function difference($testTime, ?string $timezone = null)
+    {
+        $testTime = $this->getUTCObject($testTime, $timezone);
+        $ourTime  = $this->getUTCObject($this);
+
+        return new TimeDifference($ourTime, $testTime);
+    }
+
+    //--------------------------------------------------------------------
+    // Utilities
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns a Time instance with the timezone converted to UTC.
+     *
+     * @param mixed $time
+     *
+     * @throws Exception
+     *
+     * @return DateTime|static
+     */
+    public function getUTCObject($time, ?string $timezone = null)
+    {
+        if ($time instanceof self) {
+            $time = $time->toDateTime();
+        } elseif (is_string($time)) {
+            $timezone = $timezone ?: $this->timezone;
+            $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+            $time     = new DateTime($time, $timezone);
+        }
+
+        if ($time instanceof DateTime || $time instanceof DateTimeImmutable) {
+            $time = $time->setTimezone(new DateTimeZone('UTC'));
+        }
+
+        return $time;
+    }
+
+    /**
+     * Returns the IntlCalendar object used for this object,
+     * taking into account the locale, date, etc.
+     *
+     * Primarily used internally to provide the difference and comparison functions,
+     * but available for public consumption if they need it.
+     *
+     * @throws Exception
+     *
+     * @return IntlCalendar
+     */
+    public function getCalendar()
+    {
+        return IntlCalendar::fromDateTime($this->toDateTimeString());
+    }
+
+    /**
+     * Check a time string to see if it includes a relative date (like 'next Tuesday').
+     */
+    protected static function hasRelativeKeywords(string $time): bool
+    {
+        // skip common format with a '-' in it
+        if (preg_match('/\d{4}-\d{1,2}-\d{1,2}/', $time) !== 1) {
+            return preg_match(static::$relativePattern, $time) > 0;
+        }
+
+        return false;
+    }
+
+    /**
+     * Outputs a short format version of the datetime.
+     *
+     * @throws Exception
+     */
+    public function __toString(): string
+    {
+        return IntlDateFormatter::formatObject($this->toDateTime(), $this->toStringFormat, $this->locale);
+    }
+
+    /**
+     * Allow for property-type access to any getX method...
+     *
+     * Note that we cannot use this for any of our setX methods,
+     * as they return new Time objects, but the __set ignores
+     * return values.
+     * See http://php.net/manual/en/language.oop5.overloading.php
+     *
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $method = 'get' . ucfirst($name);
+
+        if (method_exists($this, $method)) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    /**
+     * Allow for property-type checking to any getX method...
+     *
+     * @param string $name
+     */
+    public function __isset($name): bool
+    {
+        $method = 'get' . ucfirst($name);
+
+        return method_exists($this, $method);
+    }
+
+    /**
+     * This is called when we unserialize the Time object.
+     */
+    public function __wakeup(): void
+    {
+        /**
+         * Prior to unserialization, this is a string.
+         *
+         * @var string $timezone
+         */
+        $timezone = $this->timezone;
+
+        $this->timezone = new DateTimeZone($timezone);
+        parent::__construct($this->date, $this->timezone);
+    }
 }
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index dca1bb9571ed..2fcd09bd38e0 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
@@ -19,321 +19,284 @@
  */
 class TimeDifference
 {
-	/**
-	 * The timestamp of the "current" time.
-	 *
-	 * @var IntlCalendar
-	 */
-	protected $currentTime;
-
-	/**
-	 * The timestamp to compare the current time to.
-	 *
-	 * @var float
-	 */
-	protected $testTime;
-
-	/**
-	 * Eras.
-	 *
-	 * @var float
-	 */
-	protected $eras = 0;
-
-	/**
-	 * Years.
-	 *
-	 * @var float
-	 */
-	protected $years = 0;
-
-	/**
-	 * Months.
-	 *
-	 * @var float
-	 */
-	protected $months = 0;
-
-	/**
-	 * Weeks.
-	 *
-	 * @var integer
-	 */
-	protected $weeks = 0;
-
-	/**
-	 * Days.
-	 *
-	 * @var integer
-	 */
-	protected $days = 0;
-
-	/**
-	 * Hours.
-	 *
-	 * @var integer
-	 */
-	protected $hours = 0;
-
-	/**
-	 * Minutes.
-	 *
-	 * @var integer
-	 */
-	protected $minutes = 0;
-
-	/**
-	 * Seconds.
-	 *
-	 * @var integer
-	 */
-	protected $seconds = 0;
-
-	/**
-	 * Difference in seconds.
-	 *
-	 * @var integer
-	 */
-	protected $difference;
-
-	/**
-	 * Note: both parameters are required to be in the same timezone. No timezone
-	 * shifting is done internally.
-	 *
-	 * @param DateTime $currentTime
-	 * @param DateTime $testTime
-	 */
-	public function __construct(DateTime $currentTime, DateTime $testTime)
-	{
-		$this->difference = $currentTime->getTimestamp() - $testTime->getTimestamp();
-
-		$current = IntlCalendar::fromDateTime($currentTime);
-		$time    = IntlCalendar::fromDateTime($testTime)->getTime();
-
-		$this->currentTime = $current;
-		$this->testTime    = $time;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of years of difference between the two.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getYears(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / YEAR;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
-	}
-
-	/**
-	 * Returns the number of months difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getMonths(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / MONTH;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
-	}
-
-	/**
-	 * Returns the number of weeks difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getWeeks(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / WEEK;
-		}
-
-		$time = clone($this->currentTime);
-		return (int) ($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
-	}
-
-	/**
-	 * Returns the number of days difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getDays(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / DAY;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
-	}
-
-	/**
-	 * Returns the number of hours difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getHours(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / HOUR;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
-	}
-
-	/**
-	 * Returns the number of minutes difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return float|integer
-	 */
-	public function getMinutes(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference / MINUTE;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
-	}
-
-	/**
-	 * Returns the number of seconds difference between the two dates.
-	 *
-	 * @param boolean $raw
-	 *
-	 * @return integer
-	 */
-	public function getSeconds(bool $raw = false)
-	{
-		if ($raw)
-		{
-			return $this->difference;
-		}
-
-		$time = clone($this->currentTime);
-		return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_SECOND);
-	}
-
-	/**
-	 * Convert the time to human readable format
-	 *
-	 * @param string|null $locale
-	 *
-	 * @return string
-	 */
-	public function humanize(string $locale = null): string
-	{
-		$current = clone($this->currentTime);
-
-		$years   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
-		$months  = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
-		$days    = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
-		$hours   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
-		$minutes = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
-
-		$phrase = null;
-
-		if ($years !== 0)
-		{
-			$phrase = lang('Time.years', [abs($years)], $locale);
-			$before = $years < 0;
-		}
-		elseif ($months !== 0)
-		{
-			$phrase = lang('Time.months', [abs($months)], $locale);
-			$before = $months < 0;
-		}
-		elseif ($days !== 0 && (abs($days) >= 7))
-		{
-			$weeks  = ceil($days / 7);
-			$phrase = lang('Time.weeks', [abs($weeks)], $locale);
-			$before = $days < 0;
-		}
-		elseif ($days !== 0)
-		{
-			$phrase = lang('Time.days', [abs($days)], $locale);
-			$before = $days < 0;
-		}
-		elseif ($hours !== 0)
-		{
-			$phrase = lang('Time.hours', [abs($hours)], $locale);
-			$before = $hours < 0;
-		}
-		elseif ($minutes !== 0)
-		{
-			$phrase = lang('Time.minutes', [abs($minutes)], $locale);
-			$before = $minutes < 0;
-		}
-		else
-		{
-			return lang('Time.now', [], $locale);
-		}
-
-		return $before
-			? lang('Time.ago', [$phrase], $locale)
-			: lang('Time.inFuture', [$phrase], $locale);
-	}
-
-	/**
-	 * Allow property-like access to our calculated values.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	public function __get($name)
-	{
-		$name   = ucfirst(strtolower($name));
-		$method = "get{$name}";
-
-		if (method_exists($this, $method))
-		{
-			return $this->{$method}();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Allow property-like checking for our calculated values.
-	 *
-	 * @param string $name
-	 *
-	 * @return boolean
-	 */
-	public function __isset($name)
-	{
-		$name   = ucfirst(strtolower($name));
-		$method = "get{$name}";
-
-		return method_exists($this, $method);
-	}
+    /**
+     * The timestamp of the "current" time.
+     *
+     * @var IntlCalendar
+     */
+    protected $currentTime;
+
+    /**
+     * The timestamp to compare the current time to.
+     *
+     * @var float
+     */
+    protected $testTime;
+
+    /**
+     * Eras.
+     *
+     * @var float
+     */
+    protected $eras = 0;
+
+    /**
+     * Years.
+     *
+     * @var float
+     */
+    protected $years = 0;
+
+    /**
+     * Months.
+     *
+     * @var float
+     */
+    protected $months = 0;
+
+    /**
+     * Weeks.
+     *
+     * @var int
+     */
+    protected $weeks = 0;
+
+    /**
+     * Days.
+     *
+     * @var int
+     */
+    protected $days = 0;
+
+    /**
+     * Hours.
+     *
+     * @var int
+     */
+    protected $hours = 0;
+
+    /**
+     * Minutes.
+     *
+     * @var int
+     */
+    protected $minutes = 0;
+
+    /**
+     * Seconds.
+     *
+     * @var int
+     */
+    protected $seconds = 0;
+
+    /**
+     * Difference in seconds.
+     *
+     * @var int
+     */
+    protected $difference;
+
+    /**
+     * Note: both parameters are required to be in the same timezone. No timezone
+     * shifting is done internally.
+     */
+    public function __construct(DateTime $currentTime, DateTime $testTime)
+    {
+        $this->difference = $currentTime->getTimestamp() - $testTime->getTimestamp();
+
+        $current = IntlCalendar::fromDateTime($currentTime);
+        $time    = IntlCalendar::fromDateTime($testTime)->getTime();
+
+        $this->currentTime = $current;
+        $this->testTime    = $time;
+    }
+
+    /**
+     * Returns the number of years of difference between the two.
+     *
+     * @return float|int
+     */
+    public function getYears(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / YEAR;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
+    }
+
+    /**
+     * Returns the number of months difference between the two dates.
+     *
+     * @return float|int
+     */
+    public function getMonths(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / MONTH;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
+    }
+
+    /**
+     * Returns the number of weeks difference between the two dates.
+     *
+     * @return float|int
+     */
+    public function getWeeks(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / WEEK;
+        }
+
+        $time = clone $this->currentTime;
+
+        return (int) ($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
+    }
+
+    /**
+     * Returns the number of days difference between the two dates.
+     *
+     * @return float|int
+     */
+    public function getDays(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / DAY;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
+    }
+
+    /**
+     * Returns the number of hours difference between the two dates.
+     *
+     * @return float|int
+     */
+    public function getHours(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / HOUR;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
+    }
+
+    /**
+     * Returns the number of minutes difference between the two dates.
+     *
+     * @return float|int
+     */
+    public function getMinutes(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference / MINUTE;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
+    }
+
+    /**
+     * Returns the number of seconds difference between the two dates.
+     *
+     * @return int
+     */
+    public function getSeconds(bool $raw = false)
+    {
+        if ($raw) {
+            return $this->difference;
+        }
+
+        $time = clone $this->currentTime;
+
+        return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_SECOND);
+    }
+
+    /**
+     * Convert the time to human readable format
+     */
+    public function humanize(?string $locale = null): string
+    {
+        $current = clone $this->currentTime;
+
+        $years   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
+        $months  = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
+        $days    = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
+        $hours   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
+        $minutes = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
+
+        $phrase = null;
+
+        if ($years !== 0) {
+            $phrase = lang('Time.years', [abs($years)], $locale);
+            $before = $years < 0;
+        } elseif ($months !== 0) {
+            $phrase = lang('Time.months', [abs($months)], $locale);
+            $before = $months < 0;
+        } elseif ($days !== 0 && (abs($days) >= 7)) {
+            $weeks  = ceil($days / 7);
+            $phrase = lang('Time.weeks', [abs($weeks)], $locale);
+            $before = $days < 0;
+        } elseif ($days !== 0) {
+            $phrase = lang('Time.days', [abs($days)], $locale);
+            $before = $days < 0;
+        } elseif ($hours !== 0) {
+            $phrase = lang('Time.hours', [abs($hours)], $locale);
+            $before = $hours < 0;
+        } elseif ($minutes !== 0) {
+            $phrase = lang('Time.minutes', [abs($minutes)], $locale);
+            $before = $minutes < 0;
+        } else {
+            return lang('Time.now', [], $locale);
+        }
+
+        return $before
+            ? lang('Time.ago', [$phrase], $locale)
+            : lang('Time.inFuture', [$phrase], $locale);
+    }
+
+    /**
+     * Allow property-like access to our calculated values.
+     *
+     * @param string $name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $name   = ucfirst(strtolower($name));
+        $method = "get{$name}";
+
+        if (method_exists($this, $method)) {
+            return $this->{$method}();
+        }
+
+        return null;
+    }
+
+    /**
+     * Allow property-like checking for our calculated values.
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        $name   = ucfirst(strtolower($name));
+        $method = "get{$name}";
+
+        return method_exists($this, $method);
+    }
 }
diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php
index 451192c54179..3343f6d0c806 100644
--- a/system/Images/Exceptions/ImageException.php
+++ b/system/Images/Exceptions/ImageException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Exceptions;
@@ -16,53 +16,53 @@
 
 class ImageException extends FrameworkException implements ExceptionInterface
 {
-	public static function forMissingImage()
-	{
-		return new static(lang('Images.sourceImageRequired'));
-	}
+    public static function forMissingImage()
+    {
+        return new static(lang('Images.sourceImageRequired'));
+    }
 
-	public static function forFileNotSupported()
-	{
-		return new static(lang('Images.fileNotSupported'));
-	}
+    public static function forFileNotSupported()
+    {
+        return new static(lang('Images.fileNotSupported'));
+    }
 
-	public static function forMissingAngle()
-	{
-		return new static(lang('Images.rotationAngleRequired'));
-	}
+    public static function forMissingAngle()
+    {
+        return new static(lang('Images.rotationAngleRequired'));
+    }
 
-	public static function forInvalidDirection(string $dir = null)
-	{
-		return new static(lang('Images.invalidDirection', [$dir]));
-	}
+    public static function forInvalidDirection(?string $dir = null)
+    {
+        return new static(lang('Images.invalidDirection', [$dir]));
+    }
 
-	public static function forInvalidPath()
-	{
-		return new static(lang('Images.invalidPath'));
-	}
+    public static function forInvalidPath()
+    {
+        return new static(lang('Images.invalidPath'));
+    }
 
-	public static function forEXIFUnsupported()
-	{
-		return new static(lang('Images.exifNotSupported'));
-	}
+    public static function forEXIFUnsupported()
+    {
+        return new static(lang('Images.exifNotSupported'));
+    }
 
-	public static function forInvalidImageCreate(string $extra = null)
-	{
-		return new static(lang('Images.unsupportedImageCreate') . ' ' . $extra);
-	}
+    public static function forInvalidImageCreate(?string $extra = null)
+    {
+        return new static(lang('Images.unsupportedImageCreate') . ' ' . $extra);
+    }
 
-	public static function forSaveFailed()
-	{
-		return new static(lang('Images.saveFailed'));
-	}
+    public static function forSaveFailed()
+    {
+        return new static(lang('Images.saveFailed'));
+    }
 
-	public static function forInvalidImageLibraryPath(string $path = null)
-	{
-		return new static(lang('Images.libPathInvalid', [$path]));
-	}
+    public static function forInvalidImageLibraryPath(?string $path = null)
+    {
+        return new static(lang('Images.libPathInvalid', [$path]));
+    }
 
-	public static function forImageProcessFailed()
-	{
-		return new static(lang('Images.imageProcessFailed'));
-	}
+    public static function forImageProcessFailed()
+    {
+        return new static(lang('Images.imageProcessFailed'));
+    }
 }
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index b721bce21a0f..3e0d81c2dc68 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
@@ -22,880 +22,754 @@
  */
 abstract class BaseHandler implements ImageHandlerInterface
 {
-	/**
-	 * Configuration settings.
-	 *
-	 * @var Images
-	 */
-	protected $config;
-
-	/**
-	 * The image/file instance
-	 *
-	 * @var Image
-	 */
-	protected $image;
-
-	/**
-	 * Whether the image file has been confirmed.
-	 *
-	 * @var boolean
-	 */
-	protected $verified = false;
-
-	/**
-	 * Image width.
-	 *
-	 * @var integer
-	 */
-	protected $width = 0;
-
-	/**
-	 * Image height.
-	 *
-	 * @var integer
-	 */
-	protected $height = 0;
-
-	/**
-	 * File permission mask.
-	 *
-	 * @var integer
-	 */
-	protected $filePermissions = 0644;
-
-	/**
-	 * X-axis.
-	 *
-	 * @var integer|null
-	 */
-	protected $xAxis = 0;
-
-	/**
-	 * Y-axis.
-	 *
-	 * @var integer|null
-	 */
-	protected $yAxis = 0;
-
-	/**
-	 * Master dimensioning.
-	 *
-	 * @var string
-	 */
-	protected $masterDim = 'auto';
-
-	/**
-	 * Default options for text watermarking.
-	 *
-	 * @var array
-	 */
-	protected $textDefaults = [
-		'fontPath'     => null,
-		'fontSize'     => 16,
-		'color'        => 'ffffff',
-		'opacity'      => 1.0,
-		'vAlign'       => 'bottom',
-		'hAlign'       => 'center',
-		'vOffset'      => 0,
-		'hOffset'      => 0,
-		'padding'      => 0,
-		'withShadow'   => false,
-		'shadowColor'  => '000000',
-		'shadowOffset' => 3,
-	];
-
-	/**
-	 * Image types with support for transparency.
-	 *
-	 * @var array
-	 */
-	protected $supportTransparency = [
-		IMAGETYPE_PNG,
-		IMAGETYPE_WEBP,
-	];
-
-	/**
-	 * Temporary image used by the different engines.
-	 *
-	 * @var resource|null
-	 */
-	protected $resource;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param Images|null $config
-	 */
-	public function __construct($config = null)
-	{
-		$this->config = $config ?? new Images();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets another image for this handler to work on.
-	 * Keeps us from needing to continually instantiate the handler.
-	 *
-	 * @param string $path
-	 *
-	 * @return $this
-	 */
-	public function withFile(string $path)
-	{
-		// Clear out the old resource so that
-		// it doesn't try to use a previous image
-		$this->resource = null;
-		$this->verified = false;
-
-		$this->image = new Image($path, true);
-
-		$this->image->getProperties(false);
-		$this->width  = $this->image->origWidth;
-		$this->height = $this->image->origHeight;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Make the image resource object if needed
-	 */
-	protected abstract function ensureResource();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the image instance.
-	 *
-	 * @return Image
-	 */
-	public function getFile()
-	{
-		return $this->image;
-	}
-
-	/**
-	 * Verifies that a file has been supplied and it is an image.
-	 *
-	 * @return Image  The image instance
-	 * @throws ImageException
-	 */
-	protected function image(): Image
-	{
-		if ($this->verified)
-		{
-			return $this->image;
-		}
-
-		// Verify withFile has been called
-		if (empty($this->image))
-		{
-			throw ImageException::forMissingImage();
-		}
-
-		// Verify the loaded image is an Image instance
-		if (! $this->image instanceof Image)
-		{
-			throw ImageException::forInvalidPath();
-		}
-
-		// File::__construct has verified the file exists - make sure it is an image
-		if (! is_int($this->image->imageType))
-		{
-			throw ImageException::forFileNotSupported();
-		}
-
-		// Note that the image has been verified
-		$this->verified = true;
-
-		return $this->image;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the temporary image used during the image processing.
-	 * Good for extending the system or doing things this library
-	 * is not intended to do.
-	 *
-	 * @return resource
-	 */
-	public function getResource()
-	{
-		$this->ensureResource();
-		return $this->resource;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Load the temporary image used during the image processing.
-	 * Some functions e.g. save() will only copy and not compress
-	 * your image otherwise.
-	 *
-	 * @return $this
-	 */
-	public function withResource()
-	{
-		$this->ensureResource();
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resize the image
-	 *
-	 * @param integer $width
-	 * @param integer $height
-	 * @param boolean $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
-	 * @param string  $masterDim
-	 *
-	 * @return BaseHandler
-	 */
-	public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
-	{
-		// If the target width/height match the source, then we have nothing to do here.
-		if ($this->image()->origWidth === $width && $this->image()->origHeight === $height)
-		{
-			return $this;
-		}
-
-		$this->width  = $width;
-		$this->height = $height;
-
-		if ($maintainRatio)
-		{
-			$this->masterDim = $masterDim;
-			$this->reproportion();
-		}
-
-		return $this->_resize($maintainRatio);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Crops the image to the desired height and width. If one of the height/width values
-	 * is not provided, that value will be set the appropriate value based on offsets and
-	 * image dimensions.
-	 *
-	 * @param integer|null $width
-	 * @param integer|null $height
-	 * @param integer|null $x             X-axis coord to start cropping from the left of image
-	 * @param integer|null $y             Y-axis coord to start cropping from the top of image
-	 * @param boolean      $maintainRatio
-	 * @param string       $masterDim
-	 *
-	 * @return $this
-	 */
-	public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
-	{
-		$this->width  = $width;
-		$this->height = $height;
-		$this->xAxis  = $x;
-		$this->yAxis  = $y;
-
-		if ($maintainRatio)
-		{
-			$this->masterDim = $masterDim;
-			$this->reproportion();
-		}
-
-		$result = $this->_crop();
-
-		$this->xAxis = null;
-		$this->yAxis = null;
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Changes the stored image type to indicate the new file format to use when saving.
-	 * Does not touch the actual resource.
-	 *
-	 * @param integer $imageType A PHP imageType constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
-	 *
-	 * @return $this
-	 */
-	public function convert(int $imageType)
-	{
-		$this->image()->imageType = $imageType;
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rotates the image on the current canvas.
-	 *
-	 * @param float $angle
-	 *
-	 * @return $this
-	 */
-	public function rotate(float $angle)
-	{
-		// Allowed rotation values
-		$degs = [
-			90.0,
-			180.0,
-			270.0,
-		];
-
-		if (! in_array($angle, $degs, true))
-		{
-			throw ImageException::forMissingAngle();
-		}
-
-		// cast angle as an int, for our use
-		$angle = (int) $angle;
-
-		// Reassign the width and height
-		if ($angle === 90 || $angle === 270)
-		{
-			$temp         = $this->height;
-			$this->width  = $this->height;
-			$this->height = $temp;
-		}
-
-		// Call the Handler-specific version.
-		$this->_rotate($angle);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flattens transparencies, default white background
-	 *
-	 * @param integer $red
-	 * @param integer $green
-	 * @param integer $blue
-	 *
-	 * @return $this
-	 */
-	public function flatten(int $red = 255, int $green = 255, int $blue = 255)
-	{
-		$this->width  = $this->image()->origWidth;
-		$this->height = $this->image()->origHeight;
-
-		return $this->_flatten($red, $green, $blue);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method to flattening an image's transparencies.
-	 *
-	 * @param integer $red
-	 * @param integer $green
-	 * @param integer $blue
-	 *
-	 * @return   $this
-	 * @internal
-	 */
-	protected abstract function _flatten(int $red = 255, int $green = 255, int $blue = 255);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method to handle rotating an image in 90 degree increments.
-	 *
-	 * @param integer $angle
-	 *
-	 * @return mixed
-	 */
-	protected abstract function _rotate(int $angle);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flips an image either horizontally or vertically.
-	 *
-	 * @param string $dir Either 'vertical' or 'horizontal'
-	 *
-	 * @return $this
-	 */
-	public function flip(string $dir = 'vertical')
-	{
-		$dir = strtolower($dir);
-
-		if ($dir !== 'vertical' && $dir !== 'horizontal')
-		{
-			throw ImageException::forInvalidDirection($dir);
-		}
-
-		return $this->_flip($dir);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method to handle flipping an image along its
-	 * horizontal or vertical axis.
-	 *
-	 * @param string $direction
-	 *
-	 * @return $this
-	 */
-	protected abstract function _flip(string $direction);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Overlays a string of text over the image.
-	 *
-	 * Valid options:
-	 *
-	 *  - color         Text Color (hex number)
-	 *  - shadowColor   Color of the shadow (hex number)
-	 *  - hAlign        Horizontal alignment: left, center, right
-	 *  - vAlign        Vertical alignment: top, middle, bottom
-	 *  - hOffset
-	 *  - vOffset
-	 *  - fontPath
-	 *  - fontSize
-	 *  - shadowOffset
-	 *
-	 * @param string $text
-	 * @param array  $options
-	 *
-	 * @return $this
-	 */
-	public function text(string $text, array $options = [])
-	{
-		$options                = array_merge($this->textDefaults, $options);
-		$options['color']       = trim($options['color'], '# ');
-		$options['shadowColor'] = trim($options['shadowColor'], '# ');
-
-		$this->_text($text, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method for overlaying text on an image.
-	 *
-	 * @param string $text
-	 * @param array  $options
-	 */
-	protected abstract function _text(string $text, array $options = []);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles the actual resizing of the image.
-	 *
-	 * @param boolean $maintainRatio
-	 *
-	 * @return $this
-	 */
-	public abstract function _resize(bool $maintainRatio = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Crops the image.
-	 *
-	 * @return $this
-	 */
-	public abstract function _crop();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return image width.
-	 *
-	 * @return integer
-	 */
-	public abstract function _getWidth();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the height of an image.
-	 *
-	 * @return integer
-	 */
-	public abstract function _getHeight();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reads the EXIF information from the image and modifies the orientation
-	 * so that displays correctly in the browser. This is especially an issue
-	 * with images taken by smartphones who always store the image up-right,
-	 * but set the orientation flag to display it correctly.
-	 *
-	 * @param boolean $silent If true, will ignore exceptions when PHP doesn't support EXIF.
-	 *
-	 * @return $this
-	 */
-	public function reorient(bool $silent = false)
-	{
-		$orientation = $this->getEXIF('Orientation', $silent);
-
-		switch ($orientation)
-		{
-			case 2:
-				return $this->flip('horizontal');
-			case 3:
-				return $this->rotate(180);
-			case 4:
-				return $this->rotate(180)
-								->flip('horizontal');
-			case 5:
-				return $this->rotate(270)
-								->flip('horizontal');
-			case 6:
-				return $this->rotate(270);
-			case 7:
-				return $this->rotate(90)
-								->flip('horizontal');
-			case 8:
-				return $this->rotate(90);
-			default:
-				return $this;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the EXIF information from the image, if possible. Returns
-	 * an array of the information, or null if nothing can be found.
-	 *
-	 * EXIF data is only supported fr JPEG & TIFF formats.
-	 *
-	 * @param string|null $key    If specified, will only return this piece of EXIF data.
-	 * @param boolean     $silent If true, will not throw our own exceptions.
-	 *
-	 * @throws ImageException
-	 *
-	 * @return mixed
-	 */
-	public function getEXIF(string $key = null, bool $silent = false)
-	{
-		if (! function_exists('exif_read_data'))
-		{
-			if ($silent)
-			{
-				return null;
-			}
-
-			throw ImageException::forEXIFUnsupported(); // @codeCoverageIgnore
-		}
-
-		$exif = null; // default
-		switch ($this->image()->imageType)
-		{
-			case IMAGETYPE_JPEG:
-			case IMAGETYPE_TIFF_II:
-				$exif = @exif_read_data($this->image()->getPathname());
-				if (! is_null($key) && is_array($exif))
-				{
-					$exif = $exif[$key] ?? false;
-				}
-		}
-
-		return $exif;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Combine cropping and resizing into a single command.
-	 *
-	 * Supported positions:
-	 *  - top-left
-	 *  - top
-	 *  - top-right
-	 *  - left
-	 *  - center
-	 *  - right
-	 *  - bottom-left
-	 *  - bottom
-	 *  - bottom-right
-	 *
-	 * @param integer $width
-	 * @param integer $height
-	 * @param string  $position
-	 *
-	 * @return BaseHandler
-	 */
-	public function fit(int $width, int $height = null, string $position = 'center')
-	{
-		$origWidth  = $this->image()->origWidth;
-		$origHeight = $this->image()->origHeight;
-
-		[$cropWidth, $cropHeight] = $this->calcAspectRatio($width, $height, $origWidth, $origHeight);
-
-		if (is_null($height))
-		{
-			$height = ceil(($width / $cropWidth) * $cropHeight);
-		}
-
-		[$x, $y] = $this->calcCropCoords($cropWidth, $cropHeight, $origWidth, $origHeight, $position);
-
-		return $this->crop($cropWidth, $cropHeight, $x, $y)
-						->resize($width, $height);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Calculate image aspect ratio.
-	 *
-	 * @param integer|float      $width
-	 * @param integer|float|null $height
-	 * @param integer|float      $origWidth
-	 * @param integer|float      $origHeight
-	 *
-	 * @return array
-	 */
-	protected function calcAspectRatio($width, $height = null, $origWidth = 0, $origHeight = 0): array
-	{
-		if (empty($origWidth) || empty($origHeight))
-		{
-			throw new InvalidArgumentException('You must supply the parameters: origWidth, origHeight.');
-		}
-
-		// If $height is null, then we have it easy.
-		// Calc based on full image size and be done.
-		if (is_null($height))
-		{
-			$height = ($width / $origWidth) * $origHeight;
-
-			return [
-				$width,
-				(int) $height,
-			];
-		}
-
-		$xRatio = $width / $origWidth;
-		$yRatio = $height / $origHeight;
-
-		if ($xRatio > $yRatio)
-		{
-			return [
-				$origWidth,
-				(int) ($origWidth * $height / $width),
-			];
-		}
-
-		return [
-			(int) ($origHeight * $width / $height),
-			$origHeight,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Based on the position, will determine the correct x/y coords to
-	 * crop the desired portion from the image.
-	 *
-	 * @param integer|float $width
-	 * @param integer|float $height
-	 * @param integer|float $origWidth
-	 * @param integer|float $origHeight
-	 * @param string        $position
-	 *
-	 * @return array
-	 */
-	protected function calcCropCoords($width, $height, $origWidth, $origHeight, $position): array
-	{
-		$position = strtolower($position);
-
-		$x = $y = 0;
-
-		switch ($position)
-		{
-			case 'top-left':
-				$x = 0;
-				$y = 0;
-				break;
-			case 'top':
-				$x = floor(($origWidth - $width) / 2);
-				$y = 0;
-				break;
-			case 'top-right':
-				$x = $origWidth - $width;
-				$y = 0;
-				break;
-			case 'left':
-				$x = 0;
-				$y = floor(($origHeight - $height) / 2);
-				break;
-			case 'center':
-				$x = floor(($origWidth - $width) / 2);
-				$y = floor(($origHeight - $height) / 2);
-				break;
-			case 'right':
-				$x = ($origWidth - $width);
-				$y = floor(($origHeight - $height) / 2);
-				break;
-			case 'bottom-left':
-				$x = 0;
-				$y = $origHeight - $height;
-				break;
-			case 'bottom':
-				$x = floor(($origWidth - $width) / 2);
-				$y = $origHeight - $height;
-				break;
-			case 'bottom-right':
-				$x = ($origWidth - $width);
-				$y = $origHeight - $height;
-				break;
-		}
-
-		return [
-			$x,
-			$y,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get the version of the image library in use.
-	 *
-	 * @return string
-	 */
-	public abstract function getVersion();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves any changes that have been made to file.
-	 *
-	 * Example:
-	 *    $image->resize(100, 200, true)
-	 *          ->save($target);
-	 *
-	 * @param string|null $target
-	 * @param integer     $quality
-	 *
-	 * @return boolean
-	 */
-	public abstract function save(string $target = null, int $quality = 90);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the driver-specific processing of the image.
-	 *
-	 * @param string $action
-	 *
-	 * @return mixed
-	 */
-	protected abstract function process(string $action);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provide access to the Image class' methods if they don't exist
-	 * on the handler itself.
-	 *
-	 * @param string $name
-	 * @param array  $args
-	 *
-	 * @return mixed
-	 */
-	public function __call(string $name, array $args = [])
-	{
-		if (method_exists($this->image(), $name))
-		{
-			return $this->image()->$name(...$args);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Re-proportion Image Width/Height
-	 *
-	 * When creating thumbs, the desired width/height
-	 * can end up warping the image due to an incorrect
-	 * ratio between the full-sized image and the thumb.
-	 *
-	 * This function lets us re-proportion the width/height
-	 * if users choose to maintain the aspect ratio when resizing.
-	 *
-	 * @return void
-	 */
-	protected function reproportion()
-	{
-		if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)
-		)
-		{
-			return;
-		}
-
-		// Sanitize
-		$this->width  = (int) $this->width;
-		$this->height = (int) $this->height;
-
-		if ($this->masterDim !== 'width' && $this->masterDim !== 'height')
-		{
-			if ($this->width > 0 && $this->height > 0)
-			{
-				$this->masterDim = ((($this->image()->origHeight / $this->image()->origWidth) - ($this->height / $this->width)) < 0) ? 'width' : 'height';
-			}
-			else
-			{
-				$this->masterDim = ($this->height === 0) ? 'width' : 'height';
-			}
-		}
-		elseif (($this->masterDim === 'width' && $this->width === 0) || ($this->masterDim === 'height' && $this->height === 0)
-		)
-		{
-			return;
-		}
-
-		if ($this->masterDim === 'width')
-		{
-			$this->height = (int) ceil($this->width * $this->image()->origHeight / $this->image()->origWidth);
-		}
-		else
-		{
-			$this->width = (int) ceil($this->image()->origWidth * $this->height / $this->image()->origHeight);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return image width.
-	 *
-	 * accessor for testing; not part of interface
-	 *
-	 * @return integer
-	 */
-	public function getWidth()
-	{
-		return ($this->resource !== null) ? $this->_getWidth() : $this->width;
-	}
-
-	/**
-	 * Return image height.
-	 *
-	 * accessor for testing; not part of interface
-	 *
-	 * @return integer
-	 */
-	public function getHeight()
-	{
-		return ($this->resource !== null) ? $this->_getHeight() : $this->height;
-	}
+    /**
+     * Configuration settings.
+     *
+     * @var Images
+     */
+    protected $config;
+
+    /**
+     * The image/file instance
+     *
+     * @var Image
+     */
+    protected $image;
+
+    /**
+     * Whether the image file has been confirmed.
+     *
+     * @var bool
+     */
+    protected $verified = false;
+
+    /**
+     * Image width.
+     *
+     * @var int
+     */
+    protected $width = 0;
+
+    /**
+     * Image height.
+     *
+     * @var int
+     */
+    protected $height = 0;
+
+    /**
+     * File permission mask.
+     *
+     * @var int
+     */
+    protected $filePermissions = 0644;
+
+    /**
+     * X-axis.
+     *
+     * @var int|null
+     */
+    protected $xAxis = 0;
+
+    /**
+     * Y-axis.
+     *
+     * @var int|null
+     */
+    protected $yAxis = 0;
+
+    /**
+     * Master dimensioning.
+     *
+     * @var string
+     */
+    protected $masterDim = 'auto';
+
+    /**
+     * Default options for text watermarking.
+     *
+     * @var array
+     */
+    protected $textDefaults = [
+        'fontPath'     => null,
+        'fontSize'     => 16,
+        'color'        => 'ffffff',
+        'opacity'      => 1.0,
+        'vAlign'       => 'bottom',
+        'hAlign'       => 'center',
+        'vOffset'      => 0,
+        'hOffset'      => 0,
+        'padding'      => 0,
+        'withShadow'   => false,
+        'shadowColor'  => '000000',
+        'shadowOffset' => 3,
+    ];
+
+    /**
+     * Image types with support for transparency.
+     *
+     * @var array
+     */
+    protected $supportTransparency = [
+        IMAGETYPE_PNG,
+        IMAGETYPE_WEBP,
+    ];
+
+    /**
+     * Temporary image used by the different engines.
+     *
+     * @var resource|null
+     */
+    protected $resource;
+
+    /**
+     * Constructor.
+     *
+     * @param Images|null $config
+     */
+    public function __construct($config = null)
+    {
+        $this->config = $config ?? new Images();
+    }
+
+    /**
+     * Sets another image for this handler to work on.
+     * Keeps us from needing to continually instantiate the handler.
+     *
+     * @return $this
+     */
+    public function withFile(string $path)
+    {
+        // Clear out the old resource so that
+        // it doesn't try to use a previous image
+        $this->resource = null;
+        $this->verified = false;
+
+        $this->image = new Image($path, true);
+
+        $this->image->getProperties(false);
+        $this->width  = $this->image->origWidth;
+        $this->height = $this->image->origHeight;
+
+        return $this;
+    }
+
+    /**
+     * Make the image resource object if needed
+     */
+    abstract protected function ensureResource();
+
+    /**
+     * Returns the image instance.
+     *
+     * @return Image
+     */
+    public function getFile()
+    {
+        return $this->image;
+    }
+
+    /**
+     * Verifies that a file has been supplied and it is an image.
+     *
+     * @throws ImageException
+     *
+     * @return Image The image instance
+     */
+    protected function image(): Image
+    {
+        if ($this->verified) {
+            return $this->image;
+        }
+
+        // Verify withFile has been called
+        if (empty($this->image)) {
+            throw ImageException::forMissingImage();
+        }
+
+        // Verify the loaded image is an Image instance
+        if (! $this->image instanceof Image) {
+            throw ImageException::forInvalidPath();
+        }
+
+        // File::__construct has verified the file exists - make sure it is an image
+        if (! is_int($this->image->imageType)) {
+            throw ImageException::forFileNotSupported();
+        }
+
+        // Note that the image has been verified
+        $this->verified = true;
+
+        return $this->image;
+    }
+
+    /**
+     * Returns the temporary image used during the image processing.
+     * Good for extending the system or doing things this library
+     * is not intended to do.
+     *
+     * @return resource
+     */
+    public function getResource()
+    {
+        $this->ensureResource();
+
+        return $this->resource;
+    }
+
+    /**
+     * Load the temporary image used during the image processing.
+     * Some functions e.g. save() will only copy and not compress
+     * your image otherwise.
+     *
+     * @return $this
+     */
+    public function withResource()
+    {
+        $this->ensureResource();
+
+        return $this;
+    }
+
+    /**
+     * Resize the image
+     *
+     * @param bool $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
+     *
+     * @return BaseHandler
+     */
+    public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
+    {
+        // If the target width/height match the source, then we have nothing to do here.
+        if ($this->image()->origWidth === $width && $this->image()->origHeight === $height) {
+            return $this;
+        }
+
+        $this->width  = $width;
+        $this->height = $height;
+
+        if ($maintainRatio) {
+            $this->masterDim = $masterDim;
+            $this->reproportion();
+        }
+
+        return $this->_resize($maintainRatio);
+    }
+
+    /**
+     * Crops the image to the desired height and width. If one of the height/width values
+     * is not provided, that value will be set the appropriate value based on offsets and
+     * image dimensions.
+     *
+     * @param int|null $x X-axis coord to start cropping from the left of image
+     * @param int|null $y Y-axis coord to start cropping from the top of image
+     *
+     * @return $this
+     */
+    public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
+    {
+        $this->width  = $width;
+        $this->height = $height;
+        $this->xAxis  = $x;
+        $this->yAxis  = $y;
+
+        if ($maintainRatio) {
+            $this->masterDim = $masterDim;
+            $this->reproportion();
+        }
+
+        $result = $this->_crop();
+
+        $this->xAxis = null;
+        $this->yAxis = null;
+
+        return $result;
+    }
+
+    /**
+     * Changes the stored image type to indicate the new file format to use when saving.
+     * Does not touch the actual resource.
+     *
+     * @param int $imageType A PHP imageType constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+     *
+     * @return $this
+     */
+    public function convert(int $imageType)
+    {
+        $this->image()->imageType = $imageType;
+
+        return $this;
+    }
+
+    /**
+     * Rotates the image on the current canvas.
+     *
+     * @return $this
+     */
+    public function rotate(float $angle)
+    {
+        // Allowed rotation values
+        $degs = [
+            90.0,
+            180.0,
+            270.0,
+        ];
+
+        if (! in_array($angle, $degs, true)) {
+            throw ImageException::forMissingAngle();
+        }
+
+        // cast angle as an int, for our use
+        $angle = (int) $angle;
+
+        // Reassign the width and height
+        if ($angle === 90 || $angle === 270) {
+            $temp         = $this->height;
+            $this->width  = $this->height;
+            $this->height = $temp;
+        }
+
+        // Call the Handler-specific version.
+        $this->_rotate($angle);
+
+        return $this;
+    }
+
+    /**
+     * Flattens transparencies, default white background
+     *
+     * @return $this
+     */
+    public function flatten(int $red = 255, int $green = 255, int $blue = 255)
+    {
+        $this->width  = $this->image()->origWidth;
+        $this->height = $this->image()->origHeight;
+
+        return $this->_flatten($red, $green, $blue);
+    }
+
+    /**
+     * Handler-specific method to flattening an image's transparencies.
+     *
+     * @return $this
+     *
+     * @internal
+     */
+    abstract protected function _flatten(int $red = 255, int $green = 255, int $blue = 255);
+
+    /**
+     * Handler-specific method to handle rotating an image in 90 degree increments.
+     *
+     * @return mixed
+     */
+    abstract protected function _rotate(int $angle);
+
+    /**
+     * Flips an image either horizontally or vertically.
+     *
+     * @param string $dir Either 'vertical' or 'horizontal'
+     *
+     * @return $this
+     */
+    public function flip(string $dir = 'vertical')
+    {
+        $dir = strtolower($dir);
+
+        if ($dir !== 'vertical' && $dir !== 'horizontal') {
+            throw ImageException::forInvalidDirection($dir);
+        }
+
+        return $this->_flip($dir);
+    }
+
+    /**
+     * Handler-specific method to handle flipping an image along its
+     * horizontal or vertical axis.
+     *
+     * @return $this
+     */
+    abstract protected function _flip(string $direction);
+
+    /**
+     * Overlays a string of text over the image.
+     *
+     * Valid options:
+     *
+     *  - color         Text Color (hex number)
+     *  - shadowColor   Color of the shadow (hex number)
+     *  - hAlign        Horizontal alignment: left, center, right
+     *  - vAlign        Vertical alignment: top, middle, bottom
+     *  - hOffset
+     *  - vOffset
+     *  - fontPath
+     *  - fontSize
+     *  - shadowOffset
+     *
+     * @return $this
+     */
+    public function text(string $text, array $options = [])
+    {
+        $options                = array_merge($this->textDefaults, $options);
+        $options['color']       = trim($options['color'], '# ');
+        $options['shadowColor'] = trim($options['shadowColor'], '# ');
+
+        $this->_text($text, $options);
+
+        return $this;
+    }
+
+    /**
+     * Handler-specific method for overlaying text on an image.
+     */
+    abstract protected function _text(string $text, array $options = []);
+
+    /**
+     * Handles the actual resizing of the image.
+     *
+     * @return $this
+     */
+    abstract public function _resize(bool $maintainRatio = false);
+
+    /**
+     * Crops the image.
+     *
+     * @return $this
+     */
+    abstract public function _crop();
+
+    /**
+     * Return image width.
+     *
+     * @return int
+     */
+    abstract public function _getWidth();
+
+    /**
+     * Return the height of an image.
+     *
+     * @return int
+     */
+    abstract public function _getHeight();
+
+    /**
+     * Reads the EXIF information from the image and modifies the orientation
+     * so that displays correctly in the browser. This is especially an issue
+     * with images taken by smartphones who always store the image up-right,
+     * but set the orientation flag to display it correctly.
+     *
+     * @param bool $silent If true, will ignore exceptions when PHP doesn't support EXIF.
+     *
+     * @return $this
+     */
+    public function reorient(bool $silent = false)
+    {
+        $orientation = $this->getEXIF('Orientation', $silent);
+
+        switch ($orientation) {
+            case 2:
+                return $this->flip('horizontal');
+
+            case 3:
+                return $this->rotate(180);
+
+            case 4:
+                return $this->rotate(180)->flip('horizontal');
+
+            case 5:
+                return $this->rotate(270)->flip('horizontal');
+
+            case 6:
+                return $this->rotate(270);
+
+            case 7:
+                return $this->rotate(90)->flip('horizontal');
+
+            case 8:
+                return $this->rotate(90);
+
+            default:
+                return $this;
+        }
+    }
+
+    /**
+     * Retrieve the EXIF information from the image, if possible. Returns
+     * an array of the information, or null if nothing can be found.
+     *
+     * EXIF data is only supported fr JPEG & TIFF formats.
+     *
+     * @param string|null $key    If specified, will only return this piece of EXIF data.
+     * @param bool        $silent If true, will not throw our own exceptions.
+     *
+     * @throws ImageException
+     *
+     * @return mixed
+     */
+    public function getEXIF(?string $key = null, bool $silent = false)
+    {
+        if (! function_exists('exif_read_data')) {
+            if ($silent) {
+                return null;
+            }
+
+            throw ImageException::forEXIFUnsupported(); // @codeCoverageIgnore
+        }
+
+        $exif = null; // default
+
+        switch ($this->image()->imageType) {
+            case IMAGETYPE_JPEG:
+            case IMAGETYPE_TIFF_II:
+                $exif = @exif_read_data($this->image()->getPathname());
+                if ($key !== null && is_array($exif)) {
+                    $exif = $exif[$key] ?? false;
+                }
+        }
+
+        return $exif;
+    }
+
+    /**
+     * Combine cropping and resizing into a single command.
+     *
+     * Supported positions:
+     *  - top-left
+     *  - top
+     *  - top-right
+     *  - left
+     *  - center
+     *  - right
+     *  - bottom-left
+     *  - bottom
+     *  - bottom-right
+     *
+     * @param int $height
+     *
+     * @return BaseHandler
+     */
+    public function fit(int $width, ?int $height = null, string $position = 'center')
+    {
+        $origWidth  = $this->image()->origWidth;
+        $origHeight = $this->image()->origHeight;
+
+        [$cropWidth, $cropHeight] = $this->calcAspectRatio($width, $height, $origWidth, $origHeight);
+
+        if ($height === null) {
+            $height = ceil(($width / $cropWidth) * $cropHeight);
+        }
+
+        [$x, $y] = $this->calcCropCoords($cropWidth, $cropHeight, $origWidth, $origHeight, $position);
+
+        return $this->crop($cropWidth, $cropHeight, $x, $y)->resize($width, $height);
+    }
+
+    /**
+     * Calculate image aspect ratio.
+     *
+     * @param float|int      $width
+     * @param float|int|null $height
+     * @param float|int      $origWidth
+     * @param float|int      $origHeight
+     */
+    protected function calcAspectRatio($width, $height = null, $origWidth = 0, $origHeight = 0): array
+    {
+        if (empty($origWidth) || empty($origHeight)) {
+            throw new InvalidArgumentException('You must supply the parameters: origWidth, origHeight.');
+        }
+
+        // If $height is null, then we have it easy.
+        // Calc based on full image size and be done.
+        if ($height === null) {
+            $height = ($width / $origWidth) * $origHeight;
+
+            return [
+                $width,
+                (int) $height,
+            ];
+        }
+
+        $xRatio = $width / $origWidth;
+        $yRatio = $height / $origHeight;
+
+        if ($xRatio > $yRatio) {
+            return [
+                $origWidth,
+                (int) ($origWidth * $height / $width),
+            ];
+        }
+
+        return [
+            (int) ($origHeight * $width / $height),
+            $origHeight,
+        ];
+    }
+
+    /**
+     * Based on the position, will determine the correct x/y coords to
+     * crop the desired portion from the image.
+     *
+     * @param float|int $width
+     * @param float|int $height
+     * @param float|int $origWidth
+     * @param float|int $origHeight
+     * @param string    $position
+     */
+    protected function calcCropCoords($width, $height, $origWidth, $origHeight, $position): array
+    {
+        $position = strtolower($position);
+
+        $x = $y = 0;
+
+        switch ($position) {
+            case 'top-left':
+                $x = 0;
+                $y = 0;
+                break;
+
+            case 'top':
+                $x = floor(($origWidth - $width) / 2);
+                $y = 0;
+                break;
+
+            case 'top-right':
+                $x = $origWidth - $width;
+                $y = 0;
+                break;
+
+            case 'left':
+                $x = 0;
+                $y = floor(($origHeight - $height) / 2);
+                break;
+
+            case 'center':
+                $x = floor(($origWidth - $width) / 2);
+                $y = floor(($origHeight - $height) / 2);
+                break;
+
+            case 'right':
+                $x = ($origWidth - $width);
+                $y = floor(($origHeight - $height) / 2);
+                break;
+
+            case 'bottom-left':
+                $x = 0;
+                $y = $origHeight - $height;
+                break;
+
+            case 'bottom':
+                $x = floor(($origWidth - $width) / 2);
+                $y = $origHeight - $height;
+                break;
+
+            case 'bottom-right':
+                $x = ($origWidth - $width);
+                $y = $origHeight - $height;
+                break;
+        }
+
+        return [
+            $x,
+            $y,
+        ];
+    }
+
+    /**
+     * Get the version of the image library in use.
+     *
+     * @return string
+     */
+    abstract public function getVersion();
+
+    /**
+     * Saves any changes that have been made to file.
+     *
+     * Example:
+     *    $image->resize(100, 200, true)
+     *          ->save($target);
+     *
+     * @return bool
+     */
+    abstract public function save(?string $target = null, int $quality = 90);
+
+    /**
+     * Does the driver-specific processing of the image.
+     *
+     * @return mixed
+     */
+    abstract protected function process(string $action);
+
+    /**
+     * Provide access to the Image class' methods if they don't exist
+     * on the handler itself.
+     *
+     * @return mixed
+     */
+    public function __call(string $name, array $args = [])
+    {
+        if (method_exists($this->image(), $name)) {
+            return $this->image()->{$name}(...$args);
+        }
+    }
+
+    /**
+     * Re-proportion Image Width/Height
+     *
+     * When creating thumbs, the desired width/height
+     * can end up warping the image due to an incorrect
+     * ratio between the full-sized image and the thumb.
+     *
+     * This function lets us re-proportion the width/height
+     * if users choose to maintain the aspect ratio when resizing.
+     */
+    protected function reproportion()
+    {
+        if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)) {
+            return;
+        }
+
+        // Sanitize
+        $this->width  = (int) $this->width;
+        $this->height = (int) $this->height;
+
+        if ($this->masterDim !== 'width' && $this->masterDim !== 'height') {
+            if ($this->width > 0 && $this->height > 0) {
+                $this->masterDim = ((($this->image()->origHeight / $this->image()->origWidth) - ($this->height / $this->width)) < 0) ? 'width' : 'height';
+            } else {
+                $this->masterDim = ($this->height === 0) ? 'width' : 'height';
+            }
+        } elseif (($this->masterDim === 'width' && $this->width === 0) || ($this->masterDim === 'height' && $this->height === 0)
+        ) {
+            return;
+        }
+
+        if ($this->masterDim === 'width') {
+            $this->height = (int) ceil($this->width * $this->image()->origHeight / $this->image()->origWidth);
+        } else {
+            $this->width = (int) ceil($this->image()->origWidth * $this->height / $this->image()->origHeight);
+        }
+    }
+
+    /**
+     * Return image width.
+     *
+     * accessor for testing; not part of interface
+     *
+     * @return int
+     */
+    public function getWidth()
+    {
+        return ($this->resource !== null) ? $this->_getWidth() : $this->width;
+    }
+
+    /**
+     * Return image height.
+     *
+     * accessor for testing; not part of interface
+     *
+     * @return int
+     */
+    public function getHeight()
+    {
+        return ($this->resource !== null) ? $this->_getHeight() : $this->height;
+    }
 }
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index f743b2a2a550..02d61c40a007 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
@@ -19,582 +19,484 @@
  */
 class GDHandler extends BaseHandler
 {
-	/**
-	 * Constructor.
-	 *
-	 * @param  Images|null $config
-	 * @throws ImageException
-	 */
-	public function __construct($config = null)
-	{
-		parent::__construct($config);
-
-		// We should never see this, so can't test it
-		// @codeCoverageIgnoreStart
-		if (! extension_loaded('gd'))
-		{
-			throw ImageException::forMissingExtension('GD');
-		}
-		// @codeCoverageIgnoreEnd
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles the rotation of an image resource.
-	 * Doesn't save the image, but replaces the current resource.
-	 *
-	 * @param integer $angle
-	 *
-	 * @return boolean
-	 */
-	protected function _rotate(int $angle): bool
-	{
-		// Create the image handle
-		$srcImg = $this->createImage();
-
-		// Set the background color
-		// This won't work with transparent PNG files so we are
-		// going to have to figure out how to determine the color
-		// of the alpha channel in a future release.
-
-		$white = imagecolorallocate($srcImg, 255, 255, 255);
-
-		// Rotate it!
-		$destImg = imagerotate($srcImg, $angle, $white);
-
-		// Kill the file handles
-		imagedestroy($srcImg);
-
-		$this->resource = $destImg;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flattens transparencies
-	 *
-	 * @param integer $red
-	 * @param integer $green
-	 * @param integer $blue
-	 *
-	 * @return $this
-	 */
-	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
-	{
-		$srcImg = $this->createImage();
-
-		if (function_exists('imagecreatetruecolor'))
-		{
-			$create = 'imagecreatetruecolor';
-			$copy   = 'imagecopyresampled';
-		}
-		else
-		{
-			$create = 'imagecreate';
-			$copy   = 'imagecopyresized';
-		}
-		$dest = $create($this->width, $this->height);
-
-		$matte = imagecolorallocate($dest, $red, $green, $blue);
-
-		imagefilledrectangle($dest, 0, 0, $this->width, $this->height, $matte);
-		imagecopy($dest, $srcImg, 0, 0, 0, 0, $this->width, $this->height);
-
-		// Kill the file handles
-		imagedestroy($srcImg);
-
-		$this->resource = $dest;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flips an image along it's vertical or horizontal axis.
-	 *
-	 * @param string $direction
-	 *
-	 * @return $this
-	 */
-	public function _flip(string $direction)
-	{
-		$srcImg = $this->createImage();
-
-		$angle = $direction === 'horizontal' ? IMG_FLIP_HORIZONTAL : IMG_FLIP_VERTICAL;
-
-		imageflip($srcImg, $angle);
-
-		$this->resource = $srcImg;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get GD version
-	 *
-	 * @return mixed
-	 */
-	public function getVersion()
-	{
-		if (function_exists('gd_info'))
-		{
-			$gdVersion = @gd_info();
-
-			return preg_replace('/\D/', '', $gdVersion['GD Version']);
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resizes the image.
-	 *
-	 * @return GDHandler
-	 */
-	public function _resize(bool $maintainRatio = false)
-	{
-		return $this->process('resize');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Crops the image.
-	 *
-	 * @return GDHandler
-	 */
-	public function _crop()
-	{
-		return $this->process('crop');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles all of the grunt work of resizing, etc.
-	 *
-	 * @param string $action
-	 *
-	 * @return $this
-	 */
-	protected function process(string $action)
-	{
-		$origWidth  = $this->image()->origWidth;
-		$origHeight = $this->image()->origHeight;
-
-		if ($action === 'crop')
-		{
-			// Reassign the source width/height if cropping
-			$origWidth  = $this->width;
-			$origHeight = $this->height;
-
-			// Modify the "original" width/height to the new
-			// values so that methods that come after have the
-			// correct size to work with.
-			$this->image()->origHeight = $this->height;
-			$this->image()->origWidth  = $this->width;
-		}
-
-		// Create the image handle
-		$src = $this->createImage();
-
-		if (function_exists('imagecreatetruecolor'))
-		{
-			$create = 'imagecreatetruecolor';
-			$copy   = 'imagecopyresampled';
-		}
-		else
-		{
-			$create = 'imagecreate';
-			$copy   = 'imagecopyresized';
-		}
-
-		$dest = $create($this->width, $this->height);
-
-		// for png and webp we can actually preserve transparency
-		if (in_array($this->image()->imageType, $this->supportTransparency, true))
-		{
-			imagealphablending($dest, false);
-			imagesavealpha($dest, true);
-		}
-
-		$copy($dest, $src, 0, 0, $this->xAxis, $this->yAxis, $this->width, $this->height, $origWidth, $origHeight);
-
-		imagedestroy($src);
-		$this->resource = $dest;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves any changes that have been made to file. If no new filename is
-	 * provided, the existing image is overwritten, otherwise a copy of the
-	 * file is made at $target.
-	 *
-	 * Example:
-	 *    $image->resize(100, 200, true)
-	 *          ->save();
-	 *
-	 * @param string|null $target
-	 * @param integer     $quality
-	 *
-	 * @return boolean
-	 */
-	public function save(string $target = null, int $quality = 90): bool
-	{
-		$original = $target;
-		$target   = empty($target) ? $this->image()->getPathname() : $target;
-
-		// If no new resource has been created, then we're
-		// simply copy the existing one.
-		if (empty($this->resource) && $quality === 100)
-		{
-			if ($original === null)
-			{
-				return true;
-			}
-
-			$name = basename($target);
-			$path = pathinfo($target, PATHINFO_DIRNAME);
-
-			return $this->image()->copy($path, $name);
-		}
-
-		$this->ensureResource();
-
-		switch ($this->image()->imageType)
-		{
-			case IMAGETYPE_GIF:
-				if (! function_exists('imagegif'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
-				}
-
-				if (! @imagegif($this->resource, $target))
-				{
-					throw ImageException::forSaveFailed();
-				}
-				break;
-			case IMAGETYPE_JPEG:
-				if (! function_exists('imagejpeg'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
-				}
-
-				if (! @imagejpeg($this->resource, $target, $quality))
-				{
-					throw ImageException::forSaveFailed();
-				}
-				break;
-			case IMAGETYPE_PNG:
-				if (! function_exists('imagepng'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
-				}
-
-				if (! @imagepng($this->resource, $target))
-				{
-					throw ImageException::forSaveFailed();
-				}
-				break;
-			case IMAGETYPE_WEBP:
-				if (! function_exists('imagewebp'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
-				}
-
-				if (! @imagewebp($this->resource, $target))
-				{
-					throw ImageException::forSaveFailed();
-				}
-				break;
-			default:
-				throw ImageException::forInvalidImageCreate();
-		}
-
-		imagedestroy($this->resource);
-
-		chmod($target, $this->filePermissions);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Create Image Resource
-	 *
-	 * This simply creates an image resource handle
-	 * based on the type of image being processed
-	 *
-	 * @param string $path
-	 * @param string $imageType
-	 *
-	 * @return resource|boolean
-	 */
-	protected function createImage(string $path = '', string $imageType = '')
-	{
-		if ($this->resource !== null)
-		{
-			return $this->resource;
-		}
-
-		if ($path === '')
-		{
-			$path = $this->image()->getPathname();
-		}
-
-		if ($imageType === '')
-		{
-			$imageType = $this->image()->imageType;
-		}
-
-		return $this->getImageResource($path, $imageType);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Make the image resource object if needed
-	 */
-	protected function ensureResource()
-	{
-		if ($this->resource === null)
-		{
-			// if valid image type, make corresponding image resource
-			$this->resource = $this->getImageResource(
-				$this->image()->getPathname(), $this->image()->imageType
-			);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Check if image type is supported and return image resource
-	 *
-	 * @param string  $path      Image path
-	 * @param integer $imageType Image type
-	 *
-	 * @return resource|boolean
-	 * @throws ImageException
-	 */
-	protected function getImageResource(string $path, int $imageType)
-	{
-		switch ($imageType)
-		{
-			case IMAGETYPE_GIF:
-				if (! function_exists('imagecreatefromgif'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
-				}
-
-				return imagecreatefromgif($path);
-			case IMAGETYPE_JPEG:
-				if (! function_exists('imagecreatefromjpeg'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
-				}
-
-				return imagecreatefromjpeg($path);
-			case IMAGETYPE_PNG:
-				if (! function_exists('imagecreatefrompng'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
-				}
-
-				return imagecreatefrompng($path);
-			case IMAGETYPE_WEBP:
-				if (! function_exists('imagecreatefromwebp'))
-				{
-					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
-				}
-
-				return imagecreatefromwebp($path);
-			default:
-				throw ImageException::forInvalidImageCreate('Ima');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Add text overlay to an image.
-	 *
-	 * @param string $text
-	 * @param array  $options
-	 *
-	 * @return void
-	 */
-	protected function _text(string $text, array $options = [])
-	{
-		// Reverse the vertical offset
-		// When the image is positioned at the bottom
-		// we don't want the vertical offset to push it
-		// further down. We want the reverse, so we'll
-		// invert the offset. Note: The horizontal
-		// offset flips itself automatically
-
-		if ($options['vAlign'] === 'bottom')
-		{
-			$options['vOffset'] = $options['vOffset'] * -1;
-		}
-
-		if ($options['hAlign'] === 'right')
-		{
-			$options['hOffset'] = $options['hOffset'] * -1;
-		}
-
-		// Set font width and height
-		// These are calculated differently depending on
-		// whether we are using the true type font or not
-		if (! empty($options['fontPath']))
-		{
-			if (function_exists('imagettfbbox'))
-			{
-				$temp = imagettfbbox($options['fontSize'], 0, $options['fontPath'], $text);
-				$temp = $temp[2] - $temp[0];
-
-				$fontwidth = $temp / strlen($text);
-			}
-			else
-			{
-				$fontwidth = $options['fontSize'] - ($options['fontSize'] / 4);
-			}
-
-			$fontheight = $options['fontSize'];
-		}
-		else
-		{
-			$fontwidth  = imagefontwidth($options['fontSize']);
-			$fontheight = imagefontheight($options['fontSize']);
-		}
-
-		$options['fontheight'] = $fontheight;
-		$options['fontwidth']  = $fontwidth;
-
-		// Set base X and Y axis values
-		$xAxis = $options['hOffset'] + $options['padding'];
-		$yAxis = $options['vOffset'] + $options['padding'];
-
-		// Set vertical alignment
-		if ($options['vAlign'] === 'middle')
-		{
-			// Don't apply padding when you're in the middle of the image.
-			$yAxis += ($this->image()->origHeight / 2) + ($fontheight / 2) - $options['padding'] - $fontheight - $options['shadowOffset'];
-		}
-		elseif ($options['vAlign'] === 'bottom')
-		{
-			$yAxis = ($this->image()->origHeight - $fontheight - $options['shadowOffset'] - ($fontheight / 2)) - $yAxis;
-		}
-
-		// Set horizontal alignment
-		if ($options['hAlign'] === 'right')
-		{
-			$xAxis += ($this->image()->origWidth - ($fontwidth * strlen($text)) - $options['shadowOffset']) - (2 * $options['padding']);
-		}
-		elseif ($options['hAlign'] === 'center')
-		{
-			$xAxis += floor(($this->image()->origWidth - ($fontwidth * strlen($text))) / 2);
-		}
-
-		$options['xAxis'] = $xAxis;
-		$options['yAxis'] = $yAxis;
-
-		if ($options['withShadow'])
-		{
-			// Offset from text
-			$options['xShadow'] = $xAxis + $options['shadowOffset'];
-			$options['yShadow'] = $yAxis + $options['shadowOffset'];
-
-			$this->textOverlay($text, $options, true);
-		}
-
-		$this->textOverlay($text, $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method for overlaying text on an image.
-	 *
-	 * @param string  $text
-	 * @param array   $options
-	 * @param boolean $isShadow Whether we are drawing the dropshadow or actual text
-	 *
-	 * @return void
-	 */
-	protected function textOverlay(string $text, array $options = [], bool $isShadow = false)
-	{
-		$src = $this->createImage();
-
-		/* Set RGB values for shadow
-		 *
-		 * Get the rest of the string and split it into 2-length
-		 * hex values:
-		 */
-		$opacity = ($options['opacity'] * 127);
-
-		// Allow opacity to be applied to the text
-		imagealphablending($src, true);
-
-		$color = $isShadow ? $options['shadowColor'] : $options['color'];
-
-		// shorthand hex, #f00
-		if (strlen($color) === 3)
-		{
-			$color = implode('', array_map('str_repeat', str_split($color), [2, 2, 2]));
-		}
-
-		$color = str_split(substr($color, 0, 6), 2);
-		$color = imagecolorclosestalpha($src, hexdec($color[0]), hexdec($color[1]), hexdec($color[2]), $opacity);
-
-		$xAxis = $isShadow ? $options['xShadow'] : $options['xAxis'];
-		$yAxis = $isShadow ? $options['yShadow'] : $options['yAxis'];
-
-		// Add the shadow to the source image
-		if (! empty($options['fontPath']))
-		{
-			// We have to add fontheight because imagettftext locates the bottom left corner, not top-left corner.
-			imagettftext($src, $options['fontSize'], 0, $xAxis, $yAxis + $options['fontheight'], $color, $options['fontPath'], $text);
-		}
-		else
-		{
-			imagestring($src, $options['fontSize'], $xAxis, $yAxis, $text, $color);
-		}
-
-		$this->resource = $src;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return image width.
-	 *
-	 * @return integer
-	 */
-	public function _getWidth()
-	{
-		return imagesx($this->resource);
-	}
-
-	/**
-	 * Return image height.
-	 *
-	 * @return integer
-	 */
-	public function _getHeight()
-	{
-		return imagesy($this->resource);
-	}
+    /**
+     * Constructor.
+     *
+     * @param Images|null $config
+     *
+     * @throws ImageException
+     */
+    public function __construct($config = null)
+    {
+        parent::__construct($config);
+
+        if (! extension_loaded('gd')) {
+            throw ImageException::forMissingExtension('GD'); // @codeCoverageIgnore
+        }
+    }
+
+    /**
+     * Handles the rotation of an image resource.
+     * Doesn't save the image, but replaces the current resource.
+     */
+    protected function _rotate(int $angle): bool
+    {
+        // Create the image handle
+        $srcImg = $this->createImage();
+
+        // Set the background color
+        // This won't work with transparent PNG files so we are
+        // going to have to figure out how to determine the color
+        // of the alpha channel in a future release.
+
+        $white = imagecolorallocate($srcImg, 255, 255, 255);
+
+        // Rotate it!
+        $destImg = imagerotate($srcImg, $angle, $white);
+
+        // Kill the file handles
+        imagedestroy($srcImg);
+
+        $this->resource = $destImg;
+
+        return true;
+    }
+
+    /**
+     * Flattens transparencies
+     *
+     * @return $this
+     */
+    protected function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+    {
+        $srcImg = $this->createImage();
+
+        if (function_exists('imagecreatetruecolor')) {
+            $create = 'imagecreatetruecolor';
+            $copy   = 'imagecopyresampled';
+        } else {
+            $create = 'imagecreate';
+            $copy   = 'imagecopyresized';
+        }
+        $dest = $create($this->width, $this->height);
+
+        $matte = imagecolorallocate($dest, $red, $green, $blue);
+
+        imagefilledrectangle($dest, 0, 0, $this->width, $this->height, $matte);
+        imagecopy($dest, $srcImg, 0, 0, 0, 0, $this->width, $this->height);
+
+        // Kill the file handles
+        imagedestroy($srcImg);
+
+        $this->resource = $dest;
+
+        return $this;
+    }
+
+    /**
+     * Flips an image along it's vertical or horizontal axis.
+     *
+     * @return $this
+     */
+    protected function _flip(string $direction)
+    {
+        $srcImg = $this->createImage();
+
+        $angle = $direction === 'horizontal' ? IMG_FLIP_HORIZONTAL : IMG_FLIP_VERTICAL;
+
+        imageflip($srcImg, $angle);
+
+        $this->resource = $srcImg;
+
+        return $this;
+    }
+
+    /**
+     * Get GD version
+     *
+     * @return mixed
+     */
+    public function getVersion()
+    {
+        if (function_exists('gd_info')) {
+            $gdVersion = @gd_info();
+
+            return preg_replace('/\D/', '', $gdVersion['GD Version']);
+        }
+
+        return false;
+    }
+
+    /**
+     * Resizes the image.
+     *
+     * @return GDHandler
+     */
+    public function _resize(bool $maintainRatio = false)
+    {
+        return $this->process('resize');
+    }
+
+    /**
+     * Crops the image.
+     *
+     * @return GDHandler
+     */
+    public function _crop()
+    {
+        return $this->process('crop');
+    }
+
+    /**
+     * Handles all of the grunt work of resizing, etc.
+     *
+     * @return $this
+     */
+    protected function process(string $action)
+    {
+        $origWidth  = $this->image()->origWidth;
+        $origHeight = $this->image()->origHeight;
+
+        if ($action === 'crop') {
+            // Reassign the source width/height if cropping
+            $origWidth  = $this->width;
+            $origHeight = $this->height;
+
+            // Modify the "original" width/height to the new
+            // values so that methods that come after have the
+            // correct size to work with.
+            $this->image()->origHeight = $this->height;
+            $this->image()->origWidth  = $this->width;
+        }
+
+        // Create the image handle
+        $src = $this->createImage();
+
+        if (function_exists('imagecreatetruecolor')) {
+            $create = 'imagecreatetruecolor';
+            $copy   = 'imagecopyresampled';
+        } else {
+            $create = 'imagecreate';
+            $copy   = 'imagecopyresized';
+        }
+
+        $dest = $create($this->width, $this->height);
+
+        // for png and webp we can actually preserve transparency
+        if (in_array($this->image()->imageType, $this->supportTransparency, true)) {
+            imagealphablending($dest, false);
+            imagesavealpha($dest, true);
+        }
+
+        $copy($dest, $src, 0, 0, $this->xAxis, $this->yAxis, $this->width, $this->height, $origWidth, $origHeight);
+
+        imagedestroy($src);
+        $this->resource = $dest;
+
+        return $this;
+    }
+
+    /**
+     * Saves any changes that have been made to file. If no new filename is
+     * provided, the existing image is overwritten, otherwise a copy of the
+     * file is made at $target.
+     *
+     * Example:
+     *    $image->resize(100, 200, true)
+     *          ->save();
+     */
+    public function save(?string $target = null, int $quality = 90): bool
+    {
+        $original = $target;
+        $target   = empty($target) ? $this->image()->getPathname() : $target;
+
+        // If no new resource has been created, then we're
+        // simply copy the existing one.
+        if (empty($this->resource) && $quality === 100) {
+            if ($original === null) {
+                return true;
+            }
+
+            $name = basename($target);
+            $path = pathinfo($target, PATHINFO_DIRNAME);
+
+            return $this->image()->copy($path, $name);
+        }
+
+        $this->ensureResource();
+
+        switch ($this->image()->imageType) {
+            case IMAGETYPE_GIF:
+                if (! function_exists('imagegif')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
+                }
+
+                if (! @imagegif($this->resource, $target)) {
+                    throw ImageException::forSaveFailed();
+                }
+                break;
+
+            case IMAGETYPE_JPEG:
+                if (! function_exists('imagejpeg')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
+                }
+
+                if (! @imagejpeg($this->resource, $target, $quality)) {
+                    throw ImageException::forSaveFailed();
+                }
+                break;
+
+            case IMAGETYPE_PNG:
+                if (! function_exists('imagepng')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
+                }
+
+                if (! @imagepng($this->resource, $target)) {
+                    throw ImageException::forSaveFailed();
+                }
+                break;
+
+            case IMAGETYPE_WEBP:
+                if (! function_exists('imagewebp')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
+                }
+
+                if (! @imagewebp($this->resource, $target)) {
+                    throw ImageException::forSaveFailed();
+                }
+                break;
+
+            default:
+                throw ImageException::forInvalidImageCreate();
+        }
+
+        imagedestroy($this->resource);
+
+        chmod($target, $this->filePermissions);
+
+        return true;
+    }
+
+    /**
+     * Create Image Resource
+     *
+     * This simply creates an image resource handle
+     * based on the type of image being processed
+     *
+     * @return bool|resource
+     */
+    protected function createImage(string $path = '', string $imageType = '')
+    {
+        if ($this->resource !== null) {
+            return $this->resource;
+        }
+
+        if ($path === '') {
+            $path = $this->image()->getPathname();
+        }
+
+        if ($imageType === '') {
+            $imageType = $this->image()->imageType;
+        }
+
+        return $this->getImageResource($path, $imageType);
+    }
+
+    /**
+     * Make the image resource object if needed
+     */
+    protected function ensureResource()
+    {
+        if ($this->resource === null) {
+            // if valid image type, make corresponding image resource
+            $this->resource = $this->getImageResource(
+                $this->image()->getPathname(),
+                $this->image()->imageType
+            );
+        }
+    }
+
+    /**
+     * Check if image type is supported and return image resource
+     *
+     * @param string $path      Image path
+     * @param int    $imageType Image type
+     *
+     * @throws ImageException
+     *
+     * @return bool|resource
+     */
+    protected function getImageResource(string $path, int $imageType)
+    {
+        switch ($imageType) {
+            case IMAGETYPE_GIF:
+                if (! function_exists('imagecreatefromgif')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
+                }
+
+                return imagecreatefromgif($path);
+
+            case IMAGETYPE_JPEG:
+                if (! function_exists('imagecreatefromjpeg')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
+                }
+
+                return imagecreatefromjpeg($path);
+
+            case IMAGETYPE_PNG:
+                if (! function_exists('imagecreatefrompng')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
+                }
+
+                return imagecreatefrompng($path);
+
+            case IMAGETYPE_WEBP:
+                if (! function_exists('imagecreatefromwebp')) {
+                    throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
+                }
+
+                return imagecreatefromwebp($path);
+
+            default:
+                throw ImageException::forInvalidImageCreate('Ima');
+        }
+    }
+
+    /**
+     * Add text overlay to an image.
+     */
+    protected function _text(string $text, array $options = [])
+    {
+        // Reverse the vertical offset
+        // When the image is positioned at the bottom
+        // we don't want the vertical offset to push it
+        // further down. We want the reverse, so we'll
+        // invert the offset. Note: The horizontal
+        // offset flips itself automatically
+
+        if ($options['vAlign'] === 'bottom') {
+            $options['vOffset'] = $options['vOffset'] * -1;
+        }
+
+        if ($options['hAlign'] === 'right') {
+            $options['hOffset'] = $options['hOffset'] * -1;
+        }
+
+        // Set font width and height
+        // These are calculated differently depending on
+        // whether we are using the true type font or not
+        if (! empty($options['fontPath'])) {
+            if (function_exists('imagettfbbox')) {
+                $temp = imagettfbbox($options['fontSize'], 0, $options['fontPath'], $text);
+                $temp = $temp[2] - $temp[0];
+
+                $fontwidth = $temp / strlen($text);
+            } else {
+                $fontwidth = $options['fontSize'] - ($options['fontSize'] / 4);
+            }
+
+            $fontheight = $options['fontSize'];
+        } else {
+            $fontwidth  = imagefontwidth($options['fontSize']);
+            $fontheight = imagefontheight($options['fontSize']);
+        }
+
+        $options['fontheight'] = $fontheight;
+        $options['fontwidth']  = $fontwidth;
+
+        // Set base X and Y axis values
+        $xAxis = $options['hOffset'] + $options['padding'];
+        $yAxis = $options['vOffset'] + $options['padding'];
+
+        // Set vertical alignment
+        if ($options['vAlign'] === 'middle') {
+            // Don't apply padding when you're in the middle of the image.
+            $yAxis += ($this->image()->origHeight / 2) + ($fontheight / 2) - $options['padding'] - $fontheight - $options['shadowOffset'];
+        } elseif ($options['vAlign'] === 'bottom') {
+            $yAxis = ($this->image()->origHeight - $fontheight - $options['shadowOffset'] - ($fontheight / 2)) - $yAxis;
+        }
+
+        // Set horizontal alignment
+        if ($options['hAlign'] === 'right') {
+            $xAxis += ($this->image()->origWidth - ($fontwidth * strlen($text)) - $options['shadowOffset']) - (2 * $options['padding']);
+        } elseif ($options['hAlign'] === 'center') {
+            $xAxis += floor(($this->image()->origWidth - ($fontwidth * strlen($text))) / 2);
+        }
+
+        $options['xAxis'] = $xAxis;
+        $options['yAxis'] = $yAxis;
+
+        if ($options['withShadow']) {
+            // Offset from text
+            $options['xShadow'] = $xAxis + $options['shadowOffset'];
+            $options['yShadow'] = $yAxis + $options['shadowOffset'];
+
+            $this->textOverlay($text, $options, true);
+        }
+
+        $this->textOverlay($text, $options);
+    }
+
+    /**
+     * Handler-specific method for overlaying text on an image.
+     *
+     * @param bool $isShadow Whether we are drawing the dropshadow or actual text
+     */
+    protected function textOverlay(string $text, array $options = [], bool $isShadow = false)
+    {
+        $src = $this->createImage();
+
+        /* Set RGB values for shadow
+         *
+         * Get the rest of the string and split it into 2-length
+         * hex values:
+         */
+        $opacity = ($options['opacity'] * 127);
+
+        // Allow opacity to be applied to the text
+        imagealphablending($src, true);
+
+        $color = $isShadow ? $options['shadowColor'] : $options['color'];
+
+        // shorthand hex, #f00
+        if (strlen($color) === 3) {
+            $color = implode('', array_map('str_repeat', str_split($color), [2, 2, 2]));
+        }
+
+        $color = str_split(substr($color, 0, 6), 2);
+        $color = imagecolorclosestalpha($src, hexdec($color[0]), hexdec($color[1]), hexdec($color[2]), $opacity);
+
+        $xAxis = $isShadow ? $options['xShadow'] : $options['xAxis'];
+        $yAxis = $isShadow ? $options['yShadow'] : $options['yAxis'];
+
+        // Add the shadow to the source image
+        if (! empty($options['fontPath'])) {
+            // We have to add fontheight because imagettftext locates the bottom left corner, not top-left corner.
+            imagettftext($src, $options['fontSize'], 0, $xAxis, $yAxis + $options['fontheight'], $color, $options['fontPath'], $text);
+        } else {
+            imagestring($src, $options['fontSize'], $xAxis, $yAxis, $text, $color);
+        }
+
+        $this->resource = $src;
+    }
+
+    /**
+     * Return image width.
+     *
+     * @return int
+     */
+    public function _getWidth()
+    {
+        return imagesx($this->resource);
+    }
+
+    /**
+     * Return image height.
+     *
+     * @return int
+     */
+    public function _getHeight()
+    {
+        return imagesy($this->resource);
+    }
 }
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 53dc66e97fbc..5ec6a23cc4f7 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
@@ -29,508 +29,448 @@
  */
 class ImageMagickHandler extends BaseHandler
 {
-	/**
-	 * Stores image resource in memory.
-	 *
-	 * @var string|null
-	 */
-	protected $resource;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param  Images $config
-	 * @throws ImageException
-	 */
-	public function __construct($config = null)
-	{
-		parent::__construct($config);
-
-		// We should never see this, so can't test it
-		// @codeCoverageIgnoreStart
-		if (! (extension_loaded('imagick') || class_exists('Imagick')))
-		{
-			throw ImageException::forMissingExtension('IMAGICK');
-		}
-		// @codeCoverageIgnoreEnd
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles the actual resizing of the image.
-	 *
-	 * @param boolean $maintainRatio
-	 *
-	 * @return ImageMagickHandler
-	 * @throws Exception
-	 */
-	public function _resize(bool $maintainRatio = false)
-	{
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$escape = '\\';
-		if (stripos(PHP_OS, 'WIN') === 0)
-		{
-			$escape = '';
-		}
-
-		$action = $maintainRatio === true
-			? ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' "' . $source . '" "' . $destination . '"'
-			: ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . "{$escape}! \"" . $source . '" "' . $destination . '"';
-
-		$this->process($action);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Crops the image.
-	 *
-	 * @return boolean|\CodeIgniter\Images\Handlers\ImageMagickHandler
-	 * @throws Exception
-	 */
-	public function _crop()
-	{
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$extent = ' ';
-		if ($this->xAxis >= $this->width || $this->yAxis > $this->height)
-		{
-			$extent = ' -background transparent -extent ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' ';
-		}
-
-		$action = ' -crop ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . '+' . ($this->xAxis ?? 0) . '+' . ($this->yAxis ?? 0) . $extent . escapeshellarg($source) . ' ' . escapeshellarg($destination);
-
-		$this->process($action);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles the rotation of an image resource.
-	 * Doesn't save the image, but replaces the current resource.
-	 *
-	 * @param integer $angle
-	 *
-	 * @return $this
-	 * @throws Exception
-	 */
-	protected function _rotate(int $angle)
-	{
-		$angle = '-rotate ' . $angle;
-
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
-
-		$this->process($action);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flattens transparencies, default white background
-	 *
-	 * @param integer $red
-	 * @param integer $green
-	 * @param integer $blue
-	 *
-	 * @return $this
-	 * @throws Exception
-	 */
-	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
-	{
-		$flatten = "-background 'rgb({$red},{$green},{$blue})' -flatten";
-
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$action = ' ' . $flatten . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
-
-		$this->process($action);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flips an image along it's vertical or horizontal axis.
-	 *
-	 * @param string $direction
-	 *
-	 * @return $this
-	 * @throws Exception
-	 */
-	public function _flip(string $direction)
-	{
-		$angle = $direction === 'horizontal' ? '-flop' : '-flip';
-
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
-
-		$this->process($action);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get driver version
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		$result = $this->process('-version');
-
-		// The first line has the version in it...
-		preg_match('/(ImageMagick\s[\S]+)/', $result[0], $matches);
-
-		return str_replace('ImageMagick ', '', $matches[0]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles all of the grunt work of resizing, etc.
-	 *
-	 * @param string  $action
-	 * @param integer $quality
-	 *
-	 * @return array  Lines of output from shell command
-	 * @throws Exception
-	 */
-	protected function process(string $action, int $quality = 100): array
-	{
-		// Do we have a vaild library path?
-		if (empty($this->config->libraryPath))
-		{
-			throw ImageException::forInvalidImageLibraryPath($this->config->libraryPath);
-		}
-
-		if ($action !== '-version')
-		{
-			$this->supportedFormatCheck();
-		}
-
-		if (! preg_match('/convert$/i', $this->config->libraryPath))
-		{
-			$this->config->libraryPath = rtrim($this->config->libraryPath, '/') . '/convert';
-		}
-
-		$cmd  = $this->config->libraryPath;
-		$cmd .= $action === '-version' ? ' ' . $action : ' -quality ' . $quality . ' ' . $action;
-
-		$retval = 1;
-		$output = [];
-		// exec() might be disabled
-		if (function_usable('exec'))
-		{
-			@exec($cmd, $output, $retval);
-		}
-
-		// Did it work?
-		if ($retval > 0)
-		{
-			throw ImageException::forImageProcessFailed();
-		}
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves any changes that have been made to file. If no new filename is
-	 * provided, the existing image is overwritten, otherwise a copy of the
-	 * file is made at $target.
-	 *
-	 * Example:
-	 *    $image->resize(100, 200, true)
-	 *          ->save();
-	 *
-	 * @param string|null $target
-	 * @param integer     $quality
-	 *
-	 * @return boolean
-	 */
-	public function save(string $target = null, int $quality = 90): bool
-	{
-		$original = $target;
-		$target   = empty($target) ? $this->image()->getPathname() : $target;
-
-		// If no new resource has been created, then we're
-		// simply copy the existing one.
-		if (empty($this->resource) && $quality === 100)
-		{
-			if ($original === null)
-			{
-				return true;
-			}
-
-			$name = basename($target);
-			$path = pathinfo($target, PATHINFO_DIRNAME);
-
-			return $this->image()->copy($path, $name);
-		}
-
-		$this->ensureResource();
-
-		// Copy the file through ImageMagick so that it has
-		// a chance to convert file format.
-		$action = escapeshellarg($this->resource) . ' ' . escapeshellarg($target);
-
-		$result = $this->process($action, $quality);
-
-		unlink($this->resource);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get Image Resource
-	 *
-	 * This simply creates an image resource handle
-	 * based on the type of image being processed.
-	 * Since ImageMagick is used on the cli, we need to
-	 * ensure we have a temporary file on the server
-	 * that we can use.
-	 *
-	 * To ensure we can use all features, like transparency,
-	 * during the process, we'll use a PNG as the temp file type.
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	protected function getResourcePath()
-	{
-		if (! is_null($this->resource))
-		{
-			return $this->resource;
-		}
-
-		$this->resource = WRITEPATH . 'cache/' . time() . '_' . bin2hex(random_bytes(10)) . '.png';
-
-		$name = basename($this->resource);
-		$path = pathinfo($this->resource, PATHINFO_DIRNAME);
-
-		$this->image()->copy($path, $name);
-
-		return $this->resource;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Make the image resource object if needed
-	 *
-	 * @throws Exception
-	 */
-	protected function ensureResource()
-	{
-		$this->getResourcePath();
-
-		$this->supportedFormatCheck();
-	}
-
-	/**
-	 * Check if given image format is supported
-	 *
-	 * @throws ImageException
-	 */
-	protected function supportedFormatCheck()
-	{
-		switch ($this->image()->imageType)
-		{
-			case IMAGETYPE_WEBP:
-				if (! in_array('WEBP', Imagick::queryFormats(), true))
-				{
-					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
-				}
-				break;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handler-specific method for overlaying text on an image.
-	 *
-	 * @param string $text
-	 * @param array  $options
-	 *
-	 * @throws Exception
-	 */
-	protected function _text(string $text, array $options = [])
-	{
-		$cmd = '';
-
-		// Reverse the vertical offset
-		// When the image is positioned at the bottom
-		// we don't want the vertical offset to push it
-		// further down. We want the reverse, so we'll
-		// invert the offset. Note: The horizontal
-		// offset flips itself automatically
-		if ($options['vAlign'] === 'bottom')
-		{
-			$options['vOffset'] = $options['vOffset'] * -1;
-		}
-
-		if ($options['hAlign'] === 'right')
-		{
-			$options['hOffset'] = $options['hOffset'] * -1;
-		}
-
-		// Font
-		if (! empty($options['fontPath']))
-		{
-			$cmd .= " -font '{$options['fontPath']}'";
-		}
-
-		if (isset($options['hAlign']) && isset($options['vAlign']))
-		{
-			switch ($options['hAlign'])
-			{
-				case 'left':
-					$xAxis   = $options['hOffset'] + $options['padding'];
-					$yAxis   = $options['vOffset'] + $options['padding'];
-					$gravity = $options['vAlign'] === 'top' ? 'NorthWest' : 'West';
-					if ($options['vAlign'] === 'bottom')
-					{
-						$gravity = 'SouthWest';
-						$yAxis   = $options['vOffset'] - $options['padding'];
-					}
-					break;
-				case 'center':
-					$xAxis   = $options['hOffset'] + $options['padding'];
-					$yAxis   = $options['vOffset'] + $options['padding'];
-					$gravity = $options['vAlign'] === 'top' ? 'North' : 'Center';
-					if ($options['vAlign'] === 'bottom')
-					{
-						$yAxis   = $options['vOffset'] - $options['padding'];
-						$gravity = 'South';
-					}
-					break;
-				case 'right':
-					$xAxis   = $options['hOffset'] - $options['padding'];
-					$yAxis   = $options['vOffset'] + $options['padding'];
-					$gravity = $options['vAlign'] === 'top' ? 'NorthEast' : 'East';
-					if ($options['vAlign'] === 'bottom')
-					{
-						$gravity = 'SouthEast';
-						$yAxis   = $options['vOffset'] - $options['padding'];
-					}
-					break;
-			}
-
-			$xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis; // @phpstan-ignore-line
-			$yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis; // @phpstan-ignore-line
-
-			$cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}"; // @phpstan-ignore-line
-		}
-
-		// Color
-		if (isset($options['color']))
-		{
-			[$r, $g, $b] = sscanf("#{$options['color']}", '#%02x%02x%02x');
-
-			$cmd .= " -fill 'rgba({$r},{$g},{$b},{$options['opacity']})'";
-		}
-
-		// Font Size - use points....
-		if (isset($options['fontSize']))
-		{
-			$cmd .= " -pointsize {$options['fontSize']}";
-		}
-
-		// Text
-		$cmd .= " -annotate 0 '{$text}'";
-
-		$source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
-		$destination = $this->getResourcePath();
-
-		$cmd = " '{$source}' {$cmd} '{$destination}'";
-
-		$this->process($cmd);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the width of an image.
-	 *
-	 * @return integer
-	 */
-	public function _getWidth()
-	{
-		return imagesx(imagecreatefromstring(file_get_contents($this->resource)));
-	}
-
-	/**
-	 * Return the height of an image.
-	 *
-	 * @return integer
-	 */
-	public function _getHeight()
-	{
-		return imagesy(imagecreatefromstring(file_get_contents($this->resource)));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reads the EXIF information from the image and modifies the orientation
-	 * so that displays correctly in the browser. This is especially an issue
-	 * with images taken by smartphones who always store the image up-right,
-	 * but set the orientation flag to display it correctly.
-	 *
-	 * @param boolean $silent If true, will ignore exceptions when PHP doesn't support EXIF.
-	 *
-	 * @return $this
-	 */
-	public function reorient(bool $silent = false)
-	{
-		$orientation = $this->getEXIF('Orientation', $silent);
-
-		switch ($orientation)
-		{
-			case 2:
-				return $this->flip('horizontal');
-			case 3:
-				return $this->rotate(180);
-			case 4:
-				return $this->rotate(180)
-								->flip('horizontal');
-			case 5:
-				return $this->rotate(90)
-								->flip('horizontal');
-			case 6:
-				return $this->rotate(90);
-			case 7:
-				return $this->rotate(270)
-								->flip('horizontal');
-			case 8:
-				return $this->rotate(270);
-			default:
-				return $this;
-		}
-	}
+    /**
+     * Stores image resource in memory.
+     *
+     * @var string|null
+     */
+    protected $resource;
+
+    /**
+     * Constructor.
+     *
+     * @param Images $config
+     *
+     * @throws ImageException
+     */
+    public function __construct($config = null)
+    {
+        parent::__construct($config);
+
+        // We should never see this, so can't test it
+        // @codeCoverageIgnoreStart
+        if (! (extension_loaded('imagick') || class_exists('Imagick'))) {
+            throw ImageException::forMissingExtension('IMAGICK');
+        }
+        // @codeCoverageIgnoreEnd
+    }
+
+    /**
+     * Handles the actual resizing of the image.
+     *
+     * @throws Exception
+     *
+     * @return ImageMagickHandler
+     */
+    public function _resize(bool $maintainRatio = false)
+    {
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $escape = '\\';
+
+        if (PHP_OS_FAMILY === 'Windows') {
+            $escape = '';
+        }
+
+        $action = $maintainRatio === true
+            ? ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' "' . $source . '" "' . $destination . '"'
+            : ' -resize ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . "{$escape}! \"" . $source . '" "' . $destination . '"';
+
+        $this->process($action);
+
+        return $this;
+    }
+
+    /**
+     * Crops the image.
+     *
+     * @throws Exception
+     *
+     * @return bool|\CodeIgniter\Images\Handlers\ImageMagickHandler
+     */
+    public function _crop()
+    {
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $extent = ' ';
+        if ($this->xAxis >= $this->width || $this->yAxis > $this->height) {
+            $extent = ' -background transparent -extent ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . ' ';
+        }
+
+        $action = ' -crop ' . ($this->width ?? 0) . 'x' . ($this->height ?? 0) . '+' . ($this->xAxis ?? 0) . '+' . ($this->yAxis ?? 0) . $extent . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+        $this->process($action);
+
+        return $this;
+    }
+
+    /**
+     * Handles the rotation of an image resource.
+     * Doesn't save the image, but replaces the current resource.
+     *
+     * @throws Exception
+     *
+     * @return $this
+     */
+    protected function _rotate(int $angle)
+    {
+        $angle = '-rotate ' . $angle;
+
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+        $this->process($action);
+
+        return $this;
+    }
+
+    /**
+     * Flattens transparencies, default white background
+     *
+     * @throws Exception
+     *
+     * @return $this
+     */
+    protected function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+    {
+        $flatten = "-background 'rgb({$red},{$green},{$blue})' -flatten";
+
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $action = ' ' . $flatten . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+        $this->process($action);
+
+        return $this;
+    }
+
+    /**
+     * Flips an image along it's vertical or horizontal axis.
+     *
+     * @throws Exception
+     *
+     * @return $this
+     */
+    protected function _flip(string $direction)
+    {
+        $angle = $direction === 'horizontal' ? '-flop' : '-flip';
+
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $action = ' ' . $angle . ' ' . escapeshellarg($source) . ' ' . escapeshellarg($destination);
+
+        $this->process($action);
+
+        return $this;
+    }
+
+    /**
+     * Get driver version
+     */
+    public function getVersion(): string
+    {
+        $result = $this->process('-version');
+
+        // The first line has the version in it...
+        preg_match('/(ImageMagick\s[\S]+)/', $result[0], $matches);
+
+        return str_replace('ImageMagick ', '', $matches[0]);
+    }
+
+    /**
+     * Handles all of the grunt work of resizing, etc.
+     *
+     * @throws Exception
+     *
+     * @return array Lines of output from shell command
+     */
+    protected function process(string $action, int $quality = 100): array
+    {
+        // Do we have a vaild library path?
+        if (empty($this->config->libraryPath)) {
+            throw ImageException::forInvalidImageLibraryPath($this->config->libraryPath);
+        }
+
+        if ($action !== '-version') {
+            $this->supportedFormatCheck();
+        }
+
+        if (! preg_match('/convert$/i', $this->config->libraryPath)) {
+            $this->config->libraryPath = rtrim($this->config->libraryPath, '/') . '/convert';
+        }
+
+        $cmd = $this->config->libraryPath;
+        $cmd .= $action === '-version' ? ' ' . $action : ' -quality ' . $quality . ' ' . $action;
+
+        $retval = 1;
+        $output = [];
+        // exec() might be disabled
+        if (function_usable('exec')) {
+            @exec($cmd, $output, $retval);
+        }
+
+        // Did it work?
+        if ($retval > 0) {
+            throw ImageException::forImageProcessFailed();
+        }
+
+        return $output;
+    }
+
+    /**
+     * Saves any changes that have been made to file. If no new filename is
+     * provided, the existing image is overwritten, otherwise a copy of the
+     * file is made at $target.
+     *
+     * Example:
+     *    $image->resize(100, 200, true)
+     *          ->save();
+     */
+    public function save(?string $target = null, int $quality = 90): bool
+    {
+        $original = $target;
+        $target   = empty($target) ? $this->image()->getPathname() : $target;
+
+        // If no new resource has been created, then we're
+        // simply copy the existing one.
+        if (empty($this->resource) && $quality === 100) {
+            if ($original === null) {
+                return true;
+            }
+
+            $name = basename($target);
+            $path = pathinfo($target, PATHINFO_DIRNAME);
+
+            return $this->image()->copy($path, $name);
+        }
+
+        $this->ensureResource();
+
+        // Copy the file through ImageMagick so that it has
+        // a chance to convert file format.
+        $action = escapeshellarg($this->resource) . ' ' . escapeshellarg($target);
+
+        $this->process($action, $quality);
+
+        unlink($this->resource);
+
+        return true;
+    }
+
+    /**
+     * Get Image Resource
+     *
+     * This simply creates an image resource handle
+     * based on the type of image being processed.
+     * Since ImageMagick is used on the cli, we need to
+     * ensure we have a temporary file on the server
+     * that we can use.
+     *
+     * To ensure we can use all features, like transparency,
+     * during the process, we'll use a PNG as the temp file type.
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    protected function getResourcePath()
+    {
+        if ($this->resource !== null) {
+            return $this->resource;
+        }
+
+        $this->resource = WRITEPATH . 'cache/' . time() . '_' . bin2hex(random_bytes(10)) . '.png';
+
+        $name = basename($this->resource);
+        $path = pathinfo($this->resource, PATHINFO_DIRNAME);
+
+        $this->image()->copy($path, $name);
+
+        return $this->resource;
+    }
+
+    /**
+     * Make the image resource object if needed
+     *
+     * @throws Exception
+     */
+    protected function ensureResource()
+    {
+        $this->getResourcePath();
+
+        $this->supportedFormatCheck();
+    }
+
+    /**
+     * Check if given image format is supported
+     *
+     * @throws ImageException
+     */
+    protected function supportedFormatCheck()
+    {
+        switch ($this->image()->imageType) {
+            case IMAGETYPE_WEBP:
+                if (! in_array('WEBP', Imagick::queryFormats(), true)) {
+                    throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+                }
+                break;
+        }
+    }
+
+    /**
+     * Handler-specific method for overlaying text on an image.
+     *
+     * @throws Exception
+     */
+    protected function _text(string $text, array $options = [])
+    {
+        $cmd = '';
+
+        // Reverse the vertical offset
+        // When the image is positioned at the bottom
+        // we don't want the vertical offset to push it
+        // further down. We want the reverse, so we'll
+        // invert the offset. Note: The horizontal
+        // offset flips itself automatically
+        if ($options['vAlign'] === 'bottom') {
+            $options['vOffset'] = $options['vOffset'] * -1;
+        }
+
+        if ($options['hAlign'] === 'right') {
+            $options['hOffset'] = $options['hOffset'] * -1;
+        }
+
+        // Font
+        if (! empty($options['fontPath'])) {
+            $cmd .= " -font '{$options['fontPath']}'";
+        }
+
+        if (isset($options['hAlign'], $options['vAlign'])) {
+            switch ($options['hAlign']) {
+                case 'left':
+                    $xAxis   = $options['hOffset'] + $options['padding'];
+                    $yAxis   = $options['vOffset'] + $options['padding'];
+                    $gravity = $options['vAlign'] === 'top' ? 'NorthWest' : 'West';
+                    if ($options['vAlign'] === 'bottom') {
+                        $gravity = 'SouthWest';
+                        $yAxis   = $options['vOffset'] - $options['padding'];
+                    }
+                    break;
+
+                case 'center':
+                    $xAxis   = $options['hOffset'] + $options['padding'];
+                    $yAxis   = $options['vOffset'] + $options['padding'];
+                    $gravity = $options['vAlign'] === 'top' ? 'North' : 'Center';
+                    if ($options['vAlign'] === 'bottom') {
+                        $yAxis   = $options['vOffset'] - $options['padding'];
+                        $gravity = 'South';
+                    }
+                    break;
+
+                case 'right':
+                    $xAxis   = $options['hOffset'] - $options['padding'];
+                    $yAxis   = $options['vOffset'] + $options['padding'];
+                    $gravity = $options['vAlign'] === 'top' ? 'NorthEast' : 'East';
+                    if ($options['vAlign'] === 'bottom') {
+                        $gravity = 'SouthEast';
+                        $yAxis   = $options['vOffset'] - $options['padding'];
+                    }
+                    break;
+            }
+
+            $xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis; // @phpstan-ignore-line
+            $yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis; // @phpstan-ignore-line
+
+            $cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}"; // @phpstan-ignore-line
+        }
+
+        // Color
+        if (isset($options['color'])) {
+            [$r, $g, $b] = sscanf("#{$options['color']}", '#%02x%02x%02x');
+
+            $cmd .= " -fill 'rgba({$r},{$g},{$b},{$options['opacity']})'";
+        }
+
+        // Font Size - use points....
+        if (isset($options['fontSize'])) {
+            $cmd .= " -pointsize {$options['fontSize']}";
+        }
+
+        // Text
+        $cmd .= " -annotate 0 '{$text}'";
+
+        $source      = ! empty($this->resource) ? $this->resource : $this->image()->getPathname();
+        $destination = $this->getResourcePath();
+
+        $cmd = " '{$source}' {$cmd} '{$destination}'";
+
+        $this->process($cmd);
+    }
+
+    /**
+     * Return the width of an image.
+     *
+     * @return int
+     */
+    public function _getWidth()
+    {
+        return imagesx(imagecreatefromstring(file_get_contents($this->resource)));
+    }
+
+    /**
+     * Return the height of an image.
+     *
+     * @return int
+     */
+    public function _getHeight()
+    {
+        return imagesy(imagecreatefromstring(file_get_contents($this->resource)));
+    }
+
+    /**
+     * Reads the EXIF information from the image and modifies the orientation
+     * so that displays correctly in the browser. This is especially an issue
+     * with images taken by smartphones who always store the image up-right,
+     * but set the orientation flag to display it correctly.
+     *
+     * @param bool $silent If true, will ignore exceptions when PHP doesn't support EXIF.
+     *
+     * @return $this
+     */
+    public function reorient(bool $silent = false)
+    {
+        $orientation = $this->getEXIF('Orientation', $silent);
+
+        switch ($orientation) {
+            case 2:
+                return $this->flip('horizontal');
+
+            case 3:
+                return $this->rotate(180);
+
+            case 4:
+                return $this->rotate(180)->flip('horizontal');
+
+            case 5:
+                return $this->rotate(90)->flip('horizontal');
+
+            case 6:
+                return $this->rotate(90);
+
+            case 7:
+                return $this->rotate(270)->flip('horizontal');
+
+            case 8:
+                return $this->rotate(270);
+
+            default:
+                return $this;
+        }
+    }
 }
diff --git a/system/Images/Image.php b/system/Images/Image.php
index 82d2f1ad8753..2eca30f92cab 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
@@ -19,128 +19,115 @@
  */
 class Image extends File
 {
-	/**
-	 * The original image width in pixels.
-	 *
-	 * @var integer|float
-	 */
-	public $origWidth;
-
-	/**
-	 * The original image height in pixels.
-	 *
-	 * @var integer|float
-	 */
-	public $origHeight;
-
-	/**
-	 * The image type constant.
-	 *
-	 * @see http://php.net/manual/en/image.constants.php
-	 *
-	 * @var integer
-	 */
-	public $imageType;
-
-	/**
-	 * attributes string with size info:
-	 * 'height="100" width="200"'
-	 *
-	 * @var string
-	 */
-	public $sizeStr;
-
-	/**
-	 * The image's mime type, i.e. image/jpeg
-	 *
-	 * @var string
-	 */
-	public $mime;
-
-	/**
-	 * Makes a copy of itself to the new location. If no filename is provided
-	 * it will use the existing filename.
-	 *
-	 * @param string      $targetPath The directory to store the file in
-	 * @param string|null $targetName The new name of the copied file.
-	 * @param integer     $perms      File permissions to be applied after copy.
-	 *
-	 * @return boolean
-	 */
-	public function copy(string $targetPath, string $targetName = null, int $perms = 0644): bool
-	{
-		$targetPath = rtrim($targetPath, '/ ') . '/';
-
-		$targetName = is_null($targetName) ? $this->getFilename() : $targetName;
-
-		if (empty($targetName))
-		{
-			throw ImageException::forInvalidFile($targetName);
-		}
-
-		if (! is_dir($targetPath))
-		{
-			mkdir($targetPath, 0755, true);
-		}
-
-		if (! copy($this->getPathname(), "{$targetPath}{$targetName}"))
-		{
-			throw ImageException::forCopyError($targetPath);
-		}
-
-		chmod("{$targetPath}/{$targetName}", $perms);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get image properties
-	 *
-	 * A helper function that gets info about the file
-	 *
-	 * @param boolean $return
-	 *
-	 * @return array|boolean
-	 */
-	public function getProperties(bool $return = false)
-	{
-		$path = $this->getPathname();
-
-		if (! $vals = getimagesize($path))
-		{
-			throw ImageException::forFileNotSupported();
-		}
-
-		$types = [
-			IMAGETYPE_GIF  => 'gif',
-			IMAGETYPE_JPEG => 'jpeg',
-			IMAGETYPE_PNG  => 'png',
-			IMAGETYPE_WEBP => 'webp',
-		];
-
-		$mime = 'image/' . ($types[$vals[2]] ?? 'jpg');
-
-		if ($return === true)
-		{
-			return [
-				'width'      => $vals[0],
-				'height'     => $vals[1],
-				'image_type' => $vals[2],
-				'size_str'   => $vals[3],
-				'mime_type'  => $mime,
-			];
-		}
-
-		$this->origWidth  = $vals[0];
-		$this->origHeight = $vals[1];
-		$this->imageType  = $vals[2];
-		$this->sizeStr    = $vals[3];
-		$this->mime       = $mime;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The original image width in pixels.
+     *
+     * @var float|int
+     */
+    public $origWidth;
+
+    /**
+     * The original image height in pixels.
+     *
+     * @var float|int
+     */
+    public $origHeight;
+
+    /**
+     * The image type constant.
+     *
+     * @see http://php.net/manual/en/image.constants.php
+     *
+     * @var int
+     */
+    public $imageType;
+
+    /**
+     * attributes string with size info:
+     * 'height="100" width="200"'
+     *
+     * @var string
+     */
+    public $sizeStr;
+
+    /**
+     * The image's mime type, i.e. image/jpeg
+     *
+     * @var string
+     */
+    public $mime;
+
+    /**
+     * Makes a copy of itself to the new location. If no filename is provided
+     * it will use the existing filename.
+     *
+     * @param string      $targetPath The directory to store the file in
+     * @param string|null $targetName The new name of the copied file.
+     * @param int         $perms      File permissions to be applied after copy.
+     */
+    public function copy(string $targetPath, ?string $targetName = null, int $perms = 0644): bool
+    {
+        $targetPath = rtrim($targetPath, '/ ') . '/';
+
+        $targetName = $targetName ?? $this->getFilename();
+
+        if (empty($targetName)) {
+            throw ImageException::forInvalidFile($targetName);
+        }
+
+        if (! is_dir($targetPath)) {
+            mkdir($targetPath, 0755, true);
+        }
+
+        if (! copy($this->getPathname(), "{$targetPath}{$targetName}")) {
+            throw ImageException::forCopyError($targetPath);
+        }
+
+        chmod("{$targetPath}/{$targetName}", $perms);
+
+        return true;
+    }
+
+    /**
+     * Get image properties
+     *
+     * A helper function that gets info about the file
+     *
+     * @return array|bool
+     */
+    public function getProperties(bool $return = false)
+    {
+        $path = $this->getPathname();
+
+        if (! $vals = getimagesize($path)) {
+            throw ImageException::forFileNotSupported();
+        }
+
+        $types = [
+            IMAGETYPE_GIF  => 'gif',
+            IMAGETYPE_JPEG => 'jpeg',
+            IMAGETYPE_PNG  => 'png',
+            IMAGETYPE_WEBP => 'webp',
+        ];
+
+        $mime = 'image/' . ($types[$vals[2]] ?? 'jpg');
+
+        if ($return === true) {
+            return [
+                'width'      => $vals[0],
+                'height'     => $vals[1],
+                'image_type' => $vals[2],
+                'size_str'   => $vals[3],
+                'mime_type'  => $mime,
+            ];
+        }
+
+        $this->origWidth  = $vals[0];
+        $this->origHeight = $vals[1];
+        $this->imageType  = $vals[2];
+        $this->sizeStr    = $vals[3];
+        $this->mime       = $mime;
+
+        return true;
+    }
 }
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 15519f296ab9..2b924720d2dd 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
@@ -16,166 +16,125 @@
  */
 interface ImageHandlerInterface
 {
-	/**
-	 * Resize the image
-	 *
-	 * @param integer $width
-	 * @param integer $height
-	 * @param boolean $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
-	 * @param string  $masterDim
-	 *
-	 * @return $this
-	 */
-	public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Crops the image to the desired height and width. If one of the height/width values
-	 * is not provided, that value will be set the appropriate value based on offsets and
-	 * image dimensions.
-	 *
-	 * @param integer|null $width
-	 * @param integer|null $height
-	 * @param integer|null $x             X-axis coord to start cropping from the left of image
-	 * @param integer|null $y             Y-axis coord to start cropping from the top of image
-	 * @param boolean      $maintainRatio
-	 * @param string       $masterDim
-	 *
-	 * @return $this
-	 */
-	public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Changes the stored image type to indicate the new file format to use when saving.
-	 * Does not touch the actual resource.
-	 *
-	 * @param integer $imageType A PHP imagetype constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
-	 *
-	 * @return $this
-	 */
-	public function convert(int $imageType);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rotates the image on the current canvas.
-	 *
-	 * @param float $angle
-	 *
-	 * @return $this
-	 */
-	public function rotate(float $angle);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flattens transparencies, default white background
-	 *
-	 * @param integer $red
-	 * @param integer $green
-	 * @param integer $blue
-	 *
-	 * @return $this
-	 */
-	public function flatten(int $red = 255, int $green = 255, int $blue = 255);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reads the EXIF information from the image and modifies the orientation
-	 * so that displays correctly in the browser.
-	 *
-	 * @return ImageHandlerInterface
-	 */
-	public function reorient();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the EXIF information from the image, if possible. Returns
-	 * an array of the information, or null if nothing can be found.
-	 *
-	 * @param string|null $key If specified, will only return this piece of EXIF data.
-	 *
-	 * @return mixed
-	 */
-	public function getEXIF(string $key = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Flip an image horizontally or vertically
-	 *
-	 * @param string $dir Direction to flip, either 'vertical' or 'horizontal'
-	 *
-	 * @return $this
-	 */
-	public function flip(string $dir = 'vertical');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Combine cropping and resizing into a single command.
-	 *
-	 * Supported positions:
-	 *  - top-left
-	 *  - top
-	 *  - top-right
-	 *  - left
-	 *  - center
-	 *  - right
-	 *  - bottom-left
-	 *  - bottom
-	 *  - bottom-right
-	 *
-	 * @param integer $width
-	 * @param integer $height
-	 * @param string  $position
-	 *
-	 * @return $this
-	 */
-	public function fit(int $width, int $height, string $position);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Overlays a string of text over the image.
-	 *
-	 * Valid options:
-	 *
-	 *  - color         Text Color (hex number)
-	 *  - shadowColor   Color of the shadow (hex number)
-	 *  - hAlign        Horizontal alignment: left, center, right
-	 *  - vAlign        Vertical alignment: top, middle, bottom
-	 *  - hOffset
-	 *  - vOffset
-	 *  - fontPath
-	 *  - fontSize
-	 *  - shadowOffset
-	 *
-	 * @param string $text
-	 * @param array  $options
-	 *
-	 * @return $this
-	 */
-	public function text(string $text, array $options = []);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves any changes that have been made to file.
-	 *
-	 * Example:
-	 *    $image->resize(100, 200, true)
-	 *          ->save($target);
-	 *
-	 * @param string  $target
-	 * @param integer $quality
-	 *
-	 * @return boolean
-	 */
-	public function save(string $target = null, int $quality = 90);
+    /**
+     * Resize the image
+     *
+     * @param bool $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
+     *
+     * @return $this
+     */
+    public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto');
+
+    /**
+     * Crops the image to the desired height and width. If one of the height/width values
+     * is not provided, that value will be set the appropriate value based on offsets and
+     * image dimensions.
+     *
+     * @param int|null $x X-axis coord to start cropping from the left of image
+     * @param int|null $y Y-axis coord to start cropping from the top of image
+     *
+     * @return $this
+     */
+    public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
+
+    /**
+     * Changes the stored image type to indicate the new file format to use when saving.
+     * Does not touch the actual resource.
+     *
+     * @param int $imageType A PHP imagetype constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+     *
+     * @return $this
+     */
+    public function convert(int $imageType);
+
+    /**
+     * Rotates the image on the current canvas.
+     *
+     * @return $this
+     */
+    public function rotate(float $angle);
+
+    /**
+     * Flattens transparencies, default white background
+     *
+     * @return $this
+     */
+    public function flatten(int $red = 255, int $green = 255, int $blue = 255);
+
+    /**
+     * Reads the EXIF information from the image and modifies the orientation
+     * so that displays correctly in the browser.
+     *
+     * @return ImageHandlerInterface
+     */
+    public function reorient();
+
+    /**
+     * Retrieve the EXIF information from the image, if possible. Returns
+     * an array of the information, or null if nothing can be found.
+     *
+     * @param string|null $key If specified, will only return this piece of EXIF data.
+     *
+     * @return mixed
+     */
+    public function getEXIF(?string $key = null);
+
+    /**
+     * Flip an image horizontally or vertically
+     *
+     * @param string $dir Direction to flip, either 'vertical' or 'horizontal'
+     *
+     * @return $this
+     */
+    public function flip(string $dir = 'vertical');
+
+    /**
+     * Combine cropping and resizing into a single command.
+     *
+     * Supported positions:
+     *  - top-left
+     *  - top
+     *  - top-right
+     *  - left
+     *  - center
+     *  - right
+     *  - bottom-left
+     *  - bottom
+     *  - bottom-right
+     *
+     * @return $this
+     */
+    public function fit(int $width, int $height, string $position);
+
+    /**
+     * Overlays a string of text over the image.
+     *
+     * Valid options:
+     *
+     *  - color         Text Color (hex number)
+     *  - shadowColor   Color of the shadow (hex number)
+     *  - hAlign        Horizontal alignment: left, center, right
+     *  - vAlign        Vertical alignment: top, middle, bottom
+     *  - hOffset
+     *  - vOffset
+     *  - fontPath
+     *  - fontSize
+     *  - shadowOffset
+     *
+     * @return $this
+     */
+    public function text(string $text, array $options = []);
+
+    /**
+     * Saves any changes that have been made to file.
+     *
+     * Example:
+     *    $image->resize(100, 200, true)
+     *          ->save($target);
+     *
+     * @param string $target
+     *
+     * @return bool
+     */
+    public function save(?string $target = null, int $quality = 90);
 }
diff --git a/system/Language/Language.php b/system/Language/Language.php
index be66b8aab5b5..a6797f74ed9e 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Language;
@@ -21,308 +21,242 @@
  */
 class Language
 {
-	/**
-	 * Stores the retrieved language lines
-	 * from files for faster retrieval on
-	 * second use.
-	 *
-	 * @var array
-	 */
-	protected $language = [];
-
-	/**
-	 * The current language/locale to work with.
-	 *
-	 * @var string
-	 */
-	protected $locale;
-
-	/**
-	 * Boolean value whether the intl
-	 * libraries exist on the system.
-	 *
-	 * @var boolean
-	 */
-	protected $intlSupport = false;
-
-	/**
-	 * Stores filenames that have been
-	 * loaded so that we don't load them again.
-	 *
-	 * @var array
-	 */
-	protected $loadedFiles = [];
-
-	//--------------------------------------------------------------------
-
-	public function __construct(string $locale)
-	{
-		$this->locale = $locale;
-
-		if (class_exists('MessageFormatter'))
-		{
-			$this->intlSupport = true;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the current locale to use when performing string lookups.
-	 *
-	 * @param string $locale
-	 *
-	 * @return $this
-	 */
-	public function setLocale(string $locale = null)
-	{
-		if (! is_null($locale))
-		{
-			$this->locale = $locale;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @return string
-	 */
-	public function getLocale(): string
-	{
-		return $this->locale;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the language string for a file, loads the file, if necessary,
-	 * getting the line.
-	 *
-	 * @param string $line Line.
-	 * @param array  $args Arguments.
-	 *
-	 * @return string|string[] Returns line.
-	 */
-	public function getLine(string $line, array $args = [])
-	{
-		// if no file is given, just parse the line
-		if (strpos($line, '.') === false)
-		{
-			return $this->formatMessage($line, $args);
-		}
-
-		// Parse out the file name and the actual alias.
-		// Will load the language file and strings.
-		[$file, $parsedLine] = $this->parseLine($line, $this->locale);
-
-		$output = $this->getTranslationOutput($this->locale, $file, $parsedLine);
-
-		if ($output === null && strpos($this->locale, '-'))
-		{
-			[$locale] = explode('-', $this->locale, 2);
-
-			[$file, $parsedLine] = $this->parseLine($line, $locale);
-
-			$output = $this->getTranslationOutput($locale, $file, $parsedLine);
-		}
-
-		// if still not found, try English
-		if ($output === null)
-		{
-			[$file, $parsedLine] = $this->parseLine($line, 'en');
-
-			$output = $this->getTranslationOutput('en', $file, $parsedLine);
-		}
-
-		$output = $output ?? $line;
-
-		return $this->formatMessage($output, $args);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @return array|string|null
-	 */
-	protected function getTranslationOutput(string $locale, string $file, string $parsedLine)
-	{
-		$output = $this->language[$locale][$file][$parsedLine] ?? null;
-		if ($output !== null)
-		{
-			return $output;
-		}
-
-		foreach (explode('.', $parsedLine) as $row)
-		{
-			if (! isset($current))
-			{
-				$current = $this->language[$locale][$file] ?? null;
-			}
-
-			$output = $current[$row] ?? null;
-			if (is_array($output))
-			{
-				$current = $output;
-			}
-		}
-
-		if ($output !== null)
-		{
-			return $output;
-		}
-
-		$row = current(explode('.', $parsedLine));
-		$key = substr($parsedLine, strlen($row) + 1);
-
-		return $this->language[$locale][$file][$row][$key] ?? null;
-	}
-
-	/**
-	 * Parses the language string which should include the
-	 * filename as the first segment (separated by period).
-	 *
-	 * @param string $line
-	 * @param string $locale
-	 *
-	 * @return array
-	 */
-	protected function parseLine(string $line, string $locale): array
-	{
-		$file = substr($line, 0, strpos($line, '.'));
-		$line = substr($line, strlen($file) + 1);
-
-		if (! isset($this->language[$locale][$file]) || ! array_key_exists($line, $this->language[$locale][$file]))
-		{
-			$this->load($file, $locale);
-		}
-
-		return [
-			$file,
-			$line,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Advanced message formatting.
-	 *
-	 * @param string|array $message Message.
-	 * @param array	       $args    Arguments.
-	 *
-	 * @return string|array Returns formatted message.
-	 */
-	protected function formatMessage($message, array $args = [])
-	{
-		if (! $this->intlSupport || $args === [])
-		{
-			return $message;
-		}
-
-		if (is_array($message))
-		{
-			foreach ($message as $index => $value)
-			{
-				$message[$index] = $this->formatMessage($value, $args);
-			}
-
-			return $message;
-		}
-
-		return MessageFormatter::formatMessage($this->locale, $message, $args);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Loads a language file in the current locale. If $return is true,
-	 * will return the file's contents, otherwise will merge with
-	 * the existing language lines.
-	 *
-	 * @param string  $file
-	 * @param string  $locale
-	 * @param boolean $return
-	 *
-	 * @return void|array
-	 */
-	protected function load(string $file, string $locale, bool $return = false)
-	{
-		if (! array_key_exists($locale, $this->loadedFiles))
-		{
-			$this->loadedFiles[$locale] = [];
-		}
-
-		if (in_array($file, $this->loadedFiles[$locale], true))
-		{
-			// Don't load it more than once.
-			return [];
-		}
-
-		if (! array_key_exists($locale, $this->language))
-		{
-			$this->language[$locale] = [];
-		}
-
-		if (! array_key_exists($file, $this->language[$locale]))
-		{
-			$this->language[$locale][$file] = [];
-		}
-
-		$path = "Language/{$locale}/{$file}.php";
-
-		$lang = $this->requireFile($path);
-
-		if ($return)
-		{
-			return $lang;
-		}
-
-		$this->loadedFiles[$locale][] = $file;
-
-		// Merge our string
-		$this->language[$locale][$file] = $lang;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A simple method for including files that can be
-	 * overridden during testing.
-	 *
-	 * @param string $path
-	 *
-	 * @return array
-	 */
-	protected function requireFile(string $path): array
-	{
-		$files   = Services::locator()->search($path, 'php', false);
-		$strings = [];
-
-		foreach ($files as $file)
-		{
-			// On some OS's we were seeing failures
-			// on this command returning boolean instead
-			// of array during testing, so we've removed
-			// the require_once for now.
-			if (is_file($file))
-			{
-				$strings[] = require $file;
-			}
-		}
-
-		if (isset($strings[1]))
-		{
-			$strings = array_replace_recursive(...$strings);
-		}
-		elseif (isset($strings[0]))
-		{
-			$strings = $strings[0];
-		}
-
-		return $strings;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Stores the retrieved language lines
+     * from files for faster retrieval on
+     * second use.
+     *
+     * @var array
+     */
+    protected $language = [];
+
+    /**
+     * The current language/locale to work with.
+     *
+     * @var string
+     */
+    protected $locale;
+
+    /**
+     * Boolean value whether the intl
+     * libraries exist on the system.
+     *
+     * @var bool
+     */
+    protected $intlSupport = false;
+
+    /**
+     * Stores filenames that have been
+     * loaded so that we don't load them again.
+     *
+     * @var array
+     */
+    protected $loadedFiles = [];
+
+    public function __construct(string $locale)
+    {
+        $this->locale = $locale;
+
+        if (class_exists('MessageFormatter')) {
+            $this->intlSupport = true;
+        }
+    }
+
+    /**
+     * Sets the current locale to use when performing string lookups.
+     *
+     * @return $this
+     */
+    public function setLocale(?string $locale = null)
+    {
+        if ($locale !== null) {
+            $this->locale = $locale;
+        }
+
+        return $this;
+    }
+
+    public function getLocale(): string
+    {
+        return $this->locale;
+    }
+
+    /**
+     * Parses the language string for a file, loads the file, if necessary,
+     * getting the line.
+     *
+     * @return string|string[]
+     */
+    public function getLine(string $line, array $args = [])
+    {
+        // if no file is given, just parse the line
+        if (strpos($line, '.') === false) {
+            return $this->formatMessage($line, $args);
+        }
+
+        // Parse out the file name and the actual alias.
+        // Will load the language file and strings.
+        [$file, $parsedLine] = $this->parseLine($line, $this->locale);
+
+        $output = $this->getTranslationOutput($this->locale, $file, $parsedLine);
+
+        if ($output === null && strpos($this->locale, '-')) {
+            [$locale] = explode('-', $this->locale, 2);
+
+            [$file, $parsedLine] = $this->parseLine($line, $locale);
+
+            $output = $this->getTranslationOutput($locale, $file, $parsedLine);
+        }
+
+        // if still not found, try English
+        if ($output === null) {
+            [$file, $parsedLine] = $this->parseLine($line, 'en');
+
+            $output = $this->getTranslationOutput('en', $file, $parsedLine);
+        }
+
+        $output = $output ?? $line;
+
+        return $this->formatMessage($output, $args);
+    }
+
+    /**
+     * @return array|string|null
+     */
+    protected function getTranslationOutput(string $locale, string $file, string $parsedLine)
+    {
+        $output = $this->language[$locale][$file][$parsedLine] ?? null;
+        if ($output !== null) {
+            return $output;
+        }
+
+        foreach (explode('.', $parsedLine) as $row) {
+            if (! isset($current)) {
+                $current = $this->language[$locale][$file] ?? null;
+            }
+
+            $output = $current[$row] ?? null;
+            if (is_array($output)) {
+                $current = $output;
+            }
+        }
+
+        if ($output !== null) {
+            return $output;
+        }
+
+        $row = current(explode('.', $parsedLine));
+        $key = substr($parsedLine, strlen($row) + 1);
+
+        return $this->language[$locale][$file][$row][$key] ?? null;
+    }
+
+    /**
+     * Parses the language string which should include the
+     * filename as the first segment (separated by period).
+     */
+    protected function parseLine(string $line, string $locale): array
+    {
+        $file = substr($line, 0, strpos($line, '.'));
+        $line = substr($line, strlen($file) + 1);
+
+        if (! isset($this->language[$locale][$file]) || ! array_key_exists($line, $this->language[$locale][$file])) {
+            $this->load($file, $locale);
+        }
+
+        return [$file, $line];
+    }
+
+    /**
+     * Advanced message formatting.
+     *
+     * @param array|string $message
+     * @param string[]     $args
+     *
+     * @return array|string
+     */
+    protected function formatMessage($message, array $args = [])
+    {
+        if (! $this->intlSupport || $args === []) {
+            return $message;
+        }
+
+        if (is_array($message)) {
+            foreach ($message as $index => $value) {
+                $message[$index] = $this->formatMessage($value, $args);
+            }
+
+            return $message;
+        }
+
+        return MessageFormatter::formatMessage($this->locale, $message, $args);
+    }
+
+    /**
+     * Loads a language file in the current locale. If $return is true,
+     * will return the file's contents, otherwise will merge with
+     * the existing language lines.
+     *
+     * @return array|void
+     */
+    protected function load(string $file, string $locale, bool $return = false)
+    {
+        if (! array_key_exists($locale, $this->loadedFiles)) {
+            $this->loadedFiles[$locale] = [];
+        }
+
+        if (in_array($file, $this->loadedFiles[$locale], true)) {
+            // Don't load it more than once.
+            return [];
+        }
+
+        if (! array_key_exists($locale, $this->language)) {
+            $this->language[$locale] = [];
+        }
+
+        if (! array_key_exists($file, $this->language[$locale])) {
+            $this->language[$locale][$file] = [];
+        }
+
+        $path = "Language/{$locale}/{$file}.php";
+
+        $lang = $this->requireFile($path);
+
+        if ($return) {
+            return $lang;
+        }
+
+        $this->loadedFiles[$locale][] = $file;
+
+        // Merge our string
+        $this->language[$locale][$file] = $lang;
+    }
+
+    /**
+     * A simple method for including files that can be
+     * overridden during testing.
+     */
+    protected function requireFile(string $path): array
+    {
+        $files   = Services::locator()->search($path, 'php', false);
+        $strings = [];
+
+        foreach ($files as $file) {
+            // On some OS's we were seeing failures
+            // on this command returning boolean instead
+            // of array during testing, so we've removed
+            // the require_once for now.
+            if (is_file($file)) {
+                $strings[] = require $file;
+            }
+        }
+
+        if (isset($strings[1])) {
+            $strings = array_replace_recursive(...$strings);
+        } elseif (isset($strings[0])) {
+            $strings = $strings[0];
+        }
+
+        return $strings;
+    }
 }
diff --git a/system/Language/en/CLI.php b/system/Language/en/CLI.php
index ad2bafc3cb61..c8f7ecae081d 100644
--- a/system/Language/en/CLI.php
+++ b/system/Language/en/CLI.php
@@ -1,48 +1,48 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CLI language settings
 return [
-	'altCommandPlural'    => 'Did you mean one of these?',
-	'altCommandSingular'  => 'Did you mean this?',
-	'commandNotFound'     => 'Command "{0}" not found.',
-	'generator'           => [
-		'cancelOperation'  => 'Operation has been cancelled.',
-		'className'        => [
-			'command'    => 'Command class name',
-			'config'     => 'Config class name',
-			'controller' => 'Controller class name',
-			'default'    => 'Class name',
-			'entity'     => 'Entity class name',
-			'filter'     => 'Filter class name',
-			'migration'  => 'Migration class name',
-			'model'      => 'Model class name',
-			'seeder'     => 'Seeder class name',
-			'validation' => 'Validation class name',
-		],
-		'commandType'      => 'Command type',
-		'databaseGroup'    => 'Database group',
-		'fileCreate'       => 'File created: {0}',
-		'fileError'        => 'Error while creating file: {0}',
-		'fileExist'        => 'File exists: {0}',
-		'fileOverwrite'    => 'File overwritten: {0}',
-		'parentClass'      => 'Parent class',
-		'returnType'       => 'Return type',
-		'tableName'        => 'Table name',
-		'usingCINamespace' => 'Warning: Using the "CodeIgniter" namespace will generate the file in the system directory.'
-	],
-	'helpArguments'       => 'Arguments:',
-	'helpDescription'     => 'Description:',
-	'helpOptions'         => 'Options:',
-	'helpUsage'           => 'Usage:',
-	'invalidColor'        => 'Invalid {0} color: {1}.',
-	'namespaceNotDefined' => 'Namespace "{0}" is not defined.',
+    'altCommandPlural'   => 'Did you mean one of these?',
+    'altCommandSingular' => 'Did you mean this?',
+    'commandNotFound'    => 'Command "{0}" not found.',
+    'generator'          => [
+        'cancelOperation' => 'Operation has been cancelled.',
+        'className'       => [
+            'command'    => 'Command class name',
+            'config'     => 'Config class name',
+            'controller' => 'Controller class name',
+            'default'    => 'Class name',
+            'entity'     => 'Entity class name',
+            'filter'     => 'Filter class name',
+            'migration'  => 'Migration class name',
+            'model'      => 'Model class name',
+            'seeder'     => 'Seeder class name',
+            'validation' => 'Validation class name',
+        ],
+        'commandType'      => 'Command type',
+        'databaseGroup'    => 'Database group',
+        'fileCreate'       => 'File created: {0}',
+        'fileError'        => 'Error while creating file: {0}',
+        'fileExist'        => 'File exists: {0}',
+        'fileOverwrite'    => 'File overwritten: {0}',
+        'parentClass'      => 'Parent class',
+        'returnType'       => 'Return type',
+        'tableName'        => 'Table name',
+        'usingCINamespace' => 'Warning: Using the "CodeIgniter" namespace will generate the file in the system directory.',
+    ],
+    'helpArguments'       => 'Arguments:',
+    'helpDescription'     => 'Description:',
+    'helpOptions'         => 'Options:',
+    'helpUsage'           => 'Usage:',
+    'invalidColor'        => 'Invalid {0} color: {1}.',
+    'namespaceNotDefined' => 'Namespace "{0}" is not defined.',
 ];
diff --git a/system/Language/en/Cache.php b/system/Language/en/Cache.php
index 5780670fbcef..d119223a837f 100644
--- a/system/Language/en/Cache.php
+++ b/system/Language/en/Cache.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cache language settings
 return [
-	'unableToWrite'   => 'Cache unable to write to {0}.',
-	'invalidHandlers' => 'Cache config must have an array of $validHandlers.',
-	'noBackup'        => 'Cache config must have a handler and backupHandler set.',
-	'handlerNotFound' => 'Cache config has an invalid handler or backup handler specified.',
+    'unableToWrite'   => 'Cache unable to write to {0}.',
+    'invalidHandlers' => 'Cache config must have an array of $validHandlers.',
+    'noBackup'        => 'Cache config must have a handler and backupHandler set.',
+    'handlerNotFound' => 'Cache config has an invalid handler or backup handler specified.',
 ];
diff --git a/system/Language/en/Cast.php b/system/Language/en/Cast.php
index 6fb9f4b8e680..46132b0ec801 100644
--- a/system/Language/en/Cast.php
+++ b/system/Language/en/Cast.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cast language settings
 return [
-	'baseCastMissing'        => 'The "{0}" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class.',
-	'invalidCastMethod'      => 'The "{0}" is invalid cast method, valid methods are: ["get", "set"].',
-	'invalidTimestamp'       => 'Type casting "timestamp" expects a correct timestamp.',
-	'jsonErrorCtrlChar'      => 'Unexpected control character found.',
-	'jsonErrorDepth'         => 'Maximum stack depth exceeded.',
-	'jsonErrorStateMismatch' => 'Underflow or the modes mismatch.',
-	'jsonErrorSyntax'        => 'Syntax error, malformed JSON.',
-	'jsonErrorUnknown'       => 'Unknown error.',
-	'jsonErrorUtf8'          => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
+    'baseCastMissing'        => 'The "{0}" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class.',
+    'invalidCastMethod'      => 'The "{0}" is invalid cast method, valid methods are: ["get", "set"].',
+    'invalidTimestamp'       => 'Type casting "timestamp" expects a correct timestamp.',
+    'jsonErrorCtrlChar'      => 'Unexpected control character found.',
+    'jsonErrorDepth'         => 'Maximum stack depth exceeded.',
+    'jsonErrorStateMismatch' => 'Underflow or the modes mismatch.',
+    'jsonErrorSyntax'        => 'Syntax error, malformed JSON.',
+    'jsonErrorUnknown'       => 'Unknown error.',
+    'jsonErrorUtf8'          => 'Malformed UTF-8 characters, possibly incorrectly encoded.',
 ];
diff --git a/system/Language/en/Cookie.php b/system/Language/en/Cookie.php
index cc64d4626763..3de21a0fda01 100644
--- a/system/Language/en/Cookie.php
+++ b/system/Language/en/Cookie.php
@@ -1,24 +1,24 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cookie language settings
 return [
-   'invalidExpiresTime'    => 'Invalid "{0}" type for "Expires" attribute. Expected: string, integer, DateTimeInterface object.',
-   'invalidExpiresValue'   => 'The cookie expiration time is not valid.',
-   'invalidCookieName'     => 'The cookie name "{0}" contains invalid characters.',
-   'emptyCookieName'       => 'The cookie name cannot be empty.',
-   'invalidSecurePrefix'   => 'Using the "__Secure-" prefix requires setting the "Secure" attribute.',
-   'invalidHostPrefix'     => 'Using the "__Host-" prefix must be set with the "Secure" flag, must not have a "Domain" attribute, and the "Path" is set to "/".',
-   'invalidSameSite'       => 'The SameSite value must be None, Lax, Strict or a blank string, {0} given.',
-   'invalidSameSiteNone'   => 'Using the "SameSite=None" attribute requires setting the "Secure" attribute.',
-   'invalidCookieInstance' => '"{0}" class expected cookies array to be instances of "{1}" but got "{2}" at index {3}.',
-   'unknownCookieInstance' => 'Cookie object with name "{0}" and prefix "{1}" was not found in the collection.',
+    'invalidExpiresTime'    => 'Invalid "{0}" type for "Expires" attribute. Expected: string, integer, DateTimeInterface object.',
+    'invalidExpiresValue'   => 'The cookie expiration time is not valid.',
+    'invalidCookieName'     => 'The cookie name "{0}" contains invalid characters.',
+    'emptyCookieName'       => 'The cookie name cannot be empty.',
+    'invalidSecurePrefix'   => 'Using the "__Secure-" prefix requires setting the "Secure" attribute.',
+    'invalidHostPrefix'     => 'Using the "__Host-" prefix must be set with the "Secure" flag, must not have a "Domain" attribute, and the "Path" is set to "/".',
+    'invalidSameSite'       => 'The SameSite value must be None, Lax, Strict or a blank string, {0} given.',
+    'invalidSameSiteNone'   => 'Using the "SameSite=None" attribute requires setting the "Secure" attribute.',
+    'invalidCookieInstance' => '"{0}" class expected cookies array to be instances of "{1}" but got "{2}" at index {3}.',
+    'unknownCookieInstance' => 'Cookie object with name "{0}" and prefix "{1}" was not found in the collection.',
 ];
diff --git a/system/Language/en/Core.php b/system/Language/en/Core.php
index 82e039733d49..f292bb833a01 100644
--- a/system/Language/en/Core.php
+++ b/system/Language/en/Core.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Core language settings
 return [
-	'copyError'                    => 'An error was encountered while attempting to replace the file ({0}). Please make sure your file directory is writable.',
-	'enabledZlibOutputCompression' => 'Your zlib.output_compression ini directive is turned on. This will not work well with output buffers.',
-	'invalidFile'                  => 'Invalid file: {0}',
-	'invalidPhpVersion'            => 'Your PHP version must be {0} or higher to run CodeIgniter. Current version: {1}',
-	'missingExtension'             => 'The framework needs the following extension(s) installed and loaded: {0}.',
-	'noHandlers'                   => '{0} must provide at least one Handler.',
+    'copyError'                    => 'An error was encountered while attempting to replace the file ({0}). Please make sure your file directory is writable.',
+    'enabledZlibOutputCompression' => 'Your zlib.output_compression ini directive is turned on. This will not work well with output buffers.',
+    'invalidFile'                  => 'Invalid file: {0}',
+    'invalidPhpVersion'            => 'Your PHP version must be {0} or higher to run CodeIgniter. Current version: {1}',
+    'missingExtension'             => 'The framework needs the following extension(s) installed and loaded: {0}.',
+    'noHandlers'                   => '{0} must provide at least one Handler.',
 ];
diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php
index 4e04aee22000..f57f7dc598cc 100644
--- a/system/Language/en/Database.php
+++ b/system/Language/en/Database.php
@@ -1,30 +1,30 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Database language settings
 return [
-	'invalidEvent'                     => '{0} is not a valid Model Event callback.',
-	'invalidArgument'                  => 'You must provide a valid {0}.',
-	'invalidAllowedFields'             => 'Allowed fields must be specified for model: {0}',
-	'emptyDataset'                     => 'There is no data to {0}.',
-	'emptyPrimaryKey'                  => 'There is no primary key defined when trying to make {0}.',
-	'failGetFieldData'                 => 'Failed to get field data from database.',
-	'failGetIndexData'                 => 'Failed to get index data from database.',
-	'failGetForeignKeyData'            => 'Failed to get foreign key data from database.',
-	'parseStringFail'                  => 'Parsing key string failed.',
-	'featureUnavailable'               => 'This feature is not available for the database you are using.',
-	'tableNotFound'                    => 'Table `{0}` was not found in the current database.',
-	'noPrimaryKey'                     => '`{0}` model class does not specify a Primary Key.',
-	'noDateFormat'                     => '`{0}` model class does not have a valid dateFormat.',
-	'fieldNotExists'                   => 'Field `{0}` not found.',
-	'forEmptyInputGiven'               => 'Empty statement is given for the field `{0}`',
-	'forFindColumnHaveMultipleColumns' => 'Only single column allowed in Column name.',
+    'invalidEvent'                     => '{0} is not a valid Model Event callback.',
+    'invalidArgument'                  => 'You must provide a valid {0}.',
+    'invalidAllowedFields'             => 'Allowed fields must be specified for model: {0}',
+    'emptyDataset'                     => 'There is no data to {0}.',
+    'emptyPrimaryKey'                  => 'There is no primary key defined when trying to make {0}.',
+    'failGetFieldData'                 => 'Failed to get field data from database.',
+    'failGetIndexData'                 => 'Failed to get index data from database.',
+    'failGetForeignKeyData'            => 'Failed to get foreign key data from database.',
+    'parseStringFail'                  => 'Parsing key string failed.',
+    'featureUnavailable'               => 'This feature is not available for the database you are using.',
+    'tableNotFound'                    => 'Table `{0}` was not found in the current database.',
+    'noPrimaryKey'                     => '`{0}` model class does not specify a Primary Key.',
+    'noDateFormat'                     => '`{0}` model class does not have a valid dateFormat.',
+    'fieldNotExists'                   => 'Field `{0}` not found.',
+    'forEmptyInputGiven'               => 'Empty statement is given for the field `{0}`',
+    'forFindColumnHaveMultipleColumns' => 'Only single column allowed in Column name.',
 ];
diff --git a/system/Language/en/Email.php b/system/Language/en/Email.php
index 2abdd932f251..16ff832ee8a8 100644
--- a/system/Language/en/Email.php
+++ b/system/Language/en/Email.php
@@ -1,33 +1,33 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Email language settings
 return [
-	'mustBeArray'          => 'The email validation method must be passed an array.',
-	'invalidAddress'       => 'Invalid email address: {0}',
-	'attachmentMissing'    => 'Unable to locate the following email attachment: {0}',
-	'attachmentUnreadable' => 'Unable to open this attachment: {0}',
-	'noFrom'               => 'Cannot send mail with no "From" header.',
-	'noRecipients'         => 'You must include recipients: To, Cc, or Bcc',
-	'sendFailurePHPMail'   => 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.',
-	'sendFailureSendmail'  => 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.',
-	'sendFailureSmtp'      => 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.',
-	'sent'                 => 'Your message has been successfully sent using the following protocol: {0}',
-	'noSocket'             => 'Unable to open a socket to Sendmail. Please check settings.',
-	'noHostname'           => 'You did not specify a SMTP hostname.',
-	'SMTPError'            => 'The following SMTP error was encountered: {0}',
-	'noSMTPAuth'           => 'Error: You must assign a SMTP username and password.',
-	'failedSMTPLogin'      => 'Failed to send AUTH LOGIN command. Error: {0}',
-	'SMTPAuthUsername'     => 'Failed to authenticate username. Error: {0}',
-	'SMTPAuthPassword'     => 'Failed to authenticate password. Error: {0}',
-	'SMTPDataFailure'      => 'Unable to send data: {0}',
-	'exitStatus'           => 'Exit status code: {0}',
+    'mustBeArray'          => 'The email validation method must be passed an array.',
+    'invalidAddress'       => 'Invalid email address: {0}',
+    'attachmentMissing'    => 'Unable to locate the following email attachment: {0}',
+    'attachmentUnreadable' => 'Unable to open this attachment: {0}',
+    'noFrom'               => 'Cannot send mail with no "From" header.',
+    'noRecipients'         => 'You must include recipients: To, Cc, or Bcc',
+    'sendFailurePHPMail'   => 'Unable to send email using PHP mail(). Your server might not be configured to send mail using this method.',
+    'sendFailureSendmail'  => 'Unable to send email using PHP Sendmail. Your server might not be configured to send mail using this method.',
+    'sendFailureSmtp'      => 'Unable to send email using PHP SMTP. Your server might not be configured to send mail using this method.',
+    'sent'                 => 'Your message has been successfully sent using the following protocol: {0}',
+    'noSocket'             => 'Unable to open a socket to Sendmail. Please check settings.',
+    'noHostname'           => 'You did not specify a SMTP hostname.',
+    'SMTPError'            => 'The following SMTP error was encountered: {0}',
+    'noSMTPAuth'           => 'Error: You must assign a SMTP username and password.',
+    'failedSMTPLogin'      => 'Failed to send AUTH LOGIN command. Error: {0}',
+    'SMTPAuthUsername'     => 'Failed to authenticate username. Error: {0}',
+    'SMTPAuthPassword'     => 'Failed to authenticate password. Error: {0}',
+    'SMTPDataFailure'      => 'Unable to send data: {0}',
+    'exitStatus'           => 'Exit status code: {0}',
 ];
diff --git a/system/Language/en/Encryption.php b/system/Language/en/Encryption.php
index 756eeaa4b4c5..269974fc885d 100644
--- a/system/Language/en/Encryption.php
+++ b/system/Language/en/Encryption.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Encryption language settings
 return [
-	'noDriverRequested'    => 'No driver requested; Miss Daisy will be so upset!',
-	'noHandlerAvailable'   => 'Unable to find an available {0} encryption handler.',
-	'unKnownHandler'       => '"{0}" cannot be configured.',
-	'starterKeyNeeded'     => 'Encrypter needs a starter key.',
-	'authenticationFailed' => 'Decrypting: authentication failed.',
-	'encryptionFailed'     => 'Encryption failed.',
+    'noDriverRequested'    => 'No driver requested; Miss Daisy will be so upset!',
+    'noHandlerAvailable'   => 'Unable to find an available {0} encryption handler.',
+    'unKnownHandler'       => '"{0}" cannot be configured.',
+    'starterKeyNeeded'     => 'Encrypter needs a starter key.',
+    'authenticationFailed' => 'Decrypting: authentication failed.',
+    'encryptionFailed'     => 'Encryption failed.',
 ];
diff --git a/system/Language/en/Fabricator.php b/system/Language/en/Fabricator.php
index 4e4ecb3082c2..94140af339b2 100644
--- a/system/Language/en/Fabricator.php
+++ b/system/Language/en/Fabricator.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Fabricator language settings
 return [
-	'invalidModel'      => 'Invalid model supplied for fabrication.',
-	'missingFormatters' => 'No valid formatters defined.',
-	'createFailed'      => 'Fabricator failed to insert on table {0}: {1}',
+    'invalidModel'      => 'Invalid model supplied for fabrication.',
+    'missingFormatters' => 'No valid formatters defined.',
+    'createFailed'      => 'Fabricator failed to insert on table {0}: {1}',
 ];
diff --git a/system/Language/en/Files.php b/system/Language/en/Files.php
index 772ad8cdf539..924e98ea354a 100644
--- a/system/Language/en/Files.php
+++ b/system/Language/en/Files.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Files language settings
 return [
-	'fileNotFound' => 'File not found: {0}',
-	'cannotMove'   => 'Could not move file {0} to {1} ({2}).',
+    'fileNotFound' => 'File not found: {0}',
+    'cannotMove'   => 'Could not move file {0} to {1} ({2}).',
 ];
diff --git a/system/Language/en/Filters.php b/system/Language/en/Filters.php
index 4fc860f1642a..fc59eaf8d005 100644
--- a/system/Language/en/Filters.php
+++ b/system/Language/en/Filters.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Filters language settings
 return [
-	'noFilter'           => '{0} filter must have a matching alias defined.',
-	'incorrectInterface' => '{0} must implement CodeIgniter\Filters\FilterInterface.',
+    'noFilter'           => '{0} filter must have a matching alias defined.',
+    'incorrectInterface' => '{0} must implement CodeIgniter\Filters\FilterInterface.',
 ];
diff --git a/system/Language/en/Format.php b/system/Language/en/Format.php
index 383b5b567f16..8c06207e80d4 100644
--- a/system/Language/en/Format.php
+++ b/system/Language/en/Format.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Format language settings
 return [
-	'invalidFormatter' => '"{0}" is not a valid Formatter class.',
-	'invalidJSON'      => 'Failed to parse json string, error: "{0}".',
-	'invalidMime'      => 'No Formatter defined for mime type: "{0}".',
-	'missingExtension' => 'The SimpleXML extension is required to format XML.',
+    'invalidFormatter' => '"{0}" is not a valid Formatter class.',
+    'invalidJSON'      => 'Failed to parse json string, error: "{0}".',
+    'invalidMime'      => 'No Formatter defined for mime type: "{0}".',
+    'missingExtension' => 'The SimpleXML extension is required to format XML.',
 ];
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
index a70f50d28914..8902b8ea4d89 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -1,78 +1,78 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // HTTP language settings
 return [
-	// CurlRequest
-	'missingCurl'                => 'CURL must be enabled to use the CURLRequest class.',
-	'invalidSSLKey'              => 'Cannot set SSL Key. {0} is not a valid file.',
-	'sslCertNotFound'            => 'SSL certificate not found at: {0}',
-	'curlError'                  => '{0} : {1}',
+    // CurlRequest
+    'missingCurl'     => 'CURL must be enabled to use the CURLRequest class.',
+    'invalidSSLKey'   => 'Cannot set SSL Key. {0} is not a valid file.',
+    'sslCertNotFound' => 'SSL certificate not found at: {0}',
+    'curlError'       => '{0} : {1}',
 
-	// IncomingRequest
-	'invalidNegotiationType'     => '{0} is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
+    // IncomingRequest
+    'invalidNegotiationType' => '{0} is not a valid negotiation type. Must be one of: media, charset, encoding, language.',
 
-	// Message
-	'invalidHTTPProtocol'        => 'Invalid HTTP Protocol Version. Must be one of: {0}',
+    // Message
+    'invalidHTTPProtocol' => 'Invalid HTTP Protocol Version. Must be one of: {0}',
 
-	// Negotiate
-	'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
+    // Negotiate
+    'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
 
-	// RedirectResponse
-	'invalidRoute'               => '{0} route cannot be found while reverse-routing.',
+    // RedirectResponse
+    'invalidRoute' => '{0} route cannot be found while reverse-routing.',
 
-	// DownloadResponse
-	'cannotSetBinary'            => 'When setting filepath cannot set binary.',
-	'cannotSetFilepath'          => 'When setting binary cannot set filepath: {0}',
-	'notFoundDownloadSource'     => 'Not found download body source.',
-	'cannotSetCache'             => 'It does not support caching for downloading.',
-	'cannotSetStatusCode'        => 'It does not support change status code for downloading. code: {0}, reason: {1}',
+    // DownloadResponse
+    'cannotSetBinary'        => 'When setting filepath cannot set binary.',
+    'cannotSetFilepath'      => 'When setting binary cannot set filepath: {0}',
+    'notFoundDownloadSource' => 'Not found download body source.',
+    'cannotSetCache'         => 'It does not support caching for downloading.',
+    'cannotSetStatusCode'    => 'It does not support change status code for downloading. code: {0}, reason: {1}',
 
-	// Response
-	'missingResponseStatus'      => 'HTTP Response is missing a status code',
-	'invalidStatusCode'          => '{0} is not a valid HTTP return status code',
-	'unknownStatusCode'          => 'Unknown HTTP status code provided with no message: {0}',
+    // Response
+    'missingResponseStatus' => 'HTTP Response is missing a status code',
+    'invalidStatusCode'     => '{0} is not a valid HTTP return status code',
+    'unknownStatusCode'     => 'Unknown HTTP status code provided with no message: {0}',
 
-	// URI
-	'cannotParseURI'             => 'Unable to parse URI: {0}',
-	'segmentOutOfRange'          => 'Request URI segment is out of range: {0}',
-	'invalidPort'                => 'Ports must be between 0 and 65535. Given: {0}',
-	'malformedQueryString'       => 'Query strings may not include URI fragments.',
+    // URI
+    'cannotParseURI'       => 'Unable to parse URI: {0}',
+    'segmentOutOfRange'    => 'Request URI segment is out of range: {0}',
+    'invalidPort'          => 'Ports must be between 0 and 65535. Given: {0}',
+    'malformedQueryString' => 'Query strings may not include URI fragments.',
 
-	// Page Not Found
-	'pageNotFound'               => 'Page Not Found',
-	'emptyController'            => 'No Controller specified.',
-	'controllerNotFound'         => 'Controller or its method is not found: {0}::{1}',
-	'methodNotFound'             => 'Controller method is not found: {0}',
+    // Page Not Found
+    'pageNotFound'       => 'Page Not Found',
+    'emptyController'    => 'No Controller specified.',
+    'controllerNotFound' => 'Controller or its method is not found: {0}::{1}',
+    'methodNotFound'     => 'Controller method is not found: {0}',
 
-	// CSRF
-	// @deprecated use `Security.disallowedAction`
-	'disallowedAction'           => 'The action you requested is not allowed.',
+    // CSRF
+    // @deprecated use `Security.disallowedAction`
+    'disallowedAction' => 'The action you requested is not allowed.',
 
-	// Uploaded file moving
-	'alreadyMoved'               => 'The uploaded file has already been moved.',
-	'invalidFile'                => 'The original file is not a valid file.',
-	'moveFailed'                 => 'Could not move file {0} to {1} ({2})',
+    // Uploaded file moving
+    'alreadyMoved' => 'The uploaded file has already been moved.',
+    'invalidFile'  => 'The original file is not a valid file.',
+    'moveFailed'   => 'Could not move file {0} to {1} ({2})',
 
-	'uploadErrOk'                => 'The file uploaded with success.',
-	'uploadErrIniSize'           => 'The file "%s" exceeds your upload_max_filesize ini directive.',
-	'uploadErrFormSize'          => 'The file "%s" exceeds the upload limit defined in your form.',
-	'uploadErrPartial'           => 'The file "%s" was only partially uploaded.',
-	'uploadErrNoFile'            => 'No file was uploaded.',
-	'uploadErrCantWrite'         => 'The file "%s" could not be written on disk.',
-	'uploadErrNoTmpDir'          => 'File could not be uploaded: missing temporary directory.',
-	'uploadErrExtension'         => 'File upload was stopped by a PHP extension.',
-	'uploadErrUnknown'           => 'The file "%s" was not uploaded due to an unknown error.',
+    'uploadErrOk'        => 'The file uploaded with success.',
+    'uploadErrIniSize'   => 'The file "%s" exceeds your upload_max_filesize ini directive.',
+    'uploadErrFormSize'  => 'The file "%s" exceeds the upload limit defined in your form.',
+    'uploadErrPartial'   => 'The file "%s" was only partially uploaded.',
+    'uploadErrNoFile'    => 'No file was uploaded.',
+    'uploadErrCantWrite' => 'The file "%s" could not be written on disk.',
+    'uploadErrNoTmpDir'  => 'File could not be uploaded: missing temporary directory.',
+    'uploadErrExtension' => 'File upload was stopped by a PHP extension.',
+    'uploadErrUnknown'   => 'The file "%s" was not uploaded due to an unknown error.',
 
-	// SameSite setting
-	// @deprecated
-	'invalidSameSiteSetting'     => 'The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+    // SameSite setting
+    // @deprecated
+    'invalidSameSiteSetting' => 'The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
 ];
diff --git a/system/Language/en/Images.php b/system/Language/en/Images.php
index 5ad5ea6c6d79..e31804ab4159 100644
--- a/system/Language/en/Images.php
+++ b/system/Language/en/Images.php
@@ -1,34 +1,34 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Images language settings
 return [
-	'sourceImageRequired'    => 'You must specify a source image in your preferences.',
-	'gdRequired'             => 'The GD image library is required to use this feature.',
-	'gdRequiredForProps'     => 'Your server must support the GD image library in order to determine the image properties.',
-	'gifNotSupported'        => 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.',
-	'jpgNotSupported'        => 'JPG images are not supported.',
-	'pngNotSupported'        => 'PNG images are not supported.',
-	'webpNotSupported'       => 'WEBP images are not supported.',
-	'fileNotSupported'       => 'The supplied file is not a supported image type.',
-	'unsupportedImageCreate' => 'Your server does not support the GD function required to process this type of image.',
-	'jpgOrPngRequired'       => 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.',
-	'rotateUnsupported'      => 'Image rotation does not appear to be supported by your server.',
-	'libPathInvalid'         => 'The path to your image library is not correct. Please set the correct path in your image preferences. {0}',
-	'imageProcessFailed'     => 'Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.',
-	'rotationAngleRequired'  => 'An angle of rotation is required to rotate the image.',
-	'invalidPath'            => 'The path to the image is not correct.',
-	'copyFailed'             => 'The image copy routine failed.',
-	'missingFont'            => 'Unable to find a font to use.',
-	'saveFailed'             => 'Unable to save the image. Please make sure the image and file directory are writable.',
-	'invalidDirection'       => 'Flip direction can be only `vertical` or `horizontal`. Given: {0}',
-	'exifNotSupported'       => 'Reading EXIF data is not supported by this PHP installation.',
+    'sourceImageRequired'    => 'You must specify a source image in your preferences.',
+    'gdRequired'             => 'The GD image library is required to use this feature.',
+    'gdRequiredForProps'     => 'Your server must support the GD image library in order to determine the image properties.',
+    'gifNotSupported'        => 'GIF images are often not supported due to licensing restrictions. You may have to use JPG or PNG images instead.',
+    'jpgNotSupported'        => 'JPG images are not supported.',
+    'pngNotSupported'        => 'PNG images are not supported.',
+    'webpNotSupported'       => 'WEBP images are not supported.',
+    'fileNotSupported'       => 'The supplied file is not a supported image type.',
+    'unsupportedImageCreate' => 'Your server does not support the GD function required to process this type of image.',
+    'jpgOrPngRequired'       => 'The image resize protocol specified in your preferences only works with JPEG or PNG image types.',
+    'rotateUnsupported'      => 'Image rotation does not appear to be supported by your server.',
+    'libPathInvalid'         => 'The path to your image library is not correct. Please set the correct path in your image preferences. {0}',
+    'imageProcessFailed'     => 'Image processing failed. Please verify that your server supports the chosen protocol and that the path to your image library is correct.',
+    'rotationAngleRequired'  => 'An angle of rotation is required to rotate the image.',
+    'invalidPath'            => 'The path to the image is not correct.',
+    'copyFailed'             => 'The image copy routine failed.',
+    'missingFont'            => 'Unable to find a font to use.',
+    'saveFailed'             => 'Unable to save the image. Please make sure the image and file directory are writable.',
+    'invalidDirection'       => 'Flip direction can be only `vertical` or `horizontal`. Given: {0}',
+    'exifNotSupported'       => 'Reading EXIF data is not supported by this PHP installation.',
 ];
diff --git a/system/Language/en/Log.php b/system/Language/en/Log.php
index 84f5ae165dab..154d402b6c95 100644
--- a/system/Language/en/Log.php
+++ b/system/Language/en/Log.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Log language settings
 return [
-	'invalidLogLevel'    => '{0} is an invalid log level.',
-	'invalidMessageType' => 'The given message type "{0}" is not supported.',
+    'invalidLogLevel'    => '{0} is an invalid log level.',
+    'invalidMessageType' => 'The given message type "{0}" is not supported.',
 ];
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index 05335cdd2b8c..1e9ef6316d37 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -1,57 +1,57 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Migration language settings
 return [
-	// Migration Runner
-	'missingTable'      => 'Migrations table must be set.',
-	'disabled'          => 'Migrations have been loaded but are disabled or setup incorrectly.',
-	'notFound'          => 'Migration file not found: ',
-	'batchNotFound'     => 'Target batch not found: ',
-	'empty'             => 'No Migration files found',
-	'gap'               => 'There is a gap in the migration sequence near version number: ',
-	'classNotFound'     => 'The migration class "%s" could not be found.',
-	'missingMethod'     => 'The migration class is missing an "%s" method.',
+    // Migration Runner
+    'missingTable'  => 'Migrations table must be set.',
+    'disabled'      => 'Migrations have been loaded but are disabled or setup incorrectly.',
+    'notFound'      => 'Migration file not found: ',
+    'batchNotFound' => 'Target batch not found: ',
+    'empty'         => 'No Migration files found',
+    'gap'           => 'There is a gap in the migration sequence near version number: ',
+    'classNotFound' => 'The migration class "%s" could not be found.',
+    'missingMethod' => 'The migration class is missing an "%s" method.',
 
-	// Migration Command
-	'migHelpLatest'     => "\t\tMigrates database to latest available migration.",
-	'migHelpCurrent'    => "\t\tMigrates database to version set as 'current' in configuration.",
-	'migHelpVersion'    => "\tMigrates database to version {v}.",
-	'migHelpRollback'   => "\tRuns all migrations 'down' to version 0.",
-	'migHelpRefresh'    => "\t\tUninstalls and re-runs all migrations to freshen database.",
-	'migHelpSeed'       => "\tRuns the seeder named [name].",
-	'migCreate'         => "\tCreates a new migration named [name]",
-	'nameMigration'     => 'Name the migration file',
-	'migNumberError'    => 'Migration number must be three digits, and there must not be any gaps in the sequence.',
-	'rollBackConfirm'   => 'Are you sure you want to rollback?',
-	'refreshConfirm'    => 'Are you sure you want to refresh?',
+    // Migration Command
+    'migHelpLatest'   => "\t\tMigrates database to latest available migration.",
+    'migHelpCurrent'  => "\t\tMigrates database to version set as 'current' in configuration.",
+    'migHelpVersion'  => "\tMigrates database to version {v}.",
+    'migHelpRollback' => "\tRuns all migrations 'down' to version 0.",
+    'migHelpRefresh'  => "\t\tUninstalls and re-runs all migrations to freshen database.",
+    'migHelpSeed'     => "\tRuns the seeder named [name].",
+    'migCreate'       => "\tCreates a new migration named [name]",
+    'nameMigration'   => 'Name the migration file',
+    'migNumberError'  => 'Migration number must be three digits, and there must not be any gaps in the sequence.',
+    'rollBackConfirm' => 'Are you sure you want to rollback?',
+    'refreshConfirm'  => 'Are you sure you want to refresh?',
 
-	'latest'            => 'Running all new migrations...',
-	'generalFault'      => 'Migration failed!',
-	'migInvalidVersion' => 'Invalid version number provided.',
-	'toVersionPH'       => 'Migrating to version %s...',
-	'toVersion'         => 'Migrating to current version...',
-	'rollingBack'       => 'Rolling back migrations to batch: ',
-	'noneFound'         => 'No migrations were found.',
-	'migSeeder'         => 'Seeder name',
-	'migMissingSeeder'  => 'You must provide a seeder name.',
-	'nameSeeder'        => 'Name the seeder file',
-	'removed'           => 'Rolling back: ',
-	'added'             => 'Running: ',
+    'latest'            => 'Running all new migrations...',
+    'generalFault'      => 'Migration failed!',
+    'migInvalidVersion' => 'Invalid version number provided.',
+    'toVersionPH'       => 'Migrating to version %s...',
+    'toVersion'         => 'Migrating to current version...',
+    'rollingBack'       => 'Rolling back migrations to batch: ',
+    'noneFound'         => 'No migrations were found.',
+    'migSeeder'         => 'Seeder name',
+    'migMissingSeeder'  => 'You must provide a seeder name.',
+    'nameSeeder'        => 'Name the seeder file',
+    'removed'           => 'Rolling back: ',
+    'added'             => 'Running: ',
 
-	// Migrate Status
-	'namespace'         => 'Namespace',
-	'filename'          => 'Filename',
-	'version'           => 'Version',
-	'group'             => 'Group',
-	'on'                => 'Migrated On: ',
-	'batch'             => 'Batch',
+    // Migrate Status
+    'namespace' => 'Namespace',
+    'filename'  => 'Filename',
+    'version'   => 'Version',
+    'group'     => 'Group',
+    'on'        => 'Migrated On: ',
+    'batch'     => 'Batch',
 ];
diff --git a/system/Language/en/Number.php b/system/Language/en/Number.php
index 117c89241cab..c1660fdd49a5 100644
--- a/system/Language/en/Number.php
+++ b/system/Language/en/Number.php
@@ -1,26 +1,26 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Number language settings
 return [
-	'terabyteAbbr' => 'TB',
-	'gigabyteAbbr' => 'GB',
-	'megabyteAbbr' => 'MB',
-	'kilobyteAbbr' => 'KB',
-	'bytes'        => 'Bytes',
+    'terabyteAbbr' => 'TB',
+    'gigabyteAbbr' => 'GB',
+    'megabyteAbbr' => 'MB',
+    'kilobyteAbbr' => 'KB',
+    'bytes'        => 'Bytes',
 
-	// don't forget the space in front of these!
-	'thousand'     => ' thousand',
-	'million'      => ' million',
-	'billion'      => ' billion',
-	'trillion'     => ' trillion',
-	'quadrillion'  => ' quadrillion',
+    // don't forget the space in front of these!
+    'thousand'    => ' thousand',
+    'million'     => ' million',
+    'billion'     => ' billion',
+    'trillion'    => ' trillion',
+    'quadrillion' => ' quadrillion',
 ];
diff --git a/system/Language/en/Pager.php b/system/Language/en/Pager.php
index f89fb9982386..81e6d2627cf5 100644
--- a/system/Language/en/Pager.php
+++ b/system/Language/en/Pager.php
@@ -1,23 +1,23 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Pager language settings
 return [
-	'pageNavigation'         => 'Page navigation',
-	'first'                  => 'First',
-	'previous'               => 'Previous',
-	'next'                   => 'Next',
-	'last'                   => 'Last',
-	'older'                  => 'Older',
-	'newer'                  => 'Newer',
-	'invalidTemplate'        => '{0} is not a valid Pager template.',
-	'invalidPaginationGroup' => '{0} is not a valid Pagination group.',
+    'pageNavigation'         => 'Page navigation',
+    'first'                  => 'First',
+    'previous'               => 'Previous',
+    'next'                   => 'Next',
+    'last'                   => 'Last',
+    'older'                  => 'Older',
+    'newer'                  => 'Newer',
+    'invalidTemplate'        => '{0} is not a valid Pager template.',
+    'invalidPaginationGroup' => '{0} is not a valid Pagination group.',
 ];
diff --git a/system/Language/en/RESTful.php b/system/Language/en/RESTful.php
index 6a8341dcf2c8..b3ac05e89b91 100644
--- a/system/Language/en/RESTful.php
+++ b/system/Language/en/RESTful.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // RESTful language settings
 return [
-	'notImplemented' => '"{0}" action not implemented.',
+    'notImplemented' => '"{0}" action not implemented.',
 ];
diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
index 450b1c3722e8..9f6cdb700f04 100644
--- a/system/Language/en/Router.php
+++ b/system/Language/en/Router.php
@@ -1,16 +1,16 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Router language settings
 return [
-	'invalidParameter'    => 'A parameter does not match the expected type.',
-	'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
+    'invalidParameter'    => 'A parameter does not match the expected type.',
+    'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
 ];
diff --git a/system/Language/en/Security.php b/system/Language/en/Security.php
index a09c3586894b..5abec93db367 100644
--- a/system/Language/en/Security.php
+++ b/system/Language/en/Security.php
@@ -1,18 +1,18 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Security language settings
 return [
-	'disallowedAction' => 'The action you requested is not allowed.',
+    'disallowedAction' => 'The action you requested is not allowed.',
 
-	// @deprecated
-	'invalidSameSite'  => 'The SameSite value must be None, Lax, Strict, or a blank string. Given: {0}',
+    // @deprecated
+    'invalidSameSite' => 'The SameSite value must be None, Lax, Strict, or a blank string. Given: {0}',
 ];
diff --git a/system/Language/en/Session.php b/system/Language/en/Session.php
index 606860d2a119..527d2e9c7cea 100644
--- a/system/Language/en/Session.php
+++ b/system/Language/en/Session.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Session language settings
 return [
-	'missingDatabaseTable'   => '`sessionSavePath` must have the table name for the Database Session Handler to work.',
-	'invalidSavePath'        => 'Session: Configured save path "{0}" is not a directory, does not exist or cannot be created.',
-	'writeProtectedSavePath' => 'Session: Configured save path "{0}" is not writable by the PHP process.',
-	'emptySavePath'          => 'Session: No save path configured.',
-	'invalidSavePathFormat'  => 'Session: Invalid Redis save path format: {0}',
+    'missingDatabaseTable'   => '`sessionSavePath` must have the table name for the Database Session Handler to work.',
+    'invalidSavePath'        => 'Session: Configured save path "{0}" is not a directory, does not exist or cannot be created.',
+    'writeProtectedSavePath' => 'Session: Configured save path "{0}" is not writable by the PHP process.',
+    'emptySavePath'          => 'Session: No save path configured.',
+    'invalidSavePathFormat'  => 'Session: Invalid Redis save path format: {0}',
 
-	// @deprecated
-	'invalidSameSiteSetting' => 'Session: The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
+    // @deprecated
+    'invalidSameSiteSetting' => 'Session: The SameSite setting must be None, Lax, Strict, or a blank string. Given: {0}',
 ];
diff --git a/system/Language/en/Time.php b/system/Language/en/Time.php
index 47117b20d9b8..decee74fb844 100644
--- a/system/Language/en/Time.php
+++ b/system/Language/en/Time.php
@@ -1,33 +1,33 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Time language settings
 return [
-	'invalidFormat'  => '"{0}" is not a valid datetime format',
-	'invalidMonth'   => 'Months must be between 1 and 12. Given: {0}',
-	'invalidDay'     => 'Days must be between 1 and 31. Given: {0}',
-	'invalidOverDay' => 'Days must be between 1 and {0}. Given: {1}',
-	'invalidHours'   => 'Hours must be between 0 and 23. Given: {0}',
-	'invalidMinutes' => 'Minutes must be between 0 and 59. Given: {0}',
-	'invalidSeconds' => 'Seconds must be between 0 and 59. Given: {0}',
-	'years'          => '{0, plural, =1{# year} other{# years}}',
-	'months'         => '{0, plural, =1{# month} other{# months}}',
-	'weeks'          => '{0, plural, =1{# week} other{# weeks}}',
-	'days'           => '{0, plural, =1{# day} other{# days}}',
-	'hours'          => '{0, plural, =1{# hour} other{# hours}}',
-	'minutes'        => '{0, plural, =1{# minute} other{# minutes}}',
-	'seconds'        => '{0, plural, =1{# second} other{# seconds}}',
-	'ago'            => '{0} ago',
-	'inFuture'       => 'in {0}',
-	'yesterday'      => 'Yesterday',
-	'tomorrow'       => 'Tomorrow',
-	'now'            => 'Just now',
+    'invalidFormat'  => '"{0}" is not a valid datetime format',
+    'invalidMonth'   => 'Months must be between 1 and 12. Given: {0}',
+    'invalidDay'     => 'Days must be between 1 and 31. Given: {0}',
+    'invalidOverDay' => 'Days must be between 1 and {0}. Given: {1}',
+    'invalidHours'   => 'Hours must be between 0 and 23. Given: {0}',
+    'invalidMinutes' => 'Minutes must be between 0 and 59. Given: {0}',
+    'invalidSeconds' => 'Seconds must be between 0 and 59. Given: {0}',
+    'years'          => '{0, plural, =1{# year} other{# years}}',
+    'months'         => '{0, plural, =1{# month} other{# months}}',
+    'weeks'          => '{0, plural, =1{# week} other{# weeks}}',
+    'days'           => '{0, plural, =1{# day} other{# days}}',
+    'hours'          => '{0, plural, =1{# hour} other{# hours}}',
+    'minutes'        => '{0, plural, =1{# minute} other{# minutes}}',
+    'seconds'        => '{0, plural, =1{# second} other{# seconds}}',
+    'ago'            => '{0} ago',
+    'inFuture'       => 'in {0}',
+    'yesterday'      => 'Yesterday',
+    'tomorrow'       => 'Tomorrow',
+    'now'            => 'Just now',
 ];
diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php
index 63982a587f13..e4fa3a64688d 100644
--- a/system/Language/en/Validation.php
+++ b/system/Language/en/Validation.php
@@ -1,72 +1,72 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Validation language settings
 return [
-	// Core Messages
-	'noRuleSets'            => 'No rulesets specified in Validation configuration.',
-	'ruleNotFound'          => '{0} is not a valid rule.',
-	'groupNotFound'         => '{0} is not a validation rules group.',
-	'groupNotArray'         => '{0} rule group must be an array.',
-	'invalidTemplate'       => '{0} is not a valid Validation template.',
+    // Core Messages
+    'noRuleSets'      => 'No rulesets specified in Validation configuration.',
+    'ruleNotFound'    => '{0} is not a valid rule.',
+    'groupNotFound'   => '{0} is not a validation rules group.',
+    'groupNotArray'   => '{0} rule group must be an array.',
+    'invalidTemplate' => '{0} is not a valid Validation template.',
 
-	// Rule Messages
-	'alpha'                 => 'The {field} field may only contain alphabetical characters.',
-	'alpha_dash'            => 'The {field} field may only contain alphanumeric, underscore, and dash characters.',
-	'alpha_numeric'         => 'The {field} field may only contain alphanumeric characters.',
-	'alpha_numeric_punct'   => 'The {field} field may contain only alphanumeric characters, spaces, and  ~ ! # $ % & * - _ + = | : . characters.',
-	'alpha_numeric_space'   => 'The {field} field may only contain alphanumeric and space characters.',
-	'alpha_space'           => 'The {field} field may only contain alphabetical characters and spaces.',
-	'decimal'               => 'The {field} field must contain a decimal number.',
-	'differs'               => 'The {field} field must differ from the {param} field.',
-	'equals'                => 'The {field} field must be exactly: {param}.',
-	'exact_length'          => 'The {field} field must be exactly {param} characters in length.',
-	'greater_than'          => 'The {field} field must contain a number greater than {param}.',
-	'greater_than_equal_to' => 'The {field} field must contain a number greater than or equal to {param}.',
-	'hex'                   => 'The {field} field may only contain hexidecimal characters.',
-	'in_list'               => 'The {field} field must be one of: {param}.',
-	'integer'               => 'The {field} field must contain an integer.',
-	'is_natural'            => 'The {field} field must only contain digits.',
-	'is_natural_no_zero'    => 'The {field} field must only contain digits and must be greater than zero.',
-	'is_not_unique'         => 'The {field} field must contain a previously existing value in the database.',
-	'is_unique'             => 'The {field} field must contain a unique value.',
-	'less_than'             => 'The {field} field must contain a number less than {param}.',
-	'less_than_equal_to'    => 'The {field} field must contain a number less than or equal to {param}.',
-	'matches'               => 'The {field} field does not match the {param} field.',
-	'max_length'            => 'The {field} field cannot exceed {param} characters in length.',
-	'min_length'            => 'The {field} field must be at least {param} characters in length.',
-	'not_equals'            => 'The {field} field cannot be: {param}.',
-	'not_in_list'           => 'The {field} field must not be one of: {param}.',
-	'numeric'               => 'The {field} field must contain only numbers.',
-	'regex_match'           => 'The {field} field is not in the correct format.',
-	'required'              => 'The {field} field is required.',
-	'required_with'         => 'The {field} field is required when {param} is present.',
-	'required_without'      => 'The {field} field is required when {param} is not present.',
-	'string'                => 'The {field} field must be a valid string.',
-	'timezone'              => 'The {field} field must be a valid timezone.',
-	'valid_base64'          => 'The {field} field must be a valid base64 string.',
-	'valid_email'           => 'The {field} field must contain a valid email address.',
-	'valid_emails'          => 'The {field} field must contain all valid email addresses.',
-	'valid_ip'              => 'The {field} field must contain a valid IP.',
-	'valid_url'             => 'The {field} field must contain a valid URL.',
-	'valid_date'            => 'The {field} field must contain a valid date.',
+    // Rule Messages
+    'alpha'                 => 'The {field} field may only contain alphabetical characters.',
+    'alpha_dash'            => 'The {field} field may only contain alphanumeric, underscore, and dash characters.',
+    'alpha_numeric'         => 'The {field} field may only contain alphanumeric characters.',
+    'alpha_numeric_punct'   => 'The {field} field may contain only alphanumeric characters, spaces, and  ~ ! # $ % & * - _ + = | : . characters.',
+    'alpha_numeric_space'   => 'The {field} field may only contain alphanumeric and space characters.',
+    'alpha_space'           => 'The {field} field may only contain alphabetical characters and spaces.',
+    'decimal'               => 'The {field} field must contain a decimal number.',
+    'differs'               => 'The {field} field must differ from the {param} field.',
+    'equals'                => 'The {field} field must be exactly: {param}.',
+    'exact_length'          => 'The {field} field must be exactly {param} characters in length.',
+    'greater_than'          => 'The {field} field must contain a number greater than {param}.',
+    'greater_than_equal_to' => 'The {field} field must contain a number greater than or equal to {param}.',
+    'hex'                   => 'The {field} field may only contain hexidecimal characters.',
+    'in_list'               => 'The {field} field must be one of: {param}.',
+    'integer'               => 'The {field} field must contain an integer.',
+    'is_natural'            => 'The {field} field must only contain digits.',
+    'is_natural_no_zero'    => 'The {field} field must only contain digits and must be greater than zero.',
+    'is_not_unique'         => 'The {field} field must contain a previously existing value in the database.',
+    'is_unique'             => 'The {field} field must contain a unique value.',
+    'less_than'             => 'The {field} field must contain a number less than {param}.',
+    'less_than_equal_to'    => 'The {field} field must contain a number less than or equal to {param}.',
+    'matches'               => 'The {field} field does not match the {param} field.',
+    'max_length'            => 'The {field} field cannot exceed {param} characters in length.',
+    'min_length'            => 'The {field} field must be at least {param} characters in length.',
+    'not_equals'            => 'The {field} field cannot be: {param}.',
+    'not_in_list'           => 'The {field} field must not be one of: {param}.',
+    'numeric'               => 'The {field} field must contain only numbers.',
+    'regex_match'           => 'The {field} field is not in the correct format.',
+    'required'              => 'The {field} field is required.',
+    'required_with'         => 'The {field} field is required when {param} is present.',
+    'required_without'      => 'The {field} field is required when {param} is not present.',
+    'string'                => 'The {field} field must be a valid string.',
+    'timezone'              => 'The {field} field must be a valid timezone.',
+    'valid_base64'          => 'The {field} field must be a valid base64 string.',
+    'valid_email'           => 'The {field} field must contain a valid email address.',
+    'valid_emails'          => 'The {field} field must contain all valid email addresses.',
+    'valid_ip'              => 'The {field} field must contain a valid IP.',
+    'valid_url'             => 'The {field} field must contain a valid URL.',
+    'valid_date'            => 'The {field} field must contain a valid date.',
 
-	// Credit Cards
-	'valid_cc_num'          => '{field} does not appear to be a valid credit card number.',
+    // Credit Cards
+    'valid_cc_num' => '{field} does not appear to be a valid credit card number.',
 
-	// Files
-	'uploaded'              => '{field} is not a valid uploaded file.',
-	'max_size'              => '{field} is too large of a file.',
-	'is_image'              => '{field} is not a valid, uploaded image file.',
-	'mime_in'               => '{field} does not have a valid mime type.',
-	'ext_in'                => '{field} does not have a valid file extension.',
-	'max_dims'              => '{field} is either not an image, or it is too wide or tall.',
+    // Files
+    'uploaded' => '{field} is not a valid uploaded file.',
+    'max_size' => '{field} is too large of a file.',
+    'is_image' => '{field} is not a valid, uploaded image file.',
+    'mime_in'  => '{field} does not have a valid mime type.',
+    'ext_in'   => '{field} does not have a valid file extension.',
+    'max_dims' => '{field} is either not an image, or it is too wide or tall.',
 ];
diff --git a/system/Language/en/View.php b/system/Language/en/View.php
index 099c07427bb8..df42d1fa3f0e 100644
--- a/system/Language/en/View.php
+++ b/system/Language/en/View.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // View language settings
 return [
-	'invalidCellMethod'     => '{class}::{method} is not a valid method.',
-	'missingCellParameters' => '{class}::{method} has no params.',
-	'invalidCellParameter'  => '{0} is not a valid param name.',
-	'noCellClass'           => 'No view cell class provided.',
-	'invalidCellClass'      => 'Unable to locate view cell class: {0}.',
-	'tagSyntaxError'        => 'You have a syntax error in your Parser tags: {0}',
+    'invalidCellMethod'     => '{class}::{method} is not a valid method.',
+    'missingCellParameters' => '{class}::{method} has no params.',
+    'invalidCellParameter'  => '{0} is not a valid param name.',
+    'noCellClass'           => 'No view cell class provided.',
+    'invalidCellClass'      => 'Unable to locate view cell class: {0}.',
+    'tagSyntaxError'        => 'You have a syntax error in your Parser tags: {0}',
 ];
diff --git a/system/Log/Exceptions/LogException.php b/system/Log/Exceptions/LogException.php
index e2e88558702a..f79763622cc7 100644
--- a/system/Log/Exceptions/LogException.php
+++ b/system/Log/Exceptions/LogException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Exceptions;
@@ -15,13 +15,13 @@
 
 class LogException extends FrameworkException
 {
-	public static function forInvalidLogLevel(string $level)
-	{
-		return new static(lang('Log.invalidLogLevel', [$level]));
-	}
+    public static function forInvalidLogLevel(string $level)
+    {
+        return new static(lang('Log.invalidLogLevel', [$level]));
+    }
 
-	public static function forInvalidMessageType(string $messageType)
-	{
-		return new static(lang('Log.invalidMessageType', [$messageType]));
-	}
+    public static function forInvalidMessageType(string $messageType)
+    {
+        return new static(lang('Log.invalidMessageType', [$messageType]));
+    }
 }
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
index 7f06577815af..97d1281deb1a 100644
--- a/system/Log/Handlers/BaseHandler.php
+++ b/system/Log/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -16,76 +16,55 @@
  */
 abstract class BaseHandler implements HandlerInterface
 {
-	/**
-	 * Handles
-	 *
-	 * @var array
-	 */
-	protected $handles;
+    /**
+     * Handles
+     *
+     * @var array
+     */
+    protected $handles;
 
-	/**
-	 * Date format for logging
-	 *
-	 * @var string
-	 */
-	protected $dateFormat = 'Y-m-d H:i:s';
+    /**
+     * Date format for logging
+     *
+     * @var string
+     */
+    protected $dateFormat = 'Y-m-d H:i:s';
 
-	//--------------------------------------------------------------------
+    /**
+     * Constructor
+     */
+    public function __construct(array $config)
+    {
+        $this->handles = $config['handles'] ?? [];
+    }
 
-	/**
-	 * Constructor
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config)
-	{
-		$this->handles = $config['handles'] ?? [];
-	}
+    /**
+     * Checks whether the Handler will handle logging items of this
+     * log Level.
+     */
+    public function canHandle(string $level): bool
+    {
+        return in_array($level, $this->handles, true);
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param string $level
+     * @param string $message
+     */
+    abstract public function handle($level, $message): bool;
 
-	/**
-	 * Checks whether the Handler will handle logging items of this
-	 * log Level.
-	 *
-	 * @param string $level
-	 *
-	 * @return boolean
-	 */
-	public function canHandle(string $level): bool
-	{
-		return in_array($level, $this->handles, true);
-	}
+    /**
+     * Stores the date format to use while logging messages.
+     */
+    public function setDateFormat(string $format): HandlerInterface
+    {
+        $this->dateFormat = $format;
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 */
-	abstract public function handle($level, $message): bool;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Stores the date format to use while logging messages.
-	 *
-	 * @param string $format
-	 *
-	 * @return HandlerInterface
-	 */
-	public function setDateFormat(string $format): HandlerInterface
-	{
-		$this->dateFormat = $format;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
+        return $this;
+    }
 }
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 21a1bd71f04c..3d03e79f104e 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -24,157 +24,141 @@
  */
 class ChromeLoggerHandler extends BaseHandler
 {
-	/**
-	 * Version of this library - for ChromeLogger use.
-	 */
-	const VERSION = 1.0;
-
-	/**
-	 * The number of track frames returned from the backtrace.
-	 *
-	 * @var integer
-	 */
-	protected $backtraceLevel = 0;
-
-	/**
-	 * The final data that is sent to the browser.
-	 *
-	 * @var array
-	 */
-	protected $json = [
-		'version' => self::VERSION,
-		'columns' => [
-			'log',
-			'backtrace',
-			'type',
-		],
-		'rows'    => [],
-	];
-
-	/**
-	 * The header used to pass the data.
-	 *
-	 * @var string
-	 */
-	protected $header = 'X-ChromeLogger-Data';
-
-	/**
-	 * Maps the log levels to the ChromeLogger types.
-	 *
-	 * @var array
-	 */
-	protected $levels = [
-		'emergency' => 'error',
-		'alert'     => 'error',
-		'critical'  => 'error',
-		'error'     => 'error',
-		'warning'   => 'warn',
-		'notice'    => 'warn',
-		'info'      => 'info',
-		'debug'     => 'info',
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config = [])
-	{
-		parent::__construct($config);
-
-		$this->json['request_uri'] = current_url();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 */
-	public function handle($level, $message): bool
-	{
-		// Format our message
-		$message = $this->format($message);
-
-		// Generate Backtrace info
-		$backtrace = debug_backtrace(0, $this->backtraceLevel);
-		$backtrace = end($backtrace);
-
-		$backtraceMessage = 'unknown';
-		if (isset($backtrace['file']) && isset($backtrace['line']))
-		{
-			$backtraceMessage = $backtrace['file'] . ':' . $backtrace['line'];
-		}
-
-		// Default to 'log' type.
-		$type = '';
-
-		if (array_key_exists($level, $this->levels))
-		{
-			$type = $this->levels[$level];
-		}
-
-		$this->json['rows'][] = [
-			[$message],
-			$backtraceMessage,
-			$type,
-		];
-
-		$this->sendLogs();
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Converts the object to display nicely in the Chrome Logger UI.
-	 *
-	 * @param mixed $object
-	 *
-	 * @return array
-	 */
-	protected function format($object)
-	{
-		if (! is_object($object))
-		{
-			return $object;
-		}
-
-		// @todo Modify formatting of objects once we can view them in browser.
-		$objectArray = (array) $object;
-
-		$objectArray['___class_name'] = get_class($object);
-
-		return $objectArray;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attaches the header and the content to the passed in request object.
-	 *
-	 * @param ResponseInterface $response
-	 */
-	public function sendLogs(ResponseInterface &$response = null)
-	{
-		if (is_null($response))
-		{
-			$response = Services::response(null, true);
-		}
-
-		$data = base64_encode(utf8_encode(json_encode($this->json)));
-
-		$response->setHeader($this->header, $data);
-	}
+    /**
+     * Version of this library - for ChromeLogger use.
+     */
+    public const VERSION = 1.0;
+
+    /**
+     * The number of track frames returned from the backtrace.
+     *
+     * @var int
+     */
+    protected $backtraceLevel = 0;
+
+    /**
+     * The final data that is sent to the browser.
+     *
+     * @var array
+     */
+    protected $json = [
+        'version' => self::VERSION,
+        'columns' => [
+            'log',
+            'backtrace',
+            'type',
+        ],
+        'rows' => [],
+    ];
+
+    /**
+     * The header used to pass the data.
+     *
+     * @var string
+     */
+    protected $header = 'X-ChromeLogger-Data';
+
+    /**
+     * Maps the log levels to the ChromeLogger types.
+     *
+     * @var array
+     */
+    protected $levels = [
+        'emergency' => 'error',
+        'alert'     => 'error',
+        'critical'  => 'error',
+        'error'     => 'error',
+        'warning'   => 'warn',
+        'notice'    => 'warn',
+        'info'      => 'info',
+        'debug'     => 'info',
+    ];
+
+    /**
+     * Constructor
+     */
+    public function __construct(array $config = [])
+    {
+        parent::__construct($config);
+
+        $this->json['request_uri'] = current_url();
+    }
+
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param string $level
+     * @param string $message
+     */
+    public function handle($level, $message): bool
+    {
+        // Format our message
+        $message = $this->format($message);
+
+        // Generate Backtrace info
+        $backtrace = debug_backtrace(0, $this->backtraceLevel);
+        $backtrace = end($backtrace);
+
+        $backtraceMessage = 'unknown';
+        if (isset($backtrace['file'], $backtrace['line'])) {
+            $backtraceMessage = $backtrace['file'] . ':' . $backtrace['line'];
+        }
+
+        // Default to 'log' type.
+        $type = '';
+
+        if (array_key_exists($level, $this->levels)) {
+            $type = $this->levels[$level];
+        }
+
+        $this->json['rows'][] = [
+            [$message],
+            $backtraceMessage,
+            $type,
+        ];
+
+        $this->sendLogs();
+
+        return true;
+    }
+
+    /**
+     * Converts the object to display nicely in the Chrome Logger UI.
+     *
+     * @param mixed $object
+     *
+     * @return array
+     */
+    protected function format($object)
+    {
+        if (! is_object($object)) {
+            return $object;
+        }
+
+        // @todo Modify formatting of objects once we can view them in browser.
+        $objectArray = (array) $object;
+
+        $objectArray['___class_name'] = get_class($object);
+
+        return $objectArray;
+    }
+
+    /**
+     * Attaches the header and the content to the passed in request object.
+     *
+     * @param ResponseInterface $response
+     */
+    public function sendLogs(?ResponseInterface &$response = null)
+    {
+        if ($response === null) {
+            $response = Services::response(null, true);
+        }
+
+        $data = base64_encode(utf8_encode(json_encode($this->json)));
+
+        $response->setHeader($this->header, $data);
+    }
 }
diff --git a/system/Log/Handlers/ErrorlogHandler.php b/system/Log/Handlers/ErrorlogHandler.php
index fb5d1a478327..a3c9dfabb6e8 100644
--- a/system/Log/Handlers/ErrorlogHandler.php
+++ b/system/Log/Handlers/ErrorlogHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -18,75 +18,67 @@
  */
 class ErrorlogHandler extends BaseHandler
 {
-	/**
-	 * Message is sent to PHP's system logger, using the Operating System's
-	 * system logging mechanism or a file, depending on what the error_log
-	 * configuration directive is set to.
-	 */
-	public const TYPE_OS = 0;
+    /**
+     * Message is sent to PHP's system logger, using the Operating System's
+     * system logging mechanism or a file, depending on what the error_log
+     * configuration directive is set to.
+     */
+    public const TYPE_OS = 0;
 
-	/**
-	 * Message is sent directly to the SAPI logging handler.
-	 */
-	public const TYPE_SAPI = 4;
+    /**
+     * Message is sent directly to the SAPI logging handler.
+     */
+    public const TYPE_SAPI = 4;
 
-	/**
-	 * Says where the error should go. Currently supported are
-	 * 0 (`TYPE_OS`) and 4 (`TYPE_SAPI`).
-	 *
-	 * @var integer
-	 */
-	protected $messageType = 0;
+    /**
+     * Says where the error should go. Currently supported are
+     * 0 (`TYPE_OS`) and 4 (`TYPE_SAPI`).
+     *
+     * @var int
+     */
+    protected $messageType = 0;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param mixed[] $config
-	 */
-	public function __construct(array $config = [])
-	{
-		parent::__construct($config);
+    /**
+     * Constructor.
+     *
+     * @param mixed[] $config
+     */
+    public function __construct(array $config = [])
+    {
+        parent::__construct($config);
 
-		$messageType = $config['messageType'] ?? self::TYPE_OS;
+        $messageType = $config['messageType'] ?? self::TYPE_OS;
 
-		if (! is_int($messageType) || ! in_array($messageType, [self::TYPE_OS, self::TYPE_SAPI], true))
-		{
-			throw LogException::forInvalidMessageType(print_r($messageType, true));
-		}
+        if (! is_int($messageType) || ! in_array($messageType, [self::TYPE_OS, self::TYPE_SAPI], true)) {
+            throw LogException::forInvalidMessageType(print_r($messageType, true));
+        }
 
-		$this->messageType = $messageType;
-	}
+        $this->messageType = $messageType;
+    }
 
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 */
-	public function handle($level, $message): bool
-	{
-		$message = strtoupper($level) . ' --> ' . $message . "\n";
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param string $level
+     * @param string $message
+     */
+    public function handle($level, $message): bool
+    {
+        $message = strtoupper($level) . ' --> ' . $message . "\n";
 
-		return $this->errorLog($message, $this->messageType);
-	}
+        return $this->errorLog($message, $this->messageType);
+    }
 
-	/**
-	 * Extracted call to `error_log()` in order to be tested.
-	 *
-	 * @param string  $message
-	 * @param integer $messageType
-	 *
-	 * @return boolean
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function errorLog(string $message, int $messageType): bool
-	{
-		return error_log($message, $messageType);
-	}
+    /**
+     * Extracted call to `error_log()` in order to be tested.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function errorLog(string $message, int $messageType): bool
+    {
+        return error_log($message, $messageType);
+    }
 }
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 362758f07581..1fc929077d45 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -19,122 +19,104 @@
  */
 class FileHandler extends BaseHandler
 {
-	/**
-	 * Folder to hold logs
-	 *
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * Extension to use for log files
-	 *
-	 * @var string
-	 */
-	protected $fileExtension;
-
-	/**
-	 * Permissions for new log files
-	 *
-	 * @var integer
-	 */
-	protected $filePermissions;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config = [])
-	{
-		parent::__construct($config);
-
-		$this->path = empty($config['path']) ? WRITEPATH . 'logs/' : $config['path'];
-
-		$this->fileExtension = empty($config['fileExtension']) ? 'log' : $config['fileExtension'];
-		$this->fileExtension = ltrim($this->fileExtension, '.');
-
-		$this->filePermissions = $config['filePermissions'] ?? 0644;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function handle($level, $message): bool
-	{
-		$filepath = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
-
-		$msg = '';
-
-		if (! is_file($filepath))
-		{
-			$newfile = true;
-
-			// Only add protection to php files
-			if ($this->fileExtension === 'php')
-			{
-				$msg .= "<?php defined('SYSTEMPATH') || exit('No direct script access allowed'); ?>\n\n";
-			}
-		}
-
-		if (! $fp = @fopen($filepath, 'ab'))
-		{
-			return false;
-		}
-
-		// Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
-		if (strpos($this->dateFormat, 'u') !== false)
-		{
-			$microtimeFull  = microtime(true);
-			$microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1000000);
-			$date           = new DateTime(date('Y-m-d H:i:s.' . $microtimeShort, (int) $microtimeFull));
-			$date           = $date->format($this->dateFormat);
-		}
-		else
-		{
-			$date = date($this->dateFormat);
-		}
-
-		$msg .= strtoupper($level) . ' - ' . $date . ' --> ' . $message . "\n";
-
-		flock($fp, LOCK_EX);
-
-		$result = null;
-
-		for ($written = 0, $length = strlen($msg); $written < $length; $written += $result)
-		{
-			if (($result = fwrite($fp, substr($msg, $written))) === false)
-			{
-				// if we get this far, we'll never see this during travis-ci
-				// @codeCoverageIgnoreStart
-				break;
-				// @codeCoverageIgnoreEnd
-			}
-		}
-
-		flock($fp, LOCK_UN);
-		fclose($fp);
-
-		if (isset($newfile) && $newfile === true)
-		{
-			chmod($filepath, $this->filePermissions);
-		}
-
-		return is_int($result);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Folder to hold logs
+     *
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * Extension to use for log files
+     *
+     * @var string
+     */
+    protected $fileExtension;
+
+    /**
+     * Permissions for new log files
+     *
+     * @var int
+     */
+    protected $filePermissions;
+
+    /**
+     * Constructor
+     */
+    public function __construct(array $config = [])
+    {
+        parent::__construct($config);
+
+        $this->path = empty($config['path']) ? WRITEPATH . 'logs/' : $config['path'];
+
+        $this->fileExtension = empty($config['fileExtension']) ? 'log' : $config['fileExtension'];
+        $this->fileExtension = ltrim($this->fileExtension, '.');
+
+        $this->filePermissions = $config['filePermissions'] ?? 0644;
+    }
+
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param string $level
+     * @param string $message
+     *
+     * @throws Exception
+     */
+    public function handle($level, $message): bool
+    {
+        $filepath = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
+
+        $msg = '';
+
+        if (! is_file($filepath)) {
+            $newfile = true;
+
+            // Only add protection to php files
+            if ($this->fileExtension === 'php') {
+                $msg .= "<?php defined('SYSTEMPATH') || exit('No direct script access allowed'); ?>\n\n";
+            }
+        }
+
+        if (! $fp = @fopen($filepath, 'ab')) {
+            return false;
+        }
+
+        // Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
+        if (strpos($this->dateFormat, 'u') !== false) {
+            $microtimeFull  = microtime(true);
+            $microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1000000);
+            $date           = new DateTime(date('Y-m-d H:i:s.' . $microtimeShort, (int) $microtimeFull));
+            $date           = $date->format($this->dateFormat);
+        } else {
+            $date = date($this->dateFormat);
+        }
+
+        $msg .= strtoupper($level) . ' - ' . $date . ' --> ' . $message . "\n";
+
+        flock($fp, LOCK_EX);
+
+        $result = null;
+
+        for ($written = 0, $length = strlen($msg); $written < $length; $written += $result) {
+            if (($result = fwrite($fp, substr($msg, $written))) === false) {
+                // if we get this far, we'll never see this during travis-ci
+                // @codeCoverageIgnoreStart
+                break;
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        flock($fp, LOCK_UN);
+        fclose($fp);
+
+        if (isset($newfile) && $newfile === true) {
+            chmod($filepath, $this->filePermissions);
+        }
+
+        return is_int($result);
+    }
 }
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
index ec29cf82b4da..7b809a320d65 100644
--- a/system/Log/Handlers/HandlerInterface.php
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -16,41 +16,27 @@
  */
 interface HandlerInterface
 {
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 */
-	public function handle($level, $message): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks whether the Handler will handle logging items of this
-	 * log Level.
-	 *
-	 * @param string $level
-	 *
-	 * @return boolean
-	 */
-	public function canHandle(string $level): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the preferred date format to use when logging.
-	 *
-	 * @param string $format
-	 *
-	 * @return HandlerInterface
-	 */
-	public function setDateFormat(string $format);
-
-	//--------------------------------------------------------------------
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param string $level
+     * @param string $message
+     */
+    public function handle($level, $message): bool;
+
+    /**
+     * Checks whether the Handler will handle logging items of this
+     * log Level.
+     */
+    public function canHandle(string $level): bool;
+
+    /**
+     * Sets the preferred date format to use when logging.
+     *
+     * @return HandlerInterface
+     */
+    public function setDateFormat(string $format);
 }
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index c457545e75cf..cee971161f36 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log;
@@ -31,483 +31,402 @@
  */
 class Logger implements LoggerInterface
 {
-	/**
-	 * Used by the logThreshold Config setting to define
-	 * which errors to show.
-	 *
-	 * @var array<string, integer>
-	 */
-	protected $logLevels = [
-		'emergency' => 1,
-		'alert'     => 2,
-		'critical'  => 3,
-		'error'     => 4,
-		'warning'   => 5,
-		'notice'    => 6,
-		'info'      => 7,
-		'debug'     => 8,
-	];
-
-	/**
-	 * Array of levels to be logged.
-	 * The rest will be ignored.
-	 * Set in Config/logger.php
-	 *
-	 * @var array
-	 */
-	protected $loggableLevels = [];
-
-	/**
-	 * File permissions
-	 *
-	 * @var integer
-	 */
-	protected $filePermissions = 0644;
-
-	/**
-	 * Format of the timestamp for log files.
-	 *
-	 * @var string
-	 */
-	protected $dateFormat = 'Y-m-d H:i:s';
-
-	/**
-	 * Filename Extension
-	 *
-	 * @var string
-	 */
-	protected $fileExt;
-
-	/**
-	 * Caches instances of the handlers.
-	 *
-	 * @var array
-	 */
-	protected $handlers = [];
-
-	/**
-	 * Holds the configuration for each handler.
-	 * The key is the handler's class name. The
-	 * value is an associative array of configuration
-	 * items.
-	 *
-	 * @var array
-	 */
-	protected $handlerConfig = [];
-
-	/**
-	 * Caches logging calls for debugbar.
-	 *
-	 * @var array
-	 */
-	public $logCache;
-
-	/**
-	 * Should we cache our logged items?
-	 *
-	 * @var boolean
-	 */
-	protected $cacheLogs = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param  \Config\Logger $config
-	 * @param  boolean        $debug
-	 * @throws RuntimeException
-	 */
-	public function __construct($config, bool $debug = CI_DEBUG)
-	{
-		$this->loggableLevels = is_array($config->threshold) ? $config->threshold : range(1, (int) $config->threshold);
-
-		// Now convert loggable levels to strings.
-		// We only use numbers to make the threshold setting convenient for users.
-		if ($this->loggableLevels)
-		{
-			$temp = [];
-			foreach ($this->loggableLevels as $level)
-			{
-				$temp[] = array_search((int) $level, $this->logLevels, true);
-			}
-
-			$this->loggableLevels = $temp;
-			unset($temp);
-		}
-
-		$this->dateFormat = $config->dateFormat ?? $this->dateFormat;
-
-		if (! is_array($config->handlers) || empty($config->handlers))
-		{
-			throw LogException::forNoHandlers('LoggerConfig');
-		}
-
-		// Save the handler configuration for later.
-		// Instances will be created on demand.
-		$this->handlerConfig = $config->handlers;
-
-		$this->cacheLogs = $debug;
-		if ($this->cacheLogs)
-		{
-			$this->logCache = [];
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * System is unusable.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function emergency($message, array $context = []): bool
-	{
-		return $this->log('emergency', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Action must be taken immediately.
-	 *
-	 * Example: Entire website down, database unavailable, etc. This should
-	 * trigger the SMS alerts and wake you up.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function alert($message, array $context = []): bool
-	{
-		return $this->log('alert', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Critical conditions.
-	 *
-	 * Example: Application component unavailable, unexpected exception.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function critical($message, array $context = []): bool
-	{
-		return $this->log('critical', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Runtime errors that do not require immediate action but should typically
-	 * be logged and monitored.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function error($message, array $context = []): bool
-	{
-		return $this->log('error', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Exceptional occurrences that are not errors.
-	 *
-	 * Example: Use of deprecated APIs, poor use of an API, undesirable things
-	 * that are not necessarily wrong.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function warning($message, array $context = []): bool
-	{
-		return $this->log('warning', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Normal but significant events.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function notice($message, array $context = []): bool
-	{
-		return $this->log('notice', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Interesting events.
-	 *
-	 * Example: User logs in, SQL logs.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function info($message, array $context = []): bool
-	{
-		return $this->log('info', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Detailed debug information.
-	 *
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function debug($message, array $context = []): bool
-	{
-		return $this->log('debug', $message, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Logs with an arbitrary level.
-	 *
-	 * @param mixed  $level
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function log($level, $message, array $context = []): bool
-	{
-		if (is_numeric($level))
-		{
-			$level = array_search((int) $level, $this->logLevels, true);
-		}
-
-		// Is the level a valid level?
-		if (! array_key_exists($level, $this->logLevels))
-		{
-			throw LogException::forInvalidLogLevel($level);
-		}
-
-		// Does the app want to log this right now?
-		if (! in_array($level, $this->loggableLevels, true))
-		{
-			return false;
-		}
-
-		// Parse our placeholders
-		$message = $this->interpolate($message, $context);
-
-		if (! is_string($message))
-		{
-			$message = print_r($message, true);
-		}
-
-		if ($this->cacheLogs)
-		{
-			$this->logCache[] = [
-				'level' => $level,
-				'msg'   => $message,
-			];
-		}
-
-		foreach ($this->handlerConfig as $className => $config)
-		{
-			if (! array_key_exists($className, $this->handlers))
-			{
-				$this->handlers[$className] = new $className($config);
-			}
-
-			/**
-			 * @var HandlerInterface
-			 */
-			$handler = $this->handlers[$className];
-
-			if (! $handler->canHandle($level))
-			{
-				continue;
-			}
-
-			// If the handler returns false, then we
-			// don't execute any other handlers.
-			if (! $handler->setDateFormat($this->dateFormat)->handle($level, $message))
-			{
-				break;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replaces any placeholders in the message with variables
-	 * from the context, as well as a few special items like:
-	 *
-	 * {session_vars}
-	 * {post_vars}
-	 * {get_vars}
-	 * {env}
-	 * {env:foo}
-	 * {file}
-	 * {line}
-	 *
-	 * @param mixed $message
-	 * @param array $context
-	 *
-	 * @return mixed
-	 */
-	protected function interpolate($message, array $context = [])
-	{
-		if (! is_string($message))
-		{
-			return $message;
-		}
-
-		// build a replacement array with braces around the context keys
-		$replace = [];
-
-		foreach ($context as $key => $val)
-		{
-			// Verify that the 'exception' key is actually an exception
-			// or error, both of which implement the 'Throwable' interface.
-			if ($key === 'exception' && $val instanceof Throwable)
-			{
-				$val = $val->getMessage() . ' ' . $this->cleanFileNames($val->getFile()) . ':' . $val->getLine();
-			}
-
-			// todo - sanitize input before writing to file?
-			$replace['{' . $key . '}'] = $val;
-		}
-
-		// Add special placeholders
-		$replace['{post_vars}'] = '$_POST: ' . print_r($_POST, true);
-		$replace['{get_vars}']  = '$_GET: ' . print_r($_GET, true);
-		$replace['{env}']       = ENVIRONMENT;
-
-		// Allow us to log the file/line that we are logging from
-		if (strpos($message, '{file}') !== false)
-		{
-			[$file, $line] = $this->determineFile();
-
-			$replace['{file}'] = $file;
-			$replace['{line}'] = $line;
-		}
-
-		// Match up environment variables in {env:foo} tags.
-		if (strpos($message, 'env:') !== false)
-		{
-			preg_match('/env:[^}]+/', $message, $matches);
-
-			if ($matches)
-			{
-				foreach ($matches as $str)
-				{
-					$key                 = str_replace('env:', '', $str);
-					$replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';
-				}
-			}
-		}
-
-		if (isset($_SESSION))
-		{
-			$replace['{session_vars}'] = '$_SESSION: ' . print_r($_SESSION, true);
-		}
-
-		// interpolate replacement values into the message and return
-		return strtr($message, $replace);
-	}
-
-	/**
-	 * Determines the file and line that the logging call
-	 * was made from by analyzing the backtrace.
-	 * Find the earliest stack frame that is part of our logging system.
-	 *
-	 * @return array
-	 */
-	public function determineFile(): array
-	{
-		$logFunctions = [
-			'log_message',
-			'log',
-			'error',
-			'debug',
-			'info',
-			'warning',
-			'critical',
-			'emergency',
-			'alert',
-			'notice',
-		];
-
-		// Generate Backtrace info
-		$trace = \debug_backtrace(0);
-
-		// So we search from the bottom (earliest) of the stack frames
-		$stackFrames = \array_reverse($trace);
-
-		// Find the first reference to a Logger class method
-		foreach ($stackFrames as $frame)
-		{
-			if (\in_array($frame['function'], $logFunctions, true))
-			{
-				$file = isset($frame['file']) ? $this->cleanFileNames($frame['file']) : 'unknown';
-				$line = $frame['line'] ?? 'unknown';
-				return [
-					$file,
-					$line,
-				];
-			}
-		}
-
-		return [
-			'unknown',
-			'unknown',
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
-	 * with the actual var. i.e.
-	 *
-	 *  /var/www/site/app/Controllers/Home.php
-	 *      becomes:
-	 *  APPPATH/Controllers/Home.php
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 */
-	protected function cleanFileNames(string $file): string
-	{
-		$file = str_replace(APPPATH, 'APPPATH/', $file);
-		$file = str_replace(SYSTEMPATH, 'SYSTEMPATH/', $file);
-
-		return str_replace(FCPATH, 'FCPATH/', $file);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Used by the logThreshold Config setting to define
+     * which errors to show.
+     *
+     * @var array<string, integer>
+     */
+    protected $logLevels = [
+        'emergency' => 1,
+        'alert'     => 2,
+        'critical'  => 3,
+        'error'     => 4,
+        'warning'   => 5,
+        'notice'    => 6,
+        'info'      => 7,
+        'debug'     => 8,
+    ];
+
+    /**
+     * Array of levels to be logged.
+     * The rest will be ignored.
+     * Set in Config/logger.php
+     *
+     * @var array
+     */
+    protected $loggableLevels = [];
+
+    /**
+     * File permissions
+     *
+     * @var int
+     */
+    protected $filePermissions = 0644;
+
+    /**
+     * Format of the timestamp for log files.
+     *
+     * @var string
+     */
+    protected $dateFormat = 'Y-m-d H:i:s';
+
+    /**
+     * Filename Extension
+     *
+     * @var string
+     */
+    protected $fileExt;
+
+    /**
+     * Caches instances of the handlers.
+     *
+     * @var array
+     */
+    protected $handlers = [];
+
+    /**
+     * Holds the configuration for each handler.
+     * The key is the handler's class name. The
+     * value is an associative array of configuration
+     * items.
+     *
+     * @var array
+     */
+    protected $handlerConfig = [];
+
+    /**
+     * Caches logging calls for debugbar.
+     *
+     * @var array
+     */
+    public $logCache;
+
+    /**
+     * Should we cache our logged items?
+     *
+     * @var bool
+     */
+    protected $cacheLogs = false;
+
+    /**
+     * Constructor.
+     *
+     * @param \Config\Logger $config
+     *
+     * @throws RuntimeException
+     */
+    public function __construct($config, bool $debug = CI_DEBUG)
+    {
+        $this->loggableLevels = is_array($config->threshold) ? $config->threshold : range(1, (int) $config->threshold);
+
+        // Now convert loggable levels to strings.
+        // We only use numbers to make the threshold setting convenient for users.
+        if ($this->loggableLevels) {
+            $temp = [];
+
+            foreach ($this->loggableLevels as $level) {
+                $temp[] = array_search((int) $level, $this->logLevels, true);
+            }
+
+            $this->loggableLevels = $temp;
+            unset($temp);
+        }
+
+        $this->dateFormat = $config->dateFormat ?? $this->dateFormat;
+
+        if (! is_array($config->handlers) || empty($config->handlers)) {
+            throw LogException::forNoHandlers('LoggerConfig');
+        }
+
+        // Save the handler configuration for later.
+        // Instances will be created on demand.
+        $this->handlerConfig = $config->handlers;
+
+        $this->cacheLogs = $debug;
+        if ($this->cacheLogs) {
+            $this->logCache = [];
+        }
+    }
+
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     */
+    public function emergency($message, array $context = []): bool
+    {
+        return $this->log('emergency', $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     */
+    public function alert($message, array $context = []): bool
+    {
+        return $this->log('alert', $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     */
+    public function critical($message, array $context = []): bool
+    {
+        return $this->log('critical', $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     */
+    public function error($message, array $context = []): bool
+    {
+        return $this->log('error', $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     */
+    public function warning($message, array $context = []): bool
+    {
+        return $this->log('warning', $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     */
+    public function notice($message, array $context = []): bool
+    {
+        return $this->log('notice', $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     */
+    public function info($message, array $context = []): bool
+    {
+        return $this->log('info', $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     */
+    public function debug($message, array $context = []): bool
+    {
+        return $this->log('debug', $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     */
+    public function log($level, $message, array $context = []): bool
+    {
+        if (is_numeric($level)) {
+            $level = array_search((int) $level, $this->logLevels, true);
+        }
+
+        // Is the level a valid level?
+        if (! array_key_exists($level, $this->logLevels)) {
+            throw LogException::forInvalidLogLevel($level);
+        }
+
+        // Does the app want to log this right now?
+        if (! in_array($level, $this->loggableLevels, true)) {
+            return false;
+        }
+
+        // Parse our placeholders
+        $message = $this->interpolate($message, $context);
+
+        if (! is_string($message)) {
+            $message = print_r($message, true);
+        }
+
+        if ($this->cacheLogs) {
+            $this->logCache[] = [
+                'level' => $level,
+                'msg'   => $message,
+            ];
+        }
+
+        foreach ($this->handlerConfig as $className => $config) {
+            if (! array_key_exists($className, $this->handlers)) {
+                $this->handlers[$className] = new $className($config);
+            }
+
+            /**
+             * @var HandlerInterface $handler
+             */
+            $handler = $this->handlers[$className];
+
+            if (! $handler->canHandle($level)) {
+                continue;
+            }
+
+            // If the handler returns false, then we
+            // don't execute any other handlers.
+            if (! $handler->setDateFormat($this->dateFormat)->handle($level, $message)) {
+                break;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Replaces any placeholders in the message with variables
+     * from the context, as well as a few special items like:
+     *
+     * {session_vars}
+     * {post_vars}
+     * {get_vars}
+     * {env}
+     * {env:foo}
+     * {file}
+     * {line}
+     *
+     * @param mixed $message
+     *
+     * @return mixed
+     */
+    protected function interpolate($message, array $context = [])
+    {
+        if (! is_string($message)) {
+            return $message;
+        }
+
+        // build a replacement array with braces around the context keys
+        $replace = [];
+
+        foreach ($context as $key => $val) {
+            // Verify that the 'exception' key is actually an exception
+            // or error, both of which implement the 'Throwable' interface.
+            if ($key === 'exception' && $val instanceof Throwable) {
+                $val = $val->getMessage() . ' ' . $this->cleanFileNames($val->getFile()) . ':' . $val->getLine();
+            }
+
+            // todo - sanitize input before writing to file?
+            $replace['{' . $key . '}'] = $val;
+        }
+
+        // Add special placeholders
+        $replace['{post_vars}'] = '$_POST: ' . print_r($_POST, true);
+        $replace['{get_vars}']  = '$_GET: ' . print_r($_GET, true);
+        $replace['{env}']       = ENVIRONMENT;
+
+        // Allow us to log the file/line that we are logging from
+        if (strpos($message, '{file}') !== false) {
+            [$file, $line] = $this->determineFile();
+
+            $replace['{file}'] = $file;
+            $replace['{line}'] = $line;
+        }
+
+        // Match up environment variables in {env:foo} tags.
+        if (strpos($message, 'env:') !== false) {
+            preg_match('/env:[^}]+/', $message, $matches);
+
+            if ($matches) {
+                foreach ($matches as $str) {
+                    $key                 = str_replace('env:', '', $str);
+                    $replace["{{$str}}"] = $_ENV[$key] ?? 'n/a';
+                }
+            }
+        }
+
+        if (isset($_SESSION)) {
+            $replace['{session_vars}'] = '$_SESSION: ' . print_r($_SESSION, true);
+        }
+
+        // interpolate replacement values into the message and return
+        return strtr($message, $replace);
+    }
+
+    /**
+     * Determines the file and line that the logging call
+     * was made from by analyzing the backtrace.
+     * Find the earliest stack frame that is part of our logging system.
+     */
+    public function determineFile(): array
+    {
+        $logFunctions = [
+            'log_message',
+            'log',
+            'error',
+            'debug',
+            'info',
+            'warning',
+            'critical',
+            'emergency',
+            'alert',
+            'notice',
+        ];
+
+        // Generate Backtrace info
+        $trace = \debug_backtrace(0);
+
+        // So we search from the bottom (earliest) of the stack frames
+        $stackFrames = \array_reverse($trace);
+
+        // Find the first reference to a Logger class method
+        foreach ($stackFrames as $frame) {
+            if (\in_array($frame['function'], $logFunctions, true)) {
+                $file = isset($frame['file']) ? $this->cleanFileNames($frame['file']) : 'unknown';
+                $line = $frame['line'] ?? 'unknown';
+
+                return [
+                    $file,
+                    $line,
+                ];
+            }
+        }
+
+        return [
+            'unknown',
+            'unknown',
+        ];
+    }
+
+    /**
+     * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
+     * with the actual var. i.e.
+     *
+     *  /var/www/site/app/Controllers/Home.php
+     *      becomes:
+     *  APPPATH/Controllers/Home.php
+     */
+    protected function cleanFileNames(string $file): string
+    {
+        $file = str_replace(APPPATH, 'APPPATH/', $file);
+        $file = str_replace(SYSTEMPATH, 'SYSTEMPATH/', $file);
+
+        return str_replace(FCPATH, 'FCPATH/', $file);
+    }
 }
diff --git a/system/Model.php b/system/Model.php
index 7558c6117201..3617f83f69cb 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -29,8 +29,6 @@
 use ReflectionProperty;
 
 /**
- * Class Model
- *
  * The Model class extends BaseModel and provides additional
  * convenient features that makes working with a SQL database
  * table less painful.
@@ -40,859 +38,768 @@
  *      - allow intermingling calls to the builder
  *      - removes the need to use Result object directly in most cases
  *
- * @mixin    BaseBuilder
+ * @mixin BaseBuilder
+ *
  * @property BaseConnection $db
  */
 class Model extends BaseModel
 {
-	/**
-	 * Name of database table
-	 *
-	 * @var string
-	 */
-	protected $table;
-
-	/**
-	 * The table's primary key.
-	 *
-	 * @var string
-	 */
-	protected $primaryKey = 'id';
-
-	/**
-	 * Whether primary key uses auto increment.
-	 *
-	 * @var boolean
-	 */
-	protected $useAutoIncrement = true;
-
-	/**
-	 * Query Builder object
-	 *
-	 * @var BaseBuilder|null
-	 */
-	protected $builder;
-
-	/**
-	 * Holds information passed in via 'set'
-	 * so that we can capture it (not the builder)
-	 * and ensure it gets validated first.
-	 *
-	 * @var array
-	 */
-	protected $tempData = [];
-
-	/**
-	 * Escape array that maps usage of escape
-	 * flag for every parameter.
-	 *
-	 * @var array
-	 */
-	protected $escape = [];
-
-	/**
-	 * Model constructor.
-	 *
-	 * @param ConnectionInterface|null $db         DB Connection
-	 * @param ValidationInterface|null $validation Validation
-	 */
-	public function __construct(ConnectionInterface &$db = null, ValidationInterface $validation = null)
-	{
-		/**
-		 * @var BaseConnection $db
-		 */
-		$db = $db ?? Database::connect($this->DBGroup);
-
-		$this->db = &$db;
-
-		parent::__construct($validation);
-	}
-
-	/**
-	 * Specify the table associated with a model
-	 *
-	 * @param string $table Table
-	 *
-	 * @return $this
-	 */
-	public function setTable(string $table)
-	{
-		$this->table = $table;
-
-		return $this;
-	}
-
-	/**
-	 * Fetches the row of database from $this->table with a primary key
-	 * matching $id. This methods works only with dbCalls
-	 * This methods works only with dbCalls
-	 *
-	 * @param boolean                   $singleton Single or multiple results
-	 * @param array|integer|string|null $id        One primary key or an array of primary keys
-	 *
-	 * @return array|object|null    The resulting row of data, or null.
-	 */
-	protected function doFind(bool $singleton, $id = null)
-	{
-		$builder = $this->builder();
-
-		if ($this->tempUseSoftDeletes)
-		{
-			$builder->where($this->table . '.' . $this->deletedField, null);
-		}
-
-		if (is_array($id))
-		{
-			$row = $builder->whereIn($this->table . '.' . $this->primaryKey, $id)
-				->get()
-				->getResult($this->tempReturnType);
-		}
-		elseif ($singleton)
-		{
-			$row = $builder->where($this->table . '.' . $this->primaryKey, $id)
-				->get()
-				->getFirstRow($this->tempReturnType);
-		}
-		else
-		{
-			$row = $builder->get()->getResult($this->tempReturnType);
-		}
-
-		return $row;
-	}
-
-	/**
-	 * Fetches the column of database from $this->table
-	 * This methods works only with dbCalls
-	 *
-	 * @param string $columnName Column Name
-	 *
-	 * @return array|null The resulting row of data, or null if no data found.
-	 */
-	protected function doFindColumn(string $columnName)
-	{
-		return $this->select($columnName)->asArray()->find(); // @phpstan-ignore-line
-	}
-
-	/**
-	 * Works with the current Query Builder instance to return
-	 * all results, while optionally limiting them.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer $limit  Limit
-	 * @param integer $offset Offset
-	 *
-	 * @return array
-	 */
-	protected function doFindAll(int $limit = 0, int $offset = 0)
-	{
-		$builder = $this->builder();
-
-		if ($this->tempUseSoftDeletes)
-		{
-			$builder->where($this->table . '.' . $this->deletedField, null);
-		}
-
-		return $builder->limit($limit, $offset)
-			->get()
-			->getResult($this->tempReturnType);
-	}
-
-	/**
-	 * Returns the first row of the result set. Will take any previous
-	 * Query Builder calls into account when determining the result set.
-	 * This methods works only with dbCalls
-	 *
-	 * @return array|object|null
-	 */
-	protected function doFirst()
-	{
-		$builder = $this->builder();
-
-		if ($this->tempUseSoftDeletes)
-		{
-			$builder->where($this->table . '.' . $this->deletedField, null);
-		}
-		elseif ($this->useSoftDeletes && empty($builder->QBGroupBy) && $this->primaryKey)
-		{
-			$builder->groupBy($this->table . '.' . $this->primaryKey);
-		}
-
-		// Some databases, like PostgreSQL, need order
-		// information to consistently return correct results.
-		if ($builder->QBGroupBy && empty($builder->QBOrderBy) && $this->primaryKey)
-		{
-			$builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
-		}
-
-		return $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType);
-	}
-
-	/**
-	 * Inserts data into the current table.
-	 * This methods works only with dbCalls
-	 *
-	 * @param array $data Data
-	 *
-	 * @return Query|boolean
-	 */
-	protected function doInsert(array $data)
-	{
-		$escape       = $this->escape;
-		$this->escape = [];
-
-		// Require non empty primaryKey when
-		// not using auto-increment feature
-		if (! $this->useAutoIncrement && empty($data[$this->primaryKey]))
-		{
-			throw DataException::forEmptyPrimaryKey('insert');
-		}
-
-		$builder = $this->builder();
-
-		// Must use the set() method to ensure to set the correct escape flag
-		foreach ($data as $key => $val)
-		{
-			$builder->set($key, $val, $escape[$key] ?? null);
-		}
-
-		$result = $builder->insert();
-
-		// If insertion succeeded then save the insert ID
-		if ($result)
-		{
-			$this->insertID = ! $this->useAutoIncrement ? $data[$this->primaryKey] : $this->db->insertID();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Compiles batch insert strings and runs the queries, validating each row prior.
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null   $set       An associative array of insert values
-	 * @param boolean|null $escape    Whether to escape values and identifiers
-	 * @param integer      $batchSize The size of the batch to run
-	 * @param boolean      $testing   True means only number of records is returned, false will execute the query
-	 *
-	 * @return integer|boolean Number of rows inserted or FALSE on failure
-	 */
-	protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
-	{
-		if (is_array($set))
-		{
-			foreach ($set as $row)
-			{
-				// Require non empty primaryKey when
-				// not using auto-increment feature
-				if (! $this->useAutoIncrement && empty($row[$this->primaryKey]))
-				{
-					throw DataException::forEmptyPrimaryKey('insertBatch');
-				}
-			}
-		}
-
-		return $this->builder()->testMode($testing)->insertBatch($set, $escape, $batchSize);
-	}
-
-	/**
-	 * Updates a single record in $this->table.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer|array|string|null $id   ID
-	 * @param array|null                $data Data
-	 *
-	 * @return boolean
-	 */
-	protected function doUpdate($id = null, $data = null): bool
-	{
-		$escape       = $this->escape;
-		$this->escape = [];
-
-		$builder = $this->builder();
-
-		if ($id)
-		{
-			$builder = $builder->whereIn($this->table . '.' . $this->primaryKey, $id);
-		}
-
-		// Must use the set() method to ensure to set the correct escape flag
-		foreach ($data as $key => $val)
-		{
-			$builder->set($key, $val, $escape[$key] ?? null);
-		}
-
-		return $builder->update();
-	}
-
-	/**
-	 * Compiles an update string and runs the query
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null  $set       An associative array of update values
-	 * @param string|null $index     The where key
-	 * @param integer     $batchSize The size of the batch to run
-	 * @param boolean     $returnSQL True means SQL is returned, false will execute the query
-	 *
-	 * @return mixed    Number of rows affected or FALSE on failure
-	 *
-	 * @throws DatabaseException
-	 */
-	protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
-	{
-		return $this->builder()->testMode($returnSQL)->updateBatch($set, $index, $batchSize);
-	}
-
-	/**
-	 * Deletes a single record from $this->table where $id matches
-	 * the table's primaryKey
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer|string|array|null $id    The rows primary key(s)
-	 * @param boolean                   $purge Allows overriding the soft deletes setting.
-	 *
-	 * @return string|boolean
-	 *
-	 * @throws DatabaseException
-	 */
-	protected function doDelete($id = null, bool $purge = false)
-	{
-		$builder = $this->builder();
-
-		if ($id)
-		{
-			$builder = $builder->whereIn($this->primaryKey, $id);
-		}
-
-		if ($this->useSoftDeletes && ! $purge)
-		{
-			if (empty($builder->getCompiledQBWhere()))
-			{
-				if (CI_DEBUG)
-				{
-					throw new DatabaseException(
-						'Deletes are not allowed unless they contain a "where" or "like" clause.'
-					);
-				}
-
-				return false; // @codeCoverageIgnore
-			}
-
-			$set[$this->deletedField] = $this->setDate();
-
-			if ($this->useTimestamps && $this->updatedField)
-			{
-				$set[$this->updatedField] = $this->setDate();
-			}
-
-			return $builder->update($set);
-		}
-
-		return $builder->delete();
-	}
-
-	/**
-	 * Permanently deletes all rows that have been marked as deleted
-	 * through soft deletes (deleted = 1)
-	 * This methods works only with dbCalls
-	 *
-	 * @return boolean|mixed
-	 */
-	protected function doPurgeDeleted()
-	{
-		return $this->builder()
-			->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
-			->delete();
-	}
-
-	/**
-	 * Works with the find* methods to return only the rows that
-	 * have been deleted.
-	 * This methods works only with dbCalls
-	 *
-	 * @return void
-	 */
-	protected function doOnlyDeleted()
-	{
-		$this->builder()->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
-	}
-
-	/**
-	 * Compiles a replace into string and runs the query
-	 * This methods works only with dbCalls
-	 *
-	 * @param array|null $data      Data
-	 * @param boolean    $returnSQL Set to true to return Query String
-	 *
-	 * @return mixed
-	 */
-	protected function doReplace(array $data = null, bool $returnSQL = false)
-	{
-		return $this->builder()->testMode($returnSQL)->replace($data);
-	}
-
-	/**
-	 * Grabs the last error(s) that occurred from the Database connection.
-	 * The return array should be in the following format:
-	 *  ['source' => 'message']
-	 * This methods works only with dbCalls
-	 *
-	 * @return array<string,string>
-	 */
-	protected function doErrors()
-	{
-		// $error is always ['code' => string|int, 'message' => string]
-		$error = $this->db->error();
-
-		if ((int) $error['code'] === 0)
-		{
-			return [];
-		}
-
-		return [get_class($this->db) => $error['message']];
-	}
-
-	/**
-	 * Returns the id value for the data array or object
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return integer|array|string|null
-	 *
-	 * @deprecated Use getIdValue() instead. Will be removed in version 5.0.
-	 */
-	protected function idValue($data)
-	{
-		return $this->getIdValue($data);
-	}
-
-	/**
-	 * Returns the id value for the data array or object
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return integer|array|string|null
-	 */
-	public function getIdValue($data)
-	{
-		if (is_object($data) && isset($data->{$this->primaryKey}))
-		{
-			return $data->{$this->primaryKey};
-		}
-
-		if (is_array($data) && ! empty($data[$this->primaryKey]))
-		{
-			return $data[$this->primaryKey];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Loops over records in batches, allowing you to operate on them.
-	 * Works with $this->builder to get the Compiled select to
-	 * determine the rows to operate on.
-	 * This methods works only with dbCalls
-	 *
-	 * @param integer $size     Size
-	 * @param Closure $userFunc Callback Function
-	 *
-	 * @return void
-	 *
-	 * @throws DataException
-	 */
-	public function chunk(int $size, Closure $userFunc)
-	{
-		$total  = $this->builder()->countAllResults(false);
-		$offset = 0;
-
-		while ($offset <= $total)
-		{
-			$builder = clone $this->builder();
-			$rows    = $builder->get($size, $offset);
-
-			if (! $rows)
-			{
-				throw DataException::forEmptyDataset('chunk');
-			}
-
-			$rows = $rows->getResult($this->tempReturnType);
-
-			$offset += $size;
-
-			if (empty($rows))
-			{
-				continue;
-			}
-
-			foreach ($rows as $row)
-			{
-				if ($userFunc($row) === false)
-				{
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Override countAllResults to account for soft deleted accounts.
-	 *
-	 * @param boolean $reset Reset
-	 * @param boolean $test  Test
-	 *
-	 * @return mixed
-	 */
-	public function countAllResults(bool $reset = true, bool $test = false)
-	{
-		if ($this->tempUseSoftDeletes)
-		{
-			$this->builder()->where($this->table . '.' . $this->deletedField, null);
-		}
-
-		// When $reset === false, the $tempUseSoftDeletes will be
-		// dependant on $useSoftDeletes value because we don't
-		// want to add the same "where" condition for the second time
-		$this->tempUseSoftDeletes = $reset
-			? $this->useSoftDeletes
-			: ($this->useSoftDeletes ? false : $this->useSoftDeletes);
-
-		return $this->builder()->testMode($test)->countAllResults($reset);
-	}
-
-	/**
-	 * Provides a shared instance of the Query Builder.
-	 *
-	 * @param string|null $table Table name
-	 *
-	 * @return BaseBuilder
-	 * @throws ModelException
-	 */
-	public function builder(?string $table = null)
-	{
-		// Check for an existing Builder
-		if ($this->builder instanceof BaseBuilder)
-		{
-			// Make sure the requested table matches the builder
-			if ($table && $this->builder->getTable() !== $table)
-			{
-				return $this->db->table($table);
-			}
-
-			return $this->builder;
-		}
-
-		// We're going to force a primary key to exist
-		// so we don't have overly convoluted code,
-		// and future features are likely to require them.
-		if (empty($this->primaryKey))
-		{
-			throw ModelException::forNoPrimaryKey(static::class);
-		}
-
-		$table = empty($table) ? $this->table : $table;
-
-		// Ensure we have a good db connection
-		if (! $this->db instanceof BaseConnection)
-		{
-			$this->db = Database::connect($this->DBGroup);
-		}
-
-		$builder = $this->db->table($table);
-
-		// Only consider it "shared" if the table is correct
-		if ($table === $this->table)
-		{
-			$this->builder = $builder;
-		}
-
-		return $builder;
-	}
-
-	/**
-	 * Captures the builder's set() method so that we can validate the
-	 * data here. This allows it to be used with any of the other
-	 * builder methods and still get validated data, like replace.
-	 *
-	 * @param mixed        $key    Field name, or an array of field/value pairs
-	 * @param string|null  $value  Field value, if $key is a single field
-	 * @param boolean|null $escape Whether to escape values and identifiers
-	 *
-	 * @return $this
-	 */
-	public function set($key, ?string $value = '', ?bool $escape = null)
-	{
-		$data = is_array($key) ? $key : [$key => $value];
-
-		foreach (array_keys($data) as $k)
-		{
-			$this->tempData['escape'][$k] = $escape;
-		}
-
-		$this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
-
-		return $this;
-	}
-
-	/**
-	 * This method is called on save to determine if entry have to be updated
-	 * If this method return false insert operation will be executed
-	 *
-	 * @param array|object $data Data
-	 *
-	 * @return boolean
-	 */
-	protected function shouldUpdate($data) : bool
-	{
-		// When useAutoIncrement feature is disabled check
-		// in the database if given record already exists
-		return parent::shouldUpdate($data) &&
-			($this->useAutoIncrement
-				? true
-				: $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1
-			);
-	}
-
-	/**
-	 * Inserts data into the database. If an object is provided,
-	 * it will attempt to convert it to an array.
-	 *
-	 * @param array|object|null $data     Data
-	 * @param boolean           $returnID Whether insert ID should be returned or not.
-	 *
-	 * @return BaseResult|object|integer|string|false
-	 *
-	 * @throws ReflectionException
-	 */
-	public function insert($data = null, bool $returnID = true)
-	{
-		if (! empty($this->tempData['data']))
-		{
-			if (empty($data))
-			{
-				$data = $this->tempData['data'] ?? null;
-			}
-			else
-			{
-				$data = $this->transformDataToArray($data, 'insert');
-				$data = array_merge($this->tempData['data'], $data);
-			}
-		}
-
-		$this->escape   = $this->tempData['escape'] ?? [];
-		$this->tempData = [];
-
-		return parent::insert($data, $returnID);
-	}
-
-	/**
-	 * Updates a single record in the database. If an object is provided,
-	 * it will attempt to convert it into an array.
-	 *
-	 * @param integer|array|string|null $id   ID
-	 * @param array|object|null         $data Data
-	 *
-	 * @return boolean
-	 *
-	 * @throws ReflectionException
-	 */
-	public function update($id = null, $data = null): bool
-	{
-		if (! empty($this->tempData['data']))
-		{
-			if (empty($data))
-			{
-				$data = $this->tempData['data'] ?? null;
-			}
-			else
-			{
-				$data = $this->transformDataToArray($data, 'update');
-				$data = array_merge($this->tempData['data'], $data);
-			}
-		}
-
-		$this->escape   = $this->tempData['escape'] ?? [];
-		$this->tempData = [];
-
-		return parent::update($id, $data);
-	}
-
-	/**
-	 * Takes a class an returns an array of it's public and protected
-	 * properties as an array with raw values.
-	 *
-	 * @param string|object $data        Data
-	 * @param boolean       $onlyChanged Only Changed Property
-	 * @param boolean       $recursive   If true, inner entities will be casted as array as well
-	 *
-	 * @return array|null Array
-	 *
-	 * @throws ReflectionException
-	 */
-	protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
-	{
-		$properties = parent::objectToRawArray($data, $onlyChanged);
-
-		// Always grab the primary key otherwise updates will fail.
-		if (method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
-				&& ! empty($data->{$this->primaryKey})))
-		{
-			$properties[$this->primaryKey] = $data->{$this->primaryKey};
-		}
-
-		return $properties;
-	}
-
-	/**
-	 * Provides/instantiates the builder/db connection and model's table/primary key names and return type.
-	 *
-	 * @param string $name Name
-	 *
-	 * @return mixed
-	 */
-	public function __get(string $name)
-	{
-		if (parent::__isset($name))
-		{
-			return parent::__get($name);
-		}
-
-		if (isset($this->builder()->$name))
-		{
-			return $this->builder()->$name;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Checks for the existence of properties across this model, builder, and db connection.
-	 *
-	 * @param string $name Name
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $name): bool
-	{
-		if (parent::__isset($name))
-		{
-			return true;
-		}
-		return isset($this->builder()->$name);
-	}
-
-	/**
-	 * Provides direct access to method in the builder (if available)
-	 * and the database connection.
-	 *
-	 * @param string $name   Name
-	 * @param array  $params Params
-	 *
-	 * @return $this|null
-	 */
-	public function __call(string $name, array $params)
-	{
-		$result = parent::__call($name, $params);
-
-		if ($result === null && method_exists($builder = $this->builder(), $name))
-		{
-			$result = $builder->{$name}(...$params);
-		}
-
-		if (empty($result))
-		{
-			if (! method_exists($this->builder(), $name))
-			{
-				$className = static::class;
-
-				throw new BadMethodCallException('Call to undefined method ' . $className . '::' . $name);
-			}
-
-			return $result;
-		}
-
-		if ($result instanceof BaseBuilder)
-		{
-			return $this;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Takes a class an returns an array of it's public and protected
-	 * properties as an array suitable for use in creates and updates.
-	 *
-	 * @param string|object $data        Data
-	 * @param string|null   $primaryKey  Primary Key
-	 * @param string        $dateFormat  Date Format
-	 * @param boolean       $onlyChanged Only Changed
-	 *
-	 * @return array
-	 *
-	 * @throws ReflectionException
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @deprecated since 4.1
-	 */
-	public static function classToArray($data, $primaryKey = null, string $dateFormat = 'datetime', bool $onlyChanged = true): array
-	{
-		if (method_exists($data, 'toRawArray'))
-		{
-			$properties = $data->toRawArray($onlyChanged);
-
-			// Always grab the primary key otherwise updates will fail.
-			if (! empty($properties) && ! empty($primaryKey) && ! in_array($primaryKey, $properties, true) && ! empty($data->{$primaryKey}))
-			{
-				$properties[$primaryKey] = $data->{$primaryKey};
-			}
-		}
-		else
-		{
-			$mirror = new ReflectionClass($data);
-			$props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
-
-			$properties = [];
-
-			// Loop over each property,
-			// saving the name/value in a new array we can return.
-			foreach ($props as $prop)
-			{
-				// Must make protected values accessible.
-				$prop->setAccessible(true);
-				$properties[$prop->getName()] = $prop->getValue($data);
-			}
-		}
-
-		// Convert any Time instances to appropriate $dateFormat
-		if ($properties)
-		{
-			foreach ($properties as $key => $value)
-			{
-				if ($value instanceof Time)
-				{
-					switch ($dateFormat)
-					{
-						case 'datetime':
-							$converted = $value->format('Y-m-d H:i:s');
-							break;
-						case 'date':
-							$converted = $value->format('Y-m-d');
-							break;
-						case 'int':
-							$converted = $value->getTimestamp();
-							break;
-						default:
-							$converted = (string) $value;
-					}
-
-					$properties[$key] = $converted;
-				}
-			}
-		}
-
-		return $properties;
-	}
+    /**
+     * Name of database table
+     *
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * The table's primary key.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
+    /**
+     * Whether primary key uses auto increment.
+     *
+     * @var bool
+     */
+    protected $useAutoIncrement = true;
+
+    /**
+     * Query Builder object
+     *
+     * @var BaseBuilder|null
+     */
+    protected $builder;
+
+    /**
+     * Holds information passed in via 'set'
+     * so that we can capture it (not the builder)
+     * and ensure it gets validated first.
+     *
+     * @var array
+     */
+    protected $tempData = [];
+
+    /**
+     * Escape array that maps usage of escape
+     * flag for every parameter.
+     *
+     * @var array
+     */
+    protected $escape = [];
+
+    public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
+    {
+        /**
+         * @var BaseConnection $db
+         */
+        $db = $db ?? Database::connect($this->DBGroup);
+
+        $this->db = &$db;
+
+        parent::__construct($validation);
+    }
+
+    /**
+     * Specify the table associated with a model
+     *
+     * @param string $table Table
+     *
+     * @return $this
+     */
+    public function setTable(string $table)
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+
+    /**
+     * Fetches the row of database from $this->table with a primary key
+     * matching $id. This methods works only with dbCalls
+     * This methods works only with dbCalls
+     *
+     * @param bool                  $singleton Single or multiple results
+     * @param array|int|string|null $id        One primary key or an array of primary keys
+     *
+     * @return array|object|null The resulting row of data, or null.
+     */
+    protected function doFind(bool $singleton, $id = null)
+    {
+        $builder = $this->builder();
+
+        if ($this->tempUseSoftDeletes) {
+            $builder->where($this->table . '.' . $this->deletedField, null);
+        }
+
+        if (is_array($id)) {
+            $row = $builder->whereIn($this->table . '.' . $this->primaryKey, $id)
+                ->get()
+                ->getResult($this->tempReturnType);
+        } elseif ($singleton) {
+            $row = $builder->where($this->table . '.' . $this->primaryKey, $id)
+                ->get()
+                ->getFirstRow($this->tempReturnType);
+        } else {
+            $row = $builder->get()->getResult($this->tempReturnType);
+        }
+
+        return $row;
+    }
+
+    /**
+     * Fetches the column of database from $this->table
+     * This methods works only with dbCalls
+     *
+     * @param string $columnName Column Name
+     *
+     * @return array|null The resulting row of data, or null if no data found.
+     */
+    protected function doFindColumn(string $columnName)
+    {
+        return $this->select($columnName)->asArray()->find(); // @phpstan-ignore-line
+    }
+
+    /**
+     * Works with the current Query Builder instance to return
+     * all results, while optionally limiting them.
+     * This methods works only with dbCalls
+     *
+     * @param int $limit  Limit
+     * @param int $offset Offset
+     *
+     * @return array
+     */
+    protected function doFindAll(int $limit = 0, int $offset = 0)
+    {
+        $builder = $this->builder();
+
+        if ($this->tempUseSoftDeletes) {
+            $builder->where($this->table . '.' . $this->deletedField, null);
+        }
+
+        return $builder->limit($limit, $offset)
+            ->get()
+            ->getResult($this->tempReturnType);
+    }
+
+    /**
+     * Returns the first row of the result set. Will take any previous
+     * Query Builder calls into account when determining the result set.
+     * This methods works only with dbCalls
+     *
+     * @return array|object|null
+     */
+    protected function doFirst()
+    {
+        $builder = $this->builder();
+
+        if ($this->tempUseSoftDeletes) {
+            $builder->where($this->table . '.' . $this->deletedField, null);
+        } elseif ($this->useSoftDeletes && empty($builder->QBGroupBy) && $this->primaryKey) {
+            $builder->groupBy($this->table . '.' . $this->primaryKey);
+        }
+
+        // Some databases, like PostgreSQL, need order
+        // information to consistently return correct results.
+        if ($builder->QBGroupBy && empty($builder->QBOrderBy) && $this->primaryKey) {
+            $builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
+        }
+
+        return $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType);
+    }
+
+    /**
+     * Inserts data into the current table.
+     * This methods works only with dbCalls
+     *
+     * @param array $data Data
+     *
+     * @return bool|Query
+     */
+    protected function doInsert(array $data)
+    {
+        $escape       = $this->escape;
+        $this->escape = [];
+
+        // Require non empty primaryKey when
+        // not using auto-increment feature
+        if (! $this->useAutoIncrement && empty($data[$this->primaryKey])) {
+            throw DataException::forEmptyPrimaryKey('insert');
+        }
+
+        $builder = $this->builder();
+
+        // Must use the set() method to ensure to set the correct escape flag
+        foreach ($data as $key => $val) {
+            $builder->set($key, $val, $escape[$key] ?? null);
+        }
+
+        $result = $builder->insert();
+
+        // If insertion succeeded then save the insert ID
+        if ($result) {
+            $this->insertID = ! $this->useAutoIncrement ? $data[$this->primaryKey] : $this->db->insertID();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Compiles batch insert strings and runs the queries, validating each row prior.
+     * This methods works only with dbCalls
+     *
+     * @param array|null $set       An associative array of insert values
+     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param int        $batchSize The size of the batch to run
+     * @param bool       $testing   True means only number of records is returned, false will execute the query
+     *
+     * @return bool|int Number of rows inserted or FALSE on failure
+     */
+    protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
+    {
+        if (is_array($set)) {
+            foreach ($set as $row) {
+                // Require non empty primaryKey when
+                // not using auto-increment feature
+                if (! $this->useAutoIncrement && empty($row[$this->primaryKey])) {
+                    throw DataException::forEmptyPrimaryKey('insertBatch');
+                }
+            }
+        }
+
+        return $this->builder()->testMode($testing)->insertBatch($set, $escape, $batchSize);
+    }
+
+    /**
+     * Updates a single record in $this->table.
+     * This methods works only with dbCalls
+     *
+     * @param array|int|string|null $id
+     * @param array|null            $data
+     */
+    protected function doUpdate($id = null, $data = null): bool
+    {
+        $escape       = $this->escape;
+        $this->escape = [];
+
+        $builder = $this->builder();
+
+        if ($id) {
+            $builder = $builder->whereIn($this->table . '.' . $this->primaryKey, $id);
+        }
+
+        // Must use the set() method to ensure to set the correct escape flag
+        foreach ($data as $key => $val) {
+            $builder->set($key, $val, $escape[$key] ?? null);
+        }
+
+        return $builder->update();
+    }
+
+    /**
+     * Compiles an update string and runs the query
+     * This methods works only with dbCalls
+     *
+     * @param array|null  $set       An associative array of update values
+     * @param string|null $index     The where key
+     * @param int         $batchSize The size of the batch to run
+     * @param bool        $returnSQL True means SQL is returned, false will execute the query
+     *
+     * @throws DatabaseException
+     *
+     * @return mixed Number of rows affected or FALSE on failure
+     */
+    protected function doUpdateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false)
+    {
+        return $this->builder()->testMode($returnSQL)->updateBatch($set, $index, $batchSize);
+    }
+
+    /**
+     * Deletes a single record from $this->table where $id matches
+     * the table's primaryKey
+     * This methods works only with dbCalls
+     *
+     * @param array|int|string|null $id    The rows primary key(s)
+     * @param bool                  $purge Allows overriding the soft deletes setting.
+     *
+     * @throws DatabaseException
+     *
+     * @return bool|string
+     */
+    protected function doDelete($id = null, bool $purge = false)
+    {
+        $builder = $this->builder();
+
+        if ($id) {
+            $builder = $builder->whereIn($this->primaryKey, $id);
+        }
+
+        if ($this->useSoftDeletes && ! $purge) {
+            if (empty($builder->getCompiledQBWhere())) {
+                if (CI_DEBUG) {
+                    throw new DatabaseException(
+                        'Deletes are not allowed unless they contain a "where" or "like" clause.'
+                    );
+                }
+
+                return false; // @codeCoverageIgnore
+            }
+
+            $set[$this->deletedField] = $this->setDate();
+
+            if ($this->useTimestamps && $this->updatedField) {
+                $set[$this->updatedField] = $this->setDate();
+            }
+
+            return $builder->update($set);
+        }
+
+        return $builder->delete();
+    }
+
+    /**
+     * Permanently deletes all rows that have been marked as deleted
+     * through soft deletes (deleted = 1)
+     * This methods works only with dbCalls
+     *
+     * @return bool|mixed
+     */
+    protected function doPurgeDeleted()
+    {
+        return $this->builder()
+            ->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
+            ->delete();
+    }
+
+    /**
+     * Works with the find* methods to return only the rows that
+     * have been deleted.
+     * This methods works only with dbCalls
+     */
+    protected function doOnlyDeleted()
+    {
+        $this->builder()->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
+    }
+
+    /**
+     * Compiles a replace into string and runs the query
+     * This methods works only with dbCalls
+     *
+     * @param array|null $data      Data
+     * @param bool       $returnSQL Set to true to return Query String
+     *
+     * @return mixed
+     */
+    protected function doReplace(?array $data = null, bool $returnSQL = false)
+    {
+        return $this->builder()->testMode($returnSQL)->replace($data);
+    }
+
+    /**
+     * Grabs the last error(s) that occurred from the Database connection.
+     * The return array should be in the following format:
+     *  ['source' => 'message']
+     * This methods works only with dbCalls
+     *
+     * @return array<string,string>
+     */
+    protected function doErrors()
+    {
+        // $error is always ['code' => string|int, 'message' => string]
+        $error = $this->db->error();
+
+        if ((int) $error['code'] === 0) {
+            return [];
+        }
+
+        return [get_class($this->db) => $error['message']];
+    }
+
+    /**
+     * Returns the id value for the data array or object
+     *
+     * @param array|object $data Data
+     *
+     * @return array|int|string|null
+     *
+     * @deprecated Use getIdValue() instead. Will be removed in version 5.0.
+     */
+    protected function idValue($data)
+    {
+        return $this->getIdValue($data);
+    }
+
+    /**
+     * Returns the id value for the data array or object
+     *
+     * @param array|object $data Data
+     *
+     * @return array|int|string|null
+     */
+    public function getIdValue($data)
+    {
+        if (is_object($data) && isset($data->{$this->primaryKey})) {
+            return $data->{$this->primaryKey};
+        }
+
+        if (is_array($data) && ! empty($data[$this->primaryKey])) {
+            return $data[$this->primaryKey];
+        }
+
+        return null;
+    }
+
+    /**
+     * Loops over records in batches, allowing you to operate on them.
+     * Works with $this->builder to get the Compiled select to
+     * determine the rows to operate on.
+     * This methods works only with dbCalls
+     *
+     * @throws DataException
+     */
+    public function chunk(int $size, Closure $userFunc)
+    {
+        $total  = $this->builder()->countAllResults(false);
+        $offset = 0;
+
+        while ($offset <= $total) {
+            $builder = clone $this->builder();
+            $rows    = $builder->get($size, $offset);
+
+            if (! $rows) {
+                throw DataException::forEmptyDataset('chunk');
+            }
+
+            $rows = $rows->getResult($this->tempReturnType);
+
+            $offset += $size;
+
+            if (empty($rows)) {
+                continue;
+            }
+
+            foreach ($rows as $row) {
+                if ($userFunc($row) === false) {
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Override countAllResults to account for soft deleted accounts.
+     *
+     * @return mixed
+     */
+    public function countAllResults(bool $reset = true, bool $test = false)
+    {
+        if ($this->tempUseSoftDeletes) {
+            $this->builder()->where($this->table . '.' . $this->deletedField, null);
+        }
+
+        // When $reset === false, the $tempUseSoftDeletes will be
+        // dependant on $useSoftDeletes value because we don't
+        // want to add the same "where" condition for the second time
+        $this->tempUseSoftDeletes = $reset
+            ? $this->useSoftDeletes
+            : ($this->useSoftDeletes ? false : $this->useSoftDeletes);
+
+        return $this->builder()->testMode($test)->countAllResults($reset);
+    }
+
+    /**
+     * Provides a shared instance of the Query Builder.
+     *
+     * @throws ModelException
+     *
+     * @return BaseBuilder
+     */
+    public function builder(?string $table = null)
+    {
+        // Check for an existing Builder
+        if ($this->builder instanceof BaseBuilder) {
+            // Make sure the requested table matches the builder
+            if ($table && $this->builder->getTable() !== $table) {
+                return $this->db->table($table);
+            }
+
+            return $this->builder;
+        }
+
+        // We're going to force a primary key to exist
+        // so we don't have overly convoluted code,
+        // and future features are likely to require them.
+        if (empty($this->primaryKey)) {
+            throw ModelException::forNoPrimaryKey(static::class);
+        }
+
+        $table = empty($table) ? $this->table : $table;
+
+        // Ensure we have a good db connection
+        if (! $this->db instanceof BaseConnection) {
+            $this->db = Database::connect($this->DBGroup);
+        }
+
+        $builder = $this->db->table($table);
+
+        // Only consider it "shared" if the table is correct
+        if ($table === $this->table) {
+            $this->builder = $builder;
+        }
+
+        return $builder;
+    }
+
+    /**
+     * Captures the builder's set() method so that we can validate the
+     * data here. This allows it to be used with any of the other
+     * builder methods and still get validated data, like replace.
+     *
+     * @param array|string $key    Field name, or an array of field/value pairs
+     * @param string|null  $value  Field value, if $key is a single field
+     * @param bool|null    $escape Whether to escape values and identifiers
+     *
+     * @return $this
+     */
+    public function set($key, ?string $value = '', ?bool $escape = null)
+    {
+        $data = is_array($key) ? $key : [$key => $value];
+
+        foreach (array_keys($data) as $k) {
+            $this->tempData['escape'][$k] = $escape;
+        }
+
+        $this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
+
+        return $this;
+    }
+
+    /**
+     * This method is called on save to determine if entry have to be updated
+     * If this method return false insert operation will be executed
+     *
+     * @param array|object $data Data
+     */
+    protected function shouldUpdate($data): bool
+    {
+        // When useAutoIncrement feature is disabled check
+        // in the database if given record already exists
+        return parent::shouldUpdate($data)
+            && $this->useAutoIncrement
+                ? true
+                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
+    }
+
+    /**
+     * Inserts data into the database. If an object is provided,
+     * it will attempt to convert it to an array.
+     *
+     * @param array|object|null $data
+     * @param bool              $returnID Whether insert ID should be returned or not.
+     *
+     * @throws ReflectionException
+     *
+     * @return BaseResult|false|int|object|string
+     */
+    public function insert($data = null, bool $returnID = true)
+    {
+        if (! empty($this->tempData['data'])) {
+            if (empty($data)) {
+                $data = $this->tempData['data'] ?? null;
+            } else {
+                $data = $this->transformDataToArray($data, 'insert');
+                $data = array_merge($this->tempData['data'], $data);
+            }
+        }
+
+        $this->escape   = $this->tempData['escape'] ?? [];
+        $this->tempData = [];
+
+        return parent::insert($data, $returnID);
+    }
+
+    /**
+     * Updates a single record in the database. If an object is provided,
+     * it will attempt to convert it into an array.
+     *
+     * @param array|int|string|null $id
+     * @param array|object|null     $data
+     *
+     * @throws ReflectionException
+     */
+    public function update($id = null, $data = null): bool
+    {
+        if (! empty($this->tempData['data'])) {
+            if (empty($data)) {
+                $data = $this->tempData['data'] ?? null;
+            } else {
+                $data = $this->transformDataToArray($data, 'update');
+                $data = array_merge($this->tempData['data'], $data);
+            }
+        }
+
+        $this->escape   = $this->tempData['escape'] ?? [];
+        $this->tempData = [];
+
+        return parent::update($id, $data);
+    }
+
+    /**
+     * Takes a class an returns an array of it's public and protected
+     * properties as an array with raw values.
+     *
+     * @param object|string $data
+     * @param bool          $recursive If true, inner entities will be casted as array as well
+     *
+     * @throws ReflectionException
+     *
+     * @return array|null Array
+     */
+    protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
+    {
+        $properties = parent::objectToRawArray($data, $onlyChanged);
+
+        // Always grab the primary key otherwise updates will fail.
+        if (
+            method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
+            && ! empty($data->{$this->primaryKey}))
+        ) {
+            $properties[$this->primaryKey] = $data->{$this->primaryKey};
+        }
+
+        return $properties;
+    }
+
+    /**
+     * Provides/instantiates the builder/db connection and model's table/primary key names and return type.
+     *
+     * @param string $name Name
+     *
+     * @return mixed
+     */
+    public function __get(string $name)
+    {
+        if (parent::__isset($name)) {
+            return parent::__get($name);
+        }
+
+        if (isset($this->builder()->{$name})) {
+            return $this->builder()->{$name};
+        }
+
+        return null;
+    }
+
+    /**
+     * Checks for the existence of properties across this model, builder, and db connection.
+     *
+     * @param string $name Name
+     */
+    public function __isset(string $name): bool
+    {
+        if (parent::__isset($name)) {
+            return true;
+        }
+
+        return isset($this->builder()->{$name});
+    }
+
+    /**
+     * Provides direct access to method in the builder (if available)
+     * and the database connection.
+     *
+     * @return $this|null
+     */
+    public function __call(string $name, array $params)
+    {
+        $result = parent::__call($name, $params);
+
+        if ($result === null && method_exists($builder = $this->builder(), $name)) {
+            $result = $builder->{$name}(...$params);
+        }
+
+        if (empty($result)) {
+            if (! method_exists($this->builder(), $name)) {
+                $className = static::class;
+
+                throw new BadMethodCallException('Call to undefined method ' . $className . '::' . $name);
+            }
+
+            return $result;
+        }
+
+        if ($result instanceof BaseBuilder) {
+            return $this;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Takes a class an returns an array of it's public and protected
+     * properties as an array suitable for use in creates and updates.
+     *
+     * @param object|string $data
+     * @param string|null   $primaryKey
+     *
+     * @throws ReflectionException
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated since 4.1
+     */
+    public static function classToArray($data, $primaryKey = null, string $dateFormat = 'datetime', bool $onlyChanged = true): array
+    {
+        if (method_exists($data, 'toRawArray')) {
+            $properties = $data->toRawArray($onlyChanged);
+
+            // Always grab the primary key otherwise updates will fail.
+            if (! empty($properties) && ! empty($primaryKey) && ! in_array($primaryKey, $properties, true) && ! empty($data->{$primaryKey})) {
+                $properties[$primaryKey] = $data->{$primaryKey};
+            }
+        } else {
+            $mirror = new ReflectionClass($data);
+            $props  = $mirror->getProperties(ReflectionProperty::IS_PUBLIC | ReflectionProperty::IS_PROTECTED);
+
+            $properties = [];
+
+            // Loop over each property,
+            // saving the name/value in a new array we can return.
+            foreach ($props as $prop) {
+                // Must make protected values accessible.
+                $prop->setAccessible(true);
+                $properties[$prop->getName()] = $prop->getValue($data);
+            }
+        }
+
+        // Convert any Time instances to appropriate $dateFormat
+        if ($properties) {
+            foreach ($properties as $key => $value) {
+                if ($value instanceof Time) {
+                    switch ($dateFormat) {
+                        case 'datetime':
+                            $converted = $value->format('Y-m-d H:i:s');
+                            break;
+
+                        case 'date':
+                            $converted = $value->format('Y-m-d');
+                            break;
+
+                        case 'int':
+                            $converted = $value->getTimestamp();
+                            break;
+
+                        default:
+                            $converted = (string) $value;
+                    }
+
+                    $properties[$key] = $converted;
+                }
+            }
+        }
+
+        return $properties;
+    }
 }
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
index 4c1d87c04d67..ade3e693ceea 100644
--- a/system/Modules/Modules.php
+++ b/system/Modules/Modules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Modules;
@@ -14,45 +14,40 @@
 /**
  * Modules Class
  *
- * @link https://codeigniter.com/user_guide/general/modules.html
+ * @see https://codeigniter.com/user_guide/general/modules.html
  */
 class Modules
 {
-	/**
-	 * Auto-Discover
-	 *
-	 * @var boolean
-	 */
-	public $enabled = true;
+    /**
+     * Auto-Discover
+     *
+     * @var bool
+     */
+    public $enabled = true;
 
-	/**
-	 * Auto-Discovery Within Composer Packages
-	 *
-	 * @var boolean
-	 */
-	public $discoverInComposer = true;
+    /**
+     * Auto-Discovery Within Composer Packages
+     *
+     * @var bool
+     */
+    public $discoverInComposer = true;
 
-	/**
-	 * Auto-Discover Rules Handler
-	 *
-	 * @var array
-	 */
-	public $aliases = [];
+    /**
+     * Auto-Discover Rules Handler
+     *
+     * @var array
+     */
+    public $aliases = [];
 
-	/**
-	 * Should the application auto-discover the requested resource.
-	 *
-	 * @param string $alias
-	 *
-	 * @return boolean
-	 */
-	public function shouldDiscover(string $alias): bool
-	{
-		if (! $this->enabled)
-		{
-			return false;
-		}
+    /**
+     * Should the application auto-discover the requested resource.
+     */
+    public function shouldDiscover(string $alias): bool
+    {
+        if (! $this->enabled) {
+            return false;
+        }
 
-		return in_array(strtolower($alias), $this->aliases, true);
-	}
+        return in_array(strtolower($alias), $this->aliases, true);
+    }
 }
diff --git a/system/Pager/Exceptions/PagerException.php b/system/Pager/Exceptions/PagerException.php
index d0f0edd759b8..b1cb6072816f 100644
--- a/system/Pager/Exceptions/PagerException.php
+++ b/system/Pager/Exceptions/PagerException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager\Exceptions;
@@ -15,13 +15,13 @@
 
 class PagerException extends FrameworkException
 {
-	public static function forInvalidTemplate(string $template = null)
-	{
-		return new static(lang('Pager.invalidTemplate', [$template]));
-	}
+    public static function forInvalidTemplate(?string $template = null)
+    {
+        return new static(lang('Pager.invalidTemplate', [$template]));
+    }
 
-	public static function forInvalidPaginationGroup(string $group = null)
-	{
-		return new static(lang('Pager.invalidPaginationGroup', [$group]));
-	}
+    public static function forInvalidPaginationGroup(?string $group = null)
+    {
+        return new static(lang('Pager.invalidPaginationGroup', [$group]));
+    }
 }
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 7b15b317e62f..a653485633aa 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
@@ -27,541 +27,394 @@
  */
 class Pager implements PagerInterface
 {
-	/**
-	 * The group data.
-	 *
-	 * @var array
-	 */
-	protected $groups = [];
-
-	/**
-	 * URI segment for groups if provided.
-	 *
-	 * @var array
-	 */
-	protected $segment = [];
-
-	/**
-	 * Our configuration instance.
-	 *
-	 * @var PagerConfig
-	 */
-	protected $config;
-
-	/**
-	 * The view engine to render the links with.
-	 *
-	 * @var RendererInterface
-	 */
-	protected $view;
-
-	/**
-	 * List of only permitted queries
-	 *
-	 * @var array
-	 */
-	protected $only = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param PagerConfig       $config
-	 * @param RendererInterface $view
-	 */
-	public function __construct(PagerConfig $config, RendererInterface $view)
-	{
-		$this->config = $config;
-		$this->view   = $view;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles creating and displaying the
-	 *
-	 * @param string $group
-	 * @param string $template The output template alias to render.
-	 *
-	 * @return string
-	 */
-	public function links(string $group = 'default', string $template = 'default_full'): string
-	{
-		$this->ensureGroup($group);
-
-		return $this->displayLinks($group, $template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Creates simple Next/Previous links, instead of full pagination.
-	 *
-	 * @param string $group
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	public function simpleLinks(string $group = 'default', string $template = 'default_simple'): string
-	{
-		$this->ensureGroup($group);
-
-		return $this->displayLinks($group, $template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows for a simple, manual, form of pagination where all of the data
-	 * is provided by the user. The URL is the current URI.
-	 *
-	 * @param integer      $page
-	 * @param integer|null $perPage
-	 * @param integer      $total
-	 * @param string       $template The output template alias to render.
-	 * @param integer      $segment  (whether page number is provided by URI segment)
-	 * @param string|null  $group    optional group (i.e. if we'd like to define custom path)
-	 *
-	 * @return string
-	 */
-	public function makeLinks(int $page, ?int $perPage, int $total, string $template = 'default_full', int $segment = 0, ?string $group = 'default'): string
-	{
-		$group = $group === '' ? 'default' : $group;
-
-		$this->store($group, $page, $perPage ?? $this->config->perPage, $total, $segment);
-
-		return $this->displayLinks($group, $template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the actual work of displaying the view file. Used internally
-	 * by links(), simpleLinks(), and makeLinks().
-	 *
-	 * @param string $group
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	protected function displayLinks(string $group, string $template): string
-	{
-		if (! array_key_exists($template, $this->config->templates))
-		{
-			throw PagerException::forInvalidTemplate($template);
-		}
-		$pager = new PagerRenderer($this->getDetails($group));
-
-		return $this->view->setVar('pager', $pager)
-						->render($this->config->templates[$template]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stores a set of pagination data for later display. Most commonly used
-	 * by the model to automate the process.
-	 *
-	 * @param string       $group
-	 * @param integer      $page
-	 * @param integer|null $perPage
-	 * @param integer      $total
-	 * @param integer      $segment
-	 *
-	 * @return $this
-	 */
-	public function store(string $group, int $page, ?int $perPage, int $total, int $segment = 0)
-	{
-		if ($segment)
-		{
-			$this->setSegment($segment, $group);
-		}
-
-		$this->ensureGroup($group, $perPage);
-
-		if ($segment > 0 && $this->groups[$group]['currentPage'] > 0)
-		{
-			$page = $this->groups[$group]['currentPage'];
-		}
-
-		$perPage   = $perPage ?? $this->config->perPage;
-		$pageCount = (int) ceil($total / $perPage);
-
-		$this->groups[$group]['currentPage'] = $page > $pageCount ? $pageCount : $page;
-		$this->groups[$group]['perPage']     = $perPage;
-		$this->groups[$group]['total']       = $total;
-		$this->groups[$group]['pageCount']   = $pageCount;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets segment for a group.
-	 *
-	 * @param integer $number
-	 * @param string  $group
-	 *
-	 * @return mixed
-	 */
-	public function setSegment(int $number, string $group = 'default')
-	{
-		$this->segment[$group] = $number;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the path that an aliased group of links will use.
-	 *
-	 * @param string $path
-	 * @param string $group
-	 *
-	 * @return mixed
-	 */
-	public function setPath(string $path, string $group = 'default')
-	{
-		$this->ensureGroup($group);
-
-		$this->groups[$group]['uri']->setPath($path);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of items in data store.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getTotal(string $group = 'default'): int
-	{
-		$this->ensureGroup($group);
-
-		return $this->groups[$group]['total'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of pages.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getPageCount(string $group = 'default'): int
-	{
-		$this->ensureGroup($group);
-
-		return $this->groups[$group]['pageCount'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of the current page of results.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getCurrentPage(string $group = 'default'): int
-	{
-		$this->ensureGroup($group);
-
-		return $this->groups[$group]['currentPage'] ?: 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tells whether this group of results has any more pages of results.
-	 *
-	 * @param string $group
-	 *
-	 * @return boolean
-	 */
-	public function hasMore(string $group = 'default'): bool
-	{
-		$this->ensureGroup($group);
-
-		return ($this->groups[$group]['currentPage'] * $this->groups[$group]['perPage']) < $this->groups[$group]['total'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last page, if we have a total that we can calculate with.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer|null
-	 */
-	public function getLastPage(string $group = 'default')
-	{
-		$this->ensureGroup($group);
-
-		if (! is_numeric($this->groups[$group]['total']) || ! is_numeric($this->groups[$group]['perPage']))
-		{
-			return null;
-		}
-
-		return (int) ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines the first page # that should be shown.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getFirstPage(string $group = 'default'): int
-	{
-		$this->ensureGroup($group);
-
-		// @todo determine based on a 'surroundCount' value
-		return 1;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns the URI for a specific page for the specified group.
-	 *
-	 * @param integer|null $page
-	 * @param string       $group
-	 * @param boolean      $returnObject
-	 *
-	 * @return string|URI
-	 */
-	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false)
-	{
-		$this->ensureGroup($group);
-
-		/**
-		 * @var URI $uri
-		 */
-		$uri = $this->groups[$group]['uri'];
-
-		$segment = $this->segment[$group] ?? 0;
-
-		if ($segment)
-		{
-			$uri->setSegment($segment, $page);
-		}
-		else
-		{
-			$uri->addQuery($this->groups[$group]['pageSelector'], $page);
-		}
-
-		if ($this->only)
-		{
-			$query = array_intersect_key($_GET, array_flip($this->only));
-
-			if (! $segment)
-			{
-				$query[$this->groups[$group]['pageSelector']] = $page;
-			}
-
-			$uri->setQueryArray($query);
-		}
-
-		return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the full URI to the next page of results, or null.
-	 *
-	 * @param string  $group
-	 * @param boolean $returnObject
-	 *
-	 * @return string|null
-	 */
-	public function getNextPageURI(string $group = 'default', bool $returnObject = false)
-	{
-		$this->ensureGroup($group);
-
-		$last = $this->getLastPage($group);
-		$curr = $this->getCurrentPage($group);
-		$page = null;
-
-		if (! empty($last) && ! empty($curr) && $last === $curr)
-		{
-			return null;
-		}
-
-		if ($last > $curr)
-		{
-			$page = $curr + 1;
-		}
-
-		return $this->getPageURI($page, $group, $returnObject);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the full URL to the previous page of results, or null.
-	 *
-	 * @param string  $group
-	 * @param boolean $returnObject
-	 *
-	 * @return string|null
-	 */
-	public function getPreviousPageURI(string $group = 'default', bool $returnObject = false)
-	{
-		$this->ensureGroup($group);
-
-		$first = $this->getFirstPage($group);
-		$curr  = $this->getCurrentPage($group);
-		$page  = null;
-
-		if (! empty($first) && ! empty($curr) && $first === $curr)
-		{
-			return null;
-		}
-
-		if ($first < $curr)
-		{
-			$page = $curr - 1;
-		}
-
-		return $this->getPageURI($page, $group, $returnObject);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of results per page that should be shown.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getPerPage(string $group = 'default'): int
-	{
-		$this->ensureGroup($group);
-
-		return (int) $this->groups[$group]['perPage'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array with details about the results, including
-	 * total, per_page, current_page, last_page, next_url, prev_url, from, to.
-	 * Does not include the actual data. This data is suitable for adding
-	 * a 'data' object to with the result set and converting to JSON.
-	 *
-	 * @param string $group
-	 *
-	 * @return array
-	 */
-	public function getDetails(string $group = 'default'): array
-	{
-		if (! array_key_exists($group, $this->groups))
-		{
-			throw PagerException::forInvalidPaginationGroup($group);
-		}
-
-		$newGroup = $this->groups[$group];
-
-		$newGroup['next']     = $this->getNextPageURI($group);
-		$newGroup['previous'] = $this->getPreviousPageURI($group);
-		$newGroup['segment']  = $this->segment[$group] ?? 0;
-
-		return $newGroup;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets only allowed queries on pagination links.
-	 *
-	 * @param array $queries
-	 *
-	 * @return Pager
-	 */
-	public function only(array $queries):Pager
-	{
-		$this->only = $queries;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures that an array exists for the group specified.
-	 *
-	 * @param string  $group
-	 * @param integer $perPage
-	 */
-	protected function ensureGroup(string $group, int $perPage = null)
-	{
-		if (array_key_exists($group, $this->groups))
-		{
-			return;
-		}
-
-		$this->groups[$group] = [
-			'uri'          => clone current_url(true),
-			'hasMore'      => false,
-			'total'        => null,
-			'perPage'      => $perPage ?? $this->config->perPage,
-			'pageCount'    => 1,
-			'pageSelector' => $group === 'default' ? 'page' : 'page_' . $group,
-		];
-
-		$this->calculateCurrentPage($group);
-
-		if ($_GET)
-		{
-			$this->groups[$group]['uri'] = $this->groups[$group]['uri']->setQueryArray($_GET);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Calculating the current page
-	 *
-	 * @param string $group
-	 */
-	protected function calculateCurrentPage(string $group)
-	{
-		if (array_key_exists($group, $this->segment))
-		{
-			try
-			{
-				$this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
-			}
-			catch (HTTPException $e)
-			{
-				$this->groups[$group]['currentPage'] = 1;
-			}
-		}
-		else
-		{
-			$pageSelector = $this->groups[$group]['pageSelector'];
-
-			$page = (int) ($_GET[$pageSelector] ?? 1);
-
-			$this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
-		}
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The group data.
+     *
+     * @var array
+     */
+    protected $groups = [];
+
+    /**
+     * URI segment for groups if provided.
+     *
+     * @var array
+     */
+    protected $segment = [];
+
+    /**
+     * Our configuration instance.
+     *
+     * @var PagerConfig
+     */
+    protected $config;
+
+    /**
+     * The view engine to render the links with.
+     *
+     * @var RendererInterface
+     */
+    protected $view;
+
+    /**
+     * List of only permitted queries
+     *
+     * @var array
+     */
+    protected $only = [];
+
+    /**
+     * Constructor.
+     */
+    public function __construct(PagerConfig $config, RendererInterface $view)
+    {
+        $this->config = $config;
+        $this->view   = $view;
+    }
+
+    /**
+     * Handles creating and displaying the
+     *
+     * @param string $template The output template alias to render.
+     */
+    public function links(string $group = 'default', string $template = 'default_full'): string
+    {
+        $this->ensureGroup($group);
+
+        return $this->displayLinks($group, $template);
+    }
+
+    /**
+     * Creates simple Next/Previous links, instead of full pagination.
+     */
+    public function simpleLinks(string $group = 'default', string $template = 'default_simple'): string
+    {
+        $this->ensureGroup($group);
+
+        return $this->displayLinks($group, $template);
+    }
+
+    /**
+     * Allows for a simple, manual, form of pagination where all of the data
+     * is provided by the user. The URL is the current URI.
+     *
+     * @param string      $template The output template alias to render.
+     * @param int         $segment  (whether page number is provided by URI segment)
+     * @param string|null $group    optional group (i.e. if we'd like to define custom path)
+     */
+    public function makeLinks(int $page, ?int $perPage, int $total, string $template = 'default_full', int $segment = 0, ?string $group = 'default'): string
+    {
+        $group = $group === '' ? 'default' : $group;
+
+        $this->store($group, $page, $perPage ?? $this->config->perPage, $total, $segment);
+
+        return $this->displayLinks($group, $template);
+    }
+
+    /**
+     * Does the actual work of displaying the view file. Used internally
+     * by links(), simpleLinks(), and makeLinks().
+     */
+    protected function displayLinks(string $group, string $template): string
+    {
+        if (! array_key_exists($template, $this->config->templates)) {
+            throw PagerException::forInvalidTemplate($template);
+        }
+
+        $pager = new PagerRenderer($this->getDetails($group));
+
+        return $this->view->setVar('pager', $pager)->render($this->config->templates[$template]);
+    }
+
+    /**
+     * Stores a set of pagination data for later display. Most commonly used
+     * by the model to automate the process.
+     *
+     * @return $this
+     */
+    public function store(string $group, int $page, ?int $perPage, int $total, int $segment = 0)
+    {
+        if ($segment) {
+            $this->setSegment($segment, $group);
+        }
+
+        $this->ensureGroup($group, $perPage);
+
+        if ($segment > 0 && $this->groups[$group]['currentPage'] > 0) {
+            $page = $this->groups[$group]['currentPage'];
+        }
+
+        $perPage   = $perPage ?? $this->config->perPage;
+        $pageCount = (int) ceil($total / $perPage);
+
+        $this->groups[$group]['currentPage'] = $page > $pageCount ? $pageCount : $page;
+        $this->groups[$group]['perPage']     = $perPage;
+        $this->groups[$group]['total']       = $total;
+        $this->groups[$group]['pageCount']   = $pageCount;
+
+        return $this;
+    }
+
+    /**
+     * Sets segment for a group.
+     *
+     * @return mixed
+     */
+    public function setSegment(int $number, string $group = 'default')
+    {
+        $this->segment[$group] = $number;
+
+        return $this;
+    }
+
+    /**
+     * Sets the path that an aliased group of links will use.
+     *
+     * @return mixed
+     */
+    public function setPath(string $path, string $group = 'default')
+    {
+        $this->ensureGroup($group);
+
+        $this->groups[$group]['uri']->setPath($path);
+
+        return $this;
+    }
+
+    /**
+     * Returns the total number of items in data store.
+     */
+    public function getTotal(string $group = 'default'): int
+    {
+        $this->ensureGroup($group);
+
+        return $this->groups[$group]['total'];
+    }
+
+    /**
+     * Returns the total number of pages.
+     */
+    public function getPageCount(string $group = 'default'): int
+    {
+        $this->ensureGroup($group);
+
+        return $this->groups[$group]['pageCount'];
+    }
+
+    /**
+     * Returns the number of the current page of results.
+     */
+    public function getCurrentPage(string $group = 'default'): int
+    {
+        $this->ensureGroup($group);
+
+        return $this->groups[$group]['currentPage'] ?: 1;
+    }
+
+    /**
+     * Tells whether this group of results has any more pages of results.
+     */
+    public function hasMore(string $group = 'default'): bool
+    {
+        $this->ensureGroup($group);
+
+        return ($this->groups[$group]['currentPage'] * $this->groups[$group]['perPage']) < $this->groups[$group]['total'];
+    }
+
+    /**
+     * Returns the last page, if we have a total that we can calculate with.
+     *
+     * @return int|null
+     */
+    public function getLastPage(string $group = 'default')
+    {
+        $this->ensureGroup($group);
+
+        if (! is_numeric($this->groups[$group]['total']) || ! is_numeric($this->groups[$group]['perPage'])) {
+            return null;
+        }
+
+        return (int) ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
+    }
+
+    /**
+     * Determines the first page # that should be shown.
+     */
+    public function getFirstPage(string $group = 'default'): int
+    {
+        $this->ensureGroup($group);
+
+        // @todo determine based on a 'surroundCount' value
+        return 1;
+    }
+
+    /**
+     * Returns the URI for a specific page for the specified group.
+     *
+     * @return string|URI
+     */
+    public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false)
+    {
+        $this->ensureGroup($group);
+
+        /**
+         * @var URI $uri
+         */
+        $uri = $this->groups[$group]['uri'];
+
+        $segment = $this->segment[$group] ?? 0;
+
+        if ($segment) {
+            $uri->setSegment($segment, $page);
+        } else {
+            $uri->addQuery($this->groups[$group]['pageSelector'], $page);
+        }
+
+        if ($this->only) {
+            $query = array_intersect_key($_GET, array_flip($this->only));
+
+            if (! $segment) {
+                $query[$this->groups[$group]['pageSelector']] = $page;
+            }
+
+            $uri->setQueryArray($query);
+        }
+
+        return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns the full URI to the next page of results, or null.
+     *
+     * @return string|null
+     */
+    public function getNextPageURI(string $group = 'default', bool $returnObject = false)
+    {
+        $this->ensureGroup($group);
+
+        $last = $this->getLastPage($group);
+        $curr = $this->getCurrentPage($group);
+        $page = null;
+
+        if (! empty($last) && ! empty($curr) && $last === $curr) {
+            return null;
+        }
+
+        if ($last > $curr) {
+            $page = $curr + 1;
+        }
+
+        return $this->getPageURI($page, $group, $returnObject);
+    }
+
+    /**
+     * Returns the full URL to the previous page of results, or null.
+     *
+     * @return string|null
+     */
+    public function getPreviousPageURI(string $group = 'default', bool $returnObject = false)
+    {
+        $this->ensureGroup($group);
+
+        $first = $this->getFirstPage($group);
+        $curr  = $this->getCurrentPage($group);
+        $page  = null;
+
+        if (! empty($first) && ! empty($curr) && $first === $curr) {
+            return null;
+        }
+
+        if ($first < $curr) {
+            $page = $curr - 1;
+        }
+
+        return $this->getPageURI($page, $group, $returnObject);
+    }
+
+    /**
+     * Returns the number of results per page that should be shown.
+     */
+    public function getPerPage(string $group = 'default'): int
+    {
+        $this->ensureGroup($group);
+
+        return (int) $this->groups[$group]['perPage'];
+    }
+
+    /**
+     * Returns an array with details about the results, including
+     * total, per_page, current_page, last_page, next_url, prev_url, from, to.
+     * Does not include the actual data. This data is suitable for adding
+     * a 'data' object to with the result set and converting to JSON.
+     */
+    public function getDetails(string $group = 'default'): array
+    {
+        if (! array_key_exists($group, $this->groups)) {
+            throw PagerException::forInvalidPaginationGroup($group);
+        }
+
+        $newGroup = $this->groups[$group];
+
+        $newGroup['next']     = $this->getNextPageURI($group);
+        $newGroup['previous'] = $this->getPreviousPageURI($group);
+        $newGroup['segment']  = $this->segment[$group] ?? 0;
+
+        return $newGroup;
+    }
+
+    /**
+     * Sets only allowed queries on pagination links.
+     */
+    public function only(array $queries): self
+    {
+        $this->only = $queries;
+
+        return $this;
+    }
+
+    /**
+     * Ensures that an array exists for the group specified.
+     *
+     * @param int $perPage
+     */
+    protected function ensureGroup(string $group, ?int $perPage = null)
+    {
+        if (array_key_exists($group, $this->groups)) {
+            return;
+        }
+
+        $this->groups[$group] = [
+            'uri'          => clone current_url(true),
+            'hasMore'      => false,
+            'total'        => null,
+            'perPage'      => $perPage ?? $this->config->perPage,
+            'pageCount'    => 1,
+            'pageSelector' => $group === 'default' ? 'page' : 'page_' . $group,
+        ];
+
+        $this->calculateCurrentPage($group);
+
+        if ($_GET) {
+            $this->groups[$group]['uri'] = $this->groups[$group]['uri']->setQueryArray($_GET);
+        }
+    }
+
+    /**
+     * Calculating the current page
+     */
+    protected function calculateCurrentPage(string $group)
+    {
+        if (array_key_exists($group, $this->segment)) {
+            try {
+                $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
+            } catch (HTTPException $e) {
+                $this->groups[$group]['currentPage'] = 1;
+            }
+        } else {
+            $pageSelector = $this->groups[$group]['pageSelector'];
+
+            $page = (int) ($_GET[$pageSelector] ?? 1);
+
+            $this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
+        }
+    }
 }
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index 0b06ef81fc60..73c15473e78e 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
@@ -18,183 +18,101 @@
  */
 interface PagerInterface
 {
-	/**
-	 * Handles creating and displaying the
-	 *
-	 * @param string $group
-	 * @param string $template The output template alias to render.
-	 *
-	 * @return string
-	 */
-	public function links(string $group = 'default', string $template = 'default'): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Creates simple Next/Previous links, instead of full pagination.
-	 *
-	 * @param string $group
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	public function simpleLinks(string $group = 'default', string $template = 'default'): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows for a simple, manual, form of pagination where all of the data
-	 * is provided by the user. The URL is the current URI.
-	 *
-	 * @param integer $page
-	 * @param integer $perPage
-	 * @param integer $total
-	 * @param string  $template The output template alias to render.
-	 *
-	 * @return string
-	 */
-	public function makeLinks(int $page, int $perPage, int $total, string $template = 'default'): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stores a set of pagination data for later display. Most commonly used
-	 * by the model to automate the process.
-	 *
-	 * @param string  $group
-	 * @param integer $page
-	 * @param integer $perPage
-	 * @param integer $total
-	 *
-	 * @return mixed
-	 */
-	public function store(string $group, int $page, int $perPage, int $total);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the path that an aliased group of links will use.
-	 *
-	 * @param string $path
-	 * @param string $group
-	 *
-	 * @return mixed
-	 */
-	public function setPath(string $path, string $group = 'default');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of pages.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getPageCount(string $group = 'default'): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of the current page of results.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getCurrentPage(string $group = 'default'): int;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Returns the URI for a specific page for the specified group.
-	 *
-	 * @param integer|null $page
-	 * @param string       $group
-	 * @param boolean      $returnObject
-	 *
-	 * @return string|URI
-	 */
-	public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tells whether this group of results has any more pages of results.
-	 *
-	 * @param string $group
-	 *
-	 * @return boolean
-	 */
-	public function hasMore(string $group = 'default'): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the first page.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getFirstPage(string $group = 'default');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last page, if we have a total that we can calculate with.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer|null
-	 */
-	public function getLastPage(string $group = 'default');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the full URI to the next page of results, or null.
-	 *
-	 * @param string $group
-	 *
-	 * @return string|null
-	 */
-	public function getNextPageURI(string $group = 'default');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the full URL to the previous page of results, or null.
-	 *
-	 * @param string $group
-	 *
-	 * @return string|null
-	 */
-	public function getPreviousPageURI(string $group = 'default');
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of results per page that should be shown.
-	 *
-	 * @param string $group
-	 *
-	 * @return integer
-	 */
-	public function getPerPage(string $group = 'default'): int;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array with details about the results, including
-	 * total, per_page, current_page, last_page, next_url, prev_url, from, to.
-	 * Does not include the actual data. This data is suitable for adding
-	 * a 'data' object to with the result set and converting to JSON.
-	 *
-	 * @param string $group
-	 *
-	 * @return array
-	 */
-	public function getDetails(string $group = 'default'): array;
-
-	//--------------------------------------------------------------------
+    /**
+     * Handles creating and displaying the
+     *
+     * @param string $template The output template alias to render.
+     */
+    public function links(string $group = 'default', string $template = 'default'): string;
+
+    /**
+     * Creates simple Next/Previous links, instead of full pagination.
+     */
+    public function simpleLinks(string $group = 'default', string $template = 'default'): string;
+
+    /**
+     * Allows for a simple, manual, form of pagination where all of the data
+     * is provided by the user. The URL is the current URI.
+     *
+     * @param string $template The output template alias to render.
+     */
+    public function makeLinks(int $page, int $perPage, int $total, string $template = 'default'): string;
+
+    /**
+     * Stores a set of pagination data for later display. Most commonly used
+     * by the model to automate the process.
+     *
+     * @return mixed
+     */
+    public function store(string $group, int $page, int $perPage, int $total);
+
+    /**
+     * Sets the path that an aliased group of links will use.
+     *
+     * @return mixed
+     */
+    public function setPath(string $path, string $group = 'default');
+
+    /**
+     * Returns the total number of pages.
+     */
+    public function getPageCount(string $group = 'default'): int;
+
+    /**
+     * Returns the number of the current page of results.
+     */
+    public function getCurrentPage(string $group = 'default'): int;
+
+    /**
+     * Returns the URI for a specific page for the specified group.
+     *
+     * @return string|URI
+     */
+    public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false);
+
+    /**
+     * Tells whether this group of results has any more pages of results.
+     */
+    public function hasMore(string $group = 'default'): bool;
+
+    /**
+     * Returns the first page.
+     *
+     * @return int
+     */
+    public function getFirstPage(string $group = 'default');
+
+    /**
+     * Returns the last page, if we have a total that we can calculate with.
+     *
+     * @return int|null
+     */
+    public function getLastPage(string $group = 'default');
+
+    /**
+     * Returns the full URI to the next page of results, or null.
+     *
+     * @return string|null
+     */
+    public function getNextPageURI(string $group = 'default');
+
+    /**
+     * Returns the full URL to the previous page of results, or null.
+     *
+     * @return string|null
+     */
+    public function getPreviousPageURI(string $group = 'default');
+
+    /**
+     * Returns the number of results per page that should be shown.
+     */
+    public function getPerPage(string $group = 'default'): int;
+
+    /**
+     * Returns an array with details about the results, including
+     * total, per_page, current_page, last_page, next_url, prev_url, from, to.
+     * Does not include the actual data. This data is suitable for adding
+     * a 'data' object to with the result set and converting to JSON.
+     */
+    public function getDetails(string $group = 'default'): array;
 }
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index f1a45992b3a3..8c70314dc99f 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
@@ -22,446 +22,357 @@
  */
 class PagerRenderer
 {
-	/**
-	 * First page number.
-	 *
-	 * @var integer
-	 */
-	protected $first;
-
-	/**
-	 * Last page number.
-	 *
-	 * @var integer
-	 */
-	protected $last;
-
-	/**
-	 * Current page number.
-	 *
-	 * @var integer
-	 */
-	protected $current;
-
-	/**
-	 * Total number of items.
-	 *
-	 * @var integer
-	 */
-	protected $total;
-
-	/**
-	 * Total number of pages.
-	 *
-	 * @var integer
-	 */
-	protected $pageCount;
-
-	/**
-	 * URI base for pagination links
-	 *
-	 * @var URI
-	 */
-	protected $uri;
-
-	/**
-	 * Segment number used for pagination.
-	 *
-	 * @var integer
-	 */
-	protected $segment;
-
-	/**
-	 * Name of $_GET parameter
-	 *
-	 * @var string
-	 */
-	protected $pageSelector;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param array $details
-	 */
-	public function __construct(array $details)
-	{
-		$this->first        = 1;
-		$this->last         = $details['pageCount'];
-		$this->current      = $details['currentPage'];
-		$this->total        = $details['total'];
-		$this->uri          = $details['uri'];
-		$this->pageCount    = $details['pageCount'];
-		$this->segment      = $details['segment'] ?? 0;
-		$this->pageSelector = $details['pageSelector'] ?? 'page';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the total number of links that should appear on either
-	 * side of the current page. Adjusts the first and last counts
-	 * to reflect it.
-	 *
-	 * @param integer|null $count
-	 *
-	 * @return PagerRenderer
-	 */
-	public function setSurroundCount(int $count = null)
-	{
-		$this->updatePages($count);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if there is a "previous" page before our "first" page.
-	 *
-	 * @return boolean
-	 */
-	public function hasPrevious(): bool
-	{
-		return $this->first > 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a URL to the "previous" page. The previous page is NOT the
-	 * page before the current page, but is the page just before the
-	 * "first" page.
-	 *
-	 * You MUST call hasPrevious() first, or this value may be invalid.
-	 *
-	 * @return string|null
-	 */
-	public function getPrevious()
-	{
-		if (! $this->hasPrevious())
-		{
-			return null;
-		}
-
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->first - 1);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->first - 1);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if there is a "next" page after our "last" page.
-	 *
-	 * @return boolean
-	 */
-	public function hasNext(): bool
-	{
-		return $this->pageCount > $this->last;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a URL to the "next" page. The next page is NOT, the
-	 * page after the current page, but is the page that follows the
-	 * "last" page.
-	 *
-	 * You MUST call hasNext() first, or this value may be invalid.
-	 *
-	 * @return string|null
-	 */
-	public function getNext()
-	{
-		if (! $this->hasNext())
-		{
-			return null;
-		}
-
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->last + 1);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->last + 1);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the URI of the first page.
-	 *
-	 * @return string
-	 */
-	public function getFirst(): string
-	{
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, 1);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, 1);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the URI of the last page.
-	 *
-	 * @return string
-	 */
-	public function getLast(): string
-	{
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->pageCount);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->pageCount);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the URI of the current page.
-	 *
-	 * @return string
-	 */
-	public function getCurrent(): string
-	{
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->current);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->current);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of links that should be displayed. Each link
-	 * is represented by another array containing of the URI the link
-	 * should go to, the title (number) of the link, and a boolean
-	 * value representing whether this link is active or not.
-	 *
-	 * @return array
-	 */
-	public function links(): array
-	{
-		$links = [];
-
-		$uri = clone $this->uri;
-
-		for ($i = $this->first; $i <= $this->last; $i ++)
-		{
-			$uri     = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
-			$links[] = [
-				'uri'    => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
-				'title'  => (int) $i,
-				'active' => ($i === $this->current),
-			];
-		}
-
-		return $links;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Updates the first and last pages based on $surroundCount,
-	 * which is the number of links surrounding the active page
-	 * to show.
-	 *
-	 * @param integer|null $count The new "surroundCount"
-	 */
-	protected function updatePages(int $count = null)
-	{
-		if (is_null($count))
-		{
-			return;
-		}
-
-		$this->first = $this->current - $count > 0 ? (int) ($this->current - $count) : 1;
-		$this->last  = $this->current + $count <= $this->pageCount ? (int) ($this->current + $count) : (int) $this->pageCount;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if there is a "previous" page before our "first" page.
-	 *
-	 * @return boolean
-	 */
-	public function hasPreviousPage(): bool
-	{
-		return $this->current > 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a URL to the "previous" page.
-	 *
-	 * You MUST call hasPreviousPage() first, or this value may be invalid.
-	 *
-	 * @return string|null
-	 */
-	public function getPreviousPage()
-	{
-		if (! $this->hasPreviousPage())
-		{
-			return null;
-		}
-
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->current - 1);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->current - 1);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if there is a "next" page after our "last" page.
-	 *
-	 * @return boolean
-	 */
-	public function hasNextPage(): bool
-	{
-		return $this->current < $this->last;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a URL to the "next" page.
-	 *
-	 * You MUST call hasNextPage() first, or this value may be invalid.
-	 *
-	 * @return string|null
-	 */
-	public function getNextPage()
-	{
-		if (! $this->hasNextPage())
-		{
-			return null;
-		}
-
-		$uri = clone $this->uri;
-
-		if ($this->segment === 0)
-		{
-			$uri->addQuery($this->pageSelector, $this->current + 1);
-		}
-		else
-		{
-			$uri->setSegment($this->segment, $this->current + 1);
-		}
-
-		return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
-	}
-
-	/**
-	 * Returns the page number of the first page.
-	 *
-	 * @return integer
-	 */
-	public function getFirstPageNumber(): int
-	{
-		return $this->first;
-	}
-
-	/**
-	 * Returns the page number of the current page.
-	 *
-	 * @return integer
-	 */
-	public function getCurrentPageNumber(): int
-	{
-		return $this->current;
-	}
-
-	/**
-	 * Returns the page number of the last page.
-	 *
-	 * @return integer
-	 */
-	public function getLastPageNumber(): int
-	{
-		return $this->last;
-	}
-
-	/**
-	 * Returns total number of pages.
-	 *
-	 * @return integer
-	 */
-	public function getPageCount(): int
-	{
-		return $this->pageCount;
-	}
-
-	/**
-	 * Returns the previous page number.
-	 *
-	 * @return integer|null
-	 */
-	public function getPreviousPageNumber(): ?int
-	{
-		return ($this->current === 1) ? null : $this->current - 1;
-	}
-
-	/**
-	 * Returns the next page number.
-	 *
-	 * @return integer|null
-	 */
-	public function getNextPageNumber(): ?int
-	{
-		return ($this->current === $this->pageCount) ? null : $this->current + 1;
-	}
+    /**
+     * First page number.
+     *
+     * @var int
+     */
+    protected $first;
+
+    /**
+     * Last page number.
+     *
+     * @var int
+     */
+    protected $last;
+
+    /**
+     * Current page number.
+     *
+     * @var int
+     */
+    protected $current;
+
+    /**
+     * Total number of items.
+     *
+     * @var int
+     */
+    protected $total;
+
+    /**
+     * Total number of pages.
+     *
+     * @var int
+     */
+    protected $pageCount;
+
+    /**
+     * URI base for pagination links
+     *
+     * @var URI
+     */
+    protected $uri;
+
+    /**
+     * Segment number used for pagination.
+     *
+     * @var int
+     */
+    protected $segment;
+
+    /**
+     * Name of $_GET parameter
+     *
+     * @var string
+     */
+    protected $pageSelector;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(array $details)
+    {
+        $this->first        = 1;
+        $this->last         = $details['pageCount'];
+        $this->current      = $details['currentPage'];
+        $this->total        = $details['total'];
+        $this->uri          = $details['uri'];
+        $this->pageCount    = $details['pageCount'];
+        $this->segment      = $details['segment'] ?? 0;
+        $this->pageSelector = $details['pageSelector'] ?? 'page';
+    }
+
+    /**
+     * Sets the total number of links that should appear on either
+     * side of the current page. Adjusts the first and last counts
+     * to reflect it.
+     *
+     * @return PagerRenderer
+     */
+    public function setSurroundCount(?int $count = null)
+    {
+        $this->updatePages($count);
+
+        return $this;
+    }
+
+    /**
+     * Checks to see if there is a "previous" page before our "first" page.
+     */
+    public function hasPrevious(): bool
+    {
+        return $this->first > 1;
+    }
+
+    /**
+     * Returns a URL to the "previous" page. The previous page is NOT the
+     * page before the current page, but is the page just before the
+     * "first" page.
+     *
+     * You MUST call hasPrevious() first, or this value may be invalid.
+     *
+     * @return string|null
+     */
+    public function getPrevious()
+    {
+        if (! $this->hasPrevious()) {
+            return null;
+        }
+
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->first - 1);
+        } else {
+            $uri->setSegment($this->segment, $this->first - 1);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Checks to see if there is a "next" page after our "last" page.
+     */
+    public function hasNext(): bool
+    {
+        return $this->pageCount > $this->last;
+    }
+
+    /**
+     * Returns a URL to the "next" page. The next page is NOT, the
+     * page after the current page, but is the page that follows the
+     * "last" page.
+     *
+     * You MUST call hasNext() first, or this value may be invalid.
+     *
+     * @return string|null
+     */
+    public function getNext()
+    {
+        if (! $this->hasNext()) {
+            return null;
+        }
+
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->last + 1);
+        } else {
+            $uri->setSegment($this->segment, $this->last + 1);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns the URI of the first page.
+     */
+    public function getFirst(): string
+    {
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, 1);
+        } else {
+            $uri->setSegment($this->segment, 1);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns the URI of the last page.
+     */
+    public function getLast(): string
+    {
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->pageCount);
+        } else {
+            $uri->setSegment($this->segment, $this->pageCount);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns the URI of the current page.
+     */
+    public function getCurrent(): string
+    {
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->current);
+        } else {
+            $uri->setSegment($this->segment, $this->current);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns an array of links that should be displayed. Each link
+     * is represented by another array containing of the URI the link
+     * should go to, the title (number) of the link, and a boolean
+     * value representing whether this link is active or not.
+     */
+    public function links(): array
+    {
+        $links = [];
+
+        $uri = clone $this->uri;
+
+        for ($i = $this->first; $i <= $this->last; $i++) {
+            $uri     = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
+            $links[] = [
+                'uri'    => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
+                'title'  => $i,
+                'active' => ($i === $this->current),
+            ];
+        }
+
+        return $links;
+    }
+
+    /**
+     * Updates the first and last pages based on $surroundCount,
+     * which is the number of links surrounding the active page
+     * to show.
+     *
+     * @param int|null $count The new "surroundCount"
+     */
+    protected function updatePages(?int $count = null)
+    {
+        if ($count === null) {
+            return;
+        }
+
+        $this->first = $this->current - $count > 0 ? $this->current - $count : 1;
+        $this->last  = $this->current + $count <= $this->pageCount ? $this->current + $count : (int) $this->pageCount;
+    }
+
+    /**
+     * Checks to see if there is a "previous" page before our "first" page.
+     */
+    public function hasPreviousPage(): bool
+    {
+        return $this->current > 1;
+    }
+
+    /**
+     * Returns a URL to the "previous" page.
+     *
+     * You MUST call hasPreviousPage() first, or this value may be invalid.
+     *
+     * @return string|null
+     */
+    public function getPreviousPage()
+    {
+        if (! $this->hasPreviousPage()) {
+            return null;
+        }
+
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->current - 1);
+        } else {
+            $uri->setSegment($this->segment, $this->current - 1);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Checks to see if there is a "next" page after our "last" page.
+     */
+    public function hasNextPage(): bool
+    {
+        return $this->current < $this->last;
+    }
+
+    /**
+     * Returns a URL to the "next" page.
+     *
+     * You MUST call hasNextPage() first, or this value may be invalid.
+     *
+     * @return string|null
+     */
+    public function getNextPage()
+    {
+        if (! $this->hasNextPage()) {
+            return null;
+        }
+
+        $uri = clone $this->uri;
+
+        if ($this->segment === 0) {
+            $uri->addQuery($this->pageSelector, $this->current + 1);
+        } else {
+            $uri->setSegment($this->segment, $this->current + 1);
+        }
+
+        return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+    }
+
+    /**
+     * Returns the page number of the first page.
+     */
+    public function getFirstPageNumber(): int
+    {
+        return $this->first;
+    }
+
+    /**
+     * Returns the page number of the current page.
+     */
+    public function getCurrentPageNumber(): int
+    {
+        return $this->current;
+    }
+
+    /**
+     * Returns the page number of the last page.
+     */
+    public function getLastPageNumber(): int
+    {
+        return $this->last;
+    }
+
+    /**
+     * Returns total number of pages.
+     */
+    public function getPageCount(): int
+    {
+        return $this->pageCount;
+    }
+
+    /**
+     * Returns the previous page number.
+     */
+    public function getPreviousPageNumber(): ?int
+    {
+        return ($this->current === 1) ? null : $this->current - 1;
+    }
+
+    /**
+     * Returns the next page number.
+     */
+    public function getNextPageNumber(): ?int
+    {
+        return ($this->current === $this->pageCount) ? null : $this->current + 1;
+    }
 }
diff --git a/system/Pager/Views/default_head.php b/system/Pager/Views/default_head.php
index edeb092c59de..c233e5eace22 100644
--- a/system/Pager/Views/default_head.php
+++ b/system/Pager/Views/default_head.php
@@ -1,29 +1,27 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Pager\PagerRenderer;
 
- /**
+/**
  * @var PagerRenderer $pager
  */
 $pager->setSurroundCount(0);
 
-if ($pager->hasPrevious())
-{
-	echo '<link rel="prev" href="' . $pager->getPrevious() . '">' . PHP_EOL;
+if ($pager->hasPrevious()) {
+    echo '<link rel="prev" href="' . $pager->getPrevious() . '">' . PHP_EOL;
 }
 
 echo '<link rel="canonical" href="' . $pager->getCurrent() . '">' . PHP_EOL;
 
-if ($pager->hasNext())
-{
-	echo '<link rel="next" href="' . $pager->getNext() . '">' . PHP_EOL;
+if ($pager->hasNext()) {
+    echo '<link rel="next" href="' . $pager->getNext() . '">' . PHP_EOL;
 }
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index 376f0040334a..65ad21251a3d 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
@@ -18,58 +18,44 @@
 
 abstract class BaseResource extends Controller
 {
-	/**
-	 * @var string|null The model that holding this resource's data
-	 */
-	protected $modelName;
-
-	/**
-	 * @var object|null The model that holding this resource's data
-	 */
-	protected $model;
-
-	/**
-	 * Constructor.
-	 *
-	 * @param RequestInterface  $request
-	 * @param ResponseInterface $response
-	 * @param LoggerInterface   $logger
-	 */
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		parent::initController($request, $response, $logger);
-
-		// instantiate our model, if needed
-		$this->setModel($this->modelName);
-	}
-
-	/**
-	 * Set or change the model this controller is bound to.
-	 * Given either the name or the object, determine the other.
-	 *
-	 * @param object|string|null $which
-	 *
-	 * @return void
-	 */
-	public function setModel($which = null)
-	{
-		// save what we have been given
-		if ($which)
-		{
-			$this->model     = is_object($which) ? $which : null;
-			$this->modelName = is_object($which) ? null : $which;
-		}
-
-		// make a model object if needed
-		if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName))
-		{
-			$this->model = model($this->modelName);
-		}
-
-		// determine model name if needed
-		if (! empty($this->model) && empty($this->modelName))
-		{
-			$this->modelName = get_class($this->model);
-		}
-	}
+    /**
+     * @var string|null The model that holding this resource's data
+     */
+    protected $modelName;
+
+    /**
+     * @var object|null The model that holding this resource's data
+     */
+    protected $model;
+
+    /**
+     * Constructor.
+     */
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    {
+        parent::initController($request, $response, $logger);
+        $this->setModel($this->modelName);
+    }
+
+    /**
+     * Set or change the model this controller is bound to.
+     * Given either the name or the object, determine the other.
+     *
+     * @param object|string|null $which
+     */
+    public function setModel($which = null)
+    {
+        if ($which) {
+            $this->model     = is_object($which) ? $which : null;
+            $this->modelName = is_object($which) ? null : $which;
+        }
+
+        if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName)) {
+            $this->model = model($this->modelName);
+        }
+
+        if (! empty($this->model) && empty($this->modelName)) {
+            $this->modelName = get_class($this->model);
+        }
+    }
 }
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index 5289f81778c2..809545c1513b 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
@@ -18,98 +18,93 @@
  */
 class ResourceController extends BaseResource
 {
-	use ResponseTrait;
+    use ResponseTrait;
 
-	/**
-	 * Return an array of resource objects, themselves in array format
-	 *
-	 * @return mixed
-	 */
-	public function index()
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['index']), 501);
-	}
+    /**
+     * Return an array of resource objects, themselves in array format
+     *
+     * @return mixed
+     */
+    public function index()
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['index']), 501);
+    }
 
-	/**
-	 * Return the properties of a resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function show($id = null)
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['show']), 501);
-	}
+    /**
+     * Return the properties of a resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function show($id = null)
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['show']), 501);
+    }
 
-	/**
-	 * Return a new resource object, with default properties
-	 *
-	 * @return mixed
-	 */
-	public function new()
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['new']), 501);
-	}
+    /**
+     * Return a new resource object, with default properties
+     *
+     * @return mixed
+     */
+    public function new()
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['new']), 501);
+    }
 
-	/**
-	 * Create a new resource object, from "posted" parameters
-	 *
-	 * @return mixed
-	 */
-	public function create()
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['create']), 501);
-	}
+    /**
+     * Create a new resource object, from "posted" parameters
+     *
+     * @return mixed
+     */
+    public function create()
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['create']), 501);
+    }
 
-	/**
-	 * Return the editable properties of a resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function edit($id = null)
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['edit']), 501);
-	}
+    /**
+     * Return the editable properties of a resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function edit($id = null)
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['edit']), 501);
+    }
 
-	/**
-	 * Add or update a model resource, from "posted" properties
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function update($id = null)
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['update']), 501);
-	}
+    /**
+     * Add or update a model resource, from "posted" properties
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function update($id = null)
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['update']), 501);
+    }
 
-	/**
-	 * Delete the designated resource object from the model
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function delete($id = null)
-	{
-		return $this->fail(lang('RESTful.notImplemented', ['delete']), 501);
-	}
+    /**
+     * Delete the designated resource object from the model
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function delete($id = null)
+    {
+        return $this->fail(lang('RESTful.notImplemented', ['delete']), 501);
+    }
 
-	/**
-	 * Set/change the expected response representation for returned objects
-	 *
-	 * @param string $format
-	 *
-	 * @return void
-	 */
-	public function setFormat(string $format = 'json')
-	{
-		if (in_array($format, ['json', 'xml'], true))
-		{
-			$this->format = $format;
-		}
-	}
+    /**
+     * Set/change the expected response representation for returned objects
+     */
+    public function setFormat(string $format = 'json')
+    {
+        if (in_array($format, ['json', 'xml'], true)) {
+            $this->format = $format;
+        }
+    }
 }
diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php
index 22dcc3c14599..467e2687c40d 100644
--- a/system/RESTful/ResourcePresenter.php
+++ b/system/RESTful/ResourcePresenter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
@@ -16,95 +16,95 @@
  */
 class ResourcePresenter extends BaseResource
 {
-	/**
-	 * Present a view of resource objects
-	 *
-	 * @return mixed
-	 */
-	public function index()
-	{
-		return lang('RESTful.notImplemented', ['index']);
-	}
+    /**
+     * Present a view of resource objects
+     *
+     * @return mixed
+     */
+    public function index()
+    {
+        return lang('RESTful.notImplemented', ['index']);
+    }
 
-	/**
-	 * Present a view to present a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function show($id = null)
-	{
-		return lang('RESTful.notImplemented', ['show']);
-	}
+    /**
+     * Present a view to present a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function show($id = null)
+    {
+        return lang('RESTful.notImplemented', ['show']);
+    }
 
-	/**
-	 * Present a view to present a new single resource object
-	 *
-	 * @return mixed
-	 */
-	public function new()
-	{
-		return lang('RESTful.notImplemented', ['new']);
-	}
+    /**
+     * Present a view to present a new single resource object
+     *
+     * @return mixed
+     */
+    public function new()
+    {
+        return lang('RESTful.notImplemented', ['new']);
+    }
 
-	/**
-	 * Process the creation/insertion of a new resource object.
-	 * This should be a POST.
-	 *
-	 * @return mixed
-	 */
-	public function create()
-	{
-		return lang('RESTful.notImplemented', ['create']);
-	}
+    /**
+     * Process the creation/insertion of a new resource object.
+     * This should be a POST.
+     *
+     * @return mixed
+     */
+    public function create()
+    {
+        return lang('RESTful.notImplemented', ['create']);
+    }
 
-	/**
-	 * Present a view to edit the properties of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function edit($id = null)
-	{
-		return lang('RESTful.notImplemented', ['edit']);
-	}
+    /**
+     * Present a view to edit the properties of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function edit($id = null)
+    {
+        return lang('RESTful.notImplemented', ['edit']);
+    }
 
-	/**
-	 * Process the updating, full or partial, of a specific resource object.
-	 * This should be a POST.
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function update($id = null)
-	{
-		return lang('RESTful.notImplemented', ['update']);
-	}
+    /**
+     * Process the updating, full or partial, of a specific resource object.
+     * This should be a POST.
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function update($id = null)
+    {
+        return lang('RESTful.notImplemented', ['update']);
+    }
 
-	/**
-	 * Present a view to confirm the deletion of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function remove($id = null)
-	{
-		return lang('RESTful.notImplemented', ['remove']);
-	}
+    /**
+     * Present a view to confirm the deletion of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function remove($id = null)
+    {
+        return lang('RESTful.notImplemented', ['remove']);
+    }
 
-	/**
-	 * Process the deletion of a specific resource object
-	 *
-	 * @param mixed $id
-	 *
-	 * @return mixed
-	 */
-	public function delete($id = null)
-	{
-		return lang('RESTful.notImplemented', ['delete']);
-	}
+    /**
+     * Process the deletion of a specific resource object
+     *
+     * @param mixed $id
+     *
+     * @return mixed
+     */
+    public function delete($id = null)
+    {
+        return lang('RESTful.notImplemented', ['delete']);
+    }
 }
diff --git a/system/Router/Exceptions/RedirectException.php b/system/Router/Exceptions/RedirectException.php
index a98beb4fb756..b2456f367676 100644
--- a/system/Router/Exceptions/RedirectException.php
+++ b/system/Router/Exceptions/RedirectException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
@@ -18,10 +18,10 @@
  */
 class RedirectException extends Exception
 {
-	/**
-	 * Status code for redirects
-	 *
-	 * @var integer
-	 */
-	protected $code = 302;
+    /**
+     * Status code for redirects
+     *
+     * @var int
+     */
+    protected $code = 302;
 }
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index 4c74245ab2c0..8c469d967b78 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
@@ -18,49 +18,44 @@
  */
 class RouterException extends FrameworkException
 {
-	/**
-	 * Thrown when the actual parameter type does not match
-	 * the expected types.
-	 *
-	 * @return RouterException
-	 */
-	public static function forInvalidParameterType()
-	{
-		return new static(lang('Router.invalidParameterType'));
-	}
+    /**
+     * Thrown when the actual parameter type does not match
+     * the expected types.
+     *
+     * @return RouterException
+     */
+    public static function forInvalidParameterType()
+    {
+        return new static(lang('Router.invalidParameterType'));
+    }
 
-	/**
-	 * Thrown when a default route is not set.
-	 *
-	 * @return RouterException
-	 */
-	public static function forMissingDefaultRoute()
-	{
-		return new static(lang('Router.missingDefaultRoute'));
-	}
+    /**
+     * Thrown when a default route is not set.
+     *
+     * @return RouterException
+     */
+    public static function forMissingDefaultRoute()
+    {
+        return new static(lang('Router.missingDefaultRoute'));
+    }
 
-	/**
-	 * Throw when controller or its method is not found.
-	 *
-	 * @param string $controller
-	 * @param string $method
-	 *
-	 * @return RouterException
-	 */
-	public static function forControllerNotFound(string $controller, string $method)
-	{
-		return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
-	}
+    /**
+     * Throw when controller or its method is not found.
+     *
+     * @return RouterException
+     */
+    public static function forControllerNotFound(string $controller, string $method)
+    {
+        return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
+    }
 
-	/**
-	 * Throw when route is not valid.
-	 *
-	 * @param string $route
-	 *
-	 * @return RouterException
-	 */
-	public static function forInvalidRoute(string $route)
-	{
-		return new static(lang('HTTP.invalidRoute', [$route]));
-	}
+    /**
+     * Throw when route is not valid.
+     *
+     * @return RouterException
+     */
+    public static function forInvalidRoute(string $route)
+    {
+        return new static(lang('HTTP.invalidRoute', [$route]));
+    }
 }
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index b7d586e48907..e975a1ac86b9 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -25,1607 +25,1294 @@
  */
 class RouteCollection implements RouteCollectionInterface
 {
-	/**
-	 * The namespace to be added to any Controllers.
-	 * Defaults to the global namespaces (\)
-	 *
-	 * @var string
-	 */
-	protected $defaultNamespace = '\\';
-
-	/**
-	 * The name of the default controller to use
-	 * when no other controller is specified.
-	 *
-	 * Not used here. Pass-thru value for Router class.
-	 *
-	 * @var string
-	 */
-	protected $defaultController = 'Home';
-
-	/**
-	 * The name of the default method to use
-	 * when no other method has been specified.
-	 *
-	 * Not used here. Pass-thru value for Router class.
-	 *
-	 * @var string
-	 */
-	protected $defaultMethod = 'index';
-
-	/**
-	 * The placeholder used when routing 'resources'
-	 * when no other placeholder has been specified.
-	 *
-	 * @var string
-	 */
-	protected $defaultPlaceholder = 'any';
-
-	/**
-	 * Whether to convert dashes to underscores in URI.
-	 *
-	 * Not used here. Pass-thru value for Router class.
-	 *
-	 * @var boolean
-	 */
-	protected $translateURIDashes = false;
-
-	/**
-	 * Whether to match URI against Controllers
-	 * when it doesn't match defined routes.
-	 *
-	 * Not used here. Pass-thru value for Router class.
-	 *
-	 * @var boolean
-	 */
-	protected $autoRoute = true;
-
-	/**
-	 * A callable that will be shown
-	 * when the route cannot be matched.
-	 *
-	 * @var string|Closure
-	 */
-	protected $override404;
-
-	/**
-	 * Defined placeholders that can be used
-	 * within the
-	 *
-	 * @var array
-	 */
-	protected $placeholders = [
-		'any'      => '.*',
-		'segment'  => '[^/]+',
-		'alphanum' => '[a-zA-Z0-9]+',
-		'num'      => '[0-9]+',
-		'alpha'    => '[a-zA-Z]+',
-		'hash'     => '[^/]+',
-	];
-
-	/**
-	 * An array of all routes and their mappings.
-	 *
-	 * @var array
-	 */
-	protected $routes = [
-		'*'       => [],
-		'options' => [],
-		'get'     => [],
-		'head'    => [],
-		'post'    => [],
-		'put'     => [],
-		'delete'  => [],
-		'trace'   => [],
-		'connect' => [],
-		'cli'     => [],
-	];
-
-	/**
-	 * Array of routes options
-	 *
-	 * @var array
-	 */
-	protected $routesOptions = [];
-
-	/**
-	 * The current method that the script is being called by.
-	 *
-	 * @var string
-	 */
-	protected $HTTPVerb = '*';
-
-	/**
-	 * The default list of HTTP methods (and CLI for command line usage)
-	 * that is allowed if no other method is provided.
-	 *
-	 * @var array
-	 */
-	protected $defaultHTTPMethods = [
-		'options',
-		'get',
-		'head',
-		'post',
-		'put',
-		'delete',
-		'trace',
-		'connect',
-		'cli',
-	];
-
-	/**
-	 * The name of the current group, if any.
-	 *
-	 * @var string|null
-	 */
-	protected $group;
-
-	/**
-	 * The current subdomain.
-	 *
-	 * @var string|null
-	 */
-	protected $currentSubdomain;
-
-	/**
-	 * Stores copy of current options being
-	 * applied during creation.
-	 *
-	 * @var array|null
-	 */
-	protected $currentOptions;
-
-	/**
-	 * A little performance booster.
-	 *
-	 * @var boolean
-	 */
-	protected $didDiscover = false;
-
-	/**
-	 * Handle to the file locator to use.
-	 *
-	 * @var FileLocator
-	 */
-	protected $fileLocator;
-
-	/**
-	 * Handle to the modules config.
-	 *
-	 * @var Modules
-	 */
-	protected $moduleConfig;
-
-	/**
-	 * Flag for sorting routes by priority.
-	 *
-	 * @var boolean
-	 */
-	protected $prioritize = false;
-
-	/**
-	 * Route priority detection flag.
-	 *
-	 * @var boolean
-	 */
-	protected $prioritizeDetected = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param FileLocator $locator
-	 * @param Modules     $moduleConfig
-	 */
-	public function __construct(FileLocator $locator, Modules $moduleConfig)
-	{
-		$this->fileLocator  = $locator;
-		$this->moduleConfig = $moduleConfig;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Registers a new constraint with the system. Constraints are used
-	 * by the routes as placeholders for regular expressions to make defining
-	 * the routes more human-friendly.
-	 *
-	 * You can pass an associative array as $placeholder, and have
-	 * multiple placeholders added at once.
-	 *
-	 * @param string|array $placeholder
-	 * @param string|null  $pattern
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function addPlaceholder($placeholder, string $pattern = null): RouteCollectionInterface
-	{
-		if (! is_array($placeholder))
-		{
-			$placeholder = [$placeholder => $pattern];
-		}
-
-		$this->placeholders = array_merge($this->placeholders, $placeholder);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the default namespace to use for Controllers when no other
-	 * namespace has been specified.
-	 *
-	 * @param string $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setDefaultNamespace(string $value): RouteCollectionInterface
-	{
-		$this->defaultNamespace = filter_var($value, FILTER_SANITIZE_STRING);
-		$this->defaultNamespace = rtrim($this->defaultNamespace, '\\') . '\\';
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the default controller to use when no other controller has been
-	 * specified.
-	 *
-	 * @param string $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setDefaultController(string $value): RouteCollectionInterface
-	{
-		$this->defaultController = filter_var($value, FILTER_SANITIZE_STRING);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the default method to call on the controller when no other
-	 * method has been set in the route.
-	 *
-	 * @param string $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setDefaultMethod(string $value): RouteCollectionInterface
-	{
-		$this->defaultMethod = filter_var($value, FILTER_SANITIZE_STRING);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Tells the system whether to convert dashes in URI strings into
-	 * underscores. In some search engines, including Google, dashes
-	 * create more meaning and make it easier for the search engine to
-	 * find words and meaning in the URI for better SEO. But it
-	 * doesn't work well with PHP method names....
-	 *
-	 * @param boolean $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setTranslateURIDashes(bool $value): RouteCollectionInterface
-	{
-		$this->translateURIDashes = $value;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * If TRUE, the system will attempt to match the URI against
-	 * Controllers by matching each segment against folders/files
-	 * in APPPATH/Controllers, when a match wasn't found against
-	 * defined routes.
-	 *
-	 * If FALSE, will stop searching and do NO automatic routing.
-	 *
-	 * @param boolean $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setAutoRoute(bool $value): RouteCollectionInterface
-	{
-		$this->autoRoute = $value;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the class/method that should be called if routing doesn't
-	 * find a match. It can be either a closure or the controller/method
-	 * name exactly like a route is defined: Users::index
-	 *
-	 * This setting is passed to the Router class and handled there.
-	 *
-	 * @param callable|null $callable
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function set404Override($callable = null): RouteCollectionInterface
-	{
-		$this->override404 = $callable;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the 404 Override setting, which can be null, a closure
-	 * or the controller/string.
-	 *
-	 * @return string|Closure|null
-	 */
-	public function get404Override()
-	{
-		return $this->override404;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will attempt to discover any additional routes, either through
-	 * the local PSR4 namespaces, or through selected Composer packages.
-	 */
-	protected function discoverRoutes()
-	{
-		if ($this->didDiscover)
-		{
-			return;
-		}
-
-		// We need this var in local scope
-		// so route files can access it.
-		$routes = $this;
-
-		if ($this->moduleConfig->shouldDiscover('routes'))
-		{
-			$files = $this->fileLocator->search('Config/Routes.php');
-
-			foreach ($files as $file)
-			{
-				// Don't include our main file again...
-				if ($file === APPPATH . 'Config/Routes.php')
-				{
-					continue;
-				}
-
-				include $file;
-			}
-		}
-
-		$this->didDiscover = true;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets the default constraint to be used in the system. Typically
-	 * for use with the 'resource' method.
-	 *
-	 * @param string $placeholder
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setDefaultConstraint(string $placeholder): RouteCollectionInterface
-	{
-		if (array_key_exists($placeholder, $this->placeholders))
-		{
-			$this->defaultPlaceholder = $placeholder;
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the default controller. With Namespace.
-	 *
-	 * @return string
-	 */
-	public function getDefaultController(): string
-	{
-		return $this->defaultController;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the default method to use within the controller.
-	 *
-	 * @return string
-	 */
-	public function getDefaultMethod(): string
-	{
-		return $this->defaultMethod;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the default namespace as set in the Routes config file.
-	 *
-	 * @return string
-	 */
-	public function getDefaultNamespace(): string
-	{
-		return $this->defaultNamespace;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current value of the translateURIDashes setting.
-	 *
-	 * @return boolean
-	 */
-	public function shouldTranslateURIDashes(): bool
-	{
-		return $this->translateURIDashes;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the flag that tells whether to autoRoute URI against Controllers.
-	 *
-	 * @return boolean
-	 */
-	public function shouldAutoRoute(): bool
-	{
-		return $this->autoRoute;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the raw array of available routes.
-	 *
-	 * @param string|null $verb
-	 *
-	 * @return array
-	 */
-	public function getRoutes(string $verb = null): array
-	{
-		if (empty($verb))
-		{
-			$verb = $this->getHTTPVerb();
-		}
-
-		// Since this is the entry point for the Router,
-		// take a moment to do any route discovery
-		// we might need to do.
-		$this->discoverRoutes();
-
-		$routes     = [];
-		$collection = [];
-
-		if (isset($this->routes[$verb]))
-		{
-			// Keep current verb's routes at the beginning so they're matched
-			// before any of the generic, "add" routes.
-			if (isset($this->routes['*']))
-			{
-				$extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
-				$collection = array_merge($this->routes[$verb], $extraRules);
-			}
-			foreach ($collection as $r)
-			{
-				$key          = key($r['route']);
-				$routes[$key] = $r['route'][$key];
-			}
-		}
-
-		// sorting routes by priority
-		if ($this->prioritizeDetected && $this->prioritize && $routes !== [])
-		{
-			$order = [];
-
-			foreach ($routes as $key => $value)
-			{
-				$key                    = $key === '/' ? $key : ltrim($key, '/ ');
-				$priority               = $this->getRoutesOptions($key, $verb)['priority'] ?? 0;
-				$order[$priority][$key] = $value;
-			}
-
-			ksort($order);
-			$routes = array_merge(...$order);
-		}
-
-		return $routes;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns one or all routes options
-	 *
-	 * @param string|null $from
-	 * @param string|null $verb
-	 *
-	 * @return array
-	 */
-	public function getRoutesOptions(string $from = null, string $verb = null): array
-	{
-		$options = $this->loadRoutesOptions($verb);
-
-		return $from ? $options[$from] ?? [] : $options;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current HTTP Verb being used.
-	 *
-	 * @return string
-	 */
-	public function getHTTPVerb(): string
-	{
-		return $this->HTTPVerb;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the current HTTP verb.
-	 * Used primarily for testing.
-	 *
-	 * @param string $verb
-	 *
-	 * @return $this
-	 */
-	public function setHTTPVerb(string $verb)
-	{
-		$this->HTTPVerb = $verb;
-
-		return $this;
-	}
-
-	/**
-	 * A shortcut method to add a number of routes at a single time.
-	 * It does not allow any options to be set on the route, or to
-	 * define the method used.
-	 *
-	 * @param array      $routes
-	 * @param array|null $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function map(array $routes = [], array $options = null): RouteCollectionInterface
-	{
-		foreach ($routes as $from => $to)
-		{
-			$this->add($from, $to, $options);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Adds a single route to the collection.
-	 *
-	 * Example:
-	 *      $routes->add('news', 'Posts::index');
-	 *
-	 * @param string       $from
-	 * @param array|string $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function add(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('*', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Adds a temporary redirect from one route to another. Used for
-	 * redirecting traffic from old, non-existing routes to the new
-	 * moved routes.
-	 *
-	 * @param string  $from   The pattern to match against
-	 * @param string  $to     Either a route name or a URI to redirect to
-	 * @param integer $status The HTTP status code that should be returned with this redirect
-	 *
-	 * @return RouteCollection
-	 */
-	public function addRedirect(string $from, string $to, int $status = 302)
-	{
-		// Use the named route's pattern if this is a named route.
-		if (array_key_exists($to, $this->routes['*']))
-		{
-			$to = $this->routes['*'][$to]['route'];
-		}
-		elseif (array_key_exists($to, $this->routes['get']))
-		{
-			$to = $this->routes['get'][$to]['route'];
-		}
-
-		$this->create('*', $from, $to, ['redirect' => $status]);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the route is a redirecting route.
-	 *
-	 * @param string $from
-	 *
-	 * @return boolean
-	 */
-	public function isRedirect(string $from): bool
-	{
-		foreach ($this->routes['*'] as $name => $route)
-		{
-			// Named route?
-			if ($name === $from || key($route['route']) === $from)
-			{
-				return isset($route['redirect']) && is_numeric($route['redirect']);
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the HTTP status code from a redirecting Route.
-	 *
-	 * @param string $from
-	 *
-	 * @return integer
-	 */
-	public function getRedirectCode(string $from): int
-	{
-		foreach ($this->routes['*'] as $name => $route)
-		{
-			// Named route?
-			if ($name === $from || key($route['route']) === $from)
-			{
-				return $route['redirect'] ?? 0;
-			}
-		}
-
-		return 0;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Grouping Routes
-	//--------------------------------------------------------------------
-
-	/**
-	 * Group a series of routes under a single URL segment. This is handy
-	 * for grouping items into an admin area, like:
-	 *
-	 * Example:
-	 *     // Creates route: admin/users
-	 *     $route->group('admin', function() {
-	 *            $route->resource('users');
-	 *     });
-	 *
-	 * @param string         $name      The name to group/prefix the routes with.
-	 * @param array|callable ...$params
-	 *
-	 * @return void
-	 */
-	public function group(string $name, ...$params)
-	{
-		$oldGroup   = $this->group;
-		$oldOptions = $this->currentOptions;
-
-		// To register a route, we'll set a flag so that our router
-		// so it will see the group name.
-		// If the group name is empty, we go on using the previously built group name.
-		$this->group = $name ? ltrim($oldGroup . '/' . $name, '/') : $oldGroup;
-
-		$callback = array_pop($params);
-
-		if ($params && is_array($params[0]))
-		{
-			$this->currentOptions = array_shift($params);
-		}
-
-		if (is_callable($callback))
-		{
-			$callback($this);
-		}
-
-		$this->group          = $oldGroup;
-		$this->currentOptions = $oldOptions;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// HTTP Verb-based routing
-	//--------------------------------------------------------------------
-	// Routing works here because, as the routes Config file is read in,
-	// the various HTTP verb-based routes will only be added to the in-memory
-	// routes if it is a call that should respond to that verb.
-	//
-	// The options array is typically used to pass in an 'as' or var, but may
-	// be expanded in the future. See the docblock for 'add' method above for
-	// current list of globally available options.
-	//
-	/**
-	 * Creates a collections of HTTP-verb based routes for a controller.
-	 *
-	 * Possible Options:
-	 *      'controller'    - Customize the name of the controller used in the 'to' route
-	 *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
-	 *      'websafe'   -	- '1' if only GET and POST HTTP verbs are supported
-	 *
-	 * Example:
-	 *
-	 *      $route->resource('photos');
-	 *
-	 *      // Generates the following routes:
-	 *      HTTP Verb | Path        | Action        | Used for...
-	 *      ----------+-------------+---------------+-----------------
-	 *      GET         /photos             index           an array of photo objects
-	 *      GET         /photos/new         new             an empty photo object, with default properties
-	 *      GET         /photos/{id}/edit   edit            a specific photo object, editable properties
-	 *      GET         /photos/{id}        show            a specific photo object, all properties
-	 *      POST        /photos             create          a new photo object, to add to the resource
-	 *      DELETE      /photos/{id}        delete          deletes the specified photo object
-	 *      PUT/PATCH   /photos/{id}        update          replacement properties for existing photo
-	 *
-	 *  If 'websafe' option is present, the following paths are also available:
-	 *
-	 *      POST		/photos/{id}/delete delete
-	 *      POST        /photos/{id}        update
-	 *
-	 * @param string     $name    The name of the resource/controller to route to.
-	 * @param array|null $options An list of possible ways to customize the routing.
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function resource(string $name, array $options = null): RouteCollectionInterface
-	{
-		// In order to allow customization of the route the
-		// resources are sent to, we need to have a new name
-		// to store the values in.
-		$newName = implode('\\', array_map('ucfirst', explode('/', $name)));
-		// If a new controller is specified, then we replace the
-		// $name value with the name of the new controller.
-		if (isset($options['controller']))
-		{
-			$newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
-		}
-
-		// In order to allow customization of allowed id values
-		// we need someplace to store them.
-		$id = $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
-
-		if (isset($options['placeholder']))
-		{
-			$id = $options['placeholder'];
-		}
-
-		// Make sure we capture back-references
-		$id = '(' . trim($id, '()') . ')';
-
-		$methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'create', 'update', 'delete', 'new', 'edit'];
-
-		if (isset($options['except']))
-		{
-			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
-			foreach ($methods as $i => $method)
-			{
-				if (in_array($method, $options['except'], true))
-				{
-					unset($methods[$i]);
-				}
-			}
-		}
-
-		if (in_array('index', $methods, true))
-		{
-			$this->get($name, $newName . '::index', $options);
-		}
-		if (in_array('new', $methods, true))
-		{
-			$this->get($name . '/new', $newName . '::new', $options);
-		}
-		if (in_array('edit', $methods, true))
-		{
-			$this->get($name . '/' . $id . '/edit', $newName . '::edit/$1', $options);
-		}
-		if (in_array('show', $methods, true))
-		{
-			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
-		}
-		if (in_array('create', $methods, true))
-		{
-			$this->post($name, $newName . '::create', $options);
-		}
-		if (in_array('update', $methods, true))
-		{
-			$this->put($name . '/' . $id, $newName . '::update/$1', $options);
-			$this->patch($name . '/' . $id, $newName . '::update/$1', $options);
-		}
-		if (in_array('delete', $methods, true))
-		{
-			$this->delete($name . '/' . $id, $newName . '::delete/$1', $options);
-		}
-
-		// Web Safe? delete needs checking before update because of method name
-		if (isset($options['websafe']))
-		{
-			if (in_array('delete', $methods, true))
-			{
-				$this->post($name . '/' . $id . '/delete', $newName . '::delete/$1', $options);
-			}
-			if (in_array('update', $methods, true))
-			{
-				$this->post($name . '/' . $id, $newName . '::update/$1', $options);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Creates a collections of HTTP-verb based routes for a presenter controller.
-	 *
-	 * Possible Options:
-	 *      'controller'    - Customize the name of the controller used in the 'to' route
-	 *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
-	 *
-	 * Example:
-	 *
-	 *      $route->presenter('photos');
-	 *
-	 *      // Generates the following routes:
-	 *      HTTP Verb | Path        | Action        | Used for...
-	 *      ----------+-------------+---------------+-----------------
-	 *      GET         /photos             index           showing all array of photo objects
-	 *      GET         /photos/show/{id}   show            showing a specific photo object, all properties
-	 *      GET         /photos/new         new             showing a form for an empty photo object, with default properties
-	 *      POST        /photos/create      create          processing the form for a new photo
-	 *      GET         /photos/edit/{id}   edit            show an editing form for a specific photo object, editable properties
-	 *      POST        /photos/update/{id} update          process the editing form data
-	 *      GET         /photos/remove/{id} remove          show a form to confirm deletion of a specific photo object
-	 *      POST        /photos/delete/{id} delete          deleting the specified photo object
-	 *
-	 * @param string     $name    The name of the controller to route to.
-	 * @param array|null $options An list of possible ways to customize the routing.
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function presenter(string $name, array $options = null): RouteCollectionInterface
-	{
-		// In order to allow customization of the route the
-		// resources are sent to, we need to have a new name
-		// to store the values in.
-		$newName = implode('\\', array_map('ucfirst', explode('/', $name)));
-		// If a new controller is specified, then we replace the
-		// $name value with the name of the new controller.
-		if (isset($options['controller']))
-		{
-			$newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
-		}
-
-		// In order to allow customization of allowed id values
-		// we need someplace to store them.
-		$id = $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
-
-		if (isset($options['placeholder']))
-		{
-			$id = $options['placeholder'];
-		}
-
-		// Make sure we capture back-references
-		$id = '(' . trim($id, '()') . ')';
-
-		$methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'new', 'create', 'edit', 'update', 'remove', 'delete'];
-
-		if (isset($options['except']))
-		{
-			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
-			foreach ($methods as $i => $method)
-			{
-				if (in_array($method, $options['except'], true))
-				{
-					unset($methods[$i]);
-				}
-			}
-		}
-
-		if (in_array('index', $methods, true))
-		{
-			$this->get($name, $newName . '::index', $options);
-		}
-		if (in_array('show', $methods, true))
-		{
-			$this->get($name . '/show/' . $id, $newName . '::show/$1', $options);
-		}
-		if (in_array('new', $methods, true))
-		{
-			$this->get($name . '/new', $newName . '::new', $options);
-		}
-		if (in_array('create', $methods, true))
-		{
-			$this->post($name . '/create', $newName . '::create', $options);
-		}
-		if (in_array('edit', $methods, true))
-		{
-			$this->get($name . '/edit/' . $id, $newName . '::edit/$1', $options);
-		}
-		if (in_array('update', $methods, true))
-		{
-			$this->post($name . '/update/' . $id, $newName . '::update/$1', $options);
-		}
-		if (in_array('remove', $methods, true))
-		{
-			$this->get($name . '/remove/' . $id, $newName . '::remove/$1', $options);
-		}
-		if (in_array('delete', $methods, true))
-		{
-			$this->post($name . '/delete/' . $id, $newName . '::delete/$1', $options);
-		}
-		if (in_array('show', $methods, true))
-		{
-			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
-		}
-		if (in_array('create', $methods, true))
-		{
-			$this->post($name, $newName . '::create', $options);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a single route to match for multiple HTTP Verbs.
-	 *
-	 * Example:
-	 *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
-	 *
-	 * @param array        $verbs
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function match(array $verbs = [], string $from = '', $to = '', array $options = null): RouteCollectionInterface
-	{
-		if (empty($from) || empty($to))
-		{
-			throw new InvalidArgumentException('You must supply the parameters: from, to.');
-		}
-
-		foreach ($verbs as $verb)
-		{
-			$verb = strtolower($verb);
-
-			$this->{$verb}($from, $to, $options);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to GET requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function get(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('get', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to POST requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function post(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('post', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to PUT requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function put(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('put', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to DELETE requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function delete(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('delete', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to HEAD requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function head(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('head', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to PATCH requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function patch(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('patch', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to OPTIONS requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function options(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('options', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Specifies a route that is only available to command-line requests.
-	 *
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function cli(string $from, $to, array $options = null): RouteCollectionInterface
-	{
-		$this->create('cli', $from, $to, $options);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Limits the routes to a specified ENVIRONMENT or they won't run.
-	 *
-	 * @param string  $env
-	 * @param Closure $callback
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function environment(string $env, Closure $callback): RouteCollectionInterface
-	{
-		if (ENVIRONMENT === $env)
-		{
-			$callback($this);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to look up a route based on its destination.
-	 *
-	 * If a route exists:
-	 *
-	 *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
-	 *
-	 * This method allows you to know the Controller and method
-	 * and get the route that leads to it.
-	 *
-	 *      // Equals 'path/$param1/$param2'
-	 *      reverseRoute('Controller::method', $param1, $param2);
-	 *
-	 * @param string $search
-	 * @param mixed  ...$params
-	 *
-	 * @return string|false
-	 */
-	public function reverseRoute(string $search, ...$params)
-	{
-		// Named routes get higher priority.
-		foreach ($this->routes as $collection)
-		{
-			if (array_key_exists($search, $collection))
-			{
-				$route = $this->fillRouteParams(key($collection[$search]['route']), $params);
-				return $this->localizeRoute($route);
-			}
-		}
-
-		// If it's not a named route, then loop over
-		// all routes to find a match.
-		foreach ($this->routes as $collection)
-		{
-			foreach ($collection as $route)
-			{
-				$from = key($route['route']);
-				$to   = $route['route'][$from];
-
-				// ignore closures
-				if (! is_string($to))
-				{
-					continue;
-				}
-
-				// Lose any namespace slash at beginning of strings
-				// to ensure more consistent match.
-				$to     = ltrim($to, '\\');
-				$search = ltrim($search, '\\');
-
-				// If there's any chance of a match, then it will
-				// be with $search at the beginning of the $to string.
-				if (strpos($to, $search) !== 0)
-				{
-					continue;
-				}
-
-				// Ensure that the number of $params given here
-				// matches the number of back-references in the route
-				if (substr_count($to, '$') !== count($params))
-				{
-					continue;
-				}
-
-				$route = $this->fillRouteParams($from, $params);
-				return $this->localizeRoute($route);
-			}
-		}
-
-		// If we're still here, then we did not find a match.
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replaces the {locale} tag with the current application locale
-	 *
-	 * @param string $route
-	 *
-	 * @return string
-	 */
-	protected function localizeRoute(string $route) :string
-	{
-		return strtr($route, ['{locale}' => Services::request()->getLocale()]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks a route (using the "from") to see if it's filtered or not.
-	 *
-	 * @param string      $search
-	 * @param string|null $verb
-	 *
-	 * @return boolean
-	 */
-	public function isFiltered(string $search, string $verb = null): bool
-	{
-		$options = $this->loadRoutesOptions($verb);
-
-		return isset($options[$search]['filter']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the filter that should be applied for a single route, along
-	 * with any parameters it might have. Parameters are found by splitting
-	 * the parameter name on a colon to separate the filter name from the parameter list,
-	 * and the splitting the result on commas. So:
-	 *
-	 *    'role:admin,manager'
-	 *
-	 * has a filter of "role", with parameters of ['admin', 'manager'].
-	 *
-	 * @param string      $search
-	 * @param string|null $verb
-	 *
-	 * @return string
-	 */
-	public function getFilterForRoute(string $search, string $verb = null): string
-	{
-		$options = $this->loadRoutesOptions($verb);
-
-		return $options[$search]['filter'] ?? '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given a
-	 *
-	 * @param string     $from
-	 * @param array|null $params
-	 *
-	 * @return string
-	 * @throws RouterException
-	 */
-	protected function fillRouteParams(string $from, array $params = null): string
-	{
-		// Find all of our back-references in the original route
-		preg_match_all('/\(([^)]+)\)/', $from, $matches);
-
-		if (empty($matches[0]))
-		{
-			return '/' . ltrim($from, '/');
-		}
-
-		// Build our resulting string, inserting the $params in
-		// the appropriate places.
-		foreach ($matches[0] as $index => $pattern)
-		{
-			if (! preg_match('#^' . $pattern . '$#u', $params[$index]))
-			{
-				throw RouterException::forInvalidParameterType();
-			}
-
-			// Ensure that the param we're inserting matches
-			// the expected param type.
-			$pos  = strpos($from, $pattern);
-			$from = substr_replace($from, $params[$index], $pos, strlen($pattern));
-		}
-
-		return '/' . ltrim($from, '/');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does the heavy lifting of creating an actual route. You must specify
-	 * the request method(s) that this route will work for. They can be separated
-	 * by a pipe character "|" if there is more than one.
-	 *
-	 * @param string       $verb
-	 * @param string       $from
-	 * @param string|array $to
-	 * @param array|null   $options
-	 */
-	protected function create(string $verb, string $from, $to, array $options = null)
-	{
-		$overwrite = false;
-		$prefix    = is_null($this->group) ? '' : $this->group . '/';
-
-		$from = filter_var($prefix . $from, FILTER_SANITIZE_STRING);
-
-		// While we want to add a route within a group of '/',
-		// it doesn't work with matching, so remove them...
-		if ($from !== '/')
-		{
-			$from = trim($from, '/');
-		}
-
-		$options = array_merge($this->currentOptions ?? [], $options ?? []);
-
-		// Route priority detect
-		if (isset($options['priority']))
-		{
-			$options['priority'] = abs((int) $options['priority']);
-
-			if ($options['priority'] > 0)
-			{
-				$this->prioritizeDetected = true;
-			}
-		}
-
-		// Hostname limiting?
-		if (! empty($options['hostname']))
-		{
-			// @todo determine if there's a way to whitelist hosts?
-			if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname']))
-			{
-				return;
-			}
-
-			$overwrite = true;
-		}
-
-		// Limiting to subdomains?
-		elseif (! empty($options['subdomain']))
-		{
-			// If we don't match the current subdomain, then
-			// we don't need to add the route.
-			if (! $this->checkSubdomains($options['subdomain']))
-			{
-				return;
-			}
-
-			$overwrite = true;
-		}
-
-		// Are we offsetting the binds?
-		// If so, take care of them here in one
-		// fell swoop.
-		if (isset($options['offset']) && is_string($to))
-		{
-			// Get a constant string to work with.
-			$to = preg_replace('/(\$\d+)/', '$X', $to);
-
-			for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i ++)
-			{
-				$to = preg_replace_callback(
-						'/\$X/', function ($m) use ($i) {
-							return '$' . $i;
-						}, $to, 1
-				);
-			}
-		}
-
-		// Replace our regex pattern placeholders with the actual thing
-		// so that the Router doesn't need to know about any of this.
-		foreach ($this->placeholders as $tag => $pattern)
-		{
-			$from = str_ireplace(':' . $tag, $pattern, $from);
-		}
-
-		//If is redirect, No processing
-		if (! isset($options['redirect']) && is_string($to))
-		{
-			// If no namespace found, add the default namespace
-			if (strpos($to, '\\') === false || strpos($to, '\\') > 0)
-				{
-					$namespace = $options['namespace'] ?? $this->defaultNamespace;
-					$to        = trim($namespace, '\\') . '\\' . $to;
-			}
-			// Always ensure that we escape our namespace so we're not pointing to
-			// \CodeIgniter\Routes\Controller::method.
-			$to = '\\' . ltrim($to, '\\');
-		}
-
-		$name = $options['as'] ?? $from;
-
-		// Don't overwrite any existing 'froms' so that auto-discovered routes
-		// do not overwrite any app/Config/Routes settings. The app
-		// routes should always be the "source of truth".
-		// this works only because discovered routes are added just prior
-		// to attempting to route the request.
-		if (isset($this->routes[$verb][$name]) && ! $overwrite)
-		{
-			return;
-		}
-
-		$this->routes[$verb][$name] = [
-			'route' => [$from => $to],
-		];
-
-		$this->routesOptions[$verb][$from] = $options;
-
-		// Is this a redirect?
-		if (isset($options['redirect']) && is_numeric($options['redirect']))
-		{
-			$this->routes['*'][$name]['redirect'] = $options['redirect'];
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compares the subdomain(s) passed in against the current subdomain
-	 * on this page request.
-	 *
-	 * @param mixed $subdomains
-	 *
-	 * @return boolean
-	 */
-	private function checkSubdomains($subdomains): bool
-	{
-		// CLI calls can't be on subdomain.
-		if (! isset($_SERVER['HTTP_HOST']))
-		{
-			return false;
-		}
-
-		if (is_null($this->currentSubdomain))
-		{
-			$this->currentSubdomain = $this->determineCurrentSubdomain();
-		}
-
-		if (! is_array($subdomains))
-		{
-			$subdomains = [$subdomains];
-		}
-
-		// Routes can be limited to any sub-domain. In that case, though,
-		// it does require a sub-domain to be present.
-		if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true))
-		{
-			return true;
-		}
-
-		return in_array($this->currentSubdomain, $subdomains, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Examines the HTTP_HOST to get a best match for the subdomain. It
-	 * won't be perfect, but should work for our needs.
-	 *
-	 * It's especially not perfect since it's possible to register a domain
-	 * with a period (.) as part of the domain name.
-	 *
-	 * @return mixed
-	 */
-	private function determineCurrentSubdomain()
-	{
-		// We have to ensure that a scheme exists
-		// on the URL else parse_url will mis-interpret
-		// 'host' as the 'path'.
-		$url = $_SERVER['HTTP_HOST'];
-		if (strpos($url, 'http') !== 0)
-		{
-			$url = 'http://' . $url;
-		}
-
-		$parsedUrl = parse_url($url);
-
-		$host = explode('.', $parsedUrl['host']);
-
-		if ($host[0] === 'www')
-		{
-			unset($host[0]);
-		}
-
-		// Get rid of any domains, which will be the last
-		unset($host[count($host)]);
-
-		// Account for .co.uk, .co.nz, etc. domains
-		if (end($host) === 'co')
-		{
-			$host = array_slice($host, 0, -1);
-		}
-
-		// If we only have 1 part left, then we don't have a sub-domain.
-		if (count($host) === 1)
-		{
-			// Set it to false so we don't make it back here again.
-			return false;
-		}
-
-		return array_shift($host);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset the routes, so that a test case can provide the
-	 * explicit ones needed for it.
-	 */
-	public function resetRoutes()
-	{
-		$this->routes = ['*' => []];
-		foreach ($this->defaultHTTPMethods as $verb)
-		{
-			$this->routes[$verb] = [];
-		}
-
-		$this->prioritizeDetected = false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Load routes options based on verb
-	 *
-	 * @param string|null $verb
-	 *
-	 * @return array
-	 */
-	protected function loadRoutesOptions(string $verb = null): array
-	{
-		$verb = $verb ?: $this->getHTTPVerb();
-
-		$options = $this->routesOptions[$verb] ?? [];
-
-		if (isset($this->routesOptions['*']))
-		{
-			foreach ($this->routesOptions['*'] as $key => $val)
-			{
-				if (isset($options[$key]))
-				{
-					$extraOptions  = array_diff_key($val, $options[$key]);
-					$options[$key] = array_merge($options[$key], $extraOptions);
-				}
-				else
-				{
-					$options[$key] = $val;
-				}
-			}
-		}
-
-		return $options;
-	}
-
-	/**
-	 * Enable or Disable sorting routes by priority
-	 *
-	 * @param boolean $enabled The value status
-	 *
-	 * @return $this
-	 */
-	public function setPrioritize(bool $enabled = true)
-	{
-		$this->prioritize = $enabled;
-
-		return $this;
-	}
+    /**
+     * The namespace to be added to any Controllers.
+     * Defaults to the global namespaces (\)
+     *
+     * @var string
+     */
+    protected $defaultNamespace = '\\';
+
+    /**
+     * The name of the default controller to use
+     * when no other controller is specified.
+     *
+     * Not used here. Pass-thru value for Router class.
+     *
+     * @var string
+     */
+    protected $defaultController = 'Home';
+
+    /**
+     * The name of the default method to use
+     * when no other method has been specified.
+     *
+     * Not used here. Pass-thru value for Router class.
+     *
+     * @var string
+     */
+    protected $defaultMethod = 'index';
+
+    /**
+     * The placeholder used when routing 'resources'
+     * when no other placeholder has been specified.
+     *
+     * @var string
+     */
+    protected $defaultPlaceholder = 'any';
+
+    /**
+     * Whether to convert dashes to underscores in URI.
+     *
+     * Not used here. Pass-thru value for Router class.
+     *
+     * @var bool
+     */
+    protected $translateURIDashes = false;
+
+    /**
+     * Whether to match URI against Controllers
+     * when it doesn't match defined routes.
+     *
+     * Not used here. Pass-thru value for Router class.
+     *
+     * @var bool
+     */
+    protected $autoRoute = true;
+
+    /**
+     * A callable that will be shown
+     * when the route cannot be matched.
+     *
+     * @var Closure|string
+     */
+    protected $override404;
+
+    /**
+     * Defined placeholders that can be used
+     * within the
+     *
+     * @var array
+     */
+    protected $placeholders = [
+        'any'      => '.*',
+        'segment'  => '[^/]+',
+        'alphanum' => '[a-zA-Z0-9]+',
+        'num'      => '[0-9]+',
+        'alpha'    => '[a-zA-Z]+',
+        'hash'     => '[^/]+',
+    ];
+
+    /**
+     * An array of all routes and their mappings.
+     *
+     * @var array
+     */
+    protected $routes = [
+        '*'       => [],
+        'options' => [],
+        'get'     => [],
+        'head'    => [],
+        'post'    => [],
+        'put'     => [],
+        'delete'  => [],
+        'trace'   => [],
+        'connect' => [],
+        'cli'     => [],
+    ];
+
+    /**
+     * Array of routes options
+     *
+     * @var array
+     */
+    protected $routesOptions = [];
+
+    /**
+     * The current method that the script is being called by.
+     *
+     * @var string
+     */
+    protected $HTTPVerb = '*';
+
+    /**
+     * The default list of HTTP methods (and CLI for command line usage)
+     * that is allowed if no other method is provided.
+     *
+     * @var array
+     */
+    protected $defaultHTTPMethods = [
+        'options',
+        'get',
+        'head',
+        'post',
+        'put',
+        'delete',
+        'trace',
+        'connect',
+        'cli',
+    ];
+
+    /**
+     * The name of the current group, if any.
+     *
+     * @var string|null
+     */
+    protected $group;
+
+    /**
+     * The current subdomain.
+     *
+     * @var string|null
+     */
+    protected $currentSubdomain;
+
+    /**
+     * Stores copy of current options being
+     * applied during creation.
+     *
+     * @var array|null
+     */
+    protected $currentOptions;
+
+    /**
+     * A little performance booster.
+     *
+     * @var bool
+     */
+    protected $didDiscover = false;
+
+    /**
+     * Handle to the file locator to use.
+     *
+     * @var FileLocator
+     */
+    protected $fileLocator;
+
+    /**
+     * Handle to the modules config.
+     *
+     * @var Modules
+     */
+    protected $moduleConfig;
+
+    /**
+     * Flag for sorting routes by priority.
+     *
+     * @var bool
+     */
+    protected $prioritize = false;
+
+    /**
+     * Route priority detection flag.
+     *
+     * @var bool
+     */
+    protected $prioritizeDetected = false;
+
+    /**
+     * Constructor
+     */
+    public function __construct(FileLocator $locator, Modules $moduleConfig)
+    {
+        $this->fileLocator  = $locator;
+        $this->moduleConfig = $moduleConfig;
+    }
+
+    /**
+     * Registers a new constraint with the system. Constraints are used
+     * by the routes as placeholders for regular expressions to make defining
+     * the routes more human-friendly.
+     *
+     * You can pass an associative array as $placeholder, and have
+     * multiple placeholders added at once.
+     *
+     * @param array|string $placeholder
+     */
+    public function addPlaceholder($placeholder, ?string $pattern = null): RouteCollectionInterface
+    {
+        if (! is_array($placeholder)) {
+            $placeholder = [$placeholder => $pattern];
+        }
+
+        $this->placeholders = array_merge($this->placeholders, $placeholder);
+
+        return $this;
+    }
+
+    /**
+     * Sets the default namespace to use for Controllers when no other
+     * namespace has been specified.
+     */
+    public function setDefaultNamespace(string $value): RouteCollectionInterface
+    {
+        $this->defaultNamespace = esc(strip_tags($value));
+        $this->defaultNamespace = rtrim($this->defaultNamespace, '\\') . '\\';
+
+        return $this;
+    }
+
+    /**
+     * Sets the default controller to use when no other controller has been
+     * specified.
+     */
+    public function setDefaultController(string $value): RouteCollectionInterface
+    {
+        $this->defaultController = esc(strip_tags($value));
+
+        return $this;
+    }
+
+    /**
+     * Sets the default method to call on the controller when no other
+     * method has been set in the route.
+     */
+    public function setDefaultMethod(string $value): RouteCollectionInterface
+    {
+        $this->defaultMethod = esc(strip_tags($value));
+
+        return $this;
+    }
+
+    /**
+     * Tells the system whether to convert dashes in URI strings into
+     * underscores. In some search engines, including Google, dashes
+     * create more meaning and make it easier for the search engine to
+     * find words and meaning in the URI for better SEO. But it
+     * doesn't work well with PHP method names....
+     */
+    public function setTranslateURIDashes(bool $value): RouteCollectionInterface
+    {
+        $this->translateURIDashes = $value;
+
+        return $this;
+    }
+
+    /**
+     * If TRUE, the system will attempt to match the URI against
+     * Controllers by matching each segment against folders/files
+     * in APPPATH/Controllers, when a match wasn't found against
+     * defined routes.
+     *
+     * If FALSE, will stop searching and do NO automatic routing.
+     */
+    public function setAutoRoute(bool $value): RouteCollectionInterface
+    {
+        $this->autoRoute = $value;
+
+        return $this;
+    }
+
+    /**
+     * Sets the class/method that should be called if routing doesn't
+     * find a match. It can be either a closure or the controller/method
+     * name exactly like a route is defined: Users::index
+     *
+     * This setting is passed to the Router class and handled there.
+     *
+     * @param callable|null $callable
+     */
+    public function set404Override($callable = null): RouteCollectionInterface
+    {
+        $this->override404 = $callable;
+
+        return $this;
+    }
+
+    /**
+     * Returns the 404 Override setting, which can be null, a closure
+     * or the controller/string.
+     *
+     * @return Closure|string|null
+     */
+    public function get404Override()
+    {
+        return $this->override404;
+    }
+
+    /**
+     * Will attempt to discover any additional routes, either through
+     * the local PSR4 namespaces, or through selected Composer packages.
+     */
+    protected function discoverRoutes()
+    {
+        if ($this->didDiscover) {
+            return;
+        }
+
+        // We need this var in local scope
+        // so route files can access it.
+        $routes = $this;
+
+        if ($this->moduleConfig->shouldDiscover('routes')) {
+            $files = $this->fileLocator->search('Config/Routes.php');
+
+            foreach ($files as $file) {
+                // Don't include our main file again...
+                if ($file === APPPATH . 'Config/Routes.php') {
+                    continue;
+                }
+
+                include $file;
+            }
+        }
+
+        $this->didDiscover = true;
+    }
+
+    /**
+     * Sets the default constraint to be used in the system. Typically
+     * for use with the 'resource' method.
+     */
+    public function setDefaultConstraint(string $placeholder): RouteCollectionInterface
+    {
+        if (array_key_exists($placeholder, $this->placeholders)) {
+            $this->defaultPlaceholder = $placeholder;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the name of the default controller. With Namespace.
+     */
+    public function getDefaultController(): string
+    {
+        return $this->defaultController;
+    }
+
+    /**
+     * Returns the name of the default method to use within the controller.
+     */
+    public function getDefaultMethod(): string
+    {
+        return $this->defaultMethod;
+    }
+
+    /**
+     * Returns the default namespace as set in the Routes config file.
+     */
+    public function getDefaultNamespace(): string
+    {
+        return $this->defaultNamespace;
+    }
+
+    /**
+     * Returns the current value of the translateURIDashes setting.
+     */
+    public function shouldTranslateURIDashes(): bool
+    {
+        return $this->translateURIDashes;
+    }
+
+    /**
+     * Returns the flag that tells whether to autoRoute URI against Controllers.
+     */
+    public function shouldAutoRoute(): bool
+    {
+        return $this->autoRoute;
+    }
+
+    /**
+     * Returns the raw array of available routes.
+     */
+    public function getRoutes(?string $verb = null): array
+    {
+        if (empty($verb)) {
+            $verb = $this->getHTTPVerb();
+        }
+
+        // Since this is the entry point for the Router,
+        // take a moment to do any route discovery
+        // we might need to do.
+        $this->discoverRoutes();
+
+        $routes     = [];
+        $collection = [];
+
+        if (isset($this->routes[$verb])) {
+            // Keep current verb's routes at the beginning so they're matched
+            // before any of the generic, "add" routes.
+            if (isset($this->routes['*'])) {
+                $extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
+                $collection = array_merge($this->routes[$verb], $extraRules);
+            }
+
+            foreach ($collection as $r) {
+                $key          = key($r['route']);
+                $routes[$key] = $r['route'][$key];
+            }
+        }
+
+        // sorting routes by priority
+        if ($this->prioritizeDetected && $this->prioritize && $routes !== []) {
+            $order = [];
+
+            foreach ($routes as $key => $value) {
+                $key                    = $key === '/' ? $key : ltrim($key, '/ ');
+                $priority               = $this->getRoutesOptions($key, $verb)['priority'] ?? 0;
+                $order[$priority][$key] = $value;
+            }
+
+            ksort($order);
+            $routes = array_merge(...$order);
+        }
+
+        return $routes;
+    }
+
+    /**
+     * Returns one or all routes options
+     */
+    public function getRoutesOptions(?string $from = null, ?string $verb = null): array
+    {
+        $options = $this->loadRoutesOptions($verb);
+
+        return $from ? $options[$from] ?? [] : $options;
+    }
+
+    /**
+     * Returns the current HTTP Verb being used.
+     */
+    public function getHTTPVerb(): string
+    {
+        return $this->HTTPVerb;
+    }
+
+    /**
+     * Sets the current HTTP verb.
+     * Used primarily for testing.
+     *
+     * @return $this
+     */
+    public function setHTTPVerb(string $verb)
+    {
+        $this->HTTPVerb = $verb;
+
+        return $this;
+    }
+
+    /**
+     * A shortcut method to add a number of routes at a single time.
+     * It does not allow any options to be set on the route, or to
+     * define the method used.
+     */
+    public function map(array $routes = [], ?array $options = null): RouteCollectionInterface
+    {
+        foreach ($routes as $from => $to) {
+            $this->add($from, $to, $options);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a single route to the collection.
+     *
+     * Example:
+     *      $routes->add('news', 'Posts::index');
+     *
+     * @param array|string $to
+     */
+    public function add(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('*', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Adds a temporary redirect from one route to another. Used for
+     * redirecting traffic from old, non-existing routes to the new
+     * moved routes.
+     *
+     * @param string $from   The pattern to match against
+     * @param string $to     Either a route name or a URI to redirect to
+     * @param int    $status The HTTP status code that should be returned with this redirect
+     *
+     * @return RouteCollection
+     */
+    public function addRedirect(string $from, string $to, int $status = 302)
+    {
+        // Use the named route's pattern if this is a named route.
+        if (array_key_exists($to, $this->routes['*'])) {
+            $to = $this->routes['*'][$to]['route'];
+        } elseif (array_key_exists($to, $this->routes['get'])) {
+            $to = $this->routes['get'][$to]['route'];
+        }
+
+        $this->create('*', $from, $to, ['redirect' => $status]);
+
+        return $this;
+    }
+
+    /**
+     * Determines if the route is a redirecting route.
+     */
+    public function isRedirect(string $from): bool
+    {
+        foreach ($this->routes['*'] as $name => $route) {
+            // Named route?
+            if ($name === $from || key($route['route']) === $from) {
+                return isset($route['redirect']) && is_numeric($route['redirect']);
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Grabs the HTTP status code from a redirecting Route.
+     */
+    public function getRedirectCode(string $from): int
+    {
+        foreach ($this->routes['*'] as $name => $route) {
+            // Named route?
+            if ($name === $from || key($route['route']) === $from) {
+                return $route['redirect'] ?? 0;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Group a series of routes under a single URL segment. This is handy
+     * for grouping items into an admin area, like:
+     *
+     * Example:
+     *     // Creates route: admin/users
+     *     $route->group('admin', function() {
+     *            $route->resource('users');
+     *     });
+     *
+     * @param string         $name      The name to group/prefix the routes with.
+     * @param array|callable ...$params
+     */
+    public function group(string $name, ...$params)
+    {
+        $oldGroup   = $this->group;
+        $oldOptions = $this->currentOptions;
+
+        // To register a route, we'll set a flag so that our router
+        // so it will see the group name.
+        // If the group name is empty, we go on using the previously built group name.
+        $this->group = $name ? ltrim($oldGroup . '/' . $name, '/') : $oldGroup;
+
+        $callback = array_pop($params);
+
+        if ($params && is_array($params[0])) {
+            $this->currentOptions = array_shift($params);
+        }
+
+        if (is_callable($callback)) {
+            $callback($this);
+        }
+
+        $this->group          = $oldGroup;
+        $this->currentOptions = $oldOptions;
+    }
+
+    /*
+     * --------------------------------------------------------------------
+     *  HTTP Verb-based routing
+     * --------------------------------------------------------------------
+     * Routing works here because, as the routes Config file is read in,
+     * the various HTTP verb-based routes will only be added to the in-memory
+     * routes if it is a call that should respond to that verb.
+     *
+     * The options array is typically used to pass in an 'as' or var, but may
+     * be expanded in the future. See the docblock for 'add' method above for
+     * current list of globally available options.
+     */
+
+    /**
+     * Creates a collections of HTTP-verb based routes for a controller.
+     *
+     * Possible Options:
+     *      'controller'    - Customize the name of the controller used in the 'to' route
+     *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
+     *      'websafe'   -	- '1' if only GET and POST HTTP verbs are supported
+     *
+     * Example:
+     *
+     *      $route->resource('photos');
+     *
+     *      // Generates the following routes:
+     *      HTTP Verb | Path        | Action        | Used for...
+     *      ----------+-------------+---------------+-----------------
+     *      GET         /photos             index           an array of photo objects
+     *      GET         /photos/new         new             an empty photo object, with default properties
+     *      GET         /photos/{id}/edit   edit            a specific photo object, editable properties
+     *      GET         /photos/{id}        show            a specific photo object, all properties
+     *      POST        /photos             create          a new photo object, to add to the resource
+     *      DELETE      /photos/{id}        delete          deletes the specified photo object
+     *      PUT/PATCH   /photos/{id}        update          replacement properties for existing photo
+     *
+     *  If 'websafe' option is present, the following paths are also available:
+     *
+     *      POST		/photos/{id}/delete delete
+     *      POST        /photos/{id}        update
+     *
+     * @param string     $name    The name of the resource/controller to route to.
+     * @param array|null $options An list of possible ways to customize the routing.
+     */
+    public function resource(string $name, ?array $options = null): RouteCollectionInterface
+    {
+        // In order to allow customization of the route the
+        // resources are sent to, we need to have a new name
+        // to store the values in.
+        $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+        // If a new controller is specified, then we replace the
+        // $name value with the name of the new controller.
+        if (isset($options['controller'])) {
+            $newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+        }
+
+        // In order to allow customization of allowed id values
+        // we need someplace to store them.
+        $id = $options['placeholder'] ?? $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
+
+        // Make sure we capture back-references
+        $id = '(' . trim($id, '()') . ')';
+
+        $methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'create', 'update', 'delete', 'new', 'edit'];
+
+        if (isset($options['except'])) {
+            $options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
+
+            foreach ($methods as $i => $method) {
+                if (in_array($method, $options['except'], true)) {
+                    unset($methods[$i]);
+                }
+            }
+        }
+
+        if (in_array('index', $methods, true)) {
+            $this->get($name, $newName . '::index', $options);
+        }
+        if (in_array('new', $methods, true)) {
+            $this->get($name . '/new', $newName . '::new', $options);
+        }
+        if (in_array('edit', $methods, true)) {
+            $this->get($name . '/' . $id . '/edit', $newName . '::edit/$1', $options);
+        }
+        if (in_array('show', $methods, true)) {
+            $this->get($name . '/' . $id, $newName . '::show/$1', $options);
+        }
+        if (in_array('create', $methods, true)) {
+            $this->post($name, $newName . '::create', $options);
+        }
+        if (in_array('update', $methods, true)) {
+            $this->put($name . '/' . $id, $newName . '::update/$1', $options);
+            $this->patch($name . '/' . $id, $newName . '::update/$1', $options);
+        }
+        if (in_array('delete', $methods, true)) {
+            $this->delete($name . '/' . $id, $newName . '::delete/$1', $options);
+        }
+
+        // Web Safe? delete needs checking before update because of method name
+        if (isset($options['websafe'])) {
+            if (in_array('delete', $methods, true)) {
+                $this->post($name . '/' . $id . '/delete', $newName . '::delete/$1', $options);
+            }
+            if (in_array('update', $methods, true)) {
+                $this->post($name . '/' . $id, $newName . '::update/$1', $options);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Creates a collections of HTTP-verb based routes for a presenter controller.
+     *
+     * Possible Options:
+     *      'controller'    - Customize the name of the controller used in the 'to' route
+     *      'placeholder'   - The regex used by the Router. Defaults to '(:any)'
+     *
+     * Example:
+     *
+     *      $route->presenter('photos');
+     *
+     *      // Generates the following routes:
+     *      HTTP Verb | Path        | Action        | Used for...
+     *      ----------+-------------+---------------+-----------------
+     *      GET         /photos             index           showing all array of photo objects
+     *      GET         /photos/show/{id}   show            showing a specific photo object, all properties
+     *      GET         /photos/new         new             showing a form for an empty photo object, with default properties
+     *      POST        /photos/create      create          processing the form for a new photo
+     *      GET         /photos/edit/{id}   edit            show an editing form for a specific photo object, editable properties
+     *      POST        /photos/update/{id} update          process the editing form data
+     *      GET         /photos/remove/{id} remove          show a form to confirm deletion of a specific photo object
+     *      POST        /photos/delete/{id} delete          deleting the specified photo object
+     *
+     * @param string     $name    The name of the controller to route to.
+     * @param array|null $options An list of possible ways to customize the routing.
+     */
+    public function presenter(string $name, ?array $options = null): RouteCollectionInterface
+    {
+        // In order to allow customization of the route the
+        // resources are sent to, we need to have a new name
+        // to store the values in.
+        $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+        // If a new controller is specified, then we replace the
+        // $name value with the name of the new controller.
+        if (isset($options['controller'])) {
+            $newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+        }
+
+        // In order to allow customization of allowed id values
+        // we need someplace to store them.
+        $id = $options['placeholder'] ?? $this->placeholders[$this->defaultPlaceholder] ?? '(:segment)';
+
+        // Make sure we capture back-references
+        $id = '(' . trim($id, '()') . ')';
+
+        $methods = isset($options['only']) ? (is_string($options['only']) ? explode(',', $options['only']) : $options['only']) : ['index', 'show', 'new', 'create', 'edit', 'update', 'remove', 'delete'];
+
+        if (isset($options['except'])) {
+            $options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
+
+            foreach ($methods as $i => $method) {
+                if (in_array($method, $options['except'], true)) {
+                    unset($methods[$i]);
+                }
+            }
+        }
+
+        if (in_array('index', $methods, true)) {
+            $this->get($name, $newName . '::index', $options);
+        }
+        if (in_array('show', $methods, true)) {
+            $this->get($name . '/show/' . $id, $newName . '::show/$1', $options);
+        }
+        if (in_array('new', $methods, true)) {
+            $this->get($name . '/new', $newName . '::new', $options);
+        }
+        if (in_array('create', $methods, true)) {
+            $this->post($name . '/create', $newName . '::create', $options);
+        }
+        if (in_array('edit', $methods, true)) {
+            $this->get($name . '/edit/' . $id, $newName . '::edit/$1', $options);
+        }
+        if (in_array('update', $methods, true)) {
+            $this->post($name . '/update/' . $id, $newName . '::update/$1', $options);
+        }
+        if (in_array('remove', $methods, true)) {
+            $this->get($name . '/remove/' . $id, $newName . '::remove/$1', $options);
+        }
+        if (in_array('delete', $methods, true)) {
+            $this->post($name . '/delete/' . $id, $newName . '::delete/$1', $options);
+        }
+        if (in_array('show', $methods, true)) {
+            $this->get($name . '/' . $id, $newName . '::show/$1', $options);
+        }
+        if (in_array('create', $methods, true)) {
+            $this->post($name, $newName . '::create', $options);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Specifies a single route to match for multiple HTTP Verbs.
+     *
+     * Example:
+     *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
+     *
+     * @param array|string $to
+     */
+    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
+    {
+        if (empty($from) || empty($to)) {
+            throw new InvalidArgumentException('You must supply the parameters: from, to.');
+        }
+
+        foreach ($verbs as $verb) {
+            $verb = strtolower($verb);
+
+            $this->{$verb}($from, $to, $options);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to GET requests.
+     *
+     * @param array|string $to
+     */
+    public function get(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('get', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to POST requests.
+     *
+     * @param array|string $to
+     */
+    public function post(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('post', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to PUT requests.
+     *
+     * @param array|string $to
+     */
+    public function put(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('put', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to DELETE requests.
+     *
+     * @param array|string $to
+     */
+    public function delete(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('delete', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to HEAD requests.
+     *
+     * @param array|string $to
+     */
+    public function head(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('head', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to PATCH requests.
+     *
+     * @param array|string $to
+     */
+    public function patch(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('patch', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to OPTIONS requests.
+     *
+     * @param array|string $to
+     */
+    public function options(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('options', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a route that is only available to command-line requests.
+     *
+     * @param array|string $to
+     */
+    public function cli(string $from, $to, ?array $options = null): RouteCollectionInterface
+    {
+        $this->create('cli', $from, $to, $options);
+
+        return $this;
+    }
+
+    /**
+     * Limits the routes to a specified ENVIRONMENT or they won't run.
+     */
+    public function environment(string $env, Closure $callback): RouteCollectionInterface
+    {
+        if ($env === ENVIRONMENT) {
+            $callback($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Attempts to look up a route based on its destination.
+     *
+     * If a route exists:
+     *
+     *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
+     *
+     * This method allows you to know the Controller and method
+     * and get the route that leads to it.
+     *
+     *      // Equals 'path/$param1/$param2'
+     *      reverseRoute('Controller::method', $param1, $param2);
+     *
+     * @param mixed ...$params
+     *
+     * @return false|string
+     */
+    public function reverseRoute(string $search, ...$params)
+    {
+        // Named routes get higher priority.
+        foreach ($this->routes as $collection) {
+            if (array_key_exists($search, $collection)) {
+                $route = $this->fillRouteParams(key($collection[$search]['route']), $params);
+
+                return $this->localizeRoute($route);
+            }
+        }
+
+        // If it's not a named route, then loop over
+        // all routes to find a match.
+        foreach ($this->routes as $collection) {
+            foreach ($collection as $route) {
+                $from = key($route['route']);
+                $to   = $route['route'][$from];
+
+                // ignore closures
+                if (! is_string($to)) {
+                    continue;
+                }
+
+                // Lose any namespace slash at beginning of strings
+                // to ensure more consistent match.
+                $to     = ltrim($to, '\\');
+                $search = ltrim($search, '\\');
+
+                // If there's any chance of a match, then it will
+                // be with $search at the beginning of the $to string.
+                if (strpos($to, $search) !== 0) {
+                    continue;
+                }
+
+                // Ensure that the number of $params given here
+                // matches the number of back-references in the route
+                if (substr_count($to, '$') !== count($params)) {
+                    continue;
+                }
+
+                $route = $this->fillRouteParams($from, $params);
+
+                return $this->localizeRoute($route);
+            }
+        }
+
+        // If we're still here, then we did not find a match.
+        return false;
+    }
+
+    /**
+     * Replaces the {locale} tag with the current application locale
+     */
+    protected function localizeRoute(string $route): string
+    {
+        return strtr($route, ['{locale}' => Services::request()->getLocale()]);
+    }
+
+    /**
+     * Checks a route (using the "from") to see if it's filtered or not.
+     */
+    public function isFiltered(string $search, ?string $verb = null): bool
+    {
+        $options = $this->loadRoutesOptions($verb);
+
+        return isset($options[$search]['filter']);
+    }
+
+    /**
+     * Returns the filter that should be applied for a single route, along
+     * with any parameters it might have. Parameters are found by splitting
+     * the parameter name on a colon to separate the filter name from the parameter list,
+     * and the splitting the result on commas. So:
+     *
+     *    'role:admin,manager'
+     *
+     * has a filter of "role", with parameters of ['admin', 'manager'].
+     */
+    public function getFilterForRoute(string $search, ?string $verb = null): string
+    {
+        $options = $this->loadRoutesOptions($verb);
+
+        return $options[$search]['filter'] ?? '';
+    }
+
+    /**
+     * Given a
+     *
+     * @throws RouterException
+     */
+    protected function fillRouteParams(string $from, ?array $params = null): string
+    {
+        // Find all of our back-references in the original route
+        preg_match_all('/\(([^)]+)\)/', $from, $matches);
+
+        if (empty($matches[0])) {
+            return '/' . ltrim($from, '/');
+        }
+
+        // Build our resulting string, inserting the $params in
+        // the appropriate places.
+        foreach ($matches[0] as $index => $pattern) {
+            if (! preg_match('#^' . $pattern . '$#u', $params[$index])) {
+                throw RouterException::forInvalidParameterType();
+            }
+
+            // Ensure that the param we're inserting matches
+            // the expected param type.
+            $pos  = strpos($from, $pattern);
+            $from = substr_replace($from, $params[$index], $pos, strlen($pattern));
+        }
+
+        return '/' . ltrim($from, '/');
+    }
+
+    /**
+     * Does the heavy lifting of creating an actual route. You must specify
+     * the request method(s) that this route will work for. They can be separated
+     * by a pipe character "|" if there is more than one.
+     *
+     * @param array|string $to
+     */
+    protected function create(string $verb, string $from, $to, ?array $options = null)
+    {
+        $overwrite = false;
+        $prefix    = $this->group === null ? '' : $this->group . '/';
+
+        $from = esc(strip_tags($prefix . $from));
+
+        // While we want to add a route within a group of '/',
+        // it doesn't work with matching, so remove them...
+        if ($from !== '/') {
+            $from = trim($from, '/');
+        }
+
+        $options = array_merge($this->currentOptions ?? [], $options ?? []);
+
+        // Route priority detect
+        if (isset($options['priority'])) {
+            $options['priority'] = abs((int) $options['priority']);
+
+            if ($options['priority'] > 0) {
+                $this->prioritizeDetected = true;
+            }
+        }
+
+        // Hostname limiting?
+        if (! empty($options['hostname'])) {
+            // @todo determine if there's a way to whitelist hosts?
+            if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname'])) {
+                return;
+            }
+
+            $overwrite = true;
+        }
+
+        // Limiting to subdomains?
+        elseif (! empty($options['subdomain'])) {
+            // If we don't match the current subdomain, then
+            // we don't need to add the route.
+            if (! $this->checkSubdomains($options['subdomain'])) {
+                return;
+            }
+
+            $overwrite = true;
+        }
+
+        // Are we offsetting the binds?
+        // If so, take care of them here in one
+        // fell swoop.
+        if (isset($options['offset']) && is_string($to)) {
+            // Get a constant string to work with.
+            $to = preg_replace('/(\$\d+)/', '$X', $to);
+
+            for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
+                $to = preg_replace_callback(
+                    '/\$X/',
+                    static function ($m) use ($i) {
+                        return '$' . $i;
+                    },
+                    $to,
+                    1
+                );
+            }
+        }
+
+        // Replace our regex pattern placeholders with the actual thing
+        // so that the Router doesn't need to know about any of this.
+        foreach ($this->placeholders as $tag => $pattern) {
+            $from = str_ireplace(':' . $tag, $pattern, $from);
+        }
+
+        // If is redirect, No processing
+        if (! isset($options['redirect']) && is_string($to)) {
+            // If no namespace found, add the default namespace
+            if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {
+                $namespace = $options['namespace'] ?? $this->defaultNamespace;
+                $to        = trim($namespace, '\\') . '\\' . $to;
+            }
+            // Always ensure that we escape our namespace so we're not pointing to
+            // \CodeIgniter\Routes\Controller::method.
+            $to = '\\' . ltrim($to, '\\');
+        }
+
+        $name = $options['as'] ?? $from;
+
+        // Don't overwrite any existing 'froms' so that auto-discovered routes
+        // do not overwrite any app/Config/Routes settings. The app
+        // routes should always be the "source of truth".
+        // this works only because discovered routes are added just prior
+        // to attempting to route the request.
+        if (isset($this->routes[$verb][$name]) && ! $overwrite) {
+            return;
+        }
+
+        $this->routes[$verb][$name] = [
+            'route' => [$from => $to],
+        ];
+
+        $this->routesOptions[$verb][$from] = $options;
+
+        // Is this a redirect?
+        if (isset($options['redirect']) && is_numeric($options['redirect'])) {
+            $this->routes['*'][$name]['redirect'] = $options['redirect'];
+        }
+    }
+
+    /**
+     * Compares the subdomain(s) passed in against the current subdomain
+     * on this page request.
+     *
+     * @param mixed $subdomains
+     */
+    private function checkSubdomains($subdomains): bool
+    {
+        // CLI calls can't be on subdomain.
+        if (! isset($_SERVER['HTTP_HOST'])) {
+            return false;
+        }
+
+        if ($this->currentSubdomain === null) {
+            $this->currentSubdomain = $this->determineCurrentSubdomain();
+        }
+
+        if (! is_array($subdomains)) {
+            $subdomains = [$subdomains];
+        }
+
+        // Routes can be limited to any sub-domain. In that case, though,
+        // it does require a sub-domain to be present.
+        if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true)) {
+            return true;
+        }
+
+        return in_array($this->currentSubdomain, $subdomains, true);
+    }
+
+    /**
+     * Examines the HTTP_HOST to get a best match for the subdomain. It
+     * won't be perfect, but should work for our needs.
+     *
+     * It's especially not perfect since it's possible to register a domain
+     * with a period (.) as part of the domain name.
+     *
+     * @return mixed
+     */
+    private function determineCurrentSubdomain()
+    {
+        // We have to ensure that a scheme exists
+        // on the URL else parse_url will mis-interpret
+        // 'host' as the 'path'.
+        $url = $_SERVER['HTTP_HOST'];
+        if (strpos($url, 'http') !== 0) {
+            $url = 'http://' . $url;
+        }
+
+        $parsedUrl = parse_url($url);
+
+        $host = explode('.', $parsedUrl['host']);
+
+        if ($host[0] === 'www') {
+            unset($host[0]);
+        }
+
+        // Get rid of any domains, which will be the last
+        unset($host[count($host)]);
+
+        // Account for .co.uk, .co.nz, etc. domains
+        if (end($host) === 'co') {
+            $host = array_slice($host, 0, -1);
+        }
+
+        // If we only have 1 part left, then we don't have a sub-domain.
+        if (count($host) === 1) {
+            // Set it to false so we don't make it back here again.
+            return false;
+        }
+
+        return array_shift($host);
+    }
+
+    /**
+     * Reset the routes, so that a test case can provide the
+     * explicit ones needed for it.
+     */
+    public function resetRoutes()
+    {
+        $this->routes = ['*' => []];
+
+        foreach ($this->defaultHTTPMethods as $verb) {
+            $this->routes[$verb] = [];
+        }
+
+        $this->prioritizeDetected = false;
+    }
+
+    /**
+     * Load routes options based on verb
+     */
+    protected function loadRoutesOptions(?string $verb = null): array
+    {
+        $verb = $verb ?: $this->getHTTPVerb();
+
+        $options = $this->routesOptions[$verb] ?? [];
+
+        if (isset($this->routesOptions['*'])) {
+            foreach ($this->routesOptions['*'] as $key => $val) {
+                if (isset($options[$key])) {
+                    $extraOptions  = array_diff_key($val, $options[$key]);
+                    $options[$key] = array_merge($options[$key], $extraOptions);
+                } else {
+                    $options[$key] = $val;
+                }
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Enable or Disable sorting routes by priority
+     *
+     * @param bool $enabled The value status
+     *
+     * @return $this
+     */
+    public function setPrioritize(bool $enabled = true)
+    {
+        $this->prioritize = $enabled;
+
+        return $this;
+    }
 }
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index 1e9260aaa918..da25077da0fb 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -25,223 +25,163 @@
  */
 interface RouteCollectionInterface
 {
-	/**
-	 * Adds a single route to the collection.
-	 *
-	 * @param string       $from
-	 * @param array|string $to
-	 * @param array        $options
-	 *
-	 * @return mixed
-	 */
-	public function add(string $from, $to, array $options = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Registers a new constraint with the system. Constraints are used
-	 * by the routes as placeholders for regular expressions to make defining
-	 * the routes more human-friendly.
-	 *
-	 * You can pass an associative array as $placeholder, and have
-	 * multiple placeholders added at once.
-	 *
-	 * @param string|array $placeholder
-	 * @param string       $pattern
-	 *
-	 * @return mixed
-	 */
-	public function addPlaceholder($placeholder, string $pattern = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the default namespace to use for Controllers when no other
-	 * namespace has been specified.
-	 *
-	 * @param string $value
-	 *
-	 * @return mixed
-	 */
-	public function setDefaultNamespace(string $value);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the default controller to use when no other controller has been
-	 * specified.
-	 *
-	 * @param string $value
-	 *
-	 * @return mixed
-	 */
-	public function setDefaultController(string $value);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the default method to call on the controller when no other
-	 * method has been set in the route.
-	 *
-	 * @param string $value
-	 *
-	 * @return mixed
-	 */
-	public function setDefaultMethod(string $value);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tells the system whether to convert dashes in URI strings into
-	 * underscores. In some search engines, including Google, dashes
-	 * create more meaning and make it easier for the search engine to
-	 * find words and meaning in the URI for better SEO. But it
-	 * doesn't work well with PHP method names....
-	 *
-	 * @param boolean $value
-	 *
-	 * @return mixed
-	 */
-	public function setTranslateURIDashes(bool $value);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * If TRUE, the system will attempt to match the URI against
-	 * Controllers by matching each segment against folders/files
-	 * in APPPATH/Controllers, when a match wasn't found against
-	 * defined routes.
-	 *
-	 * If FALSE, will stop searching and do NO automatic routing.
-	 *
-	 * @param boolean $value
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function setAutoRoute(bool $value): self;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the class/method that should be called if routing doesn't
-	 * find a match. It can be either a closure or the controller/method
-	 * name exactly like a route is defined: Users::index
-	 *
-	 * This setting is passed to the Router class and handled there.
-	 *
-	 * @param callable|null $callable
-	 *
-	 * @return RouteCollectionInterface
-	 */
-	public function set404Override($callable = null): self;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the 404 Override setting, which can be null, a closure
-	 * or the controller/string.
-	 *
-	 * @return string|Closure|null
-	 */
-	public function get404Override();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the default controller. With Namespace.
-	 *
-	 * @return string
-	 */
-	public function getDefaultController();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the default method to use within the controller.
-	 *
-	 * @return string
-	 */
-	public function getDefaultMethod();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current value of the translateURIDashes setting.
-	 *
-	 * @return mixed
-	 */
-	public function shouldTranslateURIDashes();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the flag that tells whether to autoRoute URI against Controllers.
-	 *
-	 * @return boolean
-	 */
-	public function shouldAutoRoute();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the raw array of available routes.
-	 *
-	 * @return mixed
-	 */
-	public function getRoutes();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current HTTP Verb being used.
-	 *
-	 * @return string
-	 */
-	public function getHTTPVerb();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to look up a route based on it's destination.
-	 *
-	 * If a route exists:
-	 *
-	 *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
-	 *
-	 * This method allows you to know the Controller and method
-	 * and get the route that leads to it.
-	 *
-	 *      // Equals 'path/$param1/$param2'
-	 *      reverseRoute('Controller::method', $param1, $param2);
-	 *
-	 * @param string $search
-	 * @param array  ...$params
-	 *
-	 * @return string|false
-	 */
-	public function reverseRoute(string $search, ...$params);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the route is a redirecting route.
-	 *
-	 * @param string $from
-	 *
-	 * @return boolean
-	 */
-	public function isRedirect(string $from): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the HTTP status code from a redirecting Route.
-	 *
-	 * @param string $from
-	 *
-	 * @return integer
-	 */
-	public function getRedirectCode(string $from): int;
-
-	//--------------------------------------------------------------------
+    /**
+     * Adds a single route to the collection.
+     *
+     * @param array|string $to
+     * @param array        $options
+     *
+     * @return mixed
+     */
+    public function add(string $from, $to, ?array $options = null);
+
+    /**
+     * Registers a new constraint with the system. Constraints are used
+     * by the routes as placeholders for regular expressions to make defining
+     * the routes more human-friendly.
+     *
+     * You can pass an associative array as $placeholder, and have
+     * multiple placeholders added at once.
+     *
+     * @param array|string $placeholder
+     * @param string       $pattern
+     *
+     * @return mixed
+     */
+    public function addPlaceholder($placeholder, ?string $pattern = null);
+
+    /**
+     * Sets the default namespace to use for Controllers when no other
+     * namespace has been specified.
+     *
+     * @return mixed
+     */
+    public function setDefaultNamespace(string $value);
+
+    /**
+     * Sets the default controller to use when no other controller has been
+     * specified.
+     *
+     * @return mixed
+     */
+    public function setDefaultController(string $value);
+
+    /**
+     * Sets the default method to call on the controller when no other
+     * method has been set in the route.
+     *
+     * @return mixed
+     */
+    public function setDefaultMethod(string $value);
+
+    /**
+     * Tells the system whether to convert dashes in URI strings into
+     * underscores. In some search engines, including Google, dashes
+     * create more meaning and make it easier for the search engine to
+     * find words and meaning in the URI for better SEO. But it
+     * doesn't work well with PHP method names....
+     *
+     * @return mixed
+     */
+    public function setTranslateURIDashes(bool $value);
+
+    /**
+     * If TRUE, the system will attempt to match the URI against
+     * Controllers by matching each segment against folders/files
+     * in APPPATH/Controllers, when a match wasn't found against
+     * defined routes.
+     *
+     * If FALSE, will stop searching and do NO automatic routing.
+     */
+    public function setAutoRoute(bool $value): self;
+
+    /**
+     * Sets the class/method that should be called if routing doesn't
+     * find a match. It can be either a closure or the controller/method
+     * name exactly like a route is defined: Users::index
+     *
+     * This setting is passed to the Router class and handled there.
+     *
+     * @param callable|null $callable
+     */
+    public function set404Override($callable = null): self;
+
+    /**
+     * Returns the 404 Override setting, which can be null, a closure
+     * or the controller/string.
+     *
+     * @return Closure|string|null
+     */
+    public function get404Override();
+
+    /**
+     * Returns the name of the default controller. With Namespace.
+     *
+     * @return string
+     */
+    public function getDefaultController();
+
+    /**
+     * Returns the name of the default method to use within the controller.
+     *
+     * @return string
+     */
+    public function getDefaultMethod();
+
+    /**
+     * Returns the current value of the translateURIDashes setting.
+     *
+     * @return mixed
+     */
+    public function shouldTranslateURIDashes();
+
+    /**
+     * Returns the flag that tells whether to autoRoute URI against Controllers.
+     *
+     * @return bool
+     */
+    public function shouldAutoRoute();
+
+    /**
+     * Returns the raw array of available routes.
+     *
+     * @return mixed
+     */
+    public function getRoutes();
+
+    /**
+     * Returns the current HTTP Verb being used.
+     *
+     * @return string
+     */
+    public function getHTTPVerb();
+
+    /**
+     * Attempts to look up a route based on it's destination.
+     *
+     * If a route exists:
+     *
+     *      'path/(:any)/(:any)' => 'Controller::method/$1/$2'
+     *
+     * This method allows you to know the Controller and method
+     * and get the route that leads to it.
+     *
+     *      // Equals 'path/$param1/$param2'
+     *      reverseRoute('Controller::method', $param1, $param2);
+     *
+     * @param array ...$params
+     *
+     * @return false|string
+     */
+    public function reverseRoute(string $search, ...$params);
+
+    /**
+     * Determines if the route is a redirecting route.
+     */
+    public function isRedirect(string $from): bool;
+
+    /**
+     * Grabs the HTTP status code from a redirecting Route.
+     */
+    public function getRedirectCode(string $from): int;
 }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index dcadd8b832e2..a5ccef2c2e3b 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -21,744 +21,639 @@
  */
 class Router implements RouterInterface
 {
-	/**
-	 * A RouteCollection instance.
-	 *
-	 * @var RouteCollectionInterface
-	 */
-	protected $collection;
-
-	/**
-	 * Sub-directory that contains the requested controller class.
-	 * Primarily used by 'autoRoute'.
-	 *
-	 * @var string|null
-	 */
-	protected $directory;
-
-	/**
-	 * The name of the controller class.
-	 *
-	 * @var string
-	 */
-	protected $controller;
-
-	/**
-	 * The name of the method to use.
-	 *
-	 * @var string
-	 */
-	protected $method;
-
-	/**
-	 * An array of binds that were collected
-	 * so they can be sent to closure routes.
-	 *
-	 * @var array
-	 */
-	protected $params = [];
-
-	/**
-	 * The name of the front controller.
-	 *
-	 * @var string
-	 */
-	protected $indexPage = 'index.php';
-
-	/**
-	 * Whether dashes in URI's should be converted
-	 * to underscores when determining method names.
-	 *
-	 * @var boolean
-	 */
-	protected $translateURIDashes = false;
-
-	/**
-	 * The route that was matched for this request.
-	 *
-	 * @var array|null
-	 */
-	protected $matchedRoute;
-
-	/**
-	 * The options set for the matched route.
-	 *
-	 * @var array|null
-	 */
-	protected $matchedRouteOptions;
-
-	/**
-	 * The locale that was detected in a route.
-	 *
-	 * @var string
-	 */
-	protected $detectedLocale;
-
-	/**
-	 * The filter info from Route Collection
-	 * if the matched route should be filtered.
-	 *
-	 * @var string|null
-	 */
-	protected $filterInfo;
-
-	//--------------------------------------------------------------------
-	/**
-	 * Stores a reference to the RouteCollection object.
-	 *
-	 * @param RouteCollectionInterface $routes
-	 * @param Request                  $request
-	 */
-	public function __construct(RouteCollectionInterface $routes, Request $request = null)
-	{
-		$this->collection = $routes;
-
-		$this->controller = $this->collection->getDefaultController();
-		$this->method     = $this->collection->getDefaultMethod();
-
-		// @phpstan-ignore-next-line
-		$this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @param string|null $uri
-	 *
-	 * @return mixed|string
-	 * @throws RedirectException
-	 * @throws PageNotFoundException
-	 */
-	public function handle(string $uri = null)
-	{
-		$this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
-
-		// If we cannot find a URI to match against, then
-		// everything runs off of it's default settings.
-		if ($uri === null || $uri === '')
-		{
-			return strpos($this->controller, '\\') === false
-				? $this->collection->getDefaultNamespace() . $this->controller
-				: $this->controller;
-		}
-
-		// Decode URL-encoded string
-		$uri = urldecode($uri);
-
-		// Restart filterInfo
-		$this->filterInfo = null;
-
-		if ($this->checkRoutes($uri))
-		{
-			if ($this->collection->isFiltered($this->matchedRoute[0]))
-			{
-				$this->filterInfo = $this->collection->getFilterForRoute($this->matchedRoute[0]);
-			}
-
-			return $this->controller;
-		}
-
-		// Still here? Then we can try to match the URI against
-		// Controllers/directories, but the application may not
-		// want this, like in the case of API's.
-		if (! $this->collection->shouldAutoRoute())
-		{
-			throw new PageNotFoundException("Can't find a route for '{$uri}'.");
-		}
-
-		$this->autoRoute($uri);
-
-		return $this->controllerName();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the filter info for the matched route, if any.
-	 *
-	 * @return string
-	 */
-	public function getFilter()
-	{
-		return $this->filterInfo;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the matched controller.
-	 *
-	 * @return mixed
-	 */
-	public function controllerName()
-	{
-		return $this->translateURIDashes
-			? str_replace('-', '_', $this->controller)
-			: $this->controller;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the method to run in the
-	 * chosen container.
-	 *
-	 * @return string
-	 */
-	public function methodName(): string
-	{
-		return $this->translateURIDashes
-			? str_replace('-', '_', $this->method)
-			: $this->method;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the 404 Override settings from the Collection.
-	 * If the override is a string, will split to controller/index array.
-	 */
-	public function get404Override()
-	{
-		$route = $this->collection->get404Override();
-
-		if (is_string($route))
-		{
-			$routeArray = explode('::', $route);
-
-			return [
-				$routeArray[0], // Controller
-				$routeArray[1] ?? 'index',   // Method
-			];
-		}
-
-		if (is_callable($route))
-		{
-			return $route;
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the binds that have been matched and collected
-	 * during the parsing process as an array, ready to send to
-	 * instance->method(...$params).
-	 *
-	 * @return array
-	 */
-	public function params(): array
-	{
-		return $this->params;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the sub-directory the controller is in,
-	 * if any. Relative to APPPATH.'Controllers'.
-	 *
-	 * Only used when auto-routing is turned on.
-	 *
-	 * @return string
-	 */
-	public function directory(): string
-	{
-		return ! empty($this->directory) ? $this->directory : '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the routing information that was matched for this
-	 * request, if a route was defined.
-	 *
-	 * @return array|null
-	 */
-	public function getMatchedRoute()
-	{
-		return $this->matchedRoute;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns all options set for the matched route
-	 *
-	 * @return array|null
-	 */
-	public function getMatchedRouteOptions()
-	{
-		return $this->matchedRouteOptions;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the value that should be used to match the index.php file. Defaults
-	 * to index.php but this allows you to modify it in case your are using
-	 * something like mod_rewrite to remove the page. This allows you to set
-	 * it a blank.
-	 *
-	 * @param string $page
-	 *
-	 * @return $this
-	 */
-	public function setIndexPage($page): self
-	{
-		$this->indexPage = $page;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Tells the system whether we should translate URI dashes or not
-	 * in the URI from a dash to an underscore.
-	 *
-	 * @param boolean|false $val
-	 *
-	 * @return $this
-	 */
-	public function setTranslateURIDashes(bool $val = false): self
-	{
-		$this->translateURIDashes = $val;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns true/false based on whether the current route contained
-	 * a {locale} placeholder.
-	 *
-	 * @return boolean
-	 */
-	public function hasLocale()
-	{
-		return (bool) $this->detectedLocale;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the detected locale, if any, or null.
-	 *
-	 * @return string
-	 */
-	public function getLocale()
-	{
-		return $this->detectedLocale;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Compares the uri string against the routes that the
-	 * RouteCollection class defined for us, attempting to find a match.
-	 * This method will modify $this->controller, etal as needed.
-	 *
-	 * @param string $uri The URI path to compare against the routes
-	 *
-	 * @return boolean Whether the route was matched or not.
-	 * @throws RedirectException
-	 */
-	protected function checkRoutes(string $uri): bool
-	{
-		$routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
-
-		// Don't waste any time
-		if (empty($routes))
-		{
-			return false;
-		}
-
-		$uri = $uri === '/'
-			? $uri
-			: ltrim($uri, '/ ');
-
-		// Loop through the route array looking for wildcards
-		foreach ($routes as $key => $val)
-		{
-			// Reset localeSegment
-			$localeSegment = null;
-
-			$key = $key === '/'
-				? $key
-				: ltrim($key, '/ ');
-
-			$matchedKey = $key;
-
-			// Are we dealing with a locale?
-			if (strpos($key, '{locale}') !== false)
-			{
-				$localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key), true);
-
-				// Replace it with a regex so it
-				// will actually match.
-				$key = str_replace('/', '\/', $key);
-				$key = str_replace('{locale}', '[^\/]+', $key);
-			}
-
-			// Does the RegEx match?
-			if (preg_match('#^' . $key . '$#u', $uri, $matches))
-			{
-				// Is this route supposed to redirect to another?
-				if ($this->collection->isRedirect($key))
-				{
-					throw new RedirectException(is_array($val) ? key($val) : $val, $this->collection->getRedirectCode($key));
-				}
-				// Store our locale so CodeIgniter object can
-				// assign it to the Request.
-				if (isset($localeSegment))
-				{
-					// The following may be inefficient, but doesn't upset NetBeans :-/
-					$temp                 = (explode('/', $uri));
-					$this->detectedLocale = $temp[$localeSegment];
-				}
-
-				// Are we using Closures? If so, then we need
-				// to collect the params into an array
-				// so it can be passed to the controller method later.
-				if (! is_string($val) && is_callable($val))
-				{
-					$this->controller = $val;
-
-					// Remove the original string from the matches array
-					array_shift($matches);
-
-					$this->params = $matches;
-
-					$this->matchedRoute = [
-						$matchedKey,
-						$val,
-					];
-
-					$this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
-
-					return true;
-				}
-				// Are we using the default method for back-references?
-
-				// Support resource route when function with subdirectory
-				// ex: $routes->resource('Admin/Admins');
-				if (strpos($val, '$') !== false && strpos($key, '(') !== false && strpos($key, '/') !== false)
-				{
-					$replacekey = str_replace('/(.*)', '', $key);
-					$val        = preg_replace('#^' . $key . '$#u', $val, $uri);
-					$val        = str_replace($replacekey, str_replace('/', '\\', $replacekey), $val);
-				}
-				elseif (strpos($val, '$') !== false && strpos($key, '(') !== false)
-				{
-					$val = preg_replace('#^' . $key . '$#u', $val, $uri);
-				}
-				elseif (strpos($val, '/') !== false)
-				{
-					[
-						$controller,
-						$method,
-					] = explode('::', $val);
-
-					// Only replace slashes in the controller, not in the method.
-					$controller = str_replace('/', '\\', $controller);
-
-					$val = $controller . '::' . $method;
-				}
-
-				$this->setRequest(explode('/', $val));
-
-				$this->matchedRoute = [
-					$matchedKey,
-					$val,
-				];
-
-				$this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
-
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to match a URI path against Controllers and directories
-	 * found in APPPATH/Controllers, to find a matching route.
-	 *
-	 * @param string $uri
-	 */
-	public function autoRoute(string $uri)
-	{
-		$segments = explode('/', $uri);
-
-		$segments = $this->scanControllers($segments);
-
-		// If we don't have any segments left - try the default controller;
-		// WARNING: Directories get shifted out of the segments array.
-		if (empty($segments))
-		{
-			$this->setDefaultController();
-		}
-		// If not empty, then the first segment should be the controller
-		else
-		{
-			$this->controller = ucfirst(array_shift($segments));
-		}
-
-		$controllerName = $this->controllerName();
-		if (! $this->isValidSegment($controllerName))
-		{
-			throw new PageNotFoundException($this->controller . ' is not a valid controller name');
-		}
-
-		// Use the method name if it exists.
-		// If it doesn't, no biggie - the default method name
-		// has already been set.
-		if (! empty($segments))
-		{
-			$this->method = array_shift($segments) ?: $this->method;
-		}
-
-		if (! empty($segments))
-		{
-			$this->params = $segments;
-		}
-
-		$defaultNamespace = $this->collection->getDefaultNamespace();
-		if ($this->collection->getHTTPVerb() !== 'cli')
-		{
-			$controller = '\\' . $defaultNamespace;
-
-			$controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
-			$controller .= $controllerName;
-
-			$controller = strtolower($controller);
-			$methodName = strtolower($this->methodName());
-
-			foreach ($this->collection->getRoutes('cli') as $route)
-			{
-				if (is_string($route))
-				{
-					$route = strtolower($route);
-					if (strpos($route, $controller . '::' . $methodName) === 0)
-					{
-						throw new PageNotFoundException();
-					}
-
-					if ($route === $controller)
-					{
-						throw new PageNotFoundException();
-					}
-				}
-			}
-		}
-
-		// Load the file so that it's available for CodeIgniter.
-		$file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
-		if (is_file($file))
-		{
-			include_once $file;
-		}
-
-		// Ensure the controller stores the fully-qualified class name
-		// We have to check for a length over 1, since by default it will be '\'
-		if (strpos($this->controller, '\\') === false && strlen($defaultNamespace) > 1)
-		{
-			$this->controller = '\\' . ltrim(str_replace('/', '\\', $defaultNamespace . $this->directory . $controllerName), '\\');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
-	 *
-	 * @param array $segments URI segments
-	 *
-	 * @return array returns an array of remaining uri segments that don't map onto a directory
-	 *
-	 * @deprecated this function name does not properly describe its behavior so it has been deprecated
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function validateRequest(array $segments): array
-	{
-		return $this->scanControllers($segments);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
-	 *
-	 * @param array $segments URI segments
-	 *
-	 * @return array returns an array of remaining uri segments that don't map onto a directory
-	 */
-	protected function scanControllers(array $segments): array
-	{
-		$segments = array_filter($segments, function ($segment) {
-			return $segment !== '';
-		});
-		// numerically reindex the array, removing gaps
-		$segments = array_values($segments);
-
-		// if a prior directory value has been set, just return segments and get out of here
-		if (isset($this->directory))
-		{
-			return $segments;
-		}
-
-		// Loop through our segments and return as soon as a controller
-		// is found or when such a directory doesn't exist
-		$c = count($segments);
-		while ($c-- > 0)
-		{
-			$segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
-			// as soon as we encounter any segment that is not PSR-4 compliant, stop searching
-			if (! $this->isValidSegment($segmentConvert))
-			{
-				return $segments;
-			}
-
-			$test = APPPATH . 'Controllers/' . $this->directory . $segmentConvert;
-
-			// as long as each segment is *not* a controller file but does match a directory, add it to $this->directory
-			if (! is_file($test . '.php') && is_dir($test))
-			{
-				$this->setDirectory($segmentConvert, true, false);
-				array_shift($segments);
-				continue;
-			}
-
-			return $segments;
-		}
-
-		// This means that all segments were actually directories
-		return $segments;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the sub-directory that the controller is in.
-	 *
-	 * @param string|null $dir
-	 * @param boolean     $append
-	 * @param boolean     $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
-	 */
-	public function setDirectory(string $dir = null, bool $append = false, bool $validate = true)
-	{
-		if (empty($dir))
-		{
-			$this->directory = null;
-			return;
-		}
-
-		if ($validate)
-		{
-			$segments = explode('/', trim($dir, '/'));
-			foreach ($segments as $segment)
-			{
-				if (! $this->isValidSegment($segment))
-				{
-					return;
-				}
-			}
-		}
-
-		if ($append !== true || empty($this->directory))
-		{
-			$this->directory = trim($dir, '/') . '/';
-		}
-		else
-		{
-			$this->directory .= trim($dir, '/') . '/';
-		}
-	}
-
-	/**
-	 * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
-	 *
-	 * regex comes from https://www.php.net/manual/en/language.variables.basics.php
-	 *
-	 * @param  string $segment
-	 * @return boolean
-	 */
-	private function isValidSegment(string $segment): bool
-	{
-		return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set request route
-	 *
-	 * Takes an array of URI segments as input and sets the class/method
-	 * to be called.
-	 *
-	 * @param array $segments URI segments
-	 */
-	protected function setRequest(array $segments = [])
-	{
-		// If we don't have any segments - try the default controller;
-		if (empty($segments))
-		{
-			$this->setDefaultController();
-
-			return;
-		}
-
-		[$controller, $method] = array_pad(explode('::', $segments[0]), 2, null);
-
-		$this->controller = $controller;
-
-		// $this->method already contains the default method name,
-		// so don't overwrite it with emptiness.
-		if (! empty($method))
-		{
-			$this->method = $method;
-		}
-
-		array_shift($segments);
-
-		$this->params = $segments;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the default controller based on the info set in the RouteCollection.
-	 */
-	protected function setDefaultController()
-	{
-		if (empty($this->controller))
-		{
-			throw RouterException::forMissingDefaultRoute();
-		}
-
-		// Is the method being specified?
-		if (sscanf($this->controller, '%[^/]/%s', $class, $this->method) !== 2)
-		{
-			$this->method = 'index';
-		}
-
-		if (! is_file(APPPATH . 'Controllers/' . $this->directory . ucfirst($class) . '.php'))
-		{
-			return;
-		}
-
-		$this->controller = ucfirst($class);
-
-		log_message('info', 'Used the default controller.');
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * A RouteCollection instance.
+     *
+     * @var RouteCollectionInterface
+     */
+    protected $collection;
+
+    /**
+     * Sub-directory that contains the requested controller class.
+     * Primarily used by 'autoRoute'.
+     *
+     * @var string|null
+     */
+    protected $directory;
+
+    /**
+     * The name of the controller class.
+     *
+     * @var string
+     */
+    protected $controller;
+
+    /**
+     * The name of the method to use.
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * An array of binds that were collected
+     * so they can be sent to closure routes.
+     *
+     * @var array
+     */
+    protected $params = [];
+
+    /**
+     * The name of the front controller.
+     *
+     * @var string
+     */
+    protected $indexPage = 'index.php';
+
+    /**
+     * Whether dashes in URI's should be converted
+     * to underscores when determining method names.
+     *
+     * @var bool
+     */
+    protected $translateURIDashes = false;
+
+    /**
+     * The route that was matched for this request.
+     *
+     * @var array|null
+     */
+    protected $matchedRoute;
+
+    /**
+     * The options set for the matched route.
+     *
+     * @var array|null
+     */
+    protected $matchedRouteOptions;
+
+    /**
+     * The locale that was detected in a route.
+     *
+     * @var string
+     */
+    protected $detectedLocale;
+
+    /**
+     * The filter info from Route Collection
+     * if the matched route should be filtered.
+     *
+     * @var string|null
+     */
+    protected $filterInfo;
+
+    /**
+     * Stores a reference to the RouteCollection object.
+     *
+     * @param Request $request
+     */
+    public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
+    {
+        $this->collection = $routes;
+
+        $this->controller = $this->collection->getDefaultController();
+        $this->method     = $this->collection->getDefaultMethod();
+
+        // @phpstan-ignore-next-line
+        $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
+    }
+
+    /**
+     * @throws PageNotFoundException
+     * @throws RedirectException
+     *
+     * @return mixed|string
+     */
+    public function handle(?string $uri = null)
+    {
+        $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
+
+        // If we cannot find a URI to match against, then
+        // everything runs off of it's default settings.
+        if ($uri === null || $uri === '') {
+            return strpos($this->controller, '\\') === false
+                ? $this->collection->getDefaultNamespace() . $this->controller
+                : $this->controller;
+        }
+
+        // Decode URL-encoded string
+        $uri = urldecode($uri);
+
+        // Restart filterInfo
+        $this->filterInfo = null;
+
+        if ($this->checkRoutes($uri)) {
+            if ($this->collection->isFiltered($this->matchedRoute[0])) {
+                $this->filterInfo = $this->collection->getFilterForRoute($this->matchedRoute[0]);
+            }
+
+            return $this->controller;
+        }
+
+        // Still here? Then we can try to match the URI against
+        // Controllers/directories, but the application may not
+        // want this, like in the case of API's.
+        if (! $this->collection->shouldAutoRoute()) {
+            throw new PageNotFoundException("Can't find a route for '{$uri}'.");
+        }
+
+        $this->autoRoute($uri);
+
+        return $this->controllerName();
+    }
+
+    /**
+     * Returns the filter info for the matched route, if any.
+     *
+     * @return string
+     */
+    public function getFilter()
+    {
+        return $this->filterInfo;
+    }
+
+    /**
+     * Returns the name of the matched controller.
+     *
+     * @return mixed
+     */
+    public function controllerName()
+    {
+        return $this->translateURIDashes
+            ? str_replace('-', '_', $this->controller)
+            : $this->controller;
+    }
+
+    /**
+     * Returns the name of the method to run in the
+     * chosen container.
+     */
+    public function methodName(): string
+    {
+        return $this->translateURIDashes
+            ? str_replace('-', '_', $this->method)
+            : $this->method;
+    }
+
+    /**
+     * Returns the 404 Override settings from the Collection.
+     * If the override is a string, will split to controller/index array.
+     */
+    public function get404Override()
+    {
+        $route = $this->collection->get404Override();
+
+        if (is_string($route)) {
+            $routeArray = explode('::', $route);
+
+            return [
+                $routeArray[0], // Controller
+                $routeArray[1] ?? 'index',   // Method
+            ];
+        }
+
+        if (is_callable($route)) {
+            return $route;
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns the binds that have been matched and collected
+     * during the parsing process as an array, ready to send to
+     * instance->method(...$params).
+     */
+    public function params(): array
+    {
+        return $this->params;
+    }
+
+    /**
+     * Returns the name of the sub-directory the controller is in,
+     * if any. Relative to APPPATH.'Controllers'.
+     *
+     * Only used when auto-routing is turned on.
+     */
+    public function directory(): string
+    {
+        return ! empty($this->directory) ? $this->directory : '';
+    }
+
+    /**
+     * Returns the routing information that was matched for this
+     * request, if a route was defined.
+     *
+     * @return array|null
+     */
+    public function getMatchedRoute()
+    {
+        return $this->matchedRoute;
+    }
+
+    /**
+     * Returns all options set for the matched route
+     *
+     * @return array|null
+     */
+    public function getMatchedRouteOptions()
+    {
+        return $this->matchedRouteOptions;
+    }
+
+    /**
+     * Sets the value that should be used to match the index.php file. Defaults
+     * to index.php but this allows you to modify it in case your are using
+     * something like mod_rewrite to remove the page. This allows you to set
+     * it a blank.
+     *
+     * @param string $page
+     */
+    public function setIndexPage($page): self
+    {
+        $this->indexPage = $page;
+
+        return $this;
+    }
+
+    /**
+     * Tells the system whether we should translate URI dashes or not
+     * in the URI from a dash to an underscore.
+     */
+    public function setTranslateURIDashes(bool $val = false): self
+    {
+        $this->translateURIDashes = $val;
+
+        return $this;
+    }
+
+    /**
+     * Returns true/false based on whether the current route contained
+     * a {locale} placeholder.
+     *
+     * @return bool
+     */
+    public function hasLocale()
+    {
+        return (bool) $this->detectedLocale;
+    }
+
+    /**
+     * Returns the detected locale, if any, or null.
+     *
+     * @return string
+     */
+    public function getLocale()
+    {
+        return $this->detectedLocale;
+    }
+
+    /**
+     * Compares the uri string against the routes that the
+     * RouteCollection class defined for us, attempting to find a match.
+     * This method will modify $this->controller, etal as needed.
+     *
+     * @param string $uri The URI path to compare against the routes
+     *
+     * @throws RedirectException
+     *
+     * @return bool Whether the route was matched or not.
+     */
+    protected function checkRoutes(string $uri): bool
+    {
+        $routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
+
+        // Don't waste any time
+        if (empty($routes)) {
+            return false;
+        }
+
+        $uri = $uri === '/'
+            ? $uri
+            : ltrim($uri, '/ ');
+
+        // Loop through the route array looking for wildcards
+        foreach ($routes as $key => $val) {
+            // Reset localeSegment
+            $localeSegment = null;
+
+            $key = $key === '/'
+                ? $key
+                : ltrim($key, '/ ');
+
+            $matchedKey = $key;
+
+            // Are we dealing with a locale?
+            if (strpos($key, '{locale}') !== false) {
+                $localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key), true);
+
+                // Replace it with a regex so it
+                // will actually match.
+                $key = str_replace('/', '\/', $key);
+                $key = str_replace('{locale}', '[^\/]+', $key);
+            }
+
+            // Does the RegEx match?
+            if (preg_match('#^' . $key . '$#u', $uri, $matches)) {
+                // Is this route supposed to redirect to another?
+                if ($this->collection->isRedirect($key)) {
+                    throw new RedirectException(is_array($val) ? key($val) : $val, $this->collection->getRedirectCode($key));
+                }
+                // Store our locale so CodeIgniter object can
+                // assign it to the Request.
+                if (isset($localeSegment)) {
+                    // The following may be inefficient, but doesn't upset NetBeans :-/
+                    $temp                 = (explode('/', $uri));
+                    $this->detectedLocale = $temp[$localeSegment];
+                }
+
+                // Are we using Closures? If so, then we need
+                // to collect the params into an array
+                // so it can be passed to the controller method later.
+                if (! is_string($val) && is_callable($val)) {
+                    $this->controller = $val;
+
+                    // Remove the original string from the matches array
+                    array_shift($matches);
+
+                    $this->params = $matches;
+
+                    $this->matchedRoute = [
+                        $matchedKey,
+                        $val,
+                    ];
+
+                    $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+
+                    return true;
+                }
+                // Are we using the default method for back-references?
+
+                // Support resource route when function with subdirectory
+                // ex: $routes->resource('Admin/Admins');
+                if (strpos($val, '$') !== false && strpos($key, '(') !== false && strpos($key, '/') !== false) {
+                    $replacekey = str_replace('/(.*)', '', $key);
+                    $val        = preg_replace('#^' . $key . '$#u', $val, $uri);
+                    $val        = str_replace($replacekey, str_replace('/', '\\', $replacekey), $val);
+                } elseif (strpos($val, '$') !== false && strpos($key, '(') !== false) {
+                    $val = preg_replace('#^' . $key . '$#u', $val, $uri);
+                } elseif (strpos($val, '/') !== false) {
+                    [
+                        $controller,
+                        $method,
+                    ] = explode('::', $val);
+
+                    // Only replace slashes in the controller, not in the method.
+                    $controller = str_replace('/', '\\', $controller);
+
+                    $val = $controller . '::' . $method;
+                }
+
+                $this->setRequest(explode('/', $val));
+
+                $this->matchedRoute = [
+                    $matchedKey,
+                    $val,
+                ];
+
+                $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Attempts to match a URI path against Controllers and directories
+     * found in APPPATH/Controllers, to find a matching route.
+     */
+    public function autoRoute(string $uri)
+    {
+        $segments = explode('/', $uri);
+
+        $segments = $this->scanControllers($segments);
+
+        // If we don't have any segments left - try the default controller;
+        // WARNING: Directories get shifted out of the segments array.
+        if (empty($segments)) {
+            $this->setDefaultController();
+        }
+        // If not empty, then the first segment should be the controller
+        else {
+            $this->controller = ucfirst(array_shift($segments));
+        }
+
+        $controllerName = $this->controllerName();
+        if (! $this->isValidSegment($controllerName)) {
+            throw new PageNotFoundException($this->controller . ' is not a valid controller name');
+        }
+
+        // Use the method name if it exists.
+        // If it doesn't, no biggie - the default method name
+        // has already been set.
+        if (! empty($segments)) {
+            $this->method = array_shift($segments) ?: $this->method;
+        }
+
+        if (! empty($segments)) {
+            $this->params = $segments;
+        }
+
+        $defaultNamespace = $this->collection->getDefaultNamespace();
+        if ($this->collection->getHTTPVerb() !== 'cli') {
+            $controller = '\\' . $defaultNamespace;
+
+            $controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
+            $controller .= $controllerName;
+
+            $controller = strtolower($controller);
+            $methodName = strtolower($this->methodName());
+
+            foreach ($this->collection->getRoutes('cli') as $route) {
+                if (is_string($route)) {
+                    $route = strtolower($route);
+                    if (strpos($route, $controller . '::' . $methodName) === 0) {
+                        throw new PageNotFoundException();
+                    }
+
+                    if ($route === $controller) {
+                        throw new PageNotFoundException();
+                    }
+                }
+            }
+        }
+
+        // Load the file so that it's available for CodeIgniter.
+        $file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
+        if (is_file($file)) {
+            include_once $file;
+        }
+
+        // Ensure the controller stores the fully-qualified class name
+        // We have to check for a length over 1, since by default it will be '\'
+        if (strpos($this->controller, '\\') === false && strlen($defaultNamespace) > 1) {
+            $this->controller = '\\' . ltrim(str_replace('/', '\\', $defaultNamespace . $this->directory . $controllerName), '\\');
+        }
+    }
+
+    /**
+     * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+     *
+     * @param array $segments URI segments
+     *
+     * @return array returns an array of remaining uri segments that don't map onto a directory
+     *
+     * @deprecated this function name does not properly describe its behavior so it has been deprecated
+     *
+     * @codeCoverageIgnore
+     */
+    protected function validateRequest(array $segments): array
+    {
+        return $this->scanControllers($segments);
+    }
+
+    /**
+     * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+     *
+     * @param array $segments URI segments
+     *
+     * @return array returns an array of remaining uri segments that don't map onto a directory
+     */
+    protected function scanControllers(array $segments): array
+    {
+        $segments = array_filter($segments, static function ($segment) {
+            return $segment !== '';
+        });
+        // numerically reindex the array, removing gaps
+        $segments = array_values($segments);
+
+        // if a prior directory value has been set, just return segments and get out of here
+        if (isset($this->directory)) {
+            return $segments;
+        }
+
+        // Loop through our segments and return as soon as a controller
+        // is found or when such a directory doesn't exist
+        $c = count($segments);
+
+        while ($c-- > 0) {
+            $segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
+            // as soon as we encounter any segment that is not PSR-4 compliant, stop searching
+            if (! $this->isValidSegment($segmentConvert)) {
+                return $segments;
+            }
+
+            $test = APPPATH . 'Controllers/' . $this->directory . $segmentConvert;
+
+            // as long as each segment is *not* a controller file but does match a directory, add it to $this->directory
+            if (! is_file($test . '.php') && is_dir($test)) {
+                $this->setDirectory($segmentConvert, true, false);
+                array_shift($segments);
+
+                continue;
+            }
+
+            return $segments;
+        }
+
+        // This means that all segments were actually directories
+        return $segments;
+    }
+
+    /**
+     * Sets the sub-directory that the controller is in.
+     *
+     * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     */
+    public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
+    {
+        if (empty($dir)) {
+            $this->directory = null;
+
+            return;
+        }
+
+        if ($validate) {
+            $segments = explode('/', trim($dir, '/'));
+
+            foreach ($segments as $segment) {
+                if (! $this->isValidSegment($segment)) {
+                    return;
+                }
+            }
+        }
+
+        if ($append !== true || empty($this->directory)) {
+            $this->directory = trim($dir, '/') . '/';
+        } else {
+            $this->directory .= trim($dir, '/') . '/';
+        }
+    }
+
+    /**
+     * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
+     *
+     * regex comes from https://www.php.net/manual/en/language.variables.basics.php
+     */
+    private function isValidSegment(string $segment): bool
+    {
+        return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
+    }
+
+    /**
+     * Set request route
+     *
+     * Takes an array of URI segments as input and sets the class/method
+     * to be called.
+     *
+     * @param array $segments URI segments
+     */
+    protected function setRequest(array $segments = [])
+    {
+        // If we don't have any segments - try the default controller;
+        if (empty($segments)) {
+            $this->setDefaultController();
+
+            return;
+        }
+
+        [$controller, $method] = array_pad(explode('::', $segments[0]), 2, null);
+
+        $this->controller = $controller;
+
+        // $this->method already contains the default method name,
+        // so don't overwrite it with emptiness.
+        if (! empty($method)) {
+            $this->method = $method;
+        }
+
+        array_shift($segments);
+
+        $this->params = $segments;
+    }
+
+    /**
+     * Sets the default controller based on the info set in the RouteCollection.
+     */
+    protected function setDefaultController()
+    {
+        if (empty($this->controller)) {
+            throw RouterException::forMissingDefaultRoute();
+        }
+
+        // Is the method being specified?
+        if (sscanf($this->controller, '%[^/]/%s', $class, $this->method) !== 2) {
+            $this->method = 'index';
+        }
+
+        if (! is_file(APPPATH . 'Controllers/' . $this->directory . ucfirst($class) . '.php')) {
+            return;
+        }
+
+        $this->controller = ucfirst($class);
+
+        log_message('info', 'Used the default controller.');
+    }
 }
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index d5522e140ed9..e252b56decc8 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -18,69 +18,56 @@
  */
 interface RouterInterface
 {
-	/**
-	 * Stores a reference to the RouteCollection object.
-	 *
-	 * @param RouteCollectionInterface $routes
-	 * @param Request                  $request
-	 */
-	public function __construct(RouteCollectionInterface $routes, Request $request = null);
+    /**
+     * Stores a reference to the RouteCollection object.
+     *
+     * @param Request $request
+     */
+    public function __construct(RouteCollectionInterface $routes, ?Request $request = null);
 
-	//--------------------------------------------------------------------
+    /**
+     * Scans the URI and attempts to match the current URI to the
+     * one of the defined routes in the RouteCollection.
+     *
+     * @param string $uri
+     *
+     * @return mixed
+     */
+    public function handle(?string $uri = null);
 
-	/**
-	 * Scans the URI and attempts to match the current URI to the
-	 * one of the defined routes in the RouteCollection.
-	 *
-	 * @param string $uri
-	 *
-	 * @return mixed
-	 */
-	public function handle(string $uri = null);
+    /**
+     * Returns the name of the matched controller.
+     *
+     * @return mixed
+     */
+    public function controllerName();
 
-	//--------------------------------------------------------------------
+    /**
+     * Returns the name of the method to run in the
+     * chosen container.
+     *
+     * @return mixed
+     */
+    public function methodName();
 
-	/**
-	 * Returns the name of the matched controller.
-	 *
-	 * @return mixed
-	 */
-	public function controllerName();
+    /**
+     * Returns the binds that have been matched and collected
+     * during the parsing process as an array, ready to send to
+     * instance->method(...$params).
+     *
+     * @return mixed
+     */
+    public function params();
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the name of the method to run in the
-	 * chosen container.
-	 *
-	 * @return mixed
-	 */
-	public function methodName();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the binds that have been matched and collected
-	 * during the parsing process as an array, ready to send to
-	 * instance->method(...$params).
-	 *
-	 * @return mixed
-	 */
-	public function params();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the value that should be used to match the index.php file. Defaults
-	 * to index.php but this allows you to modify it in case your are using
-	 * something like mod_rewrite to remove the page. This allows you to set
-	 * it a blank.
-	 *
-	 * @param string $page
-	 *
-	 * @return mixed
-	 */
-	public function setIndexPage($page);
-
-	//--------------------------------------------------------------------
+    /**
+     * Sets the value that should be used to match the index.php file. Defaults
+     * to index.php but this allows you to modify it in case your are using
+     * something like mod_rewrite to remove the page. This allows you to set
+     * it a blank.
+     *
+     * @param string $page
+     *
+     * @return mixed
+     */
+    public function setIndexPage($page);
 }
diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php
index 9e096b8a70c3..254f3ec345f5 100644
--- a/system/Security/Exceptions/SecurityException.php
+++ b/system/Security/Exceptions/SecurityException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security\Exceptions;
@@ -15,18 +15,18 @@
 
 class SecurityException extends FrameworkException
 {
-	public static function forDisallowedAction()
-	{
-		return new static(lang('Security.disallowedAction'), 403);
-	}
+    public static function forDisallowedAction()
+    {
+        return new static(lang('Security.disallowedAction'), 403);
+    }
 
-	/**
-	 * @deprecated Use `CookieException::forInvalidSameSite()` instead.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forInvalidSameSite(string $samesite)
-	{
-		return new static(lang('Security.invalidSameSite', [$samesite]));
-	}
+    /**
+     * @deprecated Use `CookieException::forInvalidSameSite()` instead.
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forInvalidSameSite(string $samesite)
+    {
+        return new static(lang('Security.invalidSameSite', [$samesite]));
+    }
 }
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 22ae21f8f718..aa6cf6edabad 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security;
@@ -26,438 +26,391 @@
  */
 class Security implements SecurityInterface
 {
-	/**
-	 * CSRF Hash
-	 *
-	 * Random hash for Cross Site Request Forgery protection cookie
-	 *
-	 * @var string|null
-	 */
-	protected $hash = null;
-
-	/**
-	 * CSRF Token Name
-	 *
-	 * Token name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	protected $tokenName = 'csrf_token_name';
-
-	/**
-	 * CSRF Header Name
-	 *
-	 * Token name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	protected $headerName = 'X-CSRF-TOKEN';
-
-	/**
-	 * The CSRF Cookie instance.
-	 *
-	 * @var Cookie
-	 */
-	protected $cookie;
-
-	/**
-	 * CSRF Cookie Name
-	 *
-	 * Cookie name for Cross Site Request Forgery protection cookie.
-	 *
-	 * @var string
-	 */
-	protected $cookieName = 'csrf_cookie_name';
-
-	/**
-	 * CSRF Expires
-	 *
-	 * Expiration time for Cross Site Request Forgery protection cookie.
-	 *
-	 * Defaults to two hours (in seconds).
-	 *
-	 * @var integer
-	 *
-	 * @deprecated
-	 */
-	protected $expires = 7200;
-
-	/**
-	 * CSRF Regenerate
-	 *
-	 * Regenerate CSRF Token on every request.
-	 *
-	 * @var boolean
-	 */
-	protected $regenerate = true;
-
-	/**
-	 * CSRF Redirect
-	 *
-	 * Redirect to previous page with error on failure.
-	 *
-	 * @var boolean
-	 */
-	protected $redirect = true;
-
-	/**
-	 * CSRF SameSite
-	 *
-	 * Setting for CSRF SameSite cookie token.
-	 *
-	 * Allowed values are: None - Lax - Strict - ''.
-	 *
-	 * Defaults to `Lax` as recommended in this link:
-	 *
-	 * @see https://portswigger.net/web-security/csrf/samesite-cookies
-	 *
-	 * @var string
-	 *
-	 * @deprecated
-	 */
-	protected $samesite = Cookie::SAMESITE_LAX;
-
-	/**
-	 * Constructor.
-	 *
-	 * Stores our configuration and fires off the init() method to setup
-	 * initial state.
-	 *
-	 * @param App $config
-	 */
-	public function __construct(App $config)
-	{
-		/** @var SecurityConfig */
-		$security = config('Security');
-
-		// Store CSRF-related configurations
-		$this->tokenName  = $security->tokenName ?? $config->CSRFTokenName ?? $this->tokenName;
-		$this->headerName = $security->headerName ?? $config->CSRFHeaderName ?? $this->headerName;
-		$this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
-		$rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
-
-		/** @var CookieConfig */
-		$cookie = config('Cookie');
-
-		$cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
-		$this->cookieName = $cookiePrefix . $rawCookieName;
-
-		$expires = $security->expires ?? $config->CSRFExpire ?? 7200;
-
-		Cookie::setDefaults($cookie);
-		$this->cookie = new Cookie($rawCookieName, $this->generateHash(), [
-			'expires' => $expires === 0 ? 0 : time() + $expires,
-		]);
-	}
-
-	/**
-	 * CSRF Verify
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return $this|false
-	 *
-	 * @throws SecurityException
-	 *
-	 * @deprecated Use `CodeIgniter\Security\Security::verify()` instead of using this method.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function CSRFVerify(RequestInterface $request)
-	{
-		return $this->verify($request);
-	}
-
-	/**
-	 * Returns the CSRF Hash.
-	 *
-	 * @return string|null
-	 *
-	 * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getCSRFHash(): ?string
-	{
-		return $this->getHash();
-	}
-
-	/**
-	 * Returns the CSRF Token Name.
-	 *
-	 * @return string
-	 *
-	 * @deprecated Use `CodeIgniter\Security\Security::getTokenName()` instead of using this method.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getCSRFTokenName(): string
-	{
-		return $this->getTokenName();
-	}
-
-	/**
-	 * CSRF Verify
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return $this|false
-	 *
-	 * @throws SecurityException
-	 */
-	public function verify(RequestInterface $request)
-	{
-		// If it's not a POST request we will set the CSRF cookie.
-		if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST')
-		{
-			return $this->sendCookie($request);
-		}
-
-		// Does the token exist in POST, HEADER or optionally php:://input - json data.
-		if ($request->hasHeader($this->headerName) && ! empty($request->getHeader($this->headerName)->getValue()))
-		{
-			$tokenName = $request->getHeader($this->headerName)->getValue();
-		}
-		else
-		{
-			$json = json_decode($request->getBody());
-
-			if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE)
-			{
-				$tokenName = $json->{$this->tokenName} ?? null;
-			}
-			else
-			{
-				$tokenName = null;
-			}
-		}
-
-		$token = $_POST[$this->tokenName] ?? $tokenName;
-
-		// Does the tokens exist in both the POST/POSTed JSON and COOKIE arrays and match?
-		if (! isset($token, $_COOKIE[$this->cookieName]) || ! hash_equals($token, $_COOKIE[$this->cookieName]))
-		{
-			throw SecurityException::forDisallowedAction();
-		}
-
-		if (isset($_POST[$this->tokenName]))
-		{
-			// We kill this since we're done and we don't want to pollute the POST array.
-			unset($_POST[$this->tokenName]);
-			$request->setGlobal('post', $_POST);
-		}
-		elseif (isset($json->{$this->tokenName}))
-		{
-			// We kill this since we're done and we don't want to pollute the JSON data.
-			unset($json->{$this->tokenName});
-			$request->setBody(json_encode($json));
-		}
-
-		if ($this->regenerate)
-		{
-			$this->hash = null;
-			unset($_COOKIE[$this->cookieName]);
-		}
-
-		$this->cookie = $this->cookie->withValue($this->generateHash());
-		$this->sendCookie($request);
-
-		log_message('info', 'CSRF token verified.');
-
-		return $this;
-	}
-
-	/**
-	 * Returns the CSRF Hash.
-	 *
-	 * @return string|null
-	 */
-	public function getHash(): ?string
-	{
-		return $this->hash;
-	}
-
-	/**
-	 * Returns the CSRF Token Name.
-	 *
-	 * @return string
-	 */
-	public function getTokenName(): string
-	{
-		return $this->tokenName;
-	}
-
-	/**
-	 * Returns the CSRF Header Name.
-	 *
-	 * @return string
-	 */
-	public function getHeaderName(): string
-	{
-		return $this->headerName;
-	}
-
-	/**
-	 * Returns the CSRF Cookie Name.
-	 *
-	 * @return string
-	 */
-	public function getCookieName(): string
-	{
-		return $this->cookieName;
-	}
-
-	/**
-	 * Check if CSRF cookie is expired.
-	 *
-	 * @return boolean
-	 *
-	 * @deprecated
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function isExpired(): bool
-	{
-		return $this->cookie->isExpired();
-	}
-	/**
-	 * Check if request should be redirect on failure.
-	 *
-	 * @return boolean
-	 */
-	public function shouldRedirect(): bool
-	{
-		return $this->redirect;
-	}
-
-	/**
-	 * Sanitize Filename
-	 *
-	 * Tries to sanitize filenames in order to prevent directory traversal attempts
-	 * and other security threats, which is particularly useful for files that
-	 * were supplied via user input.
-	 *
-	 * If it is acceptable for the user input to include relative paths,
-	 * e.g. file/in/some/approved/folder.txt, you can set the second optional
-	 * parameter, $relative_path to TRUE.
-	 *
-	 * @param string  $str          Input file name
-	 * @param boolean $relativePath Whether to preserve paths
-	 *
-	 * @return string
-	 */
-	public function sanitizeFilename(string $str, bool $relativePath = false): string
-	{
-		// List of sanitize filename strings
-		$bad = [
-			'../',
-			'<!--',
-			'-->',
-			'<',
-			'>',
-			"'",
-			'"',
-			'&',
-			'$',
-			'#',
-			'{',
-			'}',
-			'[',
-			']',
-			'=',
-			';',
-			'?',
-			'%20',
-			'%22',
-			'%3c',
-			'%253c',
-			'%3e',
-			'%0e',
-			'%28',
-			'%29',
-			'%2528',
-			'%26',
-			'%24',
-			'%3f',
-			'%3b',
-			'%3d',
-		];
-
-		if (! $relativePath)
-		{
-			$bad[] = './';
-			$bad[] = '/';
-		}
-
-		$str = remove_invisible_characters($str, false);
-
-		do
-		{
-			$old = $str;
-			$str = str_replace($bad, '', $str);
-		}
-		while ($old !== $str);
-
-		return stripslashes($str);
-	}
-
-	/**
-	 * Generates the CSRF Hash.
-	 *
-	 * @return string
-	 */
-	protected function generateHash(): string
-	{
-		if (is_null($this->hash))
-		{
-			// If the cookie exists we will use its value.
-			// We don't necessarily want to regenerate it with
-			// each page load since a page could contain embedded
-			// sub-pages causing this feature to fail
-			if (isset($_COOKIE[$this->cookieName])
-				&& is_string($_COOKIE[$this->cookieName])
-				&& preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1
-			)
-			{
-				return $this->hash = $_COOKIE[$this->cookieName];
-			}
-
-			$this->hash = bin2hex(random_bytes(16));
-		}
-
-		return $this->hash;
-	}
-
-	/**
-	 * CSRF Send Cookie
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return Security|false
-	 */
-	protected function sendCookie(RequestInterface $request)
-	{
-		if ($this->cookie->isSecure() && ! $request->isSecure())
-		{
-			return false;
-		}
-
-		$this->doSendCookie();
-		log_message('info', 'CSRF cookie sent.');
-
-		return $this;
-	}
-
-	/**
-	 * Actual dispatching of cookies.
-	 * Extracted for this to be unit tested.
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @return void
-	 */
-	protected function doSendCookie(): void
-	{
-		cookies([$this->cookie], false)->dispatch();
-	}
+    /**
+     * CSRF Hash
+     *
+     * Random hash for Cross Site Request Forgery protection cookie
+     *
+     * @var string|null
+     */
+    protected $hash;
+
+    /**
+     * CSRF Token Name
+     *
+     * Token name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    protected $tokenName = 'csrf_token_name';
+
+    /**
+     * CSRF Header Name
+     *
+     * Token name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    protected $headerName = 'X-CSRF-TOKEN';
+
+    /**
+     * The CSRF Cookie instance.
+     *
+     * @var Cookie
+     */
+    protected $cookie;
+
+    /**
+     * CSRF Cookie Name
+     *
+     * Cookie name for Cross Site Request Forgery protection cookie.
+     *
+     * @var string
+     */
+    protected $cookieName = 'csrf_cookie_name';
+
+    /**
+     * CSRF Expires
+     *
+     * Expiration time for Cross Site Request Forgery protection cookie.
+     *
+     * Defaults to two hours (in seconds).
+     *
+     * @var int
+     *
+     * @deprecated
+     */
+    protected $expires = 7200;
+
+    /**
+     * CSRF Regenerate
+     *
+     * Regenerate CSRF Token on every request.
+     *
+     * @var bool
+     */
+    protected $regenerate = true;
+
+    /**
+     * CSRF Redirect
+     *
+     * Redirect to previous page with error on failure.
+     *
+     * @var bool
+     */
+    protected $redirect = true;
+
+    /**
+     * CSRF SameSite
+     *
+     * Setting for CSRF SameSite cookie token.
+     *
+     * Allowed values are: None - Lax - Strict - ''.
+     *
+     * Defaults to `Lax` as recommended in this link:
+     *
+     * @see https://portswigger.net/web-security/csrf/samesite-cookies
+     *
+     * @var string
+     *
+     * @deprecated
+     */
+    protected $samesite = Cookie::SAMESITE_LAX;
+
+    /**
+     * Constructor.
+     *
+     * Stores our configuration and fires off the init() method to setup
+     * initial state.
+     */
+    public function __construct(App $config)
+    {
+        /** @var SecurityConfig $security */
+        $security = config('Security');
+
+        // Store CSRF-related configurations
+        $this->tokenName  = $security->tokenName ?? $config->CSRFTokenName ?? $this->tokenName;
+        $this->headerName = $security->headerName ?? $config->CSRFHeaderName ?? $this->headerName;
+        $this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
+        $rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
+
+        /** @var CookieConfig $cookie */
+        $cookie = config('Cookie');
+
+        $cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
+        $this->cookieName = $cookiePrefix . $rawCookieName;
+
+        $expires = $security->expires ?? $config->CSRFExpire ?? 7200;
+
+        Cookie::setDefaults($cookie);
+        $this->cookie = new Cookie($rawCookieName, $this->generateHash(), [
+            'expires' => $expires === 0 ? 0 : time() + $expires,
+        ]);
+    }
+
+    /**
+     * CSRF Verify
+     *
+     * @throws SecurityException
+     *
+     * @return $this|false
+     *
+     * @deprecated Use `CodeIgniter\Security\Security::verify()` instead of using this method.
+     *
+     * @codeCoverageIgnore
+     */
+    public function CSRFVerify(RequestInterface $request)
+    {
+        return $this->verify($request);
+    }
+
+    /**
+     * Returns the CSRF Hash.
+     *
+     * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getCSRFHash(): ?string
+    {
+        return $this->getHash();
+    }
+
+    /**
+     * Returns the CSRF Token Name.
+     *
+     * @deprecated Use `CodeIgniter\Security\Security::getTokenName()` instead of using this method.
+     *
+     * @codeCoverageIgnore
+     */
+    public function getCSRFTokenName(): string
+    {
+        return $this->getTokenName();
+    }
+
+    /**
+     * CSRF Verify
+     *
+     * @throws SecurityException
+     *
+     * @return $this|false
+     */
+    public function verify(RequestInterface $request)
+    {
+        // If it's not a POST request we will set the CSRF cookie.
+        if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST') {
+            return $this->sendCookie($request);
+        }
+
+        // Does the token exist in POST, HEADER or optionally php:://input - json data.
+        if ($request->hasHeader($this->headerName) && ! empty($request->getHeader($this->headerName)->getValue())) {
+            $tokenName = $request->getHeader($this->headerName)->getValue();
+        } else {
+            $json = json_decode($request->getBody());
+
+            if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
+                $tokenName = $json->{$this->tokenName} ?? null;
+            } else {
+                $tokenName = null;
+            }
+        }
+
+        $token = $_POST[$this->tokenName] ?? $tokenName;
+
+        // Does the tokens exist in both the POST/POSTed JSON and COOKIE arrays and match?
+        if (! isset($token, $_COOKIE[$this->cookieName]) || ! hash_equals($token, $_COOKIE[$this->cookieName])) {
+            throw SecurityException::forDisallowedAction();
+        }
+
+        if (isset($_POST[$this->tokenName])) {
+            // We kill this since we're done and we don't want to pollute the POST array.
+            unset($_POST[$this->tokenName]);
+            $request->setGlobal('post', $_POST);
+        } elseif (isset($json->{$this->tokenName})) {
+            // We kill this since we're done and we don't want to pollute the JSON data.
+            unset($json->{$this->tokenName});
+            $request->setBody(json_encode($json));
+        }
+
+        if ($this->regenerate) {
+            $this->hash = null;
+            unset($_COOKIE[$this->cookieName]);
+        }
+
+        $this->cookie = $this->cookie->withValue($this->generateHash());
+        $this->sendCookie($request);
+
+        log_message('info', 'CSRF token verified.');
+
+        return $this;
+    }
+
+    /**
+     * Returns the CSRF Hash.
+     */
+    public function getHash(): ?string
+    {
+        return $this->hash;
+    }
+
+    /**
+     * Returns the CSRF Token Name.
+     */
+    public function getTokenName(): string
+    {
+        return $this->tokenName;
+    }
+
+    /**
+     * Returns the CSRF Header Name.
+     */
+    public function getHeaderName(): string
+    {
+        return $this->headerName;
+    }
+
+    /**
+     * Returns the CSRF Cookie Name.
+     */
+    public function getCookieName(): string
+    {
+        return $this->cookieName;
+    }
+
+    /**
+     * Check if CSRF cookie is expired.
+     *
+     * @deprecated
+     *
+     * @codeCoverageIgnore
+     */
+    public function isExpired(): bool
+    {
+        return $this->cookie->isExpired();
+    }
+
+    /**
+     * Check if request should be redirect on failure.
+     */
+    public function shouldRedirect(): bool
+    {
+        return $this->redirect;
+    }
+
+    /**
+     * Sanitize Filename
+     *
+     * Tries to sanitize filenames in order to prevent directory traversal attempts
+     * and other security threats, which is particularly useful for files that
+     * were supplied via user input.
+     *
+     * If it is acceptable for the user input to include relative paths,
+     * e.g. file/in/some/approved/folder.txt, you can set the second optional
+     * parameter, $relative_path to TRUE.
+     *
+     * @param string $str          Input file name
+     * @param bool   $relativePath Whether to preserve paths
+     */
+    public function sanitizeFilename(string $str, bool $relativePath = false): string
+    {
+        // List of sanitize filename strings
+        $bad = [
+            '../',
+            '<!--',
+            '-->',
+            '<',
+            '>',
+            "'",
+            '"',
+            '&',
+            '$',
+            '#',
+            '{',
+            '}',
+            '[',
+            ']',
+            '=',
+            ';',
+            '?',
+            '%20',
+            '%22',
+            '%3c',
+            '%253c',
+            '%3e',
+            '%0e',
+            '%28',
+            '%29',
+            '%2528',
+            '%26',
+            '%24',
+            '%3f',
+            '%3b',
+            '%3d',
+        ];
+
+        if (! $relativePath) {
+            $bad[] = './';
+            $bad[] = '/';
+        }
+
+        $str = remove_invisible_characters($str, false);
+
+        do {
+            $old = $str;
+            $str = str_replace($bad, '', $str);
+        } while ($old !== $str);
+
+        return stripslashes($str);
+    }
+
+    /**
+     * Generates the CSRF Hash.
+     */
+    protected function generateHash(): string
+    {
+        if ($this->hash === null) {
+            // If the cookie exists we will use its value.
+            // We don't necessarily want to regenerate it with
+            // each page load since a page could contain embedded
+            // sub-pages causing this feature to fail
+            if (isset($_COOKIE[$this->cookieName])
+                && is_string($_COOKIE[$this->cookieName])
+                && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1
+            ) {
+                return $this->hash = $_COOKIE[$this->cookieName];
+            }
+
+            $this->hash = bin2hex(random_bytes(16));
+        }
+
+        return $this->hash;
+    }
+
+    /**
+     * CSRF Send Cookie
+     *
+     * @return false|Security
+     */
+    protected function sendCookie(RequestInterface $request)
+    {
+        if ($this->cookie->isSecure() && ! $request->isSecure()) {
+            return false;
+        }
+
+        $this->doSendCookie();
+        log_message('info', 'CSRF cookie sent.');
+
+        return $this;
+    }
+
+    /**
+     * Actual dispatching of cookies.
+     * Extracted for this to be unit tested.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function doSendCookie(): void
+    {
+        cookies([$this->cookie], false)->dispatch();
+    }
 }
diff --git a/system/Security/SecurityInterface.php b/system/Security/SecurityInterface.php
index e77ded36f944..8dfefbc92008 100644
--- a/system/Security/SecurityInterface.php
+++ b/system/Security/SecurityInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security;
@@ -19,76 +19,60 @@
  */
 interface SecurityInterface
 {
-	/**
-	 * CSRF Verify
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return $this|false
-	 *
-	 * @throws SecurityException
-	 */
-	public function verify(RequestInterface $request);
+    /**
+     * CSRF Verify
+     *
+     * @throws SecurityException
+     *
+     * @return $this|false
+     */
+    public function verify(RequestInterface $request);
 
-	/**
-	 * Returns the CSRF Hash.
-	 *
-	 * @return string|null
-	 */
-	public function getHash(): ?string;
+    /**
+     * Returns the CSRF Hash.
+     */
+    public function getHash(): ?string;
 
-	/**
-	 * Returns the CSRF Token Name.
-	 *
-	 * @return string
-	 */
-	public function getTokenName(): string;
+    /**
+     * Returns the CSRF Token Name.
+     */
+    public function getTokenName(): string;
 
-	/**
-	 * Returns the CSRF Header Name.
-	 *
-	 * @return string
-	 */
-	public function getHeaderName(): string;
+    /**
+     * Returns the CSRF Header Name.
+     */
+    public function getHeaderName(): string;
 
-	/**
-	 * Returns the CSRF Cookie Name.
-	 *
-	 * @return string
-	 */
-	public function getCookieName(): string;
+    /**
+     * Returns the CSRF Cookie Name.
+     */
+    public function getCookieName(): string;
 
-	/**
-	 * Check if CSRF cookie is expired.
-	 *
-	 * @return boolean
-	 *
-	 * @deprecated
-	 */
-	public function isExpired(): bool;
+    /**
+     * Check if CSRF cookie is expired.
+     *
+     * @deprecated
+     */
+    public function isExpired(): bool;
 
-	/**
-	 * Check if request should be redirect on failure.
-	 *
-	 * @return boolean
-	 */
-	public function shouldRedirect(): bool;
+    /**
+     * Check if request should be redirect on failure.
+     */
+    public function shouldRedirect(): bool;
 
-	/**
-	 * Sanitize Filename
-	 *
-	 * Tries to sanitize filenames in order to prevent directory traversal attempts
-	 * and other security threats, which is particularly useful for files that
-	 * were supplied via user input.
-	 *
-	 * If it is acceptable for the user input to include relative paths,
-	 * e.g. file/in/some/approved/folder.txt, you can set the second optional
-	 * parameter, $relative_path to TRUE.
-	 *
-	 * @param string  $str          Input file name
-	 * @param boolean $relativePath Whether to preserve paths
-	 *
-	 * @return string
-	 */
-	public function sanitizeFilename(string $str, bool $relativePath = false): string;
+    /**
+     * Sanitize Filename
+     *
+     * Tries to sanitize filenames in order to prevent directory traversal attempts
+     * and other security threats, which is particularly useful for files that
+     * were supplied via user input.
+     *
+     * If it is acceptable for the user input to include relative paths,
+     * e.g. file/in/some/approved/folder.txt, you can set the second optional
+     * parameter, $relative_path to TRUE.
+     *
+     * @param string $str          Input file name
+     * @param bool   $relativePath Whether to preserve paths
+     */
+    public function sanitizeFilename(string $str, bool $relativePath = false): string;
 }
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
index 4e23b51a4c41..af619c2c198b 100644
--- a/system/Session/Exceptions/SessionException.php
+++ b/system/Session/Exceptions/SessionException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Exceptions;
@@ -15,38 +15,38 @@
 
 class SessionException extends FrameworkException
 {
-	public static function forMissingDatabaseTable()
-	{
-		return new static(lang('Session.missingDatabaseTable'));
-	}
-
-	public static function forInvalidSavePath(string $path = null)
-	{
-		return new static(lang('Session.invalidSavePath', [$path]));
-	}
-
-	public static function forWriteProtectedSavePath(string $path = null)
-	{
-		return new static(lang('Session.writeProtectedSavePath', [$path]));
-	}
-
-	public static function forEmptySavepath()
-	{
-		return new static(lang('Session.emptySavePath'));
-	}
-
-	public static function forInvalidSavePathFormat(string $path)
-	{
-		return new static(lang('Session.invalidSavePathFormat', [$path]));
-	}
-
-	/**
-	 * @deprecated
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public static function forInvalidSameSiteSetting(string $samesite)
-	{
-		return new static(lang('Session.invalidSameSiteSetting', [$samesite]));
-	}
+    public static function forMissingDatabaseTable()
+    {
+        return new static(lang('Session.missingDatabaseTable'));
+    }
+
+    public static function forInvalidSavePath(?string $path = null)
+    {
+        return new static(lang('Session.invalidSavePath', [$path]));
+    }
+
+    public static function forWriteProtectedSavePath(?string $path = null)
+    {
+        return new static(lang('Session.writeProtectedSavePath', [$path]));
+    }
+
+    public static function forEmptySavepath()
+    {
+        return new static(lang('Session.emptySavePath'));
+    }
+
+    public static function forInvalidSavePathFormat(string $path)
+    {
+        return new static(lang('Session.invalidSavePathFormat', [$path]));
+    }
+
+    /**
+     * @deprecated
+     *
+     * @codeCoverageIgnore
+     */
+    public static function forInvalidSameSiteSetting(string $samesite)
+    {
+        return new static(lang('Session.invalidSameSiteSetting', [$samesite]));
+    }
 }
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
index ef4a266be65b..31951a788e65 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -1,17 +1,17 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using static array for storage.
@@ -19,104 +19,73 @@
  */
 class ArrayHandler extends BaseHandler
 {
-	protected static $cache = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Open
-	 *
-	 * Ensures we have an initialized database connection.
-	 *
-	 * @param string $savePath Path to session files' directory
-	 * @param string $name     Session cookie name
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function open($savePath, $name): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Read
-	 *
-	 * Reads session data and acquires a lock
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return string    Serialized session data
-	 */
-	public function read($sessionID): string
-	{
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Write
-	 *
-	 * Writes (create / update) session data
-	 *
-	 * @param string $sessionID   Session ID
-	 * @param string $sessionData Serialized session data
-	 *
-	 * @return boolean
-	 */
-	public function write($sessionID, $sessionData): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close
-	 *
-	 * Releases locks and closes file descriptor.
-	 *
-	 * @return boolean
-	 */
-	public function close(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroy
-	 *
-	 * Destroys the current session.
-	 *
-	 * @param string $sessionID
-	 *
-	 * @return boolean
-	 */
-	public function destroy($sessionID): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Garbage Collector
-	 *
-	 * Deletes expired sessions
-	 *
-	 * @param integer $maxlifetime Maximum lifetime of sessions
-	 *
-	 * @return boolean
-	 */
-	public function gc($maxlifetime): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    protected static $cache = [];
+
+    /**
+     * Re-initialize existing session, or creates a new one.
+     *
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
+     */
+    public function open($path, $name): bool
+    {
+        return true;
+    }
+
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        return '';
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        return true;
+    }
+
+    /**
+     * Closes the current session.
+     */
+    public function close(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Destroys a session
+     *
+     * @param string $id The session ID being destroyed
+     */
+    public function destroy($id): bool
+    {
+        return true;
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        return 1;
+    }
 }
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 0487ca4de0ec..984b0fe7c3f6 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
@@ -20,171 +20,151 @@
  */
 abstract class BaseHandler implements SessionHandlerInterface
 {
-	use LoggerAwareTrait;
-
-	/**
-	 * The Data fingerprint.
-	 *
-	 * @var string
-	 */
-	protected $fingerprint;
-
-	/**
-	 * Lock placeholder.
-	 *
-	 * @var mixed
-	 */
-	protected $lock = false;
-
-	/**
-	 * Cookie prefix
-	 *
-	 * @var string
-	 */
-	protected $cookiePrefix = '';
-
-	/**
-	 * Cookie domain
-	 *
-	 * @var string
-	 */
-	protected $cookieDomain = '';
-
-	/**
-	 * Cookie path
-	 *
-	 * @var string
-	 */
-	protected $cookiePath = '/';
-
-	/**
-	 * Cookie secure?
-	 *
-	 * @var boolean
-	 */
-	protected $cookieSecure = false;
-
-	/**
-	 * Cookie name to use
-	 *
-	 * @var string
-	 */
-	protected $cookieName;
-
-	/**
-	 * Match IP addresses for cookies?
-	 *
-	 * @var boolean
-	 */
-	protected $matchIP = false;
-
-	/**
-	 * Current session ID
-	 *
-	 * @var string
-	 */
-	protected $sessionID;
-
-	/**
-	 * The 'save path' for the session
-	 * varies between
-	 *
-	 * @var string|array
-	 */
-	protected $savePath;
-
-	/**
-	 * User's IP address.
-	 *
-	 * @var string
-	 */
-	protected $ipAddress;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param AppConfig $config
-	 * @param string    $ipAddress
-	 */
-	public function __construct(AppConfig $config, string $ipAddress)
-	{
-		$this->cookiePrefix = $config->cookiePrefix;
-		$this->cookieDomain = $config->cookieDomain;
-		$this->cookiePath   = $config->cookiePath;
-		$this->cookieSecure = $config->cookieSecure;
-		$this->cookieName   = $config->sessionCookieName;
-		$this->matchIP      = $config->sessionMatchIP;
-		$this->savePath     = $config->sessionSavePath;
-		$this->ipAddress    = $ipAddress;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Internal method to force removal of a cookie by the client
-	 * when session_destroy() is called.
-	 *
-	 * @return boolean
-	 */
-	protected function destroyCookie(): bool
-	{
-		return setcookie(
-				$this->cookieName, '', 1, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * A dummy method allowing drivers with no locking functionality
-	 * (databases other than PostgreSQL and MySQL) to act as if they
-	 * do acquire a lock.
-	 *
-	 * @param string $sessionID
-	 *
-	 * @return boolean
-	 */
-	protected function lockSession(string $sessionID): bool
-	{
-		$this->lock = true;
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Releases the lock, if any.
-	 *
-	 * @return boolean
-	 */
-	protected function releaseLock(): bool
-	{
-		$this->lock = false;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Fail
-	 *
-	 * Drivers other than the 'files' one don't (need to) use the
-	 * session.save_path INI setting, but that leads to confusing
-	 * error messages emitted by PHP when open() or write() fail,
-	 * as the message contains session.save_path ...
-	 * To work around the problem, the drivers will call this method
-	 * so that the INI is set just in time for the error message to
-	 * be properly generated.
-	 *
-	 * @return boolean
-	 */
-	protected function fail(): bool
-	{
-		ini_set('session.save_path', $this->savePath);
-
-		return false;
-	}
+    use LoggerAwareTrait;
+
+    /**
+     * The Data fingerprint.
+     *
+     * @var string
+     */
+    protected $fingerprint;
+
+    /**
+     * Lock placeholder.
+     *
+     * @var mixed
+     */
+    protected $lock = false;
+
+    /**
+     * Cookie prefix
+     *
+     * @var string
+     */
+    protected $cookiePrefix = '';
+
+    /**
+     * Cookie domain
+     *
+     * @var string
+     */
+    protected $cookieDomain = '';
+
+    /**
+     * Cookie path
+     *
+     * @var string
+     */
+    protected $cookiePath = '/';
+
+    /**
+     * Cookie secure?
+     *
+     * @var bool
+     */
+    protected $cookieSecure = false;
+
+    /**
+     * Cookie name to use
+     *
+     * @var string
+     */
+    protected $cookieName;
+
+    /**
+     * Match IP addresses for cookies?
+     *
+     * @var bool
+     */
+    protected $matchIP = false;
+
+    /**
+     * Current session ID
+     *
+     * @var string
+     */
+    protected $sessionID;
+
+    /**
+     * The 'save path' for the session
+     * varies between
+     *
+     * @var array|string
+     */
+    protected $savePath;
+
+    /**
+     * User's IP address.
+     *
+     * @var string
+     */
+    protected $ipAddress;
+
+    public function __construct(AppConfig $config, string $ipAddress)
+    {
+        $this->cookiePrefix = $config->cookiePrefix;
+        $this->cookieDomain = $config->cookieDomain;
+        $this->cookiePath   = $config->cookiePath;
+        $this->cookieSecure = $config->cookieSecure;
+        $this->cookieName   = $config->sessionCookieName;
+        $this->matchIP      = $config->sessionMatchIP;
+        $this->savePath     = $config->sessionSavePath;
+        $this->ipAddress    = $ipAddress;
+    }
+
+    /**
+     * Internal method to force removal of a cookie by the client
+     * when session_destroy() is called.
+     */
+    protected function destroyCookie(): bool
+    {
+        return setcookie(
+            $this->cookieName,
+            '',
+            1,
+            $this->cookiePath,
+            $this->cookieDomain,
+            $this->cookieSecure,
+            true
+        );
+    }
+
+    /**
+     * A dummy method allowing drivers with no locking functionality
+     * (databases other than PostgreSQL and MySQL) to act as if they
+     * do acquire a lock.
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        $this->lock = true;
+
+        return true;
+    }
+
+    /**
+     * Releases the lock, if any.
+     */
+    protected function releaseLock(): bool
+    {
+        $this->lock = false;
+
+        return true;
+    }
+
+    /**
+     * Drivers other than the 'files' one don't (need to) use the
+     * session.save_path INI setting, but that leads to confusing
+     * error messages emitted by PHP when open() or write() fail,
+     * as the message contains session.save_path ...
+     *
+     * To work around the problem, the drivers will call this method
+     * so that the INI is set just in time for the error message to
+     * be properly generated.
+     */
+    protected function fail(): bool
+    {
+        ini_set('session.save_path', $this->savePath);
+
+        return false;
+    }
 }
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 0f4bda21d19c..18da544d2873 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
@@ -15,389 +15,312 @@
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
 use Config\Database;
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using current Database for storage
  */
 class DatabaseHandler extends BaseHandler
 {
-	/**
-	 * The database group to use for storage.
-	 *
-	 * @var string
-	 */
-	protected $DBGroup;
-
-	/**
-	 * The name of the table to store session info.
-	 *
-	 * @var string
-	 */
-	protected $table;
-
-	/**
-	 * The DB Connection instance.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * The database type, for locking purposes.
-	 *
-	 * @var string
-	 */
-	protected $platform;
-
-	/**
-	 * Row exists flag
-	 *
-	 * @var boolean
-	 */
-	protected $rowExists = false;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param AppConfig $config
-	 * @param string    $ipAddress
-	 */
-	public function __construct(AppConfig $config, string $ipAddress)
-	{
-		parent::__construct($config, $ipAddress);
-
-		// Determine Table
-		$this->table = $config->sessionSavePath;
-
-		if (empty($this->table))
-		{
-			throw SessionException::forMissingDatabaseTable();
-		}
-
-		// Get DB Connection
-		// @phpstan-ignore-next-line
-		$this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
-
-		$this->db = Database::connect($this->DBGroup);
-
-		// Determine Database type
-		$driver = strtolower(get_class($this->db));
-		if (strpos($driver, 'mysql') !== false)
-		{
-			$this->platform = 'mysql';
-		}
-		elseif (strpos($driver, 'postgre') !== false)
-		{
-			$this->platform = 'postgre';
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Open
-	 *
-	 * Ensures we have an initialized database connection.
-	 *
-	 * @param string $savePath Path to session files' directory
-	 * @param string $name     Session cookie name
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function open($savePath, $name): bool
-	{
-		if (empty($this->db->connID))
-		{
-			$this->db->initialize();
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Read
-	 *
-	 * Reads session data and acquires a lock
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return string    Serialized session data
-	 */
-	public function read($sessionID): string
-	{
-		if ($this->lockSession($sessionID) === false)
-		{
-			$this->fingerprint = md5('');
-			return '';
-		}
-
-		// Needed by write() to detect session_regenerate_id() calls
-		if (is_null($this->sessionID)) // @phpstan-ignore-line
-		{
-			$this->sessionID = $sessionID;
-		}
-
-		$builder = $this->db->table($this->table)
-				->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
-				->where('id', $sessionID);
-
-		if ($this->matchIP)
-		{
-			$builder = $builder->where('ip_address', $this->ipAddress);
-		}
-
-		$result = $builder->get()->getRow();
-
-		if ($result === null)
-		{
-			// PHP7 will reuse the same SessionHandler object after
-			// ID regeneration, so we need to explicitly set this to
-			// FALSE instead of relying on the default ...
-			$this->rowExists   = false;
-			$this->fingerprint = md5('');
-
-			return '';
-		}
-
-		if (is_bool($result))
-		{
-			$result = '';
-		}
-		else
-		{
-			$result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data), true) : $result->data;
-		}
-
-		$this->fingerprint = md5($result);
-		$this->rowExists   = true;
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Write
-	 *
-	 * Writes (create / update) session data
-	 *
-	 * @param string $sessionID   Session ID
-	 * @param string $sessionData Serialized session data
-	 *
-	 * @return boolean
-	 */
-	public function write($sessionID, $sessionData): bool
-	{
-		if ($this->lock === false)
-		{
-			return $this->fail();
-		}
-
-		// Was the ID regenerated?
-		if ($sessionID !== $this->sessionID)
-		{
-			$this->rowExists = false;
-			$this->sessionID = $sessionID;
-		}
-
-		if ($this->rowExists === false)
-		{
-			$insertData = [
-				'id'         => $sessionID,
-				'ip_address' => $this->ipAddress,
-				'timestamp'  => 'now()',
-				'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($sessionData) : $sessionData,
-			];
-
-			if (! $this->db->table($this->table)->insert($insertData))
-			{
-				return $this->fail();
-			}
-
-			$this->fingerprint = md5($sessionData);
-			$this->rowExists   = true;
-
-			return true;
-		}
-
-		$builder = $this->db->table($this->table)->where('id', $sessionID);
-
-		if ($this->matchIP)
-		{
-			$builder = $builder->where('ip_address', $this->ipAddress);
-		}
-
-		$updateData = [
-			'timestamp' => 'now()',
-		];
-
-		if ($this->fingerprint !== md5($sessionData))
-		{
-			$updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($sessionData) : $sessionData;
-		}
-
-		if (! $builder->update($updateData))
-		{
-			return $this->fail();
-		}
-
-		$this->fingerprint = md5($sessionData);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close
-	 *
-	 * Releases locks and closes file descriptor.
-	 *
-	 * @return boolean
-	 */
-	public function close(): bool
-	{
-		return ($this->lock && ! $this->releaseLock()) ? $this->fail() : true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroy
-	 *
-	 * Destroys the current session.
-	 *
-	 * @param string $sessionID
-	 *
-	 * @return boolean
-	 */
-	public function destroy($sessionID): bool
-	{
-		if ($this->lock)
-		{
-			$builder = $this->db->table($this->table)->where('id', $sessionID);
-
-			if ($this->matchIP)
-			{
-				$builder = $builder->where('ip_address', $this->ipAddress);
-			}
-
-			if (! $builder->delete())
-			{
-				return $this->fail();
-			}
-		}
-
-		if ($this->close())
-		{
-			$this->destroyCookie();
-
-			return true;
-		}
-
-		return $this->fail();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Garbage Collector
-	 *
-	 * Deletes expired sessions
-	 *
-	 * @param integer $maxlifetime Maximum lifetime of sessions
-	 *
-	 * @return boolean
-	 */
-	public function gc($maxlifetime): bool
-	{
-		$interval = implode(" '"[(int)($this->platform === 'postgre')], ['', "{$maxlifetime} second", '']);
-		return ($this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}")) ? true : $this->fail();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Lock the session.
-	 *
-	 * @param  string $sessionID
-	 * @return boolean
-	 */
-	protected function lockSession(string $sessionID): bool
-	{
-		if ($this->platform === 'mysql')
-		{
-			$arg = md5($sessionID . ($this->matchIP ? '_' . $this->ipAddress : ''));
-			if ($this->db->query("SELECT GET_LOCK('{$arg}', 300) AS ci_session_lock")->getRow()->ci_session_lock)
-			{
-				$this->lock = $arg;
-				return true;
-			}
-
-			return $this->fail();
-		}
-
-		if ($this->platform === 'postgre')
-		{
-			$arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
-			if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})"))
-			{
-				$this->lock = $arg;
-				return true;
-			}
-
-			return $this->fail();
-		}
-
-		// Unsupported DB? Let the parent handle the simplified version.
-		return parent::lockSession($sessionID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Releases the lock, if any.
-	 *
-	 * @return boolean
-	 */
-	protected function releaseLock(): bool
-	{
-		if (! $this->lock)
-		{
-			return true;
-		}
-
-		if ($this->platform === 'mysql')
-		{
-			if ($this->db->query("SELECT RELEASE_LOCK('{$this->lock}') AS ci_session_lock")->getRow()->ci_session_lock)
-			{
-				$this->lock = false;
-				return true;
-			}
-
-			return $this->fail();
-		}
-
-		if ($this->platform === 'postgre')
-		{
-			if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})"))
-			{
-				$this->lock = false;
-				return true;
-			}
-
-			return $this->fail();
-		}
-
-		// Unsupported DB? Let the parent handle the simple version.
-		return parent::releaseLock();
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The database group to use for storage.
+     *
+     * @var string
+     */
+    protected $DBGroup;
+
+    /**
+     * The name of the table to store session info.
+     *
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * The DB Connection instance.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * The database type, for locking purposes.
+     *
+     * @var string
+     */
+    protected $platform;
+
+    /**
+     * Row exists flag
+     *
+     * @var bool
+     */
+    protected $rowExists = false;
+
+    /**
+     * @throws SessionException
+     */
+    public function __construct(AppConfig $config, string $ipAddress)
+    {
+        parent::__construct($config, $ipAddress);
+        $this->table = $config->sessionSavePath;
+
+        if (empty($this->table)) {
+            throw SessionException::forMissingDatabaseTable();
+        }
+
+        // @phpstan-ignore-next-line
+        $this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
+
+        $this->db = Database::connect($this->DBGroup);
+
+        $driver = strtolower(get_class($this->db));
+
+        if (strpos($driver, 'mysql') !== false) {
+            $this->platform = 'mysql';
+        } elseif (strpos($driver, 'postgre') !== false) {
+            $this->platform = 'postgre';
+        }
+    }
+
+    /**
+     * Re-initialize existing session, or creates a new one.
+     *
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
+     */
+    public function open($path, $name): bool
+    {
+        if (empty($this->db->connID)) {
+            $this->db->initialize();
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        if ($this->lockSession($id) === false) {
+            $this->fingerprint = md5('');
+
+            return '';
+        }
+
+        if (! isset($this->sessionID)) {
+            $this->sessionID = $id;
+        }
+
+        $builder = $this->db->table($this->table)
+            ->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
+            ->where('id', $id);
+
+        if ($this->matchIP) {
+            $builder = $builder->where('ip_address', $this->ipAddress);
+        }
+
+        $result = $builder->get()->getRow();
+
+        if ($result === null) {
+            // PHP7 will reuse the same SessionHandler object after
+            // ID regeneration, so we need to explicitly set this to
+            // FALSE instead of relying on the default ...
+            $this->rowExists   = false;
+            $this->fingerprint = md5('');
+
+            return '';
+        }
+
+        if (is_bool($result)) {
+            $result = '';
+        } else {
+            $result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data), true) : $result->data;
+        }
+
+        $this->fingerprint = md5($result);
+        $this->rowExists   = true;
+
+        return $result;
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        if ($this->lock === false) {
+            return $this->fail();
+        }
+
+        if ($this->sessionID !== $id) {
+            $this->rowExists = false;
+            $this->sessionID = $id;
+        }
+
+        if ($this->rowExists === false) {
+            $insertData = [
+                'id'         => $id,
+                'ip_address' => $this->ipAddress,
+                'timestamp'  => 'now()',
+                'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($data) : $data,
+            ];
+
+            if (! $this->db->table($this->table)->insert($insertData)) {
+                return $this->fail();
+            }
+
+            $this->fingerprint = md5($data);
+            $this->rowExists   = true;
+
+            return true;
+        }
+
+        $builder = $this->db->table($this->table)->where('id', $id);
+
+        if ($this->matchIP) {
+            $builder = $builder->where('ip_address', $this->ipAddress);
+        }
+
+        $updateData = ['timestamp' => 'now()'];
+
+        if ($this->fingerprint !== md5($data)) {
+            $updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($data) : $data;
+        }
+
+        if (! $builder->update($updateData)) {
+            return $this->fail();
+        }
+
+        $this->fingerprint = md5($data);
+
+        return true;
+    }
+
+    /**
+     * Closes the current session.
+     */
+    public function close(): bool
+    {
+        return ($this->lock && ! $this->releaseLock()) ? $this->fail() : true;
+    }
+
+    /**
+     * Destroys a session
+     *
+     * @param string $id The session ID being destroyed
+     */
+    public function destroy($id): bool
+    {
+        if ($this->lock) {
+            $builder = $this->db->table($this->table)->where('id', $id);
+
+            if ($this->matchIP) {
+                $builder = $builder->where('ip_address', $this->ipAddress);
+            }
+
+            if (! $builder->delete()) {
+                return $this->fail();
+            }
+        }
+
+        if ($this->close()) {
+            $this->destroyCookie();
+
+            return true;
+        }
+
+        return $this->fail();
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        $separator = $this->platform === 'postgre' ? '\'' : ' ';
+        $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
+
+        return $this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}") ? 1 : $this->fail();
+    }
+
+    /**
+     * Lock the session.
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        if ($this->platform === 'mysql') {
+            $arg = md5($sessionID . ($this->matchIP ? '_' . $this->ipAddress : ''));
+            if ($this->db->query("SELECT GET_LOCK('{$arg}', 300) AS ci_session_lock")->getRow()->ci_session_lock) {
+                $this->lock = $arg;
+
+                return true;
+            }
+
+            return $this->fail();
+        }
+
+        if ($this->platform === 'postgre') {
+            $arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
+            if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})")) {
+                $this->lock = $arg;
+
+                return true;
+            }
+
+            return $this->fail();
+        }
+
+        // Unsupported DB? Let the parent handle the simplified version.
+        return parent::lockSession($sessionID);
+    }
+
+    /**
+     * Releases the lock, if any.
+     */
+    protected function releaseLock(): bool
+    {
+        if (! $this->lock) {
+            return true;
+        }
+
+        if ($this->platform === 'mysql') {
+            if ($this->db->query("SELECT RELEASE_LOCK('{$this->lock}') AS ci_session_lock")->getRow()->ci_session_lock) {
+                $this->lock = false;
+
+                return true;
+            }
+
+            return $this->fail();
+        }
+
+        if ($this->platform === 'postgre') {
+            if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})")) {
+                $this->lock = false;
+
+                return true;
+            }
+
+            return $this->fail();
+        }
+
+        // Unsupported DB? Let the parent handle the simple version.
+        return parent::releaseLock();
+    }
 }
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index dc28cd4f9822..9a6d2de7eb34 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -1,406 +1,339 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using file system for storage
  */
 class FileHandler extends BaseHandler
 {
-	/**
-	 * Where to save the session files to.
-	 *
-	 * @var string
-	 */
-	protected $savePath;
-
-	/**
-	 * The file handle
-	 *
-	 * @var resource|null
-	 */
-	protected $fileHandle;
-
-	/**
-	 * File Name
-	 *
-	 * @var string
-	 */
-	protected $filePath;
-
-	/**
-	 * Whether this is a new file.
-	 *
-	 * @var boolean
-	 */
-	protected $fileNew;
-
-	/**
-	 * Whether IP addresses should be matched.
-	 *
-	 * @var boolean
-	 */
-	protected $matchIP = false;
-
-	/**
-	 * Regex of session ID
-	 *
-	 * @var string
-	 */
-	protected $sessionIDRegex = '';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param AppConfig $config
-	 * @param string    $ipAddress
-	 */
-	public function __construct(AppConfig $config, string $ipAddress)
-	{
-		parent::__construct($config, $ipAddress);
-
-		if (! empty($config->sessionSavePath))
-		{
-			$this->savePath = rtrim($config->sessionSavePath, '/\\');
-			ini_set('session.save_path', $config->sessionSavePath);
-		}
-		else
-		{
-			$sessionPath = rtrim(ini_get('session.save_path'), '/\\');
-
-			if (! $sessionPath)
-			{
-				$sessionPath = WRITEPATH . 'session';
-			}
-
-			$this->savePath = $sessionPath;
-		}
-
-		$this->matchIP = $config->sessionMatchIP;
-
-		$this->configureSessionIDRegex();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Open
-	 *
-	 * Sanitizes the save_path directory.
-	 *
-	 * @param string $savePath Path to session files' directory
-	 * @param string $name     Session cookie name
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function open($savePath, $name): bool
-	{
-		if (! is_dir($savePath))
-		{
-			if (! mkdir($savePath, 0700, true))
-			{
-				throw SessionException::forInvalidSavePath($this->savePath);
-			}
-		}
-		elseif (! is_writable($savePath))
-		{
-			throw SessionException::forWriteProtectedSavePath($this->savePath);
-		}
-
-		$this->savePath = $savePath;
-		$this->filePath = $this->savePath . '/'
-						  . $name // we'll use the session cookie name as a prefix to avoid collisions
-						  . ($this->matchIP ? md5($this->ipAddress) : '');
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Read
-	 *
-	 * Reads session data and acquires a lock
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return string|boolean    Serialized session data
-	 */
-	public function read($sessionID)
-	{
-		// This might seem weird, but PHP 5.6 introduced session_reset(),
-		// which re-reads session data
-		if ($this->fileHandle === null)
-		{
-			$this->fileNew = ! is_file($this->filePath . $sessionID);
-
-			if (($this->fileHandle = fopen($this->filePath . $sessionID, 'c+b')) === false)
-			{
-				$this->logger->error("Session: Unable to open file '" . $this->filePath . $sessionID . "'.");
-
-				return false;
-			}
-
-			if (flock($this->fileHandle, LOCK_EX) === false)
-			{
-				$this->logger->error("Session: Unable to obtain lock for file '" . $this->filePath . $sessionID . "'.");
-				fclose($this->fileHandle);
-				$this->fileHandle = null;
-
-				return false;
-			}
-
-			// Needed by write() to detect session_regenerate_id() calls
-			if (is_null($this->sessionID)) // @phpstan-ignore-line
-			{
-				$this->sessionID = $sessionID;
-			}
-
-			if ($this->fileNew)
-			{
-				chmod($this->filePath . $sessionID, 0600);
-				$this->fingerprint = md5('');
-
-				return '';
-			}
-		}
-		else
-		{
-			rewind($this->fileHandle);
-		}
-
-		$sessionData = '';
-		clearstatcache();    // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
-		for ($read = 0, $length = filesize($this->filePath . $sessionID); $read < $length; $read += strlen($buffer))
-		{
-			if (($buffer = fread($this->fileHandle, $length - $read)) === false)
-			{
-				break;
-			}
-
-			$sessionData .= $buffer;
-		}
-
-		$this->fingerprint = md5($sessionData);
-
-		return $sessionData;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Write
-	 *
-	 * Writes (create / update) session data
-	 *
-	 * @param string $sessionID   Session ID
-	 * @param string $sessionData Serialized session data
-	 *
-	 * @return boolean
-	 */
-	public function write($sessionID, $sessionData): bool
-	{
-		// If the two IDs don't match, we have a session_regenerate_id() call
-		if ($sessionID !== $this->sessionID)
-		{
-			$this->sessionID = $sessionID;
-		}
-
-		if (! is_resource($this->fileHandle))
-		{
-			return false;
-		}
-
-		if ($this->fingerprint === md5($sessionData))
-		{
-			return ($this->fileNew) ? true : touch($this->filePath . $sessionID);
-		}
-
-		if (! $this->fileNew)
-		{
-			ftruncate($this->fileHandle, 0);
-			rewind($this->fileHandle);
-		}
-
-		if (($length = strlen($sessionData)) > 0)
-		{
-			$result = null;
-
-			for ($written = 0; $written < $length; $written += $result)
-			{
-				if (($result = fwrite($this->fileHandle, substr($sessionData, $written))) === false)
-				{
-					break;
-				}
-			}
-
-			if (! is_int($result))
-			{
-				$this->fingerprint = md5(substr($sessionData, 0, $written));
-				$this->logger->error('Session: Unable to write data.');
-
-				return false;
-			}
-		}
-
-		$this->fingerprint = md5($sessionData);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close
-	 *
-	 * Releases locks and closes file descriptor.
-	 *
-	 * @return boolean
-	 */
-	public function close(): bool
-	{
-		if (is_resource($this->fileHandle))
-		{
-			flock($this->fileHandle, LOCK_UN);
-			fclose($this->fileHandle);
-
-			$this->fileHandle = null;
-			$this->fileNew    = false;
-
-			return true;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroy
-	 *
-	 * Destroys the current session.
-	 *
-	 * @param string $sessionId Session ID
-	 *
-	 * @return boolean
-	 */
-	public function destroy($sessionId): bool
-	{
-		if ($this->close())
-		{
-			return is_file($this->filePath . $sessionId)
-				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
-		}
-
-		if ($this->filePath !== null)
-		{
-			clearstatcache();
-
-			return is_file($this->filePath . $sessionId)
-				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Garbage Collector
-	 *
-	 * Deletes expired sessions
-	 *
-	 * @param integer $maxlifetime Maximum lifetime of sessions
-	 *
-	 * @return boolean
-	 */
-	public function gc($maxlifetime): bool
-	{
-		if (! is_dir($this->savePath) || ($directory = opendir($this->savePath)) === false)
-		{
-			$this->logger->debug("Session: Garbage collector couldn't list files under directory '" . $this->savePath . "'.");
-
-			return false;
-		}
-
-		$ts = time() - $maxlifetime;
-
-		$pattern = $this->matchIP === true
-			? '[0-9a-f]{32}'
-			: '';
-
-		$pattern = sprintf(
-			'#\A%s' . $pattern . $this->sessionIDRegex . '\z#',
-			preg_quote($this->cookieName)
-		);
-
-		while (($file = readdir($directory)) !== false)
-		{
-			// If the filename doesn't match this pattern, it's either not a session file or is not ours
-			if (! preg_match($pattern, $file)
-				|| ! is_file($this->savePath . DIRECTORY_SEPARATOR . $file)
-				|| ($mtime = filemtime($this->savePath . DIRECTORY_SEPARATOR . $file)) === false
-				|| $mtime > $ts
-			)
-			{
-				continue;
-			}
-
-			unlink($this->savePath . DIRECTORY_SEPARATOR . $file);
-		}
-
-		closedir($directory);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Configure Session ID regular expression
-	 */
-	protected function configureSessionIDRegex()
-	{
-		$bitsPerCharacter = (int) ini_get('session.sid_bits_per_character');
-		$SIDLength        = (int) ini_get('session.sid_length');
-
-		if (($bits = $SIDLength * $bitsPerCharacter) < 160)
-		{
-			// Add as many more characters as necessary to reach at least 160 bits
-			$SIDLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
-			ini_set('session.sid_length', (string) $SIDLength);
-		}
-
-		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
-		switch ($bitsPerCharacter)
-		{
-			case 4:
-				$this->sessionIDRegex = '[0-9a-f]';
-				break;
-			case 5:
-				$this->sessionIDRegex = '[0-9a-v]';
-				break;
-			case 6:
-				$this->sessionIDRegex = '[0-9a-zA-Z,-]';
-				break;
-		}
-
-		$this->sessionIDRegex .= '{' . $SIDLength . '}';
-	}
+    /**
+     * Where to save the session files to.
+     *
+     * @var string
+     */
+    protected $savePath;
+
+    /**
+     * The file handle
+     *
+     * @var resource|null
+     */
+    protected $fileHandle;
+
+    /**
+     * File Name
+     *
+     * @var string
+     */
+    protected $filePath;
+
+    /**
+     * Whether this is a new file.
+     *
+     * @var bool
+     */
+    protected $fileNew;
+
+    /**
+     * Whether IP addresses should be matched.
+     *
+     * @var bool
+     */
+    protected $matchIP = false;
+
+    /**
+     * Regex of session ID
+     *
+     * @var string
+     */
+    protected $sessionIDRegex = '';
+
+    public function __construct(AppConfig $config, string $ipAddress)
+    {
+        parent::__construct($config, $ipAddress);
+
+        if (! empty($config->sessionSavePath)) {
+            $this->savePath = rtrim($config->sessionSavePath, '/\\');
+            ini_set('session.save_path', $config->sessionSavePath);
+        } else {
+            $sessionPath = rtrim(ini_get('session.save_path'), '/\\');
+
+            if (! $sessionPath) {
+                $sessionPath = WRITEPATH . 'session';
+            }
+
+            $this->savePath = $sessionPath;
+        }
+
+        $this->matchIP = $config->sessionMatchIP;
+
+        $this->configureSessionIDRegex();
+    }
+
+    /**
+     * Re-initialize existing session, or creates a new one.
+     *
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
+     *
+     * @throws SessionException
+     */
+    public function open($path, $name): bool
+    {
+        if (! is_dir($path) && ! mkdir($path, 0700, true)) {
+            throw SessionException::forInvalidSavePath($this->savePath);
+        }
+
+        if (! is_writable($path)) {
+            throw SessionException::forWriteProtectedSavePath($this->savePath);
+        }
+
+        $this->savePath = $path;
+
+        // we'll use the session name as prefix to avoid collisions
+        $this->filePath = $this->savePath . '/' . $name . ($this->matchIP ? md5($this->ipAddress) : '');
+
+        return true;
+    }
+
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        // This might seem weird, but PHP 5.6 introduced session_reset(),
+        // which re-reads session data
+        if ($this->fileHandle === null) {
+            $this->fileNew = ! is_file($this->filePath . $id);
+
+            if (($this->fileHandle = fopen($this->filePath . $id, 'c+b')) === false) {
+                $this->logger->error("Session: Unable to open file '" . $this->filePath . $id . "'.");
+
+                return false;
+            }
+
+            if (flock($this->fileHandle, LOCK_EX) === false) {
+                $this->logger->error("Session: Unable to obtain lock for file '" . $this->filePath . $id . "'.");
+                fclose($this->fileHandle);
+                $this->fileHandle = null;
+
+                return false;
+            }
+
+            if (! isset($this->sessionID)) {
+                $this->sessionID = $id;
+            }
+
+            if ($this->fileNew) {
+                chmod($this->filePath . $id, 0600);
+                $this->fingerprint = md5('');
+
+                return '';
+            }
+        } else {
+            rewind($this->fileHandle);
+        }
+
+        $data   = '';
+        $buffer = 0;
+        clearstatcache(); // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
+
+        for ($read = 0, $length = filesize($this->filePath . $id); $read < $length; $read += strlen($buffer)) {
+            if (($buffer = fread($this->fileHandle, $length - $read)) === false) {
+                break;
+            }
+
+            $data .= $buffer;
+        }
+
+        $this->fingerprint = md5($data);
+
+        return $data;
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        // If the two IDs don't match, we have a session_regenerate_id() call
+        if ($id !== $this->sessionID) {
+            $this->sessionID = $id;
+        }
+
+        if (! is_resource($this->fileHandle)) {
+            return false;
+        }
+
+        if ($this->fingerprint === md5($data)) {
+            return ($this->fileNew) ? true : touch($this->filePath . $id);
+        }
+
+        if (! $this->fileNew) {
+            ftruncate($this->fileHandle, 0);
+            rewind($this->fileHandle);
+        }
+
+        if (($length = strlen($data)) > 0) {
+            $result = null;
+
+            for ($written = 0; $written < $length; $written += $result) {
+                if (($result = fwrite($this->fileHandle, substr($data, $written))) === false) {
+                    break;
+                }
+            }
+
+            if (! is_int($result)) {
+                $this->fingerprint = md5(substr($data, 0, $written));
+                $this->logger->error('Session: Unable to write data.');
+
+                return false;
+            }
+        }
+
+        $this->fingerprint = md5($data);
+
+        return true;
+    }
+
+    /**
+     * Closes the current session.
+     */
+    public function close(): bool
+    {
+        if (is_resource($this->fileHandle)) {
+            flock($this->fileHandle, LOCK_UN);
+            fclose($this->fileHandle);
+
+            $this->fileHandle = null;
+            $this->fileNew    = false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Destroys a session
+     *
+     * @param string $id The session ID being destroyed
+     */
+    public function destroy($id): bool
+    {
+        if ($this->close()) {
+            return is_file($this->filePath . $id)
+                ? (unlink($this->filePath . $id) && $this->destroyCookie())
+                : true;
+        }
+
+        if ($this->filePath !== null) {
+            clearstatcache();
+
+            return is_file($this->filePath . $id)
+                ? (unlink($this->filePath . $id) && $this->destroyCookie())
+                : true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        if (! is_dir($this->savePath) || ($directory = opendir($this->savePath)) === false) {
+            $this->logger->debug("Session: Garbage collector couldn't list files under directory '" . $this->savePath . "'.");
+
+            return false;
+        }
+
+        $ts = time() - $max_lifetime;
+
+        $pattern = $this->matchIP === true ? '[0-9a-f]{32}' : '';
+
+        $pattern = sprintf(
+            '#\A%s' . $pattern . $this->sessionIDRegex . '\z#',
+            preg_quote($this->cookieName, '#')
+        );
+
+        $collected = 0;
+
+        while (($file = readdir($directory)) !== false) {
+            // If the filename doesn't match this pattern, it's either not a session file or is not ours
+            if (! preg_match($pattern, $file)
+                || ! is_file($this->savePath . DIRECTORY_SEPARATOR . $file)
+                || ($mtime = filemtime($this->savePath . DIRECTORY_SEPARATOR . $file)) === false
+                || $mtime > $ts
+            ) {
+                continue;
+            }
+
+            unlink($this->savePath . DIRECTORY_SEPARATOR . $file);
+            $collected++;
+        }
+
+        closedir($directory);
+
+        return $collected;
+    }
+
+    /**
+     * Configure Session ID regular expression
+     */
+    protected function configureSessionIDRegex()
+    {
+        $bitsPerCharacter = (int) ini_get('session.sid_bits_per_character');
+        $SIDLength        = (int) ini_get('session.sid_length');
+
+        if (($bits = $SIDLength * $bitsPerCharacter) < 160) {
+            // Add as many more characters as necessary to reach at least 160 bits
+            $SIDLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
+            ini_set('session.sid_length', (string) $SIDLength);
+        }
+
+        switch ($bitsPerCharacter) {
+            case 4:
+                $this->sessionIDRegex = '[0-9a-f]';
+                break;
+
+            case 5:
+                $this->sessionIDRegex = '[0-9a-v]';
+                break;
+
+            case 6:
+                $this->sessionIDRegex = '[0-9a-zA-Z,-]';
+                break;
+        }
+
+        $this->sessionIDRegex .= '{' . $SIDLength . '}';
+    }
 }
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index ea744fa7c8ce..5e963bf5048a 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
@@ -14,366 +14,290 @@
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
 use Memcached;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using Memcache for persistence
  */
 class MemcachedHandler extends BaseHandler
 {
-	/**
-	 * Memcached instance
-	 *
-	 * @var Memcached|null
-	 */
-	protected $memcached;
-
-	/**
-	 * Key prefix
-	 *
-	 * @var string
-	 */
-	protected $keyPrefix = 'ci_session:';
-
-	/**
-	 * Lock key
-	 *
-	 * @var string|null
-	 */
-	protected $lockKey;
-
-	/**
-	 * Number of seconds until the session ends.
-	 *
-	 * @var integer
-	 */
-	protected $sessionExpiration = 7200;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param  AppConfig $config
-	 * @param  string    $ipAddress
-	 * @throws SessionException
-	 */
-	public function __construct(AppConfig $config, string $ipAddress)
-	{
-		parent::__construct($config, $ipAddress);
-
-		if (empty($this->savePath))
-		{
-			throw SessionException::forEmptySavepath();
-		}
-
-		if ($this->matchIP === true)
-		{
-			$this->keyPrefix .= $this->ipAddress . ':';
-		}
-
-		if (! empty($this->keyPrefix))
-		{
-			ini_set('memcached.sess_prefix', $this->keyPrefix);
-		}
-
-		$this->sessionExpiration = $config->sessionExpiration;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Open
-	 *
-	 * Sanitizes save_path and initializes connections.
-	 *
-	 * @param string $savePath Server path(s)
-	 * @param string $name     Session cookie name, unused
-	 *
-	 * @return boolean
-	 */
-	public function open($savePath, $name): bool
-	{
-		$this->memcached = new Memcached();
-		$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
-
-		$serverList = [];
-
-		foreach ($this->memcached->getServerList() as $server)
-		{
-			$serverList[] = $server['host'] . ':' . $server['port'];
-		}
-
-		if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)
-		)
-		{
-			$this->memcached = null;
-			$this->logger->error('Session: Invalid Memcached save path format: ' . $this->savePath);
-
-			return false;
-		}
-
-		foreach ($matches as $match)
-		{
-			// If Memcached already has this server (or if the port is invalid), skip it
-			if (in_array($match[1] . ':' . $match[2], $serverList, true))
-			{
-				$this->logger->debug('Session: Memcached server pool already has ' . $match[1] . ':' . $match[2]);
-				continue;
-			}
-
-			if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0))
-			{
-				$this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
-			}
-			else
-			{
-				$serverList[] = $match[1] . ':' . $match[2];
-			}
-		}
-
-		if (empty($serverList))
-		{
-			$this->logger->error('Session: Memcached server pool is empty.');
-
-			return false;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Read
-	 *
-	 * Reads session data and acquires a lock
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return string    Serialized session data
-	 */
-	public function read($sessionID): string
-	{
-		if (isset($this->memcached) && $this->lockSession($sessionID))
-		{
-			// Needed by write() to detect session_regenerate_id() calls
-			if (is_null($this->sessionID)) // @phpstan-ignore-line
-			{
-				$this->sessionID = $sessionID;
-			}
-
-			$sessionData       = (string) $this->memcached->get($this->keyPrefix . $sessionID);
-			$this->fingerprint = md5($sessionData);
-
-			return $sessionData;
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Write
-	 *
-	 * Writes (create / update) session data
-	 *
-	 * @param string $sessionID   Session ID
-	 * @param string $sessionData Serialized session data
-	 *
-	 * @return boolean
-	 */
-	public function write($sessionID, $sessionData): bool
-	{
-		if (! isset($this->memcached))
-		{
-			return false;
-		}
-
-		// Was the ID regenerated?
-		if ($sessionID !== $this->sessionID)
-		{
-			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
-			{
-				return false;
-			}
-
-			$this->fingerprint = md5('');
-			$this->sessionID   = $sessionID;
-		}
-
-		if (isset($this->lockKey))
-		{
-			$this->memcached->replace($this->lockKey, time(), 300);
-
-			if ($this->fingerprint !== ($fingerprint = md5($sessionData)))
-			{
-				if ($this->memcached->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration))
-				{
-					$this->fingerprint = $fingerprint;
-
-					return true;
-				}
-
-				return false;
-			}
-
-			return $this->memcached->touch($this->keyPrefix . $sessionID, $this->sessionExpiration);
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close
-	 *
-	 * Releases locks and closes connection.
-	 *
-	 * @return boolean
-	 */
-	public function close(): bool
-	{
-		if (isset($this->memcached))
-		{
-			isset($this->lockKey) && $this->memcached->delete($this->lockKey);
-
-			if (! $this->memcached->quit())
-			{
-				return false;
-			}
-
-			$this->memcached = null;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroy
-	 *
-	 * Destroys the current session.
-	 *
-	 * @param string $sessionId Session ID
-	 *
-	 * @return boolean
-	 */
-	public function destroy($sessionId): bool
-	{
-		if (isset($this->memcached, $this->lockKey))
-		{
-			$this->memcached->delete($this->keyPrefix . $sessionId);
-
-			return $this->destroyCookie();
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Garbage Collector
-	 *
-	 * Deletes expired sessions
-	 *
-	 * @param integer $maxlifetime Maximum lifetime of sessions
-	 *
-	 * @return boolean
-	 */
-	public function gc($maxlifetime): bool
-	{
-		// Not necessary, Memcached takes care of that.
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get lock
-	 *
-	 * Acquires an (emulated) lock.
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return boolean
-	 */
-	protected function lockSession(string $sessionID): bool
-	{
-		if (isset($this->lockKey))
-		{
-			return $this->memcached->replace($this->lockKey, time(), 300);
-		}
-
-		// 30 attempts to obtain a lock, in case another request already has it
-		$lockKey = $this->keyPrefix . $sessionID . ':lock';
-		$attempt = 0;
-
-		do
-		{
-			if ($this->memcached->get($lockKey))
-			{
-				sleep(1);
-				continue;
-			}
-
-			if (! $this->memcached->set($lockKey, time(), 300))
-			{
-				$this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
-
-				return false;
-			}
-
-			$this->lockKey = $lockKey;
-			break;
-		}
-		while (++ $attempt < 30);
-
-		if ($attempt === 30)
-		{
-			$this->logger->error('Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
-
-			return false;
-		}
-
-		$this->lock = true;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Release lock
-	 *
-	 * Releases a previously acquired lock
-	 *
-	 * @return boolean
-	 */
-	protected function releaseLock(): bool
-	{
-		if (isset($this->memcached, $this->lockKey) && $this->lock)
-		{
-			if (! $this->memcached->delete($this->lockKey) &&
-					$this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
-			)
-			{
-				$this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
-
-				return false;
-			}
-
-			$this->lockKey = null;
-			$this->lock    = false;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Memcached instance
+     *
+     * @var Memcached|null
+     */
+    protected $memcached;
+
+    /**
+     * Key prefix
+     *
+     * @var string
+     */
+    protected $keyPrefix = 'ci_session:';
+
+    /**
+     * Lock key
+     *
+     * @var string|null
+     */
+    protected $lockKey;
+
+    /**
+     * Number of seconds until the session ends.
+     *
+     * @var int
+     */
+    protected $sessionExpiration = 7200;
+
+    /**
+     * @throws SessionException
+     */
+    public function __construct(AppConfig $config, string $ipAddress)
+    {
+        parent::__construct($config, $ipAddress);
+
+        if (empty($this->savePath)) {
+            throw SessionException::forEmptySavepath();
+        }
+
+        if ($this->matchIP === true) {
+            $this->keyPrefix .= $this->ipAddress . ':';
+        }
+
+        if (! empty($this->keyPrefix)) {
+            ini_set('memcached.sess_prefix', $this->keyPrefix);
+        }
+
+        $this->sessionExpiration = $config->sessionExpiration;
+    }
+
+    /**
+     * Re-initialize existing session, or creates a new one.
+     *
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
+     */
+    public function open($path, $name): bool
+    {
+        $this->memcached = new Memcached();
+        $this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
+
+        $serverList = [];
+
+        foreach ($this->memcached->getServerList() as $server) {
+            $serverList[] = $server['host'] . ':' . $server['port'];
+        }
+
+        if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)) {
+            $this->memcached = null;
+            $this->logger->error('Session: Invalid Memcached save path format: ' . $this->savePath);
+
+            return false;
+        }
+
+        foreach ($matches as $match) {
+            // If Memcached already has this server (or if the port is invalid), skip it
+            if (in_array($match[1] . ':' . $match[2], $serverList, true)) {
+                $this->logger->debug('Session: Memcached server pool already has ' . $match[1] . ':' . $match[2]);
+
+                continue;
+            }
+
+            if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0)) {
+                $this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
+            } else {
+                $serverList[] = $match[1] . ':' . $match[2];
+            }
+        }
+
+        if (empty($serverList)) {
+            $this->logger->error('Session: Memcached server pool is empty.');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        if (isset($this->memcached) && $this->lockSession($id)) {
+            if (! isset($this->sessionID)) {
+                $this->sessionID = $id;
+            }
+
+            $data = (string) $this->memcached->get($this->keyPrefix . $id);
+
+            $this->fingerprint = md5($data);
+
+            return $data;
+        }
+
+        return '';
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        if (! isset($this->memcached)) {
+            return false;
+        }
+
+        if ($this->sessionID !== $id) {
+            if (! $this->releaseLock() || ! $this->lockSession($id)) {
+                return false;
+            }
+
+            $this->fingerprint = md5('');
+            $this->sessionID   = $id;
+        }
+
+        if (isset($this->lockKey)) {
+            $this->memcached->replace($this->lockKey, time(), 300);
+
+            if ($this->fingerprint !== ($fingerprint = md5($data))) {
+                if ($this->memcached->set($this->keyPrefix . $id, $data, $this->sessionExpiration)) {
+                    $this->fingerprint = $fingerprint;
+
+                    return true;
+                }
+
+                return false;
+            }
+
+            return $this->memcached->touch($this->keyPrefix . $id, $this->sessionExpiration);
+        }
+
+        return false;
+    }
+
+    /**
+     * Closes the current session.
+     */
+    public function close(): bool
+    {
+        if (isset($this->memcached)) {
+            if (isset($this->lockKey)) {
+                $this->memcached->delete($this->lockKey);
+            }
+
+            if (! $this->memcached->quit()) {
+                return false;
+            }
+
+            $this->memcached = null;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Destroys a session
+     *
+     * @param string $id The session ID being destroyed
+     */
+    public function destroy($id): bool
+    {
+        if (isset($this->memcached, $this->lockKey)) {
+            $this->memcached->delete($this->keyPrefix . $id);
+
+            return $this->destroyCookie();
+        }
+
+        return false;
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        return 1;
+    }
+
+    /**
+     * Acquires an emulated lock.
+     *
+     * @param string $sessionID Session ID
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        if (isset($this->lockKey)) {
+            return $this->memcached->replace($this->lockKey, time(), 300);
+        }
+
+        $lockKey = $this->keyPrefix . $sessionID . ':lock';
+        $attempt = 0;
+
+        do {
+            if ($this->memcached->get($lockKey)) {
+                sleep(1);
+
+                continue;
+            }
+
+            if (! $this->memcached->set($lockKey, time(), 300)) {
+                $this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
+
+                return false;
+            }
+
+            $this->lockKey = $lockKey;
+            break;
+        } while (++$attempt < 30);
+
+        if ($attempt === 30) {
+            $this->logger->error('Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
+
+            return false;
+        }
+
+        $this->lock = true;
+
+        return true;
+    }
+
+    /**
+     * Releases a previously acquired lock
+     */
+    protected function releaseLock(): bool
+    {
+        if (isset($this->memcached, $this->lockKey) && $this->lock) {
+            if (
+                ! $this->memcached->delete($this->lockKey)
+                && $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
+            ) {
+                $this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
+
+                return false;
+            }
+
+            $this->lockKey = null;
+            $this->lock    = false;
+        }
+
+        return true;
+    }
 }
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index b3545c0b2df0..8ed7b8c052b8 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -1,405 +1,330 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
-use Exception;
 use Redis;
 use RedisException;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using Redis for persistence
  */
 class RedisHandler extends BaseHandler
 {
-	/**
-	 * phpRedis instance
-	 *
-	 * @var Redis|null
-	 */
-	protected $redis;
-
-	/**
-	 * Key prefix
-	 *
-	 * @var string
-	 */
-	protected $keyPrefix = 'ci_session:';
-
-	/**
-	 * Lock key
-	 *
-	 * @var string|null
-	 */
-	protected $lockKey;
-
-	/**
-	 * Key exists flag
-	 *
-	 * @var boolean
-	 */
-	protected $keyExists = false;
-
-	/**
-	 * Number of seconds until the session ends.
-	 *
-	 * @var integer
-	 */
-	protected $sessionExpiration = 7200;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param AppConfig $config
-	 * @param string    $ipAddress
-	 *
-	 * @throws Exception
-	 */
-	public function __construct(AppConfig $config, string $ipAddress)
-	{
-		parent::__construct($config, $ipAddress);
-
-		if (empty($this->savePath))
-		{
-			throw SessionException::forEmptySavepath();
-		}
-
-		if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches))
-		{
-			if (! isset($matches[3]))
-			{
-				$matches[3] = '';
-			} // Just to avoid undefined index notices below
-
-			$this->savePath = [
-				'host'     => $matches[1],
-				'port'     => empty($matches[2]) ? null : $matches[2],
-				'password' => preg_match('#auth=([^\s&]+)#', $matches[3], $match) ? $match[1] : null,
-				'database' => preg_match('#database=(\d+)#', $matches[3], $match) ? (int) $match[1] : null,
-				'timeout'  => preg_match('#timeout=(\d+\.\d+)#', $matches[3], $match) ? (float) $match[1] : null,
-			];
-
-			preg_match('#prefix=([^\s&]+)#', $matches[3], $match) && $this->keyPrefix = $match[1];
-		}
-		else
-		{
-			throw SessionException::forInvalidSavePathFormat($this->savePath);
-		}
-
-		if ($this->matchIP === true)
-		{
-			$this->keyPrefix .= $this->ipAddress . ':';
-		}
-
-		$this->sessionExpiration = empty($config->sessionExpiration)
-			? (int) ini_get('session.gc_maxlifetime')
-			: (int) $config->sessionExpiration;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Open
-	 *
-	 * Sanitizes save_path and initializes connection.
-	 *
-	 * @param  string $savePath Server path
-	 * @param  string $name     Session cookie name, unused
-	 * @return boolean
-	 */
-	public function open($savePath, $name): bool
-	{
-		if (empty($this->savePath))
-		{
-			return false;
-		}
-
-		$redis = new Redis();
-
-		if (! $redis->connect($this->savePath['host'], $this->savePath['port'], $this->savePath['timeout']))
-		{
-			$this->logger->error('Session: Unable to connect to Redis with the configured settings.');
-		}
-		elseif (isset($this->savePath['password']) && ! $redis->auth($this->savePath['password']))
-		{
-			$this->logger->error('Session: Unable to authenticate to Redis instance.');
-		}
-		elseif (isset($this->savePath['database']) && ! $redis->select($this->savePath['database']))
-		{
-			$this->logger->error('Session: Unable to select Redis database with index ' . $this->savePath['database']);
-		}
-		else
-		{
-			$this->redis = $redis;
-			return true;
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Read
-	 *
-	 * Reads session data and acquires a lock
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return string	Serialized session data
-	 */
-	public function read($sessionID): string
-	{
-		if (isset($this->redis) && $this->lockSession($sessionID))
-		{
-			// Needed by write() to detect session_regenerate_id() calls
-			if (is_null($this->sessionID)) // @phpstan-ignore-line
-			{
-				$this->sessionID = $sessionID;
-			}
-
-			$sessionData                               = $this->redis->get($this->keyPrefix . $sessionID);
-			is_string($sessionData) ? $this->keyExists = true : $sessionData = '';
-
-			$this->fingerprint = md5($sessionData);
-
-			return $sessionData;
-		}
-
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Write
-	 *
-	 * Writes (create / update) session data
-	 *
-	 * @param string $sessionID   Session ID
-	 * @param string $sessionData Serialized session data
-	 *
-	 * @return boolean
-	 */
-	public function write($sessionID, $sessionData): bool
-	{
-		if (! isset($this->redis))
-		{
-			return false;
-		}
-
-		// Was the ID regenerated?
-		if ($sessionID !== $this->sessionID)
-		{
-			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
-			{
-				return false;
-			}
-
-			$this->keyExists = false;
-			$this->sessionID = $sessionID;
-		}
-
-		if (isset($this->lockKey))
-		{
-			$this->redis->expire($this->lockKey, 300);
-
-			if ($this->fingerprint !== ($fingerprint = md5($sessionData)) || $this->keyExists === false)
-			{
-				if ($this->redis->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration))
-				{
-					$this->fingerprint = $fingerprint;
-					$this->keyExists   = true;
-					return true;
-				}
-
-				return false;
-			}
-
-			return $this->redis->expire($this->keyPrefix . $sessionID, $this->sessionExpiration);
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close
-	 *
-	 * Releases locks and closes connection.
-	 *
-	 * @return boolean
-	 */
-	public function close(): bool
-	{
-		if (isset($this->redis))
-		{
-			try
-			{
-				$pingReply = $this->redis->ping();
-				// @phpstan-ignore-next-line
-				if (($pingReply === true) || ($pingReply === '+PONG'))
-				{
-					isset($this->lockKey) && $this->redis->del($this->lockKey);
-
-					if (! $this->redis->close())
-					{
-						return false;
-					}
-				}
-			}
-			catch (RedisException $e)
-			{
-				$this->logger->error('Session: Got RedisException on close(): ' . $e->getMessage());
-			}
-
-			$this->redis = null;
-
-			return true;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroy
-	 *
-	 * Destroys the current session.
-	 *
-	 * @param string $sessionID
-	 *
-	 * @return boolean
-	 */
-	public function destroy($sessionID): bool
-	{
-		if (isset($this->redis, $this->lockKey))
-		{
-			if (($result = $this->redis->del($this->keyPrefix . $sessionID)) !== 1)
-			{
-				$this->logger->debug('Session: Redis::del() expected to return 1, got ' . var_export($result, true) . ' instead.');
-			}
-
-			return $this->destroyCookie();
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Garbage Collector
-	 *
-	 * Deletes expired sessions
-	 *
-	 * @param  integer $maxlifetime Maximum lifetime of sessions
-	 * @return boolean
-	 */
-	public function gc($maxlifetime): bool
-	{
-		// Not necessary, Redis takes care of that.
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get lock
-	 *
-	 * Acquires an (emulated) lock.
-	 *
-	 * @param string $sessionID Session ID
-	 *
-	 * @return boolean
-	 */
-	protected function lockSession(string $sessionID): bool
-	{
-		// PHP 7 reuses the SessionHandler object on regeneration,
-		// so we need to check here if the lock key is for the
-		// correct session ID.
-		if ($this->lockKey === $this->keyPrefix . $sessionID . ':lock')
-		{
-			return $this->redis->expire($this->lockKey, 300);
-		}
-
-		// 30 attempts to obtain a lock, in case another request already has it
-		$lockKey = $this->keyPrefix . $sessionID . ':lock';
-		$attempt = 0;
-
-		do
-		{
-			if (($ttl = $this->redis->ttl($lockKey)) > 0)
-			{
-				sleep(1);
-				continue;
-			}
-
-			if (! $this->redis->setex($lockKey, 300, (string) time()))
-			{
-				$this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
-				return false;
-			}
-
-			$this->lockKey = $lockKey;
-			break;
-		}
-		while (++ $attempt < 30);
-
-		if ($attempt === 30)
-		{
-			log_message('error', 'Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
-			return false;
-		}
-
-		if ($ttl === -1)
-		{
-			log_message('debug', 'Session: Lock for ' . $this->keyPrefix . $sessionID . ' had no TTL, overriding.');
-		}
-
-		$this->lock = true;
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Release lock
-	 *
-	 * Releases a previously acquired lock
-	 *
-	 * @return boolean
-	 */
-	protected function releaseLock(): bool
-	{
-		if (isset($this->redis, $this->lockKey) && $this->lock)
-		{
-			if (! $this->redis->del($this->lockKey))
-			{
-				$this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
-				return false;
-			}
-
-			$this->lockKey = null;
-			$this->lock    = false;
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * phpRedis instance
+     *
+     * @var Redis|null
+     */
+    protected $redis;
+
+    /**
+     * Key prefix
+     *
+     * @var string
+     */
+    protected $keyPrefix = 'ci_session:';
+
+    /**
+     * Lock key
+     *
+     * @var string|null
+     */
+    protected $lockKey;
+
+    /**
+     * Key exists flag
+     *
+     * @var bool
+     */
+    protected $keyExists = false;
+
+    /**
+     * Number of seconds until the session ends.
+     *
+     * @var int
+     */
+    protected $sessionExpiration = 7200;
+
+    /**
+     * @throws SessionException
+     */
+    public function __construct(AppConfig $config, string $ipAddress)
+    {
+        parent::__construct($config, $ipAddress);
+
+        if (empty($this->savePath)) {
+            throw SessionException::forEmptySavepath();
+        }
+
+        if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) {
+            if (! isset($matches[3])) {
+                $matches[3] = ''; // Just to avoid undefined index notices below
+            }
+
+            $this->savePath = [
+                'host'     => $matches[1],
+                'port'     => empty($matches[2]) ? null : $matches[2],
+                'password' => preg_match('#auth=([^\s&]+)#', $matches[3], $match) ? $match[1] : null,
+                'database' => preg_match('#database=(\d+)#', $matches[3], $match) ? (int) $match[1] : null,
+                'timeout'  => preg_match('#timeout=(\d+\.\d+)#', $matches[3], $match) ? (float) $match[1] : null,
+            ];
+
+            preg_match('#prefix=([^\s&]+)#', $matches[3], $match) && $this->keyPrefix = $match[1];
+        } else {
+            throw SessionException::forInvalidSavePathFormat($this->savePath);
+        }
+
+        if ($this->matchIP === true) {
+            $this->keyPrefix .= $this->ipAddress . ':';
+        }
+
+        $this->sessionExpiration = empty($config->sessionExpiration)
+            ? (int) ini_get('session.gc_maxlifetime')
+            : (int) $config->sessionExpiration;
+    }
+
+    /**
+     * Re-initialize existing session, or creates a new one.
+     *
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
+     */
+    public function open($path, $name): bool
+    {
+        if (empty($this->savePath)) {
+            return false;
+        }
+
+        $redis = new Redis();
+
+        if (! $redis->connect($this->savePath['host'], $this->savePath['port'], $this->savePath['timeout'])) {
+            $this->logger->error('Session: Unable to connect to Redis with the configured settings.');
+        } elseif (isset($this->savePath['password']) && ! $redis->auth($this->savePath['password'])) {
+            $this->logger->error('Session: Unable to authenticate to Redis instance.');
+        } elseif (isset($this->savePath['database']) && ! $redis->select($this->savePath['database'])) {
+            $this->logger->error('Session: Unable to select Redis database with index ' . $this->savePath['database']);
+        } else {
+            $this->redis = $redis;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        if (isset($this->redis) && $this->lockSession($id)) {
+            if (! isset($this->sessionID)) {
+                $this->sessionID = ${$id};
+            }
+
+            $data = $this->redis->get($this->keyPrefix . $id);
+
+            if (is_string($data)) {
+                $this->keyExists = true;
+            } else {
+                $data = '';
+            }
+
+            $this->fingerprint = md5($data);
+
+            return $data;
+        }
+
+        return '';
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        if (! isset($this->redis)) {
+            return false;
+        }
+
+        if ($this->sessionID !== $id) {
+            if (! $this->releaseLock() || ! $this->lockSession($id)) {
+                return false;
+            }
+
+            $this->keyExists = false;
+            $this->sessionID = $id;
+        }
+
+        if (isset($this->lockKey)) {
+            $this->redis->expire($this->lockKey, 300);
+
+            if ($this->fingerprint !== ($fingerprint = md5($data)) || $this->keyExists === false) {
+                if ($this->redis->set($this->keyPrefix . $id, $data, $this->sessionExpiration)) {
+                    $this->fingerprint = $fingerprint;
+                    $this->keyExists   = true;
+
+                    return true;
+                }
+
+                return false;
+            }
+
+            return $this->redis->expire($this->keyPrefix . $id, $this->sessionExpiration);
+        }
+
+        return false;
+    }
+
+    /**
+     * Closes the current session.
+     */
+    public function close(): bool
+    {
+        if (isset($this->redis)) {
+            try {
+                $pingReply = $this->redis->ping();
+
+                // @phpstan-ignore-next-line
+                if (($pingReply === true) || ($pingReply === '+PONG')) {
+                    if (isset($this->lockKey)) {
+                        $this->redis->del($this->lockKey);
+                    }
+
+                    if (! $this->redis->close()) {
+                        return false;
+                    }
+                }
+            } catch (RedisException $e) {
+                $this->logger->error('Session: Got RedisException on close(): ' . $e->getMessage());
+            }
+
+            $this->redis = null;
+
+            return true;
+        }
+
+        return true;
+    }
+
+    /**
+     * Destroys a session
+     *
+     * @param string $id The session ID being destroyed
+     */
+    public function destroy($id): bool
+    {
+        if (isset($this->redis, $this->lockKey)) {
+            if (($result = $this->redis->del($this->keyPrefix . $id)) !== 1) {
+                $this->logger->debug('Session: Redis::del() expected to return 1, got ' . var_export($result, true) . ' instead.');
+            }
+
+            return $this->destroyCookie();
+        }
+
+        return false;
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        return 1;
+    }
+
+    /**
+     * Acquires an emulated lock.
+     *
+     * @param string $sessionID Session ID
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        // PHP 7 reuses the SessionHandler object on regeneration,
+        // so we need to check here if the lock key is for the
+        // correct session ID.
+        if ($this->lockKey === $this->keyPrefix . $sessionID . ':lock') {
+            return $this->redis->expire($this->lockKey, 300);
+        }
+
+        $lockKey = $this->keyPrefix . $sessionID . ':lock';
+        $attempt = 0;
+
+        do {
+            if (($ttl = $this->redis->ttl($lockKey)) > 0) {
+                sleep(1);
+
+                continue;
+            }
+
+            if (! $this->redis->setex($lockKey, 300, (string) time())) {
+                $this->logger->error('Session: Error while trying to obtain lock for ' . $this->keyPrefix . $sessionID);
+
+                return false;
+            }
+
+            $this->lockKey = $lockKey;
+            break;
+        } while (++$attempt < 30);
+
+        if ($attempt === 30) {
+            log_message('error', 'Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
+
+            return false;
+        }
+
+        if ($ttl === -1) {
+            log_message('debug', 'Session: Lock for ' . $this->keyPrefix . $sessionID . ' had no TTL, overriding.');
+        }
+
+        $this->lock = true;
+
+        return true;
+    }
+
+    /**
+     * Releases a previously acquired lock
+     */
+    protected function releaseLock(): bool
+    {
+        if (isset($this->redis, $this->lockKey) && $this->lock) {
+            if (! $this->redis->del($this->lockKey)) {
+                $this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
+
+                return false;
+            }
+
+            $this->lockKey = null;
+            $this->lock    = false;
+        }
+
+        return true;
+    }
 }
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 5532dc7d48fa..5fc1bda6005e 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
@@ -26,991 +26,888 @@
  */
 class Session implements SessionInterface
 {
-	use LoggerAwareTrait;
-
-	/**
-	 * Instance of the driver to use.
-	 *
-	 * @var SessionHandlerInterface
-	 */
-	protected $driver;
-
-	/**
-	 * The storage driver to use: files, database, redis, memcached
-	 *
-	 * @var string
-	 */
-	protected $sessionDriverName;
-
-	/**
-	 * The session cookie name, must contain only [0-9a-z_-] characters.
-	 *
-	 * @var string
-	 */
-	protected $sessionCookieName = 'ci_session';
-
-	/**
-	 * The number of SECONDS you want the session to last.
-	 * Setting it to 0 (zero) means expire when the browser is closed.
-	 *
-	 * @var integer
-	 */
-	protected $sessionExpiration = 7200;
-
-	/**
-	 * The location to save sessions to, driver dependent..
-	 *
-	 * For the 'files' driver, it's a path to a writable directory.
-	 * WARNING: Only absolute paths are supported!
-	 *
-	 * For the 'database' driver, it's a table name.
-	 *
-	 * @todo address memcache & redis needs
-	 *
-	 * IMPORTANT: You are REQUIRED to set a valid save path!
-	 *
-	 * @var string
-	 */
-	protected $sessionSavePath;
-
-	/**
-	 * Whether to match the user's IP address when reading the session data.
-	 *
-	 * WARNING: If you're using the database driver, don't forget to update
-	 * your session table's PRIMARY KEY when changing this setting.
-	 *
-	 * @var boolean
-	 */
-	protected $sessionMatchIP = false;
-
-	/**
-	 * How many seconds between CI regenerating the session ID.
-	 *
-	 * @var integer
-	 */
-	protected $sessionTimeToUpdate = 300;
-
-	/**
-	 * Whether to destroy session data associated with the old session ID
-	 * when auto-regenerating the session ID. When set to FALSE, the data
-	 * will be later deleted by the garbage collector.
-	 *
-	 * @var boolean
-	 */
-	protected $sessionRegenerateDestroy = false;
-
-	/**
-	 * The session cookie instance.
-	 *
-	 * @var Cookie
-	 */
-	protected $cookie;
-
-	/**
-	 * The domain name to use for cookies.
-	 * Set to .your-domain.com for site-wide cookies.
-	 *
-	 * @var string
-	 *
-	 * @deprecated
-	 */
-	protected $cookieDomain = '';
-
-	/**
-	 * Path used for storing cookies.
-	 * Typically will be a forward slash.
-	 *
-	 * @var string
-	 *
-	 * @deprecated
-	 */
-	protected $cookiePath = '/';
-
-	/**
-	 * Cookie will only be set if a secure HTTPS connection exists.
-	 *
-	 * @var boolean
-	 *
-	 * @deprecated
-	 */
-	protected $cookieSecure = false;
-
-	/**
-	 * Cookie SameSite setting as described in RFC6265
-	 * Must be 'None', 'Lax' or 'Strict'.
-	 *
-	 * @var string
-	 *
-	 * @deprecated
-	 */
-	protected $cookieSameSite = Cookie::SAMESITE_LAX;
-
-	/**
-	 * sid regex expression
-	 *
-	 * @var string
-	 */
-	protected $sidRegexp;
-
-	/**
-	 * Logger instance to record error messages and warnings.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Constructor.
-	 *
-	 * Extract configuration settings and save them here.
-	 *
-	 * @param SessionHandlerInterface $driver
-	 * @param App                     $config
-	 */
-	public function __construct(SessionHandlerInterface $driver, App $config)
-	{
-		$this->driver = $driver;
-
-		$this->sessionDriverName        = $config->sessionDriver;
-		$this->sessionCookieName        = $config->sessionCookieName ?? $this->sessionCookieName;
-		$this->sessionExpiration        = $config->sessionExpiration ?? $this->sessionExpiration;
-		$this->sessionSavePath          = $config->sessionSavePath;
-		$this->sessionMatchIP           = $config->sessionMatchIP ?? $this->sessionMatchIP;
-		$this->sessionTimeToUpdate      = $config->sessionTimeToUpdate ?? $this->sessionTimeToUpdate;
-		$this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy;
-
-		//---------------------------------------------------------------------
-		// DEPRECATED COOKIE MANAGEMENT
-		//---------------------------------------------------------------------
-		$this->cookiePath     = $config->cookiePath ?? $this->cookiePath;
-		$this->cookieDomain   = $config->cookieDomain ?? $this->cookieDomain;
-		$this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
-		$this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
-
-		/**
-		 * @var CookieConfig
-		 */
-		$cookie = config('Cookie');
-
-		$this->cookie = new Cookie($this->sessionCookieName, '', [
-			'expires'  => $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration,
-			'path'     => $cookie->path ?? $config->cookiePath,
-			'domain'   => $cookie->domain ?? $config->cookieDomain,
-			'secure'   => $cookie->secure ?? $config->cookieSecure,
-			'httponly' => true, // for security
-			'samesite' => $cookie->samesite ?? $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
-			'raw'      => $cookie->raw ?? false,
-		]);
-
-		helper('array');
-	}
-
-	/**
-	 * Initialize the session container and starts up the session.
-	 *
-	 * @return mixed
-	 */
-	public function start()
-	{
-		if (is_cli() && ENVIRONMENT !== 'testing')
-		{
-			// @codeCoverageIgnoreStart
-			$this->logger->debug('Session: Initialization under CLI aborted.');
-
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		if ((bool) ini_get('session.auto_start'))
-		{
-			$this->logger->error('Session: session.auto_start is enabled in php.ini. Aborting.');
-
-			return;
-		}
-
-		if (session_status() === PHP_SESSION_ACTIVE)
-		{
-			$this->logger->warning('Session: Sessions is enabled, and one exists.Please don\'t $session->start();');
-
-			return;
-		}
-
-		$this->configure();
-		$this->setSaveHandler();
-
-		// Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers
-		if (isset($_COOKIE[$this->sessionCookieName])
-			&& (! is_string($_COOKIE[$this->sessionCookieName]) || ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->sessionCookieName]))
-		)
-		{
-			unset($_COOKIE[$this->sessionCookieName]);
-		}
-
-		$this->startSession();
-
-		// Is session ID auto-regeneration configured? (ignoring ajax requests)
-		if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
-			&& ($regenerateTime = $this->sessionTimeToUpdate) > 0
-		)
-		{
-			if (! isset($_SESSION['__ci_last_regenerate']))
-			{
-				$_SESSION['__ci_last_regenerate'] = time();
-			}
-			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerateTime))
-			{
-				$this->regenerate((bool) $this->sessionRegenerateDestroy);
-			}
-		}
-		// Another work-around ... PHP doesn't seem to send the session cookie
-		// unless it is being currently created or regenerated
-		elseif (isset($_COOKIE[$this->sessionCookieName]) && $_COOKIE[$this->sessionCookieName] === session_id())
-		{
-			$this->setCookie();
-		}
-
-		$this->initVars();
-		$this->logger->info("Session: Class initialized using '" . $this->sessionDriverName . "' driver.");
-
-		return $this;
-	}
-
-	/**
-	 * Does a full stop of the session:
-	 *
-	 * - destroys the session
-	 * - unsets the session id
-	 * - destroys the session cookie
-	 */
-	public function stop()
-	{
-		setcookie(
-			$this->sessionCookieName,
-			session_id(),
-			1,
-			$this->cookie->getPath(),
-			$this->cookie->getDomain(),
-			$this->cookie->isSecure(),
-			true
-		);
-
-		session_regenerate_id(true);
-	}
-
-	/**
-	 * Configuration.
-	 *
-	 * Handle input binds and configuration defaults.
-	 */
-	protected function configure()
-	{
-		if (empty($this->sessionCookieName))
-		{
-			$this->sessionCookieName = ini_get('session.name');
-		}
-		else
-		{
-			ini_set('session.name', $this->sessionCookieName);
-		}
-
-		$sameSite = $this->cookie->getSameSite() ?: ucfirst(Cookie::SAMESITE_LAX);
-
-		$params = [
-			'lifetime' => $this->sessionExpiration,
-			'path'     => $this->cookie->getPath(),
-			'domain'   => $this->cookie->getDomain(),
-			'secure'   => $this->cookie->isSecure(),
-			'httponly' => true, // HTTP only; Yes, this is intentional and not configurable for security reasons.
-			'samesite' => $sameSite,
-		];
-
-		ini_set('session.cookie_samesite', $sameSite);
-		session_set_cookie_params($params);
-
-		if (! isset($this->sessionExpiration))
-		{
-			$this->sessionExpiration = (int) ini_get('session.gc_maxlifetime');
-		}
-		else
-		{
-			ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
-		}
-
-		if (! empty($this->sessionSavePath))
-		{
-			ini_set('session.save_path', $this->sessionSavePath);
-		}
-
-		// Security is king
-		ini_set('session.use_trans_sid', '0');
-		ini_set('session.use_strict_mode', '1');
-		ini_set('session.use_cookies', '1');
-		ini_set('session.use_only_cookies', '1');
-
-		$this->configureSidLength();
-	}
-
-	/**
-	 * Configure session ID length
-	 *
-	 * To make life easier, we used to force SHA-1 and 4 bits per
-	 * character on everyone. And of course, someone was unhappy.
-	 *
-	 * Then PHP 7.1 broke backwards-compatibility because ext/session
-	 * is such a mess that nobody wants to touch it with a pole stick,
-	 * and the one guy who does, nobody has the energy to argue with.
-	 *
-	 * So we were forced to make changes, and OF COURSE something was
-	 * going to break and now we have this pile of shit. -- Narf
-	 *
-	 * @return void
-	 */
-	protected function configureSidLength()
-	{
-		$bitsPerCharacter = (int) (ini_get('session.sid_bits_per_character') !== false
-			? ini_get('session.sid_bits_per_character')
-			: 4);
-
-		$sidLength = (int) (ini_get('session.sid_length') !== false
-			? ini_get('session.sid_length')
-			: 40);
-
-		if (($sidLength * $bitsPerCharacter) < 160)
-		{
-			$bits = ($sidLength * $bitsPerCharacter);
-			// Add as many more characters as necessary to reach at least 160 bits
-			$sidLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
-			ini_set('session.sid_length', (string) $sidLength);
-		}
-
-		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
-		switch ($bitsPerCharacter)
-		{
-			case 4:
-				$this->sidRegexp = '[0-9a-f]';
-				break;
-			case 5:
-				$this->sidRegexp = '[0-9a-v]';
-				break;
-			case 6:
-				$this->sidRegexp = '[0-9a-zA-Z,-]';
-				break;
-		}
-
-		$this->sidRegexp .= '{' . $sidLength . '}';
-	}
-
-	/**
-	 * Handle temporary variables
-	 *
-	 * Clears old "flash" data, marks the new one for deletion and handles
-	 * "temp" data deletion.
-	 */
-	protected function initVars()
-	{
-		if (empty($_SESSION['__ci_vars']))
-		{
-			return;
-		}
-
-		$currentTime = time();
-
-		foreach ($_SESSION['__ci_vars'] as $key => &$value)
-		{
-			if ($value === 'new')
-			{
-				$_SESSION['__ci_vars'][$key] = 'old';
-			}
-			// DO NOT move this above the 'new' check!
-			elseif ($value === 'old' || $value < $currentTime)
-			{
-				unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]);
-			}
-		}
-
-		if (empty($_SESSION['__ci_vars']))
-		{
-			unset($_SESSION['__ci_vars']);
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Session Utility Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Regenerates the session ID.
-	 *
-	 * @param boolean $destroy Should old session data be destroyed?
-	 */
-	public function regenerate(bool $destroy = false)
-	{
-		$_SESSION['__ci_last_regenerate'] = time();
-		session_regenerate_id($destroy);
-	}
-
-	/**
-	 * Destroys the current session.
-	 */
-	public function destroy()
-	{
-		if (ENVIRONMENT === 'testing')
-		{
-			return;
-		}
-
-		session_destroy();
-	}
-
-	//--------------------------------------------------------------------
-	// Basic Setters and Getters
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets user data into the session.
-	 *
-	 * If $data is a string, then it is interpreted as a session property
-	 * key, and  $value is expected to be non-null.
-	 *
-	 * If $data is an array, it is expected to be an array of key/value pairs
-	 * to be set as session properties.
-	 *
-	 * @param string|array $data  Property name or associative array of properties
-	 * @param mixed        $value Property value if single key provided
-	 */
-	public function set($data, $value = null)
-	{
-		if (is_array($data))
-		{
-			foreach ($data as $key => &$value)
-			{
-				if (is_int($key))
-				{
-					$_SESSION[$value] = null;
-				}
-				else
-				{
-					$_SESSION[$key] = $value;
-				}
-			}
-
-			return;
-		}
-
-		$_SESSION[$data] = $value;
-	}
-
-	/**
-	 * Get user data that has been set in the session.
-	 *
-	 * If the property exists as "normal", returns it.
-	 * Otherwise, returns an array of any temp or flash data values with the
-	 * property key.
-	 *
-	 * Replaces the legacy method $session->userdata();
-	 *
-	 * @param  string|null $key Identifier of the session property to retrieve
-	 * @return mixed	The property value(s)
-	 */
-	public function get(string $key = null)
-	{
-		if (! empty($key) && (! is_null($value = $_SESSION[$key] ?? null) || ! is_null($value = dot_array_search($key, $_SESSION ?? []))))
-		{
-			return $value;
-		}
-
-		if (empty($_SESSION))
-		{
-			return $key === null ? [] : null;
-		}
-
-		if (! empty($key))
-		{
-			return null;
-		}
-
-		$userdata = [];
-		$_exclude = array_merge(['__ci_vars'], $this->getFlashKeys(), $this->getTempKeys());
-
-		$keys = array_keys($_SESSION);
-
-		foreach ($keys as $key)
-		{
-			if (! in_array($key, $_exclude, true))
-			{
-				$userdata[$key] = $_SESSION[$key];
-			}
-		}
-
-		return $userdata;
-	}
-
-	/**
-	 * Returns whether an index exists in the session array.
-	 *
-	 * @param string $key Identifier of the session property we are interested in.
-	 *
-	 * @return boolean
-	 */
-	public function has(string $key): bool
-	{
-		return isset($_SESSION[$key]);
-	}
-
-	/**
-	 * Push new value onto session value that is array.
-	 *
-	 * @param string $key  Identifier of the session property we are interested in.
-	 * @param array  $data value to be pushed to existing session key.
-	 *
-	 * @return void
-	 */
-	public function push(string $key, array $data)
-	{
-		if ($this->has($key) && is_array($value = $this->get($key)))
-		{
-			$this->set($key, array_merge($value, $data));
-		}
-	}
-
-	/**
-	 * Remove one or more session properties.
-	 *
-	 * If $key is an array, it is interpreted as an array of string property
-	 * identifiers to remove. Otherwise, it is interpreted as the identifier
-	 * of a specific session property to remove.
-	 *
-	 * @param string|array $key Identifier of the session property or properties to remove.
-	 */
-	public function remove($key)
-	{
-		if (is_array($key))
-		{
-			foreach ($key as $k)
-			{
-				unset($_SESSION[$k]);
-			}
-
-			return;
-		}
-
-		unset($_SESSION[$key]);
-	}
-
-	/**
-	 * Magic method to set variables in the session by simply calling
-	 *  $session->foo = bar;
-	 *
-	 * @param string       $key   Identifier of the session property to set.
-	 * @param string|array $value
-	 */
-	public function __set(string $key, $value)
-	{
-		$_SESSION[$key] = $value;
-	}
-
-	/**
-	 * Magic method to get session variables by simply calling
-	 *  $foo = $session->foo;
-	 *
-	 * @param string $key Identifier of the session property to remove.
-	 *
-	 * @return null|string
-	 */
-	public function __get(string $key)
-	{
-		// Note: Keep this order the same, just in case somebody wants to
-		//       use 'session_id' as a session data key, for whatever reason
-		if (isset($_SESSION[$key]))
-		{
-			return $_SESSION[$key];
-		}
-
-		if ($key === 'session_id')
-		{
-			return session_id();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Magic method to check for session variables.
-	 * Different from has() in that it will validate 'session_id' as well.
-	 * Mostly used by internal PHP functions, users should stick to has()
-	 *
-	 * @param string $key Identifier of the session property to remove.
-	 *
-	 * @return boolean
-	 */
-	public function __isset(string $key): bool
-	{
-		return isset($_SESSION[$key]) || ($key === 'session_id');
-	}
-
-	//--------------------------------------------------------------------
-	// Flash Data Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets data into the session that will only last for a single request.
-	 * Perfect for use with single-use status update messages.
-	 *
-	 * If $data is an array, it is interpreted as an associative array of
-	 * key/value pairs for flashdata properties.
-	 * Otherwise, it is interpreted as the identifier of a specific
-	 * flashdata property, with $value containing the property value.
-	 *
-	 * @param array|string $data  Property identifier or associative array of properties
-	 * @param string|array $value Property value if $data is a scalar
-	 */
-	public function setFlashdata($data, $value = null)
-	{
-		$this->set($data, $value);
-		$this->markAsFlashdata(is_array($data) ? array_keys($data) : $data);
-	}
-
-	/**
-	 * Retrieve one or more items of flash data from the session.
-	 *
-	 * If the item key is null, return all flashdata.
-	 *
-	 * @param string $key Property identifier
-	 *
-	 * @return array|null The requested property value, or an associative array  of them
-	 */
-	public function getFlashdata(string $key = null)
-	{
-		if (isset($key))
-		{
-			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
-					! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
-		}
-
-		$flashdata = [];
-
-		if (! empty($_SESSION['__ci_vars']))
-		{
-			foreach ($_SESSION['__ci_vars'] as $key => &$value)
-			{
-				if (! is_int($value))
-				{
-					$flashdata[$key] = $_SESSION[$key];
-				}
-			}
-		}
-
-		return $flashdata;
-	}
-
-	/**
-	 * Keeps a single piece of flash data alive for one more request.
-	 *
-	 * @param array|string $key Property identifier or array of them
-	 */
-	public function keepFlashdata($key)
-	{
-		$this->markAsFlashdata($key);
-	}
-
-	/**
-	 * Mark a session property or properties as flashdata.
-	 *
-	 * @param array|string $key Property identifier or array of them
-	 *
-	 * @return boolean False if any of the properties are not already set
-	 */
-	public function markAsFlashdata($key): bool
-	{
-		if (is_array($key))
-		{
-			foreach ($key as $sessionKey)
-			{
-				if (! isset($_SESSION[$sessionKey]))
-				{
-					return false;
-				}
-			}
-
-			$new = array_fill_keys($key, 'new');
-
-			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $new) : $new;
-
-			return true;
-		}
-
-		if (! isset($_SESSION[$key]))
-		{
-			return false;
-		}
-
-		$_SESSION['__ci_vars'][$key] = 'new';
-
-		return true;
-	}
-
-	/**
-	 * Unmark data in the session as flashdata.
-	 *
-	 * @param mixed $key Property identifier or array of them
-	 */
-	public function unmarkFlashdata($key)
-	{
-		if (empty($_SESSION['__ci_vars']))
-		{
-			return;
-		}
-
-		if (! is_array($key))
-		{
-			$key = [$key];
-		}
-
-		foreach ($key as $k)
-		{
-			if (isset($_SESSION['__ci_vars'][$k]) && ! is_int($_SESSION['__ci_vars'][$k]))
-			{
-				unset($_SESSION['__ci_vars'][$k]);
-			}
-		}
-
-		if (empty($_SESSION['__ci_vars']))
-		{
-			unset($_SESSION['__ci_vars']);
-		}
-	}
-
-	/**
-	 * Retrieve all of the keys for session data marked as flashdata.
-	 *
-	 * @return array The property names of all flashdata
-	 */
-	public function getFlashKeys(): array
-	{
-		if (! isset($_SESSION['__ci_vars']))
-		{
-			return [];
-		}
-
-		$keys = [];
-		foreach (array_keys($_SESSION['__ci_vars']) as $key)
-		{
-			if (! is_int($_SESSION['__ci_vars'][$key]))
-			{
-				$keys[] = $key;
-			}
-		}
-
-		return $keys;
-	}
-
-	//--------------------------------------------------------------------
-	// Temp Data Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets new data into the session, and marks it as temporary data
-	 * with a set lifespan.
-	 *
-	 * @param string|array $data  Session data key or associative array of items
-	 * @param null         $value Value to store
-	 * @param integer      $ttl   Time-to-live in seconds
-	 */
-	public function setTempdata($data, $value = null, int $ttl = 300)
-	{
-		$this->set($data, $value);
-		$this->markAsTempdata($data, $ttl);
-	}
-
-	/**
-	 * Returns either a single piece of tempdata, or all temp data currently
-	 * in the session.
-	 *
-	 * @param  string $key Session data key
-	 * @return mixed  Session data value or null if not found.
-	 */
-	public function getTempdata(string $key = null)
-	{
-		if (isset($key))
-		{
-			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
-					is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
-		}
-
-		$tempdata = [];
-
-		if (! empty($_SESSION['__ci_vars']))
-		{
-			foreach ($_SESSION['__ci_vars'] as $key => &$value)
-			{
-				if (is_int($value))
-				{
-					$tempdata[$key] = $_SESSION[$key];
-				}
-			}
-		}
-
-		return $tempdata;
-	}
-
-	/**
-	 * Removes a single piece of temporary data from the session.
-	 *
-	 * @param string $key Session data key
-	 */
-	public function removeTempdata(string $key)
-	{
-		$this->unmarkTempdata($key);
-		unset($_SESSION[$key]);
-	}
-
-	/**
-	 * Mark one of more pieces of data as being temporary, meaning that
-	 * it has a set lifespan within the session.
-	 *
-	 * @param string|array $key Property identifier or array of them
-	 * @param integer      $ttl Time to live, in seconds
-	 *
-	 * @return boolean False if any of the properties were not set
-	 */
-	public function markAsTempdata($key, int $ttl = 300): bool
-	{
-		$ttl += time();
-
-		if (is_array($key))
-		{
-			$temp = [];
-
-			foreach ($key as $k => $v)
-			{
-				// Do we have a key => ttl pair, or just a key?
-				if (is_int($k))
-				{
-					$k = $v;
-					$v = $ttl;
-				}
-				elseif (is_string($v))
-				{
-					$v = time() + $ttl;
-				}
-				else
-				{
-					$v += time();
-				}
-
-				if (! array_key_exists($k, $_SESSION))
-				{
-					return false;
-				}
-
-				$temp[$k] = $v;
-			}
-
-			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $temp) : $temp;
-
-			return true;
-		}
-
-		if (! isset($_SESSION[$key]))
-		{
-			return false;
-		}
-
-		$_SESSION['__ci_vars'][$key] = $ttl;
-
-		return true;
-	}
-
-	/**
-	 * Unmarks temporary data in the session, effectively removing its
-	 * lifespan and allowing it to live as long as the session does.
-	 *
-	 * @param string|array $key	Property identifier or array of them
-	 */
-	public function unmarkTempdata($key)
-	{
-		if (empty($_SESSION['__ci_vars']))
-		{
-			return;
-		}
-
-		if (! is_array($key))
-		{
-			$key = [$key];
-		}
-
-		foreach ($key as $k)
-		{
-			if (isset($_SESSION['__ci_vars'][$k]) && is_int($_SESSION['__ci_vars'][$k]))
-			{
-				unset($_SESSION['__ci_vars'][$k]);
-			}
-		}
-
-		if (empty($_SESSION['__ci_vars']))
-		{
-			unset($_SESSION['__ci_vars']);
-		}
-	}
-
-	/**
-	 * Retrieve the keys of all session data that have been marked as temporary data.
-	 *
-	 * @return array
-	 */
-	public function getTempKeys(): array
-	{
-		if (! isset($_SESSION['__ci_vars']))
-		{
-			return [];
-		}
-
-		$keys = [];
-		foreach (array_keys($_SESSION['__ci_vars']) as $key)
-		{
-			if (is_int($_SESSION['__ci_vars'][$key]))
-			{
-				$keys[] = $key;
-			}
-		}
-
-		return $keys;
-	}
-
-	/**
-	 * Sets the driver as the session handler in PHP.
-	 * Extracted for easier testing.
-	 */
-	protected function setSaveHandler()
-	{
-		session_set_save_handler($this->driver, true);
-	}
-
-	/**
-	 * Starts the session.
-	 * Extracted for testing reasons.
-	 */
-	protected function startSession()
-	{
-		if (ENVIRONMENT === 'testing')
-		{
-			$_SESSION = [];
-			return;
-		}
-
-		session_start(); // @codeCoverageIgnore
-	}
-
-	/**
-	 * Takes care of setting the cookie on the client side.
-	 *
-	 * @codeCoverageIgnore
-	 */
-	protected function setCookie()
-	{
-		$expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
-		$this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
-
-		cookies([$this->cookie], false)->dispatch();
-	}
+    use LoggerAwareTrait;
+
+    /**
+     * Instance of the driver to use.
+     *
+     * @var SessionHandlerInterface
+     */
+    protected $driver;
+
+    /**
+     * The storage driver to use: files, database, redis, memcached
+     *
+     * @var string
+     */
+    protected $sessionDriverName;
+
+    /**
+     * The session cookie name, must contain only [0-9a-z_-] characters.
+     *
+     * @var string
+     */
+    protected $sessionCookieName = 'ci_session';
+
+    /**
+     * The number of SECONDS you want the session to last.
+     * Setting it to 0 (zero) means expire when the browser is closed.
+     *
+     * @var int
+     */
+    protected $sessionExpiration = 7200;
+
+    /**
+     * The location to save sessions to, driver dependent..
+     *
+     * For the 'files' driver, it's a path to a writable directory.
+     * WARNING: Only absolute paths are supported!
+     *
+     * For the 'database' driver, it's a table name.
+     *
+     * @todo address memcache & redis needs
+     *
+     * IMPORTANT: You are REQUIRED to set a valid save path!
+     *
+     * @var string
+     */
+    protected $sessionSavePath;
+
+    /**
+     * Whether to match the user's IP address when reading the session data.
+     *
+     * WARNING: If you're using the database driver, don't forget to update
+     * your session table's PRIMARY KEY when changing this setting.
+     *
+     * @var bool
+     */
+    protected $sessionMatchIP = false;
+
+    /**
+     * How many seconds between CI regenerating the session ID.
+     *
+     * @var int
+     */
+    protected $sessionTimeToUpdate = 300;
+
+    /**
+     * Whether to destroy session data associated with the old session ID
+     * when auto-regenerating the session ID. When set to FALSE, the data
+     * will be later deleted by the garbage collector.
+     *
+     * @var bool
+     */
+    protected $sessionRegenerateDestroy = false;
+
+    /**
+     * The session cookie instance.
+     *
+     * @var Cookie
+     */
+    protected $cookie;
+
+    /**
+     * The domain name to use for cookies.
+     * Set to .your-domain.com for site-wide cookies.
+     *
+     * @var string
+     *
+     * @deprecated
+     */
+    protected $cookieDomain = '';
+
+    /**
+     * Path used for storing cookies.
+     * Typically will be a forward slash.
+     *
+     * @var string
+     *
+     * @deprecated
+     */
+    protected $cookiePath = '/';
+
+    /**
+     * Cookie will only be set if a secure HTTPS connection exists.
+     *
+     * @var bool
+     *
+     * @deprecated
+     */
+    protected $cookieSecure = false;
+
+    /**
+     * Cookie SameSite setting as described in RFC6265
+     * Must be 'None', 'Lax' or 'Strict'.
+     *
+     * @var string
+     *
+     * @deprecated
+     */
+    protected $cookieSameSite = Cookie::SAMESITE_LAX;
+
+    /**
+     * sid regex expression
+     *
+     * @var string
+     */
+    protected $sidRegexp;
+
+    /**
+     * Logger instance to record error messages and warnings.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Constructor.
+     *
+     * Extract configuration settings and save them here.
+     */
+    public function __construct(SessionHandlerInterface $driver, App $config)
+    {
+        $this->driver = $driver;
+
+        $this->sessionDriverName        = $config->sessionDriver;
+        $this->sessionCookieName        = $config->sessionCookieName ?? $this->sessionCookieName;
+        $this->sessionExpiration        = $config->sessionExpiration ?? $this->sessionExpiration;
+        $this->sessionSavePath          = $config->sessionSavePath;
+        $this->sessionMatchIP           = $config->sessionMatchIP ?? $this->sessionMatchIP;
+        $this->sessionTimeToUpdate      = $config->sessionTimeToUpdate ?? $this->sessionTimeToUpdate;
+        $this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy;
+
+        // DEPRECATED COOKIE MANAGEMENT
+        $this->cookiePath     = $config->cookiePath ?? $this->cookiePath;
+        $this->cookieDomain   = $config->cookieDomain ?? $this->cookieDomain;
+        $this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
+        $this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
+
+        /** @var CookieConfig $cookie */
+        $cookie = config('Cookie');
+
+        $this->cookie = new Cookie($this->sessionCookieName, '', [
+            'expires'  => $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration,
+            'path'     => $cookie->path ?? $config->cookiePath,
+            'domain'   => $cookie->domain ?? $config->cookieDomain,
+            'secure'   => $cookie->secure ?? $config->cookieSecure,
+            'httponly' => true, // for security
+            'samesite' => $cookie->samesite ?? $config->cookieSameSite ?? Cookie::SAMESITE_LAX,
+            'raw'      => $cookie->raw ?? false,
+        ]);
+
+        helper('array');
+    }
+
+    /**
+     * Initialize the session container and starts up the session.
+     *
+     * @return mixed
+     */
+    public function start()
+    {
+        if (is_cli() && ENVIRONMENT !== 'testing') {
+            // @codeCoverageIgnoreStart
+            $this->logger->debug('Session: Initialization under CLI aborted.');
+
+            return;
+            // @codeCoverageIgnoreEnd
+        }
+
+        if ((bool) ini_get('session.auto_start')) {
+            $this->logger->error('Session: session.auto_start is enabled in php.ini. Aborting.');
+
+            return;
+        }
+
+        if (session_status() === PHP_SESSION_ACTIVE) {
+            $this->logger->warning('Session: Sessions is enabled, and one exists.Please don\'t $session->start();');
+
+            return;
+        }
+
+        $this->configure();
+        $this->setSaveHandler();
+
+        // Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers
+        if (isset($_COOKIE[$this->sessionCookieName])
+            && (! is_string($_COOKIE[$this->sessionCookieName]) || ! preg_match('#\A' . $this->sidRegexp . '\z#', $_COOKIE[$this->sessionCookieName]))
+        ) {
+            unset($_COOKIE[$this->sessionCookieName]);
+        }
+
+        $this->startSession();
+
+        // Is session ID auto-regeneration configured? (ignoring ajax requests)
+        if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) || strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
+            && ($regenerateTime = $this->sessionTimeToUpdate) > 0
+        ) {
+            if (! isset($_SESSION['__ci_last_regenerate'])) {
+                $_SESSION['__ci_last_regenerate'] = time();
+            } elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerateTime)) {
+                $this->regenerate((bool) $this->sessionRegenerateDestroy);
+            }
+        }
+        // Another work-around ... PHP doesn't seem to send the session cookie
+        // unless it is being currently created or regenerated
+        elseif (isset($_COOKIE[$this->sessionCookieName]) && $_COOKIE[$this->sessionCookieName] === session_id()) {
+            $this->setCookie();
+        }
+
+        $this->initVars();
+        $this->logger->info("Session: Class initialized using '" . $this->sessionDriverName . "' driver.");
+
+        return $this;
+    }
+
+    /**
+     * Does a full stop of the session:
+     *
+     * - destroys the session
+     * - unsets the session id
+     * - destroys the session cookie
+     */
+    public function stop()
+    {
+        setcookie(
+            $this->sessionCookieName,
+            session_id(),
+            1,
+            $this->cookie->getPath(),
+            $this->cookie->getDomain(),
+            $this->cookie->isSecure(),
+            true
+        );
+
+        session_regenerate_id(true);
+    }
+
+    /**
+     * Configuration.
+     *
+     * Handle input binds and configuration defaults.
+     */
+    protected function configure()
+    {
+        if (empty($this->sessionCookieName)) {
+            $this->sessionCookieName = ini_get('session.name');
+        } else {
+            ini_set('session.name', $this->sessionCookieName);
+        }
+
+        $sameSite = $this->cookie->getSameSite() ?: ucfirst(Cookie::SAMESITE_LAX);
+
+        $params = [
+            'lifetime' => $this->sessionExpiration,
+            'path'     => $this->cookie->getPath(),
+            'domain'   => $this->cookie->getDomain(),
+            'secure'   => $this->cookie->isSecure(),
+            'httponly' => true, // HTTP only; Yes, this is intentional and not configurable for security reasons.
+            'samesite' => $sameSite,
+        ];
+
+        ini_set('session.cookie_samesite', $sameSite);
+        session_set_cookie_params($params);
+
+        if (! isset($this->sessionExpiration)) {
+            $this->sessionExpiration = (int) ini_get('session.gc_maxlifetime');
+        } else {
+            ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
+        }
+
+        if (! empty($this->sessionSavePath)) {
+            ini_set('session.save_path', $this->sessionSavePath);
+        }
+
+        // Security is king
+        ini_set('session.use_trans_sid', '0');
+        ini_set('session.use_strict_mode', '1');
+        ini_set('session.use_cookies', '1');
+        ini_set('session.use_only_cookies', '1');
+
+        $this->configureSidLength();
+    }
+
+    /**
+     * Configure session ID length
+     *
+     * To make life easier, we used to force SHA-1 and 4 bits per
+     * character on everyone. And of course, someone was unhappy.
+     *
+     * Then PHP 7.1 broke backwards-compatibility because ext/session
+     * is such a mess that nobody wants to touch it with a pole stick,
+     * and the one guy who does, nobody has the energy to argue with.
+     *
+     * So we were forced to make changes, and OF COURSE something was
+     * going to break and now we have this pile of shit. -- Narf
+     */
+    protected function configureSidLength()
+    {
+        $bitsPerCharacter = (int) (ini_get('session.sid_bits_per_character') !== false
+            ? ini_get('session.sid_bits_per_character')
+            : 4);
+
+        $sidLength = (int) (ini_get('session.sid_length') !== false
+            ? ini_get('session.sid_length')
+            : 40);
+
+        if (($sidLength * $bitsPerCharacter) < 160) {
+            $bits = ($sidLength * $bitsPerCharacter);
+            // Add as many more characters as necessary to reach at least 160 bits
+            $sidLength += (int) ceil((160 % $bits) / $bitsPerCharacter);
+            ini_set('session.sid_length', (string) $sidLength);
+        }
+
+        // Yes, 4,5,6 are the only known possible values as of 2016-10-27
+        switch ($bitsPerCharacter) {
+            case 4:
+                $this->sidRegexp = '[0-9a-f]';
+                break;
+
+            case 5:
+                $this->sidRegexp = '[0-9a-v]';
+                break;
+
+            case 6:
+                $this->sidRegexp = '[0-9a-zA-Z,-]';
+                break;
+        }
+
+        $this->sidRegexp .= '{' . $sidLength . '}';
+    }
+
+    /**
+     * Handle temporary variables
+     *
+     * Clears old "flash" data, marks the new one for deletion and handles
+     * "temp" data deletion.
+     */
+    protected function initVars()
+    {
+        if (empty($_SESSION['__ci_vars'])) {
+            return;
+        }
+
+        $currentTime = time();
+
+        foreach ($_SESSION['__ci_vars'] as $key => &$value) {
+            if ($value === 'new') {
+                $_SESSION['__ci_vars'][$key] = 'old';
+            }
+            // DO NOT move this above the 'new' check!
+            elseif ($value === 'old' || $value < $currentTime) {
+                unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]);
+            }
+        }
+
+        if (empty($_SESSION['__ci_vars'])) {
+            unset($_SESSION['__ci_vars']);
+        }
+    }
+
+    /**
+     * Regenerates the session ID.
+     *
+     * @param bool $destroy Should old session data be destroyed?
+     */
+    public function regenerate(bool $destroy = false)
+    {
+        $_SESSION['__ci_last_regenerate'] = time();
+        session_regenerate_id($destroy);
+    }
+
+    /**
+     * Destroys the current session.
+     */
+    public function destroy()
+    {
+        if (ENVIRONMENT === 'testing') {
+            return;
+        }
+
+        session_destroy();
+    }
+
+    /**
+     * Sets user data into the session.
+     *
+     * If $data is a string, then it is interpreted as a session property
+     * key, and  $value is expected to be non-null.
+     *
+     * If $data is an array, it is expected to be an array of key/value pairs
+     * to be set as session properties.
+     *
+     * @param array|string $data  Property name or associative array of properties
+     * @param mixed        $value Property value if single key provided
+     */
+    public function set($data, $value = null)
+    {
+        if (is_array($data)) {
+            foreach ($data as $key => &$value) {
+                if (is_int($key)) {
+                    $_SESSION[$value] = null;
+                } else {
+                    $_SESSION[$key] = $value;
+                }
+            }
+
+            return;
+        }
+
+        $_SESSION[$data] = $value;
+    }
+
+    /**
+     * Get user data that has been set in the session.
+     *
+     * If the property exists as "normal", returns it.
+     * Otherwise, returns an array of any temp or flash data values with the
+     * property key.
+     *
+     * Replaces the legacy method $session->userdata();
+     *
+     * @param string|null $key Identifier of the session property to retrieve
+     *
+     * @return mixed The property value(s)
+     */
+    public function get(?string $key = null)
+    {
+        if (! empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
+            return $value;
+        }
+
+        if (empty($_SESSION)) {
+            return $key === null ? [] : null;
+        }
+
+        if (! empty($key)) {
+            return null;
+        }
+
+        $userdata = [];
+        $_exclude = array_merge(['__ci_vars'], $this->getFlashKeys(), $this->getTempKeys());
+
+        $keys = array_keys($_SESSION);
+
+        foreach ($keys as $key) {
+            if (! in_array($key, $_exclude, true)) {
+                $userdata[$key] = $_SESSION[$key];
+            }
+        }
+
+        return $userdata;
+    }
+
+    /**
+     * Returns whether an index exists in the session array.
+     *
+     * @param string $key Identifier of the session property we are interested in.
+     */
+    public function has(string $key): bool
+    {
+        return isset($_SESSION[$key]);
+    }
+
+    /**
+     * Push new value onto session value that is array.
+     *
+     * @param string $key  Identifier of the session property we are interested in.
+     * @param array  $data value to be pushed to existing session key.
+     */
+    public function push(string $key, array $data)
+    {
+        if ($this->has($key) && is_array($value = $this->get($key))) {
+            $this->set($key, array_merge($value, $data));
+        }
+    }
+
+    /**
+     * Remove one or more session properties.
+     *
+     * If $key is an array, it is interpreted as an array of string property
+     * identifiers to remove. Otherwise, it is interpreted as the identifier
+     * of a specific session property to remove.
+     *
+     * @param array|string $key Identifier of the session property or properties to remove.
+     */
+    public function remove($key)
+    {
+        if (is_array($key)) {
+            foreach ($key as $k) {
+                unset($_SESSION[$k]);
+            }
+
+            return;
+        }
+
+        unset($_SESSION[$key]);
+    }
+
+    /**
+     * Magic method to set variables in the session by simply calling
+     *  $session->foo = bar;
+     *
+     * @param string       $key   Identifier of the session property to set.
+     * @param array|string $value
+     */
+    public function __set(string $key, $value)
+    {
+        $_SESSION[$key] = $value;
+    }
+
+    /**
+     * Magic method to get session variables by simply calling
+     *  $foo = $session->foo;
+     *
+     * @param string $key Identifier of the session property to remove.
+     *
+     * @return string|null
+     */
+    public function __get(string $key)
+    {
+        // Note: Keep this order the same, just in case somebody wants to
+        // use 'session_id' as a session data key, for whatever reason
+        if (isset($_SESSION[$key])) {
+            return $_SESSION[$key];
+        }
+
+        if ($key === 'session_id') {
+            return session_id();
+        }
+
+        return null;
+    }
+
+    /**
+     * Magic method to check for session variables.
+     * Different from has() in that it will validate 'session_id' as well.
+     * Mostly used by internal PHP functions, users should stick to has()
+     *
+     * @param string $key Identifier of the session property to remove.
+     */
+    public function __isset(string $key): bool
+    {
+        return isset($_SESSION[$key]) || ($key === 'session_id');
+    }
+
+    /**
+     * Sets data into the session that will only last for a single request.
+     * Perfect for use with single-use status update messages.
+     *
+     * If $data is an array, it is interpreted as an associative array of
+     * key/value pairs for flashdata properties.
+     * Otherwise, it is interpreted as the identifier of a specific
+     * flashdata property, with $value containing the property value.
+     *
+     * @param array|string $data  Property identifier or associative array of properties
+     * @param array|string $value Property value if $data is a scalar
+     */
+    public function setFlashdata($data, $value = null)
+    {
+        $this->set($data, $value);
+        $this->markAsFlashdata(is_array($data) ? array_keys($data) : $data);
+    }
+
+    /**
+     * Retrieve one or more items of flash data from the session.
+     *
+     * If the item key is null, return all flashdata.
+     *
+     * @param string $key Property identifier
+     *
+     * @return array|null The requested property value, or an associative array  of them
+     */
+    public function getFlashdata(?string $key = null)
+    {
+        if (isset($key)) {
+            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
+                && ! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+        }
+
+        $flashdata = [];
+
+        if (! empty($_SESSION['__ci_vars'])) {
+            foreach ($_SESSION['__ci_vars'] as $key => &$value) {
+                if (! is_int($value)) {
+                    $flashdata[$key] = $_SESSION[$key];
+                }
+            }
+        }
+
+        return $flashdata;
+    }
+
+    /**
+     * Keeps a single piece of flash data alive for one more request.
+     *
+     * @param array|string $key Property identifier or array of them
+     */
+    public function keepFlashdata($key)
+    {
+        $this->markAsFlashdata($key);
+    }
+
+    /**
+     * Mark a session property or properties as flashdata.
+     *
+     * @param array|string $key Property identifier or array of them
+     *
+     * @return bool False if any of the properties are not already set
+     */
+    public function markAsFlashdata($key): bool
+    {
+        if (is_array($key)) {
+            foreach ($key as $sessionKey) {
+                if (! isset($_SESSION[$sessionKey])) {
+                    return false;
+                }
+            }
+
+            $new = array_fill_keys($key, 'new');
+
+            $_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $new) : $new;
+
+            return true;
+        }
+
+        if (! isset($_SESSION[$key])) {
+            return false;
+        }
+
+        $_SESSION['__ci_vars'][$key] = 'new';
+
+        return true;
+    }
+
+    /**
+     * Unmark data in the session as flashdata.
+     *
+     * @param mixed $key Property identifier or array of them
+     */
+    public function unmarkFlashdata($key)
+    {
+        if (empty($_SESSION['__ci_vars'])) {
+            return;
+        }
+
+        if (! is_array($key)) {
+            $key = [$key];
+        }
+
+        foreach ($key as $k) {
+            if (isset($_SESSION['__ci_vars'][$k]) && ! is_int($_SESSION['__ci_vars'][$k])) {
+                unset($_SESSION['__ci_vars'][$k]);
+            }
+        }
+
+        if (empty($_SESSION['__ci_vars'])) {
+            unset($_SESSION['__ci_vars']);
+        }
+    }
+
+    /**
+     * Retrieve all of the keys for session data marked as flashdata.
+     *
+     * @return array The property names of all flashdata
+     */
+    public function getFlashKeys(): array
+    {
+        if (! isset($_SESSION['__ci_vars'])) {
+            return [];
+        }
+
+        $keys = [];
+
+        foreach (array_keys($_SESSION['__ci_vars']) as $key) {
+            if (! is_int($_SESSION['__ci_vars'][$key])) {
+                $keys[] = $key;
+            }
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Sets new data into the session, and marks it as temporary data
+     * with a set lifespan.
+     *
+     * @param array|string $data  Session data key or associative array of items
+     * @param null         $value Value to store
+     * @param int          $ttl   Time-to-live in seconds
+     */
+    public function setTempdata($data, $value = null, int $ttl = 300)
+    {
+        $this->set($data, $value);
+        $this->markAsTempdata($data, $ttl);
+    }
+
+    /**
+     * Returns either a single piece of tempdata, or all temp data currently
+     * in the session.
+     *
+     * @param string $key Session data key
+     *
+     * @return mixed Session data value or null if not found.
+     */
+    public function getTempdata(?string $key = null)
+    {
+        if (isset($key)) {
+            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
+                    && is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+        }
+
+        $tempdata = [];
+
+        if (! empty($_SESSION['__ci_vars'])) {
+            foreach ($_SESSION['__ci_vars'] as $key => &$value) {
+                if (is_int($value)) {
+                    $tempdata[$key] = $_SESSION[$key];
+                }
+            }
+        }
+
+        return $tempdata;
+    }
+
+    /**
+     * Removes a single piece of temporary data from the session.
+     *
+     * @param string $key Session data key
+     */
+    public function removeTempdata(string $key)
+    {
+        $this->unmarkTempdata($key);
+        unset($_SESSION[$key]);
+    }
+
+    /**
+     * Mark one of more pieces of data as being temporary, meaning that
+     * it has a set lifespan within the session.
+     *
+     * @param array|string $key Property identifier or array of them
+     * @param int          $ttl Time to live, in seconds
+     *
+     * @return bool False if any of the properties were not set
+     */
+    public function markAsTempdata($key, int $ttl = 300): bool
+    {
+        $ttl += time();
+
+        if (is_array($key)) {
+            $temp = [];
+
+            foreach ($key as $k => $v) {
+                // Do we have a key => ttl pair, or just a key?
+                if (is_int($k)) {
+                    $k = $v;
+                    $v = $ttl;
+                } elseif (is_string($v)) {
+                    $v = time() + $ttl;
+                } else {
+                    $v += time();
+                }
+
+                if (! array_key_exists($k, $_SESSION)) {
+                    return false;
+                }
+
+                $temp[$k] = $v;
+            }
+
+            $_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars']) ? array_merge($_SESSION['__ci_vars'], $temp) : $temp;
+
+            return true;
+        }
+
+        if (! isset($_SESSION[$key])) {
+            return false;
+        }
+
+        $_SESSION['__ci_vars'][$key] = $ttl;
+
+        return true;
+    }
+
+    /**
+     * Unmarks temporary data in the session, effectively removing its
+     * lifespan and allowing it to live as long as the session does.
+     *
+     * @param array|string $key Property identifier or array of them
+     */
+    public function unmarkTempdata($key)
+    {
+        if (empty($_SESSION['__ci_vars'])) {
+            return;
+        }
+
+        if (! is_array($key)) {
+            $key = [$key];
+        }
+
+        foreach ($key as $k) {
+            if (isset($_SESSION['__ci_vars'][$k]) && is_int($_SESSION['__ci_vars'][$k])) {
+                unset($_SESSION['__ci_vars'][$k]);
+            }
+        }
+
+        if (empty($_SESSION['__ci_vars'])) {
+            unset($_SESSION['__ci_vars']);
+        }
+    }
+
+    /**
+     * Retrieve the keys of all session data that have been marked as temporary data.
+     */
+    public function getTempKeys(): array
+    {
+        if (! isset($_SESSION['__ci_vars'])) {
+            return [];
+        }
+
+        $keys = [];
+
+        foreach (array_keys($_SESSION['__ci_vars']) as $key) {
+            if (is_int($_SESSION['__ci_vars'][$key])) {
+                $keys[] = $key;
+            }
+        }
+
+        return $keys;
+    }
+
+    /**
+     * Sets the driver as the session handler in PHP.
+     * Extracted for easier testing.
+     */
+    protected function setSaveHandler()
+    {
+        session_set_save_handler($this->driver, true);
+    }
+
+    /**
+     * Starts the session.
+     * Extracted for testing reasons.
+     */
+    protected function startSession()
+    {
+        if (ENVIRONMENT === 'testing') {
+            $_SESSION = [];
+
+            return;
+        }
+
+        session_start(); // @codeCoverageIgnore
+    }
+
+    /**
+     * Takes care of setting the cookie on the client side.
+     *
+     * @codeCoverageIgnore
+     */
+    protected function setCookie()
+    {
+        $expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
+        $this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
+
+        cookies([$this->cookie], false)->dispatch();
+    }
 }
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index 80402ca8b772..f485f64da163 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
@@ -16,207 +16,169 @@
  */
 interface SessionInterface
 {
-	/**
-	 * Regenerates the session ID.
-	 *
-	 * @param boolean $destroy Should old session data be destroyed?
-	 */
-	public function regenerate(bool $destroy = false);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Destroys the current session.
-	 */
-	public function destroy();
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets user data into the session.
-	 *
-	 * If $data is a string, then it is interpreted as a session property
-	 * key, and  $value is expected to be non-null.
-	 *
-	 * If $data is an array, it is expected to be an array of key/value pairs
-	 * to be set as session properties.
-	 *
-	 * @param string|array $data  Property name or associative array of properties
-	 * @param mixed        $value Property value if single key provided
-	 */
-	public function set($data, $value = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get user data that has been set in the session.
-	 *
-	 * If the property exists as "normal", returns it.
-	 * Otherwise, returns an array of any temp or flash data values with the
-	 * property key.
-	 *
-	 * Replaces the legacy method $session->userdata();
-	 *
-	 * @param string $key Identifier of the session property to retrieve
-	 *
-	 * @return mixed The property value(s)
-	 */
-	public function get(string $key = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether an index exists in the session array.
-	 *
-	 * @param string $key Identifier of the session property we are interested in.
-	 *
-	 * @return boolean
-	 */
-	public function has(string $key): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Remove one or more session properties.
-	 *
-	 * If $key is an array, it is interpreted as an array of string property
-	 * identifiers to remove. Otherwise, it is interpreted as the identifier
-	 * of a specific session property to remove.
-	 *
-	 * @param string|array $key Identifier of the session property or properties to remove.
-	 */
-	public function remove($key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets data into the session that will only last for a single request.
-	 * Perfect for use with single-use status update messages.
-	 *
-	 * If $data is an array, it is interpreted as an associative array of
-	 * key/value pairs for flashdata properties.
-	 * Otherwise, it is interpreted as the identifier of a specific
-	 * flashdata property, with $value containing the property value.
-	 *
-	 * @param string|array $data  Property identifier or associative array of properties
-	 * @param string|array $value Property value if $data is a scalar
-	 */
-	public function setFlashdata($data, $value = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve one or more items of flash data from the session.
-	 *
-	 * If the item key is null, return all flashdata.
-	 *
-	 * @param  string $key Property identifier
-	 * @return array|null	The requested property value, or an associative
-	 *     array  of them
-	 */
-	public function getFlashdata(string $key = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keeps a single piece of flash data alive for one more request.
-	 *
-	 * @param array|string $key Property identifier or array of them
-	 */
-	public function keepFlashdata($key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Mark a session property or properties as flashdata.
-	 *
-	 * @param string|array $key Property identifier or array of them
-	 *
-	 * @return False if any of the properties are not already set
-	 */
-	public function markAsFlashdata($key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Unmark data in the session as flashdata.
-	 *
-	 * @param string|array $key	Property identifier or array of them
-	 */
-	public function unmarkFlashdata($key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve all of the keys for session data marked as flashdata.
-	 *
-	 * @return array	The property names of all flashdata
-	 */
-	public function getFlashKeys(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets new data into the session, and marks it as temporary data
-	 * with a set lifespan.
-	 *
-	 * @param string|array $data  Session data key or associative array of items
-	 * @param mixed        $value Value to store
-	 * @param integer      $ttl   Time-to-live in seconds
-	 */
-	public function setTempdata($data, $value = null, int $ttl = 300);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns either a single piece of tempdata, or all temp data currently
-	 * in the session.
-	 *
-	 * @param  string $key Session data key
-	 * @return mixed        Session data value or null if not found.
-	 */
-	public function getTempdata(string $key = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes a single piece of temporary data from the session.
-	 *
-	 * @param string $key Session data key
-	 */
-	public function removeTempdata(string $key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Mark one of more pieces of data as being temporary, meaning that
-	 * it has a set lifespan within the session.
-	 *
-	 * @param string|array $key Property identifier or array of them
-	 * @param integer      $ttl Time to live, in seconds
-	 *
-	 * @return boolean    False if any of the properties were not set
-	 */
-	public function markAsTempdata($key, int $ttl = 300);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Unmarks temporary data in the session, effectively removing its
-	 * lifespan and allowing it to live as long as the session does.
-	 *
-	 * @param string|array $key	Property identifier or array of them
-	 */
-	public function unmarkTempdata($key);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Retrieve the keys of all session data that have been marked as temporary data.
-	 *
-	 * @return array
-	 */
-	public function getTempKeys(): array;
-
-	//--------------------------------------------------------------------
+    /**
+     * Regenerates the session ID.
+     *
+     * @param bool $destroy Should old session data be destroyed?
+     */
+    public function regenerate(bool $destroy = false);
+
+    /**
+     * Destroys the current session.
+     */
+    public function destroy();
+
+    /**
+     * Sets user data into the session.
+     *
+     * If $data is a string, then it is interpreted as a session property
+     * key, and  $value is expected to be non-null.
+     *
+     * If $data is an array, it is expected to be an array of key/value pairs
+     * to be set as session properties.
+     *
+     * @param array|string $data  Property name or associative array of properties
+     * @param mixed        $value Property value if single key provided
+     */
+    public function set($data, $value = null);
+
+    /**
+     * Get user data that has been set in the session.
+     *
+     * If the property exists as "normal", returns it.
+     * Otherwise, returns an array of any temp or flash data values with the
+     * property key.
+     *
+     * Replaces the legacy method $session->userdata();
+     *
+     * @param string $key Identifier of the session property to retrieve
+     *
+     * @return mixed The property value(s)
+     */
+    public function get(?string $key = null);
+
+    /**
+     * Returns whether an index exists in the session array.
+     *
+     * @param string $key Identifier of the session property we are interested in.
+     */
+    public function has(string $key): bool;
+
+    /**
+     * Remove one or more session properties.
+     *
+     * If $key is an array, it is interpreted as an array of string property
+     * identifiers to remove. Otherwise, it is interpreted as the identifier
+     * of a specific session property to remove.
+     *
+     * @param array|string $key Identifier of the session property or properties to remove.
+     */
+    public function remove($key);
+
+    /**
+     * Sets data into the session that will only last for a single request.
+     * Perfect for use with single-use status update messages.
+     *
+     * If $data is an array, it is interpreted as an associative array of
+     * key/value pairs for flashdata properties.
+     * Otherwise, it is interpreted as the identifier of a specific
+     * flashdata property, with $value containing the property value.
+     *
+     * @param array|string $data  Property identifier or associative array of properties
+     * @param array|string $value Property value if $data is a scalar
+     */
+    public function setFlashdata($data, $value = null);
+
+    /**
+     * Retrieve one or more items of flash data from the session.
+     *
+     * If the item key is null, return all flashdata.
+     *
+     * @param string $key Property identifier
+     *
+     * @return array|null The requested property value, or an associative
+     *                    array  of them
+     */
+    public function getFlashdata(?string $key = null);
+
+    /**
+     * Keeps a single piece of flash data alive for one more request.
+     *
+     * @param array|string $key Property identifier or array of them
+     */
+    public function keepFlashdata($key);
+
+    /**
+     * Mark a session property or properties as flashdata.
+     *
+     * @param array|string $key Property identifier or array of them
+     *
+     * @return false if any of the properties are not already set
+     */
+    public function markAsFlashdata($key);
+
+    /**
+     * Unmark data in the session as flashdata.
+     *
+     * @param array|string $key Property identifier or array of them
+     */
+    public function unmarkFlashdata($key);
+
+    /**
+     * Retrieve all of the keys for session data marked as flashdata.
+     *
+     * @return array The property names of all flashdata
+     */
+    public function getFlashKeys(): array;
+
+    /**
+     * Sets new data into the session, and marks it as temporary data
+     * with a set lifespan.
+     *
+     * @param array|string $data  Session data key or associative array of items
+     * @param mixed        $value Value to store
+     * @param int          $ttl   Time-to-live in seconds
+     */
+    public function setTempdata($data, $value = null, int $ttl = 300);
+
+    /**
+     * Returns either a single piece of tempdata, or all temp data currently
+     * in the session.
+     *
+     * @param string $key Session data key
+     *
+     * @return mixed Session data value or null if not found.
+     */
+    public function getTempdata(?string $key = null);
+
+    /**
+     * Removes a single piece of temporary data from the session.
+     *
+     * @param string $key Session data key
+     */
+    public function removeTempdata(string $key);
+
+    /**
+     * Mark one of more pieces of data as being temporary, meaning that
+     * it has a set lifespan within the session.
+     *
+     * @param array|string $key Property identifier or array of them
+     * @param int          $ttl Time to live, in seconds
+     *
+     * @return bool False if any of the properties were not set
+     */
+    public function markAsTempdata($key, int $ttl = 300);
+
+    /**
+     * Unmarks temporary data in the session, effectively removing its
+     * lifespan and allowing it to live as long as the session does.
+     *
+     * @param array|string $key Property identifier or array of them
+     */
+    public function unmarkTempdata($key);
+
+    /**
+     * Retrieve the keys of all session data that have been marked as temporary data.
+     */
+    public function getTempKeys(): array;
 }
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
index 63ded76eb0a0..8e25c3782dbb 100644
--- a/system/Test/CIDatabaseTestCase.php
+++ b/system/Test/CIDatabaseTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -20,5 +20,5 @@
  */
 abstract class CIDatabaseTestCase extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 }
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index c651aaa8d81d..50a28e13d2da 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -35,543 +35,507 @@
  */
 abstract class CIUnitTestCase extends TestCase
 {
-	use ReflectionHelper;
-
-	/**
-	 * @var CodeIgniter
-	 */
-	protected $app;
-
-	/**
-	 * Methods to run during setUp.
-	 *
-	 * @var array of methods
-	 */
-	protected $setUpMethods = [
-		'resetFactories',
-		'mockCache',
-		'mockEmail',
-		'mockSession',
-	];
-
-	/**
-	 * Methods to run during tearDown.
-	 *
-	 * @var array of methods
-	 */
-	protected $tearDownMethods = [];
-
-	/**
-	 * Store of identified traits.
-	 *
-	 * @var string[]|null
-	 */
-	private $traits;
-
-	//--------------------------------------------------------------------
-	// Database Properties
-	//--------------------------------------------------------------------
-
-	/**
-	 * Should run db migration?
-	 *
-	 * @var boolean
-	 */
-	protected $migrate = true;
-
-	/**
-	 * Should run db migration only once?
-	 *
-	 * @var boolean
-	 */
-	protected $migrateOnce = false;
-
-	/**
-	 * Should run seeding only once?
-	 *
-	 * @var boolean
-	 */
-	protected $seedOnce = false;
-
-	/**
-	 * Should the db be refreshed before test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
-
-	/**
-	 * The seed file(s) used for all tests within this test case.
-	 * Should be fully-namespaced or relative to $basePath
-	 *
-	 * @var string|array
-	 */
-	protected $seed = '';
-
-	/**
-	 * The path to the seeds directory.
-	 * Allows overriding the default application directories.
-	 *
-	 * @var string
-	 */
-	protected $basePath = SUPPORTPATH . 'Database';
-
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = 'Tests\Support';
-
-	/**
-	 * The name of the database group to connect to.
-	 * If not present, will use the defaultGroup.
-	 *
-	 * @var string
-	 */
-	protected $DBGroup = 'tests';
-
-	/**
-	 * Our database connection.
-	 *
-	 * @var BaseConnection
-	 */
-	protected $db;
-
-	/**
-	 * Migration Runner instance.
-	 *
-	 * @var MigrationRunner|mixed
-	 */
-	protected $migrations;
-
-	/**
-	 * Seeder instance
-	 *
-	 * @var Seeder
-	 */
-	protected $seeder;
-
-	/**
-	 * Stores information needed to remove any
-	 * rows inserted via $this->hasInDatabase();
-	 *
-	 * @var array
-	 */
-	protected $insertCache = [];
-
-	//--------------------------------------------------------------------
-	// Feature Properties
-	//--------------------------------------------------------------------
-
-	/**
-	 * If present, will override application
-	 * routes when using call().
-	 *
-	 * @var RouteCollection|null
-	 */
-	protected $routes;
-
-	/**
-	 * Values to be set in the SESSION global
-	 * before running the test.
-	 *
-	 * @var array
-	 */
-	protected $session = [];
-
-	/**
-	 * Enabled auto clean op buffer after request call
-	 *
-	 * @var boolean
-	 */
-	protected $clean = true;
-
-	/**
-	 * Custom request's headers
-	 *
-	 * @var array
-	 */
-	protected $headers = [];
-
-	/**
-	 * Allows for formatting the request body to what
-	 * the controller is going to expect
-	 *
-	 * @var string
-	 */
-	protected $bodyFormat = '';
-
-	/**
-	 * Allows for directly setting the body to what
-	 * it needs to be.
-	 *
-	 * @var mixed
-	 */
-	protected $requestBody = '';
-
-	//--------------------------------------------------------------------
-	// Staging
-	//--------------------------------------------------------------------
-
-	/**
-	 * Load the helpers.
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper(['url', 'test']);
-	}
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		if (! $this->app) // @phpstan-ignore-line
-		{
-			$this->app = $this->createApplication();
-		}
-
-		foreach ($this->setUpMethods as $method)
-		{
-			$this->$method();
-		}
-
-		// Check for the database trait
-		if (method_exists($this, 'setUpDatabase'))
-		{
-			$this->setUpDatabase();
-		}
-
-		// Check for other trait methods
-		$this->callTraitMethods('setUp');
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-
-		foreach ($this->tearDownMethods as $method)
-		{
-			$this->$method();
-		}
-
-		// Check for the database trait
-		if (method_exists($this, 'tearDownDatabase'))
-		{
-			$this->tearDownDatabase();
-		}
-
-		// Check for other trait methods
-		$this->callTraitMethods('tearDown');
-	}
-
-	/**
-	 * Checks for traits with corresponding
-	 * methods for setUp or tearDown.
-	 *
-	 * @param string $stage 'setUp' or 'tearDown'
-	 *
-	 * @return void
-	 */
-	private function callTraitMethods(string $stage): void
-	{
-		if (is_null($this->traits))
-		{
-			$this->traits = class_uses_recursive($this);
-		}
-
-		foreach ($this->traits as $trait)
-		{
-			$method = $stage . class_basename($trait);
-
-			if (method_exists($this, $method))
-			{
-				$this->$method();
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Mocking
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resets shared instanced for all Factories components
-	 */
-	protected function resetFactories()
-	{
-		Factories::reset();
-	}
-
-	/**
-	 * Resets shared instanced for all Services
-	 */
-	protected function resetServices()
-	{
-		Services::reset();
-	}
-
-	/**
-	 * Injects the mock Cache driver to prevent filesystem collisions
-	 */
-	protected function mockCache()
-	{
-		Services::injectMock('cache', new MockCache());
-	}
-
-	/**
-	 * Injects the mock email driver so no emails really send
-	 */
-	protected function mockEmail()
-	{
-		Services::injectMock('email', new MockEmail(config('Email')));
-	}
-
-	/**
-	 * Injects the mock session driver into Services
-	 */
-	protected function mockSession()
-	{
-		$_SESSION = [];
-
-		$config  = config('App');
-		$session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
-
-		Services::injectMock('session', $session);
-	}
-
-	//--------------------------------------------------------------------
-	// Assertions
-	//--------------------------------------------------------------------
-
-	/**
-	 * Custom function to hook into CodeIgniter's Logging mechanism
-	 * to check if certain messages were logged during code execution.
-	 *
-	 * @param string      $level
-	 * @param string|null $expectedMessage
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function assertLogged(string $level, $expectedMessage = null)
-	{
-		$result = TestLogger::didLog($level, $expectedMessage);
-
-		$this->assertTrue($result, sprintf(
-			'Failed asserting that expected message "%s" with level "%s" was logged.',
-			$expectedMessage ?? '',
-			$level
-		));
-
-		return $result;
-	}
-
-	/**
-	 * Hooks into CodeIgniter's Events system to check if a specific
-	 * event was triggered or not.
-	 *
-	 * @param string $eventName
-	 *
-	 * @return boolean
-	 * @throws Exception
-	 */
-	public function assertEventTriggered(string $eventName): bool
-	{
-		$found     = false;
-		$eventName = strtolower($eventName);
-
-		foreach (Events::getPerformanceLogs() as $log)
-		{
-			if ($log['event'] !== $eventName)
-			{
-				continue;
-			}
-
-			$found = true;
-			break;
-		}
-
-		$this->assertTrue($found);
-		return $found;
-	}
-
-	/**
-	 * Hooks into xdebug's headers capture, looking for a specific header
-	 * emitted
-	 *
-	 * @param string  $header     The leading portion of the header we are looking for
-	 * @param boolean $ignoreCase
-	 *
-	 * @throws Exception
-	 */
-	public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
-	{
-		$found = false;
-
-		if (! function_exists('xdebug_get_headers'))
-		{
-			$this->markTestSkipped('XDebug not found.');
-		}
-
-		foreach (xdebug_get_headers() as $emitted)
-		{
-			$found = $ignoreCase ?
-					(stripos($emitted, $header) === 0) :
-					(strpos($emitted, $header) === 0);
-			if ($found)
-			{
-				break;
-			}
-		}
-
-		$this->assertTrue($found, "Didn't find header for {$header}");
-	}
-
-	/**
-	 * Hooks into xdebug's headers capture, looking for a specific header
-	 * emitted
-	 *
-	 * @param string  $header     The leading portion of the header we don't want to find
-	 * @param boolean $ignoreCase
-	 *
-	 * @throws Exception
-	 */
-	public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
-	{
-		$found = false;
-
-		if (! function_exists('xdebug_get_headers'))
-		{
-			$this->markTestSkipped('XDebug not found.');
-		}
-
-		foreach (xdebug_get_headers() as $emitted)
-		{
-			$found = $ignoreCase ?
-					(stripos($emitted, $header) === 0) :
-					(strpos($emitted, $header) === 0);
-			if ($found)
-			{
-				break;
-			}
-		}
-
-		$success = ! $found;
-		$this->assertTrue($success, "Found header for {$header}");
-	}
-
-	/**
-	 * Custom function to test that two values are "close enough".
-	 * This is intended for extended execution time testing,
-	 * where the result is close but not exactly equal to the
-	 * expected time, for reasons beyond our control.
-	 *
-	 * @param integer $expected
-	 * @param mixed   $actual
-	 * @param string  $message
-	 * @param integer $tolerance
-	 *
-	 * @throws Exception
-	 */
-	public function assertCloseEnough(int $expected, $actual, string $message = '', int $tolerance = 1)
-	{
-		$difference = abs($expected - (int) floor($actual));
-
-		$this->assertLessThanOrEqual($tolerance, $difference, $message);
-	}
-
-	/**
-	 * Custom function to test that two values are "close enough".
-	 * This is intended for extended execution time testing,
-	 * where the result is close but not exactly equal to the
-	 * expected time, for reasons beyond our control.
-	 *
-	 * @param mixed   $expected
-	 * @param mixed   $actual
-	 * @param string  $message
-	 * @param integer $tolerance
-	 *
-	 * @return void|boolean
-	 * @throws Exception
-	 */
-	public function assertCloseEnoughString($expected, $actual, string $message = '', int $tolerance = 1)
-	{
-		$expected = (string) $expected;
-		$actual   = (string) $actual;
-		if (strlen($expected) !== strlen($actual))
-		{
-			return false;
-		}
-
-		try
-		{
-			$expected   = (int) substr($expected, -2);
-			$actual     = (int) substr($actual, -2);
-			$difference = abs($expected - $actual);
-
-			$this->assertLessThanOrEqual($tolerance, $difference, $message);
-		}
-		catch (Exception $e)
-		{
-			return false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Utility
-	//--------------------------------------------------------------------
-
-	/**
-	 * Loads up an instance of CodeIgniter
-	 * and gets the environment setup.
-	 *
-	 * @return CodeIgniter
-	 */
-	protected function createApplication()
-	{
-		// Initialize the autoloader.
-		Services::autoloader()->initialize(new Autoload(), new Modules());
-
-		$app = new MockCodeIgniter(new App());
-		$app->initialize();
-
-		return $app;
-	}
-
-	/**
-	 * Return first matching emitted header.
-	 *
-	 * @param string  $header     Identifier of the header of interest
-	 * @param boolean $ignoreCase
-	 *
-	 * @return string|null The value of the header found, null if not found
-	 */
-	protected function getHeaderEmitted(string $header, bool $ignoreCase = false): ?string
-	{
-		$found = false;
-
-		if (! function_exists('xdebug_get_headers'))
-		{
-			$this->markTestSkipped('XDebug not found.');
-		}
-
-		foreach (xdebug_get_headers() as $emitted)
-		{
-			$found = $ignoreCase ?
-					(stripos($emitted, $header) === 0) :
-					(strpos($emitted, $header) === 0);
-			if ($found)
-			{
-				return $emitted;
-			}
-		}
-
-		return null;
-	}
+    use ReflectionHelper;
+
+    /**
+     * @var CodeIgniter
+     */
+    protected $app;
+
+    /**
+     * Methods to run during setUp.
+     *
+     * @var array of methods
+     */
+    protected $setUpMethods = [
+        'resetFactories',
+        'mockCache',
+        'mockEmail',
+        'mockSession',
+    ];
+
+    /**
+     * Methods to run during tearDown.
+     *
+     * @var array of methods
+     */
+    protected $tearDownMethods = [];
+
+    /**
+     * Store of identified traits.
+     *
+     * @var string[]|null
+     */
+    private $traits;
+
+    //--------------------------------------------------------------------
+    // Database Properties
+    //--------------------------------------------------------------------
+
+    /**
+     * Should run db migration?
+     *
+     * @var bool
+     */
+    protected $migrate = true;
+
+    /**
+     * Should run db migration only once?
+     *
+     * @var bool
+     */
+    protected $migrateOnce = false;
+
+    /**
+     * Should run seeding only once?
+     *
+     * @var bool
+     */
+    protected $seedOnce = false;
+
+    /**
+     * Should the db be refreshed before test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
+
+    /**
+     * The seed file(s) used for all tests within this test case.
+     * Should be fully-namespaced or relative to $basePath
+     *
+     * @var array|string
+     */
+    protected $seed = '';
+
+    /**
+     * The path to the seeds directory.
+     * Allows overriding the default application directories.
+     *
+     * @var string
+     */
+    protected $basePath = SUPPORTPATH . 'Database';
+
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = 'Tests\Support';
+
+    /**
+     * The name of the database group to connect to.
+     * If not present, will use the defaultGroup.
+     *
+     * @var string
+     */
+    protected $DBGroup = 'tests';
+
+    /**
+     * Our database connection.
+     *
+     * @var BaseConnection
+     */
+    protected $db;
+
+    /**
+     * Migration Runner instance.
+     *
+     * @var MigrationRunner|mixed
+     */
+    protected $migrations;
+
+    /**
+     * Seeder instance
+     *
+     * @var Seeder
+     */
+    protected $seeder;
+
+    /**
+     * Stores information needed to remove any
+     * rows inserted via $this->hasInDatabase();
+     *
+     * @var array
+     */
+    protected $insertCache = [];
+
+    //--------------------------------------------------------------------
+    // Feature Properties
+    //--------------------------------------------------------------------
+
+    /**
+     * If present, will override application
+     * routes when using call().
+     *
+     * @var RouteCollection|null
+     */
+    protected $routes;
+
+    /**
+     * Values to be set in the SESSION global
+     * before running the test.
+     *
+     * @var array
+     */
+    protected $session = [];
+
+    /**
+     * Enabled auto clean op buffer after request call
+     *
+     * @var bool
+     */
+    protected $clean = true;
+
+    /**
+     * Custom request's headers
+     *
+     * @var array
+     */
+    protected $headers = [];
+
+    /**
+     * Allows for formatting the request body to what
+     * the controller is going to expect
+     *
+     * @var string
+     */
+    protected $bodyFormat = '';
+
+    /**
+     * Allows for directly setting the body to what
+     * it needs to be.
+     *
+     * @var mixed
+     */
+    protected $requestBody = '';
+
+    //--------------------------------------------------------------------
+    // Staging
+    //--------------------------------------------------------------------
+
+    /**
+     * Load the helpers.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper(['url', 'test']);
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (! $this->app) { // @phpstan-ignore-line
+            $this->app = $this->createApplication();
+        }
+
+        foreach ($this->setUpMethods as $method) {
+            $this->{$method}();
+        }
+
+        // Check for the database trait
+        if (method_exists($this, 'setUpDatabase')) {
+            $this->setUpDatabase();
+        }
+
+        // Check for other trait methods
+        $this->callTraitMethods('setUp');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        foreach ($this->tearDownMethods as $method) {
+            $this->{$method}();
+        }
+
+        // Check for the database trait
+        if (method_exists($this, 'tearDownDatabase')) {
+            $this->tearDownDatabase();
+        }
+
+        // Check for other trait methods
+        $this->callTraitMethods('tearDown');
+    }
+
+    /**
+     * Checks for traits with corresponding
+     * methods for setUp or tearDown.
+     *
+     * @param string $stage 'setUp' or 'tearDown'
+     */
+    private function callTraitMethods(string $stage): void
+    {
+        if ($this->traits === null) {
+            $this->traits = class_uses_recursive($this);
+        }
+
+        foreach ($this->traits as $trait) {
+            $method = $stage . class_basename($trait);
+
+            if (method_exists($this, $method)) {
+                $this->{$method}();
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------
+    // Mocking
+    //--------------------------------------------------------------------
+
+    /**
+     * Resets shared instanced for all Factories components
+     */
+    protected function resetFactories()
+    {
+        Factories::reset();
+    }
+
+    /**
+     * Resets shared instanced for all Services
+     */
+    protected function resetServices()
+    {
+        Services::reset();
+    }
+
+    /**
+     * Injects the mock Cache driver to prevent filesystem collisions
+     */
+    protected function mockCache()
+    {
+        Services::injectMock('cache', new MockCache());
+    }
+
+    /**
+     * Injects the mock email driver so no emails really send
+     */
+    protected function mockEmail()
+    {
+        Services::injectMock('email', new MockEmail(config('Email')));
+    }
+
+    /**
+     * Injects the mock session driver into Services
+     */
+    protected function mockSession()
+    {
+        $_SESSION = [];
+
+        $config  = config('App');
+        $session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
+
+        Services::injectMock('session', $session);
+    }
+
+    //--------------------------------------------------------------------
+    // Assertions
+    //--------------------------------------------------------------------
+
+    /**
+     * Custom function to hook into CodeIgniter's Logging mechanism
+     * to check if certain messages were logged during code execution.
+     *
+     * @param string|null $expectedMessage
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function assertLogged(string $level, $expectedMessage = null)
+    {
+        $result = TestLogger::didLog($level, $expectedMessage);
+
+        $this->assertTrue($result, sprintf(
+            'Failed asserting that expected message "%s" with level "%s" was logged.',
+            $expectedMessage ?? '',
+            $level
+        ));
+
+        return $result;
+    }
+
+    /**
+     * Hooks into CodeIgniter's Events system to check if a specific
+     * event was triggered or not.
+     *
+     * @throws Exception
+     */
+    public function assertEventTriggered(string $eventName): bool
+    {
+        $found     = false;
+        $eventName = strtolower($eventName);
+
+        foreach (Events::getPerformanceLogs() as $log) {
+            if ($log['event'] !== $eventName) {
+                continue;
+            }
+
+            $found = true;
+            break;
+        }
+
+        $this->assertTrue($found);
+
+        return $found;
+    }
+
+    /**
+     * Hooks into xdebug's headers capture, looking for a specific header
+     * emitted
+     *
+     * @param string $header The leading portion of the header we are looking for
+     *
+     * @throws Exception
+     */
+    public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
+    {
+        $found = false;
+
+        if (! function_exists('xdebug_get_headers')) {
+            $this->markTestSkipped('XDebug not found.');
+        }
+
+        foreach (xdebug_get_headers() as $emitted) {
+            $found = $ignoreCase ?
+                    (stripos($emitted, $header) === 0) :
+                    (strpos($emitted, $header) === 0);
+            if ($found) {
+                break;
+            }
+        }
+
+        $this->assertTrue($found, "Didn't find header for {$header}");
+    }
+
+    /**
+     * Hooks into xdebug's headers capture, looking for a specific header
+     * emitted
+     *
+     * @param string $header The leading portion of the header we don't want to find
+     *
+     * @throws Exception
+     */
+    public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
+    {
+        $found = false;
+
+        if (! function_exists('xdebug_get_headers')) {
+            $this->markTestSkipped('XDebug not found.');
+        }
+
+        foreach (xdebug_get_headers() as $emitted) {
+            $found = $ignoreCase ?
+                    (stripos($emitted, $header) === 0) :
+                    (strpos($emitted, $header) === 0);
+            if ($found) {
+                break;
+            }
+        }
+
+        $success = ! $found;
+        $this->assertTrue($success, "Found header for {$header}");
+    }
+
+    /**
+     * Custom function to test that two values are "close enough".
+     * This is intended for extended execution time testing,
+     * where the result is close but not exactly equal to the
+     * expected time, for reasons beyond our control.
+     *
+     * @param mixed $actual
+     *
+     * @throws Exception
+     */
+    public function assertCloseEnough(int $expected, $actual, string $message = '', int $tolerance = 1)
+    {
+        $difference = abs($expected - (int) floor($actual));
+
+        $this->assertLessThanOrEqual($tolerance, $difference, $message);
+    }
+
+    /**
+     * Custom function to test that two values are "close enough".
+     * This is intended for extended execution time testing,
+     * where the result is close but not exactly equal to the
+     * expected time, for reasons beyond our control.
+     *
+     * @param mixed $expected
+     * @param mixed $actual
+     *
+     * @throws Exception
+     *
+     * @return bool|void
+     */
+    public function assertCloseEnoughString($expected, $actual, string $message = '', int $tolerance = 1)
+    {
+        $expected = (string) $expected;
+        $actual   = (string) $actual;
+        if (strlen($expected) !== strlen($actual)) {
+            return false;
+        }
+
+        try {
+            $expected   = (int) substr($expected, -2);
+            $actual     = (int) substr($actual, -2);
+            $difference = abs($expected - $actual);
+
+            $this->assertLessThanOrEqual($tolerance, $difference, $message);
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    //--------------------------------------------------------------------
+    // Utility
+    //--------------------------------------------------------------------
+
+    /**
+     * Loads up an instance of CodeIgniter
+     * and gets the environment setup.
+     *
+     * @return CodeIgniter
+     */
+    protected function createApplication()
+    {
+        // Initialize the autoloader.
+        Services::autoloader()->initialize(new Autoload(), new Modules());
+
+        $app = new MockCodeIgniter(new App());
+        $app->initialize();
+
+        return $app;
+    }
+
+    /**
+     * Return first matching emitted header.
+     *
+     * @param string $header Identifier of the header of interest
+     *
+     * @return string|null The value of the header found, null if not found
+     */
+    protected function getHeaderEmitted(string $header, bool $ignoreCase = false): ?string
+    {
+        if (! function_exists('xdebug_get_headers')) {
+            $this->markTestSkipped('XDebug not found.');
+        }
+
+        foreach (xdebug_get_headers() as $emitted) {
+            $found = $ignoreCase ?
+                    (stripos($emitted, $header) === 0) :
+                    (strpos($emitted, $header) === 0);
+            if ($found) {
+                return $emitted;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
index 0647fb9b5923..dbed1e42de1c 100644
--- a/system/Test/Constraints/SeeInDatabase.php
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test\Constraints;
 
 use CodeIgniter\Database\ConnectionInterface;
@@ -7,120 +16,103 @@
 
 class SeeInDatabase extends Constraint
 {
-	/**
-	 * The number of results that will show in the database
-	 * in case of failure.
-	 *
-	 * @var integer
-	 */
-	protected $show = 3;
-
-	/**
-	 * @var ConnectionInterface
-	 */
-	protected $db;
-
-	/**
-	 * Data used to compare results against.
-	 *
-	 * @var array
-	 */
-	protected $data;
-
-	/**
-	 * SeeInDatabase constructor.
-	 *
-	 * @param ConnectionInterface $db
-	 * @param array               $data
-	 */
-	public function __construct(ConnectionInterface $db, array $data)
-	{
-		$this->db   = $db;
-		$this->data = $data;
-	}
-
-	/**
-	 * Check if data is found in the table
-	 *
-	 * @param mixed $table
-	 *
-	 * @return boolean
-	 */
-	public function matches($table): bool
-	{
-		return $this->db->table($table)->where($this->data)->countAllResults() > 0;
-	}
-
-	/**
-	 * Get the description of the failure
-	 *
-	 * @param mixed $table
-	 *
-	 * @return string
-	 */
-	public function failureDescription($table): string
-	{
-		return sprintf(
-			"a row in the table [%s] matches the attributes \n%s\n\n%s",
-			$table, $this->toString(JSON_PRETTY_PRINT), $this->getAdditionalInfo($table)
-		);
-	}
-
-	/**
-	 * Gets additional records similar to $data.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function getAdditionalInfo(string $table): string
-	{
-		$builder = $this->db->table($table);
-
-		$similar = $builder->where(
-				array_key_first($this->data),
-				$this->data[array_key_first($this->data)]
-			)->limit($this->show)
-			->get()->getResultArray();
-
-		if ($similar !== [])
-		{
-			$description = 'Found similar results: ' . json_encode($similar, JSON_PRETTY_PRINT);
-		}
-		else
-		{
-			// Does the table have any results at all?
-			$results = $this->db->table($table)
-				->limit($this->show)
-				->get()
-				->getResultArray();
-
-			if ($results !== [])
-			{
-				return 'The table is empty.';
-			}
-
-			$description = 'Found: ' . json_encode($results, JSON_PRETTY_PRINT);
-		}
-
-		$total = $this->db->table($table)->countAll();
-		if ($total > $this->show)
-		{
-			$description .= sprintf(' and %s others', $total - $this->show);
-		}
-
-		return $description;
-	}
-
-	/**
-	 * Gets a string representation of the constraint
-	 *
-	 * @param integer $options
-	 *
-	 * @return string
-	 */
-	public function toString($options = 0): string
-	{
-		return json_encode($this->data, $options);
-	}
+    /**
+     * The number of results that will show in the database
+     * in case of failure.
+     *
+     * @var int
+     */
+    protected $show = 3;
+
+    /**
+     * @var ConnectionInterface
+     */
+    protected $db;
+
+    /**
+     * Data used to compare results against.
+     *
+     * @var array
+     */
+    protected $data;
+
+    /**
+     * SeeInDatabase constructor.
+     */
+    public function __construct(ConnectionInterface $db, array $data)
+    {
+        $this->db   = $db;
+        $this->data = $data;
+    }
+
+    /**
+     * Check if data is found in the table
+     *
+     * @param mixed $table
+     */
+    protected function matches($table): bool
+    {
+        return $this->db->table($table)->where($this->data)->countAllResults() > 0;
+    }
+
+    /**
+     * Get the description of the failure
+     *
+     * @param mixed $table
+     */
+    protected function failureDescription($table): string
+    {
+        return sprintf(
+            "a row in the table [%s] matches the attributes \n%s\n\n%s",
+            $table,
+            $this->toString(JSON_PRETTY_PRINT),
+            $this->getAdditionalInfo($table)
+        );
+    }
+
+    /**
+     * Gets additional records similar to $data.
+     */
+    protected function getAdditionalInfo(string $table): string
+    {
+        $builder = $this->db->table($table);
+
+        $similar = $builder->where(
+            array_key_first($this->data),
+            $this->data[array_key_first($this->data)]
+        )->limit($this->show)->get()->getResultArray();
+
+        if ($similar !== []) {
+            $description = 'Found similar results: ' . json_encode($similar, JSON_PRETTY_PRINT);
+        } else {
+            // Does the table have any results at all?
+            $results = $this->db->table($table)
+                ->limit($this->show)
+                ->get()
+                ->getResultArray();
+
+            if ($results !== []) {
+                return 'The table is empty.';
+            }
+
+            $description = 'Found: ' . json_encode($results, JSON_PRETTY_PRINT);
+        }
+
+        $total = $this->db->table($table)->countAll();
+        if ($total > $this->show) {
+            $description .= sprintf(' and %s others', $total - $this->show);
+        }
+
+        return $description;
+    }
+
+    /**
+     * Gets a string representation of the constraint
+     *
+     * @param int $options
+     */
+    public function toString($options = 0): string
+    {
+        return json_encode($this->data, $options);
+    }
 }
diff --git a/system/Test/ControllerResponse.php b/system/Test/ControllerResponse.php
index 2365c35ed069..2a90e4dd0bb9 100644
--- a/system/Test/ControllerResponse.php
+++ b/system/Test/ControllerResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -23,82 +23,77 @@
  */
 class ControllerResponse extends TestResponse
 {
-	/**
-	 * The message payload.
-	 *
-	 * @var string
-	 *
-	 * @deprecated Use $response->getBody() instead
-	 */
-	protected $body;
+    /**
+     * The message payload.
+     *
+     * @var string
+     *
+     * @deprecated Use $response->getBody() instead
+     */
+    protected $body;
 
-	/**
-	 * DOM for the body.
-	 *
-	 * @var DOMParser
-	 *
-	 * @deprecated Use $domParser instead
-	 */
-	protected $dom;
+    /**
+     * DOM for the body.
+     *
+     * @var DOMParser
+     *
+     * @deprecated Use $domParser instead
+     */
+    protected $dom;
 
-	/**
-	 * Maintains the deprecated $dom property.
-	 */
-	public function __construct()
-	{
-		parent::__construct(Services::response());
+    /**
+     * Maintains the deprecated $dom property.
+     */
+    public function __construct()
+    {
+        parent::__construct(Services::response());
 
-		$this->dom = &$this->domParser;
-	}
+        $this->dom = &$this->domParser;
+    }
 
-	/**
-	 * Sets the response.
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return $this
-	 *
-	 * @deprecated Will revert to parent::setResponse() in a future release (no $body updates)
-	 */
-	public function setResponse(ResponseInterface $response)
-	{
-		parent::setResponse($response);
+    /**
+     * Sets the response.
+     *
+     * @return $this
+     *
+     * @deprecated Will revert to parent::setResponse() in a future release (no $body updates)
+     */
+    public function setResponse(ResponseInterface $response)
+    {
+        parent::setResponse($response);
 
-		$this->body = $response->getBody() ?? '';
+        $this->body = $response->getBody() ?? '';
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Sets the body and updates the DOM.
-	 *
-	 * @param string $body
-	 *
-	 * @return $this
-	 *
-	 * @deprecated Use response()->setBody() instead
-	 */
-	public function setBody(string $body)
-	{
-		$this->body = $body;
+    /**
+     * Sets the body and updates the DOM.
+     *
+     * @return $this
+     *
+     * @deprecated Use response()->setBody() instead
+     */
+    public function setBody(string $body)
+    {
+        $this->body = $body;
 
-		if ($body !== '')
-		{
-			$this->domParser->withString($body);
-		}
+        if ($body !== '') {
+            $this->domParser->withString($body);
+        }
 
-		return $this;
-	}
+        return $this;
+    }
 
-	/**
-	 * Retrieve the body.
-	 *
-	 * @return string
-	 *
-	 * @deprecated Use response()->getBody() instead
-	 */
-	public function getBody()
-	{
-		return $this->body;
-	}
+    /**
+     * Retrieve the body.
+     *
+     * @return string
+     *
+     * @deprecated Use response()->getBody() instead
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
 }
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
index 47810e519df3..c5e255b732e4 100644
--- a/system/Test/ControllerTestTrait.php
+++ b/system/Test/ControllerTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -38,289 +38,260 @@
  */
 trait ControllerTestTrait
 {
-	/**
-	 * Controller configuration.
-	 *
-	 * @var App
-	 */
-	protected $appConfig;
-
-	/**
-	 * Request.
-	 *
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	/**
-	 * Response.
-	 *
-	 * @var Response
-	 */
-	protected $response;
-
-	/**
-	 * Message logger.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Initialized controller.
-	 *
-	 * @var Controller
-	 */
-	protected $controller;
-
-	/**
-	 * URI of this request.
-	 *
-	 * @var string
-	 */
-	protected $uri = 'http://example.com';
-
-	/**
-	 * Request body.
-	 *
-	 * @var string|null
-	 */
-	protected $body;
-
-	/**
-	 * Initializes required components.
-	 */
-	protected function setUpControllerTestTrait(): void
-	{
-		// The URL helper is always loaded by the system so ensure it is available.
-		helper('url');
-
-		if (empty($this->appConfig))
-		{
-			$this->appConfig = config('App');
-		}
-
-		if (! $this->uri instanceof URI)
-		{
-			$this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
-		}
-
-		if (empty($this->request))
-		{
-			// Do some acrobatics so we can use the Request service with our own URI
-			$tempUri = Services::uri();
-			Services::injectMock('uri', $this->uri);
-
-			$this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
-
-			// Restore the URI service
-			Services::injectMock('uri', $tempUri);
-		}
-
-		if (empty($this->response))
-		{
-			$this->response = Services::response($this->appConfig, false);
-		}
-
-		if (empty($this->logger))
-		{
-			$this->logger = Services::logger();
-		}
-	}
-
-	/**
-	 * Loads the specified controller, and generates any needed dependencies.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	public function controller(string $name)
-	{
-		if (! class_exists($name))
-		{
-			throw new InvalidArgumentException('Invalid Controller: ' . $name);
-		}
-
-		$this->controller = new $name();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		return $this;
-	}
-
-	/**
-	 * Runs the specified method on the controller and returns the results.
-	 *
-	 * @param string $method
-	 * @param array  $params
-	 *
-	 * @throws InvalidArgumentException
-	 *
-	 * @return TestResponse
-	 */
-	public function execute(string $method, ...$params)
-	{
-		if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method]))
-		{
-			throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
-		}
-
-		$response = null;
-
-		try
-		{
-			ob_start();
-			$response = $this->controller->{$method}(...$params);
-		}
-		catch (Throwable $e)
-		{
-			$code = $e->getCode();
-
-			// If code is not a valid HTTP status then assume there is an error
-			if ($code < 100 || $code >= 600)
-			{
-				throw $e;
-			}
-		}
-		finally
-		{
-			$output = ob_get_clean();
-		}
-
-		// If the controller returned a view then add it to the output
-		if (is_string($response))
-		{
-			$output = is_string($output) ? $output . $response : $response;
-		}
-
-		// If the controller did not return a response then start one
-		if (! $response instanceof Response)
-		{
-			$response = $this->response;
-		}
-
-		// Check for output to set or prepend
-		// @see \CodeIgniter\CodeIgniter::gatherOutput()
-		if (is_string($output))
-		{
-			if (is_string($response->getBody()))
-			{
-				$response->setBody($output . $response->getBody());
-			}
-			else
-			{
-				$response->setBody($output);
-			}
-		}
-
-		// Check for an overriding code from exceptions
-		if (isset($code))
-		{
-			$response->setStatusCode($code);
-		}
-		// Otherwise ensure there is a status code
-		else
-		{
-			// getStatusCode() throws for empty codes
-			try
-			{
-				$response->getStatusCode();
-			}
-			catch (HTTPException $e)
-			{
-				// If no code has been set then assume success
-				$response->setStatusCode(200);
-			}
-		}
-
-		// Create the result and add the Request for reference
-		return (new TestResponse($response))->setRequest($this->request);
-	}
-
-	/**
-	 * Set controller's config, with method chaining.
-	 *
-	 * @param mixed $appConfig
-	 *
-	 * @return mixed
-	 */
-	public function withConfig($appConfig)
-	{
-		$this->appConfig = $appConfig;
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's request, with method chaining.
-	 *
-	 * @param mixed $request
-	 *
-	 * @return mixed
-	 */
-	public function withRequest($request)
-	{
-		$this->request = $request;
-
-		// Make sure it's available for other classes
-		Services::injectMock('request', $request);
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's response, with method chaining.
-	 *
-	 * @param mixed $response
-	 *
-	 * @return mixed
-	 */
-	public function withResponse($response)
-	{
-		$this->response = $response;
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's logger, with method chaining.
-	 *
-	 * @param mixed $logger
-	 *
-	 * @return mixed
-	 */
-	public function withLogger($logger)
-	{
-		$this->logger = $logger;
-
-		return $this;
-	}
-
-	/**
-	 * Set the controller's URI, with method chaining.
-	 *
-	 * @param string $uri
-	 *
-	 * @return mixed
-	 */
-	public function withUri(string $uri)
-	{
-		$this->uri = new URI($uri);
-
-		return $this;
-	}
-
-	/**
-	 * Set the method's body, with method chaining.
-	 *
-	 * @param string|null $body
-	 *
-	 * @return mixed
-	 */
-	public function withBody($body)
-	{
-		$this->body = $body;
-
-		return $this;
-	}
+    /**
+     * Controller configuration.
+     *
+     * @var App
+     */
+    protected $appConfig;
+
+    /**
+     * Request.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * Response.
+     *
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Message logger.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Initialized controller.
+     *
+     * @var Controller
+     */
+    protected $controller;
+
+    /**
+     * URI of this request.
+     *
+     * @var string
+     */
+    protected $uri = 'http://example.com';
+
+    /**
+     * Request body.
+     *
+     * @var string|null
+     */
+    protected $body;
+
+    /**
+     * Initializes required components.
+     */
+    protected function setUpControllerTestTrait(): void
+    {
+        // The URL helper is always loaded by the system so ensure it is available.
+        helper('url');
+
+        if (empty($this->appConfig)) {
+            $this->appConfig = config('App');
+        }
+
+        if (! $this->uri instanceof URI) {
+            $this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
+        }
+
+        if (empty($this->request)) {
+            // Do some acrobatics so we can use the Request service with our own URI
+            $tempUri = Services::uri();
+            Services::injectMock('uri', $this->uri);
+
+            $this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+
+            // Restore the URI service
+            Services::injectMock('uri', $tempUri);
+        }
+
+        if (empty($this->response)) {
+            $this->response = Services::response($this->appConfig, false);
+        }
+
+        if (empty($this->logger)) {
+            $this->logger = Services::logger();
+        }
+    }
+
+    /**
+     * Loads the specified controller, and generates any needed dependencies.
+     *
+     * @return mixed
+     */
+    public function controller(string $name)
+    {
+        if (! class_exists($name)) {
+            throw new InvalidArgumentException('Invalid Controller: ' . $name);
+        }
+
+        $this->controller = new $name();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        return $this;
+    }
+
+    /**
+     * Runs the specified method on the controller and returns the results.
+     *
+     * @param array $params
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return TestResponse
+     */
+    public function execute(string $method, ...$params)
+    {
+        if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method])) {
+            throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
+        }
+
+        $response = null;
+
+        try {
+            ob_start();
+            $response = $this->controller->{$method}(...$params);
+        } catch (Throwable $e) {
+            $code = $e->getCode();
+
+            // If code is not a valid HTTP status then assume there is an error
+            if ($code < 100 || $code >= 600) {
+                throw $e;
+            }
+        } finally {
+            $output = ob_get_clean();
+        }
+
+        // If the controller returned a view then add it to the output
+        if (is_string($response)) {
+            $output = is_string($output) ? $output . $response : $response;
+        }
+
+        // If the controller did not return a response then start one
+        if (! $response instanceof Response) {
+            $response = $this->response;
+        }
+
+        // Check for output to set or prepend
+        // @see \CodeIgniter\CodeIgniter::gatherOutput()
+        if (is_string($output)) {
+            if (is_string($response->getBody())) {
+                $response->setBody($output . $response->getBody());
+            } else {
+                $response->setBody($output);
+            }
+        }
+
+        // Check for an overriding code from exceptions
+        if (isset($code)) {
+            $response->setStatusCode($code);
+        }
+        // Otherwise ensure there is a status code
+        else {
+            // getStatusCode() throws for empty codes
+            try {
+                $response->getStatusCode();
+            } catch (HTTPException $e) {
+                // If no code has been set then assume success
+                $response->setStatusCode(200);
+            }
+        }
+
+        // Create the result and add the Request for reference
+        return (new TestResponse($response))->setRequest($this->request);
+    }
+
+    /**
+     * Set controller's config, with method chaining.
+     *
+     * @param mixed $appConfig
+     *
+     * @return mixed
+     */
+    public function withConfig($appConfig)
+    {
+        $this->appConfig = $appConfig;
+
+        return $this;
+    }
+
+    /**
+     * Set controller's request, with method chaining.
+     *
+     * @param mixed $request
+     *
+     * @return mixed
+     */
+    public function withRequest($request)
+    {
+        $this->request = $request;
+
+        // Make sure it's available for other classes
+        Services::injectMock('request', $request);
+
+        return $this;
+    }
+
+    /**
+     * Set controller's response, with method chaining.
+     *
+     * @param mixed $response
+     *
+     * @return mixed
+     */
+    public function withResponse($response)
+    {
+        $this->response = $response;
+
+        return $this;
+    }
+
+    /**
+     * Set controller's logger, with method chaining.
+     *
+     * @param mixed $logger
+     *
+     * @return mixed
+     */
+    public function withLogger($logger)
+    {
+        $this->logger = $logger;
+
+        return $this;
+    }
+
+    /**
+     * Set the controller's URI, with method chaining.
+     *
+     * @return mixed
+     */
+    public function withUri(string $uri)
+    {
+        $this->uri = new URI($uri);
+
+        return $this;
+    }
+
+    /**
+     * Set the method's body, with method chaining.
+     *
+     * @param string|null $body
+     *
+     * @return mixed
+     */
+    public function withBody($body)
+    {
+        $this->body = $body;
+
+        return $this;
+    }
 }
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
index 391873ac436f..a8bccc3cdd22 100644
--- a/system/Test/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -41,277 +41,253 @@
  */
 trait ControllerTester
 {
-	/**
-	 * Controller configuration.
-	 *
-	 * @var App
-	 */
-	protected $appConfig;
-
-	/**
-	 * Request.
-	 *
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	/**
-	 * Response.
-	 *
-	 * @var Response
-	 */
-	protected $response;
-
-	/**
-	 * Message logger.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Initialized controller.
-	 *
-	 * @var Controller
-	 */
-	protected $controller;
-
-	/**
-	 * URI of this request.
-	 *
-	 * @var string
-	 */
-	protected $uri = 'http://example.com';
-
-	/**
-	 * Request or response body.
-	 *
-	 * @var string|null
-	 */
-	protected $body;
-
-	/**
-	 * Initializes required components.
-	 */
-	protected function setUpControllerTester(): void
-	{
-		if (empty($this->appConfig))
-		{
-			$this->appConfig = config('App');
-		}
-
-		if (! $this->uri instanceof URI)
-		{
-			$this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
-		}
-
-		if (empty($this->request))
-		{
-			// Do some acrobatics so we can use the Request service with our own URI
-			$tempUri = Services::uri();
-			Services::injectMock('uri', $this->uri);
-
-			$this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
-
-			// Restore the URI service
-			Services::injectMock('uri', $tempUri);
-		}
-
-		if (empty($this->response))
-		{
-			$this->response = Services::response($this->appConfig, false);
-		}
-
-		if (empty($this->logger))
-		{
-			$this->logger = Services::logger();
-		}
-	}
-
-	/**
-	 * Loads the specified controller, and generates any needed dependencies.
-	 *
-	 * @param string $name
-	 *
-	 * @return mixed
-	 */
-	public function controller(string $name)
-	{
-		if (! class_exists($name))
-		{
-			throw new InvalidArgumentException('Invalid Controller: ' . $name);
-		}
-
-		$this->controller = new $name();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		return $this;
-	}
-
-	/**
-	 * Runs the specified method on the controller and returns the results.
-	 *
-	 * @param string $method
-	 * @param array  $params
-	 *
-	 * @throws InvalidArgumentException
-	 *
-	 * @return ControllerResponse
-	 */
-	public function execute(string $method, ...$params)
-	{
-		if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method]))
-		{
-			throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
-		}
-
-		// The URL helper is always loaded by the system
-		// so ensure it's available.
-		helper('url');
-
-		$result = (new ControllerResponse())
-				->setRequest($this->request)
-				->setResponse($this->response);
-
-		$response = null;
-		try
-		{
-			ob_start();
-
-			$response = $this->controller->{$method}(...$params);
-		}
-		catch (Throwable $e)
-		{
-			$code = $e->getCode();
-
-			// If code is not a valid HTTP status then assume there is an error
-			if ($code < 100 || $code >= 600)
-			{
-				throw $e;
-			}
-
-			$result->response()->setStatusCode($code);
-		}
-		finally
-		{
-			$output = ob_get_clean();
-
-			// If the controller returned a response, use it
-			if (isset($response) && $response instanceof Response)
-			{
-				$result->setResponse($response);
-			}
-
-			// check if controller returned a view rather than echoing it
-			if (is_string($response))
-			{
-				$output = $response;
-				$result->response()->setBody($output);
-				$result->setBody($output);
-			}
-			elseif (! empty($response) && ! empty($response->getBody()))
-			{
-				$result->setBody($response->getBody());
-			}
-			else
-			{
-				$result->setBody('');
-			}
-		}
-
-		// If not response code has been sent, assume a success
-		if (empty($result->response()->getStatusCode()))
-		{
-			$result->response()->setStatusCode(200);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Set controller's config, with method chaining.
-	 *
-	 * @param mixed $appConfig
-	 *
-	 * @return mixed
-	 */
-	public function withConfig($appConfig)
-	{
-		$this->appConfig = $appConfig;
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's request, with method chaining.
-	 *
-	 * @param mixed $request
-	 *
-	 * @return mixed
-	 */
-	public function withRequest($request)
-	{
-		$this->request = $request;
-
-		// Make sure it's available for other classes
-		Services::injectMock('request', $request);
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's response, with method chaining.
-	 *
-	 * @param mixed $response
-	 *
-	 * @return mixed
-	 */
-	public function withResponse($response)
-	{
-		$this->response = $response;
-
-		return $this;
-	}
-
-	/**
-	 * Set controller's logger, with method chaining.
-	 *
-	 * @param mixed $logger
-	 *
-	 * @return mixed
-	 */
-	public function withLogger($logger)
-	{
-		$this->logger = $logger;
-
-		return $this;
-	}
-
-	/**
-	 * Set the controller's URI, with method chaining.
-	 *
-	 * @param string $uri
-	 *
-	 * @return mixed
-	 */
-	public function withUri(string $uri)
-	{
-		$this->uri = new URI($uri);
-
-		return $this;
-	}
-
-	/**
-	 * Set the method's body, with method chaining.
-	 *
-	 * @param string|null $body
-	 *
-	 * @return mixed
-	 */
-	public function withBody($body)
-	{
-		$this->body = $body;
-
-		return $this;
-	}
+    /**
+     * Controller configuration.
+     *
+     * @var App
+     */
+    protected $appConfig;
+
+    /**
+     * Request.
+     *
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * Response.
+     *
+     * @var Response
+     */
+    protected $response;
+
+    /**
+     * Message logger.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Initialized controller.
+     *
+     * @var Controller
+     */
+    protected $controller;
+
+    /**
+     * URI of this request.
+     *
+     * @var string
+     */
+    protected $uri = 'http://example.com';
+
+    /**
+     * Request or response body.
+     *
+     * @var string|null
+     */
+    protected $body;
+
+    /**
+     * Initializes required components.
+     */
+    protected function setUpControllerTester(): void
+    {
+        if (empty($this->appConfig)) {
+            $this->appConfig = config('App');
+        }
+
+        if (! $this->uri instanceof URI) {
+            $this->uri = Services::uri($this->appConfig->baseURL ?? 'http://example.com/', false);
+        }
+
+        if (empty($this->request)) {
+            // Do some acrobatics so we can use the Request service with our own URI
+            $tempUri = Services::uri();
+            Services::injectMock('uri', $this->uri);
+
+            $this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+
+            // Restore the URI service
+            Services::injectMock('uri', $tempUri);
+        }
+
+        if (empty($this->response)) {
+            $this->response = Services::response($this->appConfig, false);
+        }
+
+        if (empty($this->logger)) {
+            $this->logger = Services::logger();
+        }
+    }
+
+    /**
+     * Loads the specified controller, and generates any needed dependencies.
+     *
+     * @return mixed
+     */
+    public function controller(string $name)
+    {
+        if (! class_exists($name)) {
+            throw new InvalidArgumentException('Invalid Controller: ' . $name);
+        }
+
+        $this->controller = new $name();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        return $this;
+    }
+
+    /**
+     * Runs the specified method on the controller and returns the results.
+     *
+     * @param array $params
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return ControllerResponse
+     */
+    public function execute(string $method, ...$params)
+    {
+        if (! method_exists($this->controller, $method) || ! is_callable([$this->controller, $method])) {
+            throw new InvalidArgumentException('Method does not exist or is not callable in controller: ' . $method);
+        }
+
+        // The URL helper is always loaded by the system
+        // so ensure it's available.
+        helper('url');
+
+        $result = (new ControllerResponse())
+            ->setRequest($this->request)
+            ->setResponse($this->response);
+
+        $response = null;
+
+        try {
+            ob_start();
+
+            $response = $this->controller->{$method}(...$params);
+        } catch (Throwable $e) {
+            $code = $e->getCode();
+
+            // If code is not a valid HTTP status then assume there is an error
+            if ($code < 100 || $code >= 600) {
+                throw $e;
+            }
+
+            $result->response()->setStatusCode($code);
+        } finally {
+            $output = ob_get_clean();
+
+            // If the controller returned a response, use it
+            if (isset($response) && $response instanceof Response) {
+                $result->setResponse($response);
+            }
+
+            // check if controller returned a view rather than echoing it
+            if (is_string($response)) {
+                $output = $response;
+                $result->response()->setBody($output);
+                $result->setBody($output);
+            } elseif (! empty($response) && ! empty($response->getBody())) {
+                $result->setBody($response->getBody());
+            } else {
+                $result->setBody('');
+            }
+        }
+
+        // If not response code has been sent, assume a success
+        if (empty($result->response()->getStatusCode())) {
+            $result->response()->setStatusCode(200);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set controller's config, with method chaining.
+     *
+     * @param mixed $appConfig
+     *
+     * @return mixed
+     */
+    public function withConfig($appConfig)
+    {
+        $this->appConfig = $appConfig;
+
+        return $this;
+    }
+
+    /**
+     * Set controller's request, with method chaining.
+     *
+     * @param mixed $request
+     *
+     * @return mixed
+     */
+    public function withRequest($request)
+    {
+        $this->request = $request;
+
+        // Make sure it's available for other classes
+        Services::injectMock('request', $request);
+
+        return $this;
+    }
+
+    /**
+     * Set controller's response, with method chaining.
+     *
+     * @param mixed $response
+     *
+     * @return mixed
+     */
+    public function withResponse($response)
+    {
+        $this->response = $response;
+
+        return $this;
+    }
+
+    /**
+     * Set controller's logger, with method chaining.
+     *
+     * @param mixed $logger
+     *
+     * @return mixed
+     */
+    public function withLogger($logger)
+    {
+        $this->logger = $logger;
+
+        return $this;
+    }
+
+    /**
+     * Set the controller's URI, with method chaining.
+     *
+     * @return mixed
+     */
+    public function withUri(string $uri)
+    {
+        $this->uri = new URI($uri);
+
+        return $this;
+    }
+
+    /**
+     * Set the method's body, with method chaining.
+     *
+     * @param string|null $body
+     *
+     * @return mixed
+     */
+    public function withBody($body)
+    {
+        $this->body = $body;
+
+        return $this;
+    }
 }
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 4938fdfed0b7..531adf737364 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -22,316 +22,262 @@
  */
 class DOMParser
 {
-	/**
-	 * DOM for the body,
-	 *
-	 * @var DOMDocument
-	 */
-	protected $dom;
-
-	/**
-	 * Constructor.
-	 *
-	 * @throws BadMethodCallException
-	 */
-	public function __construct()
-	{
-		if (! extension_loaded('DOM'))
-		{
-			// always there in travis-ci
-			// @codeCoverageIgnoreStart
-			throw new BadMethodCallException('DOM extension is required, but not currently loaded.');
-			// @codeCoverageIgnoreEnd
-		}
-
-		$this->dom = new DOMDocument('1.0', 'utf-8');
-	}
-
-	/**
-	 * Returns the body of the current document.
-	 *
-	 * @return string
-	 */
-	public function getBody(): string
-	{
-		return $this->dom->saveHTML();
-	}
-
-	/**
-	 * Sets a string as the body that we want to work with.
-	 *
-	 * @param string $content
-	 *
-	 * @return $this
-	 */
-	public function withString(string $content)
-	{
-		// converts all special characters to utf-8
-		$content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
-
-		//turning off some errors
-		libxml_use_internal_errors(true);
-
-		if (! $this->dom->loadHTML($content))
-		{
-			// unclear how we would get here, given that we are trapping libxml errors
-			// @codeCoverageIgnoreStart
-			libxml_clear_errors();
-			throw new BadMethodCallException('Invalid HTML');
-			// @codeCoverageIgnoreEnd
-		}
-
-		// ignore the whitespace.
-		$this->dom->preserveWhiteSpace = false;
-
-		return $this;
-	}
-
-	/**
-	 * Loads the contents of a file as a string
-	 * so that we can work with it.
-	 *
-	 * @param string $path
-	 *
-	 * @return DOMParser
-	 */
-	public function withFile(string $path)
-	{
-		if (! is_file($path))
-		{
-			throw new InvalidArgumentException(basename($path) . ' is not a valid file.');
-		}
-
-		$content = file_get_contents($path);
-
-		return $this->withString($content);
-	}
-
-	/**
-	 * Checks to see if the text is found within the result.
-	 *
-	 * @param string $search
-	 * @param string $element
-	 *
-	 * @return boolean
-	 */
-	public function see(string $search = null, string $element = null): bool
-	{
-		// If Element is null, we're just scanning for text
-		if (is_null($element))
-		{
-			$content = $this->dom->saveHTML($this->dom->documentElement);
-			return mb_strpos($content, $search) !== false;
-		}
-
-		$result = $this->doXPath($search, $element);
-
-		return (bool) $result->length;
-	}
-
-	/**
-	 * Checks to see if the text is NOT found within the result.
-	 *
-	 * @param string      $search
-	 * @param string|null $element
-	 *
-	 * @return boolean
-	 */
-	public function dontSee(string $search = null, string $element = null): bool
-	{
-		return ! $this->see($search, $element);
-	}
-
-	/**
-	 * Checks to see if an element with the matching CSS specifier
-	 * is found within the current DOM.
-	 *
-	 * @param string $element
-	 *
-	 * @return boolean
-	 */
-	public function seeElement(string $element): bool
-	{
-		return $this->see(null, $element);
-	}
-
-	/**
-	 * Checks to see if the element is available within the result.
-	 *
-	 * @param string $element
-	 *
-	 * @return boolean
-	 */
-	public function dontSeeElement(string $element): bool
-	{
-		return $this->dontSee(null, $element);
-	}
-
-	/**
-	 * Determines if a link with the specified text is found
-	 * within the results.
-	 *
-	 * @param string      $text
-	 * @param string|null $details
-	 *
-	 * @return boolean
-	 */
-	public function seeLink(string $text, string $details = null): bool
-	{
-		return $this->see($text, 'a' . $details);
-	}
-
-	/**
-	 * Checks for an input named $field with a value of $value.
-	 *
-	 * @param string $field
-	 * @param string $value
-	 *
-	 * @return boolean
-	 */
-	public function seeInField(string $field, string $value): bool
-	{
-		$result = $this->doXPath(null, 'input', ["[@value=\"{$value}\"][@name=\"{$field}\"]"]);
-
-		return (bool) $result->length;
-	}
-
-	/**
-	 * Checks for checkboxes that are currently checked.
-	 *
-	 * @param string $element
-	 *
-	 * @return boolean
-	 */
-	public function seeCheckboxIsChecked(string $element): bool
-	{
-		$result = $this->doXPath(null, 'input' . $element, [
-			'[@type="checkbox"]',
-			'[@checked="checked"]',
-		]);
-
-		return (bool) $result->length;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Search the DOM using an XPath expression.
-	 *
-	 * @param  string|null $search
-	 * @param  string      $element
-	 * @param  array       $paths
-	 *
-	 * @return DOMNodeList
-	 */
-	protected function doXPath(?string $search, string $element, array $paths = [])
-	{
-		// Otherwise, grab any elements that match
-		// the selector
-		$selector = $this->parseSelector($element);
-
-		$path = '';
-
-		// By ID
-		if (! empty($selector['id']))
-		{
-			$path = empty($selector['tag'])
-				? "id(\"{$selector['id']}\")"
-				: "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
-		}
-		// By Class
-		elseif (! empty($selector['class']))
-		{
-			$path = empty($selector['tag'])
-				? "//*[@class=\"{$selector['class']}\"]"
-				: "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
-		}
-		// By tag only
-		elseif (! empty($selector['tag']))
-		{
-			$path = "//{$selector['tag']}";
-		}
-
-		if (! empty($selector['attr']))
-		{
-			foreach ($selector['attr'] as $key => $value)
-			{
-				$path .= "[@{$key}=\"{$value}\"]";
-			}
-		}
-
-		// $paths might contain a number of different
-		// ready to go xpath portions to tack on.
-		if (! empty($paths) && is_array($paths))
-		{
-			foreach ($paths as $extra)
-			{
-				$path .= $extra;
-			}
-		}
-
-		if (! is_null($search))
-		{
-			$path .= "[contains(., \"{$search}\")]";
-		}
-
-		$xpath = new DOMXPath($this->dom);
-
-		return $xpath->query($path);
-	}
-
-	/**
-	 * Look for the a selector  in the passed text.
-	 *
-	 * @param  string $selector
-	 * @return array
-	 */
-	public function parseSelector(string $selector)
-	{
-		$tag   = null;
-		$id    = null;
-		$class = null;
-		$attr  = null;
-
-		// ID?
-		if ($pos = strpos($selector, '#') !== false)
-		{
-			[$tag, $id] = explode('#', $selector);
-		}
-		// Attribute
-		elseif (strpos($selector, '[') !== false && strpos($selector, ']') !== false)
-		{
-			$open  = strpos($selector, '[');
-			$close = strpos($selector, ']');
-
-			$tag  = substr($selector, 0, $open);
-			$text = substr($selector, $open + 1, $close - 2);
-
-			// We only support a single attribute currently
-			$text = explode(',', $text);
-			$text = trim(array_shift($text));
-
-			[$name, $value] = explode('=', $text);
-			$name               = trim($name);
-			$value              = trim($value);
-			$attr               = [$name => trim($value, '] ')];
-		}
-		// Class?
-		elseif ($pos = strpos($selector, '.') !== false)
-		{
-			[$tag, $class] = explode('.', $selector);
-		}
-		// Otherwise, assume the entire string is our tag
-		else
-		{
-			$tag = $selector;
-		}
-
-		return [
-			'tag'   => $tag,
-			'id'    => $id,
-			'class' => $class,
-			'attr'  => $attr,
-		];
-	}
+    /**
+     * DOM for the body,
+     *
+     * @var DOMDocument
+     */
+    protected $dom;
+
+    /**
+     * Constructor.
+     *
+     * @throws BadMethodCallException
+     */
+    public function __construct()
+    {
+        if (! extension_loaded('DOM')) {
+            // always there in travis-ci
+            // @codeCoverageIgnoreStart
+            throw new BadMethodCallException('DOM extension is required, but not currently loaded.');
+            // @codeCoverageIgnoreEnd
+        }
+
+        $this->dom = new DOMDocument('1.0', 'utf-8');
+    }
+
+    /**
+     * Returns the body of the current document.
+     */
+    public function getBody(): string
+    {
+        return $this->dom->saveHTML();
+    }
+
+    /**
+     * Sets a string as the body that we want to work with.
+     *
+     * @return $this
+     */
+    public function withString(string $content)
+    {
+        // converts all special characters to utf-8
+        $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+
+        // turning off some errors
+        libxml_use_internal_errors(true);
+
+        if (! $this->dom->loadHTML($content)) {
+            // unclear how we would get here, given that we are trapping libxml errors
+            // @codeCoverageIgnoreStart
+            libxml_clear_errors();
+
+            throw new BadMethodCallException('Invalid HTML');
+            // @codeCoverageIgnoreEnd
+        }
+
+        // ignore the whitespace.
+        $this->dom->preserveWhiteSpace = false;
+
+        return $this;
+    }
+
+    /**
+     * Loads the contents of a file as a string
+     * so that we can work with it.
+     *
+     * @return DOMParser
+     */
+    public function withFile(string $path)
+    {
+        if (! is_file($path)) {
+            throw new InvalidArgumentException(basename($path) . ' is not a valid file.');
+        }
+
+        $content = file_get_contents($path);
+
+        return $this->withString($content);
+    }
+
+    /**
+     * Checks to see if the text is found within the result.
+     *
+     * @param string $search
+     * @param string $element
+     */
+    public function see(?string $search = null, ?string $element = null): bool
+    {
+        // If Element is null, we're just scanning for text
+        if ($element === null) {
+            $content = $this->dom->saveHTML($this->dom->documentElement);
+
+            return mb_strpos($content, $search) !== false;
+        }
+
+        $result = $this->doXPath($search, $element);
+
+        return (bool) $result->length;
+    }
+
+    /**
+     * Checks to see if the text is NOT found within the result.
+     *
+     * @param string $search
+     */
+    public function dontSee(?string $search = null, ?string $element = null): bool
+    {
+        return ! $this->see($search, $element);
+    }
+
+    /**
+     * Checks to see if an element with the matching CSS specifier
+     * is found within the current DOM.
+     */
+    public function seeElement(string $element): bool
+    {
+        return $this->see(null, $element);
+    }
+
+    /**
+     * Checks to see if the element is available within the result.
+     */
+    public function dontSeeElement(string $element): bool
+    {
+        return $this->dontSee(null, $element);
+    }
+
+    /**
+     * Determines if a link with the specified text is found
+     * within the results.
+     */
+    public function seeLink(string $text, ?string $details = null): bool
+    {
+        return $this->see($text, 'a' . $details);
+    }
+
+    /**
+     * Checks for an input named $field with a value of $value.
+     */
+    public function seeInField(string $field, string $value): bool
+    {
+        $result = $this->doXPath(null, 'input', ["[@value=\"{$value}\"][@name=\"{$field}\"]"]);
+
+        return (bool) $result->length;
+    }
+
+    /**
+     * Checks for checkboxes that are currently checked.
+     */
+    public function seeCheckboxIsChecked(string $element): bool
+    {
+        $result = $this->doXPath(null, 'input' . $element, [
+            '[@type="checkbox"]',
+            '[@checked="checked"]',
+        ]);
+
+        return (bool) $result->length;
+    }
+
+    /**
+     * Search the DOM using an XPath expression.
+     *
+     * @return DOMNodeList
+     */
+    protected function doXPath(?string $search, string $element, array $paths = [])
+    {
+        // Otherwise, grab any elements that match
+        // the selector
+        $selector = $this->parseSelector($element);
+
+        $path = '';
+
+        // By ID
+        if (! empty($selector['id'])) {
+            $path = empty($selector['tag'])
+                ? "id(\"{$selector['id']}\")"
+                : "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
+        }
+        // By Class
+        elseif (! empty($selector['class'])) {
+            $path = empty($selector['tag'])
+                ? "//*[@class=\"{$selector['class']}\"]"
+                : "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
+        }
+        // By tag only
+        elseif (! empty($selector['tag'])) {
+            $path = "//{$selector['tag']}";
+        }
+
+        if (! empty($selector['attr'])) {
+            foreach ($selector['attr'] as $key => $value) {
+                $path .= "[@{$key}=\"{$value}\"]";
+            }
+        }
+
+        // $paths might contain a number of different
+        // ready to go xpath portions to tack on.
+        if (! empty($paths) && is_array($paths)) {
+            foreach ($paths as $extra) {
+                $path .= $extra;
+            }
+        }
+
+        if ($search !== null) {
+            $path .= "[contains(., \"{$search}\")]";
+        }
+
+        $xpath = new DOMXPath($this->dom);
+
+        return $xpath->query($path);
+    }
+
+    /**
+     * Look for the a selector  in the passed text.
+     *
+     * @return array
+     */
+    public function parseSelector(string $selector)
+    {
+        $id    = null;
+        $class = null;
+        $attr  = null;
+
+        // ID?
+        if (strpos($selector, '#') !== false) {
+            [$tag, $id] = explode('#', $selector);
+        }
+        // Attribute
+        elseif (strpos($selector, '[') !== false && strpos($selector, ']') !== false) {
+            $open  = strpos($selector, '[');
+            $close = strpos($selector, ']');
+
+            $tag  = substr($selector, 0, $open);
+            $text = substr($selector, $open + 1, $close - 2);
+
+            // We only support a single attribute currently
+            $text = explode(',', $text);
+            $text = trim(array_shift($text));
+
+            [$name, $value] = explode('=', $text);
+
+            $name  = trim($name);
+            $value = trim($value);
+            $attr  = [$name => trim($value, '] ')];
+        }
+        // Class?
+        elseif (strpos($selector, '.') !== false) {
+            [$tag, $class] = explode('.', $selector);
+        }
+        // Otherwise, assume the entire string is our tag
+        else {
+            $tag = $selector;
+        }
+
+        return [
+            'tag'   => $tag,
+            'id'    => $id,
+            'class' => $class,
+            'attr'  => $attr,
+        ];
+    }
 }
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 2c8ba23a795d..d15a5fb44480 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -28,346 +28,299 @@
  */
 trait DatabaseTestTrait
 {
-	/**
-	 * Is db migration done once or more than once?
-	 *
-	 * @var boolean
-	 */
-	private static $doneMigration = false;
-
-	/**
-	 * Is seeding done once or more than once?
-	 *
-	 * @var boolean
-	 */
-	private static $doneSeed = false;
-
-	//--------------------------------------------------------------------
-	// Staging
-	//--------------------------------------------------------------------
-
-	/**
-	 * Runs the trait set up methods.
-	 */
-	protected function setUpDatabase()
-	{
-		$this->loadDependencies();
-		$this->setUpMigrate();
-		$this->setUpSeed();
-	}
-
-	/**
-	 * Runs the trait set up methods.
-	 */
-	protected function tearDownDatabase()
-	{
-		$this->clearInsertCache();
-	}
-
-	/**
-	 * Load any database test dependencies.
-	 */
-	public function loadDependencies()
-	{
-		if ($this->db === null)
-		{
-			$this->db = Database::connect($this->DBGroup);
-			$this->db->initialize();
-		}
-
-		if ($this->migrations === null)
-		{
-			// Ensure that we can run migrations
-			$config          = new Migrations();
-			$config->enabled = true;
-
-			$this->migrations = Services::migrations($config, $this->db);
-			$this->migrations->setSilent(false);
-		}
-
-		if ($this->seeder === null)
-		{
-			$this->seeder = Database::seeder($this->DBGroup);
-			$this->seeder->setSilent(true);
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Migrations
-	//--------------------------------------------------------------------
-
-	/**
-	 * Migrate on setUp
-	 */
-	protected function setUpMigrate()
-	{
-		if ($this->migrateOnce === false || self::$doneMigration === false)
-		{
-			if ($this->refresh === true)
-			{
-				$this->regressDatabase();
-
-				// Reset counts on faked items
-				Fabricator::resetCounts();
-			}
-
-			$this->migrateDatabase();
-		}
-	}
-
-	/**
-	 * Regress migrations as defined by the class
-	 */
-	protected function regressDatabase()
-	{
-		if ($this->migrate === false)
-		{
-			return;
-		}
-
-		// If no namespace was specified then rollback all
-		if (empty($this->namespace))
-		{
-			$this->migrations->setNamespace(null);
-			$this->migrations->regress(0, 'tests');
-		}
-
-		// Regress each specified namespace
-		else
-		{
-			$namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
-
-			foreach ($namespaces as $namespace)
-			{
-				$this->migrations->setNamespace($namespace);
-				$this->migrations->regress(0, 'tests');
-			}
-		}
-	}
-
-	/**
-	 * Run migrations as defined by the class
-	 */
-	protected function migrateDatabase()
-	{
-		if ($this->migrate === false)
-		{
-			return;
-		}
-
-		// If no namespace was specified then migrate all
-		if (empty($this->namespace))
-		{
-			$this->migrations->setNamespace(null);
-			$this->migrations->latest('tests');
-			self::$doneMigration = true;
-		}
-		// Run migrations for each specified namespace
-		else
-		{
-			$namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
-
-			foreach ($namespaces as $namespace)
-			{
-				$this->migrations->setNamespace($namespace);
-				$this->migrations->latest('tests');
-				self::$doneMigration = true;
-			}
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Seeds
-	//--------------------------------------------------------------------
-
-	/**
-	 * Seed on setUp
-	 */
-	protected function setUpSeed()
-	{
-		if ($this->seedOnce === false || self::$doneSeed === false)
-		{
-			$this->runSeeds();
-		}
-	}
-
-	/**
-	 * Run seeds as defined by the class
-	 */
-	protected function runSeeds()
-	{
-		if (! empty($this->seed))
-		{
-			if (! empty($this->basePath))
-			{
-				$this->seeder->setPath(rtrim($this->basePath, '/') . '/Seeds');
-			}
-
-			$seeds = is_array($this->seed) ? $this->seed : [$this->seed];
-			foreach ($seeds as $seed)
-			{
-				$this->seed($seed);
-			}
-		}
-
-		self::$doneSeed = true;
-	}
-
-	/**
-	 * Seeds that database with a specific seeder.
-	 *
-	 * @param string $name
-	 *
-	 * @return void
-	 */
-	public function seed(string $name)
-	{
-		$this->seeder->call($name);
-	}
-
-	//--------------------------------------------------------------------
-	// Utility
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset $doneMigration and $doneSeed
-	 *
-	 * @afterClass
-	 */
-	public static function resetMigrationSeedCount()
-	{
-		self::$doneMigration = false;
-		self::$doneSeed      = false;
-	}
-
-	/**
-	 * Removes any rows inserted via $this->hasInDatabase()
-	 */
-	protected function clearInsertCache()
-	{
-		if (! empty($this->insertCache))
-		{
-			foreach ($this->insertCache as $row)
-			{
-				$this->db->table($row[0])
-						->where($row[1])
-						->delete();
-			}
-		}
-	}
-
-	/**
-	 * Loads the Builder class appropriate for the current database.
-	 *
-	 * @param string $tableName
-	 *
-	 * @return BaseBuilder
-	 */
-	public function loadBuilder(string $tableName)
-	{
-		$builderClass = str_replace('Connection', 'Builder', get_class($this->db));
-
-		return new $builderClass($tableName, $this->db);
-	}
-
-	/**
-	 * Fetches a single column from a database row with criteria
-	 * matching $where.
-	 *
-	 * @param string $table
-	 * @param string $column
-	 * @param array  $where
-	 *
-	 * @return boolean
-	 * @throws DatabaseException
-	 */
-	public function grabFromDatabase(string $table, string $column, array $where)
-	{
-		$query = $this->db->table($table)
-						  ->select($column)
-						  ->where($where)
-						  ->get();
-
-		$query = $query->getRow();
-
-		return $query->$column ?? false;
-	}
-
-	//--------------------------------------------------------------------
-	// Assertions
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asserts that records that match the conditions in $where DO
-	 * exist in the database.
-	 *
-	 * @param string $table
-	 * @param array  $where
-	 *
-	 * @return void
-	 * @throws DatabaseException
-	 */
-	public function seeInDatabase(string $table, array $where)
-	{
-		$constraint = new SeeInDatabase($this->db, $where);
-		static::assertThat($table, $constraint);
-	}
-
-	/**
-	 * Asserts that records that match the conditions in $where do
-	 * not exist in the database.
-	 *
-	 * @param string $table
-	 * @param array  $where
-	 *
-	 * @return void
-	 */
-	public function dontSeeInDatabase(string $table, array $where)
-	{
-		$count = $this->db->table($table)
-						  ->where($where)
-						  ->countAllResults();
-
-		$this->assertTrue($count === 0, 'Row was found in database');
-	}
-
-	/**
-	 * Inserts a row into to the database. This row will be removed
-	 * after the test has run.
-	 *
-	 * @param string $table
-	 * @param array  $data
-	 *
-	 * @return boolean
-	 */
-	public function hasInDatabase(string $table, array $data)
-	{
-		$this->insertCache[] = [
-			$table,
-			$data,
-		];
-
-		return $this->db->table($table)
-						->insert($data);
-	}
-
-	/**
-	 * Asserts that the number of rows in the database that match $where
-	 * is equal to $expected.
-	 *
-	 * @param integer $expected
-	 * @param string  $table
-	 * @param array   $where
-	 *
-	 * @return void
-	 * @throws DatabaseException
-	 */
-	public function seeNumRecords(int $expected, string $table, array $where)
-	{
-		$count = $this->db->table($table)
-						  ->where($where)
-						  ->countAllResults();
-
-		$this->assertEquals($expected, $count, 'Wrong number of matching rows in database.');
-	}
+    /**
+     * Is db migration done once or more than once?
+     *
+     * @var bool
+     */
+    private static $doneMigration = false;
+
+    /**
+     * Is seeding done once or more than once?
+     *
+     * @var bool
+     */
+    private static $doneSeed = false;
+
+    //--------------------------------------------------------------------
+    // Staging
+    //--------------------------------------------------------------------
+
+    /**
+     * Runs the trait set up methods.
+     */
+    protected function setUpDatabase()
+    {
+        $this->loadDependencies();
+        $this->setUpMigrate();
+        $this->setUpSeed();
+    }
+
+    /**
+     * Runs the trait set up methods.
+     */
+    protected function tearDownDatabase()
+    {
+        $this->clearInsertCache();
+    }
+
+    /**
+     * Load any database test dependencies.
+     */
+    public function loadDependencies()
+    {
+        if ($this->db === null) {
+            $this->db = Database::connect($this->DBGroup);
+            $this->db->initialize();
+        }
+
+        if ($this->migrations === null) {
+            // Ensure that we can run migrations
+            $config          = new Migrations();
+            $config->enabled = true;
+
+            $this->migrations = Services::migrations($config, $this->db);
+            $this->migrations->setSilent(false);
+        }
+
+        if ($this->seeder === null) {
+            $this->seeder = Database::seeder($this->DBGroup);
+            $this->seeder->setSilent(true);
+        }
+    }
+
+    //--------------------------------------------------------------------
+    // Migrations
+    //--------------------------------------------------------------------
+
+    /**
+     * Migrate on setUp
+     */
+    protected function setUpMigrate()
+    {
+        if ($this->migrateOnce === false || self::$doneMigration === false) {
+            if ($this->refresh === true) {
+                $this->regressDatabase();
+
+                // Reset counts on faked items
+                Fabricator::resetCounts();
+            }
+
+            $this->migrateDatabase();
+        }
+    }
+
+    /**
+     * Regress migrations as defined by the class
+     */
+    protected function regressDatabase()
+    {
+        if ($this->migrate === false) {
+            return;
+        }
+
+        // If no namespace was specified then rollback all
+        if (empty($this->namespace)) {
+            $this->migrations->setNamespace(null);
+            $this->migrations->regress(0, 'tests');
+        }
+
+        // Regress each specified namespace
+        else {
+            $namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
+
+            foreach ($namespaces as $namespace) {
+                $this->migrations->setNamespace($namespace);
+                $this->migrations->regress(0, 'tests');
+            }
+        }
+    }
+
+    /**
+     * Run migrations as defined by the class
+     */
+    protected function migrateDatabase()
+    {
+        if ($this->migrate === false) {
+            return;
+        }
+
+        // If no namespace was specified then migrate all
+        if (empty($this->namespace)) {
+            $this->migrations->setNamespace(null);
+            $this->migrations->latest('tests');
+            self::$doneMigration = true;
+        }
+        // Run migrations for each specified namespace
+        else {
+            $namespaces = is_array($this->namespace) ? $this->namespace : [$this->namespace];
+
+            foreach ($namespaces as $namespace) {
+                $this->migrations->setNamespace($namespace);
+                $this->migrations->latest('tests');
+                self::$doneMigration = true;
+            }
+        }
+    }
+
+    //--------------------------------------------------------------------
+    // Seeds
+    //--------------------------------------------------------------------
+
+    /**
+     * Seed on setUp
+     */
+    protected function setUpSeed()
+    {
+        if ($this->seedOnce === false || self::$doneSeed === false) {
+            $this->runSeeds();
+        }
+    }
+
+    /**
+     * Run seeds as defined by the class
+     */
+    protected function runSeeds()
+    {
+        if (! empty($this->seed)) {
+            if (! empty($this->basePath)) {
+                $this->seeder->setPath(rtrim($this->basePath, '/') . '/Seeds');
+            }
+
+            $seeds = is_array($this->seed) ? $this->seed : [$this->seed];
+
+            foreach ($seeds as $seed) {
+                $this->seed($seed);
+            }
+        }
+
+        self::$doneSeed = true;
+    }
+
+    /**
+     * Seeds that database with a specific seeder.
+     */
+    public function seed(string $name)
+    {
+        $this->seeder->call($name);
+    }
+
+    //--------------------------------------------------------------------
+    // Utility
+    //--------------------------------------------------------------------
+
+    /**
+     * Reset $doneMigration and $doneSeed
+     *
+     * @afterClass
+     */
+    public static function resetMigrationSeedCount()
+    {
+        self::$doneMigration = false;
+        self::$doneSeed      = false;
+    }
+
+    /**
+     * Removes any rows inserted via $this->hasInDatabase()
+     */
+    protected function clearInsertCache()
+    {
+        foreach ($this->insertCache as $row) {
+            $this->db->table($row[0])
+                ->where($row[1])
+                ->delete();
+        }
+    }
+
+    /**
+     * Loads the Builder class appropriate for the current database.
+     *
+     * @return BaseBuilder
+     */
+    public function loadBuilder(string $tableName)
+    {
+        $builderClass = str_replace('Connection', 'Builder', get_class($this->db));
+
+        return new $builderClass($tableName, $this->db);
+    }
+
+    /**
+     * Fetches a single column from a database row with criteria
+     * matching $where.
+     *
+     * @throws DatabaseException
+     *
+     * @return bool
+     */
+    public function grabFromDatabase(string $table, string $column, array $where)
+    {
+        $query = $this->db->table($table)
+            ->select($column)
+            ->where($where)
+            ->get();
+
+        $query = $query->getRow();
+
+        return $query->{$column} ?? false;
+    }
+
+    //--------------------------------------------------------------------
+    // Assertions
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that records that match the conditions in $where DO
+     * exist in the database.
+     *
+     * @throws DatabaseException
+     */
+    public function seeInDatabase(string $table, array $where)
+    {
+        $constraint = new SeeInDatabase($this->db, $where);
+        static::assertThat($table, $constraint);
+    }
+
+    /**
+     * Asserts that records that match the conditions in $where do
+     * not exist in the database.
+     */
+    public function dontSeeInDatabase(string $table, array $where)
+    {
+        $count = $this->db->table($table)
+            ->where($where)
+            ->countAllResults();
+
+        $this->assertTrue($count === 0, 'Row was found in database');
+    }
+
+    /**
+     * Inserts a row into to the database. This row will be removed
+     * after the test has run.
+     *
+     * @return bool
+     */
+    public function hasInDatabase(string $table, array $data)
+    {
+        $this->insertCache[] = [
+            $table,
+            $data,
+        ];
+
+        return $this->db->table($table)->insert($data);
+    }
+
+    /**
+     * Asserts that the number of rows in the database that match $where
+     * is equal to $expected.
+     *
+     * @throws DatabaseException
+     */
+    public function seeNumRecords(int $expected, string $table, array $where)
+    {
+        $count = $this->db->table($table)
+            ->where($where)
+            ->countAllResults();
+
+        $this->assertEquals($expected, $count, 'Wrong number of matching rows in database.');
+    }
 }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 885f2ef42e10..0fb013cb1820 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -26,590 +26,517 @@
  */
 class Fabricator
 {
-	/**
-	 * Array of counts for fabricated items
-	 *
-	 * @var array
-	 */
-	protected static $tableCounts = [];
-
-	/**
-	 * Locale-specific Faker instance
-	 *
-	 * @var Generator
-	 */
-	protected $faker;
-
-	/**
-	 * Model instance (can be non-framework if it follows framework design)
-	 *
-	 * @var Model|object
-	 */
-	protected $model;
-
-	/**
-	 * Locale used to initialize Faker
-	 *
-	 * @var string
-	 */
-	protected $locale;
-
-	/**
-	 * Map of properties and their formatter to use
-	 *
-	 * @var array|null
-	 */
-	protected $formatters;
-
-	/**
-	 * Date fields present in the model
-	 *
-	 * @var array
-	 */
-	protected $dateFields = [];
-
-	/**
-	 * Array of data to add or override faked versions
-	 *
-	 * @var array
-	 */
-	protected $overrides = [];
-
-	/**
-	 * Array of single-use data to override faked versions
-	 *
-	 * @var array|null
-	 */
-	protected $tempOverrides;
-
-	/**
-	 * Default formatter to use when nothing is detected
-	 *
-	 * @var string
-	 */
-	public $defaultFormatter = 'word';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Store the model instance and initialize Faker to the locale.
-	 *
-	 * @param string|object $model      Instance or classname of the model to use
-	 * @param array|null    $formatters Array of property => formatter
-	 * @param string|null   $locale     Locale for Faker provider
-	 *
-	 * @throws InvalidArgumentException
-	 */
-	public function __construct($model, array $formatters = null, string $locale = null)
-	{
-		if (is_string($model))
-		{
-			// Create a new model instance
-			$model = model($model, false);
-		}
-
-		if (! is_object($model))
-		{
-			throw new InvalidArgumentException(lang('Fabricator.invalidModel'));
-		}
-
-		$this->model = $model;
-
-		// If no locale was specified then use the App default
-		if (is_null($locale))
-		{
-			$locale = config('App')->defaultLocale;
-		}
-
-		// There is no easy way to retrieve the locale from Faker so we will store it
-		$this->locale = $locale;
-
-		// Create the locale-specific Generator
-		$this->faker = Factory::create($this->locale);
-
-		// Determine eligible date fields
-		foreach (['createdField', 'updatedField', 'deletedField'] as $field)
-		{
-			if (! empty($this->model->$field))
-			{
-				$this->dateFields[] = $this->model->$field;
-			}
-		}
-
-		// Set the formatters
-		$this->setFormatters($formatters);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset internal counts
-	 */
-	public static function resetCounts()
-	{
-		self::$tableCounts = [];
-	}
-
-	/**
-	 * Get the count for a specific table
-	 *
-	 * @param string $table Name of the target table
-	 *
-	 * @return integer
-	 */
-	public static function getCount(string $table): int
-	{
-		return empty(self::$tableCounts[$table]) ? 0 : self::$tableCounts[$table];
-	}
-
-	/**
-	 * Set the count for a specific table
-	 *
-	 * @param string  $table Name of the target table
-	 * @param integer $count Count value
-	 *
-	 * @return integer  The new count value
-	 */
-	public static function setCount(string $table, int $count): int
-	{
-		self::$tableCounts[$table] = $count;
-		return $count;
-	}
-
-	/**
-	 * Increment the count for a table
-	 *
-	 * @param string $table Name of the target table
-	 *
-	 * @return integer  The new count value
-	 */
-	public static function upCount(string $table): int
-	{
-		return self::setCount($table, self::getCount($table) + 1);
-	}
-
-	/**
-	 * Decrement the count for a table
-	 *
-	 * @param string $table Name of the target table
-	 *
-	 * @return integer  The new count value
-	 */
-	public static function downCount(string $table): int
-	{
-		return self::setCount($table, self::getCount($table) - 1);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the model instance
-	 *
-	 * @return object  Framework or compatible model
-	 */
-	public function getModel()
-	{
-		return $this->model;
-	}
-
-	/**
-	 * Returns the locale
-	 *
-	 * @return string
-	 */
-	public function getLocale(): string
-	{
-		return $this->locale;
-	}
-
-	/**
-	 * Returns the Faker generator
-	 *
-	 * @return Generator
-	 */
-	public function getFaker(): Generator
-	{
-		return $this->faker;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return and reset tempOverrides
-	 *
-	 * @return array
-	 */
-	public function getOverrides(): array
-	{
-		$overrides = $this->tempOverrides ?? $this->overrides;
-
-		$this->tempOverrides = $this->overrides;
-
-		return $overrides;
-	}
-
-	/**
-	 * Set the overrides, once or persistent
-	 *
-	 * @param array   $overrides Array of [field => value]
-	 * @param boolean $persist   Whether these overrides should persist through the next operation
-	 *
-	 * @return $this
-	 */
-	public function setOverrides(array $overrides = [], $persist = true): self
-	{
-		if ($persist)
-		{
-			$this->overrides = $overrides;
-		}
-
-		$this->tempOverrides = $overrides;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current formatters
-	 *
-	 * @return array|null
-	 */
-	public function getFormatters(): ?array
-	{
-		return $this->formatters;
-	}
-
-	/**
-	 * Set the formatters to use. Will attempt to autodetect if none are available.
-	 *
-	 * @param array|null $formatters Array of [field => formatter], or null to detect
-	 *
-	 * @return $this
-	 */
-	public function setFormatters(array $formatters = null): self
-	{
-		if (! is_null($formatters))
-		{
-			$this->formatters = $formatters;
-		}
-		elseif (method_exists($this->model, 'fake'))
-		{
-			$this->formatters = null;
-		}
-		else
-		{
-			$formatters = $this->detectFormatters();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Try to identify the appropriate Faker formatter for each field.
-	 *
-	 * @return $this
-	 */
-	protected function detectFormatters(): self
-	{
-		$this->formatters = [];
-
-		if (! empty($this->model->allowedFields))
-		{
-			foreach ($this->model->allowedFields as $field)
-			{
-				$this->formatters[$field] = $this->guessFormatter($field);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Guess at the correct formatter to match a field name.
-	 *
-	 * @param string $field Name of the field
-	 *
-	 * @return string  Name of the formatter
-	 */
-	protected function guessFormatter($field): string
-	{
-		// First check for a Faker formatter of the same name - covers things like "email"
-		try
-		{
-			$this->faker->getFormatter($field);
-			return $field;
-		}
-		catch (InvalidArgumentException $e)
-		{
-			// No match, keep going
-		}
-
-		// Next look for known model fields
-		if (in_array($field, $this->dateFields, true))
-		{
-			switch ($this->model->dateFormat)
-			{
-				case 'datetime':
-				case 'date':
-					return 'date';
-				case 'int':
-					return 'unixTime';
-			}
-		}
-		elseif ($field === $this->model->primaryKey)
-		{
-			return 'numberBetween';
-		}
-
-		// Check some common partials
-		foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term)
-		{
-			if (stripos($field, $term) !== false)
-			{
-				return $term;
-			}
-		}
-
-		if (stripos($field, 'phone') !== false)
-		{
-			return 'phoneNumber';
-		}
-
-		// Nothing left, use the default
-		return $this->defaultFormatter;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generate new entities with faked data
-	 *
-	 * @param integer|null $count Optional number to create a collection
-	 *
-	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
-	 */
-	public function make(int $count = null)
-	{
-		// If a singleton was requested then go straight to it
-		if (is_null($count))
-		{
-			return $this->model->returnType === 'array'
-				? $this->makeArray()
-				: $this->makeObject();
-		}
-
-		$return = [];
-
-		for ($i = 0; $i < $count; $i++)
-		{
-			$return[] = $this->model->returnType === 'array'
-				? $this->makeArray()
-				: $this->makeObject();
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Generate an array of faked data
-	 *
-	 * @return array  An array of faked data
-	 *
-	 * @throws RuntimeException
-	 */
-	public function makeArray()
-	{
-		if (! is_null($this->formatters))
-		{
-			$result = [];
-
-			foreach ($this->formatters as $field => $formatter)
-			{
-				$result[$field] = $this->faker->{$formatter};
-			}
-		}
-		// If no formatters were defined then look for a model fake() method
-		elseif (method_exists($this->model, 'fake'))
-		{
-			$result = $this->model->fake($this->faker);
-
-			$result = is_object($result) && method_exists($result, 'toArray')
-				// This should cover entities
-				? $result->toArray()
-				// Try to cast it
-				: (array) $result;
-		}
-		// Nothing left to do but give up
-		else
-		{
-			throw new RuntimeException(lang('Fabricator.missingFormatters'));
-		}
-
-		// Replace overridden fields
-		return array_merge($result, $this->getOverrides());
-	}
-
-	/**
-	 * Generate an object of faked data
-	 *
-	 * @param string|null $className Class name of the object to create; null to use model default
-	 *
-	 * @return object  An instance of the class with faked data
-	 *
-	 * @throws RuntimeException
-	 */
-	public function makeObject(string $className = null): object
-	{
-		if (is_null($className))
-		{
-			if ($this->model->returnType === 'object' || $this->model->returnType === 'array')
-			{
-				$className = 'stdClass';
-			}
-			else
-			{
-				$className = $this->model->returnType;
-			}
-		}
-
-		// If using the model's fake() method then check it for the correct return type
-		if (is_null($this->formatters) && method_exists($this->model, 'fake'))
-		{
-			$result = $this->model->fake($this->faker);
-
-			if ($result instanceof $className)
-			{
-				// Set overrides manually
-				foreach ($this->getOverrides() as $key => $value)
-				{
-					$result->{$key} = $value;
-				}
-
-				return $result;
-			}
-		}
-
-		// Get the array values and apply them to the object
-		$array  = $this->makeArray();
-		$object = new $className();
-
-		// Check for the entity method
-		if (method_exists($object, 'fill'))
-		{
-			$object->fill($array);
-		}
-		else
-		{
-			foreach ($array as $key => $value)
-			{
-				$object->{$key} = $value;
-			}
-		}
-
-		return $object;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generate new entities from the database
-	 *
-	 * @param integer|null $count Optional number to create a collection
-	 * @param boolean      $mock  Whether to execute or mock the insertion
-	 *
-	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
-	 *
-	 * @throws FrameworkException
-	 */
-	public function create(int $count = null, bool $mock = false)
-	{
-		// Intercept mock requests
-		if ($mock)
-		{
-			return $this->createMock($count);
-		}
-
-		$ids = [];
-
-		// Iterate over new entities and insert each one, storing insert IDs
-		foreach ($this->make($count ?? 1) as $result)
-		{
-			if ($id = $this->model->insert($result, true))
-			{
-				$ids[] = $id;
-				self::upCount($this->model->table);
-				continue;
-			}
-
-			throw FrameworkException::forFabricatorCreateFailed($this->model->table, implode(' ', $this->model->errors() ?? []));
-		}
-
-		// If the model defines a "withDeleted" method for handling soft deletes then use it
-		if (method_exists($this->model, 'withDeleted'))
-		{
-			$this->model->withDeleted();
-		}
-
-		return $this->model->find(is_null($count) ? reset($ids) : $ids);
-	}
-
-	/**
-	 * Generate new database entities without actually inserting them
-	 *
-	 * @param integer|null $count Optional number to create a collection
-	 *
-	 * @return array|object  An array or object (based on returnType), or an array of returnTypes
-	 */
-	protected function createMock(int $count = null)
-	{
-		switch ($this->model->dateFormat)
-		{
-			case 'datetime':
-				$datetime = date('Y-m-d H:i:s');
-			case 'date':
-				$datetime = date('Y-m-d');
-			default:
-				$datetime = time();
-		}
-
-		// Determine which fields we will need
-		$fields = [];
-
-		if (! empty($this->model->useTimestamps))
-		{
-			$fields[$this->model->createdField] = $datetime; // @phpstan-ignore-line
-			$fields[$this->model->updatedField] = $datetime; // @phpstan-ignore-line
-		}
-
-		if (! empty($this->model->useSoftDeletes))
-		{
-			$fields[$this->model->deletedField] = null; // @phpstan-ignore-line
-		}
-
-		// Iterate over new entities and add the necessary fields
-		$return = [];
-		foreach ($this->make($count ?? 1) as $i => $result)
-		{
-			// Set the ID
-			$fields[$this->model->primaryKey] = $i;
-
-			// Merge fields
-			if (is_array($result))
-			{
-				$result = array_merge($result, $fields);
-			}
-			else
-			{
-				foreach ($fields as $key => $value)
-				{
-					$result->{$key} = $value;
-				}
-			}
-
-			$return[] = $result;
-		}
-
-		return is_null($count) ? reset($return) : $return;
-	}
+    /**
+     * Array of counts for fabricated items
+     *
+     * @var array
+     */
+    protected static $tableCounts = [];
+
+    /**
+     * Locale-specific Faker instance
+     *
+     * @var Generator
+     */
+    protected $faker;
+
+    /**
+     * Model instance (can be non-framework if it follows framework design)
+     *
+     * @var Model|object
+     */
+    protected $model;
+
+    /**
+     * Locale used to initialize Faker
+     *
+     * @var string
+     */
+    protected $locale;
+
+    /**
+     * Map of properties and their formatter to use
+     *
+     * @var array|null
+     */
+    protected $formatters;
+
+    /**
+     * Date fields present in the model
+     *
+     * @var array
+     */
+    protected $dateFields = [];
+
+    /**
+     * Array of data to add or override faked versions
+     *
+     * @var array
+     */
+    protected $overrides = [];
+
+    /**
+     * Array of single-use data to override faked versions
+     *
+     * @var array|null
+     */
+    protected $tempOverrides;
+
+    /**
+     * Default formatter to use when nothing is detected
+     *
+     * @var string
+     */
+    public $defaultFormatter = 'word';
+
+    /**
+     * Store the model instance and initialize Faker to the locale.
+     *
+     * @param object|string $model      Instance or classname of the model to use
+     * @param array|null    $formatters Array of property => formatter
+     * @param string|null   $locale     Locale for Faker provider
+     *
+     * @throws InvalidArgumentException
+     */
+    public function __construct($model, ?array $formatters = null, ?string $locale = null)
+    {
+        if (is_string($model)) {
+            // Create a new model instance
+            $model = model($model, false);
+        }
+
+        if (! is_object($model)) {
+            throw new InvalidArgumentException(lang('Fabricator.invalidModel'));
+        }
+
+        $this->model = $model;
+
+        // If no locale was specified then use the App default
+        if ($locale === null) {
+            $locale = config('App')->defaultLocale;
+        }
+
+        // There is no easy way to retrieve the locale from Faker so we will store it
+        $this->locale = $locale;
+
+        // Create the locale-specific Generator
+        $this->faker = Factory::create($this->locale);
+
+        // Determine eligible date fields
+        foreach (['createdField', 'updatedField', 'deletedField'] as $field) {
+            if (! empty($this->model->{$field})) {
+                $this->dateFields[] = $this->model->{$field};
+            }
+        }
+
+        // Set the formatters
+        $this->setFormatters($formatters);
+    }
+
+    /**
+     * Reset internal counts
+     */
+    public static function resetCounts()
+    {
+        self::$tableCounts = [];
+    }
+
+    /**
+     * Get the count for a specific table
+     *
+     * @param string $table Name of the target table
+     */
+    public static function getCount(string $table): int
+    {
+        return empty(self::$tableCounts[$table]) ? 0 : self::$tableCounts[$table];
+    }
+
+    /**
+     * Set the count for a specific table
+     *
+     * @param string $table Name of the target table
+     * @param int    $count Count value
+     *
+     * @return int The new count value
+     */
+    public static function setCount(string $table, int $count): int
+    {
+        self::$tableCounts[$table] = $count;
+
+        return $count;
+    }
+
+    /**
+     * Increment the count for a table
+     *
+     * @param string $table Name of the target table
+     *
+     * @return int The new count value
+     */
+    public static function upCount(string $table): int
+    {
+        return self::setCount($table, self::getCount($table) + 1);
+    }
+
+    /**
+     * Decrement the count for a table
+     *
+     * @param string $table Name of the target table
+     *
+     * @return int The new count value
+     */
+    public static function downCount(string $table): int
+    {
+        return self::setCount($table, self::getCount($table) - 1);
+    }
+
+    /**
+     * Returns the model instance
+     *
+     * @return object Framework or compatible model
+     */
+    public function getModel()
+    {
+        return $this->model;
+    }
+
+    /**
+     * Returns the locale
+     */
+    public function getLocale(): string
+    {
+        return $this->locale;
+    }
+
+    /**
+     * Returns the Faker generator
+     */
+    public function getFaker(): Generator
+    {
+        return $this->faker;
+    }
+
+    /**
+     * Return and reset tempOverrides
+     */
+    public function getOverrides(): array
+    {
+        $overrides = $this->tempOverrides ?? $this->overrides;
+
+        $this->tempOverrides = $this->overrides;
+
+        return $overrides;
+    }
+
+    /**
+     * Set the overrides, once or persistent
+     *
+     * @param array $overrides Array of [field => value]
+     * @param bool  $persist   Whether these overrides should persist through the next operation
+     */
+    public function setOverrides(array $overrides = [], $persist = true): self
+    {
+        if ($persist) {
+            $this->overrides = $overrides;
+        }
+
+        $this->tempOverrides = $overrides;
+
+        return $this;
+    }
+
+    /**
+     * Returns the current formatters
+     */
+    public function getFormatters(): ?array
+    {
+        return $this->formatters;
+    }
+
+    /**
+     * Set the formatters to use. Will attempt to autodetect if none are available.
+     *
+     * @param array|null $formatters Array of [field => formatter], or null to detect
+     */
+    public function setFormatters(?array $formatters = null): self
+    {
+        if ($formatters !== null) {
+            $this->formatters = $formatters;
+        } elseif (method_exists($this->model, 'fake')) {
+            $this->formatters = null;
+        } else {
+            $this->detectFormatters();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Try to identify the appropriate Faker formatter for each field.
+     */
+    protected function detectFormatters(): self
+    {
+        $this->formatters = [];
+
+        if (! empty($this->model->allowedFields)) {
+            foreach ($this->model->allowedFields as $field) {
+                $this->formatters[$field] = $this->guessFormatter($field);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Guess at the correct formatter to match a field name.
+     *
+     * @param string $field Name of the field
+     *
+     * @return string Name of the formatter
+     */
+    protected function guessFormatter($field): string
+    {
+        // First check for a Faker formatter of the same name - covers things like "email"
+        try {
+            $this->faker->getFormatter($field);
+
+            return $field;
+        } catch (InvalidArgumentException $e) {
+            // No match, keep going
+        }
+
+        // Next look for known model fields
+        if (in_array($field, $this->dateFields, true)) {
+            switch ($this->model->dateFormat) {
+                case 'datetime':
+                case 'date':
+                    return 'date';
+
+                case 'int':
+                    return 'unixTime';
+            }
+        } elseif ($field === $this->model->primaryKey) {
+            return 'numberBetween';
+        }
+
+        // Check some common partials
+        foreach (['email', 'name', 'title', 'text', 'date', 'url'] as $term) {
+            if (stripos($field, $term) !== false) {
+                return $term;
+            }
+        }
+
+        if (stripos($field, 'phone') !== false) {
+            return 'phoneNumber';
+        }
+
+        // Nothing left, use the default
+        return $this->defaultFormatter;
+    }
+
+    /**
+     * Generate new entities with faked data
+     *
+     * @param int|null $count Optional number to create a collection
+     *
+     * @return array|object An array or object (based on returnType), or an array of returnTypes
+     */
+    public function make(?int $count = null)
+    {
+        // If a singleton was requested then go straight to it
+        if ($count === null) {
+            return $this->model->returnType === 'array'
+                ? $this->makeArray()
+                : $this->makeObject();
+        }
+
+        $return = [];
+
+        for ($i = 0; $i < $count; $i++) {
+            $return[] = $this->model->returnType === 'array'
+                ? $this->makeArray()
+                : $this->makeObject();
+        }
+
+        return $return;
+    }
+
+    /**
+     * Generate an array of faked data
+     *
+     * @throws RuntimeException
+     *
+     * @return array An array of faked data
+     */
+    public function makeArray()
+    {
+        if ($this->formatters !== null) {
+            $result = [];
+
+            foreach ($this->formatters as $field => $formatter) {
+                $result[$field] = $this->faker->{$formatter};
+            }
+        }
+        // If no formatters were defined then look for a model fake() method
+        elseif (method_exists($this->model, 'fake')) {
+            $result = $this->model->fake($this->faker);
+
+            $result = is_object($result) && method_exists($result, 'toArray')
+                // This should cover entities
+                ? $result->toArray()
+                // Try to cast it
+                : (array) $result;
+        }
+        // Nothing left to do but give up
+        else {
+            throw new RuntimeException(lang('Fabricator.missingFormatters'));
+        }
+
+        // Replace overridden fields
+        return array_merge($result, $this->getOverrides());
+    }
+
+    /**
+     * Generate an object of faked data
+     *
+     * @param string|null $className Class name of the object to create; null to use model default
+     *
+     * @throws RuntimeException
+     *
+     * @return object An instance of the class with faked data
+     */
+    public function makeObject(?string $className = null): object
+    {
+        if ($className === null) {
+            if ($this->model->returnType === 'object' || $this->model->returnType === 'array') {
+                $className = 'stdClass';
+            } else {
+                $className = $this->model->returnType;
+            }
+        }
+
+        // If using the model's fake() method then check it for the correct return type
+        if ($this->formatters === null && method_exists($this->model, 'fake')) {
+            $result = $this->model->fake($this->faker);
+
+            if ($result instanceof $className) {
+                // Set overrides manually
+                foreach ($this->getOverrides() as $key => $value) {
+                    $result->{$key} = $value;
+                }
+
+                return $result;
+            }
+        }
+
+        // Get the array values and apply them to the object
+        $array  = $this->makeArray();
+        $object = new $className();
+
+        // Check for the entity method
+        if (method_exists($object, 'fill')) {
+            $object->fill($array);
+        } else {
+            foreach ($array as $key => $value) {
+                $object->{$key} = $value;
+            }
+        }
+
+        return $object;
+    }
+
+    /**
+     * Generate new entities from the database
+     *
+     * @param int|null $count Optional number to create a collection
+     * @param bool     $mock  Whether to execute or mock the insertion
+     *
+     * @throws FrameworkException
+     *
+     * @return array|object An array or object (based on returnType), or an array of returnTypes
+     */
+    public function create(?int $count = null, bool $mock = false)
+    {
+        // Intercept mock requests
+        if ($mock) {
+            return $this->createMock($count);
+        }
+
+        $ids = [];
+
+        // Iterate over new entities and insert each one, storing insert IDs
+        foreach ($this->make($count ?? 1) as $result) {
+            if ($id = $this->model->insert($result, true)) {
+                $ids[] = $id;
+                self::upCount($this->model->table);
+
+                continue;
+            }
+
+            throw FrameworkException::forFabricatorCreateFailed($this->model->table, implode(' ', $this->model->errors() ?? []));
+        }
+
+        // If the model defines a "withDeleted" method for handling soft deletes then use it
+        if (method_exists($this->model, 'withDeleted')) {
+            $this->model->withDeleted();
+        }
+
+        return $this->model->find($count === null ? reset($ids) : $ids);
+    }
+
+    /**
+     * Generate new database entities without actually inserting them
+     *
+     * @param int|null $count Optional number to create a collection
+     *
+     * @return array|object An array or object (based on returnType), or an array of returnTypes
+     */
+    protected function createMock(?int $count = null)
+    {
+        switch ($this->model->dateFormat) {
+            case 'datetime':
+                $datetime = date('Y-m-d H:i:s');
+                break;
+
+            case 'date':
+                $datetime = date('Y-m-d');
+                break;
+
+            default:
+                $datetime = time();
+        }
+
+        // Determine which fields we will need
+        $fields = [];
+
+        if (! empty($this->model->useTimestamps)) {
+            $fields[$this->model->createdField] = $datetime; // @phpstan-ignore-line
+            $fields[$this->model->updatedField] = $datetime; // @phpstan-ignore-line
+        }
+
+        if (! empty($this->model->useSoftDeletes)) {
+            $fields[$this->model->deletedField] = null; // @phpstan-ignore-line
+        }
+
+        // Iterate over new entities and add the necessary fields
+        $return = [];
+
+        foreach ($this->make($count ?? 1) as $i => $result) {
+            // Set the ID
+            $fields[$this->model->primaryKey] = $i;
+
+            // Merge fields
+            if (is_array($result)) {
+                $result = array_merge($result, $fields);
+            } else {
+                foreach ($fields as $key => $value) {
+                    $result->{$key} = $value;
+                }
+            }
+
+            $return[] = $result;
+        }
+
+        return $count === null ? reset($return) : $return;
+    }
 }
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
index 488e114d0236..971f41c5b6e4 100644
--- a/system/Test/FeatureResponse.php
+++ b/system/Test/FeatureResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -18,8 +18,8 @@
  */
 class FeatureResponse extends TestResponse
 {
-	/**
-	 * @deprecated Will be protected in a future release, use response() instead
-	 */
-	public $response;
+    /**
+     * @deprecated Will be protected in a future release, use response() instead
+     */
+    public $response;
 }
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index d1f648cab488..87423271cd63 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -29,411 +29,373 @@
  * Provides a base class with the trait for doing full HTTP testing
  * against your application.
  *
+ * @no-final
+ *
  * @deprecated Use FeatureTestTrait instead
  *
  * @codeCoverageIgnore
+ *
+ * @internal
  */
 class FeatureTestCase extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	/**
-	 * Sets a RouteCollection that will override
-	 * the application's route collection.
-	 *
-	 * Example routes:
-	 * [
-	 *    ['get', 'home', 'Home::index']
-	 * ]
-	 *
-	 * @param array $routes
-	 *
-	 * @return $this
-	 */
-	protected function withRoutes(array $routes = null)
-	{
-		$collection = Services::routes();
-
-		if ($routes)
-		{
-			$collection->resetRoutes();
-			foreach ($routes as $route)
-			{
-				$collection->{$route[0]}($route[1], $route[2]);
-			}
-		}
-
-		$this->routes = $collection;
-
-		return $this;
-	}
-
-	/**
-	 * Sets any values that should exist during this session.
-	 *
-	 * @param array|null $values Array of values, or null to use the current $_SESSION
-	 *
-	 * @return $this
-	 */
-	public function withSession(array $values = null)
-	{
-		$this->session = is_null($values) ? $_SESSION : $values;
-
-		return $this;
-	}
-
-	/**
-	 * Set request's headers
-	 *
-	 * Example of use
-	 * withHeaders([
-	 *  'Authorization' => 'Token'
-	 * ])
-	 *
-	 * @param array $headers Array of headers
-	 *
-	 * @return $this
-	 */
-	public function withHeaders(array $headers = [])
-	{
-		$this->headers = $headers;
-
-		return $this;
-	}
-
-	/**
-	 * Set the format the request's body should have.
-	 *
-	 * @param  string $format The desired format. Currently supported formats: xml, json
-	 * @return $this
-	 */
-	public function withBodyFormat(string $format)
-	{
-		$this->bodyFormat = $format;
-
-		return $this;
-	}
-
-	/**
-	 * Set the raw body for the request
-	 *
-	 * @param  mixed $body
-	 * @return $this
-	 */
-	public function withBody($body)
-	{
-		$this->requestBody = $body;
-
-		return $this;
-	}
-
-	/**
-	 * Don't run any events while running this test.
-	 *
-	 * @return $this
-	 */
-	public function skipEvents()
-	{
-		Events::simulate(true);
-
-		return $this;
-	}
-
-	/**
-	 * Calls a single URI, executes it, and returns a FeatureResponse
-	 * instance that can be used to run many assertions against.
-	 *
-	 * @param string     $method
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function call(string $method, string $path, array $params = null)
-	{
-		$buffer = \ob_get_level();
-
-		// Clean up any open output buffers
-		// not relevant to unit testing
-		// @codeCoverageIgnoreStart
-		if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true))
-		{
-			\ob_end_clean();
-		}
-		// @codeCoverageIgnoreEnd
-
-		// Simulate having a blank session
-		$_SESSION                  = [];
-		$_SERVER['REQUEST_METHOD'] = $method;
-
-		$request = $this->setupRequest($method, $path);
-		$request = $this->setupHeaders($request);
-		$request = $this->populateGlobals($method, $request, $params);
-		$request = $this->setRequestBody($request);
-
-		// Initialize the RouteCollection
-		if (! $routes = $this->routes)
-		{
-			require APPPATH . 'Config/Routes.php';
-
-			/**
-			 * @var RouteCollection $routes
-			 */
-			$routes->getRoutes('*');
-		}
-
-		$routes->setHTTPVerb($method);
-
-		// Make sure any other classes that might call the request
-		// instance get the right one.
-		Services::injectMock('request', $request);
-
-		// Make sure filters are reset between tests
-		Services::injectMock('filters', Services::filters(null, false));
-
-		$response = $this->app
-				->setRequest($request)
-				->run($routes, true);
-
-		$output = \ob_get_contents();
-		if (empty($response->getBody()) && ! empty($output))
-		{
-			$response->setBody($output);
-		}
-
-		// Reset directory if it has been set
-		Services::router()->setDirectory(null);
-
-		// Ensure the output buffer is identical so no tests are risky
-		// @codeCoverageIgnoreStart
-		while (\ob_get_level() > $buffer)
-		{
-			\ob_end_clean();
-		}
-		while (\ob_get_level() < $buffer)
-		{
-			\ob_start();
-		}
-		// @codeCoverageIgnoreEnd
-
-		return new FeatureResponse($response);
-	}
-
-	/**
-	 * Performs a GET request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function get(string $path, array $params = null)
-	{
-		return $this->call('get', $path, $params);
-	}
-
-	/**
-	 * Performs a POST request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function post(string $path, array $params = null)
-	{
-		return $this->call('post', $path, $params);
-	}
-
-	/**
-	 * Performs a PUT request
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function put(string $path, array $params = null)
-	{
-		return $this->call('put', $path, $params);
-	}
-
-	/**
-	 * Performss a PATCH request
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function patch(string $path, array $params = null)
-	{
-		return $this->call('patch', $path, $params);
-	}
-
-	/**
-	 * Performs a DELETE request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function delete(string $path, array $params = null)
-	{
-		return $this->call('delete', $path, $params);
-	}
-
-	/**
-	 * Performs an OPTIONS request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return FeatureResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function options(string $path, array $params = null)
-	{
-		return $this->call('options', $path, $params);
-	}
-
-	/**
-	 * Setup a Request object to use so that CodeIgniter
-	 * won't try to auto-populate some of the items.
-	 *
-	 * @param string      $method
-	 * @param string|null $path
-	 *
-	 * @return IncomingRequest
-	 */
-	protected function setupRequest(string $method, string $path = null): IncomingRequest
-	{
-		$config = config(App::class);
-		$uri    = new URI(rtrim($config->baseURL, '/') . '/' . trim($path, '/ '));
-
-		$request      = new IncomingRequest($config, clone($uri), null, new UserAgent());
-		$request->uri = $uri;
-
-		$request->setMethod($method);
-		$request->setProtocolVersion('1.1');
-
-		if ($config->forceGlobalSecureRequests)
-		{
-			$_SERVER['HTTPS'] = 'test';
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Setup the custom request's headers
-	 *
-	 * @param IncomingRequest $request
-	 *
-	 * @return IncomingRequest
-	 */
-	protected function setupHeaders(IncomingRequest $request)
-	{
-		if (! empty($this->headers))
-		{
-			foreach ($this->headers as $name => $value)
-			{
-				$request->setHeader($name, $value);
-			}
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Populates the data of our Request with "global" data
-	 * relevant to the request, like $_POST data.
-	 *
-	 * Always populate the GET vars based on the URI.
-	 *
-	 * @param string     $method
-	 * @param Request    $request
-	 * @param array|null $params
-	 *
-	 * @return Request
-	 * @throws ReflectionException
-	 */
-	protected function populateGlobals(string $method, Request $request, array $params = null)
-	{
-		// $params should set the query vars if present,
-		// otherwise set it from the URL.
-		$get = ! empty($params) && $method === 'get'
-			? $params
-			: $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
-
-		$request->setGlobal('get', $get);
-		if ($method !== 'get')
-		{
-			$request->setGlobal($method, $params);
-		}
-
-		$request->setGlobal('request', $params);
-
-		$_SESSION = $this->session ?? [];
-
-		return $request;
-	}
-
-	/**
-	 * Set the request's body formatted according to the value in $this->bodyFormat.
-	 * This allows the body to be formatted in a way that the controller is going to
-	 * expect as in the case of testing a JSON or XML API.
-	 *
-	 * @param  Request    $request
-	 * @param  null|array $params  The parameters to be formatted and put in the body. If this is empty, it will get the
-	 *                               what has been loaded into the request global of the request class.
-	 * @return Request
-	 */
-	protected function setRequestBody(Request $request, array $params = null): Request
-	{
-		if (isset($this->requestBody) && $this->requestBody !== '')
-		{
-			$request->setBody($this->requestBody);
-			return $request;
-		}
-
-		if (isset($this->bodyFormat) && $this->bodyFormat !== '')
-		{
-			if (empty($params))
-			{
-				$params = $request->fetchGlobal('request');
-			}
-			$formatMime = '';
-			if ($this->bodyFormat === 'json')
-			{
-				$formatMime = 'application/json';
-			}
-			elseif ($this->bodyFormat === 'xml')
-			{
-				$formatMime = 'application/xml';
-			}
-			if (! empty($formatMime) && ! empty($params))
-			{
-				$formatted = Services::format()->getFormatter($formatMime)->format($params);
-				$request->setBody($formatted);
-				$request->setHeader('Content-Type', $formatMime);
-			}
-		}
-
-		return $request;
-	}
+    use DatabaseTestTrait;
+
+    /**
+     * Sets a RouteCollection that will override
+     * the application's route collection.
+     *
+     * Example routes:
+     * [
+     *    ['get', 'home', 'Home::index']
+     * ]
+     *
+     * @param array $routes
+     *
+     * @return $this
+     */
+    protected function withRoutes(?array $routes = null)
+    {
+        $collection = Services::routes();
+
+        if ($routes) {
+            $collection->resetRoutes();
+
+            foreach ($routes as $route) {
+                $collection->{$route[0]}($route[1], $route[2]);
+            }
+        }
+
+        $this->routes = $collection;
+
+        return $this;
+    }
+
+    /**
+     * Sets any values that should exist during this session.
+     *
+     * @param array|null $values Array of values, or null to use the current $_SESSION
+     *
+     * @return $this
+     */
+    public function withSession(?array $values = null)
+    {
+        $this->session = $values ?? $_SESSION;
+
+        return $this;
+    }
+
+    /**
+     * Set request's headers
+     *
+     * Example of use
+     * withHeaders([
+     *  'Authorization' => 'Token'
+     * ])
+     *
+     * @param array $headers Array of headers
+     *
+     * @return $this
+     */
+    public function withHeaders(array $headers = [])
+    {
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+    /**
+     * Set the format the request's body should have.
+     *
+     * @param string $format The desired format. Currently supported formats: xml, json
+     *
+     * @return $this
+     */
+    public function withBodyFormat(string $format)
+    {
+        $this->bodyFormat = $format;
+
+        return $this;
+    }
+
+    /**
+     * Set the raw body for the request
+     *
+     * @param mixed $body
+     *
+     * @return $this
+     */
+    public function withBody($body)
+    {
+        $this->requestBody = $body;
+
+        return $this;
+    }
+
+    /**
+     * Don't run any events while running this test.
+     *
+     * @return $this
+     */
+    public function skipEvents()
+    {
+        Events::simulate(true);
+
+        return $this;
+    }
+
+    /**
+     * Calls a single URI, executes it, and returns a FeatureResponse
+     * instance that can be used to run many assertions against.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function call(string $method, string $path, ?array $params = null)
+    {
+        $buffer = \ob_get_level();
+
+        // Clean up any open output buffers
+        // not relevant to unit testing
+        // @codeCoverageIgnoreStart
+        if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true)) {
+            \ob_end_clean();
+        }
+        // @codeCoverageIgnoreEnd
+
+        // Simulate having a blank session
+        $_SESSION                  = [];
+        $_SERVER['REQUEST_METHOD'] = $method;
+
+        $request = $this->setupRequest($method, $path);
+        $request = $this->setupHeaders($request);
+        $request = $this->populateGlobals($method, $request, $params);
+        $request = $this->setRequestBody($request);
+
+        // Initialize the RouteCollection
+        if (! $routes = $this->routes) {
+            require APPPATH . 'Config/Routes.php';
+
+            /**
+             * @var RouteCollection $routes
+             */
+            $routes->getRoutes('*');
+        }
+
+        $routes->setHTTPVerb($method);
+
+        // Make sure any other classes that might call the request
+        // instance get the right one.
+        Services::injectMock('request', $request);
+
+        // Make sure filters are reset between tests
+        Services::injectMock('filters', Services::filters(null, false));
+
+        $response = $this->app
+            ->setRequest($request)
+            ->run($routes, true);
+
+        $output = \ob_get_contents();
+        if (empty($response->getBody()) && ! empty($output)) {
+            $response->setBody($output);
+        }
+
+        // Reset directory if it has been set
+        Services::router()->setDirectory(null);
+
+        // Ensure the output buffer is identical so no tests are risky
+        // @codeCoverageIgnoreStart
+        while (\ob_get_level() > $buffer) {
+            \ob_end_clean();
+        }
+
+        while (\ob_get_level() < $buffer) {
+            \ob_start();
+        }
+        // @codeCoverageIgnoreEnd
+
+        return new FeatureResponse($response);
+    }
+
+    /**
+     * Performs a GET request.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function get(string $path, ?array $params = null)
+    {
+        return $this->call('get', $path, $params);
+    }
+
+    /**
+     * Performs a POST request.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function post(string $path, ?array $params = null)
+    {
+        return $this->call('post', $path, $params);
+    }
+
+    /**
+     * Performs a PUT request
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function put(string $path, ?array $params = null)
+    {
+        return $this->call('put', $path, $params);
+    }
+
+    /**
+     * Performss a PATCH request
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function patch(string $path, ?array $params = null)
+    {
+        return $this->call('patch', $path, $params);
+    }
+
+    /**
+     * Performs a DELETE request.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function delete(string $path, ?array $params = null)
+    {
+        return $this->call('delete', $path, $params);
+    }
+
+    /**
+     * Performs an OPTIONS request.
+     *
+     * @throws Exception
+     * @throws RedirectException
+     *
+     * @return FeatureResponse
+     */
+    public function options(string $path, ?array $params = null)
+    {
+        return $this->call('options', $path, $params);
+    }
+
+    /**
+     * Setup a Request object to use so that CodeIgniter
+     * won't try to auto-populate some of the items.
+     */
+    protected function setupRequest(string $method, ?string $path = null): IncomingRequest
+    {
+        $config = config(App::class);
+        $uri    = new URI(rtrim($config->baseURL, '/') . '/' . trim($path, '/ '));
+
+        $request      = new IncomingRequest($config, clone $uri, null, new UserAgent());
+        $request->uri = $uri;
+
+        $request->setMethod($method);
+        $request->setProtocolVersion('1.1');
+
+        if ($config->forceGlobalSecureRequests) {
+            $_SERVER['HTTPS'] = 'test';
+        }
+
+        return $request;
+    }
+
+    /**
+     * Setup the custom request's headers
+     *
+     * @return IncomingRequest
+     */
+    protected function setupHeaders(IncomingRequest $request)
+    {
+        foreach ($this->headers as $name => $value) {
+            $request->setHeader($name, $value);
+        }
+
+        return $request;
+    }
+
+    /**
+     * Populates the data of our Request with "global" data
+     * relevant to the request, like $_POST data.
+     *
+     * Always populate the GET vars based on the URI.
+     *
+     * @throws ReflectionException
+     *
+     * @return Request
+     */
+    protected function populateGlobals(string $method, Request $request, ?array $params = null)
+    {
+        // $params should set the query vars if present,
+        // otherwise set it from the URL.
+        $get = ! empty($params) && $method === 'get'
+            ? $params
+            : $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+
+        $request->setGlobal('get', $get);
+        if ($method !== 'get') {
+            $request->setGlobal($method, $params);
+        }
+
+        $request->setGlobal('request', $params);
+
+        $_SESSION = $this->session ?? [];
+
+        return $request;
+    }
+
+    /**
+     * Set the request's body formatted according to the value in $this->bodyFormat.
+     * This allows the body to be formatted in a way that the controller is going to
+     * expect as in the case of testing a JSON or XML API.
+     *
+     * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the
+     *                           what has been loaded into the request global of the request class.
+     */
+    protected function setRequestBody(Request $request, ?array $params = null): Request
+    {
+        if (isset($this->requestBody) && $this->requestBody !== '') {
+            $request->setBody($this->requestBody);
+
+            return $request;
+        }
+
+        if (isset($this->bodyFormat) && $this->bodyFormat !== '') {
+            if (empty($params)) {
+                $params = $request->fetchGlobal('request');
+            }
+            $formatMime = '';
+            if ($this->bodyFormat === 'json') {
+                $formatMime = 'application/json';
+            } elseif ($this->bodyFormat === 'xml') {
+                $formatMime = 'application/xml';
+            }
+            if (! empty($formatMime) && ! empty($params)) {
+                $formatted = Services::format()->getFormatter($formatMime)->format($params);
+                $request->setBody($formatted);
+                $request->setHeader('Content-Type', $formatMime);
+            }
+        }
+
+        return $request;
+    }
 }
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 51f5b41f132d..b44ff8c65491 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -31,406 +31,366 @@
  */
 trait FeatureTestTrait
 {
-	/**
-	 * Sets a RouteCollection that will override
-	 * the application's route collection.
-	 *
-	 * Example routes:
-	 * [
-	 *    ['get', 'home', 'Home::index']
-	 * ]
-	 *
-	 * @param array $routes
-	 *
-	 * @return $this
-	 */
-	protected function withRoutes(array $routes = null)
-	{
-		$collection = Services::routes();
-
-		if ($routes)
-		{
-			$collection->resetRoutes();
-			foreach ($routes as $route)
-			{
-				$collection->{$route[0]}($route[1], $route[2]);
-			}
-		}
-
-		$this->routes = $collection;
-
-		return $this;
-	}
-
-	/**
-	 * Sets any values that should exist during this session.
-	 *
-	 * @param array|null $values Array of values, or null to use the current $_SESSION
-	 *
-	 * @return $this
-	 */
-	public function withSession(array $values = null)
-	{
-		$this->session = is_null($values) ? $_SESSION : $values;
-
-		return $this;
-	}
-
-	/**
-	 * Set request's headers
-	 *
-	 * Example of use
-	 * withHeaders([
-	 *  'Authorization' => 'Token'
-	 * ])
-	 *
-	 * @param array $headers Array of headers
-	 *
-	 * @return $this
-	 */
-	public function withHeaders(array $headers = [])
-	{
-		$this->headers = $headers;
-
-		return $this;
-	}
-
-	/**
-	 * Set the format the request's body should have.
-	 *
-	 * @param  string $format The desired format. Currently supported formats: xml, json
-	 * @return $this
-	 */
-	public function withBodyFormat(string $format)
-	{
-		$this->bodyFormat = $format;
-
-		return $this;
-	}
-
-	/**
-	 * Set the raw body for the request
-	 *
-	 * @param  mixed $body
-	 * @return $this
-	 */
-	public function withBody($body)
-	{
-		$this->requestBody = $body;
-
-		return $this;
-	}
-
-	/**
-	 * Don't run any events while running this test.
-	 *
-	 * @return $this
-	 */
-	public function skipEvents()
-	{
-		Events::simulate(true);
-
-		return $this;
-	}
-
-	/**
-	 * Calls a single URI, executes it, and returns a TestResponse
-	 * instance that can be used to run many assertions against.
-	 *
-	 * @param string     $method
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function call(string $method, string $path, array $params = null)
-	{
-		$buffer = \ob_get_level();
-
-		// Clean up any open output buffers
-		// not relevant to unit testing
-		// @codeCoverageIgnoreStart
-		if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true))
-		{
-			\ob_end_clean();
-		}
-		// @codeCoverageIgnoreEnd
-
-		// Simulate having a blank session
-		$_SESSION                  = [];
-		$_SERVER['REQUEST_METHOD'] = $method;
-
-		$request = $this->setupRequest($method, $path);
-		$request = $this->setupHeaders($request);
-		$request = $this->populateGlobals($method, $request, $params);
-		$request = $this->setRequestBody($request);
-
-		// Initialize the RouteCollection
-		if (! $routes = $this->routes)
-		{
-			require APPPATH . 'Config/Routes.php';
-
-			/**
-			 * @var RouteCollection $routes
-			 */
-			$routes->getRoutes('*');
-		}
-
-		$routes->setHTTPVerb($method);
-
-		// Make sure any other classes that might call the request
-		// instance get the right one.
-		Services::injectMock('request', $request);
-
-		// Make sure filters are reset between tests
-		Services::injectMock('filters', Services::filters(null, false));
-
-		$response = $this->app
-				->setRequest($request)
-				->run($routes, true);
-
-		$output = \ob_get_contents();
-		if (empty($response->getBody()) && ! empty($output))
-		{
-			$response->setBody($output);
-		}
-
-		// Reset directory if it has been set
-		Services::router()->setDirectory(null);
-
-		// Ensure the output buffer is identical so no tests are risky
-		// @codeCoverageIgnoreStart
-		while (\ob_get_level() > $buffer)
-		{
-			\ob_end_clean();
-		}
-		while (\ob_get_level() < $buffer)
-		{
-			\ob_start();
-		}
-		// @codeCoverageIgnoreEnd
-
-		return new TestResponse($response);
-	}
-
-	/**
-	 * Performs a GET request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function get(string $path, array $params = null)
-	{
-		return $this->call('get', $path, $params);
-	}
-
-	/**
-	 * Performs a POST request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function post(string $path, array $params = null)
-	{
-		return $this->call('post', $path, $params);
-	}
-
-	/**
-	 * Performs a PUT request
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function put(string $path, array $params = null)
-	{
-		return $this->call('put', $path, $params);
-	}
-
-	/**
-	 * Performss a PATCH request
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function patch(string $path, array $params = null)
-	{
-		return $this->call('patch', $path, $params);
-	}
-
-	/**
-	 * Performs a DELETE request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function delete(string $path, array $params = null)
-	{
-		return $this->call('delete', $path, $params);
-	}
-
-	/**
-	 * Performs an OPTIONS request.
-	 *
-	 * @param string     $path
-	 * @param array|null $params
-	 *
-	 * @return TestResponse
-	 * @throws RedirectException
-	 * @throws Exception
-	 */
-	public function options(string $path, array $params = null)
-	{
-		return $this->call('options', $path, $params);
-	}
-
-	/**
-	 * Setup a Request object to use so that CodeIgniter
-	 * won't try to auto-populate some of the items.
-	 *
-	 * @param string      $method
-	 * @param string|null $path
-	 *
-	 * @return IncomingRequest
-	 */
-	protected function setupRequest(string $method, string $path = null): IncomingRequest
-	{
-		$path    = URI::removeDotSegments($path);
-		$config  = config(App::class);
-		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
-
-		// $path may have a query in it
-		$parts                   = explode('?', $path);
-		$_SERVER['QUERY_STRING'] = $parts[1] ?? '';
-
-		$request->setPath($parts[0]);
-		$request->setMethod($method);
-		$request->setProtocolVersion('1.1');
-
-		if ($config->forceGlobalSecureRequests)
-		{
-			$_SERVER['HTTPS'] = 'test';
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Setup the custom request's headers
-	 *
-	 * @param IncomingRequest $request
-	 *
-	 * @return IncomingRequest
-	 */
-	protected function setupHeaders(IncomingRequest $request)
-	{
-		if (! empty($this->headers))
-		{
-			foreach ($this->headers as $name => $value)
-			{
-				$request->setHeader($name, $value);
-			}
-		}
-
-		return $request;
-	}
-
-	/**
-	 * Populates the data of our Request with "global" data
-	 * relevant to the request, like $_POST data.
-	 *
-	 * Always populate the GET vars based on the URI.
-	 *
-	 * @param string     $method
-	 * @param Request    $request
-	 * @param array|null $params
-	 *
-	 * @return Request
-	 * @throws ReflectionException
-	 */
-	protected function populateGlobals(string $method, Request $request, array $params = null)
-	{
-		// $params should set the query vars if present,
-		// otherwise set it from the URL.
-		$get = ! empty($params) && $method === 'get'
-			? $params
-			: $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
-
-		$request->setGlobal('get', $get);
-		if ($method !== 'get')
-		{
-			$request->setGlobal($method, $params);
-		}
-
-		$request->setGlobal('request', $params);
-
-		$_SESSION = $this->session ?? [];
-
-		return $request;
-	}
-
-	/**
-	 * Set the request's body formatted according to the value in $this->bodyFormat.
-	 * This allows the body to be formatted in a way that the controller is going to
-	 * expect as in the case of testing a JSON or XML API.
-	 *
-	 * @param  Request    $request
-	 * @param  null|array $params  The parameters to be formatted and put in the body. If this is empty, it will get the
-	 *                               what has been loaded into the request global of the request class.
-	 * @return Request
-	 */
-	protected function setRequestBody(Request $request, array $params = null): Request
-	{
-		if (isset($this->requestBody) && $this->requestBody !== '')
-		{
-			$request->setBody($this->requestBody);
-			return $request;
-		}
-
-		if (isset($this->bodyFormat) && $this->bodyFormat !== '')
-		{
-			if (empty($params))
-			{
-				$params = $request->fetchGlobal('request');
-			}
-			$formatMime = '';
-			if ($this->bodyFormat === 'json')
-			{
-				$formatMime = 'application/json';
-			}
-			elseif ($this->bodyFormat === 'xml')
-			{
-				$formatMime = 'application/xml';
-			}
-			if (! empty($formatMime) && ! empty($params))
-			{
-				$formatted = Services::format()->getFormatter($formatMime)->format($params);
-				$request->setBody($formatted);
-				$request->setHeader('Content-Type', $formatMime);
-			}
-		}
-
-		return $request;
-	}
+    /**
+     * Sets a RouteCollection that will override
+     * the application's route collection.
+     *
+     * Example routes:
+     * [
+     *    ['get', 'home', 'Home::index']
+     * ]
+     *
+     * @param array $routes
+     *
+     * @return $this
+     */
+    protected function withRoutes(?array $routes = null)
+    {
+        $collection = Services::routes();
+
+        if ($routes) {
+            $collection->resetRoutes();
+
+            foreach ($routes as $route) {
+                $collection->{$route[0]}($route[1], $route[2]);
+            }
+        }
+
+        $this->routes = $collection;
+
+        return $this;
+    }
+
+    /**
+     * Sets any values that should exist during this session.
+     *
+     * @param array|null $values Array of values, or null to use the current $_SESSION
+     *
+     * @return $this
+     */
+    public function withSession(?array $values = null)
+    {
+        $this->session = $values ?? $_SESSION;
+
+        return $this;
+    }
+
+    /**
+     * Set request's headers
+     *
+     * Example of use
+     * withHeaders([
+     *  'Authorization' => 'Token'
+     * ])
+     *
+     * @param array $headers Array of headers
+     *
+     * @return $this
+     */
+    public function withHeaders(array $headers = [])
+    {
+        $this->headers = $headers;
+
+        return $this;
+    }
+
+    /**
+     * Set the format the request's body should have.
+     *
+     * @param string $format The desired format. Currently supported formats: xml, json
+     *
+     * @return $this
+     */
+    public function withBodyFormat(string $format)
+    {
+        $this->bodyFormat = $format;
+
+        return $this;
+    }
+
+    /**
+     * Set the raw body for the request
+     *
+     * @param mixed $body
+     *
+     * @return $this
+     */
+    public function withBody($body)
+    {
+        $this->requestBody = $body;
+
+        return $this;
+    }
+
+    /**
+     * Don't run any events while running this test.
+     *
+     * @return $this
+     */
+    public function skipEvents()
+    {
+        Events::simulate(true);
+
+        return $this;
+    }
+
+    /**
+     * Calls a single URI, executes it, and returns a TestResponse
+     * instance that can be used to run many assertions against.
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function call(string $method, string $path, ?array $params = null)
+    {
+        $buffer = \ob_get_level();
+
+        // Clean up any open output buffers
+        // not relevant to unit testing
+        // @codeCoverageIgnoreStart
+        if (\ob_get_level() > 0 && (! isset($this->clean) || $this->clean === true)) {
+            \ob_end_clean();
+        }
+        // @codeCoverageIgnoreEnd
+
+        // Simulate having a blank session
+        $_SESSION                  = [];
+        $_SERVER['REQUEST_METHOD'] = $method;
+
+        $request = $this->setupRequest($method, $path);
+        $request = $this->setupHeaders($request);
+        $request = $this->populateGlobals($method, $request, $params);
+        $request = $this->setRequestBody($request);
+
+        // Initialize the RouteCollection
+        if (! $routes = $this->routes) {
+            require APPPATH . 'Config/Routes.php';
+
+            /**
+             * @var RouteCollection $routes
+             */
+            $routes->getRoutes('*');
+        }
+
+        $routes->setHTTPVerb($method);
+
+        // Make sure any other classes that might call the request
+        // instance get the right one.
+        Services::injectMock('request', $request);
+
+        // Make sure filters are reset between tests
+        Services::injectMock('filters', Services::filters(null, false));
+
+        $response = $this->app
+            ->setRequest($request)
+            ->run($routes, true);
+
+        $output = \ob_get_contents();
+        if (empty($response->getBody()) && ! empty($output)) {
+            $response->setBody($output);
+        }
+
+        // Reset directory if it has been set
+        Services::router()->setDirectory(null);
+
+        // Ensure the output buffer is identical so no tests are risky
+        // @codeCoverageIgnoreStart
+        while (\ob_get_level() > $buffer) {
+            \ob_end_clean();
+        }
+
+        while (\ob_get_level() < $buffer) {
+            \ob_start();
+        }
+        // @codeCoverageIgnoreEnd
+
+        return new TestResponse($response);
+    }
+
+    /**
+     * Performs a GET request.
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function get(string $path, ?array $params = null)
+    {
+        return $this->call('get', $path, $params);
+    }
+
+    /**
+     * Performs a POST request.
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function post(string $path, ?array $params = null)
+    {
+        return $this->call('post', $path, $params);
+    }
+
+    /**
+     * Performs a PUT request
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function put(string $path, ?array $params = null)
+    {
+        return $this->call('put', $path, $params);
+    }
+
+    /**
+     * Performss a PATCH request
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function patch(string $path, ?array $params = null)
+    {
+        return $this->call('patch', $path, $params);
+    }
+
+    /**
+     * Performs a DELETE request.
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function delete(string $path, ?array $params = null)
+    {
+        return $this->call('delete', $path, $params);
+    }
+
+    /**
+     * Performs an OPTIONS request.
+     *
+     * @throws RedirectException
+     * @throws Exception
+     *
+     * @return TestResponse
+     */
+    public function options(string $path, ?array $params = null)
+    {
+        return $this->call('options', $path, $params);
+    }
+
+    /**
+     * Setup a Request object to use so that CodeIgniter
+     * won't try to auto-populate some of the items.
+     */
+    protected function setupRequest(string $method, ?string $path = null): IncomingRequest
+    {
+        $path    = URI::removeDotSegments($path);
+        $config  = config(App::class);
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        // $path may have a query in it
+        $parts                   = explode('?', $path);
+        $_SERVER['QUERY_STRING'] = $parts[1] ?? '';
+
+        $request->setPath($parts[0]);
+        $request->setMethod($method);
+        $request->setProtocolVersion('1.1');
+
+        if ($config->forceGlobalSecureRequests) {
+            $_SERVER['HTTPS'] = 'test';
+        }
+
+        return $request;
+    }
+
+    /**
+     * Setup the custom request's headers
+     *
+     * @return IncomingRequest
+     */
+    protected function setupHeaders(IncomingRequest $request)
+    {
+        if (! empty($this->headers)) {
+            foreach ($this->headers as $name => $value) {
+                $request->setHeader($name, $value);
+            }
+        }
+
+        return $request;
+    }
+
+    /**
+     * Populates the data of our Request with "global" data
+     * relevant to the request, like $_POST data.
+     *
+     * Always populate the GET vars based on the URI.
+     *
+     * @throws ReflectionException
+     *
+     * @return Request
+     */
+    protected function populateGlobals(string $method, Request $request, ?array $params = null)
+    {
+        // $params should set the query vars if present,
+        // otherwise set it from the URL.
+        $get = ! empty($params) && $method === 'get'
+            ? $params
+            : $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+
+        $request->setGlobal('get', $get);
+        if ($method !== 'get') {
+            $request->setGlobal($method, $params);
+        }
+
+        $request->setGlobal('request', $params);
+
+        $_SESSION = $this->session ?? [];
+
+        return $request;
+    }
+
+    /**
+     * Set the request's body formatted according to the value in $this->bodyFormat.
+     * This allows the body to be formatted in a way that the controller is going to
+     * expect as in the case of testing a JSON or XML API.
+     *
+     * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the
+     *                           what has been loaded into the request global of the request class.
+     */
+    protected function setRequestBody(Request $request, ?array $params = null): Request
+    {
+        if (isset($this->requestBody) && $this->requestBody !== '') {
+            $request->setBody($this->requestBody);
+
+            return $request;
+        }
+
+        if (isset($this->bodyFormat) && $this->bodyFormat !== '') {
+            if (empty($params)) {
+                $params = $request->fetchGlobal('request');
+            }
+            $formatMime = '';
+            if ($this->bodyFormat === 'json') {
+                $formatMime = 'application/json';
+            } elseif ($this->bodyFormat === 'xml') {
+                $formatMime = 'application/xml';
+            }
+            if (! empty($formatMime) && ! empty($params)) {
+                $formatted = Services::format()->getFormatter($formatMime)->format($params);
+                $request->setBody($formatted);
+                $request->setHeader('Content-Type', $formatMime);
+            }
+        }
+
+        return $request;
+    }
 }
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 4b1dc4d5b92d..680515ed107b 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -1,20 +1,20 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
 use Closure;
 use CodeIgniter\Filters\Exceptions\FilterException;
-use CodeIgniter\Filters\Filters;
 use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\Filters\Filters;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Router\RouteCollection;
@@ -33,259 +33,238 @@
  */
 trait FilterTestTrait
 {
-	/**
-	 * Have the one-time classes been instantiated?
-	 *
-	 * @var boolean
-	 */
-	private $doneFilterSetUp = false;
-
-	/**
-	 * The active IncomingRequest or CLIRequest
-	 *
-	 * @var RequestInterface
-	 */
-	protected $request;
-
-	/**
-	 * The active Response instance
-	 *
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	/**
-	 * The Filters configuration to use.
-	 * Extracted for access to aliases
-	 * during Filters::discoverFilters().
-	 *
-	 * @var FiltersConfig|null
-	 */
-	protected $filtersConfig;
-
-	/**
-	 * The prepared Filters library.
-	 *
-	 * @var Filters|null
-	 */
-	protected $filters;
-
-	/**
-	 * The default App and discovered
-	 * routes to check for filters.
-	 *
-	 * @var RouteCollection|null
-	 */
-	protected $collection;
-
-	//--------------------------------------------------------------------
-	// Staging
-	//--------------------------------------------------------------------
-
-	/**
-	 * Initializes dependencies once.
-	 *
-	 * @return void
-	 */
-	protected function setUpFilterTestTrait(): void
-	{
-		if ($this->doneFilterSetUp === true)
-		{
-			return;
-		}
-
-		// Create our own Request and Response so we can
-		// use the same ones for Filters and FilterInterface
-		// yet isolate them from outside influence
-		$this->request  = $this->request ?? clone Services::request();
-		$this->response = $this->response ?? clone Services::response();
-
-		// Create our config and Filters instance to reuse for performance
-		$this->filtersConfig = $this->filtersConfig ?? config('Filters');
-		$this->filters       = $this->filters ?? new Filters($this->filtersConfig, $this->request, $this->response);
-
-		if (is_null($this->collection))
-		{
-			// Load the RouteCollection from Config to gather App route info
-			// (creates $routes using the Service as a starting point)
-			require APPPATH . 'Config/Routes.php';
-
-			$routes->getRoutes('*'); // Triggers discovery
-			$this->collection = $routes;
-		}
-
-		$this->doneFilterSetUp = true;
-	}
-
-	//--------------------------------------------------------------------
-	// Utility
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a callable method for a filter position
-	 * using the local HTTP instances.
-	 *
-	 * @param FilterInterface|string $filter   The filter instance, class, or alias
-	 * @param string                 $position "before" or "after"
-	 *
-	 * @return Closure
-	 */
-	protected function getFilterCaller($filter, string $position): Closure
-	{
-		if (! in_array($position, ['before', 'after'], true))
-		{
-			throw new InvalidArgumentException('Invalid filter position passed: ' . $position);
-		}
-
-		if (is_string($filter))
-		{
-			// Check for an alias (no namespace)
-			if (strpos($filter, '\\') === false)
-			{
-				if (! isset($this->filtersConfig->aliases[$filter]))
-				{
-					throw new RuntimeException("No filter found with alias '{$filter}'");
-				}
-
-				$filter = $this->filtersConfig->aliases[$filter];
-			}
-
-			// Get an instance
-			$filter = new $filter();
-		}
-
-		if (! $filter instanceof FilterInterface)
-		{
-			throw FilterException::forIncorrectInterface(get_class($filter));
-		}
-
-		$request = clone $this->request;
-
-		if ($position === 'before')
-		{
-			return function (array $params = null) use ($filter, $request) {
-				return $filter->before($request, $params);
-			};
-		}
-
-		$response = clone $this->response;
-
-		return function (array $params = null) use ($filter, $request, $response) {
-			return $filter->after($request, $response, $params);
-		};
-	}
-
-	/**
-	 * Gets an array of filter aliases enabled
-	 * for the given route at position.
-	 *
-	 * @param string $route    The route to test
-	 * @param string $position "before" or "after"
-	 *
-	 * @return string[] The filter aliases
-	 */
-	protected function getFiltersForRoute(string $route, string $position): array
-	{
-		if (! in_array($position, ['before', 'after'], true))
-		{
-			throw new InvalidArgumentException('Invalid filter position passed:' . $position);
-		}
-
-		$this->filters->reset();
-
-		if ($routeFilter = $this->collection->getFilterForRoute($route))
-		{
-			$this->filters->enableFilter($routeFilter, $position);
-		}
-
-		$aliases = $this->filters->initialize($route)->getFilters();
-
-		$this->filters->reset();
-		return $aliases[$position];
-	}
-
-	//--------------------------------------------------------------------
-	// Assertions
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asserts that the given route at position uses
-	 * the filter (by its alias).
-	 *
-	 * @param string $route    The route to test
-	 * @param string $position "before" or "after"
-	 * @param string $alias    Alias for the anticipated filter
-	 *
-	 * @return void
-	 */
-	protected function assertFilter(string $route, string $position, string $alias): void
-	{
-		$filters = $this->getFiltersForRoute($route, $position);
-
-		$this->assertContains(
-			$alias,
-			$filters,
-			"Filter '{$alias}' does not apply to '{$route}'.",
-		);
-	}
-
-	/**
-	 * Asserts that the given route at position does not
-	 * use the filter (by its alias).
-	 *
-	 * @param string $route    The route to test
-	 * @param string $position "before" or "after"
-	 * @param string $alias    Alias for the anticipated filter
-	 *
-	 * @return void
-	 */
-	protected function assertNotFilter(string $route, string $position, string $alias)
-	{
-		$filters = $this->getFiltersForRoute($route, $position);
-
-		$this->assertNotContains(
-			$alias,
-			$filters,
-			"Filter '{$alias}' applies to '{$route}' when it should not.",
-		);
-	}
-
-	/**
-	 * Asserts that the given route at position has
-	 * at least one filter set.
-	 *
-	 * @param string $route    The route to test
-	 * @param string $position "before" or "after"
-	 *
-	 * @return void
-	 */
-	protected function assertHasFilters(string $route, string $position)
-	{
-		$filters = $this->getFiltersForRoute($route, $position);
-
-		$this->assertNotEmpty(
-			$filters,
-			"No filters found for '{$route}' when at least one was expected.",
-		);
-	}
-
-	/**
-	 * Asserts that the given route at position has
-	 * no filters set.
-	 *
-	 * @param string $route    The route to test
-	 * @param string $position "before" or "after"
-	 *
-	 * @return void
-	 */
-	protected function assertNotHasFilters(string $route, string $position)
-	{
-		$filters = $this->getFiltersForRoute($route, $position);
-
-		$this->assertSame(
-			[],
-			$filters,
-			"Found filters for '{$route}' when none were expected: " . implode(', ', $filters) . '.',
-		);
-	}
+    /**
+     * Have the one-time classes been instantiated?
+     *
+     * @var bool
+     */
+    private $doneFilterSetUp = false;
+
+    /**
+     * The active IncomingRequest or CLIRequest
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * The active Response instance
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * The Filters configuration to use.
+     * Extracted for access to aliases
+     * during Filters::discoverFilters().
+     *
+     * @var FiltersConfig|null
+     */
+    protected $filtersConfig;
+
+    /**
+     * The prepared Filters library.
+     *
+     * @var Filters|null
+     */
+    protected $filters;
+
+    /**
+     * The default App and discovered
+     * routes to check for filters.
+     *
+     * @var RouteCollection|null
+     */
+    protected $collection;
+
+    //--------------------------------------------------------------------
+    // Staging
+    //--------------------------------------------------------------------
+
+    /**
+     * Initializes dependencies once.
+     */
+    protected function setUpFilterTestTrait(): void
+    {
+        if ($this->doneFilterSetUp === true) {
+            return;
+        }
+
+        // Create our own Request and Response so we can
+        // use the same ones for Filters and FilterInterface
+        // yet isolate them from outside influence
+        $this->request  = $this->request ?? clone Services::request();
+        $this->response = $this->response ?? clone Services::response();
+
+        // Create our config and Filters instance to reuse for performance
+        $this->filtersConfig = $this->filtersConfig ?? config('Filters');
+        $this->filters       = $this->filters ?? new Filters($this->filtersConfig, $this->request, $this->response);
+
+        if ($this->collection === null) {
+            // Load the RouteCollection from Config to gather App route info
+            // (creates $routes using the Service as a starting point)
+            require APPPATH . 'Config/Routes.php';
+
+            $routes->getRoutes('*'); // Triggers discovery
+            $this->collection = $routes;
+        }
+
+        $this->doneFilterSetUp = true;
+    }
+
+    //--------------------------------------------------------------------
+    // Utility
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns a callable method for a filter position
+     * using the local HTTP instances.
+     *
+     * @param FilterInterface|string $filter   The filter instance, class, or alias
+     * @param string                 $position "before" or "after"
+     */
+    protected function getFilterCaller($filter, string $position): Closure
+    {
+        if (! in_array($position, ['before', 'after'], true)) {
+            throw new InvalidArgumentException('Invalid filter position passed: ' . $position);
+        }
+
+        if (is_string($filter)) {
+            // Check for an alias (no namespace)
+            if (strpos($filter, '\\') === false) {
+                if (! isset($this->filtersConfig->aliases[$filter])) {
+                    throw new RuntimeException("No filter found with alias '{$filter}'");
+                }
+
+                $filter = $this->filtersConfig->aliases[$filter];
+            }
+
+            // Get an instance
+            $filter = new $filter();
+        }
+
+        if (! $filter instanceof FilterInterface) {
+            throw FilterException::forIncorrectInterface(get_class($filter));
+        }
+
+        $request = clone $this->request;
+
+        if ($position === 'before') {
+            return static function (?array $params = null) use ($filter, $request) {
+                return $filter->before($request, $params);
+            };
+        }
+
+        $response = clone $this->response;
+
+        return static function (?array $params = null) use ($filter, $request, $response) {
+            return $filter->after($request, $response, $params);
+        };
+    }
+
+    /**
+     * Gets an array of filter aliases enabled
+     * for the given route at position.
+     *
+     * @param string $route    The route to test
+     * @param string $position "before" or "after"
+     *
+     * @return string[] The filter aliases
+     */
+    protected function getFiltersForRoute(string $route, string $position): array
+    {
+        if (! in_array($position, ['before', 'after'], true)) {
+            throw new InvalidArgumentException('Invalid filter position passed:' . $position);
+        }
+
+        $this->filters->reset();
+
+        if ($routeFilter = $this->collection->getFilterForRoute($route)) {
+            $this->filters->enableFilter($routeFilter, $position);
+        }
+
+        $aliases = $this->filters->initialize($route)->getFilters();
+
+        $this->filters->reset();
+
+        return $aliases[$position];
+    }
+
+    //--------------------------------------------------------------------
+    // Assertions
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that the given route at position uses
+     * the filter (by its alias).
+     *
+     * @param string $route    The route to test
+     * @param string $position "before" or "after"
+     * @param string $alias    Alias for the anticipated filter
+     */
+    protected function assertFilter(string $route, string $position, string $alias): void
+    {
+        $filters = $this->getFiltersForRoute($route, $position);
+
+        $this->assertContains(
+            $alias,
+            $filters,
+            "Filter '{$alias}' does not apply to '{$route}'.",
+        );
+    }
+
+    /**
+     * Asserts that the given route at position does not
+     * use the filter (by its alias).
+     *
+     * @param string $route    The route to test
+     * @param string $position "before" or "after"
+     * @param string $alias    Alias for the anticipated filter
+     */
+    protected function assertNotFilter(string $route, string $position, string $alias)
+    {
+        $filters = $this->getFiltersForRoute($route, $position);
+
+        $this->assertNotContains(
+            $alias,
+            $filters,
+            "Filter '{$alias}' applies to '{$route}' when it should not.",
+        );
+    }
+
+    /**
+     * Asserts that the given route at position has
+     * at least one filter set.
+     *
+     * @param string $route    The route to test
+     * @param string $position "before" or "after"
+     */
+    protected function assertHasFilters(string $route, string $position)
+    {
+        $filters = $this->getFiltersForRoute($route, $position);
+
+        $this->assertNotEmpty(
+            $filters,
+            "No filters found for '{$route}' when at least one was expected.",
+        );
+    }
+
+    /**
+     * Asserts that the given route at position has
+     * no filters set.
+     *
+     * @param string $route    The route to test
+     * @param string $position "before" or "after"
+     */
+    protected function assertNotHasFilters(string $route, string $position)
+    {
+        $filters = $this->getFiltersForRoute($route, $position);
+
+        $this->assertSame(
+            [],
+            $filters,
+            "Found filters for '{$route}' when none were expected: " . implode(', ', $filters) . '.',
+        );
+    }
 }
diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php
index f293e0ab54b2..46e895ab19b8 100644
--- a/system/Test/Filters/CITestStreamFilter.php
+++ b/system/Test/Filters/CITestStreamFilter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Filters;
@@ -14,43 +14,37 @@
 use php_user_filter;
 
 /**
- * Class to extract an output snapshot.
  * Used to capture output during unit testing, so that it can
  * be used in assertions.
  */
 class CITestStreamFilter extends php_user_filter
 {
-	/**
-	 * Buffer to capture stream content.
-	 *
-	 * @var string
-	 */
-	public static $buffer = '';
-
-	/**
-	 * Output filtering - catch it all.
-	 *
-	 * @param resource $in
-	 * @param resource $out
-	 * @param integer  $consumed
-	 * @param boolean  $closing
-	 *
-	 * @return integer
-	 */
-	public function filter($in, $out, &$consumed, $closing)
-	{
-		while ($bucket = stream_bucket_make_writeable($in))
-		{
-			static::$buffer .= $bucket->data;
-
-			$consumed += $bucket->datalen;
-		}
-
-		// @phpstan-ignore-next-line
-		return PSFS_PASS_ON;
-	}
+    /**
+     * Buffer to capture stream content.
+     *
+     * @var string
+     */
+    public static $buffer = '';
+
+    /**
+     * This method is called whenever data is read from or written to the
+     * attached stream (such as with fread() or fwrite()).
+     *
+     * @param resource $in
+     * @param resource $out
+     * @param int      $consumed
+     * @param bool     $closing
+     */
+    public function filter($in, $out, &$consumed, $closing): int
+    {
+        while ($bucket = stream_bucket_make_writeable($in)) {
+            static::$buffer .= $bucket->data;
+
+            $consumed += $bucket->datalen;
+        }
+
+        return PSFS_PASS_ON;
+    }
 }
 
-// @codeCoverageIgnoreStart
-stream_filter_register('CITestStreamFilter', 'CodeIgniter\Test\Filters\CITestStreamFilter');
-// @codeCoverageIgnoreEnd
+stream_filter_register('CITestStreamFilter', CITestStreamFilter::class); // @codeCoverageIgnore
diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php
index e383eb019789..08cf5a15a0d7 100644
--- a/system/Test/Interfaces/FabricatorModel.php
+++ b/system/Test/Interfaces/FabricatorModel.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Interfaces;
@@ -28,56 +28,57 @@
  */
 interface FabricatorModel
 {
-	/**
-	 * Fetches the row of database from $this->table with a primary key
-	 * matching $id.
-	 *
-	 * @param mixed|array|null $id One primary key or an array of primary keys
-	 *
-	 * @return array|object|null    The resulting row of data, or null.
-	 */
-	public function find($id = null);
+    /**
+     * Fetches the row of database from $this->table with a primary key
+     * matching $id.
+     *
+     * @param array|mixed|null $id One primary key or an array of primary keys
+     *
+     * @return array|object|null The resulting row of data, or null.
+     */
+    public function find($id = null);
 
-	/**
-	 * Inserts data into the current table. If an object is provided,
-	 * it will attempt to convert it to an array.
-	 *
-	 * @param array|object $data
-	 * @param boolean      $returnID Whether insert ID should be returned or not.
-	 *
-	 * @return integer|string|boolean
-	 * @throws ReflectionException
-	 */
-	public function insert($data = null, bool $returnID = true);
+    /**
+     * Inserts data into the current table. If an object is provided,
+     * it will attempt to convert it to an array.
+     *
+     * @param array|object $data
+     * @param bool         $returnID Whether insert ID should be returned or not.
+     *
+     * @throws ReflectionException
+     *
+     * @return bool|int|string
+     */
+    public function insert($data = null, bool $returnID = true);
 
-	/**
-	 * The following properties and methods are optional, but if present should
-	 * adhere to their definitions.
-	 *
-	 * @property array  $allowedFields
-	 * @property string $useSoftDeletes
-	 * @property string $useTimestamps
-	 * @property string $createdField
-	 * @property string $updatedField
-	 * @property string $deletedField
-	 */
+    /**
+     * The following properties and methods are optional, but if present should
+     * adhere to their definitions.
+     *
+     * @property array  $allowedFields
+     * @property string $useSoftDeletes
+     * @property string $useTimestamps
+     * @property string $createdField
+     * @property string $updatedField
+     * @property string $deletedField
+     */
 
-	/*
-	 * Sets $useSoftDeletes value so that we can temporarily override
-	 * the softdeletes settings. Can be used for all find* methods.
-	 *
-	 * @param boolean $val
-	 *
-	 * @return Model
-	 */
-	// public function withDeleted($val = true);
+    /*
+     * Sets $useSoftDeletes value so that we can temporarily override
+     * the softdeletes settings. Can be used for all find* methods.
+     *
+     * @param boolean $val
+     *
+     * @return Model
+     */
+    // public function withDeleted($val = true);
 
-	/**
-	 * Faked data for Fabricator.
-	 *
-	 * @param Generator $faker
-	 *
-	 * @return array|object
-	 */
-	// public function fake(Generator &$faker);
+    /**
+     * Faked data for Fabricator.
+     *
+     * @param Generator $faker
+     *
+     * @return array|object
+     */
+    // public function fake(Generator &$faker);
 }
diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
index d461fbe6a2dd..26fb350db12c 100644
--- a/system/Test/Mock/MockAppConfig.php
+++ b/system/Test/Mock/MockAppConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,35 +15,35 @@
 
 class MockAppConfig extends App
 {
-	public $baseURL = 'http://example.com/';
-
-	public $uriProtocol = 'REQUEST_URI';
-
-	public $cookiePrefix   = '';
-	public $cookieDomain   = '';
-	public $cookiePath     = '/';
-	public $cookieSecure   = false;
-	public $cookieHTTPOnly = false;
-	public $cookieSameSite = 'Lax';
-
-	public $proxyIPs = '';
-
-	public $CSRFProtection  = false;
-	public $CSRFTokenName   = 'csrf_test_name';
-	public $CSRFHeaderName  = 'X-CSRF-TOKEN';
-	public $CSRFCookieName  = 'csrf_cookie_name';
-	public $CSRFExpire      = 7200;
-	public $CSRFRegenerate  = true;
-	public $CSRFExcludeURIs = ['http://example.com'];
-	public $CSRFRedirect    = false;
-	public $CSRFSameSite    = 'Lax';
-
-	public $CSPEnabled = false;
-
-	public $defaultLocale    = 'en';
-	public $negotiateLocale  = false;
-	public $supportedLocales = [
-		'en',
-		'es',
-	];
+    public $baseURL = 'http://example.com/';
+
+    public $uriProtocol = 'REQUEST_URI';
+
+    public $cookiePrefix   = '';
+    public $cookieDomain   = '';
+    public $cookiePath     = '/';
+    public $cookieSecure   = false;
+    public $cookieHTTPOnly = false;
+    public $cookieSameSite = 'Lax';
+
+    public $proxyIPs = '';
+
+    public $CSRFProtection  = false;
+    public $CSRFTokenName   = 'csrf_test_name';
+    public $CSRFHeaderName  = 'X-CSRF-TOKEN';
+    public $CSRFCookieName  = 'csrf_cookie_name';
+    public $CSRFExpire      = 7200;
+    public $CSRFRegenerate  = true;
+    public $CSRFExcludeURIs = ['http://example.com'];
+    public $CSRFRedirect    = false;
+    public $CSRFSameSite    = 'Lax';
+
+    public $CSPEnabled = false;
+
+    public $defaultLocale    = 'en';
+    public $negotiateLocale  = false;
+    public $supportedLocales = [
+        'en',
+        'es',
+    ];
 }
diff --git a/system/Test/Mock/MockAutoload.php b/system/Test/Mock/MockAutoload.php
index dfc3fe3ae1b2..26a92b2f811c 100644
--- a/system/Test/Mock/MockAutoload.php
+++ b/system/Test/Mock/MockAutoload.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,13 +15,13 @@
 
 class MockAutoload extends Autoload
 {
-	public $psr4 = [];
+    public $psr4 = [];
 
-	public $classmap = [];
+    public $classmap = [];
 
-	public function __construct()
-	{
-		// Don't call the parent since we don't want the default mappings.
-		// parent::__construct();
-	}
+    public function __construct()
+    {
+        // Don't call the parent since we don't want the default mappings.
+        // parent::__construct();
+    }
 }
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
index db0242c4f27a..63002436b4e4 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -1,23 +1,18 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\ConnectionInterface;
 
 class MockBuilder extends BaseBuilder
 {
-	public function __construct($tableName, ConnectionInterface &$db, array $options = null)
-	{
-		parent::__construct($tableName, $db, $options);
-	}
 }
diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php
index edb0739a5145..5c6e6b5db195 100644
--- a/system/Test/Mock/MockCLIConfig.php
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,33 +15,33 @@
 
 class MockCLIConfig extends App
 {
-	public $baseURL = 'http://example.com/';
-
-	public $uriProtocol = 'REQUEST_URI';
-
-	public $cookiePrefix   = '';
-	public $cookieDomain   = '';
-	public $cookiePath     = '/';
-	public $cookieSecure   = false;
-	public $cookieHTTPOnly = false;
-	public $cookieSameSite = 'Lax';
-
-	public $proxyIPs = '';
-
-	public $CSRFProtection  = false;
-	public $CSRFTokenName   = 'csrf_test_name';
-	public $CSRFCookieName  = 'csrf_cookie_name';
-	public $CSRFExpire      = 7200;
-	public $CSRFRegenerate  = true;
-	public $CSRFExcludeURIs = ['http://example.com'];
-	public $CSRFSameSite    = 'Lax';
-
-	public $CSPEnabled = false;
-
-	public $defaultLocale    = 'en';
-	public $negotiateLocale  = false;
-	public $supportedLocales = [
-		'en',
-		'es',
-	];
+    public $baseURL = 'http://example.com/';
+
+    public $uriProtocol = 'REQUEST_URI';
+
+    public $cookiePrefix   = '';
+    public $cookieDomain   = '';
+    public $cookiePath     = '/';
+    public $cookieSecure   = false;
+    public $cookieHTTPOnly = false;
+    public $cookieSameSite = 'Lax';
+
+    public $proxyIPs = '';
+
+    public $CSRFProtection  = false;
+    public $CSRFTokenName   = 'csrf_test_name';
+    public $CSRFCookieName  = 'csrf_cookie_name';
+    public $CSRFExpire      = 7200;
+    public $CSRFRegenerate  = true;
+    public $CSRFExcludeURIs = ['http://example.com'];
+    public $CSRFSameSite    = 'Lax';
+
+    public $CSPEnabled = false;
+
+    public $defaultLocale    = 'en';
+    public $negotiateLocale  = false;
+    public $supportedLocales = [
+        'en',
+        'es',
+    ];
 }
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index 4c3ccdff7fcf..5b7344fe13e5 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -22,39 +22,34 @@
  */
 class MockCURLRequest extends CURLRequest
 {
-	public $curl_options;
+    public $curl_options;
 
-	protected $output = '';
+    protected $output = '';
 
-	//--------------------------------------------------------------------
+    public function setOutput($output)
+    {
+        $this->output = $output;
 
-	public function setOutput($output)
-	{
-		$this->output = $output;
+        return $this;
+    }
 
-		return $this;
-	}
+    protected function sendRequest(array $curlOptions = []): string
+    {
+        // Save so we can access later.
+        $this->curl_options = $curlOptions;
 
-	//--------------------------------------------------------------------
+        return $this->output;
+    }
 
-	protected function sendRequest(array $curlOptions = []): string
-	{
-		// Save so we can access later.
-		$this->curl_options = $curlOptions;
+    // for testing purposes only
+    public function getBaseURI()
+    {
+        return $this->baseURI;
+    }
 
-		return $this->output;
-	}
-
-	//--------------------------------------------------------------------
-	// for testing purposes only
-	public function getBaseURI()
-	{
-		return $this->baseURI;
-	}
-
-	// for testing purposes only
-	public function getDelay()
-	{
-		return $this->delay;
-	}
+    // for testing purposes only
+    public function getDelay()
+    {
+        return $this->delay;
+    }
 }
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index f4fb1a972c5d..e6bc200fdd1f 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -1,289 +1,245 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
 
+use Closure;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Cache\Handlers\BaseHandler;
-use Closure;
 
 class MockCache extends BaseHandler implements CacheInterface
 {
-	/**
-	 * Mock cache storage.
-	 *
-	 * @var array
-	 */
-	protected $cache = [];
-
-	/**
-	 * Expiration times.
-	 *
-	 * @var ?int[]
-	 */
-	protected $expirations = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes care of any handler-specific setup that must be done.
-	 */
-	public function initialize()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Attempts to fetch an item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return mixed
-	 */
-	public function get(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		return array_key_exists($key, $this->cache)
-			? $this->cache[$key]
-			: null;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get an item from the cache, or execute the given Closure and store the result.
-	 *
-	 * @param string  $key      Cache item name
-	 * @param integer $ttl      Time to live
-	 * @param Closure $callback Callback return value
-	 *
-	 * @return mixed
-	 */
-	public function remember(string $key, int $ttl, Closure $callback)
-	{
-		$value = $this->get($key);
-
-		if (! is_null($value))
-		{
-			return $value;
-		}
-
-		$this->save($key, $value = $callback(), $ttl);
-
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Saves an item to the cache store.
-	 *
-	 * The $raw parameter is only utilized by Mamcache in order to
-	 * allow usage of increment() and decrement().
-	 *
-	 * @param string  $key   Cache item name
-	 * @param mixed   $value the data to save
-	 * @param integer $ttl   Time To Live, in seconds (default 60)
-	 * @param boolean $raw   Whether to store the raw value.
-	 *
-	 * @return boolean
-	 */
-	public function save(string $key, $value, int $ttl = 60, bool $raw = false)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		$this->cache[$key]       = $value;
-		$this->expirations[$key] = $ttl > 0 ? time() + $ttl : null;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes a specific item from the cache store.
-	 *
-	 * @param string $key Cache item name
-	 *
-	 * @return boolean
-	 */
-	public function delete(string $key)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		if (! isset($this->cache[$key]))
-		{
-			return false;
-		}
-
-		unset($this->cache[$key]);
-		unset($this->expirations[$key]);
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Deletes items from the cache store matching a given pattern.
-	 *
-	 * @param string $pattern Cache items glob-style pattern
-	 *
-	 * @return integer
-	 */
-	public function deleteMatching(string $pattern)
-	{
-		$count = 0;
-		foreach (array_keys($this->cache) as $key)
-		{
-			if (fnmatch($pattern, $key))
-			{
-				$count++;
-				unset($this->cache[$key]);
-				unset($this->expirations[$key]);
-			}
-		}
-
-		return $count;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic incrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function increment(string $key, int $offset = 1)
-	{
-		$key  = static::validateKey($key, $this->prefix);
-		$data = $this->cache[$key] ?: null;
-
-		if (empty($data))
-		{
-			$data = 0;
-		}
-		elseif (! is_int($data))
-		{
-			return false;
-		}
-
-		return $this->save($key, $data + $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Performs atomic decrementation of a raw stored value.
-	 *
-	 * @param string  $key    Cache ID
-	 * @param integer $offset Step/value to increase by
-	 *
-	 * @return boolean
-	 */
-	public function decrement(string $key, int $offset = 1)
-	{
-		$key = static::validateKey($key, $this->prefix);
-
-		$data = $this->cache[$key] ?: null;
-
-		if (empty($data))
-		{
-			$data = 0;
-		}
-		elseif (! is_int($data))
-		{
-			return false;
-		}
-
-		return $this->save($key, $data - $offset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Will delete all items in the entire cache.
-	 *
-	 * @return boolean
-	 */
-	public function clean()
-	{
-		$this->cache       = [];
-		$this->expirations = [];
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns information on the entire cache.
-	 *
-	 * The information returned and the structure of the data
-	 * varies depending on the handler.
-	 *
-	 * @return string[] Keys currently present in the store
-	 */
-	public function getCacheInfo()
-	{
-		return array_keys($this->cache);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns detailed information about the specific item in the cache.
-	 *
-	 * @param string $key Cache item name.
-	 *
-	 * @return array|null
-	 *   Returns null if the item does not exist, otherwise array<string, mixed>
-	 *   with at least the 'expire' key for absolute epoch expiry (or null).
-	 */
-	public function getMetaData(string $key)
-	{
-		// Misses return null
-		if (! array_key_exists($key, $this->expirations))
-		{
-			return null;
-		}
-
-		// Count expired items as a miss
-		if (is_int($this->expirations[$key]) && $this->expirations[$key] > time())
-		{
-			return null;
-		}
-
-		return [
-			'expire' => $this->expirations[$key],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Determines if the driver is supported on this system.
-	 *
-	 * @return boolean
-	 */
-	public function isSupported(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
+    /**
+     * Mock cache storage.
+     *
+     * @var array
+     */
+    protected $cache = [];
+
+    /**
+     * Expiration times.
+     *
+     * @var ?int[]
+     */
+    protected $expirations = [];
+
+    /**
+     * Takes care of any handler-specific setup that must be done.
+     */
+    public function initialize()
+    {
+    }
+
+    /**
+     * Attempts to fetch an item from the cache store.
+     *
+     * @param string $key Cache item name
+     *
+     * @return mixed
+     */
+    public function get(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        return $this->cache[$key] ?? null;
+    }
+
+    /**
+     * Get an item from the cache, or execute the given Closure and store the result.
+     *
+     * @param string  $key      Cache item name
+     * @param int     $ttl      Time to live
+     * @param Closure $callback Callback return value
+     *
+     * @return mixed
+     */
+    public function remember(string $key, int $ttl, Closure $callback)
+    {
+        $value = $this->get($key);
+
+        if ($value !== null) {
+            return $value;
+        }
+
+        $this->save($key, $value = $callback(), $ttl);
+
+        return $value;
+    }
+
+    /**
+     * Saves an item to the cache store.
+     *
+     * The $raw parameter is only utilized by Mamcache in order to
+     * allow usage of increment() and decrement().
+     *
+     * @param string $key   Cache item name
+     * @param mixed  $value the data to save
+     * @param int    $ttl   Time To Live, in seconds (default 60)
+     * @param bool   $raw   Whether to store the raw value.
+     *
+     * @return bool
+     */
+    public function save(string $key, $value, int $ttl = 60, bool $raw = false)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        $this->cache[$key]       = $value;
+        $this->expirations[$key] = $ttl > 0 ? time() + $ttl : null;
+
+        return true;
+    }
+
+    /**
+     * Deletes a specific item from the cache store.
+     *
+     * @param string $key Cache item name
+     *
+     * @return bool
+     */
+    public function delete(string $key)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        if (! isset($this->cache[$key])) {
+            return false;
+        }
+
+        unset($this->cache[$key], $this->expirations[$key]);
+
+        return true;
+    }
+
+    /**
+     * Deletes items from the cache store matching a given pattern.
+     *
+     * @param string $pattern Cache items glob-style pattern
+     *
+     * @return int
+     */
+    public function deleteMatching(string $pattern)
+    {
+        $count = 0;
+
+        foreach (array_keys($this->cache) as $key) {
+            if (fnmatch($pattern, $key)) {
+                $count++;
+                unset($this->cache[$key], $this->expirations[$key]);
+            }
+        }
+
+        return $count;
+    }
+
+    /**
+     * Performs atomic incrementation of a raw stored value.
+     *
+     * @param string $key    Cache ID
+     * @param int    $offset Step/value to increase by
+     *
+     * @return bool
+     */
+    public function increment(string $key, int $offset = 1)
+    {
+        $key  = static::validateKey($key, $this->prefix);
+        $data = $this->cache[$key] ?: null;
+
+        if (empty($data)) {
+            $data = 0;
+        } elseif (! is_int($data)) {
+            return false;
+        }
+
+        return $this->save($key, $data + $offset);
+    }
+
+    /**
+     * Performs atomic decrementation of a raw stored value.
+     *
+     * @param string $key    Cache ID
+     * @param int    $offset Step/value to increase by
+     *
+     * @return bool
+     */
+    public function decrement(string $key, int $offset = 1)
+    {
+        $key = static::validateKey($key, $this->prefix);
+
+        $data = $this->cache[$key] ?: null;
+
+        if (empty($data)) {
+            $data = 0;
+        } elseif (! is_int($data)) {
+            return false;
+        }
+
+        return $this->save($key, $data - $offset);
+    }
+
+    /**
+     * Will delete all items in the entire cache.
+     *
+     * @return bool
+     */
+    public function clean()
+    {
+        $this->cache       = [];
+        $this->expirations = [];
+
+        return true;
+    }
+
+    /**
+     * Returns information on the entire cache.
+     *
+     * The information returned and the structure of the data
+     * varies depending on the handler.
+     *
+     * @return string[] Keys currently present in the store
+     */
+    public function getCacheInfo()
+    {
+        return array_keys($this->cache);
+    }
+
+    /**
+     * Returns detailed information about the specific item in the cache.
+     *
+     * @param string $key Cache item name.
+     *
+     * @return array|null
+     *                    Returns null if the item does not exist, otherwise array<string, mixed>
+     *                    with at least the 'expire' key for absolute epoch expiry (or null).
+     */
+    public function getMetaData(string $key)
+    {
+        // Misses return null
+        if (! array_key_exists($key, $this->expirations)) {
+            return null;
+        }
+
+        // Count expired items as a miss
+        if (is_int($this->expirations[$key]) && $this->expirations[$key] > time()) {
+            return null;
+        }
+
+        return [
+            'expire' => $this->expirations[$key],
+        ];
+    }
+
+    /**
+     * Determines if the driver is supported on this system.
+     */
+    public function isSupported(): bool
+    {
+        return true;
+    }
 }
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index 3ada4c70d1e5..bf2f54afdee0 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,8 +15,8 @@
 
 class MockCodeIgniter extends CodeIgniter
 {
-	protected function callExit($code)
-	{
-		// Do not call exit() in testing.
-	}
+    protected function callExit($code)
+    {
+        // Do not call exit() in testing.
+    }
 }
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
index a66b2a404e7f..d8ba461312cf 100644
--- a/system/Test/Mock/MockCommon.php
+++ b/system/Test/Mock/MockCommon.php
@@ -1,35 +1,32 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-if (! function_exists('is_cli'))
-{
-	/**
-	 * Is CLI?
-	 *
-	 * Test to see if a request was made from the command line.
-	 * You can set the return value for testing.
-	 *
-	 * @param  boolean $newReturn return value to set
-	 * @return boolean
-	 */
-	function is_cli(bool $newReturn = null): bool
-	{
-		// PHPUnit always runs via CLI.
-		static $returnValue = true;
+if (! function_exists('is_cli')) {
+    /**
+     * Is CLI?
+     *
+     * Test to see if a request was made from the command line.
+     * You can set the return value for testing.
+     *
+     * @param bool $newReturn return value to set
+     */
+    function is_cli(?bool $newReturn = null): bool
+    {
+        // PHPUnit always runs via CLI.
+        static $returnValue = true;
 
-		if ($newReturn !== null)
-		{
-			$returnValue = $newReturn;
-		}
+        if ($newReturn !== null) {
+            $returnValue = $newReturn;
+        }
 
-		return $returnValue;
-	}
+        return $returnValue;
+    }
 }
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index 9cb660715b7f..099a8b735d20 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -18,300 +18,218 @@
 
 class MockConnection extends BaseConnection
 {
-	protected $returnValues = [];
-
-	public $database;
-
-	public $lastQuery;
-
-	//--------------------------------------------------------------------
-
-	public function shouldReturn(string $method, $return)
-	{
-		$this->returnValues[$method] = $return;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Orchestrates a query against the database. Queries must use
-	 * Database\Statement objects to store the query and build it.
-	 * This method works with the cache.
-	 *
-	 * Should automatically handle different connections for read/write
-	 * queries if needed.
-	 *
-	 * @param string  $sql
-	 * @param mixed   ...$binds
-	 * @param boolean $setEscapeFlags
-	 * @param string  $queryClass
-	 *
-	 * @return BaseResult|Query|boolean
-	 *
-	 * @todo BC set $queryClass default as null in 4.1
-	 */
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
-	{
-		$queryClass = str_replace('Connection', 'Query', static::class);
-
-		$query = new $queryClass($this);
-
-		$query->setQuery($sql, $binds, $setEscapeFlags);
-
-		if (! empty($this->swapPre) && ! empty($this->DBPrefix))
-		{
-			$query->swapPrefix($this->DBPrefix, $this->swapPre);
-		}
-
-		$startTime = microtime(true);
-
-		$this->lastQuery = $query;
-
-		// Run the query
-		if (false === ($this->resultID = $this->simpleQuery($query->getQuery())))
-		{
-			$query->setDuration($startTime, $startTime);
-
-			// @todo deal with errors
-
-			return false;
-		}
-
-		$query->setDuration($startTime);
-
-		// resultID is not false, so it must be successful
-		if ($query->isWriteType())
-		{
-			return true;
-		}
-
-		// query is not write-type, so it must be read-type query; return QueryResult
-		$resultClass = str_replace('Connection', 'Result', get_class($this));
-		return new $resultClass($this->connID, $this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param boolean $persistent
-	 *
-	 * @return mixed
-	 */
-	public function connect(bool $persistent = false)
-	{
-		$return = $this->returnValues['connect'] ?? true;
-
-		if (is_array($return))
-		{
-			// By removing the top item here, we can
-			// get a different value for, say, testing failover connections.
-			$return = array_shift($this->returnValues['connect']);
-		}
-
-		return $return;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return boolean
-	 */
-	public function reconnect(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return mixed
-	 */
-	public function setDatabase(string $databaseName)
-	{
-		$this->database = $databaseName;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		return CodeIgniter::CI_VERSION;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return mixed
-	 */
-	protected function execute(string $sql)
-	{
-		return $this->returnValues['execute'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return 1;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 *
-	 * Must return an array with keys 'code' and 'message':
-	 *
-	 *  return ['code' => null, 'message' => null);
-	 *
-	 * @return array
-	 */
-	public function error(): array
-	{
-		return [
-			'code'    => null,
-			'message' => null,
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer
-	 */
-	public function insertID(): int
-	{
-		return $this->connID->insert_id; // @phpstan-ignore-line
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $constrainByPrefix
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $constrainByPrefix = false): string
-	{
-		return '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		return '';
-	}
-
-	/**
-	 * @param  string $table
-	 * @return array
-	 */
-	protected function _fieldData(string $table): array
-	{
-		return [];
-	}
-
-	/**
-	 * @param  string $table
-	 * @return array
-	 */
-	protected function _indexData(string $table): array
-	{
-		return [];
-	}
-
-	/**
-	 * @param  string $table
-	 * @return array
-	 */
-	protected function _foreignKeyData(string $table): array
-	{
-		return [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the connection.
-	 */
-	protected function _close()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    protected $returnValues = [];
+
+    public $database;
+
+    public $lastQuery;
+
+    public function shouldReturn(string $method, $return)
+    {
+        $this->returnValues[$method] = $return;
+
+        return $this;
+    }
+
+    /**
+     * Orchestrates a query against the database. Queries must use
+     * Database\Statement objects to store the query and build it.
+     * This method works with the cache.
+     *
+     * Should automatically handle different connections for read/write
+     * queries if needed.
+     *
+     * @param mixed ...$binds
+     *
+     * @return BaseResult|bool|Query
+     *
+     * @todo BC set $queryClass default as null in 4.1
+     */
+    public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
+    {
+        $queryClass = str_replace('Connection', 'Query', static::class);
+
+        $query = new $queryClass($this);
+
+        $query->setQuery($sql, $binds, $setEscapeFlags);
+
+        if (! empty($this->swapPre) && ! empty($this->DBPrefix)) {
+            $query->swapPrefix($this->DBPrefix, $this->swapPre);
+        }
+
+        $startTime = microtime(true);
+
+        $this->lastQuery = $query;
+
+        // Run the query
+        if (false === ($this->resultID = $this->simpleQuery($query->getQuery()))) {
+            $query->setDuration($startTime, $startTime);
+
+            // @todo deal with errors
+
+            return false;
+        }
+
+        $query->setDuration($startTime);
+
+        // resultID is not false, so it must be successful
+        if ($query->isWriteType()) {
+            return true;
+        }
+
+        // query is not write-type, so it must be read-type query; return QueryResult
+        $resultClass = str_replace('Connection', 'Result', static::class);
+
+        return new $resultClass($this->connID, $this->resultID);
+    }
+
+    /**
+     * Connect to the database.
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        $return = $this->returnValues['connect'] ?? true;
+
+        if (is_array($return)) {
+            // By removing the top item here, we can
+            // get a different value for, say, testing failover connections.
+            $return = array_shift($this->returnValues['connect']);
+        }
+
+        return $return;
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     */
+    public function reconnect(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Select a specific database table to use.
+     *
+     * @return mixed
+     */
+    public function setDatabase(string $databaseName)
+    {
+        $this->database = $databaseName;
+
+        return $this;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        return CodeIgniter::CI_VERSION;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return mixed
+     */
+    protected function execute(string $sql)
+    {
+        return $this->returnValues['execute'];
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return 1;
+    }
+
+    /**
+     * Returns the last error code and message.
+     *
+     * Must return an array with keys 'code' and 'message':
+     *
+     *  return ['code' => null, 'message' => null);
+     */
+    public function error(): array
+    {
+        return [
+            'code'    => 0,
+            'message' => '',
+        ];
+    }
+
+    /**
+     * Insert ID
+     */
+    public function insertID(): int
+    {
+        return $this->connID->insert_id; // @phpstan-ignore-line
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     */
+    protected function _listTables(bool $constrainByPrefix = false): string
+    {
+        return '';
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        return '';
+    }
+
+    protected function _fieldData(string $table): array
+    {
+        return [];
+    }
+
+    protected function _indexData(string $table): array
+    {
+        return [];
+    }
+
+    protected function _foreignKeyData(string $table): array
+    {
+        return [];
+    }
+
+    /**
+     * Close the connection.
+     */
+    protected function _close()
+    {
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        return true;
+    }
 }
diff --git a/system/Test/Mock/MockEmail.php b/system/Test/Mock/MockEmail.php
index 5bc941812883..3683ee8885e6 100644
--- a/system/Test/Mock/MockEmail.php
+++ b/system/Test/Mock/MockEmail.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -16,27 +16,25 @@
 
 class MockEmail extends Email
 {
-	/**
-	 * Value to return from mocked send().
-	 *
-	 * @var boolean
-	 */
-	public $returnValue = true;
-
-	public function send($autoClear = true)
-	{
-		if ($this->returnValue)
-		{
-			$this->setArchiveValues();
-
-			if ($autoClear)
-			{
-				$this->clear();
-			}
-
-			Events::trigger('email', $this->archive);
-		}
-
-		return $this->returnValue;
-	}
+    /**
+     * Value to return from mocked send().
+     *
+     * @var bool
+     */
+    public $returnValue = true;
+
+    public function send($autoClear = true)
+    {
+        if ($this->returnValue) {
+            $this->setArchiveValues();
+
+            if ($autoClear) {
+                $this->clear();
+            }
+
+            Events::trigger('email', $this->archive);
+        }
+
+        return $this->returnValue;
+    }
 }
diff --git a/system/Test/Mock/MockEvents.php b/system/Test/Mock/MockEvents.php
index 0d36c611efe9..e4f556af81d5 100644
--- a/system/Test/Mock/MockEvents.php
+++ b/system/Test/Mock/MockEvents.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -18,23 +18,23 @@
  */
 class MockEvents extends Events
 {
-	public function getListeners()
-	{
-		return self::$listeners;
-	}
+    public function getListeners()
+    {
+        return self::$listeners;
+    }
 
-	public function getEventsFile()
-	{
-		return self::$files;
-	}
+    public function getEventsFile()
+    {
+        return self::$files;
+    }
 
-	public function getSimulate()
-	{
-		return self::$simulate;
-	}
+    public function getSimulate()
+    {
+        return self::$simulate;
+    }
 
-	public function unInitialize()
-	{
-		static::$initialized = false;
-	}
+    public function unInitialize()
+    {
+        static::$initialized = false;
+    }
 }
diff --git a/system/Test/Mock/MockFileLogger.php b/system/Test/Mock/MockFileLogger.php
index 1c007ec27d77..7422221b68f1 100644
--- a/system/Test/Mock/MockFileLogger.php
+++ b/system/Test/Mock/MockFileLogger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -20,17 +20,15 @@
  */
 class MockFileLogger extends FileHandler
 {
-	/**
-	 * Where would the log be written?
-	 */
-	public $destination;
+    /**
+     * Where would the log be written?
+     */
+    public $destination;
 
-	//--------------------------------------------------------------------
-
-	public function __construct(array $config)
-	{
-		parent::__construct($config);
-		$this->handles     = $config['handles'] ?? [];
-		$this->destination = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
-	}
+    public function __construct(array $config)
+    {
+        parent::__construct($config);
+        $this->handles     = $config['handles'] ?? [];
+        $this->destination = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
+    }
 }
diff --git a/system/Test/Mock/MockIncomingRequest.php b/system/Test/Mock/MockIncomingRequest.php
index 3791f2656796..05c9587d4170 100644
--- a/system/Test/Mock/MockIncomingRequest.php
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,13 +15,8 @@
 
 class MockIncomingRequest extends IncomingRequest
 {
-	//    public function populateHeaders()
-	//    {
-	//        // Don't do anything... force the tester to manually set the headers they want.
-	//    }
-
-	public function detectURI($protocol, $baseURL)
-	{
-		// Do nothing...
-	}
+    protected function detectURI($protocol, $baseURL)
+    {
+        // Do nothing...
+    }
 }
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index 10cbc9452c53..267114e2a824 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,56 +15,42 @@
 
 class MockLanguage extends Language
 {
-	/**
-	 * Stores the data that should be
-	 * returned by the 'requireFile()' method.
-	 *
-	 * @var mixed
-	 */
-	protected $data;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the data that should be returned by the
-	 * 'requireFile()' method to allow easy overrides
-	 * during testing.
-	 *
-	 * @param array       $data
-	 * @param string      $file
-	 * @param string|null $locale
-	 *
-	 * @return $this
-	 */
-	public function setData(string $file, array $data, string $locale = null)
-	{
-		$this->language[$locale ?? $this->locale][$file] = $data;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Provides an override that allows us to set custom
-	 * data to be returned easily during testing.
-	 *
-	 * @param string $path
-	 *
-	 * @return array
-	 */
-	protected function requireFile(string $path): array
-	{
-		return $this->data ?? [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Arbitrarily turnoff internationalization support for testing
-	 */
-	public function disableIntlSupport()
-	{
-		$this->intlSupport = false;
-	}
+    /**
+     * Stores the data that should be
+     * returned by the 'requireFile()' method.
+     *
+     * @var mixed
+     */
+    protected $data;
+
+    /**
+     * Sets the data that should be returned by the
+     * 'requireFile()' method to allow easy overrides
+     * during testing.
+     *
+     * @return $this
+     */
+    public function setData(string $file, array $data, ?string $locale = null)
+    {
+        $this->language[$locale ?? $this->locale][$file] = $data;
+
+        return $this;
+    }
+
+    /**
+     * Provides an override that allows us to set custom
+     * data to be returned easily during testing.
+     */
+    protected function requireFile(string $path): array
+    {
+        return $this->data ?? [];
+    }
+
+    /**
+     * Arbitrarily turnoff internationalization support for testing
+     */
+    public function disableIntlSupport()
+    {
+        $this->intlSupport = false;
+    }
 }
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index c32407b2ffd9..97c3e89dfb22 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -1,108 +1,101 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
 
 class MockLogger
 {
-	/*
-	  |--------------------------------------------------------------------------
-	  | Error Logging Threshold
-	  |--------------------------------------------------------------------------
-	  |
-	  | You can enable error logging by setting a threshold over zero. The
-	  | threshold determines what gets logged. Any values below or equal to the
-	  | threshold will be logged. Threshold options are:
-	  |
-	  |	0 = Disables logging, Error logging TURNED OFF
-	  |	1 = Emergency Messages  - System is unusable
-	  |	2 = Alert Messages      - Action Must Be Taken Immediately
-	  |   3 = Critical Messages   - Application component unavailable, unexpected exception.
-	  |   4 = Runtime Errors      - Don't need immediate action, but should be monitored.
-	  |   5 = Warnings            - Exceptional occurrences that are not errors.
-	  |   6 = Notices             - Normal but significant events.
-	  |   7 = Info                - Interesting events, like user logging in, etc.
-	  |   8 = Debug               - Detailed debug information.
-	  |   9 = All Messages
-	  |
-	  | You can also pass an array with threshold levels to show individual error types
-	  |
-	  | 	array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
-	  |
-	  | For a live site you'll usually enable Critical or higher (3) to be logged otherwise
-	  | your log files will fill up very fast.
-	  |
-	 */
+    /*
+      |--------------------------------------------------------------------------
+      | Error Logging Threshold
+      |--------------------------------------------------------------------------
+      |
+      | You can enable error logging by setting a threshold over zero. The
+      | threshold determines what gets logged. Any values below or equal to the
+      | threshold will be logged. Threshold options are:
+      |
+      |	0 = Disables logging, Error logging TURNED OFF
+      |	1 = Emergency Messages  - System is unusable
+      |	2 = Alert Messages      - Action Must Be Taken Immediately
+      |   3 = Critical Messages   - Application component unavailable, unexpected exception.
+      |   4 = Runtime Errors      - Don't need immediate action, but should be monitored.
+      |   5 = Warnings            - Exceptional occurrences that are not errors.
+      |   6 = Notices             - Normal but significant events.
+      |   7 = Info                - Interesting events, like user logging in, etc.
+      |   8 = Debug               - Detailed debug information.
+      |   9 = All Messages
+      |
+      | You can also pass an array with threshold levels to show individual error types
+      |
+      | 	array(1, 2, 3, 8) = Emergency, Alert, Critical, and Debug messages
+      |
+      | For a live site you'll usually enable Critical or higher (3) to be logged otherwise
+      | your log files will fill up very fast.
+      |
+     */
 
-	public $threshold = 9;
+    public $threshold = 9;
 
-	/*
-	  |--------------------------------------------------------------------------
-	  | Date Format for Logs
-	  |--------------------------------------------------------------------------
-	  |
-	  | Each item that is logged has an associated date. You can use PHP date
-	  | codes to set your own date formatting
-	  |
-	 */
-	public $dateFormat = 'Y-m-d';
+    /*
+      |--------------------------------------------------------------------------
+      | Date Format for Logs
+      |--------------------------------------------------------------------------
+      |
+      | Each item that is logged has an associated date. You can use PHP date
+      | codes to set your own date formatting
+      |
+     */
+    public $dateFormat = 'Y-m-d';
 
-	/*
-	  |--------------------------------------------------------------------------
-	  | Log Handlers
-	  |--------------------------------------------------------------------------
-	  |
-	  | The logging system supports multiple actions to be taken when something
-	  | is logged. This is done by allowing for multiple Handlers, special classes
-	  | designed to write the log to their chosen destinations, whether that is
-	  | a file on the getServer, a cloud-based service, or even taking actions such
-	  | as emailing the dev team.
-	  |
-	  | Each handler is defined by the class name used for that handler, and it
-	  | MUST implement the CodeIgniter\Log\Handlers\HandlerInterface interface.
-	  |
-	  | The value of each key is an array of configuration items that are sent
-	  | to the constructor of each handler. The only required configuration item
-	  | is the 'handles' element, which must be an array of integer log levels.
-	  | This is most easily handled by using the constants defined in the
-	  | Psr\Log\LogLevel class.
-	  |
-	  | Handlers are executed in the order defined in this array, starting with
-	  | the handler on top and continuing down.
-	  |
-	 */
-	public $handlers = [
-		//--------------------------------------------------------------------
-		// File Handler
-		//--------------------------------------------------------------------
+    /*
+      |--------------------------------------------------------------------------
+      | Log Handlers
+      |--------------------------------------------------------------------------
+      |
+      | The logging system supports multiple actions to be taken when something
+      | is logged. This is done by allowing for multiple Handlers, special classes
+      | designed to write the log to their chosen destinations, whether that is
+      | a file on the getServer, a cloud-based service, or even taking actions such
+      | as emailing the dev team.
+      |
+      | Each handler is defined by the class name used for that handler, and it
+      | MUST implement the CodeIgniter\Log\Handlers\HandlerInterface interface.
+      |
+      | The value of each key is an array of configuration items that are sent
+      | to the constructor of each handler. The only required configuration item
+      | is the 'handles' element, which must be an array of integer log levels.
+      | This is most easily handled by using the constants defined in the
+      | Psr\Log\LogLevel class.
+      |
+      | Handlers are executed in the order defined in this array, starting with
+      | the handler on top and continuing down.
+      |
+     */
+    public $handlers = [
+        // File Handler
+        'Tests\Support\Log\Handlers\TestHandler' => [
+            // The log levels that this handler will handle.
+            'handles' => [
+                'critical',
+                'alert',
+                'emergency',
+                'debug',
+                'error',
+                'info',
+                'notice',
+                'warning',
+            ],
 
-		'Tests\Support\Log\Handlers\TestHandler' => [
-			/*
-			 * The log levels that this handler will handle.
-			 */
-			'handles' => [
-				'critical',
-				'alert',
-				'emergency',
-				'debug',
-				'error',
-				'info',
-				'notice',
-				'warning',
-			],
-
-			/*
-			 * Logging Directory Path
-			 */
-			'path'    => '',
-		],
-	];
+            // Logging Directory Path
+            'path' => '',
+        ],
+    ];
 }
diff --git a/system/Test/Mock/MockQuery.php b/system/Test/Mock/MockQuery.php
index 7d6aff1efd63..c67c4763af58 100644
--- a/system/Test/Mock/MockQuery.php
+++ b/system/Test/Mock/MockQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockResourceController.php b/system/Test/Mock/MockResourceController.php
index 743ecb829d37..2d5871f414aa 100644
--- a/system/Test/Mock/MockResourceController.php
+++ b/system/Test/Mock/MockResourceController.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,18 +15,18 @@
 
 class MockResourceController extends ResourceController
 {
-	public function getModel()
-	{
-		return $this->model;
-	}
+    public function getModel()
+    {
+        return $this->model;
+    }
 
-	public function getModelName()
-	{
-		return $this->modelName;
-	}
+    public function getModelName()
+    {
+        return $this->modelName;
+    }
 
-	public function getFormat()
-	{
-		return $this->format;
-	}
+    public function getFormat()
+    {
+        return $this->format;
+    }
 }
diff --git a/system/Test/Mock/MockResourcePresenter.php b/system/Test/Mock/MockResourcePresenter.php
index 1a4779a7def7..26f013239163 100644
--- a/system/Test/Mock/MockResourcePresenter.php
+++ b/system/Test/Mock/MockResourcePresenter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -16,20 +16,20 @@
 
 class MockResourcePresenter extends ResourcePresenter
 {
-	use ResponseTrait;
+    use ResponseTrait;
 
-	public function getModel()
-	{
-		return $this->model;
-	}
+    public function getModel()
+    {
+        return $this->model;
+    }
 
-	public function getModelName()
-	{
-		return $this->modelName;
-	}
+    public function getModelName()
+    {
+        return $this->modelName;
+    }
 
-	public function getFormat()
-	{
-		return $this->format;
-	}
+    public function getFormat()
+    {
+        return $this->format;
+    }
 }
diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php
index f862fc6d94dd..533129216b41 100755
--- a/system/Test/Mock/MockResponse.php
+++ b/system/Test/Mock/MockResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -18,22 +18,22 @@
  */
 class MockResponse extends Response
 {
-	/**
-	 * If true, will not write output. Useful during testing.
-	 *
-	 * @var boolean
-	 */
-	protected $pretend = true;
+    /**
+     * If true, will not write output. Useful during testing.
+     *
+     * @var bool
+     */
+    protected $pretend = true;
 
-	// for testing
-	public function getPretend()
-	{
-		return $this->pretend;
-	}
+    // for testing
+    public function getPretend()
+    {
+        return $this->pretend;
+    }
 
-	// artificial error for testing
-	public function misbehave()
-	{
-		$this->statusCode = 0;
-	}
+    // artificial error for testing
+    public function misbehave()
+    {
+        $this->statusCode = 0;
+    }
 }
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index 3d2d0d39d1b5..0aaa340a95de 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -15,106 +15,82 @@
 
 class MockResult extends BaseResult
 {
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return 0;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		return [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		return [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return mixed
-	 */
-	public function freeResult()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek($n = 0)
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object
-	 */
-	protected function fetchObject($className = 'stdClass')
-	{
-		return new $className;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getNumRows(): int
-	{
-		return 0;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return 0;
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        return [];
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        return [];
+    }
+
+    /**
+     * Frees the current result.
+     *
+     * @return mixed
+     */
+    public function freeResult()
+    {
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @param int $n
+     *
+     * @return mixed
+     */
+    public function dataSeek($n = 0)
+    {
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @param string $className
+     *
+     * @return object
+     */
+    protected function fetchObject($className = 'stdClass')
+    {
+        return new $className();
+    }
+
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getNumRows(): int
+    {
+        return 0;
+    }
 }
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index 3570e5c380df..3f802a7d79f6 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -16,10 +16,10 @@
 
 class MockSecurity extends Security
 {
-	public function sendCookie(RequestInterface $request)
-	{
-		$_COOKIE['csrf_cookie_name'] = $this->hash;
+    protected function sendCookie(RequestInterface $request)
+    {
+        $_COOKIE['csrf_cookie_name'] = $this->hash;
 
-		return $this;
-	}
+        return $this;
+    }
 }
diff --git a/system/Test/Mock/MockSecurityConfig.php b/system/Test/Mock/MockSecurityConfig.php
index c9cd280d9b58..67e9e289dde7 100644
--- a/system/Test/Mock/MockSecurityConfig.php
+++ b/system/Test/Mock/MockSecurityConfig.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test\Mock;
 
 use Config\Security as Security;
@@ -11,12 +20,12 @@
  */
 class MockSecurityConfig extends Security
 {
-	public $tokenName   = 'csrf_test_name';
-	public $headerName  = 'X-CSRF-TOKEN';
-	public $cookieName  = 'csrf_cookie_name';
-	public $expires     = 7200;
-	public $regenerate  = true;
-	public $redirect    = false;
-	public $samesite    = 'Lax';
-	public $excludeURIs = ['http://example.com'];
+    public $tokenName   = 'csrf_test_name';
+    public $headerName  = 'X-CSRF-TOKEN';
+    public $cookieName  = 'csrf_cookie_name';
+    public $expires     = 7200;
+    public $regenerate  = true;
+    public $redirect    = false;
+    public $samesite    = 'Lax';
+    public $excludeURIs = ['http://example.com'];
 }
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
index 58fac0c1ad68..f02404a1b74e 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -1,38 +1,35 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
 
-use CodeIgniter\Config\BaseService;
 use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Config\BaseService;
 
 class MockServices extends BaseService
 {
-	public $psr4 = [
-		'Tests/Support' => TESTPATH . '_support/',
-	];
-
-	public $classmap = [];
-
-	//--------------------------------------------------------------------
-
-	public function __construct()
-	{
-		// Don't call the parent since we don't want the default mappings.
-		// parent::__construct();
-	}
-
-	//--------------------------------------------------------------------
-	public static function locator(bool $getShared = true)
-	{
-		return new FileLocator(static::autoloader());
-	}
+    public $psr4 = [
+        'Tests/Support' => TESTPATH . '_support/',
+    ];
+
+    public $classmap = [];
+
+    public function __construct()
+    {
+        // Don't call the parent since we don't want the default mappings.
+        // parent::__construct();
+    }
+
+    public static function locator(bool $getShared = true)
+    {
+        return new FileLocator(static::autoloader());
+    }
 }
diff --git a/system/Test/Mock/MockSession.php b/system/Test/Mock/MockSession.php
index 69b1bb06c6ea..f686f17eab39 100644
--- a/system/Test/Mock/MockSession.php
+++ b/system/Test/Mock/MockSession.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -22,49 +22,49 @@
  */
 class MockSession extends Session
 {
-	/**
-	 * Holds our "cookie" data.
-	 *
-	 * @var Cookie[]
-	 */
-	public $cookies = [];
+    /**
+     * Holds our "cookie" data.
+     *
+     * @var Cookie[]
+     */
+    public $cookies = [];
 
-	public $didRegenerate = false;
+    public $didRegenerate = false;
 
-	/**
-	 * Sets the driver as the session handler in PHP.
-	 * Extracted for easier testing.
-	 */
-	protected function setSaveHandler()
-	{
-		// session_set_save_handler($this->driver, true);
-	}
+    /**
+     * Sets the driver as the session handler in PHP.
+     * Extracted for easier testing.
+     */
+    protected function setSaveHandler()
+    {
+        // session_set_save_handler($this->driver, true);
+    }
 
-	/**
-	 * Starts the session.
-	 * Extracted for testing reasons.
-	 */
-	protected function startSession()
-	{
-		// session_start();
-		$this->setCookie();
-	}
+    /**
+     * Starts the session.
+     * Extracted for testing reasons.
+     */
+    protected function startSession()
+    {
+        // session_start();
+        $this->setCookie();
+    }
 
-	/**
-	 * Takes care of setting the cookie on the client side.
-	 * Extracted for testing reasons.
-	 */
-	protected function setCookie()
-	{
-		$expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
-		$this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
+    /**
+     * Takes care of setting the cookie on the client side.
+     * Extracted for testing reasons.
+     */
+    protected function setCookie()
+    {
+        $expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
+        $this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
 
-		$this->cookies[] = $this->cookie;
-	}
+        $this->cookies[] = $this->cookie;
+    }
 
-	public function regenerate(bool $destroy = false)
-	{
-		$this->didRegenerate              = true;
-		$_SESSION['__ci_last_regenerate'] = time();
-	}
+    public function regenerate(bool $destroy = false)
+    {
+        $this->didRegenerate              = true;
+        $_SESSION['__ci_last_regenerate'] = time();
+    }
 }
diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php
index 23a685d3f509..697e72b12a7d 100644
--- a/system/Test/Mock/MockTable.php
+++ b/system/Test/Mock/MockTable.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
@@ -16,14 +16,13 @@
 
 class MockTable extends Table
 {
-	// Override inaccessible protected method
-	public function __call($method, $params)
-	{
-		if (is_callable([$this, '_' . $method]))
-		{
-			return call_user_func_array([$this, '_' . $method], $params);
-		}
+    // Override inaccessible protected method
+    public function __call($method, $params)
+    {
+        if (is_callable([$this, '_' . $method])) {
+            return call_user_func_array([$this, '_' . $method], $params);
+        }
 
-		throw new BadMethodCallException('Method ' . $method . ' was not found');
-	}
+        throw new BadMethodCallException('Method ' . $method . ' was not found');
+    }
 }
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index 1f2617946228..4eb474ad0ecb 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -23,73 +23,76 @@
  */
 trait ReflectionHelper
 {
-	/**
-	 * Find a private method invoker.
-	 *
-	 * @param object|string $obj    object or class name
-	 * @param string        $method method name
-	 *
-	 * @return Closure
-	 * @throws ReflectionException
-	 */
-	public static function getPrivateMethodInvoker($obj, $method)
-	{
-		$refMethod = new ReflectionMethod($obj, $method);
-		$refMethod->setAccessible(true);
-		$obj = (gettype($obj) === 'object') ? $obj : null;
+    /**
+     * Find a private method invoker.
+     *
+     * @param object|string $obj    object or class name
+     * @param string        $method method name
+     *
+     * @throws ReflectionException
+     *
+     * @return Closure
+     */
+    public static function getPrivateMethodInvoker($obj, $method)
+    {
+        $refMethod = new ReflectionMethod($obj, $method);
+        $refMethod->setAccessible(true);
+        $obj = (gettype($obj) === 'object') ? $obj : null;
 
-		return function () use ($obj, $refMethod) {
-			$args = func_get_args();
-			return $refMethod->invokeArgs($obj, $args);
-		};
-	}
+        return static function (...$args) use ($obj, $refMethod) {
+            return $refMethod->invokeArgs($obj, $args);
+        };
+    }
 
-	/**
-	 * Find an accessible property.
-	 *
-	 * @param object|string $obj
-	 * @param string        $property
-	 *
-	 * @return ReflectionProperty
-	 * @throws ReflectionException
-	 */
-	private static function getAccessibleRefProperty($obj, $property)
-	{
-		$refClass = is_object($obj) ? new ReflectionObject($obj) : new ReflectionClass($obj);
+    /**
+     * Find an accessible property.
+     *
+     * @param object|string $obj
+     * @param string        $property
+     *
+     * @throws ReflectionException
+     *
+     * @return ReflectionProperty
+     */
+    private static function getAccessibleRefProperty($obj, $property)
+    {
+        $refClass = is_object($obj) ? new ReflectionObject($obj) : new ReflectionClass($obj);
 
-		$refProperty = $refClass->getProperty($property);
-		$refProperty->setAccessible(true);
+        $refProperty = $refClass->getProperty($property);
+        $refProperty->setAccessible(true);
 
-		return $refProperty;
-	}
+        return $refProperty;
+    }
 
-	/**
-	 * Set a private property.
-	 *
-	 * @param object|string $obj      object or class name
-	 * @param string        $property property name
-	 * @param mixed         $value    value
-	 *
-	 * @throws ReflectionException
-	 */
-	public static function setPrivateProperty($obj, $property, $value)
-	{
-		$refProperty = self::getAccessibleRefProperty($obj, $property);
-		$refProperty->setValue($obj, $value);
-	}
+    /**
+     * Set a private property.
+     *
+     * @param object|string $obj      object or class name
+     * @param string        $property property name
+     * @param mixed         $value    value
+     *
+     * @throws ReflectionException
+     */
+    public static function setPrivateProperty($obj, $property, $value)
+    {
+        $refProperty = self::getAccessibleRefProperty($obj, $property);
+        $refProperty->setValue($obj, $value);
+    }
 
-	/**
-	 * Retrieve a private property.
-	 *
-	 * @param object|string $obj      object or class name
-	 * @param string        $property property name
-	 *
-	 * @return mixed value
-	 * @throws ReflectionException
-	 */
-	public static function getPrivateProperty($obj, $property)
-	{
-		$refProperty = self::getAccessibleRefProperty($obj, $property);
-		return is_string($obj) ? $refProperty->getValue() : $refProperty->getValue($obj);
-	}
+    /**
+     * Retrieve a private property.
+     *
+     * @param object|string $obj      object or class name
+     * @param string        $property property name
+     *
+     * @throws ReflectionException
+     *
+     * @return mixed value
+     */
+    public static function getPrivateProperty($obj, $property)
+    {
+        $refProperty = self::getAccessibleRefProperty($obj, $property);
+
+        return is_string($obj) ? $refProperty->getValue() : $refProperty->getValue($obj);
+    }
 }
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index 396b6032b022..22d9f811cfc2 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -15,77 +15,64 @@
 
 class TestLogger extends Logger
 {
-	protected static $op_logs = [];
+    protected static $op_logs = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * The log method is overridden so that we can store log history during
+     * the tests to allow us to check ->assertLogged() methods.
+     *
+     * @param string $level
+     * @param string $message
+     */
+    public function log($level, $message, array $context = []): bool
+    {
+        // While this requires duplicate work, we want to ensure
+        // we have the final message to test against.
+        $logMessage = $this->interpolate($message, $context);
 
-	/**
-	 * The log method is overridden so that we can store log history during
-	 * the tests to allow us to check ->assertLogged() methods.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 * @param array  $context
-	 *
-	 * @return boolean
-	 */
-	public function log($level, $message, array $context = []): bool
-	{
-		// While this requires duplicate work, we want to ensure
-		// we have the final message to test against.
-		$logMessage = $this->interpolate($message, $context);
+        // Determine the file and line by finding the first
+        // backtrace that is not part of our logging system.
+        $trace = debug_backtrace();
+        $file  = null;
 
-		// Determine the file and line by finding the first
-		// backtrace that is not part of our logging system.
-		$trace = debug_backtrace();
-		$file  = null;
+        foreach ($trace as $row) {
+            if (! in_array($row['function'], ['log', 'log_message'], true)) {
+                $file = basename($row['file'] ?? '');
+                break;
+            }
+        }
 
-		foreach ($trace as $row)
-		{
-			if (! in_array($row['function'], ['log', 'log_message'], true))
-			{
-				$file = basename($row['file'] ?? '');
-				break;
-			}
-		}
+        self::$op_logs[] = [
+            'level'   => $level,
+            'message' => $logMessage,
+            'file'    => $file,
+        ];
 
-		self::$op_logs[] = [
-				  'level'   => $level,
-				  'message' => $logMessage,
-				  'file'    => $file,
-			  ];
+        // Let the parent do it's thing.
+        return parent::log($level, $message, $context);
+    }
 
-		// Let the parent do it's thing.
-		return parent::log($level, $message, $context);
-	}
+    /**
+     * Used by CIUnitTestCase class to provide ->assertLogged() methods.
+     *
+     * @param string $message
+     *
+     * @return bool
+     */
+    public static function didLog(string $level, $message)
+    {
+        foreach (self::$op_logs as $log) {
+            if (strtolower($log['level']) === strtolower($level) && $message === $log['message']) {
+                return true;
+            }
+        }
 
-	//--------------------------------------------------------------------
+        return false;
+    }
 
-	/**
-	 * Used by CIUnitTestCase class to provide ->assertLogged() methods.
-	 *
-	 * @param string $level
-	 * @param string $message
-	 *
-	 * @return boolean
-	 */
-	public static function didLog(string $level, $message)
-	{
-		foreach (self::$op_logs as $log)
-		{
-			if (strtolower($log['level']) === strtolower($level) && $message === $log['message'])
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-	// Expose cleanFileNames()
-	public function cleanup($file)
-	{
-		return $this->cleanFileNames($file);
-	}
+    // Expose cleanFileNames()
+    public function cleanup($file)
+    {
+        return $this->cleanFileNames($file);
+    }
 }
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index a1bacdaacd2c..d91f00080b14 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -16,6 +16,7 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Exception;
+use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -23,533 +24,473 @@
  *
  * Consolidated response processing
  * for test results.
+ *
+ * @no-final
+ *
+ * @internal
  */
 class TestResponse extends TestCase
 {
-	/**
-	 * The request.
-	 *
-	 * @var RequestInterface|null
-	 */
-	protected $request;
-
-	/**
-	 * The response.
-	 *
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	/**
-	 * DOM for the body.
-	 *
-	 * @var DOMParser
-	 */
-	protected $domParser;
-
-	/**
-	 * Stores or the Response and parses the body in the DOM.
-	 *
-	 * @param ResponseInterface $response
-	 */
-	public function __construct(ResponseInterface $response)
-	{
-		$this->setResponse($response);
-	}
-
-	//--------------------------------------------------------------------
-	// Getters / Setters
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the request.
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return $this
-	 */
-	public function setRequest(RequestInterface $request)
-	{
-		$this->request = $request;
-
-		return $this;
-	}
-
-	/**
-	 * Sets the Response and updates the DOM.
-	 *
-	 * @param ResponseInterface $response
-	 *
-	 * @return $this
-	 */
-	public function setResponse(ResponseInterface $response)
-	{
-		$this->response  = $response;
-		$this->domParser = new DOMParser();
-
-		$body = $response->getBody();
-		if (is_string($body) && $body !== '')
-		{
-			$this->domParser->withString($body);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Request accessor.
-	 *
-	 * @return RequestInterface|null
-	 */
-	public function request()
-	{
-		return $this->request;
-	}
-
-	/**
-	 * Response accessor.
-	 *
-	 * @return ResponseInterface
-	 */
-	public function response()
-	{
-		return $this->response;
-	}
-
-	//--------------------------------------------------------------------
-	// Status Checks
-	//--------------------------------------------------------------------
-
-	/**
-	 * Boils down the possible responses into a boolean valid/not-valid
-	 * response type.
-	 *
-	 * @return boolean
-	 */
-	public function isOK(): bool
-	{
-		$status = $this->response->getStatusCode();
-
-		// Only 200 and 300 range status codes
-		// are considered valid.
-		if ($status >= 400 || $status < 200)
-		{
-			return false;
-		}
-		// Empty bodies are not considered valid, unless in redirects
-		return ! ($status < 300 && empty($this->response->getBody()));
-	}
-
-	/**
-	 * Asserts that the status is a specific value.
-	 *
-	 * @param integer $code
-	 *
-	 * @throws Exception
-	 */
-	public function assertStatus(int $code)
-	{
-		$this->assertEquals($code, $this->response->getStatusCode());
-	}
-
-	/**
-	 * Asserts that the Response is considered OK.
-	 *
-	 * @throws Exception
-	 */
-	public function assertOK()
-	{
-		$this->assertTrue($this->isOK(), "{$this->response->getStatusCode()} is not a successful status code, or the Response has an empty body.");
-	}
-
-	/**
-	 * Asserts that the Response is considered OK.
-	 *
-	 * @throws Exception
-	 */
-	public function assertNotOK()
-	{
-		$this->assertFalse($this->isOK(), "{$this->response->getStatusCode()} is an unexpected successful status code, or the Response has body content.");
-	}
-
-	//--------------------------------------------------------------------
-	// Redirection
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns whether or not the Response was a redirect or RedirectResponse
-	 *
-	 * @return boolean
-	 */
-	public function isRedirect(): bool
-	{
-		return $this->response instanceof RedirectResponse
-			|| $this->response->hasHeader('Location')
-			|| $this->response->hasHeader('Refresh');
-	}
-
-	/**
-	 * Assert that the given response was a redirect.
-	 *
-	 * @throws Exception
-	 */
-	public function assertRedirect()
-	{
-		$this->assertTrue($this->isRedirect(), 'Response is not a redirect or RedirectResponse.');
-	}
-
-	/**
-	 * Assert that a given response was a redirect
-	 * and it was redirect to a specific URI.
-	 *
-	 * @param string $uri
-	 *
-	 * @throws Exception
-	 */
-	public function assertRedirectTo(string $uri)
-	{
-		$this->assertRedirect();
-
-		$uri         = trim(strtolower($uri));
-		$redirectUri = strtolower($this->getRedirectUrl());
-
-		$matches = $uri === $redirectUri
-				   || strtolower(site_url($uri)) === $redirectUri
-				   || $uri === site_url($redirectUri);
-
-		$this->assertTrue($matches, "Redirect URL `{$uri}` does not match `{$redirectUri}`");
-	}
-
-	/*
-	 * Assert that the given response was not a redirect.
-	 *
-	 * @throws Exception
-	 */
-	public function assertNotRedirect()
-	{
-		$this->assertFalse($this->isRedirect(), 'Response is an unexpected redirect or RedirectResponse.');
-	}
-
-	/**
-	 * Returns the URL set for redirection.
-	 *
-	 * @return string|null
-	 */
-	public function getRedirectUrl(): ?string
-	{
-		if (! $this->isRedirect())
-		{
-			return null;
-		}
-
-		if ($this->response->hasHeader('Location'))
-		{
-			return $this->response->getHeaderLine('Location');
-		}
-
-		if ($this->response->hasHeader('Refresh'))
-		{
-			return str_replace('0;url=', '', $this->response->getHeaderLine('Refresh'));
-		}
-
-		return null;
-	}
-
-	//--------------------------------------------------------------------
-	// Session
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asserts that an SESSION key has been set and, optionally, test it's value.
-	 *
-	 * @param string $key
-	 * @param mixed  $value
-	 *
-	 * @throws Exception
-	 */
-	public function assertSessionHas(string $key, $value = null)
-	{
-		$this->assertTrue(array_key_exists($key, $_SESSION), "'{$key}' is not in the current \$_SESSION");
-
-		if (is_null($value))
-		{
-			return;
-		}
-
-		if (is_scalar($value))
-		{
-			$this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
-		}
-		else
-		{
-			$this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' does not match expected value.");
-		}
-	}
-
-	/**
-	 * Asserts the session is missing $key.
-	 *
-	 * @param string $key
-	 *
-	 * @throws Exception
-	 */
-	public function assertSessionMissing(string $key)
-	{
-		$this->assertFalse(array_key_exists($key, $_SESSION), "'{$key}' should not be present in \$_SESSION.");
-	}
-
-	//--------------------------------------------------------------------
-	// Headers
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asserts that the Response contains a specific header.
-	 *
-	 * @param string      $key
-	 * @param string|null $value
-	 *
-	 * @throws Exception
-	 */
-	public function assertHeader(string $key, $value = null)
-	{
-		$this->assertTrue($this->response->hasHeader($key), "'{$key}' is not a valid Response header.");
-
-		if ($value !== null)
-		{
-			$this->assertEquals($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
-		}
-	}
-
-	/**
-	 * Asserts the Response headers does not contain the specified header.
-	 *
-	 * @param string $key
-	 *
-	 * @throws Exception
-	 */
-	public function assertHeaderMissing(string $key)
-	{
-		$this->assertFalse($this->response->hasHeader($key), "'{$key}' should not be in the Response headers.");
-	}
-
-	//--------------------------------------------------------------------
-	// Cookies
-	//--------------------------------------------------------------------
-
-	/**
-	 * Asserts that the response has the specified cookie.
-	 *
-	 * @param string      $key
-	 * @param string|null $value
-	 * @param string      $prefix
-	 *
-	 * @throws Exception
-	 */
-	public function assertCookie(string $key, $value = null, string $prefix = '')
-	{
-		$this->assertTrue($this->response->hasCookie($key, $value, $prefix), "No cookie found named '{$key}'.");
-	}
-
-	/**
-	 * Assert the Response does not have the specified cookie set.
-	 *
-	 * @param string $key
-	 */
-	public function assertCookieMissing(string $key)
-	{
-		$this->assertFalse($this->response->hasCookie($key), "Cookie named '{$key}' should not be set.");
-	}
-
-	/**
-	 * Asserts that a cookie exists and has an expired time.
-	 *
-	 * @param string $key
-	 * @param string $prefix
-	 *
-	 * @throws Exception
-	 */
-	public function assertCookieExpired(string $key, string $prefix = '')
-	{
-		$this->assertTrue($this->response->hasCookie($key, null, $prefix));
-		$this->assertGreaterThan(time(), $this->response->getCookie($key, $prefix)->getExpiresTimestamp());
-	}
-
-	//--------------------------------------------------------------------
-	// JSON
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the response's body as JSON
-	 *
-	 * @return mixed|false
-	 */
-	public function getJSON()
-	{
-		$response = $this->response->getJSON();
-
-		if (is_null($response))
-		{
-			return false;
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Test that the response contains a matching JSON fragment.
-	 *
-	 * @param array   $fragment
-	 * @param boolean $strict
-	 *
-	 * @throws Exception
-	 */
-	public function assertJSONFragment(array $fragment, bool $strict = false)
-	{
-		$json = json_decode($this->getJSON(), true);
-		$this->assertIsArray($json, 'Response does not have valid json');
-		$patched = array_replace_recursive($json, $fragment);
-
-		if ($strict)
-		{
-			$this->assertSame($json, $patched, 'Response does not contain a matching JSON fragment.');
-		}
-		else
-		{
-			$this->assertEquals($json, $patched, 'Response does not contain a matching JSON fragment.');
-		}
-	}
-
-	/**
-	 * Asserts that the JSON exactly matches the passed in data.
-	 * If the value being passed in is a string, it must be a json_encoded string.
-	 *
-	 * @param string|array $test
-	 *
-	 * @throws Exception
-	 */
-	public function assertJSONExact($test)
-	{
-		$json = $this->getJSON();
-
-		if (is_object($test))
-		{
-			$test = method_exists($test, 'toArray') ? $test->toArray() : (array) $test;
-		}
-
-		if (is_array($test))
-		{
-			$test = Services::format()->getFormatter('application/json')->format($test);
-		}
-
-		$this->assertJsonStringEqualsJsonString($test, $json, 'Response does not contain matching JSON.');
-	}
-
-	//--------------------------------------------------------------------
-	// XML Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the response' body as XML
-	 *
-	 * @return mixed|string
-	 */
-	public function getXML()
-	{
-		return $this->response->getXML();
-	}
-
-	//--------------------------------------------------------------------
-	// DomParser
-	//--------------------------------------------------------------------
-
-	/**
-	 * Assert that the desired text can be found in the result body.
-	 *
-	 * @param string|null $search
-	 * @param string|null $element
-	 *
-	 * @throws Exception
-	 */
-	public function assertSee(string $search = null, string $element = null)
-	{
-		$this->assertTrue($this->domParser->see($search, $element), "Do not see '{$search}' in response.");
-	}
-
-	/**
-	 * Asserts that we do not see the specified text.
-	 *
-	 * @param string|null $search
-	 * @param string|null $element
-	 *
-	 * @throws Exception
-	 */
-	public function assertDontSee(string $search = null, string $element = null)
-	{
-		$this->assertTrue($this->domParser->dontSee($search, $element), "I should not see '{$search}' in response.");
-	}
-
-	/**
-	 * Assert that we see an element selected via a CSS selector.
-	 *
-	 * @param string $search
-	 *
-	 * @throws Exception
-	 */
-	public function assertSeeElement(string $search)
-	{
-		$this->assertTrue($this->domParser->seeElement($search), "Do not see element with selector '{$search} in response.'");
-	}
-
-	/**
-	 * Assert that we do not see an element selected via a CSS selector.
-	 *
-	 * @param string $search
-	 *
-	 * @throws Exception
-	 */
-	public function assertDontSeeElement(string $search)
-	{
-		$this->assertTrue($this->domParser->dontSeeElement($search), "I should not see an element with selector '{$search}' in response.'");
-	}
-
-	/**
-	 * Assert that we see a link with the matching text and/or class.
-	 *
-	 * @param string      $text
-	 * @param string|null $details
-	 *
-	 * @throws Exception
-	 */
-	public function assertSeeLink(string $text, string $details = null)
-	{
-		$this->assertTrue($this->domParser->seeLink($text, $details), "Do no see anchor tag with the text {$text} in response.");
-	}
-
-	/**
-	 * Assert that we see an input with name/value.
-	 *
-	 * @param string      $field
-	 * @param string|null $value
-	 *
-	 * @throws Exception
-	 */
-	public function assertSeeInField(string $field, string $value = null)
-	{
-		$this->assertTrue($this->domParser->seeInField($field, $value), "Do no see input named {$field} with value {$value} in response.");
-	}
-
-	/**
-	 * Forward any unrecognized method calls to our DOMParser instance.
-	 *
-	 * @param  string $function Method name
-	 * @param  mixed  $params   Any method parameters
-	 * @return mixed
-	 */
-	public function __call($function, $params)
-	{
-		if (method_exists($this->domParser, $function))
-		{
-			return $this->domParser->{$function}(...$params);
-		}
-	}
+    /**
+     * The request.
+     *
+     * @var RequestInterface|null
+     */
+    protected $request;
+
+    /**
+     * The response.
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * DOM for the body.
+     *
+     * @var DOMParser
+     */
+    protected $domParser;
+
+    /**
+     * Stores or the Response and parses the body in the DOM.
+     */
+    public function __construct(ResponseInterface $response)
+    {
+        $this->setResponse($response);
+    }
+
+    //--------------------------------------------------------------------
+    // Getters / Setters
+    //--------------------------------------------------------------------
+
+    /**
+     * Sets the request.
+     *
+     * @return $this
+     */
+    public function setRequest(RequestInterface $request)
+    {
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * Sets the Response and updates the DOM.
+     *
+     * @return $this
+     */
+    public function setResponse(ResponseInterface $response)
+    {
+        $this->response  = $response;
+        $this->domParser = new DOMParser();
+
+        $body = $response->getBody();
+        if (is_string($body) && $body !== '') {
+            $this->domParser->withString($body);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Request accessor.
+     *
+     * @return RequestInterface|null
+     */
+    public function request()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Response accessor.
+     *
+     * @return ResponseInterface
+     */
+    public function response()
+    {
+        return $this->response;
+    }
+
+    //--------------------------------------------------------------------
+    // Status Checks
+    //--------------------------------------------------------------------
+
+    /**
+     * Boils down the possible responses into a boolean valid/not-valid
+     * response type.
+     */
+    public function isOK(): bool
+    {
+        $status = $this->response->getStatusCode();
+
+        // Only 200 and 300 range status codes
+        // are considered valid.
+        if ($status >= 400 || $status < 200) {
+            return false;
+        }
+        // Empty bodies are not considered valid, unless in redirects
+        return ! ($status < 300 && empty($this->response->getBody()));
+    }
+
+    /**
+     * Asserts that the status is a specific value.
+     *
+     * @throws Exception
+     */
+    public function assertStatus(int $code)
+    {
+        $this->assertSame($code, $this->response->getStatusCode());
+    }
+
+    /**
+     * Asserts that the Response is considered OK.
+     *
+     * @throws Exception
+     */
+    public function assertOK()
+    {
+        $this->assertTrue($this->isOK(), "{$this->response->getStatusCode()} is not a successful status code, or the Response has an empty body.");
+    }
+
+    /**
+     * Asserts that the Response is considered OK.
+     *
+     * @throws Exception
+     */
+    public function assertNotOK()
+    {
+        $this->assertFalse($this->isOK(), "{$this->response->getStatusCode()} is an unexpected successful status code, or the Response has body content.");
+    }
+
+    //--------------------------------------------------------------------
+    // Redirection
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns whether or not the Response was a redirect or RedirectResponse
+     */
+    public function isRedirect(): bool
+    {
+        return $this->response instanceof RedirectResponse
+            || $this->response->hasHeader('Location')
+            || $this->response->hasHeader('Refresh');
+    }
+
+    /**
+     * Assert that the given response was a redirect.
+     *
+     * @throws Exception
+     */
+    public function assertRedirect()
+    {
+        $this->assertTrue($this->isRedirect(), 'Response is not a redirect or RedirectResponse.');
+    }
+
+    /**
+     * Assert that a given response was a redirect
+     * and it was redirect to a specific URI.
+     *
+     * @throws Exception
+     */
+    public function assertRedirectTo(string $uri)
+    {
+        $this->assertRedirect();
+
+        $uri         = trim(strtolower($uri));
+        $redirectUri = strtolower($this->getRedirectUrl());
+
+        $matches = $uri === $redirectUri
+                   || strtolower(site_url($uri)) === $redirectUri
+                   || $uri === site_url($redirectUri);
+
+        $this->assertTrue($matches, "Redirect URL `{$uri}` does not match `{$redirectUri}`");
+    }
+
+    /**
+     * Assert that the given response was not a redirect.
+     *
+     * @throws Exception
+     */
+    public function assertNotRedirect()
+    {
+        $this->assertFalse($this->isRedirect(), 'Response is an unexpected redirect or RedirectResponse.');
+    }
+
+    /**
+     * Returns the URL set for redirection.
+     */
+    public function getRedirectUrl(): ?string
+    {
+        if (! $this->isRedirect()) {
+            return null;
+        }
+
+        if ($this->response->hasHeader('Location')) {
+            return $this->response->getHeaderLine('Location');
+        }
+
+        if ($this->response->hasHeader('Refresh')) {
+            return str_replace('0;url=', '', $this->response->getHeaderLine('Refresh'));
+        }
+
+        return null;
+    }
+
+    //--------------------------------------------------------------------
+    // Session
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that an SESSION key has been set and, optionally, test it's value.
+     *
+     * @param mixed $value
+     *
+     * @throws Exception
+     */
+    public function assertSessionHas(string $key, $value = null)
+    {
+        $this->assertArrayHasKey($key, $_SESSION, "'{$key}' is not in the current \$_SESSION");
+
+        if ($value === null) {
+            return;
+        }
+
+        if (is_scalar($value)) {
+            $this->assertSame($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
+        } else {
+            $this->assertSame($value, $_SESSION[$key], "The value of '{$key}' does not match expected value.");
+        }
+    }
+
+    /**
+     * Asserts the session is missing $key.
+     *
+     * @throws Exception
+     */
+    public function assertSessionMissing(string $key)
+    {
+        $this->assertArrayNotHasKey($key, $_SESSION, "'{$key}' should not be present in \$_SESSION.");
+    }
+
+    //--------------------------------------------------------------------
+    // Headers
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that the Response contains a specific header.
+     *
+     * @param string|null $value
+     *
+     * @throws Exception
+     */
+    public function assertHeader(string $key, $value = null)
+    {
+        $this->assertTrue($this->response->hasHeader($key), "'{$key}' is not a valid Response header.");
+
+        if ($value !== null) {
+            $this->assertSame($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
+        }
+    }
+
+    /**
+     * Asserts the Response headers does not contain the specified header.
+     *
+     * @throws Exception
+     */
+    public function assertHeaderMissing(string $key)
+    {
+        $this->assertFalse($this->response->hasHeader($key), "'{$key}' should not be in the Response headers.");
+    }
+
+    //--------------------------------------------------------------------
+    // Cookies
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that the response has the specified cookie.
+     *
+     * @param string|null $value
+     *
+     * @throws Exception
+     */
+    public function assertCookie(string $key, $value = null, string $prefix = '')
+    {
+        $this->assertTrue($this->response->hasCookie($key, $value, $prefix), "No cookie found named '{$key}'.");
+    }
+
+    /**
+     * Assert the Response does not have the specified cookie set.
+     */
+    public function assertCookieMissing(string $key)
+    {
+        $this->assertFalse($this->response->hasCookie($key), "Cookie named '{$key}' should not be set.");
+    }
+
+    /**
+     * Asserts that a cookie exists and has an expired time.
+     *
+     * @throws Exception
+     */
+    public function assertCookieExpired(string $key, string $prefix = '')
+    {
+        $this->assertTrue($this->response->hasCookie($key, null, $prefix));
+        $this->assertGreaterThan(time(), $this->response->getCookie($key, $prefix)->getExpiresTimestamp());
+    }
+
+    //--------------------------------------------------------------------
+    // JSON
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the response's body as JSON
+     *
+     * @return false|mixed
+     */
+    public function getJSON()
+    {
+        $response = $this->response->getJSON();
+
+        if ($response === null) {
+            return false;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Test that the response contains a matching JSON fragment.
+     *
+     * @throws Exception
+     */
+    public function assertJSONFragment(array $fragment, bool $strict = false)
+    {
+        $json = json_decode($this->getJSON(), true);
+        $this->assertIsArray($json, 'Response does not have valid json');
+        $patched = array_replace_recursive($json, $fragment);
+
+        if ($strict) {
+            $this->assertSame($json, $patched, 'Response does not contain a matching JSON fragment.');
+        } else {
+            $this->assertThat($patched, new IsEqual($json), 'Response does not contain a matching JSON fragment.');
+        }
+    }
+
+    /**
+     * Asserts that the JSON exactly matches the passed in data.
+     * If the value being passed in is a string, it must be a json_encoded string.
+     *
+     * @param array|string $test
+     *
+     * @throws Exception
+     */
+    public function assertJSONExact($test)
+    {
+        $json = $this->getJSON();
+
+        if (is_object($test)) {
+            $test = method_exists($test, 'toArray') ? $test->toArray() : (array) $test;
+        }
+
+        if (is_array($test)) {
+            $test = Services::format()->getFormatter('application/json')->format($test);
+        }
+
+        $this->assertJsonStringEqualsJsonString($test, $json, 'Response does not contain matching JSON.');
+    }
+
+    //--------------------------------------------------------------------
+    // XML Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the response' body as XML
+     *
+     * @return mixed|string
+     */
+    public function getXML()
+    {
+        return $this->response->getXML();
+    }
+
+    //--------------------------------------------------------------------
+    // DomParser
+    //--------------------------------------------------------------------
+
+    /**
+     * Assert that the desired text can be found in the result body.
+     *
+     * @throws Exception
+     */
+    public function assertSee(?string $search = null, ?string $element = null)
+    {
+        $this->assertTrue($this->domParser->see($search, $element), "Do not see '{$search}' in response.");
+    }
+
+    /**
+     * Asserts that we do not see the specified text.
+     *
+     * @throws Exception
+     */
+    public function assertDontSee(?string $search = null, ?string $element = null)
+    {
+        $this->assertTrue($this->domParser->dontSee($search, $element), "I should not see '{$search}' in response.");
+    }
+
+    /**
+     * Assert that we see an element selected via a CSS selector.
+     *
+     * @throws Exception
+     */
+    public function assertSeeElement(string $search)
+    {
+        $this->assertTrue($this->domParser->seeElement($search), "Do not see element with selector '{$search} in response.'");
+    }
+
+    /**
+     * Assert that we do not see an element selected via a CSS selector.
+     *
+     * @throws Exception
+     */
+    public function assertDontSeeElement(string $search)
+    {
+        $this->assertTrue($this->domParser->dontSeeElement($search), "I should not see an element with selector '{$search}' in response.'");
+    }
+
+    /**
+     * Assert that we see a link with the matching text and/or class.
+     *
+     * @throws Exception
+     */
+    public function assertSeeLink(string $text, ?string $details = null)
+    {
+        $this->assertTrue($this->domParser->seeLink($text, $details), "Do no see anchor tag with the text {$text} in response.");
+    }
+
+    /**
+     * Assert that we see an input with name/value.
+     *
+     * @throws Exception
+     */
+    public function assertSeeInField(string $field, ?string $value = null)
+    {
+        $this->assertTrue($this->domParser->seeInField($field, $value), "Do no see input named {$field} with value {$value} in response.");
+    }
+
+    /**
+     * Forward any unrecognized method calls to our DOMParser instance.
+     *
+     * @param string $function Method name
+     * @param mixed  $params   Any method parameters
+     *
+     * @return mixed
+     */
+    public function __call($function, $params)
+    {
+        if (method_exists($this->domParser, $function)) {
+            return $this->domParser->{$function}(...$params);
+        }
+    }
 }
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 9625506bc22f..f6ddb2ad68d1 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Config\DotEnv;
@@ -28,10 +28,10 @@
 // Often these constants are pre-defined, but query the current directory structure as a fallback
 defined('HOMEPATH') || define('HOMEPATH', realpath(rtrim(getcwd(), '\\/ ')) . DIRECTORY_SEPARATOR);
 $source = is_dir(HOMEPATH . 'app')
-	? HOMEPATH
-	: (is_dir('vendor/codeigniter4/framework/')
-		? 'vendor/codeigniter4/framework/'
-		: 'vendor/codeigniter4/codeigniter4/');
+    ? HOMEPATH
+    : (is_dir('vendor/codeigniter4/framework/')
+        ? 'vendor/codeigniter4/framework/'
+        : 'vendor/codeigniter4/codeigniter4/');
 defined('CONFIGPATH') || define('CONFIGPATH', realpath($source . 'app/Config') . DIRECTORY_SEPARATOR);
 defined('PUBLICPATH') || define('PUBLICPATH', realpath($source . 'public') . DIRECTORY_SEPARATOR);
 unset($source);
@@ -53,17 +53,15 @@
 defined('VENDORPATH')    || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR);
 
 // Load Common.php from App then System
-if (file_exists(APPPATH . 'Common.php'))
-{
-	require_once APPPATH . 'Common.php';
+if (file_exists(APPPATH . 'Common.php')) {
+    require_once APPPATH . 'Common.php';
 }
 
 require_once SYSTEMPATH . 'Common.php';
 
 // Set environment values that would otherwise stop the framework from functioning during tests.
-if (! isset($_SERVER['app.baseURL']))
-{
-	$_SERVER['app.baseURL'] = 'http://example.com/';
+if (! isset($_SERVER['app.baseURL'])) {
+    $_SERVER['app.baseURL'] = 'http://example.com/';
 }
 
 // Load necessary components
@@ -79,28 +77,25 @@
 require_once APPPATH . 'Config/Services.php';
 
 // Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false))
-{
-	class_alias('Config\Services', 'CodeIgniter\Services');
+if (! class_exists('CodeIgniter\Services', false)) {
+    class_alias('Config\Services', 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
 // Now load Composer's if it's available
-if (is_file(COMPOSER_PATH))
-{
-	/*
-	 * The path to the vendor directory.
-	 *
-	 * We do not want to enforce this, so set the constant if Composer was used.
-	 */
-	if (! defined('VENDORPATH'))
-	{
-		define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
-	}
-
-	require_once COMPOSER_PATH;
+if (is_file(COMPOSER_PATH)) {
+    /*
+     * The path to the vendor directory.
+     *
+     * We do not want to enforce this, so set the constant if Composer was used.
+     */
+    if (! defined('VENDORPATH')) {
+        define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
+    }
+
+    require_once COMPOSER_PATH;
 }
 
 // Load environment settings from .env files into $_SERVER and $_ENV
diff --git a/system/ThirdParty/Escaper/Escaper.php b/system/ThirdParty/Escaper/Escaper.php
index 9f903a5931a5..ca0f1a9dd21c 100644
--- a/system/ThirdParty/Escaper/Escaper.php
+++ b/system/ThirdParty/Escaper/Escaper.php
@@ -1,13 +1,30 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper;
 
+use function bin2hex;
+use function ctype_digit;
+use function function_exists;
+use function hexdec;
+use function htmlspecialchars;
+use function iconv;
+use function in_array;
+use function mb_convert_encoding;
+use function ord;
+use function preg_match;
+use function preg_replace_callback;
+use function rawurlencode;
+use function sprintf;
+use function strlen;
+use function strtolower;
+use function strtoupper;
+use function substr;
+
+use const ENT_QUOTES;
+use const ENT_SUBSTITUTE;
+
 /**
  * Context specific methods for use in secure output escaping
  */
@@ -24,10 +41,10 @@ class Escaper
      * @var array
      */
     protected static $htmlNamedEntityMap = [
-        34 => 'quot',         // quotation mark
-        38 => 'amp',          // ampersand
-        60 => 'lt',           // less-than sign
-        62 => 'gt',           // greater-than sign
+        34 => 'quot', // quotation mark
+        38 => 'amp', // ampersand
+        60 => 'lt', // less-than sign
+        62 => 'gt', // greater-than sign
     ];
 
     /**
@@ -73,42 +90,61 @@ class Escaper
      * @var array
      */
     protected $supportedEncodings = [
-        'iso-8859-1',   'iso8859-1',    'iso-8859-5',   'iso8859-5',
-        'iso-8859-15',  'iso8859-15',   'utf-8',        'cp866',
-        'ibm866',       '866',          'cp1251',       'windows-1251',
-        'win-1251',     '1251',         'cp1252',       'windows-1252',
-        '1252',         'koi8-r',       'koi8-ru',      'koi8r',
-        'big5',         '950',          'gb2312',       '936',
-        'big5-hkscs',   'shift_jis',    'sjis',         'sjis-win',
-        'cp932',        '932',          'euc-jp',       'eucjp',
-        'eucjp-win',    'macroman'
+        'iso-8859-1',
+        'iso8859-1',
+        'iso-8859-5',
+        'iso8859-5',
+        'iso-8859-15',
+        'iso8859-15',
+        'utf-8',
+        'cp866',
+        'ibm866',
+        '866',
+        'cp1251',
+        'windows-1251',
+        'win-1251',
+        '1251',
+        'cp1252',
+        'windows-1252',
+        '1252',
+        'koi8-r',
+        'koi8-ru',
+        'koi8r',
+        'big5',
+        '950',
+        'gb2312',
+        '936',
+        'big5-hkscs',
+        'shift_jis',
+        'sjis',
+        'sjis-win',
+        'cp932',
+        '932',
+        'euc-jp',
+        'eucjp',
+        'eucjp-win',
+        'macroman',
     ];
 
     /**
      * Constructor: Single parameter allows setting of global encoding for use by
      * the current object.
      *
-     * @param string $encoding
      * @throws Exception\InvalidArgumentException
      */
-    public function __construct($encoding = null)
+    public function __construct(?string $encoding = null)
     {
         if ($encoding !== null) {
-            if (! is_string($encoding)) {
-                throw new Exception\InvalidArgumentException(
-                    get_class($this) . ' constructor parameter must be a string, received ' . gettype($encoding)
-                );
-            }
             if ($encoding === '') {
                 throw new Exception\InvalidArgumentException(
-                    get_class($this) . ' constructor parameter does not allow a blank value'
+                    static::class . ' constructor parameter does not allow a blank value'
                 );
             }
 
             $encoding = strtolower($encoding);
             if (! in_array($encoding, $this->supportedEncodings)) {
                 throw new Exception\InvalidArgumentException(
-                    'Value of \'' . $encoding . '\' passed to ' . get_class($this)
+                    'Value of \'' . $encoding . '\' passed to ' . static::class
                     . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
                 );
             }
@@ -139,10 +175,9 @@ public function getEncoding()
      * Escape a string for the HTML Body context where there are very few characters
      * of special meaning. Internally this will use htmlspecialchars().
      *
-     * @param string $string
      * @return string
      */
-    public function escapeHtml($string)
+    public function escapeHtml(string $string)
     {
         return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
     }
@@ -152,10 +187,9 @@ public function escapeHtml($string)
      * to escape that are not covered by htmlspecialchars() to cover cases where an attribute
      * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE).
      *
-     * @param string $string
      * @return string
      */
-    public function escapeHtmlAttr($string)
+    public function escapeHtmlAttr(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -175,10 +209,9 @@ public function escapeHtmlAttr($string)
      * Backslash escaping is not used as it still leaves the escaped character as-is and so
      * is not useful in a HTML context.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeJs($string)
+    public function escapeJs(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -194,10 +227,9 @@ public function escapeJs($string)
      * an entire URI - only a subcomponent being inserted. The function is a simple proxy
      * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeUrl($string)
+    public function escapeUrl(string $string)
     {
         return rawurlencode($string);
     }
@@ -206,10 +238,9 @@ public function escapeUrl($string)
      * Escape a string for the CSS context. CSS escaping can be applied to any string being
      * inserted into CSS and escapes everything except alphanumerics.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeCss($string)
+    public function escapeCss(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -236,7 +267,8 @@ protected function htmlAttrMatcher($matches)
          * The following replaces characters undefined in HTML with the
          * hex entity for the Unicode replacement character.
          */
-        if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r")
+        if (
+            ($ord <= 0x1f && $chr !== "\t" && $chr !== "\n" && $chr !== "\r")
             || ($ord >= 0x7f && $ord <= 0x9f)
         ) {
             return '&#xFFFD;';
@@ -276,7 +308,7 @@ protected function htmlAttrMatcher($matches)
     protected function jsMatcher($matches)
     {
         $chr = $matches[0];
-        if (strlen($chr) == 1) {
+        if (strlen($chr) === 1) {
             return sprintf('\\x%02X', ord($chr));
         }
         $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
@@ -285,7 +317,7 @@ protected function jsMatcher($matches)
             return sprintf('\\u%04s', $hex);
         }
         $highSurrogate = substr($hex, 0, 4);
-        $lowSurrogate = substr($hex, 4, 4);
+        $lowSurrogate  = substr($hex, 4, 4);
         return sprintf('\\u%04s\\u%04s', $highSurrogate, $lowSurrogate);
     }
 
@@ -299,7 +331,7 @@ protected function jsMatcher($matches)
     protected function cssMatcher($matches)
     {
         $chr = $matches[0];
-        if (strlen($chr) == 1) {
+        if (strlen($chr) === 1) {
             $ord = ord($chr);
         } else {
             $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
@@ -310,7 +342,6 @@ protected function cssMatcher($matches)
 
     /**
      * Converts a string to UTF-8 from the base encoding. The base encoding is set via this
-     * class' constructor.
      *
      * @param string $string
      * @throws Exception\RuntimeException
@@ -335,7 +366,7 @@ protected function toUtf8($string)
 
     /**
      * Converts a string from UTF-8 to the base encoding. The base encoding is set via this
-     * class' constructor.
+     *
      * @param string $string
      * @return string
      */
@@ -356,7 +387,7 @@ protected function fromUtf8($string)
      */
     protected function isUtf8($string)
     {
-        return ($string === '' || preg_match('/^./su', $string));
+        return $string === '' || preg_match('/^./su', $string);
     }
 
     /**
@@ -377,7 +408,7 @@ protected function convertEncoding($string, $to, $from)
             $result = mb_convert_encoding($string, $to, $from);
         } else {
             throw new Exception\RuntimeException(
-                get_class($this)
+                static::class
                 . ' requires either the iconv or mbstring extension to be installed'
                 . ' when escaping for non UTF-8 strings.'
             );
diff --git a/system/ThirdParty/Escaper/Exception/ExceptionInterface.php b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
index 7ebe04ef6b36..87edfd2aa582 100644
--- a/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
+++ b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 
diff --git a/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
index f5bf1fa5c01e..48e646dcefad 100644
--- a/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
+++ b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 
diff --git a/system/ThirdParty/Escaper/Exception/RuntimeException.php b/system/ThirdParty/Escaper/Exception/RuntimeException.php
index ab1903fd2bb1..5004c4c47523 100644
--- a/system/ThirdParty/Escaper/Exception/RuntimeException.php
+++ b/system/ThirdParty/Escaper/Exception/RuntimeException.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 0b69db4ca7b6..0bdf8a95522d 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
@@ -27,169 +27,146 @@
  */
 class Throttler implements ThrottlerInterface
 {
-	/**
-	 * Container for throttle counters.
-	 *
-	 * @var CacheInterface
-	 */
-	protected $cache;
-
-	/**
-	 * The number of seconds until the next token is available.
-	 *
-	 * @var integer
-	 */
-	protected $tokenTime = 0;
-
-	/**
-	 * The prefix applied to all keys to
-	 * minimize potential conflicts.
-	 *
-	 * @var string
-	 */
-	protected $prefix = 'throttler_';
-
-	/**
-	 * Timestamp to use (during testing)
-	 *
-	 * @var integer
-	 */
-	protected $testTime;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param CacheInterface $cache
-	 */
-	public function __construct(CacheInterface $cache)
-	{
-		$this->cache = $cache;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of seconds until the next available token will
-	 * be released for usage.
-	 *
-	 * @return integer
-	 */
-	public function getTokenTime(): int
-	{
-		return $this->tokenTime;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Restricts the number of requests made by a single IP address within
-	 * a set number of seconds.
-	 *
-	 * Example:
-	 *
-	 *  if (! $throttler->check($request->ipAddress(), 60, MINUTE))
-	 * {
-	 *      die('You submitted over 60 requests within a minute.');
-	 * }
-	 *
-	 * @param string  $key      The name to use as the "bucket" name.
-	 * @param integer $capacity The number of requests the "bucket" can hold
-	 * @param integer $seconds  The time it takes the "bucket" to completely refill
-	 * @param integer $cost     The number of tokens this action uses.
-	 *
-	 * @return   boolean
-	 * @internal param int $maxRequests
-	 */
-	public function check(string $key, int $capacity, int $seconds, int $cost = 1): bool
-	{
-		$tokenName = $this->prefix . $key;
-
-		// Check to see if the bucket has even been created yet.
-		if (($tokens = $this->cache->get($tokenName)) === null)
-		{
-			// If it hasn't been created, then we'll set it to the maximum
-			// capacity - 1, and save it to the cache.
-			$this->cache->save($tokenName, $capacity - $cost, $seconds);
-			$this->cache->save($tokenName . 'Time', time(), $seconds);
-
-			return true;
-		}
-
-		// If $tokens > 0, then we need to replenish the bucket
-		// based on how long it's been since the last update.
-		$throttleTime = $this->cache->get($tokenName . 'Time');
-		$elapsed      = $this->time() - $throttleTime;
-
-		// Number of tokens to add back per second
-		$rate = $capacity / $seconds;
-
-		// How many seconds till a new token is available.
-		// We must have a minimum wait of 1 second for a new token.
-		// Primarily stored to allow devs to report back to users.
-		$newTokenAvailable = (1 / $rate) - $elapsed;
-		$this->tokenTime   = max(1, $newTokenAvailable);
-
-		// Add tokens based up on number per second that
-		// should be refilled, then checked against capacity
-		// to be sure the bucket didn't overflow.
-		$tokens += $rate * $elapsed;
-		$tokens  = $tokens > $capacity ? $capacity : $tokens;
-
-		// If $tokens >= 1, then we are safe to perform the action, but
-		// we need to decrement the number of available tokens.
-		if ($tokens >= 1)
-		{
-			$this->cache->save($tokenName, $tokens - $cost, $seconds);
-			$this->cache->save($tokenName . 'Time', time(), $seconds);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @param string $key The name of the bucket
-	 *
-	 * @return $this
-	 */
-	public function remove(string $key): self
-	{
-		$tokenName = $this->prefix . $key;
-
-		$this->cache->delete($tokenName);
-		$this->cache->delete($tokenName . 'Time');
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Used during testing to set the current timestamp to use.
-	 *
-	 * @param integer $time
-	 *
-	 * @return $this
-	 */
-	public function setTestTime(int $time)
-	{
-		$this->testTime = $time;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Return the test time, defaulting to current.
-	 *
-	 * @return integer
-	 */
-	public function time(): int
-	{
-		return $this->testTime ?? time();
-	}
+    /**
+     * Container for throttle counters.
+     *
+     * @var CacheInterface
+     */
+    protected $cache;
+
+    /**
+     * The number of seconds until the next token is available.
+     *
+     * @var int
+     */
+    protected $tokenTime = 0;
+
+    /**
+     * The prefix applied to all keys to
+     * minimize potential conflicts.
+     *
+     * @var string
+     */
+    protected $prefix = 'throttler_';
+
+    /**
+     * Timestamp to use (during testing)
+     *
+     * @var int
+     */
+    protected $testTime;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(CacheInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Returns the number of seconds until the next available token will
+     * be released for usage.
+     */
+    public function getTokenTime(): int
+    {
+        return $this->tokenTime;
+    }
+
+    /**
+     * Restricts the number of requests made by a single IP address within
+     * a set number of seconds.
+     *
+     * Example:
+     *
+     *  if (! $throttler->check($request->ipAddress(), 60, MINUTE))
+     * {
+     *      die('You submitted over 60 requests within a minute.');
+     * }
+     *
+     * @param string $key      The name to use as the "bucket" name.
+     * @param int    $capacity The number of requests the "bucket" can hold
+     * @param int    $seconds  The time it takes the "bucket" to completely refill
+     * @param int    $cost     The number of tokens this action uses.
+     *
+     * @internal param int $maxRequests
+     */
+    public function check(string $key, int $capacity, int $seconds, int $cost = 1): bool
+    {
+        $tokenName = $this->prefix . $key;
+
+        // Check to see if the bucket has even been created yet.
+        if (($tokens = $this->cache->get($tokenName)) === null) {
+            // If it hasn't been created, then we'll set it to the maximum
+            // capacity - 1, and save it to the cache.
+            $this->cache->save($tokenName, $capacity - $cost, $seconds);
+            $this->cache->save($tokenName . 'Time', time(), $seconds);
+
+            return true;
+        }
+
+        // If $tokens > 0, then we need to replenish the bucket
+        // based on how long it's been since the last update.
+        $throttleTime = $this->cache->get($tokenName . 'Time');
+        $elapsed      = $this->time() - $throttleTime;
+
+        // Number of tokens to add back per second
+        $rate = $capacity / $seconds;
+
+        // How many seconds till a new token is available.
+        // We must have a minimum wait of 1 second for a new token.
+        // Primarily stored to allow devs to report back to users.
+        $newTokenAvailable = (1 / $rate) - $elapsed;
+        $this->tokenTime   = max(1, $newTokenAvailable);
+
+        // Add tokens based up on number per second that
+        // should be refilled, then checked against capacity
+        // to be sure the bucket didn't overflow.
+        $tokens += $rate * $elapsed;
+        $tokens = $tokens > $capacity ? $capacity : $tokens;
+
+        // If $tokens >= 1, then we are safe to perform the action, but
+        // we need to decrement the number of available tokens.
+        if ($tokens >= 1) {
+            $this->cache->save($tokenName, $tokens - $cost, $seconds);
+            $this->cache->save($tokenName . 'Time', time(), $seconds);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $key The name of the bucket
+     */
+    public function remove(string $key): self
+    {
+        $tokenName = $this->prefix . $key;
+
+        $this->cache->delete($tokenName);
+        $this->cache->delete($tokenName . 'Time');
+
+        return $this;
+    }
+
+    /**
+     * Used during testing to set the current timestamp to use.
+     *
+     * @return $this
+     */
+    public function setTestTime(int $time)
+    {
+        $this->testTime = $time;
+
+        return $this;
+    }
+
+    /**
+     * Return the test time, defaulting to current.
+     */
+    public function time(): int
+    {
+        return $this->testTime ?? time();
+    }
 }
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
index ac57dc307eda..2fffcb7a4e78 100644
--- a/system/Throttle/ThrottlerInterface.php
+++ b/system/Throttle/ThrottlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
@@ -16,33 +16,29 @@
  */
 interface ThrottlerInterface
 {
-	/**
-	 * Restricts the number of requests made by a single key within
-	 * a set number of seconds.
-	 *
-	 * Example:
-	 *
-	 *  if (! $throttler->checkIPAddress($request->ipAddress(), 60, MINUTE))
-	 * {
-	 *      die('You submitted over 60 requests within a minute.');
-	 * }
-	 *
-	 * @param string  $key      The name to use as the "bucket" name.
-	 * @param integer $capacity The number of requests the "bucket" can hold
-	 * @param integer $seconds  The time it takes the "bucket" to completely refill
-	 * @param integer $cost     The number of tokens this action uses.
-	 *
-	 * @return boolean
-	 */
-	public function check(string $key, int $capacity, int $seconds, int $cost);
+    /**
+     * Restricts the number of requests made by a single key within
+     * a set number of seconds.
+     *
+     * Example:
+     *
+     *  if (! $throttler->checkIPAddress($request->ipAddress(), 60, MINUTE))
+     * {
+     *      die('You submitted over 60 requests within a minute.');
+     * }
+     *
+     * @param string $key      The name to use as the "bucket" name.
+     * @param int    $capacity The number of requests the "bucket" can hold
+     * @param int    $seconds  The time it takes the "bucket" to completely refill
+     * @param int    $cost     The number of tokens this action uses.
+     *
+     * @return bool
+     */
+    public function check(string $key, int $capacity, int $seconds, int $cost);
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the number of seconds until the next available token will
-	 * be released for usage.
-	 *
-	 * @return integer
-	 */
-	public function getTokenTime(): int;
+    /**
+     * Returns the number of seconds until the next available token will
+     * be released for usage.
+     */
+    public function getTokenTime(): int;
 }
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 038c295efeb2..a5ecebd69ddc 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Typography;
@@ -16,362 +16,320 @@
  */
 class Typography
 {
-	/**
-	 * Block level elements that should not be wrapped inside <p> tags
-	 *
-	 * @var string
-	 */
-	public $blockElements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
-
-	/**
-	 * Elements that should not have <p> and <br /> tags within them.
-	 *
-	 * @var string
-	 */
-	public $skipElements = 'p|pre|ol|ul|dl|object|table|h\d';
-
-	/**
-	 * Tags we want the parser to completely ignore when splitting the string.
-	 *
-	 * @var string
-	 */
-	public $inlineElements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
-
-	/**
-	 * array of block level elements that require inner content to be within another block level element
-	 *
-	 * @var array
-	 */
-	public $innerBlockRequired = ['blockquote'];
-
-	/**
-	 * the last block element parsed
-	 *
-	 * @var string
-	 */
-	public $lastBlockElement = '';
-
-	/**
-	 * whether or not to protect quotes within { curly braces }
-	 *
-	 * @var boolean
-	 */
-	public $protectBracedQuotes = false;
-
-	/**
-	 * Auto Typography
-	 *
-	 * This function converts text, making it typographically correct:
-	 *     - Converts double spaces into paragraphs.
-	 *     - Converts single line breaks into <br /> tags
-	 *     - Converts single and double quotes into correctly facing curly quote entities.
-	 *     - Converts three dots into ellipsis.
-	 *     - Converts double dashes into em-dashes.
-	 *  - Converts two spaces into entities
-	 *
-	 * @param string  $str
-	 * @param boolean $reduceLinebreaks whether to reduce more then two consecutive newlines to two
-	 *
-	 * @return string
-	 */
-	public function autoTypography(string $str, bool $reduceLinebreaks = false): string
-	{
-		if ($str === '')
-		{
-			return '';
-		}
-
-		// Standardize Newlines to make matching easier
-		if (strpos($str, "\r") !== false)
-		{
-			$str = str_replace(["\r\n", "\r"], "\n", $str);
-		}
-
-		// Reduce line breaks.  If there are more than two consecutive linebreaks
-		// we'll compress them down to a maximum of two since there's no benefit to more.
-		if ($reduceLinebreaks === false)
-		{
-			$str = preg_replace("/\n\n+/", "\n\n", $str);
-		}
-
-		// HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed
-		$htmlComments = [];
-		if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches))
-		{
-			for ($i = 0, $total = count($matches[0]); $i < $total; $i ++)
-			{
-				$htmlComments[] = $matches[0][$i];
-				$str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
-			}
-		}
-
-		// match and yank <pre> tags if they exist.  It's cheaper to do this separately since most content will
-		// not contain <pre> tags, and it keeps the PCRE patterns below simpler and faster
-		if (strpos($str, '<pre') !== false)
-		{
-			$str = preg_replace_callback('#<pre.*?>.*?</pre>#si', [$this, 'protectCharacters'], $str);
-		}
-
-		// Convert quotes within tags to temporary markers.
-		$str = preg_replace_callback('#<.+?>#si', [$this, 'protectCharacters'], $str);
-
-		// Do the same with braces if necessary
-		if ($this->protectBracedQuotes === false)
-		{
-			$str = preg_replace_callback('#\{.+?\}#si', [$this, 'protectCharacters'], $str);
-		}
-
-		// Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag
-		// it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be
-		// adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
-		$str = preg_replace('#<(/*)(' . $this->inlineElements . ')([ >])#i', '{@TAG}\\1\\2\\3', $str);
-
-		/* Split the string at every tag. This expression creates an array with this prototype:
-		 *
-		 * 	[array]
-		 * 	{
-		 * 		[0] = <opening tag>
-		 * 		[1] = Content...
-		 * 		[2] = <closing tag>
-		 * 		Etc...
-		 * 	}
-		 */
-		$chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-
-		// Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
-		$str     = '';
-		$process = true;
-
-		for ($i = 0, $c = count($chunks) - 1; $i <= $c; $i ++)
-		{
-			// Are we dealing with a tag? If so, we'll skip the processing for this cycle.
-			// Well also set the "process" flag which allows us to skip <pre> tags and a few other things.
-			if (preg_match('#<(/*)(' . $this->blockElements . ').*?>#', $chunks[$i], $match))
-			{
-				if (preg_match('#' . $this->skipElements . '#', $match[2]))
-				{
-					$process = ($match[1] === '/');
-				}
-
-				if ($match[1] === '')
-				{
-					$this->lastBlockElement = $match[2];
-				}
-
-				$str .= $chunks[$i];
-				continue;
-			}
-
-			if ($process === false)
-			{
-				$str .= $chunks[$i];
-				continue;
-			}
-
-			//  Force a newline to make sure end tags get processed by _format_newlines()
-			if ($i === $c)
-			{
-				$chunks[$i] .= "\n";
-			}
-
-			//  Convert Newlines into <p> and <br /> tags
-			$str .= $this->formatNewLines($chunks[$i]);
-		}
-
-		// No opening block level tag? Add it if needed.
-		if (! preg_match('/^\s*<(?:' . $this->blockElements . ')/i', $str))
-		{
-			$str = preg_replace('/^(.*?)<(' . $this->blockElements . ')/i', '<p>$1</p><$2', $str);
-		}
-
-		// Convert quotes, elipsis, em-dashes, non-breaking spaces, and ampersands
-		$str = $this->formatCharacters($str);
-
-		foreach ($htmlComments as $i => $htmlComment)
-		{
-			// remove surrounding paragraph tags, but only if there's an opening paragraph tag
-			// otherwise HTML comments at the ends of paragraphs will have the closing tag removed
-			// if '<p>{@HC1}' then replace <p>{@HC1}</p> with the comment, else replace only {@HC1} with the comment
-			$str = preg_replace('#(?(?=<p>\{@HC' . $i . '\})<p>\{@HC' . $i . '\}(\s*</p>)|\{@HC' . $i . '\})#s', $htmlComment, $str);
-		}
-
-		// Final clean up
-		$table = [
-			// If the user submitted their own paragraph tags within the text
-			// we will retain them instead of using our tags.
-			'/(<p[^>*?]>)<p>/'                              => '$1', // <?php BBEdit syntax coloring bug fix
-			// Reduce multiple instances of opening/closing paragraph tags to a single one
-			'#(</p>)+#'                                     => '</p>',
-			'/(<p>\W*<p>)+/'                                => '<p>',
-			// Clean up stray paragraph tags that appear before block level elements
-			'#<p></p><(' . $this->blockElements . ')#'      => '<$1',
-			// Clean up stray non-breaking spaces preceeding block elements
-			'#(&nbsp;\s*)+<(' . $this->blockElements . ')#' => '  <$2',
-			// Replace the temporary markers we added earlier
-			'/\{@TAG\}/'                                    => '<',
-			'/\{@DQ\}/'                                     => '"',
-			'/\{@SQ\}/'                                     => "'",
-			'/\{@DD\}/'                                     => '--',
-			'/\{@NBS\}/'                                    => '  ',
-			// An unintended consequence of the _format_newlines function is that
-			// some of the newlines get truncated, resulting in <p> tags
-			// starting immediately after <block> tags on the same line.
-			// This forces a newline after such occurrences, which looks much nicer.
-			"/><p>\n/"                                      => ">\n<p>",
-			// Similarly, there might be cases where a closing </block> will follow
-			// a closing </p> tag, so we'll correct it by adding a newline in between
-			'#</p></#'                                      => "</p>\n</",
-		];
-
-		// Do we need to reduce empty lines?
-		if ($reduceLinebreaks === true)
-		{
-			$table['#<p>\n*</p>#'] = '';
-		}
-		else
-		{
-			// If we have empty paragraph tags we add a non-breaking space
-			// otherwise most browsers won't treat them as true paragraphs
-			$table['#<p></p>#'] = '<p>&nbsp;</p>';
-		}
-
-		return preg_replace(array_keys($table), $table, $str);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Format Characters
-	 *
-	 * This function mainly converts double and single quotes
-	 * to curly entities, but it also converts em-dashes,
-	 * double spaces, and ampersands
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	public function formatCharacters(string $str): string
-	{
-		static $table;
-
-		if (! isset($table))
-		{
-			$table = [
-				// nested smart quotes, opening and closing
-				// note that rules for grammar (English) allow only for two levels deep
-				// and that single quotes are _supposed_ to always be on the outside
-				// but we'll accommodate both
-				// Note that in all cases, whitespace is the primary determining factor
-				// on which direction to curl, with non-word characters like punctuation
-				// being a secondary factor only after whitespace is addressed.
-				'/\'"(\s|$)/'               => '&#8217;&#8221;$1',
-				'/(^|\s|<p>)\'"/'           => '$1&#8216;&#8220;',
-				'/\'"(\W)/'                 => '&#8217;&#8221;$1',
-				'/(\W)\'"/'                 => '$1&#8216;&#8220;',
-				'/"\'(\s|$)/'               => '&#8221;&#8217;$1',
-				'/(^|\s|<p>)"\'/'           => '$1&#8220;&#8216;',
-				'/"\'(\W)/'                 => '&#8221;&#8217;$1',
-				'/(\W)"\'/'                 => '$1&#8220;&#8216;',
-				// single quote smart quotes
-				'/\'(\s|$)/'                => '&#8217;$1',
-				'/(^|\s|<p>)\'/'            => '$1&#8216;',
-				'/\'(\W)/'                  => '&#8217;$1',
-				'/(\W)\'/'                  => '$1&#8216;',
-				// double quote smart quotes
-				'/"(\s|$)/'                 => '&#8221;$1',
-				'/(^|\s|<p>)"/'             => '$1&#8220;',
-				'/"(\W)/'                   => '&#8221;$1',
-				'/(\W)"/'                   => '$1&#8220;',
-				// apostrophes
-				"/(\w)'(\w)/"               => '$1&#8217;$2',
-				// Em dash and ellipses dots
-				'/\s?\-\-\s?/'              => '&#8212;',
-				'/(\w)\.{3}/'               => '$1&#8230;',
-				// double space after sentences
-				'/(\W)  /'                  => '$1&nbsp; ',
-				// ampersands, if not a character entity
-				'/&(?!#?[a-zA-Z0-9]{2,};)/' => '&amp;',
-			];
-		}
-
-		return preg_replace(array_keys($table), $table, $str);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Format Newlines
-	 *
-	 * Converts newline characters into either <p> tags or <br />
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function formatNewLines(string $str): string
-	{
-		if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true)))
-		{
-			return $str;
-		}
-
-		// Convert two consecutive newlines to paragraphs
-		$str = str_replace("\n\n", "</p>\n\n<p>", $str);
-
-		// Convert single spaces to <br /> tags
-		$str = preg_replace("/([^\n])(\n)([^\n])/", '\\1<br />\\2\\3', $str);
-
-		// Wrap the whole enchilada in enclosing paragraphs
-		if ($str !== "\n")
-		{
-			// We trim off the right-side new line so that the closing </p> tag
-			// will be positioned immediately following the string, matching
-			// the behavior of the opening <p> tag
-			$str = '<p>' . rtrim($str) . '</p>';
-		}
-
-		// Remove empty paragraphs if they are on the first line, as this
-		// is a potential unintended consequence of the previous code
-		return preg_replace('/<p><\/p>(.*)/', '\\1', $str, 1);
-	}
-
-	// ------------------------------------------------------------------------
-
-	/**
-	 * Protect Characters
-	 *
-	 * Protects special characters from being formatted later
-	 * We don't want quotes converted within tags so we'll temporarily convert them to {@DQ} and {@SQ}
-	 * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
-	 * likewise double spaces are converted to {@NBS} to prevent entity conversion
-	 *
-	 * @param  array $match
-	 * @return string
-	 */
-	protected function protectCharacters(array $match): string
-	{
-		return str_replace(["'", '"', '--', '  '], ['{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'], $match[0]);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Convert newlines to HTML line breaks except within PRE tags
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	public function nl2brExceptPre(string $str): string
-	{
-		$newstr = '';
-		for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i ++)
-		{
-			$newstr .= (($i % 2) === 0) ? nl2br($ex[$i]) : $ex[$i];
-			if ($ct - 1 !== $i)
-			{
-				$newstr .= 'pre>';
-			}
-		}
-
-		return $newstr;
-	}
+    /**
+     * Block level elements that should not be wrapped inside <p> tags
+     *
+     * @var string
+     */
+    public $blockElements = 'address|blockquote|div|dl|fieldset|form|h\d|hr|noscript|object|ol|p|pre|script|table|ul';
+
+    /**
+     * Elements that should not have <p> and <br /> tags within them.
+     *
+     * @var string
+     */
+    public $skipElements = 'p|pre|ol|ul|dl|object|table|h\d';
+
+    /**
+     * Tags we want the parser to completely ignore when splitting the string.
+     *
+     * @var string
+     */
+    public $inlineElements = 'a|abbr|acronym|b|bdo|big|br|button|cite|code|del|dfn|em|i|img|ins|input|label|map|kbd|q|samp|select|small|span|strong|sub|sup|textarea|tt|var';
+
+    /**
+     * array of block level elements that require inner content to be within another block level element
+     *
+     * @var array
+     */
+    public $innerBlockRequired = ['blockquote'];
+
+    /**
+     * the last block element parsed
+     *
+     * @var string
+     */
+    public $lastBlockElement = '';
+
+    /**
+     * whether or not to protect quotes within { curly braces }
+     *
+     * @var bool
+     */
+    public $protectBracedQuotes = false;
+
+    /**
+     * Auto Typography
+     *
+     * This function converts text, making it typographically correct:
+     *     - Converts double spaces into paragraphs.
+     *     - Converts single line breaks into <br /> tags
+     *     - Converts single and double quotes into correctly facing curly quote entities.
+     *     - Converts three dots into ellipsis.
+     *     - Converts double dashes into em-dashes.
+     *  - Converts two spaces into entities
+     *
+     * @param bool $reduceLinebreaks whether to reduce more then two consecutive newlines to two
+     */
+    public function autoTypography(string $str, bool $reduceLinebreaks = false): string
+    {
+        if ($str === '') {
+            return '';
+        }
+
+        // Standardize Newlines to make matching easier
+        if (strpos($str, "\r") !== false) {
+            $str = str_replace(["\r\n", "\r"], "\n", $str);
+        }
+
+        // Reduce line breaks.  If there are more than two consecutive linebreaks
+        // we'll compress them down to a maximum of two since there's no benefit to more.
+        if ($reduceLinebreaks === false) {
+            $str = preg_replace("/\n\n+/", "\n\n", $str);
+        }
+
+        // HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed
+        $htmlComments = [];
+        if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches)) {
+            for ($i = 0, $total = count($matches[0]); $i < $total; $i++) {
+                $htmlComments[] = $matches[0][$i];
+                $str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
+            }
+        }
+
+        // match and yank <pre> tags if they exist.  It's cheaper to do this separately since most content will
+        // not contain <pre> tags, and it keeps the PCRE patterns below simpler and faster
+        if (strpos($str, '<pre') !== false) {
+            $str = preg_replace_callback('#<pre.*?>.*?</pre>#si', [$this, 'protectCharacters'], $str);
+        }
+
+        // Convert quotes within tags to temporary markers.
+        $str = preg_replace_callback('#<.+?>#si', [$this, 'protectCharacters'], $str);
+
+        // Do the same with braces if necessary
+        if ($this->protectBracedQuotes === false) {
+            $str = preg_replace_callback('#\{.+?\}#si', [$this, 'protectCharacters'], $str);
+        }
+
+        // Convert "ignore" tags to temporary marker.  The parser splits out the string at every tag
+        // it encounters.  Certain inline tags, like image tags, links, span tags, etc. will be
+        // adversely affected if they are split out so we'll convert the opening bracket < temporarily to: {@TAG}
+        $str = preg_replace('#<(/*)(' . $this->inlineElements . ')([ >])#i', '{@TAG}\\1\\2\\3', $str);
+
+        /* Split the string at every tag. This expression creates an array with this prototype:
+         *
+         * 	[array]
+         * 	{
+         * 		[0] = <opening tag>
+         * 		[1] = Content...
+         * 		[2] = <closing tag>
+         * 		Etc...
+         * 	}
+         */
+        $chunks = preg_split('/(<(?:[^<>]+(?:"[^"]*"|\'[^\']*\')?)+>)/', $str, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+        // Build our finalized string.  We cycle through the array, skipping tags, and processing the contained text
+        $str     = '';
+        $process = true;
+
+        for ($i = 0, $c = count($chunks) - 1; $i <= $c; $i++) {
+            // Are we dealing with a tag? If so, we'll skip the processing for this cycle.
+            // Well also set the "process" flag which allows us to skip <pre> tags and a few other things.
+            if (preg_match('#<(/*)(' . $this->blockElements . ').*?>#', $chunks[$i], $match)) {
+                if (preg_match('#' . $this->skipElements . '#', $match[2])) {
+                    $process = ($match[1] === '/');
+                }
+
+                if ($match[1] === '') {
+                    $this->lastBlockElement = $match[2];
+                }
+
+                $str .= $chunks[$i];
+
+                continue;
+            }
+
+            if ($process === false) {
+                $str .= $chunks[$i];
+
+                continue;
+            }
+
+            // Force a newline to make sure end tags get processed by _format_newlines()
+            if ($i === $c) {
+                $chunks[$i] .= "\n";
+            }
+
+            // Convert Newlines into <p> and <br /> tags
+            $str .= $this->formatNewLines($chunks[$i]);
+        }
+
+        // No opening block level tag? Add it if needed.
+        if (! preg_match('/^\s*<(?:' . $this->blockElements . ')/i', $str)) {
+            $str = preg_replace('/^(.*?)<(' . $this->blockElements . ')/i', '<p>$1</p><$2', $str);
+        }
+
+        // Convert quotes, elipsis, em-dashes, non-breaking spaces, and ampersands
+        $str = $this->formatCharacters($str);
+
+        foreach ($htmlComments as $i => $htmlComment) {
+            // remove surrounding paragraph tags, but only if there's an opening paragraph tag
+            // otherwise HTML comments at the ends of paragraphs will have the closing tag removed
+            // if '<p>{@HC1}' then replace <p>{@HC1}</p> with the comment, else replace only {@HC1} with the comment
+            $str = preg_replace('#(?(?=<p>\{@HC' . $i . '\})<p>\{@HC' . $i . '\}(\s*</p>)|\{@HC' . $i . '\})#s', $htmlComment, $str);
+        }
+
+        // Final clean up
+        $table = [
+            // If the user submitted their own paragraph tags within the text
+            // we will retain them instead of using our tags.
+            '/(<p[^>*?]>)<p>/' => '$1', // <?php BBEdit syntax coloring bug fix
+            // Reduce multiple instances of opening/closing paragraph tags to a single one
+            '#(</p>)+#'      => '</p>',
+            '/(<p>\W*<p>)+/' => '<p>',
+            // Clean up stray paragraph tags that appear before block level elements
+            '#<p></p><(' . $this->blockElements . ')#' => '<$1',
+            // Clean up stray non-breaking spaces preceeding block elements
+            '#(&nbsp;\s*)+<(' . $this->blockElements . ')#' => '  <$2',
+            // Replace the temporary markers we added earlier
+            '/\{@TAG\}/' => '<',
+            '/\{@DQ\}/'  => '"',
+            '/\{@SQ\}/'  => "'",
+            '/\{@DD\}/'  => '--',
+            '/\{@NBS\}/' => '  ',
+            // An unintended consequence of the _format_newlines function is that
+            // some of the newlines get truncated, resulting in <p> tags
+            // starting immediately after <block> tags on the same line.
+            // This forces a newline after such occurrences, which looks much nicer.
+            "/><p>\n/" => ">\n<p>",
+            // Similarly, there might be cases where a closing </block> will follow
+            // a closing </p> tag, so we'll correct it by adding a newline in between
+            '#</p></#' => "</p>\n</",
+        ];
+
+        // Do we need to reduce empty lines?
+        if ($reduceLinebreaks === true) {
+            $table['#<p>\n*</p>#'] = '';
+        } else {
+            // If we have empty paragraph tags we add a non-breaking space
+            // otherwise most browsers won't treat them as true paragraphs
+            $table['#<p></p>#'] = '<p>&nbsp;</p>';
+        }
+
+        return preg_replace(array_keys($table), $table, $str);
+    }
+
+    /**
+     * Format Characters
+     *
+     * This function mainly converts double and single quotes
+     * to curly entities, but it also converts em-dashes,
+     * double spaces, and ampersands
+     */
+    public function formatCharacters(string $str): string
+    {
+        static $table;
+
+        if (! isset($table)) {
+            $table = [
+                // nested smart quotes, opening and closing
+                // note that rules for grammar (English) allow only for two levels deep
+                // and that single quotes are _supposed_ to always be on the outside
+                // but we'll accommodate both
+                // Note that in all cases, whitespace is the primary determining factor
+                // on which direction to curl, with non-word characters like punctuation
+                // being a secondary factor only after whitespace is addressed.
+                '/\'"(\s|$)/'     => '&#8217;&#8221;$1',
+                '/(^|\s|<p>)\'"/' => '$1&#8216;&#8220;',
+                '/\'"(\W)/'       => '&#8217;&#8221;$1',
+                '/(\W)\'"/'       => '$1&#8216;&#8220;',
+                '/"\'(\s|$)/'     => '&#8221;&#8217;$1',
+                '/(^|\s|<p>)"\'/' => '$1&#8220;&#8216;',
+                '/"\'(\W)/'       => '&#8221;&#8217;$1',
+                '/(\W)"\'/'       => '$1&#8220;&#8216;',
+                // single quote smart quotes
+                '/\'(\s|$)/'     => '&#8217;$1',
+                '/(^|\s|<p>)\'/' => '$1&#8216;',
+                '/\'(\W)/'       => '&#8217;$1',
+                '/(\W)\'/'       => '$1&#8216;',
+                // double quote smart quotes
+                '/"(\s|$)/'     => '&#8221;$1',
+                '/(^|\s|<p>)"/' => '$1&#8220;',
+                '/"(\W)/'       => '&#8221;$1',
+                '/(\W)"/'       => '$1&#8220;',
+                // apostrophes
+                '/(\w)\'(\w)/' => '$1&#8217;$2',
+                // Em dash and ellipses dots
+                '/\s?\-\-\s?/' => '&#8212;',
+                '/(\w)\.{3}/'  => '$1&#8230;',
+                // double space after sentences
+                '/(\W)  /' => '$1&nbsp; ',
+                // ampersands, if not a character entity
+                '/&(?!#?[a-zA-Z0-9]{2,};)/' => '&amp;',
+            ];
+        }
+
+        return preg_replace(array_keys($table), $table, $str);
+    }
+
+    /**
+     * Format Newlines
+     *
+     * Converts newline characters into either <p> tags or <br />
+     */
+    protected function formatNewLines(string $str): string
+    {
+        if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true))) {
+            return $str;
+        }
+
+        // Convert two consecutive newlines to paragraphs
+        $str = str_replace("\n\n", "</p>\n\n<p>", $str);
+
+        // Convert single spaces to <br /> tags
+        $str = preg_replace("/([^\n])(\n)([^\n])/", '\\1<br />\\2\\3', $str);
+
+        // Wrap the whole enchilada in enclosing paragraphs
+        if ($str !== "\n") {
+            // We trim off the right-side new line so that the closing </p> tag
+            // will be positioned immediately following the string, matching
+            // the behavior of the opening <p> tag
+            $str = '<p>' . rtrim($str) . '</p>';
+        }
+
+        // Remove empty paragraphs if they are on the first line, as this
+        // is a potential unintended consequence of the previous code
+        return preg_replace('/<p><\/p>(.*)/', '\\1', $str, 1);
+    }
+
+    /**
+     * Protect Characters
+     *
+     * Protects special characters from being formatted later
+     * We don't want quotes converted within tags so we'll temporarily convert them to {@DQ} and {@SQ}
+     * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
+     * likewise double spaces are converted to {@NBS} to prevent entity conversion
+     */
+    protected function protectCharacters(array $match): string
+    {
+        return str_replace(["'", '"', '--', '  '], ['{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'], $match[0]);
+    }
+
+    /**
+     * Convert newlines to HTML line breaks except within PRE tags
+     */
+    public function nl2brExceptPre(string $str): string
+    {
+        $newstr = '';
+
+        for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
+            $newstr .= (($i % 2) === 0) ? nl2br($ex[$i]) : $ex[$i];
+
+            if ($ct - 1 !== $i) {
+                $newstr .= 'pre>';
+            }
+        }
+
+        return $newstr;
+    }
 }
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index d7d3bfb122f4..8632dfc8f47e 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -20,287 +20,263 @@
  */
 class CreditCardRules
 {
-	/**
-	 * The cards that we support, with the defining details:
-	 *
-	 *  name        - The type of card as found in the form. Must match the user's value
-	 *  length      - List of possible lengths for the card number
-	 *  prefixes    - List of possible prefixes for the card
-	 *  checkdigit  - Boolean on whether we should do a modulus10 check on the numbers.
-	 *
-	 * @var array
-	 */
-	protected $cards = [
-		'American Express'                 => [
-			'name'       => 'amex',
-			'length'     => '15',
-			'prefixes'   => '34,37',
-			'checkdigit' => true,
-		],
-		'China UnionPay'                   => [
-			'name'       => 'unionpay',
-			'length'     => '16,17,18,19',
-			'prefixes'   => '62',
-			'checkdigit' => true,
-		],
-		'Dankort'                          => [
-			'name'       => 'dankort',
-			'length'     => '16',
-			'prefixes'   => '5019,4175,4571,4',
-			'checkdigit' => true,
-		],
-		'DinersClub'                       => [
-			'name'       => 'dinersclub',
-			'length'     => '14,16',
-			'prefixes'   => '300,301,302,303,304,305,309,36,38,39,54,55',
-			'checkdigit' => true,
-		],
-		'DinersClub CarteBlanche'          => [
-			'name'       => 'carteblanche',
-			'length'     => '14',
-			'prefixes'   => '300,301,302,303,304,305',
-			'checkdigit' => true,
-		],
-		'Discover Card'                    => [
-			'name'       => 'discover',
-			'length'     => '16,19',
-			'prefixes'   => '6011,622,644,645,656,647,648,649,65',
-			'checkdigit' => true,
-		],
-		'InterPayment'                     => [
-			'name'       => 'interpayment',
-			'length'     => '16,17,18,19',
-			'prefixes'   => '4',
-			'checkdigit' => true,
-		],
-		'JCB'                              => [
-			'name'       => 'jcb',
-			'length'     => '16,17,18,19',
-			'prefixes'   => '352,353,354,355,356,357,358',
-			'checkdigit' => true,
-		],
-		'Maestro'                          => [
-			'name'       => 'maestro',
-			'length'     => '12,13,14,15,16,18,19',
-			'prefixes'   => '50,56,57,58,59,60,61,62,63,64,65,66,67,68,69',
-			'checkdigit' => true,
-		],
-		'MasterCard'                       => [
-			'name'       => 'mastercard',
-			'length'     => '16',
-			'prefixes'   => '51,52,53,54,55,22,23,24,25,26,27',
-			'checkdigit' => true,
-		],
-		'NSPK MIR'                         => [
-			'name'       => 'mir',
-			'length'     => '16',
-			'prefixes'   => '2200,2201,2202,2203,2204',
-			'checkdigit' => true,
-		],
-		'Troy'                             => [
-			'name'       => 'troy',
-			'length'     => '16',
-			'prefixes'   => '979200,979289',
-			'checkdigit' => true,
-		],
-		'UATP'                             => [
-			'name'       => 'uatp',
-			'length'     => '15',
-			'prefixes'   => '1',
-			'checkdigit' => true,
-		],
-		'Verve'                            => [
-			'name'       => 'verve',
-			'length'     => '16,19',
-			'prefixes'   => '506,650',
-			'checkdigit' => true,
-		],
-		'Visa'                             => [
-			'name'       => 'visa',
-			'length'     => '13,16,19',
-			'prefixes'   => '4',
-			'checkdigit' => true,
-		],
-		// Canadian Cards
-		'BMO ABM Card'                     => [
-			'name'       => 'bmoabm',
-			'length'     => '16',
-			'prefixes'   => '500',
-			'checkdigit' => false,
-		],
-		'CIBC Convenience Card'            => [
-			'name'       => 'cibc',
-			'length'     => '16',
-			'prefixes'   => '4506',
-			'checkdigit' => false,
-		],
-		'HSBC Canada Card'                 => [
-			'name'       => 'hsbc',
-			'length'     => '16',
-			'prefixes'   => '56',
-			'checkdigit' => false,
-		],
-		'Royal Bank of Canada Client Card' => [
-			'name'       => 'rbc',
-			'length'     => '16',
-			'prefixes'   => '45',
-			'checkdigit' => false,
-		],
-		'Scotiabank Scotia Card'           => [
-			'name'       => 'scotia',
-			'length'     => '16',
-			'prefixes'   => '4536',
-			'checkdigit' => false,
-		],
-		'TD Canada Trust Access Card'      => [
-			'name'       => 'tdtrust',
-			'length'     => '16',
-			'prefixes'   => '589297',
-			'checkdigit' => false,
-		],
-	];
+    /**
+     * The cards that we support, with the defining details:
+     *
+     *  name        - The type of card as found in the form. Must match the user's value
+     *  length      - List of possible lengths for the card number
+     *  prefixes    - List of possible prefixes for the card
+     *  checkdigit  - Boolean on whether we should do a modulus10 check on the numbers.
+     *
+     * @var array
+     */
+    protected $cards = [
+        'American Express' => [
+            'name'       => 'amex',
+            'length'     => '15',
+            'prefixes'   => '34,37',
+            'checkdigit' => true,
+        ],
+        'China UnionPay' => [
+            'name'       => 'unionpay',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '62',
+            'checkdigit' => true,
+        ],
+        'Dankort' => [
+            'name'       => 'dankort',
+            'length'     => '16',
+            'prefixes'   => '5019,4175,4571,4',
+            'checkdigit' => true,
+        ],
+        'DinersClub' => [
+            'name'       => 'dinersclub',
+            'length'     => '14,16',
+            'prefixes'   => '300,301,302,303,304,305,309,36,38,39,54,55',
+            'checkdigit' => true,
+        ],
+        'DinersClub CarteBlanche' => [
+            'name'       => 'carteblanche',
+            'length'     => '14',
+            'prefixes'   => '300,301,302,303,304,305',
+            'checkdigit' => true,
+        ],
+        'Discover Card' => [
+            'name'       => 'discover',
+            'length'     => '16,19',
+            'prefixes'   => '6011,622,644,645,656,647,648,649,65',
+            'checkdigit' => true,
+        ],
+        'InterPayment' => [
+            'name'       => 'interpayment',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '4',
+            'checkdigit' => true,
+        ],
+        'JCB' => [
+            'name'       => 'jcb',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '352,353,354,355,356,357,358',
+            'checkdigit' => true,
+        ],
+        'Maestro' => [
+            'name'       => 'maestro',
+            'length'     => '12,13,14,15,16,18,19',
+            'prefixes'   => '50,56,57,58,59,60,61,62,63,64,65,66,67,68,69',
+            'checkdigit' => true,
+        ],
+        'MasterCard' => [
+            'name'       => 'mastercard',
+            'length'     => '16',
+            'prefixes'   => '51,52,53,54,55,22,23,24,25,26,27',
+            'checkdigit' => true,
+        ],
+        'NSPK MIR' => [
+            'name'       => 'mir',
+            'length'     => '16',
+            'prefixes'   => '2200,2201,2202,2203,2204',
+            'checkdigit' => true,
+        ],
+        'Troy' => [
+            'name'       => 'troy',
+            'length'     => '16',
+            'prefixes'   => '979200,979289',
+            'checkdigit' => true,
+        ],
+        'UATP' => [
+            'name'       => 'uatp',
+            'length'     => '15',
+            'prefixes'   => '1',
+            'checkdigit' => true,
+        ],
+        'Verve' => [
+            'name'       => 'verve',
+            'length'     => '16,19',
+            'prefixes'   => '506,650',
+            'checkdigit' => true,
+        ],
+        'Visa' => [
+            'name'       => 'visa',
+            'length'     => '13,16,19',
+            'prefixes'   => '4',
+            'checkdigit' => true,
+        ],
+        // Canadian Cards
+        'BMO ABM Card' => [
+            'name'       => 'bmoabm',
+            'length'     => '16',
+            'prefixes'   => '500',
+            'checkdigit' => false,
+        ],
+        'CIBC Convenience Card' => [
+            'name'       => 'cibc',
+            'length'     => '16',
+            'prefixes'   => '4506',
+            'checkdigit' => false,
+        ],
+        'HSBC Canada Card' => [
+            'name'       => 'hsbc',
+            'length'     => '16',
+            'prefixes'   => '56',
+            'checkdigit' => false,
+        ],
+        'Royal Bank of Canada Client Card' => [
+            'name'       => 'rbc',
+            'length'     => '16',
+            'prefixes'   => '45',
+            'checkdigit' => false,
+        ],
+        'Scotiabank Scotia Card' => [
+            'name'       => 'scotia',
+            'length'     => '16',
+            'prefixes'   => '4536',
+            'checkdigit' => false,
+        ],
+        'TD Canada Trust Access Card' => [
+            'name'       => 'tdtrust',
+            'length'     => '16',
+            'prefixes'   => '589297',
+            'checkdigit' => false,
+        ],
+    ];
 
-	//--------------------------------------------------------------------
+    /**
+     * Verifies that a credit card number is valid and matches the known
+     * formats for a wide number of credit card types. This does not verify
+     * that the card is a valid card, only that the number is formatted correctly.
+     *
+     * Example:
+     *  $rules = [
+     *      'cc_num' => 'valid_cc_number[visa]'
+     *  ];
+     */
+    public function valid_cc_number(?string $ccNumber, string $type): bool
+    {
+        $type = strtolower($type);
+        $info = null;
 
-	/**
-	 * Verifies that a credit card number is valid and matches the known
-	 * formats for a wide number of credit card types. This does not verify
-	 * that the card is a valid card, only that the number is formatted correctly.
-	 *
-	 * Example:
-	 *  $rules = [
-	 *      'cc_num' => 'valid_cc_number[visa]'
-	 *  ];
-	 *
-	 * @param string|null $ccNumber
-	 * @param string      $type
-	 *
-	 * @return boolean
-	 */
-	public function valid_cc_number(?string $ccNumber, string $type): bool
-	{
-		$type = strtolower($type);
-		$info = null;
+        // Get our card info based on provided name.
+        foreach ($this->cards as $card) {
+            if ($card['name'] === $type) {
+                $info = $card;
+                break;
+            }
+        }
 
-		// Get our card info based on provided name.
-		foreach ($this->cards as $card)
-		{
-			if ($card['name'] === $type)
-			{
-				$info = $card;
-				break;
-			}
-		}
+        // If empty, it's not a card type we recognize, or invalid type.
+        if (empty($info)) {
+            return false;
+        }
 
-		// If empty, it's not a card type we recognize, or invalid type.
-		if (empty($info))
-		{
-			return false;
-		}
+        // Make sure we have a valid length
+        if (strlen($ccNumber) === 0) {
+            return false;
+        }
 
-		// Make sure we have a valid length
-		if (strlen($ccNumber) === 0)
-		{
-			return false;
-		}
+        // Remove any spaces and dashes
+        $ccNumber = str_replace([' ', '-'], '', $ccNumber);
 
-		// Remove any spaces and dashes
-		$ccNumber = str_replace([' ', '-'], '', $ccNumber);
+        // Non-numeric values cannot be a number...duh
+        if (! is_numeric($ccNumber)) {
+            return false;
+        }
 
-		// Non-numeric values cannot be a number...duh
-		if (! is_numeric($ccNumber))
-		{
-			return false;
-		}
+        // Make sure it's a valid length for this card
+        $lengths = explode(',', $info['length']);
 
-		// Make sure it's a valid length for this card
-		$lengths = explode(',', $info['length']);
+        if (! in_array((string) strlen($ccNumber), $lengths, true)) {
+            return false;
+        }
 
-		if (! in_array((string) strlen($ccNumber), $lengths, true))
-		{
-			return false;
-		}
+        // Make sure it has a valid prefix
+        $prefixes = explode(',', $info['prefixes']);
 
-		// Make sure it has a valid prefix
-		$prefixes = explode(',', $info['prefixes']);
+        $validPrefix = false;
 
-		$validPrefix = false;
+        foreach ($prefixes as $prefix) {
+            if (strpos($ccNumber, $prefix) === 0) {
+                $validPrefix = true;
+                break;
+            }
+        }
 
-		foreach ($prefixes as $prefix)
-		{
-			if (strpos($ccNumber, $prefix) === 0)
-			{
-							  $validPrefix = true;
-							  break;
-			}
-		}
+        if ($validPrefix === false) {
+            return false;
+        }
 
-		if ($validPrefix === false)
-		{
-			return false;
-		}
+        // Still here? Then check the number against the Luhn algorithm, if required
+        // @see https://en.wikipedia.org/wiki/Luhn_algorithm
+        // @see https://gist.github.com/troelskn/1287893
+        if ($info['checkdigit'] === true) {
+            return $this->isValidLuhn($ccNumber);
+        }
 
-		// Still here? Then check the number against the Luhn algorithm, if required
-		// @see https://en.wikipedia.org/wiki/Luhn_algorithm
-		// @see https://gist.github.com/troelskn/1287893
-		if ($info['checkdigit'] === true)
-		{
-			return $this->isValidLuhn($ccNumber);
-		}
+        return true;
+    }
 
-		return true;
-	}
+    /**
+     * Checks the given number to see if the number passing a Luhn check.
+     *
+     * @param string $number
+     */
+    protected function isValidLuhn(?string $number = null): bool
+    {
+        $number = (string) $number;
 
-	//--------------------------------------------------------------------
+        $sumTable = [
+            [
+                0,
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+            ],
+            [
+                0,
+                2,
+                4,
+                6,
+                8,
+                1,
+                3,
+                5,
+                7,
+                9,
+            ],
+        ];
 
-	/**
-	 * Checks the given number to see if the number passing a Luhn check.
-	 *
-	 * @param string $number
-	 *
-	 * @return boolean
-	 */
-	protected function isValidLuhn(string $number = null): bool
-	{
-		$number = (string) $number;
+        $sum  = 0;
+        $flip = 0;
 
-		$sumTable = [
-			[
-				0,
-				1,
-				2,
-				3,
-				4,
-				5,
-				6,
-				7,
-				8,
-				9,
-			],
-			[
-				0,
-				2,
-				4,
-				6,
-				8,
-				1,
-				3,
-				5,
-				7,
-				9,
-			],
-		];
+        for ($i = strlen($number) - 1; $i >= 0; $i--) {
+            $sum += $sumTable[$flip++ & 0x1][$number[$i]];
+        }
 
-		$sum  = 0;
-		$flip = 0;
-
-		for ($i = strlen($number) - 1; $i >= 0; $i --)
-		{
-			$sum += $sumTable[$flip ++ & 0x1][$number[$i]];
-		}
-
-		return $sum % 10 === 0;
-	}
-
-	//--------------------------------------------------------------------
+        return $sum % 10 === 0;
+    }
 }
diff --git a/system/Validation/Exceptions/ValidationException.php b/system/Validation/Exceptions/ValidationException.php
index 077aa1f4b7fb..2e924fffc937 100644
--- a/system/Validation/Exceptions/ValidationException.php
+++ b/system/Validation/Exceptions/ValidationException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation\Exceptions;
@@ -15,28 +15,28 @@
 
 class ValidationException extends FrameworkException
 {
-	public static function forRuleNotFound(string $rule = null)
-	{
-		return new static(lang('Validation.ruleNotFound', [$rule]));
-	}
-
-	public static function forGroupNotFound(string $group = null)
-	{
-		return new static(lang('Validation.groupNotFound', [$group]));
-	}
-
-	public static function forGroupNotArray(string $group = null)
-	{
-		return new static(lang('Validation.groupNotArray', [$group]));
-	}
-
-	public static function forInvalidTemplate(string $template = null)
-	{
-		return new static(lang('Validation.invalidTemplate', [$template]));
-	}
-
-	public static function forNoRuleSets()
-	{
-		return new static(lang('Validation.noRuleSets'));
-	}
+    public static function forRuleNotFound(?string $rule = null)
+    {
+        return new static(lang('Validation.ruleNotFound', [$rule]));
+    }
+
+    public static function forGroupNotFound(?string $group = null)
+    {
+        return new static(lang('Validation.groupNotFound', [$group]));
+    }
+
+    public static function forGroupNotArray(?string $group = null)
+    {
+        return new static(lang('Validation.groupNotArray', [$group]));
+    }
+
+    public static function forInvalidTemplate(?string $template = null)
+    {
+        return new static(lang('Validation.invalidTemplate', [$template]));
+    }
+
+    public static function forNoRuleSets()
+    {
+        return new static(lang('Validation.noRuleSets'));
+    }
 }
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index 0ab18b215b36..ea1a6f678379 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -20,310 +20,229 @@
  */
 class FileRules
 {
-	/**
-	 * Request instance. So we can get access to the files.
-	 *
-	 * @var RequestInterface
-	 */
-	protected $request;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor.
-	 *
-	 * @param RequestInterface $request
-	 */
-	public function __construct(RequestInterface $request = null)
-	{
-		if (is_null($request))
-		{
-			$request = Services::request();
-		}
-
-		$this->request = $request;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies that $name is the name of a valid uploaded file.
-	 *
-	 * @param string|null $blank
-	 * @param string      $name
-	 *
-	 * @return boolean
-	 */
-	public function uploaded(?string $blank, string $name): bool
-	{
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if (ENVIRONMENT === 'testing')
-			{
-				if ($file->getError() !== 0)
-				{
-					return false;
-				}
-			}
-			else
-			{
-				// Note: cannot unit test this; no way to over-ride ENVIRONMENT?
-				// @codeCoverageIgnoreStart
-				if (! $file->isValid())
-				{
-					return false;
-				}
-				// @codeCoverageIgnoreEnd
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies if the file's size in Kilobytes is no larger than the parameter.
-	 *
-	 * @param string|null $blank
-	 * @param string      $params
-	 *
-	 * @return boolean
-	 */
-	public function max_size(?string $blank, string $params): bool
-	{
-		// Grab the file name off the top of the $params
-		// after we split it.
-		$params = explode(',', $params);
-		$name   = array_shift($params);
-
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_NO_FILE)
-			{
-				return true;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_INI_SIZE)
-			{
-				return false;
-			}
-
-			if ($file->getSize() / 1024 > $params[0])
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Uses the mime config file to determine if a file is considered an "image",
-	 * which for our purposes basically means that it's a raster image or svg.
-	 *
-	 * @param string|null $blank
-	 * @param string      $params
-	 *
-	 * @return boolean
-	 */
-	public function is_image(?string $blank, string $params): bool
-	{
-		// Grab the file name off the top of the $params
-		// after we split it.
-		$params = explode(',', $params);
-		$name   = array_shift($params);
-
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_NO_FILE)
-			{
-				return true;
-			}
-
-			// We know that our mimes list always has the first mime
-			// start with `image` even when then are multiple accepted types.
-			$type = Mimes::guessTypeFromExtension($file->getExtension());
-
-			if (mb_strpos($type, 'image') !== 0)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if an uploaded file's mime type matches one in the parameter.
-	 *
-	 * @param string|null $blank
-	 * @param string      $params
-	 *
-	 * @return boolean
-	 */
-	public function mime_in(?string $blank, string $params): bool
-	{
-		// Grab the file name off the top of the $params
-		// after we split it.
-		$params = explode(',', $params);
-		$name   = array_shift($params);
-
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_NO_FILE)
-			{
-				return true;
-			}
-
-			if (! in_array($file->getMimeType(), $params, true))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if an uploaded file's extension matches one in the parameter.
-	 *
-	 * @param string|null $blank
-	 * @param string      $params
-	 *
-	 * @return boolean
-	 */
-	public function ext_in(?string $blank, string $params): bool
-	{
-		// Grab the file name off the top of the $params
-		// after we split it.
-		$params = explode(',', $params);
-		$name   = array_shift($params);
-
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_NO_FILE)
-			{
-				return true;
-			}
-
-			if (! in_array($file->guessExtension(), $params, true))
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks an uploaded file to verify that the dimensions are within
-	 * a specified allowable dimension.
-	 *
-	 * @param string|null $blank
-	 * @param string      $params
-	 *
-	 * @return boolean
-	 */
-	public function max_dims(?string $blank, string $params): bool
-	{
-		// Grab the file name off the top of the $params
-		// after we split it.
-		$params = explode(',', $params);
-		$name   = array_shift($params);
-
-		if (! ($files = $this->request->getFileMultiple($name)))
-		{
-			$files = [$this->request->getFile($name)];
-		}
-
-		foreach ($files as $file)
-		{
-			if (is_null($file))
-			{
-				return false;
-			}
-
-			if ($file->getError() === UPLOAD_ERR_NO_FILE)
-			{
-				return true;
-			}
-
-			// Get Parameter sizes
-			$allowedWidth  = $params[0] ?? 0;
-			$allowedHeight = $params[1] ?? 0;
-
-			// Get uploaded image size
-			$info       = getimagesize($file->getTempName());
-			$fileWidth  = $info[0];
-			$fileHeight = $info[1];
-
-			if ($fileWidth > $allowedWidth || $fileHeight > $allowedHeight)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Request instance. So we can get access to the files.
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Constructor.
+     *
+     * @param RequestInterface $request
+     */
+    public function __construct(?RequestInterface $request = null)
+    {
+        if ($request === null) {
+            $request = Services::request();
+        }
+
+        $this->request = $request;
+    }
+
+    /**
+     * Verifies that $name is the name of a valid uploaded file.
+     */
+    public function uploaded(?string $blank, string $name): bool
+    {
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if (ENVIRONMENT === 'testing') {
+                if ($file->getError() !== 0) {
+                    return false;
+                }
+            } else {
+                // Note: cannot unit test this; no way to over-ride ENVIRONMENT?
+                // @codeCoverageIgnoreStart
+                if (! $file->isValid()) {
+                    return false;
+                }
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Verifies if the file's size in Kilobytes is no larger than the parameter.
+     */
+    public function max_size(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_INI_SIZE) {
+                return false;
+            }
+
+            if ($file->getSize() / 1024 > $params[0]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Uses the mime config file to determine if a file is considered an "image",
+     * which for our purposes basically means that it's a raster image or svg.
+     */
+    public function is_image(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            // We know that our mimes list always has the first mime
+            // start with `image` even when then are multiple accepted types.
+            $type = Mimes::guessTypeFromExtension($file->getExtension());
+
+            if (mb_strpos($type, 'image') !== 0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see if an uploaded file's mime type matches one in the parameter.
+     */
+    public function mime_in(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if (! in_array($file->getMimeType(), $params, true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see if an uploaded file's extension matches one in the parameter.
+     */
+    public function ext_in(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if (! in_array($file->guessExtension(), $params, true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks an uploaded file to verify that the dimensions are within
+     * a specified allowable dimension.
+     */
+    public function max_dims(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            // Get Parameter sizes
+            $allowedWidth  = $params[0] ?? 0;
+            $allowedHeight = $params[1] ?? 0;
+
+            // Get uploaded image size
+            $info       = getimagesize($file->getTempName());
+            $fileWidth  = $info[0];
+            $fileHeight = $info[1];
+
+            if ($fileWidth > $allowedWidth || $fileHeight > $allowedHeight) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index cefe16469b5b..6ee13c3f31df 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -18,361 +18,293 @@
  */
 class FormatRules
 {
-	/**
-	 * Alpha
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function alpha(?string $str = null): bool
-	{
-		return ctype_alpha($str);
-	}
-
-	/**
-	 * Alpha with spaces.
-	 *
-	 * @param string|null $value Value.
-	 *
-	 * @return boolean True if alpha with spaces, else false.
-	 */
-	public function alpha_space(?string $value = null): bool
-	{
-		if ($value === null)
-		{
-			return true;
-		}
-
-		// @see https://regex101.com/r/LhqHPO/1
-		return (bool) preg_match('/\A[A-Z ]+\z/i', $value);
-	}
-
-	/**
-	 * Alphanumeric with underscores and dashes
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function alpha_dash(?string $str = null): bool
-	{
-		// @see https://regex101.com/r/XfVY3d/1
-		return (bool) preg_match('/\A[a-z0-9_-]+\z/i', $str);
-	}
-
-	/**
-	 * Alphanumeric, spaces, and a limited set of punctuation characters.
-	 * Accepted punctuation characters are: ~ tilde, ! exclamation,
-	 * # number, $ dollar, % percent, & ampersand, * asterisk, - dash,
-	 * _ underscore, + plus, = equals, | vertical bar, : colon, . period
-	 * ~ ! # $ % & * - _ + = | : .
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function alpha_numeric_punct($str)
-	{
-		// @see https://regex101.com/r/6N8dDY/1
-		return (bool) preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str);
-	}
-
-	/**
-	 * Alphanumeric
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function alpha_numeric(?string $str = null): bool
-	{
-		return ctype_alnum($str);
-	}
-
-	/**
-	 * Alphanumeric w/ spaces
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function alpha_numeric_space(?string $str = null): bool
-	{
-		// @see https://regex101.com/r/0AZDME/1
-		return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
-	}
-
-	/**
-	 * Any type of string
-	 *
-	 * Note: we specifically do NOT type hint $str here so that
-	 * it doesn't convert numbers into strings.
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function string($str = null): bool
-	{
-		return is_string($str);
-	}
-
-	/**
-	 * Decimal number
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function decimal(?string $str = null): bool
-	{
-		// @see https://regex101.com/r/HULifl/1/
-		return (bool) preg_match('/\A[-+]?[0-9]{0,}\.?[0-9]+\z/', $str);
-	}
-
-	/**
-	 * String of hexidecimal characters
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function hex(?string $str = null): bool
-	{
-		return ctype_xdigit($str);
-	}
-
-	/**
-	 * Integer
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function integer(?string $str = null): bool
-	{
-		return (bool) preg_match('/\A[\-+]?[0-9]+\z/', $str);
-	}
-
-	/**
-	 * Is a Natural number  (0,1,2,3, etc.)
-	 *
-	 * @param  string|null $str
-	 * @return boolean
-	 */
-	public function is_natural(?string $str = null): bool
-	{
-		return ctype_digit($str);
-	}
-
-	/**
-	 * Is a Natural number, but not a zero  (1,2,3, etc.)
-	 *
-	 * @param  string|null $str
-	 * @return boolean
-	 */
-	public function is_natural_no_zero(?string $str = null): bool
-	{
-		return ($str !== '0' && ctype_digit($str));
-	}
-
-	/**
-	 * Numeric
-	 *
-	 * @param string|null $str
-	 *
-	 * @return boolean
-	 */
-	public function numeric(?string $str = null): bool
-	{
-		// @see https://regex101.com/r/bb9wtr/1
-		return (bool) preg_match('/\A[\-+]?[0-9]*\.?[0-9]+\z/', $str);
-	}
-
-	/**
-	 * Compares value against a regular expression pattern.
-	 *
-	 * @param string|null $str
-	 * @param string      $pattern
-	 *
-	 * @return boolean
-	 */
-	public function regex_match(?string $str, string $pattern): bool
-	{
-		if (strpos($pattern, '/') !== 0)
-		{
-			$pattern = "/{$pattern}/";
-		}
-
-		return (bool) preg_match($pattern, $str);
-	}
-
-	/**
-	 * Validates that the string is a valid timezone as per the
-	 * timezone_identifiers_list function.
-	 *
-	 * @see http://php.net/manual/en/datetimezone.listidentifiers.php
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function timezone(string $str = null): bool
-	{
-		return in_array($str, timezone_identifiers_list(), true);
-	}
-
-	/**
-	 * Valid Base64
-	 *
-	 * Tests a string for characters outside of the Base64 alphabet
-	 * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
-	 *
-	 * @param  string $str
-	 * @return boolean
-	 */
-	public function valid_base64(string $str = null): bool
-	{
-		return (base64_encode(base64_decode($str, true)) === $str);
-	}
-
-	/**
-	 * Valid JSON
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function valid_json(string $str = null): bool
-	{
-		json_decode($str);
-		return json_last_error() === JSON_ERROR_NONE;
-	}
-
-	/**
-	 * Checks for a correctly formatted email address
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function valid_email(string $str = null): bool
-	{
-		// @see https://regex101.com/r/wlJG1t/1/
-		if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches))
-		{
-			$str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
-		}
-
-		return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
-	}
-
-	/**
-	 * Validate a comma-separated list of email addresses.
-	 *
-	 * Example:
-	 *     valid_emails[one@example.com,two@example.com]
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function valid_emails(string $str = null): bool
-	{
-		foreach (explode(',', $str) as $email)
-		{
-			$email = trim($email);
-			if ($email === '')
-			{
-				return false;
-			}
-
-			if ($this->valid_email($email) === false)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Validate an IP address (human readable format or binary string - inet_pton)
-	 *
-	 * @param string $ip    IP Address
-	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
-	 *
-	 * @return boolean
-	 */
-	public function valid_ip(string $ip = null, string $which = null): bool
-	{
-		if (empty($ip))
-		{
-			return false;
-		}
-		switch (strtolower($which))
-		{
-			case 'ipv4':
-				$which = FILTER_FLAG_IPV4;
-				break;
-			case 'ipv6':
-				$which = FILTER_FLAG_IPV6;
-				break;
-			default:
-				$which = null;
-				break;
-		}
-
-		return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
-	}
-
-	/**
-	 * Checks a URL to ensure it's formed correctly.
-	 *
-	 * @param string $str
-	 *
-	 * @return boolean
-	 */
-	public function valid_url(string $str = null): bool
-	{
-		if (empty($str))
-		{
-			return false;
-		}
-
-		if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
-		{
-			if (! in_array($matches[1], ['http', 'https'], true))
-			{
-				return false;
-			}
-
-			$str = $matches[2];
-		}
-
-		$str = 'http://' . $str;
-
-		return (filter_var($str, FILTER_VALIDATE_URL) !== false);
-	}
-
-	/**
-	 * Checks for a valid date and matches a given date format
-	 *
-	 * @param string $str
-	 * @param string $format
-	 *
-	 * @return boolean
-	 */
-	public function valid_date(string $str = null, string $format = null): bool
-	{
-		if (empty($format))
-		{
-			return (bool) strtotime($str);
-		}
-
-		$date = DateTime::createFromFormat($format, $str);
-
-		return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
-	}
+    /**
+     * Alpha
+     */
+    public function alpha(?string $str = null): bool
+    {
+        return ctype_alpha($str);
+    }
+
+    /**
+     * Alpha with spaces.
+     *
+     * @param string|null $value Value.
+     *
+     * @return bool True if alpha with spaces, else false.
+     */
+    public function alpha_space(?string $value = null): bool
+    {
+        if ($value === null) {
+            return true;
+        }
+
+        // @see https://regex101.com/r/LhqHPO/1
+        return (bool) preg_match('/\A[A-Z ]+\z/i', $value);
+    }
+
+    /**
+     * Alphanumeric with underscores and dashes
+     */
+    public function alpha_dash(?string $str = null): bool
+    {
+        // @see https://regex101.com/r/XfVY3d/1
+        return (bool) preg_match('/\A[a-z0-9_-]+\z/i', $str);
+    }
+
+    /**
+     * Alphanumeric, spaces, and a limited set of punctuation characters.
+     * Accepted punctuation characters are: ~ tilde, ! exclamation,
+     * # number, $ dollar, % percent, & ampersand, * asterisk, - dash,
+     * _ underscore, + plus, = equals, | vertical bar, : colon, . period
+     * ~ ! # $ % & * - _ + = | : .
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    public function alpha_numeric_punct($str)
+    {
+        // @see https://regex101.com/r/6N8dDY/1
+        return (bool) preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str);
+    }
+
+    /**
+     * Alphanumeric
+     */
+    public function alpha_numeric(?string $str = null): bool
+    {
+        return ctype_alnum($str);
+    }
+
+    /**
+     * Alphanumeric w/ spaces
+     */
+    public function alpha_numeric_space(?string $str = null): bool
+    {
+        // @see https://regex101.com/r/0AZDME/1
+        return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
+    }
+
+    /**
+     * Any type of string
+     *
+     * Note: we specifically do NOT type hint $str here so that
+     * it doesn't convert numbers into strings.
+     *
+     * @param string|null $str
+     */
+    public function string($str = null): bool
+    {
+        return is_string($str);
+    }
+
+    /**
+     * Decimal number
+     */
+    public function decimal(?string $str = null): bool
+    {
+        // @see https://regex101.com/r/HULifl/2/
+        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
+    }
+
+    /**
+     * String of hexidecimal characters
+     */
+    public function hex(?string $str = null): bool
+    {
+        return ctype_xdigit($str);
+    }
+
+    /**
+     * Integer
+     */
+    public function integer(?string $str = null): bool
+    {
+        return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
+    }
+
+    /**
+     * Is a Natural number  (0,1,2,3, etc.)
+     */
+    public function is_natural(?string $str = null): bool
+    {
+        return ctype_digit($str);
+    }
+
+    /**
+     * Is a Natural number, but not a zero  (1,2,3, etc.)
+     */
+    public function is_natural_no_zero(?string $str = null): bool
+    {
+        return $str !== '0' && ctype_digit($str);
+    }
+
+    /**
+     * Numeric
+     */
+    public function numeric(?string $str = null): bool
+    {
+        // @see https://regex101.com/r/bb9wtr/2
+        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
+    }
+
+    /**
+     * Compares value against a regular expression pattern.
+     */
+    public function regex_match(?string $str, string $pattern): bool
+    {
+        if (strpos($pattern, '/') !== 0) {
+            $pattern = "/{$pattern}/";
+        }
+
+        return (bool) preg_match($pattern, $str);
+    }
+
+    /**
+     * Validates that the string is a valid timezone as per the
+     * timezone_identifiers_list function.
+     *
+     * @see http://php.net/manual/en/datetimezone.listidentifiers.php
+     *
+     * @param string $str
+     */
+    public function timezone(?string $str = null): bool
+    {
+        return in_array($str, timezone_identifiers_list(), true);
+    }
+
+    /**
+     * Valid Base64
+     *
+     * Tests a string for characters outside of the Base64 alphabet
+     * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
+     *
+     * @param string $str
+     */
+    public function valid_base64(?string $str = null): bool
+    {
+        return base64_encode(base64_decode($str, true)) === $str;
+    }
+
+    /**
+     * Valid JSON
+     *
+     * @param string $str
+     */
+    public function valid_json(?string $str = null): bool
+    {
+        json_decode($str);
+
+        return json_last_error() === JSON_ERROR_NONE;
+    }
+
+    /**
+     * Checks for a correctly formatted email address
+     *
+     * @param string $str
+     */
+    public function valid_email(?string $str = null): bool
+    {
+        // @see https://regex101.com/r/wlJG1t/1/
+        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
+            $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
+        }
+
+        return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
+    }
+
+    /**
+     * Validate a comma-separated list of email addresses.
+     *
+     * Example:
+     *     valid_emails[one@example.com,two@example.com]
+     *
+     * @param string $str
+     */
+    public function valid_emails(?string $str = null): bool
+    {
+        foreach (explode(',', $str) as $email) {
+            $email = trim($email);
+            if ($email === '') {
+                return false;
+            }
+
+            if ($this->valid_email($email) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an IP address (human readable format or binary string - inet_pton)
+     *
+     * @param string $ip    IP Address
+     * @param string $which IP protocol: 'ipv4' or 'ipv6'
+     */
+    public function valid_ip(?string $ip = null, ?string $which = null): bool
+    {
+        if (empty($ip)) {
+            return false;
+        }
+
+        switch (strtolower($which)) {
+            case 'ipv4':
+                $which = FILTER_FLAG_IPV4;
+                break;
+
+            case 'ipv6':
+                $which = FILTER_FLAG_IPV6;
+                break;
+
+            default:
+                $which = null;
+                break;
+        }
+
+        return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
+    }
+
+    /**
+     * Checks a URL to ensure it's formed correctly.
+     *
+     * @param string $str
+     */
+    public function valid_url(?string $str = null): bool
+    {
+        if (empty($str)) {
+            return false;
+        }
+
+        if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches)) {
+            if (! in_array($matches[1], ['http', 'https'], true)) {
+                return false;
+            }
+
+            $str = $matches[2];
+        }
+
+        $str = 'http://' . $str;
+
+        return filter_var($str, FILTER_VALIDATE_URL) !== false;
+    }
+
+    /**
+     * Checks for a valid date and matches a given date format
+     *
+     * @param string $str
+     * @param string $format
+     */
+    public function valid_date(?string $str = null, ?string $format = null): bool
+    {
+        if (empty($format)) {
+            return (bool) strtotime($str);
+        }
+
+        $date = DateTime::createFromFormat($format, $str);
+
+        return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
+    }
 }
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 9f9e23d0762c..20f558e52be2 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -19,424 +19,317 @@
  */
 class Rules
 {
-	//--------------------------------------------------------------------
-
-	/**
-	 * The value does not match another field in $data.
-	 *
-	 * @param string $str
-	 * @param string $field
-	 * @param array  $data  Other field/value pairs
-	 *
-	 * @return boolean
-	 */
-	public function differs(string $str = null, string $field, array $data): bool
-	{
-		if (strpos($field, '.') !== false)
-		{
-			return $str !== dot_array_search($field, $data);
-		}
-
-		return array_key_exists($field, $data) && $str !== $data[$field];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Equals the static value provided.
-	 *
-	 * @param string $str
-	 * @param string $val
-	 *
-	 * @return boolean
-	 */
-	public function equals(string $str = null, string $val): bool
-	{
-		return $str === $val;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns true if $str is $val characters long.
-	 * $val = "5" (one) | "5,8,12" (multiple values)
-	 *
-	 * @param string $str
-	 * @param string $val
-	 *
-	 * @return boolean
-	 */
-	public function exact_length(string $str = null, string $val): bool
-	{
-		$val = explode(',', $val);
-		foreach ($val as $tmp)
-		{
-			if (is_numeric($tmp) && (int) $tmp === mb_strlen($str))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Greater than
-	 *
-	 * @param string $str
-	 * @param string $min
-	 *
-	 * @return boolean
-	 */
-	public function greater_than(string $str = null, string $min): bool
-	{
-		return is_numeric($str) && $str > $min;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Equal to or Greater than
-	 *
-	 * @param string $str
-	 * @param string $min
-	 *
-	 * @return boolean
-	 */
-	public function greater_than_equal_to(string $str = null, string $min): bool
-	{
-		return is_numeric($str) && $str >= $min;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks the database to see if the given value exist.
-	 * Can ignore records by field/value to filter (currently
-	 * accept only one filter).
-	 *
-	 * Example:
-	 *    is_not_unique[table.field,where_field,where_value]
-	 *    is_not_unique[menu.id,active,1]
-	 *
-	 * @param string $str
-	 * @param string $field
-	 * @param array  $data
-	 *
-	 * @return boolean
-	 */
-	public function is_not_unique(string $str = null, string $field, array $data): bool
-	{
-		// Grab any data for exclusion of a single row.
-		[$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
-
-		// Break the table and field apart
-		sscanf($field, '%[^.].%[^.]', $table, $field);
-
-		$db = Database::connect($data['DBGroup'] ?? null);
-
-		$row = $db->table($table)
-				  ->select('1')
-				  ->where($field, $str)
-				  ->limit(1);
-
-		if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue))
-		{
-			$row = $row->where($whereField, $whereValue);
-		}
-
-		return (bool) ($row->get()->getRow() !== null);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Value should be within an array of values
-	 *
-	 * @param string $value
-	 * @param string $list
-	 *
-	 * @return boolean
-	 */
-	public function in_list(string $value = null, string $list): bool
-	{
-		$list = array_map('trim', explode(',', $list));
-		return in_array($value, $list, true);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks the database to see if the given value is unique. Can
-	 * ignore a single record by field/value to make it useful during
-	 * record updates.
-	 *
-	 * Example:
-	 *    is_unique[table.field,ignore_field,ignore_value]
-	 *    is_unique[users.email,id,5]
-	 *
-	 * @param string $str
-	 * @param string $field
-	 * @param array  $data
-	 *
-	 * @return boolean
-	 */
-	public function is_unique(string $str = null, string $field, array $data): bool
-	{
-		// Grab any data for exclusion of a single row.
-		[$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
-
-		// Break the table and field apart
-		sscanf($field, '%[^.].%[^.]', $table, $field);
-
-		$db = Database::connect($data['DBGroup'] ?? null);
-
-		$row = $db->table($table)
-				  ->select('1')
-				  ->where($field, $str)
-				  ->limit(1);
-
-		if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue))
-		{
-			$row = $row->where("{$ignoreField} !=", $ignoreValue);
-		}
-
-		return (bool) ($row->get()->getRow() === null);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Less than
-	 *
-	 * @param string $str
-	 * @param string $max
-	 *
-	 * @return boolean
-	 */
-	public function less_than(string $str = null, string $max): bool
-	{
-		return is_numeric($str) && $str < $max;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Equal to or Less than
-	 *
-	 * @param string $str
-	 * @param string $max
-	 *
-	 * @return boolean
-	 */
-	public function less_than_equal_to(string $str = null, string $max): bool
-	{
-		return is_numeric($str) && $str <= $max;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Matches the value of another field in $data.
-	 *
-	 * @param string $str
-	 * @param string $field
-	 * @param array  $data  Other field/value pairs
-	 *
-	 * @return boolean
-	 */
-	public function matches(string $str = null, string $field, array $data): bool
-	{
-		if (strpos($field, '.') !== false)
-		{
-			return $str === dot_array_search($field, $data);
-		}
-
-		return array_key_exists($field, $data) && $str === $data[$field];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns true if $str is $val or fewer characters in length.
-	 *
-	 * @param string $str
-	 * @param string $val
-	 *
-	 * @return boolean
-	 */
-	public function max_length(string $str = null, string $val): bool
-	{
-		return (is_numeric($val) && $val >= mb_strlen($str));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns true if $str is at least $val length.
-	 *
-	 * @param string $str
-	 * @param string $val
-	 *
-	 * @return boolean
-	 */
-	public function min_length(string $str = null, string $val): bool
-	{
-		return (is_numeric($val) && $val <= mb_strlen($str));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Does not equal the static value provided.
-	 *
-	 * @param string $str
-	 * @param string $val
-	 *
-	 * @return boolean
-	 */
-	public function not_equals(string $str = null, string $val): bool
-	{
-		return $str !== $val;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Value should not be within an array of values.
-	 *
-	 * @param string $value
-	 * @param string $list
-	 *
-	 * @return boolean
-	 */
-	public function not_in_list(string $value = null, string $list): bool
-	{
-		return ! $this->in_list($value, $list);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Required
-	 *
-	 * @param mixed $str Value
-	 *
-	 * @return boolean          True if valid, false if not
-	 */
-	public function required($str = null): bool
-	{
-		if (is_object($str))
-		{
-			return true;
-		}
-
-		return is_array($str) ? ! empty($str) : (trim($str) !== '');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The field is required when any of the other required fields are present
-	 * in the data.
-	 *
-	 * Example (field is required when the password field is present):
-	 *
-	 *     required_with[password]
-	 *
-	 * @param string|null $str
-	 * @param string|null $fields List of fields that we should check if present
-	 * @param array       $data   Complete list of fields from the form
-	 *
-	 * @return boolean
-	 */
-	public function required_with($str = null, string $fields = null, array $data = []): bool
-	{
-		if (is_null($fields) || empty($data))
-		{
-			throw new InvalidArgumentException('You must supply the parameters: fields, data.');
-		}
-
-		$fields = explode(',', $fields);
-
-		// If the field is present we can safely assume that
-		// the field is here, no matter whether the corresponding
-		// search field is present or not.
-		$present = $this->required($str ?? '');
-
-		if ($present)
-		{
-			return true;
-		}
-
-		// Still here? Then we fail this test if
-		// any of the fields are present in $data
-		// as $fields is the lis
-		$requiredFields = [];
-
-		foreach ($fields as $field)
-		{
-			if ((array_key_exists($field, $data) && ! empty($data[$field])) ||
-				(strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))                )
-			{
-				$requiredFields[] = $field;
-			}
-		}
-
-		return empty($requiredFields);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * The field is required when all of the other fields are present
-	 * in the data but not required.
-	 *
-	 * Example (field is required when the id or email field is missing):
-	 *
-	 *     required_without[id,email]
-	 *
-	 * @param string|null $str
-	 * @param string|null $fields
-	 * @param array       $data
-	 *
-	 * @return boolean
-	 */
-	public function required_without($str = null, string $fields = null, array $data = []): bool
-	{
-		if (is_null($fields) || empty($data))
-		{
-			throw new InvalidArgumentException('You must supply the parameters: fields, data.');
-		}
-
-		$fields = explode(',', $fields);
-
-		// If the field is present we can safely assume that
-		// the field is here, no matter whether the corresponding
-		// search field is present or not.
-		$present = $this->required($str ?? '');
-
-		if ($present)
-		{
-			return true;
-		}
-
-		// Still here? Then we fail this test if
-		// any of the fields are not present in $data
-		foreach ($fields as $field)
-		{
-			if ((strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) ||
-				(strpos($field, '.') !== false && empty(dot_array_search($field, $data)))
-			)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * The value does not match another field in $data.
+     *
+     * @param string $str
+     * @param array  $data Other field/value pairs
+     */
+    public function differs(?string $str, string $field, array $data): bool
+    {
+        if (strpos($field, '.') !== false) {
+            return $str !== dot_array_search($field, $data);
+        }
+
+        return array_key_exists($field, $data) && $str !== $data[$field];
+    }
+
+    /**
+     * Equals the static value provided.
+     *
+     * @param string $str
+     */
+    public function equals(?string $str, string $val): bool
+    {
+        return $str === $val;
+    }
+
+    /**
+     * Returns true if $str is $val characters long.
+     * $val = "5" (one) | "5,8,12" (multiple values)
+     *
+     * @param string $str
+     */
+    public function exact_length(?string $str, string $val): bool
+    {
+        $val = explode(',', $val);
+
+        foreach ($val as $tmp) {
+            if (is_numeric($tmp) && (int) $tmp === mb_strlen($str)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Greater than
+     *
+     * @param string $str
+     */
+    public function greater_than(?string $str, string $min): bool
+    {
+        return is_numeric($str) && $str > $min;
+    }
+
+    /**
+     * Equal to or Greater than
+     *
+     * @param string $str
+     */
+    public function greater_than_equal_to(?string $str, string $min): bool
+    {
+        return is_numeric($str) && $str >= $min;
+    }
+
+    /**
+     * Checks the database to see if the given value exist.
+     * Can ignore records by field/value to filter (currently
+     * accept only one filter).
+     *
+     * Example:
+     *    is_not_unique[table.field,where_field,where_value]
+     *    is_not_unique[menu.id,active,1]
+     *
+     * @param string $str
+     */
+    public function is_not_unique(?string $str, string $field, array $data): bool
+    {
+        // Grab any data for exclusion of a single row.
+        [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
+
+        // Break the table and field apart
+        sscanf($field, '%[^.].%[^.]', $table, $field);
+
+        $db = Database::connect($data['DBGroup'] ?? null);
+
+        $row = $db->table($table)
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
+
+        if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
+            $row = $row->where($whereField, $whereValue);
+        }
+
+        return $row->get()->getRow() !== null;
+    }
+
+    /**
+     * Value should be within an array of values
+     *
+     * @param string $value
+     */
+    public function in_list(?string $value, string $list): bool
+    {
+        $list = array_map('trim', explode(',', $list));
+
+        return in_array($value, $list, true);
+    }
+
+    /**
+     * Checks the database to see if the given value is unique. Can
+     * ignore a single record by field/value to make it useful during
+     * record updates.
+     *
+     * Example:
+     *    is_unique[table.field,ignore_field,ignore_value]
+     *    is_unique[users.email,id,5]
+     *
+     * @param string $str
+     */
+    public function is_unique(?string $str, string $field, array $data): bool
+    {
+        // Grab any data for exclusion of a single row.
+        [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
+
+        // Break the table and field apart
+        sscanf($field, '%[^.].%[^.]', $table, $field);
+
+        $db = Database::connect($data['DBGroup'] ?? null);
+
+        $row = $db->table($table)
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
+
+        if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
+            $row = $row->where("{$ignoreField} !=", $ignoreValue);
+        }
+
+        return $row->get()->getRow() === null;
+    }
+
+    /**
+     * Less than
+     *
+     * @param string $str
+     */
+    public function less_than(?string $str, string $max): bool
+    {
+        return is_numeric($str) && $str < $max;
+    }
+
+    /**
+     * Equal to or Less than
+     *
+     * @param string $str
+     */
+    public function less_than_equal_to(?string $str, string $max): bool
+    {
+        return is_numeric($str) && $str <= $max;
+    }
+
+    /**
+     * Matches the value of another field in $data.
+     *
+     * @param string $str
+     * @param array  $data Other field/value pairs
+     */
+    public function matches(?string $str, string $field, array $data): bool
+    {
+        if (strpos($field, '.') !== false) {
+            return $str === dot_array_search($field, $data);
+        }
+
+        return array_key_exists($field, $data) && $str === $data[$field];
+    }
+
+    /**
+     * Returns true if $str is $val or fewer characters in length.
+     *
+     * @param string $str
+     */
+    public function max_length(?string $str, string $val): bool
+    {
+        return is_numeric($val) && $val >= mb_strlen($str);
+    }
+
+    /**
+     * Returns true if $str is at least $val length.
+     *
+     * @param string $str
+     */
+    public function min_length(?string $str, string $val): bool
+    {
+        return is_numeric($val) && $val <= mb_strlen($str);
+    }
+
+    /**
+     * Does not equal the static value provided.
+     *
+     * @param string $str
+     */
+    public function not_equals(?string $str, string $val): bool
+    {
+        return $str !== $val;
+    }
+
+    /**
+     * Value should not be within an array of values.
+     *
+     * @param string $value
+     */
+    public function not_in_list(?string $value, string $list): bool
+    {
+        return ! $this->in_list($value, $list);
+    }
+
+    /**
+     * Required
+     *
+     * @param mixed $str Value
+     *
+     * @return bool True if valid, false if not
+     */
+    public function required($str = null): bool
+    {
+        if (is_object($str)) {
+            return true;
+        }
+
+        return is_array($str) ? ! empty($str) : (trim($str) !== '');
+    }
+
+    /**
+     * The field is required when any of the other required fields are present
+     * in the data.
+     *
+     * Example (field is required when the password field is present):
+     *
+     *     required_with[password]
+     *
+     * @param string|null $str
+     * @param string|null $fields List of fields that we should check if present
+     * @param array       $data   Complete list of fields from the form
+     */
+    public function required_with($str = null, ?string $fields = null, array $data = []): bool
+    {
+        if ($fields === null || empty($data)) {
+            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+        }
+
+        $fields = explode(',', $fields);
+
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $present = $this->required($str ?? '');
+
+        if ($present) {
+            return true;
+        }
+
+        // Still here? Then we fail this test if
+        // any of the fields are present in $data
+        // as $fields is the lis
+        $requiredFields = [];
+
+        foreach ($fields as $field) {
+            if ((array_key_exists($field, $data) && ! empty($data[$field])) || (strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))) {
+                $requiredFields[] = $field;
+            }
+        }
+
+        return empty($requiredFields);
+    }
+
+    /**
+     * The field is required when all of the other fields are present
+     * in the data but not required.
+     *
+     * Example (field is required when the id or email field is missing):
+     *
+     *     required_without[id,email]
+     *
+     * @param string|null $str
+     */
+    public function required_without($str = null, ?string $fields = null, array $data = []): bool
+    {
+        if ($fields === null || empty($data)) {
+            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+        }
+
+        $fields = explode(',', $fields);
+
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $present = $this->required($str ?? '');
+
+        if ($present) {
+            return true;
+        }
+
+        // Still here? Then we fail this test if
+        // any of the fields are not present in $data
+        foreach ($fields as $field) {
+            if ((strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) || (strpos($field, '.') !== false && empty(dot_array_search($field, $data)))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 29a2322ccf6c..a41e1ebc558f 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -23,800 +23,681 @@
  */
 class Validation implements ValidationInterface
 {
-	/**
-	 * Files to load with validation functions.
-	 *
-	 * @var array
-	 */
-	protected $ruleSetFiles;
-
-	/**
-	 * The loaded instances of our validation files.
-	 *
-	 * @var array
-	 */
-	protected $ruleSetInstances = [];
-
-	/**
-	 * Stores the actual rules that should
-	 * be ran against $data.
-	 *
-	 * @var array
-	 */
-	protected $rules = [];
-
-	/**
-	 * The data that should be validated,
-	 * where 'key' is the alias, with value.
-	 *
-	 * @var array
-	 */
-	protected $data = [];
-
-	/**
-	 * Any generated errors during validation.
-	 * 'key' is the alias, 'value' is the message.
-	 *
-	 * @var array
-	 */
-	protected $errors = [];
-
-	/**
-	 * Stores custom error message to use
-	 * during validation. Where 'key' is the alias.
-	 *
-	 * @var array
-	 */
-	protected $customErrors = [];
-
-	/**
-	 * Our configuration.
-	 *
-	 * @var ValidationConfig
-	 */
-	protected $config;
-
-	/**
-	 * The view renderer used to render validation messages.
-	 *
-	 * @var RendererInterface
-	 */
-	protected $view;
-
-	/**
-	 * Validation constructor.
-	 *
-	 * @param ValidationConfig  $config
-	 * @param RendererInterface $view
-	 */
-	public function __construct($config, RendererInterface $view)
-	{
-		$this->ruleSetFiles = $config->ruleSets;
-
-		$this->config = $config;
-
-		$this->view = $view;
-	}
-
-	/**
-	 * Runs the validation process, returning true/false determining whether
-	 * validation was successful or not.
-	 *
-	 * @param array|null  $data    The array of data to validate.
-	 * @param string|null $group   The predefined group of rules to apply.
-	 * @param string|null $dbGroup The database group to use.
-	 *
-	 * @return boolean
-	 */
-	public function run(array $data = null, string $group = null, string $dbGroup = null): bool
-	{
-		$data = $data ?? $this->data;
-
-		// i.e. is_unique
-		$data['DBGroup'] = $dbGroup;
-
-		$this->loadRuleSets();
-		$this->loadRuleGroup($group);
-
-		// If no rules exist, we return false to ensure
-		// the developer didn't forget to set the rules.
-		if (empty($this->rules))
-		{
-			return false;
-		}
-
-		// Replace any placeholders (e.g. {id}) in the rules with
-		// the value found in $data, if any.
-		$this->rules = $this->fillPlaceholders($this->rules, $data);
-
-		// Need this for searching arrays in validation.
-		helper('array');
-
-		// Run through each rule. If we have any field set for
-		// this rule, then we need to run them through!
-		foreach ($this->rules as $field => $setup)
-		{
-			// Blast $rSetup apart, unless it's already an array.
-			$rules = $setup['rules'] ?? $setup;
-
-			if (is_string($rules))
-			{
-				$rules = $this->splitRules($rules);
-			}
-
-			$values = dot_array_search($field, $data);
-			$values = is_array($values) ? $values : [$values];
-
-			if ($values === [])
-			{
-				// We'll process the values right away if an empty array
-				$this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
-			}
-
-			foreach ($values as $value)
-			{
-				// Otherwise, we'll let the loop do the job
-				$this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
-			}
-		}
-
-		return $this->getErrors() === [];
-	}
-
-	/**
-	 * Runs the validation process, returning true or false
-	 * determining whether validation was successful or not.
-	 *
-	 * @param mixed    $value
-	 * @param string   $rule
-	 * @param string[] $errors
-	 *
-	 * @return boolean
-	 */
-	public function check($value, string $rule, array $errors = []): bool
-	{
-		$this->reset();
-
-		return $this->setRule('check', null, $rule, $errors)->run(['check' => $value]);
-	}
-
-	/**
-	 * Runs all of $rules against $field, until one fails, or
-	 * all of them have been processed. If one fails, it adds
-	 * the error to $this->errors and moves on to the next,
-	 * so that we can collect all of the first errors.
-	 *
-	 * @param string       $field
-	 * @param string|null  $label
-	 * @param string|array $value
-	 * @param array|null   $rules
-	 * @param array        $data
-	 *
-	 * @return boolean
-	 */
-	protected function processRules(string $field, string $label = null, $value, $rules = null, array $data = null): bool
-	{
-		if (is_null($data))
-		{
-			throw new InvalidArgumentException('You must supply the parameter: data.');
-		}
-
-		if (in_array('if_exist', $rules, true))
-		{
-			$flattenedData = array_flatten_with_dots($data);
-			$ifExistField  = $field;
-
-			if (strpos($field, '.*') !== false)
-			{
-				// We'll change the dot notation into a PCRE pattern
-				// that can be used later
-				$ifExistField = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
-
-				$dataIsExisting = array_reduce(array_keys($flattenedData), static function ($carry, $item) use ($ifExistField) {
-					$pattern = sprintf('/%s/u', $ifExistField);
-					return $carry || preg_match($pattern, $item) === 1;
-				}, false);
-			}
-			else
-			{
-				$dataIsExisting = array_key_exists($ifExistField, $flattenedData);
-			}
-
-			unset($ifExistField, $flattenedData);
-
-			if (! $dataIsExisting)
-			{
-				// we return early if `if_exist` is not satisfied. we have nothing to do here.
-				return true;
-			}
-
-			// Otherwise remove the if_exist rule and continue the process
-			$rules = array_diff($rules, ['if_exist']);
-		}
-
-		if (in_array('permit_empty', $rules, true))
-		{
-			if (! in_array('required', $rules, true) && (is_array($value) ? empty($value) : (trim($value) === '')))
-			{
-				$passed = true;
-
-				foreach ($rules as $rule)
-				{
-					if (preg_match('/(.*?)\[(.*)\]/', $rule, $match))
-					{
-						$rule  = $match[1];
-						$param = $match[2];
-
-						if (! in_array($rule, ['required_with', 'required_without'], true))
-						{
-							continue;
-						}
-
-						// Check in our rulesets
-						foreach ($this->ruleSetInstances as $set)
-						{
-							if (! method_exists($set, $rule))
-							{
-								continue;
-							}
-
-							$passed = $passed && $set->$rule($value, $param, $data);
-							break;
-						}
-					}
-				}
-
-				if ($passed === true)
-				{
-					return true;
-				}
-			}
-
-			$rules = array_diff($rules, ['permit_empty']);
-		}
-
-		foreach ($rules as $rule)
-		{
-			$isCallable = is_callable($rule);
-
-			$passed = false;
-			$param  = false;
-
-			if (! $isCallable && preg_match('/(.*?)\[(.*)\]/', $rule, $match))
-			{
-				$rule  = $match[1];
-				$param = $match[2];
-			}
-
-			// Placeholder for custom errors from the rules.
-			$error = null;
-
-			// If it's a callable, call and and get out of here.
-			if ($isCallable)
-			{
-				$passed = $param === false ? $rule($value) : $rule($value, $param, $data);
-			}
-			else
-			{
-				$found = false;
-
-				// Check in our rulesets
-				foreach ($this->ruleSetInstances as $set)
-				{
-					if (! method_exists($set, $rule))
-					{
-						continue;
-					}
-
-					$found  = true;
-					$passed = $param === false ? $set->$rule($value, $error) : $set->$rule($value, $param, $data, $error);
-
-					break;
-				}
-
-				// If the rule wasn't found anywhere, we
-				// should throw an exception so the developer can find it.
-				if (! $found)
-				{
-					throw ValidationException::forRuleNotFound($rule);
-				}
-			}
-
-			// Set the error message if we didn't survive.
-			if ($passed === false)
-			{
-				// if the $value is an array, convert it to as string representation
-				if (is_array($value))
-				{
-					$value = '[' . implode(', ', $value) . ']';
-				}
-
-				$this->errors[$field] = is_null($error)
-					? $this->getErrorMessage($rule, $field, $label, $param, $value)
-					: $error; // @phpstan-ignore-line
-
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Takes a Request object and grabs the input data to use from its
-	 * array values.
-	 *
-	 * @param RequestInterface|IncomingRequest $request
-	 *
-	 * @return ValidationInterface
-	 */
-	public function withRequest(RequestInterface $request): ValidationInterface
-	{
-		/** @var IncomingRequest $request */
-		if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false)
-		{
-			$this->data = $request->getJSON(true);
-			return $this;
-		}
-
-		if (in_array($request->getMethod(), ['put', 'patch', 'delete'], true)
-			&& strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false
-		)
-		{
-			$this->data = $request->getRawInput();
-		}
-		else
-		{
-			$this->data = $request->getVar() ?? [];
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Sets an individual rule and custom error messages for a single field.
-	 *
-	 * The custom error message should be just the messages that apply to
-	 * this field, like so:
-	 *
-	 *    [
-	 *        'rule' => 'message',
-	 *        'rule' => 'message'
-	 *    ]
-	 *
-	 * @param string      $field
-	 * @param string|null $label
-	 * @param string      $rules
-	 * @param array       $errors
-	 *
-	 * @return $this
-	 */
-	public function setRule(string $field, string $label = null, string $rules, array $errors = [])
-	{
-		$this->rules[$field] = [
-			'label' => $label,
-			'rules' => $rules,
-		];
-
-		$this->customErrors = array_merge($this->customErrors, [
-			$field => $errors,
-		]);
-
-		return $this;
-	}
-
-	/**
-	 * Stores the rules that should be used to validate the items.
-	 * Rules should be an array formatted like:
-	 *
-	 *    [
-	 *        'field' => 'rule1|rule2'
-	 *    ]
-	 *
-	 * The $errors array should be formatted like:
-	 *    [
-	 *        'field' => [
-	 *            'rule' => 'message',
-	 *            'rule' => 'message
-	 *        ],
-	 *    ]
-	 *
-	 * @param array $rules
-	 * @param array $errors // An array of custom error messages
-	 *
-	 * @return ValidationInterface
-	 */
-	public function setRules(array $rules, array $errors = []): ValidationInterface
-	{
-		$this->customErrors = $errors;
-
-		foreach ($rules as $field => &$rule)
-		{
-			if (! is_array($rule))
-			{
-				continue;
-			}
-
-			if (! array_key_exists('errors', $rule))
-			{
-				continue;
-			}
-
-			$this->customErrors[$field] = $rule['errors'];
-			unset($rule['errors']);
-		}
-
-		$this->rules = $rules;
-
-		return $this;
-	}
-
-	/**
-	 * Returns all of the rules currently defined.
-	 *
-	 * @return array
-	 */
-	public function getRules(): array
-	{
-		return $this->rules;
-	}
-
-	/**
-	 * Checks to see if the rule for key $field has been set or not.
-	 *
-	 * @param string $field
-	 *
-	 * @return boolean
-	 */
-	public function hasRule(string $field): bool
-	{
-		return array_key_exists($field, $this->rules);
-	}
-
-	/**
-	 * Get rule group.
-	 *
-	 * @param string $group Group.
-	 *
-	 * @return string[] Rule group.
-	 *
-	 * @throws InvalidArgumentException If group not found.
-	 */
-	public function getRuleGroup(string $group): array
-	{
-		if (! isset($this->config->$group))
-		{
-			throw ValidationException::forGroupNotFound($group);
-		}
-
-		if (! is_array($this->config->$group))
-		{
-			throw ValidationException::forGroupNotArray($group);
-		}
-
-		return $this->config->$group;
-	}
-
-	/**
-	 * Set rule group.
-	 *
-	 * @param string $group Group.
-	 *
-	 * @throws InvalidArgumentException If group not found.
-	 */
-	public function setRuleGroup(string $group)
-	{
-		$rules = $this->getRuleGroup($group);
-		$this->setRules($rules);
-
-		$errorName = $group . '_errors';
-		if (isset($this->config->$errorName))
-		{
-			$this->customErrors = $this->config->$errorName;
-		}
-	}
-
-	/**
-	 * Returns the rendered HTML of the errors as defined in $template.
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	public function listErrors(string $template = 'list'): string
-	{
-		if (! array_key_exists($template, $this->config->templates))
-		{
-			throw ValidationException::forInvalidTemplate($template);
-		}
-
-		return $this->view
-			->setVar('errors', $this->getErrors())
-			->render($this->config->templates[$template]);
-	}
-
-	/**
-	 * Displays a single error in formatted HTML as defined in the $template view.
-	 *
-	 * @param string $field
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	public function showError(string $field, string $template = 'single'): string
-	{
-		if (! array_key_exists($field, $this->getErrors()))
-		{
-			return '';
-		}
-
-		if (! array_key_exists($template, $this->config->templates))
-		{
-			throw ValidationException::forInvalidTemplate($template);
-		}
-
-		return $this->view
-			->setVar('error', $this->getError($field))
-			->render($this->config->templates[$template]);
-	}
-
-	/**
-	 * Loads all of the rulesets classes that have been defined in the
-	 * Config\Validation and stores them locally so we can use them.
-	 */
-	protected function loadRuleSets()
-	{
-		if (empty($this->ruleSetFiles))
-		{
-			throw ValidationException::forNoRuleSets();
-		}
-
-		foreach ($this->ruleSetFiles as $file)
-		{
-			$this->ruleSetInstances[] = new $file();
-		}
-	}
-
-	/**
-	 * Loads custom rule groups (if set) into the current rules.
-	 *
-	 * Rules can be pre-defined in Config\Validation and can
-	 * be any name, but must all still be an array of the
-	 * same format used with setRules(). Additionally, check
-	 * for {group}_errors for an array of custom error messages.
-	 *
-	 * @param string|null $group
-	 *
-	 * @return array|ValidationException|null
-	 */
-	public function loadRuleGroup(string $group = null)
-	{
-		if (empty($group))
-		{
-			return null;
-		}
-
-		if (! isset($this->config->$group))
-		{
-			throw ValidationException::forGroupNotFound($group);
-		}
-
-		if (! is_array($this->config->$group))
-		{
-			throw ValidationException::forGroupNotArray($group);
-		}
-
-		$this->setRules($this->config->$group);
-
-		// If {group}_errors exists in the config file,
-		// then override our custom errors with them.
-		$errorName = $group . '_errors';
-
-		if (isset($this->config->$errorName))
-		{
-			$this->customErrors = $this->config->$errorName;
-		}
-
-		return $this->rules;
-	}
-
-	/**
-	 * Replace any placeholders within the rules with the values that
-	 * match the 'key' of any properties being set. For example, if
-	 * we had the following $data array:
-	 *
-	 * [ 'id' => 13 ]
-	 *
-	 * and the following rule:
-	 *
-	 *  'required|is_unique[users,email,id,{id}]'
-	 *
-	 * The value of {id} would be replaced with the actual id in the form data:
-	 *
-	 *  'required|is_unique[users,email,id,13]'
-	 *
-	 * @param array $rules
-	 * @param array $data
-	 *
-	 * @return array
-	 */
-	protected function fillPlaceholders(array $rules, array $data): array
-	{
-		$replacements = [];
-
-		foreach ($data as $key => $value)
-		{
-			$replacements["{{$key}}"] = $value;
-		}
-
-		if (! empty($replacements))
-		{
-			foreach ($rules as &$rule)
-			{
-				if (is_array($rule))
-				{
-					foreach ($rule as &$row)
-					{
-						// Should only be an `errors` array
-						// which doesn't take placeholders.
-						if (is_array($row))
-						{
-							continue;
-						}
-
-						$row = strtr($row, $replacements);
-					}
-					continue;
-				}
-
-				$rule = strtr($rule, $replacements);
-			}
-		}
-
-		return $rules;
-	}
-
-	/**
-	 * Checks to see if an error exists for the given field.
-	 *
-	 * @param string $field
-	 *
-	 * @return boolean
-	 */
-	public function hasError(string $field): bool
-	{
-		return array_key_exists($field, $this->getErrors());
-	}
-
-	/**
-	 * Returns the error(s) for a specified $field (or empty string if not
-	 * set).
-	 *
-	 * @param string $field Field.
-	 *
-	 * @return string Error(s).
-	 */
-	public function getError(string $field = null): string
-	{
-		if ($field === null && count($this->rules) === 1)
-		{
-			$field = array_key_first($this->rules);
-		}
-
-		return array_key_exists($field, $this->getErrors()) ? $this->errors[$field] : '';
-	}
-
-	/**
-	 * Returns the array of errors that were encountered during
-	 * a run() call. The array should be in the following format:
-	 *
-	 *    [
-	 *        'field1' => 'error message',
-	 *        'field2' => 'error message',
-	 *    ]
-	 *
-	 * @return array<string,string>
-	 *
-	 * Excluded from code coverage because that it always run as cli
-	 *
-	 * @codeCoverageIgnore
-	 */
-	public function getErrors(): array
-	{
-		// If we already have errors, we'll use those.
-		// If we don't, check the session to see if any were
-		// passed along from a redirect_with_input request.
-		if (empty($this->errors) && ! is_cli() && isset($_SESSION, $_SESSION['_ci_validation_errors']))
-		{
-			$this->errors = unserialize($_SESSION['_ci_validation_errors']);
-		}
-
-		return $this->errors ?? [];
-	}
-
-	/**
-	 * Sets the error for a specific field. Used by custom validation methods.
-	 *
-	 * @param string $field
-	 * @param string $error
-	 *
-	 * @return ValidationInterface
-	 */
-	public function setError(string $field, string $error): ValidationInterface
-	{
-		$this->errors[$field] = $error;
-
-		return $this;
-	}
-
-	/**
-	 * Attempts to find the appropriate error message
-	 *
-	 * @param string      $rule
-	 * @param string      $field
-	 * @param string|null $label
-	 * @param string      $param
-	 * @param string      $value The value that caused the validation to fail.
-	 *
-	 * @return string
-	 */
-	protected function getErrorMessage(string $rule, string $field, string $label = null, string $param = null, string $value = null): string
-	{
-		// Check if custom message has been defined by user
-		if (isset($this->customErrors[$field][$rule]))
-		{
-			$message = lang($this->customErrors[$field][$rule]);
-		}
-		else
-		{
-			// Try to grab a localized version of the message...
-			// lang() will return the rule name back if not found,
-			// so there will always be a string being returned.
-			$message = lang('Validation.' . $rule);
-		}
-
-		$message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
-		$message = str_replace('{param}', empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']), $message);
-
-		return str_replace('{value}', $value, $message);
-	}
-
-	/**
-	 * Split rules string by pipe operator.
-	 *
-	 * @param string $rules
-	 *
-	 * @return array
-	 */
-	protected function splitRules(string $rules): array
-	{
-		$nonEscapeBracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
-		$pipeNotInBracket = sprintf(
-			'/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
-			$nonEscapeBracket,
-			$nonEscapeBracket,
-			$nonEscapeBracket
-		);
-
-		$_rules = preg_split($pipeNotInBracket, $rules);
-
-		return array_unique($_rules);
-	}
-
-	// Misc
-	/**
-	 * Resets the class to a blank slate. Should be called whenever
-	 * you need to process more than one array.
-	 *
-	 * @return ValidationInterface
-	 */
-	public function reset(): ValidationInterface
-	{
-		$this->data         = [];
-		$this->rules        = [];
-		$this->errors       = [];
-		$this->customErrors = [];
-
-		return $this;
-	}
+    /**
+     * Files to load with validation functions.
+     *
+     * @var array
+     */
+    protected $ruleSetFiles;
+
+    /**
+     * The loaded instances of our validation files.
+     *
+     * @var array
+     */
+    protected $ruleSetInstances = [];
+
+    /**
+     * Stores the actual rules that should
+     * be ran against $data.
+     *
+     * @var array
+     */
+    protected $rules = [];
+
+    /**
+     * The data that should be validated,
+     * where 'key' is the alias, with value.
+     *
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Any generated errors during validation.
+     * 'key' is the alias, 'value' is the message.
+     *
+     * @var array
+     */
+    protected $errors = [];
+
+    /**
+     * Stores custom error message to use
+     * during validation. Where 'key' is the alias.
+     *
+     * @var array
+     */
+    protected $customErrors = [];
+
+    /**
+     * Our configuration.
+     *
+     * @var ValidationConfig
+     */
+    protected $config;
+
+    /**
+     * The view renderer used to render validation messages.
+     *
+     * @var RendererInterface
+     */
+    protected $view;
+
+    /**
+     * Validation constructor.
+     *
+     * @param ValidationConfig $config
+     */
+    public function __construct($config, RendererInterface $view)
+    {
+        $this->ruleSetFiles = $config->ruleSets;
+
+        $this->config = $config;
+
+        $this->view = $view;
+    }
+
+    /**
+     * Runs the validation process, returning true/false determining whether
+     * validation was successful or not.
+     *
+     * @param array|null  $data    The array of data to validate.
+     * @param string|null $group   The predefined group of rules to apply.
+     * @param string|null $dbGroup The database group to use.
+     */
+    public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool
+    {
+        $data = $data ?? $this->data;
+
+        // i.e. is_unique
+        $data['DBGroup'] = $dbGroup;
+
+        $this->loadRuleSets();
+        $this->loadRuleGroup($group);
+
+        // If no rules exist, we return false to ensure
+        // the developer didn't forget to set the rules.
+        if (empty($this->rules)) {
+            return false;
+        }
+
+        // Replace any placeholders (e.g. {id}) in the rules with
+        // the value found in $data, if any.
+        $this->rules = $this->fillPlaceholders($this->rules, $data);
+
+        // Need this for searching arrays in validation.
+        helper('array');
+
+        // Run through each rule. If we have any field set for
+        // this rule, then we need to run them through!
+        foreach ($this->rules as $field => $setup) {
+            // Blast $rSetup apart, unless it's already an array.
+            $rules = $setup['rules'] ?? $setup;
+
+            if (is_string($rules)) {
+                $rules = $this->splitRules($rules);
+            }
+
+            $values = dot_array_search($field, $data);
+            $values = is_array($values) ? $values : [$values];
+
+            if ($values === []) {
+                // We'll process the values right away if an empty array
+                $this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
+            }
+
+            foreach ($values as $value) {
+                // Otherwise, we'll let the loop do the job
+                $this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
+            }
+        }
+
+        return $this->getErrors() === [];
+    }
+
+    /**
+     * Runs the validation process, returning true or false
+     * determining whether validation was successful or not.
+     *
+     * @param mixed    $value
+     * @param string[] $errors
+     */
+    public function check($value, string $rule, array $errors = []): bool
+    {
+        $this->reset();
+
+        return $this->setRule('check', null, $rule, $errors)->run(['check' => $value]);
+    }
+
+    /**
+     * Runs all of $rules against $field, until one fails, or
+     * all of them have been processed. If one fails, it adds
+     * the error to $this->errors and moves on to the next,
+     * so that we can collect all of the first errors.
+     *
+     * @param array|string $value
+     * @param array|null   $rules
+     * @param array        $data
+     */
+    protected function processRules(string $field, ?string $label, $value, $rules = null, ?array $data = null): bool
+    {
+        if ($data === null) {
+            throw new InvalidArgumentException('You must supply the parameter: data.');
+        }
+
+        if (in_array('if_exist', $rules, true)) {
+            $flattenedData = array_flatten_with_dots($data);
+            $ifExistField  = $field;
+
+            if (strpos($field, '.*') !== false) {
+                // We'll change the dot notation into a PCRE pattern
+                // that can be used later
+                $ifExistField = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
+
+                $dataIsExisting = array_reduce(array_keys($flattenedData), static function ($carry, $item) use ($ifExistField) {
+                    $pattern = sprintf('/%s/u', $ifExistField);
+
+                    return $carry || preg_match($pattern, $item) === 1;
+                }, false);
+            } else {
+                $dataIsExisting = array_key_exists($ifExistField, $flattenedData);
+            }
+
+            unset($ifExistField, $flattenedData);
+
+            if (! $dataIsExisting) {
+                // we return early if `if_exist` is not satisfied. we have nothing to do here.
+                return true;
+            }
+
+            // Otherwise remove the if_exist rule and continue the process
+            $rules = array_diff($rules, ['if_exist']);
+        }
+
+        if (in_array('permit_empty', $rules, true)) {
+            if (! in_array('required', $rules, true) && (is_array($value) ? empty($value) : (trim($value) === ''))) {
+                $passed = true;
+
+                foreach ($rules as $rule) {
+                    if (preg_match('/(.*?)\[(.*)\]/', $rule, $match)) {
+                        $rule  = $match[1];
+                        $param = $match[2];
+
+                        if (! in_array($rule, ['required_with', 'required_without'], true)) {
+                            continue;
+                        }
+
+                        // Check in our rulesets
+                        foreach ($this->ruleSetInstances as $set) {
+                            if (! method_exists($set, $rule)) {
+                                continue;
+                            }
+
+                            $passed = $passed && $set->{$rule}($value, $param, $data);
+                            break;
+                        }
+                    }
+                }
+
+                if ($passed === true) {
+                    return true;
+                }
+            }
+
+            $rules = array_diff($rules, ['permit_empty']);
+        }
+
+        foreach ($rules as $rule) {
+            $isCallable = is_callable($rule);
+
+            $passed = false;
+            $param  = false;
+
+            if (! $isCallable && preg_match('/(.*?)\[(.*)\]/', $rule, $match)) {
+                $rule  = $match[1];
+                $param = $match[2];
+            }
+
+            // Placeholder for custom errors from the rules.
+            $error = null;
+
+            // If it's a callable, call and and get out of here.
+            if ($isCallable) {
+                $passed = $param === false ? $rule($value) : $rule($value, $param, $data);
+            } else {
+                $found = false;
+
+                // Check in our rulesets
+                foreach ($this->ruleSetInstances as $set) {
+                    if (! method_exists($set, $rule)) {
+                        continue;
+                    }
+
+                    $found  = true;
+                    $passed = $param === false ? $set->{$rule}($value, $error) : $set->{$rule}($value, $param, $data, $error);
+
+                    break;
+                }
+
+                // If the rule wasn't found anywhere, we
+                // should throw an exception so the developer can find it.
+                if (! $found) {
+                    throw ValidationException::forRuleNotFound($rule);
+                }
+            }
+
+            // Set the error message if we didn't survive.
+            if ($passed === false) {
+                // if the $value is an array, convert it to as string representation
+                if (is_array($value)) {
+                    $value = '[' . implode(', ', $value) . ']';
+                }
+
+                $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, $value);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Takes a Request object and grabs the input data to use from its
+     * array values.
+     *
+     * @param IncomingRequest|RequestInterface $request
+     */
+    public function withRequest(RequestInterface $request): ValidationInterface
+    {
+        /** @var IncomingRequest $request */
+        if (strpos($request->getHeaderLine('Content-Type'), 'application/json') !== false) {
+            $this->data = $request->getJSON(true);
+
+            return $this;
+        }
+
+        if (in_array($request->getMethod(), ['put', 'patch', 'delete'], true)
+            && strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false
+        ) {
+            $this->data = $request->getRawInput();
+        } else {
+            $this->data = $request->getVar() ?? [];
+        }
+
+        return $this;
+    }
+
+    /**
+     * Sets an individual rule and custom error messages for a single field.
+     *
+     * The custom error message should be just the messages that apply to
+     * this field, like so:
+     *
+     *    [
+     *        'rule' => 'message',
+     *        'rule' => 'message'
+     *    ]
+     *
+     * @return $this
+     */
+    public function setRule(string $field, ?string $label, string $rules, array $errors = [])
+    {
+        $this->rules[$field] = [
+            'label' => $label,
+            'rules' => $rules,
+        ];
+
+        $this->customErrors = array_merge($this->customErrors, [
+            $field => $errors,
+        ]);
+
+        return $this;
+    }
+
+    /**
+     * Stores the rules that should be used to validate the items.
+     * Rules should be an array formatted like:
+     *
+     *    [
+     *        'field' => 'rule1|rule2'
+     *    ]
+     *
+     * The $errors array should be formatted like:
+     *    [
+     *        'field' => [
+     *            'rule' => 'message',
+     *            'rule' => 'message
+     *        ],
+     *    ]
+     *
+     * @param array $errors // An array of custom error messages
+     */
+    public function setRules(array $rules, array $errors = []): ValidationInterface
+    {
+        $this->customErrors = $errors;
+
+        foreach ($rules as $field => &$rule) {
+            if (! is_array($rule)) {
+                continue;
+            }
+
+            if (! array_key_exists('errors', $rule)) {
+                continue;
+            }
+
+            $this->customErrors[$field] = $rule['errors'];
+            unset($rule['errors']);
+        }
+
+        $this->rules = $rules;
+
+        return $this;
+    }
+
+    /**
+     * Returns all of the rules currently defined.
+     */
+    public function getRules(): array
+    {
+        return $this->rules;
+    }
+
+    /**
+     * Checks to see if the rule for key $field has been set or not.
+     */
+    public function hasRule(string $field): bool
+    {
+        return array_key_exists($field, $this->rules);
+    }
+
+    /**
+     * Get rule group.
+     *
+     * @param string $group Group.
+     *
+     * @throws InvalidArgumentException If group not found.
+     *
+     * @return string[] Rule group.
+     */
+    public function getRuleGroup(string $group): array
+    {
+        if (! isset($this->config->{$group})) {
+            throw ValidationException::forGroupNotFound($group);
+        }
+
+        if (! is_array($this->config->{$group})) {
+            throw ValidationException::forGroupNotArray($group);
+        }
+
+        return $this->config->{$group};
+    }
+
+    /**
+     * Set rule group.
+     *
+     * @param string $group Group.
+     *
+     * @throws InvalidArgumentException If group not found.
+     */
+    public function setRuleGroup(string $group)
+    {
+        $rules = $this->getRuleGroup($group);
+        $this->setRules($rules);
+
+        $errorName = $group . '_errors';
+        if (isset($this->config->{$errorName})) {
+            $this->customErrors = $this->config->{$errorName};
+        }
+    }
+
+    /**
+     * Returns the rendered HTML of the errors as defined in $template.
+     */
+    public function listErrors(string $template = 'list'): string
+    {
+        if (! array_key_exists($template, $this->config->templates)) {
+            throw ValidationException::forInvalidTemplate($template);
+        }
+
+        return $this->view
+            ->setVar('errors', $this->getErrors())
+            ->render($this->config->templates[$template]);
+    }
+
+    /**
+     * Displays a single error in formatted HTML as defined in the $template view.
+     */
+    public function showError(string $field, string $template = 'single'): string
+    {
+        if (! array_key_exists($field, $this->getErrors())) {
+            return '';
+        }
+
+        if (! array_key_exists($template, $this->config->templates)) {
+            throw ValidationException::forInvalidTemplate($template);
+        }
+
+        return $this->view
+            ->setVar('error', $this->getError($field))
+            ->render($this->config->templates[$template]);
+    }
+
+    /**
+     * Loads all of the rulesets classes that have been defined in the
+     * Config\Validation and stores them locally so we can use them.
+     */
+    protected function loadRuleSets()
+    {
+        if (empty($this->ruleSetFiles)) {
+            throw ValidationException::forNoRuleSets();
+        }
+
+        foreach ($this->ruleSetFiles as $file) {
+            $this->ruleSetInstances[] = new $file();
+        }
+    }
+
+    /**
+     * Loads custom rule groups (if set) into the current rules.
+     *
+     * Rules can be pre-defined in Config\Validation and can
+     * be any name, but must all still be an array of the
+     * same format used with setRules(). Additionally, check
+     * for {group}_errors for an array of custom error messages.
+     *
+     * @return array|ValidationException|null
+     */
+    public function loadRuleGroup(?string $group = null)
+    {
+        if (empty($group)) {
+            return null;
+        }
+
+        if (! isset($this->config->{$group})) {
+            throw ValidationException::forGroupNotFound($group);
+        }
+
+        if (! is_array($this->config->{$group})) {
+            throw ValidationException::forGroupNotArray($group);
+        }
+
+        $this->setRules($this->config->{$group});
+
+        // If {group}_errors exists in the config file,
+        // then override our custom errors with them.
+        $errorName = $group . '_errors';
+
+        if (isset($this->config->{$errorName})) {
+            $this->customErrors = $this->config->{$errorName};
+        }
+
+        return $this->rules;
+    }
+
+    /**
+     * Replace any placeholders within the rules with the values that
+     * match the 'key' of any properties being set. For example, if
+     * we had the following $data array:
+     *
+     * [ 'id' => 13 ]
+     *
+     * and the following rule:
+     *
+     *  'required|is_unique[users,email,id,{id}]'
+     *
+     * The value of {id} would be replaced with the actual id in the form data:
+     *
+     *  'required|is_unique[users,email,id,13]'
+     */
+    protected function fillPlaceholders(array $rules, array $data): array
+    {
+        $replacements = [];
+
+        foreach ($data as $key => $value) {
+            $replacements["{{$key}}"] = $value;
+        }
+
+        if (! empty($replacements)) {
+            foreach ($rules as &$rule) {
+                if (is_array($rule)) {
+                    foreach ($rule as &$row) {
+                        // Should only be an `errors` array
+                        // which doesn't take placeholders.
+                        if (is_array($row)) {
+                            continue;
+                        }
+
+                        $row = strtr($row, $replacements);
+                    }
+
+                    continue;
+                }
+
+                $rule = strtr($rule, $replacements);
+            }
+        }
+
+        return $rules;
+    }
+
+    /**
+     * Checks to see if an error exists for the given field.
+     */
+    public function hasError(string $field): bool
+    {
+        return array_key_exists($field, $this->getErrors());
+    }
+
+    /**
+     * Returns the error(s) for a specified $field (or empty string if not
+     * set).
+     *
+     * @param string $field Field.
+     *
+     * @return string Error(s).
+     */
+    public function getError(?string $field = null): string
+    {
+        if ($field === null && count($this->rules) === 1) {
+            $field = array_key_first($this->rules);
+        }
+
+        return array_key_exists($field, $this->getErrors()) ? $this->errors[$field] : '';
+    }
+
+    /**
+     * Returns the array of errors that were encountered during
+     * a run() call. The array should be in the following format:
+     *
+     *    [
+     *        'field1' => 'error message',
+     *        'field2' => 'error message',
+     *    ]
+     *
+     * @return array<string,string>
+     *
+     * Excluded from code coverage because that it always run as cli
+     *
+     * @codeCoverageIgnore
+     */
+    public function getErrors(): array
+    {
+        // If we already have errors, we'll use those.
+        // If we don't, check the session to see if any were
+        // passed along from a redirect_with_input request.
+        if (empty($this->errors) && ! is_cli() && isset($_SESSION, $_SESSION['_ci_validation_errors'])) {
+            $this->errors = unserialize($_SESSION['_ci_validation_errors']);
+        }
+
+        return $this->errors ?? [];
+    }
+
+    /**
+     * Sets the error for a specific field. Used by custom validation methods.
+     */
+    public function setError(string $field, string $error): ValidationInterface
+    {
+        $this->errors[$field] = $error;
+
+        return $this;
+    }
+
+    /**
+     * Attempts to find the appropriate error message
+     *
+     * @param string $param
+     * @param string $value The value that caused the validation to fail.
+     */
+    protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
+    {
+        // Check if custom message has been defined by user
+        if (isset($this->customErrors[$field][$rule])) {
+            $message = lang($this->customErrors[$field][$rule]);
+        } else {
+            // Try to grab a localized version of the message...
+            // lang() will return the rule name back if not found,
+            // so there will always be a string being returned.
+            $message = lang('Validation.' . $rule);
+        }
+
+        $message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
+        $message = str_replace('{param}', empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']), $message);
+
+        return str_replace('{value}', $value, $message);
+    }
+
+    /**
+     * Split rules string by pipe operator.
+     */
+    protected function splitRules(string $rules): array
+    {
+        $nonEscapeBracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
+        $pipeNotInBracket = sprintf(
+            '/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
+            $nonEscapeBracket,
+            $nonEscapeBracket,
+            $nonEscapeBracket
+        );
+
+        $_rules = preg_split($pipeNotInBracket, $rules);
+
+        return array_unique($_rules);
+    }
+
+    // Misc
+
+    /**
+     * Resets the class to a blank slate. Should be called whenever
+     * you need to process more than one array.
+     */
+    public function reset(): ValidationInterface
+    {
+        $this->data         = [];
+        $this->rules        = [];
+        $this->errors       = [];
+        $this->customErrors = [];
+
+        return $this;
+    }
 }
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index f4bd82037e27..dc0679a3e328 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -18,120 +18,69 @@
  */
 interface ValidationInterface
 {
-	/**
-	 * Runs the validation process, returning true/false determining whether
-	 * or not validation was successful.
-	 *
-	 * @param array  $data  The array of data to validate.
-	 * @param string $group The pre-defined group of rules to apply.
-	 *
-	 * @return boolean
-	 */
-	public function run(array $data = null, string $group = null): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Check; runs the validation process, returning true or false
-	 * determining whether or not validation was successful.
-	 *
-	 * @param mixed    $value  Value to validation.
-	 * @param string   $rule   Rule.
-	 * @param string[] $errors Errors.
-	 *
-	 * @return boolean True if valid, else false.
-	 */
-	public function check($value, string $rule, array $errors = []): bool;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes a Request object and grabs the input data to use from its
-	 * array values.
-	 *
-	 * @param RequestInterface $request
-	 *
-	 * @return ValidationInterface
-	 */
-	public function withRequest(RequestInterface $request): ValidationInterface;
-
-	//--------------------------------------------------------------------
-	// Rules
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stores the rules that should be used to validate the items.
-	 *
-	 * @param array $rules
-	 * @param array $messages
-	 *
-	 * @return ValidationInterface
-	 */
-	public function setRules(array $rules, array $messages = []): ValidationInterface;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks to see if the rule for key $field has been set or not.
-	 *
-	 * @param string $field
-	 *
-	 * @return boolean
-	 */
-	public function hasRule(string $field): bool;
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Errors
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the error for a specified $field (or empty string if not set).
-	 *
-	 * @param string $field
-	 *
-	 * @return string
-	 */
-	public function getError(string $field): string;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the array of errors that were encountered during
-	 * a run() call. The array should be in the following format:
-	 *
-	 *    [
-	 *        'field1' => 'error message',
-	 *        'field2' => 'error message',
-	 *    ]
-	 *
-	 * @return array<string,string>
-	 */
-	public function getErrors(): array;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the error for a specific field. Used by custom validation methods.
-	 *
-	 * @param string $alias
-	 * @param string $error
-	 *
-	 * @return ValidationInterface
-	 */
-	public function setError(string $alias, string $error): ValidationInterface;
-
-	//--------------------------------------------------------------------
-	// Misc
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resets the class to a blank slate. Should be called whenever
-	 * you need to process more than one array.
-	 *
-	 * @return ValidationInterface
-	 */
-	public function reset(): ValidationInterface;
-
-	//--------------------------------------------------------------------
+    /**
+     * Runs the validation process, returning true/false determining whether
+     * or not validation was successful.
+     *
+     * @param array  $data  The array of data to validate.
+     * @param string $group The pre-defined group of rules to apply.
+     */
+    public function run(?array $data = null, ?string $group = null): bool;
+
+    /**
+     * Check; runs the validation process, returning true or false
+     * determining whether or not validation was successful.
+     *
+     * @param mixed    $value  Value to validation.
+     * @param string   $rule   Rule.
+     * @param string[] $errors Errors.
+     *
+     * @return bool True if valid, else false.
+     */
+    public function check($value, string $rule, array $errors = []): bool;
+
+    /**
+     * Takes a Request object and grabs the input data to use from its
+     * array values.
+     */
+    public function withRequest(RequestInterface $request): ValidationInterface;
+
+    /**
+     * Stores the rules that should be used to validate the items.
+     */
+    public function setRules(array $rules, array $messages = []): ValidationInterface;
+
+    /**
+     * Checks to see if the rule for key $field has been set or not.
+     */
+    public function hasRule(string $field): bool;
+
+    /**
+     * Returns the error for a specified $field (or empty string if not set).
+     */
+    public function getError(string $field): string;
+
+    /**
+     * Returns the array of errors that were encountered during
+     * a run() call. The array should be in the following format:
+     *
+     *    [
+     *        'field1' => 'error message',
+     *        'field2' => 'error message',
+     *    ]
+     *
+     * @return array<string,string>
+     */
+    public function getErrors(): array;
+
+    /**
+     * Sets the error for a specific field. Used by custom validation methods.
+     */
+    public function setError(string $alias, string $error): ValidationInterface;
+
+    /**
+     * Resets the class to a blank slate. Should be called whenever
+     * you need to process more than one array.
+     */
+    public function reset(): ValidationInterface;
 }
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 8f753e68bae8..7affd2742049 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -44,212 +44,170 @@
  */
 class Cell
 {
-	/**
-	 * Instance of the current Cache Instance
-	 *
-	 * @var CacheInterface
-	 */
-	protected $cache;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Cell constructor.
-	 *
-	 * @param CacheInterface $cache
-	 */
-	public function __construct(CacheInterface $cache)
-	{
-		$this->cache = $cache;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Render a cell, returning its body as a string.
-	 *
-	 * @param string      $library
-	 * @param null        $params
-	 * @param integer     $ttl
-	 * @param string|null $cacheName
-	 *
-	 * @return string
-	 * @throws ReflectionException
-	 */
-	public function render(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
-	{
-		[$class, $method] = $this->determineClass($library);
-
-		// Is it cached?
-		$cacheName = ! empty($cacheName)
-			? $cacheName
-			: str_replace(['\\', '/'], '', $class) . $method . md5(serialize($params));
-
-		if (! empty($this->cache) && $output = $this->cache->get($cacheName))
-		{
-			return $output;
-		}
-
-		// Not cached - so grab it...
-		$instance = new $class();
-
-		if (method_exists($instance, 'initController'))
-		{
-			$instance->initController(Services::request(), Services::response(), Services::logger());
-		}
-
-		if (! method_exists($instance, $method))
-		{
-			throw ViewException::forInvalidCellMethod($class, $method);
-		}
-
-		// Try to match up the parameter list we were provided
-		// with the parameter name in the callback method.
-		$paramArray = $this->prepareParams($params);
-		$refMethod  = new ReflectionMethod($instance, $method);
-		$paramCount = $refMethod->getNumberOfParameters();
-		$refParams  = $refMethod->getParameters();
-
-		if ($paramCount === 0)
-		{
-			if (! empty($paramArray))
-			{
-				throw ViewException::forMissingCellParameters($class, $method);
-			}
-
-			$output = $instance->{$method}();
-		}
-		elseif (($paramCount === 1)
-			&& ((! array_key_exists($refParams[0]->name, $paramArray))
-			|| (array_key_exists($refParams[0]->name, $paramArray)
-			&& count($paramArray) !== 1))
-		)
-		{
-			$output = $instance->{$method}($paramArray);
-		}
-		else
-		{
-			$fireArgs     = [];
-			$methodParams = [];
-
-			foreach ($refParams as $arg)
-			{
-				$methodParams[$arg->name] = true;
-				if (array_key_exists($arg->name, $paramArray))
-				{
-					$fireArgs[$arg->name] = $paramArray[$arg->name];
-				}
-			}
-
-			foreach (array_keys($paramArray) as $key)
-			{
-				if (! isset($methodParams[$key]))
-				{
-					throw ViewException::forInvalidCellParameter($key);
-				}
-			}
-
-			$output = $instance->$method(...array_values($fireArgs));
-		}
-		// Can we cache it?
-		if (! empty($this->cache) && $ttl !== 0)
-		{
-			$this->cache->save($cacheName, $output, $ttl);
-		}
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses the params attribute. If an array, returns untouched.
-	 * If a string, it should be in the format "key1=value key2=value".
-	 * It will be split and returned as an array.
-	 *
-	 * @param mixed $params
-	 *
-	 * @return array|null
-	 */
-	public function prepareParams($params)
-	{
-		if (empty($params) || (! is_string($params) && ! is_array($params)))
-		{
-			return [];
-		}
-
-		if (is_string($params))
-		{
-			$newParams = [];
-			$separator = ' ';
-
-			if (strpos($params, ',') !== false)
-			{
-				$separator = ',';
-			}
-
-			$params = explode($separator, $params);
-			unset($separator);
-
-			foreach ($params as $p)
-			{
-				if (! empty($p))
-				{
-					[$key, $val]       = explode('=', $p);
-					$newParams[trim($key)] = trim($val, ', ');
-				}
-			}
-
-			$params = $newParams;
-
-			unset($newParams);
-		}
-
-		if (is_array($params) && empty($params))
-		{
-			return [];
-		}
-
-		return $params;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given the library string, attempts to determine the class and method
-	 * to call.
-	 *
-	 * @param string $library
-	 *
-	 * @return array
-	 */
-	protected function determineClass(string $library): array
-	{
-		// We don't want to actually call static methods
-		// by default, so convert any double colons.
-		$library = str_replace('::', ':', $library);
-
-		[$class, $method] = explode(':', $library);
-
-		if (empty($class))
-		{
-			throw ViewException::forNoCellClass();
-		}
-
-		if (! class_exists($class, true))
-		{
-			throw ViewException::forInvalidCellClass($class);
-		}
-
-		if (empty($method))
-		{
-			$method = 'index';
-		}
-
-		return [
-			$class,
-			$method,
-		];
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Instance of the current Cache Instance
+     *
+     * @var CacheInterface
+     */
+    protected $cache;
+
+    /**
+     * Cell constructor.
+     */
+    public function __construct(CacheInterface $cache)
+    {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Render a cell, returning its body as a string.
+     *
+     * @param null $params
+     *
+     * @throws ReflectionException
+     */
+    public function render(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
+    {
+        [$class, $method] = $this->determineClass($library);
+
+        // Is it cached?
+        $cacheName = ! empty($cacheName)
+            ? $cacheName
+            : str_replace(['\\', '/'], '', $class) . $method . md5(serialize($params));
+
+        if (! empty($this->cache) && $output = $this->cache->get($cacheName)) {
+            return $output;
+        }
+
+        // Not cached - so grab it...
+        $instance = new $class();
+
+        if (method_exists($instance, 'initController')) {
+            $instance->initController(Services::request(), Services::response(), Services::logger());
+        }
+
+        if (! method_exists($instance, $method)) {
+            throw ViewException::forInvalidCellMethod($class, $method);
+        }
+
+        // Try to match up the parameter list we were provided
+        // with the parameter name in the callback method.
+        $paramArray = $this->prepareParams($params);
+        $refMethod  = new ReflectionMethod($instance, $method);
+        $paramCount = $refMethod->getNumberOfParameters();
+        $refParams  = $refMethod->getParameters();
+
+        if ($paramCount === 0) {
+            if (! empty($paramArray)) {
+                throw ViewException::forMissingCellParameters($class, $method);
+            }
+
+            $output = $instance->{$method}();
+        } elseif (($paramCount === 1)
+            && ((! array_key_exists($refParams[0]->name, $paramArray))
+            || (array_key_exists($refParams[0]->name, $paramArray)
+            && count($paramArray) !== 1))
+        ) {
+            $output = $instance->{$method}($paramArray);
+        } else {
+            $fireArgs     = [];
+            $methodParams = [];
+
+            foreach ($refParams as $arg) {
+                $methodParams[$arg->name] = true;
+                if (array_key_exists($arg->name, $paramArray)) {
+                    $fireArgs[$arg->name] = $paramArray[$arg->name];
+                }
+            }
+
+            foreach (array_keys($paramArray) as $key) {
+                if (! isset($methodParams[$key])) {
+                    throw ViewException::forInvalidCellParameter($key);
+                }
+            }
+
+            $output = $instance->{$method}(...array_values($fireArgs));
+        }
+        // Can we cache it?
+        if (! empty($this->cache) && $ttl !== 0) {
+            $this->cache->save($cacheName, $output, $ttl);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Parses the params attribute. If an array, returns untouched.
+     * If a string, it should be in the format "key1=value key2=value".
+     * It will be split and returned as an array.
+     *
+     * @param mixed $params
+     *
+     * @return array|null
+     */
+    public function prepareParams($params)
+    {
+        if (empty($params) || (! is_string($params) && ! is_array($params))) {
+            return [];
+        }
+
+        if (is_string($params)) {
+            $newParams = [];
+            $separator = ' ';
+
+            if (strpos($params, ',') !== false) {
+                $separator = ',';
+            }
+
+            $params = explode($separator, $params);
+            unset($separator);
+
+            foreach ($params as $p) {
+                if (! empty($p)) {
+                    [$key, $val] = explode('=', $p);
+
+                    $newParams[trim($key)] = trim($val, ', ');
+                }
+            }
+
+            $params = $newParams;
+            unset($newParams);
+        }
+
+        if (is_array($params) && empty($params)) {
+            return [];
+        }
+
+        return $params;
+    }
+
+    /**
+     * Given the library string, attempts to determine the class and method
+     * to call.
+     */
+    protected function determineClass(string $library): array
+    {
+        // We don't want to actually call static methods
+        // by default, so convert any double colons.
+        $library = str_replace('::', ':', $library);
+
+        [$class, $method] = explode(':', $library);
+
+        if (empty($class)) {
+            throw ViewException::forNoCellClass();
+        }
+
+        if (! class_exists($class, true)) {
+            throw ViewException::forInvalidCellClass($class);
+        }
+
+        if (empty($method)) {
+            $method = 'index';
+        }
+
+        return [
+            $class,
+            $method,
+        ];
+    }
 }
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
index fc8d3be1706f..f2643e44ed7e 100644
--- a/system/View/Exceptions/ViewException.php
+++ b/system/View/Exceptions/ViewException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View\Exceptions;
@@ -15,33 +15,33 @@
 
 class ViewException extends FrameworkException
 {
-	public static function forInvalidCellMethod(string $class, string $method)
-	{
-		return new static(lang('View.invalidCellMethod', ['class' => $class, 'method' => $method]));
-	}
-
-	public static function forMissingCellParameters(string $class, string $method)
-	{
-		return new static(lang('View.missingCellParameters', ['class' => $class, 'method' => $method]));
-	}
-
-	public static function forInvalidCellParameter(string $key)
-	{
-		return new static(lang('View.invalidCellParameter', [$key]));
-	}
-
-	public static function forNoCellClass()
-	{
-		return new static(lang('View.noCellClass'));
-	}
-
-	public static function forInvalidCellClass(string $class = null)
-	{
-		return new static(lang('View.invalidCellClass', [$class]));
-	}
-
-	public static function forTagSyntaxError(string $output)
-	{
-		return new static(lang('View.tagSyntaxError', [$output]));
-	}
+    public static function forInvalidCellMethod(string $class, string $method)
+    {
+        return new static(lang('View.invalidCellMethod', ['class' => $class, 'method' => $method]));
+    }
+
+    public static function forMissingCellParameters(string $class, string $method)
+    {
+        return new static(lang('View.missingCellParameters', ['class' => $class, 'method' => $method]));
+    }
+
+    public static function forInvalidCellParameter(string $key)
+    {
+        return new static(lang('View.invalidCellParameter', [$key]));
+    }
+
+    public static function forNoCellClass()
+    {
+        return new static(lang('View.noCellClass'));
+    }
+
+    public static function forInvalidCellClass(?string $class = null)
+    {
+        return new static(lang('View.invalidCellClass', [$class]));
+    }
+
+    public static function forTagSyntaxError(string $output)
+    {
+        return new static(lang('View.tagSyntaxError', [$output]));
+    }
 }
diff --git a/system/View/Filters.php b/system/View/Filters.php
index cae51b92c2fa..86fd23c4b0a6 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -19,315 +19,226 @@
  */
 class Filters
 {
-	/**
-	 * Returns $value as all lowercase with the first letter capitalized.
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public static function capitalize(string $value): string
-	{
-		return ucfirst(strtolower($value));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Formats a date into the given $format.
-	 *
-	 * @param mixed  $value
-	 * @param string $format
-	 *
-	 * @return string
-	 */
-	public static function date($value, string $format): string
-	{
-		if (is_string($value) && ! is_numeric($value))
-		{
-			$value = strtotime($value);
-		}
-
-		return date($format, $value);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given a string or DateTime object, will return the date modified
-	 * by the given value. Returns the value as a unix timestamp
-	 *
-	 * Example:
-	 *      my_date|date_modify(+1 day)
-	 *
-	 * @param string $value
-	 * @param string $adjustment
-	 *
-	 * @return   integer|false
-	 * @internal param string $format
-	 */
-	public static function date_modify($value, string $adjustment)
-	{
-		$value = static::date($value, 'Y-m-d H:i:s');
-
-		return strtotime($adjustment, strtotime($value));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the given default value if $value is empty or undefined.
-	 *
-	 * @param mixed  $value
-	 * @param string $default
-	 *
-	 * @return string
-	 */
-	public static function default($value, string $default): string
-	{
-		return empty($value)
-			? $default
-			: $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Escapes the given value with our `esc()` helper function.
-	 *
-	 * @param string $value
-	 * @param string $context
-	 *
-	 * @return string
-	 */
-	public static function esc($value, string $context = 'html'): string
-	{
-		return esc($value, $context);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an excerpt of the given string.
-	 *
-	 * @param string  $value
-	 * @param string  $phrase
-	 * @param integer $radius
-	 *
-	 * @return string
-	 */
-	public static function excerpt(string $value, string $phrase, int $radius = 100): string
-	{
-		helper('text');
-
-		return excerpt($value, $phrase, $radius);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Highlights a given phrase within the text using '<mark></mark>' tags.
-	 *
-	 * @param string $value
-	 * @param string $phrase
-	 *
-	 * @return string
-	 */
-	public static function highlight(string $value, string $phrase): string
-	{
-		helper('text');
-
-		return highlight_phrase($value, $phrase);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Highlights code samples with HTML/CSS.
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public static function highlight_code($value): string
-	{
-		helper('text');
-
-		return highlight_code($value);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Limits the number of characters to $limit, and trails of with an ellipsis.
-	 * Will break at word break so may be more or less than $limit.
-	 *
-	 * @param string  $value
-	 * @param integer $limit
-	 *
-	 * @return string
-	 */
-	public static function limit_chars($value, int $limit = 500): string
-	{
-		helper('text');
-
-		return character_limiter($value, $limit);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Limits the number of words to $limit, and trails of with an ellipsis.
-	 *
-	 * @param string  $value
-	 * @param integer $limit
-	 *
-	 * @return string
-	 */
-	public static function limit_words($value, int $limit = 100): string
-	{
-		helper('text');
-
-		return word_limiter($value, $limit);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the $value displayed in a localized manner.
-	 *
-	 * @param integer|float $value
-	 * @param integer       $precision
-	 * @param string        $type
-	 * @param string|null   $locale
-	 *
-	 * @return string
-	 */
-	public static function local_number($value, string $type = 'decimal', int $precision = 4, string $locale = null): string
-	{
-		helper('number');
-
-		$types = [
-			'decimal'    => NumberFormatter::DECIMAL,
-			'currency'   => NumberFormatter::CURRENCY,
-			'percent'    => NumberFormatter::PERCENT,
-			'scientific' => NumberFormatter::SCIENTIFIC,
-			'spellout'   => NumberFormatter::SPELLOUT,
-			'ordinal'    => NumberFormatter::ORDINAL,
-			'duration'   => NumberFormatter::DURATION,
-		];
-
-		return format_number($value, $precision, $locale, ['type' => $types[$type]]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the $value displayed as a currency string.
-	 *
-	 * @param integer|float $value
-	 * @param string        $currency
-	 * @param string|null   $locale
-	 * @param integer       $fraction
-	 *
-	 * @return string
-	 */
-	public static function local_currency($value, string $currency, string $locale = null, $fraction = null): string
-	{
-		helper('number');
-
-		$options = [
-			'type'     => NumberFormatter::CURRENCY,
-			'currency' => $currency,
-			'fraction' => $fraction,
-		];
-
-		return format_number($value, 2, $locale, $options);
-	}
-
-	/**
-	 * Returns a string with all instances of newline character (\n)
-	 * converted to an HTML <br/> tag.
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public static function nl2br(string $value): string
-	{
-		$typography = Services::typography();
-
-		return $typography->nl2brExceptPre($value);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes a body of text and uses the auto_typography() method to
-	 * turn it into prettier, easier-to-read, prose.
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public static function prose(string $value): string
-	{
-		$typography = Services::typography();
-
-		return $typography->autoTypography($value);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Rounds a given $value in one of 3 ways;
-	 *
-	 *  - common    Normal rounding
-	 *  - ceil      always rounds up
-	 *  - floor     always rounds down
-	 *
-	 * @param string $value
-	 * @param mixed  $precision
-	 * @param string $type
-	 *
-	 * @return string|float
-	 */
-	public static function round(string $value, $precision = 2, string $type = 'common')
-	{
-		if (! is_numeric($precision))
-		{
-			$type      = $precision;
-			$precision = 2;
-		}
-
-		switch ($type)
-		{
-			case 'common':
-				return round((float) $value, $precision);
-			case 'ceil':
-				return ceil((float) $value);
-			case 'floor':
-				return floor((float) $value);
-		}
-
-		// Still here, just return the value.
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a "title case" version of the string.
-	 *
-	 * @param string $value
-	 *
-	 * @return string
-	 */
-	public static function title(string $value): string
-	{
-		return ucwords(strtolower($value));
-	}
-
-	//--------------------------------------------------------------------
-
+    /**
+     * Returns $value as all lowercase with the first letter capitalized.
+     */
+    public static function capitalize(string $value): string
+    {
+        return ucfirst(strtolower($value));
+    }
+
+    /**
+     * Formats a date into the given $format.
+     *
+     * @param mixed $value
+     */
+    public static function date($value, string $format): string
+    {
+        if (is_string($value) && ! is_numeric($value)) {
+            $value = strtotime($value);
+        }
+
+        return date($format, $value);
+    }
+
+    /**
+     * Given a string or DateTime object, will return the date modified
+     * by the given value. Returns the value as a unix timestamp
+     *
+     * Example:
+     *      my_date|date_modify(+1 day)
+     *
+     * @param string $value
+     *
+     * @return false|int
+     */
+    public static function date_modify($value, string $adjustment)
+    {
+        $value = static::date($value, 'Y-m-d H:i:s');
+
+        return strtotime($adjustment, strtotime($value));
+    }
+
+    /**
+     * Returns the given default value if $value is empty or undefined.
+     *
+     * @param mixed $value
+     */
+    public static function default($value, string $default): string
+    {
+        return empty($value)
+            ? $default
+            : $value;
+    }
+
+    /**
+     * Escapes the given value with our `esc()` helper function.
+     *
+     * @param string $value
+     */
+    public static function esc($value, string $context = 'html'): string
+    {
+        return esc($value, $context);
+    }
+
+    /**
+     * Returns an excerpt of the given string.
+     */
+    public static function excerpt(string $value, string $phrase, int $radius = 100): string
+    {
+        helper('text');
+
+        return excerpt($value, $phrase, $radius);
+    }
+
+    /**
+     * Highlights a given phrase within the text using '<mark></mark>' tags.
+     */
+    public static function highlight(string $value, string $phrase): string
+    {
+        helper('text');
+
+        return highlight_phrase($value, $phrase);
+    }
+
+    /**
+     * Highlights code samples with HTML/CSS.
+     *
+     * @param string $value
+     */
+    public static function highlight_code($value): string
+    {
+        helper('text');
+
+        return highlight_code($value);
+    }
+
+    /**
+     * Limits the number of characters to $limit, and trails of with an ellipsis.
+     * Will break at word break so may be more or less than $limit.
+     *
+     * @param string $value
+     */
+    public static function limit_chars($value, int $limit = 500): string
+    {
+        helper('text');
+
+        return character_limiter($value, $limit);
+    }
+
+    /**
+     * Limits the number of words to $limit, and trails of with an ellipsis.
+     *
+     * @param string $value
+     */
+    public static function limit_words($value, int $limit = 100): string
+    {
+        helper('text');
+
+        return word_limiter($value, $limit);
+    }
+
+    /**
+     * Returns the $value displayed in a localized manner.
+     *
+     * @param float|int $value
+     */
+    public static function local_number($value, string $type = 'decimal', int $precision = 4, ?string $locale = null): string
+    {
+        helper('number');
+
+        $types = [
+            'decimal'    => NumberFormatter::DECIMAL,
+            'currency'   => NumberFormatter::CURRENCY,
+            'percent'    => NumberFormatter::PERCENT,
+            'scientific' => NumberFormatter::SCIENTIFIC,
+            'spellout'   => NumberFormatter::SPELLOUT,
+            'ordinal'    => NumberFormatter::ORDINAL,
+            'duration'   => NumberFormatter::DURATION,
+        ];
+
+        return format_number($value, $precision, $locale, ['type' => $types[$type]]);
+    }
+
+    /**
+     * Returns the $value displayed as a currency string.
+     *
+     * @param float|int $value
+     * @param int       $fraction
+     */
+    public static function local_currency($value, string $currency, ?string $locale = null, $fraction = null): string
+    {
+        helper('number');
+
+        $options = [
+            'type'     => NumberFormatter::CURRENCY,
+            'currency' => $currency,
+            'fraction' => $fraction,
+        ];
+
+        return format_number($value, 2, $locale, $options);
+    }
+
+    /**
+     * Returns a string with all instances of newline character (\n)
+     * converted to an HTML <br/> tag.
+     */
+    public static function nl2br(string $value): string
+    {
+        $typography = Services::typography();
+
+        return $typography->nl2brExceptPre($value);
+    }
+
+    /**
+     * Takes a body of text and uses the auto_typography() method to
+     * turn it into prettier, easier-to-read, prose.
+     */
+    public static function prose(string $value): string
+    {
+        $typography = Services::typography();
+
+        return $typography->autoTypography($value);
+    }
+
+    /**
+     * Rounds a given $value in one of 3 ways;
+     *
+     *  - common    Normal rounding
+     *  - ceil      always rounds up
+     *  - floor     always rounds down
+     *
+     * @param mixed $precision
+     *
+     * @return float|string
+     */
+    public static function round(string $value, $precision = 2, string $type = 'common')
+    {
+        if (! is_numeric($precision)) {
+            $type      = $precision;
+            $precision = 2;
+        }
+
+        switch ($type) {
+            case 'common':
+                return round((float) $value, $precision);
+
+            case 'ceil':
+                return ceil((float) $value);
+
+            case 'floor':
+                return floor((float) $value);
+        }
+
+        // Still here, just return the value.
+        return $value;
+    }
+
+    /**
+     * Returns a "title case" version of the string.
+     */
+    public static function title(string $value): string
+    {
+        return ucwords(strtolower($value));
+    }
 }
diff --git a/system/View/Parser.php b/system/View/Parser.php
index b3cef4b4a1c1..c58f2b427dc5 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -21,820 +21,664 @@
  */
 class Parser extends View
 {
-	/**
-	 * Left delimiter character for pseudo vars
-	 *
-	 * @var string
-	 */
-	public $leftDelimiter = '{';
-
-	/**
-	 * Right delimiter character for pseudo vars
-	 *
-	 * @var string
-	 */
-	public $rightDelimiter = '}';
-
-	/**
-	 * Stores extracted noparse blocks.
-	 *
-	 * @var array
-	 */
-	protected $noparseBlocks = [];
-
-	/**
-	 * Stores any plugins registered at run-time.
-	 *
-	 * @var array
-	 */
-	protected $plugins = [];
-
-	/**
-	 * Stores the context for each data element
-	 * when set by `setData` so the context is respected.
-	 *
-	 * @var array
-	 */
-	protected $dataContexts = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Constructor
-	 *
-	 * @param ViewConfig      $config
-	 * @param string          $viewPath
-	 * @param mixed           $loader
-	 * @param boolean         $debug
-	 * @param LoggerInterface $logger
-	 */
-	public function __construct(ViewConfig $config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
-	{
-		// Ensure user plugins override core plugins.
-		$this->plugins = $config->plugins ?? [];
-
-		parent::__construct($config, $viewPath, $loader, $debug, $logger);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a template
-	 *
-	 * Parses pseudo-variables contained in the specified template view,
-	 * replacing them with any data that has already been set.
-	 *
-	 * @param string  $view
-	 * @param array   $options
-	 * @param boolean $saveData
-	 *
-	 * @return string
-	 */
-	public function render(string $view, array $options = null, bool $saveData = null): string
-	{
-		$start = microtime(true);
-		if (is_null($saveData))
-		{
-			$saveData = $this->config->saveData;
-		}
-
-		$fileExt = pathinfo($view, PATHINFO_EXTENSION);
-		$view    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
-
-		$cacheName = $options['cache_name'] ?? str_replace('.php', '', $view);
-
-		// Was it cached?
-		if (isset($options['cache']) && ($output = cache($cacheName)))
-		{
-			$this->logPerformance($start, microtime(true), $view);
-			return $output;
-		}
-
-		$file = $this->viewPath . $view;
-
-		if (! is_file($file))
-		{
-			$fileOrig = $file;
-			$file     = $this->loader->locateFile($view, 'Views');
-
-			// locateFile will return an empty string if the file cannot be found.
-			if (empty($file))
-			{
-				throw ViewException::forInvalidFile($fileOrig);
-			}
-		}
-
-		if (is_null($this->tempData))
-		{
-			$this->tempData = $this->data;
-		}
-
-		$template = file_get_contents($file);
-		$output   = $this->parse($template, $this->tempData, $options);
-		$this->logPerformance($start, microtime(true), $view);
-
-		if ($saveData)
-		{
-			$this->data = $this->tempData;
-		}
-		// Should we cache?
-		if (isset($options['cache']))
-		{
-			cache()->save($cacheName, $output, (int) $options['cache']);
-		}
-		$this->tempData = null;
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a String
-	 *
-	 * Parses pseudo-variables contained in the specified string,
-	 * replacing them with any data that has already been set.
-	 *
-	 * @param string  $template
-	 * @param array   $options
-	 * @param boolean $saveData
-	 *
-	 * @return string
-	 */
-	public function renderString(string $template, array $options = null, bool $saveData = null): string
-	{
-		$start = microtime(true);
-		if (is_null($saveData))
-		{
-			$saveData = $this->config->saveData;
-		}
-
-		if (is_null($this->tempData))
-		{
-			$this->tempData = $this->data;
-		}
-
-		$output = $this->parse($template, $this->tempData, $options);
-
-		$this->logPerformance($start, microtime(true), $this->excerpt($template));
-
-		if ($saveData)
-		{
-			$this->data = $this->tempData;
-		}
-
-		$this->tempData = null;
-
-		return $output;
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Sets several pieces of view data at once.
-	 * In the Parser, we need to store the context here
-	 * so that the variable is correctly handled within the
-	 * parsing itself, and contexts (including raw) are respected.
-	 *
-	 * @param array  $data
-	 * @param string $context The context to escape it for: html, css, js, url, raw
-	 *                        If 'raw', no escaping will happen
-	 *
-	 * @return RendererInterface
-	 */
-	public function setData(array $data = [], string $context = null): RendererInterface
-	{
-		if (! empty($context))
-		{
-			foreach ($data as $key => &$value)
-			{
-				if (is_array($value))
-				{
-					foreach ($value as &$obj)
-					{
-						$obj = $this->objectToArray($obj);
-					}
-				}
-				else
-				{
-					$value = $this->objectToArray($value);
-				}
-
-				$this->dataContexts[$key] = $context;
-			}
-		}
-
-		$this->tempData = $this->tempData ?? $this->data;
-		$this->tempData = array_merge($this->tempData, $data);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a template
-	 *
-	 * Parses pseudo-variables contained in the specified template,
-	 * replacing them with the data in the second param
-	 *
-	 * @param string $template
-	 * @param array  $data
-	 * @param array  $options  Future options
-	 *
-	 * @return string
-	 */
-	protected function parse(string $template, array $data = [], array $options = null): string
-	{
-		if ($template === '')
-		{
-			return '';
-		}
-
-		// Remove any possible PHP tags since we don't support it
-		// and parseConditionals needs it clean anyway...
-		$template = str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $template);
-
-		$template = $this->parseComments($template);
-		$template = $this->extractNoparse($template);
-
-		// Replace any conditional code here so we don't have to parse as much
-		$template = $this->parseConditionals($template);
-
-		// Handle any plugins before normal data, so that
-		// it can potentially modify any template between its tags.
-		$template = $this->parsePlugins($template);
-
-		// loop over the data variables, replacing
-		// the content as we go.
-		foreach ($data as $key => $val)
-		{
-			$escape = true;
-
-			if (is_array($val))
-			{
-				$escape  = false;
-				$replace = $this->parsePair($key, $val, $template);
-			}
-			else
-			{
-				$replace = $this->parseSingle($key, (string) $val);
-			}
-
-			foreach ($replace as $pattern => $content)
-			{
-				$template = $this->replaceSingle($pattern, $content, $template, $escape);
-			}
-		}
-
-		return $this->insertNoparse($template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a single key/value, extracting it
-	 *
-	 * @param  string $key
-	 * @param  string $val
-	 * @return array
-	 */
-	protected function parseSingle(string $key, string $val): array
-	{
-		$pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ms';
-
-		return [$pattern => $val];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parse a tag pair
-	 *
-	 * Parses tag pairs: {some_tag} string... {/some_tag}
-	 *
-	 * @param  string $variable
-	 * @param  array  $data
-	 * @param  string $template
-	 * @return array
-	 */
-	protected function parsePair(string $variable, array $data, string $template): array
-	{
-		// Holds the replacement patterns and contents
-		// that will be used within a preg_replace in parse()
-		$replace = [];
-
-		// Find all matches of space-flexible versions of {tag}{/tag} so we
-		// have something to loop over.
-		preg_match_all(
-			'#' . $this->leftDelimiter . '\s*' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '(.+?)' .
-			$this->leftDelimiter . '\s*' . '/' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
-		);
-
-		/*
-		 * Each match looks like:
-		 *
-		 * $match[0] {tag}...{/tag}
-		 * $match[1] Contents inside the tag
-		 */
-		foreach ($matches as $match)
-		{
-			// Loop over each piece of $data, replacing
-			// it's contents so that we know what to replace in parse()
-			$str = '';  // holds the new contents for this tag pair.
-			foreach ($data as $row)
-			{
-				// Objects that have a `toArray()` method should be
-				// converted with that method (i.e. Entities)
-				if (is_object($row) && method_exists($row, 'toArray'))
-				{
-					$row = $row->toArray();
-				}
-				// Otherwise, cast as an array and it will grab public properties.
-				elseif (is_object($row))
-				{
-					$row = (array) $row;
-				}
-
-				$temp  = [];
-				$pairs = [];
-				$out   = $match[1];
-				foreach ($row as $key => $val)
-				{
-					// For nested data, send us back through this method...
-					if (is_array($val))
-					{
-						$pair = $this->parsePair($key, $val, $match[1]);
-
-						if (! empty($pair))
-						{
-							$pairs[array_keys($pair)[0]] = true;
-
-							$temp = array_merge($temp, $pair);
-						}
-
-						continue;
-					}
-
-					if (is_object($val))
-					{
-						$val = 'Class: ' . get_class($val);
-					}
-					elseif (is_resource($val))
-					{
-						$val = 'Resource';
-					}
-
-					$temp['#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#s'] = $val;
-				}
-
-				// Now replace our placeholders with the new content.
-				foreach ($temp as $pattern => $content)
-				{
-					$out = $this->replaceSingle($pattern, $content, $out, ! isset($pairs[$pattern]));
-				}
-
-				$str .= $out;
-			}
-
-			//Escape | character from filters as it's handled as OR in regex
-			$escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
-
-			$replace['#' . $escapedMatch . '#s'] = $str;
-		}
-
-		return $replace;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes any comments from the file. Comments are wrapped in {# #} symbols:
-	 *
-	 *      {# This is a comment #}
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	protected function parseComments(string $template): string
-	{
-		return preg_replace('/\{#.*?#\}/s', '', $template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Extracts noparse blocks, inserting a hash in its place so that
-	 * those blocks of the page are not touched by parsing.
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	protected function extractNoparse(string $template): string
-	{
-		$pattern = '/\{\s*noparse\s*\}(.*?)\{\s*\/noparse\s*\}/ms';
-
-		/*
-		 * $matches[][0] is the raw match
-		 * $matches[][1] is the contents
-		 */
-		if (preg_match_all($pattern, $template, $matches, PREG_SET_ORDER))
-		{
-			foreach ($matches as $match)
-			{
-				// Create a hash of the contents to insert in its place.
-				$hash                       = md5($match[1]);
-				$this->noparseBlocks[$hash] = $match[1];
-				$template                   = str_replace($match[0], "noparse_{$hash}", $template);
-			}
-		}
-
-		return $template;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Re-inserts the noparsed contents back into the template.
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	public function insertNoparse(string $template): string
-	{
-		foreach ($this->noparseBlocks as $hash => $replace)
-		{
-			$template = str_replace("noparse_{$hash}", $replace, $template);
-			unset($this->noparseBlocks[$hash]);
-		}
-
-		return $template;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Parses any conditionals in the code, removing blocks that don't
-	 * pass so we don't try to parse it later.
-	 *
-	 * Valid conditionals:
-	 *  - if
-	 *  - elseif
-	 *  - else
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	protected function parseConditionals(string $template): string
-	{
-		$pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms';
-
-		/**
-		 * For each match:
-		 * [0] = raw match `{if var}`
-		 * [1] = conditional `if`
-		 * [2] = condition `do === true`
-		 * [3] = same as [2]
-		 */
-		preg_match_all($pattern, $template, $matches, PREG_SET_ORDER);
-
-		foreach ($matches as $match)
-		{
-			// Build the string to replace the `if` statement with.
-			$condition = $match[2];
-
-			$statement = $match[1] === 'elseif' ? '<?php elseif (' . $condition . '): ?>' : '<?php if (' . $condition . '): ?>';
-			$template  = str_replace($match[0], $statement, $template);
-		}
-
-		$template = preg_replace('/\{\s*else\s*\}/ms', '<?php else: ?>', $template);
-		$template = preg_replace('/\{\s*endif\s*\}/ms', '<?php endif; ?>', $template);
-
-		// Parse the PHP itself, or insert an error so they can debug
-		ob_start();
-
-		if (is_null($this->tempData))
-		{
-			$this->tempData = $this->data;
-		}
-
-		extract($this->tempData);
-
-		try
-		{
-			eval('?>' . $template . '<?php ');
-		}
-		catch (ParseError $e)
-		{
-			ob_end_clean();
-			throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
-		}
-
-		return ob_get_clean();
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Over-ride the substitution field delimiters.
-	 *
-	 * @param  string $leftDelimiter
-	 * @param  string $rightDelimiter
-	 * @return RendererInterface
-	 */
-	public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface
-	{
-		$this->leftDelimiter  = $leftDelimiter;
-		$this->rightDelimiter = $rightDelimiter;
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles replacing a pseudo-variable with the actual content. Will double-check
-	 * for escaping brackets.
-	 *
-	 * @param mixed   $pattern
-	 * @param string  $content
-	 * @param string  $template
-	 * @param boolean $escape
-	 *
-	 * @return string
-	 */
-	protected function replaceSingle($pattern, $content, $template, bool $escape = false): string
-	{
-		// Any dollar signs in the pattern will be misinterpreted, so slash them
-		$pattern = addcslashes($pattern, '$');
-		$content = (string) $content;
-
-		// Flesh out the main pattern from the delimiters and escape the hash
-		// See https://regex101.com/r/IKdUlk/1
-		if (preg_match('/^(#)(.+)(#(m?s)?)$/s', $pattern, $parts))
-		{
-			$pattern = $parts[1] . addcslashes($parts[2], '#') . $parts[3];
-		}
-
-		// Replace the content in the template
-		return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
-			// Check for {! !} syntax to not escape this one.
-			if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}')
-			{
-				$escape = false;
-			}
-
-			return $this->prepareReplacement($matches, $content, $escape);
-		}, (string) $template);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Callback used during parse() to apply any filters to the value.
-	 *
-	 * @param array   $matches
-	 * @param string  $replace
-	 * @param boolean $escape
-	 *
-	 * @return string
-	 */
-	protected function prepareReplacement(array $matches, string $replace, bool $escape = true): string
-	{
-		$orig = array_shift($matches);
-
-		// Our regex earlier will leave all chained values on a single line
-		// so we need to break them apart so we can apply them all.
-		$filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
-
-		if ($escape && empty($filters) && ($context = $this->shouldAddEscaping($orig)))
-		{
-			$filters[] = "esc({$context})";
-		}
-
-		return $this->applyFilters($replace, $filters);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Checks the placeholder the view provided to see if we need to provide any autoescaping.
-	 *
-	 * @param string $key
-	 *
-	 * @return false|string
-	 */
-	public function shouldAddEscaping(string $key)
-	{
-		$escape = false;
-
-		$key = trim(str_replace(['{', '}'], '', $key));
-
-		// If the key has a context stored (from setData)
-		// we need to respect that.
-		if (array_key_exists($key, $this->dataContexts))
-		{
-			if ($this->dataContexts[$key] !== 'raw')
-			{
-				return $this->dataContexts[$key];
-			}
-		}
-		// No pipes, then we know we need to escape
-		elseif (strpos($key, '|') === false)
-		{
-			$escape = 'html';
-		}
-		// If there's a `noescape` then we're definitely false.
-		elseif (strpos($key, 'noescape') !== false)
-		{
-			$escape = false;
-		}
-		// If no `esc` filter is found, then we'll need to add one.
-		elseif (! preg_match('/\s+esc/', $key))
-		{
-			$escape = 'html';
-		}
-
-		return $escape;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Given a set of filters, will apply each of the filters in turn
-	 * to $replace, and return the modified string.
-	 *
-	 * @param string $replace
-	 * @param array  $filters
-	 *
-	 * @return string
-	 */
-	protected function applyFilters(string $replace, array $filters): string
-	{
-		// Determine the requested filters
-		foreach ($filters as $filter)
-		{
-			// Grab any parameter we might need to send
-			preg_match('/\([\w<>=\/\\\,:.\-\s\+]+\)/', $filter, $param);
-
-			// Remove the () and spaces to we have just the parameter left
-			$param = ! empty($param) ? trim($param[0], '() ') : null;
-
-			// Params can be separated by commas to allow multiple parameters for the filter
-			if (! empty($param))
-			{
-				$param = explode(',', $param);
-
-				// Clean it up
-				foreach ($param as &$p)
-				{
-					$p = trim($p, ' "');
-				}
-			}
-			else
-			{
-				$param = [];
-			}
-
-			// Get our filter name
-			$filter = ! empty($param) ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
-
-			if (! array_key_exists($filter, $this->config->filters))
-			{
-				continue;
-			}
-
-			// Filter it....
-			$replace = $this->config->filters[$filter]($replace, ...$param);
-		}
-
-		return $replace;
-	}
-
-	//--------------------------------------------------------------------
-	// Plugins
-	//--------------------------------------------------------------------
-
-	/**
-	 * Scans the template for any parser plugins, and attempts to execute them.
-	 * Plugins are delimited by {+ ... +}
-	 *
-	 * @param string $template
-	 *
-	 * @return string
-	 */
-	protected function parsePlugins(string $template)
-	{
-		foreach ($this->plugins as $plugin => $callable)
-		{
-			// Paired tags are enclosed in an array in the config array.
-			$isPair   = is_array($callable);
-			$callable = $isPair ? array_shift($callable) : $callable;
-
-			// See https://regex101.com/r/BCBBKB/1
-			$pattern = $isPair
-				? '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}(.+?)\{\+\s*/' . $plugin . '\s*\+\}#ims'
-				: '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}#ims';
-
-			/**
-			 * Match tag pairs
-			 *
-			 * Each match is an array:
-			 *   $matches[0] = entire matched string
-			 *   $matches[1] = all parameters string in opening tag
-			 *   $matches[2] = content between the tags to send to the plugin.
-			 */
-			if (! preg_match_all($pattern, $template, $matches, PREG_SET_ORDER))
-			{
-				continue;
-			}
-
-			foreach ($matches as $match)
-			{
-				$params = [];
-
-				preg_match_all('/([\w-]+=\"[^"]+\")|([\w-]+=[^\"\s=]+)|(\"[^"]+\")|(\S+)/', trim($match[1]), $matchesParams);
-
-				foreach ($matchesParams[0] as $item)
-				{
-					$keyVal = explode('=', $item);
-
-					if (count($keyVal) === 2)
-					{
-						$params[$keyVal[0]] = str_replace('"', '', $keyVal[1]);
-					}
-					else
-					{
-						$params[] = str_replace('"', '', $item);
-					}
-				}
-
-				$template = $isPair
-					? str_replace($match[0], $callable($match[2], $params), $template)
-					: str_replace($match[0], $callable($params), $template);
-			}
-		}
-
-		return $template;
-	}
-
-	/**
-	 * Makes a new plugin available during the parsing of the template.
-	 *
-	 * @param string   $alias
-	 * @param callable $callback
-	 *
-	 * @param boolean  $isPair
-	 *
-	 * @return $this
-	 */
-	public function addPlugin(string $alias, callable $callback, bool $isPair = false)
-	{
-		$this->plugins[$alias] = $isPair ? [$callback] : $callback;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes a plugin from the available plugins.
-	 *
-	 * @param string $alias
-	 *
-	 * @return $this
-	 */
-	public function removePlugin(string $alias)
-	{
-		unset($this->plugins[$alias]);
-
-		return $this;
-	}
-
-	/**
-	 * Converts an object to an array, respecting any
-	 * toArray() methods on an object.
-	 *
-	 * @param mixed $value
-	 *
-	 * @return mixed
-	 */
-	protected function objectToArray($value)
-	{
-		// Objects that have a `toArray()` method should be
-		// converted with that method (i.e. Entities)
-		if (is_object($value) && method_exists($value, 'toArray'))
-		{
-			$value = $value->toArray();
-		}
-		// Otherwise, cast as an array and it will grab public properties.
-		elseif (is_object($value))
-		{
-			$value = (array) $value;
-		}
-
-		return $value;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Left delimiter character for pseudo vars
+     *
+     * @var string
+     */
+    public $leftDelimiter = '{';
+
+    /**
+     * Right delimiter character for pseudo vars
+     *
+     * @var string
+     */
+    public $rightDelimiter = '}';
+
+    /**
+     * Stores extracted noparse blocks.
+     *
+     * @var array
+     */
+    protected $noparseBlocks = [];
+
+    /**
+     * Stores any plugins registered at run-time.
+     *
+     * @var array
+     */
+    protected $plugins = [];
+
+    /**
+     * Stores the context for each data element
+     * when set by `setData` so the context is respected.
+     *
+     * @var array
+     */
+    protected $dataContexts = [];
+
+    /**
+     * Constructor
+     *
+     * @param string          $viewPath
+     * @param mixed           $loader
+     * @param bool            $debug
+     * @param LoggerInterface $logger
+     */
+    public function __construct(ViewConfig $config, ?string $viewPath = null, $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
+    {
+        // Ensure user plugins override core plugins.
+        $this->plugins = $config->plugins ?? [];
+
+        parent::__construct($config, $viewPath, $loader, $debug, $logger);
+    }
+
+    /**
+     * Parse a template
+     *
+     * Parses pseudo-variables contained in the specified template view,
+     * replacing them with any data that has already been set.
+     *
+     * @param array $options
+     * @param bool  $saveData
+     */
+    public function render(string $view, ?array $options = null, ?bool $saveData = null): string
+    {
+        $start = microtime(true);
+        if ($saveData === null) {
+            $saveData = $this->config->saveData;
+        }
+
+        $fileExt = pathinfo($view, PATHINFO_EXTENSION);
+        $view    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
+
+        $cacheName = $options['cache_name'] ?? str_replace('.php', '', $view);
+
+        // Was it cached?
+        if (isset($options['cache']) && ($output = cache($cacheName))) {
+            $this->logPerformance($start, microtime(true), $view);
+
+            return $output;
+        }
+
+        $file = $this->viewPath . $view;
+
+        if (! is_file($file)) {
+            $fileOrig = $file;
+            $file     = $this->loader->locateFile($view, 'Views');
+
+            // locateFile will return an empty string if the file cannot be found.
+            if (empty($file)) {
+                throw ViewException::forInvalidFile($fileOrig);
+            }
+        }
+
+        if ($this->tempData === null) {
+            $this->tempData = $this->data;
+        }
+
+        $template = file_get_contents($file);
+        $output   = $this->parse($template, $this->tempData, $options);
+        $this->logPerformance($start, microtime(true), $view);
+
+        if ($saveData) {
+            $this->data = $this->tempData;
+        }
+        // Should we cache?
+        if (isset($options['cache'])) {
+            cache()->save($cacheName, $output, (int) $options['cache']);
+        }
+        $this->tempData = null;
+
+        return $output;
+    }
+
+    /**
+     * Parse a String
+     *
+     * Parses pseudo-variables contained in the specified string,
+     * replacing them with any data that has already been set.
+     *
+     * @param array $options
+     * @param bool  $saveData
+     */
+    public function renderString(string $template, ?array $options = null, ?bool $saveData = null): string
+    {
+        $start = microtime(true);
+        if ($saveData === null) {
+            $saveData = $this->config->saveData;
+        }
+
+        if ($this->tempData === null) {
+            $this->tempData = $this->data;
+        }
+
+        $output = $this->parse($template, $this->tempData, $options);
+
+        $this->logPerformance($start, microtime(true), $this->excerpt($template));
+
+        if ($saveData) {
+            $this->data = $this->tempData;
+        }
+
+        $this->tempData = null;
+
+        return $output;
+    }
+
+    /**
+     * Sets several pieces of view data at once.
+     * In the Parser, we need to store the context here
+     * so that the variable is correctly handled within the
+     * parsing itself, and contexts (including raw) are respected.
+     *
+     * @param string $context The context to escape it for: html, css, js, url, raw
+     *                        If 'raw', no escaping will happen
+     */
+    public function setData(array $data = [], ?string $context = null): RendererInterface
+    {
+        if (! empty($context)) {
+            foreach ($data as $key => &$value) {
+                if (is_array($value)) {
+                    foreach ($value as &$obj) {
+                        $obj = $this->objectToArray($obj);
+                    }
+                } else {
+                    $value = $this->objectToArray($value);
+                }
+
+                $this->dataContexts[$key] = $context;
+            }
+        }
+
+        $this->tempData = $this->tempData ?? $this->data;
+        $this->tempData = array_merge($this->tempData, $data);
+
+        return $this;
+    }
+
+    /**
+     * Parse a template
+     *
+     * Parses pseudo-variables contained in the specified template,
+     * replacing them with the data in the second param
+     *
+     * @param array $options Future options
+     */
+    protected function parse(string $template, array $data = [], ?array $options = null): string
+    {
+        if ($template === '') {
+            return '';
+        }
+
+        // Remove any possible PHP tags since we don't support it
+        // and parseConditionals needs it clean anyway...
+        $template = str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $template);
+
+        $template = $this->parseComments($template);
+        $template = $this->extractNoparse($template);
+
+        // Replace any conditional code here so we don't have to parse as much
+        $template = $this->parseConditionals($template);
+
+        // Handle any plugins before normal data, so that
+        // it can potentially modify any template between its tags.
+        $template = $this->parsePlugins($template);
+
+        // loop over the data variables, replacing
+        // the content as we go.
+        foreach ($data as $key => $val) {
+            $escape = true;
+
+            if (is_array($val)) {
+                $escape  = false;
+                $replace = $this->parsePair($key, $val, $template);
+            } else {
+                $replace = $this->parseSingle($key, (string) $val);
+            }
+
+            foreach ($replace as $pattern => $content) {
+                $template = $this->replaceSingle($pattern, $content, $template, $escape);
+            }
+        }
+
+        return $this->insertNoparse($template);
+    }
+
+    /**
+     * Parse a single key/value, extracting it
+     */
+    protected function parseSingle(string $key, string $val): array
+    {
+        $pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#') . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ms';
+
+        return [$pattern => $val];
+    }
+
+    /**
+     * Parse a tag pair
+     *
+     * Parses tag pairs: {some_tag} string... {/some_tag}
+     */
+    protected function parsePair(string $variable, array $data, string $template): array
+    {
+        // Holds the replacement patterns and contents
+        // that will be used within a preg_replace in parse()
+        $replace = [];
+
+        // Find all matches of space-flexible versions of {tag}{/tag} so we
+        // have something to loop over.
+        preg_match_all(
+            '#' . $this->leftDelimiter . '\s*' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '(.+?)' .
+            $this->leftDelimiter . '\s*' . '/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
+            $template,
+            $matches,
+            PREG_SET_ORDER
+        );
+
+        /*
+         * Each match looks like:
+         *
+         * $match[0] {tag}...{/tag}
+         * $match[1] Contents inside the tag
+         */
+        foreach ($matches as $match) {
+            // Loop over each piece of $data, replacing
+            // it's contents so that we know what to replace in parse()
+            $str = '';  // holds the new contents for this tag pair.
+
+            foreach ($data as $row) {
+                // Objects that have a `toArray()` method should be
+                // converted with that method (i.e. Entities)
+                if (is_object($row) && method_exists($row, 'toArray')) {
+                    $row = $row->toArray();
+                }
+                // Otherwise, cast as an array and it will grab public properties.
+                elseif (is_object($row)) {
+                    $row = (array) $row;
+                }
+
+                $temp  = [];
+                $pairs = [];
+                $out   = $match[1];
+
+                foreach ($row as $key => $val) {
+                    // For nested data, send us back through this method...
+                    if (is_array($val)) {
+                        $pair = $this->parsePair($key, $val, $match[1]);
+
+                        if (! empty($pair)) {
+                            $pairs[array_keys($pair)[0]] = true;
+
+                            $temp = array_merge($temp, $pair);
+                        }
+
+                        continue;
+                    }
+
+                    if (is_object($val)) {
+                        $val = 'Class: ' . get_class($val);
+                    } elseif (is_resource($val)) {
+                        $val = 'Resource';
+                    }
+
+                    $temp['#' . $this->leftDelimiter . '!?\s*' . preg_quote($key, '#') . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#s'] = $val;
+                }
+
+                // Now replace our placeholders with the new content.
+                foreach ($temp as $pattern => $content) {
+                    $out = $this->replaceSingle($pattern, $content, $out, ! isset($pairs[$pattern]));
+                }
+
+                $str .= $out;
+            }
+
+            // Escape | character from filters as it's handled as OR in regex
+            $escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
+
+            $replace['#' . $escapedMatch . '#s'] = $str;
+        }
+
+        return $replace;
+    }
+
+    /**
+     * Removes any comments from the file. Comments are wrapped in {# #} symbols:
+     *
+     *      {# This is a comment #}
+     */
+    protected function parseComments(string $template): string
+    {
+        return preg_replace('/\{#.*?#\}/s', '', $template);
+    }
+
+    /**
+     * Extracts noparse blocks, inserting a hash in its place so that
+     * those blocks of the page are not touched by parsing.
+     */
+    protected function extractNoparse(string $template): string
+    {
+        $pattern = '/\{\s*noparse\s*\}(.*?)\{\s*\/noparse\s*\}/ms';
+
+        /*
+         * $matches[][0] is the raw match
+         * $matches[][1] is the contents
+         */
+        if (preg_match_all($pattern, $template, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                // Create a hash of the contents to insert in its place.
+                $hash                       = md5($match[1]);
+                $this->noparseBlocks[$hash] = $match[1];
+                $template                   = str_replace($match[0], "noparse_{$hash}", $template);
+            }
+        }
+
+        return $template;
+    }
+
+    /**
+     * Re-inserts the noparsed contents back into the template.
+     */
+    public function insertNoparse(string $template): string
+    {
+        foreach ($this->noparseBlocks as $hash => $replace) {
+            $template = str_replace("noparse_{$hash}", $replace, $template);
+            unset($this->noparseBlocks[$hash]);
+        }
+
+        return $template;
+    }
+
+    /**
+     * Parses any conditionals in the code, removing blocks that don't
+     * pass so we don't try to parse it later.
+     *
+     * Valid conditionals:
+     *  - if
+     *  - elseif
+     *  - else
+     */
+    protected function parseConditionals(string $template): string
+    {
+        $pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms';
+
+        /*
+         * For each match:
+         * [0] = raw match `{if var}`
+         * [1] = conditional `if`
+         * [2] = condition `do === true`
+         * [3] = same as [2]
+         */
+        preg_match_all($pattern, $template, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $match) {
+            // Build the string to replace the `if` statement with.
+            $condition = $match[2];
+
+            $statement = $match[1] === 'elseif' ? '<?php elseif (' . $condition . '): ?>' : '<?php if (' . $condition . '): ?>';
+            $template  = str_replace($match[0], $statement, $template);
+        }
+
+        $template = preg_replace('/\{\s*else\s*\}/ms', '<?php else: ?>', $template);
+        $template = preg_replace('/\{\s*endif\s*\}/ms', '<?php endif; ?>', $template);
+
+        // Parse the PHP itself, or insert an error so they can debug
+        ob_start();
+
+        if ($this->tempData === null) {
+            $this->tempData = $this->data;
+        }
+
+        extract($this->tempData);
+
+        try {
+            eval('?>' . $template . '<?php ');
+        } catch (ParseError $e) {
+            ob_end_clean();
+
+            throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
+        }
+
+        return ob_get_clean();
+    }
+
+    /**
+     * Over-ride the substitution field delimiters.
+     *
+     * @param string $leftDelimiter
+     * @param string $rightDelimiter
+     */
+    public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface
+    {
+        $this->leftDelimiter  = $leftDelimiter;
+        $this->rightDelimiter = $rightDelimiter;
+
+        return $this;
+    }
+
+    /**
+     * Handles replacing a pseudo-variable with the actual content. Will double-check
+     * for escaping brackets.
+     *
+     * @param mixed  $pattern
+     * @param string $content
+     * @param string $template
+     */
+    protected function replaceSingle($pattern, $content, $template, bool $escape = false): string
+    {
+        // Any dollar signs in the pattern will be misinterpreted, so slash them
+        $pattern = addcslashes($pattern, '$');
+        $content = (string) $content;
+
+        // Flesh out the main pattern from the delimiters and escape the hash
+        // See https://regex101.com/r/IKdUlk/1
+        if (preg_match('/^(#)(.+)(#(m?s)?)$/s', $pattern, $parts)) {
+            $pattern = $parts[1] . addcslashes($parts[2], '#') . $parts[3];
+        }
+
+        // Replace the content in the template
+        return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
+            // Check for {! !} syntax to not escape this one.
+            if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}') {
+                $escape = false;
+            }
+
+            return $this->prepareReplacement($matches, $content, $escape);
+        }, (string) $template);
+    }
+
+    /**
+     * Callback used during parse() to apply any filters to the value.
+     */
+    protected function prepareReplacement(array $matches, string $replace, bool $escape = true): string
+    {
+        $orig = array_shift($matches);
+
+        // Our regex earlier will leave all chained values on a single line
+        // so we need to break them apart so we can apply them all.
+        $filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
+
+        if ($escape && empty($filters) && ($context = $this->shouldAddEscaping($orig))) {
+            $filters[] = "esc({$context})";
+        }
+
+        return $this->applyFilters($replace, $filters);
+    }
+
+    /**
+     * Checks the placeholder the view provided to see if we need to provide any autoescaping.
+     *
+     * @return false|string
+     */
+    public function shouldAddEscaping(string $key)
+    {
+        $escape = false;
+
+        $key = trim(str_replace(['{', '}'], '', $key));
+
+        // If the key has a context stored (from setData)
+        // we need to respect that.
+        if (array_key_exists($key, $this->dataContexts)) {
+            if ($this->dataContexts[$key] !== 'raw') {
+                return $this->dataContexts[$key];
+            }
+        }
+        // No pipes, then we know we need to escape
+        elseif (strpos($key, '|') === false) {
+            $escape = 'html';
+        }
+        // If there's a `noescape` then we're definitely false.
+        elseif (strpos($key, 'noescape') !== false) {
+            $escape = false;
+        }
+        // If no `esc` filter is found, then we'll need to add one.
+        elseif (! preg_match('/\s+esc/', $key)) {
+            $escape = 'html';
+        }
+
+        return $escape;
+    }
+
+    /**
+     * Given a set of filters, will apply each of the filters in turn
+     * to $replace, and return the modified string.
+     */
+    protected function applyFilters(string $replace, array $filters): string
+    {
+        // Determine the requested filters
+        foreach ($filters as $filter) {
+            // Grab any parameter we might need to send
+            preg_match('/\([\w<>=\/\\\,:.\-\s\+]+\)/', $filter, $param);
+
+            // Remove the () and spaces to we have just the parameter left
+            $param = ! empty($param) ? trim($param[0], '() ') : null;
+
+            // Params can be separated by commas to allow multiple parameters for the filter
+            if (! empty($param)) {
+                $param = explode(',', $param);
+
+                // Clean it up
+                foreach ($param as &$p) {
+                    $p = trim($p, ' "');
+                }
+            } else {
+                $param = [];
+            }
+
+            // Get our filter name
+            $filter = ! empty($param) ? trim(strtolower(substr($filter, 0, strpos($filter, '(')))) : trim($filter);
+
+            if (! array_key_exists($filter, $this->config->filters)) {
+                continue;
+            }
+
+            // Filter it....
+            $replace = $this->config->filters[$filter]($replace, ...$param);
+        }
+
+        return $replace;
+    }
+
+    // Plugins
+
+    /**
+     * Scans the template for any parser plugins, and attempts to execute them.
+     * Plugins are delimited by {+ ... +}
+     *
+     * @return string
+     */
+    protected function parsePlugins(string $template)
+    {
+        foreach ($this->plugins as $plugin => $callable) {
+            // Paired tags are enclosed in an array in the config array.
+            $isPair   = is_array($callable);
+            $callable = $isPair ? array_shift($callable) : $callable;
+
+            // See https://regex101.com/r/BCBBKB/1
+            $pattern = $isPair
+                ? '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}(.+?)\{\+\s*/' . $plugin . '\s*\+\}#ims'
+                : '#\{\+\s*' . $plugin . '([\w=\-_:\+\s\(\)/"@.]*)?\s*\+\}#ims';
+
+            /**
+             * Match tag pairs
+             *
+             * Each match is an array:
+             *   $matches[0] = entire matched string
+             *   $matches[1] = all parameters string in opening tag
+             *   $matches[2] = content between the tags to send to the plugin.
+             */
+            if (! preg_match_all($pattern, $template, $matches, PREG_SET_ORDER)) {
+                continue;
+            }
+
+            foreach ($matches as $match) {
+                $params = [];
+
+                preg_match_all('/([\w-]+=\"[^"]+\")|([\w-]+=[^\"\s=]+)|(\"[^"]+\")|(\S+)/', trim($match[1]), $matchesParams);
+
+                foreach ($matchesParams[0] as $item) {
+                    $keyVal = explode('=', $item);
+
+                    if (count($keyVal) === 2) {
+                        $params[$keyVal[0]] = str_replace('"', '', $keyVal[1]);
+                    } else {
+                        $params[] = str_replace('"', '', $item);
+                    }
+                }
+
+                $template = $isPair
+                    ? str_replace($match[0], $callable($match[2], $params), $template)
+                    : str_replace($match[0], $callable($params), $template);
+            }
+        }
+
+        return $template;
+    }
+
+    /**
+     * Makes a new plugin available during the parsing of the template.
+     *
+     * @return $this
+     */
+    public function addPlugin(string $alias, callable $callback, bool $isPair = false)
+    {
+        $this->plugins[$alias] = $isPair ? [$callback] : $callback;
+
+        return $this;
+    }
+
+    /**
+     * Removes a plugin from the available plugins.
+     *
+     * @return $this
+     */
+    public function removePlugin(string $alias)
+    {
+        unset($this->plugins[$alias]);
+
+        return $this;
+    }
+
+    /**
+     * Converts an object to an array, respecting any
+     * toArray() methods on an object.
+     *
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    protected function objectToArray($value)
+    {
+        // Objects that have a `toArray()` method should be
+        // converted with that method (i.e. Entities)
+        if (is_object($value) && method_exists($value, 'toArray')) {
+            $value = $value->toArray();
+        }
+        // Otherwise, cast as an array and it will grab public properties.
+        elseif (is_object($value)) {
+            $value = (array) $value;
+        }
+
+        return $value;
+    }
 }
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index 05bb2af46cbd..d0e170071a6a 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -19,125 +19,88 @@
  */
 class Plugins
 {
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @return string|URI
-	 */
-	public static function currentURL()
-	{
-		return current_url();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @return URI|mixed|string
-	 */
-	public static function previousURL()
-	{
-		return previous_url();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string
-	 */
-	public static function mailto(array $params = []): string
-	{
-		$email = $params['email'] ?? '';
-		$title = $params['title'] ?? '';
-		$attrs = $params['attributes'] ?? '';
-
-		return mailto($email, $title, $attrs);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string
-	 */
-	public static function safeMailto(array $params = []): string
-	{
-		$email = $params['email'] ?? '';
-		$title = $params['title'] ?? '';
-		$attrs = $params['attributes'] ?? '';
-
-		return safe_mailto($email, $title, $attrs);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string
-	 */
-	public static function lang(array $params = []): string
-	{
-		$line = array_shift($params);
-
-		return lang($line, $params);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string
-	 */
-	public static function ValidationErrors(array $params = []): string
-	{
-		$validator = Services::validation();
-		if (empty($params))
-		{
-			return $validator->listErrors();
-		}
-
-		return $validator->showError($params['field']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string|false
-	 */
-	public static function route(array $params = [])
-	{
-		return route_to(...$params);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Wrap helper function to use as view plugin.
-	 *
-	 * @param array $params
-	 *
-	 * @return string
-	 */
-	public static function siteURL(array $params = []): string
-	{
-		return site_url(...$params);
-	}
+    /**
+     * Wrap helper function to use as view plugin.
+     *
+     * @return string|URI
+     */
+    public static function currentURL()
+    {
+        return current_url();
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     *
+     * @return mixed|string|URI
+     */
+    public static function previousURL()
+    {
+        return previous_url();
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     */
+    public static function mailto(array $params = []): string
+    {
+        $email = $params['email'] ?? '';
+        $title = $params['title'] ?? '';
+        $attrs = $params['attributes'] ?? '';
+
+        return mailto($email, $title, $attrs);
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     */
+    public static function safeMailto(array $params = []): string
+    {
+        $email = $params['email'] ?? '';
+        $title = $params['title'] ?? '';
+        $attrs = $params['attributes'] ?? '';
+
+        return safe_mailto($email, $title, $attrs);
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     */
+    public static function lang(array $params = []): string
+    {
+        $line = array_shift($params);
+
+        return lang($line, $params);
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     */
+    public static function ValidationErrors(array $params = []): string
+    {
+        $validator = Services::validation();
+        if (empty($params)) {
+            return $validator->listErrors();
+        }
+
+        return $validator->showError($params['field']);
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     *
+     * @return false|string
+     */
+    public static function route(array $params = [])
+    {
+        return route_to(...$params);
+    }
+
+    /**
+     * Wrap helper function to use as view plugin.
+     */
+    public static function siteURL(array $params = []): string
+    {
+        return site_url(...$params);
+    }
 }
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index c8a3b7a6ed1e..409a5a76d3ba 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -18,71 +18,54 @@
  */
 interface RendererInterface
 {
-	/**
-	 * Builds the output based upon a file name and any
-	 * data that has already been set.
-	 *
-	 * @param string  $view
-	 * @param array   $options  Reserved for 3rd-party uses since
-	 *                          it might be needed to pass additional info
-	 *                          to other template engines.
-	 * @param boolean $saveData Whether to save data for subsequent calls
-	 *
-	 * @return string
-	 */
-	public function render(string $view, array $options = null, bool $saveData = false): string;
+    /**
+     * Builds the output based upon a file name and any
+     * data that has already been set.
+     *
+     * @param array $options  Reserved for 3rd-party uses since
+     *                        it might be needed to pass additional info
+     *                        to other template engines.
+     * @param bool  $saveData Whether to save data for subsequent calls
+     */
+    public function render(string $view, ?array $options = null, bool $saveData = false): string;
 
-	//--------------------------------------------------------------------
+    /**
+     * Builds the output based upon a string and any
+     * data that has already been set.
+     *
+     * @param string $view     The view contents
+     * @param array  $options  Reserved for 3rd-party uses since
+     *                         it might be needed to pass additional info
+     *                         to other template engines.
+     * @param bool   $saveData Whether to save data for subsequent calls
+     */
+    public function renderString(string $view, ?array $options = null, bool $saveData = false): string;
 
-	/**
-	 * Builds the output based upon a string and any
-	 * data that has already been set.
-	 *
-	 * @param string  $view     The view contents
-	 * @param array   $options  Reserved for 3rd-party uses since
-	 *                          it might be needed to pass additional info
-	 *                          to other template engines.
-	 * @param boolean $saveData Whether to save data for subsequent calls
-	 *
-	 * @return string
-	 */
-	public function renderString(string $view, array $options = null, bool $saveData = false): string;
+    /**
+     * Sets several pieces of view data at once.
+     *
+     * @param string $context The context to escape it for: html, css, js, url
+     *                        If 'raw', no escaping will happen
+     *
+     * @return RendererInterface
+     */
+    public function setData(array $data = [], ?string $context = null);
 
-	//--------------------------------------------------------------------
+    /**
+     * Sets a single piece of view data.
+     *
+     * @param mixed  $value
+     * @param string $context The context to escape it for: html, css, js, url
+     *                        If 'raw' no escaping will happen
+     *
+     * @return RendererInterface
+     */
+    public function setVar(string $name, $value = null, ?string $context = null);
 
-	/**
-	 * Sets several pieces of view data at once.
-	 *
-	 * @param array  $data
-	 * @param string $context The context to escape it for: html, css, js, url
-	 *                        If 'raw', no escaping will happen
-	 *
-	 * @return RendererInterface
-	 */
-	public function setData(array $data = [], string $context = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets a single piece of view data.
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 * @param string $context The context to escape it for: html, css, js, url
-	 *                        If 'raw' no escaping will happen
-	 *
-	 * @return RendererInterface
-	 */
-	public function setVar(string $name, $value = null, string $context = null);
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes all of the view data from the system.
-	 *
-	 * @return RendererInterface
-	 */
-	public function resetData();
-
-	//--------------------------------------------------------------------
+    /**
+     * Removes all of the view data from the system.
+     *
+     * @return RendererInterface
+     */
+    public function resetData();
 }
diff --git a/system/View/Table.php b/system/View/Table.php
index ec10e75c79e7..d57a7092de00 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -20,504 +20,467 @@
  */
 class Table
 {
-	/**
-	 * Data for table rows
-	 *
-	 * @var array
-	 */
-	public $rows = [];
-
-	/**
-	 * Data for table heading
-	 *
-	 * @var array
-	 */
-	public $heading = [];
-
-	/**
-	 * Data for table footing
-	 *
-	 * @var array
-	 */
-	public $footing = [];
-
-	/**
-	 * Whether or not to automatically create the table header
-	 *
-	 * @var boolean
-	 */
-	public $autoHeading = true;
-
-	/**
-	 * Table caption
-	 *
-	 * @var string|null
-	 */
-	public $caption;
-
-	/**
-	 * Table layout template
-	 *
-	 * @var array
-	 */
-	public $template;
-
-	/**
-	 * Newline setting
-	 *
-	 * @var string
-	 */
-	public $newline = "\n";
-
-	/**
-	 * Contents of empty cells
-	 *
-	 * @var string
-	 */
-	public $emptyCells = '';
-
-	/**
-	 * Callback for custom table layout
-	 *
-	 * @var callable|null
-	 */
-	public $function;
-
-	/**
-	 * Set the template from the table config file if it exists
-	 *
-	 * @param  array $config (default: array())
-	 * @return void
-	 */
-	public function __construct($config = [])
-	{
-		// initialize config
-		foreach ($config as $key => $val)
-		{
-			$this->template[$key] = $val;
-		}
-	}
-
-	/**
-	 * Set the template
-	 *
-	 * @param  array $template
-	 * @return boolean
-	 */
-	public function setTemplate($template)
-	{
-		if (! is_array($template))
-		{
-			return false;
-		}
-
-		$this->template = $template;
-		return true;
-	}
-
-	/**
-	 * Set the table heading
-	 *
-	 * Can be passed as an array or discreet params
-	 *
-	 * @return Table
-	 */
-	public function setHeading()
-	{
-		$this->heading = $this->_prepArgs(func_get_args());
-		return $this;
-	}
-
-	/**
-	 * Set the table footing
-	 *
-	 * Can be passed as an array or discreet params
-	 *
-	 * @return Table
-	 */
-	public function setFooting()
-	{
-		$this->footing = $this->_prepArgs(func_get_args());
-		return $this;
-	}
-
-	/**
-	 * Set columns. Takes a one-dimensional array as input and creates
-	 * a multi-dimensional array with a depth equal to the number of
-	 * columns. This allows a single array with many elements to be
-	 * displayed in a table that has a fixed column count.
-	 *
-	 * @param  array   $array
-	 * @param  integer $columnLimit
-	 * @return array|false
-	 */
-	public function makeColumns($array = [], $columnLimit = 0)
-	{
-		if (! is_array($array) || $array === [] || ! is_int($columnLimit))
-		{
-			return false;
-		}
-
-		// Turn off the auto-heading feature since it's doubtful we
-		// will want headings from a one-dimensional array
-		$this->autoHeading = false;
-
-		if ($columnLimit === 0)
-		{
-			return $array;
-		}
-
-		$new = [];
-		do
-		{
-			$temp = array_splice($array, 0, $columnLimit);
-
-			if (count($temp) < $columnLimit)
-			{
-				for ($i = count($temp); $i < $columnLimit; $i++)
-				{
-					$temp[] = '&nbsp;';
-				}
-			}
-
-			$new[] = $temp;
-		}
-		while (count($array) > 0);
-
-		// @phpstan-ignore-next-line
-		return $new;
-	}
-
-	/**
-	 * Set "empty" cells
-	 *
-	 * Can be passed as an array or discreet params
-	 *
-	 * @param  mixed $value
-	 * @return Table
-	 */
-	public function setEmpty($value)
-	{
-		$this->emptyCells = $value;
-		return $this;
-	}
-
-	/**
-	 * Add a table row
-	 *
-	 * Can be passed as an array or discreet params
-	 *
-	 * @return Table
-	 */
-	public function addRow()
-	{
-		$this->rows[] = $this->_prepArgs(func_get_args());
-		return $this;
-	}
-
-	/**
-	 * Prep Args
-	 *
-	 * Ensures a standard associative array format for all cell data
-	 *
-	 * @param  array $args
-	 * @return array
-	 */
-	protected function _prepArgs(array $args)
-	{
-		// If there is no $args[0], skip this and treat as an associative array
-		// This can happen if there is only a single key, for example this is passed to table->generate
-		// array(array('foo'=>'bar'))
-		if (isset($args[0]) && count($args) === 1 && is_array($args[0]) && ! isset($args[0]['data']))
-		{
-			$args = $args[0];
-		}
-
-		foreach ($args as $key => $val)
-		{
-			if (! is_array($val))
-			{
-				$args[$key] = ['data' => $val];
-			}
-		}
-
-		return $args;
-	}
-
-	/**
-	 * Add a table caption
-	 *
-	 * @param  string $caption
-	 * @return Table
-	 */
-	public function setCaption($caption)
-	{
-		$this->caption = $caption;
-		return $this;
-	}
-
-	/**
-	 * Generate the table
-	 *
-	 * @param mixed $tableData
-	 *
-	 * @return string
-	 */
-	public function generate($tableData = null)
-	{
-		// The table data can optionally be passed to this function
-		// either as a database result object or an array
-		if (! empty($tableData))
-		{
-			if ($tableData instanceof BaseResult)
-			{
-				$this->_setFromDBResult($tableData);
-			}
-			elseif (is_array($tableData))
-			{
-				$this->_setFromArray($tableData);
-			}
-		}
-
-		// Is there anything to display? No? Smite them!
-		if (empty($this->heading) && empty($this->rows))
-		{
-			return 'Undefined table data';
-		}
-
-		// Compile and validate the template date
-		$this->_compileTemplate();
-
-		// Validate a possibly existing custom cell manipulation function
-		if (isset($this->function) && ! is_callable($this->function))
-		{
-			$this->function = null;
-		}
-
-		// Build the table!
-		$out = $this->template['table_open'] . $this->newline;
-
-		// Add any caption here
-		if ($this->caption)
-		{
-			$out .= '<caption>' . $this->caption . '</caption>' . $this->newline;
-		}
-
-		// Is there a table heading to display?
-		if (! empty($this->heading))
-		{
-			$out .= $this->template['thead_open'] . $this->newline . $this->template['heading_row_start'] . $this->newline;
-
-			foreach ($this->heading as $heading)
-			{
-				$temp = $this->template['heading_cell_start'];
-
-				foreach ($heading as $key => $val)
-				{
-					if ($key !== 'data')
-					{
-						$temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
-					}
-				}
-
-				$out .= $temp . ($heading['data'] ?? '') . $this->template['heading_cell_end'];
-			}
-
-			$out .= $this->template['heading_row_end'] . $this->newline . $this->template['thead_close'] . $this->newline;
-		}
-
-		// Build the table rows
-		if (! empty($this->rows))
-		{
-			$out .= $this->template['tbody_open'] . $this->newline;
-
-			$i = 1;
-
-			foreach ($this->rows as $row)
-			{
-				// We use modulus to alternate the row colors
-				$name = fmod($i++, 2) ? '' : 'alt_';
-
-				$out .= $this->template['row_' . $name . 'start'] . $this->newline;
-
-				foreach ($row as $cell)
-				{
-					$temp = $this->template['cell_' . $name . 'start'];
-
-					foreach ($cell as $key => $val)
-					{
-						if ($key !== 'data')
-						{
-							$temp = str_replace('<td', '<td ' . $key . '="' . $val . '"', $temp);
-						}
-					}
-
-					$cell = $cell['data'] ?? '';
-					$out .= $temp;
-
-					if ($cell === '' || $cell === null)
-					{
-						$out .= $this->emptyCells;
-					}
-					elseif (isset($this->function))
-					{
-						$out .= call_user_func($this->function, $cell);
-					}
-					else
-					{
-						$out .= $cell;
-					}
-
-					$out .= $this->template['cell_' . $name . 'end'];
-				}
-
-				$out .= $this->template['row_' . $name . 'end'] . $this->newline;
-			}
-
-			$out .= $this->template['tbody_close'] . $this->newline;
-		}
-
-		// Any table footing to display?
-		if (! empty($this->footing))
-		{
-			$out .= $this->template['tfoot_open'] . $this->newline . $this->template['footing_row_start'] . $this->newline;
-
-			foreach ($this->footing as $footing)
-			{
-				$temp = $this->template['footing_cell_start'];
-
-				foreach ($footing as $key => $val)
-				{
-					if ($key !== 'data')
-					{
-						$temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
-					}
-				}
-
-				$out .= $temp . ($footing['data'] ?? '') . $this->template['footing_cell_end'];
-			}
-
-			$out .= $this->template['footing_row_end'] . $this->newline . $this->template['tfoot_close'] . $this->newline;
-		}
-
-		// And finally, close off the table
-		$out .= $this->template['table_close'];
-
-		// Clear table class properties before generating the table
-		$this->clear();
-
-		return $out;
-	}
-
-	/**
-	 * Clears the table arrays.  Useful if multiple tables are being generated
-	 *
-	 * @return Table
-	 */
-	public function clear()
-	{
-		$this->rows        = [];
-		$this->heading     = [];
-		$this->footing     = [];
-		$this->autoHeading = true;
-		$this->caption     = null;
-		return $this;
-	}
-
-	/**
-	 * Set table data from a database result object
-	 *
-	 * @param  BaseResult $object Database result object
-	 * @return void
-	 */
-	protected function _setFromDBResult($object)
-	{
-		// First generate the headings from the table column names
-		if ($this->autoHeading && empty($this->heading))
-		{
-			$this->heading = $this->_prepArgs($object->getFieldNames());
-		}
-
-		foreach ($object->getResultArray() as $row)
-		{
-			$this->rows[] = $this->_prepArgs($row);
-		}
-	}
-
-	/**
-	 * Set table data from an array
-	 *
-	 * @param array $data
-	 *
-	 * @return void
-	 */
-	protected function _setFromArray($data)
-	{
-		if ($this->autoHeading && empty($this->heading))
-		{
-			$this->heading = $this->_prepArgs(array_shift($data));
-		}
-
-		foreach ($data as &$row)
-		{
-			$this->rows[] = $this->_prepArgs($row);
-		}
-	}
-
-	/**
-	 * Compile Template
-	 *
-	 * @return void
-	 */
-	protected function _compileTemplate()
-	{
-		if ($this->template === null)
-		{
-			$this->template = $this->_defaultTemplate();
-			return;
-		}
-
-		foreach ($this->_defaultTemplate() as $field => $template)
-		{
-			if (! isset($this->template[$field]))
-			{
-				$this->template[$field] = $template;
-			}
-		}
-	}
-
-	/**
-	 * Default Template
-	 *
-	 * @return array
-	 */
-	protected function _defaultTemplate()
-	{
-		return [
-			'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
-			'thead_open'         => '<thead>',
-			'thead_close'        => '</thead>',
-			'heading_row_start'  => '<tr>',
-			'heading_row_end'    => '</tr>',
-			'heading_cell_start' => '<th>',
-			'heading_cell_end'   => '</th>',
-			'tfoot_open'         => '<tfoot>',
-			'tfoot_close'        => '</tfoot>',
-			'footing_row_start'  => '<tr>',
-			'footing_row_end'    => '</tr>',
-			'footing_cell_start' => '<td>',
-			'footing_cell_end'   => '</td>',
-			'tbody_open'         => '<tbody>',
-			'tbody_close'        => '</tbody>',
-			'row_start'          => '<tr>',
-			'row_end'            => '</tr>',
-			'cell_start'         => '<td>',
-			'cell_end'           => '</td>',
-			'row_alt_start'      => '<tr>',
-			'row_alt_end'        => '</tr>',
-			'cell_alt_start'     => '<td>',
-			'cell_alt_end'       => '</td>',
-			'table_close'        => '</table>',
-		];
-	}
+    /**
+     * Data for table rows
+     *
+     * @var array
+     */
+    public $rows = [];
+
+    /**
+     * Data for table heading
+     *
+     * @var array
+     */
+    public $heading = [];
+
+    /**
+     * Data for table footing
+     *
+     * @var array
+     */
+    public $footing = [];
+
+    /**
+     * Whether or not to automatically create the table header
+     *
+     * @var bool
+     */
+    public $autoHeading = true;
+
+    /**
+     * Table caption
+     *
+     * @var string|null
+     */
+    public $caption;
+
+    /**
+     * Table layout template
+     *
+     * @var array
+     */
+    public $template;
+
+    /**
+     * Newline setting
+     *
+     * @var string
+     */
+    public $newline = "\n";
+
+    /**
+     * Contents of empty cells
+     *
+     * @var string
+     */
+    public $emptyCells = '';
+
+    /**
+     * Callback for custom table layout
+     *
+     * @var callable|null
+     */
+    public $function;
+
+    /**
+     * Set the template from the table config file if it exists
+     *
+     * @param array $config (default: array())
+     */
+    public function __construct($config = [])
+    {
+        // initialize config
+        foreach ($config as $key => $val) {
+            $this->template[$key] = $val;
+        }
+    }
+
+    /**
+     * Set the template
+     *
+     * @param array $template
+     *
+     * @return bool
+     */
+    public function setTemplate($template)
+    {
+        if (! is_array($template)) {
+            return false;
+        }
+
+        $this->template = $template;
+
+        return true;
+    }
+
+    /**
+     * Set the table heading
+     *
+     * Can be passed as an array or discreet params
+     *
+     * @return Table
+     */
+    public function setHeading()
+    {
+        $this->heading = $this->_prepArgs(func_get_args());
+
+        return $this;
+    }
+
+    /**
+     * Set the table footing
+     *
+     * Can be passed as an array or discreet params
+     *
+     * @return Table
+     */
+    public function setFooting()
+    {
+        $this->footing = $this->_prepArgs(func_get_args());
+
+        return $this;
+    }
+
+    /**
+     * Set columns. Takes a one-dimensional array as input and creates
+     * a multi-dimensional array with a depth equal to the number of
+     * columns. This allows a single array with many elements to be
+     * displayed in a table that has a fixed column count.
+     *
+     * @param array $array
+     * @param int   $columnLimit
+     *
+     * @return array|false
+     */
+    public function makeColumns($array = [], $columnLimit = 0)
+    {
+        if (! is_array($array) || $array === [] || ! is_int($columnLimit)) {
+            return false;
+        }
+
+        // Turn off the auto-heading feature since it's doubtful we
+        // will want headings from a one-dimensional array
+        $this->autoHeading = false;
+
+        if ($columnLimit === 0) {
+            return $array;
+        }
+
+        $new = [];
+
+        do {
+            $temp = array_splice($array, 0, $columnLimit);
+
+            if (count($temp) < $columnLimit) {
+                for ($i = count($temp); $i < $columnLimit; $i++) {
+                    $temp[] = '&nbsp;';
+                }
+            }
+
+            $new[] = $temp;
+        } while (count($array) > 0);
+
+        // @phpstan-ignore-next-line
+        return $new;
+    }
+
+    /**
+     * Set "empty" cells
+     *
+     * Can be passed as an array or discreet params
+     *
+     * @param mixed $value
+     *
+     * @return Table
+     */
+    public function setEmpty($value)
+    {
+        $this->emptyCells = $value;
+
+        return $this;
+    }
+
+    /**
+     * Add a table row
+     *
+     * Can be passed as an array or discreet params
+     *
+     * @return Table
+     */
+    public function addRow()
+    {
+        $this->rows[] = $this->_prepArgs(func_get_args());
+
+        return $this;
+    }
+
+    /**
+     * Prep Args
+     *
+     * Ensures a standard associative array format for all cell data
+     *
+     * @return array
+     */
+    protected function _prepArgs(array $args)
+    {
+        // If there is no $args[0], skip this and treat as an associative array
+        // This can happen if there is only a single key, for example this is passed to table->generate
+        // array(array('foo'=>'bar'))
+        if (isset($args[0]) && count($args) === 1 && is_array($args[0]) && ! isset($args[0]['data'])) {
+            $args = $args[0];
+        }
+
+        foreach ($args as $key => $val) {
+            if (! is_array($val)) {
+                $args[$key] = ['data' => $val];
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * Add a table caption
+     *
+     * @param string $caption
+     *
+     * @return Table
+     */
+    public function setCaption($caption)
+    {
+        $this->caption = $caption;
+
+        return $this;
+    }
+
+    /**
+     * Generate the table
+     *
+     * @param mixed $tableData
+     *
+     * @return string
+     */
+    public function generate($tableData = null)
+    {
+        // The table data can optionally be passed to this function
+        // either as a database result object or an array
+        if (! empty($tableData)) {
+            if ($tableData instanceof BaseResult) {
+                $this->_setFromDBResult($tableData);
+            } elseif (is_array($tableData)) {
+                $this->_setFromArray($tableData);
+            }
+        }
+
+        // Is there anything to display? No? Smite them!
+        if (empty($this->heading) && empty($this->rows)) {
+            return 'Undefined table data';
+        }
+
+        // Compile and validate the template date
+        $this->_compileTemplate();
+
+        // Validate a possibly existing custom cell manipulation function
+        if (isset($this->function) && ! is_callable($this->function)) {
+            $this->function = null;
+        }
+
+        // Build the table!
+        $out = $this->template['table_open'] . $this->newline;
+
+        // Add any caption here
+        if ($this->caption) {
+            $out .= '<caption>' . $this->caption . '</caption>' . $this->newline;
+        }
+
+        // Is there a table heading to display?
+        if (! empty($this->heading)) {
+            $out .= $this->template['thead_open'] . $this->newline . $this->template['heading_row_start'] . $this->newline;
+
+            foreach ($this->heading as $heading) {
+                $temp = $this->template['heading_cell_start'];
+
+                foreach ($heading as $key => $val) {
+                    if ($key !== 'data') {
+                        $temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
+                    }
+                }
+
+                $out .= $temp . ($heading['data'] ?? '') . $this->template['heading_cell_end'];
+            }
+
+            $out .= $this->template['heading_row_end'] . $this->newline . $this->template['thead_close'] . $this->newline;
+        }
+
+        // Build the table rows
+        if (! empty($this->rows)) {
+            $out .= $this->template['tbody_open'] . $this->newline;
+
+            $i = 1;
+
+            foreach ($this->rows as $row) {
+                // We use modulus to alternate the row colors
+                $name = fmod($i++, 2) ? '' : 'alt_';
+
+                $out .= $this->template['row_' . $name . 'start'] . $this->newline;
+
+                foreach ($row as $cell) {
+                    $temp = $this->template['cell_' . $name . 'start'];
+
+                    foreach ($cell as $key => $val) {
+                        if ($key !== 'data') {
+                            $temp = str_replace('<td', '<td ' . $key . '="' . $val . '"', $temp);
+                        }
+                    }
+
+                    $cell = $cell['data'] ?? '';
+                    $out .= $temp;
+
+                    if ($cell === '' || $cell === null) {
+                        $out .= $this->emptyCells;
+                    } elseif (isset($this->function)) {
+                        $out .= ($this->function)($cell);
+                    } else {
+                        $out .= $cell;
+                    }
+
+                    $out .= $this->template['cell_' . $name . 'end'];
+                }
+
+                $out .= $this->template['row_' . $name . 'end'] . $this->newline;
+            }
+
+            $out .= $this->template['tbody_close'] . $this->newline;
+        }
+
+        // Any table footing to display?
+        if (! empty($this->footing)) {
+            $out .= $this->template['tfoot_open'] . $this->newline . $this->template['footing_row_start'] . $this->newline;
+
+            foreach ($this->footing as $footing) {
+                $temp = $this->template['footing_cell_start'];
+
+                foreach ($footing as $key => $val) {
+                    if ($key !== 'data') {
+                        $temp = str_replace('<th', '<th ' . $key . '="' . $val . '"', $temp);
+                    }
+                }
+
+                $out .= $temp . ($footing['data'] ?? '') . $this->template['footing_cell_end'];
+            }
+
+            $out .= $this->template['footing_row_end'] . $this->newline . $this->template['tfoot_close'] . $this->newline;
+        }
+
+        // And finally, close off the table
+        $out .= $this->template['table_close'];
+
+        // Clear table class properties before generating the table
+        $this->clear();
+
+        return $out;
+    }
+
+    /**
+     * Clears the table arrays.  Useful if multiple tables are being generated
+     *
+     * @return Table
+     */
+    public function clear()
+    {
+        $this->rows        = [];
+        $this->heading     = [];
+        $this->footing     = [];
+        $this->autoHeading = true;
+        $this->caption     = null;
+
+        return $this;
+    }
+
+    /**
+     * Set table data from a database result object
+     *
+     * @param BaseResult $object Database result object
+     */
+    protected function _setFromDBResult($object)
+    {
+        // First generate the headings from the table column names
+        if ($this->autoHeading && empty($this->heading)) {
+            $this->heading = $this->_prepArgs($object->getFieldNames());
+        }
+
+        foreach ($object->getResultArray() as $row) {
+            $this->rows[] = $this->_prepArgs($row);
+        }
+    }
+
+    /**
+     * Set table data from an array
+     *
+     * @param array $data
+     */
+    protected function _setFromArray($data)
+    {
+        if ($this->autoHeading && empty($this->heading)) {
+            $this->heading = $this->_prepArgs(array_shift($data));
+        }
+
+        foreach ($data as &$row) {
+            $this->rows[] = $this->_prepArgs($row);
+        }
+    }
+
+    /**
+     * Compile Template
+     */
+    protected function _compileTemplate()
+    {
+        if ($this->template === null) {
+            $this->template = $this->_defaultTemplate();
+
+            return;
+        }
+
+        foreach ($this->_defaultTemplate() as $field => $template) {
+            if (! isset($this->template[$field])) {
+                $this->template[$field] = $template;
+            }
+        }
+    }
+
+    /**
+     * Default Template
+     *
+     * @return array
+     */
+    protected function _defaultTemplate()
+    {
+        return [
+            'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
+            'thead_open'         => '<thead>',
+            'thead_close'        => '</thead>',
+            'heading_row_start'  => '<tr>',
+            'heading_row_end'    => '</tr>',
+            'heading_cell_start' => '<th>',
+            'heading_cell_end'   => '</th>',
+            'tfoot_open'         => '<tfoot>',
+            'tfoot_close'        => '</tfoot>',
+            'footing_row_start'  => '<tr>',
+            'footing_row_end'    => '</tr>',
+            'footing_cell_start' => '<td>',
+            'footing_cell_end'   => '</td>',
+            'tbody_open'         => '<tbody>',
+            'tbody_close'        => '</tbody>',
+            'row_start'          => '<tr>',
+            'row_end'            => '</tr>',
+            'cell_start'         => '<td>',
+            'cell_end'           => '</td>',
+            'row_alt_start'      => '<tr>',
+            'row_alt_end'        => '</tr>',
+            'cell_alt_start'     => '<td>',
+            'cell_alt_end'       => '</td>',
+            'table_close'        => '</table>',
+        ];
+    }
 }
diff --git a/system/View/View.php b/system/View/View.php
index 33efdaa21e13..6005b5f40582 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -25,497 +25,433 @@
  */
 class View implements RendererInterface
 {
-	/**
-	 * Data that is made available to the Views.
-	 *
-	 * @var array
-	 */
-	protected $data = [];
-
-	/**
-	 * Merge savedData and userData
-	 */
-	protected $tempData = null;
-
-	/**
-	 * The base directory to look in for our Views.
-	 *
-	 * @var string
-	 */
-	protected $viewPath;
-
-	/**
-	 * The render variables
-	 *
-	 * @var array
-	 */
-	protected $renderVars = [];
-
-	/**
-	 * Instance of FileLocator for when
-	 * we need to attempt to find a view
-	 * that's not in standard place.
-	 *
-	 * @var FileLocator
-	 */
-	protected $loader;
-
-	/**
-	 * Logger instance.
-	 *
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	/**
-	 * Should we store performance info?
-	 *
-	 * @var boolean
-	 */
-	protected $debug = false;
-
-	/**
-	 * Cache stats about our performance here,
-	 * when CI_DEBUG = true
-	 *
-	 * @var array
-	 */
-	protected $performanceData = [];
-
-	/**
-	 * @var ViewConfig
-	 */
-	protected $config;
-
-	/**
-	 * Whether data should be saved between renders.
-	 *
-	 * @var boolean
-	 */
-	protected $saveData;
-
-	/**
-	 * Number of loaded views
-	 *
-	 * @var integer
-	 */
-	protected $viewsCount = 0;
-
-	/**
-	 * The name of the layout being used, if any.
-	 * Set by the `extend` method used within views.
-	 *
-	 * @var string|null
-	 */
-	protected $layout;
-
-
-	/**
-	 * Holds the sections and their data.
-	 *
-	 * @var array
-	 */
-	protected $sections = [];
-
-	/**
-	 * The name of the current section being rendered,
-	 * if any.
-	 *
-	 * @var string|null
-	 * @deprecated
-	 */
-	protected $currentSection;
-
-	/**
-	 * The name of the current section being rendered,
-	 * if any.
-	 *
-	 * @var array<string>
-	 */
-	protected $sectionStack = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param ViewConfig       $config
-	 * @param string|null      $viewPath
-	 * @param FileLocator|null $loader
-	 * @param boolean|null     $debug
-	 * @param LoggerInterface  $logger
-	 */
-	public function __construct(ViewConfig $config, string $viewPath = null, FileLocator $loader = null, bool $debug = null, LoggerInterface $logger = null)
-	{
-		$this->config   = $config;
-		$this->viewPath = rtrim($viewPath, '\\/ ') . DIRECTORY_SEPARATOR;
-		$this->loader   = $loader ?? Services::locator();
-		$this->logger   = $logger ?? Services::logger();
-		$this->debug    = $debug ?? CI_DEBUG;
-		$this->saveData = (bool) $config->saveData;
-	}
-
-	/**
-	 * Builds the output based upon a file name and any
-	 * data that has already been set.
-	 *
-	 * Valid $options:
-	 *  - cache      Number of seconds to cache for
-	 *  - cache_name Name to use for cache
-	 *
-	 * @param string       $view     File name of the view source
-	 * @param array|null   $options  Reserved for 3rd-party uses since
-	 *                               it might be needed to pass additional info
-	 *                               to other template engines.
-	 * @param boolean|null $saveData If true, saves data for subsequent calls,
-	 *                               if false, cleans the data after displaying,
-	 *                               if null, uses the config setting.
-	 *
-	 * @return string
-	 */
-	public function render(string $view, array $options = null, bool $saveData = null): string
-	{
-		$this->renderVars['start'] = microtime(true);
-
-		// Store the results here so even if
-		// multiple views are called in a view, it won't
-		// clean it unless we mean it to.
-		$saveData                    = $saveData ?? $this->saveData;
-		$fileExt                     = pathinfo($view, PATHINFO_EXTENSION);
-		$realPath                    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
-		$this->renderVars['view']    = $realPath;
-		$this->renderVars['options'] = $options ?? [];
-
-		// Was it cached?
-		if (isset($this->renderVars['options']['cache']))
-		{
-			$cacheName = $this->renderVars['options']['cache_name'] ?? str_replace('.php', '', $this->renderVars['view']);
-			$cacheName = str_replace(['\\', '/'], '', $cacheName);
-
-			$this->renderVars['cacheName'] = $cacheName;
-
-			if ($output = cache($this->renderVars['cacheName']))
-			{
-				$this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
-
-				return $output;
-			}
-		}
-
-		$this->renderVars['file'] = $this->viewPath . $this->renderVars['view'];
-
-		if (! is_file($this->renderVars['file']))
-		{
-			$this->renderVars['file'] = $this->loader->locateFile($this->renderVars['view'], 'Views', empty($fileExt) ? 'php' : $fileExt);
-		}
-
-		// locateFile will return an empty string if the file cannot be found.
-		if (empty($this->renderVars['file']))
-		{
-			throw ViewException::forInvalidFile($this->renderVars['view']);
-		}
-
-		// Make our view data available to the view.
-		$this->tempData = $this->tempData ?? $this->data;
-
-		if ($saveData)
-		{
-			$this->data = $this->tempData;
-		}
-
-		// Save current vars
-		$renderVars = $this->renderVars;
-
-		$output = (function (): string {
-			extract($this->tempData);
-			ob_start();
-			include $this->renderVars['file'];
-			return ob_get_clean() ?: '';
-		})();
-
-		// Get back current vars
-		$this->renderVars = $renderVars;
-
-		// When using layouts, the data has already been stored
-		// in $this->sections, and no other valid output
-		// is allowed in $output so we'll overwrite it.
-		if (! is_null($this->layout) && $this->sectionStack === [])
-		{
-			$layoutView   = $this->layout;
-			$this->layout = null;
-			// Save current vars
-			$renderVars = $this->renderVars;
-			$output     = $this->render($layoutView, $options, $saveData);
-			// Get back current vars
-			$this->renderVars = $renderVars;
-		}
-
-		$this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
-
-		if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
-			&& in_array('CodeIgniter\Filters\DebugToolbar', service('filters')->getFiltersClass()['after'], true)
-		)
-		{
-			$toolbarCollectors = config(Toolbar::class)->collectors;
-
-			if (in_array(Views::class, $toolbarCollectors, true))
-			{
-				// Clean up our path names to make them a little cleaner
-				$this->renderVars['file'] = clean_path($this->renderVars['file']);
-				$this->renderVars['file'] = ++$this->viewsCount . ' ' . $this->renderVars['file'];
-
-				$output = '<!-- DEBUG-VIEW START ' . $this->renderVars['file'] . ' -->' . PHP_EOL
-					. $output . PHP_EOL
-					. '<!-- DEBUG-VIEW ENDED ' . $this->renderVars['file'] . ' -->' . PHP_EOL;
-			}
-		}
-
-		// Should we cache?
-		if (isset($this->renderVars['options']['cache']))
-		{
-			cache()->save($this->renderVars['cacheName'], $output, (int) $this->renderVars['options']['cache']);
-		}
-
-		$this->tempData = null;
-
-		return $output;
-	}
-
-	/**
-	 * Builds the output based upon a string and any
-	 * data that has already been set.
-	 * Cache does not apply, because there is no "key".
-	 *
-	 * @param string       $view     The view contents
-	 * @param array|null   $options  Reserved for 3rd-party uses since
-	 *                               it might be needed to pass additional info
-	 *                               to other template engines.
-	 * @param boolean|null $saveData If true, saves data for subsequent calls,
-	 *                               if false, cleans the data after displaying,
-	 *                               if null, uses the config setting.
-	 *
-	 * @return string
-	 */
-	public function renderString(string $view, array $options = null, bool $saveData = null): string
-	{
-		$start          = microtime(true);
-		$saveData       = $saveData ?? $this->saveData;
-		$this->tempData = $this->tempData ?? $this->data;
-
-		if ($saveData)
-		{
-			$this->data = $this->tempData;
-		}
-
-		$output = (function (string $view): string {
-			extract($this->tempData);
-			ob_start();
-			eval('?>' . $view);
-			return ob_get_clean() ?: '';
-		})($view);
-
-		$this->logPerformance($start, microtime(true), $this->excerpt($view));
-		$this->tempData = null;
-
-		return $output;
-	}
-
-	/**
-	 * Extract first bit of a long string and add ellipsis
-	 *
-	 * @param  string  $string
-	 * @param  integer $length
-	 * @return string
-	 */
-	public function excerpt(string $string, int $length = 20): string
-	{
-		return (strlen($string) > $length) ? substr($string, 0, $length - 3) . '...' : $string;
-	}
-
-	/**
-	 * Sets several pieces of view data at once.
-	 *
-	 * @param array  $data
-	 * @param string $context The context to escape it for: html, css, js, url
-	 *                        If null, no escaping will happen
-	 *
-	 * @return RendererInterface
-	 */
-	public function setData(array $data = [], string $context = null): RendererInterface
-	{
-		if ($context)
-		{
-			$data = \esc($data, $context);
-		}
-
-		$this->tempData = $this->tempData ?? $this->data;
-		$this->tempData = array_merge($this->tempData, $data);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a single piece of view data.
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 * @param string $context The context to escape it for: html, css, js, url
-	 *                        If null, no escaping will happen
-	 *
-	 * @return RendererInterface
-	 */
-	public function setVar(string $name, $value = null, string $context = null): RendererInterface
-	{
-		if ($context)
-		{
-			$value = \esc($value, $context);
-		}
-
-		$this->tempData        = $this->tempData ?? $this->data;
-		$this->tempData[$name] = $value;
-
-		return $this;
-	}
-
-	/**
-	 * Removes all of the view data from the system.
-	 *
-	 * @return RendererInterface
-	 */
-	public function resetData(): RendererInterface
-	{
-		$this->data = [];
-
-		return $this;
-	}
-
-	/**
-	 * Returns the current data that will be displayed in the view.
-	 *
-	 * @return array
-	 */
-	public function getData(): array
-	{
-		return $this->tempData ?? $this->data;
-	}
-
-	/**
-	 * Specifies that the current view should extend an existing layout.
-	 *
-	 * @param string $layout
-	 *
-	 * @return void
-	 */
-	public function extend(string $layout)
-	{
-		$this->layout = $layout;
-	}
-
-	/**
-	 * Starts holds content for a section within the layout.
-	 *
-	 * @param string $name Section name
-	 *
-	 * @return void
-	 *
-	 */
-	public function section(string $name)
-	{
-		//Saved to prevent BC.
-		$this->currentSection = $name;
-		$this->sectionStack[] = $name;
-
-		ob_start();
-	}
-
-	/**
-	 * Captures the last section
-	 *
-	 * @return void
-	 * @throws RuntimeException
-	 */
-	public function endSection()
-	{
-		$contents = ob_get_clean();
-
-		if ($this->sectionStack === [])
-		{
-			throw new RuntimeException('View themes, no current section.');
-		}
-
-		$section = array_pop($this->sectionStack);
-
-		// Ensure an array exists so we can store multiple entries for this.
-		if (! array_key_exists($section, $this->sections))
-		{
-			$this->sections[$section] = [];
-		}
-
-		$this->sections[$section][] = $contents;
-	}
-
-	/**
-	 * Renders a section's contents.
-	 *
-	 * @param string $sectionName
-	 */
-	public function renderSection(string $sectionName)
-	{
-		if (! isset($this->sections[$sectionName]))
-		{
-			echo '';
-
-			return;
-		}
-
-		foreach ($this->sections[$sectionName] as $key => $contents)
-		{
-			echo $contents;
-			unset($this->sections[$sectionName][$key]);
-		}
-	}
-
-	/**
-	 * Used within layout views to include additional views.
-	 *
-	 * @param string     $view
-	 * @param array|null $options
-	 * @param boolean    $saveData
-	 *
-	 * @return string
-	 */
-	public function include(string $view, array $options = null, $saveData = true): string
-	{
-		return $this->render($view, $options, $saveData);
-	}
-
-	/**
-	 * Returns the performance data that might have been collected
-	 * during the execution. Used primarily in the Debug Toolbar.
-	 *
-	 * @return array
-	 */
-	public function getPerformanceData(): array
-	{
-		return $this->performanceData;
-	}
-
-	/**
-	 * Logs performance data for rendering a view.
-	 *
-	 * @param float  $start
-	 * @param float  $end
-	 * @param string $view
-	 *
-	 * @return void
-	 */
-	protected function logPerformance(float $start, float $end, string $view)
-	{
-		if ($this->debug)
-		{
-			$this->performanceData[] = [
-				'start' => $start,
-				'end'   => $end,
-				'view'  => $view,
-			];
-		}
-	}
+    /**
+     * Data that is made available to the Views.
+     *
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Merge savedData and userData
+     */
+    protected $tempData;
+
+    /**
+     * The base directory to look in for our Views.
+     *
+     * @var string
+     */
+    protected $viewPath;
+
+    /**
+     * The render variables
+     *
+     * @var array
+     */
+    protected $renderVars = [];
+
+    /**
+     * Instance of FileLocator for when
+     * we need to attempt to find a view
+     * that's not in standard place.
+     *
+     * @var FileLocator
+     */
+    protected $loader;
+
+    /**
+     * Logger instance.
+     *
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * Should we store performance info?
+     *
+     * @var bool
+     */
+    protected $debug = false;
+
+    /**
+     * Cache stats about our performance here,
+     * when CI_DEBUG = true
+     *
+     * @var array
+     */
+    protected $performanceData = [];
+
+    /**
+     * @var ViewConfig
+     */
+    protected $config;
+
+    /**
+     * Whether data should be saved between renders.
+     *
+     * @var bool
+     */
+    protected $saveData;
+
+    /**
+     * Number of loaded views
+     *
+     * @var int
+     */
+    protected $viewsCount = 0;
+
+    /**
+     * The name of the layout being used, if any.
+     * Set by the `extend` method used within views.
+     *
+     * @var string|null
+     */
+    protected $layout;
+
+    /**
+     * Holds the sections and their data.
+     *
+     * @var array
+     */
+    protected $sections = [];
+
+    /**
+     * The name of the current section being rendered,
+     * if any.
+     *
+     * @var string|null
+     *
+     * @deprecated
+     */
+    protected $currentSection;
+
+    /**
+     * The name of the current section being rendered,
+     * if any.
+     *
+     * @var array<string>
+     */
+    protected $sectionStack = [];
+
+    public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
+    {
+        $this->config   = $config;
+        $this->viewPath = rtrim($viewPath, '\\/ ') . DIRECTORY_SEPARATOR;
+        $this->loader   = $loader ?? Services::locator();
+        $this->logger   = $logger ?? Services::logger();
+        $this->debug    = $debug ?? CI_DEBUG;
+        $this->saveData = (bool) $config->saveData;
+    }
+
+    /**
+     * Builds the output based upon a file name and any
+     * data that has already been set.
+     *
+     * Valid $options:
+     *  - cache      Number of seconds to cache for
+     *  - cache_name Name to use for cache
+     *
+     * @param string     $view     File name of the view source
+     * @param array|null $options  Reserved for 3rd-party uses since
+     *                             it might be needed to pass additional info
+     *                             to other template engines.
+     * @param bool|null  $saveData If true, saves data for subsequent calls,
+     *                             if false, cleans the data after displaying,
+     *                             if null, uses the config setting.
+     */
+    public function render(string $view, ?array $options = null, ?bool $saveData = null): string
+    {
+        $this->renderVars['start'] = microtime(true);
+
+        // Store the results here so even if
+        // multiple views are called in a view, it won't
+        // clean it unless we mean it to.
+        $saveData                    = $saveData ?? $this->saveData;
+        $fileExt                     = pathinfo($view, PATHINFO_EXTENSION);
+        $realPath                    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
+        $this->renderVars['view']    = $realPath;
+        $this->renderVars['options'] = $options ?? [];
+
+        // Was it cached?
+        if (isset($this->renderVars['options']['cache'])) {
+            $cacheName = $this->renderVars['options']['cache_name'] ?? str_replace('.php', '', $this->renderVars['view']);
+            $cacheName = str_replace(['\\', '/'], '', $cacheName);
+
+            $this->renderVars['cacheName'] = $cacheName;
+
+            if ($output = cache($this->renderVars['cacheName'])) {
+                $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+
+                return $output;
+            }
+        }
+
+        $this->renderVars['file'] = $this->viewPath . $this->renderVars['view'];
+
+        if (! is_file($this->renderVars['file'])) {
+            $this->renderVars['file'] = $this->loader->locateFile($this->renderVars['view'], 'Views', empty($fileExt) ? 'php' : $fileExt);
+        }
+
+        // locateFile will return an empty string if the file cannot be found.
+        if (empty($this->renderVars['file'])) {
+            throw ViewException::forInvalidFile($this->renderVars['view']);
+        }
+
+        // Make our view data available to the view.
+        $this->tempData = $this->tempData ?? $this->data;
+
+        if ($saveData) {
+            $this->data = $this->tempData;
+        }
+
+        // Save current vars
+        $renderVars = $this->renderVars;
+
+        $output = (function (): string {
+            extract($this->tempData);
+            ob_start();
+            include $this->renderVars['file'];
+
+            return ob_get_clean() ?: '';
+        })();
+
+        // Get back current vars
+        $this->renderVars = $renderVars;
+
+        // When using layouts, the data has already been stored
+        // in $this->sections, and no other valid output
+        // is allowed in $output so we'll overwrite it.
+        if ($this->layout !== null && $this->sectionStack === []) {
+            $layoutView   = $this->layout;
+            $this->layout = null;
+            // Save current vars
+            $renderVars = $this->renderVars;
+            $output     = $this->render($layoutView, $options, $saveData);
+            // Get back current vars
+            $this->renderVars = $renderVars;
+        }
+
+        $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+
+        if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
+            && in_array('CodeIgniter\Filters\DebugToolbar', service('filters')->getFiltersClass()['after'], true)
+        ) {
+            $toolbarCollectors = config(Toolbar::class)->collectors;
+
+            if (in_array(Views::class, $toolbarCollectors, true)) {
+                // Clean up our path names to make them a little cleaner
+                $this->renderVars['file'] = clean_path($this->renderVars['file']);
+                $this->renderVars['file'] = ++$this->viewsCount . ' ' . $this->renderVars['file'];
+
+                $output = '<!-- DEBUG-VIEW START ' . $this->renderVars['file'] . ' -->' . PHP_EOL
+                    . $output . PHP_EOL
+                    . '<!-- DEBUG-VIEW ENDED ' . $this->renderVars['file'] . ' -->' . PHP_EOL;
+            }
+        }
+
+        // Should we cache?
+        if (isset($this->renderVars['options']['cache'])) {
+            cache()->save($this->renderVars['cacheName'], $output, (int) $this->renderVars['options']['cache']);
+        }
+
+        $this->tempData = null;
+
+        return $output;
+    }
+
+    /**
+     * Builds the output based upon a string and any
+     * data that has already been set.
+     * Cache does not apply, because there is no "key".
+     *
+     * @param string     $view     The view contents
+     * @param array|null $options  Reserved for 3rd-party uses since
+     *                             it might be needed to pass additional info
+     *                             to other template engines.
+     * @param bool|null  $saveData If true, saves data for subsequent calls,
+     *                             if false, cleans the data after displaying,
+     *                             if null, uses the config setting.
+     */
+    public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
+    {
+        $start          = microtime(true);
+        $saveData       = $saveData ?? $this->saveData;
+        $this->tempData = $this->tempData ?? $this->data;
+
+        if ($saveData) {
+            $this->data = $this->tempData;
+        }
+
+        $output = (function (string $view): string {
+            extract($this->tempData);
+            ob_start();
+            eval('?>' . $view);
+
+            return ob_get_clean() ?: '';
+        })($view);
+
+        $this->logPerformance($start, microtime(true), $this->excerpt($view));
+        $this->tempData = null;
+
+        return $output;
+    }
+
+    /**
+     * Extract first bit of a long string and add ellipsis
+     */
+    public function excerpt(string $string, int $length = 20): string
+    {
+        return (strlen($string) > $length) ? substr($string, 0, $length - 3) . '...' : $string;
+    }
+
+    /**
+     * Sets several pieces of view data at once.
+     *
+     * @param string $context The context to escape it for: html, css, js, url
+     *                        If null, no escaping will happen
+     */
+    public function setData(array $data = [], ?string $context = null): RendererInterface
+    {
+        if ($context) {
+            $data = \esc($data, $context);
+        }
+
+        $this->tempData = $this->tempData ?? $this->data;
+        $this->tempData = array_merge($this->tempData, $data);
+
+        return $this;
+    }
+
+    /**
+     * Sets a single piece of view data.
+     *
+     * @param mixed       $value
+     * @param string|null $context The context to escape it for: html, css, js, url
+     *                             If null, no escaping will happen
+     */
+    public function setVar(string $name, $value = null, ?string $context = null): RendererInterface
+    {
+        if ($context) {
+            $value = esc($value, $context);
+        }
+
+        $this->tempData        = $this->tempData ?? $this->data;
+        $this->tempData[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Removes all of the view data from the system.
+     */
+    public function resetData(): RendererInterface
+    {
+        $this->data = [];
+
+        return $this;
+    }
+
+    /**
+     * Returns the current data that will be displayed in the view.
+     */
+    public function getData(): array
+    {
+        return $this->tempData ?? $this->data;
+    }
+
+    /**
+     * Specifies that the current view should extend an existing layout.
+     */
+    public function extend(string $layout)
+    {
+        $this->layout = $layout;
+    }
+
+    /**
+     * Starts holds content for a section within the layout.
+     *
+     * @param string $name Section name
+     */
+    public function section(string $name)
+    {
+        // Saved to prevent BC.
+        $this->currentSection = $name;
+        $this->sectionStack[] = $name;
+
+        ob_start();
+    }
+
+    /**
+     * Captures the last section
+     *
+     * @throws RuntimeException
+     */
+    public function endSection()
+    {
+        $contents = ob_get_clean();
+
+        if ($this->sectionStack === []) {
+            throw new RuntimeException('View themes, no current section.');
+        }
+
+        $section = array_pop($this->sectionStack);
+
+        // Ensure an array exists so we can store multiple entries for this.
+        if (! array_key_exists($section, $this->sections)) {
+            $this->sections[$section] = [];
+        }
+
+        $this->sections[$section][] = $contents;
+    }
+
+    /**
+     * Renders a section's contents.
+     */
+    public function renderSection(string $sectionName)
+    {
+        if (! isset($this->sections[$sectionName])) {
+            echo '';
+
+            return;
+        }
+
+        foreach ($this->sections[$sectionName] as $key => $contents) {
+            echo $contents;
+            unset($this->sections[$sectionName][$key]);
+        }
+    }
+
+    /**
+     * Used within layout views to include additional views.
+     *
+     * @param bool $saveData
+     */
+    public function include(string $view, ?array $options = null, $saveData = true): string
+    {
+        return $this->render($view, $options, $saveData);
+    }
+
+    /**
+     * Returns the performance data that might have been collected
+     * during the execution. Used primarily in the Debug Toolbar.
+     */
+    public function getPerformanceData(): array
+    {
+        return $this->performanceData;
+    }
+
+    /**
+     * Logs performance data for rendering a view.
+     */
+    protected function logPerformance(float $start, float $end, string $view)
+    {
+        if ($this->debug) {
+            $this->performanceData[] = [
+                'start' => $start,
+                'end'   => $end,
+                'view'  => $view,
+            ];
+        }
+    }
 }
diff --git a/system/bootstrap.php b/system/bootstrap.php
index d822c0c4a07b..17226d099974 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Config\DotEnv;
@@ -26,45 +26,40 @@
  */
 
 // The path to the application directory.
-if (! defined('APPPATH'))
-{
-	/**
-	 * @var Paths $paths
-	 */
-	define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+if (! defined('APPPATH')) {
+    /**
+     * @var Paths $paths
+     */
+    define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 // The path to the project root directory. Just above APPPATH.
-if (! defined('ROOTPATH'))
-{
-	define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
+if (! defined('ROOTPATH')) {
+    define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 }
 
 // The path to the system directory.
-if (! defined('SYSTEMPATH'))
-{
-	/**
-	 * @var Paths $paths
-	 */
-	define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+if (! defined('SYSTEMPATH')) {
+    /**
+     * @var Paths $paths
+     */
+    define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 // The path to the writable directory.
-if (! defined('WRITEPATH'))
-{
-	/**
-	 * @var Paths $paths
-	 */
-	define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+if (! defined('WRITEPATH')) {
+    /**
+     * @var Paths $paths
+     */
+    define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 // The path to the tests directory
-if (! defined('TESTPATH'))
-{
-	/**
-	 * @var Paths $paths
-	 */
-	define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+if (! defined('TESTPATH')) {
+    /**
+     * @var Paths $paths
+     */
+    define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -72,15 +67,13 @@
  * GRAB OUR CONSTANTS & COMMON
  * ---------------------------------------------------------------
  */
-if (! defined('APP_NAMESPACE'))
-{
-	require_once APPPATH . 'Config/Constants.php';
+if (! defined('APP_NAMESPACE')) {
+    require_once APPPATH . 'Config/Constants.php';
 }
 
 // Require app/Common.php file if exists.
-if (is_file(APPPATH . 'Common.php'))
-{
-	require_once APPPATH . 'Common.php';
+if (is_file(APPPATH . 'Common.php')) {
+    require_once APPPATH . 'Common.php';
 }
 
 // Require system/Common.php
@@ -96,12 +89,11 @@
  * files can use the path constants.
  */
 
-if (! class_exists('Config\Autoload', false))
-{
-	require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
-	require_once APPPATH . 'Config/Autoload.php';
-	require_once SYSTEMPATH . 'Modules/Modules.php';
-	require_once APPPATH . 'Config/Modules.php';
+if (! class_exists('Config\Autoload', false)) {
+    require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
+    require_once APPPATH . 'Config/Autoload.php';
+    require_once SYSTEMPATH . 'Modules/Modules.php';
+    require_once APPPATH . 'Config/Modules.php';
 }
 
 require_once SYSTEMPATH . 'Autoloader/Autoloader.php';
@@ -110,28 +102,25 @@
 require_once APPPATH . 'Config/Services.php';
 
 // Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false))
-{
-	class_alias('Config\Services', 'CodeIgniter\Services');
+if (! class_exists('CodeIgniter\Services', false)) {
+    class_alias('Config\Services', 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
 // Now load Composer's if it's available
-if (is_file(COMPOSER_PATH))
-{
-	/*
-	 * The path to the vendor directory.
-	 *
-	 * We do not want to enforce this, so set the constant if Composer was used.
-	 */
-	if (! defined('VENDORPATH'))
-	{
-		define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
-	}
-
-	require_once COMPOSER_PATH;
+if (is_file(COMPOSER_PATH)) {
+    /*
+     * The path to the vendor directory.
+     *
+     * We do not want to enforce this, so set the constant if Composer was used.
+     */
+    if (! defined('VENDORPATH')) {
+        define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
+    }
+
+    require_once COMPOSER_PATH;
 }
 
 // Load environment settings from .env files into $_SERVER and $_ENV
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index ebc298806cc8..9c30fb9c89b6 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Autoloader;
 
 use CodeIgniter\Autoloader\FileLocator;
@@ -14,46 +23,39 @@
  */
 class FatalLocator extends FileLocator
 {
+    /**
+     * Throws.
+     *
+     * @param string $file   The namespaced file to locate
+     * @param string $folder The folder within the namespace that we should look for the file.
+     * @param string $ext    The file extension the file should have.
+     *
+     * @return false|string The path to the file, or false if not found.
+     */
+    public function locateFile(string $file, ?string $folder = null, string $ext = 'php')
+    {
+        $folder = $folder ?? 'null';
 
-	/**
-	 * Throws.
-	 *
-	 * @param string $file   The namespaced file to locate
-	 * @param string $folder The folder within the namespace that we should look for the file.
-	 * @param string $ext    The file extension the file should have.
-	 *
-	 * @return string|false The path to the file, or false if not found.
-	 */
-	public function locateFile(string $file, string $folder = null, string $ext = 'php')
-	{
-		$folder = $folder ?? 'null';
-		throw new RuntimeException("locateFile({$file}, {$folder}, {$ext})");
-	}
+        throw new RuntimeException("locateFile({$file}, {$folder}, {$ext})");
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * Searches through all of the defined namespaces looking for a file.
+     * Returns an array of all found locations for the defined file.
+     *
+     * Example:
+     *
+     *  $locator->search('Config/Routes.php');
+     *  // Assuming PSR4 namespaces include foo and bar, might return:
+     *  [
+     *      'app/Modules/foo/Config/Routes.php',
+     *      'app/Modules/bar/Config/Routes.php',
+     *  ]
+     */
+    public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
+    {
+        $prioritizeApp = $prioritizeApp ? 'true' : 'false';
 
-	/**
-	 * Searches through all of the defined namespaces looking for a file.
-	 * Returns an array of all found locations for the defined file.
-	 *
-	 * Example:
-	 *
-	 *  $locator->search('Config/Routes.php');
-	 *  // Assuming PSR4 namespaces include foo and bar, might return:
-	 *  [
-	 *      'app/Modules/foo/Config/Routes.php',
-	 *      'app/Modules/bar/Config/Routes.php',
-	 *  ]
-	 *
-	 * @param string  $path
-	 * @param string  $ext
-	 * @param boolean $prioritizeApp
-	 *
-	 * @return array
-	 */
-	public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
-	{
-		$prioritizeApp = $prioritizeApp ? 'true' : 'false';
-		throw new RuntimeException("search({$path}, {$ext}, {$prioritizeApp})");
-	}
+        throw new RuntimeException("search({$path}, {$ext}, {$prioritizeApp})");
+    }
 }
diff --git a/tests/_support/Autoloader/UnnamespacedClass.php b/tests/_support/Autoloader/UnnamespacedClass.php
index 67b1ed352b42..3eeb37a8dd38 100644
--- a/tests/_support/Autoloader/UnnamespacedClass.php
+++ b/tests/_support/Autoloader/UnnamespacedClass.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 class UnnamespacedClass
 {
 }
diff --git a/tests/_support/Autoloader/functions.php b/tests/_support/Autoloader/functions.php
index 5be9195240ac..e5aaddf296d8 100644
--- a/tests/_support/Autoloader/functions.php
+++ b/tests/_support/Autoloader/functions.php
@@ -1,14 +1,21 @@
 <?php
 
-if (! function_exists('autoload_foo'))
-{
-	function autoload_foo(): string
-	{
-		return 'I am autoloaded by Autoloader through $files!';
-	}
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+if (! function_exists('autoload_foo')) {
+    function autoload_foo(): string
+    {
+        return 'I am autoloaded by Autoloader through $files!';
+    }
 }
 
-if (! defined('AUTOLOAD_CONSTANT'))
-{
-	define('AUTOLOAD_CONSTANT', 'foo');
+if (! defined('AUTOLOAD_CONSTANT')) {
+    define('AUTOLOAD_CONSTANT', 'foo');
 }
diff --git a/tests/_support/Cache/RestrictiveHandler.php b/tests/_support/Cache/RestrictiveHandler.php
index c74e3771190b..6a5824939954 100644
--- a/tests/_support/Cache/RestrictiveHandler.php
+++ b/tests/_support/Cache/RestrictiveHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace Tests\Support\Cache;
@@ -19,8 +19,8 @@
  */
 class RestrictiveHandler extends DummyHandler
 {
-	/**
-	 * Maximum key length.
-	 */
-	public const MAX_KEY_LENGTH = 10;
+    /**
+     * Maximum key length.
+     */
+    public const MAX_KEY_LENGTH = 10;
 }
diff --git a/tests/_support/Commands/AbstractInfo.php b/tests/_support/Commands/AbstractInfo.php
index 2ca684e2dbc9..1913f0e285df 100644
--- a/tests/_support/Commands/AbstractInfo.php
+++ b/tests/_support/Commands/AbstractInfo.php
@@ -1,13 +1,21 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
 
 abstract class AbstractInfo extends BaseCommand
 {
-
-	protected $group       = 'demo';
-	protected $name        = 'app:pablo';
-	protected $description = 'Displays basic application information.';
-
+    protected $group       = 'demo';
+    protected $name        = 'app:pablo';
+    protected $description = 'Displays basic application information.';
 }
diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php
index 6e9191c10f05..562cc9dd3847 100644
--- a/tests/_support/Commands/AppInfo.php
+++ b/tests/_support/Commands/AppInfo.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -7,31 +17,27 @@
 
 class AppInfo extends BaseCommand
 {
+    protected $group       = 'demo';
+    protected $name        = 'app:info';
+    protected $arguments   = ['draft' => 'unused'];
+    protected $description = 'Displays basic application information.';
 
-	protected $group       = 'demo';
-	protected $name        = 'app:info';
-	protected $arguments   = ['draft' => 'unused'];
-	protected $description = 'Displays basic application information.';
-
-	public function run(array $params)
-	{
-		CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
-	}
+    public function run(array $params)
+    {
+        CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
+    }
 
-	public function bomb()
-	{
-		try
-		{
-			CLI::color('test', 'white', 'Background');
-		}
-		catch (\RuntimeException $oops)
-		{
-			$this->showError($oops);
-		}
-	}
+    public function bomb()
+    {
+        try {
+            CLI::color('test', 'white', 'Background');
+        } catch (\RuntimeException $oops) {
+            $this->showError($oops);
+        }
+    }
 
-	public function helpme()
-	{
-		$this->call('help');
-	}
+    public function helpme()
+    {
+        $this->call('help');
+    }
 }
diff --git a/tests/_support/Commands/InvalidCommand.php b/tests/_support/Commands/InvalidCommand.php
index 4e7fcecdbb98..a6d13d6fe494 100644
--- a/tests/_support/Commands/InvalidCommand.php
+++ b/tests/_support/Commands/InvalidCommand.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -7,18 +17,17 @@
 
 class InvalidCommand extends BaseCommand
 {
+    protected $group       = 'demo';
+    protected $name        = 'app:invalid';
+    protected $description = '';
 
-	protected $group       = 'demo';
-	protected $name        = 'app:invalid';
-	protected $description = '';
-
-	public function __construct()
-	{
-		throw new \ReflectionException();
-	}
+    public function __construct()
+    {
+        throw new \ReflectionException();
+    }
 
-	public function run(array $params)
-	{
-		CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
-	}
+    public function run(array $params)
+    {
+        CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
+    }
 }
diff --git a/tests/_support/Commands/LanguageCommand.php b/tests/_support/Commands/LanguageCommand.php
index 246f249d0d54..858755b7549a 100644
--- a/tests/_support/Commands/LanguageCommand.php
+++ b/tests/_support/Commands/LanguageCommand.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -7,34 +16,34 @@
 
 class LanguageCommand extends BaseCommand
 {
-	use GeneratorTrait;
-
-	protected $group       = 'Generators';
-	protected $name        = 'publish:language';
-	protected $description = 'Publishes a language file.';
-	protected $usage       = 'publish:language [options]';
-	protected $options     = [
-		'--lang' => 'The language folder to save the file.',
-		'--sort' => 'Turn on/off the sortImports flag.',
-	];
-
-	public function run(array $params)
-	{
-		$this->setHasClassName(false);
-		$params[0]      = 'Foobar';
-		$params['lang'] = $params['lang'] ?? 'en';
-
-		$this->component = 'Language';
-		$this->directory = 'Language\\' . $params['lang'];
-
-		$sort = (isset($params['sort']) && $params['sort'] === 'off') ? false : true;
-		$this->setSortImports($sort);
-
-		$this->execute($params);
-	}
-
-	protected function prepare(string $class): string
-	{
-		return file_get_contents(__DIR__ . '/Foobar.php') ?: '';
-	}
+    use GeneratorTrait;
+
+    protected $group       = 'Generators';
+    protected $name        = 'publish:language';
+    protected $description = 'Publishes a language file.';
+    protected $usage       = 'publish:language [options]';
+    protected $options     = [
+        '--lang' => 'The language folder to save the file.',
+        '--sort' => 'Turn on/off the sortImports flag.',
+    ];
+
+    public function run(array $params)
+    {
+        $this->setHasClassName(false);
+        $params[0]      = 'Foobar';
+        $params['lang'] = $params['lang'] ?? 'en';
+
+        $this->component = 'Language';
+        $this->directory = 'Language\\' . $params['lang'];
+
+        $sort = (isset($params['sort']) && $params['sort'] === 'off') ? false : true;
+        $this->setSortImports($sort);
+
+        $this->execute($params);
+    }
+
+    protected function prepare(string $class): string
+    {
+        return file_get_contents(__DIR__ . '/Foobar.php') ?: '';
+    }
 }
diff --git a/tests/_support/Commands/ParamsReveal.php b/tests/_support/Commands/ParamsReveal.php
index 66692cce9661..76be444e69d1 100644
--- a/tests/_support/Commands/ParamsReveal.php
+++ b/tests/_support/Commands/ParamsReveal.php
@@ -1,19 +1,28 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
 
 class ParamsReveal extends BaseCommand
 {
-	protected $group       = 'demo';
-	protected $name        = 'reveal';
-	protected $usage       = 'reveal [options] [arguments]';
-	protected $description = 'Reveal params';
-	public static $args;
+    protected $group       = 'demo';
+    protected $name        = 'reveal';
+    protected $usage       = 'reveal [options] [arguments]';
+    protected $description = 'Reveal params';
+    public static $args;
 
-	public function run(array $params)
-	{
-		static::$args = $params;
-	}
+    public function run(array $params)
+    {
+        static::$args = $params;
+    }
 }
diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php
index ca86988d4a9a..36a752e25891 100644
--- a/tests/_support/Commands/Unsuffixable.php
+++ b/tests/_support/Commands/Unsuffixable.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
@@ -7,64 +16,62 @@
 
 class Unsuffixable extends BaseCommand
 {
-	use GeneratorTrait;
+    use GeneratorTrait;
 
-	/**
-	 * The Command's Group
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
+    /**
+     * The Command's Group
+     *
+     * @var string
+     */
+    protected $group = 'Generators';
 
-	/**
-	 * The Command's Name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:foo';
+    /**
+     * The Command's Name
+     *
+     * @var string
+     */
+    protected $name = 'make:foo';
 
-	/**
-	 * The Command's Description
-	 *
-	 * @var string
-	 */
-	protected $description = '';
+    /**
+     * The Command's Description
+     *
+     * @var string
+     */
+    protected $description = '';
 
-	/**
-	 * The Command's Usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:foo [arguments] [options]';
+    /**
+     * The Command's Usage
+     *
+     * @var string
+     */
+    protected $usage = 'make:foo [arguments] [options]';
 
-	/**
-	 * The Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'name' => 'Class name',
-	];
+    /**
+     * The Command's Arguments
+     *
+     * @var array
+     */
+    protected $arguments = [
+        'name' => 'Class name',
+    ];
 
-	/**
-	 * The Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * The Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	/**
-	 * Actually execute a command.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$this->component = 'Command';
-		$this->directory = 'Commands';
-		$this->template  = 'command.tpl.php';
+    /**
+     * Actually execute a command.
+     */
+    public function run(array $params)
+    {
+        $this->component = 'Command';
+        $this->directory = 'Commands';
+        $this->template  = 'command.tpl.php';
 
-		$this->setEnabledSuffixing(false);
-		$this->execute($params);
-	}
+        $this->setEnabledSuffixing(false);
+        $this->execute($params);
+    }
 }
diff --git a/tests/_support/Config/BadRegistrar.php b/tests/_support/Config/BadRegistrar.php
index a651d11d3004..20730db4602b 100644
--- a/tests/_support/Config/BadRegistrar.php
+++ b/tests/_support/Config/BadRegistrar.php
@@ -1,4 +1,15 @@
-<?php namespace Tests\Support\Config;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Config;
 
 /**
  * Class BadRegistrar
@@ -6,13 +17,10 @@
  * Doesn't provides a basic registrar class for testing BaseConfig registration functions,
  * because it doesn't return an associative array
  */
-
 class BadRegistrar
 {
-
-	public static function RegistrarConfig()
-	{
-		return 'I am not worthy';
-	}
-
+    public static function RegistrarConfig()
+    {
+        return 'I am not worthy';
+    }
 }
diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php
index 6bc554967548..48936397449e 100644
--- a/tests/_support/Config/Filters.php
+++ b/tests/_support/Config/Filters.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Config\Filters;
 
 $filters->aliases['test-customfilter'] = \Tests\Support\Filters\Customfilter::class;
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index a961e2951a73..4a9f3b0fe981 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Config;
 
 /**
@@ -7,113 +16,109 @@
  *
  * Provides a basic registrar class for testing BaseConfig registration functions.
  */
-
 class Registrar
 {
-	/**
-	 * DB config array for testing purposes.
-	 *
-	 * @var array
-	 */
-	protected static $dbConfig = [
-		'MySQLi'  => [
-			'DSN'      => '',
-			'hostname' => '127.0.0.1',
-			'username' => 'root',
-			'password' => '',
-			'database' => 'test',
-			'DBDriver' => 'MySQLi',
-			'DBPrefix' => 'db_',
-			'pConnect' => false,
-			'DBDebug'  => (ENVIRONMENT !== 'production'),
-			'charset'  => 'utf8',
-			'DBCollat' => 'utf8_general_ci',
-			'swapPre'  => '',
-			'encrypt'  => false,
-			'compress' => false,
-			'strictOn' => false,
-			'failover' => [],
-			'port'     => 3306,
-		],
-		'Postgre' => [
-			'DSN'      => '',
-			'hostname' => 'localhost',
-			'username' => 'postgres',
-			'password' => 'postgres',
-			'database' => 'test',
-			'DBDriver' => 'Postgre',
-			'DBPrefix' => 'db_',
-			'pConnect' => false,
-			'DBDebug'  => (ENVIRONMENT !== 'production'),
-			'charset'  => 'utf8',
-			'DBCollat' => 'utf8_general_ci',
-			'swapPre'  => '',
-			'encrypt'  => false,
-			'compress' => false,
-			'strictOn' => false,
-			'failover' => [],
-			'port'     => 5432,
-		],
-		'SQLite3' => [
-			'DSN'      => '',
-			'hostname' => 'localhost',
-			'username' => '',
-			'password' => '',
-			'database' => 'database.db',
-			'DBDriver' => 'SQLite3',
-			'DBPrefix' => 'db_',
-			'pConnect' => false,
-			'DBDebug'  => (ENVIRONMENT !== 'production'),
-			'charset'  => 'utf8',
-			'DBCollat' => 'utf8_general_ci',
-			'swapPre'  => '',
-			'encrypt'  => false,
-			'compress' => false,
-			'strictOn' => false,
-			'failover' => [],
-			'port'     => 3306,
-		],
-		'SQLSRV'  => [
-			'DSN'      => '',
-			'hostname' => 'localhost',
-			'username' => 'sa',
-			'password' => '1Secure*Password1',
-			'database' => 'test',
-			'DBDriver' => 'SQLSRV',
-			'DBPrefix' => 'db_',
-			'pConnect' => false,
-			'DBDebug'  => (ENVIRONMENT !== 'production'),
-			'charset'  => 'utf8',
-			'DBCollat' => 'utf8_general_ci',
-			'swapPre'  => '',
-			'encrypt'  => false,
-			'compress' => false,
-			'strictOn' => false,
-			'failover' => [],
-			'port'     => 1433,
-		],
-	];
-
-	/**
-	 * Override database config
-	 *
-	 * @return array
-	 */
-	public static function Database()
-	{
-		$config = [];
+    /**
+     * DB config array for testing purposes.
+     *
+     * @var array
+     */
+    protected static $dbConfig = [
+        'MySQLi' => [
+            'DSN'      => '',
+            'hostname' => '127.0.0.1',
+            'username' => 'root',
+            'password' => '',
+            'database' => 'test',
+            'DBDriver' => 'MySQLi',
+            'DBPrefix' => 'db_',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'production'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => 3306,
+        ],
+        'Postgre' => [
+            'DSN'      => '',
+            'hostname' => 'localhost',
+            'username' => 'postgres',
+            'password' => 'postgres',
+            'database' => 'test',
+            'DBDriver' => 'Postgre',
+            'DBPrefix' => 'db_',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'production'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => 5432,
+        ],
+        'SQLite3' => [
+            'DSN'      => '',
+            'hostname' => 'localhost',
+            'username' => '',
+            'password' => '',
+            'database' => 'database.db',
+            'DBDriver' => 'SQLite3',
+            'DBPrefix' => 'db_',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'production'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => 3306,
+        ],
+        'SQLSRV' => [
+            'DSN'      => '',
+            'hostname' => 'localhost',
+            'username' => 'sa',
+            'password' => '1Secure*Password1',
+            'database' => 'test',
+            'DBDriver' => 'SQLSRV',
+            'DBPrefix' => 'db_',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'production'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+            'port'     => 1433,
+        ],
+    ];
 
-		// Under Github Actions, we can set an ENV var named 'DB'
-		// so that we can test against multiple databases.
-		if ($group = getenv('DB'))
-		{
-			if (! empty(self::$dbConfig[$group]))
-			{
-				$config['tests'] = self::$dbConfig[$group];
-			}
-		}
+    /**
+     * Override database config
+     *
+     * @return array
+     */
+    public static function Database()
+    {
+        $config = [];
 
-		return $config;
-	}
+        // Under Github Actions, we can set an ENV var named 'DB'
+        // so that we can test against multiple databases.
+        if ($group = getenv('DB')) {
+            if (! empty(self::$dbConfig[$group])) {
+                $config['tests'] = self::$dbConfig[$group];
+            }
+        }
 
+        return $config;
+    }
 }
diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php
index 78dc6cfd4317..6ca5bbf2488d 100644
--- a/tests/_support/Config/Routes.php
+++ b/tests/_support/Config/Routes.php
@@ -1,5 +1,15 @@
-<?php namespace Tests\Support\Config;
+<?php
+
 /**
- * This is a simple file to include for testing the RouteCollection class.
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
+
+namespace Tests\Support\Config;
+
+// This is a simple file to include for testing the RouteCollection class.
 $routes->add('testing', 'TestController::index', ['as' => 'testing-index']);
diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php
index 4cf9f38e144a..4a942a053433 100644
--- a/tests/_support/Config/Services.php
+++ b/tests/_support/Config/Services.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Config;
 
 use CodeIgniter\HTTP\URI;
@@ -14,27 +23,24 @@
  */
 class Services extends BaseServices
 {
-	/**
-	 * The URI class provides a way to model and manipulate URIs.
-	 *
-	 * @param string  $uri
-	 * @param boolean $getShared
-	 *
-	 * @return URI
-	 */
-	public static function uri(string $uri = null, bool $getShared = true)
-	{
-		// Intercept our test case
-		if ($uri === 'testCanReplaceFrameworkServices')
-		{
-			throw new RuntimeException('Service originated from ' . static::class);
-		}
+    /**
+     * The URI class provides a way to model and manipulate URIs.
+     *
+     * @param string $uri
+     *
+     * @return URI
+     */
+    public static function uri(?string $uri = null, bool $getShared = true)
+    {
+        // Intercept our test case
+        if ($uri === 'testCanReplaceFrameworkServices') {
+            throw new RuntimeException('Service originated from ' . static::class);
+        }
 
-		if ($getShared)
-		{
-			return static::getSharedInstance('uri', $uri);
-		}
+        if ($getShared) {
+            return static::getSharedInstance('uri', $uri);
+        }
 
-		return new URI($uri);
-	}
+        return new URI($uri);
+    }
 }
diff --git a/tests/_support/Config/TestRegistrar.php b/tests/_support/Config/TestRegistrar.php
index 4651e0fea9bb..f809ef54376f 100644
--- a/tests/_support/Config/TestRegistrar.php
+++ b/tests/_support/Config/TestRegistrar.php
@@ -1,27 +1,35 @@
-<?php namespace Tests\Support\Config;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Config;
 
 /**
  * Class Registrar
  *
  * Provides a basic registrar class for testing BaseConfig registration functions.
  */
-
 class TestRegistrar
 {
-
-	public static function RegistrarConfig()
-	{
-		return [
-			'bar'    => [
-				'first',
-				'second',
-			],
-			'format' => 'nice',
-			'fruit'  => [
-				'apple',
-				'banana',
-			],
-		];
-	}
-
+    public static function RegistrarConfig()
+    {
+        return [
+            'bar' => [
+                'first',
+                'second',
+            ],
+            'format' => 'nice',
+            'fruit'  => [
+                'apple',
+                'banana',
+            ],
+        ];
+    }
 }
diff --git a/tests/_support/Controllers/Hello.php b/tests/_support/Controllers/Hello.php
index 8c7c05f01970..cc63814d7e09 100644
--- a/tests/_support/Controllers/Hello.php
+++ b/tests/_support/Controllers/Hello.php
@@ -1,11 +1,22 @@
-<?php namespace App\Controllers;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace App\Controllers;
 
 use CodeIgniter\Controller;
 
 class Hello extends Controller
 {
-	public function index()
-	{
-		return 'Hello';
-	}
+    public function index()
+    {
+        return 'Hello';
+    }
 }
diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php
index 7e62b547fa0f..a0aa972c635f 100644
--- a/tests/_support/Controllers/Popcorn.php
+++ b/tests/_support/Controllers/Popcorn.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
@@ -10,70 +20,72 @@
  */
 class Popcorn extends Controller
 {
-	use ResponseTrait;
-
-	public function index()
-	{
-		return 'Hi there';
-	}
-
-	public function pop()
-	{
-		$this->respond('Oops', 567, 'Surprise');
-	}
-
-	public function popper()
-	{
-		throw new \RuntimeException('Surprise', 500);
-	}
-
-	public function weasel()
-	{
-		$this->respond('', 200);
-	}
-
-	public function oops()
-	{
-		$this->failUnauthorized();
-	}
-
-	public function goaway()
-	{
-		return redirect()->to('/');
-	}
-
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/1834
-	public function index3()
-	{
-		return $this->response->setJSON(['lang' => $this->request->getLocale()]);
-	}
-
-	public function canyon()
-	{
-		echo 'Hello-o-o ' . $this->request->getGet('foo');
-	}
-
-	public function cat()
-	{
-	}
-
-	public function json()
-	{
-		$this->respond(['answer' => 42]);
-	}
-
-	public function xml()
-	{
-		$this->respond('<my><pet>cat</pet></my>');
-	}
-
-	public function toindex()
-	{
-		return redirect()->route('testing-index');
-	}
-
-	public function echoJson()
-	{
-		return $this->response->setJSON($this->request->getJSON());
-	}
+    use ResponseTrait;
+
+    public function index()
+    {
+        return 'Hi there';
+    }
+
+    public function pop()
+    {
+        $this->respond('Oops', 567, 'Surprise');
+    }
+
+    public function popper()
+    {
+        throw new \RuntimeException('Surprise', 500);
+    }
+
+    public function weasel()
+    {
+        $this->respond('', 200);
+    }
+
+    public function oops()
+    {
+        $this->failUnauthorized();
+    }
+
+    public function goaway()
+    {
+        return redirect()->to('/');
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1834
+     */
+    public function index3()
+    {
+        return $this->response->setJSON(['lang' => $this->request->getLocale()]);
+    }
+
+    public function canyon()
+    {
+        echo 'Hello-o-o ' . $this->request->getGet('foo');
+    }
+
+    public function cat()
+    {
+    }
+
+    public function json()
+    {
+        $this->respond(['answer' => 42]);
+    }
+
+    public function xml()
+    {
+        $this->respond('<my><pet>cat</pet></my>');
+    }
+
+    public function toindex()
+    {
+        return redirect()->route('testing-index');
+    }
+
+    public function echoJson()
+    {
+        return $this->response->setJSON($this->request->getJSON());
+    }
 }
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 864114427c1f..07b61cdd2451 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -1,140 +1,144 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 
 class Migration_Create_test_tables extends Migration
 {
-	public function up()
-	{
-		// User Table
-		$this->forge->addField([
-			'id'         => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
-			'name'       => ['type' => 'VARCHAR', 'constraint' => 80],
-			'email'      => ['type' => 'VARCHAR', 'constraint' => 100],
-			'country'    => ['type' => 'VARCHAR', 'constraint' => 40],
-			'created_at' => ['type' => 'DATETIME', 'null' => true],
-			'updated_at' => ['type' => 'DATETIME', 'null' => true],
-			'deleted_at' => ['type' => 'DATETIME', 'null' => true],
-		])->addKey('id', true)->createTable('user', true);
-
-		// Job Table
-		$this->forge->addField([
-			'id'          => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
-			'name'        => ['type' => 'VARCHAR', 'constraint' => 40],
-			'description' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
-			'created_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
-			'updated_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
-			'deleted_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
-		])->addKey('id', true)->createTable('job', true);
-
-		// Misc Table
-		$this->forge->addField([
-			'id'    => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
-			'key'   => ['type' => 'VARCHAR', 'constraint' => 40],
-			'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
-		])->addKey('id', true)->createTable('misc', true);
-
-		//Database Type test table
-		//missing types :
-		//TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
-		// id must be interger else SQLite3 error on not null for autoinc 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],
-			'type_float'      => ['type' => 'FLOAT', 'null' => true],
-			'type_numeric'    => ['type' => 'NUMERIC', 'constraint' => '18,2', 'null' => true],
-			'type_date'       => ['type' => 'DATE', 'null' => true],
-			'type_time'       => ['type' => 'TIME', 'null' => true],
-			'type_datetime'   => ['type' => 'DATETIME', 'null' => true],
-			'type_timestamp'  => ['type' => 'TIMESTAMP', 'null' => true],
-			'type_bigint'     => ['type' => 'BIGINT', 'null' => true],
-			'type_real'       => ['type' => 'REAL', 'null' => true],
-			'type_enum'       => ['type' => 'ENUM', 'constraint' => ['appel', 'pears'], 'null' => true],
-			'type_set'        => ['type' => 'SET', 'constraint' => ['one', 'two'], 'null' => true],
-			'type_mediumtext' => ['type' => 'MEDIUMTEXT', 'null' => true],
-			'type_double'     => ['type' => 'DOUBLE', 'null' => true],
-			'type_decimal'    => ['type' => 'DECIMAL', 'constraint' => '18,4', 'null' => true],
-			'type_blob'       => ['type' => 'BLOB', 'null' => true],
-		];
-
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			unset(
-				$data_type_fields['type_real'],
-				$data_type_fields['type_decimal']
-			);
-		}
-
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			unset($data_type_fields['type_timestamp']);
-		}
-
-		if ($this->db->DBDriver === 'Postgre' || $this->db->DBDriver === 'SQLSRV')
-		{
-			unset(
-				$data_type_fields['type_enum'],
-				$data_type_fields['type_set'],
-				$data_type_fields['type_mediumtext'],
-				$data_type_fields['type_double'],
-				$data_type_fields['type_blob']
-			);
-		}
-
-		$this->forge->addField($data_type_fields)->addKey('id', true)->createTable('type_test', true);
-
-		// Empty Table
-		$this->forge->addField([
-			'id'         => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
-			'name'       => ['type' => 'VARCHAR', 'constraint' => 40],
-			'created_at' => ['type' => 'DATE', 'null' => true],
-			'updated_at' => ['type' => 'DATE', 'null' => true],
-		])->addKey('id', true)->createTable('empty', true);
-
-		// Secondary Table
-		$this->forge->addField([
-			'id'    => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
-			'key'   => ['type' => 'VARCHAR', 'constraint' => 40],
-			'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
-		])->addKey('id', true)->createTable('secondary', true);
-
-		// Stringify Primary key Table
-		$this->forge->addField([
-			'id'    => ['type' => 'VARCHAR', 'constraint' => 3],
-			'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
-		])->addKey('id', true)->createTable('stringifypkey', true);
-
-		// Table without auto increment field
-		$this->forge->addField([
-			'key'   => ['type' => 'VARCHAR', 'constraint' => 40, 'unique' => true],
-			'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
-		])->addKey('key', true)->createTable('without_auto_increment', true);
-
-		// IP Table
-		$this->forge->addField([
-			'ip' => ['type' => 'VARCHAR', 'constraint' => 100],
-			'ip2' => ['type' => 'VARCHAR', 'constraint' => 100],
-		])->createTable('ip_table', true);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function down()
-	{
-		$this->forge->dropTable('user', true);
-		$this->forge->dropTable('job', true);
-		$this->forge->dropTable('misc', true);
-		$this->forge->dropTable('type_test', true);
-		$this->forge->dropTable('empty', true);
-		$this->forge->dropTable('secondary', true);
-		$this->forge->dropTable('stringifypkey', true);
-		$this->forge->dropTable('without_auto_increment', true);
-		$this->forge->dropTable('ip_table', true);
-	}
+    public function up()
+    {
+        // User Table
+        $this->forge->addField([
+            'id'         => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
+            'name'       => ['type' => 'VARCHAR', 'constraint' => 80],
+            'email'      => ['type' => 'VARCHAR', 'constraint' => 100],
+            'country'    => ['type' => 'VARCHAR', 'constraint' => 40],
+            'created_at' => ['type' => 'DATETIME', 'null' => true],
+            'updated_at' => ['type' => 'DATETIME', 'null' => true],
+            'deleted_at' => ['type' => 'DATETIME', 'null' => true],
+        ])->addKey('id', true)->createTable('user', true);
+
+        // Job Table
+        $this->forge->addField([
+            'id'          => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
+            'name'        => ['type' => 'VARCHAR', 'constraint' => 40],
+            'description' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+            'created_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
+            'updated_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
+            'deleted_at'  => ['type' => 'INTEGER', 'constraint' => 11, 'null' => true],
+        ])->addKey('id', true)->createTable('job', true);
+
+        // Misc Table
+        $this->forge->addField([
+            'id'    => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
+            'key'   => ['type' => 'VARCHAR', 'constraint' => 40],
+            'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+        ])->addKey('id', true)->createTable('misc', true);
+
+        // Database Type test table
+        // missing types :
+        // TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
+        // id must be interger else SQLite3 error on not null for autoinc 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],
+            'type_float'      => ['type' => 'FLOAT', 'null' => true],
+            'type_numeric'    => ['type' => 'NUMERIC', 'constraint' => '18,2', 'null' => true],
+            'type_date'       => ['type' => 'DATE', 'null' => true],
+            'type_time'       => ['type' => 'TIME', 'null' => true],
+            'type_datetime'   => ['type' => 'DATETIME', 'null' => true],
+            'type_timestamp'  => ['type' => 'TIMESTAMP', 'null' => true],
+            'type_bigint'     => ['type' => 'BIGINT', 'null' => true],
+            'type_real'       => ['type' => 'REAL', 'null' => true],
+            'type_enum'       => ['type' => 'ENUM', 'constraint' => ['appel', 'pears'], 'null' => true],
+            'type_set'        => ['type' => 'SET', 'constraint' => ['one', 'two'], 'null' => true],
+            'type_mediumtext' => ['type' => 'MEDIUMTEXT', 'null' => true],
+            'type_double'     => ['type' => 'DOUBLE', 'null' => true],
+            'type_decimal'    => ['type' => 'DECIMAL', 'constraint' => '18,4', 'null' => true],
+            'type_blob'       => ['type' => 'BLOB', 'null' => true],
+        ];
+
+        if ($this->db->DBDriver === 'Postgre') {
+            unset(
+                $data_type_fields['type_real'],
+                $data_type_fields['type_decimal']
+            );
+        }
+
+        if ($this->db->DBDriver === 'SQLSRV') {
+            unset($data_type_fields['type_timestamp']);
+        }
+
+        if ($this->db->DBDriver === 'Postgre' || $this->db->DBDriver === 'SQLSRV') {
+            unset(
+                $data_type_fields['type_enum'],
+                $data_type_fields['type_set'],
+                $data_type_fields['type_mediumtext'],
+                $data_type_fields['type_double'],
+                $data_type_fields['type_blob']
+            );
+        }
+
+        $this->forge->addField($data_type_fields)->addKey('id', true)->createTable('type_test', true);
+
+        // Empty Table
+        $this->forge->addField([
+            'id'         => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
+            'name'       => ['type' => 'VARCHAR', 'constraint' => 40],
+            'created_at' => ['type' => 'DATE', 'null' => true],
+            'updated_at' => ['type' => 'DATE', 'null' => true],
+        ])->addKey('id', true)->createTable('empty', true);
+
+        // Secondary Table
+        $this->forge->addField([
+            'id'    => ['type' => 'INTEGER', 'constraint' => 3, 'auto_increment' => true],
+            'key'   => ['type' => 'VARCHAR', 'constraint' => 40],
+            'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+        ])->addKey('id', true)->createTable('secondary', true);
+
+        // Stringify Primary key Table
+        $this->forge->addField([
+            'id'    => ['type' => 'VARCHAR', 'constraint' => 3],
+            'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+        ])->addKey('id', true)->createTable('stringifypkey', true);
+
+        // Table without auto increment field
+        $this->forge->addField([
+            'key'   => ['type' => 'VARCHAR', 'constraint' => 40, 'unique' => true],
+            'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
+        ])->addKey('key', true)->createTable('without_auto_increment', true);
+
+        // IP Table
+        $this->forge->addField([
+            'ip'  => ['type' => 'VARCHAR', 'constraint' => 100],
+            'ip2' => ['type' => 'VARCHAR', 'constraint' => 100],
+        ])->createTable('ip_table', true);
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable('user', true);
+        $this->forge->dropTable('job', true);
+        $this->forge->dropTable('misc', true);
+        $this->forge->dropTable('type_test', true);
+        $this->forge->dropTable('empty', true);
+        $this->forge->dropTable('secondary', true);
+        $this->forge->dropTable('stringifypkey', true);
+        $this->forge->dropTable('without_auto_increment', true);
+        $this->forge->dropTable('ip_table', true);
+    }
 }
diff --git a/tests/_support/Database/Seeds/AnotherSeeder.php b/tests/_support/Database/Seeds/AnotherSeeder.php
index fe0644cff03f..aaf7c7e93410 100644
--- a/tests/_support/Database/Seeds/AnotherSeeder.php
+++ b/tests/_support/Database/Seeds/AnotherSeeder.php
@@ -1,19 +1,28 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
 
 class AnotherSeeder extends Seeder
 {
-	public function run()
-	{
-		$row = [
-			'name'    => 'Jerome Lohan',
-			'email'   => 'jlo@lohanenterprises.com',
-			'country' => 'UK',
-		];
+    public function run()
+    {
+        $row = [
+            'name'    => 'Jerome Lohan',
+            'email'   => 'jlo@lohanenterprises.com',
+            'country' => 'UK',
+        ];
 
-		$this->db->table('user')->insert($row);
-	}
+        $this->db->table('user')->insert($row);
+    }
 }
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 9c5c724fa8e7..0319896159ab 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -1,148 +1,157 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
 
 class CITestSeeder extends Seeder
 {
-	public function run()
-	{
-		// Job Data
-		$data = [
-			'user'                   => [
-				[
-					'name'    => 'Derek Jones',
-					'email'   => 'derek@world.com',
-					'country' => 'US',
-				],
-				[
-					'name'    => 'Ahmadinejad',
-					'email'   => 'ahmadinejad@world.com',
-					'country' => 'Iran',
-				],
-				[
-					'name'    => 'Richard A Causey',
-					'email'   => 'richard@world.com',
-					'country' => 'US',
-				],
-				[
-					'name'    => 'Chris Martin',
-					'email'   => 'chris@world.com',
-					'country' => 'UK',
-				],
-			],
-			'job'                    => [
-				[
-					'name'        => 'Developer',
-					'description' => 'Awesome job, but sometimes makes you bored',
-				],
-				[
-					'name'        => 'Politician',
-					'description' => 'This is not really a job',
-				],
-				[
-					'name'        => 'Accountant',
-					'description' => 'Boring job, but you will get free snack at lunch',
-				],
-				[
-					'name'        => 'Musician',
-					'description' => 'Only Coldplay can actually called Musician',
-				],
-			],
-			'misc'                   => [
-				[
-					'key'   => '\\xxxfoo456',
-					'value' => 'Entry with \\xxx',
-				],
-				[
-					'key'   => '\\%foo456',
-					'value' => 'Entry with \\%',
-				],
-				[
-					'key'   => 'spaces and tabs',
-					'value' => ' One  two   three	tab',
-				],
-			],
-			'stringifypkey'          => [
-				[
-					'id'    => 'A01',
-					'value' => 'test',
-				],
-			],
-			'without_auto_increment' => [
-				[
-					'key'   => 'key',
-					'value' => 'value',
-				],
-			],
-			'type_test'              => [
-				[
-					'type_varchar'    => 'test',
-					'type_char'       => 'test',
-					'type_enum'       => 'appel',
-					'type_set'        => 'one',
-					'type_text'       => 'test text',
-					'type_mediumtext' => 'test medium text',
-					'type_smallint'   => 1,
-					'type_integer'    => 123,
-					'type_float'      => 10.1,
-					'type_real'       => 11.21,
-					'type_double'     => 23.22,
-					'type_decimal'    => 123123.2234,
-					'type_numeric'    => 123.23,
-					'type_blob'       => 'test blob',
-					'type_date'       => '2020-01-11T22:11:00.000+02:00',
-					'type_time'       => '2020-07-18T15:22:00.000+02:00',
-					'type_datetime'   => '2020-06-18T05:12:24.000+02:00',
-					'type_timestamp'  => '2019-07-18T21:53:21.000+02:00',
-					'type_bigint'     => 2342342,
-				],
-			],
-		];
+    public function run()
+    {
+        // Job Data
+        $data = [
+            'user' => [
+                [
+                    'name'    => 'Derek Jones',
+                    'email'   => 'derek@world.com',
+                    'country' => 'US',
+                ],
+                [
+                    'name'    => 'Ahmadinejad',
+                    'email'   => 'ahmadinejad@world.com',
+                    'country' => 'Iran',
+                ],
+                [
+                    'name'    => 'Richard A Causey',
+                    'email'   => 'richard@world.com',
+                    'country' => 'US',
+                ],
+                [
+                    'name'    => 'Chris Martin',
+                    'email'   => 'chris@world.com',
+                    'country' => 'UK',
+                ],
+            ],
+            'job' => [
+                [
+                    'name'        => 'Developer',
+                    'description' => 'Awesome job, but sometimes makes you bored',
+                ],
+                [
+                    'name'        => 'Politician',
+                    'description' => 'This is not really a job',
+                ],
+                [
+                    'name'        => 'Accountant',
+                    'description' => 'Boring job, but you will get free snack at lunch',
+                ],
+                [
+                    'name'        => 'Musician',
+                    'description' => 'Only Coldplay can actually called Musician',
+                ],
+            ],
+            'misc' => [
+                [
+                    'key'   => '\\xxxfoo456',
+                    'value' => 'Entry with \\xxx',
+                ],
+                [
+                    'key'   => '\\%foo456',
+                    'value' => 'Entry with \\%',
+                ],
+                [
+                    'key'   => 'spaces and tabs',
+                    'value' => ' One  two   three	tab',
+                ],
+            ],
+            'stringifypkey' => [
+                [
+                    'id'    => 'A01',
+                    'value' => 'test',
+                ],
+            ],
+            'without_auto_increment' => [
+                [
+                    'key'   => 'key',
+                    'value' => 'value',
+                ],
+            ],
+            'type_test' => [
+                [
+                    'type_varchar'    => 'test',
+                    'type_char'       => 'test',
+                    'type_enum'       => 'appel',
+                    'type_set'        => 'one',
+                    'type_text'       => 'test text',
+                    'type_mediumtext' => 'test medium text',
+                    'type_smallint'   => 1,
+                    'type_integer'    => 123,
+                    'type_float'      => 10.1,
+                    'type_real'       => 11.21,
+                    'type_double'     => 23.22,
+                    'type_decimal'    => 123123.2234,
+                    'type_numeric'    => 123.23,
+                    'type_blob'       => 'test blob',
+                    'type_date'       => '2020-01-11T22:11:00.000+02:00',
+                    'type_time'       => '2020-07-18T15:22:00.000+02:00',
+                    'type_datetime'   => '2020-06-18T05:12:24.000+02:00',
+                    'type_timestamp'  => '2019-07-18T21:53:21.000+02:00',
+                    'type_bigint'     => 2342342,
+                ],
+            ],
+        ];
+
+        // set SQL times to more correct format
+        if ($this->db->DBDriver === 'SQLite3') {
+            $data['type_test'][0]['type_date']      = '2020/01/11';
+            $data['type_test'][0]['type_time']      = '15:22:00';
+            $data['type_test'][0]['type_datetime']  = '2020/06/18 05:12:24';
+            $data['type_test'][0]['type_timestamp'] = '2019/07/18 21:53:21';
+        }
 
-		//set SQL times to more correct format
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			 $data['type_test'][0]['type_date']      = '2020/01/11';
-			 $data['type_test'][0]['type_time']      = '15:22:00';
-			 $data['type_test'][0]['type_datetime']  = '2020/06/18 05:12:24';
-			 $data['type_test'][0]['type_timestamp'] = '2019/07/18 21:53:21';
-		}
+        if ($this->db->DBDriver === 'Postgre') {
+            $data['type_test'][0]['type_time'] = '15:22:00';
+            unset(
+                $data['type_test'][0]['type_enum'],
+                $data['type_test'][0]['type_set'],
+                $data['type_test'][0]['type_mediumtext'],
+                $data['type_test'][0]['type_real'],
+                $data['type_test'][0]['type_double'],
+                $data['type_test'][0]['type_decimal'],
+                $data['type_test'][0]['type_blob']
+            );
+        }
 
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$data['type_test'][0]['type_time'] = '15:22:00';
-			unset($data['type_test'][0]['type_enum']);
-			unset($data['type_test'][0]['type_set']);
-			unset($data['type_test'][0]['type_mediumtext']);
-			unset($data['type_test'][0]['type_real']);
-			unset($data['type_test'][0]['type_double']);
-			unset($data['type_test'][0]['type_decimal']);
-			unset($data['type_test'][0]['type_blob']);
-		}
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $data['type_test'][0]['type_date']     = '2020-01-11';
+            $data['type_test'][0]['type_time']     = '15:22:00.000';
+            $data['type_test'][0]['type_datetime'] = '2020-06-18 05:12:24.000';
 
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$data['type_test'][0]['type_date']     = '2020-01-11';
-			$data['type_test'][0]['type_time']     = '15:22:00.000';
-			$data['type_test'][0]['type_datetime'] = '2020-06-18 05:12:24.000';
-			unset($data['type_test'][0]['type_timestamp']);
-			unset($data['type_test'][0]['type_enum']);
-			unset($data['type_test'][0]['type_set']);
-			unset($data['type_test'][0]['type_mediumtext']);
-			unset($data['type_test'][0]['type_double']);
-			unset($data['type_test'][0]['type_blob']);
-		}
+            unset(
+                $data['type_test'][0]['type_timestamp'],
+                $data['type_test'][0]['type_enum'],
+                $data['type_test'][0]['type_set'],
+                $data['type_test'][0]['type_mediumtext'],
+                $data['type_test'][0]['type_double'],
+                $data['type_test'][0]['type_blob']
+            );
+        }
 
-		foreach ($data as $table => $dummy_data)
-		{
-			$this->db->table($table)->truncate();
+        foreach ($data as $table => $dummy_data) {
+            $this->db->table($table)->truncate();
 
-			foreach ($dummy_data as $single_dummy_data)
-			{
-				$this->db->table($table)->insert($single_dummy_data);
-			}
-		}
-	}
+            foreach ($dummy_data as $single_dummy_data) {
+                $this->db->table($table)->insert($single_dummy_data);
+            }
+        }
+    }
 }
diff --git a/tests/_support/Entity/Cast/CastBase64.php b/tests/_support/Entity/Cast/CastBase64.php
index 6bf93ba5ee33..f09fb79d3e8d 100644
--- a/tests/_support/Entity/Cast/CastBase64.php
+++ b/tests/_support/Entity/Cast/CastBase64.php
@@ -1,34 +1,43 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 use CodeIgniter\Entity\Cast\BaseCast;
 
 class CastBase64 extends BaseCast
 {
-	/**
-	 * Get
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function get($value, array $params = []) : string
-	{
-		return base64_decode($value);
-	}
+    /**
+     * Get
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function get($value, array $params = []): string
+    {
+        return base64_decode($value, true);
+    }
 
-	/**
-	 * Set
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function set($value, array $params = []) : string
-	{
-		return base64_encode($value);
-	}
+    /**
+     * Set
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function set($value, array $params = []): string
+    {
+        return base64_encode($value);
+    }
 }
diff --git a/tests/_support/Entity/Cast/CastPassParameters.php b/tests/_support/Entity/Cast/CastPassParameters.php
index 403290b3383b..7c73cd262a95 100644
--- a/tests/_support/Entity/Cast/CastPassParameters.php
+++ b/tests/_support/Entity/Cast/CastPassParameters.php
@@ -1,21 +1,30 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 use CodeIgniter\Entity\Cast\BaseCast;
 
 class CastPassParameters extends BaseCast
 {
-	/**
-	 * Set
-	 *
-	 * @param mixed $value  Data
-	 * @param array $params Additional param
-	 *
-	 * @return mixed
-	 */
-	public static function set($value, array $params = [])
-	{
-		return $value . ':' . json_encode($params);
-	}
+    /**
+     * Set
+     *
+     * @param mixed $value  Data
+     * @param array $params Additional param
+     *
+     * @return mixed
+     */
+    public static function set($value, array $params = [])
+    {
+        return $value . ':' . json_encode($params);
+    }
 }
diff --git a/tests/_support/Entity/Cast/NotExtendsBaseCast.php b/tests/_support/Entity/Cast/NotExtendsBaseCast.php
index 30ea69dabcbc..35352b0a793e 100644
--- a/tests/_support/Entity/Cast/NotExtendsBaseCast.php
+++ b/tests/_support/Entity/Cast/NotExtendsBaseCast.php
@@ -1,8 +1,16 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 class NotExtendsBaseCast
 {
-
 }
diff --git a/tests/_support/Files/able/apple.php b/tests/_support/Files/able/apple.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/apple.php
+++ b/tests/_support/Files/able/apple.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
diff --git a/tests/_support/Files/able/fig_3.php b/tests/_support/Files/able/fig_3.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/fig_3.php
+++ b/tests/_support/Files/able/fig_3.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
diff --git a/tests/_support/Files/able/prune_ripe.php b/tests/_support/Files/able/prune_ripe.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/prune_ripe.php
+++ b/tests/_support/Files/able/prune_ripe.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
diff --git a/tests/_support/Files/baker/banana.php b/tests/_support/Files/baker/banana.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/baker/banana.php
+++ b/tests/_support/Files/baker/banana.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
diff --git a/tests/_support/Filters/Customfilter.php b/tests/_support/Filters/Customfilter.php
index 3c9fbd0eaf6c..134f82a46f9f 100644
--- a/tests/_support/Filters/Customfilter.php
+++ b/tests/_support/Filters/Customfilter.php
@@ -1,24 +1,29 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Filters;
 
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Security\Exceptions\SecurityException;
-use Config\Services;
 
 class Customfilter implements \CodeIgniter\Filters\FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $request->url = 'http://hellowworld.com';
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$request->url = 'http://hellowworld.com';
-
-		return $request;
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
+        return $request;
+    }
 
-	//--------------------------------------------------------------------
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/_support/Helpers/baguette_helper.php b/tests/_support/Helpers/baguette_helper.php
index 2e50fe85e0c1..72ff5eff4d01 100644
--- a/tests/_support/Helpers/baguette_helper.php
+++ b/tests/_support/Helpers/baguette_helper.php
@@ -1,2 +1,10 @@
 <?php
-// You did it!
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
diff --git a/tests/_support/Language/SecondMockLanguage.php b/tests/_support/Language/SecondMockLanguage.php
index 7142885434ed..d7550ab848a4 100644
--- a/tests/_support/Language/SecondMockLanguage.php
+++ b/tests/_support/Language/SecondMockLanguage.php
@@ -1,27 +1,33 @@
-<?php namespace Tests\Support\Language;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Language;
 
 use CodeIgniter\Language\Language;
 
 class SecondMockLanguage extends Language
 {
-	//--------------------------------------------------------------------
-
-	/**
-	 * Expose the protected *load* method
-	 */
-	public function loadem(string $file, string $locale = 'en', bool $return = false)
-	{
-		return $this->load($file, $locale, $return);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Expose the loaded language files
-	 */
-	public function loaded(string $locale = 'en')
-	{
-		return $this->loadedFiles[$locale];
-	}
+    /**
+     * Expose the protected *load* method
+     */
+    public function loadem(string $file, string $locale = 'en', bool $return = false)
+    {
+        return $this->load($file, $locale, $return);
+    }
 
+    /**
+     * Expose the loaded language files
+     */
+    public function loaded(string $locale = 'en')
+    {
+        return $this->loadedFiles[$locale];
+    }
 }
diff --git a/tests/_support/Language/ab-CD/Allin.php b/tests/_support/Language/ab-CD/Allin.php
index 3b153883bc35..070ca73dac05 100644
--- a/tests/_support/Language/ab-CD/Allin.php
+++ b/tests/_support/Language/ab-CD/Allin.php
@@ -1,8 +1,17 @@
 <?php
-// seven wonders of the ancient world
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'one' => 'Pyramid of Giza',
-   'tre' => 'Colossus of Rhodes',
-   'fiv' => 'Temple of Artemis',
-   'sev' => 'Hanging Gardens of Babylon',
+    'one' => 'Pyramid of Giza',
+    'tre' => 'Colossus of Rhodes',
+    'fiv' => 'Temple of Artemis',
+    'sev' => 'Hanging Gardens of Babylon',
 ];
diff --git a/tests/_support/Language/ab/Allin.php b/tests/_support/Language/ab/Allin.php
index 69120758f046..3960c8989204 100644
--- a/tests/_support/Language/ab/Allin.php
+++ b/tests/_support/Language/ab/Allin.php
@@ -1,8 +1,17 @@
 <?php
-// seven deadly sins
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'two' => 'gluttony',
-   'tre' => 'greed',
-   'six' => 'envy',
-   'sev' => 'pride',
+    'two' => 'gluttony',
+    'tre' => 'greed',
+    'six' => 'envy',
+    'sev' => 'pride',
 ];
diff --git a/tests/_support/Language/en-ZZ/More.php b/tests/_support/Language/en-ZZ/More.php
index 66810205a329..639adae037f5 100644
--- a/tests/_support/Language/en-ZZ/More.php
+++ b/tests/_support/Language/en-ZZ/More.php
@@ -1,6 +1,16 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'strongForce' => 'These are not the droids you are looking for',
-   'notaMoon'    => "It's made of cheese",
-   'wisdom'      => 'There is no try',
+    'strongForce' => 'These are not the droids you are looking for',
+    'notaMoon'    => "It's made of cheese",
+    'wisdom'      => 'There is no try',
 ];
diff --git a/tests/_support/Language/en/Allin.php b/tests/_support/Language/en/Allin.php
index 6a10dcc76c1a..0023f5195009 100644
--- a/tests/_support/Language/en/Allin.php
+++ b/tests/_support/Language/en/Allin.php
@@ -1,8 +1,17 @@
 <?php
-// 12 days of Christmas
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'for' => 'four calling birds',
-   'fiv' => 'five golden rings',
-   'six' => 'six geese a laying',
-   'sev' => 'seven swans a swimming',
+    'for' => 'four calling birds',
+    'fiv' => 'five golden rings',
+    'six' => 'six geese a laying',
+    'sev' => 'seven swans a swimming',
 ];
diff --git a/tests/_support/Language/en/Core.php b/tests/_support/Language/en/Core.php
index b2fc4c188767..240247892e28 100644
--- a/tests/_support/Language/en/Core.php
+++ b/tests/_support/Language/en/Core.php
@@ -1,20 +1,15 @@
 <?php
+
 /**
- * Core language strings.
+ * This file is part of CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2018 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * @codeCoverageIgnore
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
-// looking for a system message not likely to be part of unit testing
 return [
-   'missingExtension' => '{0} extension could not be found.',
-   'bazillion'        => 'billions and billions', // adds a new setting
+    'missingExtension' => '{0} extension could not be found.',
+    'bazillion'        => 'billions and billions', // adds a new setting
 ];
diff --git a/tests/_support/Language/en/Foo.php b/tests/_support/Language/en/Foo.php
index 3e7071af6194..e5493d637dc5 100644
--- a/tests/_support/Language/en/Foo.php
+++ b/tests/_support/Language/en/Foo.php
@@ -1,10 +1,19 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'bar'             => 'Foo Bar Translated',
-   'bar.min_length1' => 'The {field} field is very short.',
-   'bar.min_length2' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
-   'baz'             => [
-	   'min_length3.short' => 'The {field} field is very short.',
-   ],
+    'bar'             => 'Foo Bar Translated',
+    'bar.min_length1' => 'The {field} field is very short.',
+    'bar.min_length2' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
+    'baz'             => [
+        'min_length3.short' => 'The {field} field is very short.',
+    ],
 ];
diff --git a/tests/_support/Language/en/Language.php b/tests/_support/Language/en/Language.php
index 01690352602c..349a4aade553 100644
--- a/tests/_support/Language/en/Language.php
+++ b/tests/_support/Language/en/Language.php
@@ -1,15 +1,15 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * This file is part of CodeIgniter 4 framework.
  *
  * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Language system language settings
 return [
-	'languageGetLineInvalidArgumentException' => 'Get line must be a string or array of strings.',
+    'languageGetLineInvalidArgumentException' => 'Get line must be a string or array of strings.',
 ];
diff --git a/tests/_support/Language/en/More.php b/tests/_support/Language/en/More.php
index 5b4eaea5a6b0..66d4e1b54694 100644
--- a/tests/_support/Language/en/More.php
+++ b/tests/_support/Language/en/More.php
@@ -1,7 +1,16 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'strongForce' => 'These are not the droids you are looking for',
-   'notaMoon'    => "That's no moon... it's a space station",
-   'cannotMove'  => 'I have a very bad feeling about this',
+    'strongForce' => 'These are not the droids you are looking for',
+    'notaMoon'    => "That's no moon... it's a space station",
+    'cannotMove'  => 'I have a very bad feeling about this',
 ];
diff --git a/tests/_support/Language/en/Nested.php b/tests/_support/Language/en/Nested.php
index 5be4d63730b8..8b67880566d5 100644
--- a/tests/_support/Language/en/Nested.php
+++ b/tests/_support/Language/en/Nested.php
@@ -1,11 +1,20 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'a' => [
-	   'b' => [
-		   'c' => [
-			   'd' => 'e',
-		   ],
-	   ],
-   ],
+    'a' => [
+        'b' => [
+            'c' => [
+                'd' => 'e',
+            ],
+        ],
+    ],
 ];
diff --git a/tests/_support/Language/ru/Language.php b/tests/_support/Language/ru/Language.php
index d6c6632b7bb9..2568889fee66 100644
--- a/tests/_support/Language/ru/Language.php
+++ b/tests/_support/Language/ru/Language.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 return [
-   'languageGetLineInvalidArgumentException' => 'Whatever this would be, translated',
+    'languageGetLineInvalidArgumentException' => 'Whatever this would be, translated',
 ];
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index e22559c69433..50fd95054b7e 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -1,4 +1,15 @@
-<?php namespace Tests\Support\Log\Handlers;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Log\Handlers;
 
 /**
  * Class TestHandler
@@ -6,59 +17,47 @@
  * A simple LogHandler that stores the logs in memory.
  * Only used for testing purposes.
  */
-
 class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler
 {
-
-	/**
-	 * Local storage for logs.
-	 *
-	 * @var array
-	 */
-	protected static $logs = [];
-
-	/**
-	 * Where would the log be written?
-	 */
-	//--------------------------------------------------------------------
-
-	public function __construct(array $config)
-	{
-		parent::__construct($config);
-		$this->handles     = $config['handles'] ?? [];
-		$this->destination = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
-
-		self::$logs = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Handles logging the message.
-	 * If the handler returns false, then execution of handlers
-	 * will stop. Any handlers that have not run, yet, will not
-	 * be run.
-	 *
-	 * @param $level
-	 * @param $message
-	 *
-	 * @return boolean
-	 */
-	public function handle($level, $message): bool
-	{
-		$date = date($this->dateFormat);
-
-		self::$logs[] = strtoupper($level) . ' - ' . $date . ' --> ' . $message;
-
-		return true;
-	}
-
-	//--------------------------------------------------------------------
-
-	public static function getLogs()
-	{
-		return self::$logs;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Local storage for logs.
+     *
+     * @var array
+     */
+    protected static $logs = [];
+
+    /**
+     * Where would the log be written?
+     */
+    public function __construct(array $config)
+    {
+        parent::__construct($config);
+        $this->handles     = $config['handles'] ?? [];
+        $this->destination = $this->path . 'log-' . date('Y-m-d') . '.' . $this->fileExtension;
+
+        self::$logs = [];
+    }
+
+    /**
+     * Handles logging the message.
+     * If the handler returns false, then execution of handlers
+     * will stop. Any handlers that have not run, yet, will not
+     * be run.
+     *
+     * @param $level
+     * @param $message
+     */
+    public function handle($level, $message): bool
+    {
+        $date = date($this->dateFormat);
+
+        self::$logs[] = strtoupper($level) . ' - ' . $date . ' --> ' . $message;
+
+        return true;
+    }
+
+    public static function getLogs()
+    {
+        return self::$logs;
+    }
 }
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
index e7763a83a393..a6eb0b54ab62 100644
--- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
+++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
@@ -1,24 +1,35 @@
-<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
 class Migration_some_migration extends \CodeIgniter\Database\Migration
 {
-	public function up()
-	{
-		$this->forge->addField([
-			'key' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->createTable('foo', true);
+    public function up()
+    {
+        $this->forge->addField([
+            'key' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->createTable('foo', true);
 
-		$this->db->table('foo')->insert([
-			'key' => 'foobar',
-		]);
-	}
+        $this->db->table('foo')->insert([
+            'key' => 'foobar',
+        ]);
+    }
 
-	public function down()
-	{
-		$this->forge->dropTable('foo', true);
-	}
+    public function down()
+    {
+        $this->forge->dropTable('foo', true);
+    }
 }
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
index 797aae70259b..f1606eff56e1 100644
--- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
+++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
@@ -1,28 +1,38 @@
-<?php namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\MigrationTestMigrations\Database\Migrations;
 
 class Migration_another_migration extends \CodeIgniter\Database\Migration
 {
-	public function up()
-	{
-		$fields = [
-			'value' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		];
-		$this->forge->addColumn('foo', $fields);
+    public function up()
+    {
+        $fields = [
+            'value' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ];
+        $this->forge->addColumn('foo', $fields);
 
-		$this->db->table('foo')->insert([
-			'key'   => 'foobar',
-			'value' => 'raboof',
-		]);
-	}
+        $this->db->table('foo')->insert([
+            'key'   => 'foobar',
+            'value' => 'raboof',
+        ]);
+    }
 
-	public function down()
-	{
-		if ($this->db->tableExists('foo'))
-		{
-			$this->forge->dropColumn('foo', 'value');
-		}
-	}
+    public function down()
+    {
+        if ($this->db->tableExists('foo')) {
+            $this->forge->dropColumn('foo', 'value');
+        }
+    }
 }
diff --git a/tests/_support/Models/EntityModel.php b/tests/_support/Models/EntityModel.php
index 46abfa59c43e..fb53549e8fa6 100644
--- a/tests/_support/Models/EntityModel.php
+++ b/tests/_support/Models/EntityModel.php
@@ -1,22 +1,33 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class EntityModel extends Model
 {
-	protected $table = 'job';
+    protected $table = 'job';
 
-	protected $returnType = '\Tests\Support\Models\SimpleEntity';
+    protected $returnType = '\Tests\Support\Models\SimpleEntity';
 
-	protected $useSoftDeletes = false;
+    protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $deletedField = 'deleted_at';
+    protected $deletedField = 'deleted_at';
 
-	protected $allowedFields = [
-		'name',
-		'description',
-		'created_at',
-	];
+    protected $allowedFields = [
+        'name',
+        'description',
+        'created_at',
+    ];
 }
diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
index c1ef3b84c70f..8b8a947efcc6 100644
--- a/tests/_support/Models/EventModel.php
+++ b/tests/_support/Models/EventModel.php
@@ -1,115 +1,124 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class EventModel extends Model
 {
-	protected $table = 'user';
-
-	protected $returnType = 'array';
+    protected $table = 'user';
 
-	protected $useSoftDeletes = false;
+    protected $returnType = 'array';
 
-	protected $dateFormat = 'datetime';
+    protected $useSoftDeletes = false;
 
-	protected $allowedFields = [
-		'name',
-		'email',
-		'country',
-		'deleted_at',
-	];
+    protected $dateFormat = 'datetime';
 
-	protected $beforeInsert = ['beforeInsertMethod'];
-	protected $afterInsert  = ['afterInsertMethod'];
-	protected $beforeUpdate = ['beforeUpdateMethod'];
-	protected $afterUpdate  = ['afterUpdateMethod'];
-	protected $beforeDelete = ['beforeDeleteMethod'];
-	protected $afterDelete  = ['afterDeleteMethod'];
-	protected $beforeFind   = ['beforeFindMethod'];
-	protected $afterFind    = ['afterFindMethod'];
+    protected $allowedFields = [
+        'name',
+        'email',
+        'country',
+        'deleted_at',
+    ];
 
-	// Cache of the most recent eventData from a trigger
-	public $eventData;
+    protected $beforeInsert = ['beforeInsertMethod'];
+    protected $afterInsert  = ['afterInsertMethod'];
+    protected $beforeUpdate = ['beforeUpdateMethod'];
+    protected $afterUpdate  = ['afterUpdateMethod'];
+    protected $beforeDelete = ['beforeDeleteMethod'];
+    protected $afterDelete  = ['afterDeleteMethod'];
+    protected $beforeFind   = ['beforeFindMethod'];
+    protected $afterFind    = ['afterFindMethod'];
 
-	// Testing directive to set $returnData on beforeFind event
-	public $beforeFindReturnData = false;
+    // Cache of the most recent eventData from a trigger
+    public $eventData;
 
-	// Holds stuff for testing events
-	protected $tokens = [];
+    // Testing directive to set $returnData on beforeFind event
+    public $beforeFindReturnData = false;
 
-	protected function beforeInsertMethod(array $data)
-	{
-		$this->tokens[]  = 'beforeInsert';
-		$this->eventData = $data;
+    // Holds stuff for testing events
+    protected $tokens = [];
 
-		return $data;
-	}
+    protected function beforeInsertMethod(array $data)
+    {
+        $this->tokens[]  = 'beforeInsert';
+        $this->eventData = $data;
 
-	protected function afterInsertMethod(array $data)
-	{
-		$this->tokens[]  = 'afterInsert';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function afterInsertMethod(array $data)
+    {
+        $this->tokens[]  = 'afterInsert';
+        $this->eventData = $data;
 
-	protected function beforeUpdateMethod(array $data)
-	{
-		$this->tokens[]  = 'beforeUpdate';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function beforeUpdateMethod(array $data)
+    {
+        $this->tokens[]  = 'beforeUpdate';
+        $this->eventData = $data;
 
-	protected function afterUpdateMethod(array $data)
-	{
-		$this->tokens[]  = 'afterUpdate';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function afterUpdateMethod(array $data)
+    {
+        $this->tokens[]  = 'afterUpdate';
+        $this->eventData = $data;
 
-	protected function beforeDeleteMethod(array $data)
-	{
-		$this->tokens[]  = 'beforeDelete';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function beforeDeleteMethod(array $data)
+    {
+        $this->tokens[]  = 'beforeDelete';
+        $this->eventData = $data;
 
-	protected function afterDeleteMethod(array $data)
-	{
-		$this->tokens[]  = 'afterDelete';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function afterDeleteMethod(array $data)
+    {
+        $this->tokens[]  = 'afterDelete';
+        $this->eventData = $data;
 
-	protected function beforeFindMethod(array $data)
-	{
-		$this->tokens[]  = 'beforeFind';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		if ($this->beforeFindReturnData)
-		{
-			$data['data']       = 'foobar';
-			$data['returnData'] = true;
-		}
+    protected function beforeFindMethod(array $data)
+    {
+        $this->tokens[]  = 'beforeFind';
+        $this->eventData = $data;
 
-		return $data;
-	}
+        if ($this->beforeFindReturnData) {
+            $data['data']       = 'foobar';
+            $data['returnData'] = true;
+        }
 
-	protected function afterFindMethod(array $data)
-	{
-		$this->tokens[]  = 'afterFind';
-		$this->eventData = $data;
+        return $data;
+    }
 
-		return $data;
-	}
+    protected function afterFindMethod(array $data)
+    {
+        $this->tokens[]  = 'afterFind';
+        $this->eventData = $data;
 
-	public function hasToken(string $token)
-	{
-		return in_array($token, $this->tokens);
-	}
+        return $data;
+    }
 
+    public function hasToken(string $token)
+    {
+        return in_array($token, $this->tokens, true);
+    }
 }
diff --git a/tests/_support/Models/FabricatorModel.php b/tests/_support/Models/FabricatorModel.php
index de99daece4b2..1c40e7e1464e 100644
--- a/tests/_support/Models/FabricatorModel.php
+++ b/tests/_support/Models/FabricatorModel.php
@@ -1,31 +1,42 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 use Faker\Generator;
 
 class FabricatorModel extends Model
 {
-	protected $table = 'job';
+    protected $table = 'job';
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = true;
+    protected $useSoftDeletes = true;
 
-	protected $useTimestamps = true;
+    protected $useTimestamps = true;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $allowedFields = [
-		'name',
-		'description',
-	];
+    protected $allowedFields = [
+        'name',
+        'description',
+    ];
 
-	// Return a faked entity
-	public function fake(Generator &$faker)
-	{
-		return (object) [
-							'name'        => $faker->ipv4,
-							'description' => $faker->words(10),
-						];
-	}
+    // Return a faked entity
+    public function fake(Generator &$faker)
+    {
+        return (object) [
+            'name'        => $faker->ipv4,
+            'description' => $faker->words(10),
+        ];
+    }
 }
diff --git a/tests/_support/Models/JobModel.php b/tests/_support/Models/JobModel.php
index 98c4ad28d94e..06b967af7a89 100644
--- a/tests/_support/Models/JobModel.php
+++ b/tests/_support/Models/JobModel.php
@@ -1,23 +1,34 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class JobModel extends Model
 {
-	protected $table = 'job';
+    protected $table = 'job';
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = false;
+    protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $allowedFields = [
-		'name',
-		'description',
-	];
+    protected $allowedFields = [
+        'name',
+        'description',
+    ];
 
-	public $name = '';
+    public $name = '';
 
-	public $description = '';
+    public $description = '';
 }
diff --git a/tests/_support/Models/SecondaryModel.php b/tests/_support/Models/SecondaryModel.php
index 18e0b0aa2ae4..b4ef155a5aa9 100644
--- a/tests/_support/Models/SecondaryModel.php
+++ b/tests/_support/Models/SecondaryModel.php
@@ -1,21 +1,32 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class SecondaryModel extends Model
 {
-	protected $table = 'secondary';
+    protected $table = 'secondary';
 
-	protected $primaryKey = 'id';
+    protected $primaryKey = 'id';
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = false;
+    protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $allowedFields = [
-		'key',
-		'value',
-	];
+    protected $allowedFields = [
+        'key',
+        'value',
+    ];
 }
diff --git a/tests/_support/Models/SimpleEntity.php b/tests/_support/Models/SimpleEntity.php
index 961a88d51578..2c13dccafd55 100644
--- a/tests/_support/Models/SimpleEntity.php
+++ b/tests/_support/Models/SimpleEntity.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Entity\Entity;
@@ -9,8 +18,6 @@
  *
  * Simple Entity-type class for testing creating and saving entities
  * in the model so we can support Entity/Repository type patterns.
- *
- * @package Tests\Support\Models
  */
 class SimpleEntity extends Entity
 {
diff --git a/tests/_support/Models/StringifyPkeyModel.php b/tests/_support/Models/StringifyPkeyModel.php
index bf15414d8a21..9d66e33d194e 100644
--- a/tests/_support/Models/StringifyPkeyModel.php
+++ b/tests/_support/Models/StringifyPkeyModel.php
@@ -1,9 +1,20 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class StringifyPkeyModel extends Model
 {
-	protected $table      = 'stringifypkey';
-	protected $returnType = 'object';
+    protected $table      = 'stringifypkey';
+    protected $returnType = 'object';
 }
diff --git a/tests/_support/Models/UserModel.php b/tests/_support/Models/UserModel.php
index 7be6d889ccca..7e68c3441803 100644
--- a/tests/_support/Models/UserModel.php
+++ b/tests/_support/Models/UserModel.php
@@ -1,27 +1,38 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class UserModel extends Model
 {
-	protected $table = 'user';
+    protected $table = 'user';
 
-	protected $allowedFields = [
-		'name',
-		'email',
-		'country',
-		'deleted_at',
-	];
+    protected $allowedFields = [
+        'name',
+        'email',
+        'country',
+        'deleted_at',
+    ];
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = true;
+    protected $useSoftDeletes = true;
 
-	protected $dateFormat = 'datetime';
+    protected $dateFormat = 'datetime';
 
-	public $name = '';
+    public $name = '';
 
-	public $email = '';
+    public $email = '';
 
-	public $country = '';
+    public $country = '';
 }
diff --git a/tests/_support/Models/ValidErrorsModel.php b/tests/_support/Models/ValidErrorsModel.php
index 189ac63be124..04ff1a98f715 100644
--- a/tests/_support/Models/ValidErrorsModel.php
+++ b/tests/_support/Models/ValidErrorsModel.php
@@ -1,30 +1,41 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class ValidErrorsModel extends Model
 {
-	protected $table = 'job';
+    protected $table = 'job';
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = false;
+    protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $allowedFields = [
-		'name',
-		'description',
-	];
+    protected $allowedFields = [
+        'name',
+        'description',
+    ];
 
-	protected $validationRules = [
-		'name'  => [
-			'required',
-			'min_length[10]',
-			'errors' => [
-				'min_length' => 'Minimum Length Error',
-			]
-		],
-		'token' => 'in_list[{id}]',
-	];
+    protected $validationRules = [
+        'name' => [
+            'required',
+            'min_length[10]',
+            'errors' => [
+                'min_length' => 'Minimum Length Error',
+            ],
+        ],
+        'token' => 'in_list[{id}]',
+    ];
 }
diff --git a/tests/_support/Models/ValidModel.php b/tests/_support/Models/ValidModel.php
index dc9ec7c459be..730985ad8142 100644
--- a/tests/_support/Models/ValidModel.php
+++ b/tests/_support/Models/ValidModel.php
@@ -1,34 +1,45 @@
-<?php namespace Tests\Support\Models;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class ValidModel extends Model
 {
-	protected $table = 'job';
+    protected $table = 'job';
 
-	protected $returnType = 'object';
+    protected $returnType = 'object';
 
-	protected $useSoftDeletes = false;
+    protected $useSoftDeletes = false;
 
-	protected $dateFormat = 'int';
+    protected $dateFormat = 'int';
 
-	protected $allowedFields = [
-		'name',
-		'description',
-	];
+    protected $allowedFields = [
+        'name',
+        'description',
+    ];
 
-	protected $validationRules = [
-		'name'  => [
-			'required',
-			'min_length[3]',
-		],
-		'token' => 'permit_empty|in_list[{id}]',
-	];
+    protected $validationRules = [
+        'name' => [
+            'required',
+            'min_length[3]',
+        ],
+        'token' => 'permit_empty|in_list[{id}]',
+    ];
 
-	protected $validationMessages = [
-		'name' => [
-			'required'   => 'You forgot to name the baby.',
-			'min_length' => 'Too short, man!',
-		],
-	];
+    protected $validationMessages = [
+        'name' => [
+            'required'   => 'You forgot to name the baby.',
+            'min_length' => 'Too short, man!',
+        ],
+    ];
 }
diff --git a/tests/_support/Models/WithoutAutoIncrementModel.php b/tests/_support/Models/WithoutAutoIncrementModel.php
index 76640a5d4ce9..248fd3af1134 100644
--- a/tests/_support/Models/WithoutAutoIncrementModel.php
+++ b/tests/_support/Models/WithoutAutoIncrementModel.php
@@ -1,19 +1,28 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
 
 class WithoutAutoIncrementModel extends Model
 {
-	protected $table = 'without_auto_increment';
+    protected $table = 'without_auto_increment';
 
-	protected $primaryKey = 'key';
+    protected $primaryKey = 'key';
 
-	protected $allowedFields = [
-		'key',
-		'value',
-	];
+    protected $allowedFields = [
+        'key',
+        'value',
+    ];
 
-	protected $useAutoIncrement = false;
+    protected $useAutoIncrement = false;
 }
diff --git a/tests/_support/RESTful/Worker.php b/tests/_support/RESTful/Worker.php
index 973543fa5119..9e736a0a8f72 100644
--- a/tests/_support/RESTful/Worker.php
+++ b/tests/_support/RESTful/Worker.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\RESTful;
 
 use CodeIgniter\RESTful\ResourceController;
diff --git a/tests/_support/RESTful/Worker2.php b/tests/_support/RESTful/Worker2.php
index bced2e9524af..af3df04c713c 100644
--- a/tests/_support/RESTful/Worker2.php
+++ b/tests/_support/RESTful/Worker2.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\RESTful;
 
 use CodeIgniter\RESTful\ResourcePresenter;
@@ -8,5 +18,4 @@
  */
 class Worker2 extends ResourcePresenter
 {
-
 }
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
index 48e8283d786f..e6a8e53e6858 100644
--- a/tests/_support/Services.php
+++ b/tests/_support/Services.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
 
 use CIUnitTestCase;
 use Config\Services as ConfigServices;
@@ -8,63 +19,48 @@
  */
 class Services
 {
-	/**
-	 * Mock objects for testing which are returned if exist.
-	 *
-	 * @var array
-	 */
-	static protected $mocks = [];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset shared instances and mocks for testing.
-	 */
-	public static function reset()
-	{
-		static::$mocks = [];
-
-		CIUnitTestCase::setPrivateProperty(ConfigServices::class, 'instances', []);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Inject mock object for testing.
-	 *
-	 * @param string $name
-	 * @param $mock
-	 */
-	public static function injectMock(string $name, $mock)
-	{
-		$name                 = strtolower($name);
-		static::$mocks[$name] = $mock;
-	}
+    /**
+     * Mock objects for testing which are returned if exist.
+     *
+     * @var array
+     */
+    protected static $mocks = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * Reset shared instances and mocks for testing.
+     */
+    public static function reset()
+    {
+        static::$mocks = [];
 
-	/**
-	 * Returns a service
-	 *
-	 * @param string $name
-	 * @param array  $arguments
-	 */
-	public static function __callStatic(string $name, array $arguments)
-	{
-		$name = strtolower($name);
+        CIUnitTestCase::setPrivateProperty(ConfigServices::class, 'instances', []);
+    }
 
-		// Returns mock if exists
-		if (isset(static::$mocks[$name]))
-		{
-			return static::$mocks[$name];
-		}
+    /**
+     * Inject mock object for testing.
+     *
+     * @param $mock
+     */
+    public static function injectMock(string $name, $mock)
+    {
+        $name                 = strtolower($name);
+        static::$mocks[$name] = $mock;
+    }
 
-		if (method_exists(ConfigServices::class, $name))
-		{
-			return ConfigServices::$name(...$arguments);
-		}
-	}
+    /**
+     * Returns a service
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        $name = strtolower($name);
 
-	//--------------------------------------------------------------------
+        // Returns mock if exists
+        if (isset(static::$mocks[$name])) {
+            return static::$mocks[$name];
+        }
 
+        if (method_exists(ConfigServices::class, $name)) {
+            return ConfigServices::$name(...$arguments);
+        }
+    }
 }
diff --git a/tests/_support/SomeEntity.php b/tests/_support/SomeEntity.php
index d1b1410c3e21..a0edb4525e1b 100644
--- a/tests/_support/SomeEntity.php
+++ b/tests/_support/SomeEntity.php
@@ -1,13 +1,22 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support;
 
 use CodeIgniter\Entity\Entity;
 
 class SomeEntity extends Entity
 {
-	protected $attributes = [
-		'foo' => null,
-		'bar' => null,
-	];
+    protected $attributes = [
+        'foo' => null,
+        'bar' => null,
+    ];
 }
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index 2c40f32b5dea..ca9b672f583e 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -1,14 +1,22 @@
-<?php namespace Tests\Support\Validation;
+<?php
 
-class TestRules {
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-	public function customError(string $str, string &$error = null)
-	{
-		$error = 'My lovely error';
+namespace Tests\Support\Validation;
 
-		return false;
-	}
-
-	//--------------------------------------------------------------------
+class TestRules
+{
+    public function customError(string $str, ?string &$error = null)
+    {
+        $error = 'My lovely error';
 
+        return false;
+    }
 }
diff --git a/tests/_support/View/SampleClass.php b/tests/_support/View/SampleClass.php
index a7c1d3c25700..acc982dce225 100644
--- a/tests/_support/View/SampleClass.php
+++ b/tests/_support/View/SampleClass.php
@@ -1,4 +1,15 @@
-<?php namespace Tests\Support\View;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\View;
 
 /**
  * Class SampleClass
@@ -6,47 +17,38 @@
  * This class is only used to provide a reference point
  * during tests to make sure that things work as expected.
  */
-
-class SampleClass {
-
-	public function index()
-	{
-		return 'Hello World';
-	}
-
-	public function hello()
-	{
-		return 'Hello';
-	}
-
-	//--------------------------------------------------------------------
-
-	public function echobox($params)
-	{
-		if (is_array($params))
-		{
-			$params = implode(',', $params);
-		}
-
-		return $params;
-	}
-
-	//--------------------------------------------------------------------
-
-	public static function staticEcho($params)
-	{
-		if (is_array($params))
-		{
-			$params = implode(',', $params);
-		}
-
-		return $params;
-	}
-
-	//--------------------------------------------------------------------
-
-	public function work($p1, $p2, $p4)
-	{
-		return 'Right on';
-	}
+class SampleClass
+{
+    public function index()
+    {
+        return 'Hello World';
+    }
+
+    public function hello()
+    {
+        return 'Hello';
+    }
+
+    public function echobox($params)
+    {
+        if (is_array($params)) {
+            $params = implode(',', $params);
+        }
+
+        return $params;
+    }
+
+    public static function staticEcho($params)
+    {
+        if (is_array($params)) {
+            $params = implode(',', $params);
+        }
+
+        return $params;
+    }
+
+    public function work($p1, $p2, $p4)
+    {
+        return 'Right on';
+    }
 }
diff --git a/tests/_support/View/SampleClassWithInitController.php b/tests/_support/View/SampleClassWithInitController.php
index 6ffe5280ef25..531b208dc6d7 100644
--- a/tests/_support/View/SampleClassWithInitController.php
+++ b/tests/_support/View/SampleClassWithInitController.php
@@ -1,4 +1,15 @@
-<?php namespace Tests\Support\View;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\View;
 
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -10,16 +21,15 @@
  * This class is only used to provide a reference point
  * during tests to make sure that things work as expected.
  */
-
 class SampleClassWithInitController
 {
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		$this->response = $response;
-	}
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
+    {
+        $this->response = $response;
+    }
 
-	public function index()
-	{
-		return get_class($this->response);
-	}
+    public function index()
+    {
+        return get_class($this->response);
+    }
 }
diff --git a/tests/_support/Widgets/NopeWidget.php b/tests/_support/Widgets/NopeWidget.php
index b709183c06b6..9c677f380915 100644
--- a/tests/_support/Widgets/NopeWidget.php
+++ b/tests/_support/Widgets/NopeWidget.php
@@ -1,4 +1,12 @@
 <?php
 
-// Valid PHP file but, much like myself: no class
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 $class = 'nope';
diff --git a/tests/_support/Widgets/OtherWidget.php b/tests/_support/Widgets/OtherWidget.php
index 243c5fae3bd2..6276b8354bfb 100644
--- a/tests/_support/Widgets/OtherWidget.php
+++ b/tests/_support/Widgets/OtherWidget.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Widgets;
 
 class OtherWidget
diff --git a/tests/_support/Widgets/SomeWidget.php b/tests/_support/Widgets/SomeWidget.php
index 2621af7c062d..380449f14b9b 100644
--- a/tests/_support/Widgets/SomeWidget.php
+++ b/tests/_support/Widgets/SomeWidget.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Widgets;
 
 // Extends a trivial class to test the instanceOf directive
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index c7b7e9a16579..958be5434689 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\API;
 
 use CodeIgniter\Format\JSONFormatter;
@@ -11,558 +21,554 @@
 use Config\App;
 use stdClass;
 
-class ResponseTraitTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ResponseTraitTest extends CIUnitTestCase
 {
-
-	protected $request;
-	protected $response;
-
-	/**
-	 * @var Response formatter
-	 */
-	protected $formatter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->formatter = new JSONFormatter();
-	}
-
-	protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
-	{
-		$config = new App();
-		foreach ([
-			'baseURL'          => 'http://example.com/',
-			'uriProtocol'      => 'REQUEST_URI',
-			'defaultLocale'    => 'en',
-			'negotiateLocale'  => false,
-			'supportedLocales' => ['en'],
-			'CSPEnabled'       => false,
-			'cookiePrefix'     => '',
-			'cookieDomain'     => '',
-			'cookiePath'       => '/',
-			'cookieSecure'     => false,
-			'cookieHTTPOnly'   => false,
-			'proxyIPs'         => [],
-			'cookieSameSite'   => 'Lax',
-		] as $key => $value)
-		{
-			$config->$key = $value;
-		}
-
-		if (is_null($this->request))
-		{
-			$this->request  = new MockIncomingRequest((object) $config, new URI($uri), null, new UserAgent());
-			$this->response = new MockResponse((object) $config);
-		}
-
-		// Insert headers into request.
-		$headers = [
-			'Accept' => 'text/html',
-		];
-		$headers = array_merge($headers, $userHeaders);
-
-		foreach ($headers as $key => $value)
-		{
-			$this->request->setHeader($key, $value);
-			if (($key === 'Accept') && ! is_array($value))
-			{
-				$this->response->setContentType($value);
-			}
-		}
-
-		// Create the controller class finally.
-		$controller = new class($this->request, $this->response, $this->formatter)
-		{
-
-			use ResponseTrait;
-
-			protected $request;
-			protected $response;
-			protected $formatter;
-
-			public function __construct(&$request, &$response, &$formatter)
-			{
-				$this->request   = $request;
-				$this->response  = $response;
-				$this->formatter = $formatter;
-			}
-
-			public function resetFormatter()
-			{
-				$this->formatter = null;
-			}
-		};
-
-		return $controller;
-	}
-
-	public function testNoFormatterJSON()
-	{
-		$this->formatter = null;
-		$controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
-		$controller->respondCreated(['id' => 3], 'A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(201, $this->response->getStatusCode());
-
-		$expected = <<<EOH
-{
-    "id": 3
-}
-EOH;
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testNoFormatter()
-	{
-		$this->formatter = null;
-		$controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
-		$controller->respondCreated('A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getBody());
-	}
-
-	public function testAssociativeArrayPayload()
-	{
-		$this->formatter = null;
-		$controller      = $this->makeController();
-		$payload         = ['answer' => 42];
-		$expected        = <<<EOH
-{
-    "answer": 42
-}
-EOH;
-		$controller->respond($payload);
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testArrayPayload()
-	{
-		$this->formatter = null;
-		$controller      = $this->makeController();
-		$payload         = [
-			1,
-			2,
-			3,
-		];
-		$expected        = <<<EOH
-[
-    1,
-    2,
-    3
-]
-EOH;
-		$controller->respond($payload);
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testPHPtoArrayPayload()
-	{
-		$this->formatter = null;
-		$controller      = $this->makeController();
-		$payload         = new stdClass();
-		$payload->name   = 'Tom';
-		$payload->id     = 1;
-		$expected        = <<<EOH
-{
-    "name": "Tom",
-    "id": 1
-}
-EOH;
-		$controller->respond((array)$payload);
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testRespondSets404WithNoData()
-	{
-		$controller = $this->makeController();
-		$controller->respond(null, null);
-
-		$this->assertEquals(404, $this->response->getStatusCode());
-		$this->assertNull($this->response->getBody());
-	}
-
-	public function testRespondSetsStatusWithEmptyData()
-	{
-		$controller = $this->makeController();
-		$controller->respond(null, 201);
-
-		$this->assertEquals(201, $this->response->getStatusCode());
-		$this->assertNull($this->response->getBody());
-	}
-
-	public function testRespondSetsCorrectBodyAndStatus()
-	{
-		$controller = $this->makeController();
-		$controller->respond('something', 201);
-
-		$this->assertEquals(201, $this->response->getStatusCode());
-		$this->assertEquals('something', $this->response->getBody());
-		$this->assertStringStartsWith('text/html', $this->response->getHeaderLine('Content-Type'));
-		$this->assertEquals('Created', $this->response->getReason());
-	}
-
-	public function testRespondWithCustomReason()
-	{
-		$controller = $this->makeController();
-		$controller->respond('something', 201, 'A Custom Reason');
-
-		$this->assertEquals(201, $this->response->getStatusCode());
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-	}
-
-	public function testFailSingleMessage()
-	{
-		$controller = $this->makeController();
-
-		$controller->fail('Failure to Launch', 500, 'WHAT!', 'A Custom Reason');
-
-		// Will use the JSON formatter by default
-		$expected = [
-			'status'   => 500,
-			'error'    => 'WHAT!',
-			'messages' => [
-				'error' => 'Failure to Launch',
-			],
-		];
-
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-		$this->assertEquals(500, $this->response->getStatusCode());
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-	}
-
-	public function testCreated()
-	{
-		$controller = $this->makeController();
-		$controller->respondCreated(['id' => 3], 'A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(201, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
-	}
-
-	public function testDeleted()
-	{
-		$controller = $this->makeController();
-		$controller->respondDeleted(['id' => 3], 'A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(200, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
-	}
-
-	public function testUpdated()
-	{
-		$controller = $this->makeController();
-		$controller->respondUpdated(['id' => 3], 'A Custom Reason');
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(200, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
-	}
-
-	public function testUnauthorized()
-	{
-		$controller = $this->makeController();
-		$controller->failUnauthorized('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 401,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(401, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testForbidden()
-	{
-		$controller = $this->makeController();
-		$controller->failForbidden('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 403,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(403, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testNoContent()
-	{
-		$controller = $this->makeController();
-		$controller->respondNoContent('');
-
-		$this->assertEquals('No Content', $this->response->getReason());
-		$this->assertEquals(204, $this->response->getStatusCode());
-	}
-
-	public function testNotFound()
-	{
-		$controller = $this->makeController();
-		$controller->failNotFound('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 404,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(404, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testValidationError()
-	{
-		$controller = $this->makeController();
-		$controller->failValidationError('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 400,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(400, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testValidationErrors()
-	{
-		$controller = $this->makeController();
-		$controller->failValidationErrors(['foo' => 'Nope', 'bar' => 'No way'], 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 400,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'foo' => 'Nope',
-				'bar' => 'No way',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(400, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testResourceExists()
-	{
-		$controller = $this->makeController();
-		$controller->failResourceExists('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 409,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(409, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testResourceGone()
-	{
-		$controller = $this->makeController();
-		$controller->failResourceGone('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 410,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(410, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testTooManyRequests()
-	{
-		$controller = $this->makeController();
-		$controller->failTooManyRequests('Nope', 'FAT CHANCE', 'A Custom Reason');
-
-		$expected = [
-			'status'   => 429,
-			'error'    => 'FAT CHANCE',
-			'messages' => [
-				'error' => 'Nope',
-			],
-		];
-
-		$this->assertEquals('A Custom Reason', $this->response->getReason());
-		$this->assertEquals(429, $this->response->getStatusCode());
-		$this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-	}
-
-	public function testServerError()
-	{
-		$controller = $this->makeController();
-		$controller->failServerError('Nope.', 'FAT-CHANCE', 'A custom reason.');
-
-		$this::assertEquals('A custom reason.', $this->response->getReason());
-		$this::assertEquals(500, $this->response->getStatusCode());
-		$this::assertEquals($this->formatter->format([
-			'status'   => 500,
-			'error'    => 'FAT-CHANCE',
-			'messages' => [
-				'error' => 'Nope.',
-			],
-		]), $this->response->getBody());
-	}
-
-	public function testValidContentTypes()
-	{
-		$chars     = '; charset=UTF-8';
-		$goodMimes = [
-			'text/xml',
-			'text/html',
-			'application/json',
-			'application/xml',
-		];
-		foreach ($goodMimes as $goodMime)
-		{
-			$this->tryValidContentType($goodMime, $goodMime . $chars);
-		}
-	}
-
-	private function tryValidContentType($mimeType, $contentType)
-	{
-		$original                = $_SERVER;
-		$_SERVER['CONTENT_TYPE'] = $mimeType;
-
-		$controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
-		$this->assertEquals($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
-		$this->response->setContentType($contentType);
-		$this->assertEquals($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
-
-		$_SERVER = $original;
-	}
-
-	public function testValidResponses()
-	{
-		$chars     = '; charset=UTF-8';
-		$goodMimes = [
-			'text/xml',
-			'text/html',
-			'application/json',
-			'application/xml',
-		];
-		foreach ($goodMimes as $goodMime)
-		{
-			$this->tryValidContentType($goodMime, $goodMime . $chars);
-		}
-	}
-
-	public function testXMLFormatter()
-	{
-		$this->formatter = new XMLFormatter();
-		$controller      = $this->makeController();
-
-		$this->assertEquals('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
-
-		$controller->respondCreated(['id' => 3], 'A Custom Reason');
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><id>3</id></response>
-
-EOH;
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
-	{
-		$config = new App();
-		foreach ([
-			'baseURL'          => 'http://example.com/',
-			'uriProtocol'      => 'REQUEST_URI',
-			'defaultLocale'    => 'en',
-			'negotiateLocale'  => false,
-			'supportedLocales' => ['en'],
-			'CSPEnabled'       => false,
-			'cookiePrefix'     => '',
-			'cookieDomain'     => '',
-			'cookiePath'       => '/',
-			'cookieSecure'     => false,
-			'cookieHTTPOnly'   => false,
-			'proxyIPs'         => [],
-			'cookieSameSite'   => 'Lax',
-		] as $key => $value)
-		{
-			$config->$key = $value;
-		}
-
-		$request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
-		$response = new MockResponse($config);
-
-		$controller = new class($request, $response)
-		{
-			use ResponseTrait;
-
-			protected $request;
-			protected $response;
-
-			public function __construct(&$request, &$response)
-			{
-				$this->request  = $request;
-				$this->response = $response;
-
-				$this->format = 'txt';
-			}
-		};
-
-		$controller->respondCreated(['id' => 3], 'A Custom Reason');
-		$this->assertStringStartsWith(config('Format')->supportedResponseFormats[0], $response->getHeaderLine('Content-Type'));
-	}
-
-	public function testResponseFormat()
-	{
-		$data = ['foo' => 'something'];
-
-		$controller = $this->makeController();
-		$controller->setResponseFormat('json');
-		$controller->respond($data, 201);
-
-		$this->assertStringStartsWith('application/json', $this->response->getHeaderLine('Content-Type'));
-		$this->assertEquals($this->formatter->format($data), $this->response->getJSON());
-
-		$controller->setResponseFormat('xml');
-		$controller->respond($data, 201);
-
-		$this->assertStringStartsWith('application/xml', $this->response->getHeaderLine('Content-Type'));
-	}
-
-	public function testXMLResponseFormat()
-	{
-		$data       = ['foo' => 'bar'];
-		$controller = $this->makeController();
-		$controller->resetFormatter();
-		$controller->setResponseFormat('xml');
-		$controller->respond($data, 201);
-
-		$xmlFormatter = new XMLFormatter();
-		$this->assertEquals($xmlFormatter->format($data), $this->response->getXML());
-	}
+    protected $request;
+    protected $response;
+
+    /**
+     * @var Response formatter
+     */
+    protected $formatter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->formatter = new JSONFormatter();
+    }
+
+    protected function makeController(array $userConfig = [], string $uri = 'http://example.com', array $userHeaders = [])
+    {
+        $config = new App();
+
+        foreach ([
+            'baseURL' => 'http://example.com/',
+            'uriProtocol' => 'REQUEST_URI',
+            'defaultLocale' => 'en',
+            'negotiateLocale' => false,
+            'supportedLocales' => ['en'],
+            'CSPEnabled' => false,
+            'cookiePrefix' => '',
+            'cookieDomain' => '',
+            'cookiePath' => '/',
+            'cookieSecure' => false,
+            'cookieHTTPOnly' => false,
+            'proxyIPs' => [],
+            'cookieSameSite' => 'Lax',
+        ] as $key => $value) {
+            $config->{$key} = $value;
+        }
+
+        if ($this->request === null) {
+            $this->request  = new MockIncomingRequest($config, new URI($uri), null, new UserAgent());
+            $this->response = new MockResponse($config);
+        }
+
+        // Insert headers into request.
+        $headers = [
+            'Accept' => 'text/html',
+        ];
+        $headers = array_merge($headers, $userHeaders);
+
+        foreach ($headers as $key => $value) {
+            $this->request->setHeader($key, $value);
+            if (($key === 'Accept') && ! is_array($value)) {
+                $this->response->setContentType($value);
+            }
+        }
+
+        // Create the controller class finally.
+        $controller = new class ($this->request, $this->response, $this->formatter) {
+            use ResponseTrait;
+
+            protected $request;
+            protected $response;
+            protected $formatter;
+
+            public function __construct(&$request, &$response, &$formatter)
+            {
+                $this->request   = $request;
+                $this->response  = $response;
+                $this->formatter = $formatter;
+            }
+
+            public function resetFormatter()
+            {
+                $this->formatter = null;
+            }
+        };
+
+        return $controller;
+    }
+
+    public function testNoFormatterJSON()
+    {
+        $this->formatter = null;
+        $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
+        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(201, $this->response->getStatusCode());
+
+        $expected = <<<'EOH'
+            {
+                "id": 3
+            }
+            EOH;
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testNoFormatter()
+    {
+        $this->formatter = null;
+        $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
+        $controller->respondCreated('A Custom Reason');
+
+        $this->assertSame('A Custom Reason', $this->response->getBody());
+    }
+
+    public function testAssociativeArrayPayload()
+    {
+        $this->formatter = null;
+        $controller      = $this->makeController();
+        $payload         = ['answer' => 42];
+        $expected        = <<<'EOH'
+            {
+                "answer": 42
+            }
+            EOH;
+        $controller->respond($payload);
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testArrayPayload()
+    {
+        $this->formatter = null;
+        $controller      = $this->makeController();
+        $payload         = [
+            1,
+            2,
+            3,
+        ];
+        $expected = <<<'EOH'
+            [
+                1,
+                2,
+                3
+            ]
+            EOH;
+        $controller->respond($payload);
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testPHPtoArrayPayload()
+    {
+        $this->formatter = null;
+        $controller      = $this->makeController();
+        $payload         = new stdClass();
+        $payload->name   = 'Tom';
+        $payload->id     = 1;
+        $expected        = <<<'EOH'
+            {
+                "name": "Tom",
+                "id": 1
+            }
+            EOH;
+        $controller->respond((array) $payload);
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testRespondSets404WithNoData()
+    {
+        $controller = $this->makeController();
+        $controller->respond(null, null);
+
+        $this->assertSame(404, $this->response->getStatusCode());
+        $this->assertNull($this->response->getBody());
+    }
+
+    public function testRespondSetsStatusWithEmptyData()
+    {
+        $controller = $this->makeController();
+        $controller->respond(null, 201);
+
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertNull($this->response->getBody());
+    }
+
+    public function testRespondSetsCorrectBodyAndStatus()
+    {
+        $controller = $this->makeController();
+        $controller->respond('something', 201);
+
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame('something', $this->response->getBody());
+        $this->assertStringStartsWith('text/html', $this->response->getHeaderLine('Content-Type'));
+        $this->assertSame('Created', $this->response->getReason());
+    }
+
+    public function testRespondWithCustomReason()
+    {
+        $controller = $this->makeController();
+        $controller->respond('something', 201, 'A Custom Reason');
+
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+    }
+
+    public function testFailSingleMessage()
+    {
+        $controller = $this->makeController();
+
+        $controller->fail('Failure to Launch', 500, 'WHAT!', 'A Custom Reason');
+
+        // Will use the JSON formatter by default
+        $expected = [
+            'status'   => 500,
+            'error'    => 'WHAT!',
+            'messages' => [
+                'error' => 'Failure to Launch',
+            ],
+        ];
+
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame(500, $this->response->getStatusCode());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+    }
+
+    public function testCreated()
+    {
+        $controller = $this->makeController();
+        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
+    }
+
+    public function testDeleted()
+    {
+        $controller = $this->makeController();
+        $controller->respondDeleted(['id' => 3], 'A Custom Reason');
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(200, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
+    }
+
+    public function testUpdated()
+    {
+        $controller = $this->makeController();
+        $controller->respondUpdated(['id' => 3], 'A Custom Reason');
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(200, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
+    }
+
+    public function testUnauthorized()
+    {
+        $controller = $this->makeController();
+        $controller->failUnauthorized('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 401,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(401, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testForbidden()
+    {
+        $controller = $this->makeController();
+        $controller->failForbidden('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 403,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(403, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testNoContent()
+    {
+        $controller = $this->makeController();
+        $controller->respondNoContent('');
+
+        $this->assertSame('No Content', $this->response->getReason());
+        $this->assertSame(204, $this->response->getStatusCode());
+    }
+
+    public function testNotFound()
+    {
+        $controller = $this->makeController();
+        $controller->failNotFound('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 404,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(404, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testValidationError()
+    {
+        $controller = $this->makeController();
+        $controller->failValidationError('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 400,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(400, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testValidationErrors()
+    {
+        $controller = $this->makeController();
+        $controller->failValidationErrors(['foo' => 'Nope', 'bar' => 'No way'], 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 400,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'foo' => 'Nope',
+                'bar' => 'No way',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(400, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testResourceExists()
+    {
+        $controller = $this->makeController();
+        $controller->failResourceExists('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 409,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(409, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testResourceGone()
+    {
+        $controller = $this->makeController();
+        $controller->failResourceGone('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 410,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(410, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testTooManyRequests()
+    {
+        $controller = $this->makeController();
+        $controller->failTooManyRequests('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $expected = [
+            'status'   => 429,
+            'error'    => 'FAT CHANCE',
+            'messages' => [
+                'error' => 'Nope',
+            ],
+        ];
+
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(429, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+    }
+
+    public function testServerError()
+    {
+        $controller = $this->makeController();
+        $controller->failServerError('Nope.', 'FAT-CHANCE', 'A custom reason.');
+
+        $this->assertSame('A custom reason.', $this->response->getReason());
+        $this->assertSame(500, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format([
+            'status'   => 500,
+            'error'    => 'FAT-CHANCE',
+            'messages' => [
+                'error' => 'Nope.',
+            ],
+        ]), $this->response->getBody());
+    }
+
+    public function testValidContentTypes()
+    {
+        $chars     = '; charset=UTF-8';
+        $goodMimes = [
+            'text/xml',
+            'text/html',
+            'application/json',
+            'application/xml',
+        ];
+
+        foreach ($goodMimes as $goodMime) {
+            $this->tryValidContentType($goodMime, $goodMime . $chars);
+        }
+    }
+
+    private function tryValidContentType($mimeType, $contentType)
+    {
+        $original                = $_SERVER;
+        $_SERVER['CONTENT_TYPE'] = $mimeType;
+
+        $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
+        $this->assertSame($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
+        $this->response->setContentType($contentType);
+        $this->assertSame($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
+
+        $_SERVER = $original;
+    }
+
+    public function testValidResponses()
+    {
+        $chars     = '; charset=UTF-8';
+        $goodMimes = [
+            'text/xml',
+            'text/html',
+            'application/json',
+            'application/xml',
+        ];
+
+        foreach ($goodMimes as $goodMime) {
+            $this->tryValidContentType($goodMime, $goodMime . $chars);
+        }
+    }
+
+    public function testXMLFormatter()
+    {
+        $this->formatter = new XMLFormatter();
+        $controller      = $this->makeController();
+
+        $this->assertSame('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
+
+        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><id>3</id></response>
+
+            EOH;
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
+    {
+        $config = new App();
+
+        foreach ([
+            'baseURL' => 'http://example.com/',
+            'uriProtocol' => 'REQUEST_URI',
+            'defaultLocale' => 'en',
+            'negotiateLocale' => false,
+            'supportedLocales' => ['en'],
+            'CSPEnabled' => false,
+            'cookiePrefix' => '',
+            'cookieDomain' => '',
+            'cookiePath' => '/',
+            'cookieSecure' => false,
+            'cookieHTTPOnly' => false,
+            'proxyIPs' => [],
+            'cookieSameSite' => 'Lax',
+        ] as $key => $value) {
+            $config->{$key} = $value;
+        }
+
+        $request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
+        $response = new MockResponse($config);
+
+        $controller = new class ($request, $response) {
+            use ResponseTrait;
+
+            protected $request;
+            protected $response;
+
+            public function __construct(&$request, &$response)
+            {
+                $this->request  = $request;
+                $this->response = $response;
+
+                $this->format = 'txt';
+            }
+        };
+
+        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+        $this->assertStringStartsWith(config('Format')->supportedResponseFormats[0], $response->getHeaderLine('Content-Type'));
+    }
+
+    public function testResponseFormat()
+    {
+        $data = ['foo' => 'something'];
+
+        $controller = $this->makeController();
+        $controller->setResponseFormat('json');
+        $controller->respond($data, 201);
+
+        $this->assertStringStartsWith('application/json', $this->response->getHeaderLine('Content-Type'));
+        $this->assertSame($this->formatter->format($data), $this->response->getJSON());
+
+        $controller->setResponseFormat('xml');
+        $controller->respond($data, 201);
+
+        $this->assertStringStartsWith('application/xml', $this->response->getHeaderLine('Content-Type'));
+    }
+
+    public function testXMLResponseFormat()
+    {
+        $data       = ['foo' => 'bar'];
+        $controller = $this->makeController();
+        $controller->resetFormatter();
+        $controller->setResponseFormat('xml');
+        $controller->respond($data, 201);
+
+        $xmlFormatter = new XMLFormatter();
+        $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
+    }
 }
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index c96f60adac58..fb0b4c8c0cb5 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -1,251 +1,257 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Autoloader;
 
-use UnnamespacedClass;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Autoload;
 use Config\Modules;
 use Config\Services;
+use UnnamespacedClass;
 
-class AutoloaderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class AutoloaderTest extends CIUnitTestCase
 {
-	/**
-	 * @var Autoloader
-	 */
-	protected $loader;
-
-	protected $filesPath = SUPPORTPATH . 'Autoloader/';
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$config                      = new Autoload();
-		$modules                     = new Modules();
-		$modules->discoverInComposer = false;
-
-		$config->classmap = [
-			'UnnamespacedClass' => SUPPORTPATH . 'Autoloader/UnnamespacedClass.php',
-			'OtherClass'        => APPPATH . 'Controllers/Home.php',
-			'Name\Spaced\Class' => APPPATH . 'Controllers/Home.php',
-		];
-		$config->psr4     = [
-			'App'         => APPPATH,
-			'CodeIgniter' => SYSTEMPATH,
-		];
-
-		$this->loader = new Autoloader();
-		$this->loader->initialize($config, $modules)->register();
-	}
-
-	public function testLoadStoredClass()
-	{
-		$this->assertInstanceOf('UnnamespacedClass', new UnnamespacedClass());
-	}
-
-	public function testInitializeWithInvalidArguments()
-	{
-		$this->expectException('InvalidArgumentException');
-		$this->expectExceptionMessage("Config array must contain either the 'psr4' key or the 'classmap' key.");
-
-		$config                      = new Autoload();
-		$config->classmap            = [];
-		$config->psr4                = [];
-		$modules                     = new Modules();
-		$modules->discoverInComposer = false;
-
-		(new Autoloader())->initialize($config, $modules);
-	}
-
-	//--------------------------------------------------------------------
-	// PSR4 Namespacing
-	//--------------------------------------------------------------------
-
-	public function testServiceAutoLoaderFromShareInstances()
-	{
-		$autoloader = Services::autoloader();
-		// look for Home controller, as that should be in base repo
-		$actual   = $autoloader->loadClass('App\Controllers\Home');
-		$expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testServiceAutoLoader()
-	{
-		$autoloader = Services::autoloader(false);
-		$autoloader->initialize(new Autoload(), new Modules());
-		$autoloader->register();
-		// look for Home controller, as that should be in base repo
-		$actual   = $autoloader->loadClass('App\Controllers\Home');
-		$expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testExistingFile()
-	{
-		$actual   = $this->loader->loadClass('App\Controllers\Home');
-		$expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-		$this->assertSame($expected, $actual);
-
-		$actual   = $this->loader->loadClass('CodeIgniter\Helpers\array_helper');
-		$expected = SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'array_helper.php';
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testMatchesWithPrecedingSlash()
-	{
-		$actual   = $this->loader->loadClass('\App\Controllers\Home');
-		$expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testMatchesWithFileExtension()
-	{
-		$actual   = $this->loader->loadClass('\App\Controllers\Home.php');
-		$expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testMissingFile()
-	{
-		$this->assertFalse($this->loader->loadClass('\App\Missing\Classname'));
-	}
-
-	public function testAddNamespaceWorks()
-	{
-		$this->assertFalse($this->loader->loadClass('My\App\Class'));
-
-		$this->loader->addNamespace('My\App', __DIR__);
-
-		$actual   = $this->loader->loadClass('My\App\AutoloaderTest');
-		$expected = __FILE__;
-
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testAddNamespaceMultiplePathsWorks()
-	{
-		$this->loader->addNamespace([
-			'My\App' => [
-				APPPATH . 'Config',
-				__DIR__,
-			],
-		]);
-
-		$actual   = $this->loader->loadClass('My\App\App');
-		$expected = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'App.php';
-		$this->assertSame($expected, $actual);
-
-		$actual   = $this->loader->loadClass('My\App\AutoloaderTest');
-		$expected = __FILE__;
-		$this->assertSame($expected, $actual);
-	}
-
-	public function testAddNamespaceStringToArray()
-	{
-		$this->loader->addNamespace('App\Controllers', __DIR__);
-
-		$this->assertSame(
-			__FILE__,
-			$this->loader->loadClass('App\Controllers\AutoloaderTest')
-		);
-	}
-
-	public function testGetNamespaceGivesArray()
-	{
-		$this->assertSame([
-			'App'         => [APPPATH],
-			'CodeIgniter' => [SYSTEMPATH],
-		], $this->loader->getNamespace());
-
-		$this->assertSame([SYSTEMPATH], $this->loader->getNamespace('CodeIgniter'));
-		$this->assertSame([], $this->loader->getNamespace('Foo'));
-	}
-
-	public function testRemoveNamespace()
-	{
-		$this->loader->addNamespace('My\App', __DIR__);
-		$this->assertSame(__FILE__, $this->loader->loadClass('My\App\AutoloaderTest'));
-
-		$this->loader->removeNamespace('My\App');
-		$this->assertFalse((bool) $this->loader->loadClass('My\App\AutoloaderTest'));
-	}
-
-	public function testloadClassNonNamespaced()
-	{
-		$this->assertFalse($this->loader->loadClass('Modules'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSanitizationSimply()
-	{
-		$test     = '${../path}!#/to/some/file.php_';
-		$expected = '/path/to/some/file.php';
-
-		$this->assertEquals($expected, $this->loader->sanitizeFilename($test));
-	}
-
-	public function testSanitizationAllowUnicodeChars()
-	{
-		$test     = 'Ä/path/to/some/file.php_';
-		$expected = 'Ä/path/to/some/file.php';
-
-		$this->assertEquals($expected, $this->loader->sanitizeFilename($test));
-	}
-
-	public function testSanitizationAllowsWindowsFilepaths()
-	{
-		$test = 'C:\path\to\some/file.php';
-
-		$this->assertEquals($test, $this->loader->sanitizeFilename($test));
-	}
-
-	public function testFindsComposerRoutes()
-	{
-		$config                      = new Autoload();
-		$modules                     = new Modules();
-		$modules->discoverInComposer = true;
-
-		$this->loader = new Autoloader();
-		$this->loader->initialize($config, $modules);
-
-		$namespaces = $this->loader->getNamespace();
-		$this->assertArrayHasKey('Laminas\\Escaper', $namespaces);
-	}
-
-	public function testFindsComposerRoutesWithComposerPathNotFound()
-	{
-		$composerPath = COMPOSER_PATH;
-
-		$config                      = new Autoload();
-		$modules                     = new Modules();
-		$modules->discoverInComposer = true;
-
-		$this->loader = new Autoloader();
-
-		rename(COMPOSER_PATH, COMPOSER_PATH . '.backup');
-		$this->loader->initialize($config, $modules);
-		rename(COMPOSER_PATH . '.backup', $composerPath);
-
-		$namespaces = $this->loader->getNamespace();
-		$this->assertArrayNotHasKey('Laminas\\Escaper', $namespaces);
-	}
-
-	public function testAutoloaderLoadsNonClassFiles(): void
-	{
-		$config = new Autoload();
-
-		$config->files[] = SUPPORTPATH . 'Autoloader/functions.php';
-
-		$this->loader = new Autoloader();
-		$this->loader->initialize($config, new Modules());
-		$this->loader->register();
-
-		$this->assertTrue(function_exists('autoload_foo'));
-		$this->assertSame('I am autoloaded by Autoloader through $files!', autoload_foo());
-		$this->assertTrue(defined('AUTOLOAD_CONSTANT'));
-		$this->assertSame('foo', AUTOLOAD_CONSTANT);
-	}
+    /**
+     * @var Autoloader
+     */
+    protected $loader;
+
+    protected $filesPath = SUPPORTPATH . 'Autoloader/';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $config                      = new Autoload();
+        $modules                     = new Modules();
+        $modules->discoverInComposer = false;
+
+        $config->classmap = [
+            'UnnamespacedClass' => SUPPORTPATH . 'Autoloader/UnnamespacedClass.php',
+            'OtherClass'        => APPPATH . 'Controllers/Home.php',
+            'Name\Spaced\Class' => APPPATH . 'Controllers/Home.php',
+        ];
+        $config->psr4 = [
+            'App'         => APPPATH,
+            'CodeIgniter' => SYSTEMPATH,
+        ];
+
+        $this->loader = new Autoloader();
+        $this->loader->initialize($config, $modules)->register();
+    }
+
+    public function testLoadStoredClass()
+    {
+        $this->assertInstanceOf('UnnamespacedClass', new UnnamespacedClass());
+    }
+
+    public function testInitializeWithInvalidArguments()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage("Config array must contain either the 'psr4' key or the 'classmap' key.");
+
+        $config                      = new Autoload();
+        $config->classmap            = [];
+        $config->psr4                = [];
+        $modules                     = new Modules();
+        $modules->discoverInComposer = false;
+
+        (new Autoloader())->initialize($config, $modules);
+    }
+
+    public function testServiceAutoLoaderFromShareInstances()
+    {
+        $autoloader = Services::autoloader();
+        // look for Home controller, as that should be in base repo
+        $actual   = $autoloader->loadClass('App\Controllers\Home');
+        $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testServiceAutoLoader()
+    {
+        $autoloader = Services::autoloader(false);
+        $autoloader->initialize(new Autoload(), new Modules());
+        $autoloader->register();
+        // look for Home controller, as that should be in base repo
+        $actual   = $autoloader->loadClass('App\Controllers\Home');
+        $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testExistingFile()
+    {
+        $actual   = $this->loader->loadClass('App\Controllers\Home');
+        $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
+        $this->assertSame($expected, $actual);
+
+        $actual   = $this->loader->loadClass('CodeIgniter\Helpers\array_helper');
+        $expected = SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'array_helper.php';
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testMatchesWithPrecedingSlash()
+    {
+        $actual   = $this->loader->loadClass('\App\Controllers\Home');
+        $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testMatchesWithFileExtension()
+    {
+        $actual   = $this->loader->loadClass('\App\Controllers\Home.php');
+        $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testMissingFile()
+    {
+        $this->assertFalse($this->loader->loadClass('\App\Missing\Classname'));
+    }
+
+    public function testAddNamespaceWorks()
+    {
+        $this->assertFalse($this->loader->loadClass('My\App\Class'));
+
+        $this->loader->addNamespace('My\App', __DIR__);
+
+        $actual   = $this->loader->loadClass('My\App\AutoloaderTest');
+        $expected = __FILE__;
+
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testAddNamespaceMultiplePathsWorks()
+    {
+        $this->loader->addNamespace([
+            'My\App' => [
+                APPPATH . 'Config',
+                __DIR__,
+            ],
+        ]);
+
+        $actual   = $this->loader->loadClass('My\App\App');
+        $expected = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'App.php';
+        $this->assertSame($expected, $actual);
+
+        $actual   = $this->loader->loadClass('My\App\AutoloaderTest');
+        $expected = __FILE__;
+        $this->assertSame($expected, $actual);
+    }
+
+    public function testAddNamespaceStringToArray()
+    {
+        $this->loader->addNamespace('App\Controllers', __DIR__);
+
+        $this->assertSame(
+            __FILE__,
+            $this->loader->loadClass('App\Controllers\AutoloaderTest')
+        );
+    }
+
+    public function testGetNamespaceGivesArray()
+    {
+        $this->assertSame([
+            'App'         => [APPPATH],
+            'CodeIgniter' => [SYSTEMPATH],
+        ], $this->loader->getNamespace());
+
+        $this->assertSame([SYSTEMPATH], $this->loader->getNamespace('CodeIgniter'));
+        $this->assertSame([], $this->loader->getNamespace('Foo'));
+    }
+
+    public function testRemoveNamespace()
+    {
+        $this->loader->addNamespace('My\App', __DIR__);
+        $this->assertSame(__FILE__, $this->loader->loadClass('My\App\AutoloaderTest'));
+
+        $this->loader->removeNamespace('My\App');
+        $this->assertFalse((bool) $this->loader->loadClass('My\App\AutoloaderTest'));
+    }
+
+    public function testloadClassNonNamespaced()
+    {
+        $this->assertFalse($this->loader->loadClass('Modules'));
+    }
+
+    public function testSanitizationSimply()
+    {
+        $test     = '${../path}!#/to/some/file.php_';
+        $expected = '/path/to/some/file.php';
+
+        $this->assertSame($expected, $this->loader->sanitizeFilename($test));
+    }
+
+    public function testSanitizationAllowUnicodeChars()
+    {
+        $test     = 'Ä/path/to/some/file.php_';
+        $expected = 'Ä/path/to/some/file.php';
+
+        $this->assertSame($expected, $this->loader->sanitizeFilename($test));
+    }
+
+    public function testSanitizationAllowsWindowsFilepaths()
+    {
+        $test = 'C:\path\to\some/file.php';
+
+        $this->assertSame($test, $this->loader->sanitizeFilename($test));
+    }
+
+    public function testFindsComposerRoutes()
+    {
+        $config                      = new Autoload();
+        $modules                     = new Modules();
+        $modules->discoverInComposer = true;
+
+        $this->loader = new Autoloader();
+        $this->loader->initialize($config, $modules);
+
+        $namespaces = $this->loader->getNamespace();
+        $this->assertArrayHasKey('Laminas\\Escaper', $namespaces);
+    }
+
+    public function testFindsComposerRoutesWithComposerPathNotFound()
+    {
+        $composerPath = COMPOSER_PATH;
+
+        $config                      = new Autoload();
+        $modules                     = new Modules();
+        $modules->discoverInComposer = true;
+
+        $this->loader = new Autoloader();
+
+        rename(COMPOSER_PATH, COMPOSER_PATH . '.backup');
+        $this->loader->initialize($config, $modules);
+        rename(COMPOSER_PATH . '.backup', $composerPath);
+
+        $namespaces = $this->loader->getNamespace();
+        $this->assertArrayNotHasKey('Laminas\\Escaper', $namespaces);
+    }
+
+    public function testAutoloaderLoadsNonClassFiles(): void
+    {
+        $config = new Autoload();
+
+        $config->files[] = SUPPORTPATH . 'Autoloader/functions.php';
+
+        $this->loader = new Autoloader();
+        $this->loader->initialize($config, new Modules());
+        $this->loader->register();
+
+        $this->assertTrue(function_exists('autoload_foo'));
+        $this->assertSame('I am autoloaded by Autoloader through $files!', autoload_foo());
+        $this->assertTrue(defined('AUTOLOAD_CONSTANT'));
+        $this->assertSame('foo', AUTOLOAD_CONSTANT);
+    }
 }
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 844855ead267..8a8b91aeea90 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -1,308 +1,276 @@
-<?php namespace CodeIgniter\Autoloader;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Autoloader;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Autoload;
 use Config\Modules;
 
-class FileLocatorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileLocatorTest extends CIUnitTestCase
 {
-	/**
-	 * @var FileLocator
-	 */
-	protected $locator;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$autoloader = new Autoloader();
-		$autoloader->initialize(new Autoload(), new Modules());
-		$autoloader->addNamespace([
-			'Unknown'       => '/i/do/not/exist',
-			'Tests/Support' => TESTPATH . '_support/',
-			'App'           => APPPATH,
-			'CodeIgniter'   => [
-				TESTPATH,
-				SYSTEMPATH,
-			],
-			'Errors'        => APPPATH . 'Views/errors',
-			'System'        => SUPPORTPATH . 'Autoloader/system',
-		]);
-
-		$this->locator = new FileLocator($autoloader);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileWorksWithLegacyStructure()
-	{
-		$file = 'Controllers/Home';
-
-		$expected = APPPATH . 'Controllers/Home.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileWithLegacyStructureNotFound()
-	{
-		$file = 'Unknown';
-
-		$this->assertFalse($this->locator->locateFile($file));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileWorksInApplicationDirectory()
-	{
-		$file = 'welcome_message';
-
-		$expected = APPPATH . 'Views/welcome_message.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileWorksInApplicationDirectoryWithoutFolder()
-	{
-		$file = 'Common';
-
-		$expected = APPPATH . 'Common.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileWorksInNestedApplicationDirectory()
-	{
-		$file = 'Controllers/Home';
-
-		$expected = APPPATH . 'Controllers/Home.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'Controllers'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileReplacesFolderName()
-	{
-		$file = '\App\Views/errors/html/error_404.php';
-
-		$expected = APPPATH . 'Views/errors/html/error_404.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileReplacesFolderNameLegacy()
-	{
-		$file = 'Views/welcome_message.php';
-
-		$expected = APPPATH . 'Views/welcome_message.php';
-
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLocateFileCanFindNamespacedView()
-	{
-		$file = '\Errors\error_404';
+    /**
+     * @var FileLocator
+     */
+    protected $locator;
 
-		$expected = APPPATH . 'Views/errors/html/error_404.php';
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'html'));
-	}
+        $autoloader = new Autoloader();
+        $autoloader->initialize(new Autoload(), new Modules());
+        $autoloader->addNamespace([
+            'Unknown'       => '/i/do/not/exist',
+            'Tests/Support' => TESTPATH . '_support/',
+            'App'           => APPPATH,
+            'CodeIgniter'   => [
+                TESTPATH,
+                SYSTEMPATH,
+            ],
+            'Errors' => APPPATH . 'Views/errors',
+            'System' => SUPPORTPATH . 'Autoloader/system',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->locator = new FileLocator($autoloader);
+    }
 
-	public function testLocateFileCanFindNestedNamespacedView()
-	{
-		$file = '\Errors\html/error_404';
+    public function testLocateFileWorksWithLegacyStructure()
+    {
+        $file = 'Controllers/Home';
 
-		$expected = APPPATH . 'Views/errors/html/error_404.php';
+        $expected = APPPATH . 'Controllers/Home.php';
 
-		$this->assertEquals($expected, $this->locator->locateFile($file, 'html'));
-	}
+        $this->assertSame($expected, $this->locator->locateFile($file));
+    }
 
-	//--------------------------------------------------------------------
+    public function testLocateFileWithLegacyStructureNotFound()
+    {
+        $file = 'Unknown';
 
-	public function testLocateFileNotFoundExistingNamespace()
-	{
-		$file = '\App\Views/unexistence-file.php';
+        $this->assertFalse($this->locator->locateFile($file));
+    }
 
-		$this->assertFalse($this->locator->locateFile($file, 'Views'));
-	}
+    public function testLocateFileWorksInApplicationDirectory()
+    {
+        $file = 'welcome_message';
 
-	//--------------------------------------------------------------------
+        $expected = APPPATH . 'Views/welcome_message.php';
 
-	public function testLocateFileNotFoundWithBadNamespace()
-	{
-		$file = '\Blogger\admin/posts.php';
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
 
-		$this->assertFalse($this->locator->locateFile($file, 'Views'));
-	}
+    public function testLocateFileWorksInApplicationDirectoryWithoutFolder()
+    {
+        $file = 'Common';
 
-	//--------------------------------------------------------------------
+        $expected = APPPATH . 'Common.php';
 
-	public function testSearchSimple()
-	{
-		$expected = APPPATH . 'Config/App.php';
+        $this->assertSame($expected, $this->locator->locateFile($file));
+    }
 
-		$foundFiles = $this->locator->search('Config/App.php');
+    public function testLocateFileWorksInNestedApplicationDirectory()
+    {
+        $file = 'Controllers/Home';
 
-		$this->assertEquals($expected, $foundFiles[0]);
-	}
+        $expected = APPPATH . 'Controllers/Home.php';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Controllers'));
+    }
 
-	public function testSearchWithFileExtension()
-	{
-		$expected = APPPATH . 'Config/App.php';
+    public function testLocateFileReplacesFolderName()
+    {
+        $file = '\App\Views/errors/html/error_404.php';
 
-		$foundFiles = $this->locator->search('Config/App', 'php');
+        $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-		$this->assertEquals($expected, $foundFiles[0]);
-	}
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
 
-	//--------------------------------------------------------------------
+    public function testLocateFileReplacesFolderNameLegacy()
+    {
+        $file = 'Views/welcome_message.php';
 
-	public function testSearchWithMultipleFilesFound()
-	{
-		$foundFiles = $this->locator->search('index', 'html');
+        $expected = APPPATH . 'Views/welcome_message.php';
 
-		$expected = APPPATH . 'index.html';
-		$this->assertContains($expected, $foundFiles);
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
 
-		$expected = SYSTEMPATH . 'index.html';
-		$this->assertContains($expected, $foundFiles);
-	}
+    public function testLocateFileCanFindNamespacedView()
+    {
+        $file = '\Errors\error_404';
 
-	//--------------------------------------------------------------------
+        $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-	public function testSearchForFileNotExist()
-	{
-		$foundFiles = $this->locator->search('Views/Fake.html');
+        $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
+    }
 
-		$this->assertArrayNotHasKey(0, $foundFiles);
-	}
+    public function testLocateFileCanFindNestedNamespacedView()
+    {
+        $file = '\Errors\html/error_404';
 
-	//--------------------------------------------------------------------
+        $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-	public function testSearchPrioritizeSystemOverApp()
-	{
-		$foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
+        $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
+    }
 
-		$this->assertEquals([
-			SYSTEMPATH . 'Language/en/Validation.php',
-			APPPATH . 'Language/en/Validation.php',
-		],
-			$foundFiles
-		);
-	}
+    public function testLocateFileNotFoundExistingNamespace()
+    {
+        $file = '\App\Views/unexistence-file.php';
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->locator->locateFile($file, 'Views'));
+    }
 
-	public function testListNamespaceFilesEmptyPrefixAndPath()
-	{
-		$this->assertEmpty($this->locator->listNamespaceFiles('', ''));
-	}
+    public function testLocateFileNotFoundWithBadNamespace()
+    {
+        $file = '\Blogger\admin/posts.php';
 
-	//--------------------------------------------------------------------
+        $this->assertFalse($this->locator->locateFile($file, 'Views'));
+    }
 
-	public function testListFilesSimple()
-	{
-		$files = $this->locator->listFiles('Config/');
+    public function testSearchSimple()
+    {
+        $expected = APPPATH . 'Config/App.php';
 
-		$expectedWin = APPPATH . 'Config\App.php';
-		$expectedLin = APPPATH . 'Config/App.php';
-		$this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
-	}
+        $foundFiles = $this->locator->search('Config/App.php');
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $foundFiles[0]);
+    }
 
-	public function testListFilesWithFileAsInput()
-	{
-		$files = $this->locator->listFiles('Config/App.php');
+    public function testSearchWithFileExtension()
+    {
+        $expected = APPPATH . 'Config/App.php';
 
-		$this->assertEmpty($files);
-	}
+        $foundFiles = $this->locator->search('Config/App', 'php');
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $foundFiles[0]);
+    }
 
-	public function testListFilesFromMultipleDir()
-	{
-		$files = $this->locator->listFiles('Filters/');
+    public function testSearchWithMultipleFilesFound()
+    {
+        $foundFiles = $this->locator->search('index', 'html');
 
-		$expectedWin = SYSTEMPATH . 'Filters\DebugToolbar.php';
-		$expectedLin = SYSTEMPATH . 'Filters/DebugToolbar.php';
-		$this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
+        $expected = APPPATH . 'index.html';
+        $this->assertContains($expected, $foundFiles);
 
-		$expectedWin = SYSTEMPATH . 'Filters\Filters.php';
-		$expectedLin = SYSTEMPATH . 'Filters/Filters.php';
-		$this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
-	}
+        $expected = SYSTEMPATH . 'index.html';
+        $this->assertContains($expected, $foundFiles);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSearchForFileNotExist()
+    {
+        $foundFiles = $this->locator->search('Views/Fake.html');
 
-	public function testListFilesWithPathNotExist()
-	{
-		$files = $this->locator->listFiles('Fake/');
+        $this->assertArrayNotHasKey(0, $foundFiles);
+    }
 
-		$this->assertEmpty($files);
-	}
+    public function testSearchPrioritizeSystemOverApp()
+    {
+        $foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
 
-	//--------------------------------------------------------------------
+        $this->assertSame(
+            [
+                SYSTEMPATH . 'Language/en/Validation.php',
+                APPPATH . 'Language/en/Validation.php',
+            ],
+            $foundFiles
+        );
+    }
 
-	public function testListFilesWithoutPath()
-	{
-		$files = $this->locator->listFiles('');
+    public function testListNamespaceFilesEmptyPrefixAndPath()
+    {
+        $this->assertEmpty($this->locator->listNamespaceFiles('', ''));
+    }
 
-		$this->assertEmpty($files);
-	}
+    public function testListFilesSimple()
+    {
+        $files = $this->locator->listFiles('Config/');
 
-	public function testFindQNameFromPathSimple()
-	{
-		$ClassName = $this->locator->findQualifiedNameFromPath(SYSTEMPATH . 'HTTP/Header.php');
-		$expected  = '\CodeIgniter\HTTP\Header';
+        $expectedWin = APPPATH . 'Config\App.php';
+        $expectedLin = APPPATH . 'Config/App.php';
+        $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
+    }
 
-		$this->assertEquals($expected, $ClassName);
-	}
+    public function testListFilesWithFileAsInput()
+    {
+        $files = $this->locator->listFiles('Config/App.php');
 
-	public function testFindQNameFromPathWithFileNotExist()
-	{
-		$ClassName = $this->locator->findQualifiedNameFromPath('modules/blog/Views/index.php');
+        $this->assertEmpty($files);
+    }
 
-		$this->assertFalse($ClassName);
-	}
+    public function testListFilesFromMultipleDir()
+    {
+        $files = $this->locator->listFiles('Filters/');
 
-	public function testFindQNameFromPathWithoutCorrespondingNamespace()
-	{
-		$ClassName = $this->locator->findQualifiedNameFromPath('/etc/hosts');
+        $expectedWin = SYSTEMPATH . 'Filters\DebugToolbar.php';
+        $expectedLin = SYSTEMPATH . 'Filters/DebugToolbar.php';
+        $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
 
-		$this->assertFalse($ClassName);
-	}
+        $expectedWin = SYSTEMPATH . 'Filters\Filters.php';
+        $expectedLin = SYSTEMPATH . 'Filters/Filters.php';
+        $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
+    }
 
-	public function testGetClassNameFromClassFile()
-	{
-		$this->assertEquals(
-			__CLASS__,
-			$this->locator->getClassname(__FILE__)
-		);
-	}
+    public function testListFilesWithPathNotExist()
+    {
+        $files = $this->locator->listFiles('Fake/');
+
+        $this->assertEmpty($files);
+    }
 
-	public function testGetClassNameFromNonClassFile()
-	{
-		$this->assertEquals(
-			'',
-			$this->locator->getClassname(SYSTEMPATH . 'bootstrap.php')
-		);
-	}
+    public function testListFilesWithoutPath()
+    {
+        $files = $this->locator->listFiles('');
+
+        $this->assertEmpty($files);
+    }
 
+    public function testFindQNameFromPathSimple()
+    {
+        $ClassName = $this->locator->findQualifiedNameFromPath(SYSTEMPATH . 'HTTP/Header.php');
+        $expected  = '\CodeIgniter\HTTP\Header';
+
+        $this->assertSame($expected, $ClassName);
+    }
+
+    public function testFindQNameFromPathWithFileNotExist()
+    {
+        $ClassName = $this->locator->findQualifiedNameFromPath('modules/blog/Views/index.php');
+
+        $this->assertFalse($ClassName);
+    }
+
+    public function testFindQNameFromPathWithoutCorrespondingNamespace()
+    {
+        $ClassName = $this->locator->findQualifiedNameFromPath('/etc/hosts');
+
+        $this->assertFalse($ClassName);
+    }
+
+    public function testGetClassNameFromClassFile()
+    {
+        $this->assertSame(
+            __CLASS__,
+            $this->locator->getClassname(__FILE__)
+        );
+    }
+
+    public function testGetClassNameFromNonClassFile()
+    {
+        $this->assertSame(
+            '',
+            $this->locator->getClassname(SYSTEMPATH . 'bootstrap.php')
+        );
+    }
 }
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 85b2ded4f007..68008ccc1e4d 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -1,475 +1,487 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use ReflectionProperty;
 
+/**
+ * @internal
+ */
 final class CLITest extends CIUnitTestCase
 {
-
-	private $stream_filter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
-	}
-
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->stream_filter);
-	}
-
-	public function testNew()
-	{
-		$actual = new CLI();
-		$this->assertInstanceOf(CLI::class, $actual);
-	}
-
-	public function testBeep()
-	{
-		$this->expectOutputString("\x07");
-		CLI::beep();
-	}
-
-	public function testBeep4()
-	{
-		$this->expectOutputString("\x07\x07\x07\x07");
-		CLI::beep(4);
-	}
-
-	/**
-	 * This test waits for 2 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 2.5
-	 */
-	public function testWait()
-	{
-		$time = time();
-		CLI::wait(1, true);
-		$this->assertCloseEnough(1, time() - $time);
-
-		$time = time();
-		CLI::wait(1);
-		$this->assertCloseEnough(1, time() - $time);
-
-		// Leaving the code fragment below in, to remind myself (or others)
-		// of what appears to be the most likely path to test this last
-		// bit of wait() functionality.
-		// The problem: if the block below is enabled, the phpunit tests
-		// go catatonic when it is executed, presumably because of
-		// the CLI::input() waiting for a key press
-		//      // test the press any key to continue...
-		//      stream_filter_register('CLITestKeyboardFilter', 'CodeIgniter\CLI\CLITestKeyboardFilter');
-		//      $spoofer = stream_filter_append(STDIN, 'CLITestKeyboardFilter');
-		//      $time = time();
-		//      CLITestKeyboardFilter::$spoofed = ' ';
-		//      CLI::wait(0);
-		//      stream_filter_remove($spoofer);
-		//      $this->assertEquals(0, time() - $time);
-	}
-
-	public function testIsWindows()
-	{
-		$this->assertEquals(('\\' === DIRECTORY_SEPARATOR), CLI::isWindows());
-		$this->assertEquals(defined('PHP_WINDOWS_VERSION_MAJOR'), CLI::isWindows());
-	}
-
-	public function testNewLine()
-	{
-		$this->expectOutputString('');
-		CLI::newLine();
-	}
-
-	public function testColorExceptionForeground()
-	{
-		$this->expectException('RuntimeException');
-		$this->expectExceptionMessage('Invalid foreground color: Foreground');
-
-		CLI::color('test', 'Foreground');
-	}
-
-	public function testColorExceptionBackground()
-	{
-		$this->expectException('RuntimeException');
-		$this->expectExceptionMessage('Invalid background color: Background');
-
-		CLI::color('test', 'white', 'Background');
-	}
-
-	public function testColorSupportOnNoColor()
-	{
-		$nocolor = getenv('NO_COLOR');
-		putenv('NO_COLOR=1');
-
-		CLI::init(); // force re-check on env
-		$this->assertEquals('test', CLI::color('test', 'white', 'green'));
-		putenv($nocolor ? "NO_COLOR=$nocolor" : 'NO_COLOR');
-	}
-
-	public function testColorSupportOnHyperTerminals()
-	{
-		$termProgram = getenv('TERM_PROGRAM');
-		putenv('TERM_PROGRAM=Hyper');
-
-		CLI::init(); // force re-check on env
-		$this->assertEquals("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
-		putenv($termProgram ? "TERM_PROGRAM=$termProgram" : 'TERM_PROGRAM');
-	}
-
-	public function testStreamSupports()
-	{
-		$this->assertTrue(CLI::streamSupports('stream_isatty', STDOUT));
-		$this->assertIsBool(CLI::streamSupports('sapi_windows_vt100_support', STDOUT));
-	}
-
-	public function testColor()
-	{
-		// After the tests on NO_COLOR and TERM_PROGRAM above,
-		// the $isColored variable is rigged. So we reset this.
-		CLI::init();
-		$this->assertEquals("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
-	}
-
-	public function testPrint()
-	{
-		CLI::print('test');
-		$expected = 'test';
-
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testPrintForeground()
-	{
-		CLI::print('test', 'red');
-		$expected = "\033[0;31mtest\033[0m";
-
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testPrintBackground()
-	{
-		CLI::print('test', 'red', 'green');
-		$expected = "\033[0;31m\033[42mtest\033[0m";
-
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWrite()
-	{
-		CLI::write('test');
-		$expected = PHP_EOL . 'test' . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWriteForeground()
-	{
-		CLI::write('test', 'red');
-		$expected = "\033[0;31mtest\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWriteForegroundWithColorBefore()
-	{
-		CLI::write(CLI::color('green', 'green') . ' red', 'red');
-		$expected = "\033[0;31m\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWriteForegroundWithColorAfter()
-	{
-		CLI::write('red ' . CLI::color('green', 'green'), 'red');
-		$expected = "\033[0;31mred \033[0;32mgreen\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWriteBackground()
-	{
-		CLI::write('test', 'red', 'green');
-		$expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testError()
-	{
-		$this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
-		CLI::error('test');
-		// red expected cuz stderr
-		$expected = "\033[1;31mtest\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testErrorForeground()
-	{
-		$this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
-		CLI::error('test', 'purple');
-		$expected = "\033[0;35mtest\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testErrorBackground()
-	{
-		$this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
-		CLI::error('test', 'purple', 'green');
-		$expected = "\033[0;35m\033[42mtest\033[0m" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testShowProgress()
-	{
-		CLI::write('first.');
-		CLI::showProgress(1, 20);
-		CLI::showProgress(10, 20);
-		CLI::showProgress(20, 20);
-		CLI::write('second.');
-		CLI::showProgress(1, 20);
-		CLI::showProgress(10, 20);
-		CLI::showProgress(20, 20);
-		CLI::write('third.');
-		CLI::showProgress(1, 20);
-
-		$expected = 'first.' . PHP_EOL .
-					"[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL .
-					"\033[1A[\033[32m#####.....\033[0m]  50% Complete" . PHP_EOL .
-					"\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
-					'second.' . PHP_EOL .
-					"[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL .
-					"\033[1A[\033[32m#####.....\033[0m]  50% Complete" . PHP_EOL .
-					"\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
-					'third.' . PHP_EOL .
-					"[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL;
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testShowProgressWithoutBar()
-	{
-		CLI::write('first.');
-		CLI::showProgress(false, 20);
-		CLI::showProgress(false, 20);
-		CLI::showProgress(false, 20);
-
-		$expected = 'first.' . PHP_EOL . "\007\007\007";
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-	}
-
-	public function testWrap()
-	{
-		$this->assertEquals('', CLI::wrap(''));
-		$this->assertEquals('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1));
-		$this->assertEquals('1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2));
-		$this->assertEquals('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321'));
-	}
-
-	public function testParseCommand()
-	{
-		$_SERVER['argv'] = [
-			'ignored',
-			'b',
-			'c',
-		];
-		$_SERVER['argc'] = 3;
-		CLI::init();
-		$this->assertEquals(null, CLI::getSegment(3));
-		$this->assertEquals('b', CLI::getSegment(1));
-		$this->assertEquals('c', CLI::getSegment(2));
-		$this->assertEquals('b/c', CLI::getURI());
-		$this->assertEquals([], CLI::getOptions());
-		$this->assertEmpty(CLI::getOptionString());
-		$this->assertEquals(['b', 'c'], CLI::getSegments());
-	}
-
-	public function testParseCommandMixed()
-	{
-		$_SERVER['argv'] = [
-			'ignored',
-			'b',
-			'c',
-			'd',
-			'--parm',
-			'pvalue',
-			'd2',
-			'da-sh',
-			'--fix',
-			'--opt-in',
-			'sure',
-		];
-		CLI::init();
-		$this->assertEquals(null, CLI::getSegment(7));
-		$this->assertEquals('b', CLI::getSegment(1));
-		$this->assertEquals('c', CLI::getSegment(2));
-		$this->assertEquals('d', CLI::getSegment(3));
-		$this->assertEquals(['b', 'c', 'd', 'd2', 'da-sh'], CLI::getSegments());
-		$this->assertEquals(['parm' => 'pvalue', 'fix' => null, 'opt-in' => 'sure'], CLI::getOptions());
-		$this->assertEquals('-parm pvalue -fix -opt-in sure ', CLI::getOptionString());
-		$this->assertEquals('-parm pvalue -fix -opt-in sure', CLI::getOptionString(false, true));
-		$this->assertEquals('--parm pvalue --fix --opt-in sure ', CLI::getOptionString(true));
-		$this->assertEquals('--parm pvalue --fix --opt-in sure', CLI::getOptionString(true, true));
-	}
-
-	public function testParseCommandOption()
-	{
-		$_SERVER['argv'] = [
-			'ignored',
-			'b',
-			'c',
-			'--parm',
-			'pvalue',
-			'd',
-		];
-		CLI::init();
-		$this->assertEquals(['parm' => 'pvalue'], CLI::getOptions());
-		$this->assertEquals('pvalue', CLI::getOption('parm'));
-		$this->assertEquals('-parm pvalue ', CLI::getOptionString());
-		$this->assertEquals('-parm pvalue', CLI::getOptionString(false, true));
-		$this->assertEquals('--parm pvalue ', CLI::getOptionString(true));
-		$this->assertEquals('--parm pvalue', CLI::getOptionString(true, true));
-		$this->assertNull(CLI::getOption('bogus'));
-		$this->assertEquals(['b', 'c', 'd'], CLI::getSegments());
-	}
-
-	public function testParseCommandMultipleOptions()
-	{
-		$_SERVER['argv'] = [
-			'ignored',
-			'b',
-			'c',
-			'--parm',
-			'pvalue',
-			'd',
-			'--p2',
-			'--p3',
-			'value 3',
-		];
-		CLI::init();
-		$this->assertEquals(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());
-		$this->assertEquals('pvalue', CLI::getOption('parm'));
-		$this->assertEquals('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString());
-		$this->assertEquals('-parm pvalue -p2 -p3 "value 3"', CLI::getOptionString(false, true));
-		$this->assertEquals('--parm pvalue --p2 --p3 "value 3" ', CLI::getOptionString(true));
-		$this->assertEquals('--parm pvalue --p2 --p3 "value 3"', CLI::getOptionString(true, true));
-		$this->assertEquals(['b', 'c', 'd'], CLI::getSegments());
-	}
-
-	public function testWindow()
-	{
-		$height = new ReflectionProperty(CLI::class, 'height');
-		$height->setAccessible(true);
-		$height->setValue(null);
-		$this->assertTrue(is_int(CLI::getHeight()));
-
-		$width = new ReflectionProperty(CLI::class, 'width');
-		$width->setAccessible(true);
-		$width->setValue(null);
-		$this->assertTrue(is_int(CLI::getWidth()));
-	}
-
-	/**
-	 * @dataProvider tableProvider
-	 *
-	 * @param array $tbody
-	 * @param array $thead
-	 * @param array $expected
-	 */
-	public function testTable($tbody, $thead, $expected)
-	{
-		CLI::table($tbody, $thead);
-		$this->assertEquals(CITestStreamFilter::$buffer, $expected);
-	}
-
-	public function tableProvider()
-	{
-		$head     = [
-			'ID',
-			'Title',
-		];
-		$oneRow   = [
-			[
-				'id'  => 1,
-				'foo' => 'bar',
-			],
-		];
-		$manyRows = [
-			[
-				'id'  => 1,
-				'foo' => 'bar',
-			],
-			[
-				'id'  => 2,
-				'foo' => 'bar * 2',
-			],
-			[
-				'id'  => 3,
-				'foo' => 'bar + bar + bar',
-			],
-		];
-
-		return [
-			[
-				$oneRow,
-				[],
-				'+---+-----+' . PHP_EOL .
-				'| 1 | bar |' . PHP_EOL .
-				'+---+-----+' . PHP_EOL . PHP_EOL,
-			],
-			[
-				$oneRow,
-				$head,
-				'+----+-------+' . PHP_EOL .
-				'| ID | Title |' . PHP_EOL .
-				'+----+-------+' . PHP_EOL .
-				'| 1  | bar   |' . PHP_EOL .
-				'+----+-------+' . PHP_EOL . PHP_EOL,
-			],
-			[
-				$manyRows,
-				[],
-				'+---+-----------------+' . PHP_EOL .
-				'| 1 | bar             |' . PHP_EOL .
-				'| 2 | bar * 2         |' . PHP_EOL .
-				'| 3 | bar + bar + bar |' . PHP_EOL .
-				'+---+-----------------+' . PHP_EOL . PHP_EOL,
-			],
-			[
-				$manyRows,
-				$head,
-				'+----+-----------------+' . PHP_EOL .
-				'| ID | Title           |' . PHP_EOL .
-				'+----+-----------------+' . PHP_EOL .
-				'| 1  | bar             |' . PHP_EOL .
-				'| 2  | bar * 2         |' . PHP_EOL .
-				'| 3  | bar + bar + bar |' . PHP_EOL .
-				'+----+-----------------+' . PHP_EOL . PHP_EOL,
-			],
-			// Multibyte letters
-			[
-				[
-					[
-						'id'  => 'ほげ',
-						'foo' => 'bar',
-					],
-				],
-				[
-					'ID',
-					'タイトル',
-				],
-				'+------+----------+' . PHP_EOL .
-				'| ID   | タイトル |' . PHP_EOL .
-				'+------+----------+' . PHP_EOL .
-				'| ほげ | bar      |' . PHP_EOL .
-				'+------+----------+' . PHP_EOL . PHP_EOL,
-			],
-		];
-	}
-
-	public function testStrlen()
-	{
-		$this->assertEquals(18, mb_strlen(CLI::color('success', 'green')));
-		$this->assertEquals(7, CLI::strlen(CLI::color('success', 'green')));
-		$this->assertEquals(0, CLI::strlen(null));
-	}
+    private $stream_filter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->stream_filter);
+    }
+
+    public function testNew()
+    {
+        $actual = new CLI();
+        $this->assertInstanceOf(CLI::class, $actual);
+    }
+
+    public function testBeep()
+    {
+        $this->expectOutputString("\x07");
+        CLI::beep();
+    }
+
+    public function testBeep4()
+    {
+        $this->expectOutputString("\x07\x07\x07\x07");
+        CLI::beep(4);
+    }
+
+    /**
+     * This test waits for 2 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 2.5
+     */
+    public function testWait()
+    {
+        $time = time();
+        CLI::wait(1, true);
+        $this->assertCloseEnough(1, time() - $time);
+
+        $time = time();
+        CLI::wait(1);
+        $this->assertCloseEnough(1, time() - $time);
+
+        // Leaving the code fragment below in, to remind myself (or others)
+        // of what appears to be the most likely path to test this last
+        // bit of wait() functionality.
+        // The problem: if the block below is enabled, the phpunit tests
+        // go catatonic when it is executed, presumably because of
+        // the CLI::input() waiting for a key press
+        //
+        // // test the press any key to continue...
+        // stream_filter_register('CLITestKeyboardFilter', 'CodeIgniter\CLI\CLITestKeyboardFilter');
+        // $spoofer = stream_filter_append(STDIN, 'CLITestKeyboardFilter');
+        // $time = time();
+        // CLITestKeyboardFilter::$spoofed = ' ';
+        // CLI::wait(0);
+        // stream_filter_remove($spoofer);
+        // $this->assertEquals(0, time() - $time);
+    }
+
+    public function testIsWindows()
+    {
+        $this->assertSame(('\\' === DIRECTORY_SEPARATOR), CLI::isWindows());
+        $this->assertSame(defined('PHP_WINDOWS_VERSION_MAJOR'), CLI::isWindows());
+    }
+
+    public function testNewLine()
+    {
+        $this->expectOutputString('');
+        CLI::newLine();
+    }
+
+    public function testColorExceptionForeground()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Invalid foreground color: Foreground');
+
+        CLI::color('test', 'Foreground');
+    }
+
+    public function testColorExceptionBackground()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Invalid background color: Background');
+
+        CLI::color('test', 'white', 'Background');
+    }
+
+    public function testColorSupportOnNoColor()
+    {
+        $nocolor = getenv('NO_COLOR');
+        putenv('NO_COLOR=1');
+
+        CLI::init(); // force re-check on env
+        $this->assertSame('test', CLI::color('test', 'white', 'green'));
+        putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR');
+    }
+
+    public function testColorSupportOnHyperTerminals()
+    {
+        $termProgram = getenv('TERM_PROGRAM');
+        putenv('TERM_PROGRAM=Hyper');
+
+        CLI::init(); // force re-check on env
+        $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+        putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM');
+    }
+
+    public function testStreamSupports()
+    {
+        $this->assertTrue(CLI::streamSupports('stream_isatty', STDOUT));
+        $this->assertIsBool(CLI::streamSupports('sapi_windows_vt100_support', STDOUT));
+    }
+
+    public function testColor()
+    {
+        // After the tests on NO_COLOR and TERM_PROGRAM above,
+        // the $isColored variable is rigged. So we reset this.
+        CLI::init();
+        $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+    }
+
+    public function testPrint()
+    {
+        CLI::print('test');
+        $expected = 'test';
+
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testPrintForeground()
+    {
+        CLI::print('test', 'red');
+        $expected = "\033[0;31mtest\033[0m";
+
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testPrintBackground()
+    {
+        CLI::print('test', 'red', 'green');
+        $expected = "\033[0;31m\033[42mtest\033[0m";
+
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWrite()
+    {
+        CLI::write('test');
+        $expected = PHP_EOL . 'test' . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWriteForeground()
+    {
+        CLI::write('test', 'red');
+        $expected = "\033[0;31mtest\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWriteForegroundWithColorBefore()
+    {
+        CLI::write(CLI::color('green', 'green') . ' red', 'red');
+        $expected = "\033[0;31m\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWriteForegroundWithColorAfter()
+    {
+        CLI::write('red ' . CLI::color('green', 'green'), 'red');
+        $expected = "\033[0;31mred \033[0;32mgreen\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWriteBackground()
+    {
+        CLI::write('test', 'red', 'green');
+        $expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testError()
+    {
+        $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+        CLI::error('test');
+        // red expected cuz stderr
+        $expected = "\033[1;31mtest\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testErrorForeground()
+    {
+        $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+        CLI::error('test', 'purple');
+        $expected = "\033[0;35mtest\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testErrorBackground()
+    {
+        $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+        CLI::error('test', 'purple', 'green');
+        $expected = "\033[0;35m\033[42mtest\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testShowProgress()
+    {
+        CLI::write('first.');
+        CLI::showProgress(1, 20);
+        CLI::showProgress(10, 20);
+        CLI::showProgress(20, 20);
+        CLI::write('second.');
+        CLI::showProgress(1, 20);
+        CLI::showProgress(10, 20);
+        CLI::showProgress(20, 20);
+        CLI::write('third.');
+        CLI::showProgress(1, 20);
+
+        $expected = 'first.' . PHP_EOL .
+                    "[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL .
+                    "\033[1A[\033[32m#####.....\033[0m]  50% Complete" . PHP_EOL .
+                    "\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
+                    'second.' . PHP_EOL .
+                    "[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL .
+                    "\033[1A[\033[32m#####.....\033[0m]  50% Complete" . PHP_EOL .
+                    "\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
+                    'third.' . PHP_EOL .
+                    "[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testShowProgressWithoutBar()
+    {
+        CLI::write('first.');
+        CLI::showProgress(false, 20);
+        CLI::showProgress(false, 20);
+        CLI::showProgress(false, 20);
+
+        $expected = 'first.' . PHP_EOL . "\007\007\007";
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    public function testWrap()
+    {
+        $this->assertSame('', CLI::wrap(''));
+        $this->assertSame('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1));
+        $this->assertSame('1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2));
+        $this->assertSame('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321'));
+    }
+
+    public function testParseCommand()
+    {
+        $_SERVER['argv'] = [
+            'ignored',
+            'b',
+            'c',
+        ];
+        $_SERVER['argc'] = 3;
+        CLI::init();
+        $this->assertNull(CLI::getSegment(3));
+        $this->assertSame('b', CLI::getSegment(1));
+        $this->assertSame('c', CLI::getSegment(2));
+        $this->assertSame('b/c', CLI::getURI());
+        $this->assertSame([], CLI::getOptions());
+        $this->assertEmpty(CLI::getOptionString());
+        $this->assertSame(['b', 'c'], CLI::getSegments());
+    }
+
+    public function testParseCommandMixed()
+    {
+        $_SERVER['argv'] = [
+            'ignored',
+            'b',
+            'c',
+            'd',
+            '--parm',
+            'pvalue',
+            'd2',
+            'da-sh',
+            '--fix',
+            '--opt-in',
+            'sure',
+        ];
+        CLI::init();
+        $this->assertNull(CLI::getSegment(7));
+        $this->assertSame('b', CLI::getSegment(1));
+        $this->assertSame('c', CLI::getSegment(2));
+        $this->assertSame('d', CLI::getSegment(3));
+        $this->assertSame(['b', 'c', 'd', 'd2', 'da-sh'], CLI::getSegments());
+        $this->assertSame(['parm' => 'pvalue', 'fix' => null, 'opt-in' => 'sure'], CLI::getOptions());
+        $this->assertSame('-parm pvalue -fix -opt-in sure ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue -fix -opt-in sure', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue --fix --opt-in sure ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue --fix --opt-in sure', CLI::getOptionString(true, true));
+    }
+
+    public function testParseCommandOption()
+    {
+        $_SERVER['argv'] = [
+            'ignored',
+            'b',
+            'c',
+            '--parm',
+            'pvalue',
+            'd',
+        ];
+        CLI::init();
+        $this->assertSame(['parm' => 'pvalue'], CLI::getOptions());
+        $this->assertSame('pvalue', CLI::getOption('parm'));
+        $this->assertSame('-parm pvalue ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue', CLI::getOptionString(true, true));
+        $this->assertNull(CLI::getOption('bogus'));
+        $this->assertSame(['b', 'c', 'd'], CLI::getSegments());
+    }
+
+    public function testParseCommandMultipleOptions()
+    {
+        $_SERVER['argv'] = [
+            'ignored',
+            'b',
+            'c',
+            '--parm',
+            'pvalue',
+            'd',
+            '--p2',
+            '--p3',
+            'value 3',
+        ];
+        CLI::init();
+        $this->assertSame(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());
+        $this->assertSame('pvalue', CLI::getOption('parm'));
+        $this->assertSame('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue -p2 -p3 "value 3"', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue --p2 --p3 "value 3" ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue --p2 --p3 "value 3"', CLI::getOptionString(true, true));
+        $this->assertSame(['b', 'c', 'd'], CLI::getSegments());
+    }
+
+    public function testWindow()
+    {
+        $height = new ReflectionProperty(CLI::class, 'height');
+        $height->setAccessible(true);
+        $height->setValue(null);
+        $this->assertIsInt(CLI::getHeight());
+
+        $width = new ReflectionProperty(CLI::class, 'width');
+        $width->setAccessible(true);
+        $width->setValue(null);
+        $this->assertIsInt(CLI::getWidth());
+    }
+
+    /**
+     * @dataProvider tableProvider
+     *
+     * @param array $tbody
+     * @param array $thead
+     * @param array $expected
+     */
+    public function testTable($tbody, $thead, $expected)
+    {
+        CLI::table($tbody, $thead);
+        $this->assertSame(CITestStreamFilter::$buffer, $expected);
+    }
+
+    public function tableProvider()
+    {
+        $head = [
+            'ID',
+            'Title',
+        ];
+        $oneRow = [
+            [
+                'id'  => 1,
+                'foo' => 'bar',
+            ],
+        ];
+        $manyRows = [
+            [
+                'id'  => 1,
+                'foo' => 'bar',
+            ],
+            [
+                'id'  => 2,
+                'foo' => 'bar * 2',
+            ],
+            [
+                'id'  => 3,
+                'foo' => 'bar + bar + bar',
+            ],
+        ];
+
+        return [
+            [
+                $oneRow,
+                [],
+                '+---+-----+' . PHP_EOL .
+                '| 1 | bar |' . PHP_EOL .
+                '+---+-----+' . PHP_EOL . PHP_EOL,
+            ],
+            [
+                $oneRow,
+                $head,
+                '+----+-------+' . PHP_EOL .
+                '| ID | Title |' . PHP_EOL .
+                '+----+-------+' . PHP_EOL .
+                '| 1  | bar   |' . PHP_EOL .
+                '+----+-------+' . PHP_EOL . PHP_EOL,
+            ],
+            [
+                $manyRows,
+                [],
+                '+---+-----------------+' . PHP_EOL .
+                '| 1 | bar             |' . PHP_EOL .
+                '| 2 | bar * 2         |' . PHP_EOL .
+                '| 3 | bar + bar + bar |' . PHP_EOL .
+                '+---+-----------------+' . PHP_EOL . PHP_EOL,
+            ],
+            [
+                $manyRows,
+                $head,
+                '+----+-----------------+' . PHP_EOL .
+                '| ID | Title           |' . PHP_EOL .
+                '+----+-----------------+' . PHP_EOL .
+                '| 1  | bar             |' . PHP_EOL .
+                '| 2  | bar * 2         |' . PHP_EOL .
+                '| 3  | bar + bar + bar |' . PHP_EOL .
+                '+----+-----------------+' . PHP_EOL . PHP_EOL,
+            ],
+            // Multibyte letters
+            [
+                [
+                    [
+                        'id'  => 'ほげ',
+                        'foo' => 'bar',
+                    ],
+                ],
+                [
+                    'ID',
+                    'タイトル',
+                ],
+                '+------+----------+' . PHP_EOL .
+                '| ID   | タイトル |' . PHP_EOL .
+                '+------+----------+' . PHP_EOL .
+                '| ほげ | bar      |' . PHP_EOL .
+                '+------+----------+' . PHP_EOL . PHP_EOL,
+            ],
+        ];
+    }
+
+    public function testStrlen()
+    {
+        $this->assertSame(18, mb_strlen(CLI::color('success', 'green')));
+        $this->assertSame(7, CLI::strlen(CLI::color('success', 'green')));
+        $this->assertSame(0, CLI::strlen(null));
+    }
 }
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 9f33fd7b99be..36c89ddafc76 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Log\Logger;
@@ -7,112 +16,121 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
+/**
+ * @internal
+ */
 final class CommandRunnerTest extends CIUnitTestCase
 {
-	/** @var resource */
-	private $streamFilter;
-
-	/** @var Logger */
-	private static $logger;
-
-	/** @var CommandRunner */
-	private static $runner;
-
-	public static function setUpBeforeClass(): void
-	{
-		self::$logger = service('logger');
-		self::$runner = new CommandRunner();
-
-		self::$runner->initController(service('request'), service('response'), self::$logger);
-	}
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	public function testGoodCommand()
-	{
-		self::$runner->index(['list']);
-		$result = CITestStreamFilter::$buffer;
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Lists the available commands.', $result);
-		$this->assertStringContainsString('Displays basic usage information.', $result);
-	}
-
-	public function testDefaultCommand()
-	{
-		self::$runner->index([]);
-		$result = CITestStreamFilter::$buffer;
-
-		// make sure the result looks like basic help
-		$this->assertStringContainsString('Lists the available commands.', $result);
-		$this->assertStringContainsString('Displays basic usage information.', $result);
-	}
-
-	public function testHelpCommand()
-	{
-		self::$runner->index(['help']);
-		$result = CITestStreamFilter::$buffer;
-
-		// make sure the result looks like basic help
-		$this->assertStringContainsString('Displays basic usage information.', $result);
-		$this->assertStringContainsString('help command_name', $result);
-	}
-
-	public function testHelpCommandDetails()
-	{
-		self::$runner->index(['help', 'session:migration']);
-		$result = CITestStreamFilter::$buffer;
-
-		// make sure the result looks like more detailed help
-		$this->assertStringContainsString('Description:', $result);
-		$this->assertStringContainsString('Usage:', $result);
-		$this->assertStringContainsString('Options:', $result);
-	}
-
-	public function testCommandProperties()
-	{
-		$commands = self::$runner->getCommands();
-		$command  = new $commands['help']['class'](self::$logger, Services::commands());
-
-		$this->assertSame('Displays basic usage information.', $command->description);
-		$this->assertNull($command->notdescription);
-	}
-
-	public function testEmptyCommand()
-	{
-		self::$runner->index([null, 'list']);
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Lists the available commands.', CITestStreamFilter::$buffer);
-	}
-
-	public function testBadCommand()
-	{
-		self::$runner->index(['bogus']);
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Command "bogus" not found', CITestStreamFilter::$buffer);
-	}
-
-	public function testRemapEmptyFirstParams()
-	{
-		self::$runner->_remap('anyvalue', null, 'list');
-		$result = CITestStreamFilter::$buffer;
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Lists the available commands.', $result);
-	}
+    /**
+     * @var resource
+     */
+    private $streamFilter;
+
+    /**
+     * @var Logger
+     */
+    private static $logger;
+
+    /**
+     * @var CommandRunner
+     */
+    private static $runner;
+
+    public static function setUpBeforeClass(): void
+    {
+        self::$logger = service('logger');
+        self::$runner = new CommandRunner();
+
+        self::$runner->initController(service('request'), service('response'), self::$logger);
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    public function testGoodCommand()
+    {
+        self::$runner->index(['list']);
+        $result = CITestStreamFilter::$buffer;
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Lists the available commands.', $result);
+        $this->assertStringContainsString('Displays basic usage information.', $result);
+    }
+
+    public function testDefaultCommand()
+    {
+        self::$runner->index([]);
+        $result = CITestStreamFilter::$buffer;
+
+        // make sure the result looks like basic help
+        $this->assertStringContainsString('Lists the available commands.', $result);
+        $this->assertStringContainsString('Displays basic usage information.', $result);
+    }
+
+    public function testHelpCommand()
+    {
+        self::$runner->index(['help']);
+        $result = CITestStreamFilter::$buffer;
+
+        // make sure the result looks like basic help
+        $this->assertStringContainsString('Displays basic usage information.', $result);
+        $this->assertStringContainsString('help command_name', $result);
+    }
+
+    public function testHelpCommandDetails()
+    {
+        self::$runner->index(['help', 'session:migration']);
+        $result = CITestStreamFilter::$buffer;
+
+        // make sure the result looks like more detailed help
+        $this->assertStringContainsString('Description:', $result);
+        $this->assertStringContainsString('Usage:', $result);
+        $this->assertStringContainsString('Options:', $result);
+    }
+
+    public function testCommandProperties()
+    {
+        $commands = self::$runner->getCommands();
+        $command  = new $commands['help']['class'](self::$logger, Services::commands());
+
+        $this->assertSame('Displays basic usage information.', $command->description);
+        $this->assertNull($command->notdescription);
+    }
+
+    public function testEmptyCommand()
+    {
+        self::$runner->index([null, 'list']);
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Lists the available commands.', CITestStreamFilter::$buffer);
+    }
+
+    public function testBadCommand()
+    {
+        self::$runner->index(['bogus']);
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Command "bogus" not found', CITestStreamFilter::$buffer);
+    }
+
+    public function testRemapEmptyFirstParams()
+    {
+        self::$runner->_remap('anyvalue', null, 'list');
+        $result = CITestStreamFilter::$buffer;
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Lists the available commands.', $result);
+    }
 }
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index 465bf0e0f306..a5b3dd1e9783 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CodeIgniter;
@@ -10,79 +19,79 @@
 use CodeIgniter\Test\Mock\MockCLIConfig;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 
-class ConsoleTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConsoleTest extends CIUnitTestCase
 {
-
-	private $stream_filter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
-
-		$this->env = new DotEnv(ROOTPATH);
-		$this->env->load();
-
-		// Set environment values that would otherwise stop the framework from functioning during tests.
-		if (! isset($_SERVER['app.baseURL']))
-		{
-			$_SERVER['app.baseURL'] = 'http://example.com/';
-		}
-
-		$_SERVER['argv'] = [
-			'spark',
-			'list',
-		];
-		$_SERVER['argc'] = 2;
-		CLI::init();
-
-		$this->app = new MockCodeIgniter(new MockCLIConfig());
-	}
-
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->stream_filter);
-	}
-
-	public function testNew()
-	{
-		$console = new Console($this->app);
-		$this->assertInstanceOf(Console::class, $console);
-	}
-
-	public function testHeader()
-	{
-		$console = new Console($this->app);
-		$console->showHeader();
-		$result = CITestStreamFilter::$buffer;
-		$this->assertTrue(strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)) > 0);
-	}
-
-	public function testNoHeader()
-	{
-		$console = new Console($this->app);
-		$console->showHeader(true);
-		$result = CITestStreamFilter::$buffer;
-		$this->assertSame('', $result);
-	}
-
-	public function testRun()
-	{
-		$request = new CLIRequest(config('App'));
-		$this->app->setRequest($request);
-
-		$console = new Console($this->app);
-		$console->run(true);
-		$result = CITestStreamFilter::$buffer;
-
-		// close open buffer
-		ob_end_clean();
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Lists the available commands.', $result);
-		$this->assertStringContainsString('Displays basic usage information.', $result);
-	}
-
+    private $stream_filter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
+
+        $this->env = new DotEnv(ROOTPATH);
+        $this->env->load();
+
+        // Set environment values that would otherwise stop the framework from functioning during tests.
+        if (! isset($_SERVER['app.baseURL'])) {
+            $_SERVER['app.baseURL'] = 'http://example.com/';
+        }
+
+        $_SERVER['argv'] = [
+            'spark',
+            'list',
+        ];
+        $_SERVER['argc'] = 2;
+        CLI::init();
+
+        $this->app = new MockCodeIgniter(new MockCLIConfig());
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->stream_filter);
+    }
+
+    public function testNew()
+    {
+        $console = new Console($this->app);
+        $this->assertInstanceOf(Console::class, $console);
+    }
+
+    public function testHeader()
+    {
+        $console = new Console($this->app);
+        $console->showHeader();
+        $result = CITestStreamFilter::$buffer;
+        $this->assertTrue(strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)) > 0);
+    }
+
+    public function testNoHeader()
+    {
+        $console = new Console($this->app);
+        $console->showHeader(true);
+        $result = CITestStreamFilter::$buffer;
+        $this->assertSame('', $result);
+    }
+
+    public function testRun()
+    {
+        $request = new CLIRequest(config('App'));
+        $this->app->setRequest($request);
+
+        $console = new Console($this->app);
+        $console->run(true);
+        $result = CITestStreamFilter::$buffer;
+
+        // close open buffer
+        ob_end_clean();
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Lists the available commands.', $result);
+        $this->assertStringContainsString('Displays basic usage information.', $result);
+    }
 }
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index af108219f451..ec978504fcfb 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -1,119 +1,124 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache;
 
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
-class CacheFactoryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CacheFactoryTest extends CIUnitTestCase
 {
+    private static $directory = 'CacheFactory';
+    private $cacheFactory;
+    private $config;
 
-	private static $directory = 'CacheFactory';
-	private $cacheFactory;
-	private $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->cacheFactory = new CacheFactory();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		//Initialize path
-		$this->config             = new Cache();
-		$this->config->storePath .= self::$directory;
-	}
+        $this->cacheFactory = new CacheFactory();
 
-	public function tearDown(): void
-	{
-		if (is_dir($this->config->storePath))
-		{
-			chmod($this->config->storePath, 0777);
-			rmdir($this->config->storePath);
-		}
-	}
+        // Initialize path
+        $this->config = new Cache();
+        $this->config->storePath .= self::$directory;
+    }
 
-	public function testNew()
-	{
-		$this->assertInstanceOf(CacheFactory::class, $this->cacheFactory);
-	}
+    protected function tearDown(): void
+    {
+        if (is_dir($this->config->storePath)) {
+            chmod($this->config->storePath, 0777);
+            rmdir($this->config->storePath);
+        }
+    }
 
-	public function testGetHandlerExceptionCacheInvalidHandlers()
-	{
-		$this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
-		$this->expectExceptionMessage('Cache config must have an array of $validHandlers.');
+    public function testNew()
+    {
+        $this->assertInstanceOf(CacheFactory::class, $this->cacheFactory);
+    }
 
-		$this->config->validHandlers = null;
+    public function testGetHandlerExceptionCacheInvalidHandlers()
+    {
+        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectExceptionMessage('Cache config must have an array of $validHandlers.');
 
-		$this->cacheFactory->getHandler($this->config);
-	}
+        $this->config->validHandlers = null;
 
-	public function testGetHandlerExceptionCacheNoBackup()
-	{
-		$this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
-		$this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
+        $this->cacheFactory->getHandler($this->config);
+    }
 
-		$this->config->backupHandler = null;
+    public function testGetHandlerExceptionCacheNoBackup()
+    {
+        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
 
-		$this->cacheFactory->getHandler($this->config);
-	}
+        $this->config->backupHandler = null;
 
-	public function testGetHandlerExceptionCacheNoHandler()
-	{
-		$this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
-		$this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
+        $this->cacheFactory->getHandler($this->config);
+    }
 
-		$this->config->handler = null;
+    public function testGetHandlerExceptionCacheNoHandler()
+    {
+        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
 
-		$this->cacheFactory->getHandler($this->config);
-	}
+        $this->config->handler = null;
 
-	public function testGetHandlerExceptionCacheHandlerNotFound()
-	{
-		$this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
-		$this->expectExceptionMessage('Cache config has an invalid handler or backup handler specified.');
+        $this->cacheFactory->getHandler($this->config);
+    }
 
-		unset($this->config->validHandlers[$this->config->handler]);
+    public function testGetHandlerExceptionCacheHandlerNotFound()
+    {
+        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectExceptionMessage('Cache config has an invalid handler or backup handler specified.');
 
-		$this->cacheFactory->getHandler($this->config);
-	}
+        unset($this->config->validHandlers[$this->config->handler]);
 
-	public function testGetDummyHandler()
-	{
-		if (! is_dir($this->config->storePath))
-		{
-			mkdir($this->config->storePath, 0555, true);
-		}
+        $this->cacheFactory->getHandler($this->config);
+    }
 
-		$this->config->handler = 'dummy';
+    public function testGetDummyHandler()
+    {
+        if (! is_dir($this->config->storePath)) {
+            mkdir($this->config->storePath, 0555, true);
+        }
 
-		$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config));
+        $this->config->handler = 'dummy';
 
-		//Initialize path
-		$this->config             = new Cache();
-		$this->config->storePath .= self::$directory;
-	}
+        $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config));
 
-	public function testHandlesBadHandler()
-	{
-		if (! is_dir($this->config->storePath))
-		{
-			mkdir($this->config->storePath, 0555, true);
-		}
+        // Initialize path
+        $this->config = new Cache();
+        $this->config->storePath .= self::$directory;
+    }
 
-		$this->config->handler = 'dummy';
+    public function testHandlesBadHandler()
+    {
+        if (! is_dir($this->config->storePath)) {
+            mkdir($this->config->storePath, 0555, true);
+        }
 
-		if (stripos('win', php_uname()) === 0)
-		{
-			$this->assertTrue(true); // can't test properly if we are on Windows
-		}
-		else
-		{
-			$this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
-		}
+        $this->config->handler = 'dummy';
 
-		//Initialize path
-		$this->config             = new Cache();
-		$this->config->storePath .= self::$directory;
-	}
+        if (stripos('win', php_uname()) === 0) {
+            $this->assertTrue(true); // can't test properly if we are on Windows
+        } else {
+            $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
+        }
 
+        // Initialize path
+        $this->config = new Cache();
+        $this->config->storePath .= self::$directory;
+    }
 }
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 2141b1c4ed65..5965666a5810 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -1,66 +1,82 @@
-<?php namespace CodeIgniter\Cache\Handlers;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
 
-use stdClass;
 use CodeIgniter\Test\CIUnitTestCase;
+use stdClass;
 use Tests\Support\Cache\RestrictiveHandler;
 
-class BaseHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseHandlerTest extends CIUnitTestCase
 {
-	/**
-	 * @dataProvider invalidTypeProvider
-	 */
-	public function testValidateKeyInvalidType($input)
-	{
-		$this->expectException('InvalidArgumentException');
-		$this->expectExceptionMessage('Cache key must be a string');
-
-		BaseHandler::validateKey($input);
-	}
-
-	public function invalidTypeProvider(): array
-	{
-		return [
-			[true],
-			[false],
-			[null],
-			[42],
-			[new stdClass],
-		];
-	}
-
-	public function testValidateKeySuccess()
-	{
-		$string = 'banana';
-		$result = BaseHandler::validateKey($string);
-
-		$this->assertSame($string, $result);
-	}
-
-	public function testValidateKeySuccessWithPrefix()
-	{
-		$string = 'banana';
-		$result = BaseHandler::validateKey($string, 'prefix');
-
-		$this->assertSame('prefix' . $string, $result);
-	}
-
-	public function testValidateExcessiveLength()
-	{
-		$string   = 'MoreThanTenCharacters';
-		$expected = md5($string);
-
-		$result = RestrictiveHandler::validateKey($string);
-
-		$this->assertSame($expected, $result);
-	}
-
-	public function testValidateExcessiveLengthWithPrefix()
-	{
-		$string   = 'MoreThanTenCharacters';
-		$expected = 'prefix' . md5($string);
-
-		$result = RestrictiveHandler::validateKey($string, 'prefix');
-
-		$this->assertSame($expected, $result);
-	}
+    /**
+     * @dataProvider invalidTypeProvider
+     *
+     * @param mixed $input
+     */
+    public function testValidateKeyInvalidType($input)
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cache key must be a string');
+
+        BaseHandler::validateKey($input);
+    }
+
+    public function invalidTypeProvider(): array
+    {
+        return [
+            [true],
+            [false],
+            [null],
+            [42],
+            [new stdClass()],
+        ];
+    }
+
+    public function testValidateKeySuccess()
+    {
+        $string = 'banana';
+        $result = BaseHandler::validateKey($string);
+
+        $this->assertSame($string, $result);
+    }
+
+    public function testValidateKeySuccessWithPrefix()
+    {
+        $string = 'banana';
+        $result = BaseHandler::validateKey($string, 'prefix');
+
+        $this->assertSame('prefix' . $string, $result);
+    }
+
+    public function testValidateExcessiveLength()
+    {
+        $string   = 'MoreThanTenCharacters';
+        $expected = md5($string);
+
+        $result = RestrictiveHandler::validateKey($string);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testValidateExcessiveLengthWithPrefix()
+    {
+        $string   = 'MoreThanTenCharacters';
+        $expected = 'prefix' . md5($string);
+
+        $result = RestrictiveHandler::validateKey($string, 'prefix');
+
+        $this->assertSame($expected, $result);
+    }
 }
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index 7b2dcbfe3fd3..c0fc5eb20cf5 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -1,78 +1,92 @@
-<?php namespace CodeIgniter\Cache\Handlers;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class DummyHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DummyHandlerTest extends CIUnitTestCase
 {
-	private $dummyHandler;
-
-	protected function setUp(): void
-	{
-		$this->dummyHandler = new DummyHandler();
-		$this->dummyHandler->initialize();
-	}
-
-	public function testNew()
-	{
-		$this->assertInstanceOf(DummyHandler::class, $this->dummyHandler);
-	}
-
-	public function testGet()
-	{
-		$this->assertNull($this->dummyHandler->get('key'));
-	}
-
-	public function testRemember()
-	{
-		$dummyHandler = $this->dummyHandler->remember('key', 2, function () {
-			return 'value';
-		});
-
-		$this->assertNull($dummyHandler);
-	}
-
-	public function testSave()
-	{
-		$this->assertTrue($this->dummyHandler->save('key', 'value'));
-	}
-
-	public function testDelete()
-	{
-		$this->assertTrue($this->dummyHandler->delete('key'));
-	}
-
-	public function testDeleteMatching()
-	{
-		$this->assertSame(0, $this->dummyHandler->deleteMatching('key*'));
-	}
-
-	public function testIncrement()
-	{
-		$this->assertTrue($this->dummyHandler->increment('key'));
-	}
-
-	public function testDecrement()
-	{
-		$this->assertTrue($this->dummyHandler->decrement('key'));
-	}
-
-	public function testClean()
-	{
-		$this->assertTrue($this->dummyHandler->clean());
-	}
-
-	public function testGetCacheInfo()
-	{
-		$this->assertNull($this->dummyHandler->getCacheInfo());
-	}
-
-	public function testGetMetaData()
-	{
-		$this->assertNull($this->dummyHandler->getMetaData('key'));
-	}
-
-	public function testIsSupported()
-	{
-		$this->assertTrue($this->dummyHandler->isSupported());
-	}
+    private $dummyHandler;
+
+    protected function setUp(): void
+    {
+        $this->dummyHandler = new DummyHandler();
+        $this->dummyHandler->initialize();
+    }
+
+    public function testNew()
+    {
+        $this->assertInstanceOf(DummyHandler::class, $this->dummyHandler);
+    }
+
+    public function testGet()
+    {
+        $this->assertNull($this->dummyHandler->get('key'));
+    }
+
+    public function testRemember()
+    {
+        $dummyHandler = $this->dummyHandler->remember('key', 2, static function () {
+            return 'value';
+        });
+
+        $this->assertNull($dummyHandler);
+    }
+
+    public function testSave()
+    {
+        $this->assertTrue($this->dummyHandler->save('key', 'value'));
+    }
+
+    public function testDelete()
+    {
+        $this->assertTrue($this->dummyHandler->delete('key'));
+    }
+
+    public function testDeleteMatching()
+    {
+        $this->assertSame(0, $this->dummyHandler->deleteMatching('key*'));
+    }
+
+    public function testIncrement()
+    {
+        $this->assertTrue($this->dummyHandler->increment('key'));
+    }
+
+    public function testDecrement()
+    {
+        $this->assertTrue($this->dummyHandler->decrement('key'));
+    }
+
+    public function testClean()
+    {
+        $this->assertTrue($this->dummyHandler->clean());
+    }
+
+    public function testGetCacheInfo()
+    {
+        $this->assertNull($this->dummyHandler->getCacheInfo());
+    }
+
+    public function testGetMetaData()
+    {
+        $this->assertNull($this->dummyHandler->getMetaData('key'));
+    }
+
+    public function testIsSupported()
+    {
+        $this->assertTrue($this->dummyHandler->isSupported());
+    }
 }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 8882a036273c..bfd379ae9d8f 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -1,355 +1,361 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class FileHandlerTest extends CIUnitTestCase
 {
-	private static $directory = 'FileHandler';
-	private static $key1      = 'key1';
-	private static $key2      = 'key2';
-	private static $key3      = 'key3';
-
-	private static function getKeyArray()
-	{
-		return [
-			self::$key1,
-			self::$key2,
-			self::$key3,
-		];
-	}
-
-	private static $dummy = 'dymmy';
-	private $fileHandler;
-	private $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		if (! function_exists('octal_permissions'))
-		{
-			helper('filesystem');
-		}
-
-		// Initialize path
-		$this->config                     = new Cache();
-		$this->config->file['storePath'] .= self::$directory;
-
-		if (! is_dir($this->config->file['storePath']))
-		{
-			mkdir($this->config->file['storePath'], 0777, true);
-		}
-
-		$this->fileHandler = new FileHandler($this->config);
-		$this->fileHandler->initialize();
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		if (is_dir($this->config->file['storePath']))
-		{
-			chmod($this->config->file['storePath'], 0777);
-
-			foreach (self::getKeyArray() as $key)
-			{
-				if (is_file($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key))
-				{
-					chmod($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key, 0777);
-					unlink($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key);
-				}
-			}
-
-			rmdir($this->config->file['storePath']);
-		}
-	}
-
-	public function testNew()
-	{
-		$this->assertInstanceOf(FileHandler::class, $this->fileHandler);
-	}
-
-	public function testNewWithNonWritablePath()
-	{
-		$this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
-
-		chmod($this->config->file['storePath'], 0444);
-		new FileHandler($this->config);
-	}
-
-	public function testSetDefaultPath()
-	{
-		// Initialize path
-		$config                    = new Cache();
-		$config->file['storePath'] = null;
-
-		$this->fileHandler = new FileHandler($config);
-		$this->fileHandler->initialize();
-
-		$this->assertInstanceOf(FileHandler::class, $this->fileHandler);
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testGet()
-	{
-		$this->fileHandler->save(self::$key1, 'value', 2);
-
-		$this->assertSame('value', $this->fileHandler->get(self::$key1));
-		$this->assertNull($this->fileHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->fileHandler->get(self::$key1));
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testRemember()
-	{
-		$this->fileHandler->remember(self::$key1, 2, function () {
-			return 'value';
-		});
-
-		$this->assertSame('value', $this->fileHandler->get(self::$key1));
-		$this->assertNull($this->fileHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->fileHandler->get(self::$key1));
-	}
-
-	public function testSave()
-	{
-		$this->assertTrue($this->fileHandler->save(self::$key1, 'value'));
-
-		chmod($this->config->file['storePath'], 0444);
-		$this->assertFalse($this->fileHandler->save(self::$key2, 'value'));
-	}
-
-	public function testSaveExcessiveKeyLength()
-	{
-		$key  = str_repeat('a', 260);
-		$file = $this->config->file['storePath'] . DIRECTORY_SEPARATOR . md5($key);
-
-		$this->assertTrue($this->fileHandler->save($key, 'value'));
-		$this->assertFileExists($file);
-
-		unlink($file);
-	}
-
-	public function testDelete()
-	{
-		$this->fileHandler->save(self::$key1, 'value');
-
-		$this->assertTrue($this->fileHandler->delete(self::$key1));
-		$this->assertFalse($this->fileHandler->delete(self::$dummy));
-	}
-
-	public function testDeleteMatchingPrefix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->fileHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$this->assertSame(101, count($this->fileHandler->getCacheInfo()));
-
-		// Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
-		// (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-		$this->assertSame(13, $this->fileHandler->deleteMatching('key_1*'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$this->assertSame(88, count($this->fileHandler->getCacheInfo()));
-
-		// Clear all files
-		$this->fileHandler->clean();
-	}
-
-	public function testDeleteMatchingSuffix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->fileHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$this->assertSame(101, count($this->fileHandler->getCacheInfo()));
-
-		// Checking that given the suffix "1", deleteMatching deletes 11 keys:
-		// (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-		$this->assertSame(11, $this->fileHandler->deleteMatching('*1'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$this->assertSame(90, count($this->fileHandler->getCacheInfo()));
-
-		// Clear all files
-		$this->fileHandler->clean();
-	}
-
-	public function testIncrement()
-	{
-		$this->fileHandler->save(self::$key1, 1);
-		$this->fileHandler->save(self::$key2, 'value');
-
-		$this->assertSame(11, $this->fileHandler->increment(self::$key1, 10));
-		$this->assertFalse($this->fileHandler->increment(self::$key2, 10));
-		$this->assertSame(10, $this->fileHandler->increment(self::$key3, 10));
-	}
-
-	public function testDecrement()
-	{
-		$this->fileHandler->save(self::$key1, 10);
-		$this->fileHandler->save(self::$key2, 'value');
-
-		//  Line following commented out to force the cache to add a zero entry for key3
-		//      $this->fileHandler->save(self::$key3, 0);
-
-		$this->assertSame(9, $this->fileHandler->decrement(self::$key1, 1));
-		$this->assertFalse($this->fileHandler->decrement(self::$key2, 1));
-		$this->assertSame(-1, $this->fileHandler->decrement(self::$key3, 1));
-	}
-
-	public function testClean()
-	{
-		$this->fileHandler->save(self::$key1, 1);
-		$this->fileHandler->save(self::$key2, 'value');
-
-		$this->assertTrue($this->fileHandler->clean());
-
-		$this->fileHandler->save(self::$key1, 1);
-		$this->fileHandler->save(self::$key2, 'value');
-	}
-
-	public function testGetMetaData()
-	{
-		$time = time();
-		$this->fileHandler->save(self::$key1, 'value');
-
-		$this->assertFalse($this->fileHandler->getMetaData(self::$dummy));
-
-		$actual = $this->fileHandler->getMetaData(self::$key1);
-		$this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-		$this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-		$this->assertSame('value', $actual['data']);
-	}
-
-	public function testGetCacheInfo()
-	{
-		$time = time();
-		$this->fileHandler->save(self::$key1, 'value');
-
-		$actual = $this->fileHandler->getCacheInfo();
-		$this->assertArrayHasKey(self::$key1, $actual);
-		$this->assertEquals(self::$key1, $actual[self::$key1]['name']);
-		$this->assertArrayHasKey('server_path', $actual[self::$key1]);
-	}
-
-	public function testIsSupported()
-	{
-		$this->assertTrue($this->fileHandler->isSupported());
-	}
-
-	/**
-	 * @dataProvider modeProvider
-	 */
-	public function testSaveMode($int, $string)
-	{
-		// Initialize mode
-		$config               = new Cache();
-		$config->file['mode'] = $int;
-
-		$this->fileHandler = new FileHandler($config);
-		$this->fileHandler->initialize();
-
-		$this->fileHandler->save(self::$key1, 'value');
-
-		$file = $config->file['storePath'] . DIRECTORY_SEPARATOR . self::$key1;
-		$mode = octal_permissions(fileperms($file));
-
-		$this->assertEquals($string, $mode);
-	}
-
-	public function modeProvider()
-	{
-		return [
-			[
-				0640,
-				'640',
-			],
-			[
-				0600,
-				'600',
-			],
-			[
-				0660,
-				'660',
-			],
-			[
-				0777,
-				'777',
-			],
-		];
-	}
-
-	public function testFileHandler()
-	{
-		$fileHandler = new BaseTestFileHandler();
-
-		$actual = $fileHandler->getFileInfoTest();
-
-		$this->assertArrayHasKey('server_path', $actual);
-		$this->assertArrayHasKey('size', $actual);
-		$this->assertArrayHasKey('date', $actual);
-		$this->assertArrayHasKey('readable', $actual);
-		$this->assertArrayHasKey('writable', $actual);
-		$this->assertArrayHasKey('executable', $actual);
-		$this->assertArrayHasKey('fileperms', $actual);
-	}
-
+    private static $directory = 'FileHandler';
+    private static $key1      = 'key1';
+    private static $key2      = 'key2';
+    private static $key3      = 'key3';
+
+    private static function getKeyArray()
+    {
+        return [
+            self::$key1,
+            self::$key2,
+            self::$key3,
+        ];
+    }
+
+    private static $dummy = 'dymmy';
+    private $fileHandler;
+    private $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (! function_exists('octal_permissions')) {
+            helper('filesystem');
+        }
+
+        // Initialize path
+        $this->config = new Cache();
+        $this->config->file['storePath'] .= self::$directory;
+
+        if (! is_dir($this->config->file['storePath'])) {
+            mkdir($this->config->file['storePath'], 0777, true);
+        }
+
+        $this->fileHandler = new FileHandler($this->config);
+        $this->fileHandler->initialize();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (is_dir($this->config->file['storePath'])) {
+            chmod($this->config->file['storePath'], 0777);
+
+            foreach (self::getKeyArray() as $key) {
+                if (is_file($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key)) {
+                    chmod($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key, 0777);
+                    unlink($this->config->file['storePath'] . DIRECTORY_SEPARATOR . $key);
+                }
+            }
+
+            rmdir($this->config->file['storePath']);
+        }
+    }
+
+    public function testNew()
+    {
+        $this->assertInstanceOf(FileHandler::class, $this->fileHandler);
+    }
+
+    public function testNewWithNonWritablePath()
+    {
+        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+
+        chmod($this->config->file['storePath'], 0444);
+        new FileHandler($this->config);
+    }
+
+    public function testSetDefaultPath()
+    {
+        // Initialize path
+        $config                    = new Cache();
+        $config->file['storePath'] = null;
+
+        $this->fileHandler = new FileHandler($config);
+        $this->fileHandler->initialize();
+
+        $this->assertInstanceOf(FileHandler::class, $this->fileHandler);
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testGet()
+    {
+        $this->fileHandler->save(self::$key1, 'value', 2);
+
+        $this->assertSame('value', $this->fileHandler->get(self::$key1));
+        $this->assertNull($this->fileHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->fileHandler->get(self::$key1));
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testRemember()
+    {
+        $this->fileHandler->remember(self::$key1, 2, static function () {
+            return 'value';
+        });
+
+        $this->assertSame('value', $this->fileHandler->get(self::$key1));
+        $this->assertNull($this->fileHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->fileHandler->get(self::$key1));
+    }
+
+    public function testSave()
+    {
+        $this->assertTrue($this->fileHandler->save(self::$key1, 'value'));
+
+        chmod($this->config->file['storePath'], 0444);
+        $this->assertFalse($this->fileHandler->save(self::$key2, 'value'));
+    }
+
+    public function testSaveExcessiveKeyLength()
+    {
+        $key  = str_repeat('a', 260);
+        $file = $this->config->file['storePath'] . DIRECTORY_SEPARATOR . md5($key);
+
+        $this->assertTrue($this->fileHandler->save($key, 'value'));
+        $this->assertFileExists($file);
+
+        unlink($file);
+    }
+
+    public function testDelete()
+    {
+        $this->fileHandler->save(self::$key1, 'value');
+
+        $this->assertTrue($this->fileHandler->delete(self::$key1));
+        $this->assertFalse($this->fileHandler->delete(self::$dummy));
+    }
+
+    public function testDeleteMatchingPrefix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->fileHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $this->assertCount(101, $this->fileHandler->getCacheInfo());
+
+        // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
+        // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
+        $this->assertSame(13, $this->fileHandler->deleteMatching('key_1*'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $this->assertCount(88, $this->fileHandler->getCacheInfo());
+
+        // Clear all files
+        $this->fileHandler->clean();
+    }
+
+    public function testDeleteMatchingSuffix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->fileHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $this->assertCount(101, $this->fileHandler->getCacheInfo());
+
+        // Checking that given the suffix "1", deleteMatching deletes 11 keys:
+        // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
+        $this->assertSame(11, $this->fileHandler->deleteMatching('*1'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $this->assertCount(90, $this->fileHandler->getCacheInfo());
+
+        // Clear all files
+        $this->fileHandler->clean();
+    }
+
+    public function testIncrement()
+    {
+        $this->fileHandler->save(self::$key1, 1);
+        $this->fileHandler->save(self::$key2, 'value');
+
+        $this->assertSame(11, $this->fileHandler->increment(self::$key1, 10));
+        $this->assertFalse($this->fileHandler->increment(self::$key2, 10));
+        $this->assertSame(10, $this->fileHandler->increment(self::$key3, 10));
+    }
+
+    public function testDecrement()
+    {
+        $this->fileHandler->save(self::$key1, 10);
+        $this->fileHandler->save(self::$key2, 'value');
+
+        // Line following commented out to force the cache to add a zero entry for key3
+        // $this->fileHandler->save(self::$key3, 0);
+
+        $this->assertSame(9, $this->fileHandler->decrement(self::$key1, 1));
+        $this->assertFalse($this->fileHandler->decrement(self::$key2, 1));
+        $this->assertSame(-1, $this->fileHandler->decrement(self::$key3, 1));
+    }
+
+    public function testClean()
+    {
+        $this->fileHandler->save(self::$key1, 1);
+        $this->fileHandler->save(self::$key2, 'value');
+
+        $this->assertTrue($this->fileHandler->clean());
+
+        $this->fileHandler->save(self::$key1, 1);
+        $this->fileHandler->save(self::$key2, 'value');
+    }
+
+    public function testGetMetaData()
+    {
+        $time = time();
+        $this->fileHandler->save(self::$key1, 'value');
+
+        $this->assertFalse($this->fileHandler->getMetaData(self::$dummy));
+
+        $actual = $this->fileHandler->getMetaData(self::$key1);
+        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
+        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
+        $this->assertSame('value', $actual['data']);
+    }
+
+    public function testGetCacheInfo()
+    {
+        $this->fileHandler->save(self::$key1, 'value');
+
+        $actual = $this->fileHandler->getCacheInfo();
+        $this->assertArrayHasKey(self::$key1, $actual);
+        $this->assertSame(self::$key1, $actual[self::$key1]['name']);
+        $this->assertArrayHasKey('server_path', $actual[self::$key1]);
+    }
+
+    public function testIsSupported()
+    {
+        $this->assertTrue($this->fileHandler->isSupported());
+    }
+
+    /**
+     * @dataProvider modeProvider
+     *
+     * @param mixed $int
+     * @param mixed $string
+     */
+    public function testSaveMode($int, $string)
+    {
+        // Initialize mode
+        $config               = new Cache();
+        $config->file['mode'] = $int;
+
+        $this->fileHandler = new FileHandler($config);
+        $this->fileHandler->initialize();
+
+        $this->fileHandler->save(self::$key1, 'value');
+
+        $file = $config->file['storePath'] . DIRECTORY_SEPARATOR . self::$key1;
+        $mode = octal_permissions(fileperms($file));
+
+        $this->assertSame($string, $mode);
+    }
+
+    public function modeProvider()
+    {
+        return [
+            [
+                0640,
+                '640',
+            ],
+            [
+                0600,
+                '600',
+            ],
+            [
+                0660,
+                '660',
+            ],
+            [
+                0777,
+                '777',
+            ],
+        ];
+    }
+
+    public function testFileHandler()
+    {
+        $fileHandler = new BaseTestFileHandler();
+
+        $actual = $fileHandler->getFileInfoTest();
+
+        $this->assertArrayHasKey('server_path', $actual);
+        $this->assertArrayHasKey('size', $actual);
+        $this->assertArrayHasKey('date', $actual);
+        $this->assertArrayHasKey('readable', $actual);
+        $this->assertArrayHasKey('writable', $actual);
+        $this->assertArrayHasKey('executable', $actual);
+        $this->assertArrayHasKey('fileperms', $actual);
+    }
 }
 
 final class BaseTestFileHandler extends FileHandler
 {
-	private static $directory = 'FileHandler';
-	private $config;
-
-	public function __construct()
-	{
-		$this->config                     = new Cache();
-		$this->config->file['storePath'] .= self::$directory;
-
-		parent::__construct($this->config);
-	}
-
-	public function getFileInfoTest()
-	{
-		$tmpHandle = tmpfile();
-		stream_get_meta_data($tmpHandle)['uri'];
-
-		return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
-			'name',
-			'server_path',
-			'size',
-			'date',
-			'readable',
-			'writable',
-			'executable',
-			'fileperms',
-		]);
-	}
+    private static $directory = 'FileHandler';
+    private $config;
+
+    public function __construct()
+    {
+        $this->config = new Cache();
+        $this->config->file['storePath'] .= self::$directory;
+
+        parent::__construct($this->config);
+    }
+
+    public function getFileInfoTest()
+    {
+        $tmpHandle = tmpfile();
+        stream_get_meta_data($tmpHandle);
+
+        return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
+            'name',
+            'server_path',
+            'size',
+            'date',
+            'readable',
+            'writable',
+            'executable',
+            'fileperms',
+        ]);
+    }
 }
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 82232c3061ae..f83708bd8c98 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
@@ -7,173 +16,176 @@
 use Config\Cache;
 use Exception;
 
+/**
+ * @internal
+ */
 final class MemcachedHandlerTest extends CIUnitTestCase
 {
-	private $memcachedHandler;
-	private static $key1 = 'key1';
-	private static $key2 = 'key2';
-	private static $key3 = 'key3';
-	private static function getKeyArray()
-	{
-		return [
-			self::$key1,
-			self::$key2,
-			self::$key3,
-		];
-	}
-
-	private static $dummy = 'dymmy';
-	private $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->config = new Cache();
-
-		$this->memcachedHandler = new MemcachedHandler($this->config);
-
-		$this->memcachedHandler->initialize();
-	}
-
-	public function tearDown(): void
-	{
-		foreach (self::getKeyArray() as $key)
-		{
-			$this->memcachedHandler->delete($key);
-		}
-	}
-
-	public function testNew()
-	{
-		$this->assertInstanceOf(MemcachedHandler::class, $this->memcachedHandler);
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testGet()
-	{
-		$this->memcachedHandler->save(self::$key1, 'value', 2);
-
-		$this->assertSame('value', $this->memcachedHandler->get(self::$key1));
-		$this->assertNull($this->memcachedHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->memcachedHandler->get(self::$key1));
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testRemember()
-	{
-		$this->memcachedHandler->remember(self::$key1, 2, function () {
-			return 'value';
-		});
-
-		$this->assertSame('value', $this->memcachedHandler->get(self::$key1));
-		$this->assertNull($this->memcachedHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->memcachedHandler->get(self::$key1));
-	}
-
-	public function testSave()
-	{
-		$this->assertTrue($this->memcachedHandler->save(self::$key1, 'value'));
-	}
-
-	public function testDelete()
-	{
-		$this->memcachedHandler->save(self::$key1, 'value');
-
-		$this->assertTrue($this->memcachedHandler->delete(self::$key1));
-		$this->assertFalse($this->memcachedHandler->delete(self::$dummy));
-	}
-
-	public function testDeleteMatching()
-	{
-		// Not implemented for Memcached, should throw an exception
-		$this->expectException(Exception::class);
-
-		$this->memcachedHandler->deleteMatching('key*');
-	}
-
-	public function testIncrement()
-	{
-		$this->memcachedHandler->save(self::$key1, 1);
-
-		$this->assertFalse($this->memcachedHandler->increment(self::$key1, 10));
-
-		$config                   = new Cache();
-		$config->memcached['raw'] = true;
-		$memcachedHandler         = new MemcachedHandler($config);
-		$memcachedHandler->initialize();
-
-		$memcachedHandler->save(self::$key1, 1);
-		$memcachedHandler->save(self::$key2, 'value');
-
-		$this->assertSame(11, $memcachedHandler->increment(self::$key1, 10));
-		$this->assertFalse($memcachedHandler->increment(self::$key2, 10));
-		$this->assertSame(10, $memcachedHandler->increment(self::$key3, 10));
-	}
-
-	public function testDecrement()
-	{
-		$this->memcachedHandler->save(self::$key1, 10);
-
-		$this->assertFalse($this->memcachedHandler->decrement(self::$key1, 1));
-
-		$config                   = new Cache();
-		$config->memcached['raw'] = true;
-		$memcachedHandler         = new MemcachedHandler($config);
-		$memcachedHandler->initialize();
-
-		$memcachedHandler->save(self::$key1, 10);
-		$memcachedHandler->save(self::$key2, 'value');
-
-		$this->assertSame(9, $memcachedHandler->decrement(self::$key1, 1));
-		$this->assertFalse($memcachedHandler->decrement(self::$key2, 1));
-		$this->assertSame(1, $memcachedHandler->decrement(self::$key3, 1));
-	}
-
-	public function testClean()
-	{
-		$this->memcachedHandler->save(self::$key1, 1);
-		$this->memcachedHandler->save(self::$key2, 'value');
-
-		$this->assertTrue($this->memcachedHandler->clean());
-	}
-
-	public function testGetCacheInfo()
-	{
-		$this->memcachedHandler->save(self::$key1, 'value');
-
-		$this->assertIsArray($this->memcachedHandler->getCacheInfo());
-	}
-
-	public function testGetMetaData()
-	{
-		$time = time();
-		$this->memcachedHandler->save(self::$key1, 'value');
-
-		$this->assertFalse($this->memcachedHandler->getMetaData(self::$dummy));
-
-		$actual = $this->memcachedHandler->getMetaData(self::$key1);
-		$this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-		$this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-		$this->assertSame('value', $actual['data']);
-	}
-
-	public function testIsSupported()
-	{
-		$this->assertTrue($this->memcachedHandler->isSupported());
-	}
+    private $memcachedHandler;
+    private static $key1 = 'key1';
+    private static $key2 = 'key2';
+    private static $key3 = 'key3';
+
+    private static function getKeyArray()
+    {
+        return [
+            self::$key1,
+            self::$key2,
+            self::$key3,
+        ];
+    }
+
+    private static $dummy = 'dymmy';
+    private $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = new Cache();
+
+        $this->memcachedHandler = new MemcachedHandler($this->config);
+
+        $this->memcachedHandler->initialize();
+    }
+
+    protected function tearDown(): void
+    {
+        foreach (self::getKeyArray() as $key) {
+            $this->memcachedHandler->delete($key);
+        }
+    }
+
+    public function testNew()
+    {
+        $this->assertInstanceOf(MemcachedHandler::class, $this->memcachedHandler);
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testGet()
+    {
+        $this->memcachedHandler->save(self::$key1, 'value', 2);
+
+        $this->assertSame('value', $this->memcachedHandler->get(self::$key1));
+        $this->assertNull($this->memcachedHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->memcachedHandler->get(self::$key1));
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testRemember()
+    {
+        $this->memcachedHandler->remember(self::$key1, 2, static function () {
+            return 'value';
+        });
+
+        $this->assertSame('value', $this->memcachedHandler->get(self::$key1));
+        $this->assertNull($this->memcachedHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->memcachedHandler->get(self::$key1));
+    }
+
+    public function testSave()
+    {
+        $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value'));
+    }
+
+    public function testDelete()
+    {
+        $this->memcachedHandler->save(self::$key1, 'value');
+
+        $this->assertTrue($this->memcachedHandler->delete(self::$key1));
+        $this->assertFalse($this->memcachedHandler->delete(self::$dummy));
+    }
+
+    public function testDeleteMatching()
+    {
+        // Not implemented for Memcached, should throw an exception
+        $this->expectException(Exception::class);
+
+        $this->memcachedHandler->deleteMatching('key*');
+    }
+
+    public function testIncrement()
+    {
+        $this->memcachedHandler->save(self::$key1, 1);
+
+        $this->assertFalse($this->memcachedHandler->increment(self::$key1, 10));
+
+        $config                   = new Cache();
+        $config->memcached['raw'] = true;
+        $memcachedHandler         = new MemcachedHandler($config);
+        $memcachedHandler->initialize();
+
+        $memcachedHandler->save(self::$key1, 1);
+        $memcachedHandler->save(self::$key2, 'value');
+
+        $this->assertSame(11, $memcachedHandler->increment(self::$key1, 10));
+        $this->assertFalse($memcachedHandler->increment(self::$key2, 10));
+        $this->assertSame(10, $memcachedHandler->increment(self::$key3, 10));
+    }
+
+    public function testDecrement()
+    {
+        $this->memcachedHandler->save(self::$key1, 10);
+
+        $this->assertFalse($this->memcachedHandler->decrement(self::$key1, 1));
+
+        $config                   = new Cache();
+        $config->memcached['raw'] = true;
+        $memcachedHandler         = new MemcachedHandler($config);
+        $memcachedHandler->initialize();
+
+        $memcachedHandler->save(self::$key1, 10);
+        $memcachedHandler->save(self::$key2, 'value');
+
+        $this->assertSame(9, $memcachedHandler->decrement(self::$key1, 1));
+        $this->assertFalse($memcachedHandler->decrement(self::$key2, 1));
+        $this->assertSame(1, $memcachedHandler->decrement(self::$key3, 1));
+    }
+
+    public function testClean()
+    {
+        $this->memcachedHandler->save(self::$key1, 1);
+        $this->memcachedHandler->save(self::$key2, 'value');
+
+        $this->assertTrue($this->memcachedHandler->clean());
+    }
+
+    public function testGetCacheInfo()
+    {
+        $this->memcachedHandler->save(self::$key1, 'value');
+
+        $this->assertIsArray($this->memcachedHandler->getCacheInfo());
+    }
+
+    public function testGetMetaData()
+    {
+        $time = time();
+        $this->memcachedHandler->save(self::$key1, 'value');
+
+        $this->assertFalse($this->memcachedHandler->getMetaData(self::$dummy));
+
+        $actual = $this->memcachedHandler->getMetaData(self::$key1);
+        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
+        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
+        $this->assertSame('value', $actual['data']);
+    }
+
+    public function testIsSupported()
+    {
+        $this->assertTrue($this->memcachedHandler->isSupported());
+    }
 }
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 23e294ddb18a..df6dfdbfbaef 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -1,179 +1,188 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class PredisHandlerTest extends CIUnitTestCase
 {
-	private $PredisHandler;
-	private static $key1 = 'key1';
-	private static $key2 = 'key2';
-	private static $key3 = 'key3';
-
-	private static function getKeyArray()
-	{
-		return [
-			self::$key1,
-			self::$key2,
-			self::$key3,
-		];
-	}
-
-	private static $dummy = 'dymmy';
-	private $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->config = new Cache();
-
-		$this->PredisHandler = new PredisHandler($this->config);
-
-		$this->PredisHandler->initialize();
-	}
-
-	public function tearDown(): void
-	{
-		foreach (self::getKeyArray() as $key)
-		{
-			$this->PredisHandler->delete($key);
-		}
-	}
-
-	public function testNew()
-	{
-		$this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
-	}
-
-	public function testDestruct()
-	{
-		$this->PredisHandler = new PRedisHandler($this->config);
-		$this->PredisHandler->initialize();
-
-		$this->assertInstanceOf(PRedisHandler::class, $this->PredisHandler);
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testGet()
-	{
-		$this->PredisHandler->save(self::$key1, 'value', 2);
-
-		$this->assertSame('value', $this->PredisHandler->get(self::$key1));
-		$this->assertNull($this->PredisHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->PredisHandler->get(self::$key1));
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testRemember()
-	{
-		$this->PredisHandler->remember(self::$key1, 2, function () {
-			return 'value';
-		});
-
-		$this->assertSame('value', $this->PredisHandler->get(self::$key1));
-		$this->assertNull($this->PredisHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->PredisHandler->get(self::$key1));
-	}
-
-	public function testSave()
-	{
-		$this->assertTrue($this->PredisHandler->save(self::$key1, 'value'));
-	}
-
-	public function testDelete()
-	{
-		$this->PredisHandler->save(self::$key1, 'value');
-
-		$this->assertTrue($this->PredisHandler->delete(self::$key1));
-		$this->assertFalse($this->PredisHandler->delete(self::$dummy));
-	}
-
-	public function testDeleteMatchingPrefix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->PredisHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
-
-		// Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
-		// (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-		$this->assertSame(13, $this->PredisHandler->deleteMatching('key_1*'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$this->assertSame('88', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
-	}
-
-	public function testDeleteMatchingSuffix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->PredisHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
-
-		// Checking that given the suffix "1", deleteMatching deletes 11 keys:
-		// (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-		$this->assertSame(11, $this->PredisHandler->deleteMatching('*1'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$this->assertSame('90', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
-	}
-
-	public function testClean()
-	{
-		$this->PredisHandler->save(self::$key1, 1);
-		$this->PredisHandler->save(self::$key2, 'value');
-
-		$this->assertTrue($this->PredisHandler->clean());
-	}
-
-	public function testGetCacheInfo()
-	{
-		$this->PredisHandler->save(self::$key1, 'value');
-
-		$this->assertIsArray($this->PredisHandler->getCacheInfo());
-	}
-
-	public function testGetMetaData()
-	{
-		$time = time();
-		$this->PredisHandler->save(self::$key1, 'value');
-
-		$this->assertNull($this->PredisHandler->getMetaData(self::$dummy));
-
-		$actual = $this->PredisHandler->getMetaData(self::$key1);
-		$this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-		$this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-		$this->assertSame('value', $actual['data']);
-	}
-
-	public function testIsSupported()
-	{
-		$this->assertTrue($this->PredisHandler->isSupported());
-	}
+    private $PredisHandler;
+    private static $key1 = 'key1';
+    private static $key2 = 'key2';
+    private static $key3 = 'key3';
+
+    private static function getKeyArray()
+    {
+        return [
+            self::$key1,
+            self::$key2,
+            self::$key3,
+        ];
+    }
+
+    private static $dummy = 'dymmy';
+    private $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = new Cache();
+
+        $this->PredisHandler = new PredisHandler($this->config);
+
+        $this->PredisHandler->initialize();
+    }
+
+    protected function tearDown(): void
+    {
+        foreach (self::getKeyArray() as $key) {
+            $this->PredisHandler->delete($key);
+        }
+    }
+
+    public function testNew()
+    {
+        $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
+    }
+
+    public function testDestruct()
+    {
+        $this->PredisHandler = new PredisHandler($this->config);
+        $this->PredisHandler->initialize();
+
+        $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testGet()
+    {
+        $this->PredisHandler->save(self::$key1, 'value', 2);
+
+        $this->assertSame('value', $this->PredisHandler->get(self::$key1));
+        $this->assertNull($this->PredisHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->PredisHandler->get(self::$key1));
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testRemember()
+    {
+        $this->PredisHandler->remember(self::$key1, 2, static function () {
+            return 'value';
+        });
+
+        $this->assertSame('value', $this->PredisHandler->get(self::$key1));
+        $this->assertNull($this->PredisHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->PredisHandler->get(self::$key1));
+    }
+
+    public function testSave()
+    {
+        $this->assertTrue($this->PredisHandler->save(self::$key1, 'value'));
+    }
+
+    public function testDelete()
+    {
+        $this->PredisHandler->save(self::$key1, 'value');
+
+        $this->assertTrue($this->PredisHandler->delete(self::$key1));
+        $this->assertFalse($this->PredisHandler->delete(self::$dummy));
+    }
+
+    public function testDeleteMatchingPrefix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->PredisHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+
+        // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
+        // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
+        $this->assertSame(13, $this->PredisHandler->deleteMatching('key_1*'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $this->assertSame('88', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+    }
+
+    public function testDeleteMatchingSuffix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->PredisHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+
+        // Checking that given the suffix "1", deleteMatching deletes 11 keys:
+        // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
+        $this->assertSame(11, $this->PredisHandler->deleteMatching('*1'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $this->assertSame('90', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+    }
+
+    public function testClean()
+    {
+        $this->PredisHandler->save(self::$key1, 1);
+        $this->PredisHandler->save(self::$key2, 'value');
+
+        $this->assertTrue($this->PredisHandler->clean());
+    }
+
+    public function testGetCacheInfo()
+    {
+        $this->PredisHandler->save(self::$key1, 'value');
+
+        $this->assertIsArray($this->PredisHandler->getCacheInfo());
+    }
+
+    public function testGetMetaData()
+    {
+        $time = time();
+        $this->PredisHandler->save(self::$key1, 'value');
+
+        $this->assertNull($this->PredisHandler->getMetaData(self::$dummy));
+
+        $actual = $this->PredisHandler->getMetaData(self::$key1);
+        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
+        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
+        $this->assertSame('value', $actual['data']);
+    }
+
+    public function testIsSupported()
+    {
+        $this->assertTrue($this->PredisHandler->isSupported());
+    }
 }
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 36cab2d0c0d4..66f3c7fd2244 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -1,191 +1,200 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class RedisHandlerTest extends CIUnitTestCase
 {
-	private $redisHandler;
-	private static $key1 = 'key1';
-	private static $key2 = 'key2';
-	private static $key3 = 'key3';
-
-	private static function getKeyArray()
-	{
-		return [
-			self::$key1,
-			self::$key2,
-			self::$key3,
-		];
-	}
-
-	private static $dummy = 'dymmy';
-	private $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->config = new Cache();
-
-		$this->redisHandler = new RedisHandler($this->config);
-
-		$this->redisHandler->initialize();
-	}
-
-	public function tearDown(): void
-	{
-		foreach (self::getKeyArray() as $key)
-		{
-			$this->redisHandler->delete($key);
-		}
-	}
-
-	public function testNew()
-	{
-		$this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
-	}
-
-	public function testDestruct()
-	{
-		$this->redisHandler = new RedisHandler($this->config);
-		$this->redisHandler->initialize();
-
-		$this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testGet()
-	{
-		$this->redisHandler->save(self::$key1, 'value', 2);
-
-		$this->assertSame('value', $this->redisHandler->get(self::$key1));
-		$this->assertNull($this->redisHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->redisHandler->get(self::$key1));
-	}
-
-	/**
-	 * This test waits for 3 seconds before last assertion so this
-	 * is naturally a "slow" test on the perspective of the default limit.
-	 *
-	 * @timeLimit 3.5
-	 */
-	public function testRemember()
-	{
-		$this->redisHandler->remember(self::$key1, 2, function () {
-			return 'value';
-		});
-
-		$this->assertSame('value', $this->redisHandler->get(self::$key1));
-		$this->assertNull($this->redisHandler->get(self::$dummy));
-
-		CLI::wait(3);
-		$this->assertNull($this->redisHandler->get(self::$key1));
-	}
-
-	public function testSave()
-	{
-		$this->assertTrue($this->redisHandler->save(self::$key1, 'value'));
-	}
-
-	public function testDelete()
-	{
-		$this->redisHandler->save(self::$key1, 'value');
-
-		$this->assertTrue($this->redisHandler->delete(self::$key1));
-		$this->assertFalse($this->redisHandler->delete(self::$dummy));
-	}
-
-	public function testDeleteMatchingPrefix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->redisHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
-		$this->assertSame('keys=101', $dbInfo[0]);
-
-		// Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
-		// (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-		$this->assertSame(13, $this->redisHandler->deleteMatching('key_1*'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
-		$this->assertSame('keys=88', $dbInfo[0]);
-	}
-
-	public function testDeleteMatchingSuffix()
-	{
-		// Save 101 items to match on
-		for ($i = 1; $i <= 101; $i++)
-		{
-			$this->redisHandler->save('key_' . $i, 'value' . $i);
-		}
-
-		// check that there are 101 items is cache store
-		$dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
-		$this->assertSame('keys=101', $dbInfo[0]);
-
-		// Checking that given the suffix "1", deleteMatching deletes 11 keys:
-		// (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-		$this->assertSame(11, $this->redisHandler->deleteMatching('*1'));
-
-		// check that there remains (101 - 13) = 88 items is cache store
-		$dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
-		$this->assertSame('keys=90', $dbInfo[0]);
-	}
-
-	//FIXME: I don't like all Hash logic very much. It's wasting memory.
-	//public function testIncrement()
-	//{
-	//}
-
-	//public function testDecrement()
-	//{
-	//}
-
-	public function testClean()
-	{
-		$this->redisHandler->save(self::$key1, 1);
-
-		$this->assertTrue($this->redisHandler->clean());
-	}
-
-	public function testGetCacheInfo()
-	{
-		$this->redisHandler->save(self::$key1, 'value');
-
-		$this->assertIsArray($this->redisHandler->getCacheInfo());
-	}
-
-	public function testGetMetaData()
-	{
-		$time = time();
-		$this->redisHandler->save(self::$key1, 'value');
-
-		$this->assertNull($this->redisHandler->getMetaData(self::$dummy));
-
-		$actual = $this->redisHandler->getMetaData(self::$key1);
-		$this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-		$this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-		$this->assertSame('value', $actual['data']);
-	}
-
-	public function testIsSupported()
-	{
-		$this->assertTrue($this->redisHandler->isSupported());
-	}
+    private $redisHandler;
+    private static $key1 = 'key1';
+    private static $key2 = 'key2';
+    private static $key3 = 'key3';
+
+    private static function getKeyArray()
+    {
+        return [
+            self::$key1,
+            self::$key2,
+            self::$key3,
+        ];
+    }
+
+    private static $dummy = 'dymmy';
+    private $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = new Cache();
+
+        $this->redisHandler = new RedisHandler($this->config);
+
+        $this->redisHandler->initialize();
+    }
+
+    protected function tearDown(): void
+    {
+        foreach (self::getKeyArray() as $key) {
+            $this->redisHandler->delete($key);
+        }
+    }
+
+    public function testNew()
+    {
+        $this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
+    }
+
+    public function testDestruct()
+    {
+        $this->redisHandler = new RedisHandler($this->config);
+        $this->redisHandler->initialize();
+
+        $this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testGet()
+    {
+        $this->redisHandler->save(self::$key1, 'value', 2);
+
+        $this->assertSame('value', $this->redisHandler->get(self::$key1));
+        $this->assertNull($this->redisHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->redisHandler->get(self::$key1));
+    }
+
+    /**
+     * This test waits for 3 seconds before last assertion so this
+     * is naturally a "slow" test on the perspective of the default limit.
+     *
+     * @timeLimit 3.5
+     */
+    public function testRemember()
+    {
+        $this->redisHandler->remember(self::$key1, 2, static function () {
+            return 'value';
+        });
+
+        $this->assertSame('value', $this->redisHandler->get(self::$key1));
+        $this->assertNull($this->redisHandler->get(self::$dummy));
+
+        CLI::wait(3);
+        $this->assertNull($this->redisHandler->get(self::$key1));
+    }
+
+    public function testSave()
+    {
+        $this->assertTrue($this->redisHandler->save(self::$key1, 'value'));
+    }
+
+    public function testDelete()
+    {
+        $this->redisHandler->save(self::$key1, 'value');
+
+        $this->assertTrue($this->redisHandler->delete(self::$key1));
+        $this->assertFalse($this->redisHandler->delete(self::$dummy));
+    }
+
+    public function testDeleteMatchingPrefix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->redisHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $this->assertSame('keys=101', $dbInfo[0]);
+
+        // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
+        // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
+        $this->assertSame(13, $this->redisHandler->deleteMatching('key_1*'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $this->assertSame('keys=88', $dbInfo[0]);
+    }
+
+    public function testDeleteMatchingSuffix()
+    {
+        // Save 101 items to match on
+        for ($i = 1; $i <= 101; $i++) {
+            $this->redisHandler->save('key_' . $i, 'value' . $i);
+        }
+
+        // check that there are 101 items is cache store
+        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $this->assertSame('keys=101', $dbInfo[0]);
+
+        // Checking that given the suffix "1", deleteMatching deletes 11 keys:
+        // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
+        $this->assertSame(11, $this->redisHandler->deleteMatching('*1'));
+
+        // check that there remains (101 - 13) = 88 items is cache store
+        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $this->assertSame('keys=90', $dbInfo[0]);
+    }
+
+    // FIXME: I don't like all Hash logic very much. It's wasting memory.
+    // public function testIncrement()
+    // {
+    // }
+
+    // public function testDecrement()
+    // {
+    // }
+
+    public function testClean()
+    {
+        $this->redisHandler->save(self::$key1, 1);
+
+        $this->assertTrue($this->redisHandler->clean());
+    }
+
+    public function testGetCacheInfo()
+    {
+        $this->redisHandler->save(self::$key1, 'value');
+
+        $this->assertIsArray($this->redisHandler->getCacheInfo());
+    }
+
+    public function testGetMetaData()
+    {
+        $time = time();
+        $this->redisHandler->save(self::$key1, 'value');
+
+        $this->assertNull($this->redisHandler->getMetaData(self::$dummy));
+
+        $actual = $this->redisHandler->getMetaData(self::$key1);
+        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
+        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
+        $this->assertSame('value', $actual['data']);
+    }
+
+    public function testIsSupported()
+    {
+        $this->assertTrue($this->redisHandler->isSupported());
+    }
 }
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index fbf67904d276..af0488f3c7f5 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -1,6 +1,17 @@
-<?php namespace CodeIgniter;
+<?php
 
-use \CodeIgniter\Config\Services;
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
@@ -9,427 +20,368 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CodeIgniterTest extends CIUnitTestCase
+final class CodeIgniterTest extends CIUnitTestCase
 {
-	/**
-	 * @var CodeIgniter
-	 */
-	protected $codeigniter;
-
-	protected $routes;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset();
-
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-
-		$config            = new App();
-		$this->codeigniter = new MockCodeIgniter($config);
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		if (count( ob_list_handlers() ) > 1)
-		{
-			ob_end_clean();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunEmptyDefaultRoute()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-		];
-		$_SERVER['argc'] = 1;
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('Welcome to CodeIgniter', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunClosureRoute()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'pages/about',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/pages/about';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->add('pages/(:segment)', function ($segment) {
-			echo 'You want to see "' . esc($segment) . '" page.';
-		});
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('You want to see "about" page.', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRun404Override()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->setAutoRoute(false);
-		$routes->set404Override('Home::index');
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('Welcome to CodeIgniter', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRun404OverrideByClosure()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		// Inject mock router.
-		$routes = new RouteCollection(Services::locator(), new Modules());
-		$routes->setAutoRoute(false);
-		$routes->set404Override(function () {
-			echo '404 Override by Closure.';
-		});
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('404 Override by Closure.', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testControllersCanReturnString()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'pages/about',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/pages/about';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->add('pages/(:segment)', function ($segment) {
-			return 'You want to see "' . esc($segment) . '" page.';
-		});
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('You want to see "about" page.', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testControllersCanReturnResponseObject()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'pages/about',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/pages/about';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->add('pages/(:segment)', function ($segment) {
-			$response = Services::response();
-			$string   = "You want to see 'about' page.";
-			return $response->setBody($string);
-		});
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString("You want to see 'about' page.", $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResponseConfigEmpty()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		$response = Services::response(null, false);
-
-		$this->assertInstanceOf('\CodeIgniter\HTTP\Response', $response);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRoutesIsEmpty()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		// Inject mock router.
-		$router = Services::router(null, Services::request(), false);
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('Welcome to CodeIgniter', $output);
-	}
-
-	public function testTransfersCorrectHTTPVersion()
-	{
-		$_SERVER['argv']            = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc']            = 2;
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/2.0';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-
-		$this->assertEquals(2, $response->getProtocolVersion());
-	}
-
-	public function testIgnoringErrorSuppressedByAt()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		ob_start();
-		@unlink('inexistent-file');
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('Welcome to CodeIgniter', $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunForceSecure()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		$config                            = new App();
-		$config->forceGlobalSecureRequests = true;
-		$codeigniter                       = new MockCodeIgniter($config);
-
-		$this->getPrivateMethodInvoker($codeigniter, 'getRequestObject')();
-		$this->getPrivateMethodInvoker($codeigniter, 'getResponseObject')();
-
-		$response = $this->getPrivateProperty($codeigniter, 'response');
-		$this->assertNull($response->header('Location'));
-
-		ob_start();
-		$codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertEquals('https://example.com/', $response->header('Location')->getValue());
-	}
-
-	public function testRunRedirectionWithNamed()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'example',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/example';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->add('pages/named', function () {
-		}, ['as' => 'name']);
-		$routes->addRedirect('example', 'name');
-
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		ob_get_clean();
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-		$this->assertEquals('http://example.com/pages/named', $response->header('Location')->getValue());
-	}
-
-	public function testRunRedirectionWithURI()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'example',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/example';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->add('pages/uri', function () {
-		});
-		$routes->addRedirect('example', 'pages/uri');
-
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		ob_get_clean();
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-		$this->assertEquals('http://example.com/pages/uri', $response->header('Location')->getValue());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3041
-	 */
-	public function testRunRedirectionWithURINotSet()
-	{
-		$_SERVER['argv']        = [
-			'index.php',
-			'example',
-		];
-		$_SERVER['argc']        = 2;
-		$_SERVER['REQUEST_URI'] = '/example';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->addRedirect('example', 'pages/notset');
-
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		ob_get_clean();
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-		$this->assertEquals('http://example.com/pages/notset', $response->header('Location')->getValue());
-	}
-
-	public function testRunRedirectionWithHTTPCode303()
-	{
-		$_SERVER['argv']            = [
-			'index.php',
-			'example',
-		];
-		$_SERVER['argc']            = 2;
-		$_SERVER['REQUEST_URI']     = '/example';
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-		$_SERVER['REQUEST_METHOD']  = 'POST';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->addRedirect('example', 'pages/notset', 301);
-
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		ob_get_clean();
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-		$this->assertEquals('303', $response->getStatusCode());
-	}
-
-	public function testRunRedirectionWithHTTPCode301()
-	{
-		$_SERVER['argv']            = [
-			'index.php',
-			'example',
-		];
-		$_SERVER['argc']            = 2;
-		$_SERVER['REQUEST_URI']     = '/example';
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-		$_SERVER['REQUEST_METHOD']  = 'GET';
-
-		// Inject mock router.
-		$routes = Services::routes();
-		$routes->addRedirect('example', 'pages/notset', 301);
-
-		$router = Services::router($routes, Services::request());
-		Services::injectMock('router', $router);
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		ob_get_clean();
-		$response = $this->getPrivateProperty($this->codeigniter, 'response');
-		$this->assertEquals('301', $response->getStatusCode());
-	}
-
-	/**
-	 * The method after all test, reset Servces:: config
-	 * Can't use static::tearDownAfterClass. This will cause a buffer exception
-	 * need improve
-	 */
-	public function testRunDefaultRoute()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'/',
-		];
-		$_SERVER['argc'] = 2;
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run();
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString('Welcome to CodeIgniter', $output);
-	}
+    /**
+     * @var CodeIgniter
+     */
+    protected $codeigniter;
+
+    protected $routes;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Services::reset();
+
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+
+        $this->codeigniter = new MockCodeIgniter(new App());
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (count(ob_list_handlers()) > 1) {
+            ob_end_clean();
+        }
+    }
+
+    public function testRunEmptyDefaultRoute()
+    {
+        $_SERVER['argv'] = ['index.php'];
+        $_SERVER['argc'] = 1;
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+    }
+
+    public function testRunClosureRoute()
+    {
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/pages/about';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/(:segment)', static function ($segment) {
+            echo 'You want to see "' . esc($segment) . '" page.';
+        });
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('You want to see "about" page.', $output);
+    }
+
+    public function testRun404Override()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->setAutoRoute(false);
+        $routes->set404Override('Home::index');
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+    }
+
+    public function testRun404OverrideByClosure()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $routes = new RouteCollection(Services::locator(), new Modules());
+        $routes->setAutoRoute(false);
+        $routes->set404Override(static function () {
+            echo '404 Override by Closure.';
+        });
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('404 Override by Closure.', $output);
+    }
+
+    public function testControllersCanReturnString()
+    {
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/pages/about';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/(:segment)', static function ($segment) {
+            return 'You want to see "' . esc($segment) . '" page.';
+        });
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('You want to see "about" page.', $output);
+    }
+
+    public function testControllersCanReturnResponseObject()
+    {
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/pages/about';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/(:segment)', static function ($segment) {
+            $response = Services::response();
+            $string = "You want to see 'about' page.";
+
+            return $response->setBody($string);
+        });
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString("You want to see 'about' page.", $output);
+    }
+
+    public function testResponseConfigEmpty()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        $response = Services::response(null, false);
+
+        $this->assertInstanceOf('\CodeIgniter\HTTP\Response', $response);
+    }
+
+    public function testRoutesIsEmpty()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $router = Services::router(null, Services::request(), false);
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+    }
+
+    public function testTransfersCorrectHTTPVersion()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/2.0';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+
+        $this->assertSame('2.0', $response->getProtocolVersion());
+    }
+
+    public function testIgnoringErrorSuppressedByAt()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        ob_start();
+        @unlink('inexistent-file');
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+    }
+
+    public function testRunForceSecure()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        $config = new App();
+
+        $config->forceGlobalSecureRequests = true;
+
+        $codeigniter = new MockCodeIgniter($config);
+
+        $this->getPrivateMethodInvoker($codeigniter, 'getRequestObject')();
+        $this->getPrivateMethodInvoker($codeigniter, 'getResponseObject')();
+
+        $response = $this->getPrivateProperty($codeigniter, 'response');
+        $this->assertNull($response->header('Location'));
+
+        ob_start();
+        $codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $this->assertSame('https://example.com/', $response->header('Location')->getValue());
+    }
+
+    public function testRunRedirectionWithNamed()
+    {
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/example';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/named', static function () {
+        }, ['as' => 'name']);
+        $routes->addRedirect('example', 'name');
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
 
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+        $this->assertSame('http://example.com/pages/named', $response->header('Location')->getValue());
+    }
+
+    public function testRunRedirectionWithURI()
+    {
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/example';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/uri', static function () {
+        });
+        $routes->addRedirect('example', 'pages/uri');
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+        $this->assertSame('http://example.com/pages/uri', $response->header('Location')->getValue());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3041
+     */
+    public function testRunRedirectionWithURINotSet()
+    {
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/example';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->addRedirect('example', 'pages/notset');
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+        $this->assertSame('http://example.com/pages/notset', $response->header('Location')->getValue());
+    }
+
+    public function testRunRedirectionWithHTTPCode303()
+    {
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']     = '/example';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'POST';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->addRedirect('example', 'pages/notset', 301);
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+        $this->assertSame(303, $response->getStatusCode());
+    }
+
+    public function testRunRedirectionWithHTTPCode301()
+    {
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']     = '/example';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'GET';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->addRedirect('example', 'pages/notset', 301);
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+        $response = $this->getPrivateProperty($this->codeigniter, 'response');
+        $this->assertSame(301, $response->getStatusCode());
+    }
+
+    /**
+     * The method after all test, reset Servces:: config
+     * Can't use static::tearDownAfterClass. This will cause a buffer exception
+     * need improve
+     */
+    public function testRunDefaultRoute()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+    }
 }
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index d23bf518f930..7295c05e4d0c 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\CLI\CommandRunner;
@@ -6,43 +16,46 @@
 use Config\Services;
 use Tests\Support\Commands\AppInfo;
 
-class BaseCommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseCommandTest extends CIUnitTestCase
 {
-	protected $logger;
-	protected $runner;
+    protected $logger;
+    protected $runner;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->logger = Services::logger();
-		$this->runner = new CommandRunner();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->logger = Services::logger();
+        $this->runner = new CommandRunner();
+    }
 
-	public function testMagicIssetTrue()
-	{
-		$command = new AppInfo($this->logger, service('commands'));
+    public function testMagicIssetTrue()
+    {
+        $command = new AppInfo($this->logger, service('commands'));
 
-		$this->assertTrue(isset($command->group));
-	}
+        $this->assertTrue(isset($command->group));
+    }
 
-	public function testMagicIssetFalse()
-	{
-		$command = new AppInfo($this->logger, service('commands'));
+    public function testMagicIssetFalse()
+    {
+        $command = new AppInfo($this->logger, service('commands'));
 
-		$this->assertFalse(isset($command->foobar));
-	}
+        $this->assertFalse(isset($command->foobar));
+    }
 
-	public function testMagicGet()
-	{
-		$command = new AppInfo($this->logger, service('commands'));
+    public function testMagicGet()
+    {
+        $command = new AppInfo($this->logger, service('commands'));
 
-		$this->assertEquals('demo', $command->group);
-	}
+        $this->assertSame('demo', $command->group);
+    }
 
-	public function testMagicGetMissing()
-	{
-		$command = new AppInfo($this->logger, service('commands'));
+    public function testMagicGetMissing()
+    {
+        $command = new AppInfo($this->logger, service('commands'));
 
-		$this->assertNull($command->foobar);
-	}
+        $this->assertNull($command->foobar);
+    }
 }
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 0c34eb45acd6..2a48a3742f5f 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -1,46 +1,60 @@
-<?php namespace CodeIgniter\Commands;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands;
 
 use CodeIgniter\Cache\CacheFactory;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
-class ClearCacheTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearCacheTest extends CIUnitTestCase
 {
-	protected $streamFilter;
+    protected $streamFilter;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
 
-		// Make sure we are testing with the correct handler (override injections)
-		Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
-	}
+        // Make sure we are testing with the correct handler (override injections)
+        Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
+    }
 
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
 
-	public function testClearCacheInvalidHandler()
-	{
-		command('cache:clear junk');
+    public function testClearCacheInvalidHandler()
+    {
+        command('cache:clear junk');
 
-		$this->assertStringContainsString('junk is not a valid cache handler.', CITestStreamFilter::$buffer);
-	}
+        $this->assertStringContainsString('junk is not a valid cache handler.', CITestStreamFilter::$buffer);
+    }
 
-	public function testClearCacheWorks()
-	{
-		cache()->save('foo', 'bar');
-		$this->assertEquals('bar', cache('foo'));
+    public function testClearCacheWorks()
+    {
+        cache()->save('foo', 'bar');
+        $this->assertSame('bar', cache('foo'));
 
-		command('cache:clear');
+        command('cache:clear');
 
-		$this->assertNull(cache('foo'));
-		$this->assertStringContainsString('Cache cleared.', CITestStreamFilter::$buffer);
-	}
+        $this->assertNull(cache('foo'));
+        $this->assertStringContainsString('Cache cleared.', CITestStreamFilter::$buffer);
+    }
 }
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
index 588634f3b4b9..0d9957dde7e5 100644
--- a/tests/system/Commands/ClearDebugbarTest.php
+++ b/tests/system/Commands/ClearDebugbarTest.php
@@ -1,59 +1,70 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ClearDebugbarTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearDebugbarTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-	protected $time;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-		$this->time                 = time();
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	protected function createDummyDebugbarJson()
-	{
-		$time = $this->time;
-		$path = WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$time}.json";
-
-		// create 10 dummy debugbar json files
-		for ($i = 0; $i < 10; $i++)
-		{
-			$path = str_replace($time, $time - $i, $path);
-			file_put_contents($path, "{}\n");
-
-			$time -= $i;
-		}
-	}
-
-	public function testClearDebugbarWorks()
-	{
-		// test clean debugbar dir
-		$this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
-
-		// test dir is now populated with json
-		$this->createDummyDebugbarJson();
-		$this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
-
-		command('debugbar:clear');
-		$result = CITestStreamFilter::$buffer;
-
-		$this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
-		$this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . '.gitkeep');
-		$this->assertStringContainsString('Debugbar cleared.', $result);
-	}
+    protected $streamFilter;
+    protected $time;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+        $this->time                 = time();
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    protected function createDummyDebugbarJson()
+    {
+        $time = $this->time;
+        $path = WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$time}.json";
+
+        // create 10 dummy debugbar json files
+        for ($i = 0; $i < 10; $i++) {
+            $path = str_replace($time, $time - $i, $path);
+            file_put_contents($path, "{}\n");
+
+            $time -= $i;
+        }
+    }
+
+    public function testClearDebugbarWorks()
+    {
+        // test clean debugbar dir
+        $this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
+
+        // test dir is now populated with json
+        $this->createDummyDebugbarJson();
+        $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
+
+        command('debugbar:clear');
+        $result = CITestStreamFilter::$buffer;
+
+        $this->assertFileDoesNotExist(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$this->time}.json");
+        $this->assertFileExists(WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . '.gitkeep');
+        $this->assertStringContainsString('Debugbar cleared.', $result);
+    }
 }
diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php
index 302a3eef2038..2297fdccb284 100644
--- a/tests/system/Commands/ClearLogsTest.php
+++ b/tests/system/Commands/ClearLogsTest.php
@@ -1,63 +1,74 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ClearLogsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearLogsTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-	protected $date;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		// test runs on other tests may log errors since default threshold
-		// is now 4, so set this to a safe distance
-		$this->date = date('Y-m-d', strtotime('+1 year'));
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	protected function createDummyLogFiles()
-	{
-		$date = $this->date;
-		$path = WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$date}.log";
-
-		// create 10 dummy log files
-		for ($i = 0; $i < 10; $i++)
-		{
-			$newDate = date('Y-m-d', strtotime("+1 year -{$i} day"));
-			$path    = str_replace($date, $newDate, $path);
-			file_put_contents($path, 'Lorem ipsum');
-
-			$date = $newDate;
-		}
-	}
-
-	public function testClearLogsWorks()
-	{
-		// test clean logs dir
-		$this->assertFileDoesNotExist(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
-
-		// test dir is now populated with logs
-		$this->createDummyLogFiles();
-		$this->assertFileExists(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
-
-		command('logs:clear -force');
-		$result = CITestStreamFilter::$buffer;
-
-		$this->assertFileDoesNotExist(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
-		$this->assertFileExists(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . 'index.html');
-		$this->assertStringContainsString('Logs cleared.', $result);
-	}
+    protected $streamFilter;
+    protected $date;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        // test runs on other tests may log errors since default threshold
+        // is now 4, so set this to a safe distance
+        $this->date = date('Y-m-d', strtotime('+1 year'));
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    protected function createDummyLogFiles()
+    {
+        $date = $this->date;
+        $path = WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$date}.log";
+
+        // create 10 dummy log files
+        for ($i = 0; $i < 10; $i++) {
+            $newDate = date('Y-m-d', strtotime("+1 year -{$i} day"));
+            $path    = str_replace($date, $newDate, $path);
+            file_put_contents($path, 'Lorem ipsum');
+
+            $date = $newDate;
+        }
+    }
+
+    public function testClearLogsWorks()
+    {
+        // test clean logs dir
+        $this->assertFileDoesNotExist(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
+
+        // test dir is now populated with logs
+        $this->createDummyLogFiles();
+        $this->assertFileExists(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
+
+        command('logs:clear -force');
+        $result = CITestStreamFilter::$buffer;
+
+        $this->assertFileDoesNotExist(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . "log-{$this->date}.log");
+        $this->assertFileExists(WRITEPATH . 'logs' . DIRECTORY_SEPARATOR . 'index.html');
+        $this->assertStringContainsString('Logs cleared.', $result);
+    }
 }
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 586270b85b55..abe3ce4c7e6e 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -10,114 +19,117 @@
  */
 final class CommandGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		$dir    = dirname($file);
-
-		is_file($file) && unlink($file);
-		is_dir($dir) && strpos($dir, 'Commands') !== false && rmdir($dir);
-	}
-
-	protected function getFileContents(string $filepath): string
-	{
-		if (! file_exists($filepath))
-		{
-			return '';
-		}
-
-		return file_get_contents($filepath) ?: '';
-	}
-
-	public function testGenerateCommand()
-	{
-		command('make:command deliver');
-		$file = APPPATH . 'Commands/Deliver.php';
-		$this->assertFileExists($file);
-		$contents = $this->getFileContents($file);
-		$this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
-		$this->assertStringContainsString('protected $name = \'command:name\';', $contents);
-	}
-
-	public function testGenerateCommandWithOptionCommand()
-	{
-		command('make:command deliver -command clear:sessions');
-		$file = APPPATH . 'Commands/Deliver.php';
-		$this->assertFileExists($file);
-		$contents = $this->getFileContents($file);
-		$this->assertStringContainsString('protected $name = \'clear:sessions\';', $contents);
-		$this->assertStringContainsString('protected $usage = \'clear:sessions [arguments] [options]\';', $contents);
-	}
-
-	public function testGenerateCommandWithOptionTypeBasic()
-	{
-		command('make:command deliver -type basic');
-		$file = APPPATH . 'Commands/Deliver.php';
-		$this->assertFileExists($file);
-		$contents = $this->getFileContents($file);
-		$this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
-		$this->assertStringContainsString('protected $name = \'command:name\';', $contents);
-	}
-
-	public function testGenerateCommandWithOptionTypeGenerator()
-	{
-		command('make:command deliver -type generator');
-		$file = APPPATH . 'Commands/Deliver.php';
-		$this->assertFileExists($file);
-		$contents = $this->getFileContents($file);
-		$this->assertStringContainsString('protected $group = \'Generators\';', $contents);
-		$this->assertStringContainsString('protected $name = \'command:name\';', $contents);
-	}
-
-	public function testGenerateCommandWithOptionGroup()
-	{
-		command('make:command deliver -group Deliverables');
-		$file = APPPATH . 'Commands/Deliver.php';
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists($file);
-
-		$contents = $this->getFileContents($file);
-		$this->assertStringContainsString('protected $group = \'Deliverables\';', $contents);
-	}
-
-	public function testGenerateCommandWithOptionSuffix()
-	{
-		command('make:command publish -suffix');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Commands/PublishCommand.php';
-		$this->assertFileExists($file);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4495
-	 */
-	public function testGeneratorPreservesCase(): void
-	{
-		command('make:model TestModule');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Models/TestModule.php');
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4495
-	 */
-	public function testGeneratorPreservesCaseButChangesComponentName(): void
-	{
-		command('make:controller TestModulecontroller');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/TestModuleController.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        $dir    = dirname($file);
+
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir) && strpos($dir, 'Commands') !== false) {
+            rmdir($dir);
+        }
+    }
+
+    protected function getFileContents(string $filepath): string
+    {
+        if (! file_exists($filepath)) {
+            return '';
+        }
+
+        return file_get_contents($filepath) ?: '';
+    }
+
+    public function testGenerateCommand()
+    {
+        command('make:command deliver');
+        $file = APPPATH . 'Commands/Deliver.php';
+        $this->assertFileExists($file);
+        $contents = $this->getFileContents($file);
+        $this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
+        $this->assertStringContainsString('protected $name = \'command:name\';', $contents);
+    }
+
+    public function testGenerateCommandWithOptionCommand()
+    {
+        command('make:command deliver -command clear:sessions');
+        $file = APPPATH . 'Commands/Deliver.php';
+        $this->assertFileExists($file);
+        $contents = $this->getFileContents($file);
+        $this->assertStringContainsString('protected $name = \'clear:sessions\';', $contents);
+        $this->assertStringContainsString('protected $usage = \'clear:sessions [arguments] [options]\';', $contents);
+    }
+
+    public function testGenerateCommandWithOptionTypeBasic()
+    {
+        command('make:command deliver -type basic');
+        $file = APPPATH . 'Commands/Deliver.php';
+        $this->assertFileExists($file);
+        $contents = $this->getFileContents($file);
+        $this->assertStringContainsString('protected $group = \'CodeIgniter\';', $contents);
+        $this->assertStringContainsString('protected $name = \'command:name\';', $contents);
+    }
+
+    public function testGenerateCommandWithOptionTypeGenerator()
+    {
+        command('make:command deliver -type generator');
+        $file = APPPATH . 'Commands/Deliver.php';
+        $this->assertFileExists($file);
+        $contents = $this->getFileContents($file);
+        $this->assertStringContainsString('protected $group = \'Generators\';', $contents);
+        $this->assertStringContainsString('protected $name = \'command:name\';', $contents);
+    }
+
+    public function testGenerateCommandWithOptionGroup()
+    {
+        command('make:command deliver -group Deliverables');
+        $file = APPPATH . 'Commands/Deliver.php';
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists($file);
+
+        $contents = $this->getFileContents($file);
+        $this->assertStringContainsString('protected $group = \'Deliverables\';', $contents);
+    }
+
+    public function testGenerateCommandWithOptionSuffix()
+    {
+        command('make:command publish -suffix');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Commands/PublishCommand.php';
+        $this->assertFileExists($file);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4495
+     */
+    public function testGeneratorPreservesCase(): void
+    {
+        command('make:model TestModule');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Models/TestModule.php');
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4495
+     */
+    public function testGeneratorPreservesCaseButChangesComponentName(): void
+    {
+        command('make:controller TestModulecontroller');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/TestModuleController.php');
+    }
 }
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 00b62a0dd585..3333d215ba78 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,198 +16,171 @@
 use Config\Services;
 use Tests\Support\Commands\ParamsReveal;
 
-class CommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CommandTest extends CIUnitTestCase
 {
-
-	private $streamFilter;
-	protected $logger;
-	protected $commands;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		$this->logger   = Services::logger();
-		$this->commands = Services::commands();
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	protected function getBuffer()
-	{
-		return CITestStreamFilter::$buffer;
-	}
-
-	public function testListCommands()
-	{
-		command('list');
-
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Lists the available commands.', $this->getBuffer());
-		$this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
-	}
-
-	public function testListCommandsSimple()
-	{
-		command('list --simple');
-
-		$this->assertStringContainsString('db:seed', $this->getBuffer());
-		$this->assertStringNotContainsString('Lists the available commands.', $this->getBuffer());
-	}
-
-	public function testCustomCommand()
-	{
-		command('app:info');
-		$this->assertStringContainsString('CI Version:', $this->getBuffer());
-	}
-
-	public function testShowError()
-	{
-		command('app:info');
-		$commands = $this->commands->getCommands();
-		$command  = new $commands['app:info']['class']($this->logger, $this->commands);
-
-		$command->helpme();
-		$this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
-	}
-
-	public function testCommandCall()
-	{
-		command('app:info');
-		$commands = $this->commands->getCommands();
-		$command  = new $commands['app:info']['class']($this->logger, $this->commands);
-
-		$command->bomb();
-		$this->assertStringContainsString('Invalid background color:', $this->getBuffer());
-	}
-
-	public function testAbstractCommand()
-	{
-		command('app:pablo');
-		$this->assertStringContainsString('not found', $this->getBuffer());
-	}
-
-	public function testNamespacesCommand()
-	{
-		command('namespaces');
-
-		$this->assertStringContainsString('| Namespace', $this->getBuffer());
-		$this->assertStringContainsString('| Config', $this->getBuffer());
-		$this->assertStringContainsString('| Yes', $this->getBuffer());
-	}
-
-	public function testRoutesCommand()
-	{
-		command('routes');
-
-		$this->assertStringContainsString('| Route', $this->getBuffer());
-		$this->assertStringContainsString('| testing', $this->getBuffer());
-		$this->assertStringContainsString('\\TestController::index', $this->getBuffer());
-	}
-
-	public function testInexistentCommandWithNoAlternatives()
-	{
-		command('app:oops');
-		$this->assertStringContainsString('Command "app:oops" not found', $this->getBuffer());
-	}
-
-	public function testInexistentCommandsButWithOneAlternative()
-	{
-		command('namespace');
-
-		$this->assertStringContainsString('Command "namespace" not found.', $this->getBuffer());
-		$this->assertStringContainsString('Did you mean this?', $this->getBuffer());
-		$this->assertStringContainsString('namespaces', $this->getBuffer());
-	}
-
-	public function testInexistentCommandsButWithManyAlternatives()
-	{
-		command('clear');
-
-		$this->assertStringContainsString('Command "clear" not found.', $this->getBuffer());
-		$this->assertStringContainsString('Did you mean one of these?', $this->getBuffer());
-		$this->assertStringContainsString(':clear', $this->getBuffer());
-	}
-
-	/**
-	 * @dataProvider commandArgsProvider
-	 */
-	public function testCommandParsesArgsCorrectly(string $input, array $expected)
-	{
-		ParamsReveal::$args = null;
-		command($input);
-
-		$this->assertEquals($expected, ParamsReveal::$args);
-	}
-
-	public function commandArgsProvider(): array
-	{
-		return [
-			[
-				'reveal as df',
-				[
-					'as',
-					'df',
-				],
-			],
-			[
-				'reveal',
-				[],
-			],
-			[
-				'reveal seg1 seg2 -opt1 -opt2',
-				[
-					'seg1',
-					'seg2',
-					'opt1' => null,
-					'opt2' => null,
-				],
-			],
-			[
-				'reveal seg1 seg2 -opt1 val1 seg3',
-				[
-					'seg1',
-					'seg2',
-					'opt1' => 'val1',
-					'seg3',
-				],
-			],
-			[
-				'reveal as df -gh -jk -qw 12 zx cv',
-				[
-					'as',
-					'df',
-					'gh' => null,
-					'jk' => null,
-					'qw' => 12,
-					'zx',
-					'cv',
-				],
-			],
-			[
-				'reveal as -df "some stuff" -jk 12 -sd "Some longer stuff" -fg \'using single quotes\'',
-				[
-					'as',
-					'df' => 'some stuff',
-					'jk' => 12,
-					'sd' => 'Some longer stuff',
-					'fg' => 'using single quotes',
-				],
-			],
-			[
-				'reveal as -df "using mixed \'quotes\'\" here\""',
-				[
-					'as',
-					'df' => 'using mixed \'quotes\'" here"'
-				],
-			],
-		];
-	}
+    private $streamFilter;
+    protected $logger;
+    protected $commands;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->logger   = Services::logger();
+        $this->commands = Services::commands();
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    protected function getBuffer()
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    public function testListCommands()
+    {
+        command('list');
+
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Lists the available commands.', $this->getBuffer());
+        $this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
+    }
+
+    public function testListCommandsSimple()
+    {
+        command('list --simple');
+
+        $this->assertStringContainsString('db:seed', $this->getBuffer());
+        $this->assertStringNotContainsString('Lists the available commands.', $this->getBuffer());
+    }
+
+    public function testCustomCommand()
+    {
+        command('app:info');
+        $this->assertStringContainsString('CI Version:', $this->getBuffer());
+    }
+
+    public function testShowError()
+    {
+        command('app:info');
+        $commands = $this->commands->getCommands();
+        $command  = new $commands['app:info']['class']($this->logger, $this->commands);
+
+        $command->helpme();
+        $this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
+    }
+
+    public function testCommandCall()
+    {
+        command('app:info');
+        $commands = $this->commands->getCommands();
+        $command  = new $commands['app:info']['class']($this->logger, $this->commands);
+
+        $command->bomb();
+        $this->assertStringContainsString('Invalid background color:', $this->getBuffer());
+    }
+
+    public function testAbstractCommand()
+    {
+        command('app:pablo');
+        $this->assertStringContainsString('not found', $this->getBuffer());
+    }
+
+    public function testNamespacesCommand()
+    {
+        command('namespaces');
+
+        $this->assertStringContainsString('| Namespace', $this->getBuffer());
+        $this->assertStringContainsString('| Config', $this->getBuffer());
+        $this->assertStringContainsString('| Yes', $this->getBuffer());
+    }
+
+    public function testRoutesCommand()
+    {
+        command('routes');
+
+        $this->assertStringContainsString('| Route', $this->getBuffer());
+        $this->assertStringContainsString('| testing', $this->getBuffer());
+        $this->assertStringContainsString('\\TestController::index', $this->getBuffer());
+    }
+
+    public function testInexistentCommandWithNoAlternatives()
+    {
+        command('app:oops');
+        $this->assertStringContainsString('Command "app:oops" not found', $this->getBuffer());
+    }
+
+    public function testInexistentCommandsButWithOneAlternative()
+    {
+        command('namespace');
+
+        $this->assertStringContainsString('Command "namespace" not found.', $this->getBuffer());
+        $this->assertStringContainsString('Did you mean this?', $this->getBuffer());
+        $this->assertStringContainsString('namespaces', $this->getBuffer());
+    }
+
+    public function testInexistentCommandsButWithManyAlternatives()
+    {
+        command('clear');
+
+        $this->assertStringContainsString('Command "clear" not found.', $this->getBuffer());
+        $this->assertStringContainsString('Did you mean one of these?', $this->getBuffer());
+        $this->assertStringContainsString(':clear', $this->getBuffer());
+    }
+
+    /**
+     * @dataProvider commandArgsProvider
+     */
+    public function testCommandParsesArgsCorrectly(string $input, array $expected)
+    {
+        ParamsReveal::$args = null;
+        command($input);
+
+        $this->assertSame($expected, ParamsReveal::$args);
+    }
+
+    public function commandArgsProvider(): array
+    {
+        return [
+            [
+                'reveal as df',
+                ['as', 'df'],
+            ],
+            [
+                'reveal',
+                [],
+            ],
+            [
+                'reveal seg1 seg2 -opt1 -opt2',
+                ['seg1', 'seg2', 'opt1' => null, 'opt2' => null],
+            ],
+            [
+                'reveal seg1 seg2 -opt1 val1 seg3',
+                ['seg1', 'seg2', 'opt1' => 'val1', 'seg3'],
+            ],
+            [
+                'reveal as df -gh -jk -qw 12 zx cv',
+                ['as', 'df', 'gh' => null, 'jk' => null, 'qw' => '12', 'zx', 'cv'],
+            ],
+            [
+                'reveal as -df "some stuff" -jk 12 -sd "Some longer stuff" -fg \'using single quotes\'',
+                ['as', 'df' => 'some stuff', 'jk' => '12', 'sd' => 'Some longer stuff', 'fg' => 'using single quotes'],
+            ],
+            [
+                'reveal as -df "using mixed \'quotes\'\" here\""',
+                ['as', 'df' => 'using mixed \'quotes\'" here"'],
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index a756c4d468e0..4ea808864afe 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -1,40 +1,54 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ConfigGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		is_file($file) && unlink($file);
-	}
-
-	public function testGenerateConfig()
-	{
-		command('make:config auth');
-		$this->assertFileExists(APPPATH . 'Config/Auth.php');
-	}
-
-	public function testGenerateConfigWithOptionSuffix()
-	{
-		command('make:config auth -suffix');
-		$this->assertFileExists(APPPATH . 'Config/AuthConfig.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateConfig()
+    {
+        command('make:config auth');
+        $this->assertFileExists(APPPATH . 'Config/Auth.php');
+    }
+
+    public function testGenerateConfigWithOptionSuffix()
+    {
+        command('make:config auth -suffix');
+        $this->assertFileExists(APPPATH . 'Config/AuthConfig.php');
+    }
 }
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index 423a3185c823..914796aef3bb 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -1,63 +1,85 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ConfigurableSortImportsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigurableSortImportsTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	public function testPublishLanguageWithoutOptions()
-	{
-		command('publish:language');
-
-		$file = APPPATH . 'Language/en/Foobar.php';
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists($file);
-		$this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-		is_file($file) && unlink($file);
-	}
-
-	public function testEnabledSortImportsWillDisruptLanguageFilePublish()
-	{
-		command('publish:language --lang es');
-
-		$file = APPPATH . 'Language/es/Foobar.php';
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists($file);
-		$this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-		is_file($file) && unlink($file);
-		$dir    = dirname($file);
-		is_dir($dir) && rmdir($dir);
-	}
-
-	public function testDisabledSortImportsWillNotAffectLanguageFilesPublish()
-	{
-		command('publish:language --lang ar --sort off');
-
-		$file = APPPATH . 'Language/ar/Foobar.php';
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists($file);
-		$this->assertSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-		is_file($file) && unlink($file);
-		$dir    = dirname($file);
-		is_dir($dir) && rmdir($dir);
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    public function testPublishLanguageWithoutOptions()
+    {
+        command('publish:language');
+
+        $file = APPPATH . 'Language/en/Foobar.php';
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists($file);
+        $this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testEnabledSortImportsWillDisruptLanguageFilePublish()
+    {
+        command('publish:language --lang es');
+
+        $file = APPPATH . 'Language/es/Foobar.php';
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists($file);
+        $this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
+        if (is_file($file)) {
+            unlink($file);
+        }
+        $dir = dirname($file);
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
+    public function testDisabledSortImportsWillNotAffectLanguageFilesPublish()
+    {
+        command('publish:language --lang ar --sort off');
+
+        $file = APPPATH . 'Language/ar/Foobar.php';
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists($file);
+        $this->assertSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
+        if (is_file($file)) {
+            unlink($file);
+        }
+        $dir = dirname($file);
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
 }
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 29e643f499b3..e1ee68fb540a 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -1,82 +1,94 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ControllerGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ControllerGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
+    protected $streamFilter;
 
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
 
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
 
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		is_file($file) && unlink($file);
-	}
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
 
-	protected function getFileContents(string $filepath): string
-	{
-		if (! file_exists($filepath))
-		{
-			return '';
-		}
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
 
-		return file_get_contents($filepath) ?: '';
-	}
+    protected function getFileContents(string $filepath): string
+    {
+        if (! file_exists($filepath)) {
+            return '';
+        }
 
-	public function testGenerateController()
-	{
-		command('make:controller user');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Controllers/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('extends BaseController', $this->getFileContents($file));
-	}
+        return file_get_contents($filepath) ?: '';
+    }
 
-	public function testGenerateControllerWithOptionBare()
-	{
-		command('make:controller blog -bare');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Controllers/Blog.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('extends Controller', $this->getFileContents($file));
+    public function testGenerateController()
+    {
+        command('make:controller user');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Controllers/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('extends BaseController', $this->getFileContents($file));
+    }
 
-	}
+    public function testGenerateControllerWithOptionBare()
+    {
+        command('make:controller blog -bare');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Controllers/Blog.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('extends Controller', $this->getFileContents($file));
+    }
 
-	public function testGenerateControllerWithOptionRestful()
-	{
-		command('make:controller order -restful');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Controllers/Order.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('extends ResourceController', $this->getFileContents($file));
-	}
+    public function testGenerateControllerWithOptionRestful()
+    {
+        command('make:controller order -restful');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Controllers/Order.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('extends ResourceController', $this->getFileContents($file));
+    }
 
-	public function testGenerateControllerWithOptionRestfulPresenter()
-	{
-		command('make:controller pay -restful presenter');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Controllers/Pay.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('extends ResourcePresenter', $this->getFileContents($file));
-	}
+    public function testGenerateControllerWithOptionRestfulPresenter()
+    {
+        command('make:controller pay -restful presenter');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Controllers/Pay.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('extends ResourcePresenter', $this->getFileContents($file));
+    }
 
-	public function testGenerateControllerWithOptionSuffix()
-	{
-		command('make:controller dashboard -suffix');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/DashboardController.php');
-	}
+    public function testGenerateControllerWithOptionSuffix()
+    {
+        command('make:controller dashboard -suffix');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/DashboardController.php');
+    }
 }
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index a7003a5a0277..aed4fd5c144e 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
@@ -8,83 +17,80 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Database;
 
-class CreateDatabaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CreateDatabaseTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	/**
-	 * @var BaseConnection
-	 */
-	protected $connection;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-		$this->connection   = Database::connect();
-
-		parent::setUp();
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		if ($this->connection instanceof Connection)
-		{
-			$file = WRITEPATH . 'foobar.db';
-
-			if (file_exists($file))
-			{
-				unlink($file);
-			}
-		}
-		else
-		{
-			Database::forge()->dropDatabase('foobar');
-		}
-
-		parent::tearDown();
-	}
-
-	protected function getBuffer()
-	{
-		return CITestStreamFilter::$buffer;
-	}
-
-	public function testCreateDatabase()
-	{
-		command('db:create foobar');
-		$this->assertStringContainsString('successfully created.', $this->getBuffer());
-	}
-
-	public function testSqliteDatabaseDuplicated()
-	{
-		if (! $this->connection instanceof Connection)
-		{
-			$this->markTestSkipped('Needs to run on SQLite3.');
-		}
-
-		command('db:create foobar');
-		CITestStreamFilter::$buffer = '';
-
-		command('db:create foobar --ext db');
-		$this->assertStringContainsString('already exists.', $this->getBuffer());
-	}
-
-	public function testOtherDriverDuplicatedDatabase()
-	{
-		if ($this->connection instanceof Connection)
-		{
-			$this->markTestSkipped('Needs to run on non-SQLite3 drivers.');
-		}
-
-		command('db:create foobar');
-		CITestStreamFilter::$buffer = '';
-
-		command('db:create foobar');
-		$this->assertStringContainsString('Unable to create the specified database.', $this->getBuffer());
-	}
+    protected $streamFilter;
+
+    /**
+     * @var BaseConnection
+     */
+    protected $connection;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+        $this->connection   = Database::connect();
+
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        if ($this->connection instanceof Connection) {
+            $file = WRITEPATH . 'foobar.db';
+
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        } else {
+            Database::forge()->dropDatabase('foobar');
+        }
+
+        parent::tearDown();
+    }
+
+    protected function getBuffer()
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    public function testCreateDatabase()
+    {
+        command('db:create foobar');
+        $this->assertStringContainsString('successfully created.', $this->getBuffer());
+    }
+
+    public function testSqliteDatabaseDuplicated()
+    {
+        if (! $this->connection instanceof Connection) {
+            $this->markTestSkipped('Needs to run on SQLite3.');
+        }
+
+        command('db:create foobar');
+        CITestStreamFilter::$buffer = '';
+
+        command('db:create foobar --ext db');
+        $this->assertStringContainsString('already exists.', $this->getBuffer());
+    }
+
+    public function testOtherDriverDuplicatedDatabase()
+    {
+        if ($this->connection instanceof Connection) {
+            $this->markTestSkipped('Needs to run on non-SQLite3 drivers.');
+        }
+
+        command('db:create foobar');
+        CITestStreamFilter::$buffer = '';
+
+        command('db:create foobar');
+        $this->assertStringContainsString('Unable to create the specified database.', $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index 558dce91f7b2..0d33342654f0 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -1,93 +1,105 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class DatabaseCommandsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseCommandsTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		parent::setUp();
-	}
-
-	protected function tearDown(): void
-	{
-		command('migrate:rollback');
-		stream_filter_remove($this->streamFilter);
-
-		parent::tearDown();
-	}
-
-	protected function getBuffer(): string
-	{
-		return CITestStreamFilter::$buffer;
-	}
-
-	protected function clearBuffer(): void
-	{
-		CITestStreamFilter::$buffer = '';
-	}
-
-	public function testMigrate()
-	{
-		command('migrate --all');
-		$this->assertStringContainsString('Done migrations.', $this->getBuffer());
-		command('migrate:rollback');
-
-		$this->clearBuffer();
-		command('migrate -n Tests\\\\Support');
-		$this->assertStringContainsString('Done migrations.', $this->getBuffer());
-	}
-
-	public function testMigrateRollback()
-	{
-		command('migrate --all -g tests');
-		$this->clearBuffer();
-
-		command('migrate:rollback -g tests');
-		$this->assertStringContainsString('Done rolling back migrations.', $this->getBuffer());
-	}
-
-	public function testMigrateRefresh()
-	{
-		command('migrate --all');
-		$this->clearBuffer();
-
-		command('migrate:refresh');
-		$this->assertStringContainsString('Done migrations.', $this->getBuffer());
-	}
-
-	public function testMigrateStatus()
-	{
-		command('migrate --all');
-		$this->clearBuffer();
-
-		command('migrate:status -g tests');
-		$this->assertStringContainsString('Namespace', $this->getBuffer());
-		$this->assertStringContainsString('Version', $this->getBuffer());
-		$this->assertStringContainsString('Filename', $this->getBuffer());
-	}
-
-	public function testSeed()
-	{
-		command('migrate --all');
-		$this->clearBuffer();
-
-		// use '\\\\' to prevent escaping
-		command('db:seed Tests\\\\Support\\\\Database\\\\Seeds\\\\CITestSeeder');
-		$this->assertStringContainsString('Seeded', $this->getBuffer());
-		$this->clearBuffer();
-
-		command('db:seed Foobar.php');
-		$this->assertStringContainsString('The specified seeder is not a valid file:', $this->getBuffer());
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        command('migrate:rollback');
+        stream_filter_remove($this->streamFilter);
+
+        parent::tearDown();
+    }
+
+    protected function getBuffer(): string
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    protected function clearBuffer(): void
+    {
+        CITestStreamFilter::$buffer = '';
+    }
+
+    public function testMigrate()
+    {
+        command('migrate --all');
+        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+        command('migrate:rollback');
+
+        $this->clearBuffer();
+        command('migrate -n Tests\\\\Support');
+        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+    }
+
+    public function testMigrateRollback()
+    {
+        command('migrate --all -g tests');
+        $this->clearBuffer();
+
+        command('migrate:rollback -g tests');
+        $this->assertStringContainsString('Done rolling back migrations.', $this->getBuffer());
+    }
+
+    public function testMigrateRefresh()
+    {
+        command('migrate --all');
+        $this->clearBuffer();
+
+        command('migrate:refresh');
+        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+    }
+
+    public function testMigrateStatus()
+    {
+        command('migrate --all');
+        $this->clearBuffer();
+
+        command('migrate:status -g tests');
+        $this->assertStringContainsString('Namespace', $this->getBuffer());
+        $this->assertStringContainsString('Version', $this->getBuffer());
+        $this->assertStringContainsString('Filename', $this->getBuffer());
+    }
+
+    public function testSeed()
+    {
+        command('migrate --all');
+        $this->clearBuffer();
+
+        // use '\\\\' to prevent escaping
+        command('db:seed Tests\\\\Support\\\\Database\\\\Seeds\\\\CITestSeeder');
+        $this->assertStringContainsString('Seeded', $this->getBuffer());
+        $this->clearBuffer();
+
+        command('db:seed Foobar.php');
+        $this->assertStringContainsString('The specified seeder is not a valid file:', $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index cac5f55c8a64..3f644d6ee526 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -1,42 +1,58 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class EntityGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EntityGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		$dir    = dirname($file);
-		is_file($file) && unlink($file);
-		is_dir($dir) && rmdir($dir);
-	}
-
-	public function testGenerateEntity()
-	{
-		command('make:entity user');
-		$this->assertFileExists(APPPATH . 'Entities/User.php');
-	}
-
-	public function testGenerateEntityWithOptionSuffix()
-	{
-		command('make:entity user -suffix');
-		$this->assertFileExists(APPPATH . 'Entities/UserEntity.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        $dir    = dirname($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
+    public function testGenerateEntity()
+    {
+        command('make:entity user');
+        $this->assertFileExists(APPPATH . 'Entities/User.php');
+    }
+
+    public function testGenerateEntityWithOptionSuffix()
+    {
+        command('make:entity user -suffix');
+        $this->assertFileExists(APPPATH . 'Entities/UserEntity.php');
+    }
 }
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index 0f30f98868be..bd7f04ff3121 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -1,86 +1,95 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
+/**
+ * @internal
+ */
 final class EnvironmentCommandTest extends CIUnitTestCase
 {
-	private $streamFilter;
-
-	private $envPath = ROOTPATH . '.env';
-
-	private $backupEnvPath = ROOTPATH . '.env.backup';
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		if (is_file($this->envPath))
-		{
-			rename($this->envPath, $this->backupEnvPath);
-		}
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-		stream_filter_remove($this->streamFilter);
-
-		if (is_file($this->envPath))
-		{
-			unlink($this->envPath);
-		}
-
-		if (is_file($this->backupEnvPath))
-		{
-			rename($this->backupEnvPath, $this->envPath);
-		}
-
-		$_SERVER['CI_ENVIRONMENT'] = $_ENV['CI_ENVIRONMENT'] = ENVIRONMENT;
-	}
-
-	public function testUsingCommandWithNoArgumentsGivesCurrentEnvironment(): void
-	{
-		command('env');
-		$this->assertStringContainsString('testing', CITestStreamFilter::$buffer);
-		$this->assertStringContainsString(ENVIRONMENT, CITestStreamFilter::$buffer);
-	}
-
-	public function testProvidingTestingAsEnvGivesErrorMessage(): void
-	{
-		command('env testing');
-		$this->assertStringContainsString('The "testing" environment is reserved for PHPUnit testing.', CITestStreamFilter::$buffer);
-	}
-
-	public function testProvidingUnknownEnvGivesErrorMessage(): void
-	{
-		command('env foobar');
-		$this->assertStringContainsString('Invalid environment type "foobar".', CITestStreamFilter::$buffer);
-	}
-
-	public function testDefaultShippedEnvIsMissing()
-	{
-		rename(ROOTPATH . 'env', ROOTPATH . 'lostenv');
-		command('env development');
-		rename(ROOTPATH . 'lostenv', ROOTPATH . 'env');
-
-		$this->assertStringContainsString('Both default shipped', CITestStreamFilter::$buffer);
-		$this->assertStringContainsString('It is impossible to write the new environment type.', CITestStreamFilter::$buffer);
-	}
-
-	public function testSettingNewEnvIsSuccess(): void
-	{
-		// default env file has `production` env in it
-		$_SERVER['CI_ENVIRONMENT'] = 'production';
-		command('env development');
-
-		$this->assertStringContainsString('Environment is successfully changed to', CITestStreamFilter::$buffer);
-		$this->assertStringContainsString('CI_ENVIRONMENT = development', file_get_contents($this->envPath));
-	}
+    private $streamFilter;
+
+    private $envPath = ROOTPATH . '.env';
+
+    private $backupEnvPath = ROOTPATH . '.env.backup';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        if (is_file($this->envPath)) {
+            rename($this->envPath, $this->backupEnvPath);
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        stream_filter_remove($this->streamFilter);
+
+        if (is_file($this->envPath)) {
+            unlink($this->envPath);
+        }
+
+        if (is_file($this->backupEnvPath)) {
+            rename($this->backupEnvPath, $this->envPath);
+        }
+
+        $_SERVER['CI_ENVIRONMENT'] = $_ENV['CI_ENVIRONMENT'] = ENVIRONMENT;
+    }
+
+    public function testUsingCommandWithNoArgumentsGivesCurrentEnvironment(): void
+    {
+        command('env');
+        $this->assertStringContainsString('testing', CITestStreamFilter::$buffer);
+        $this->assertStringContainsString(ENVIRONMENT, CITestStreamFilter::$buffer);
+    }
+
+    public function testProvidingTestingAsEnvGivesErrorMessage(): void
+    {
+        command('env testing');
+        $this->assertStringContainsString('The "testing" environment is reserved for PHPUnit testing.', CITestStreamFilter::$buffer);
+    }
+
+    public function testProvidingUnknownEnvGivesErrorMessage(): void
+    {
+        command('env foobar');
+        $this->assertStringContainsString('Invalid environment type "foobar".', CITestStreamFilter::$buffer);
+    }
+
+    public function testDefaultShippedEnvIsMissing()
+    {
+        rename(ROOTPATH . 'env', ROOTPATH . 'lostenv');
+        command('env development');
+        rename(ROOTPATH . 'lostenv', ROOTPATH . 'env');
+
+        $this->assertStringContainsString('Both default shipped', CITestStreamFilter::$buffer);
+        $this->assertStringContainsString('It is impossible to write the new environment type.', CITestStreamFilter::$buffer);
+    }
+
+    public function testSettingNewEnvIsSuccess(): void
+    {
+        // default env file has `production` env in it
+        $_SERVER['CI_ENVIRONMENT'] = 'production';
+        command('env development');
+
+        $this->assertStringContainsString('Environment is successfully changed to', CITestStreamFilter::$buffer);
+        $this->assertStringContainsString('CI_ENVIRONMENT = development', file_get_contents($this->envPath));
+    }
 }
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index 6477219f423e..ceff677f420e 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -1,40 +1,54 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class FilterGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FilterGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		is_file($file) && unlink($file);
-	}
-
-	public function testGenerateFilter()
-	{
-		command('make:filter admin');
-		$this->assertFileExists(APPPATH . 'Filters/Admin.php');
-	}
-
-	public function testGenerateFilterWithOptionSuffix()
-	{
-		command('make:filter admin -suffix');
-		$this->assertFileExists(APPPATH . 'Filters/AdminFilter.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateFilter()
+    {
+        command('make:filter admin');
+        $this->assertFileExists(APPPATH . 'Filters/Admin.php');
+    }
+
+    public function testGenerateFilterWithOptionSuffix()
+    {
+        command('make:filter admin -suffix');
+        $this->assertFileExists(APPPATH . 'Filters/AdminFilter.php');
+    }
 }
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 2810996f2fc9..2691bca89180 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -1,109 +1,116 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class GenerateKeyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GenerateKeyTest extends CIUnitTestCase
 {
-	private $streamFilter;
-	private $envPath;
-	private $backupEnvPath;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		$this->envPath       = ROOTPATH . '.env';
-		$this->backupEnvPath = ROOTPATH . '.env.backup';
-
-		if (file_exists($this->envPath))
-		{
-			rename($this->envPath, $this->backupEnvPath);
-		}
-
-		$this->resetEnvironment();
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		if (file_exists($this->envPath))
-		{
-			unlink($this->envPath);
-		}
-
-		if (file_exists($this->backupEnvPath))
-		{
-			rename($this->backupEnvPath, $this->envPath);
-		}
-
-		$this->resetEnvironment();
-	}
-
-	/**
-	 * Gets buffer contents then releases it.
-	 *
-	 * @return string
-	 */
-	protected function getBuffer(): string
-	{
-		return CITestStreamFilter::$buffer;
-	}
-
-	protected function resetEnvironment()
-	{
-		putenv('encryption.key');
-		unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
-	}
-
-	public function testGenerateKeyShowsEncodedKey()
-	{
-		command('key:generate -show');
-		$this->assertStringContainsString('hex2bin:', $this->getBuffer());
-
-		command('key:generate -prefix base64 -show');
-		$this->assertStringContainsString('base64:', $this->getBuffer());
-
-		command('key:generate -prefix hex2bin -show');
-		$this->assertStringContainsString('hex2bin:', $this->getBuffer());
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testGenerateKeyCreatesNewKey()
-	{
-		command('key:generate');
-		$this->assertStringContainsString('successfully set.', $this->getBuffer());
-		$this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
-		$this->assertStringContainsString('hex2bin:', file_get_contents($this->envPath));
-
-		command('key:generate -prefix base64 -force');
-		$this->assertStringContainsString('successfully set.', $this->getBuffer());
-		$this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
-		$this->assertStringContainsString('base64:', file_get_contents($this->envPath));
-
-		command('key:generate -prefix hex2bin -force');
-		$this->assertStringContainsString('successfully set.', $this->getBuffer());
-		$this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
-		$this->assertStringContainsString('hex2bin:', file_get_contents($this->envPath));
-	}
-
-	public function testDefaultShippedEnvIsMissing()
-	{
-		rename(ROOTPATH . 'env', ROOTPATH . 'lostenv');
-		command('key:generate');
-		rename(ROOTPATH . 'lostenv', ROOTPATH . 'env');
-
-		$this->assertStringContainsString('Both default shipped', $this->getBuffer());
-		$this->assertStringContainsString('Error in setting', $this->getBuffer());
-	}
+    private $streamFilter;
+    private $envPath;
+    private $backupEnvPath;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->envPath       = ROOTPATH . '.env';
+        $this->backupEnvPath = ROOTPATH . '.env.backup';
+
+        if (file_exists($this->envPath)) {
+            rename($this->envPath, $this->backupEnvPath);
+        }
+
+        $this->resetEnvironment();
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        if (file_exists($this->envPath)) {
+            unlink($this->envPath);
+        }
+
+        if (file_exists($this->backupEnvPath)) {
+            rename($this->backupEnvPath, $this->envPath);
+        }
+
+        $this->resetEnvironment();
+    }
+
+    /**
+     * Gets buffer contents then releases it.
+     */
+    protected function getBuffer(): string
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    protected function resetEnvironment()
+    {
+        putenv('encryption.key');
+        unset($_ENV['encryption.key'], $_SERVER['encryption.key']);
+    }
+
+    public function testGenerateKeyShowsEncodedKey()
+    {
+        command('key:generate -show');
+        $this->assertStringContainsString('hex2bin:', $this->getBuffer());
+
+        command('key:generate -prefix base64 -show');
+        $this->assertStringContainsString('base64:', $this->getBuffer());
+
+        command('key:generate -prefix hex2bin -show');
+        $this->assertStringContainsString('hex2bin:', $this->getBuffer());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testGenerateKeyCreatesNewKey()
+    {
+        command('key:generate');
+        $this->assertStringContainsString('successfully set.', $this->getBuffer());
+        $this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
+        $this->assertStringContainsString('hex2bin:', file_get_contents($this->envPath));
+
+        command('key:generate -prefix base64 -force');
+        $this->assertStringContainsString('successfully set.', $this->getBuffer());
+        $this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
+        $this->assertStringContainsString('base64:', file_get_contents($this->envPath));
+
+        command('key:generate -prefix hex2bin -force');
+        $this->assertStringContainsString('successfully set.', $this->getBuffer());
+        $this->assertStringContainsString(env('encryption.key'), file_get_contents($this->envPath));
+        $this->assertStringContainsString('hex2bin:', file_get_contents($this->envPath));
+    }
+
+    public function testDefaultShippedEnvIsMissing()
+    {
+        rename(ROOTPATH . 'env', ROOTPATH . 'lostenv');
+        command('key:generate');
+        rename(ROOTPATH . 'lostenv', ROOTPATH . 'env');
+
+        $this->assertStringContainsString('Both default shipped', $this->getBuffer());
+        $this->assertStringContainsString('Error in setting', $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index a7b9018268cb..8b37dc5112f1 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -1,101 +1,128 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class GeneratorsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GeneratorsTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	public function testGenerateFileCreated()
-	{
-		command('make:seeder categories');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Database/Seeds/Categories.php';
-		is_file($file) && unlink($file);
-	}
-
-	public function testGenerateFileExists()
-	{
-		command('make:filter items');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		CITestStreamFilter::$buffer = '';
-		command('make:filter items');
-		$this->assertStringContainsString('File exists: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Filters/Items.php';
-		is_file($file) && unlink($file);
-	}
-
-	public function testGenerateFileOverwritten()
-	{
-		command('make:controller products');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		CITestStreamFilter::$buffer = '';
-		command('make:controller products -force');
-		$this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Controllers/Products.php';
-		is_file($file) && unlink($file);
-	}
-
-	public function testGenerateFileFailsOnUnwritableDirectory()
-	{
-		if ('\\' === DIRECTORY_SEPARATOR)
-		{
-			$this->markTestSkipped('chmod does not work as expected on Windows');
-		}
-
-		chmod(APPPATH . 'Filters', 0444);
-
-		command('make:filter permissions');
-		$this->assertStringContainsString('Error while creating file: ', CITestStreamFilter::$buffer);
-
-		chmod(APPPATH . 'Filters', 0755);
-	}
-
-	public function testGenerateFailsOnUndefinedNamespace()
-	{
-		command('make:model cars -namespace CodeIgnite');
-		$this->assertStringContainsString('Namespace "CodeIgnite" is not defined.', CITestStreamFilter::$buffer);
-	}
-
-	public function testGenerateFileInSubfolders()
-	{
-		command('make:controller admin/user');
-		$file = APPPATH . 'Controllers/Admin/User.php';
-		$dir = dirname($file);
-		$this->assertFileExists($file);
-		$this->assertDirectoryExists($dir);
-		is_file($file) && unlink($file);
-		is_dir($dir) && rmdir($dir);
-	}
-
-	public function testSuffixingHasNoEffect(): void
-	{
-		command('make:foo bar --suffix');
-		$file1 = APPPATH . 'Commands/Bar.php';
-		$file2 = APPPATH . 'Commands/BarCommand.php';
-		$dir   = dirname($file1);
-
-		$this->assertFileExists($file1);
-		$this->assertFileDoesNotExist($file2);
-
-		is_file($file1) && unlink($file1);
-		is_file($file2) && unlink($file2);
-		is_dir($dir) && rmdir($dir);
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    public function testGenerateFileCreated()
+    {
+        command('make:seeder categories');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Database/Seeds/Categories.php';
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateFileExists()
+    {
+        command('make:filter items');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        CITestStreamFilter::$buffer = '';
+        command('make:filter items');
+        $this->assertStringContainsString('File exists: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Filters/Items.php';
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateFileOverwritten()
+    {
+        command('make:controller products');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        CITestStreamFilter::$buffer = '';
+        command('make:controller products -force');
+        $this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Controllers/Products.php';
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateFileFailsOnUnwritableDirectory()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod does not work as expected on Windows');
+        }
+
+        chmod(APPPATH . 'Filters', 0444);
+
+        command('make:filter permissions');
+        $this->assertStringContainsString('Error while creating file: ', CITestStreamFilter::$buffer);
+
+        chmod(APPPATH . 'Filters', 0755);
+    }
+
+    public function testGenerateFailsOnUndefinedNamespace()
+    {
+        command('make:model cars -namespace CodeIgnite');
+        $this->assertStringContainsString('Namespace "CodeIgnite" is not defined.', CITestStreamFilter::$buffer);
+    }
+
+    public function testGenerateFileInSubfolders()
+    {
+        command('make:controller admin/user');
+        $file = APPPATH . 'Controllers/Admin/User.php';
+        $dir  = dirname($file);
+        $this->assertFileExists($file);
+        $this->assertDirectoryExists($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
+    public function testSuffixingHasNoEffect(): void
+    {
+        command('make:foo bar --suffix');
+        $file1 = APPPATH . 'Commands/Bar.php';
+        $file2 = APPPATH . 'Commands/BarCommand.php';
+        $dir   = dirname($file1);
+
+        $this->assertFileExists($file1);
+        $this->assertFileDoesNotExist($file2);
+
+        if (is_file($file1)) {
+            unlink($file1);
+        }
+        if (is_file($file2)) {
+            unlink($file2);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
 }
diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php
index 9b1dc1a9a62d..13ce4b14e62c 100644
--- a/tests/system/Commands/HelpCommandTest.php
+++ b/tests/system/Commands/HelpCommandTest.php
@@ -1,64 +1,76 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class HelpCommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HelpCommandTest extends CIUnitTestCase
 {
-	private $streamFilter;
+    private $streamFilter;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
 
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
 
-	protected function getBuffer()
-	{
-		return CITestStreamFilter::$buffer;
-	}
+    protected function getBuffer()
+    {
+        return CITestStreamFilter::$buffer;
+    }
 
-	public function testHelpCommand()
-	{
-		command('help');
+    public function testHelpCommand()
+    {
+        command('help');
 
-		// make sure the result looks like a command list
-		$this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
-		$this->assertStringContainsString('command_name', $this->getBuffer());
-	}
+        // make sure the result looks like a command list
+        $this->assertStringContainsString('Displays basic usage information.', $this->getBuffer());
+        $this->assertStringContainsString('command_name', $this->getBuffer());
+    }
 
-	public function testHelpCommandWithMissingUsage()
-	{
-		command('help app:info');
-		$this->assertStringContainsString('app:info [arguments]', $this->getBuffer());
-	}
+    public function testHelpCommandWithMissingUsage()
+    {
+        command('help app:info');
+        $this->assertStringContainsString('app:info [arguments]', $this->getBuffer());
+    }
 
-	public function testHelpCommandOnSpecificCommand()
-	{
-		command('help cache:clear');
-		$this->assertStringContainsString('Clears the current system caches.', $this->getBuffer());
-	}
+    public function testHelpCommandOnSpecificCommand()
+    {
+        command('help cache:clear');
+        $this->assertStringContainsString('Clears the current system caches.', $this->getBuffer());
+    }
 
-	public function testHelpCommandOnInexistentCommand()
-	{
-		command('help fixme');
-		$this->assertStringContainsString('Command "fixme" not found', $this->getBuffer());
-	}
+    public function testHelpCommandOnInexistentCommand()
+    {
+        command('help fixme');
+        $this->assertStringContainsString('Command "fixme" not found', $this->getBuffer());
+    }
 
-	public function testHelpCommandOnInexistentCommandButWithAlternatives()
-	{
-		command('help clear');
-		$this->assertStringContainsString('Command "clear" not found.', $this->getBuffer());
-		$this->assertStringContainsString('Did you mean one of these?', $this->getBuffer());
-	}
+    public function testHelpCommandOnInexistentCommandButWithAlternatives()
+    {
+        command('help clear');
+        $this->assertStringContainsString('Command "clear" not found.', $this->getBuffer());
+        $this->assertStringContainsString('Did you mean one of these?', $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index 26c7b1373d2c..56a52b72bf1c 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Cache\CacheFactory;
@@ -7,67 +16,70 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
-class InfoCacheTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class InfoCacheTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		CITestStreamFilter::$buffer = '';
-		$this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-		// Make sure we are testing with the correct handler (override injections)
-		Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
-	}
-
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		// restore default cache handler
-		config('Cache')->handler = 'file';
-	}
-
-	protected function getBuffer()
-	{
-		return CITestStreamFilter::$buffer;
-	}
-
-	public function testInfoCacheErrorsOnInvalidHandler()
-	{
-		config('Cache')->handler = 'redis';
-		cache()->save('foo', 'bar');
-		command('cache:info');
-
-		$this->assertStringContainsString('This command only supports the file cache handler.', $this->getBuffer());
-	}
-
-	public function testInfoCacheCanSeeFoo()
-	{
-		cache()->save('foo', 'bar');
-		command('cache:info');
-
-		$this->assertStringContainsString('foo', $this->getBuffer());
-	}
-
-	public function testInfoCacheCanSeeTable()
-	{
-		command('cache:info');
-
-		$this->assertStringContainsString('Name', $this->getBuffer());
-		$this->assertStringContainsString('Server Path', $this->getBuffer());
-		$this->assertStringContainsString('Size', $this->getBuffer());
-		$this->assertStringContainsString('Date', $this->getBuffer());
-	}
-
-	public function testInfoCacheCannotSeeFoo()
-	{
-		cache()->delete('foo');
-		command('cache:info');
-
-		$this->assertStringNotContainsString ('foo', $this->getBuffer());
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        // Make sure we are testing with the correct handler (override injections)
+        Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        // restore default cache handler
+        config('Cache')->handler = 'file';
+    }
+
+    protected function getBuffer()
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    public function testInfoCacheErrorsOnInvalidHandler()
+    {
+        config('Cache')->handler = 'redis';
+        cache()->save('foo', 'bar');
+        command('cache:info');
+
+        $this->assertStringContainsString('This command only supports the file cache handler.', $this->getBuffer());
+    }
+
+    public function testInfoCacheCanSeeFoo()
+    {
+        cache()->save('foo', 'bar');
+        command('cache:info');
+
+        $this->assertStringContainsString('foo', $this->getBuffer());
+    }
+
+    public function testInfoCacheCanSeeTable()
+    {
+        command('cache:info');
+
+        $this->assertStringContainsString('Name', $this->getBuffer());
+        $this->assertStringContainsString('Server Path', $this->getBuffer());
+        $this->assertStringContainsString('Size', $this->getBuffer());
+        $this->assertStringContainsString('Date', $this->getBuffer());
+    }
+
+    public function testInfoCacheCannotSeeFoo()
+    {
+        cache()->delete('foo');
+        command('cache:info');
+
+        $this->assertStringNotContainsString('foo', $this->getBuffer());
+    }
 }
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index afdf085b73b6..7e65639948a2 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -1,52 +1,66 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class MigrationGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MigrationGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		file_exists($file) && unlink($file);
-	}
-
-	public function testGenerateMigration()
-	{
-		command('make:migration database');
-		$this->assertStringContainsString('_Database.php', CITestStreamFilter::$buffer);
-	}
-
-	public function testGenerateMigrationWithOptionSession()
-	{
-		command('make:migration -session');
-		$this->assertStringContainsString('_CreateCiSessionsTable.php', CITestStreamFilter::$buffer);
-	}
-
-	public function testGenerateMigrationWithOptionTable()
-	{
-		command('make:migration -session -table logger');
-		$this->assertStringContainsString('_CreateLoggerTable.php', CITestStreamFilter::$buffer);
-	}
-
-	public function testGenerateMigrationWithOptionSuffix()
-	{
-		command('make:migration database -suffix');
-		$this->assertStringContainsString('_DatabaseMigration.php', CITestStreamFilter::$buffer);
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (file_exists($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateMigration()
+    {
+        command('make:migration database');
+        $this->assertStringContainsString('_Database.php', CITestStreamFilter::$buffer);
+    }
+
+    public function testGenerateMigrationWithOptionSession()
+    {
+        command('make:migration -session');
+        $this->assertStringContainsString('_CreateCiSessionsTable.php', CITestStreamFilter::$buffer);
+    }
+
+    public function testGenerateMigrationWithOptionTable()
+    {
+        command('make:migration -session -table logger');
+        $this->assertStringContainsString('_CreateLoggerTable.php', CITestStreamFilter::$buffer);
+    }
+
+    public function testGenerateMigrationWithOptionSuffix()
+    {
+        command('make:migration database -suffix');
+        $this->assertStringContainsString('_DatabaseMigration.php', CITestStreamFilter::$buffer);
+    }
 }
diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index a1e5442bf556..77c047ef82ae 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -10,67 +19,64 @@
  */
 final class MigrationIntegrationTest extends CIUnitTestCase
 {
-	private $streamFilter;
+    private $streamFilter;
 
-	private $migrationFileFrom = SUPPORTPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
+    private $migrationFileFrom = SUPPORTPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
 
-	private $migrationFileTo = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
+    private $migrationFileTo = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		if (! is_file($this->migrationFileFrom))
-		{
-			$this->fail(clean_path($this->migrationFileFrom) . ' is not found.');
-		}
+        if (! is_file($this->migrationFileFrom)) {
+            $this->fail(clean_path($this->migrationFileFrom) . ' is not found.');
+        }
 
-		if (is_file($this->migrationFileTo))
-		{
-			@unlink($this->migrationFileTo);
-		}
+        if (is_file($this->migrationFileTo)) {
+            @unlink($this->migrationFileTo);
+        }
 
-		copy($this->migrationFileFrom, $this->migrationFileTo);
+        copy($this->migrationFileFrom, $this->migrationFileTo);
 
-		$contents = file_get_contents($this->migrationFileTo);
-		$contents = str_replace('namespace Tests\Support\Database\Migrations;', 'namespace App\Database\Migrations;', $contents);
-		file_put_contents($this->migrationFileTo, $contents);
+        $contents = file_get_contents($this->migrationFileTo);
+        $contents = str_replace('namespace Tests\Support\Database\Migrations;', 'namespace App\Database\Migrations;', $contents);
+        file_put_contents($this->migrationFileTo, $contents);
 
-		CITestStreamFilter::$buffer = '';
+        CITestStreamFilter::$buffer = '';
 
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
 
-	protected function tearDown(): void
-	{
-		parent::tearDown();
+    protected function tearDown(): void
+    {
+        parent::tearDown();
 
-		if (is_file($this->migrationFileTo))
-		{
-			@unlink($this->migrationFileTo);
-		}
+        if (is_file($this->migrationFileTo)) {
+            @unlink($this->migrationFileTo);
+        }
 
-		stream_filter_remove($this->streamFilter);
-	}
+        stream_filter_remove($this->streamFilter);
+    }
 
-	/**
-	 * @runTestsInSeparateProcesses
-	 */
-	public function testMigrationWithRollbackHasSameNameFormat(): void
-	{
-		command('migrate -n App');
-		$this->assertStringContainsString(
-			'(App) 20160428212500_App\Database\Migrations\Migration_Create_test_tables',
-			CITestStreamFilter::$buffer
-		);
+    /**
+     * @runTestsInSeparateProcesses
+     */
+    public function testMigrationWithRollbackHasSameNameFormat(): void
+    {
+        command('migrate -n App');
+        $this->assertStringContainsString(
+            '(App) 20160428212500_App\Database\Migrations\Migration_Create_test_tables',
+            CITestStreamFilter::$buffer
+        );
 
-		CITestStreamFilter::$buffer = '';
+        CITestStreamFilter::$buffer = '';
 
-		command('migrate:rollback -n App');
-		$this->assertStringContainsString(
-			'(App) 20160428212500_App\Database\Migrations\Migration_Create_test_tables',
-			CITestStreamFilter::$buffer
-		);
-	}
+        command('migrate:rollback -n App');
+        $this->assertStringContainsString(
+            '(App) 20160428212500_App\Database\Migrations\Migration_Create_test_tables',
+            CITestStreamFilter::$buffer
+        );
+    }
 }
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index 3cc908aa0a11..68e001103fb5 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -1,115 +1,134 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ModelGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ModelGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		is_file($file) && unlink($file);
-	}
-
-	protected function getFileContent(string $filepath): string
-	{
-		if (! is_file($filepath))
-		{
-			return '';
-		}
-
-		return file_get_contents($filepath) ?: '';
-	}
-
-	public function testGenerateModel()
-	{
-		command('make:model user -table users');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('extends Model', $this->getFileContent($file));
-		$this->assertStringContainsString('protected $table                = \'users\';', $this->getFileContent($file));
-		$this->assertStringContainsString('protected $DBGroup              = \'default\';', $this->getFileContent($file));
-		$this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
-	}
-
-	public function testGenerateModelWithOptionTable()
-	{
-		command('make:model cars -table utilisateur');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/Cars.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('protected $table                = \'utilisateur\';', $this->getFileContent($file));
-	}
-
-	public function testGenerateModelWithOptionDBGroup()
-	{
-		command('make:model user -dbgroup testing');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('protected $DBGroup              = \'testing\';', $this->getFileContent($file));
-	}
-
-	public function testGenerateModelWithOptionReturnArray()
-	{
-		command('make:model user -return array');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
-	}
-
-	public function testGenerateModelWithOptionReturnObject()
-	{
-		command('make:model user -return object');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('protected $returnType           = \'object\';', $this->getFileContent($file));
-	}
-
-	public function testGenerateModelWithOptionReturnEntity()
-	{
-		command('make:model user -return entity');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$file = APPPATH . 'Models/User.php';
-		$this->assertFileExists($file);
-		$this->assertStringContainsString('protected $returnType           = \'App\Entities\User\';', $this->getFileContent($file));
-		is_file($file) && unlink($file);
-		$file = APPPATH . 'Entities/User.php';
-		$this->assertFileExists($file);
-		$dir = dirname($file);
-		is_file($file) && unlink($file);
-		is_dir($dir) && rmdir($dir);
-	}
-
-	public function testGenerateModelWithOptionSuffix()
-	{
-		command('make:model user -suffix -return entity');
-
-		$model  = APPPATH . 'Models/UserModel.php';
-		$entity = APPPATH . 'Entities/UserEntity.php';
-
-		$this->assertFileExists($model);
-		$this->assertFileExists($entity);
-		unlink($model);
-		unlink($entity);
-		rmdir(dirname($entity));
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (is_file($file)) {
+            unlink($file);
+        }
+    }
+
+    protected function getFileContent(string $filepath): string
+    {
+        if (! is_file($filepath)) {
+            return '';
+        }
+
+        return file_get_contents($filepath) ?: '';
+    }
+
+    public function testGenerateModel()
+    {
+        command('make:model user -table users');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('extends Model', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $table                = \'users\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $DBGroup              = \'default\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
+    }
+
+    public function testGenerateModelWithOptionTable()
+    {
+        command('make:model cars -table utilisateur');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/Cars.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('protected $table                = \'utilisateur\';', $this->getFileContent($file));
+    }
+
+    public function testGenerateModelWithOptionDBGroup()
+    {
+        command('make:model user -dbgroup testing');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('protected $DBGroup              = \'testing\';', $this->getFileContent($file));
+    }
+
+    public function testGenerateModelWithOptionReturnArray()
+    {
+        command('make:model user -return array');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
+    }
+
+    public function testGenerateModelWithOptionReturnObject()
+    {
+        command('make:model user -return object');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('protected $returnType           = \'object\';', $this->getFileContent($file));
+    }
+
+    public function testGenerateModelWithOptionReturnEntity()
+    {
+        command('make:model user -return entity');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $file = APPPATH . 'Models/User.php';
+        $this->assertFileExists($file);
+        $this->assertStringContainsString('protected $returnType           = \'App\Entities\User\';', $this->getFileContent($file));
+        if (is_file($file)) {
+            unlink($file);
+        }
+        $file = APPPATH . 'Entities/User.php';
+        $this->assertFileExists($file);
+        $dir = dirname($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
+    public function testGenerateModelWithOptionSuffix()
+    {
+        command('make:model user -suffix -return entity');
+
+        $model  = APPPATH . 'Models/UserModel.php';
+        $entity = APPPATH . 'Entities/UserEntity.php';
+
+        $this->assertFileExists($model);
+        $this->assertFileExists($entity);
+        unlink($model);
+        unlink($entity);
+        rmdir(dirname($entity));
+    }
 }
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index 79e77fd3c509..d3cbf1088f30 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -1,171 +1,182 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ScaffoldGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ScaffoldGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-	}
-
-	protected function getFileContents(string $filepath): string
-	{
-		if (! file_exists($filepath))
-		{
-			return '';
-		}
-
-		return file_get_contents($filepath) ?: '';
-	}
-
-	public function testCreateComponentProducesManyFiles()
-	{
-		command('make:scaffold people');
-
-		$dir       = '\\' . DIRECTORY_SEPARATOR;
-		$migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
-		preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
-		$matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
-
-		// Files check
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/People.php');
-		$this->assertFileExists(APPPATH . 'Models/People.php');
-		$this->assertStringContainsString('_People.php', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/People.php');
-
-		// Options check
-		unlink(APPPATH . 'Controllers/People.php');
-		unlink(APPPATH . 'Models/People.php');
-		unlink($matches[0]);
-		unlink(APPPATH . 'Database/Seeds/People.php');
-	}
-
-	public function testCreateComponentWithManyOptions()
-	{
-		command('make:scaffold user -restful -return entity');
-
-		$dir       = '\\' . DIRECTORY_SEPARATOR;
-		$migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
-		preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
-		$matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
-
-		// Files check
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/User.php');
-		$this->assertStringContainsString('_User.php', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/User.php');
-		$this->assertFileExists(APPPATH . 'Entities/User.php');
-		$this->assertFileExists(APPPATH . 'Models/User.php');
-
-		// Options check
-		$this->assertStringContainsString('extends ResourceController', $this->getFileContents(APPPATH . 'Controllers/User.php'));
-
-		// Clean up
-		unlink(APPPATH . 'Controllers/User.php');
-		unlink($matches[0]);
-		unlink(APPPATH . 'Database/Seeds/User.php');
-		unlink(APPPATH . 'Entities/User.php');
-		rmdir(APPPATH . 'Entities');
-		unlink(APPPATH . 'Models/User.php');
-	}
-
-	public function testCreateComponentWithOptionSuffix()
-	{
-		command('make:scaffold order -suffix');
-
-		$dir       = '\\' . DIRECTORY_SEPARATOR;
-		$migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
-		preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
-		$matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
-
-		// Files check
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/OrderController.php');
-		$this->assertStringContainsString('_OrderMigration.php', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/OrderSeeder.php');
-		$this->assertFileExists(APPPATH . 'Models/OrderModel.php');
-
-		// Clean up
-		unlink(APPPATH . 'Controllers/OrderController.php');
-		unlink($matches[0]);
-		unlink(APPPATH . 'Database/Seeds/OrderSeeder.php');
-		unlink(APPPATH . 'Models/OrderModel.php');
-	}
-
-	public function testCreateComponentWithOptionForce()
-	{
-		command('make:controller fixer');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertStringContainsString('extends BaseController', $this->getFileContents(APPPATH . 'Controllers/Fixer.php'));
-		$this->assertFileExists(APPPATH . 'Controllers/Fixer.php');
-		CITestStreamFilter::$buffer = '';
-
-		command('make:scaffold fixer -bare -force');
-
-		$dir       = '\\' . DIRECTORY_SEPARATOR;
-		$migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
-		preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
-		$matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
-
-		// Files check
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/Fixer.php');
-		$this->assertStringContainsString('_Fixer.php', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/Fixer.php');
-		$this->assertFileExists(APPPATH . 'Models/Fixer.php');
-
-		// Options check
-		$this->assertStringContainsString('extends Controller', $this->getFileContents(APPPATH . 'Controllers/Fixer.php'));
-		$this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
-
-		// Clean up
-		unlink(APPPATH . 'Controllers/Fixer.php');
-		unlink($matches[0]);
-		unlink(APPPATH . 'Database/Seeds/Fixer.php');
-		unlink(APPPATH . 'Models/Fixer.php');
-	}
-
-	public function testCreateComponentWithOptionNamespace()
-	{
-		command('make:scaffold product -namespace App');
-
-		$dir       = '\\' . DIRECTORY_SEPARATOR;
-		$migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
-		preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
-		$matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
-
-		// Files check
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Controllers/Product.php');
-		$this->assertStringContainsString('_Product.php', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/Product.php');
-		$this->assertFileExists(APPPATH . 'Models/Product.php');
-
-		// Options check
-		$this->assertStringContainsString('namespace App\Controllers;', $this->getFileContents(APPPATH . 'Controllers/Product.php'));
-		$this->assertStringContainsString('namespace App\Database\Migrations;', $this->getFileContents($matches[0]));
-		$this->assertStringContainsString('namespace App\Database\Seeds;', $this->getFileContents(APPPATH . 'Database/Seeds/Product.php'));
-		$this->assertStringContainsString('namespace App\Models;', $this->getFileContents(APPPATH . 'Models/Product.php'));
-
-		// Clean up
-		unlink(APPPATH . 'Controllers/Product.php');
-		unlink($matches[0]);
-		unlink(APPPATH . 'Database/Seeds/Product.php');
-		unlink(APPPATH . 'Models/Product.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    protected function getFileContents(string $filepath): string
+    {
+        if (! file_exists($filepath)) {
+            return '';
+        }
+
+        return file_get_contents($filepath) ?: '';
+    }
+
+    public function testCreateComponentProducesManyFiles()
+    {
+        command('make:scaffold people');
+
+        $dir       = '\\' . DIRECTORY_SEPARATOR;
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
+        preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
+        $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
+
+        // Files check
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/People.php');
+        $this->assertFileExists(APPPATH . 'Models/People.php');
+        $this->assertStringContainsString('_People.php', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/People.php');
+
+        // Options check
+        unlink(APPPATH . 'Controllers/People.php');
+        unlink(APPPATH . 'Models/People.php');
+        unlink($matches[0]);
+        unlink(APPPATH . 'Database/Seeds/People.php');
+    }
+
+    public function testCreateComponentWithManyOptions()
+    {
+        command('make:scaffold user -restful -return entity');
+
+        $dir       = '\\' . DIRECTORY_SEPARATOR;
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
+        preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
+        $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
+
+        // Files check
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/User.php');
+        $this->assertStringContainsString('_User.php', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/User.php');
+        $this->assertFileExists(APPPATH . 'Entities/User.php');
+        $this->assertFileExists(APPPATH . 'Models/User.php');
+
+        // Options check
+        $this->assertStringContainsString('extends ResourceController', $this->getFileContents(APPPATH . 'Controllers/User.php'));
+
+        // Clean up
+        unlink(APPPATH . 'Controllers/User.php');
+        unlink($matches[0]);
+        unlink(APPPATH . 'Database/Seeds/User.php');
+        unlink(APPPATH . 'Entities/User.php');
+        rmdir(APPPATH . 'Entities');
+        unlink(APPPATH . 'Models/User.php');
+    }
+
+    public function testCreateComponentWithOptionSuffix()
+    {
+        command('make:scaffold order -suffix');
+
+        $dir       = '\\' . DIRECTORY_SEPARATOR;
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
+        preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
+        $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
+
+        // Files check
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/OrderController.php');
+        $this->assertStringContainsString('_OrderMigration.php', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/OrderSeeder.php');
+        $this->assertFileExists(APPPATH . 'Models/OrderModel.php');
+
+        // Clean up
+        unlink(APPPATH . 'Controllers/OrderController.php');
+        unlink($matches[0]);
+        unlink(APPPATH . 'Database/Seeds/OrderSeeder.php');
+        unlink(APPPATH . 'Models/OrderModel.php');
+    }
+
+    public function testCreateComponentWithOptionForce()
+    {
+        command('make:controller fixer');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertStringContainsString('extends BaseController', $this->getFileContents(APPPATH . 'Controllers/Fixer.php'));
+        $this->assertFileExists(APPPATH . 'Controllers/Fixer.php');
+        CITestStreamFilter::$buffer = '';
+
+        command('make:scaffold fixer -bare -force');
+
+        $dir       = '\\' . DIRECTORY_SEPARATOR;
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
+        preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
+        $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
+
+        // Files check
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/Fixer.php');
+        $this->assertStringContainsString('_Fixer.php', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/Fixer.php');
+        $this->assertFileExists(APPPATH . 'Models/Fixer.php');
+
+        // Options check
+        $this->assertStringContainsString('extends Controller', $this->getFileContents(APPPATH . 'Controllers/Fixer.php'));
+        $this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
+
+        // Clean up
+        unlink(APPPATH . 'Controllers/Fixer.php');
+        unlink($matches[0]);
+        unlink(APPPATH . 'Database/Seeds/Fixer.php');
+        unlink(APPPATH . 'Models/Fixer.php');
+    }
+
+    public function testCreateComponentWithOptionNamespace()
+    {
+        command('make:scaffold product -namespace App');
+
+        $dir       = '\\' . DIRECTORY_SEPARATOR;
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
+        preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
+        $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
+
+        // Files check
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Controllers/Product.php');
+        $this->assertStringContainsString('_Product.php', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/Product.php');
+        $this->assertFileExists(APPPATH . 'Models/Product.php');
+
+        // Options check
+        $this->assertStringContainsString('namespace App\Controllers;', $this->getFileContents(APPPATH . 'Controllers/Product.php'));
+        $this->assertStringContainsString('namespace App\Database\Migrations;', $this->getFileContents($matches[0]));
+        $this->assertStringContainsString('namespace App\Database\Seeds;', $this->getFileContents(APPPATH . 'Database/Seeds/Product.php'));
+        $this->assertStringContainsString('namespace App\Models;', $this->getFileContents(APPPATH . 'Models/Product.php'));
+
+        // Clean up
+        unlink(APPPATH . 'Controllers/Product.php');
+        unlink($matches[0]);
+        unlink(APPPATH . 'Database/Seeds/Product.php');
+        unlink(APPPATH . 'Models/Product.php');
+    }
 }
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index c0f252832d2f..aa41d745803a 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -1,42 +1,56 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class SeederGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SeederGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		file_exists($file) && unlink($file);
-	}
-
-	public function testGenerateSeeder()
-	{
-		command('make:seeder cars');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/Cars.php');
-	}
-
-	public function testGenerateSeederWithOptionSuffix()
-	{
-		command('make:seeder cars -suffix');
-		$this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
-		$this->assertFileExists(APPPATH . 'Database/Seeds/CarsSeeder.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (file_exists($file)) {
+            unlink($file);
+        }
+    }
+
+    public function testGenerateSeeder()
+    {
+        command('make:seeder cars');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/Cars.php');
+    }
+
+    public function testGenerateSeederWithOptionSuffix()
+    {
+        command('make:seeder cars -suffix');
+        $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+        $this->assertFileExists(APPPATH . 'Database/Seeds/CarsSeeder.php');
+    }
 }
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index beabd80cc16b..6af2d09bf536 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -1,63 +1,76 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class SessionsCommandsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionsCommandsTest extends CIUnitTestCase
 {
-	private $streamFilter;
+    private $streamFilter;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		CITestStreamFilter::$buffer = '';
+        CITestStreamFilter::$buffer = '';
 
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
 
-	public function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
 
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		file_exists($file) && unlink($file);
-	}
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        if (file_exists($file)) {
+            unlink($file);
+        }
+    }
 
-	public function testCreateMigrationCommand()
-	{
-		command('session:migration');
+    public function testCreateMigrationCommand()
+    {
+        command('session:migration');
 
-		// make sure we end up with a migration class in the right place
-		// or at least that we claim to have done so
-		// separate assertions avoid console color codes
-		$this->assertStringContainsString('_CreateCiSessionsTable.php', CITestStreamFilter::$buffer);
-	}
+        // make sure we end up with a migration class in the right place
+        // or at least that we claim to have done so
+        // separate assertions avoid console color codes
+        $this->assertStringContainsString('_CreateCiSessionsTable.php', CITestStreamFilter::$buffer);
+    }
 
-	public function testOverriddenCreateMigrationCommand()
-	{
-		command('session:migration -t mygoodies');
+    public function testOverriddenCreateMigrationCommand()
+    {
+        command('session:migration -t mygoodies');
 
-		// make sure we end up with a migration class in the right place
-		$this->assertStringContainsString('_CreateMygoodiesTable.php', CITestStreamFilter::$buffer);
-	}
+        // make sure we end up with a migration class in the right place
+        $this->assertStringContainsString('_CreateMygoodiesTable.php', CITestStreamFilter::$buffer);
+    }
 
-	public function testCannotWriteFileOnCreateMigrationCommand()
-	{
-		if ('\\' === DIRECTORY_SEPARATOR)
-		{
-			$this->markTestSkipped('chmod does not work as expected on Windows');
-		}
+    public function testCannotWriteFileOnCreateMigrationCommand()
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $this->markTestSkipped('chmod does not work as expected on Windows');
+        }
 
-		chmod(APPPATH . 'Database/Migrations', 0444);
+        chmod(APPPATH . 'Database/Migrations', 0444);
 
-		command('session:migration');
-		$this->assertStringContainsString('Error while creating file:', CITestStreamFilter::$buffer);
+        command('session:migration');
+        $this->assertStringContainsString('Error while creating file:', CITestStreamFilter::$buffer);
 
-		chmod(APPPATH . 'Database/Migrations', 0755);
-	}
+        chmod(APPPATH . 'Database/Migrations', 0755);
+    }
 }
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index f42c93781b2e..64698d1b55db 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -1,42 +1,58 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ValidationGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ValidationGeneratorTest extends CIUnitTestCase
 {
-	protected $streamFilter;
-
-	protected function setUp(): void
-	{
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		stream_filter_remove($this->streamFilter);
-
-		$result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-		$file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-		$dir    = dirname($file);
-		is_file($file) && unlink($file);
-		is_dir($dir) && rmdir($dir);
-	}
-
-	public function testGenerateValidation()
-	{
-		command('make:validation user');
-		$this->assertFileExists(APPPATH . 'Validation/User.php');
-	}
-
-	public function testGenerateValidationWithOptionSuffix()
-	{
-		command('make:validation admin -suffix');
-		$this->assertFileExists(APPPATH . 'Validation/AdminValidation.php');
-	}
+    protected $streamFilter;
+
+    protected function setUp(): void
+    {
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+
+        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
+        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+        $dir    = dirname($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
+    }
+
+    public function testGenerateValidation()
+    {
+        command('make:validation user');
+        $this->assertFileExists(APPPATH . 'Validation/User.php');
+    }
+
+    public function testGenerateValidationWithOptionSuffix()
+    {
+        command('make:validation admin -suffix');
+        $this->assertFileExists(APPPATH . 'Validation/AdminValidation.php');
+    }
 }
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 112d868a2667..49a99b1494ea 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -1,55 +1,61 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class CommonFunctionsSendTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CommonFunctionsSendTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		unset($_ENV['foo'], $_SERVER['foo']);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Make sure cookies are set by RedirectResponse this way
-	 * See https://github.com/codeigniter4/CodeIgniter4/issues/1393
-	 *
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testRedirectResponseCookiesSent()
-	{
-		$loginTime = time();
-
-		$routes = service('routes');
-		$routes->add('user/login', 'Auth::verify', ['as' => 'login']);
-
-		$response = redirect()->route('login')
-				->setCookie('foo', 'onething', YEAR)
-				->setCookie('login_time', $loginTime, YEAR);
-		$response->pretend(false);
-		$this->assertTrue($response->hasCookie('foo', 'onething'));
-		$this->assertTrue($response->hasCookie('login_time'));
-		$response->setBody('Hello');
-
-		// send it
-		ob_start();
-		$response->send();
-
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-
-		// and what actually got sent?
-		$this->assertHeaderEmitted('Set-Cookie: foo=onething;');
-		$this->assertHeaderEmitted('Set-Cookie: login_time');
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        unset($_ENV['foo'], $_SERVER['foo']);
+    }
+
+    /**
+     * Make sure cookies are set by RedirectResponse this way
+     * See https://github.com/codeigniter4/CodeIgniter4/issues/1393
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testRedirectResponseCookiesSent()
+    {
+        $loginTime = time();
+
+        $routes = service('routes');
+        $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
+
+        $response = redirect()->route('login')
+            ->setCookie('foo', 'onething', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
+        $response->pretend(false);
+        $this->assertTrue($response->hasCookie('foo', 'onething'));
+        $this->assertTrue($response->hasCookie('login_time'));
+        $response->setBody('Hello');
+
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        // and what actually got sent?
+        $this->assertHeaderEmitted('Set-Cookie: foo=onething;');
+        $this->assertHeaderEmitted('Set-Cookie: login_time');
+    }
 }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 62aa4182ac60..1ce1e7ab61a2 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
@@ -26,491 +35,487 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CommonFunctionsTest extends CIUnitTestCase
+final class CommonFunctionsTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$renderer = Services::renderer();
-		$renderer->resetData();
-		unset($_ENV['foo'], $_SERVER['foo']);
-	}
-
-	public function testStringifyAttributes()
-	{
-		$this->assertEquals(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
-
-		$atts        = new stdClass;
-		$atts->class = 'foo';
-		$atts->id    = 'bar';
-		$this->assertEquals(' class="foo" id="bar"', stringify_attributes($atts));
-
-		$atts = new stdClass;
-		$this->assertEquals('', stringify_attributes($atts));
-
-		$this->assertEquals(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
-
-		$this->assertEquals('', stringify_attributes([]));
-	}
-
-	public function testStringifyJsAttributes()
-	{
-		$this->assertEquals('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
-
-		$atts         = new stdClass;
-		$atts->width  = 800;
-		$atts->height = 600;
-		$this->assertEquals('width=800,height=600', stringify_attributes($atts, true));
-	}
-
-	public function testEnvReturnsDefault()
-	{
-		$this->assertEquals('baz', env('foo', 'baz'));
-	}
-
-	public function testEnvGetsFromSERVER()
-	{
-		$_SERVER['foo'] = 'bar';
-
-		$this->assertEquals('bar', env('foo', 'baz'));
-	}
-
-	public function testEnvGetsFromENV()
-	{
-		$_ENV['foo'] = 'bar';
-
-		$this->assertEquals('bar', env('foo', 'baz'));
-	}
-
-	public function testEnvBooleans()
-	{
-		$_ENV['p1'] = 'true';
-		$_ENV['p2'] = 'false';
-		$_ENV['p3'] = 'empty';
-		$_ENV['p4'] = 'null';
-
-		$this->assertTrue(env('p1'));
-		$this->assertFalse(env('p2'));
-		$this->assertEmpty(env('p3'));
-		$this->assertNull(env('p4'));
-	}
-
-	public function testRedirectReturnsRedirectResponse()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$response = $this->createMock(Response::class);
-		$routes   = new RouteCollection(
-			Services::locator(), new Modules()
-		);
-		\CodeIgniter\Services::injectMock('response', $response);
-		\CodeIgniter\Services::injectMock('routes', $routes);
-
-		$routes->add('home/base', 'Controller::index', ['as' => 'base']);
-
-		$response->method('redirect')
-				->will($this->returnArgument(0));
-
-		$this->assertInstanceOf(RedirectResponse::class, redirect('base'));
-	}
-
-	public function testRedirectDefault()
-	{
-		$this->assertInstanceOf(RedirectResponse::class, redirect());
-	}
-
-	public function testView()
-	{
-		$data     = [
-			'testString' => 'bar',
-			'bar'        => 'baz',
-		];
-		$expected = '<h1>bar</h1>';
-		$this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple', $data));
-	}
-
-	public function testViewSavedData()
-	{
-		$data     = [
-			'testString' => 'bar',
-			'bar'        => 'baz',
-		];
-		$expected = '<h1>bar</h1>';
-		$this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple', $data, ['saveData' => true]));
-		$this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple'));
-	}
-
-	public function testViewCell()
-	{
-		$expected = 'Hello';
-		$this->assertEquals($expected, view_cell('\Tests\Support\View\SampleClass::hello'));
-	}
-
-	public function testEscapeWithDifferentEncodings()
-	{
-		$this->assertEquals('&lt;x', esc('<x', 'html', 'utf-8'));
-		$this->assertEquals('&lt;x', esc('<x', 'html', 'iso-8859-1'));
-		$this->assertEquals('&lt;x', esc('<x', 'html', 'windows-1251'));
-	}
-
-	public function testEscapeBadContext()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		esc(['width' => '800', 'height' => '600'], 'bogus');
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSessionInstance()
-	{
-		$this->injectSessionMock();
-
-		$this->assertInstanceOf(Session::class, session());
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSessionVariable()
-	{
-		$this->injectSessionMock();
-
-		$_SESSION['notbogus'] = 'Hi there';
-
-		$this->assertEquals('Hi there', session('notbogus'));
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSessionVariableNotThere()
-	{
-		$this->injectSessionMock();
-
-		$_SESSION['bogus'] = 'Hi there';
-		$this->assertEquals(null, session('notbogus'));
-	}
-
-	public function testRouteTo()
-	{
-		// prime the pump
-		$routes = service('routes');
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
-
-		$this->assertEquals('/path/string/to/13', route_to('myController::goto', 'string', 13));
-	}
-
-	public function testInvisible()
-	{
-		$this->assertEquals('Javascript', remove_invisible_characters("Java\0script"));
-	}
-
-	public function testInvisibleEncoded()
-	{
-		$this->assertEquals('Javascript', remove_invisible_characters('Java%0cscript'));
-	}
-
-	public function testAppTimezone()
-	{
-		$this->assertEquals('America/Chicago', app_timezone());
-	}
-
-	public function testCSRFToken()
-	{
-		$this->assertEquals('csrf_test_name', csrf_token());
-	}
-
-	public function testCSRFHeader()
-	{
-		$this->assertEquals('X-CSRF-TOKEN', csrf_header());
-	}
-
-	public function testHash()
-	{
-		$this->assertEquals(32, strlen(csrf_hash()));
-	}
-
-	public function testCSRFField()
-	{
-		$this->assertStringContainsString('<input type="hidden" ', csrf_field());
-	}
-
-	public function testCSRFMeta()
-	{
-		$this->assertStringContainsString('<meta name="X-CSRF-TOKEN" ', csrf_meta());
-	}
-
-	public function testModelNotExists()
-	{
-		$this->assertNull(model(UnexsistenceClass::class));
-	}
-
-	public function testModelExistsBasename()
-	{
-		$this->assertInstanceOf(JobModel::class, model('JobModel'));
-	}
-
-	public function testModelExistsClassname()
-	{
-		$this->assertInstanceOf(JobModel::class, model(JobModel::class));
-	}
-
-	public function testModelExistsAbsoluteClassname()
-	{
-		$this->assertInstanceOf(JobModel::class, model('\Tests\Support\Models\JobModel'));
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testOldInput()
-	{
-		$this->injectSessionMock();
-		// setup from RedirectResponseTest...
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$this->config          = new App();
-		$this->config->baseURL = 'http://example.com/';
-
-		$this->routes = new RouteCollection(Services::locator(), new Modules());
-		Services::injectMock('routes', $this->routes);
-
-		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
-		Services::injectMock('request', $this->request);
-
-		// setup & ask for a redirect...
-		$_SESSION = [];
-		$_GET     = ['foo' => 'bar'];
-		$_POST    = [
-			'bar'    => 'baz',
-			'zibble' => serialize('fritz'),
-		];
-
-		$response = new RedirectResponse(new App());
-		$returned = $response->withInput();
-
-		$this->assertEquals('bar', old('foo')); // regular parameter
-		$this->assertEquals('doo', old('yabba dabba', 'doo')); // non-existing parameter
-		$this->assertEquals('fritz', old('zibble')); // serialized parameter
-	}
-
-	// Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testOldInputArray()
-	{
-		$this->injectSessionMock();
-		// setup from RedirectResponseTest...
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$this->config          = new App();
-		$this->config->baseURL = 'http://example.com/';
-
-		$this->routes = new RouteCollection(Services::locator(), new Modules());
-		Services::injectMock('routes', $this->routes);
-
-		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
-		Services::injectMock('request', $this->request);
-
-		$locations = [
-			'AB' => 'Alberta',
-			'BC' => 'British Columbia',
-			'SK' => 'Saskatchewan',
-		];
-
-		// setup & ask for a redirect...
-		$_SESSION = [];
-		$_GET     = [];
-		$_POST    = ['location' => $locations];
-
-		$response = new RedirectResponse(new App());
-		$returned = $response->withInput();
-
-		$this->assertEquals($locations, old('location'));
-	}
-
-	public function testReallyWritable()
-	{
-		// cannot test fully on *nix
-		$this->assertTrue(is_really_writable(WRITEPATH));
-	}
-
-	public function testSlashItem()
-	{
-		$this->assertEquals('/', slash_item('cookiePath')); // slash already there
-		$this->assertEquals('', slash_item('cookieDomain')); // empty, so untouched
-		$this->assertEquals('en/', slash_item('defaultLocale')); // slash appended
-	}
-
-	protected function injectSessionMock()
-	{
-		$defaults = [
-			'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
-			'sessionCookieName'        => 'ci_session',
-			'sessionExpiration'        => 7200,
-			'sessionSavePath'          => null,
-			'sessionMatchIP'           => false,
-			'sessionTimeToUpdate'      => 300,
-			'sessionRegenerateDestroy' => false,
-			'cookieDomain'             => '',
-			'cookiePrefix'             => '',
-			'cookiePath'               => '/',
-			'cookieSecure'             => false,
-			'cookieSameSite'           => 'Lax',
-		];
-
-		$appConfig = new App();
-		foreach ($defaults as $key => $config)
-		{
-			$appConfig->$key = $config;
-		}
-
-		$session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
-		$session->setLogger(new TestLogger(new Logger()));
-		BaseService::injectMock('session', $session);
-	}
-
-	// Make sure cookies are set by RedirectResponse this way
-	// See https://github.com/codeigniter4/CodeIgniter4/issues/1393
-	public function testRedirectResponseCookies1()
-	{
-		$loginTime = time();
-
-		$response = new Response(new App());
-
-		$routes = service('routes');
-		$routes->add('user/login', 'Auth::verify', ['as' => 'login']);
-
-		$answer1 = redirect()->route('login')
-				->setCookie('foo', 'onething', YEAR)
-				->setCookie('login_time', $loginTime, YEAR);
-
-		$this->assertTrue($answer1->hasCookie('foo', 'onething'));
-		$this->assertTrue($answer1->hasCookie('login_time'));
-	}
-
-	public function testTrace()
-	{
-		ob_start();
-		trace();
-		$content = ob_get_clean();
-
-		$this->assertStringContainsString('Debug Backtrace', $content);
-	}
-
-	public function testViewNotSaveData()
-	{
-		$data = [
-			'testString' => 'bar',
-			'bar'        => 'baz',
-		];
-		$this->assertStringContainsString('<h1>bar</h1>', view('\Tests\Support\View\Views\simples', $data, ['saveData' => false]));
-		$this->assertStringContainsString('<h1>is_not</h1>', view('\Tests\Support\View\Views\simples'));
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testForceHttpsNullRequestAndResponse()
-	{
-		$this->assertNull(Services::response()->header('Location'));
-
-		force_https();
-
-		$this->assertEquals('https://example.com/', Services::response()->header('Location')->getValue());
-	}
-
-	/**
-	 * @dataProvider dirtyPathsProvider
-	 */
-	public function testCleanPathActuallyCleaningThePaths($input, $expected)
-	{
-		$this->assertEquals($expected, clean_path($input));
-	}
-
-	public function dirtyPathsProvider()
-	{
-		$ds = DIRECTORY_SEPARATOR;
-
-		return [
-			[
-				ROOTPATH . 'spark',
-				'ROOTPATH' . $ds . 'spark',
-			],
-			[
-				APPPATH . 'Config' . $ds . 'App.php',
-				'APPPATH' . $ds . 'Config' . $ds . 'App.php',
-			],
-			[
-				SYSTEMPATH . 'CodeIgniter.php',
-				'SYSTEMPATH' . $ds . 'CodeIgniter.php',
-			],
-			[
-				VENDORPATH . 'autoload.php',
-				'VENDORPATH' . $ds . 'autoload.php',
-			],
-			[
-				FCPATH . 'index.php',
-				'FCPATH' . $ds . 'index.php',
-			],
-		];
-	}
-
-	public function testHelperWithFatalLocatorThrowsException()
-	{
-		// Replace the locator with one that will fail if it is called
-		$locator = new FatalLocator(Services::autoloader());
-		Services::injectMock('locator', $locator);
-
-		try
-		{
-			helper('baguette');
-			$exception = false;
-		}
-		catch (RuntimeException $e)
-		{
-			$exception = true;
-		}
-
-		$this->assertTrue($exception);
-		Services::reset();
-	}
-
-	public function testHelperLoadsOnce()
-	{
-		// Load it the first time
-		helper('baguette');
-
-		// Replace the locator with one that will fail if it is called
-		$locator = new FatalLocator(Services::autoloader());
-		Services::injectMock('locator', $locator);
-
-		try
-		{
-			helper('baguette');
-			$exception = false;
-		}
-		catch (RuntimeException $e)
-		{
-			$exception = true;
-		}
-
-		$this->assertFalse($exception);
-		Services::reset();
-	}
-
-	public function testIsCli()
-	{
-		$this->assertIsBool(is_cli());
-		$this->assertTrue(is_cli());
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $renderer = Services::renderer();
+        $renderer->resetData();
+        unset($_ENV['foo'], $_SERVER['foo']);
+    }
+
+    public function testStringifyAttributes()
+    {
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
+
+        $atts        = new stdClass();
+        $atts->class = 'foo';
+        $atts->id    = 'bar';
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes($atts));
+
+        $atts = new stdClass();
+        $this->assertSame('', stringify_attributes($atts));
+
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
+
+        $this->assertSame('', stringify_attributes([]));
+    }
+
+    public function testStringifyJsAttributes()
+    {
+        $this->assertSame('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
+
+        $atts         = new stdClass();
+        $atts->width  = 800;
+        $atts->height = 600;
+        $this->assertSame('width=800,height=600', stringify_attributes($atts, true));
+    }
+
+    public function testEnvReturnsDefault()
+    {
+        $this->assertSame('baz', env('foo', 'baz'));
+    }
+
+    public function testEnvGetsFromSERVER()
+    {
+        $_SERVER['foo'] = 'bar';
+
+        $this->assertSame('bar', env('foo', 'baz'));
+    }
+
+    public function testEnvGetsFromENV()
+    {
+        $_ENV['foo'] = 'bar';
+
+        $this->assertSame('bar', env('foo', 'baz'));
+    }
+
+    public function testEnvBooleans()
+    {
+        $_ENV['p1'] = 'true';
+        $_ENV['p2'] = 'false';
+        $_ENV['p3'] = 'empty';
+        $_ENV['p4'] = 'null';
+
+        $this->assertTrue(env('p1'));
+        $this->assertFalse(env('p2'));
+        $this->assertEmpty(env('p3'));
+        $this->assertNull(env('p4'));
+    }
+
+    public function testRedirectReturnsRedirectResponse()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $response = $this->createMock(Response::class);
+        $routes   = new RouteCollection(
+            Services::locator(),
+            new Modules()
+        );
+        \CodeIgniter\Services::injectMock('response', $response);
+        \CodeIgniter\Services::injectMock('routes', $routes);
+
+        $routes->add('home/base', 'Controller::index', ['as' => 'base']);
+        $response->method('redirect')->willReturnArgument(0);
+
+        $this->assertInstanceOf(RedirectResponse::class, redirect('base'));
+    }
+
+    public function testRedirectDefault()
+    {
+        $this->assertInstanceOf(RedirectResponse::class, redirect());
+    }
+
+    public function testView()
+    {
+        $data = [
+            'testString' => 'bar',
+            'bar'        => 'baz',
+        ];
+        $expected = '<h1>bar</h1>';
+        $this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple', $data));
+    }
+
+    public function testViewSavedData()
+    {
+        $data = [
+            'testString' => 'bar',
+            'bar'        => 'baz',
+        ];
+        $expected = '<h1>bar</h1>';
+        $this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple', $data, ['saveData' => true]));
+        $this->assertStringContainsString($expected, view('\Tests\Support\View\Views\simple'));
+    }
+
+    public function testViewCell()
+    {
+        $expected = 'Hello';
+        $this->assertSame($expected, view_cell('\Tests\Support\View\SampleClass::hello'));
+    }
+
+    public function testEscapeWithDifferentEncodings()
+    {
+        $this->assertSame('&lt;x', esc('<x', 'html', 'utf-8'));
+        $this->assertSame('&lt;x', esc('<x', 'html', 'iso-8859-1'));
+        $this->assertSame('&lt;x', esc('<x', 'html', 'windows-1251'));
+    }
+
+    public function testEscapeBadContext()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        esc(['width' => '800', 'height' => '600'], 'bogus');
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSessionInstance()
+    {
+        $this->injectSessionMock();
+
+        $this->assertInstanceOf(Session::class, session());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSessionVariable()
+    {
+        $this->injectSessionMock();
+
+        $_SESSION['notbogus'] = 'Hi there';
+
+        $this->assertSame('Hi there', session('notbogus'));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSessionVariableNotThere()
+    {
+        $this->injectSessionMock();
+
+        $_SESSION['bogus'] = 'Hi there';
+        $this->assertNull(session('notbogus'));
+    }
+
+    public function testRouteTo()
+    {
+        // prime the pump
+        $routes = service('routes');
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+
+        $this->assertSame('/path/string/to/13', route_to('myController::goto', 'string', 13));
+    }
+
+    public function testInvisible()
+    {
+        $this->assertSame('Javascript', remove_invisible_characters("Java\0script"));
+    }
+
+    public function testInvisibleEncoded()
+    {
+        $this->assertSame('Javascript', remove_invisible_characters('Java%0cscript'));
+    }
+
+    public function testAppTimezone()
+    {
+        $this->assertSame('America/Chicago', app_timezone());
+    }
+
+    public function testCSRFToken()
+    {
+        $this->assertSame('csrf_test_name', csrf_token());
+    }
+
+    public function testCSRFHeader()
+    {
+        $this->assertSame('X-CSRF-TOKEN', csrf_header());
+    }
+
+    public function testHash()
+    {
+        $this->assertSame(32, strlen(csrf_hash()));
+    }
+
+    public function testCSRFField()
+    {
+        $this->assertStringContainsString('<input type="hidden" ', csrf_field());
+    }
+
+    public function testCSRFMeta()
+    {
+        $this->assertStringContainsString('<meta name="X-CSRF-TOKEN" ', csrf_meta());
+    }
+
+    public function testModelNotExists()
+    {
+        $this->assertNull(model(UnexsistenceClass::class));
+    }
+
+    public function testModelExistsBasename()
+    {
+        $this->assertInstanceOf(JobModel::class, model('JobModel'));
+    }
+
+    public function testModelExistsClassname()
+    {
+        $this->assertInstanceOf(JobModel::class, model(JobModel::class));
+    }
+
+    public function testModelExistsAbsoluteClassname()
+    {
+        $this->assertInstanceOf(JobModel::class, model('\Tests\Support\Models\JobModel'));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testOldInput()
+    {
+        $this->injectSessionMock();
+        // setup from RedirectResponseTest...
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $this->config          = new App();
+        $this->config->baseURL = 'http://example.com/';
+
+        $this->routes = new RouteCollection(Services::locator(), new Modules());
+        Services::injectMock('routes', $this->routes);
+
+        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        Services::injectMock('request', $this->request);
+
+        // setup & ask for a redirect...
+        $_SESSION = [];
+        $_GET     = ['foo' => 'bar'];
+        $_POST    = [
+            'bar'    => 'baz',
+            'zibble' => serialize('fritz'),
+        ];
+
+        $response = new RedirectResponse(new App());
+        $response->withInput();
+
+        $this->assertSame('bar', old('foo')); // regular parameter
+        $this->assertSame('doo', old('yabba dabba', 'doo')); // non-existing parameter
+        $this->assertSame('fritz', old('zibble')); // serialized parameter
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testOldInputArray()
+    {
+        $this->injectSessionMock();
+        // setup from RedirectResponseTest...
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $this->config          = new App();
+        $this->config->baseURL = 'http://example.com/';
+
+        $this->routes = new RouteCollection(Services::locator(), new Modules());
+        Services::injectMock('routes', $this->routes);
+
+        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        Services::injectMock('request', $this->request);
+
+        $locations = [
+            'AB' => 'Alberta',
+            'BC' => 'British Columbia',
+            'SK' => 'Saskatchewan',
+        ];
+
+        // setup & ask for a redirect...
+        $_SESSION = [];
+        $_GET     = [];
+        $_POST    = ['location' => $locations];
+
+        $response = new RedirectResponse(new App());
+        $response->withInput();
+
+        $this->assertSame($locations, old('location'));
+    }
+
+    public function testReallyWritable()
+    {
+        // cannot test fully on *nix
+        $this->assertTrue(is_really_writable(WRITEPATH));
+    }
+
+    public function testSlashItem()
+    {
+        $this->assertSame('/', slash_item('cookiePath')); // slash already there
+        $this->assertSame('', slash_item('cookieDomain')); // empty, so untouched
+        $this->assertSame('en/', slash_item('defaultLocale')); // slash appended
+    }
+
+    protected function injectSessionMock()
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => null,
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $appConfig = new App();
+
+        foreach ($defaults as $key => $config) {
+            $appConfig->{$key} = $config;
+        }
+
+        $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
+        $session->setLogger(new TestLogger(new Logger()));
+        BaseService::injectMock('session', $session);
+    }
+
+    // Make sure cookies are set by RedirectResponse this way
+    // See https://github.com/codeigniter4/CodeIgniter4/issues/1393
+    public function testRedirectResponseCookies1()
+    {
+        $loginTime = time();
+
+        $routes = service('routes');
+        $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
+
+        $answer1 = redirect()->route('login')
+            ->setCookie('foo', 'onething', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
+
+        $this->assertTrue($answer1->hasCookie('foo', 'onething'));
+        $this->assertTrue($answer1->hasCookie('login_time'));
+    }
+
+    public function testTrace()
+    {
+        ob_start();
+        trace();
+        $content = ob_get_clean();
+
+        $this->assertStringContainsString('Debug Backtrace', $content);
+    }
+
+    public function testViewNotSaveData()
+    {
+        $data = [
+            'testString' => 'bar',
+            'bar'        => 'baz',
+        ];
+        $this->assertStringContainsString('<h1>bar</h1>', view('\Tests\Support\View\Views\simples', $data, ['saveData' => false]));
+        $this->assertStringContainsString('<h1>is_not</h1>', view('\Tests\Support\View\Views\simples'));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testForceHttpsNullRequestAndResponse()
+    {
+        $this->assertNull(Services::response()->header('Location'));
+
+        force_https();
+
+        $this->assertSame('https://example.com/', Services::response()->header('Location')->getValue());
+    }
+
+    /**
+     * @dataProvider dirtyPathsProvider
+     *
+     * @param mixed $input
+     * @param mixed $expected
+     */
+    public function testCleanPathActuallyCleaningThePaths($input, $expected)
+    {
+        $this->assertSame($expected, clean_path($input));
+    }
+
+    public function dirtyPathsProvider()
+    {
+        $ds = DIRECTORY_SEPARATOR;
+
+        return [
+            [
+                ROOTPATH . 'spark',
+                'ROOTPATH' . $ds . 'spark',
+            ],
+            [
+                APPPATH . 'Config' . $ds . 'App.php',
+                'APPPATH' . $ds . 'Config' . $ds . 'App.php',
+            ],
+            [
+                SYSTEMPATH . 'CodeIgniter.php',
+                'SYSTEMPATH' . $ds . 'CodeIgniter.php',
+            ],
+            [
+                VENDORPATH . 'autoload.php',
+                'VENDORPATH' . $ds . 'autoload.php',
+            ],
+            [
+                FCPATH . 'index.php',
+                'FCPATH' . $ds . 'index.php',
+            ],
+        ];
+    }
+
+    public function testHelperWithFatalLocatorThrowsException()
+    {
+        // Replace the locator with one that will fail if it is called
+        $locator = new FatalLocator(Services::autoloader());
+        Services::injectMock('locator', $locator);
+
+        try {
+            helper('baguette');
+            $exception = false;
+        } catch (RuntimeException $e) {
+            $exception = true;
+        }
+
+        $this->assertTrue($exception);
+        Services::reset();
+    }
+
+    public function testHelperLoadsOnce()
+    {
+        // Load it the first time
+        helper('baguette');
+
+        // Replace the locator with one that will fail if it is called
+        $locator = new FatalLocator(Services::autoloader());
+        Services::injectMock('locator', $locator);
+
+        try {
+            helper('baguette');
+            $exception = false;
+        } catch (RuntimeException $e) {
+            $exception = true;
+        }
+
+        $this->assertFalse($exception);
+        Services::reset();
+    }
+
+    public function testIsCli()
+    {
+        $this->assertIsBool(is_cli());
+        $this->assertTrue(is_cli());
+    }
 }
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index b7e956488b00..1dca6f823ab8 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Config\Services;
@@ -7,88 +16,81 @@
 use ReflectionClass;
 use ReflectionMethod;
 
+/**
+ * @internal
+ */
 final class CommonSingleServiceTest extends CIUnitTestCase
 {
-	/**
-	 * @dataProvider serviceNamesProvider
-	 *
-	 * @param string $service
-	 *
-	 * @return void
-	 */
-	public function testSingleServiceWithNoParamsSupplied(string $service): void
-	{
-		$service1 = single_service($service);
-		$service2 = single_service($service);
-
-		$this->assertSame(get_class($service1), get_class($service2));
-		$this->assertNotSame($service1, $service2);
-	}
-
-	/**
-	 * @dataProvider serviceNamesProvider
-	 *
-	 * @param string $service
-	 *
-	 * @return void
-	 */
-	public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void
-	{
-		$params = [];
-		$method = new ReflectionMethod(Services::class, $service);
-
-		$params[] = $method->getNumberOfParameters() === 1 ? true : $method->getParameters()[0]->getDefaultValue();
-
-		$service1 = single_service($service, ...$params);
-		$service2 = single_service($service, ...$params);
-
-		$this->assertSame(get_class($service1), get_class($service2));
-		$this->assertNotSame($service1, $service2);
-	}
-
-	public function testSingleServiceWithAllParamsSupplied(): void
-	{
-		$cache1 = single_service('cache', null, true);
-		$cache2 = single_service('cache', null, true);
-
-		// Assert that even passing true as last param this will
-		// not create a shared instance.
-		$this->assertSame(get_class($cache1), get_class($cache2));
-		$this->assertNotSame($cache1, $cache2);
-	}
-
-	public function testSingleServiceWithGibberishGiven(): void
-	{
-		$this->assertNull(single_service('foo'));
-		$this->assertNull(single_service('bar'));
-		$this->assertNull(single_service('baz'));
-		$this->assertNull(single_service('caches'));
-		$this->assertNull(single_service('timers'));
-	}
-
-	public static function serviceNamesProvider(): iterable
-	{
-		$methods = (new ReflectionClass(Services::class))->getMethods(ReflectionMethod::IS_PUBLIC);
-
-		foreach ($methods as $method)
-		{
-			$name = $method->getName();
-			$excl = [
-				'__callStatic',
-				'serviceExists',
-				'reset',
-				'resetSingle',
-				'injectMock',
-				'encrypter', // Encrypter needs a starter key
-				'session', // Headers already sent
-			];
-
-			if (in_array($name, $excl, true))
-			{
-				continue;
-			}
-
-			yield [$name];
-		}
-	}
+    /**
+     * @dataProvider serviceNamesProvider
+     */
+    public function testSingleServiceWithNoParamsSupplied(string $service): void
+    {
+        $service1 = single_service($service);
+        $service2 = single_service($service);
+
+        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertNotSame($service1, $service2);
+    }
+
+    /**
+     * @dataProvider serviceNamesProvider
+     */
+    public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void
+    {
+        $params = [];
+        $method = new ReflectionMethod(Services::class, $service);
+
+        $params[] = $method->getNumberOfParameters() === 1 ? true : $method->getParameters()[0]->getDefaultValue();
+
+        $service1 = single_service($service, ...$params);
+        $service2 = single_service($service, ...$params);
+
+        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertNotSame($service1, $service2);
+    }
+
+    public function testSingleServiceWithAllParamsSupplied(): void
+    {
+        $cache1 = single_service('cache', null, true);
+        $cache2 = single_service('cache', null, true);
+
+        // Assert that even passing true as last param this will
+        // not create a shared instance.
+        $this->assertSame(get_class($cache1), get_class($cache2));
+        $this->assertNotSame($cache1, $cache2);
+    }
+
+    public function testSingleServiceWithGibberishGiven(): void
+    {
+        $this->assertNull(single_service('foo'));
+        $this->assertNull(single_service('bar'));
+        $this->assertNull(single_service('baz'));
+        $this->assertNull(single_service('caches'));
+        $this->assertNull(single_service('timers'));
+    }
+
+    public static function serviceNamesProvider(): iterable
+    {
+        $methods = (new ReflectionClass(Services::class))->getMethods(ReflectionMethod::IS_PUBLIC);
+
+        foreach ($methods as $method) {
+            $name = $method->getName();
+            $excl = [
+                '__callStatic',
+                'serviceExists',
+                'reset',
+                'resetSingle',
+                'injectMock',
+                'encrypter', // Encrypter needs a starter key
+                'session', // Headers already sent
+            ];
+
+            if (in_array($name, $excl, true)) {
+                continue;
+            }
+
+            yield [$name];
+        }
+    }
 }
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index cfada1b6b594..872e7ce48b2f 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -1,263 +1,271 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
-use SimpleConfig;
+use CodeIgniter\Test\CIUnitTestCase;
 use Encryption;
 use RegistrarConfig;
-use CodeIgniter\Test\CIUnitTestCase;
 use RuntimeException;
+use SimpleConfig;
 
-class BaseConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseConfigTest extends CIUnitTestCase
 {
-	protected $fixturesFolder;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->fixturesFolder = __DIR__ . '/fixtures';
-
-		if (! class_exists('SimpleConfig', false))
-		{
-			require $this->fixturesFolder . '/SimpleConfig.php';
-		}
-
-		if (! class_exists('RegistrarConfig', false))
-		{
-			require $this->fixturesFolder . '/RegistrarConfig.php';
-		}
-
-		if (! class_exists('Encryption', false))
-		{
-			require $this->fixturesFolder . '/Encryption.php';
-		}
-	}
-
-	public function testBasicValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-		$config = new SimpleConfig();
-
-		$this->assertNull($config->FOO);
-		$this->assertSame('', $config->echo);
-		$this->assertTrue($config->foxtrot);
-		$this->assertSame(18, $config->golf);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testServerValues()
-	{
-		$_SERVER = [
-			'simpleconfig.shortie' => 123,
-			'SimpleConfig.longie'  => 456,
-		];
-		$dotenv  = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-		$config = new SimpleConfig();
-
-		$this->assertSame('123', $config->shortie);
-		$this->assertSame('456', $config->longie);
-	}
-
-	public function testEnvironmentOverrides()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		// override config with ENV var
-		$this->assertSame('pow', $config->alpha);
-		// config should not be over-written by wrongly named ENV var
-		$this->assertSame('three', $config->charlie);
-		// override config with shortPrefix ENV var
-		$this->assertSame('hubbahubba', $config->delta);
-		// incorrect env name should not inject property
-		$this->assertObjectNotHasAttribute('notthere', $config);
-		// empty ENV var should not affect config setting
-		$this->assertSame('pineapple', $config->fruit);
-		// non-empty ENV var should overrideconfig setting
-		$this->assertSame('banana', $config->dessert);
-		// null property should not be affected
-		$this->assertNull($config->QEMPTYSTR);
-	}
-
-	public function testPrefixedValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		$this->assertSame('baz', $config->onedeep);
-	}
-
-	public function testPrefixedArrayValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		$this->assertSame('ci4', $config->default['name']);
-		$this->assertSame('Malcolm', $config->crew['captain']);
-		$this->assertSame('Spock', $config->crew['science']);
-		$this->assertArrayNotHasKey('pilot', $config->crew);
-		$this->assertTrue($config->crew['comms']);
-		$this->assertFalse($config->crew['doctor']);
-	}
-
-	public function testArrayValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		$this->assertSame('complex', $config->simple['name']);
-		$this->assertSame('foo', $config->first);
-		$this->assertSame('bar', $config->second);
-	}
-
-	public function testSetsDefaultValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		$this->assertSame('foo', $config->first);
-		$this->assertSame('bar', $config->second);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSetsDefaultValuesEncryptionUsingHex2Bin()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'encryption.env');
-		$dotenv->load();
-		$config = new Encryption();
-
-		// override config with ENV var
-		$this->assertSame('f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', bin2hex($config->key));
-		$this->assertSame('OpenSSL', $config->driver);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSetDefaultValuesEncryptionUsingBase64()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env');
-		$dotenv->load();
-		$config = new Encryption('base64');
-
-		$this->assertSame('L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', base64_encode($config->key));
-		$this->assertSame('OpenSSL', $config->driver);
-	}
-
-	public function testSetsDefaultValuesHex2Bin()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
-		$dotenv->load();
-		$config = new Encryption();
-
-		// override config with ENV var
-		$this->assertSame('84cf2c0811d5daf9e1c897825a3debce91f9a33391e639f72f7a4740b30675a2', bin2hex($config->key));
-		$this->assertSame('MCrypt', $config->driver);
-	}
-
-	public function testSetDefaultValuesBase64()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
-		$dotenv->load();
-		$config = new Encryption('base64');
-
-		$this->assertSame('Psf8bUHRh1UJYG2M7e+5ec3MdjpKpzAr0twamcAvOcI=', base64_encode($config->key));
-		$this->assertSame('MCrypt', $config->driver);
-	}
-
-	public function testRecognizesLooseValues()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'loose.env');
-		$dotenv->load();
-
-		$config = new SimpleConfig();
-
-		$this->assertEquals(0, $config->QZERO);
-		$this->assertSame('0', $config->QZEROSTR);
-		$this->assertSame(' ', $config->QEMPTYSTR);
-		$this->assertFalse($config->QFALSE);
-	}
-
-	public function testRegistrars()
-	{
-		$config              = new RegistrarConfig();
-		$config::$registrars = ['\Tests\Support\Config\TestRegistrar'];
-		$this->setPrivateProperty($config, 'didDiscovery', true);
-		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
-		$method();
-
-		// no change to unmodified property
-		$this->assertSame('bar', $config->foo);
-		// add to an existing array property
-		$this->assertSame(['baz', 'first', 'second'], $config->bar);
-		// add a new property
-		$this->assertSame('nice', $config->format);
-		// add a new array property
-		$this->assertSame(['apple', 'banana'], $config->fruit);
-	}
-
-	public function testBadRegistrar()
-	{
-		// Shouldn't change any values.
-		$config              = new RegistrarConfig();
-		$config::$registrars = ['\Tests\Support\Config\BadRegistrar'];
-		$this->setPrivateProperty($config, 'didDiscovery', true);
-
-		$this->expectException(RuntimeException::class);
-		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
-		$method();
-
-		$this->assertSame('bar', $config->foo);
-	}
-
-	public function testNotEnabled()
-	{
-		$modulesConfig          = config('Modules');
-		$modulesConfig->enabled = false;
-
-		$config              = new RegistrarConfig();
-		$config::$registrars = [];
-		$expected            = $config::$registrars;
-
-		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
-		$method();
-
-		$this->assertSame($expected, $config::$registrars);
-	}
-
-	public function testDidDiscovery()
-	{
-		$modulesConfig          = config('Modules');
-		$modulesConfig->enabled = true;
-
-		$config              = new RegistrarConfig();
-		$config::$registrars = [];
-		$this->setPrivateProperty($config, 'didDiscovery', false);
-
-		$method = $this->getPrivateMethodInvoker($config, 'registerProperties');
-		$method();
-
-		$this->assertSame(true, $this->getPrivateProperty($config, 'didDiscovery'));
-	}
-
+    protected $fixturesFolder;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->fixturesFolder = __DIR__ . '/fixtures';
+
+        if (! class_exists('SimpleConfig', false)) {
+            require $this->fixturesFolder . '/SimpleConfig.php';
+        }
+
+        if (! class_exists('RegistrarConfig', false)) {
+            require $this->fixturesFolder . '/RegistrarConfig.php';
+        }
+
+        if (! class_exists('Encryption', false)) {
+            require $this->fixturesFolder . '/Encryption.php';
+        }
+    }
+
+    public function testBasicValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+        $config = new SimpleConfig();
+
+        $this->assertNull($config->FOO);
+        $this->assertSame('', $config->echo);
+        $this->assertTrue($config->foxtrot);
+        $this->assertSame(18, $config->golf);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testServerValues()
+    {
+        $_SERVER = [
+            'simpleconfig.shortie' => 123,
+            'SimpleConfig.longie'  => 456,
+        ];
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+        $config = new SimpleConfig();
+
+        $this->assertSame('123', $config->shortie);
+        $this->assertSame('456', $config->longie);
+    }
+
+    public function testEnvironmentOverrides()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        // override config with ENV var
+        $this->assertSame('pow', $config->alpha);
+        // config should not be over-written by wrongly named ENV var
+        $this->assertSame('three', $config->charlie);
+        // override config with shortPrefix ENV var
+        $this->assertSame('hubbahubba', $config->delta);
+        // incorrect env name should not inject property
+        $this->assertObjectNotHasAttribute('notthere', $config);
+        // empty ENV var should not affect config setting
+        $this->assertSame('pineapple', $config->fruit);
+        // non-empty ENV var should overrideconfig setting
+        $this->assertSame('banana', $config->dessert);
+        // null property should not be affected
+        $this->assertNull($config->QEMPTYSTR);
+    }
+
+    public function testPrefixedValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        $this->assertSame('baz', $config->onedeep);
+    }
+
+    public function testPrefixedArrayValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        $this->assertSame('ci4', $config->default['name']);
+        $this->assertSame('Malcolm', $config->crew['captain']);
+        $this->assertSame('Spock', $config->crew['science']);
+        $this->assertArrayNotHasKey('pilot', $config->crew);
+        $this->assertTrue($config->crew['comms']);
+        $this->assertFalse($config->crew['doctor']);
+    }
+
+    public function testArrayValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        $this->assertSame('complex', $config->simple['name']);
+        $this->assertSame('foo', $config->first);
+        $this->assertSame('bar', $config->second);
+    }
+
+    public function testSetsDefaultValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        $this->assertSame('foo', $config->first);
+        $this->assertSame('bar', $config->second);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSetsDefaultValuesEncryptionUsingHex2Bin()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env');
+        $dotenv->load();
+        $config = new Encryption();
+
+        // override config with ENV var
+        $this->assertSame('f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', bin2hex($config->key));
+        $this->assertSame('OpenSSL', $config->driver);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSetDefaultValuesEncryptionUsingBase64()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env');
+        $dotenv->load();
+        $config = new Encryption('base64');
+
+        $this->assertSame('L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', base64_encode($config->key));
+        $this->assertSame('OpenSSL', $config->driver);
+    }
+
+    public function testSetsDefaultValuesHex2Bin()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
+        $dotenv->load();
+        $config = new Encryption();
+
+        // override config with ENV var
+        $this->assertSame('84cf2c0811d5daf9e1c897825a3debce91f9a33391e639f72f7a4740b30675a2', bin2hex($config->key));
+        $this->assertSame('MCrypt', $config->driver);
+    }
+
+    public function testSetDefaultValuesBase64()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
+        $dotenv->load();
+        $config = new Encryption('base64');
+
+        $this->assertSame('Psf8bUHRh1UJYG2M7e+5ec3MdjpKpzAr0twamcAvOcI=', base64_encode($config->key));
+        $this->assertSame('MCrypt', $config->driver);
+    }
+
+    public function testRecognizesLooseValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'loose.env');
+        $dotenv->load();
+
+        $config = new SimpleConfig();
+
+        $this->assertSame(0, (int) $config->QZERO);
+        $this->assertSame('0', $config->QZEROSTR);
+        $this->assertSame(' ', $config->QEMPTYSTR);
+        $this->assertFalse($config->QFALSE);
+    }
+
+    public function testRegistrars()
+    {
+        $config              = new RegistrarConfig();
+        $config::$registrars = ['\Tests\Support\Config\TestRegistrar'];
+        $this->setPrivateProperty($config, 'didDiscovery', true);
+        $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+        $method();
+
+        // no change to unmodified property
+        $this->assertSame('bar', $config->foo);
+        // add to an existing array property
+        $this->assertSame(['baz', 'first', 'second'], $config->bar);
+        // add a new property
+        $this->assertSame('nice', $config->format);
+        // add a new array property
+        $this->assertSame(['apple', 'banana'], $config->fruit);
+    }
+
+    public function testBadRegistrar()
+    {
+        // Shouldn't change any values.
+        $config              = new RegistrarConfig();
+        $config::$registrars = ['\Tests\Support\Config\BadRegistrar'];
+        $this->setPrivateProperty($config, 'didDiscovery', true);
+
+        $this->expectException(RuntimeException::class);
+        $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+        $method();
+
+        $this->assertSame('bar', $config->foo);
+    }
+
+    public function testNotEnabled()
+    {
+        $modulesConfig          = config('Modules');
+        $modulesConfig->enabled = false;
+
+        $config              = new RegistrarConfig();
+        $config::$registrars = [];
+        $expected            = $config::$registrars;
+
+        $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+        $method();
+
+        $this->assertSame($expected, $config::$registrars);
+    }
+
+    public function testDidDiscovery()
+    {
+        $modulesConfig          = config('Modules');
+        $modulesConfig->enabled = true;
+
+        $config              = new RegistrarConfig();
+        $config::$registrars = [];
+        $this->setPrivateProperty($config, 'didDiscovery', false);
+
+        $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
+        $method();
+
+        $this->assertTrue($this->getPrivateProperty($config, 'didDiscovery'));
+    }
 }
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index 1678e68b70b7..7f64a4851205 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -1,53 +1,64 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\DocTypes;
 use stdClass;
 
-class ConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigTest extends CIUnitTestCase
 {
+    public function testCreateSingleInstance()
+    {
+        $Config          = Config::get('DocTypes', false);
+        $NamespaceConfig = Config::get('Config\\DocTypes', false);
 
-	public function testCreateSingleInstance()
-	{
-		$Config          = Config::get('DocTypes', false);
-		$NamespaceConfig = Config::get('Config\\DocTypes', false);
-
-		$this->assertInstanceOf(DocTypes::class, $Config);
-		$this->assertInstanceOf(DocTypes::class, $NamespaceConfig);
-	}
-
-	public function testCreateInvalidInstance()
-	{
-		$Config = Config::get('gfnusvjai', false);
+        $this->assertInstanceOf(DocTypes::class, $Config);
+        $this->assertInstanceOf(DocTypes::class, $NamespaceConfig);
+    }
 
-		$this->assertNull($Config);
-	}
+    public function testCreateInvalidInstance()
+    {
+        $Config = Config::get('gfnusvjai', false);
 
-	public function testCreateSharedInstance()
-	{
-		$Config  = Config::get('DocTypes');
-		$Config2 = Config::get('Config\\DocTypes');
+        $this->assertNull($Config);
+    }
 
-		$this->assertTrue($Config === $Config2);
-	}
+    public function testCreateSharedInstance()
+    {
+        $Config  = Config::get('DocTypes');
+        $Config2 = Config::get('Config\\DocTypes');
 
-	public function testCreateNonConfig()
-	{
-		$Config = Config::get('Constants', false);
+        $this->assertTrue($Config === $Config2);
+    }
 
-		$this->assertNull($Config);
-	}
+    public function testCreateNonConfig()
+    {
+        $Config = Config::get('Constants', false);
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testInjection()
-	{
-		Config::reset();
-		Config::injectMock('Banana', new stdClass());
-		$this->assertNotNull(Config::get('Banana'));
-	}
+        $this->assertNull($Config);
+    }
 
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testInjection()
+    {
+        Config::reset();
+        Config::injectMock('Banana', new stdClass());
+        $this->assertNotNull(Config::get('Banana'));
+    }
 }
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 4297cfd8fa6f..dbdb1c1c6743 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,221 +16,188 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class DotEnvTest extends CIUnitTestCase
+final class DotEnvTest extends CIUnitTestCase
 {
-
-	protected $fixturesFolder;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->root           = vfsStream::setup();
-		$this->fixturesFolder = $this->root->url();
-		$this->path           = TESTPATH . 'system/Config/fixtures';
-		vfsStream::copyFromFileSystem($this->path, $this->root);
-
-		$file = 'unreadable.env';
-		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
-		chmod($path, 0644);
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-
-		$this->root = null;
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testReturnsFalseIfCannotFindFile()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'bogus');
-		$this->assertFalse($dotenv->load());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsVars()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder);
-		$dotenv->load();
-		$this->assertEquals('bar', getenv('FOO'));
-		$this->assertEquals('baz', getenv('BAR'));
-		$this->assertEquals('with spaces', getenv('SPACED'));
-		$this->assertEquals('', getenv('NULL'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testLoadsHex2Bin()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'encryption.env');
-		$dotenv->load();
-
-		$this->assertEquals('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('encryption.key'));
-		$this->assertEquals('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('different.key'));
-		$this->assertEquals('OpenSSL', getenv('encryption.driver'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testLoadsBase64()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env');
-		$dotenv->load();
-
-		$this->assertEquals('base64:L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', getenv('encryption.key'));
-		$this->assertEquals('OpenSSL', getenv('encryption.driver'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsNoneStringFiles()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 2);
-		$dotenv->load();
-		$this->assertEquals('bar', getenv('FOO'));
-		$this->assertEquals('baz', getenv('BAR'));
-		$this->assertEquals('with spaces', getenv('SPACED'));
-		$this->assertEquals('', getenv('NULL'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCommentedLoadsVars()
-	{
-		$dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
-		$dotenv->load();
-		$this->assertEquals('bar', getenv('CFOO'));
-		$this->assertFalse(getenv('CBAR'));
-		$this->assertFalse(getenv('CZOO'));
-		$this->assertEquals('with spaces', getenv('CSPACED'));
-		$this->assertEquals('a value with a # character', getenv('CQUOTES'));
-		$this->assertEquals('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
-		$this->assertEquals('', getenv('CNULL'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsUnreadableFile()
-	{
-		$file = 'unreadable.env';
-		$path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
-		chmod($path, 0000);
-		$this->expectException('\InvalidArgumentException');
-		$this->expectExceptionMessage("The .env file is not readable: {$path}");
-		$dotenv = new DotEnv($this->fixturesFolder, $file);
-		$dotenv->load();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testQuotedDotenvLoadsEnvironmentVars()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
-		$dotenv->load();
-		$this->assertEquals('bar', getenv('QFOO'));
-		$this->assertEquals('baz', getenv('QBAR'));
-		$this->assertEquals('with spaces', getenv('QSPACED'));
-		$this->assertEquals('', getenv('QNULL'));
-		$this->assertEquals('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
-		$this->assertEquals('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSpacedValuesWithoutQuotesThrowsException()
-	{
-		$this->expectException('InvalidArgumentException');
-		$this->expectExceptionMessage('.env values containing spaces must be surrounded by quotes.');
-
-		$dotenv = new Dotenv($this->fixturesFolder, 'spaced-wrong.env');
-		$dotenv->load();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsServerGlobals()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$this->assertEquals('bar', $_SERVER['FOO']);
-		$this->assertEquals('baz', $_SERVER['BAR']);
-		$this->assertEquals('with spaces', $_SERVER['SPACED']);
-		$this->assertEquals('', $_SERVER['NULL']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNamespacedVariables()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder, '.env');
-		$dotenv->load();
-
-		$this->assertEquals('complex', $_SERVER['SimpleConfig.simple.name']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsGetServerVar()
-	{
-		$_SERVER['SER_VAR'] = 'TT';
-		$dotenv             = new Dotenv($this->fixturesFolder, 'nested.env');
-		$dotenv->load();
-
-		$this->assertEquals('TT', $_ENV['NVAR7']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLoadsEnvGlobals()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder);
-		$dotenv->load();
-		$this->assertEquals('bar', $_ENV['FOO']);
-		$this->assertEquals('baz', $_ENV['BAR']);
-		$this->assertEquals('with spaces', $_ENV['SPACED']);
-		$this->assertEquals('', $_ENV['NULL']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNestedEnvironmentVars()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder, 'nested.env');
-		$dotenv->load();
-		$this->assertEquals('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
-		$this->assertEquals('Hello World!', $_ENV['NVAR4']);
-		$this->assertEquals('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
-		$this->assertEquals('Hello/World!', $_ENV['NVAR8']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDotenvAllowsSpecialCharacters()
-	{
-		$dotenv = new Dotenv($this->fixturesFolder, 'specialchars.env');
-		$dotenv->load();
-		$this->assertEquals('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
-		$this->assertEquals('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
-		$this->assertEquals('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
-		$this->assertEquals('22222:22#2^{', getenv('SPVAR4'));
-		$this->assertEquals('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
-	}
-
-	//--------------------------------------------------------------------
+    protected $fixturesFolder;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->root           = vfsStream::setup();
+        $this->fixturesFolder = $this->root->url();
+        $this->path           = TESTPATH . 'system/Config/fixtures';
+        vfsStream::copyFromFileSystem($this->path, $this->root);
+
+        $file = 'unreadable.env';
+        $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+        chmod($path, 0644);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->root = null;
+    }
+
+    public function testReturnsFalseIfCannotFindFile()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'bogus');
+        $this->assertFalse($dotenv->load());
+    }
+
+    public function testLoadsVars()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder);
+        $dotenv->load();
+        $this->assertSame('bar', getenv('FOO'));
+        $this->assertSame('baz', getenv('BAR'));
+        $this->assertSame('with spaces', getenv('SPACED'));
+        $this->assertSame('', getenv('NULL'));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testLoadsHex2Bin()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env');
+        $dotenv->load();
+
+        $this->assertSame('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('encryption.key'));
+        $this->assertSame('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('different.key'));
+        $this->assertSame('OpenSSL', getenv('encryption.driver'));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testLoadsBase64()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env');
+        $dotenv->load();
+
+        $this->assertSame('base64:L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', getenv('encryption.key'));
+        $this->assertSame('OpenSSL', getenv('encryption.driver'));
+    }
+
+    public function testLoadsNoneStringFiles()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 2);
+        $dotenv->load();
+        $this->assertSame('bar', getenv('FOO'));
+        $this->assertSame('baz', getenv('BAR'));
+        $this->assertSame('with spaces', getenv('SPACED'));
+        $this->assertSame('', getenv('NULL'));
+    }
+
+    public function testCommentedLoadsVars()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
+        $dotenv->load();
+        $this->assertSame('bar', getenv('CFOO'));
+        $this->assertFalse(getenv('CBAR'));
+        $this->assertFalse(getenv('CZOO'));
+        $this->assertSame('with spaces', getenv('CSPACED'));
+        $this->assertSame('a value with a # character', getenv('CQUOTES'));
+        $this->assertSame('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
+        $this->assertSame('', getenv('CNULL'));
+    }
+
+    public function testLoadsUnreadableFile()
+    {
+        $file = 'unreadable.env';
+        $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
+        chmod($path, 0000);
+        $this->expectException('\InvalidArgumentException');
+        $this->expectExceptionMessage("The .env file is not readable: {$path}");
+        $dotenv = new DotEnv($this->fixturesFolder, $file);
+        $dotenv->load();
+    }
+
+    public function testQuotedDotenvLoadsEnvironmentVars()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'quoted.env');
+        $dotenv->load();
+        $this->assertSame('bar', getenv('QFOO'));
+        $this->assertSame('baz', getenv('QBAR'));
+        $this->assertSame('with spaces', getenv('QSPACED'));
+        $this->assertSame('', getenv('QNULL'));
+        $this->assertSame('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
+        $this->assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
+    }
+
+    public function testSpacedValuesWithoutQuotesThrowsException()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('.env values containing spaces must be surrounded by quotes.');
+
+        $dotenv = new DotEnv($this->fixturesFolder, 'spaced-wrong.env');
+        $dotenv->load();
+    }
+
+    public function testLoadsServerGlobals()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $this->assertSame('bar', $_SERVER['FOO']);
+        $this->assertSame('baz', $_SERVER['BAR']);
+        $this->assertSame('with spaces', $_SERVER['SPACED']);
+        $this->assertSame('', $_SERVER['NULL']);
+    }
+
+    public function testNamespacedVariables()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+
+        $this->assertSame('complex', $_SERVER['SimpleConfig.simple.name']);
+    }
+
+    public function testLoadsGetServerVar()
+    {
+        $_SERVER['SER_VAR'] = 'TT';
+        $dotenv             = new DotEnv($this->fixturesFolder, 'nested.env');
+        $dotenv->load();
+
+        $this->assertSame('TT', $_ENV['NVAR7']);
+    }
+
+    public function testLoadsEnvGlobals()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder);
+        $dotenv->load();
+        $this->assertSame('bar', $_ENV['FOO']);
+        $this->assertSame('baz', $_ENV['BAR']);
+        $this->assertSame('with spaces', $_ENV['SPACED']);
+        $this->assertSame('', $_ENV['NULL']);
+    }
+
+    public function testNestedEnvironmentVars()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'nested.env');
+        $dotenv->load();
+        $this->assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
+        $this->assertSame('Hello World!', $_ENV['NVAR4']);
+        $this->assertSame('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
+        $this->assertSame('Hello/World!', $_ENV['NVAR8']);
+    }
+
+    public function testDotenvAllowsSpecialCharacters()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, 'specialchars.env');
+        $dotenv->load();
+        $this->assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
+        $this->assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
+        $this->assertSame('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
+        $this->assertSame('22222:22#2^{', getenv('SPVAR4'));
+        $this->assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
+    }
 }
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index 1d63bcba3beb..3a8cb7584f7d 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -1,266 +1,266 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
-use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
 use ReflectionClass;
 use stdClass;
 use Tests\Support\Widgets\OtherWidget;
 use Tests\Support\Widgets\SomeWidget;
 
-class FactoriesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FactoriesTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Factories::reset();
-	}
-
-	protected function getFactoriesStaticProperty(...$params)
-	{
-		// First parameter is the actual property
-		$name = array_shift($params);
-
-		$factory    = new ReflectionClass(Factories::class);
-		$properties = $factory->getStaticProperties();
-		$property   = $properties[$name] ?? [];
-
-		// If any additional parameters were provided then drill into the array
-		foreach ($params as $param)
-		{
-			$property = $property[$param];
-		}
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		return $property;
-	}
+        Factories::reset();
+    }
 
-	//--------------------------------------------------------------------
+    protected function getFactoriesStaticProperty(...$params)
+    {
+        // First parameter is the actual property
+        $name = array_shift($params);
 
-	public function testGetsOptions()
-	{
-		$result = Factories::getOptions('models');
+        $factory    = new ReflectionClass(Factories::class);
+        $properties = $factory->getStaticProperties();
+        $property   = $properties[$name] ?? [];
 
-		$this->assertTrue($result['preferApp']);
-	}
+        // If any additional parameters were provided then drill into the array
+        foreach ($params as $param) {
+            $property = $property[$param];
+        }
 
-	public function testGetsDefaultOptions()
-	{
-		$result = Factories::getOptions('blahblahs');
+        return $property;
+    }
 
-		$this->assertTrue($result['preferApp']);
-		$this->assertEquals('Blahblahs', $result['path']);
-	}
+    public function testGetsOptions()
+    {
+        $result = Factories::getOptions('models');
 
-	public function testSetsOptions()
-	{
-		Factories::setOptions('widgets', ['foo' => 'bar']);
+        $this->assertTrue($result['preferApp']);
+    }
 
-		$result = Factories::getOptions('widgets');
+    public function testGetsDefaultOptions()
+    {
+        $result = Factories::getOptions('blahblahs');
 
-		$this->assertEquals('bar', $result['foo']);
-		$this->assertEquals(true, $result['preferApp']);
-	}
+        $this->assertTrue($result['preferApp']);
+        $this->assertSame('Blahblahs', $result['path']);
+    }
 
-	public function testUsesConfigOptions()
-	{
-		// Simulate having a $widgets property in App\Config\Factory
-		$config          = new Factory();
-		$config->widgets = ['bar' => 'bam'];
-		Factories::injectMock('config', Factory::class, $config);
+    public function testSetsOptions()
+    {
+        Factories::setOptions('widgets', ['foo' => 'bar']);
 
-		$result = Factories::getOptions('widgets');
+        $result = Factories::getOptions('widgets');
 
-		$this->assertEquals('bam', $result['bar']);
-	}
+        $this->assertSame('bar', $result['foo']);
+        $this->assertTrue($result['preferApp']);
+    }
 
-	public function testSetOptionsResets()
-	{
-		Factories::injectMock('widgets', 'Banana', new stdClass());
+    public function testUsesConfigOptions()
+    {
+        // Simulate having a $widgets property in App\Config\Factory
+        $config          = new Factory();
+        $config->widgets = ['bar' => 'bam'];
+        Factories::injectMock('config', Factory::class, $config);
 
-		$result = $this->getFactoriesStaticProperty('instances');
-		$this->assertIsArray($result);
-		$this->assertArrayHasKey('widgets', $result);
+        $result = Factories::getOptions('widgets');
 
-		Factories::setOptions('widgets', []);
+        $this->assertSame('bam', $result['bar']);
+    }
 
-		$result = $this->getFactoriesStaticProperty('instances');
-		$this->assertIsArray($result);
-		$this->assertArrayNotHasKey('widgets', $result);
-	}
+    public function testSetOptionsResets()
+    {
+        Factories::injectMock('widgets', 'Banana', new stdClass());
 
-	public function testResetsAll()
-	{
-		Factories::setOptions('widgets', ['foo' => 'bar']);
+        $result = $this->getFactoriesStaticProperty('instances');
+        $this->assertIsArray($result);
+        $this->assertArrayHasKey('widgets', $result);
 
-		Factories::reset();
+        Factories::setOptions('widgets', []);
 
-		$result = $this->getFactoriesStaticProperty('options');
-		$this->assertEquals([], $result);
-	}
+        $result = $this->getFactoriesStaticProperty('instances');
+        $this->assertIsArray($result);
+        $this->assertArrayNotHasKey('widgets', $result);
+    }
 
-	public function testResetsComponentOnly()
-	{
-		Factories::setOptions('widgets', ['foo' => 'bar']);
-		Factories::setOptions('spigots', ['bar' => 'bam']);
+    public function testResetsAll()
+    {
+        Factories::setOptions('widgets', ['foo' => 'bar']);
 
-		Factories::reset('spigots');
+        Factories::reset();
 
-		$result = $this->getFactoriesStaticProperty('options');
-		$this->assertIsArray($result);
-		$this->assertArrayHasKey('widgets', $result);
-	}
+        $result = $this->getFactoriesStaticProperty('options');
+        $this->assertSame([], $result);
+    }
 
-	//--------------------------------------------------------------------
+    public function testResetsComponentOnly()
+    {
+        Factories::setOptions('widgets', ['foo' => 'bar']);
+        Factories::setOptions('spigots', ['bar' => 'bam']);
 
-	public function testGetsBasenameByBasename()
-	{
-		$this->assertEquals('SomeWidget', Factories::getBasename('SomeWidget'));
-	}
+        Factories::reset('spigots');
 
-	public function testGetsBasenameByClassname()
-	{
-		$this->assertEquals('SomeWidget', Factories::getBasename(SomeWidget::class));
-	}
+        $result = $this->getFactoriesStaticProperty('options');
+        $this->assertIsArray($result);
+        $this->assertArrayHasKey('widgets', $result);
+    }
 
-	public function testGetsBasenameByAbsoluteClassname()
-	{
-		$this->assertEquals('UserModel', Factories::getBasename('\Tests\Support\Models\UserModel'));
-	}
+    public function testGetsBasenameByBasename()
+    {
+        $this->assertSame('SomeWidget', Factories::getBasename('SomeWidget'));
+    }
 
-	public function testGetsBasenameInvalid()
-	{
-		$this->assertEquals('', Factories::getBasename('Tests\\Support\\'));
-	}
+    public function testGetsBasenameByClassname()
+    {
+        $this->assertSame('SomeWidget', Factories::getBasename(SomeWidget::class));
+    }
 
-	//--------------------------------------------------------------------
+    public function testGetsBasenameByAbsoluteClassname()
+    {
+        $this->assertSame('UserModel', Factories::getBasename('\Tests\Support\Models\UserModel'));
+    }
 
-	public function testCreatesByBasename()
-	{
-		$result = Factories::widgets('SomeWidget', ['getShared' => false]);
+    public function testGetsBasenameInvalid()
+    {
+        $this->assertSame('', Factories::getBasename('Tests\\Support\\'));
+    }
 
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+    public function testCreatesByBasename()
+    {
+        $result = Factories::widgets('SomeWidget', ['getShared' => false]);
 
-	public function testCreatesByClassname()
-	{
-		$result = Factories::widgets(SomeWidget::class, ['getShared' => false]);
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+    public function testCreatesByClassname()
+    {
+        $result = Factories::widgets(SomeWidget::class, ['getShared' => false]);
 
-	public function testCreatesByAbsoluteClassname()
-	{
-		$result = Factories::models('\Tests\Support\Models\UserModel', ['getShared' => false]);
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-		$this->assertInstanceOf('Tests\Support\Models\UserModel', $result);
-	}
+    public function testCreatesByAbsoluteClassname()
+    {
+        $result = Factories::models('\Tests\Support\Models\UserModel', ['getShared' => false]);
 
-	public function testCreatesInvalid()
-	{
-		$result = Factories::widgets('gfnusvjai', ['getShared' => false]);
+        $this->assertInstanceOf('Tests\Support\Models\UserModel', $result);
+    }
 
-		$this->assertNull($result);
-	}
+    public function testCreatesInvalid()
+    {
+        $result = Factories::widgets('gfnusvjai', ['getShared' => false]);
 
-	public function testIgnoresNonClass()
-	{
-		$result = Factories::widgets('NopeWidget', ['getShared' => false]);
+        $this->assertNull($result);
+    }
 
-		$this->assertNull($result);
-	}
+    public function testIgnoresNonClass()
+    {
+        $result = Factories::widgets('NopeWidget', ['getShared' => false]);
 
-	public function testReturnsSharedInstance()
-	{
-		$widget1 = Factories::widgets('SomeWidget');
-		$widget2 = Factories::widgets(SomeWidget::class);
+        $this->assertNull($result);
+    }
 
-		$this->assertSame($widget1, $widget2);
-	}
+    public function testReturnsSharedInstance()
+    {
+        $widget1 = Factories::widgets('SomeWidget');
+        $widget2 = Factories::widgets(SomeWidget::class);
 
-	public function testInjection()
-	{
-		Factories::injectMock('widgets', 'Banana', new stdClass());
+        $this->assertSame($widget1, $widget2);
+    }
 
-		$result = Factories::widgets('Banana');
+    public function testInjection()
+    {
+        Factories::injectMock('widgets', 'Banana', new stdClass());
 
-		$this->assertInstanceOf(stdClass::class, $result);
-	}
+        $result = Factories::widgets('Banana');
 
-	//--------------------------------------------------------------------
+        $this->assertInstanceOf(stdClass::class, $result);
+    }
 
-	public function testRespectsComponentAlias()
-	{
-		Factories::setOptions('tedwigs', ['component' => 'widgets']);
+    public function testRespectsComponentAlias()
+    {
+        Factories::setOptions('tedwigs', ['component' => 'widgets']);
 
-		$result = Factories::tedwigs('SomeWidget');
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+        $result = Factories::tedwigs('SomeWidget');
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-	public function testRespectsPath()
-	{
-		Factories::setOptions('models', ['path' => 'Widgets']);
+    public function testRespectsPath()
+    {
+        Factories::setOptions('models', ['path' => 'Widgets']);
 
-		$result = Factories::models('SomeWidget');
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+        $result = Factories::models('SomeWidget');
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-	public function testRespectsInstanceOf()
-	{
-		Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
+    public function testRespectsInstanceOf()
+    {
+        Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
 
-		$result = Factories::widgets('SomeWidget');
-		$this->assertInstanceOf(SomeWidget::class, $result);
+        $result = Factories::widgets('SomeWidget');
+        $this->assertInstanceOf(SomeWidget::class, $result);
 
-		$result = Factories::widgets('OtherWidget');
-		$this->assertNull($result);
-	}
+        $result = Factories::widgets('OtherWidget');
+        $this->assertNull($result);
+    }
 
-	public function testSharedRespectsInstanceOf()
-	{
-		Factories::injectMock('widgets', 'SomeWidget', new OtherWidget());
+    public function testSharedRespectsInstanceOf()
+    {
+        Factories::injectMock('widgets', 'SomeWidget', new OtherWidget());
 
-		$result = Factories::widgets('SomeWidget', ['instanceOf' => stdClass::class]);
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+        $result = Factories::widgets('SomeWidget', ['instanceOf' => stdClass::class]);
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-	public function testPrioritizesParameterOptions()
-	{
-		Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
+    public function testPrioritizesParameterOptions()
+    {
+        Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
 
-		$result = Factories::widgets('OtherWidget', ['instanceOf' => null]);
-		$this->assertInstanceOf(OtherWidget::class, $result);
-	}
+        $result = Factories::widgets('OtherWidget', ['instanceOf' => null]);
+        $this->assertInstanceOf(OtherWidget::class, $result);
+    }
 
-	public function testFindsAppFirst()
-	{
-		// Create a fake class in App
-		$class = 'App\Widgets\OtherWidget';
-		if (! class_exists($class))
-		{
-			class_alias(SomeWidget::class, $class);
-		}
+    public function testFindsAppFirst()
+    {
+        // Create a fake class in App
+        $class = 'App\Widgets\OtherWidget';
+        if (! class_exists($class)) {
+            class_alias(SomeWidget::class, $class);
+        }
 
-		$result = Factories::widgets('OtherWidget');
-		$this->assertInstanceOf(SomeWidget::class, $result);
-	}
+        $result = Factories::widgets('OtherWidget');
+        $this->assertInstanceOf(SomeWidget::class, $result);
+    }
 
-	public function testpreferAppOverridesClassname()
-	{
-		// Create a fake class in App
-		$class = 'App\Widgets\OtherWidget';
-		if (! class_exists($class))
-		{
-			class_alias(SomeWidget::class, $class);
-		}
+    public function testpreferAppOverridesClassname()
+    {
+        // Create a fake class in App
+        $class = 'App\Widgets\OtherWidget';
+        if (! class_exists($class)) {
+            class_alias(SomeWidget::class, $class);
+        }
 
-		$result = Factories::widgets(OtherWidget::class);
-		$this->assertInstanceOf(SomeWidget::class, $result);
+        $result = Factories::widgets(OtherWidget::class);
+        $this->assertInstanceOf(SomeWidget::class, $result);
 
-		Factories::setOptions('widgets', ['preferApp' => false]);
+        Factories::setOptions('widgets', ['preferApp' => false]);
 
-		$result = Factories::widgets(OtherWidget::class);
-		$this->assertInstanceOf(OtherWidget::class, $result);
-	}
+        $result = Factories::widgets(OtherWidget::class);
+        $this->assertInstanceOf(OtherWidget::class, $result);
+    }
 }
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index 65fcd02fee3e..cbd389882fcf 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -1,89 +1,96 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Mimes;
 
-class MimesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MimesTest extends CIUnitTestCase
 {
-	public function extensionsList()
-	{
-		return [
-			'null'      => [
-				null,
-				'xkadjflkjdsf',
-			],
-			'single'    => [
-				'cpt',
-				'application/mac-compactpro',
-			],
-			'trimmed'   => [
-				'cpt',
-				' application/mac-compactpro ',
-			],
-			'manyMimes' => [
-				'csv',
-				'text/csv',
-			],
-			'mixedCase' => [
-				'csv',
-				'text/CSV',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider extensionsList
-	 *
-	 * @param $expected
-	 * @param $ext
-	 */
-	public function testGuessExtensionFromType($expected, $mime)
-	{
-		$this->assertEquals($expected, Mimes::guessExtensionFromType($mime));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function mimesList()
-	{
-		return [
-			'null'      => [
-				null,
-				'xalkjdlfkj',
-			],
-			'single'    => [
-				'audio/midi',
-				'mid',
-			],
-			'many'      => [
-				'image/bmp',
-				'bmp',
-			],
-			'trimmed'   => [
-				'image/bmp',
-				'.bmp',
-			],
-			'mixedCase' => [
-				'image/bmp',
-				'BMP',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
+    public function extensionsList()
+    {
+        return [
+            'null' => [
+                null,
+                'xkadjflkjdsf',
+            ],
+            'single' => [
+                'cpt',
+                'application/mac-compactpro',
+            ],
+            'trimmed' => [
+                'cpt',
+                ' application/mac-compactpro ',
+            ],
+            'manyMimes' => [
+                'csv',
+                'text/csv',
+            ],
+            'mixedCase' => [
+                'csv',
+                'text/CSV',
+            ],
+        ];
+    }
 
-	/**
-	 * @dataProvider mimesList
-	 */
-	public function testGuessTypeFromExtension($expected, $ext)
-	{
-		$this->assertEquals($expected, Mimes::guessTypeFromExtension($ext));
-	}
+    /**
+     * @dataProvider extensionsList
+     *
+     * @param $expected
+     * @param $ext
+     * @param mixed $mime
+     */
+    public function testGuessExtensionFromType($expected, $mime)
+    {
+        $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
+    }
 
-	//--------------------------------------------------------------------
+    public function mimesList()
+    {
+        return [
+            'null' => [
+                null,
+                'xalkjdlfkj',
+            ],
+            'single' => [
+                'audio/midi',
+                'mid',
+            ],
+            'many' => [
+                'image/bmp',
+                'bmp',
+            ],
+            'trimmed' => [
+                'image/bmp',
+                '.bmp',
+            ],
+            'mixedCase' => [
+                'image/bmp',
+                'BMP',
+            ],
+        ];
+    }
 
+    /**
+     * @dataProvider mimesList
+     *
+     * @param mixed $expected
+     * @param mixed $ext
+     */
+    public function testGuessTypeFromExtension($expected, $ext)
+    {
+        $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
+    }
 }
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 1a763447d86a..6733ee06fff6 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Autoloader\Autoloader;
@@ -36,381 +45,378 @@
 use Config\Exceptions;
 use Tests\Support\Config\Services as Services;
 
-class ServicesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ServicesTest extends CIUnitTestCase
 {
-	protected $config;
-	protected $original;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->original = $_SERVER;
-		$this->config   = new App();
-	}
-
-	public function tearDown(): void
-	{
-		$_SERVER = $this->original;
-		Services::reset();
-	}
-
-	public function testCanReplaceFrameworkServices()
-	{
-		$this->expectException('RuntimeException');
-		$this->expectExceptionMessage('Service originated from Tests\Support\Config\Services');
-
-		Services::uri('testCanReplaceFrameworkServices');
-	}
-
-	public function testNewAutoloader()
-	{
-		$actual = Services::autoloader();
-		$this->assertInstanceOf(Autoloader::class, $actual);
-	}
-
-	public function testNewUnsharedAutoloader()
-	{
-		$actual = Services::autoloader(false);
-		$this->assertInstanceOf(Autoloader::class, $actual);
-	}
-
-	public function testNewFileLocator()
-	{
-		$actual = Services::locator();
-		$this->assertInstanceOf(FileLocator::class, $actual);
-	}
-
-	public function testNewUnsharedFileLocator()
-	{
-		$actual = Services::locator(false);
-		$this->assertInstanceOf(FileLocator::class, $actual);
-	}
-
-	public function testNewCurlRequest()
-	{
-		$actual = Services::curlrequest();
-		$this->assertInstanceOf(CURLRequest::class, $actual);
-	}
-
-	public function testNewEmail()
-	{
-		$actual = Services::email();
-		$this->assertInstanceOf(Email::class, $actual);
-	}
-
-	public function testNewUnsharedEmailWithEmptyConfig()
-	{
-		$actual = Services::email(null, false);
-		$this->assertInstanceOf(Email::class, $actual);
-	}
-
-	public function testNewUnsharedEmailWithNonEmptyConfig()
-	{
-		$actual = Services::email(new \Config\Email(), false);
-		$this->assertInstanceOf(Email::class, $actual);
-	}
-
-	public function testNewExceptions()
-	{
-		$actual = Services::exceptions(new Exceptions(), Services::request(), Services::response());
-		$this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
-	}
-
-	public function testNewExceptionsWithNullConfig()
-	{
-		$actual = Services::exceptions(null, null, null, false);
-		$this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
-	}
-
-	public function testNewIterator()
-	{
-		$actual = Services::iterator();
-		$this->assertInstanceOf(Iterator::class, $actual);
-	}
-
-	public function testNewImage()
-	{
-		$actual = Services::image();
-		$this->assertInstanceOf(ImageHandlerInterface::class, $actual);
-	}
-
-	//  public function testNewMigrationRunner()
-	//  {
-	//      //FIXME - docs aren't clear about setting this up to just make sure that the service
-	//      // returns a MigrationRunner
-	//      $config = new \Config\Migrations();
-	//      $db = new \CodeIgniter\Database\MockConnection([]);
-	//      $this->expectException('InvalidArgumentException');
-	//      $actual = Services::migrations($config, $db);
-	//      $this->assertInstanceOf(\CodeIgniter\Database\MigrationRunner::class, $actual);
-	//  }
-	//
-	public function testNewNegotiatorWithNullConfig()
-	{
-		$actual = Services::negotiator(null);
-		$this->assertInstanceOf(Negotiate::class, $actual);
-	}
-
-	public function testNewClirequest()
-	{
-		$actual = Services::clirequest(null);
-		$this->assertInstanceOf(CLIRequest::class, $actual);
-	}
-
-	public function testNewUnsharedClirequest()
-	{
-		$actual = Services::clirequest(null, false);
-		$this->assertInstanceOf(CLIRequest::class, $actual);
-	}
-
-	public function testNewLanguage()
-	{
-		$actual = Services::language();
-		$this->assertInstanceOf(Language::class, $actual);
-		$this->assertEquals('en', $actual->getLocale());
-
-		Services::language('la');
-		$this->assertEquals('la', $actual->getLocale());
-	}
-
-	public function testNewUnsharedLanguage()
-	{
-		$actual = Services::language(null, false);
-		$this->assertInstanceOf(Language::class, $actual);
-		$this->assertEquals('en', $actual->getLocale());
-
-		Services::language('la', false);
-		$this->assertEquals('en', $actual->getLocale());
-	}
-
-	public function testNewPager()
-	{
-		$actual = Services::pager(null);
-		$this->assertInstanceOf(Pager::class, $actual);
-	}
-
-	public function testNewThrottlerFromShared()
-	{
-		$actual = Services::throttler();
-		$this->assertInstanceOf(Throttler::class, $actual);
-	}
-
-	public function testNewThrottler()
-	{
-		$actual = Services::throttler(false);
-		$this->assertInstanceOf(Throttler::class, $actual);
-	}
-
-	public function testNewToolbar()
-	{
-		$actual = Services::toolbar(null);
-		$this->assertInstanceOf(Toolbar::class, $actual);
-	}
-
-	public function testNewUri()
-	{
-		$actual = Services::uri(null);
-		$this->assertInstanceOf(URI::class, $actual);
-	}
-
-	public function testNewValidation()
-	{
-		$actual = Services::validation(null);
-		$this->assertInstanceOf(Validation::class, $actual);
-	}
-
-	public function testNewViewcellFromShared()
-	{
-		$actual = Services::viewcell();
-		$this->assertInstanceOf(Cell::class, $actual);
-	}
-
-	public function testNewViewcell()
-	{
-		$actual = Services::viewcell(false);
-		$this->assertInstanceOf(Cell::class, $actual);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testNewSession()
-	{
-		$actual = Services::session($this->config);
-		$this->assertInstanceOf(Session::class, $actual);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testNewSessionWithNullConfig()
-	{
-		$actual = Services::session(null, false);
-		$this->assertInstanceOf(Session::class, $actual);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testCallStatic()
-	{
-		// __callStatic should kick in for this but fail
-		$actual = Services::SeSsIoNs(null, false);
-		$this->assertNull($actual);
-		// __callStatic should kick in for this
-		$actual = Services::SeSsIoN(null, false);
-		$this->assertInstanceOf(Session::class, $actual);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testCallStaticDirectly()
-	{
-		//      $actual = \CodeIgniter\Config\Services::SeSsIoN(null, false); // original
-		$actual = Services::__callStatic('SeSsIoN', [null, false]);
-		$this->assertInstanceOf(Session::class, $actual);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testMockInjection()
-	{
-		Services::injectMock('response', new MockResponse(new App()));
-		$response = service('response');
-		$this->assertInstanceOf(MockResponse::class, $response);
-
-		Services::injectMock('response', new MockResponse(new App()));
-		$response2 = service('response');
-		$this->assertInstanceOf(MockResponse::class, $response2);
-
-		$this->assertEquals($response, $response2);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testReset()
-	{
-		Services::injectMock('response', new MockResponse(new App()));
-		$response = service('response');
-		$this->assertInstanceOf(MockResponse::class, $response);
-
-		Services::reset(true); // reset mocks & shared instances
-
-		Services::injectMock('response', new MockResponse(new App()));
-		$response2 = service('response');
-		$this->assertInstanceOf(MockResponse::class, $response2);
-
-		$this->assertTrue($response !== $response2);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testResetSingle()
-	{
-		Services::injectMock('response', new MockResponse(new App()));
-		Services::injectMock('security', new MockSecurity(new App()));
-		$response = service('response');
-		$security = service('security');
-		$this->assertInstanceOf(MockResponse::class, $response);
-		$this->assertInstanceOf(MockSecurity::class, $security);
-
-		Services::resetSingle('response');
-
-		$response2 = service('response');
-		$security2 = service('security');
-		$this->assertNotInstanceOf(MockResponse::class, $response2);
-		$this->assertInstanceOf(MockSecurity::class, $security2);
-
-		$this->assertNotSame($response, $response2);
-		$this->assertSame($security, $security2);
-	}
-
-	public function testFilters()
-	{
-		$result = Services::filters();
-		$this->assertInstanceOf(Filters::class, $result);
-	}
-
-	public function testFormat()
-	{
-		$this->assertInstanceOf(Format::class, Services::format());
-	}
-
-	public function testUnsharedFormat()
-	{
-		$this->assertInstanceOf(Format::class, Services::format(null, false));
-	}
-
-	public function testHoneypot()
-	{
-		$result = Services::honeypot();
-		$this->assertInstanceOf(Honeypot::class, $result);
-	}
-
-	public function testMigrations()
-	{
-		$result = Services::migrations();
-		$this->assertInstanceOf(MigrationRunner::class, $result);
-	}
-
-	public function testParser()
-	{
-		$result = Services::parser();
-		$this->assertInstanceOf(Parser::class, $result);
-	}
-
-	public function testRedirectResponse()
-	{
-		$result = Services::redirectResponse();
-		$this->assertInstanceOf(RedirectResponse::class, $result);
-	}
-
-	public function testRoutes()
-	{
-		$result = Services::routes();
-		$this->assertInstanceOf(RouteCollection::class, $result);
-	}
-
-	public function testRouter()
-	{
-		$result = Services::router();
-		$this->assertInstanceOf(Router::class, $result);
-	}
-
-	public function testSecurity()
-	{
-		$result = Services::security();
-		$this->assertInstanceOf(Security::class, $result);
-	}
-
-	public function testTimer()
-	{
-		$result = Services::timer();
-		$this->assertInstanceOf(Timer::class, $result);
-	}
-
-	public function testTypography()
-	{
-		$result = Services::typography();
-		$this->assertInstanceOf(Typography::class, $result);
-	}
-
-	public function testServiceInstance()
-	{
-		rename(COMPOSER_PATH, COMPOSER_PATH . '.backup');
-		$this->assertInstanceOf(\Config\Services::class, new \Config\Services());
-		rename(COMPOSER_PATH . '.backup', COMPOSER_PATH);
-	}
+    protected $config;
+    protected $original;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->original = $_SERVER;
+        $this->config   = new App();
+    }
+
+    protected function tearDown(): void
+    {
+        $_SERVER = $this->original;
+        Services::reset();
+    }
+
+    public function testCanReplaceFrameworkServices()
+    {
+        $this->expectException('RuntimeException');
+        $this->expectExceptionMessage('Service originated from Tests\Support\Config\Services');
+
+        Services::uri('testCanReplaceFrameworkServices');
+    }
+
+    public function testNewAutoloader()
+    {
+        $actual = Services::autoloader();
+        $this->assertInstanceOf(Autoloader::class, $actual);
+    }
+
+    public function testNewUnsharedAutoloader()
+    {
+        $actual = Services::autoloader(false);
+        $this->assertInstanceOf(Autoloader::class, $actual);
+    }
+
+    public function testNewFileLocator()
+    {
+        $actual = Services::locator();
+        $this->assertInstanceOf(FileLocator::class, $actual);
+    }
+
+    public function testNewUnsharedFileLocator()
+    {
+        $actual = Services::locator(false);
+        $this->assertInstanceOf(FileLocator::class, $actual);
+    }
+
+    public function testNewCurlRequest()
+    {
+        $actual = Services::curlrequest();
+        $this->assertInstanceOf(CURLRequest::class, $actual);
+    }
+
+    public function testNewEmail()
+    {
+        $actual = Services::email();
+        $this->assertInstanceOf(Email::class, $actual);
+    }
+
+    public function testNewUnsharedEmailWithEmptyConfig()
+    {
+        $actual = Services::email(null, false);
+        $this->assertInstanceOf(Email::class, $actual);
+    }
+
+    public function testNewUnsharedEmailWithNonEmptyConfig()
+    {
+        $actual = Services::email(new \Config\Email(), false);
+        $this->assertInstanceOf(Email::class, $actual);
+    }
+
+    public function testNewExceptions()
+    {
+        $actual = Services::exceptions(new Exceptions(), Services::request(), Services::response());
+        $this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
+    }
+
+    public function testNewExceptionsWithNullConfig()
+    {
+        $actual = Services::exceptions(null, null, null, false);
+        $this->assertInstanceOf(\CodeIgniter\Debug\Exceptions::class, $actual);
+    }
+
+    public function testNewIterator()
+    {
+        $actual = Services::iterator();
+        $this->assertInstanceOf(Iterator::class, $actual);
+    }
+
+    public function testNewImage()
+    {
+        $actual = Services::image();
+        $this->assertInstanceOf(ImageHandlerInterface::class, $actual);
+    }
+
+    public function testNewNegotiatorWithNullConfig()
+    {
+        $actual = Services::negotiator(null);
+        $this->assertInstanceOf(Negotiate::class, $actual);
+    }
+
+    public function testNewClirequest()
+    {
+        $actual = Services::clirequest(null);
+        $this->assertInstanceOf(CLIRequest::class, $actual);
+    }
+
+    public function testNewUnsharedClirequest()
+    {
+        $actual = Services::clirequest(null, false);
+        $this->assertInstanceOf(CLIRequest::class, $actual);
+    }
+
+    public function testNewLanguage()
+    {
+        $actual = Services::language();
+        $this->assertInstanceOf(Language::class, $actual);
+        $this->assertSame('en', $actual->getLocale());
+
+        Services::language('la');
+        $this->assertSame('la', $actual->getLocale());
+    }
+
+    public function testNewUnsharedLanguage()
+    {
+        $actual = Services::language(null, false);
+        $this->assertInstanceOf(Language::class, $actual);
+        $this->assertSame('en', $actual->getLocale());
+
+        Services::language('la', false);
+        $this->assertSame('en', $actual->getLocale());
+    }
+
+    public function testNewPager()
+    {
+        $actual = Services::pager(null);
+        $this->assertInstanceOf(Pager::class, $actual);
+    }
+
+    public function testNewThrottlerFromShared()
+    {
+        $actual = Services::throttler();
+        $this->assertInstanceOf(Throttler::class, $actual);
+    }
+
+    public function testNewThrottler()
+    {
+        $actual = Services::throttler(false);
+        $this->assertInstanceOf(Throttler::class, $actual);
+    }
+
+    public function testNewToolbar()
+    {
+        $actual = Services::toolbar(null);
+        $this->assertInstanceOf(Toolbar::class, $actual);
+    }
+
+    public function testNewUri()
+    {
+        $actual = Services::uri(null);
+        $this->assertInstanceOf(URI::class, $actual);
+    }
+
+    public function testNewValidation()
+    {
+        $actual = Services::validation(null);
+        $this->assertInstanceOf(Validation::class, $actual);
+    }
+
+    public function testNewViewcellFromShared()
+    {
+        $actual = Services::viewcell();
+        $this->assertInstanceOf(Cell::class, $actual);
+    }
+
+    public function testNewViewcell()
+    {
+        $actual = Services::viewcell(false);
+        $this->assertInstanceOf(Cell::class, $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testNewSession()
+    {
+        $actual = Services::session($this->config);
+        $this->assertInstanceOf(Session::class, $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testNewSessionWithNullConfig()
+    {
+        $actual = Services::session(null, false);
+        $this->assertInstanceOf(Session::class, $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testCallStatic()
+    {
+        // __callStatic should kick in for this but fail
+        $actual = Services::SeSsIoNs(null, false);
+        $this->assertNull($actual);
+        // __callStatic should kick in for this
+        $actual = Services::SeSsIoN(null, false);
+        $this->assertInstanceOf(Session::class, $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testCallStaticDirectly()
+    {
+        //      $actual = \CodeIgniter\Config\Services::SeSsIoN(null, false); // original
+        $actual = Services::__callStatic('SeSsIoN', [null, false]);
+        $this->assertInstanceOf(Session::class, $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testMockInjection()
+    {
+        Services::injectMock('response', new MockResponse(new App()));
+        $response = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response);
+
+        Services::injectMock('response', new MockResponse(new App()));
+        $response2 = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response2);
+
+        Services::injectMock('response', $response);
+        $response3 = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response3);
+
+        $this->assertNotSame($response, $response2);
+        $this->assertSame($response, $response3);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testReset()
+    {
+        Services::injectMock('response', new MockResponse(new App()));
+        $response = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response);
+
+        Services::reset(true); // reset mocks & shared instances
+
+        Services::injectMock('response', new MockResponse(new App()));
+        $response2 = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response2);
+
+        $this->assertTrue($response !== $response2);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testResetSingle()
+    {
+        Services::injectMock('response', new MockResponse(new App()));
+        Services::injectMock('security', new MockSecurity(new App()));
+        $response = service('response');
+        $security = service('security');
+        $this->assertInstanceOf(MockResponse::class, $response);
+        $this->assertInstanceOf(MockSecurity::class, $security);
+
+        Services::resetSingle('response');
+
+        $response2 = service('response');
+        $security2 = service('security');
+        $this->assertNotInstanceOf(MockResponse::class, $response2);
+        $this->assertInstanceOf(MockSecurity::class, $security2);
+
+        $this->assertNotSame($response, $response2);
+        $this->assertSame($security, $security2);
+    }
+
+    public function testFilters()
+    {
+        $result = Services::filters();
+        $this->assertInstanceOf(Filters::class, $result);
+    }
+
+    public function testFormat()
+    {
+        $this->assertInstanceOf(Format::class, Services::format());
+    }
+
+    public function testUnsharedFormat()
+    {
+        $this->assertInstanceOf(Format::class, Services::format(null, false));
+    }
+
+    public function testHoneypot()
+    {
+        $result = Services::honeypot();
+        $this->assertInstanceOf(Honeypot::class, $result);
+    }
+
+    public function testMigrations()
+    {
+        $result = Services::migrations();
+        $this->assertInstanceOf(MigrationRunner::class, $result);
+    }
+
+    public function testParser()
+    {
+        $result = Services::parser();
+        $this->assertInstanceOf(Parser::class, $result);
+    }
+
+    public function testRedirectResponse()
+    {
+        $result = Services::redirectResponse();
+        $this->assertInstanceOf(RedirectResponse::class, $result);
+    }
+
+    public function testRoutes()
+    {
+        $result = Services::routes();
+        $this->assertInstanceOf(RouteCollection::class, $result);
+    }
+
+    public function testRouter()
+    {
+        $result = Services::router();
+        $this->assertInstanceOf(Router::class, $result);
+    }
+
+    public function testSecurity()
+    {
+        $result = Services::security();
+        $this->assertInstanceOf(Security::class, $result);
+    }
+
+    public function testTimer()
+    {
+        $result = Services::timer();
+        $this->assertInstanceOf(Timer::class, $result);
+    }
+
+    public function testTypography()
+    {
+        $result = Services::typography();
+        $this->assertInstanceOf(Typography::class, $result);
+    }
+
+    public function testServiceInstance()
+    {
+        rename(COMPOSER_PATH, COMPOSER_PATH . '.backup');
+        $this->assertInstanceOf(\Config\Services::class, new \Config\Services());
+        rename(COMPOSER_PATH . '.backup', COMPOSER_PATH);
+    }
 }
diff --git a/tests/system/Config/fixtures/Encryption.php b/tests/system/Config/fixtures/Encryption.php
index 9cdc2d4ee2d9..2793795f56ff 100644
--- a/tests/system/Config/fixtures/Encryption.php
+++ b/tests/system/Config/fixtures/Encryption.php
@@ -1,25 +1,31 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 use Config\Encryption as EncryptionConfig;
 
 class Encryption extends EncryptionConfig
 {
-	private const HEX2BIN = 'hex2bin:84cf2c0811d5daf9e1c897825a3debce91f9a33391e639f72f7a4740b30675a2';
-	private const BASE64  = 'base64:Psf8bUHRh1UJYG2M7e+5ec3MdjpKpzAr0twamcAvOcI=';
-	public $key;
-	public $driver = 'MCrypt';
+    private const HEX2BIN = 'hex2bin:84cf2c0811d5daf9e1c897825a3debce91f9a33391e639f72f7a4740b30675a2';
+    private const BASE64  = 'base64:Psf8bUHRh1UJYG2M7e+5ec3MdjpKpzAr0twamcAvOcI=';
+    public $key;
+    public $driver = 'MCrypt';
 
-	public function __construct(string $prefix = 'hex2bin')
-	{
-		if ($prefix === 'base64')
-		{
-			$this->key = self::BASE64;
-		}
-		else
-		{
-			$this->key = self::HEX2BIN;
-		}
+    public function __construct(string $prefix = 'hex2bin')
+    {
+        if ($prefix === 'base64') {
+            $this->key = self::BASE64;
+        } else {
+            $this->key = self::HEX2BIN;
+        }
 
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 }
diff --git a/tests/system/Config/fixtures/RegistrarConfig.php b/tests/system/Config/fixtures/RegistrarConfig.php
index a5f3bdcb7cdd..a8a656c5ae6b 100644
--- a/tests/system/Config/fixtures/RegistrarConfig.php
+++ b/tests/system/Config/fixtures/RegistrarConfig.php
@@ -1,10 +1,18 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
 {
-	public $foo = 'bar';
-	public $bar = [
-		'baz'
-	];
-
+    public $foo = 'bar';
+    public $bar = [
+        'baz',
+    ];
 }
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index 3476d8d0729a..d2e13fbda3c0 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -1,39 +1,47 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 class SimpleConfig extends \CodeIgniter\Config\BaseConfig
 {
+    public $QZERO;
+    public $QZEROSTR;
+    public $QEMPTYSTR;
+    public $QFALSE;
+    public $first  = 'foo';
+    public $second = 'bar';
+    public $FOO;
+    public $onedeep;
+    public $default = [
+        'name' => null,
+    ];
+    public $simple = [
+        'name' => null,
+    ];
+    // properties for environment over-ride testing
+    public $alpha   = 'one';
+    public $bravo   = 'two';
+    public $charlie = 'three';
+    public $delta   = 'four';
+    public $echo    = '';
+    public $foxtrot = 'false';
+    public $fruit   = 'pineapple';
+    public $dessert = '';
+    public $golf    = 18;
+    public $crew    = [
+        'captain' => 'Kirk',
+        'science' => 'Spock',
+        'doctor'  => 'Bones',
+        'comms'   => 'Uhuru',
+    ];
 
-	public $QZERO;
-	public $QZEROSTR;
-	public $QEMPTYSTR;
-	public $QFALSE;
-	public $first  = 'foo';
-	public $second = 'bar';
-	public $FOO;
-	public $onedeep;
-	public $default = [
-		'name' => null,
-	];
-	public $simple  = [
-		'name' => null,
-	];
-	// properties for environment over-ride testing
-	public $alpha   = 'one';
-	public $bravo   = 'two';
-	public $charlie = 'three';
-	public $delta   = 'four';
-	public $echo    = '';
-	public $foxtrot = 'false';
-	public $fruit   = 'pineapple';
-	public $dessert = '';
-	public $golf    = 18;
-	public $crew    = [
-		'captain' => 'Kirk',
-		'science' => 'Spock',
-		'doctor'  => 'Bones',
-		'comms'   => 'Uhuru',
-	];
-
-	public $shortie;
-	public $longie;
+    public $shortie;
+    public $longie;
 }
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 6a738eb44de5..3d7c205eec0b 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
 
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Request;
@@ -17,163 +28,155 @@
  * we can exercise everything without blowing up :-/
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class ControllerTest extends CIUnitTestCase
+final class ControllerTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var CodeIgniter
-	 */
-	protected $codeigniter;
-
-	/**
-	 * @var Controller
-	 */
-	protected $controller;
-
-	/**
-	 * Current request.
-	 *
-	 * @var Request
-	 */
-	protected $request;
-
-	/**
-	 * Current response.
-	 *
-	 * @var Response
-	 */
-	protected $response;
-	/**
-	 * @var LoggerInterface
-	 */
-	protected $logger;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->config      = new App();
-		$this->request     = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
-		$this->response    = new Response($this->config);
-		$this->logger      = \Config\Services::logger();
-		$this->codeigniter = new MockCodeIgniter($this->config);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstructor()
-	{
-		// make sure we can instantiate one
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-		$this->assertInstanceOf(Controller::class, $this->controller);
-	}
-
-	public function testConstructorHTTPS()
-	{
-		$original = $_SERVER;
-		$_SERVER  = ['HTTPS' => 'on'];
-		// make sure we can instantiate one
-		$this->controller = new Class() extends Controller
-		{
-			protected $forceHTTPS = 1;
-		};
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$this->assertInstanceOf(Controller::class, $this->controller);
-		$_SERVER = $original; // restore so code coverage doesn't break
-	}
-
-	//--------------------------------------------------------------------
-	public function testCachePage()
-	{
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$method = $this->getPrivateMethodInvoker($this->controller, 'cachePage');
-		$this->assertNull($method(10));
-	}
-
-	public function testValidate()
-	{
-		// make sure we can instantiate one
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		// and that we can attempt validation, with no rules
-		$method = $this->getPrivateMethodInvoker($this->controller, 'validate');
-		$this->assertFalse($method([]));
-	}
-
-	public function testValidateWithStringRulesNotFound()
-	{
-		$this->expectException(ValidationException::class);
-
-		// make sure we can instantiate one
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$method = $this->getPrivateMethodInvoker($this->controller, 'validate');
-		$this->assertFalse($method('signup'));
-	}
-
-	public function testValidateWithStringRulesFoundReadMessagesFromValidationConfig()
-	{
-		$validation                = config('Validation');
-		$validation->signup        = [
-			'username' => 'required',
-		];
-		$validation->signup_errors = [
-			'username' => [
-				'required' => 'You must choose a username.',
-			],
-		];
-
-		// make sure we can instantiate one
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$method = $this->getPrivateMethodInvoker($this->controller, 'validate');
-		$this->assertFalse($method('signup'));
-		$this->assertEquals('You must choose a username.', Services::validation()->getError());
-	}
-
-	public function testValidateWithStringRulesFoundUseMessagesParameter()
-	{
-		$validation         = config('Validation');
-		$validation->signup = [
-			'username' => 'required',
-		];
-
-		// make sure we can instantiate one
-		$this->controller = new Controller();
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$method = $this->getPrivateMethodInvoker($this->controller, 'validate');
-		$this->assertFalse($method('signup', [
-			'username' => [
-				'required' => 'You must choose a username.',
-			],
-		]));
-		$this->assertEquals('You must choose a username.', Services::validation()->getError());
-	}
-
-	//--------------------------------------------------------------------
-	public function testHelpers()
-	{
-		$this->controller = new Class() extends Controller
-		{
-			protected $helpers = [
-				'cookie',
-				'text',
-			];
-		};
-		$this->controller->initController($this->request, $this->response, $this->logger);
-
-		$this->assertInstanceOf(Controller::class, $this->controller);
-	}
-
+    /**
+     * @var CodeIgniter
+     */
+    protected $codeigniter;
+
+    /**
+     * @var Controller
+     */
+    protected $controller;
+
+    /**
+     * Current request.
+     *
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * Current response.
+     *
+     * @var Response
+     */
+    protected $response;
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config      = new App();
+        $this->request     = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
+        $this->response    = new Response($this->config);
+        $this->logger      = \Config\Services::logger();
+        $this->codeigniter = new MockCodeIgniter($this->config);
+    }
+
+    public function testConstructor()
+    {
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+        $this->assertInstanceOf(Controller::class, $this->controller);
+    }
+
+    public function testConstructorHTTPS()
+    {
+        $original = $_SERVER;
+        $_SERVER  = ['HTTPS' => 'on'];
+        // make sure we can instantiate one
+        $this->controller         = new class () extends Controller {
+            protected $forceHTTPS = 1;
+        };
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $this->assertInstanceOf(Controller::class, $this->controller);
+        $_SERVER = $original; // restore so code coverage doesn't break
+    }
+
+    public function testCachePage()
+    {
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'cachePage');
+        $this->assertNull($method(10));
+    }
+
+    public function testValidate()
+    {
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        // and that we can attempt validation, with no rules
+        $method = $this->getPrivateMethodInvoker($this->controller, 'validate');
+        $this->assertFalse($method([]));
+    }
+
+    public function testValidateWithStringRulesNotFound()
+    {
+        $this->expectException(ValidationException::class);
+
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'validate');
+        $this->assertFalse($method('signup'));
+    }
+
+    public function testValidateWithStringRulesFoundReadMessagesFromValidationConfig()
+    {
+        $validation         = config('Validation');
+        $validation->signup = [
+            'username' => 'required',
+        ];
+        $validation->signup_errors = [
+            'username' => [
+                'required' => 'You must choose a username.',
+            ],
+        ];
+
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'validate');
+        $this->assertFalse($method('signup'));
+        $this->assertSame('You must choose a username.', Services::validation()->getError());
+    }
+
+    public function testValidateWithStringRulesFoundUseMessagesParameter()
+    {
+        $validation         = config('Validation');
+        $validation->signup = [
+            'username' => 'required',
+        ];
+
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'validate');
+        $this->assertFalse($method('signup', [
+            'username' => [
+                'required' => 'You must choose a username.',
+            ],
+        ]));
+        $this->assertSame('You must choose a username.', Services::validation()->getError());
+    }
+
+    public function testHelpers()
+    {
+        $this->controller      = new class () extends Controller {
+            protected $helpers = [
+                'cookie',
+                'text',
+            ];
+        };
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $this->assertInstanceOf(Controller::class, $this->controller);
+    }
 }
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index 1c0fcf13b1d0..2c588fb3391e 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -1,8 +1,16 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cookie;
 
-use CodeIgniter\Cookie\CookieStore;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\Test\CIUnitTestCase;
 use DateTimeImmutable;
@@ -13,114 +21,114 @@
  */
 final class CookieStoreTest extends CIUnitTestCase
 {
-	/**
-	 * @var array
-	 */
-	private $defaults;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->defaults = Cookie::setDefaults();
-	}
-
-	protected function tearDown(): void
-	{
-		Cookie::setDefaults($this->defaults);
-	}
-
-	public function testCookieStoreInitialization(): void
-	{
-		$cookies = [
-			new Cookie('dev', 'cookie'),
-			new Cookie('prod', 'cookie', ['raw' => true]),
-		];
-
-		$store = new CookieStore($cookies);
-
-		$this->assertCount(2, $store);
-		$this->assertTrue($store->has('dev'));
-		$this->assertSame($cookies[0], $store->get('dev'));
-		$this->assertTrue($store->has('prod'));
-		$this->assertTrue($store->has('prod', '', 'cookie'));
-		$this->assertSame($cookies[1], $store->get('prod'));
-		$this->assertFalse($store->has('test'));
-		$this->assertSame($cookies, array_values($store->display()));
-		$this->assertSame($cookies, array_values(iterator_to_array($store->getIterator())));
-
-		$this->expectException(CookieException::class);
-		$store->get('test');
-	}
-
-	public function testCookieStoreInitViaHeaders(): void
-	{
-		$cookies = [
-			'dev=cookie; Max-Age=3600',
-			'prod=cookie; Path=/web',
-			'test,def=cookie; SameSite=Lax',
-		];
-
-		$store = CookieStore::fromCookieHeaders($cookies, true);
-		$this->assertCount(2, $store);
-		$this->assertTrue($store->has('dev'));
-		$this->assertTrue($store->has('prod'));
-		$this->assertFalse($store->has('test,def'));
-	}
-
-	public function testInvalidCookieStored(): void
-	{
-		$this->expectException(CookieException::class);
-		new CookieStore([new DateTimeImmutable('now')]);
-	}
-
-	public function testPutRemoveCookiesInStore(): void
-	{
-		$cookies = [
-			new Cookie('dev', 'cookie'),
-			new Cookie('prod', 'cookie', ['raw' => true]),
-		];
-
-		$store  = new CookieStore($cookies);
-		$bottle = $store->put(new Cookie('test', 'cookie'));
-		$jar    = $store->remove('dev');
-
-		$this->assertNotSame($store->display(), $bottle->display());
-		$this->assertFalse($store->has('test'));
-		$this->assertTrue($bottle->has('test'));
-		$this->assertTrue($store->has('dev'));
-		$this->assertFalse($jar->has('dev'));
-	}
-
-	public function testCookieDispatching(): void
-	{
-		$cookies = [
-			'dev'  => new Cookie('dev', 'cookie'),
-			'prod' => new Cookie('prod', 'cookie', ['raw' => true]),
-		];
-
-		$dev  = $cookies['dev']->getOptions();
-		$prod = $cookies['prod']->getOptions();
-
-		/**
-		 * @var MockObject&CookieStore
-		 */
-		$store = $this->getMockBuilder(CookieStore::class)
-			->setConstructorArgs([$cookies])
-			->onlyMethods(['setRawCookie', 'setCookie'])
-			->getMock();
-
-		$store->expects($this->once())->method('setRawCookie')->with('prod', 'cookie', $prod);
-		$store->expects($this->once())->method('setCookie')->with('dev', 'cookie', $dev);
-		$store->dispatch();
-	}
-
-	public function testCookiesFunction(): void
-	{
-		$a = cookies();
-		$b = cookies([], false);
-
-		$this->assertInstanceOf(CookieStore::class, $a);
-		$this->assertInstanceOf(CookieStore::class, $b);
-		$this->assertNotSame($a, $b);
-	}
+    /**
+     * @var array
+     */
+    private $defaults;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->defaults = Cookie::setDefaults();
+    }
+
+    protected function tearDown(): void
+    {
+        Cookie::setDefaults($this->defaults);
+    }
+
+    public function testCookieStoreInitialization(): void
+    {
+        $cookies = [
+            new Cookie('dev', 'cookie'),
+            new Cookie('prod', 'cookie', ['raw' => true]),
+        ];
+
+        $store = new CookieStore($cookies);
+
+        $this->assertCount(2, $store);
+        $this->assertTrue($store->has('dev'));
+        $this->assertSame($cookies[0], $store->get('dev'));
+        $this->assertTrue($store->has('prod'));
+        $this->assertTrue($store->has('prod', '', 'cookie'));
+        $this->assertSame($cookies[1], $store->get('prod'));
+        $this->assertFalse($store->has('test'));
+        $this->assertSame($cookies, array_values($store->display()));
+        $this->assertSame($cookies, array_values(iterator_to_array($store->getIterator())));
+
+        $this->expectException(CookieException::class);
+        $store->get('test');
+    }
+
+    public function testCookieStoreInitViaHeaders(): void
+    {
+        $cookies = [
+            'dev=cookie; Max-Age=3600',
+            'prod=cookie; Path=/web',
+            'test,def=cookie; SameSite=Lax',
+        ];
+
+        $store = CookieStore::fromCookieHeaders($cookies, true);
+        $this->assertCount(2, $store);
+        $this->assertTrue($store->has('dev'));
+        $this->assertTrue($store->has('prod'));
+        $this->assertFalse($store->has('test,def'));
+    }
+
+    public function testInvalidCookieStored(): void
+    {
+        $this->expectException(CookieException::class);
+        new CookieStore([new DateTimeImmutable('now')]);
+    }
+
+    public function testPutRemoveCookiesInStore(): void
+    {
+        $cookies = [
+            new Cookie('dev', 'cookie'),
+            new Cookie('prod', 'cookie', ['raw' => true]),
+        ];
+
+        $store  = new CookieStore($cookies);
+        $bottle = $store->put(new Cookie('test', 'cookie'));
+        $jar    = $store->remove('dev');
+
+        $this->assertNotSame($store->display(), $bottle->display());
+        $this->assertFalse($store->has('test'));
+        $this->assertTrue($bottle->has('test'));
+        $this->assertTrue($store->has('dev'));
+        $this->assertFalse($jar->has('dev'));
+    }
+
+    public function testCookieDispatching(): void
+    {
+        $cookies = [
+            'dev'  => new Cookie('dev', 'cookie'),
+            'prod' => new Cookie('prod', 'cookie', ['raw' => true]),
+        ];
+
+        $dev  = $cookies['dev']->getOptions();
+        $prod = $cookies['prod']->getOptions();
+
+        /**
+         * @var MockObject&CookieStore $store
+         */
+        $store = $this->getMockBuilder(CookieStore::class)
+            ->setConstructorArgs([$cookies])
+            ->onlyMethods(['setRawCookie', 'setCookie'])
+            ->getMock();
+
+        $store->expects($this->once())->method('setRawCookie')->with('prod', 'cookie', $prod);
+        $store->expects($this->once())->method('setCookie')->with('dev', 'cookie', $dev);
+        $store->dispatch();
+    }
+
+    public function testCookiesFunction(): void
+    {
+        $a = cookies();
+        $b = cookies([], false);
+
+        $this->assertInstanceOf(CookieStore::class, $a);
+        $this->assertInstanceOf(CookieStore::class, $b);
+        $this->assertNotSame($a, $b);
+    }
 }
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index e98151524920..781373755529 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -1,8 +1,16 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cookie;
 
-use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cookie as CookieConfig;
@@ -16,282 +24,274 @@
  */
 final class CookieTest extends CIUnitTestCase
 {
-	/**
-	 * @var array
-	 */
-	private $defaults;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->defaults = Cookie::setDefaults();
-	}
-
-	protected function tearDown(): void
-	{
-		Cookie::setDefaults($this->defaults);
-	}
-
-	public function testCookieInitializationWithDefaults(): void
-	{
-		$cookie  = new Cookie('test', 'value');
-		$options = Cookie::setDefaults();
-
-		$this->assertSame($options['prefix'] . 'test', $cookie->getPrefixedName());
-		$this->assertSame('test', $cookie->getName());
-		$this->assertSame('value', $cookie->getValue());
-		$this->assertSame($options['prefix'], $cookie->getPrefix());
-		$this->assertSame($options['expires'], $cookie->getExpiresTimestamp());
-		$this->assertSame($options['path'], $cookie->getPath());
-		$this->assertSame($options['domain'], $cookie->getDomain());
-		$this->assertSame($options['secure'], $cookie->isSecure());
-		$this->assertSame($options['httponly'], $cookie->isHTTPOnly());
-		$this->assertSame($options['samesite'], $cookie->getSameSite());
-		$this->assertSame($options['raw'], $cookie->isRaw());
-	}
-
-	public function testConfigInjectionForDefaults(): void
-	{
-		/**
-		 * @var CookieConfig $config
-		 */
-		$config = new CookieConfig();
-
-		$old = Cookie::setDefaults($config);
-
-		$cookie = new Cookie('test', 'value');
-		$this->assertSame($config->prefix . 'test', $cookie->getPrefixedName());
-		$this->assertSame('test', $cookie->getName());
-		$this->assertSame('value', $cookie->getValue());
-		$this->assertSame($config->prefix, $cookie->getPrefix());
-		$this->assertSame($config->expires, $cookie->getExpiresTimestamp());
-		$this->assertSame($config->path, $cookie->getPath());
-		$this->assertSame($config->domain, $cookie->getDomain());
-		$this->assertSame($config->secure, $cookie->isSecure());
-		$this->assertSame($config->httponly, $cookie->isHTTPOnly());
-		$this->assertSame($config->samesite, $cookie->getSameSite());
-		$this->assertSame($config->raw, $cookie->isRaw());
-
-		Cookie::setDefaults($old);
-	}
-
-	public function testValidationOfRawCookieName(): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie("test;\n", '', ['raw' => true]);
-	}
-
-	public function testValidationOfEmptyCookieName(): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie('', 'value');
-	}
-
-	public function testValidationOfSecurePrefix(): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie('test', 'value', ['prefix' => '__Secure-', 'secure' => false]);
-	}
-
-	public function testValidationOfHostPrefix(): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie('test', 'value', ['prefix' => '__Host-', 'domain' => 'localhost']);
-	}
-
-	public function testValidationOfSameSite(): void
-	{
-		Cookie::setDefaults(['samesite' => '']);
-		$this->assertInstanceOf(Cookie::class, new Cookie('test'));
-
-		$this->expectException(CookieException::class);
-		new Cookie('test', '', ['samesite' => 'Yes']);
-	}
-
-	public function testValidationOfSameSiteNone(): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie('test', '', ['samesite' => Cookie::SAMESITE_NONE, 'secure' => false]);
-	}
-
-	public function testExpirationTime(): void
-	{
-		// expires => 0
-		$cookie = new Cookie('test', 'value');
-		$this->assertSame(0, $cookie->getExpiresTimestamp());
-		$this->assertSame('Thu, 01-Jan-1970 00:00:00 GMT', $cookie->getExpiresString());
-		$this->assertTrue($cookie->isExpired());
-		$this->assertSame(0, $cookie->getMaxAge());
-
-		$date   = new DateTimeImmutable('2021-01-10 00:00:00 GMT', new DateTimeZone('UTC'));
-		$cookie = new Cookie('test', 'value', ['expires' => $date]);
-		$this->assertSame((int) $date->format('U'), $cookie->getExpiresTimestamp());
-		$this->assertSame('Sun, 10-Jan-2021 00:00:00 GMT', $cookie->getExpiresString());
-	}
-
-	/**
-	 * @dataProvider invalidExpiresProvider
-	 *
-	 * @param mixed $expires
-	 *
-	 * @return void
-	 */
-	public function testInvalidExpires($expires): void
-	{
-		$this->expectException(CookieException::class);
-		new Cookie('test', 'value', ['expires' => $expires]);
-	}
-
-	public static function invalidExpiresProvider(): iterable
-	{
-		$cases = [
-			'non-numeric-string' => ['yes'],
-			'boolean'            => [true],
-			'float'              => [10.0],
-		];
-
-		foreach ($cases as $type => $case)
-		{
-			yield $type => $case;
-		}
-	}
-
-	/**
-	 * @dataProvider setCookieHeaderProvider
-	 *
-	 * @param string $header
-	 * @param array  $changed
-	 *
-	 * @return void
-	 */
-	public function testSetCookieHeaderCreation(string $header, array $changed): void
-	{
-		$cookie = Cookie::fromHeaderString($header);
-		$cookie = $cookie->toArray();
-		$this->assertEquals($changed + $cookie, $cookie);
-	}
-
-	public static function setCookieHeaderProvider(): iterable
-	{
-		yield 'basic' => [
-			'test=value',
-			['name' => 'test', 'value' => 'value'],
-		];
-
-		yield 'empty-value' => [
-			'test',
-			['name' => 'test', 'value' => ''],
-		];
-
-		yield 'with-other-attrs' => [
-			'test=value; Max-Age=3600; Path=/web',
-			['name' => 'test', 'value' => 'value', 'path' => '/web'],
-		];
-
-		yield 'with-flags' => [
-			'test=value; Secure; HttpOnly; SameSite=Lax',
-			['name' => 'test', 'value' => 'value', 'secure' => true, 'httponly' => true, 'samesite' => 'Lax'],
-		];
-	}
-
-	public function testValidNamePerRfcYieldsSameNameRegardlessOfRawParam(): void
-	{
-		$cookie1 = new Cookie('testing', '', ['raw' => false]);
-		$cookie2 = new Cookie('testing', '', ['raw' => true]);
-		$this->assertSame($cookie1->getPrefixedName(), $cookie2->getPrefixedName());
-	}
-
-	public function testCloningCookies(): void
-	{
-		$a = new Cookie('dev', 'cookie');
-		$b = $a->withRaw();
-		$c = $a->withPrefix('my_');
-		$d = $a->withName('prod');
-		$e = $a->withValue('muffin');
-		$f = $a->withExpires('+30 days');
-		$g = $a->withExpired();
-		$h = $a->withNeverExpiring();
-		$i = $a->withDomain('localhost');
-		$j = $a->withPath('/web');
-		$k = $a->withSecure();
-		$l = $a->withHTTPOnly();
-		$m = $a->withSameSite(Cookie::SAMESITE_STRICT);
-
-		$this->assertNotSame($a, $b);
-		$this->assertNotSame($a, $c);
-		$this->assertNotSame($a, $d);
-		$this->assertNotSame($a, $e);
-		$this->assertNotSame($a, $f);
-		$this->assertNotSame($a, $g);
-		$this->assertNotSame($a, $h);
-		$this->assertNotSame($a, $i);
-		$this->assertNotSame($a, $j);
-		$this->assertNotSame($a, $k);
-		$this->assertNotSame($a, $l);
-		$this->assertNotSame($a, $m);
-	}
-
-	public function testStringCastingOfCookies(): void
-	{
-		$date = new DateTimeImmutable('2021-02-14 00:00:00 GMT', new DateTimeZone('UTC'));
-
-		$a = new Cookie('cookie', 'lover');
-		$b = $a->withValue('monster')->withPath('/web')->withDomain('localhost')->withExpires($date);
-		$c = $a->withSecure()->withHTTPOnly(false)->withSameSite(Cookie::SAMESITE_STRICT);
-
-		$max = (string) $b->getMaxAge();
-		$old = Cookie::setDefaults(['samesite' => '']);
-
-		$d = $a->withValue('')->withSameSite('');
-
-		$this->assertSame(
-			'cookie=lover; Path=/; HttpOnly; SameSite=Lax',
-			$a->toHeaderString()
-		);
-		$this->assertSame(
-			"cookie=monster; Expires=Sun, 14-Feb-2021 00:00:00 GMT; Max-Age={$max}; Path=/web; Domain=localhost; HttpOnly; SameSite=Lax",
-			(string) $b
-		);
-		$this->assertSame(
-			'cookie=lover; Path=/; Secure; SameSite=Strict',
-			(string) $c
-		);
-		$this->assertSame(
-			'cookie=deleted; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; Path=/; HttpOnly; SameSite=Lax',
-			(string) $d
-		);
-
-		Cookie::setDefaults($old);
-	}
-
-	public function testArrayAccessOfCookie(): void
-	{
-		$cookie = new Cookie('cookie', 'monster');
-
-		$this->assertTrue(isset($cookie['expire']));
-		$this->assertSame($cookie['expire'], $cookie->getExpiresTimestamp());
-		$this->assertTrue(isset($cookie['httponly']));
-		$this->assertSame($cookie['httponly'], $cookie->isHTTPOnly());
-		$this->assertTrue(isset($cookie['samesite']));
-		$this->assertSame($cookie['samesite'], $cookie->getSameSite());
-		$this->assertTrue(isset($cookie['path']));
-		$this->assertSame($cookie['path'], $cookie->getPath());
-
-		$this->expectException(InvalidArgumentException::class);
-		$cookie['expiry'];
-	}
-
-	public function testCannotSetPropertyViaArrayAccess(): void
-	{
-		$this->expectException(LogicException::class);
-		$cookie            = new Cookie('cookie', 'monster');
-		$cookie['expires'] = 7200;
-	}
-
-	public function testCannotUnsetPropertyViaArrayAccess(): void
-	{
-		$this->expectException(LogicException::class);
-		$cookie = new Cookie('cookie', 'monster');
-		unset($cookie['path']);
-	}
+    /**
+     * @var array
+     */
+    private $defaults;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->defaults = Cookie::setDefaults();
+    }
+
+    protected function tearDown(): void
+    {
+        Cookie::setDefaults($this->defaults);
+    }
+
+    public function testCookieInitializationWithDefaults(): void
+    {
+        $cookie  = new Cookie('test', 'value');
+        $options = Cookie::setDefaults();
+
+        $this->assertSame($options['prefix'] . 'test', $cookie->getPrefixedName());
+        $this->assertSame('test', $cookie->getName());
+        $this->assertSame('value', $cookie->getValue());
+        $this->assertSame($options['prefix'], $cookie->getPrefix());
+        $this->assertSame($options['expires'], $cookie->getExpiresTimestamp());
+        $this->assertSame($options['path'], $cookie->getPath());
+        $this->assertSame($options['domain'], $cookie->getDomain());
+        $this->assertSame($options['secure'], $cookie->isSecure());
+        $this->assertSame($options['httponly'], $cookie->isHTTPOnly());
+        $this->assertSame($options['samesite'], $cookie->getSameSite());
+        $this->assertSame($options['raw'], $cookie->isRaw());
+    }
+
+    public function testConfigInjectionForDefaults(): void
+    {
+        /**
+         * @var CookieConfig $config
+         */
+        $config = new CookieConfig();
+
+        $old = Cookie::setDefaults($config);
+
+        $cookie = new Cookie('test', 'value');
+        $this->assertSame($config->prefix . 'test', $cookie->getPrefixedName());
+        $this->assertSame('test', $cookie->getName());
+        $this->assertSame('value', $cookie->getValue());
+        $this->assertSame($config->prefix, $cookie->getPrefix());
+        $this->assertSame($config->expires, $cookie->getExpiresTimestamp());
+        $this->assertSame($config->path, $cookie->getPath());
+        $this->assertSame($config->domain, $cookie->getDomain());
+        $this->assertSame($config->secure, $cookie->isSecure());
+        $this->assertSame($config->httponly, $cookie->isHTTPOnly());
+        $this->assertSame($config->samesite, $cookie->getSameSite());
+        $this->assertSame($config->raw, $cookie->isRaw());
+
+        Cookie::setDefaults($old);
+    }
+
+    public function testValidationOfRawCookieName(): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie("test;\n", '', ['raw' => true]);
+    }
+
+    public function testValidationOfEmptyCookieName(): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie('', 'value');
+    }
+
+    public function testValidationOfSecurePrefix(): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie('test', 'value', ['prefix' => '__Secure-', 'secure' => false]);
+    }
+
+    public function testValidationOfHostPrefix(): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie('test', 'value', ['prefix' => '__Host-', 'domain' => 'localhost']);
+    }
+
+    public function testValidationOfSameSite(): void
+    {
+        Cookie::setDefaults(['samesite' => '']);
+        $this->assertInstanceOf(Cookie::class, new Cookie('test'));
+
+        $this->expectException(CookieException::class);
+        new Cookie('test', '', ['samesite' => 'Yes']);
+    }
+
+    public function testValidationOfSameSiteNone(): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie('test', '', ['samesite' => Cookie::SAMESITE_NONE, 'secure' => false]);
+    }
+
+    public function testExpirationTime(): void
+    {
+        // expires => 0
+        $cookie = new Cookie('test', 'value');
+        $this->assertSame(0, $cookie->getExpiresTimestamp());
+        $this->assertSame('Thu, 01-Jan-1970 00:00:00 GMT', $cookie->getExpiresString());
+        $this->assertTrue($cookie->isExpired());
+        $this->assertSame(0, $cookie->getMaxAge());
+
+        $date   = new DateTimeImmutable('2021-01-10 00:00:00 GMT', new DateTimeZone('UTC'));
+        $cookie = new Cookie('test', 'value', ['expires' => $date]);
+        $this->assertSame((int) $date->format('U'), $cookie->getExpiresTimestamp());
+        $this->assertSame('Sun, 10-Jan-2021 00:00:00 GMT', $cookie->getExpiresString());
+    }
+
+    /**
+     * @dataProvider invalidExpiresProvider
+     *
+     * @param mixed $expires
+     */
+    public function testInvalidExpires($expires): void
+    {
+        $this->expectException(CookieException::class);
+        new Cookie('test', 'value', ['expires' => $expires]);
+    }
+
+    public static function invalidExpiresProvider(): iterable
+    {
+        $cases = [
+            'non-numeric-string' => ['yes'],
+            'boolean'            => [true],
+            'float'              => [10.0],
+        ];
+
+        foreach ($cases as $type => $case) {
+            yield $type => $case;
+        }
+    }
+
+    /**
+     * @dataProvider setCookieHeaderProvider
+     */
+    public function testSetCookieHeaderCreation(string $header, array $changed): void
+    {
+        $cookie = Cookie::fromHeaderString($header);
+        $cookie = $cookie->toArray();
+        $this->assertSame(array_merge($cookie, $changed), $cookie);
+    }
+
+    public static function setCookieHeaderProvider(): iterable
+    {
+        yield 'basic' => [
+            'test=value',
+            ['name' => 'test', 'value' => 'value'],
+        ];
+
+        yield 'empty-value' => [
+            'test',
+            ['name' => 'test', 'value' => ''],
+        ];
+
+        yield 'with-other-attrs' => [
+            'test=value; Max-Age=3600; Path=/web',
+            ['name' => 'test', 'value' => 'value', 'path' => '/web'],
+        ];
+
+        yield 'with-flags' => [
+            'test=value; Secure; HttpOnly; SameSite=Lax',
+            ['name' => 'test', 'value' => 'value', 'secure' => true, 'httponly' => true, 'samesite' => 'Lax'],
+        ];
+    }
+
+    public function testValidNamePerRfcYieldsSameNameRegardlessOfRawParam(): void
+    {
+        $cookie1 = new Cookie('testing', '', ['raw' => false]);
+        $cookie2 = new Cookie('testing', '', ['raw' => true]);
+        $this->assertSame($cookie1->getPrefixedName(), $cookie2->getPrefixedName());
+    }
+
+    public function testCloningCookies(): void
+    {
+        $a = new Cookie('dev', 'cookie');
+        $b = $a->withRaw();
+        $c = $a->withPrefix('my_');
+        $d = $a->withName('prod');
+        $e = $a->withValue('muffin');
+        $f = $a->withExpires('+30 days');
+        $g = $a->withExpired();
+        $h = $a->withNeverExpiring();
+        $i = $a->withDomain('localhost');
+        $j = $a->withPath('/web');
+        $k = $a->withSecure();
+        $l = $a->withHTTPOnly();
+        $m = $a->withSameSite(Cookie::SAMESITE_STRICT);
+
+        $this->assertNotSame($a, $b);
+        $this->assertNotSame($a, $c);
+        $this->assertNotSame($a, $d);
+        $this->assertNotSame($a, $e);
+        $this->assertNotSame($a, $f);
+        $this->assertNotSame($a, $g);
+        $this->assertNotSame($a, $h);
+        $this->assertNotSame($a, $i);
+        $this->assertNotSame($a, $j);
+        $this->assertNotSame($a, $k);
+        $this->assertNotSame($a, $l);
+        $this->assertNotSame($a, $m);
+    }
+
+    public function testStringCastingOfCookies(): void
+    {
+        $date = new DateTimeImmutable('2021-02-14 00:00:00 GMT', new DateTimeZone('UTC'));
+
+        $a = new Cookie('cookie', 'lover');
+        $b = $a->withValue('monster')->withPath('/web')->withDomain('localhost')->withExpires($date);
+        $c = $a->withSecure()->withHTTPOnly(false)->withSameSite(Cookie::SAMESITE_STRICT);
+
+        $max = (string) $b->getMaxAge();
+        $old = Cookie::setDefaults(['samesite' => '']);
+
+        $d = $a->withValue('')->withSameSite('');
+
+        $this->assertSame(
+            'cookie=lover; Path=/; HttpOnly; SameSite=Lax',
+            $a->toHeaderString()
+        );
+        $this->assertSame(
+            "cookie=monster; Expires=Sun, 14-Feb-2021 00:00:00 GMT; Max-Age={$max}; Path=/web; Domain=localhost; HttpOnly; SameSite=Lax",
+            (string) $b
+        );
+        $this->assertSame(
+            'cookie=lover; Path=/; Secure; SameSite=Strict',
+            (string) $c
+        );
+        $this->assertSame(
+            'cookie=deleted; Expires=Thu, 01-Jan-1970 00:00:00 GMT; Max-Age=0; Path=/; HttpOnly; SameSite=Lax',
+            (string) $d
+        );
+
+        Cookie::setDefaults($old);
+    }
+
+    public function testArrayAccessOfCookie(): void
+    {
+        $cookie = new Cookie('cookie', 'monster');
+
+        $this->assertTrue(isset($cookie['expire']));
+        $this->assertSame($cookie['expire'], $cookie->getExpiresTimestamp());
+        $this->assertTrue(isset($cookie['httponly']));
+        $this->assertSame($cookie['httponly'], $cookie->isHTTPOnly());
+        $this->assertTrue(isset($cookie['samesite']));
+        $this->assertSame($cookie['samesite'], $cookie->getSameSite());
+        $this->assertTrue(isset($cookie['path']));
+        $this->assertSame($cookie['path'], $cookie->getPath());
+
+        $this->expectException(InvalidArgumentException::class);
+        $cookie['expiry'];
+    }
+
+    public function testCannotSetPropertyViaArrayAccess(): void
+    {
+        $this->expectException(LogicException::class);
+        $cookie            = new Cookie('cookie', 'monster');
+        $cookie['expires'] = 7200;
+    }
+
+    public function testCannotUnsetPropertyViaArrayAccess(): void
+    {
+        $this->expectException(LogicException::class);
+        $cookie = new Cookie('cookie', 'monster');
+        unset($cookie['path']);
+    }
 }
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 75ec2f2e0a20..85126836650f 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
@@ -7,139 +16,139 @@
 use CodeIgniter\Test\Mock\MockConnection;
 use Throwable;
 
-class BaseConnectionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseConnectionTest extends CIUnitTestCase
 {
-	protected $options = [
-		'DSN'      => '',
-		'hostname' => 'localhost',
-		'username' => 'first',
-		'password' => 'last',
-		'database' => 'dbname',
-		'DBDriver' => 'MockDriver',
-		'DBPrefix' => 'test_',
-		'pConnect' => true,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-	];
-
-	protected $failoverOptions = [
-		'DSN'      => '',
-		'hostname' => 'localhost',
-		'username' => 'failover',
-		'password' => 'one',
-		'database' => 'failover',
-		'DBDriver' => 'MockDriver',
-		'DBPrefix' => 'test_',
-		'pConnect' => true,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-	];
-
-	public function testSavesConfigOptions()
-	{
-		$db = new MockConnection($this->options);
-
-		$this->assertSame('localhost', $db->hostname);
-		$this->assertSame('first', $db->username);
-		$this->assertSame('last', $db->password);
-		$this->assertSame('dbname', $db->database);
-		$this->assertSame('MockDriver', $db->DBDriver);
-		$this->assertTrue($db->pConnect);
-		$this->assertTrue($db->DBDebug);
-		$this->assertSame('utf8', $db->charset);
-		$this->assertSame('utf8_general_ci', $db->DBCollat);
-		$this->assertSame('', $db->swapPre);
-		$this->assertFalse($db->encrypt);
-		$this->assertFalse($db->compress);
-		$this->assertTrue($db->strictOn);
-		$this->assertSame([], $db->failover);
-	}
-
-	public function testConnectionThrowExceptionWhenCannotConnect()
-	{
-		try
-		{
-			$db = new MockConnection($this->options);
-			$db->shouldReturn('connect', false)->initialize();
-		}
-		catch (Throwable $e)
-		{
-			$this->assertInstanceOf(DatabaseException::class, $e);
-			$this->assertStringContainsString('Unable to connect to the database.', $e->getMessage());
-		}
-	}
-
-	public function testCanConnectAndStoreConnection()
-	{
-		$db = new MockConnection($this->options);
-		$db->shouldReturn('connect', 123)->initialize();
-
-		$this->assertSame(123, $db->getConnection());
-	}
-
-	/**
-	 * @group single
-	 */
-	public function testCanConnectToFailoverWhenNoConnectionAvailable()
-	{
-		$options             = $this->options;
-		$options['failover'] = [$this->failoverOptions];
-
-		$db = new MockConnection($options);
-		$db->shouldReturn('connect', [false, 345])->initialize();
-
-		$this->assertSame(345, $db->getConnection());
-		$this->assertSame('failover', $db->username);
-	}
-
-	public function testStoresConnectionTimings()
-	{
-		$start = microtime(true);
-
-		$db = new MockConnection($this->options);
-		$db->initialize();
-
-		$this->assertGreaterThan($start, $db->getConnectStart());
-		$this->assertGreaterThan(0.0, $db->getConnectDuration());
-	}
-
-	public function testMagicIssetTrue()
-	{
-		$db = new MockConnection($this->options);
-
-		$this->assertTrue(isset($db->charset));
-	}
-
-	public function testMagicIssetFalse()
-	{
-		$db = new MockConnection($this->options);
-
-		$this->assertFalse(isset($db->foobar));
-	}
-
-	public function testMagicGet()
-	{
-		$db = new MockConnection($this->options);
-
-		$this->assertSame('utf8', $db->charset);
-	}
-
-	public function testMagicGetMissing()
-	{
-		$db = new MockConnection($this->options);
-
-		$this->assertNull($db->foobar);
-	}
+    protected $options = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => 'first',
+        'password' => 'last',
+        'database' => 'dbname',
+        'DBDriver' => 'MockDriver',
+        'DBPrefix' => 'test_',
+        'pConnect' => true,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+    ];
+
+    protected $failoverOptions = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => 'failover',
+        'password' => 'one',
+        'database' => 'failover',
+        'DBDriver' => 'MockDriver',
+        'DBPrefix' => 'test_',
+        'pConnect' => true,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+    ];
+
+    public function testSavesConfigOptions()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertSame('localhost', $db->hostname);
+        $this->assertSame('first', $db->username);
+        $this->assertSame('last', $db->password);
+        $this->assertSame('dbname', $db->database);
+        $this->assertSame('MockDriver', $db->DBDriver);
+        $this->assertTrue($db->pConnect);
+        $this->assertTrue($db->DBDebug);
+        $this->assertSame('utf8', $db->charset);
+        $this->assertSame('utf8_general_ci', $db->DBCollat);
+        $this->assertSame('', $db->swapPre);
+        $this->assertFalse($db->encrypt);
+        $this->assertFalse($db->compress);
+        $this->assertTrue($db->strictOn);
+        $this->assertSame([], $db->failover);
+    }
+
+    public function testConnectionThrowExceptionWhenCannotConnect()
+    {
+        try {
+            $db = new MockConnection($this->options);
+            $db->shouldReturn('connect', false)->initialize();
+        } catch (Throwable $e) {
+            $this->assertInstanceOf(DatabaseException::class, $e);
+            $this->assertStringContainsString('Unable to connect to the database.', $e->getMessage());
+        }
+    }
+
+    public function testCanConnectAndStoreConnection()
+    {
+        $db = new MockConnection($this->options);
+        $db->shouldReturn('connect', 123)->initialize();
+
+        $this->assertSame(123, $db->getConnection());
+    }
+
+    /**
+     * @group single
+     */
+    public function testCanConnectToFailoverWhenNoConnectionAvailable()
+    {
+        $options             = $this->options;
+        $options['failover'] = [$this->failoverOptions];
+
+        $db = new MockConnection($options);
+        $db->shouldReturn('connect', [false, 345])->initialize();
+
+        $this->assertSame(345, $db->getConnection());
+        $this->assertSame('failover', $db->username);
+    }
+
+    public function testStoresConnectionTimings()
+    {
+        $start = microtime(true);
+
+        $db = new MockConnection($this->options);
+        $db->initialize();
+
+        $this->assertGreaterThan($start, $db->getConnectStart());
+        $this->assertGreaterThan(0.0, $db->getConnectDuration());
+    }
+
+    public function testMagicIssetTrue()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertTrue(isset($db->charset));
+    }
+
+    public function testMagicIssetFalse()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertFalse(isset($db->foobar));
+    }
+
+    public function testMagicGet()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertSame('utf8', $db->charset);
+    }
+
+    public function testMagicGetMissing()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertNull($db->foobar);
+    }
 }
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 0dccb3ac8549..f53beadcd8e9 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -1,320 +1,335 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class BaseQueryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseQueryTest extends CIUnitTestCase
 {
-	protected $db;
+    protected $db;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->db = new MockConnection([]);
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->db = new MockConnection([]);
+    }
 
-	public function testQueryStoresSQL()
-	{
-		$query = new Query($this->db);
-
-		$sql = 'SELECT * FROM users';
-
-		$query->setQuery($sql);
-
-		$this->assertEquals($sql, $query->getQuery());
-	}
-
-	public function testStoresDuration()
-	{
-		$query = new Query($this->db);
-
-		$start = microtime(true);
-
-		$query->setDuration($start, $start + 5);
-
-		$this->assertEquals(5, $query->getDuration());
-	}
-
-	public function testGetStartTime()
-	{
-		$query = new Query($this->db);
-
-		$start = round(microtime(true));
-
-		$query->setDuration($start, $start + 5);
-
-		$this->assertEquals($start, $query->getStartTime(true));
-	}
-
-	public function testGetStartTimeNumberFormat()
-	{
-		$query = new Query($this->db);
-
-		$start = microtime(true);
-
-		$query->setDuration($start, $start + 5);
-
-		$this->assertEquals(number_format($start, 6), $query->getStartTime());
-	}
-
-	public function testsStoresErrorInformation()
-	{
-		$query = new Query($this->db);
-
-		$code = 13;
-		$msg  = 'Oops, yo!';
-
-		$this->assertFalse($query->hasError());
-
-		$query->setError($code, $msg);
-		$this->assertTrue($query->hasError());
-		$this->assertEquals($code, $query->getErrorCode());
-		$this->assertEquals($msg, $query->getErrorMessage());
-	}
-
-	public function testSwapPrefix()
-	{
-		$query = new Query($this->db);
-
-		$origPrefix = 'db_';
-		$newPrefix  = 'ci_';
-
-		$origSQL = 'SELECT * FROM db_users WHERE db_users.id = 1';
-		$newSQL  = 'SELECT * FROM ci_users WHERE ci_users.id = 1';
-
-		$query->setQuery($origSQL);
-		$query->swapPrefix($origPrefix, $newPrefix);
-
-		$this->assertEquals($newSQL, $query->getQuery());
-	}
-
-	public function queryTypes()
-	{
-		return [
-			'select'   => [
-				false,
-				'SELECT * FROM users',
-			],
-			'set'      => [
-				true,
-				'SET ...',
-			],
-			'insert'   => [
-				true,
-				'INSERT INTO ...',
-			],
-			'update'   => [
-				true,
-				'UPDATE ...',
-			],
-			'delete'   => [
-				true,
-				'DELETE ...',
-			],
-			'replace'  => [
-				true,
-				'REPLACE ...',
-			],
-			'create'   => [
-				true,
-				'CREATE ...',
-			],
-			'drop'     => [
-				true,
-				'DROP ...',
-			],
-			'truncate' => [
-				true,
-				'TRUNCATE ...',
-			],
-			'load'     => [
-				true,
-				'LOAD ...',
-			],
-			'copy'     => [
-				true,
-				'COPY ...',
-			],
-			'alter'    => [
-				true,
-				'ALTER ...',
-			],
-			'rename'   => [
-				true,
-				'RENAME ...',
-			],
-			'grant'    => [
-				true,
-				'GRANT ...',
-			],
-			'revoke'   => [
-				true,
-				'REVOKE ...',
-			],
-			'lock'     => [
-				true,
-				'LOCK ...',
-			],
-			'unlock'   => [
-				true,
-				'UNLOCK ...',
-			],
-			'reindex'  => [
-				true,
-				'REINDEX ...',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider queryTypes
-	 */
-	public function testIsWriteType($expected, $sql)
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery($sql);
-		$this->assertSame($expected, $query->isWriteType());
-	}
-
-	public function testSingleBindingOutsideOfArray()
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery('SELECT * FROM users WHERE id = ?', 13);
-
-		$expected = 'SELECT * FROM users WHERE id = 13';
-
-		$this->assertEquals($expected, $query->getQuery());
-	}
-
-	public function testBindingSingleElementInArray()
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery('SELECT * FROM users WHERE id = ?', [13]);
-
-		$expected = 'SELECT * FROM users WHERE id = 13';
-
-		$this->assertEquals($expected, $query->getQuery());
-	}
-
-	public function testBindingMultipleItems()
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery('SELECT * FROM users WHERE id = ? OR name = ?', [13, 'Vader']);
-
-		$expected = "SELECT * FROM users WHERE id = 13 OR name = 'Vader'";
-
-		$this->assertEquals($expected, $query->getQuery());
-	}
-
-	public function testBindingAutoEscapesParameters()
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery('SELECT * FROM users WHERE name = ?', ["O'Reilly"]);
-
-		$expected = "SELECT * FROM users WHERE name = 'O''Reilly'";
-
-		$this->assertEquals($expected, $query->getQuery());
-	}
-
-	public function testNamedBinds()
-	{
-		$query = new Query($this->db);
-
-		$query->setQuery('SELECT * FROM users WHERE id = :id: OR name = :name:', ['id' => 13, 'name' => 'Geoffrey']);
-
-		$expected = "SELECT * FROM users WHERE id = 13 OR name = 'Geoffrey'";
-
-		$this->assertEquals($expected, $query->getQuery());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3566
-	 */
-	public function testNamedBindsWithColonElseWhere()
-	{
-		$query = new Query($this->db);
-		$query->setQuery('SELECT `email`, @total:=(total+1) FROM `users` WHERE `id` = :id:', ['id' => 10]);
-
-		$sql = 'SELECT `email`, @total:=(total+1) FROM `users` WHERE `id` = 10';
-		$this->assertSame($sql, $query->getQuery());
-	}
-
-	/**
-	 * @group single
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/201
-	 */
-	public function testSimilarNamedBinds()
-	{
-		$query = new Query($this->db);
+    public function testQueryStoresSQL()
+    {
+        $query = new Query($this->db);
+
+        $sql = 'SELECT * FROM users';
+
+        $query->setQuery($sql);
+
+        $this->assertSame($sql, $query->getQuery());
+    }
+
+    public function testStoresDuration()
+    {
+        $query = new Query($this->db);
+
+        $start = microtime(true);
+
+        $query->setDuration($start, $start + 5);
+
+        $this->assertSame(5, (int) $query->getDuration());
+    }
+
+    public function testGetStartTime()
+    {
+        $query = new Query($this->db);
+
+        $start = round(microtime(true));
+
+        $query->setDuration($start, $start + 5);
+
+        $this->assertSame($start, $query->getStartTime(true));
+    }
+
+    public function testGetStartTimeNumberFormat()
+    {
+        $query = new Query($this->db);
+
+        $start = microtime(true);
+
+        $query->setDuration($start, $start + 5);
+
+        $this->assertSame(number_format($start, 6), $query->getStartTime());
+    }
+
+    public function testsStoresErrorInformation()
+    {
+        $query = new Query($this->db);
+
+        $code = 13;
+        $msg  = 'Oops, yo!';
+
+        $this->assertFalse($query->hasError());
+
+        $query->setError($code, $msg);
+        $this->assertTrue($query->hasError());
+        $this->assertSame($code, $query->getErrorCode());
+        $this->assertSame($msg, $query->getErrorMessage());
+    }
+
+    public function testSwapPrefix()
+    {
+        $query = new Query($this->db);
+
+        $origPrefix = 'db_';
+        $newPrefix  = 'ci_';
+
+        $origSQL = 'SELECT * FROM db_users WHERE db_users.id = 1';
+        $newSQL  = 'SELECT * FROM ci_users WHERE ci_users.id = 1';
+
+        $query->setQuery($origSQL);
+        $query->swapPrefix($origPrefix, $newPrefix);
+
+        $this->assertSame($newSQL, $query->getQuery());
+    }
+
+    public function queryTypes()
+    {
+        return [
+            'select' => [
+                false,
+                'SELECT * FROM users',
+            ],
+            'set' => [
+                true,
+                'SET ...',
+            ],
+            'insert' => [
+                true,
+                'INSERT INTO ...',
+            ],
+            'update' => [
+                true,
+                'UPDATE ...',
+            ],
+            'delete' => [
+                true,
+                'DELETE ...',
+            ],
+            'replace' => [
+                true,
+                'REPLACE ...',
+            ],
+            'create' => [
+                true,
+                'CREATE ...',
+            ],
+            'drop' => [
+                true,
+                'DROP ...',
+            ],
+            'truncate' => [
+                true,
+                'TRUNCATE ...',
+            ],
+            'load' => [
+                true,
+                'LOAD ...',
+            ],
+            'copy' => [
+                true,
+                'COPY ...',
+            ],
+            'alter' => [
+                true,
+                'ALTER ...',
+            ],
+            'rename' => [
+                true,
+                'RENAME ...',
+            ],
+            'grant' => [
+                true,
+                'GRANT ...',
+            ],
+            'revoke' => [
+                true,
+                'REVOKE ...',
+            ],
+            'lock' => [
+                true,
+                'LOCK ...',
+            ],
+            'unlock' => [
+                true,
+                'UNLOCK ...',
+            ],
+            'reindex' => [
+                true,
+                'REINDEX ...',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider queryTypes
+     *
+     * @param mixed $expected
+     * @param mixed $sql
+     */
+    public function testIsWriteType($expected, $sql)
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery($sql);
+        $this->assertSame($expected, $query->isWriteType());
+    }
+
+    public function testSingleBindingOutsideOfArray()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE id = ?', 13);
+
+        $expected = 'SELECT * FROM users WHERE id = 13';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testBindingSingleElementInArray()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE id = ?', [13]);
+
+        $expected = 'SELECT * FROM users WHERE id = 13';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testBindingMultipleItems()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE id = ? OR name = ?', [13, 'Vader']);
+
+        $expected = "SELECT * FROM users WHERE id = 13 OR name = 'Vader'";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testBindingAutoEscapesParameters()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = ?', ["O'Reilly"]);
+
+        $expected = "SELECT * FROM users WHERE name = 'O''Reilly'";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testNamedBinds()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE id = :id: OR name = :name:', ['id' => 13, 'name' => 'Geoffrey']);
+
+        $expected = "SELECT * FROM users WHERE id = 13 OR name = 'Geoffrey'";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3566
+     */
+    public function testNamedBindsWithColonElseWhere()
+    {
+        $query = new Query($this->db);
+        $query->setQuery('SELECT `email`, @total:=(total+1) FROM `users` WHERE `id` = :id:', ['id' => 10]);
+
+        $sql = 'SELECT `email`, @total:=(total+1) FROM `users` WHERE `id` = 10';
+        $this->assertSame($sql, $query->getQuery());
+    }
+
+    /**
+     * @group single
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/201
+     */
+    public function testSimilarNamedBinds()
+    {
+        $query = new Query($this->db);
 
-		$query->setQuery('SELECT * FROM users WHERE sitemap = :sitemap: OR site = :site:', ['sitemap' => 'sitemap', 'site' => 'site']);
+        $query->setQuery('SELECT * FROM users WHERE sitemap = :sitemap: OR site = :site:', ['sitemap' => 'sitemap', 'site' => 'site']);
 
-		$expected = "SELECT * FROM users WHERE sitemap = 'sitemap' OR site = 'site'";
+        $expected = "SELECT * FROM users WHERE sitemap = 'sitemap' OR site = 'site'";
 
-		$this->assertEquals($expected, $query->getQuery());
-	}
+        $this->assertSame($expected, $query->getQuery());
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1705
-	 */
-	public function testSetQueryBindsWithSetEscapeTrue()
-	{
-		$query = new Query($this->db);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1705
+     */
+    public function testSetQueryBindsWithSetEscapeTrue()
+    {
+        $query = new Query($this->db);
 
-		$query->setQuery('UPDATE user_table SET `x` = NOW() WHERE `id` = :id:', ['id' => 22], true);
+        $query->setQuery('UPDATE user_table SET `x` = NOW() WHERE `id` = :id:', ['id' => 22], true);
 
-		$expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
+        $expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
 
-		$this->assertEquals($expected, $query->getQuery());
-	}
+        $this->assertSame($expected, $query->getQuery());
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1705
-	 */
-	public function testSetQueryBindsWithSetEscapeFalse()
-	{
-		$query = new Query($this->db);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1705
+     */
+    public function testSetQueryBindsWithSetEscapeFalse()
+    {
+        $query = new Query($this->db);
 
-		// The only time setQuery is called with setEscape = false
-		// is when the query builder has already stored the escaping info...
-		$binds = [
-			'id' => [
-				22,
-				1,
-			],
-		];
+        // The only time setQuery is called with setEscape = false
+        // is when the query builder has already stored the escaping info...
+        $binds = [
+            'id' => [
+                22,
+                1,
+            ],
+        ];
 
-		$query->setQuery('UPDATE user_table SET `x` = NOW() WHERE `id` = :id:', $binds, false);
+        $query->setQuery('UPDATE user_table SET `x` = NOW() WHERE `id` = :id:', $binds, false);
 
-		$expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
+        $expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
 
-		$this->assertEquals($expected, $query->getQuery());
-	}
+        $this->assertSame($expected, $query->getQuery());
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2762
-	 */
-	public function testSetQueryBinds()
-	{
-		$query = new Query($this->db);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2762
+     */
+    public function testSetQueryBinds()
+    {
+        $query = new Query($this->db);
 
-		$binds = [
-			1,
-			2,
-		];
+        $binds = [
+            1,
+            2,
+        ];
 
-		$query->setQuery('SELECT @factorA := ?, @factorB := ?', $binds);
+        $query->setQuery('SELECT @factorA := ?, @factorB := ?', $binds);
 
-		$expected = 'SELECT @factorA := 1, @factorB := 2';
+        $expected = 'SELECT @factorA := 1, @factorB := 2';
 
-		$this->assertEquals($expected, $query->getQuery());
-	}
+        $this->assertSame($expected, $query->getQuery());
+    }
 }
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index d9cf80e34cc0..b6789d987708 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -1,83 +1,87 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class AliasTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class AliasTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAlias()
-	{
-		$builder = $this->db->table('jobs j');
+    protected $db;
 
-		$expectedSQL = 'SELECT * FROM "jobs" "j"';
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->db = new MockConnection([]);
+    }
 
-	//--------------------------------------------------------------------
+    public function testAlias()
+    {
+        $builder = $this->db->table('jobs j');
 
-	public function testAliasSupportsArrayOfNames()
-	{
-		$builder = $this->db->table(['jobs j', 'users u']);
+        $expectedSQL = 'SELECT * FROM "jobs" "j"';
 
-		$expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testAliasSupportsArrayOfNames()
+    {
+        $builder = $this->db->table(['jobs j', 'users u']);
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
 
-	public function testAliasSupportsStringOfNames()
-	{
-		$builder = $this->db->table('jobs j, users u');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
+    public function testAliasSupportsStringOfNames()
+    {
+        $builder = $this->db->table('jobs j, users u');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1599
-	 */
-	public function testAliasLeftJoinWithShortTableName()
-	{
-		$this->setPrivateProperty($this->db, 'DBPrefix', 'db_');
-		$builder = $this->db->table('jobs');
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1599
+     */
+    public function testAliasLeftJoinWithShortTableName()
+    {
+        $this->setPrivateProperty($this->db, 'DBPrefix', 'db_');
+        $builder = $this->db->table('jobs');
 
-		$builder->join('users as u', 'u.id = jobs.id', 'left');
+        $builder->join('users as u', 'u.id = jobs.id', 'left');
 
-		$expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "u"."id" = "db_jobs"."id"';
+        $expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "u"."id" = "db_jobs"."id"';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1599
-	 */
-	public function testAliasLeftJoinWithLongTableName()
-	{
-		$this->setPrivateProperty($this->db, 'DBPrefix', 'db_');
-		$builder = $this->db->table('jobs');
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1599
+     */
+    public function testAliasLeftJoinWithLongTableName()
+    {
+        $this->setPrivateProperty($this->db, 'DBPrefix', 'db_');
+        $builder = $this->db->table('jobs');
 
-		$builder->join('users as u', 'users.id = jobs.id', 'left');
+        $builder->join('users as u', 'users.id = jobs.id', 'left');
 
-		$expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "db_users"."id" = "db_jobs"."id"';
+        $expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "db_users"."id" = "db_jobs"."id"';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 73a14c455064..1390e4668200 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -1,49 +1,56 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class BaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
+    protected $db;
 
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	public function testDbReturnsConnection()
-	{
-		$builder = $this->db->table('jobs');
+        $this->db = new MockConnection([]);
+    }
 
-		$result = $builder->db();
+    public function testDbReturnsConnection()
+    {
+        $builder = $this->db->table('jobs');
 
-		$this->assertInstanceOf(MockConnection::class, $result);
-	}
+        $result = $builder->db();
 
-	//--------------------------------------------------------------------
+        $this->assertInstanceOf(MockConnection::class, $result);
+    }
 
-	public function testGetTableReturnsTable()
-	{
-		$builder = $this->db->table('jobs');
+    public function testGetTableReturnsTable()
+    {
+        $builder = $this->db->table('jobs');
 
-		$result = $builder->getTable();
-		$this->assertEquals('jobs', $result);
-	}
+        $result = $builder->getTable();
+        $this->assertSame('jobs', $result);
+    }
 
-	public function testGetTableIgnoresFrom()
-	{
-		$builder = $this->db->table('jobs');
+    public function testGetTableIgnoresFrom()
+    {
+        $builder = $this->db->table('jobs');
 
-		$builder->from('foo');
-		$result = $builder->getTable();
-		$this->assertEquals('jobs', $result);
-	}
+        $builder->from('foo');
+        $result = $builder->getTable();
+        $this->assertSame('jobs', $result);
+    }
 }
diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
index 81f870a3b146..d0d9000279f6 100644
--- a/tests/system/Database/Builder/CountTest.php
+++ b/tests/system/Database/Builder/CountTest.php
@@ -1,99 +1,113 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class CountTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CountTest extends CIUnitTestCase
 {
-	protected $db;
+    protected $db;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->db = new MockConnection([]);
-	}
+        $this->db = new MockConnection([]);
+    }
 
-	public function testCountAll()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->testMode();
+    public function testCountAll()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->testMode();
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs"';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs"';
 
-		$this->assertSame($expectedSQL, $builder->countAll(true));
-	}
+        $this->assertSame($expectedSQL, $builder->countAll(true));
+    }
 
-	public function testCountAllResults()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->testMode();
+    public function testCountAllResults()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->testMode();
 
-		$answer = $builder->where('id >', 3)->countAllResults(false);
+        $answer = $builder->where('id >', 3)->countAllResults(false);
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs" WHERE "id" > :id:';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs" WHERE "id" > :id:';
 
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+    }
 
-	public function testCountAllResultsWithGroupBy()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->groupBy('id');
-		$builder->testMode();
+    public function testCountAllResultsWithGroupBy()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->groupBy('id');
+        $builder->testMode();
 
-		$answer = $builder->where('id >', 3)->countAllResults(false);
+        $answer = $builder->where('id >', 3)->countAllResults(false);
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT * FROM "jobs" WHERE "id" > :id: GROUP BY "id" ) CI_count_all_results';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT * FROM "jobs" WHERE "id" > :id: GROUP BY "id" ) CI_count_all_results';
 
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3651
-	 */
-	public function testCountAllResultsWithGroupByAndPrefix()
-	{
-		$this->db = new MockConnection(['DBPrefix' => 'ci_']);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3651
+     */
+    public function testCountAllResultsWithGroupByAndPrefix()
+    {
+        $this->db = new MockConnection(['DBPrefix' => 'ci_']);
 
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->select('jobs.*')->where('id >', 3)->groupBy('id')->testMode();
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->select('jobs.*')->where('id >', 3)->groupBy('id')->testMode();
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT "ci_jobs".* FROM "ci_jobs" WHERE "id" > :id: GROUP BY "id" ) CI_count_all_results';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT "ci_jobs".* FROM "ci_jobs" WHERE "id" > :id: GROUP BY "id" ) CI_count_all_results';
 
-		$answer1 = $builder->countAllResults(false);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer1));
+        $answer1 = $builder->countAllResults(false);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer1));
 
-		// We run the query one more time to make sure the DBPrefix is added only once
-		$answer2 = $builder->countAllResults(false);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer2));
-	}
+        // We run the query one more time to make sure the DBPrefix is added only once
+        $answer2 = $builder->countAllResults(false);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer2));
+    }
 
-	public function testCountAllResultsWithGroupByAndHaving()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->groupBy('id');
-		$builder->having('1=1');
-		$builder->testMode();
+    public function testCountAllResultsWithGroupByAndHaving()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->groupBy('id');
+        $builder->having('1=1');
+        $builder->testMode();
 
-		$answer = $builder->where('id >', 3)->countAllResults(false);
+        $answer = $builder->where('id >', 3)->countAllResults(false);
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT * FROM "jobs" WHERE "id" > :id: GROUP BY "id" HAVING 1 = 1 ) CI_count_all_results';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM ( SELECT * FROM "jobs" WHERE "id" > :id: GROUP BY "id" HAVING 1 = 1 ) CI_count_all_results';
 
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+    }
 
-	public function testCountAllResultsWithHavingOnly()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->having('1=1');
-		$builder->testMode();
+    public function testCountAllResultsWithHavingOnly()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->having('1=1');
+        $builder->testMode();
 
-		$answer = $builder->where('id >', 3)->countAllResults(false);
+        $answer = $builder->where('id >', 3)->countAllResults(false);
 
-		$expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs" WHERE "id" > :id: HAVING 1 = 1';
+        $expectedSQL = 'SELECT COUNT(*) AS "numrows" FROM "jobs" WHERE "id" > :id: HAVING 1 = 1';
 
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+    }
 }
diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
index ebc60b427c06..777a646992c4 100644
--- a/tests/system/Database/Builder/DeleteTest.php
+++ b/tests/system/Database/Builder/DeleteTest.php
@@ -1,63 +1,75 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class DeleteTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DeleteTest extends CIUnitTestCase
 {
-	protected $db;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	public function testDelete()
-	{
-		$builder = $this->db->table('jobs');
-
-		$answer = $builder->testMode()->delete(['id' => 1], null, true);
-
-		$expectedSQL   = 'DELETE FROM "jobs" WHERE "id" = :id:';
-		$expectedBinds = [
-			'id' => [
-				1,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testGetCompiledDelete()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('id', 1);
-		$sql = $builder->getCompiledDelete();
-
-		$expectedSQL = <<<'EOL'
-		DELETE FROM "jobs"
-		WHERE "id" = 1
-		EOL;
-		$this->assertSame($expectedSQL, $sql);
-	}
-
-	public function testGetCompiledDeleteWithLimit()
-	{
-		$builder = $this->db->table('jobs');
-
-		$sql = $builder->where('id', 1)->limit(10)->getCompiledDelete();
-
-		$expectedSQL = <<<'EOL'
-		DELETE FROM "jobs"
-		WHERE "id" = 1 LIMIT 10
-		EOL;
-		$this->assertSame($expectedSQL, $sql);
-	}
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testDelete()
+    {
+        $builder = $this->db->table('jobs');
+
+        $answer = $builder->testMode()->delete(['id' => 1], null, true);
+
+        $expectedSQL   = 'DELETE FROM "jobs" WHERE "id" = :id:';
+        $expectedBinds = [
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testGetCompiledDelete()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('id', 1);
+        $sql = $builder->getCompiledDelete();
+
+        $expectedSQL = <<<'EOL'
+            DELETE FROM "jobs"
+            WHERE "id" = 1
+            EOL;
+        $this->assertSame($expectedSQL, $sql);
+    }
+
+    public function testGetCompiledDeleteWithLimit()
+    {
+        $builder = $this->db->table('jobs');
+
+        $sql = $builder->where('id', 1)->limit(10)->getCompiledDelete();
+
+        $expectedSQL = <<<'EOL'
+            DELETE FROM "jobs"
+            WHERE "id" = 1 LIMIT 10
+            EOL;
+        $this->assertSame($expectedSQL, $sql);
+    }
 }
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index 00758a155ff0..d47edc1e85a9 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -1,34 +1,42 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class DistinctTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DistinctTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
+    protected $db;
 
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	public function testDelete()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->db = new MockConnection([]);
+    }
 
-		$builder->select('country')->distinct();
+    public function testDelete()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT DISTINCT "country" FROM "user"';
+        $builder->select('country')->distinct();
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT DISTINCT "country" FROM "user"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 7a6b159cbb6f..25ce07ca0aaf 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -1,35 +1,42 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class EmptyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EmptyTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
+    protected $db;
 
-	public function testEmptyWithNoTable()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$answer = $builder->testMode()->emptyTable();
+        $this->db = new MockConnection([]);
+    }
 
-		$expectedSQL = 'DELETE FROM "jobs"';
+    public function testEmptyWithNoTable()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $answer));
-	}
+        $answer = $builder->testMode()->emptyTable();
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'DELETE FROM "jobs"';
 
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
+    }
 }
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index bb8338a544ce..b7c62a2c748c 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -1,118 +1,116 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class FromTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FromTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSimpleFrom()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->from('jobs');
-
-		$expectedSQL = 'SELECT * FROM "user", "jobs"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    protected $db;
 
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	public function testFromThatOverwrites()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->db = new MockConnection([]);
+    }
 
-		$builder->from('jobs', true);
+    public function testSimpleFrom()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "jobs"';
+        $builder->from('jobs');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "user", "jobs"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testFromWithMultipleTables()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testFromThatOverwrites()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->from(['jobs', 'roles']);
+        $builder->from('jobs', true);
 
-		$expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
+        $expectedSQL = 'SELECT * FROM "jobs"';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testFromWithMultipleTables()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testFromWithMultipleTablesAsString()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->from(['jobs', 'roles']);
 
-		$builder->from(['jobs, roles']);
+        $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-		$expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testFromWithMultipleTablesAsString()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->from(['jobs, roles']);
 
-	public function testFromReset()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-		$builder->from(['jobs', 'roles']);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
+    public function testFromReset()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $builder->from(['jobs', 'roles']);
 
-		$expectedSQL = 'SELECT * FROM "user"';
+        $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-		$expectedSQL = 'SELECT *';
+        $expectedSQL = 'SELECT * FROM "user"';
 
-		$builder->from(null, true);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $expectedSQL = 'SELECT *';
 
-		$expectedSQL = 'SELECT * FROM "jobs"';
+        $builder->from(null, true);
 
-		$builder->from('jobs');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "jobs"';
 
-	//--------------------------------------------------------------------
+        $builder->from('jobs');
 
-	public function testFromWithMultipleTablesAsStringWithSQLSRV()
-	{
-		$this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder = new SQLSRVBuilder('user', $this->db);
+    public function testFromWithMultipleTablesAsStringWithSQLSRV()
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
 
-		$builder->from(['jobs, roles']);
+        $builder = new SQLSRVBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "test"."dbo"."user", "test"."dbo"."jobs", "test"."dbo"."roles"';
+        $builder->from(['jobs, roles']);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."user", "test"."dbo"."jobs", "test"."dbo"."roles"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 9fd611431e95..36aacb7b794b 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -1,108 +1,107 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class GetTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GetTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGet()
-	{
-		$builder = $this->db->table('users');
-
-		$expectedSQL = 'SELECT * FROM "users"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2141
-	 */
-	public function testGetWithReset()
-	{
-		$builder = $this->db->table('users');
-		$builder->testMode()->where('username', 'bogus');
-
-		$expectedSQL           = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
-		$expectedSQLafterreset = 'SELECT * FROM "users"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, false)));
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, true)));
-		$this->assertEquals($expectedSQLafterreset, str_replace("\n", ' ', $builder->get(0, 50, true)));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2143
-	 */
-	public function testGetWhereWithLimit()
-	{
-		$builder = $this->db->table('users');
-		$builder->testMode();
-
-		$expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 5';
-		$expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 5';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, false)));
-		$this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 0, true)));
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, true)));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWhereWithLimitAndOffset()
-	{
-		$builder = $this->db->table('users');
-		$builder->testMode();
-
-		$expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 10, 5';
-		$expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 10, 5';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, false)));
-		$this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWhereWithWhereConditionOnly()
-	{
-		$builder = $this->db->table('users');
-		$builder->testMode();
-
-		$expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
-		$expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, false)));
-		$this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWhereWithoutArgs()
-	{
-		$builder = $this->db->table('users');
-		$builder->testMode();
-
-		$expectedSQL = 'SELECT * FROM "users"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(null, null, null, true)));
-	}
-
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testGet()
+    {
+        $builder = $this->db->table('users');
+
+        $expectedSQL = 'SELECT * FROM "users"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2141
+     */
+    public function testGetWithReset()
+    {
+        $builder = $this->db->table('users');
+        $builder->testMode()->where('username', 'bogus');
+
+        $expectedSQL           = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
+        $expectedSQLafterreset = 'SELECT * FROM "users"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, false)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, true)));
+        $this->assertSame($expectedSQLafterreset, str_replace("\n", ' ', $builder->get(0, 50, true)));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2143
+     */
+    public function testGetWhereWithLimit()
+    {
+        $builder = $this->db->table('users');
+        $builder->testMode();
+
+        $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 5';
+        $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 5';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 0, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, true)));
+    }
+
+    public function testGetWhereWithLimitAndOffset()
+    {
+        $builder = $this->db->table('users');
+        $builder->testMode();
+
+        $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 10, 5';
+        $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 10, 5';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
+    }
+
+    public function testGetWhereWithWhereConditionOnly()
+    {
+        $builder = $this->db->table('users');
+        $builder->testMode();
+
+        $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
+        $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
+    }
+
+    public function testGetWhereWithoutArgs()
+    {
+        $builder = $this->db->table('users');
+        $builder->testMode();
+
+        $expectedSQL = 'SELECT * FROM "users"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(null, null, null, true)));
+    }
 }
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index d59fed26573f..8d5520ecd73e 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -1,536 +1,479 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class GroupTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GroupTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupBy()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name');
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingBy()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name')
-				->having('SUM(id) > 2');
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 2';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingBy()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name')
-				->having('id >', 3)
-				->orHaving('SUM(id) > 2');
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" > 3 OR SUM(id) > 2';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingIn()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name')
-				->havingIn('id', [1, 2]);
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2)';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingInClosure()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name');
-
-		$builder->havingIn('id', function (BaseBuilder $builder) {
-			return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-		});
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingIn()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->select('name')
-				->groupBy('name')
-				->havingIn('id', [1, 2])
-				->orHavingIn('group_id', [5, 6]);
-
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2) OR "group_id" IN (5,6)';
+    protected $db;
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	//--------------------------------------------------------------------
+        $this->db = new MockConnection([]);
+    }
 
-	public function testOrHavingInClosure()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testGroupBy()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->select('name')
-				->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
-		$builder->havingIn('id', function (BaseBuilder $builder) {
-			return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-		});
-		$builder->orHavingIn('group_id', function (BaseBuilder $builder) {
-			return $builder->select('group_id')->from('groups')->where('group_id', 6);
-		});
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name"';
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testHavingBy()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) > 2');
 
-	public function testHavingNotIn()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 2';
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingNotIn('id', [1, 2]);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2)';
+    public function testOrHavingBy()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('id >', 3)
+            ->orHaving('SUM(id) > 2');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" > 3 OR SUM(id) > 2';
 
-	public function testHavingNotInClosure()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name');
+    public function testHavingIn()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->havingNotIn('id', function (BaseBuilder $builder) {
-			return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-		});
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingIn('id', [1, 2]);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2)';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testHavingInClosure()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testOrHavingNotIn()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->select('name')->groupBy('name');
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingNotIn('id', [1, 2])
-				->orHavingNotIn('group_id', [5, 6]);
+        $builder->havingIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+        });
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2) OR "group_id" NOT IN (5,6)';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testOrHavingIn()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testOrHavingNotInClosure()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingIn('id', [1, 2])
+            ->orHavingIn('group_id', [5, 6]);
 
-		$builder->select('name')
-				->groupBy('name');
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2) OR "group_id" IN (5,6)';
 
-		$builder->havingNotIn('id', function (BaseBuilder $builder) {
-			return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-		});
-		$builder->orHavingNotIn('group_id', function (BaseBuilder $builder) {
-			return $builder->select('group_id')->from('groups')->where('group_id', 6);
-		});
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" NOT IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
+    public function testOrHavingInClosure()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')->groupBy('name');
 
-	//--------------------------------------------------------------------
+        $builder->havingIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+        });
+        $builder->orHavingIn('group_id', static function (BaseBuilder $builder) {
+            return $builder->select('group_id')->from('groups')->where('group_id', 6);
+        });
 
-	public function testHavingLike()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\'';
+    public function testHavingNotIn()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingNotIn('id', [1, 2]);
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2)';
 
-	public function testHavingLikeBefore()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'before');
+    public function testHavingNotInClosure()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\'';
+        $builder->select('name')->groupBy('name');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->havingNotIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+        });
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
-	public function testHavingLikeAfter()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'after');
+    public function testOrHavingNotIn()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\'';
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingNotIn('id', [1, 2])
+            ->orHavingNotIn('group_id', [5, 6]);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2) OR "group_id" NOT IN (5,6)';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testNotHavingLike()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testOrHavingNotInClosure()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->select('name')
-				->groupBy('name')
-				->notHavingLike('pet_name', 'a');
+        $builder->select('name')->groupBy('name');
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a%\' ESCAPE \'!\'';
+        $builder->havingNotIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+        });
+        $builder->orHavingNotIn('group_id', static function (BaseBuilder $builder) {
+            return $builder->select('group_id')->from('groups')->where('group_id', 6);
+        });
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" NOT IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testNotHavingLikeBefore()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testHavingLike()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->select('name')
-				->groupBy('name')
-				->notHavingLike('pet_name', 'a', 'before');
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a');
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a\' ESCAPE \'!\'';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\'';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testHavingLikeBefore()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testNotHavingLikeAfter()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before');
 
-		$builder->select('name')
-				->groupBy('name')
-				->notHavingLike('pet_name', 'a', 'after');
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\'';
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'a%\' ESCAPE \'!\'';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testHavingLikeAfter()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after');
 
-	public function testOrHavingLike()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\'';
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a')
-				->orHavingLike('pet_color', 'b');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b%\' ESCAPE \'!\'';
+    public function testNotHavingLike()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a%\' ESCAPE \'!\'';
 
-	public function testOrHavingLikeBefore()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'before')
-				->orHavingLike('pet_color', 'b', 'before');
+    public function testNotHavingLikeBefore()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b\' ESCAPE \'!\'';
+        $builder->select('name')
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a', 'before');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a\' ESCAPE \'!\'';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testOrHavingLikeAfter()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testNotHavingLikeAfter()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'after')
-				->orHavingLike('pet_color', 'b', 'after');
+        $builder->select('name')
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a', 'after');
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'b%\' ESCAPE \'!\'';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'a%\' ESCAPE \'!\'';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testOrHavingLike()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testOrNotHavingLike()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a')
+            ->orHavingLike('pet_color', 'b');
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a')
-				->orNotHavingLike('pet_color', 'b');
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b%\' ESCAPE \'!\'';
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b%\' ESCAPE \'!\'';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testOrHavingLikeBefore()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before')
+            ->orHavingLike('pet_color', 'b', 'before');
 
-	public function testOrNotHavingLikeBefore()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b\' ESCAPE \'!\'';
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'before')
-				->orNotHavingLike('pet_color', 'b', 'before');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b\' ESCAPE \'!\'';
+    public function testOrHavingLikeAfter()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after')
+            ->orHavingLike('pet_color', 'b', 'after');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'b%\' ESCAPE \'!\'';
 
-	public function testOrNotHavingLikeAfter()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name')
-				->havingLike('pet_name', 'a', 'after')
-				->orNotHavingLike('pet_color', 'b', 'after');
+    public function testOrNotHavingLike()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'b%\' ESCAPE \'!\'';
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a')
+            ->orNotHavingLike('pet_color', 'b');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b%\' ESCAPE \'!\'';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testHavingAndGroup()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testOrNotHavingLikeBefore()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->select('name')
-				->groupBy('name')
-				->having('SUM(id) <', 3)
-				->havingGroupStart()
-					->having('SUM(id)', 2)
-					->having('name', 'adam')
-				->havingGroupEnd();
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before')
+            ->orNotHavingLike('pet_color', 'b', 'before');
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND   ( SUM(id) = 2 AND "name" = \'adam\'  )';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b\' ESCAPE \'!\'';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testOrNotHavingLikeAfter()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testHavingOrGroup()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->select('name')
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after')
+            ->orNotHavingLike('pet_color', 'b', 'after');
 
-		$builder->select('name')
-				->groupBy('name')
-				->having('SUM(id) >', 3)
-				->orHavingGroupStart()
-					->having('SUM(id)', 2)
-					->having('name', 'adam')
-				->havingGroupEnd();
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'b%\' ESCAPE \'!\'';
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 3 OR   ( SUM(id) = 2 AND "name" = \'adam\'  )';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testHavingAndGroup()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->havingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
-	public function testNotHavingAndGroup()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-		$builder->select('name')
-				->groupBy('name')
-				->having('SUM(id) <', 3)
-				->notHavingGroupStart()
-					->having('SUM(id)', 2)
-					->having('name', 'adam')
-				->havingGroupEnd();
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
+    public function testHavingOrGroup()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) >', 3)
+            ->orHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 3 OR   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-	public function testNotHavingOrGroup()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->select('name')
-				->groupBy('name')
-				->having('SUM(id) <', 3)
-				->orNotHavingGroupStart()
-					->having('SUM(id)', 2)
-					->having('name', 'adam')
-				->havingGroupEnd();
+    public function testNotHavingAndGroup()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 OR NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->notHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testAndGroups()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    public function testNotHavingOrGroup()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$builder->groupStart()
-					->where('id >', 3)
-					->where('name !=', 'Luke')
-				->groupEnd()
-				->where('name', 'Darth');
+        $builder->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->orNotHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
-		$expectedSQL = 'SELECT * FROM "user" WHERE   ( "id" > 3 AND "name" != \'Luke\'  ) AND "name" = \'Darth\'';
+        $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 OR NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testAndGroups()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	public function testOrGroups()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $builder->groupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd()
+            ->where('name', 'Darth');
 
-		$builder->where('name', 'Darth')
-				->orGroupStart()
-					->where('id >', 3)
-					->where('name !=', 'Luke')
-				->groupEnd();
+        $expectedSQL = 'SELECT * FROM "user" WHERE   ( "id" > 3 AND "name" != \'Luke\'  ) AND "name" = \'Darth\'';
 
-		$expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR   ( "id" > 3 AND "name" != \'Luke\'  )';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testOrGroups()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->where('name', 'Darth')
+            ->orGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
-	public function testNotGroups()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-		$builder->where('name', 'Darth')
-				->notGroupStart()
-				->where('id >', 3)
-				->where('name !=', 'Luke')
-				->groupEnd();
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' AND NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
+    public function testNotGroups()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->where('name', 'Darth')
+            ->notGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' AND NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-	public function testOrNotGroups()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->where('name', 'Darth')
-				->orNotGroupStart()
-				->where('id >', 3)
-				->where('name !=', 'Luke')
-				->groupEnd();
+    public function testOrNotGroups()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
+        $builder->where('name', 'Darth')
+            ->orNotGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 9ccecba23248..f2537543ac5e 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -1,129 +1,145 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class InsertTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class InsertTest extends CIUnitTestCase
 {
-	/** @var MockConnection */
-	protected $db;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	public function testSimpleInsert()
-	{
-		$builder = $this->db->table('jobs');
-
-		$insertData = [
-			'id'   => 1,
-			'name' => 'Grocery Sales',
-		];
-		$builder->testMode()->insert($insertData, true);
-
-		$expectedSQL   = 'INSERT INTO "jobs" ("id", "name") VALUES (1, \'Grocery Sales\')';
-		$expectedBinds = [
-			'id'   => [
-				1,
-				true,
-			],
-			'name' => [
-				'Grocery Sales',
-				true,
-			],
-		];
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledInsert()));
-		$this->assertEquals($expectedBinds, $builder->getBinds());
-	}
-
-	public function testThrowsExceptionOnNoValuesSet()
-	{
-		$builder = $this->db->table('jobs');
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('You must use the "set" method to update an entry.');
-
-		$builder->testMode()->insert(null, true);
-	}
-
-	public function testInsertBatch()
-	{
-		$builder = $this->db->table('jobs');
-
-		$insertData = [
-			[
-				'id'          => 2,
-				'name'        => 'Commedian',
-				'description' => 'There\'s something in your teeth',
-			],
-			[
-				'id'          => 3,
-				'name'        => 'Cab Driver',
-				'description' => 'I am yellow',
-			],
-		];
-
-		$this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
-		$builder->insertBatch($insertData, true);
-
-		$query = $this->db->getLastQuery();
-		$this->assertInstanceOf(Query::class, $query);
-
-		$raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-		$this->assertEquals($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
-
-		$expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
-		$this->assertEquals($expected, str_replace("\n", ' ', $query->getQuery()));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4345
-	 */
-	public function testInsertBatchWithFieldsEndingInNumbers()
-	{
-		$builder = $this->db->table('ip_table');
-
-		$data = [
-			[ 'ip' => '1.1.1.0', 'ip2' => '1.1.1.2' ],
-			[ 'ip' => '2.2.2.0', 'ip2' => '2.2.2.2' ],
-			[ 'ip' => '3.3.3.0', 'ip2' => '3.3.3.2' ],
-			[ 'ip' => '4.4.4.0', 'ip2' => '4.4.4.2' ],
-		];
-
-		$this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
-		$builder->insertBatch($data, true);
-
-		$query = $this->db->getLastQuery();
-		$this->assertInstanceOf(Query::class, $query);
-
-		$raw = 'INSERT INTO "ip_table" ("ip", "ip2") VALUES (:ip:,:ip2:), (:ip.1:,:ip2.1:), (:ip.2:,:ip2.2:), (:ip.3:,:ip2.3:)';
-		$this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
-
-		$expected = "INSERT INTO \"ip_table\" (\"ip\", \"ip2\") VALUES ('1.1.1.0','1.1.1.2'), ('2.2.2.0','2.2.2.2'), ('3.3.3.0','3.3.3.2'), ('4.4.4.0','4.4.4.2')";
-		$this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
-	}
-
-	public function testInsertBatchThrowsExceptionOnNoData()
-	{
-		$builder = $this->db->table('jobs');
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
-		$this->expectExceptionMessage('You must use the "set" method to update an entry.');
-		$builder->insertBatch();
-	}
-
-	public function testInsertBatchThrowsExceptionOnEmptyData()
-	{
-		$builder = $this->db->table('jobs');
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('insertBatch() called with no data');
-		$builder->insertBatch([]);
-	}
+    /**
+     * @var MockConnection
+     */
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testSimpleInsert()
+    {
+        $builder = $this->db->table('jobs');
+
+        $insertData = [
+            'id'   => 1,
+            'name' => 'Grocery Sales',
+        ];
+        $builder->testMode()->insert($insertData, true);
+
+        $expectedSQL   = 'INSERT INTO "jobs" ("id", "name") VALUES (1, \'Grocery Sales\')';
+        $expectedBinds = [
+            'id' => [
+                1,
+                true,
+            ],
+            'name' => [
+                'Grocery Sales',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledInsert()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testThrowsExceptionOnNoValuesSet()
+    {
+        $builder = $this->db->table('jobs');
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
+
+        $builder->testMode()->insert(null, true);
+    }
+
+    public function testInsertBatch()
+    {
+        $builder = $this->db->table('jobs');
+
+        $insertData = [
+            [
+                'id'          => 2,
+                'name'        => 'Commedian',
+                'description' => 'There\'s something in your teeth',
+            ],
+            [
+                'id'          => 3,
+                'name'        => 'Cab Driver',
+                'description' => 'I am yellow',
+            ],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->insertBatch($insertData, true);
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(Query::class, $query);
+
+        $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
+        $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4345
+     */
+    public function testInsertBatchWithFieldsEndingInNumbers()
+    {
+        $builder = $this->db->table('ip_table');
+
+        $data = [
+            ['ip' => '1.1.1.0', 'ip2' => '1.1.1.2'],
+            ['ip' => '2.2.2.0', 'ip2' => '2.2.2.2'],
+            ['ip' => '3.3.3.0', 'ip2' => '3.3.3.2'],
+            ['ip' => '4.4.4.0', 'ip2' => '4.4.4.2'],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->insertBatch($data, true);
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(Query::class, $query);
+
+        $raw = 'INSERT INTO "ip_table" ("ip", "ip2") VALUES (:ip:,:ip2:), (:ip.1:,:ip2.1:), (:ip.2:,:ip2.2:), (:ip.3:,:ip2.3:)';
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
+        $expected = "INSERT INTO \"ip_table\" (\"ip\", \"ip2\") VALUES ('1.1.1.0','1.1.1.2'), ('2.2.2.0','2.2.2.2'), ('3.3.3.0','3.3.3.2'), ('4.4.4.0','4.4.4.2')";
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
+    }
+
+    public function testInsertBatchThrowsExceptionOnNoData()
+    {
+        $builder = $this->db->table('jobs');
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
+        $builder->insertBatch();
+    }
+
+    public function testInsertBatchThrowsExceptionOnEmptyData()
+    {
+        $builder = $this->db->table('jobs');
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('insertBatch() called with no data');
+        $builder->insertBatch([]);
+    }
 }
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 3ea9f8445fdc..7ebb188adf6d 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Postgre\Builder as PostgreBuilder;
@@ -6,99 +17,85 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class JoinTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class JoinTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testJoinSimple()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-
-		$builder->join('job', 'user.id = job.id');
-
-		$expectedSQL = 'SELECT * FROM "user" JOIN "job" ON "user"."id" = "job"."id"';
-
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
+    protected $db;
 
-	public function testJoinIsNull()
-	{
-		$builder = new BaseBuilder('table1', $this->db);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$builder->join('table2', 'field IS NULL');
+        $this->db = new MockConnection([]);
+    }
 
-		$expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NULL';
+    public function testJoinSimple()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->join('job', 'user.id = job.id');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "user" JOIN "job" ON "user"."id" = "job"."id"';
 
-	public function testJoinIsNotNull()
-	{
-		$builder = new BaseBuilder('table1', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->join('table2', 'field IS NOT NULL');
+    public function testJoinIsNull()
+    {
+        $builder = new BaseBuilder('table1', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NOT NULL';
+        $builder->join('table2', 'field IS NULL');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NULL';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testJoinMultipleConditions()
-	{
-		$builder = new BaseBuilder('table1', $this->db);
+    public function testJoinIsNotNull()
+    {
+        $builder = new BaseBuilder('table1', $this->db);
 
-		$builder->join('table2', "table1.field1 = table2.field2 AND table1.field1 = 'foo' AND table2.field2 = 0", 'LEFT');
+        $builder->join('table2', 'field IS NOT NULL');
 
-		$expectedSQL = "SELECT * FROM \"table1\" LEFT JOIN \"table2\" ON \"table1\".\"field1\" = \"table2\".\"field2\" AND \"table1\".\"field1\" = 'foo' AND \"table2\".\"field2\" = 0";
+        $expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NOT NULL';
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testJoinMultipleConditions()
+    {
+        $builder = new BaseBuilder('table1', $this->db);
 
-	public function testFullOuterJoin()
-	{
-		$builder = new PostgreBuilder('jobs', $this->db);
-		$builder->testMode();
-		$builder->join('users as u', 'users.id = jobs.id', 'full outer');
+        $builder->join('table2', "table1.field1 = table2.field2 AND table1.field1 = 'foo' AND table2.field2 = 0", 'LEFT');
 
-		$expectedSQL = 'SELECT * FROM "jobs" FULL OUTER JOIN "users" as "u" ON "users"."id" = "jobs"."id"';
+        $expectedSQL = "SELECT * FROM \"table1\" LEFT JOIN \"table2\" ON \"table1\".\"field1\" = \"table2\".\"field2\" AND \"table1\".\"field1\" = 'foo' AND \"table2\".\"field2\" = 0";
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testFullOuterJoin()
+    {
+        $builder = new PostgreBuilder('jobs', $this->db);
+        $builder->testMode();
+        $builder->join('users as u', 'users.id = jobs.id', 'full outer');
 
-	public function testJoinWithAlias()
-	{
-		$this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+        $expectedSQL = 'SELECT * FROM "jobs" FULL OUTER JOIN "users" as "u" ON "users"."id" = "jobs"."id"';
 
-		$builder = new SQLSRVBuilder('jobs', $this->db);
-		$builder->testMode();
-		$builder->join('users u', 'u.id = jobs.id', 'LEFT');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "test"."dbo"."jobs" LEFT JOIN "test"."dbo"."users" "u" ON "u"."id" = "jobs"."id"';
+    public function testJoinWithAlias()
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder = new SQLSRVBuilder('jobs', $this->db);
+        $builder->testMode();
+        $builder->join('users u', 'u.id = jobs.id', 'LEFT');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs" LEFT JOIN "test"."dbo"."users" "u" ON "u"."id" = "jobs"."id"';
 
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index c838e27731df..74a2d2fbbf81 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -1,172 +1,186 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class LikeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LikeTest extends CIUnitTestCase
 {
-	protected $db;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	public function testSimpleLike()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'%veloper%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testLikeNoSide()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper', 'none');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE 'veloper' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'veloper',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testLikeBeforeOnly()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper', 'before');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'%veloper',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testLikeAfterOnly()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper', 'after');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE 'veloper%' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'veloper%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testOrLike()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper')->orLike('name', 'ian');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!' OR  \"name\" LIKE '%ian%' ESCAPE '!'";
-		$expectedBinds = [
-			'name'  => [
-				'%veloper%',
-				true,
-			],
-			'name.1' => [
-				'%ian%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testNotLike()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->notLike('name', 'veloper');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" NOT LIKE '%veloper%' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'%veloper%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testOrNotLike()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'veloper')->orNotLike('name', 'ian');
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!' OR  \"name\" NOT LIKE '%ian%' ESCAPE '!'";
-		$expectedBinds = [
-			'name'  => [
-				'%veloper%',
-				true,
-			],
-			'name.1' => [
-				'%ian%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	/**
-	 * @group single
-	 */
-	public function testCaseInsensitiveLike()
-	{
-		$builder = new BaseBuilder('job', $this->db);
-
-		$builder->like('name', 'VELOPER', 'both', null, true);
-
-		$expectedSQL   = "SELECT * FROM \"job\" WHERE LOWER(name) LIKE '%veloper%' ESCAPE '!'";
-		$expectedBinds = [
-			'name' => [
-				'%veloper%',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testSimpleLike()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testLikeNoSide()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper', 'none');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE 'veloper' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                'veloper',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testLikeBeforeOnly()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper', 'before');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testLikeAfterOnly()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper', 'after');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE 'veloper%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                'veloper%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testOrLike()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper')->orLike('name', 'ian');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!' OR  \"name\" LIKE '%ian%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper%',
+                true,
+            ],
+            'name.1' => [
+                '%ian%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testNotLike()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->notLike('name', 'veloper');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" NOT LIKE '%veloper%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testOrNotLike()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'veloper')->orNotLike('name', 'ian');
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE \"name\" LIKE '%veloper%' ESCAPE '!' OR  \"name\" NOT LIKE '%ian%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper%',
+                true,
+            ],
+            'name.1' => [
+                '%ian%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    /**
+     * @group single
+     */
+    public function testCaseInsensitiveLike()
+    {
+        $builder = new BaseBuilder('job', $this->db);
+
+        $builder->like('name', 'VELOPER', 'both', null, true);
+
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE LOWER(name) LIKE '%veloper%' ESCAPE '!'";
+        $expectedBinds = [
+            'name' => [
+                '%veloper%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
 }
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index 2338a44112f2..ab6c2e41e222 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -1,60 +1,64 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class LimitTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LimitTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLimitAlone()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    protected $db;
 
-		$builder->limit(5);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$expectedSQL = 'SELECT * FROM "user"  LIMIT 5';
+        $this->db = new MockConnection([]);
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testLimitAlone()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->limit(5);
 
-	public function testLimitAndOffset()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT * FROM "user"  LIMIT 5';
 
-		$builder->limit(5, 1);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
+    public function testLimitAndOffset()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->limit(5, 1);
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
 
-	public function testLimitAndOffsetMethod()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->limit(5)->offset(1);
+    public function testLimitAndOffsetMethod()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
+        $builder->limit(5)->offset(1);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 076e27f0a299..3b3b6622c59f 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -1,60 +1,64 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class OrderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class OrderTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrderAscending()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    protected $db;
 
-		$builder->orderBy('name', 'asc');
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$expectedSQL = 'SELECT * FROM "user" ORDER BY "name" ASC';
+        $this->db = new MockConnection([]);
+    }
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testOrderAscending()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->orderBy('name', 'asc');
 
-	public function testOrderDescending()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $expectedSQL = 'SELECT * FROM "user" ORDER BY "name" ASC';
 
-		$builder->orderBy('name', 'desc');
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expectedSQL = 'SELECT * FROM "user" ORDER BY "name" DESC';
+    public function testOrderDescending()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->orderBy('name', 'desc');
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'SELECT * FROM "user" ORDER BY "name" DESC';
 
-	public function testOrderRandom()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->orderBy('name', 'random');
+    public function testOrderRandom()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-		$expectedSQL = 'SELECT * FROM "user" ORDER BY RAND()';
+        $builder->orderBy('name', 'random');
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expectedSQL = 'SELECT * FROM "user" ORDER BY RAND()';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 88ce1312198c..35455d4856f9 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -1,45 +1,52 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class PrefixTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PrefixTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection(['DBPrefix' => 'ci_']);
-	}
-
-	//--------------------------------------------------------------------
+    protected $db;
 
-	public function testPrefixesSetOnTableNames()
-	{
-		$expected = 'ci_users';
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->assertEquals($expected, $this->db->prefixTable('users'));
-	}
+        $this->db = new MockConnection(['DBPrefix' => 'ci_']);
+    }
 
-	//--------------------------------------------------------------------
+    public function testPrefixesSetOnTableNames()
+    {
+        $expected = 'ci_users';
 
-	public function testPrefixesSetOnTableNamesWithWhereClause()
-	{
-		$builder = $this->db->table('users');
+        $this->assertSame($expected, $this->db->prefixTable('users'));
+    }
 
-		$where = 'users.created_at < users.updated_at';
+    public function testPrefixesSetOnTableNamesWithWhereClause()
+    {
+        $builder = $this->db->table('users');
 
-		$expectedSQL   = 'SELECT * FROM "ci_users" WHERE "ci_users"."created_at" < "ci_users"."updated_at"';
-		$expectedBinds = [];
+        $where = 'users.created_at < users.updated_at';
 
-		$builder->where($where);
+        $expectedSQL   = 'SELECT * FROM "ci_users" WHERE "ci_users"."created_at" < "ci_users"."updated_at"';
+        $expectedBinds = [];
 
-		$this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
+        $builder->where($where);
 
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
 }
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index 71cb7423abdb..4197ed05449d 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -1,41 +1,55 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class ReplaceTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ReplaceTest extends CIUnitTestCase
 {
-	protected $db;
+    protected $db;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->db = new MockConnection([]);
-	}
+        $this->db = new MockConnection([]);
+    }
 
-	public function testSimpleReplace()
-	{
-		$builder = $this->db->table('jobs');
+    public function testSimpleReplace()
+    {
+        $builder = $this->db->table('jobs');
 
-		$expected = 'REPLACE INTO "jobs" ("title", "name", "date") VALUES (:title:, :name:, :date:)';
+        $expected = 'REPLACE INTO "jobs" ("title", "name", "date") VALUES (:title:, :name:, :date:)';
 
-		$data = [
-			'title' => 'My title',
-			'name'  => 'My Name',
-			'date'  => 'My date',
-		];
+        $data = [
+            'title' => 'My title',
+            'name'  => 'My Name',
+            'date'  => 'My date',
+        ];
 
-		$this->assertSame($expected, $builder->testMode()->replace($data));
-	}
+        $this->assertSame($expected, $builder->testMode()->replace($data));
+    }
 
-	public function testReplaceThrowsExceptionWithNoData()
-	{
-		$builder = $this->db->table('jobs');
+    public function testReplaceThrowsExceptionWithNoData()
+    {
+        $builder = $this->db->table('jobs');
 
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('You must use the "set" method to update an entry.');
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
-		$builder->replace();
-	}
+        $builder->replace();
+    }
 }
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index bfec1cc494d7..7a9e7570221d 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DataException;
@@ -6,275 +17,233 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class SelectTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SelectTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSimpleSelect()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-
-		$expected = 'SELECT * FROM "users"';
-
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectOnlyOneColumn()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-
-		$builder->select('name');
-
-		$expected = 'SELECT "name" FROM "users"';
-
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectAcceptsArray()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-
-		$builder->select(['name', 'role']);
-
-		$expected = 'SELECT "name", "role" FROM "users"';
-
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectAcceptsMultipleColumns()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-
-		$builder->select('name, role');
-
-		$expected = 'SELECT "name", "role" FROM "users"';
-
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	//--------------------------------------------------------------------
+    protected $db;
 
-	public function testSelectKeepsAliases()
-	{
-		$builder = new BaseBuilder('users', $this->db);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$builder->select('name, role as myRole');
+        $this->db = new MockConnection([]);
+    }
 
-		$expected = 'SELECT "name", "role" as "myRole" FROM "users"';
+    public function testSimpleSelect()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expected = 'SELECT * FROM "users"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testSelectWorksWithComplexSelects()
-	{
-		$builder = new BaseBuilder('users', $this->db);
+    public function testSelectOnlyOneColumn()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-		$builder->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid');
+        $builder->select('name');
 
-		$expected = 'SELECT (SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid FROM "users"';
+        $expected = 'SELECT "name" FROM "users"';
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectAcceptsArray()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-	public function testSelectMinWithNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $builder->select(['name', 'role']);
 
-		$builder->selectMin('payments');
+        $expected = 'SELECT "name", "role" FROM "users"';
 
-		$expected = 'SELECT MIN("payments") AS "payments" FROM "invoices"';
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testSelectAcceptsMultipleColumns()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->select('name, role');
 
-	public function testSelectMinWithAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $expected = 'SELECT "name", "role" FROM "users"';
 
-		$builder->selectMin('payments', 'myAlias');
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expected = 'SELECT MIN("payments") AS "myAlias" FROM "invoices"';
+    public function testSelectKeepsAliases()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->select('name, role as myRole');
 
-	//--------------------------------------------------------------------
+        $expected = 'SELECT "name", "role" as "myRole" FROM "users"';
 
-	public function testSelectMaxWithNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->selectMax('payments');
+    public function testSelectWorksWithComplexSelects()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-		$expected = 'SELECT MAX("payments") AS "payments" FROM "invoices"';
+        $builder->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid');
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expected = 'SELECT (SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid FROM "users"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testSelectMaxWithAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+    public function testSelectMinWithNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$builder->selectMax('payments', 'myAlias');
+        $builder->selectMin('payments');
 
-		$expected = 'SELECT MAX("payments") AS "myAlias" FROM "invoices"';
+        $expected = 'SELECT MIN("payments") AS "payments" FROM "invoices"';
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectMinWithAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-	public function testSelectAvgWithNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $builder->selectMin('payments', 'myAlias');
 
-		$builder->selectAvg('payments');
+        $expected = 'SELECT MIN("payments") AS "myAlias" FROM "invoices"';
 
-		$expected = 'SELECT AVG("payments") AS "payments" FROM "invoices"';
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testSelectMaxWithNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->selectMax('payments');
 
-	public function testSelectAvgWithAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $expected = 'SELECT MAX("payments") AS "payments" FROM "invoices"';
 
-		$builder->selectAvg('payments', 'myAlias');
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expected = 'SELECT AVG("payments") AS "myAlias" FROM "invoices"';
+    public function testSelectMaxWithAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->selectMax('payments', 'myAlias');
 
-	//--------------------------------------------------------------------
+        $expected = 'SELECT MAX("payments") AS "myAlias" FROM "invoices"';
 
-	public function testSelectSumWithNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->selectSum('payments');
+    public function testSelectAvgWithNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$expected = 'SELECT SUM("payments") AS "payments" FROM "invoices"';
+        $builder->selectAvg('payments');
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $expected = 'SELECT AVG("payments") AS "payments" FROM "invoices"';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	public function testSelectSumWithAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+    public function testSelectAvgWithAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$builder->selectSum('payments', 'myAlias');
+        $builder->selectAvg('payments', 'myAlias');
 
-		$expected = 'SELECT SUM("payments") AS "myAlias" FROM "invoices"';
+        $expected = 'SELECT AVG("payments") AS "myAlias" FROM "invoices"';
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectSumWithNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-	public function testSelectCountWithNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $builder->selectSum('payments');
 
-		$builder->selectCount('payments');
+        $expected = 'SELECT SUM("payments") AS "payments" FROM "invoices"';
 
-		$expected = 'SELECT COUNT("payments") AS "payments" FROM "invoices"';
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    public function testSelectSumWithAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-	//--------------------------------------------------------------------
+        $builder->selectSum('payments', 'myAlias');
 
-	public function testSelectCountWithAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $expected = 'SELECT SUM("payments") AS "myAlias" FROM "invoices"';
 
-		$builder->selectCount('payments', 'myAlias');
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$expected = 'SELECT COUNT("payments") AS "myAlias" FROM "invoices"';
+    public function testSelectCountWithNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->selectCount('payments');
 
-	//--------------------------------------------------------------------
+        $expected = 'SELECT COUNT("payments") AS "payments" FROM "invoices"';
 
-	public function testSelectMinThrowsExceptionOnEmptyValue()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('Empty statement is given for the field `Select`');
+    public function testSelectCountWithAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$builder->selectSum('');
-	}
+        $builder->selectCount('payments', 'myAlias');
 
-	//--------------------------------------------------------------------
+        $expected = 'SELECT COUNT("payments") AS "myAlias" FROM "invoices"';
 
-	public function testSelectMaxWithDotNameAndNoAlias()
-	{
-		$builder = new BaseBuilder('invoices', $this->db);
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-		$builder->selectMax('db.payments');
+    public function testSelectMinThrowsExceptionOnEmptyValue()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-		$expected = 'SELECT MAX("db"."payments") AS "payments" FROM "invoices"';
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('Empty statement is given for the field `Select`');
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder->selectSum('');
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectMaxWithDotNameAndNoAlias()
+    {
+        $builder = new BaseBuilder('invoices', $this->db);
 
-	public function testSelectMinThrowsExceptionOnMultipleColumn()
-	{
-		$builder = new BaseBuilder('users', $this->db);
+        $builder->selectMax('db.payments');
 
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('You must provide a valid column name not separated by comma.');
+        $expected = 'SELECT MAX("db"."payments") AS "payments" FROM "invoices"';
 
-		$builder->selectSum('name,role');
-	}
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectMinThrowsExceptionOnMultipleColumn()
+    {
+        $builder = new BaseBuilder('users', $this->db);
 
-	public function testSimpleSelectWithSQLSRV()
-	{
-		$this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('You must provide a valid column name not separated by comma.');
 
-		$builder = new SQLSRVBuilder('users', $this->db);
+        $builder->selectSum('name,role');
+    }
 
-		$expected = 'SELECT * FROM "test"."dbo"."users"';
+    public function testSimpleSelectWithSQLSRV()
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
 
-		$this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+        $builder = new SQLSRVBuilder('users', $this->db);
 
-	//--------------------------------------------------------------------
+        $expected = 'SELECT * FROM "test"."dbo"."users"';
 
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index 14ddd55701ae..82bf5ad4d9aa 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -1,33 +1,40 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class TruncateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TruncateTest extends CIUnitTestCase
 {
-	protected $db;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	//--------------------------------------------------------------------
+    protected $db;
 
-	public function testTruncate()
-	{
-		$builder = new BaseBuilder('user', $this->db);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$expectedSQL = 'TRUNCATE "user"';
+        $this->db = new MockConnection([]);
+    }
 
-		$this->assertEquals($expectedSQL, $builder->testMode()->truncate());
-	}
+    public function testTruncate()
+    {
+        $builder = new BaseBuilder('user', $this->db);
 
-	//--------------------------------------------------------------------
+        $expectedSQL = 'TRUNCATE "user"';
 
+        $this->assertSame($expectedSQL, $builder->testMode()->truncate());
+    }
 }
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 807c4180d3f2..801324d01f79 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -1,299 +1,316 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 use CodeIgniter\Test\Mock\MockQuery;
 
-class UpdateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class UpdateTest extends CIUnitTestCase
 {
-	/** @var MockConnection */
-	protected $db;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	public function testUpdate()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()->where('id', 1)->update(['name' => 'Programmer'], null, null);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
-		$expectedBinds = [
-			'id'   => [
-				1,
-				true,
-			],
-			'name' => [
-				'Programmer',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testUpdateInternalWhereAndLimit()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()->update(['name' => 'Programmer'], ['id' => 1], 5);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1  LIMIT 5';
-		$expectedBinds = [
-			'name' => [
-				'Programmer',
-				true,
-			],
-			'id'   => [
-				1,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testUpdateWithSet()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()->set('name', 'Programmer')->where('id', 1)->update(null, null, null);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
-		$expectedBinds = [
-			'name' => [
-				'Programmer',
-				true,
-			],
-			'id'   => [
-				1,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testUpdateThrowsExceptionWithNoData()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$this->expectException('CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
-
-		$builder->update(null, null, null, true);
-	}
-
-	public function testUpdateBatch()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$updateData = [
-			[
-				'id'          => 2,
-				'name'        => 'Comedian',
-				'description' => 'There\'s something in your teeth',
-			],
-			[
-				'id'          => 3,
-				'name'        => 'Cab Driver',
-				'description' => 'I am yellow',
-			],
-		];
-
-		$this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
-		$builder->updateBatch($updateData, 'id');
-
-		$query = $this->db->getLastQuery();
-		$this->assertInstanceOf(MockQuery::class, $query);
-
-		$space = ' ';
-
-		$expected = <<<EOF
-		UPDATE "jobs" SET "name" = CASE{$space}
-		WHEN "id" = :id: THEN :name:
-		WHEN "id" = :id.1: THEN :name.1:
-		ELSE "name" END, "description" = CASE{$space}
-		WHEN "id" = :id: THEN :description:
-		WHEN "id" = :id.1: THEN :description.1:
-		ELSE "description" END
-		WHERE "id" IN(:id:,:id.1:)
-		EOF;
-
-		$this->assertSame($expected, $query->getOriginalQuery());
-
-		$expected = <<<EOF
-		UPDATE "jobs" SET "name" = CASE{$space}
-		WHEN "id" = 2 THEN 'Comedian'
-		WHEN "id" = 3 THEN 'Cab Driver'
-		ELSE "name" END, "description" = CASE{$space}
-		WHEN "id" = 2 THEN 'There''s something in your teeth'
-		WHEN "id" = 3 THEN 'I am yellow'
-		ELSE "description" END
-		WHERE "id" IN(2,3)
-		EOF;
-
-		$this->assertSame($expected, $query->getQuery() );
-	}
-
-	public function testUpdateBatchThrowsExceptionWithNoData()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('You must use the "set" method to update an entry.');
-
-		$builder->updateBatch(null, 'id');
-	}
-
-	public function testUpdateBatchThrowsExceptionWithNoID()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('You must specify an index to match on for batch updates.');
-
-		$builder->updateBatch([]);
-	}
-
-	public function testUpdateBatchThrowsExceptionWithEmptySetArray()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-		$this->expectExceptionMessage('updateBatch() called with no data');
-
-		$builder->updateBatch([], 'id');
-	}
-
-	public function testUpdateWithWhereSameColumn()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()->update(['name' => 'foobar'], ['name' => 'Programmer'], null);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
-		$expectedBinds = [
-			'name'  => [
-				'foobar',
-				true,
-			],
-			'name.1' => [
-				'Programmer',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testUpdateWithWhereSameColumn2()
-	{
-		// calling order: set() -> where()
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()
-			->set('name', 'foobar')
-			->where('name', 'Programmer')
-			->update(null, null, null);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
-		$expectedBinds = [
-			'name'  => [
-				'foobar',
-				true,
-			],
-			'name.1' => [
-				'Programmer',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testUpdateWithWhereSameColumn3()
-	{
-		// calling order: where() -> set() in update()
-		$builder = new BaseBuilder('jobs', $this->db);
-
-		$builder->testMode()
-			->where('name', 'Programmer')
-			->update(['name' => 'foobar'], null, null);
-
-		$expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
-		$expectedBinds = [
-			'name'  => [
-				'Programmer',
-				true,
-			],
-			'name.1' => [
-				'foobar',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	/**
-	 * @see https://codeigniter4.github.io/CodeIgniter4/database/query_builder.html#updating-data
-	 */
-	public function testSetWithoutEscape()
-	{
-		$builder = new BaseBuilder('mytable', $this->db);
-
-		$builder->testMode()
-			->set('field', 'field+1', false)
-			->where('id', 2)
-			->update(null, null, null);
-
-		$expectedSQL   = 'UPDATE "mytable" SET field = field+1 WHERE "id" = 2';
-		$expectedBinds = [
-			'id' => [
-				2,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testSetWithAndWithoutEscape()
-	{
-		$builder = new BaseBuilder('mytable', $this->db);
-
-		$builder->testMode()
-			->set('foo', 'bar')
-			->set('field', 'field+1', false)
-			->where('id', 2)
-			->update(null, null, null);
-
-		$expectedSQL   = 'UPDATE "mytable" SET "foo" = \'bar\', field = field+1 WHERE "id" = 2';
-		$expectedBinds = [
-			'foo' => [
-				'bar',
-				true,
-			],
-			'id'  => [
-				2,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
+    /**
+     * @var MockConnection
+     */
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testUpdate()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->where('id', 1)->update(['name' => 'Programmer'], null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
+        $expectedBinds = [
+            'id' => [
+                1,
+                true,
+            ],
+            'name' => [
+                'Programmer',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateInternalWhereAndLimit()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->update(['name' => 'Programmer'], ['id' => 1], 5);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1  LIMIT 5';
+        $expectedBinds = [
+            'name' => [
+                'Programmer',
+                true,
+            ],
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateWithSet()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->set('name', 'Programmer')->where('id', 1)->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\' WHERE "id" = 1';
+        $expectedBinds = [
+            'name' => [
+                'Programmer',
+                true,
+            ],
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateThrowsExceptionWithNoData()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
+
+        $builder->update(null, null, null);
+    }
+
+    public function testUpdateBatch()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $updateData = [
+            [
+                'id'          => 2,
+                'name'        => 'Comedian',
+                'description' => 'There\'s something in your teeth',
+            ],
+            [
+                'id'          => 3,
+                'name'        => 'Cab Driver',
+                'description' => 'I am yellow',
+            ],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->updateBatch($updateData, 'id');
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(MockQuery::class, $query);
+
+        $space = ' ';
+
+        $expected = <<<EOF
+            UPDATE "jobs" SET "name" = CASE{$space}
+            WHEN "id" = :id: THEN :name:
+            WHEN "id" = :id.1: THEN :name.1:
+            ELSE "name" END, "description" = CASE{$space}
+            WHEN "id" = :id: THEN :description:
+            WHEN "id" = :id.1: THEN :description.1:
+            ELSE "description" END
+            WHERE "id" IN(:id:,:id.1:)
+            EOF;
+
+        $this->assertSame($expected, $query->getOriginalQuery());
+
+        $expected = <<<EOF
+            UPDATE "jobs" SET "name" = CASE{$space}
+            WHEN "id" = 2 THEN 'Comedian'
+            WHEN "id" = 3 THEN 'Cab Driver'
+            ELSE "name" END, "description" = CASE{$space}
+            WHEN "id" = 2 THEN 'There''s something in your teeth'
+            WHEN "id" = 3 THEN 'I am yellow'
+            ELSE "description" END
+            WHERE "id" IN(2,3)
+            EOF;
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testUpdateBatchThrowsExceptionWithNoData()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
+
+        $builder->updateBatch(null, 'id');
+    }
+
+    public function testUpdateBatchThrowsExceptionWithNoID()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must specify an index to match on for batch updates.');
+
+        $builder->updateBatch([]);
+    }
+
+    public function testUpdateBatchThrowsExceptionWithEmptySetArray()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('updateBatch() called with no data');
+
+        $builder->updateBatch([], 'id');
+    }
+
+    public function testUpdateWithWhereSameColumn()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->update(['name' => 'foobar'], ['name' => 'Programmer'], null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
+        $expectedBinds = [
+            'name' => [
+                'foobar',
+                true,
+            ],
+            'name.1' => [
+                'Programmer',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateWithWhereSameColumn2()
+    {
+        // calling order: set() -> where()
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()
+            ->set('name', 'foobar')
+            ->where('name', 'Programmer')
+            ->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
+        $expectedBinds = [
+            'name' => [
+                'foobar',
+                true,
+            ],
+            'name.1' => [
+                'Programmer',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateWithWhereSameColumn3()
+    {
+        // calling order: where() -> set() in update()
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()
+            ->where('name', 'Programmer')
+            ->update(['name' => 'foobar'], null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'foobar\' WHERE "name" = \'Programmer\'';
+        $expectedBinds = [
+            'name' => [
+                'Programmer',
+                true,
+            ],
+            'name.1' => [
+                'foobar',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    /**
+     * @see https://codeigniter4.github.io/CodeIgniter4/database/query_builder.html#updating-data
+     */
+    public function testSetWithoutEscape()
+    {
+        $builder = new BaseBuilder('mytable', $this->db);
+
+        $builder->testMode()
+            ->set('field', 'field+1', false)
+            ->where('id', 2)
+            ->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "mytable" SET field = field+1 WHERE "id" = 2';
+        $expectedBinds = [
+            'id' => [
+                2,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testSetWithAndWithoutEscape()
+    {
+        $builder = new BaseBuilder('mytable', $this->db);
+
+        $builder->testMode()
+            ->set('foo', 'bar')
+            ->set('field', 'field+1', false)
+            ->where('id', 2)
+            ->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "mytable" SET "foo" = \'bar\', field = field+1 WHERE "id" = 2';
+        $expectedBinds = [
+            'foo' => [
+                'bar',
+                true,
+            ],
+            'id' => [
+                2,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
 }
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index e759987fd9b2..653c837058aa 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Builder;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,358 +17,366 @@
 use InvalidArgumentException;
 use stdClass;
 
-class WhereTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class WhereTest extends CIUnitTestCase
 {
-	/** @var MockConnection */
-	protected $db;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->db = new MockConnection([]);
-	}
-
-	public function testSimpleWhere()
-	{
-		$builder = $this->db->table('users');
-
-		$expectedSQL   = 'SELECT * FROM "users" WHERE "id" = 3';
-		$expectedBinds = [
-			'id' => [
-				3,
-				true,
-			],
-		];
-
-		$builder->where('id', 3);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereNoEscape()
-	{
-		$builder = $this->db->table('users');
-
-		$expectedSQL   = 'SELECT * FROM "users" WHERE id = 3';
-		$expectedBinds = [
-			'id' => [
-				3,
-				false,
-			],
-		];
-
-		$builder->where('id', 3, false);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereCustomKeyOperator()
-	{
-		$builder = $this->db->table('users');
-
-		$expectedSQL   = 'SELECT * FROM "users" WHERE "id" != 3';
-		$expectedBinds = [
-			'id' => [
-				3,
-				true,
-			],
-		];
-
-		$builder->where('id !=', 3);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereAssociateArray()
-	{
-		$builder = $this->db->table('jobs');
-
-		$where = [
-			'id'      => 2,
-			'name !=' => 'Accountant',
-		];
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 AND "name" != \'Accountant\'';
-		$expectedBinds = [
-			'id'   => [
-				2,
-				true,
-			],
-			'name' => [
-				'Accountant',
-				true,
-			],
-		];
-
-		$builder->where($where);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereCustomString()
-	{
-		$builder = $this->db->table('jobs');
-
-		$where = "id > 2 AND name != 'Accountant'";
-
-		$expectedSQL   = "SELECT * FROM \"jobs\" WHERE \"id\" > 2 AND \"name\" != 'Accountant'";
-		$expectedBinds = [];
-
-		$builder->where($where);
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereValueClosure()
-	{
-		$builder = $this->db->table('neworder');
-
-		$builder->where('advance_amount <', function (BaseBuilder $builder) {
-			return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
-		});
-		$expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	public function testOrWhere()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('name !=', 'Accountant')->orWhere('id >', 3);
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" != \'Accountant\' OR "id" > 3';
-		$expectedBinds = [
-			'name' => [
-				'Accountant',
-				true,
-			],
-			'id'   => [
-				3,
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testOrWhereSameColumn()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('name', 'Accountant')
-				->orWhere('name', 'foobar');
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" = \'Accountant\' OR "name" = \'foobar\'';
-		$expectedBinds = [
-			'name'  => [
-				'Accountant',
-				true,
-			],
-			'name.1' => [
-				'foobar',
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereIn()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->whereIn('name', ['Politician', 'Accountant']);
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" IN (\'Politician\',\'Accountant\')';
-		$expectedBinds = [
-			'name' => [
-				[
-					'Politician',
-					'Accountant',
-				],
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereInClosure()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->whereIn('id', function (BaseBuilder $builder) {
-			return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-		});
-
-		$expectedSQL = 'SELECT * FROM "jobs" WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	public function provideInvalidKeys()
-	{
-		return [
-			'null'         => [null],
-			'empty string' => [''],
-		];
-	}
-
-	/**
-	 * @dataProvider provideInvalidKeys
-	 */
-	public function testWhereInvalidKeyThrowInvalidArgumentException($key)
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$builder = $this->db->table('jobs');
-
-		$builder->whereIn($key, ['Politician', 'Accountant']);
-	}
-
-	public function provideInvalidValues()
-	{
-		return [
-			'null'                    => [null],
-			'not array'               => ['not array'],
-			'not instanceof \Closure' => [new stdClass],
-		];
-	}
-
-	/**
-	 * @dataProvider provideInvalidValues
-	 */
-	public function testWhereInEmptyValuesThrowInvalidArgumentException($values)
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$builder = $this->db->table('jobs');
-
-		$builder->whereIn('name', $values);
-	}
-
-	public function testWhereNotIn()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->whereNotIn('name', ['Politician', 'Accountant']);
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" NOT IN (\'Politician\',\'Accountant\')';
-		$expectedBinds = [
-			'name' => [
-				[
-					'Politician',
-					'Accountant',
-				],
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testWhereNotInClosure()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->whereNotIn('id', function (BaseBuilder $builder) {
-			return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-		});
-
-		$expectedSQL = 'SELECT * FROM "jobs" WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	public function testOrWhereIn()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('id', 2)->orWhereIn('name', ['Politician', 'Accountant']);
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 OR "name" IN (\'Politician\',\'Accountant\')';
-		$expectedBinds = [
-			'id'   => [
-				2,
-				true,
-			],
-			'name' => [
-				[
-					'Politician',
-					'Accountant',
-				],
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testOrWhereInClosure()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('deleted_at', null)->orWhereIn('id', function (BaseBuilder $builder) {
-			return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-		});
-
-		$expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	public function testOrWhereNotIn()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('id', 2)->orWhereNotIn('name', ['Politician', 'Accountant']);
-
-		$expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 OR "name" NOT IN (\'Politician\',\'Accountant\')';
-		$expectedBinds = [
-			'id'   => [
-				2,
-				true,
-			],
-			'name' => [
-				[
-					'Politician',
-					'Accountant',
-				],
-				true,
-			],
-		];
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-		$this->assertSame($expectedBinds, $builder->getBinds());
-	}
-
-	public function testOrWhereNotInClosure()
-	{
-		$builder = $this->db->table('jobs');
-
-		$builder->where('deleted_at', null)->orWhereNotIn('id', function (BaseBuilder $builder) {
-			return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-		});
-
-		$expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
-
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4443
-	 */
-	public function testWhereWithLower()
-	{
-		$builder = $this->db->table('jobs');
-		$builder->where('LOWER(jobs.name)', 'accountant');
-
-		$expectedSQL = 'SELECT * FROM "jobs" WHERE LOWER(jobs.name) = \'accountant\'';
-		$this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
-	}
+    /**
+     * @var MockConnection
+     */
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testSimpleWhere()
+    {
+        $builder = $this->db->table('users');
+
+        $expectedSQL   = 'SELECT * FROM "users" WHERE "id" = 3';
+        $expectedBinds = [
+            'id' => [
+                3,
+                true,
+            ],
+        ];
+
+        $builder->where('id', 3);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereNoEscape()
+    {
+        $builder = $this->db->table('users');
+
+        $expectedSQL   = 'SELECT * FROM "users" WHERE id = 3';
+        $expectedBinds = [
+            'id' => [
+                3,
+                false,
+            ],
+        ];
+
+        $builder->where('id', 3, false);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereCustomKeyOperator()
+    {
+        $builder = $this->db->table('users');
+
+        $expectedSQL   = 'SELECT * FROM "users" WHERE "id" != 3';
+        $expectedBinds = [
+            'id' => [
+                3,
+                true,
+            ],
+        ];
+
+        $builder->where('id !=', 3);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereAssociateArray()
+    {
+        $builder = $this->db->table('jobs');
+
+        $where = [
+            'id'      => 2,
+            'name !=' => 'Accountant',
+        ];
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 AND "name" != \'Accountant\'';
+        $expectedBinds = [
+            'id' => [
+                2,
+                true,
+            ],
+            'name' => [
+                'Accountant',
+                true,
+            ],
+        ];
+
+        $builder->where($where);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereCustomString()
+    {
+        $builder = $this->db->table('jobs');
+
+        $where = "id > 2 AND name != 'Accountant'";
+
+        $expectedSQL   = "SELECT * FROM \"jobs\" WHERE \"id\" > 2 AND \"name\" != 'Accountant'";
+        $expectedBinds = [];
+
+        $builder->where($where);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereValueClosure()
+    {
+        $builder = $this->db->table('neworder');
+
+        $builder->where('advance_amount <', static function (BaseBuilder $builder) {
+            return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
+        });
+        $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    public function testOrWhere()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('name !=', 'Accountant')->orWhere('id >', 3);
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" != \'Accountant\' OR "id" > 3';
+        $expectedBinds = [
+            'name' => [
+                'Accountant',
+                true,
+            ],
+            'id' => [
+                3,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testOrWhereSameColumn()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('name', 'Accountant')->orWhere('name', 'foobar');
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" = \'Accountant\' OR "name" = \'foobar\'';
+        $expectedBinds = [
+            'name' => [
+                'Accountant',
+                true,
+            ],
+            'name.1' => [
+                'foobar',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereIn()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->whereIn('name', ['Politician', 'Accountant']);
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" IN (\'Politician\',\'Accountant\')';
+        $expectedBinds = [
+            'name' => [
+                [
+                    'Politician',
+                    'Accountant',
+                ],
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereInClosure()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->whereIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+        });
+
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    public function provideInvalidKeys()
+    {
+        return [
+            'null'         => [null],
+            'empty string' => [''],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidKeys
+     *
+     * @param mixed $key
+     */
+    public function testWhereInvalidKeyThrowInvalidArgumentException($key)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $builder = $this->db->table('jobs');
+
+        $builder->whereIn($key, ['Politician', 'Accountant']);
+    }
+
+    public function provideInvalidValues()
+    {
+        return [
+            'null'                    => [null],
+            'not array'               => ['not array'],
+            'not instanceof \Closure' => [new stdClass()],
+        ];
+    }
+
+    /**
+     * @dataProvider provideInvalidValues
+     *
+     * @param mixed $values
+     */
+    public function testWhereInEmptyValuesThrowInvalidArgumentException($values)
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $builder = $this->db->table('jobs');
+
+        $builder->whereIn('name', $values);
+    }
+
+    public function testWhereNotIn()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->whereNotIn('name', ['Politician', 'Accountant']);
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" NOT IN (\'Politician\',\'Accountant\')';
+        $expectedBinds = [
+            'name' => [
+                [
+                    'Politician',
+                    'Accountant',
+                ],
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testWhereNotInClosure()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->whereNotIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+        });
+
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    public function testOrWhereIn()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('id', 2)->orWhereIn('name', ['Politician', 'Accountant']);
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 OR "name" IN (\'Politician\',\'Accountant\')';
+        $expectedBinds = [
+            'id' => [
+                2,
+                true,
+            ],
+            'name' => [
+                [
+                    'Politician',
+                    'Accountant',
+                ],
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testOrWhereInClosure()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('deleted_at', null)->orWhereIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+        });
+
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    public function testOrWhereNotIn()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('id', 2)->orWhereNotIn('name', ['Politician', 'Accountant']);
+
+        $expectedSQL   = 'SELECT * FROM "jobs" WHERE "id" = 2 OR "name" NOT IN (\'Politician\',\'Accountant\')';
+        $expectedBinds = [
+            'id' => [
+                2,
+                true,
+            ],
+            'name' => [
+                [
+                    'Politician',
+                    'Accountant',
+                ],
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testOrWhereNotInClosure()
+    {
+        $builder = $this->db->table('jobs');
+
+        $builder->where('deleted_at', null)->orWhereNotIn('id', static function (BaseBuilder $builder) {
+            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+        });
+
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4443
+     */
+    public function testWhereWithLower()
+    {
+        $builder = $this->db->table('jobs');
+        $builder->where('LOWER(jobs.name)', 'accountant');
+
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE LOWER(jobs.name) = \'accountant\'';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index de8c9a53abf1..d4f795dcc26b 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -1,184 +1,194 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
-use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\Config;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 
-class ConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigTest extends CIUnitTestCase
 {
-	use ReflectionHelper;
-
-	protected $group = [
-		'DSN'      => '',
-		'hostname' => 'localhost',
-		'username' => 'first',
-		'password' => 'last',
-		'database' => 'dbname',
-		'DBDriver' => 'MySQLi',
-		'DBPrefix' => 'test_',
-		'pConnect' => true,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-		'port'     => 3306,
-	];
-
-	protected $dsnGroup = [
-		'DSN'      => 'MySQLi://user:pass@localhost:3306/dbname?DBPrefix=test_&pConnect=true&charset=latin1&DBCollat=latin1_swedish_ci',
-		'hostname' => '',
-		'username' => '',
-		'password' => '',
-		'database' => '',
-		'DBDriver' => 'SQLite3',
-		'DBPrefix' => 't_',
-		'pConnect' => false,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-		'port'     => 3306,
-	];
-
-	protected $dsnGroupPostgre = [
-		'DSN'      => 'Postgre://user:pass@localhost:5432/dbname?DBPrefix=test_&connect_timeout=5&sslmode=1',
-		'hostname' => '',
-		'username' => '',
-		'password' => '',
-		'database' => '',
-		'DBDriver' => 'SQLite3',
-		'DBPrefix' => 't_',
-		'pConnect' => false,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-		'port'     => 5432,
-	];
-
-	protected $dsnGroupPostgreNative = [
-		'DSN'      => 'pgsql:host=localhost;port=5432;dbname=database_name',
-		'hostname' => '',
-		'username' => '',
-		'password' => '',
-		'database' => '',
-		'DBDriver' => 'Postgre',
-		'DBPrefix' => 't_',
-		'pConnect' => false,
-		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'charset'  => 'utf8',
-		'DBCollat' => 'utf8_general_ci',
-		'swapPre'  => '',
-		'encrypt'  => false,
-		'compress' => false,
-		'strictOn' => true,
-		'failover' => [],
-		'port'     => 5432,
-	];
-
-	protected function tearDown(): void
-	{
-		$this->setPrivateProperty(Config::class, 'instances', []);
-	}
-
-	public function testConnectionGroup()
-	{
-		$conn = Config::connect($this->group, false);
-		$this->assertInstanceOf(BaseConnection::class, $conn);
-
-		$this->assertEquals($this->group['DSN'], $this->getPrivateProperty($conn, 'DSN'));
-		$this->assertEquals($this->group['hostname'], $this->getPrivateProperty($conn, 'hostname'));
-		$this->assertEquals($this->group['username'], $this->getPrivateProperty($conn, 'username'));
-		$this->assertEquals($this->group['password'], $this->getPrivateProperty($conn, 'password'));
-		$this->assertEquals($this->group['database'], $this->getPrivateProperty($conn, 'database'));
-		$this->assertEquals($this->group['port'], $this->getPrivateProperty($conn, 'port'));
-		$this->assertEquals($this->group['DBDriver'], $this->getPrivateProperty($conn, 'DBDriver'));
-		$this->assertEquals($this->group['DBPrefix'], $this->getPrivateProperty($conn, 'DBPrefix'));
-		$this->assertEquals($this->group['pConnect'], $this->getPrivateProperty($conn, 'pConnect'));
-		$this->assertEquals($this->group['charset'], $this->getPrivateProperty($conn, 'charset'));
-		$this->assertEquals($this->group['DBCollat'], $this->getPrivateProperty($conn, 'DBCollat'));
-	}
-
-	public function testConnectionGroupWithDSN()
-	{
-		$conn = Config::connect($this->dsnGroup, false);
-		$this->assertInstanceOf(BaseConnection::class, $conn);
-
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'DSN'));
-		$this->assertEquals('localhost', $this->getPrivateProperty($conn, 'hostname'));
-		$this->assertEquals('user', $this->getPrivateProperty($conn, 'username'));
-		$this->assertEquals('pass', $this->getPrivateProperty($conn, 'password'));
-		$this->assertEquals('dbname', $this->getPrivateProperty($conn, 'database'));
-		$this->assertEquals('3306', $this->getPrivateProperty($conn, 'port'));
-		$this->assertEquals('MySQLi', $this->getPrivateProperty($conn, 'DBDriver'));
-		$this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
-		$this->assertEquals(true, $this->getPrivateProperty($conn, 'pConnect'));
-		$this->assertEquals('latin1', $this->getPrivateProperty($conn, 'charset'));
-		$this->assertEquals('latin1_swedish_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-		$this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
-		$this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
-	}
-
-	public function testConnectionGroupWithDSNPostgre()
-	{
-		$conn = Config::connect($this->dsnGroupPostgre, false);
-		$this->assertInstanceOf(BaseConnection::class, $conn);
-
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'DSN'));
-		$this->assertEquals('localhost', $this->getPrivateProperty($conn, 'hostname'));
-		$this->assertEquals('user', $this->getPrivateProperty($conn, 'username'));
-		$this->assertEquals('pass', $this->getPrivateProperty($conn, 'password'));
-		$this->assertEquals('dbname', $this->getPrivateProperty($conn, 'database'));
-		$this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
-		$this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
-		$this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
-		$this->assertEquals(false, $this->getPrivateProperty($conn, 'pConnect'));
-		$this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
-		$this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-		$this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
-		$this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
-		$this->assertEquals('5', $this->getPrivateProperty($conn, 'connect_timeout'));
-		$this->assertEquals('1', $this->getPrivateProperty($conn, 'sslmode'));
-
-		$method = $this->getPrivateMethodInvoker($conn, 'buildDSN');
-		$method();
-
-		$expected = "host=localhost port=5432 user=user password='pass' dbname=dbname connect_timeout='5' sslmode='1'";
-		$this->assertEquals($expected, $this->getPrivateProperty($conn, 'DSN'));
-	}
-
-	public function testConnectionGroupWithDSNPostgreNative()
-	{
-		$conn = Config::connect($this->dsnGroupPostgreNative, false);
-		$this->assertInstanceOf(BaseConnection::class, $conn);
-
-		$this->assertEquals('pgsql:host=localhost;port=5432;dbname=database_name', $this->getPrivateProperty($conn, 'DSN'));
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'hostname'));
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'username'));
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'password'));
-		$this->assertEquals('', $this->getPrivateProperty($conn, 'database'));
-		$this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
-		$this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
-		$this->assertEquals('t_', $this->getPrivateProperty($conn, 'DBPrefix'));
-		$this->assertEquals(false, $this->getPrivateProperty($conn, 'pConnect'));
-		$this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
-		$this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-		$this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
-		$this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
-	}
-
+    use ReflectionHelper;
+
+    protected $group = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => 'first',
+        'password' => 'last',
+        'database' => 'dbname',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => 'test_',
+        'pConnect' => true,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+        'port'     => 3306,
+    ];
+
+    protected $dsnGroup = [
+        'DSN'      => 'MySQLi://user:pass@localhost:3306/dbname?DBPrefix=test_&pConnect=true&charset=latin1&DBCollat=latin1_swedish_ci',
+        'hostname' => '',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'SQLite3',
+        'DBPrefix' => 't_',
+        'pConnect' => false,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+        'port'     => 3306,
+    ];
+
+    protected $dsnGroupPostgre = [
+        'DSN'      => 'Postgre://user:pass@localhost:5432/dbname?DBPrefix=test_&connect_timeout=5&sslmode=1',
+        'hostname' => '',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'SQLite3',
+        'DBPrefix' => 't_',
+        'pConnect' => false,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+        'port'     => 5432,
+    ];
+
+    protected $dsnGroupPostgreNative = [
+        'DSN'      => 'pgsql:host=localhost;port=5432;dbname=database_name',
+        'hostname' => '',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'Postgre',
+        'DBPrefix' => 't_',
+        'pConnect' => false,
+        'DBDebug'  => (ENVIRONMENT !== 'production'),
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => true,
+        'failover' => [],
+        'port'     => 5432,
+    ];
+
+    protected function tearDown(): void
+    {
+        $this->setPrivateProperty(Config::class, 'instances', []);
+    }
+
+    public function testConnectionGroup()
+    {
+        $conn = Config::connect($this->group, false);
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+
+        $this->assertSame($this->group['DSN'], $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame($this->group['hostname'], $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame($this->group['username'], $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame($this->group['password'], $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame($this->group['database'], $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame($this->group['port'], $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame($this->group['DBDriver'], $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame($this->group['DBPrefix'], $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertSame($this->group['pConnect'], $this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertSame($this->group['charset'], $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame($this->group['DBCollat'], $this->getPrivateProperty($conn, 'DBCollat'));
+    }
+
+    public function testConnectionGroupWithDSN()
+    {
+        $conn = Config::connect($this->dsnGroup, false);
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+
+        $this->assertSame('', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('localhost', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('user', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('pass', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('dbname', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame('3306', $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('MySQLi', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertSame('latin1', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('latin1_swedish_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
+    }
+
+    public function testConnectionGroupWithDSNPostgre()
+    {
+        $conn = Config::connect($this->dsnGroupPostgre, false);
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+
+        $this->assertSame('', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('localhost', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('user', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('pass', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('dbname', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame('5432', $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertSame('utf8', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
+        $this->assertSame('5', $this->getPrivateProperty($conn, 'connect_timeout'));
+        $this->assertSame('1', $this->getPrivateProperty($conn, 'sslmode'));
+
+        $method = $this->getPrivateMethodInvoker($conn, 'buildDSN');
+        $method();
+
+        $expected = "host=localhost port=5432 user=user password='pass' dbname=dbname connect_timeout='5' sslmode='1'";
+        $this->assertSame($expected, $this->getPrivateProperty($conn, 'DSN'));
+    }
+
+    public function testConnectionGroupWithDSNPostgreNative()
+    {
+        $conn = Config::connect($this->dsnGroupPostgreNative, false);
+        $this->assertInstanceOf(BaseConnection::class, $conn);
+
+        $this->assertSame('pgsql:host=localhost;port=5432;dbname=database_name', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame(5432, $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('t_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertSame('utf8', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
+    }
 }
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index 36dfa9d0621f..d17ff71fe61a 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -1,41 +1,53 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Database;
 use Faker\Generator;
 
-class DatabaseSeederTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseSeederTest extends CIUnitTestCase
 {
-	public function testInstantiateNoSeedPath()
-	{
-		$this->expectException('InvalidArgumentException');
-
-		$config            = new Database();
-		$config->filesPath = '';
-		new Seeder($config);
-	}
-
-	public function testInstantiateNotDirSeedPath()
-	{
-		$this->expectException('InvalidArgumentException');
-
-		$config            = new Database;
-		$config->filesPath = APPPATH . 'Foo';
-		new Seeder($config);
-	}
-
-	public function testFakerGet()
-	{
-		$this->assertInstanceOf(Generator::class, Seeder::faker());
-	}
-
-	public function testCallOnEmptySeeder()
-	{
-		$this->expectException('InvalidArgumentException');
-
-		$seeder = new Seeder(new Database());
-		$seeder->call('');
-	}
+    public function testInstantiateNoSeedPath()
+    {
+        $this->expectException('InvalidArgumentException');
+
+        $config            = new Database();
+        $config->filesPath = '';
+        new Seeder($config);
+    }
+
+    public function testInstantiateNotDirSeedPath()
+    {
+        $this->expectException('InvalidArgumentException');
+
+        $config            = new Database();
+        $config->filesPath = APPPATH . 'Foo';
+        new Seeder($config);
+    }
+
+    public function testFakerGet()
+    {
+        $this->assertInstanceOf(Generator::class, Seeder::faker());
+    }
+
+    public function testCallOnEmptySeeder()
+    {
+        $this->expectException('InvalidArgumentException');
+
+        $seeder = new Seeder(new Database());
+        $seeder->call('');
+    }
 }
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
index 340a5cdac488..5cf5ea0d69cc 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\DatabaseTestCase;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\DatabaseTestCase;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
@@ -10,56 +21,58 @@
  * show $migrateOnce applies per test case file.
  *
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
+final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	/**
-	 * Should run db migration only once?
-	 *
-	 * @var boolean
-	 */
-	protected $migrateOnce = true;
+    /**
+     * Should run db migration only once?
+     *
+     * @var bool
+     */
+    protected $migrateOnce = true;
 
-	/**
-	 * Should the db be refreshed before test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
+    /**
+     * Should the db be refreshed before test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
 
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = [
-		'Tests\Support\MigrationTestMigrations',
-	];
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = [
+        'Tests\Support\MigrationTestMigrations',
+    ];
 
-	public function setUp(): void
-	{
-		Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
+    protected function setUp(): void
+    {
+        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
 
-		parent::setUp();
-	}
+        parent::setUp();
+    }
 
-	public function testMigrationDone()
-	{
-		$this->seeInDatabase('foo', ['key' => 'foobar']);
+    public function testMigrationDone()
+    {
+        $this->seeInDatabase('foo', ['key' => 'foobar']);
 
-		// Drop table to make sure there is no foo table when
-		// DatabaseTestCaseMigrationOnce2Test runs
-		$this->dropTableFoo();
-	}
+        // Drop table to make sure there is no foo table when
+        // DatabaseTestCaseMigrationOnce2Test runs
+        $this->dropTableFoo();
+    }
 
-	private function dropTableFoo()
-	{
-		$forge = Database::forge();
-		$forge->dropTable('foo', true);
-	}
+    private function dropTableFoo()
+    {
+        $forge = Database::forge();
+        $forge->dropTable('foo', true);
+    }
 }
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
index a440fdf4c42d..c801d189535b 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\DatabaseTestCase;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\DatabaseTestCase;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
@@ -9,46 +20,48 @@
  * show $migrateOnce applies per test case file.
  *
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
+final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	/**
-	 * Should run db migration only once?
-	 *
-	 * @var boolean
-	 */
-	protected $migrateOnce = true;
-
-	/**
-	 * Should the db be refreshed before test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
-
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = [
-		'Tests\Support\MigrationTestMigrations',
-	];
-
-	public function setUp(): void
-	{
-		Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
-
-		parent::setUp();
-	}
-
-	public function testMigrationDone()
-	{
-		$this->seeInDatabase('foo', ['key' => 'foobar']);
-	}
+    use DatabaseTestTrait;
+
+    /**
+     * Should run db migration only once?
+     *
+     * @var bool
+     */
+    protected $migrateOnce = true;
+
+    /**
+     * Should the db be refreshed before test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
+
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = [
+        'Tests\Support\MigrationTestMigrations',
+    ];
+
+    protected function setUp(): void
+    {
+        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
+
+        parent::setUp();
+    }
+
+    public function testMigrationDone()
+    {
+        $this->seeInDatabase('foo', ['key' => 'foobar']);
+    }
 }
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index eab7442cb93c..86f3ec3eec31 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
@@ -6,63 +17,64 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseTest extends CIUnitTestCase
+final class DatabaseTestCaseTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	protected static $loaded = false;
+    protected static $loaded = false;
 
-	/**
-	 * Should the db be refreshed before
-	 * each test?
-	 *
-	 * @var boolean
-	 */
-	protected $refresh = true;
+    /**
+     * Should the db be refreshed before
+     * each test?
+     *
+     * @var bool
+     */
+    protected $refresh = true;
 
-	/**
-	 * The seed file(s) used for all tests within this test case.
-	 * Should be fully-namespaced or relative to $basePath
-	 *
-	 * @var string|array
-	 */
-	protected $seed = [
-		'Tests\Support\Database\Seeds\CITestSeeder',
-		'Tests\Support\Database\Seeds\AnotherSeeder',
-	];
+    /**
+     * The seed file(s) used for all tests within this test case.
+     * Should be fully-namespaced or relative to $basePath
+     *
+     * @var array|string
+     */
+    protected $seed = [
+        'Tests\Support\Database\Seeds\CITestSeeder',
+        'Tests\Support\Database\Seeds\AnotherSeeder',
+    ];
 
-	/**
-	 * The namespace(s) to help us find the migration classes.
-	 * Empty is equivalent to running `spark migrate -all`.
-	 * Note that running "all" runs migrations in date order,
-	 * but specifying namespaces runs them in namespace order (then date)
-	 *
-	 * @var string|array|null
-	 */
-	protected $namespace = [
-		'Tests\Support',
-		'Tests\Support\MigrationTestMigrations',
-	];
+    /**
+     * The namespace(s) to help us find the migration classes.
+     * Empty is equivalent to running `spark migrate -all`.
+     * Note that running "all" runs migrations in date order,
+     * but specifying namespaces runs them in namespace order (then date)
+     *
+     * @var array|string|null
+     */
+    protected $namespace = [
+        'Tests\Support',
+        'Tests\Support\MigrationTestMigrations',
+    ];
 
-	public function setUp(): void
-	{
-		if (! self::$loaded)
-		{
-			Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
-			self::$loaded = true;
-		}
+    protected function setUp(): void
+    {
+        if (! self::$loaded) {
+            Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
+            self::$loaded = true;
+        }
 
-		parent::setUp();
-	}
+        parent::setUp();
+    }
 
-	public function testMultipleSeeders()
-	{
-		$this->seeInDatabase('user', ['name' => 'Jerome Lohan']);
-	}
+    public function testMultipleSeeders()
+    {
+        $this->seeInDatabase('user', ['name' => 'Jerome Lohan']);
+    }
 
-	public function testMultipleMigrationNamespaces()
-	{
-		$this->seeInDatabase('foo', ['key' => 'foobar']);
-	}
+    public function testMultipleMigrationNamespaces()
+    {
+        $this->seeInDatabase('foo', ['key' => 'foobar']);
+    }
 }
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index 9001bec455bc..0024625ce5b5 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -1,30 +1,40 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class AliasTest extends CIUnitTestCase
+final class AliasTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    use DatabaseTestTrait;
 
-	public function testAlias()
-	{
-		$builder = $this->db->table('job j');
+    protected $refresh = true;
 
-		$jobs = $builder
-			->where('j.name', 'Developer')
-			->get();
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-		$this->assertEquals(1, count($jobs->getResult()));
-	}
+    public function testAlias()
+    {
+        $builder = $this->db->table('job j');
 
-	//--------------------------------------------------------------------
+        $jobs = $builder
+            ->where('j.name', 'Developer')
+            ->get();
 
+        $this->assertCount(1, $jobs->getResult());
+    }
 }
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index 88b64d5fa567..44a2adb0a391 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
@@ -6,49 +17,48 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class BadQueryTest extends CIUnitTestCase
+final class BadQueryTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-	protected static $origDebug;
+    use DatabaseTestTrait;
 
-	//--------------------------------------------------------------------
+    protected $refresh = true;
 
-	/**
-	 * This test must run first to store the inital debug value before we tinker with it below
-	 */
-	public function testFirst()
-	{
-		$this::$origDebug = $this->getPrivateProperty($this->db, 'DBDebug');
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected static $origDebug;
 
-		$this->assertIsBool($this::$origDebug);
-	}
+    /**
+     * This test must run first to store the inital debug value before we tinker with it below
+     */
+    public function testFirst()
+    {
+        $this::$origDebug = $this->getPrivateProperty($this->db, 'DBDebug');
 
-	public function testBadQueryDebugTrue()
-	{
-		// WARNING this value will persist! take care to roll it back.
-		$this->setPrivateProperty($this->db, 'DBDebug', true);
-		// expect an exception, class and message varies by DBMS
-		$this->expectException(Exception::class);
-		$query = $this->db->query('SELECT * FROM table_does_not_exist');
+        $this->assertIsBool($this::$origDebug);
+    }
 
-		// this code is never executed
-	}
+    public function testBadQueryDebugTrue()
+    {
+        // WARNING this value will persist! take care to roll it back.
+        $this->setPrivateProperty($this->db, 'DBDebug', true);
+        // expect an exception, class and message varies by DBMS
+        $this->expectException(Exception::class);
+        $this->db->query('SELECT * FROM table_does_not_exist');
 
-	public function testBadQueryDebugFalse()
-	{
-		// WARNING this value will persist! take care to roll it back.
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		// this throws an exception when DBDebug is true, but it'll return FALSE when DBDebug is false
-		$query = $this->db->query('SELECT * FROM table_does_not_exist');
-		$this->assertEquals(false, $query);
+        // this code is never executed
+    }
 
-		// restore the DBDebug value in effect when this unit test began
-		$this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
-	}
+    public function testBadQueryDebugFalse()
+    {
+        // WARNING this value will persist! take care to roll it back.
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        // this throws an exception when DBDebug is true, but it'll return FALSE when DBDebug is false
+        $query = $this->db->query('SELECT * FROM table_does_not_exist');
+        $this->assertFalse($query);
 
+        // restore the DBDebug value in effect when this unit test began
+        $this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
+    }
 }
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 07ae5223d137..680f03c94ca7 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -1,97 +1,110 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
+
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Database\SQLite3\Connection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
-use CodeIgniter\Config\Factories;
 use Config\Database;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class ConnectTest extends CIUnitTestCase
+final class ConnectTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	protected $group1;
+    protected $group1;
 
-	protected $group2;
+    protected $group2;
 
-	protected $tests;
+    protected $tests;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$config = config('Database');
+        $config = config('Database');
 
-		$this->group1 = $config->default;
-		$this->group2 = $config->default;
-		$this->tests  = $config->tests;
+        $this->group1 = $config->default;
+        $this->group2 = $config->default;
+        $this->tests  = $config->tests;
 
-		$this->group1['DBDriver'] = 'MySQLi';
-		$this->group2['DBDriver'] = 'Postgre';
-	}
+        $this->group1['DBDriver'] = 'MySQLi';
+        $this->group2['DBDriver'] = 'Postgre';
+    }
 
-	public function testConnectWithMultipleCustomGroups()
-	{
-		// We should have our test database connection already.
-		$instances = $this->getPrivateProperty(Database::class, 'instances');
-		$this->assertEquals(1, count($instances));
+    public function testConnectWithMultipleCustomGroups()
+    {
+        // We should have our test database connection already.
+        $instances = $this->getPrivateProperty(Database::class, 'instances');
+        $this->assertCount(1, $instances);
 
-		$db1 = Database::connect($this->group1);
-		$db2 = Database::connect($this->group2);
+        $db1 = Database::connect($this->group1);
+        $db2 = Database::connect($this->group2);
 
-		$this->assertNotSame($db1, $db2);
+        $this->assertNotSame($db1, $db2);
 
-		$instances = $this->getPrivateProperty(Database::class, 'instances');
-		$this->assertEquals(3, count($instances));
-	}
+        $instances = $this->getPrivateProperty(Database::class, 'instances');
+        $this->assertCount(3, $instances);
+    }
 
-	public function testConnectReturnsProvidedConnection()
-	{
-		$config = config('Database');
+    public function testConnectReturnsProvidedConnection()
+    {
+        $config = config('Database');
 
-		// This will be the tests database
-		$db = Database::connect();
-		$this->assertEquals($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+        // This will be the tests database
+        $db = Database::connect();
+        $this->assertSame($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
 
-		// Get an instance of the system's default db so we have something to test with.
-		$db1 = Database::connect($this->group1);
-		$this->assertEquals('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
+        // Get an instance of the system's default db so we have something to test with.
+        $db1 = Database::connect($this->group1);
+        $this->assertSame('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
 
-		// If a connection is passed into connect, it should simply be returned to us...
-		$db2 = Database::connect($db1);
-		$this->assertSame($db1, $db2);
-	}
+        // If a connection is passed into connect, it should simply be returned to us...
+        $db2 = Database::connect($db1);
+        $this->assertSame($db1, $db2);
+    }
 
-	public function testConnectWorksWithGroupName()
-	{
-		$config = config('Database');
+    public function testConnectWorksWithGroupName()
+    {
+        $config = config('Database');
 
-		$db = Database::connect('tests');
-		$this->assertEquals($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+        $db = Database::connect('tests');
+        $this->assertSame($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
 
-		$config                      = config('Database');
-		$config->default['DBDriver'] = 'MySQLi';
-		Factories::injectMock('config','Database', $config);
+        $config                      = config('Database');
+        $config->default['DBDriver'] = 'MySQLi';
+        Factories::injectMock('config', 'Database', $config);
 
-		$db1 = Database::connect('default');
-		$this->assertNotInstanceOf(Connection::class, $db1);
-		$this->assertEquals('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
-	}
+        $db1 = Database::connect('default');
+        $this->assertNotInstanceOf(Connection::class, $db1);
+        $this->assertSame('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
+    }
 
-	public function testConnectWithFailover()
-	{
-		$this->tests['failover'][] = $this->tests;
+    public function testConnectWithFailover()
+    {
+        $this->tests['failover'][] = $this->tests;
 
-		unset($this->tests['failover'][0]['failover']);
+        unset($this->tests['failover'][0]['failover']);
 
-		$this->tests['username'] = 'wrong';
+        $this->tests['username'] = 'wrong';
 
-		$db1 = Database::connect($this->tests);
+        $db1 = Database::connect($this->tests);
 
-		$this->assertEquals($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
-		$this->assertTrue(count($db1->listTables()) >= 0);
-	}
+        $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
+        $this->assertTrue(count($db1->listTables()) >= 0);
+    }
 }
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index 5a8c65b671b3..bfe917cb2adc 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -1,54 +1,57 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class CountTest extends CIUnitTestCase
+final class CountTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testCountReturnsZeroWithNoResults()
-	{
-		$this->assertSame(0, $this->db->table('empty')->countAll());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCountAllReturnsCorrectInteger()
-	{
-		$this->assertSame(4, $this->db->table('job')->countAll());
-	}
+    use DatabaseTestTrait;
 
-	//--------------------------------------------------------------------
+    protected $refresh = true;
 
-	public function testCountAllResultsReturnsZeroWithNoResults()
-	{
-		$this->assertSame(0, $this->db->table('job')->where('name', 'Superstar')->countAllResults());
-	}
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	//--------------------------------------------------------------------
+    public function testCountReturnsZeroWithNoResults()
+    {
+        $this->assertSame(0, $this->db->table('empty')->countAll());
+    }
 
-	public function testCountAllResultsReturnsCorrectValue()
-	{
-		$this->assertSame(1, $this->db->table('job')->where('name', 'Developer')->countAllResults());
-	}
+    public function testCountAllReturnsCorrectInteger()
+    {
+        $this->assertSame(4, $this->db->table('job')->countAll());
+    }
 
-	//--------------------------------------------------------------------
+    public function testCountAllResultsReturnsZeroWithNoResults()
+    {
+        $this->assertSame(0, $this->db->table('job')->where('name', 'Superstar')->countAllResults());
+    }
 
-	public function testCountAllResultsHonorsReset()
-	{
-		$builder = $this->db->table('job');
+    public function testCountAllResultsReturnsCorrectValue()
+    {
+        $this->assertSame(1, $this->db->table('job')->where('name', 'Developer')->countAllResults());
+    }
 
-		$this->assertSame(1, $builder->where('name', 'Developer')->countAllResults(false));
-		$this->assertSame(1, $builder->countAllResults());
-	}
+    public function testCountAllResultsHonorsReset()
+    {
+        $builder = $this->db->table('job');
 
-	//--------------------------------------------------------------------
+        $this->assertSame(1, $builder->where('name', 'Developer')->countAllResults(false));
+        $this->assertSame(1, $builder->countAllResults());
+    }
 }
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
deleted file mode 100644
index f7d7fcb880bf..000000000000
--- a/tests/system/Database/Live/DEBugTest.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php namespace CodeIgniter\Database\Live;
-
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
-
-/**
- * @group DatabaseLive
- */
-class DEBugTest extends CIUnitTestCase
-{
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	public function testDBDebugTrue()
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', true);
-		$this->expectException('Exception');
-		$result = $this->db->simpleQuery('SELECT * FROM db_error');
-	}
-
-	public function testDBDebugFalse()
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		$result = $this->db->simpleQuery('SELECT * FROM db_error');
-		$this->assertEquals(false, $result);
-	}
-
-	public function tearDown(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', true);
-		parent::tearDown();
-	}
-}
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index 53d9a02c23e1..8e917a7d30e9 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -1,51 +1,64 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestTraitCaseTest extends CIUnitTestCase
+final class DatabaseTestTraitCaseTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	protected $refresh = true;
+    protected $refresh = true;
 
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	public function testHasInDatabase()
-	{
-		$this->hasInDatabase('user', ['name' => 'Ricky', 'email' => 'sofine@example.com', 'country' => 'US']);
+    public function testHasInDatabase()
+    {
+        $this->hasInDatabase('user', ['name' => 'Ricky', 'email' => 'sofine@example.com', 'country' => 'US']);
 
-		$this->seeInDatabase('user', ['name' => 'Ricky', 'email' => 'sofine@example.com', 'country' => 'US']);
-	}
+        $this->seeInDatabase('user', ['name' => 'Ricky', 'email' => 'sofine@example.com', 'country' => 'US']);
+    }
 
-	public function testDontSeeInDatabase()
-	{
-		$this->dontSeeInDatabase('user', ['name' => 'Ricardo']);
-	}
+    public function testDontSeeInDatabase()
+    {
+        $this->dontSeeInDatabase('user', ['name' => 'Ricardo']);
+    }
 
-	public function testSeeNumRecords()
-	{
-		$this->seeNumRecords(2, 'user', ['country' => 'US']);
-	}
+    public function testSeeNumRecords()
+    {
+        $this->seeNumRecords(2, 'user', ['country' => 'US']);
+    }
 
-	public function testGrabFromDatabase()
-	{
-		$email = $this->grabFromDatabase('user', 'email', ['name' => 'Derek Jones']);
+    public function testGrabFromDatabase()
+    {
+        $email = $this->grabFromDatabase('user', 'email', ['name' => 'Derek Jones']);
 
-		$this->assertEquals('derek@world.com', $email);
-	}
+        $this->assertSame('derek@world.com', $email);
+    }
 
-	public function testSeeInDatabase()
-	{
-		$this->hasInDatabase('user', [
-			'name'    => 'Ricardo',
-			'email'   => 'ricardo@example.com',
-			'country' => 'The Moon',
-		]);
+    public function testSeeInDatabase()
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Ricardo',
+            'email'   => 'ricardo@example.com',
+            'country' => 'The Moon',
+        ]);
 
-		$this->seeInDatabase('user', ['name' => 'Ricardo']);
-	}
+        $this->seeInDatabase('user', ['name' => 'Ricardo']);
+    }
 }
diff --git a/tests/system/Database/Live/DbDebugTest.php b/tests/system/Database/Live/DbDebugTest.php
new file mode 100644
index 000000000000..8caadf5144fe
--- /dev/null
+++ b/tests/system/Database/Live/DbDebugTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class DbDebugTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    public function testDBDebugTrue()
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', true);
+        $this->expectException('Exception');
+        $this->db->simpleQuery('SELECT * FROM db_error');
+    }
+
+    public function testDBDebugFalse()
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        $result = $this->db->simpleQuery('SELECT * FROM db_error');
+        $this->assertFalse($result);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', true);
+        parent::tearDown();
+    }
+}
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 1d3b6a9d083b..c9b93242f4d1 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Database;
@@ -9,220 +18,188 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DbUtilsTest extends CIUnitTestCase
+final class DbUtilsTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-	protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
-	protected static $origDebug;
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * This test must run first to store the inital debug value before we tinker with it below
-	 */
-	public function testFirst()
-	{
-		$this::$origDebug = $this->getPrivateProperty($this->db, 'DBDebug');
-
-		$this->assertIsBool($this::$origDebug);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUtilsBackup()
-	{
-		$util = (new Database())->loadUtils($this->db);
-
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
-
-		$util->backup();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUtilsBackupWithParamsArray()
-	{
-		$util = (new Database())->loadUtils($this->db);
-
-		$params = [
-			'format' => 'json',
-		];
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
-
-		$util->backup($params);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUtilsBackupWithParamsString()
-	{
-		$util = (new Database())->loadUtils($this->db);
+    use DatabaseTestTrait;
 
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+    protected $refresh = true;
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected static $origDebug;
 
-		$util->backup('db_jobs');
-	}
+    /**
+     * This test must run first to store the inital debug value before we tinker with it below
+     */
+    public function testFirst()
+    {
+        $this::$origDebug = $this->getPrivateProperty($this->db, 'DBDebug');
 
-	//--------------------------------------------------------------------
+        $this->assertIsBool($this::$origDebug);
+    }
 
-	public function testUtilsListDatabases()
-	{
-		$util = (new Database())->loadUtils($this->db);
+    public function testUtilsBackup()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-		if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true))
-		{
-			$databases = $util->listDatabases();
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-			$this->assertTrue(in_array($this->db->getDatabase(), $databases, true));
-		}
-		elseif ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->expectException(DatabaseException::class);
-			$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+        $util->backup();
+    }
 
-			$util->listDatabases();
-		}
-	}
+    public function testUtilsBackupWithParamsArray()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	//--------------------------------------------------------------------
+        $params = [
+            'format' => 'json',
+        ];
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-	public function testUtilsDatabaseExist()
-	{
-		$util = (new Database())->loadUtils($this->db);
+        $util->backup($params);
+    }
 
-		if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true))
-		{
-			$exist = $util->databaseExists($this->db->getDatabase());
+    public function testUtilsBackupWithParamsString()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-			$this->assertTrue($exist);
-		}
-		elseif ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->expectException(DatabaseException::class);
-			$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-			$util->databaseExists($this->db->getDatabase());
-		}
-	}
+        $util->backup('db_jobs');
+    }
 
-	//--------------------------------------------------------------------
+    public function testUtilsListDatabases()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	public function testUtilsOptimizeDatabase()
-	{
-		$util = (new Database())->loadUtils($this->db);
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
+            $databases = $util->listDatabases();
 
-		$d = $util->optimizeDatabase();
+            $this->assertTrue(in_array($this->db->getDatabase(), $databases, true));
+        } elseif ($this->db->DBDriver === 'SQLite3') {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-		$this->assertTrue((bool) $d);
-	}
+            $util->listDatabases();
+        }
+    }
 
-	//--------------------------------------------------------------------
+    public function testUtilsDatabaseExist()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugTrue()
-	{
-		$util = (new Database())->loadUtils($this->db);
-		$this->setPrivateProperty($util, 'optimizeTable', false);
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
+            $exist = $util->databaseExists($this->db->getDatabase());
 
-		// set debug to true -- WARNING this change will persist!
-		$this->setPrivateProperty($this->db, 'DBDebug', true);
+            $this->assertTrue($exist);
+        } elseif ($this->db->DBDriver === 'SQLite3') {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
-		$util->optimizeDatabase();
+            $util->databaseExists($this->db->getDatabase());
+        }
+    }
 
-		// this point in code execution will never be reached
-	}
+    public function testUtilsOptimizeDatabase()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	//--------------------------------------------------------------------
+        $d = $util->optimizeDatabase();
 
-	public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugFalse()
-	{
-		$util = (new Database())->loadUtils($this->db);
-		$this->setPrivateProperty($util, 'optimizeTable', false);
+        $this->assertTrue((bool) $d);
+    }
 
-		// set debug to false -- WARNING this change will persist!
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
+    public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugTrue()
+    {
+        $util = (new Database())->loadUtils($this->db);
+        $this->setPrivateProperty($util, 'optimizeTable', false);
 
-		$result = $util->optimizeDatabase();
-		$this->assertFalse($result);
+        // set debug to true -- WARNING this change will persist!
+        $this->setPrivateProperty($this->db, 'DBDebug', true);
 
-		// restore original value grabbed from testFirst -- WARNING this change will persist!
-		$this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
-	}
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+        $util->optimizeDatabase();
 
-	//--------------------------------------------------------------------
+        // this point in code execution will never be reached
+    }
 
-	public function testUtilsOptimizeTable()
-	{
-		$util = (new Database())->loadUtils($this->db);
+    public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugFalse()
+    {
+        $util = (new Database())->loadUtils($this->db);
+        $this->setPrivateProperty($util, 'optimizeTable', false);
 
-		$d = $util->optimizeTable('db_job');
+        // set debug to false -- WARNING this change will persist!
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
 
-		$this->assertTrue((bool) $d);
-	}
+        $result = $util->optimizeDatabase();
+        $this->assertFalse($result);
 
-	//--------------------------------------------------------------------
+        // restore original value grabbed from testFirst -- WARNING this change will persist!
+        $this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
+    }
 
-	public function testUtilsOptimizeTableFalseOptimizeTable()
-	{
-		$util = (new Database())->loadUtils($this->db);
+    public function testUtilsOptimizeTable()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-		$this->setPrivateProperty($util, 'optimizeTable', false);
+        $d = $util->optimizeTable('db_job');
 
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+        $this->assertTrue((bool) $d);
+    }
 
-		$util->optimizeTable('db_job');
-	}
+    public function testUtilsOptimizeTableFalseOptimizeTable()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	//--------------------------------------------------------------------
+        $this->setPrivateProperty($util, 'optimizeTable', false);
 
-	public function testUtilsRepairTable()
-	{
-		$util = (new Database())->loadUtils($this->db);
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
+        $util->optimizeTable('db_job');
+    }
 
-		$util->repairTable('db_job');
-	}
+    public function testUtilsRepairTable()
+    {
+        $util = (new Database())->loadUtils($this->db);
 
-	//--------------------------------------------------------------------
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
-	public function testUtilsCSVFromResult()
-	{
-		$data = $this->db->table('job')->get();
+        $util->repairTable('db_job');
+    }
 
-		$util = (new Database())->loadUtils($this->db);
+    public function testUtilsCSVFromResult()
+    {
+        $data = $this->db->table('job')->get();
 
-		$data = $util->getCSVFromResult($data);
+        $util = (new Database())->loadUtils($this->db);
 
-		$data = array_filter(preg_split('/(\r\n|\n|\r)/', $data));
+        $data = $util->getCSVFromResult($data);
 
-		$this->assertEquals('"1","Developer","Awesome job, but sometimes makes you bored","","",""', $data[1]);
-	}
+        $data = array_filter(preg_split('/(\r\n|\n|\r)/', $data));
 
-	//--------------------------------------------------------------------
+        $this->assertSame('"1","Developer","Awesome job, but sometimes makes you bored","","",""', $data[1]);
+    }
 
-	public function testUtilsXMLFromResult()
-	{
-		$data = $this->db->table('job')->where('id', 4)->get();
+    public function testUtilsXMLFromResult()
+    {
+        $data = $this->db->table('job')->where('id', 4)->get();
 
-		$util = (new Database())->loadUtils($this->db);
+        $util = (new Database())->loadUtils($this->db);
 
-		$data = $util->getXMLFromResult($data);
+        $data = $util->getXMLFromResult($data);
 
-		$expected = '<root><element><id>4</id><name>Musician</name><description>Only Coldplay can actually called Musician</description><created_at></created_at><updated_at></updated_at><deleted_at></deleted_at></element></root>';
+        $expected = '<root><element><id>4</id><name>Musician</name><description>Only Coldplay can actually called Musician</description><created_at></created_at><updated_at></updated_at><deleted_at></deleted_at></element></root>';
 
-		$actual = preg_replace('#\R+#', '', $data);
-		$actual = preg_replace('/[ ]{2,}|[\t]/', '', $actual);
+        $actual = preg_replace('#\R+#', '', $data);
+        $actual = preg_replace('/[ ]{2,}|[\t]/', '', $actual);
 
-		$this->assertEquals($expected, $actual);
-	}
+        $this->assertSame($expected, $actual);
+    }
 }
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 92e3b9fa0986..bd3cd7d6d05c 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,69 +17,59 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DeleteTest extends CIUnitTestCase
+final class DeleteTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testDeleteThrowExceptionWithNoCriteria()
-	{
-		$this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
-
-		$this->db->table('job')->delete();
-	}
+    use DatabaseTestTrait;
 
-	//--------------------------------------------------------------------
+    protected $refresh = true;
 
-	public function testDeleteWithExternalWhere()
-	{
-		$this->seeInDatabase('job', ['name' => 'Developer']);
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-		$this->db->table('job')->where('name', 'Developer')->delete();
+    public function testDeleteThrowExceptionWithNoCriteria()
+    {
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
 
-		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
-	}
+        $this->db->table('job')->delete();
+    }
 
-	//--------------------------------------------------------------------
+    public function testDeleteWithExternalWhere()
+    {
+        $this->seeInDatabase('job', ['name' => 'Developer']);
 
-	public function testDeleteWithInternalWhere()
-	{
-		$this->seeInDatabase('job', ['name' => 'Developer']);
+        $this->db->table('job')->where('name', 'Developer')->delete();
 
-		$this->db->table('job')->delete(['name' => 'Developer']);
+        $this->dontSeeInDatabase('job', ['name' => 'Developer']);
+    }
 
-		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
-	}
+    public function testDeleteWithInternalWhere()
+    {
+        $this->seeInDatabase('job', ['name' => 'Developer']);
 
-	//--------------------------------------------------------------------
-	/**
-	 * @group  single
-	 * @throws DatabaseException
-	 */
-	public function testDeleteWithLimit()
-	{
-		$this->seeNumRecords(2, 'user', ['country' => 'US']);
+        $this->db->table('job')->delete(['name' => 'Developer']);
 
-		try
-		{
-			$this->db->table('user')
-					 ->delete(['country' => 'US'], 1);
-		}
-		catch (DatabaseException $e)
-		{
-			if (strpos($e->getMessage(), 'does not allow LIMITs on DELETE queries.') !== false)
-			{
-				return;
-			}
-		}
+        $this->dontSeeInDatabase('job', ['name' => 'Developer']);
+    }
 
-		$this->seeNumRecords(1, 'user', ['country' => 'US']);
-	}
+    /**
+     * @group  single
+     *
+     * @throws DatabaseException
+     */
+    public function testDeleteWithLimit()
+    {
+        $this->seeNumRecords(2, 'user', ['country' => 'US']);
 
-	//--------------------------------------------------------------------
+        try {
+            $this->db->table('user')->delete(['country' => 'US'], 1);
+        } catch (DatabaseException $e) {
+            if (strpos($e->getMessage(), 'does not allow LIMITs on DELETE queries.') !== false) {
+                return;
+            }
+        }
 
+        $this->seeNumRecords(1, 'user', ['country' => 'US']);
+    }
 }
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 13018f15c513..5dfcec87e418 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -1,34 +1,43 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class EmptyTest extends CIUnitTestCase
+final class EmptyTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    use DatabaseTestTrait;
 
-	public function testEmpty()
-	{
-		$this->db->table('misc')->emptyTable();
+    protected $refresh = true;
 
-		$this->assertEquals(0, $this->db->table('misc')->countAll());
-	}
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	//--------------------------------------------------------------------
+    public function testEmpty()
+    {
+        $this->db->table('misc')->emptyTable();
 
-	public function testTruncate()
-	{
-		$this->db->table('misc')->truncate();
+        $this->assertSame(0, $this->db->table('misc')->countAll());
+    }
 
-		$this->assertEquals(0, $this->db->table('misc')->countAll());
-	}
+    public function testTruncate()
+    {
+        $this->db->table('misc')->truncate();
 
-	//--------------------------------------------------------------------
+        $this->assertSame(0, $this->db->table('misc')->countAll());
+    }
 }
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index c89b8dbae272..f5c3ff8b59c1 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -1,82 +1,82 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class EscapeTest extends CIUnitTestCase
+final class EscapeTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = false;
-
-	protected $char;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->char = $this->db->DBDriver === 'MySQLi' ? '\\' : "'";
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Ensures we don't have escaped - values...
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/606
-	 */
-	public function testEscapeProtectsNegativeNumbers()
-	{
-		$this->assertEquals("'-100'", $this->db->escape(-100));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEscape()
-	{
-		$expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
-		$sql      = 'SELECT * FROM brands WHERE name = ' . $this->db->escape("O'Doules");
-
-		$this->assertEquals($expected, $sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEscapeString()
-	{
-		$expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
-		$sql      = "SELECT * FROM brands WHERE name = '" . $this->db->escapeString("O'Doules") . "'";
-
-		$this->assertEquals($expected, $sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEscapeLikeString()
-	{
-		$expected = "SELECT * FROM brands WHERE column LIKE '%10!% more%' ESCAPE '!'";
-		$sql      = "SELECT * FROM brands WHERE column LIKE '%" . $this->db->escapeLikeString('10% more') . "%' ESCAPE '!'";
-
-		$this->assertEquals($expected, $sql);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEscapeLikeStringDirect()
-	{
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$expected = "SHOW COLUMNS FROM brands WHERE column LIKE 'wild\_chars%'";
-			$sql      = "SHOW COLUMNS FROM brands WHERE column LIKE '" . $this->db->escapeLikeStringDirect('wild_chars') . "%'";
-
-			$this->assertEquals($expected, $sql);
-		}
-		else
-		{
-			$this->expectNotToPerformAssertions();
-		}
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = false;
+
+    protected $char;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->char = $this->db->DBDriver === 'MySQLi' ? '\\' : "'";
+    }
+
+    /**
+     * Ensures we don't have escaped - values...
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/606
+     */
+    public function testEscapeProtectsNegativeNumbers()
+    {
+        $this->assertSame("'-100'", $this->db->escape(-100));
+    }
+
+    public function testEscape()
+    {
+        $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
+        $sql      = 'SELECT * FROM brands WHERE name = ' . $this->db->escape("O'Doules");
+
+        $this->assertSame($expected, $sql);
+    }
+
+    public function testEscapeString()
+    {
+        $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
+        $sql      = "SELECT * FROM brands WHERE name = '" . $this->db->escapeString("O'Doules") . "'";
+
+        $this->assertSame($expected, $sql);
+    }
+
+    public function testEscapeLikeString()
+    {
+        $expected = "SELECT * FROM brands WHERE column LIKE '%10!% more%' ESCAPE '!'";
+        $sql      = "SELECT * FROM brands WHERE column LIKE '%" . $this->db->escapeLikeString('10% more') . "%' ESCAPE '!'";
+
+        $this->assertSame($expected, $sql);
+    }
+
+    public function testEscapeLikeStringDirect()
+    {
+        if ($this->db->DBDriver === 'MySQLi') {
+            $expected = "SHOW COLUMNS FROM brands WHERE column LIKE 'wild\\_chars%'";
+            $sql      = "SHOW COLUMNS FROM brands WHERE column LIKE '" . $this->db->escapeLikeStringDirect('wild_chars') . "%'";
+
+            $this->assertSame($expected, $sql);
+        } else {
+            $this->expectNotToPerformAssertions();
+        }
+    }
 }
diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php
index 35f675af9ec3..b1cf373f1244 100644
--- a/tests/system/Database/Live/FabricatorLiveTest.php
+++ b/tests/system/Database/Live/FabricatorLiveTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -9,82 +20,84 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class FabricatorLiveTest extends CIUnitTestCase
+final class FabricatorLiveTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	protected $refresh = true;
+    protected $refresh = true;
 
-	public function testCreateAddsToDatabase()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+    public function testCreateAddsToDatabase()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		// Some countries violate the 40 character limit so override that
-		$fabricator->setOverrides(['country' => 'Spain']);
+        // Some countries violate the 40 character limit so override that
+        $fabricator->setOverrides(['country' => 'Spain']);
 
-		$result = $fabricator->create();
+        $result = $fabricator->create();
 
-		$this->seeInDatabase('user', ['name' => $result->name]);
-	}
+        $this->seeInDatabase('user', ['name' => $result->name]);
+    }
 
-	public function testCreateAddsCountToDatabase()
-	{
-		$count = 10;
+    public function testCreateAddsCountToDatabase()
+    {
+        $count = 10;
 
-		$fabricator = new Fabricator(UserModel::class);
+        $fabricator = new Fabricator(UserModel::class);
 
-		// Some countries violate the 40 character limit so override that
-		$fabricator->setOverrides(['country' => 'France']);
+        // Some countries violate the 40 character limit so override that
+        $fabricator->setOverrides(['country' => 'France']);
 
-		$result = $fabricator->create($count);
+        $result = $fabricator->create($count);
 
-		$this->seeNumRecords($count, 'user', []);
-	}
+        $this->seeNumRecords($count, 'user', []);
+    }
 
-	public function testHelperCreates()
-	{
-		helper('test');
+    public function testHelperCreates()
+    {
+        helper('test');
 
-		$result = fake(UserModel::class, ['country' => 'Italy']);
+        $result = fake(UserModel::class, ['country' => 'Italy']);
 
-		$this->seeInDatabase('user', ['name' => $result->name]);
-	}
+        $this->seeInDatabase('user', ['name' => $result->name]);
+    }
 
-	public function testCreateIncrementsCount()
-	{
-		$fabricator = new Fabricator(UserModel::class);
-		$fabricator->setOverrides(['country' => 'China']);
+    public function testCreateIncrementsCount()
+    {
+        $fabricator = new Fabricator(UserModel::class);
+        $fabricator->setOverrides(['country' => 'China']);
 
-		$count = Fabricator::getCount('user');
+        $count = Fabricator::getCount('user');
 
-		$fabricator->create();
+        $fabricator->create();
 
-		$this->assertEquals($count + 1, Fabricator::getCount('user'));
-	}
+        $this->assertSame($count + 1, Fabricator::getCount('user'));
+    }
 
-	public function testHelperIncrementsCount()
-	{
-		$count = Fabricator::getCount('user');
+    public function testHelperIncrementsCount()
+    {
+        $count = Fabricator::getCount('user');
 
-		fake(UserModel::class, ['country' => 'Italy']);
+        fake(UserModel::class, ['country' => 'Italy']);
 
-		$this->assertEquals($count + 1, Fabricator::getCount('user'));
-	}
+        $this->assertSame($count + 1, Fabricator::getCount('user'));
+    }
 
-	public function testCreateThrowsOnFailure()
-	{
-		$this->expectException(FrameworkException::class);
-		$this->expectExceptionMessage(lang('Fabricator.createFailed', ['job', 'Too short, man!']));
+    public function testCreateThrowsOnFailure()
+    {
+        $this->expectException(FrameworkException::class);
+        $this->expectExceptionMessage(lang('Fabricator.createFailed', ['job', 'Too short, man!']));
 
-		fake(ValidModel::class, ['name' => 'eh']);
-	}
+        fake(ValidModel::class, ['name' => 'eh']);
+    }
 
-	public function testHelperDoesNotPersist()
-	{
-		helper('test');
-		$result = fake(UserModel::class, ['name' => 'Derek'], false);
-		$this->assertEquals('Derek', $result->name);
-		$this->dontSeeInDatabase('user', ['name' => 'Derek']);
-	}
+    public function testHelperDoesNotPersist()
+    {
+        helper('test');
+        $result = fake(UserModel::class, ['name' => 'Derek'], false);
+        $this->assertSame('Derek', $result->name);
+        $this->dontSeeInDatabase('user', ['name' => 'Derek']);
+    }
 }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index c7ea8fc4510b..69812f98444b 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
@@ -12,936 +21,881 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class ForgeTest extends CIUnitTestCase
+final class ForgeTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-	protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	/**
-	 * @var Forge
-	 */
-	protected $forge;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->forge = Database::forge($this->DBGroup);
-	}
-
-	public function testCreateDatabase()
-	{
-		$databaseCreated = $this->forge->createDatabase('test_forge_database');
-
-		$this->assertTrue($databaseCreated);
-	}
-
-	public function testCreateDatabaseIfNotExists()
-	{
-		$dbName = 'test_forge_database_exist';
-
-		$databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
-		if ($this->db->DBDriver !== 'SQLite3')
-		{
-			$this->forge->dropDatabase($dbName);
-		}
-
-		$this->assertTrue($databaseCreateIfNotExists);
-	}
-
-	public function testCreateDatabaseIfNotExistsWithDb()
-	{
-		$dbName = 'test_forge_database_exist';
-
-		$this->forge->createDatabase($dbName);
-		$databaseExists = $this->forge->createDatabase($dbName, true);
-		if ($this->db->DBDriver !== 'SQLite3')
-		{
-			$this->forge->dropDatabase($dbName);
-		}
-
-		$this->assertTrue($databaseExists);
-	}
-
-	public function testDropDatabase()
-	{
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->markTestSkipped('SQLite3 requires file path to drop database');
-		}
-
-		$databaseDropped = $this->forge->dropDatabase('test_forge_database');
-
-		$this->assertTrue($databaseDropped);
-	}
-
-	public function testCreateDatabaseExceptionNoCreateStatement()
-	{
-		$this->setPrivateProperty($this->forge, 'createDatabaseStr', false);
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$databaseCreated = $this->forge->createDatabase('test_forge_database');
-			$this->assertTrue($databaseCreated);
-		}
-		else
-		{
-			$this->expectException(DatabaseException::class);
-			$this->expectExceptionMessage('This feature is not available for the database you are using.');
-
-			$this->forge->createDatabase('test_forge_database');
-		}
-	}
-
-	public function testDropDatabaseExceptionNoDropStatement()
-	{
-		$this->setPrivateProperty($this->forge, 'dropDatabaseStr', false);
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->markTestSkipped('SQLite3 requires file path to drop database');
-		}
-		else
-		{
-			$this->expectException(DatabaseException::class);
-			$this->expectExceptionMessage('This feature is not available for the database you are using.');
-
-			$this->forge->dropDatabase('test_forge_database');
-		}
-	}
-
-	public function testCreateTable()
-	{
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->forge->addField([
-			'id'     => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => true,
-				'auto_increment' => true,
-			],
-			'mobile' => [
-				'type'       => 'INTEGER',
-				'constraint' => 10,
-				'unsigned'   => true,
-			],
-		]);
-
-		$unsignedAttributes = [
-			'INTEGER',
-		];
-
-		$this->setPrivateProperty($this->forge, 'unsigned', $unsignedAttributes);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_table');
-
-		$exist = $this->db->tableExists('forge_test_table');
-
-		$this->assertTrue($exist);
-		$this->forge->dropTable('forge_test_table', true);
-	}
-
-	public function testCreateTableApplyBigInt()
-	{
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->forge->addField([
-			'id' => [
-				'type'           => 'BIGINT',
-				'unsigned'       => true,
-				'auto_increment' => true,
-			],
-		]);
-
-		$this->forge->addPrimaryKey('id');
-		$this->forge->createTable('forge_test_table', true);
-
-		$fieldsData = $this->db->getFieldData('forge_test_table');
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
-		}
-		elseif ($this->db->DBDriver === 'Postgre')
-		{
-			$this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
-		}
-		elseif ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertEquals(strtolower($fieldsData[0]->type), 'integer');
-		}
-		elseif ($this->db->DBDriver === 'SQLSRV')
-		{
-			$this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
-		}
-
-		$this->forge->dropTable('forge_test_table', true);
-	}
-
-	public function testCreateTableWithAttributes()
-	{
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
-		}
-
-		$this->forge->dropTable('forge_test_attributes', true);
-
-		$this->forge->addField('id');
-
-		$attributes = [
-			'comment' => "Forge's Test",
-		];
-
-		$this->forge->createTable('forge_test_attributes', false, $attributes);
-
-		$exist = $this->db->tableExists('forge_test_attributes');
-		$this->forge->dropTable('forge_test_attributes', true, true);
-
-		$this->assertTrue($exist);
-	}
-
-	public function testCreateTableWithArrayFieldConstraints()
-	{
-		if (in_array($this->db->DBDriver, ['MySQLi', 'SQLite3'], true))
-		{
-			$this->forge->dropTable('forge_array_constraint', true);
-			$this->forge->addField([
-				'status' => [
-					'type'       => 'ENUM',
-					'constraint' => [
-						'sad',
-						'ok',
-						'happy',
-					],
-				],
-			]);
-			$this->forge->createTable('forge_array_constraint');
-
-			$fields = $this->db->getFieldData('forge_array_constraint');
-
-			$this->assertEquals('status', $fields[0]->name);
-
-			if ($this->db->DBDriver === 'SQLite3')
-			{
-				// SQLite3 converts array constraints to TEXT CHECK(...)
-				$this->assertEquals('TEXT', $fields[0]->type);
-			}
-			else
-			{
-				$this->assertEquals('enum', $fields[0]->type);
-			}
-
-			$this->forge->dropTable('forge_array_constraint', true);
-		}
-		else
-		{
-			$this->expectNotToPerformAssertions();
-		}
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4693
-	 */
-	public function testCreateTableWithNullableFieldsGivesNullDataType(): void
-	{
-		$this->forge->addField([
-			'id'   => [
-				'type'           => 'INT',
-				'constraint'     => 11,
-				'auto_increment' => true,
-			],
-			'name' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$createTable = $this->getPrivateMethodInvoker($this->forge, '_createTable');
-
-		$sql = $createTable('forge_nullable_table', false, []);
-
-		if ($this->db->DBDriver !== 'SQLSRV')
-		{
-			// @see https://regex101.com/r/bIHVNw/1
-			$this->assertMatchesRegularExpression('/(?:`name`|"name") VARCHAR(.*) NULL/', $sql);
-		}
-		else
-		{
-			// sqlsrv table fields are default nullable
-			$this->assertMatchesRegularExpression('/"name" VARCHAR/', $sql);
-		}
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    /**
+     * @var Forge
+     */
+    protected $forge;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->forge = Database::forge($this->DBGroup);
+    }
+
+    public function testCreateDatabase()
+    {
+        $databaseCreated = $this->forge->createDatabase('test_forge_database');
+
+        $this->assertTrue($databaseCreated);
+    }
+
+    public function testCreateDatabaseIfNotExists()
+    {
+        $dbName = 'test_forge_database_exist';
+
+        $databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
+        if ($this->db->DBDriver !== 'SQLite3') {
+            $this->forge->dropDatabase($dbName);
+        }
+
+        $this->assertTrue($databaseCreateIfNotExists);
+    }
+
+    public function testCreateDatabaseIfNotExistsWithDb()
+    {
+        $dbName = 'test_forge_database_exist';
+
+        $this->forge->createDatabase($dbName);
+        $databaseExists = $this->forge->createDatabase($dbName, true);
+        if ($this->db->DBDriver !== 'SQLite3') {
+            $this->forge->dropDatabase($dbName);
+        }
+
+        $this->assertTrue($databaseExists);
+    }
+
+    public function testDropDatabase()
+    {
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->markTestSkipped('SQLite3 requires file path to drop database');
+        }
+
+        $databaseDropped = $this->forge->dropDatabase('test_forge_database');
+
+        $this->assertTrue($databaseDropped);
+    }
+
+    public function testCreateDatabaseExceptionNoCreateStatement()
+    {
+        $this->setPrivateProperty($this->forge, 'createDatabaseStr', false);
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $databaseCreated = $this->forge->createDatabase('test_forge_database');
+            $this->assertTrue($databaseCreated);
+        } else {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('This feature is not available for the database you are using.');
+
+            $this->forge->createDatabase('test_forge_database');
+        }
+    }
+
+    public function testDropDatabaseExceptionNoDropStatement()
+    {
+        $this->setPrivateProperty($this->forge, 'dropDatabaseStr', false);
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->markTestSkipped('SQLite3 requires file path to drop database');
+        } else {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('This feature is not available for the database you are using.');
+
+            $this->forge->dropDatabase('test_forge_database');
+        }
+    }
+
+    public function testCreateTable()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'mobile' => [
+                'type'       => 'INTEGER',
+                'constraint' => 10,
+                'unsigned'   => true,
+            ],
+        ]);
+
+        $unsignedAttributes = [
+            'INTEGER',
+        ];
+
+        $this->setPrivateProperty($this->forge, 'unsigned', $unsignedAttributes);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_table');
+
+        $exist = $this->db->tableExists('forge_test_table');
+
+        $this->assertTrue($exist);
+        $this->forge->dropTable('forge_test_table', true);
+    }
+
+    public function testCreateTableApplyBigInt()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'BIGINT',
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+        ]);
+
+        $this->forge->addPrimaryKey('id');
+        $this->forge->createTable('forge_test_table', true);
+
+        $fieldsData = $this->db->getFieldData('forge_test_table');
+        if ($this->db->DBDriver === 'MySQLi') {
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
+        } elseif ($this->db->DBDriver === 'Postgre') {
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
+        } elseif ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame(strtolower($fieldsData[0]->type), 'integer');
+        } elseif ($this->db->DBDriver === 'SQLSRV') {
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
+        }
+
+        $this->forge->dropTable('forge_test_table', true);
+    }
+
+    public function testCreateTableWithAttributes()
+    {
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
+        }
+
+        $this->forge->dropTable('forge_test_attributes', true);
+
+        $this->forge->addField('id');
+
+        $attributes = [
+            'comment' => "Forge's Test",
+        ];
+
+        $this->forge->createTable('forge_test_attributes', false, $attributes);
+
+        $exist = $this->db->tableExists('forge_test_attributes');
+        $this->forge->dropTable('forge_test_attributes', true, true);
+
+        $this->assertTrue($exist);
+    }
+
+    public function testCreateTableWithArrayFieldConstraints()
+    {
+        if (in_array($this->db->DBDriver, ['MySQLi', 'SQLite3'], true)) {
+            $this->forge->dropTable('forge_array_constraint', true);
+            $this->forge->addField([
+                'status' => [
+                    'type'       => 'ENUM',
+                    'constraint' => [
+                        'sad',
+                        'ok',
+                        'happy',
+                    ],
+                ],
+            ]);
+            $this->forge->createTable('forge_array_constraint');
+
+            $fields = $this->db->getFieldData('forge_array_constraint');
+
+            $this->assertSame('status', $fields[0]->name);
+
+            if ($this->db->DBDriver === 'SQLite3') {
+                // SQLite3 converts array constraints to TEXT CHECK(...)
+                $this->assertSame('TEXT', $fields[0]->type);
+            } else {
+                $this->assertSame('enum', $fields[0]->type);
+            }
+
+            $this->forge->dropTable('forge_array_constraint', true);
+        } else {
+            $this->expectNotToPerformAssertions();
+        }
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4693
+     */
+    public function testCreateTableWithNullableFieldsGivesNullDataType(): void
+    {
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INT',
+                'constraint'     => 11,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $createTable = $this->getPrivateMethodInvoker($this->forge, '_createTable');
+
+        $sql = $createTable('forge_nullable_table', false, []);
+
+        if ($this->db->DBDriver !== 'SQLSRV') {
+            // @see https://regex101.com/r/bIHVNw/1
+            $this->assertMatchesRegularExpression('/(?:`name`|"name") VARCHAR(.*) NULL/', $sql);
+        } else {
+            // sqlsrv table fields are default nullable
+            $this->assertMatchesRegularExpression('/"name" VARCHAR/', $sql);
+        }
+    }
+
+    public function testCreateTableWithStringField()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField('id');
+        $this->forge->addField('name varchar(100) NULL');
+
+        $this->forge->createTable('forge_test_table');
+
+        $exist = $this->db->tableExists('forge_test_table');
+        $this->forge->dropTable('db_forge_test_table', true);
+
+        $this->assertTrue($exist);
+    }
+
+    public function testCreateTableWithEmptyName()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField('id');
+        $this->forge->addField('name varchar(100) NULL');
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('A table name is required for that operation.');
 
-	public function testCreateTableWithStringField()
-	{
-		$this->forge->dropTable('forge_test_table', true);
+        $this->forge->createTable('');
+    }
 
-		$this->forge->addField('id');
-		$this->forge->addField('name varchar(100) NULL');
+    public function testCreateTableWithNoFields()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Field information is required.');
+
+        $this->forge->createTable('forge_test_table');
+    }
+
+    public function testCreateTableWithStringFieldException()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Field information is required for that operation.');
+
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField('id');
+        $this->forge->addField('name');
+
+        $this->forge->createTable('forge_test_table');
+    }
 
-		$this->forge->createTable('forge_test_table');
+    public function testRenameTable()
+    {
+        $this->forge->dropTable('forge_test_table_dummy', true);
+
+        $this->forge->addField('id');
+        $this->forge->addField('name varchar(100) NULL');
+
+        $this->forge->createTable('forge_test_table');
+
+        $this->forge->renameTable('forge_test_table', 'forge_test_table_dummy');
+
+        $exist = $this->db->tableExists('forge_test_table_dummy');
+
+        $this->assertTrue($exist);
+    }
+
+    public function testRenameTableEmptyNameException()
+    {
+        $this->forge->dropTable('forge_test_table_dummy', true);
+
+        $this->forge->addField('id');
+        $this->forge->addField('name varchar(100) NULL');
+
+        $this->forge->createTable('forge_test_table');
 
-		$exist = $this->db->tableExists('forge_test_table');
-		$this->forge->dropTable('db_forge_test_table', true);
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('A table name is required for that operation.');
 
-		$this->assertTrue($exist);
-	}
+        $this->forge->renameTable('forge_test_table', '');
+    }
 
-	public function testCreateTableWithEmptyName()
-	{
-		$this->forge->dropTable('forge_test_table', true);
+    public function testRenameTableNoRenameStatementException()
+    {
+        $this->setPrivateProperty($this->forge, 'renameTableStr', false);
 
-		$this->forge->addField('id');
-		$this->forge->addField('name varchar(100) NULL');
-
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('A table name is required for that operation.');
-
-		$this->forge->createTable('');
-	}
-
-	public function testCreateTableWithNoFields()
-	{
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->expectException(RuntimeException::class);
-		$this->expectExceptionMessage('Field information is required.');
-
-		$this->forge->createTable('forge_test_table');
-	}
-
-	public function testCreateTableWithStringFieldException()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Field information is required for that operation.');
-
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->forge->addField('id');
-		$this->forge->addField('name');
-
-		$this->forge->createTable('forge_test_table');
-	}
-
-	public function testRenameTable()
-	{
-		$this->forge->dropTable('forge_test_table_dummy', true);
-
-		$this->forge->addField('id');
-		$this->forge->addField('name varchar(100) NULL');
-
-		$this->forge->createTable('forge_test_table');
-
-		$this->forge->renameTable('forge_test_table', 'forge_test_table_dummy');
-
-		$exist = $this->db->tableExists('forge_test_table_dummy');
-
-		$this->assertTrue($exist);
-	}
-
-	public function testRenameTableEmptyNameException()
-	{
-		$this->forge->dropTable('forge_test_table_dummy', true);
-
-		$this->forge->addField('id');
-		$this->forge->addField('name varchar(100) NULL');
-
-		$this->forge->createTable('forge_test_table');
-
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('A table name is required for that operation.');
-
-		$this->forge->renameTable('forge_test_table', '');
-	}
+        $this->forge->dropTable('forge_test_table', true);
 
-	public function testRenameTableNoRenameStatementException()
-	{
-		$this->setPrivateProperty($this->forge, 'renameTableStr', false);
-
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->forge->addField('id');
-		$this->forge->addField('name varchar(100) NULL');
-
-		$this->forge->createTable('forge_test_table');
-
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('This feature is not available for the database you are using.');
-
-		$this->forge->renameTable('forge_test_table', 'forge_test_table_dummy');
-	}
-
-	public function testDropTableWithEmptyName()
-	{
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('A table name is required for that operation.');
-
-		$this->forge->dropTable('', true);
-	}
-
-	public function testForeignKey()
-	{
-		$attributes = [];
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$attributes = ['ENGINE' => 'InnoDB'];
-		}
-
-		$this->forge->addField([
-			'id'   => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_users', true, $attributes);
-
-		$this->forge->addField([
-			'id'       => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'users_id' => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
-
-		$this->forge->createTable('forge_test_invoices', true, $attributes);
-
-		$foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertEquals($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
-			$this->assertEquals($foreignKeyData[0]->sequence, 0);
-		}
-		else
-		{
-			$this->assertEquals($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
-			$this->assertEquals($foreignKeyData[0]->column_name, 'users_id');
-			$this->assertEquals($foreignKeyData[0]->foreign_column_name, 'id');
-		}
-		$this->assertEquals($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
-		$this->assertEquals($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
-
-		$this->forge->dropTable('forge_test_invoices', true);
-		$this->forge->dropTable('forge_test_users', true);
-	}
-
-	public function testForeignKeyFieldNotExistException()
-	{
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Field `user_id` not found.');
-
-		$attributes = [];
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$attributes = ['ENGINE' => 'InnoDB'];
-		}
-
-		$this->forge->addField([
-			'id'   => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_users', true, $attributes);
-
-		$this->forge->addField([
-			'id'       => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'users_id' => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->addForeignKey('user_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
-
-		$this->forge->createTable('forge_test_invoices', true, $attributes);
-	}
-
-	public function testDropForeignKey()
-	{
-		$attributes = [];
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$attributes = ['ENGINE' => 'InnoDB'];
-		}
-
-		$this->forge->addField([
-			'id'   => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_users', true, $attributes);
-
-		$this->forge->addField([
-			'id'       => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'users_id' => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-			],
-			'name'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-		]);
-		$this->forge->addKey('id', true);
-		$this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
-
-		$this->forge->createTable('forge_test_invoices', true, $attributes);
-
-		$this->forge->dropForeignKey('forge_test_invoices', 'forge_test_invoices_users_id_foreign');
-
-		$foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
-
-		$this->assertEmpty($foreignKeyData);
-
-		$this->forge->dropTable('forge_test_invoices', true);
-		$this->forge->dropTable('forge_test_users', true);
-	}
-
-	public function testAddColumn()
-	{
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->forge->addField([
-			'id' => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_table');
-
-		$newField = [
-			'username' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'unique'     => false,
-			],
-		];
-
-		$this->forge->addColumn('forge_test_table', $newField);
-
-		$fieldNames = $this->db->table('forge_test_table')
-				->get()
-				->getFieldNames();
-
-		$this->forge->dropTable('forge_test_table', true);
-
-		$this->assertEquals('username', $fieldNames[1]);
-	}
-
-	public function testAddFields()
-	{
-		$this->forge->dropTable('forge_test_fields', true);
-
-		$this->forge->addField([
-			'id'       => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-			'username' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-				'unique'     => false,
-			],
-			'name'     => [
-				'type'       => 'VARCHAR',
-				'constraint' => 255,
-			],
-			'active'   => [
-				'type'       => 'INTEGER',
-				'constraint' => 11,
-				'default'    => 0,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->addUniqueKey(['username', 'active']);
-		$create = $this->forge->createTable('forge_test_fields', true);
-
-		$fieldsNames = $this->db->getFieldNames('forge_test_fields');
-		$fieldsData  = $this->db->getFieldData('forge_test_fields');
-
-		$this->forge->dropTable('forge_test_fields', true);
-
-		// Check field names
-		$this->assertContains('id', $fieldsNames);
-		$this->assertContains('username', $fieldsNames);
-		$this->assertContains('name', $fieldsNames);
-		$this->assertContains('active', $fieldsNames);
-
-		// Check field data
-		$this->assertContains($fieldsData[0]->name, ['id', 'name', 'username', 'active']);
-		$this->assertContains($fieldsData[1]->name, ['id', 'name', 'username', 'active']);
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			// Check types
-			$this->assertEquals($fieldsData[0]->type, 'int');
-			$this->assertEquals($fieldsData[1]->type, 'varchar');
-
-			if (version_compare($this->db->getVersion(), '8.0.17', '<'))
-			{
-				// As of MySQL 8.0.17, the display width attribute for integer data types
-				// is deprecated and is not reported back anymore.
-				// @see https://dev.mysql.com/doc/refman/8.0/en/numeric-type-attributes.html
-				$this->assertEquals($fieldsData[0]->max_length, 11);
-			}
-
-			$this->assertNull($fieldsData[0]->default);
-			$this->assertNull($fieldsData[1]->default);
-
-			$this->assertEquals($fieldsData[0]->primary_key, 1);
-
-			$this->assertEquals($fieldsData[1]->max_length, 255);
-		}
-		elseif ($this->db->DBDriver === 'Postgre')
-		{
-			// Check types
-			$this->assertEquals($fieldsData[0]->type, 'integer', print_r($fieldsData, true));
-			$this->assertEquals($fieldsData[1]->type, 'character varying', print_r($fieldsData, true));
-
-			$this->assertEquals($fieldsData[0]->max_length, 32);
-			$this->assertNull($fieldsData[1]->default);
-
-			$this->assertEquals($fieldsData[1]->max_length, 255);
-		}
-		elseif ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertEquals(strtolower($fieldsData[0]->type), 'integer');
-			$this->assertEquals(strtolower($fieldsData[1]->type), 'varchar');
-
-			$this->assertEquals($fieldsData[1]->default, null);
-		}
-		elseif ($this->db->DBDriver === 'SQLSRV')
-		{
-			// Check types
-			$this->assertEquals($fieldsData[0]->type, 'int');
-			$this->assertEquals($fieldsData[0]->max_length, 10);
-
-			$this->assertEquals($fieldsData[1]->type, 'varchar');
-			$this->assertNull($fieldsData[1]->default);
-			$this->assertEquals($fieldsData[1]->max_length, 255);
-		}
-		else
-		{
-			$this->assertTrue(false, 'DB Driver not supported');
-		}
-	}
-
-	public function testCompositeKey()
-	{
-		// SQLite3 uses auto increment different
-		$uniqueOrAuto = $this->db->DBDriver === 'SQLite3' ? 'unique' : 'auto_increment';
-
-		$this->forge->addField([
-			'id'      => [
-				'type'        => 'INTEGER',
-				'constraint'  => 3,
-				$uniqueOrAuto => true,
-			],
-			'code'    => [
-				'type'       => 'VARCHAR',
-				'constraint' => 40,
-			],
-			'company' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 40,
-			],
-			'active'  => [
-				'type'       => 'INTEGER',
-				'constraint' => 1,
-			],
-		]);
-		$this->forge->addPrimaryKey('id');
-		$this->forge->addKey(['code', 'company']);
-		$this->forge->addUniqueKey(['code', 'active']);
-		$this->forge->createTable('forge_test_1', true);
-
-		$keys = $this->db->getIndexData('forge_test_1');
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$this->assertEquals($keys['PRIMARY']->name, 'PRIMARY');
-			$this->assertEquals($keys['PRIMARY']->fields, ['id']);
-			$this->assertEquals($keys['PRIMARY']->type, 'PRIMARY');
-			$this->assertEquals($keys['code_company']->name, 'code_company');
-			$this->assertEquals($keys['code_company']->fields, ['code', 'company']);
-			$this->assertEquals($keys['code_company']->type, 'INDEX');
-			$this->assertEquals($keys['code_active']->name, 'code_active');
-			$this->assertEquals($keys['code_active']->fields, ['code', 'active']);
-			$this->assertEquals($keys['code_active']->type, 'UNIQUE');
-		}
-		elseif ($this->db->DBDriver === 'Postgre')
-		{
-			$this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
-			$this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
-			$this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-			$this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-			$this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
-		}
-		elseif ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertEquals($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
-			$this->assertEquals($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
-			$this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-			$this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-		}
-		elseif ($this->db->DBDriver === 'SQLSRV')
-		{
-			$this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
-			$this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
-			$this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
-
-			$this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-			$this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
-
-			$this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-			$this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
-		}
-
-		$this->forge->dropTable('forge_test_1', true);
-	}
-
-	public function testDropColumn()
-	{
-		$this->forge->dropTable('forge_test_two', true);
-
-		$this->forge->addField([
-			'id'   => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-			'name' => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_two');
-
-		$this->assertTrue($this->db->fieldExists('name', 'forge_test_two'));
-
-		$this->forge->dropColumn('forge_test_two', 'name');
-
-		$this->db->resetDataCache();
-
-		$this->assertFalse($this->db->fieldExists('name', 'forge_test_two'));
-
-		$this->forge->dropTable('forge_test_two', true);
-	}
-
-	public function testModifyColumnRename()
-	{
-		$this->forge->dropTable('forge_test_three', true);
-
-		$this->forge->addField([
-			'id'   => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-			'name' => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_three');
-
-		$this->assertTrue($this->db->fieldExists('name', 'forge_test_three'));
-
-		$this->forge->modifyColumn('forge_test_three', [
-			'name' => [
-				'name'       => 'altered',
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$this->db->resetDataCache();
-
-		$this->assertFalse($this->db->fieldExists('name', 'forge_test_three'));
-		$this->assertTrue($this->db->fieldExists('altered', 'forge_test_three'));
-
-		$this->forge->dropTable('forge_test_three', true);
-	}
-
-	public function testConnectWithArrayGroup()
-	{
-		$group = config('Database');
-		$group = $group->tests;
-
-		$forge = Database::forge($group);
-
-		$this->assertInstanceOf(Forge::class, $forge);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1983
-	 */
-	public function testDropTableSuccess()
-	{
-		// Add an index to user table so we have
-		// something to work with
-		$this->forge->addField([
-			'id' => [
-				'type'       => 'INTEGER',
-				'constraint' => 3,
-			],
-		]);
-		$this->forge->addKey('id');
-		$this->forge->createTable('droptest');
-
-		$this->assertCount(1, $this->db->getIndexData('droptest'));
-
-		$this->forge->dropTable('droptest', true);
-
-		$this->assertFalse($this->db->tableExists('dropTest'));
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertCount(0, $this->db->getIndexData('droptest'));
-		}
-	}
-
-	public function testDropMultipleColumnWithArray()
-	{
-		$this->forge->dropTable('forge_test_two', true);
-
-		$this->forge->addField([
-			'id'    => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-			'name'  => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-			'email' => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_two');
-
-		$this->assertTrue($this->db->fieldExists('name', 'forge_test_two'));
-
-		$this->forge->dropColumn('forge_test_two', ['id', 'name']);
-
-		$this->db->resetDataCache();
-
-		$this->assertFalse($this->db->fieldExists('id', 'forge_test_two'));
-		$this->assertFalse($this->db->fieldExists('name', 'forge_test_two'));
-
-		$this->forge->dropTable('forge_test_two', true);
-	}
-
-	public function testDropMultipleColumnWithString()
-	{
-		$this->forge->dropTable('forge_test_four', true);
-
-		$this->forge->addField([
-			'id'    => [
-				'type'           => 'INTEGER',
-				'constraint'     => 11,
-				'unsigned'       => false,
-				'auto_increment' => true,
-			],
-			'name'  => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-			'email' => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-		]);
-
-		$this->forge->addKey('id', true);
-		$this->forge->createTable('forge_test_four');
-
-		$this->assertTrue($this->db->fieldExists('name', 'forge_test_four'));
-
-		$this->forge->dropColumn('forge_test_four', 'id, name');
-
-		$this->db->resetDataCache();
-
-		$this->assertFalse($this->db->fieldExists('id', 'forge_test_four'));
-		$this->assertFalse($this->db->fieldExists('name', 'forge_test_four'));
-
-		$this->forge->dropTable('forge_test_four', true);
-	}
+        $this->forge->addField('id');
+        $this->forge->addField('name varchar(100) NULL');
+
+        $this->forge->createTable('forge_test_table');
+
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('This feature is not available for the database you are using.');
+
+        $this->forge->renameTable('forge_test_table', 'forge_test_table_dummy');
+    }
+
+    public function testDropTableWithEmptyName()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('A table name is required for that operation.');
+
+        $this->forge->dropTable('', true);
+    }
+
+    public function testForeignKey()
+    {
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_users', true, $attributes);
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
+
+        $this->forge->createTable('forge_test_invoices', true, $attributes);
+
+        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
+            $this->assertSame($foreignKeyData[0]->sequence, 0);
+        } else {
+            $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
+            $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
+            $this->assertSame($foreignKeyData[0]->foreign_column_name, 'id');
+        }
+        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
+        $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
+
+        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable('forge_test_users', true);
+    }
+
+    public function testForeignKeyFieldNotExistException()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Field `user_id` not found.');
+
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_users', true, $attributes);
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->addForeignKey('user_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
+
+        $this->forge->createTable('forge_test_invoices', true, $attributes);
+    }
+
+    public function testDropForeignKey()
+    {
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_users', true, $attributes);
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
+
+        $this->forge->createTable('forge_test_invoices', true, $attributes);
+
+        $this->forge->dropForeignKey('forge_test_invoices', 'forge_test_invoices_users_id_foreign');
+
+        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+
+        $this->assertEmpty($foreignKeyData);
+
+        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable('forge_test_users', true);
+    }
+
+    public function testAddColumn()
+    {
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_table');
+
+        $newField = [
+            'username' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'unique'     => false,
+            ],
+        ];
+
+        $this->forge->addColumn('forge_test_table', $newField);
+
+        $fieldNames = $this->db->table('forge_test_table')
+            ->get()
+            ->getFieldNames();
+
+        $this->forge->dropTable('forge_test_table', true);
+
+        $this->assertSame('username', $fieldNames[1]);
+    }
+
+    public function testAddFields()
+    {
+        $this->forge->dropTable('forge_test_fields', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+            'username' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+                'unique'     => false,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+            'active' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+                'default'    => 0,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->addUniqueKey(['username', 'active']);
+        $this->forge->createTable('forge_test_fields', true);
+
+        $fieldsNames = $this->db->getFieldNames('forge_test_fields');
+        $fieldsData  = $this->db->getFieldData('forge_test_fields');
+
+        $this->forge->dropTable('forge_test_fields', true);
+
+        $this->assertIsArray($fieldsNames);
+        $this->assertContains('id', $fieldsNames);
+        $this->assertContains('username', $fieldsNames);
+        $this->assertContains('name', $fieldsNames);
+        $this->assertContains('active', $fieldsNames);
+
+        $fields = ['id', 'name', 'username', 'active'];
+        $this->assertContains($fieldsData[0]->name, $fields);
+        $this->assertContains($fieldsData[1]->name, $fields);
+        unset($fields);
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $this->assertSame('int', $fieldsData[0]->type);
+            $this->assertSame('varchar', $fieldsData[1]->type);
+
+            if (version_compare($this->db->getVersion(), '8.0.17', '<')) {
+                // As of MySQL 8.0.17, the display width attribute for integer data types
+                // is deprecated and is not reported back anymore.
+                // @see https://dev.mysql.com/doc/refman/8.0/en/numeric-type-attributes.html
+                $this->assertSame(11, $fieldsData[0]->max_length);
+            }
+
+            $this->assertNull($fieldsData[0]->default);
+            $this->assertNull($fieldsData[1]->default);
+            $this->assertSame(1, (int) $fieldsData[0]->primary_key);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
+        } elseif ($this->db->DBDriver === 'Postgre') {
+            $this->assertSame('integer', $fieldsData[0]->type);
+            $this->assertSame('character varying', $fieldsData[1]->type);
+            $this->assertSame(32, (int) $fieldsData[0]->max_length);
+            $this->assertNull($fieldsData[1]->default);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
+        } elseif ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame('integer', strtolower($fieldsData[0]->type));
+            $this->assertSame('varchar', strtolower($fieldsData[1]->type));
+            $this->assertNull($fieldsData[1]->default);
+        } elseif ($this->db->DBDriver === 'SQLSRV') {
+            $this->assertSame('int', $fieldsData[0]->type);
+            $this->assertSame(10, (int) $fieldsData[0]->max_length);
+            $this->assertSame('varchar', $fieldsData[1]->type);
+            $this->assertNull($fieldsData[1]->default);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
+        } else {
+            $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));
+        }
+    }
+
+    public function testCompositeKey()
+    {
+        // SQLite3 uses auto increment different
+        $uniqueOrAuto = $this->db->DBDriver === 'SQLite3' ? 'unique' : 'auto_increment';
+
+        $this->forge->addField([
+            'id' => [
+                'type'        => 'INTEGER',
+                'constraint'  => 3,
+                $uniqueOrAuto => true,
+            ],
+            'code' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 40,
+            ],
+            'company' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 40,
+            ],
+            'active' => [
+                'type'       => 'INTEGER',
+                'constraint' => 1,
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addKey(['code', 'company']);
+        $this->forge->addUniqueKey(['code', 'active']);
+        $this->forge->createTable('forge_test_1', true);
+
+        $keys = $this->db->getIndexData('forge_test_1');
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
+            $this->assertSame($keys['PRIMARY']->fields, ['id']);
+            $this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
+            $this->assertSame($keys['code_company']->name, 'code_company');
+            $this->assertSame($keys['code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['code_company']->type, 'INDEX');
+            $this->assertSame($keys['code_active']->name, 'code_active');
+            $this->assertSame($keys['code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['code_active']->type, 'UNIQUE');
+        } elseif ($this->db->DBDriver === 'Postgre') {
+            $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+            $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
+            $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+        } elseif ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
+            $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+        } elseif ($this->db->DBDriver === 'SQLSRV') {
+            $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+            $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
+            $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
+
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+        }
+
+        $this->forge->dropTable('forge_test_1', true);
+    }
+
+    public function testDropColumn()
+    {
+        $this->forge->dropTable('forge_test_two', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_two');
+
+        $this->assertTrue($this->db->fieldExists('name', 'forge_test_two'));
+
+        $this->forge->dropColumn('forge_test_two', 'name');
+
+        $this->db->resetDataCache();
+
+        $this->assertFalse($this->db->fieldExists('name', 'forge_test_two'));
+
+        $this->forge->dropTable('forge_test_two', true);
+    }
+
+    public function testModifyColumnRename()
+    {
+        $this->forge->dropTable('forge_test_three', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_three');
+
+        $this->assertTrue($this->db->fieldExists('name', 'forge_test_three'));
+
+        $this->forge->modifyColumn('forge_test_three', [
+            'name' => [
+                'name'       => 'altered',
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $this->db->resetDataCache();
+
+        $this->assertFalse($this->db->fieldExists('name', 'forge_test_three'));
+        $this->assertTrue($this->db->fieldExists('altered', 'forge_test_three'));
+
+        $this->forge->dropTable('forge_test_three', true);
+    }
+
+    public function testConnectWithArrayGroup()
+    {
+        $group = config('Database');
+        $group = $group->tests;
+
+        $forge = Database::forge($group);
+
+        $this->assertInstanceOf(Forge::class, $forge);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1983
+     */
+    public function testDropTableSuccess()
+    {
+        // Add an index to user table so we have
+        // something to work with
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 3,
+            ],
+        ]);
+        $this->forge->addKey('id');
+        $this->forge->createTable('droptest');
+
+        $this->assertCount(1, $this->db->getIndexData('droptest'));
+
+        $this->forge->dropTable('droptest', true);
+
+        $this->assertFalse($this->db->tableExists('dropTest'));
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->assertCount(0, $this->db->getIndexData('droptest'));
+        }
+    }
+
+    public function testDropMultipleColumnWithArray()
+    {
+        $this->forge->dropTable('forge_test_two', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+            'email' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_two');
+
+        $this->assertTrue($this->db->fieldExists('name', 'forge_test_two'));
+
+        $this->forge->dropColumn('forge_test_two', ['id', 'name']);
+
+        $this->db->resetDataCache();
+
+        $this->assertFalse($this->db->fieldExists('id', 'forge_test_two'));
+        $this->assertFalse($this->db->fieldExists('name', 'forge_test_two'));
+
+        $this->forge->dropTable('forge_test_two', true);
+    }
+
+    public function testDropMultipleColumnWithString()
+    {
+        $this->forge->dropTable('forge_test_four', true);
+
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'INTEGER',
+                'constraint'     => 11,
+                'unsigned'       => false,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+            'email' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+        ]);
+
+        $this->forge->addKey('id', true);
+        $this->forge->createTable('forge_test_four');
+
+        $this->assertTrue($this->db->fieldExists('name', 'forge_test_four'));
+
+        $this->forge->dropColumn('forge_test_four', 'id, name');
+
+        $this->db->resetDataCache();
+
+        $this->assertFalse($this->db->fieldExists('id', 'forge_test_four'));
+        $this->assertFalse($this->db->fieldExists('name', 'forge_test_four'));
+
+        $this->forge->dropTable('forge_test_four', true);
+    }
 }
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 3029d3ae9843..6a17f800e55a 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -1,44 +1,50 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class FromTest extends CIUnitTestCase
+final class FromTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testFromCanAddTables()
-	{
-		$result = $this->db->table('job')->from('misc')->get()->getResult();
-
-		$this->assertCount(12, $result);
-	}
+    use DatabaseTestTrait;
 
-	//--------------------------------------------------------------------
+    protected $refresh = true;
 
-	public function testFromCanOverride()
-	{
-		$result = $this->db->table('job')->from('misc', true)->get()->getResult();
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-		$this->assertCount(3, $result);
-	}
+    public function testFromCanAddTables()
+    {
+        $result = $this->db->table('job')->from('misc')->get()->getResult();
 
-	//--------------------------------------------------------------------
+        $this->assertCount(12, $result);
+    }
 
-	public function testFromWithWhere()
-	{
-		$result = $this->db->table('job')->from('user')->where('user.id', 1)->get()->getResult();
+    public function testFromCanOverride()
+    {
+        $result = $this->db->table('job')->from('misc', true)->get()->getResult();
 
-		$this->assertCount(4, $result);
-	}
+        $this->assertCount(3, $result);
+    }
 
-	//--------------------------------------------------------------------
+    public function testFromWithWhere()
+    {
+        $result = $this->db->table('job')->from('user')->where('user.id', 1)->get()->getResult();
 
+        $this->assertCount(4, $result);
+    }
 }
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index 9ee54269220b..bfa982d5d6a5 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -1,45 +1,58 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class GetNumRowsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GetNumRowsTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	/**
-	 * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
-	 * {@inheritDoc}
-	 *
-	 * @see \CodeIgniter\Test\CIDatabaseTestCase::setUp()
-	 */
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	/**
-	 * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
-	 * {@inheritDoc}
-	 *
-	 * @see \CodeIgniter\Test\CIDatabaseTestCase::tearDown()
-	 */
-	public function tearDown(): void
-	{
-		parent::tearDown();
-	}
-
-	/**
-	 * tests newly added ResultInterface::getNumRows with a live db
-	 */
-	public function testGetRowNum()
-	{
-		$query = $this->db->table('job')->get();
-		$this->assertEquals(4, $query->getNumRows());
-	}
-
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    /**
+     * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
+     * {@inheritDoc}
+     *
+     * @see \CodeIgniter\Test\CIDatabaseTestCase::setUp()
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    /**
+     * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
+     * {@inheritDoc}
+     *
+     * @see \CodeIgniter\Test\CIDatabaseTestCase::tearDown()
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+    }
+
+    /**
+     * tests newly added ResultInterface::getNumRows with a live db
+     */
+    public function testGetRowNum()
+    {
+        $query = $this->db->table('job')->get();
+        $this->assertSame(4, $query->getNumRows());
+    }
 }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 64933c6859bb..a2f1aa4f9b89 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
@@ -8,314 +17,252 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class GetTest extends CIUnitTestCase
+final class GetTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testGet()
-	{
-		$jobs = $this->db->table('job')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(4, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Politician', $jobs[1]->name);
-		$this->assertEquals('Accountant', $jobs[2]->name);
-		$this->assertEquals('Musician', $jobs[3]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWitLimit()
-	{
-		$jobs = $this->db->table('job')
-						 ->get(2, 2)
-						 ->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Accountant', $jobs[0]->name);
-		$this->assertEquals('Musician', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWhereArray()
-	{
-		$jobs = $this->db->table('job')
-						 ->getWhere(['id' => 1])
-						 ->getResult();
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetWhereWithLimits()
-	{
-		$jobs = $this->db->table('job')
-						 ->getWhere('id > 1', 1, 1)
-						 ->getResult();
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Accountant', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFieldCount()
-	{
-		$jobs = $this->db->table('job')
-						 ->get()
-						 ->getFieldCount();
-
-		$this->assertEquals(6, $jobs);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFieldNames()
-	{
-		$jobs = $this->db->table('job')
-						 ->get()
-						 ->getFieldNames();
-
-		$this->assertTrue(in_array('name', $jobs, true));
-		$this->assertTrue(in_array('description', $jobs, true));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFieldData()
-	{
-		$jobs = $this->db->table('job')
-						 ->get()
-						 ->getFieldData();
-
-		$this->assertEquals('id', $jobs[0]->name);
-		$this->assertEquals('name', $jobs[1]->name);
-
-		$typeTest = $this->db->table('type_test')
-							  ->get()
-							  ->getFieldData();
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->assertEquals('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
-			$this->assertEquals('text', $typeTest[1]->type_name);  //VARCHAR
-			$this->assertEquals('text', $typeTest[2]->type_name);  //CHAR
-			$this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-			$this->assertEquals('integer', $typeTest[4]->type_name);  //SMALLINT
-			$this->assertEquals('integer', $typeTest[5]->type_name);  //INTEGER
-			$this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-			$this->assertEquals('float', $typeTest[7]->type_name);  //NUMERIC
-			$this->assertEquals('text', $typeTest[8]->type_name);  //DATE
-			$this->assertEquals('text', $typeTest[9]->type_name);  //TIME
-			$this->assertEquals('text', $typeTest[10]->type_name);  //DATETIME
-			$this->assertEquals('text', $typeTest[11]->type_name);  //TIMESTAMP
-			$this->assertEquals('integer', $typeTest[12]->type_name);  //BIGINT
-			$this->assertEquals('float', $typeTest[13]->type_name);  //REAL
-			$this->assertEquals('text', $typeTest[14]->type_name);  //ENUM
-			$this->assertEquals('text', $typeTest[15]->type_name);  //SET
-			$this->assertEquals('text', $typeTest[16]->type_name);  //MEDIUMTEXT
-			$this->assertEquals('float', $typeTest[17]->type_name);  //DOUBLE
-			$this->assertEquals('float', $typeTest[18]->type_name);  //DECIMAL
-			$this->assertEquals('text', $typeTest[19]->type_name);  //BLOB
-		}
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$this->assertEquals('long', $typeTest[0]->type_name); //INTEGER AUTOINC
-			$this->assertEquals('var_string', $typeTest[1]->type_name);  //VARCHAR
-			$this->assertEquals('string', $typeTest[2]->type_name);  //CHAR
-			$this->assertEquals('blob', $typeTest[3]->type_name);  //TEXT
-			$this->assertEquals('short', $typeTest[4]->type_name);  //SMALLINT
-			$this->assertEquals('long', $typeTest[5]->type_name);  //INTEGER
-			$this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-			$this->assertEquals('newdecimal', $typeTest[7]->type_name);  //NUMERIC
-			$this->assertEquals('date', $typeTest[8]->type_name);  //DATE
-			$this->assertEquals('time', $typeTest[9]->type_name);  //TIME
-			$this->assertEquals('datetime', $typeTest[10]->type_name);  //DATETIME
-			$this->assertEquals('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-			$this->assertEquals('longlong', $typeTest[12]->type_name); //BIGINT
-			$this->assertEquals('double', $typeTest[13]->type_name);  //REAL
-			$this->assertEquals('string', $typeTest[14]->type_name);  //ENUM
-			$this->assertEquals('string', $typeTest[15]->type_name);  //SET
-			$this->assertEquals('blob', $typeTest[16]->type_name);  //MEDIUMTEXT
-			$this->assertEquals('double', $typeTest[17]->type_name);  //DOUBLE
-			$this->assertEquals('newdecimal', $typeTest[18]->type_name);  //DECIMAL
-			$this->assertEquals('blob', $typeTest[19]->type_name);  //BLOB
-		}
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$this->assertEquals('int4', $typeTest[0]->type_name); //INTEGER AUTOINC
-			$this->assertEquals('varchar', $typeTest[1]->type_name);  //VARCHAR
-			$this->assertEquals('bpchar', $typeTest[2]->type_name);  //CHAR
-			$this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-			$this->assertEquals('int2', $typeTest[4]->type_name);  //SMALLINT
-			$this->assertEquals('int4', $typeTest[5]->type_name);  //INTEGER
-			$this->assertEquals('float8', $typeTest[6]->type_name);  //FLOAT
-			$this->assertEquals('numeric', $typeTest[7]->type_name);  //NUMERIC
-			$this->assertEquals('date', $typeTest[8]->type_name);  //DATE
-			$this->assertEquals('time', $typeTest[9]->type_name);  //TIME
-			$this->assertEquals('timestamp', $typeTest[10]->type_name);  //DATETIME
-			$this->assertEquals('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-			$this->assertEquals('int8', $typeTest[12]->type_name); //BIGINT
-		}
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$this->assertEquals('int', $typeTest[0]->type_name); //INTEGER AUTOINC
-			$this->assertEquals('varchar', $typeTest[1]->type_name);  //VARCHAR
-			$this->assertEquals('char', $typeTest[2]->type_name);  //CHAR
-			$this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-			$this->assertEquals('smallint', $typeTest[4]->type_name);  //SMALLINT
-			$this->assertEquals('int', $typeTest[5]->type_name);  //INTEGER
-			$this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-			$this->assertEquals('numeric', $typeTest[7]->type_name);  //NUMERIC
-			$this->assertEquals(null, $typeTest[8]->type_name);  //DATE
-			$this->assertEquals(null, $typeTest[9]->type_name);  //TIME
-			$this->assertEquals(null, $typeTest[10]->type_name);  //DATETIME
-			$this->assertEquals('bigint', $typeTest[11]->type_name); //BIGINT
-			$this->assertEquals('real', $typeTest[12]->type_name);  //REAL
-			$this->assertEquals('decimal', $typeTest[13]->type_name);  //DECIMAL
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetDataSeek()
-	{
-		$data = $this->db->table('job')
-						 ->get();
-
-		if ($this->db->DBDriver === 'SQLite3')
-		{
-			$this->expectException(DatabaseException::class);
-			$this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
-		}
-
-		$data->dataSeek(3);
-
-		$details = $data->getResult();
-		$this->assertEquals('Musician', $details[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-	public function testGetAnotherDataSeek()
-	{
-		$data = $this->db->table('job')
-						 ->get();
-
-		$data->dataSeek(0);
-
-		$details = $data->getResult();
-
-		$this->assertEquals('Developer', $details[0]->name);
-		$this->assertEquals('Politician', $details[1]->name);
-		$this->assertEquals('Accountant', $details[2]->name);
-		$this->assertEquals('Musician', $details[3]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFreeResult()
-	{
-		$data = $this->db->table('job')
-						 ->where('id', 4)
-						 ->get();
-
-		$details = $data->getResult();
-
-		$this->assertEquals('Musician', $details[0]->name);
-
-		$data->freeResult();
-
-		$this->assertFalse($data->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetRowWithColumnName()
-	{
-		$name = $this->db->table('user')
-						 ->get()
-						 ->getRow('name', 'array');
-
-		$this->assertEquals('Derek Jones', $name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetRowWithReturnType()
-	{
-		$user = $this->db->table('user')
-						 ->get()
-						 ->getRow(0, 'array');
-
-		$this->assertEquals('Derek Jones', $user['name']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetRowWithCustomReturnType()
-	{
-		$testClass = new class { };
-
-		$user = $this->db->table('user')
-						 ->get()
-						 ->getRow(0, get_class($testClass));
-
-		$this->assertEquals('Derek Jones', $user->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFirstRow()
-	{
-		$user = $this->db->table('user')
-						 ->get()
-						 ->getFirstRow();
-
-		$this->assertEquals('Derek Jones', $user->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLastRow()
-	{
-		$user = $this->db->table('user')
-						 ->get()
-						 ->getLastRow();
-
-		$this->assertEquals('Chris Martin', $user->name);
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testGet()
+    {
+        $jobs = $this->db->table('job')->get()->getResult();
+
+        $this->assertCount(4, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Accountant', $jobs[2]->name);
+        $this->assertSame('Musician', $jobs[3]->name);
+    }
+
+    public function testGetWitLimit()
+    {
+        $jobs = $this->db->table('job')->get(2, 2)->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+    }
+
+    public function testGetWhereArray()
+    {
+        $jobs = $this->db->table('job')
+            ->getWhere(['id' => 1])
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+    }
+
+    public function testGetWhereWithLimits()
+    {
+        $jobs = $this->db->table('job')
+            ->getWhere('id > 1', 1, 1)
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+        $this->assertSame('Accountant', $jobs[0]->name);
+    }
+
+    public function testGetFieldCount()
+    {
+        $jobs = $this->db->table('job')->get()->getFieldCount();
+
+        $this->assertSame(6, $jobs);
+    }
+
+    public function testGetFieldNames()
+    {
+        $jobs = $this->db->table('job')->get()->getFieldNames();
+
+        $this->assertTrue(in_array('name', $jobs, true));
+        $this->assertTrue(in_array('description', $jobs, true));
+    }
+
+    public function testGetFieldData()
+    {
+        $jobs = $this->db->table('job')->get()->getFieldData();
+
+        $this->assertSame('id', $jobs[0]->name);
+        $this->assertSame('name', $jobs[1]->name);
+
+        $typeTest = $this->db->table('type_test')->get()->getFieldData();
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame('integer', $typeTest[0]->type_name); // INTEGER AUTO INC
+            $this->assertSame('text', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('text', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('integer', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('integer', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('float', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('text', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('text', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('text', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('text', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('integer', $typeTest[12]->type_name);  // BIGINT
+            $this->assertSame('float', $typeTest[13]->type_name);  // REAL
+            $this->assertSame('text', $typeTest[14]->type_name);  // ENUM
+            $this->assertSame('text', $typeTest[15]->type_name);  // SET
+            $this->assertSame('text', $typeTest[16]->type_name);  // MEDIUMTEXT
+            $this->assertSame('float', $typeTest[17]->type_name);  // DOUBLE
+            $this->assertSame('float', $typeTest[18]->type_name);  // DECIMAL
+            $this->assertSame('text', $typeTest[19]->type_name);  // BLOB
+        }
+        if ($this->db->DBDriver === 'MySQLi') {
+            $this->assertSame('long', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('var_string', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('string', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('blob', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('short', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('long', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('newdecimal', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('datetime', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('longlong', $typeTest[12]->type_name); // BIGINT
+            $this->assertSame('double', $typeTest[13]->type_name);  // REAL
+            $this->assertSame('string', $typeTest[14]->type_name);  // ENUM
+            $this->assertSame('string', $typeTest[15]->type_name);  // SET
+            $this->assertSame('blob', $typeTest[16]->type_name);  // MEDIUMTEXT
+            $this->assertSame('double', $typeTest[17]->type_name);  // DOUBLE
+            $this->assertSame('newdecimal', $typeTest[18]->type_name);  // DECIMAL
+            $this->assertSame('blob', $typeTest[19]->type_name);  // BLOB
+        }
+        if ($this->db->DBDriver === 'Postgre') {
+            $this->assertSame('int4', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('bpchar', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('int2', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('int4', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float8', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('timestamp', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('int8', $typeTest[12]->type_name); // BIGINT
+        }
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $this->assertSame('int', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('char', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('smallint', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('int', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertNull($typeTest[8]->type_name);  // DATE
+            $this->assertNull($typeTest[9]->type_name);  // TIME
+            $this->assertNull($typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('bigint', $typeTest[11]->type_name); // BIGINT
+            $this->assertSame('real', $typeTest[12]->type_name);  // REAL
+            $this->assertSame('decimal', $typeTest[13]->type_name);  // DECIMAL
+        }
+    }
+
+    public function testGetDataSeek()
+    {
+        $data = $this->db->table('job')->get();
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->expectException(DatabaseException::class);
+            $this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
+        }
+
+        $data->dataSeek(3);
+
+        $details = $data->getResult();
+        $this->assertSame('Musician', $details[0]->name);
+    }
+
+    public function testGetAnotherDataSeek()
+    {
+        $data = $this->db->table('job')->get();
+
+        $data->dataSeek(0);
+
+        $details = $data->getResult();
+
+        $this->assertSame('Developer', $details[0]->name);
+        $this->assertSame('Politician', $details[1]->name);
+        $this->assertSame('Accountant', $details[2]->name);
+        $this->assertSame('Musician', $details[3]->name);
+    }
+
+    public function testFreeResult()
+    {
+        $data = $this->db->table('job')->where('id', 4)->get();
+
+        $details = $data->getResult();
+
+        $this->assertSame('Musician', $details[0]->name);
+
+        $data->freeResult();
+
+        $this->assertFalse($data->resultID);
+    }
+
+    public function testGetRowWithColumnName()
+    {
+        $name = $this->db->table('user')->get()->getRow('name', 'array');
+
+        $this->assertSame('Derek Jones', $name);
+    }
+
+    public function testGetRowWithReturnType()
+    {
+        $user = $this->db->table('user')->get()->getRow(0, 'array');
+
+        $this->assertSame('Derek Jones', $user['name']);
+    }
+
+    public function testGetRowWithCustomReturnType()
+    {
+        $testClass = new class () {};
+
+        $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
+
+        $this->assertSame('Derek Jones', $user->name);
+    }
+
+    public function testGetFirstRow()
+    {
+        $user = $this->db->table('user')->get()->getFirstRow();
+
+        $this->assertSame('Derek Jones', $user->name);
+    }
+
+    public function testGetLastRow()
+    {
+        $user = $this->db->table('user')->get()->getLastRow();
 
-	//--------------------------------------------------------------------
+        $this->assertSame('Chris Martin', $user->name);
+    }
 
-	public function testGetNextRow()
-	{
-		$user = $this->db->table('user')
-						 ->get()
-						 ->getNextRow();
+    public function testGetNextRow()
+    {
+        $user = $this->db->table('user')->get()->getNextRow();
 
-		$this->assertEquals('Ahmadinejad', $user->name);
-	}
+        $this->assertSame('Ahmadinejad', $user->name);
+    }
 
-	//--------------------------------------------------------------------
+    public function testGetPreviousRow()
+    {
+        $user = $this->db->table('user')->get();
 
-	public function testGetPreviousRow()
-	{
-		$user = $this->db->table('user')
-						 ->get();
+        $user->currentRow = 3;
 
-		$user->currentRow = 3;
-		$user             = $user->getPreviousRow();
+        $user = $user->getPreviousRow();
 
-		$this->assertEquals('Richard A Causey', $user->name);
-	}
+        $this->assertSame('Richard A Causey', $user->name);
+    }
 }
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 7aa9f3877320..9ef9da758fff 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -1,363 +1,338 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class GroupTest extends CIUnitTestCase
+final class GroupTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testGroupBy()
-	{
-		$result = $this->db->table('user')
-						->select('name')
-						->groupBy('name')
-						->get()
-						->getResult();
-
-		$this->assertCount(4, $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingBy()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->having('SUM(id) > 2')
-						->get()
-						->getResultArray();
-
-		$this->assertCount(2, $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingBy()
-	{
-		$result = $this->db->table('user')
-						->select('id')
-						->groupBy('id')
-						->having('id >', 3)
-						->orHaving('SUM(id) > 2')
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingIn()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->havingIn('name', ['Developer', 'Politician'])
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Developer', $result[0]->name);
-		$this->assertEquals('Politician', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testorHavingIn()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->havingIn('name', ['Developer'])
-						->orHavingIn('name', ['Politician'])
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Developer', $result[0]->name);
-		$this->assertEquals('Politician', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingNotIn()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->havingNotIn('name', ['Developer', 'Politician'])
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Musician', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingNotIn()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->orHavingNotIn('name', ['Developer', 'Politician'])
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Musician', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHavingLike()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->havingLike('name', 'elo')
-						->get()
-						->getResult();
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('Developer', $result[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotHavingLike()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->notHavingLike('name', 'ian')
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Developer', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingLike()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->havingLike('name', 'elo')
-						->orHavingLike('name', 'cc')
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Developer', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrNotHavingLike()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->orNotHavingLike('name', 'ian')
-						->get()
-						->getResult();
-
-		$this->assertCount(3, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Developer', $result[1]->name);
-		$this->assertEquals('Musician', $result[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAndHavingGroupStart()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->havingGroupStart()
-							->having('SUM(id) <= 4')
-							->havingLike('name', 'ant', 'before')
-						->havingGroupEnd()
-						->get()
-						->getResult();
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrHavingGroupStart()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->orHavingGroupStart()
-							->having('SUM(id) <= 4')
-							->havingLike('name', 'ant', 'before')
-						->havingGroupEnd()
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Musician', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotHavingGroupStart()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->notHavingGroupStart()
-							->having('SUM(id) <= 4')
-							->havingLike('name', 'ant', 'before')
-						->havingGroupEnd()
-						->get()
-						->getResult();
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('Musician', $result[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrNotHavingGroupStart()
-	{
-		$result = $this->db->table('job')
-						->select('name')
-						->groupBy('name')
-						->orderBy('name', 'asc')
-						->having('SUM(id) > 2')
-						->orNotHavingGroupStart()
-							->having('SUM(id) < 2')
-							->havingLike('name', 'o')
-						->havingGroupEnd()
-						->get()
-						->getResult();
-
-		$this->assertCount(3, $result);
-		$this->assertEquals('Accountant', $result[0]->name);
-		$this->assertEquals('Musician', $result[1]->name);
-		$this->assertEquals('Politician', $result[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAndGroups()
-	{
-		$result = $this->db->table('user')
-				->groupStart()
-				->where('id >=', 3)
-				->where('name !=', 'Chris Martin')
-				->groupEnd()
-				->where('country', 'US')
-				->get()
-				->getResult();
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('Richard A Causey', $result[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrGroups()
-	{
-		$result = $this->db->table('user')
-				->where('country', 'Iran')
-				->orGroupStart()
-				->where('id >=', 3)
-				->where('name !=', 'Richard A Causey')
-				->groupEnd()
-				->get()
-				->getResult();
-
-		$this->assertCount(2, $result);
-		$this->assertEquals('Ahmadinejad', $result[0]->name);
-		$this->assertEquals('Chris Martin', $result[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotGroups()
-	{
-		$result = $this->db->table('user')
-				->where('country', 'US')
-				->notGroupStart()
-				->where('id >=', 3)
-				->where('name !=', 'Chris Martin')
-				->groupEnd()
-				->get()
-				->getResult();
-
-		$this->assertCount(1, $result);
-		$this->assertEquals('Derek Jones', $result[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrNotGroups()
-	{
-		$result = $this->db->table('user')
-				->where('country', 'US')
-				->orNotGroupStart()
-				->where('id >=', 2)
-				->where('country', 'Iran')
-				->groupEnd()
-				->get()
-				->getResult();
-
-		$this->assertCount(3, $result);
-		$this->assertEquals('Derek Jones', $result[0]->name);
-		$this->assertEquals('Richard A Causey', $result[1]->name);
-		$this->assertEquals('Chris Martin', $result[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupByCount()
-	{
-		$result = $this->db->table('user')
-				->selectCount('id', 'count')
-				->groupBy('country')
-				->orderBy('country', 'desc')
-				->get()
-				->getResult();
-
-		$this->assertEquals(2, $result[0]->count);
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testGroupBy()
+    {
+        $result = $this->db->table('user')
+            ->select('name')
+            ->groupBy('name')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(4, $result);
+    }
+
+    public function testHavingBy()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) > 2')
+            ->get()
+            ->getResultArray();
+
+        $this->assertCount(2, $result);
+    }
+
+    public function testOrHavingBy()
+    {
+        $result = $this->db->table('user')
+            ->select('id')
+            ->groupBy('id')
+            ->having('id >', 3)
+            ->orHaving('SUM(id) > 2')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+    }
+
+    public function testHavingIn()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Developer', $result[0]->name);
+        $this->assertSame('Politician', $result[1]->name);
+    }
+
+    public function testorHavingIn()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingIn('name', ['Developer'])
+            ->orHavingIn('name', ['Politician'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Developer', $result[0]->name);
+        $this->assertSame('Politician', $result[1]->name);
+    }
+
+    public function testHavingNotIn()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingNotIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
+    }
+
+    public function testOrHavingNotIn()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orHavingNotIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
+    }
+
+    public function testHavingLike()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->havingLike('name', 'elo')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Developer', $result[0]->name);
+    }
+
+    public function testNotHavingLike()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->notHavingLike('name', 'ian')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
+    }
+
+    public function testOrHavingLike()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingLike('name', 'elo')
+            ->orHavingLike('name', 'cc')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
+    }
+
+    public function testOrNotHavingLike()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orNotHavingLike('name', 'ian')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
+        $this->assertSame('Musician', $result[2]->name);
+    }
+
+    public function testAndHavingGroupStart()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->havingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+    }
+
+    public function testOrHavingGroupStart()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orHavingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
+    }
+
+    public function testNotHavingGroupStart()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->notHavingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Musician', $result[0]->name);
+    }
+
+    public function testOrNotHavingGroupStart()
+    {
+        $result = $this->db->table('job')
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orNotHavingGroupStart()
+            ->having('SUM(id) < 2')
+            ->havingLike('name', 'o')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $result);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
+        $this->assertSame('Politician', $result[2]->name);
+    }
+
+    public function testAndGroups()
+    {
+        $result = $this->db->table('user')
+            ->groupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Chris Martin')
+            ->groupEnd()
+            ->where('country', 'US')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Richard A Causey', $result[0]->name);
+    }
+
+    public function testOrGroups()
+    {
+        $result = $this->db->table('user')
+            ->where('country', 'Iran')
+            ->orGroupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Richard A Causey')
+            ->groupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $result);
+        $this->assertSame('Ahmadinejad', $result[0]->name);
+        $this->assertSame('Chris Martin', $result[1]->name);
+    }
+
+    public function testNotGroups()
+    {
+        $result = $this->db->table('user')
+            ->where('country', 'US')
+            ->notGroupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Chris Martin')
+            ->groupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $result);
+        $this->assertSame('Derek Jones', $result[0]->name);
+    }
+
+    public function testOrNotGroups()
+    {
+        $result = $this->db->table('user')
+            ->where('country', 'US')
+            ->orNotGroupStart()
+            ->where('id >=', 2)
+            ->where('country', 'Iran')
+            ->groupEnd()
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $result);
+        $this->assertSame('Derek Jones', $result[0]->name);
+        $this->assertSame('Richard A Causey', $result[1]->name);
+        $this->assertSame('Chris Martin', $result[2]->name);
+    }
+
+    public function testGroupByCount()
+    {
+        $result = $this->db->table('user')
+            ->selectCount('id', 'count')
+            ->groupBy('country')
+            ->orderBy('country', 'desc')
+            ->get()
+            ->getResult();
+
+        $this->assertSame(2, (int) $result[0]->count);
+    }
 }
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index fd28db08345c..d53732464f56 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -1,68 +1,73 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class IncrementTest extends CIUnitTestCase
+final class IncrementTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testIncrement()
-	{
-		$this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
-
-		$this->db->table('job')
-				->where('name', 'incremental')
-				->increment('description');
+    use DatabaseTestTrait;
 
-		$this->seeInDatabase('job', ['name' => 'incremental', 'description' => '7']);
-	}
+    protected $refresh = true;
 
-	//--------------------------------------------------------------------
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	public function testIncrementWithValue()
-	{
-		$this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
+    public function testIncrement()
+    {
+        $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
-		$this->db->table('job')
-				 ->where('name', 'incremental')
-				 ->increment('description', 2);
+        $this->db->table('job')
+            ->where('name', 'incremental')
+            ->increment('description');
 
-		$this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
-	}
+        $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '7']);
+    }
 
-	//--------------------------------------------------------------------
+    public function testIncrementWithValue()
+    {
+        $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
-	public function testDecrement()
-	{
-		$this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
+        $this->db->table('job')
+            ->where('name', 'incremental')
+            ->increment('description', 2);
 
-		$this->db->table('job')
-				 ->where('name', 'incremental')
-				 ->decrement('description');
+        $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
+    }
 
-		$this->seeInDatabase('job', ['name' => 'incremental', 'description' => '5']);
-	}
+    public function testDecrement()
+    {
+        $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
-	//--------------------------------------------------------------------
+        $this->db->table('job')
+            ->where('name', 'incremental')
+            ->decrement('description');
 
-	public function testDecrementWithValue()
-	{
-		$this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
+        $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '5']);
+    }
 
-		$this->db->table('job')
-				 ->where('name', 'incremental')
-				 ->decrement('description', 2);
+    public function testDecrementWithValue()
+    {
+        $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
-		$this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
-	}
+        $this->db->table('job')
+            ->where('name', 'incremental')
+            ->decrement('description', 2);
 
-	//--------------------------------------------------------------------
+        $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
+    }
 }
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index ae682a2f4a9d..8ca40e2309ef 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -1,115 +1,119 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class InsertTest extends CIUnitTestCase
+final class InsertTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testInsert()
-	{
-		$jobData = [
-			'name'        => 'Grocery Sales',
-			'description' => 'Discount!',
-		];
-
-		$this->db->table('job')->insert($jobData);
-
-		$this->seeInDatabase('job', ['name' => 'Grocery Sales']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testInsertBatch()
-	{
-		$jobData = [
-			[
-				'name'        => 'Comedian',
-				'description' => 'Theres something in your teeth',
-			],
-			[
-				'name'        => 'Cab Driver',
-				'description' => 'Iam yellow',
-			],
-		];
-
-		$this->db->table('job')->insertBatch($jobData);
-
-		$this->seeInDatabase('job', ['name' => 'Comedian']);
-		$this->seeInDatabase('job', ['name' => 'Cab Driver']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testReplaceWithNoMatchingData()
-	{
-		$data = [
-			'id'          => 5,
-			'name'        => 'Cab Driver',
-			'description' => 'Iam yellow',
-		];
-
-		$this->db->table('job')->replace($data);
-
-		$row = $this->db->table('job')
-						->getwhere(['id' => 5])
-						->getRow();
-
-		$this->assertEquals('Cab Driver', $row->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testReplaceWithMatchingData()
-	{
-		$data = [
-			'id'          => 1,
-			'name'        => 'Cab Driver',
-			'description' => 'Iam yellow',
-		];
-
-		$this->db->table('job')->replace($data);
-
-		$row = $this->db->table('job')
-						->getwhere(['id' => 1])
-						->getRow();
-
-		$this->assertEquals('Cab Driver', $row->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testBug302()
-	{
-		$code = "my code \'CodeIgniter\Autoloader\'";
-
-		$this->db->table('misc')->insert([
-			'key'   => 'test',
-			'value' => $code,
-		]);
-
-		$this->seeInDatabase('misc', ['key' => 'test']);
-		$this->seeInDatabase('misc', ['value' => $code]);
-	}
-
-	public function testInsertPasswordHash()
-	{
-		$hash = '$2y$10$tNevVVMwW52V2neE3H79a.wp8ZoItrwosk54.Siz5Fbw55X9YIBsW';
-
-		$this->db->table('misc')->insert([
-			'key'   => 'password',
-			'value' => $hash,
-		]);
-
-		$this->seeInDatabase('misc', ['value' => $hash]);
-	}
-
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testInsert()
+    {
+        $jobData = [
+            'name'        => 'Grocery Sales',
+            'description' => 'Discount!',
+        ];
+
+        $this->db->table('job')->insert($jobData);
+
+        $this->seeInDatabase('job', ['name' => 'Grocery Sales']);
+    }
+
+    public function testInsertBatch()
+    {
+        $jobData = [
+            [
+                'name'        => 'Comedian',
+                'description' => 'Theres something in your teeth',
+            ],
+            [
+                'name'        => 'Cab Driver',
+                'description' => 'Iam yellow',
+            ],
+        ];
+
+        $this->db->table('job')->insertBatch($jobData);
+
+        $this->seeInDatabase('job', ['name' => 'Comedian']);
+        $this->seeInDatabase('job', ['name' => 'Cab Driver']);
+    }
+
+    public function testReplaceWithNoMatchingData()
+    {
+        $data = [
+            'id'          => 5,
+            'name'        => 'Cab Driver',
+            'description' => 'Iam yellow',
+        ];
+
+        $this->db->table('job')->replace($data);
+
+        $row = $this->db->table('job')
+            ->getwhere(['id' => 5])
+            ->getRow();
+
+        $this->assertSame('Cab Driver', $row->name);
+    }
+
+    public function testReplaceWithMatchingData()
+    {
+        $data = [
+            'id'          => 1,
+            'name'        => 'Cab Driver',
+            'description' => 'Iam yellow',
+        ];
+
+        $this->db->table('job')->replace($data);
+
+        $row = $this->db->table('job')
+            ->getwhere(['id' => 1])
+            ->getRow();
+
+        $this->assertSame('Cab Driver', $row->name);
+    }
+
+    public function testBug302()
+    {
+        $code = "my code \\'CodeIgniter\\Autoloader\\'";
+
+        $this->db->table('misc')->insert([
+            'key'   => 'test',
+            'value' => $code,
+        ]);
+
+        $this->seeInDatabase('misc', ['key' => 'test']);
+        $this->seeInDatabase('misc', ['value' => $code]);
+    }
+
+    public function testInsertPasswordHash()
+    {
+        $hash = '$2y$10$tNevVVMwW52V2neE3H79a.wp8ZoItrwosk54.Siz5Fbw55X9YIBsW';
+
+        $this->db->table('misc')->insert([
+            'key'   => 'password',
+            'value' => $hash,
+        ]);
+
+        $this->seeInDatabase('misc', ['value' => $hash]);
+    }
 }
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index 02bb660d64b8..7e35effcc852 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -1,33 +1,43 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class JoinTest extends CIUnitTestCase
+final class JoinTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    use DatabaseTestTrait;
 
-	public function testSimpleJoin()
-	{
-		$row = $this->db->table('job')
-						->select('job.id as job_id, job.name as job_name, user.id as user_id, user.name as user_name')
-						->join('user', 'user.id = job.id')
-						->get()
-						->getRow();
+    protected $refresh = true;
 
-		$this->assertEquals(1, $row->job_id);
-		$this->assertEquals(1, $row->user_id);
-		$this->assertEquals('Derek Jones', $row->user_name);
-		$this->assertEquals('Developer', $row->job_name);
-	}
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	//--------------------------------------------------------------------
+    public function testSimpleJoin()
+    {
+        $row = $this->db->table('job')
+            ->select('job.id as job_id, job.name as job_name, user.id as user_id, user.name as user_name')
+            ->join('user', 'user.id = job.id')
+            ->get()
+            ->getRow();
 
+        $this->assertSame(1, (int) $row->job_id);
+        $this->assertSame(1, (int) $row->user_id);
+        $this->assertSame('Derek Jones', $row->user_name);
+        $this->assertSame('Developer', $row->job_name);
+    }
 }
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index f7edd76a64f5..999539e488fc 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -1,130 +1,124 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class LikeTest extends CIUnitTestCase
+final class LikeTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testLikeDefault()
-	{
-		$job = $this->db->table('job')->like('name', 'veloper')->get();
-		$job = $job->getRow();
-
-		$this->assertEquals(1, $job->id);
-		$this->assertEquals('Developer', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLikeBefore()
-	{
-		$job = $this->db->table('job')->like('name', 'veloper', 'before')->get();
-		$job = $job->getRow();
-
-		$this->assertEquals(1, $job->id);
-		$this->assertEquals('Developer', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLikeAfter()
-	{
-		$job = $this->db->table('job')->like('name', 'Develop')->get();
-		$job = $job->getRow();
-
-		$this->assertEquals(1, $job->id);
-		$this->assertEquals('Developer', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLikeBoth()
-	{
-		$job = $this->db->table('job')->like('name', 'veloper', 'both')->get();
-		$job = $job->getRow();
-
-		$this->assertEquals(1, $job->id);
-		$this->assertEquals('Developer', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLikeCaseInsensitive()
-	{
-		$job = $this->db->table('job')->like('name', 'VELOPER', 'both', null, true)->get();
-		$job = $job->getRow();
-
-		$this->assertEquals(1, $job->id);
-		$this->assertEquals('Developer', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrLike()
-	{
-		$jobs = $this->db->table('job')->like('name', 'ian')
-						->orLike('name', 'veloper')
-						->get()
-						->getResult();
-
-		$this->assertCount(3, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Politician', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotLike()
-	{
-		$jobs = $this->db->table('job')
-						 ->notLike('name', 'veloper')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(3, $jobs);
-		$this->assertEquals('Politician', $jobs[0]->name);
-		$this->assertEquals('Accountant', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrNotLike()
-	{
-		$jobs = $this->db->table('job')
-						 ->like('name', 'ian')
-						 ->orNotLike('name', 'veloper')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(3, $jobs);
-		$this->assertEquals('Politician', $jobs[0]->name);
-		$this->assertEquals('Accountant', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLikeSpacesOrTabs()
-	{
-		$builder = $this->db->table('misc');
-		$spaces  = $builder->like('value', '   ')->get()->getResult();
-		$tabs    = $builder->like('value', "\t")->get()->getResult();
-
-		$this->assertCount(1, $spaces);
-		$this->assertCount(1, $tabs);
-	}
-
-	//--------------------------------------------------------------------
-
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testLikeDefault()
+    {
+        $job = $this->db->table('job')->like('name', 'veloper')->get();
+        $job = $job->getRow();
+
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
+    }
+
+    public function testLikeBefore()
+    {
+        $job = $this->db->table('job')->like('name', 'veloper', 'before')->get();
+        $job = $job->getRow();
+
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
+    }
+
+    public function testLikeAfter()
+    {
+        $job = $this->db->table('job')->like('name', 'Develop')->get();
+        $job = $job->getRow();
+
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
+    }
+
+    public function testLikeBoth()
+    {
+        $job = $this->db->table('job')->like('name', 'veloper', 'both')->get();
+        $job = $job->getRow();
+
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
+    }
+
+    public function testLikeCaseInsensitive()
+    {
+        $job = $this->db->table('job')->like('name', 'VELOPER', 'both', null, true)->get();
+        $job = $job->getRow();
+
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
+    }
+
+    public function testOrLike()
+    {
+        $jobs = $this->db->table('job')->like('name', 'ian')
+            ->orLike('name', 'veloper')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+    }
+
+    public function testNotLike()
+    {
+        $jobs = $this->db->table('job')
+            ->notLike('name', 'veloper')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $jobs);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+    }
+
+    public function testOrNotLike()
+    {
+        $jobs = $this->db->table('job')
+            ->like('name', 'ian')
+            ->orNotLike('name', 'veloper')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $jobs);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+    }
+
+    public function testLikeSpacesOrTabs()
+    {
+        $builder = $this->db->table('misc');
+        $spaces  = $builder->like('value', '   ')->get()->getResult();
+        $tabs    = $builder->like('value', "\t")->get()->getResult();
+
+        $this->assertCount(1, $spaces);
+        $this->assertCount(1, $tabs);
+    }
 }
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 4aeeb977a4ca..ee3f8c475b79 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -1,44 +1,52 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class LimitTest extends CIUnitTestCase
+final class LimitTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testLimit()
-	{
-		$jobs = $this->db->table('job')
-						->limit(2)
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Politician', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLimitAndOffset()
-	{
-		$jobs = $this->db->table('job')
-						->limit(2, 2)
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Accountant', $jobs[0]->name);
-		$this->assertEquals('Musician', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
+    use DatabaseTestTrait;
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testLimit()
+    {
+        $jobs = $this->db->table('job')
+            ->limit(2)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+    }
+
+    public function testLimitAndOffset()
+    {
+        $jobs = $this->db->table('job')
+            ->limit(2, 2)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+    }
 }
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index c382a525425b..e59b28f7b724 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -8,92 +17,88 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class MetadataTest extends CIUnitTestCase
+final class MetadataTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-	protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	/**
-	 * Array of expected tables.
-	 *
-	 * @var array
-	 */
-	protected $expectedTables;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		// Prepare the array of expected tables once
-		$prefix               = $this->db->getPrefix();
-		$this->expectedTables = [
-			$prefix . 'migrations',
-			$prefix . 'user',
-			$prefix . 'job',
-			$prefix . 'misc',
-			$prefix . 'type_test',
-			$prefix . 'empty',
-			$prefix . 'secondary',
-			$prefix . 'stringifypkey',
-			$prefix . 'without_auto_increment',
-			$prefix . 'ip_table',
-		];
-	}
-
-	public function testListTables()
-	{
-		$result = $this->db->listTables(true);
-
-		$this->assertEquals($this->expectedTables, array_values($result));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testListTablesConstrainPrefix()
-	{
-		$result = $this->db->listTables(true);
-
-		$this->assertEquals($this->expectedTables, array_values($result));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstrainPrefixIgnoresOtherTables()
-	{
-		$this->forge = Database::forge($this->DBGroup);
-
-		// Stash the prefix and change it
-		$DBPrefix = $this->db->getPrefix();
-		$this->db->setPrefix('tmp_');
-
-		// Create a table with the new prefix
-		$fields = [
-			'name'       => [
-				'type'       => 'varchar',
-				'constraint' => 31,
-			],
-			'created_at' => [
-				'type' => 'datetime',
-				'null' => true,
-			],
-		];
-		$this->forge->addField($fields);
-		$this->forge->createTable('widgets');
-
-		// Restore the prefix and get the tables with the original prefix
-		$this->db->setPrefix($DBPrefix);
-		$result = $this->db->listTables(true);
-
-		$this->assertEquals($this->expectedTables, array_values($result));
-
-		// Clean up temporary table
-		$this->db->setPrefix('tmp_');
-		$this->forge->dropTable('widgets');
-		$this->db->setPrefix($DBPrefix);
-	}
-
-	//--------------------------------------------------------------------
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    /**
+     * Array of expected tables.
+     *
+     * @var array
+     */
+    protected $expectedTables;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Prepare the array of expected tables once
+        $prefix               = $this->db->getPrefix();
+        $this->expectedTables = [
+            $prefix . 'migrations',
+            $prefix . 'user',
+            $prefix . 'job',
+            $prefix . 'misc',
+            $prefix . 'type_test',
+            $prefix . 'empty',
+            $prefix . 'secondary',
+            $prefix . 'stringifypkey',
+            $prefix . 'without_auto_increment',
+            $prefix . 'ip_table',
+        ];
+    }
+
+    public function testListTables()
+    {
+        $result = $this->db->listTables(true);
+
+        $this->assertSame($this->expectedTables, array_values($result));
+    }
+
+    public function testListTablesConstrainPrefix()
+    {
+        $result = $this->db->listTables(true);
+
+        $this->assertSame($this->expectedTables, array_values($result));
+    }
+
+    public function testConstrainPrefixIgnoresOtherTables()
+    {
+        $this->forge = Database::forge($this->DBGroup);
+
+        // Stash the prefix and change it
+        $DBPrefix = $this->db->getPrefix();
+        $this->db->setPrefix('tmp_');
+
+        // Create a table with the new prefix
+        $fields = [
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 31,
+            ],
+            'created_at' => [
+                'type' => 'datetime',
+                'null' => true,
+            ],
+        ];
+        $this->forge->addField($fields);
+        $this->forge->createTable('widgets');
+
+        // Restore the prefix and get the tables with the original prefix
+        $this->db->setPrefix($DBPrefix);
+        $result = $this->db->listTables(true);
+
+        $this->assertSame($this->expectedTables, array_values($result));
+
+        // Clean up temporary table
+        $this->db->setPrefix('tmp_');
+        $this->forge->dropTable('widgets');
+        $this->db->setPrefix($DBPrefix);
+    }
 }
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index fac957cd94d1..9d87089b5e79 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,85 +16,78 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class OrderTest extends CIUnitTestCase
+final class OrderTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testOrderAscending()
-	{
-		$jobs = $this->db->table('job')
-						->orderBy('name', 'asc')
-						->get()
-						->getResult();
-
-		$this->assertCount(4, $jobs);
-		$this->assertEquals('Accountant', $jobs[0]->name);
-		$this->assertEquals('Developer', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-		$this->assertEquals('Politician', $jobs[3]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrderDescending()
-	{
-		$jobs = $this->db->table('job')
-						 ->orderBy('name', 'desc')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(4, $jobs);
-		$this->assertEquals('Accountant', $jobs[3]->name);
-		$this->assertEquals('Developer', $jobs[2]->name);
-		$this->assertEquals('Musician', $jobs[1]->name);
-		$this->assertEquals('Politician', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMultipleOrderValues()
-	{
-		$users = $this->db->table('user')
-						->orderBy('country', 'asc')
-						->orderBy('name', 'desc')
-						->get()
-						->getResult();
-
-		$this->assertCount(4, $users);
-		$this->assertEquals('Ahmadinejad', $users[0]->name);
-		$this->assertEquals('Chris Martin', $users[1]->name);
-		$this->assertEquals('Richard A Causey', $users[2]->name);
-		$this->assertEquals('Derek Jones', $users[3]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrderRandom()
-	{
-		$sql = $this->db->table('job')
-			->orderBy('name', 'random')
-			->getCompiledSelect();
-
-		$key   = 'RANDOM()';
-		$table = $this->db->protectIdentifiers('job', true);
-
-		if ($this->db->DBDriver === 'MySQLi')
-		{
-			$key = 'RAND()';
-		}
-		elseif ($this->db->DBDriver === 'SQLSRV')
-		{
-			$key   = 'NEWID()';
-			$table = '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '".' . $table;
-		}
-
-		$expected = 'SELECT * FROM ' . $table . ' ORDER BY ' . $key;
-
-		$this->assertEquals($expected, str_replace("\n", ' ', $sql));
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testOrderAscending()
+    {
+        $jobs = $this->db->table('job')
+            ->orderBy('name', 'asc')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(4, $jobs);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Developer', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+        $this->assertSame('Politician', $jobs[3]->name);
+    }
+
+    public function testOrderDescending()
+    {
+        $jobs = $this->db->table('job')
+            ->orderBy('name', 'desc')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(4, $jobs);
+        $this->assertSame('Accountant', $jobs[3]->name);
+        $this->assertSame('Developer', $jobs[2]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
+    }
+
+    public function testMultipleOrderValues()
+    {
+        $users = $this->db->table('user')
+            ->orderBy('country', 'asc')
+            ->orderBy('name', 'desc')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(4, $users);
+        $this->assertSame('Ahmadinejad', $users[0]->name);
+        $this->assertSame('Chris Martin', $users[1]->name);
+        $this->assertSame('Richard A Causey', $users[2]->name);
+        $this->assertSame('Derek Jones', $users[3]->name);
+    }
+
+    public function testOrderRandom()
+    {
+        $sql = $this->db->table('job')
+            ->orderBy('name', 'random')
+            ->getCompiledSelect();
+
+        $key   = 'RANDOM()';
+        $table = $this->db->protectIdentifiers('job', true);
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $key = 'RAND()';
+        } elseif ($this->db->DBDriver === 'SQLSRV') {
+            $key   = 'NEWID()';
+            $table = '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '".' . $table;
+        }
+
+        $expected = 'SELECT * FROM ' . $table . ' ORDER BY ' . $key;
+
+        $this->assertSame($expected, str_replace("\n", ' ', $sql));
+    }
 }
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index ab38f3e32849..b71c0498f80e 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\BasePreparedQuery;
@@ -9,111 +18,104 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class PreparedQueryTest extends CIUnitTestCase
+final class PreparedQueryTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-	protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	//--------------------------------------------------------------------
+    use DatabaseTestTrait;
 
-	public function testPrepareReturnsPreparedQuery()
-	{
-		$query = $this->db->prepare(function ($db) {
-			return $db->table('user')->insert([
-				'name'  => 'a',
-				'email' => 'b@example.com',
-			]);
-		});
+    protected $refresh = true;
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-		$this->assertInstanceOf(BasePreparedQuery::class, $query);
+    public function testPrepareReturnsPreparedQuery()
+    {
+        $query = $this->db->prepare(static function ($db) {
+            return $db->table('user')->insert([
+                'name'  => 'a',
+                'email' => 'b@example.com',
+            ]);
+        });
 
-		$ec  = $this->db->escapeChar;
-		$pre = $this->db->DBPrefix;
+        $this->assertInstanceOf(BasePreparedQuery::class, $query);
 
-		$placeholders = '?, ?';
+        $ec  = $this->db->escapeChar;
+        $pre = $this->db->DBPrefix;
 
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$placeholders = '$1, $2';
-		}
+        $placeholders = '?, ?';
 
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$database = $this->db->getDatabase();
-			$expected = "INSERT INTO {$ec}{$database}{$ec}.{$ec}dbo{$ec}.{$ec}{$pre}user{$ec} ({$ec}name{$ec},{$ec}email{$ec}) VALUES ({$placeholders})";
-		}
-		else
-		{
-			$expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
-		}
-		$this->assertEquals($expected, $query->getQueryString());
+        if ($this->db->DBDriver === 'Postgre') {
+            $placeholders = '$1, $2';
+        }
 
-		$query->close();
-	}
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $database = $this->db->getDatabase();
+            $expected = "INSERT INTO {$ec}{$database}{$ec}.{$ec}dbo{$ec}.{$ec}{$pre}user{$ec} ({$ec}name{$ec},{$ec}email{$ec}) VALUES ({$placeholders})";
+        } else {
+            $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
+        }
+        $this->assertSame($expected, $query->getQueryString());
 
-	public function testPrepareReturnsManualPreparedQuery()
-	{
-		$query = $this->db->prepare(function ($db) {
-			$sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
+        $query->close();
+    }
 
-			return (new Query($db))->setQuery($sql);
-		});
+    public function testPrepareReturnsManualPreparedQuery()
+    {
+        $query = $this->db->prepare(static function ($db) {
+            $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
 
-		$this->assertInstanceOf(BasePreparedQuery::class, $query);
+            return (new Query($db))->setQuery($sql);
+        });
 
-		$pre = $this->db->DBPrefix;
+        $this->assertInstanceOf(BasePreparedQuery::class, $query);
 
-		$placeholders = '?, ?, ?';
+        $pre = $this->db->DBPrefix;
 
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$placeholders = '$1, $2, $3';
-		}
+        $placeholders = '?, ?, ?';
 
-		$expected = "INSERT INTO {$pre}user (name, email, country) VALUES ({$placeholders})";
-		$this->assertEquals($expected, $query->getQueryString());
+        if ($this->db->DBDriver === 'Postgre') {
+            $placeholders = '$1, $2, $3';
+        }
 
-		$query->close();
-	}
+        $expected = "INSERT INTO {$pre}user (name, email, country) VALUES ({$placeholders})";
+        $this->assertSame($expected, $query->getQueryString());
 
-	//--------------------------------------------------------------------
+        $query->close();
+    }
 
-	public function testExecuteRunsQueryAndReturnsResultObject()
-	{
-		$query = $this->db->prepare(function ($db) {
-			return $db->table('user')->insert([
-				'name'    => 'a',
-				'email'   => 'b@example.com',
-				'country' => 'x',
-			]);
-		});
+    public function testExecuteRunsQueryAndReturnsResultObject()
+    {
+        $query = $this->db->prepare(static function ($db) {
+            return $db->table('user')->insert([
+                'name'    => 'a',
+                'email'   => 'b@example.com',
+                'country' => 'x',
+            ]);
+        });
 
-		$query->execute('foo', 'foo@example.com', 'US');
-		$query->execute('bar', 'bar@example.com', 'GB');
+        $query->execute('foo', 'foo@example.com', 'US');
+        $query->execute('bar', 'bar@example.com', 'GB');
 
-		$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
-		$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
+        $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
+        $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
 
-		$query->close();
-	}
+        $query->close();
+    }
 
-	public function testExecuteRunsQueryAndReturnsManualResultObject()
-	{
-		$query = $this->db->prepare(function ($db) {
-			$sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
+    public function testExecuteRunsQueryAndReturnsManualResultObject()
+    {
+        $query = $this->db->prepare(static function ($db) {
+            $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
 
-			return (new Query($db))->setQuery($sql);
-		});
+            return (new Query($db))->setQuery($sql);
+        });
 
-		$query->execute('foo', 'foo@example.com', '');
-		$query->execute('bar', 'bar@example.com', '');
+        $query->execute('foo', 'foo@example.com', '');
+        $query->execute('bar', 'bar@example.com', '');
 
-		$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
-		$this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
+        $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
+        $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
 
-		$query->close();
-	}
+        $query->close();
+    }
 }
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index 776ab4229481..b313f41fb7cb 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,32 +17,31 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class PretendTest extends CIUnitTestCase
+final class PretendTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	public function tearDown(): void
-	{
-		// We share `$this->db` in testing, so we need to restore the state.
-		$this->db->pretend(false);
-	}
-
-	public function testPretendReturnsQueryObject()
-	{
-		$result = $this->db->pretend(false)
-						   ->table('user')
-						   ->get();
+    use DatabaseTestTrait;
 
-		$this->assertFalse($result instanceof Query);
+    protected function tearDown(): void
+    {
+        // We share `$this->db` in testing, so we need to restore the state.
+        $this->db->pretend(false);
+    }
 
-		$result = $this->db->pretend(true)
-					->table('user')
-					->get();
+    public function testPretendReturnsQueryObject()
+    {
+        $result = $this->db->pretend(false)
+            ->table('user')
+            ->get();
 
-		$this->assertInstanceOf(Query::class, $result);
-	}
+        $this->assertFalse($result instanceof Query);
 
-	//--------------------------------------------------------------------
+        $result = $this->db->pretend(true)
+            ->table('user')
+            ->get();
 
+        $this->assertInstanceOf(Query::class, $result);
+    }
 }
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 05842cbdf53c..029c764269a8 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live\SQLite;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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;
@@ -9,258 +20,260 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class AlterTableTest extends CIUnitTestCase
+final class AlterTableTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	/**
-	 * In setUp() db connection is changed. So migration doesn't work
-	 *
-	 * @var boolean
-	 */
-	protected $migrate = false;
-
-	/**
-	 * @var Table
-	 */
-	protected $table;
-
-	/**
-	 * @var Connection
-	 */
-	protected $db;
-
-	/**
-	 * @var Forge
-	 */
-	protected $forge;
-
-	public function setUp(): void
-	{
-		parent::setUp();
-
-		$config = [
-			'DBDriver' => 'SQLite3',
-			'database' => 'database.db',
-		];
-
-		$this->db    = db_connect($config);
-		$this->forge = Database::forge($config);
-		$this->table = new Table($this->db, $this->forge);
-
-		$this->dropTables();
-	}
-
-	private function dropTables()
-	{
-		$this->forge->dropTable('aliens', true);
-		$this->forge->dropTable('aliens_fk', true);
-		$this->forge->dropTable('janky', true);
-		$this->forge->dropTable('janky_fk', true);
-		$this->forge->dropTable('foo', true);
-		$this->forge->dropTable('foo_fk', true);
-	}
-
-	public function testFromTableThrowsOnNoTable()
-	{
-		$this->expectException('CodeIgniter\Database\Exceptions\DataException');
-		$this->expectExceptionMessage('Table `foo` was not found in the current database.');
-
-		$this->table->fromTable('foo');
-	}
-
-	public function testFromTableFillsDetails()
-	{
-		$this->createTable();
-
-		$this->assertTrue($this->db->tableExists('foo'));
-
-		$this->table->fromTable('foo');
-
-		$fields = $this->getPrivateProperty($this->table, 'fields');
-
-		$this->assertCount(4, $fields);
-		$this->assertTrue(array_key_exists('id', $fields));
-		$this->assertNull($fields['id']['default']);
-		$this->assertTrue($fields['id']['null']);
-		$this->assertEquals('integer', strtolower($fields['id']['type']));
-
-		$this->assertTrue(array_key_exists('name', $fields));
-		$this->assertNull($fields['name']['default']);
-		$this->assertFalse($fields['name']['null']);
-		$this->assertEquals('varchar', strtolower($fields['name']['type']));
-
-		$this->assertTrue(array_key_exists('email', $fields));
-		$this->assertNull($fields['email']['default']);
-		$this->assertTrue($fields['email']['null']);
-		$this->assertEquals('varchar', strtolower($fields['email']['type']));
-
-		$keys = $this->getPrivateProperty($this->table, 'keys');
-
-		$this->assertCount(3, $keys);
-		$this->assertTrue(array_key_exists('foo_name', $keys));
-		$this->assertEquals(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']);
-		$this->assertTrue(array_key_exists('id', $keys));
-		$this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
-		$this->assertTrue(array_key_exists('id', $keys));
-		$this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
-	}
-
-	public function testDropColumnSuccess()
-	{
-		$this->createTable();
-
-		$result = $this->table
-			->fromTable('foo')
-			->dropColumn('name')
-			->run();
-
-		$this->assertTrue($result);
-
-		$columns = $this->db->getFieldNames('foo');
-
-		$this->assertFalse(in_array('name', $columns, true));
-		$this->assertTrue(in_array('id', $columns, true));
-		$this->assertTrue(in_array('email', $columns, true));
-	}
-
-	public function testDropColumnMaintainsKeys()
-	{
-		$this->createTable();
-
-		$oldKeys = $this->db->getIndexData('foo');
-
-		$this->assertTrue(array_key_exists('foo_name', $oldKeys));
-		$this->assertTrue(array_key_exists('foo_email', $oldKeys));
-
-		$result = $this->table
-			->fromTable('foo')
-			->dropColumn('name')
-			->run();
-
-		$newKeys = $this->db->getIndexData('foo');
-
-		$this->assertFalse(array_key_exists('foo_name', $newKeys));
-		$this->assertTrue(array_key_exists('foo_email', $newKeys));
-
-		$this->assertTrue($result);
-	}
-
-	public function testModifyColumnSuccess()
-	{
-		$this->createTable('janky');
-
-		$result = $this->table
-			->fromTable('janky')
-			->modifyColumn([
-				[
-					'name'       => 'name',
-					'new_name'   => 'serial',
-					'type'       => 'int',
-					'constraint' => 11,
-					'null'       => true,
-				],
-			])
-			->run();
-
-		$this->assertTrue($result);
-
-		$this->assertFalse($this->db->fieldExists('name', 'janky'));
-		$this->assertTrue($this->db->fieldExists('serial', 'janky'));
-	}
-
-	public function testDropForeignKeySuccess()
-	{
-		$this->createTable('aliens');
-
-		$keys = $this->db->getForeignKeyData('aliens');
-		$this->assertEquals('key_id to aliens_fk.id', $keys[0]->constraint_name);
-
-		$result = $this->table
-			->fromTable('aliens')
-			->dropForeignKey('key_id')
-			->run();
-
-		$this->assertTrue($result);
-
-		$keys = $this->db->getForeignKeyData('aliens');
-		$this->assertTrue(empty($keys));
-	}
-
-	public function testProcessCopiesOldData()
-	{
-		$this->createTable();
-
-		$this->db->table('foo_fk')->insert([
-			'id'   => 1,
-			'name' => 'bar',
-		]);
-
-		$this->db->table('foo')->insert([
-			'id'     => 1,
-			'name'   => 'George Clinton',
-			'email'  => 'funkalicious@example.com',
-			'key_id' => 1,
-		]);
-
-		$this->seeInDatabase('foo', ['name' => 'George Clinton']);
-
-		$result = $this->table
-			->fromTable('foo')
-			->dropColumn('name')
-			->run();
-
-		$this->dontSeeInDatabase('foo', ['name' => 'George Clinton']);
-		$this->seeInDatabase('foo', ['email' => 'funkalicious@example.com']);
-	}
-
-	protected function createTable(string $tableName = 'foo')
-	{
-		// Create support table for foreign keys
-		$this->forge->addField([
-			'id'   => [
-				'type'           => 'integer',
-				'constraint'     => 11,
-				'unsigned'       => true,
-				'auto_increment' => true,
-			],
-			'name' => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => false,
-			],
-		]);
-		$this->forge->createTable($tableName . '_fk');
-
-		// Create main table
-		$this->forge->addField([
-			'id'     => [
-				'type'           => 'integer',
-				'constraint'     => 11,
-				'unsigned'       => true,
-				'auto_increment' => true,
-			],
-			'name'   => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => false,
-			],
-			'email'  => [
-				'type'       => 'varchar',
-				'constraint' => 255,
-				'null'       => true,
-			],
-			'key_id' => [
-				'type'       => 'integer',
-				'constraint' => 11,
-				'unsigned'   => true,
-			],
-		]);
-		$this->forge->addPrimaryKey('id');
-		$this->forge->addKey('name');
-		$this->forge->addUniqueKey('email');
-		$this->forge->addForeignKey('key_id', $tableName . '_fk', 'id');
-		$this->forge->createTable($tableName);
-	}
+    use DatabaseTestTrait;
+
+    /**
+     * In setUp() db connection is changed. So migration doesn't work
+     *
+     * @var bool
+     */
+    protected $migrate = false;
+
+    /**
+     * @var Table
+     */
+    protected $table;
+
+    /**
+     * @var Connection
+     */
+    protected $db;
+
+    /**
+     * @var Forge
+     */
+    protected $forge;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $config = [
+            'DBDriver' => 'SQLite3',
+            'database' => 'database.db',
+        ];
+
+        $this->db    = db_connect($config);
+        $this->forge = Database::forge($config);
+        $this->table = new Table($this->db, $this->forge);
+
+        $this->dropTables();
+    }
+
+    private function dropTables()
+    {
+        $this->forge->dropTable('aliens', true);
+        $this->forge->dropTable('aliens_fk', true);
+        $this->forge->dropTable('janky', true);
+        $this->forge->dropTable('janky_fk', true);
+        $this->forge->dropTable('foo', true);
+        $this->forge->dropTable('foo_fk', true);
+    }
+
+    public function testFromTableThrowsOnNoTable()
+    {
+        $this->expectException('CodeIgniter\Database\Exceptions\DataException');
+        $this->expectExceptionMessage('Table `foo` was not found in the current database.');
+
+        $this->table->fromTable('foo');
+    }
+
+    public function testFromTableFillsDetails()
+    {
+        $this->createTable();
+
+        $this->assertTrue($this->db->tableExists('foo'));
+
+        $this->table->fromTable('foo');
+
+        $fields = $this->getPrivateProperty($this->table, 'fields');
+
+        $this->assertCount(4, $fields);
+        $this->assertArrayHasKey('id', $fields);
+        $this->assertNull($fields['id']['default']);
+        $this->assertTrue($fields['id']['null']);
+        $this->assertSame('integer', strtolower($fields['id']['type']));
+
+        $this->assertArrayHasKey('name', $fields);
+        $this->assertNull($fields['name']['default']);
+        $this->assertFalse($fields['name']['null']);
+        $this->assertSame('varchar', strtolower($fields['name']['type']));
+
+        $this->assertArrayHasKey('email', $fields);
+        $this->assertNull($fields['email']['default']);
+        $this->assertTrue($fields['email']['null']);
+        $this->assertSame('varchar', strtolower($fields['email']['type']));
+
+        $keys = $this->getPrivateProperty($this->table, 'keys');
+
+        $this->assertCount(3, $keys);
+        $this->assertArrayHasKey('foo_name', $keys);
+        $this->assertSame(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']);
+        $this->assertArrayHasKey('id', $keys);
+        $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
+        $this->assertArrayHasKey('id', $keys);
+        $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
+    }
+
+    public function testDropColumnSuccess()
+    {
+        $this->createTable();
+
+        $result = $this->table
+            ->fromTable('foo')
+            ->dropColumn('name')
+            ->run();
+
+        $this->assertTrue($result);
+
+        $columns = $this->db->getFieldNames('foo');
+
+        $this->assertFalse(in_array('name', $columns, true));
+        $this->assertTrue(in_array('id', $columns, true));
+        $this->assertTrue(in_array('email', $columns, true));
+    }
+
+    public function testDropColumnMaintainsKeys()
+    {
+        $this->createTable();
+
+        $oldKeys = $this->db->getIndexData('foo');
+
+        $this->assertArrayHasKey('foo_name', $oldKeys);
+        $this->assertArrayHasKey('foo_email', $oldKeys);
+
+        $result = $this->table
+            ->fromTable('foo')
+            ->dropColumn('name')
+            ->run();
+
+        $newKeys = $this->db->getIndexData('foo');
+
+        $this->assertArrayNotHasKey('foo_name', $newKeys);
+        $this->assertArrayHasKey('foo_email', $newKeys);
+
+        $this->assertTrue($result);
+    }
+
+    public function testModifyColumnSuccess()
+    {
+        $this->createTable('janky');
+
+        $result = $this->table
+            ->fromTable('janky')
+            ->modifyColumn([
+                [
+                    'name'       => 'name',
+                    'new_name'   => 'serial',
+                    'type'       => 'int',
+                    'constraint' => 11,
+                    'null'       => true,
+                ],
+            ])
+            ->run();
+
+        $this->assertTrue($result);
+
+        $this->assertFalse($this->db->fieldExists('name', 'janky'));
+        $this->assertTrue($this->db->fieldExists('serial', 'janky'));
+    }
+
+    public function testDropForeignKeySuccess()
+    {
+        $this->createTable('aliens');
+
+        $keys = $this->db->getForeignKeyData('aliens');
+        $this->assertSame('key_id to aliens_fk.id', $keys[0]->constraint_name);
+
+        $result = $this->table
+            ->fromTable('aliens')
+            ->dropForeignKey('key_id')
+            ->run();
+
+        $this->assertTrue($result);
+
+        $keys = $this->db->getForeignKeyData('aliens');
+        $this->assertEmpty($keys);
+    }
+
+    public function testProcessCopiesOldData()
+    {
+        $this->createTable();
+
+        $this->db->table('foo_fk')->insert([
+            'id'   => 1,
+            'name' => 'bar',
+        ]);
+
+        $this->db->table('foo')->insert([
+            'id'     => 1,
+            'name'   => 'George Clinton',
+            'email'  => 'funkalicious@example.com',
+            'key_id' => 1,
+        ]);
+
+        $this->seeInDatabase('foo', ['name' => 'George Clinton']);
+
+        $this->table
+            ->fromTable('foo')
+            ->dropColumn('name')
+            ->run();
+
+        $this->dontSeeInDatabase('foo', ['name' => 'George Clinton']);
+        $this->seeInDatabase('foo', ['email' => 'funkalicious@example.com']);
+    }
+
+    protected function createTable(string $tableName = 'foo')
+    {
+        // Create support table for foreign keys
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'integer',
+                'constraint'     => 11,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+        ]);
+        $this->forge->createTable($tableName . '_fk');
+
+        // Create main table
+        $this->forge->addField([
+            'id' => [
+                'type'           => 'integer',
+                'constraint'     => 11,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'name' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => false,
+            ],
+            'email' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
+            'key_id' => [
+                'type'       => 'integer',
+                'constraint' => 11,
+                'unsigned'   => true,
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addKey('name');
+        $this->forge->addUniqueKey('email');
+        $this->forge->addForeignKey('key_id', $tableName . '_fk', 'id');
+        $this->forge->createTable($tableName);
+    }
 }
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 4ae681a0b657..6224633847d6 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -1,197 +1,176 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class SelectTest extends CIUnitTestCase
+final class SelectTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	//--------------------------------------------------------------------
-
-	public function testSelectAllByDefault()
-	{
-		$row = $this->db->table('job')->get()->getRowArray();
-
-		$this->assertArrayHasKey('id', $row);
-		$this->assertArrayHasKey('name', $row);
-		$this->assertArrayHasKey('description', $row);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectSingleColumn()
-	{
-		$row = $this->db->table('job')->select('name')->get()->getRowArray();
-
-		$this->assertArrayNotHasKey('id', $row);
-		$this->assertArrayHasKey('name', $row);
-		$this->assertArrayNotHasKey('description', $row);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectMultipleColumns()
-	{
-		$row = $this->db->table('job')->select('name, description')->get()->getRowArray();
-
-		$this->assertArrayNotHasKey('id', $row);
-		$this->assertArrayHasKey('name', $row);
-		$this->assertArrayHasKey('description', $row);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectMax()
-	{
-		$result = $this->db->table('job')->selectMax('id')->get()->getRow();
-
-		$this->assertEquals(4, $result->id);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectMaxWithAlias()
-	{
-		$result = $this->db->table('job')->selectMax('id', 'xam')->get()->getRow();
-
-		$this->assertEquals(4, $result->xam);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSelectMin()
-	{
-		$result = $this->db->table('job')->selectMin('id')->get()->getRow();
+    use DatabaseTestTrait;
 
-		$this->assertEquals(1, $result->id);
-	}
+    protected $refresh = true;
 
-	//--------------------------------------------------------------------
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-	public function testSelectMinWithAlias()
-	{
-		$result = $this->db->table('job')->selectMin('id', 'xam')->get()->getRow();
+    public function testSelectAllByDefault()
+    {
+        $row = $this->db->table('job')->get()->getRowArray();
 
-		$this->assertEquals(1, $result->xam);
-	}
+        $this->assertArrayHasKey('id', $row);
+        $this->assertArrayHasKey('name', $row);
+        $this->assertArrayHasKey('description', $row);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectSingleColumn()
+    {
+        $row = $this->db->table('job')->select('name')->get()->getRowArray();
 
-	public function testSelectAvg()
-	{
-		$result = $this->db->table('job')->selectAvg('id')->get()->getRow();
+        $this->assertArrayNotHasKey('id', $row);
+        $this->assertArrayHasKey('name', $row);
+        $this->assertArrayNotHasKey('description', $row);
+    }
 
-		$this->assertEquals(2.5, $result->id);
-	}
+    public function testSelectMultipleColumns()
+    {
+        $row = $this->db->table('job')->select('name, description')->get()->getRowArray();
 
-	//--------------------------------------------------------------------
+        $this->assertArrayNotHasKey('id', $row);
+        $this->assertArrayHasKey('name', $row);
+        $this->assertArrayHasKey('description', $row);
+    }
 
-	public function testSelectAvgWithAlias()
-	{
-		$result = $this->db->table('job')->selectAvg('id', 'xam')->get()->getRow();
+    public function testSelectMax()
+    {
+        $result = $this->db->table('job')->selectMax('id')->get()->getRow();
 
-		$this->assertEquals(2.5, $result->xam);
-	}
+        $this->assertSame(4, (int) $result->id);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectMaxWithAlias()
+    {
+        $result = $this->db->table('job')->selectMax('id', 'xam')->get()->getRow();
 
-	public function testSelectSum()
-	{
-		$result = $this->db->table('job')->selectSum('id')->get()->getRow();
+        $this->assertSame(4, (int) $result->xam);
+    }
 
-		$this->assertEquals(10, $result->id);
-	}
+    public function testSelectMin()
+    {
+        $result = $this->db->table('job')->selectMin('id')->get()->getRow();
 
-	//--------------------------------------------------------------------
+        $this->assertSame(1, (int) $result->id);
+    }
 
-	public function testSelectSumWithAlias()
-	{
-		$result = $this->db->table('job')->selectSum('id', 'xam')->get()->getRow();
+    public function testSelectMinWithAlias()
+    {
+        $result = $this->db->table('job')->selectMin('id', 'xam')->get()->getRow();
 
-		$this->assertEquals(10, $result->xam);
-	}
+        $this->assertSame(1, (int) $result->xam);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectAvg()
+    {
+        $result = $this->db->table('job')->selectAvg('id')->get()->getRow();
 
-	public function testSelectCount()
-	{
-		$result = $this->db->table('job')->selectCount('id')->get()->getRow();
+        $this->assertSame(2.5, (float) $result->id);
+    }
 
-		$this->assertEquals(4, $result->id);
-	}
+    public function testSelectAvgWithAlias()
+    {
+        $result = $this->db->table('job')->selectAvg('id', 'xam')->get()->getRow();
 
-	//--------------------------------------------------------------------
+        $this->assertSame(2.5, (float) $result->xam);
+    }
 
-	public function testSelectCountWithAlias()
-	{
-		$result = $this->db->table('job')->selectCount('id', 'xam')->get()->getRow();
+    public function testSelectSum()
+    {
+        $result = $this->db->table('job')->selectSum('id')->get()->getRow();
 
-		$this->assertEquals(4, $result->xam);
-	}
+        $this->assertSame(10, (int) $result->id);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectSumWithAlias()
+    {
+        $result = $this->db->table('job')->selectSum('id', 'xam')->get()->getRow();
 
-	public function testSelectDistinctWorkTogether()
-	{
-		$users = $this->db->table('user')->select('country')->distinct()->get()->getResult();
+        $this->assertSame(10, (int) $result->xam);
+    }
 
-		$this->assertCount(3, $users);
-	}
+    public function testSelectCount()
+    {
+        $result = $this->db->table('job')->selectCount('id')->get()->getRow();
 
-	//--------------------------------------------------------------------
+        $this->assertSame(4, (int) $result->id);
+    }
 
-	public function testSelectDistinctCanBeTurnedOff()
-	{
-		$users = $this->db->table('user')->select('country')->distinct(false)->get()->getResult();
+    public function testSelectCountWithAlias()
+    {
+        $result = $this->db->table('job')->selectCount('id', 'xam')->get()->getRow();
 
-		$this->assertCount(4, $users);
-	}
+        $this->assertSame(4, (int) $result->xam);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSelectDistinctWorkTogether()
+    {
+        $users = $this->db->table('user')->select('country')->distinct()->get()->getResult();
+
+        $this->assertCount(3, $users);
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1226
-	 */
-	public function testSelectWithMultipleWheresOnSameColumn()
-	{
-		$users = $this->db->table('user')
-			->where('id', 1)
-			->orWhereIn('id', [2, 3])
-			->get()
-			->getResultArray();
+    public function testSelectDistinctCanBeTurnedOff()
+    {
+        $users = $this->db->table('user')->select('country')->distinct(false)->get()->getResult();
 
-		$this->assertCount(3, $users);
+        $this->assertCount(4, $users);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1226
+     */
+    public function testSelectWithMultipleWheresOnSameColumn()
+    {
+        $users = $this->db->table('user')
+            ->where('id', 1)
+            ->orWhereIn('id', [2, 3])
+            ->get()
+            ->getResultArray();
 
-		foreach ($users as $user)
-		{
-			$this->assertTrue(in_array($user['id'], [1, 2, 3]));
-		}
-	}
+        $this->assertCount(3, $users);
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1226
-	 */
-	public function testSelectWithMultipleWheresOnSameColumnAgain()
-	{
-		$users = $this->db->table('user')
-						  ->whereIn('id', [1, 2])
-						  ->orWhere('id', 3)
-						  ->get()
-						  ->getResultArray();
+        foreach ($users as $user) {
+            $this->assertContains((int) $user['id'], [1, 2, 3]);
+        }
+    }
 
-		$this->assertCount(3, $users);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1226
+     */
+    public function testSelectWithMultipleWheresOnSameColumnAgain()
+    {
+        $users = $this->db->table('user')
+            ->whereIn('id', [1, 2])
+            ->orWhere('id', 3)
+            ->get()
+            ->getResultArray();
 
-		foreach ($users as $user)
-		{
-			$this->assertTrue(in_array($user['id'], [1, 2, 3]));
-		}
-	}
+        $this->assertCount(3, $users);
+
+        foreach ($users as $user) {
+            $this->assertContains((int) $user['id'], [1, 2, 3]);
+        }
+    }
 }
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 3a767a5e248f..f047f16a7bfd 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,238 +17,198 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class UpdateTest extends CIUnitTestCase
+final class UpdateTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testUpdateSetsAllWithoutWhere()
-	{
-		$this->db->table('user')
-					->update(['name' => 'Bobby']);
-
-		$result = $this->db->table('user')->get()->getResult();
-
-		$this->assertEquals('Bobby', $result[0]->name);
-		$this->assertEquals('Bobby', $result[1]->name);
-		$this->assertEquals('Bobby', $result[2]->name);
-		$this->assertEquals('Bobby', $result[3]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateSetsAllWithoutWhereAndLimit()
-	{
-		try
-		{
-			$this->db->table('user')
-					 ->update(['name' => 'Bobby'], null, 1);
-
-			$result = $this->db->table('user')
-							   ->orderBy('id', 'asc')
-							   ->get()
-							   ->getResult();
-
-			$this->assertEquals('Bobby', $result[0]->name);
-			$this->assertEquals('Ahmadinejad', $result[1]->name);
-			$this->assertEquals('Richard A Causey', $result[2]->name);
-			$this->assertEquals('Chris Martin', $result[3]->name);
-		}
-		catch (DatabaseException $e)
-		{
-			// This DB doesn't support Where and Limit together
-			// but we don't want it called a "Risky" test.
-			$this->assertTrue(true);
-			return;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateWithWhere()
-	{
-		$this->db->table('user')
-				 ->update(['name' => 'Bobby'], ['country' => 'US']);
-
-		$result = $this->db->table('user')->get()->getResultArray();
-
-		$rows = [];
-
-		foreach ($result as $row)
-		{
-			if ($row['name'] === 'Bobby')
-			{
-				$rows[] = $row;
-			}
-		}
-
-		$this->assertCount(2, $rows);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateWithWhereAndLimit()
-	{
-		try
-		{
-			$this->db->table('user')
-					 ->update(['name' => 'Bobby'], ['country' => 'US'], 1);
-
-			$result = $this->db->table('user')
-							   ->get()
-							   ->getResult();
-
-			$this->assertEquals('Bobby', $result[0]->name);
-			$this->assertEquals('Ahmadinejad', $result[1]->name);
-			$this->assertEquals('Richard A Causey', $result[2]->name);
-			$this->assertEquals('Chris Martin', $result[3]->name);
-		}
-		catch (DatabaseException $e)
-		{
-			// This DB doesn't support Where and Limit together
-			// but we don't want it called a "Risky" test.
-			$this->assertTrue(true);
-			return;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateBatch()
-	{
-		$data = [
-			[
-				'name'    => 'Derek Jones',
-				'country' => 'Greece',
-			],
-			[
-				'name'    => 'Ahmadinejad',
-				'country' => 'Greece',
-			],
-		];
-
-		$this->db->table('user')
-					->updateBatch($data, 'name');
-
-		$this->seeInDatabase('user', [
-			'name'    => 'Derek Jones',
-			'country' => 'Greece',
-		]);
-		$this->seeInDatabase('user', [
-			'name'    => 'Ahmadinejad',
-			'country' => 'Greece',
-		]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateWithWhereSameColumn()
-	{
-		$this->db->table('user')
-				 ->update(['country' => 'CA'], ['country' => 'US']);
-
-		$result = $this->db->table('user')->get()->getResultArray();
-
-		$rows = [];
-
-		foreach ($result as $row)
-		{
-			if ($row['country'] === 'CA')
-			{
-				$rows[] = $row;
-			}
-		}
-
-		$this->assertCount(2, $rows);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateWithWhereSameColumn2()
-	{
-		// calling order: set() -> where()
-		$this->db->table('user')
-				 ->set('country', 'CA')
-				 ->where('country', 'US')
-				 ->update();
-
-		$result = $this->db->table('user')->get()->getResultArray();
-
-		$rows = [];
-
-		foreach ($result as $row)
-		{
-			if ($row['country'] === 'CA')
-			{
-				$rows[] = $row;
-			}
-		}
-
-		$this->assertCount(2, $rows);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUpdateWithWhereSameColumn3()
-	{
-		// calling order: where() -> set() in update()
-		$this->db->table('user')
-				 ->where('country', 'US')
-				 ->update(['country' => 'CA']);
-
-		$result = $this->db->table('user')->get()->getResultArray();
-
-		$rows = [];
-
-		foreach ($result as $row)
-		{
-			if ($row['country'] === 'CA')
-			{
-				$rows[] = $row;
-			}
-		}
-
-		$this->assertCount(2, $rows);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group single
-	 * @see   https://github.com/codeigniter4/CodeIgniter4/issues/324
-	 */
-	public function testUpdatePeriods()
-	{
-		$this->db->table('misc')
-			->where('key', 'spaces and tabs')
-			->update([
-				'value' => '30.192',
-			]);
-
-		$this->seeInDatabase('misc', [
-			'value' => '30.192',
-		]);
-	}
-
-	//--------------------------------------------------------------------
-
-	// @see https://codeigniter4.github.io/CodeIgniter4/database/query_builder.html#updating-data
-	public function testSetWithoutEscape()
-	{
-		$this->db->table('job')
-				 ->set('description', 'name', false)
-				 ->update();
-
-		$result = $this->db->table('user')->get()->getResultArray();
-
-		$this->seeInDatabase('job', [
-			'name'        => 'Developer',
-			'description' => 'Developer',
-		]);
-	}
-
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testUpdateSetsAllWithoutWhere()
+    {
+        $this->db->table('user')->update(['name' => 'Bobby']);
+
+        $result = $this->db->table('user')->get()->getResult();
+
+        $this->assertSame('Bobby', $result[0]->name);
+        $this->assertSame('Bobby', $result[1]->name);
+        $this->assertSame('Bobby', $result[2]->name);
+        $this->assertSame('Bobby', $result[3]->name);
+    }
+
+    public function testUpdateSetsAllWithoutWhereAndLimit()
+    {
+        try {
+            $this->db->table('user')->update(['name' => 'Bobby'], null, 1);
+
+            $result = $this->db->table('user')
+                ->orderBy('id', 'asc')
+                ->get()
+                ->getResult();
+
+            $this->assertSame('Bobby', $result[0]->name);
+            $this->assertSame('Ahmadinejad', $result[1]->name);
+            $this->assertSame('Richard A Causey', $result[2]->name);
+            $this->assertSame('Chris Martin', $result[3]->name);
+        } catch (DatabaseException $e) {
+            // This DB doesn't support Where and Limit together
+            // but we don't want it called a "Risky" test.
+            $this->assertTrue(true);
+        }
+    }
+
+    public function testUpdateWithWhere()
+    {
+        $this->db->table('user')->update(['name' => 'Bobby'], ['country' => 'US']);
+
+        $result = $this->db->table('user')->get()->getResultArray();
+
+        $rows = [];
+
+        foreach ($result as $row) {
+            if ($row['name'] === 'Bobby') {
+                $rows[] = $row;
+            }
+        }
+
+        $this->assertCount(2, $rows);
+    }
+
+    public function testUpdateWithWhereAndLimit()
+    {
+        try {
+            $this->db->table('user')->update(['name' => 'Bobby'], ['country' => 'US'], 1);
+
+            $result = $this->db->table('user')->get()->getResult();
+
+            $this->assertSame('Bobby', $result[0]->name);
+            $this->assertSame('Ahmadinejad', $result[1]->name);
+            $this->assertSame('Richard A Causey', $result[2]->name);
+            $this->assertSame('Chris Martin', $result[3]->name);
+        } catch (DatabaseException $e) {
+            // This DB doesn't support Where and Limit together
+            // but we don't want it called a "Risky" test.
+            $this->assertTrue(true);
+        }
+    }
+
+    public function testUpdateBatch()
+    {
+        $data = [
+            [
+                'name'    => 'Derek Jones',
+                'country' => 'Greece',
+            ],
+            [
+                'name'    => 'Ahmadinejad',
+                'country' => 'Greece',
+            ],
+        ];
+
+        $this->db->table('user')->updateBatch($data, 'name');
+
+        $this->seeInDatabase('user', [
+            'name'    => 'Derek Jones',
+            'country' => 'Greece',
+        ]);
+        $this->seeInDatabase('user', [
+            'name'    => 'Ahmadinejad',
+            'country' => 'Greece',
+        ]);
+    }
+
+    public function testUpdateWithWhereSameColumn()
+    {
+        $this->db->table('user')->update(['country' => 'CA'], ['country' => 'US']);
+
+        $result = $this->db->table('user')->get()->getResultArray();
+
+        $rows = [];
+
+        foreach ($result as $row) {
+            if ($row['country'] === 'CA') {
+                $rows[] = $row;
+            }
+        }
+
+        $this->assertCount(2, $rows);
+    }
+
+    public function testUpdateWithWhereSameColumn2()
+    {
+        // calling order: set() -> where()
+        $this->db->table('user')
+            ->set('country', 'CA')
+            ->where('country', 'US')
+            ->update();
+
+        $result = $this->db->table('user')->get()->getResultArray();
+
+        $rows = [];
+
+        foreach ($result as $row) {
+            if ($row['country'] === 'CA') {
+                $rows[] = $row;
+            }
+        }
+
+        $this->assertCount(2, $rows);
+    }
+
+    public function testUpdateWithWhereSameColumn3()
+    {
+        // calling order: where() -> set() in update()
+        $this->db->table('user')
+            ->where('country', 'US')
+            ->update(['country' => 'CA']);
+
+        $result = $this->db->table('user')->get()->getResultArray();
+
+        $rows = [];
+
+        foreach ($result as $row) {
+            if ($row['country'] === 'CA') {
+                $rows[] = $row;
+            }
+        }
+
+        $this->assertCount(2, $rows);
+    }
+
+    /**
+     * @group single
+     *
+     * @see   https://github.com/codeigniter4/CodeIgniter4/issues/324
+     */
+    public function testUpdatePeriods()
+    {
+        $this->db->table('misc')
+            ->where('key', 'spaces and tabs')
+            ->update([
+                'value' => '30.192',
+            ]);
+
+        $this->seeInDatabase('misc', [
+            'value' => '30.192',
+        ]);
+    }
+
+    /**
+     * @see https://codeigniter4.github.io/CodeIgniter4/database/query_builder.html#updating-data
+     */
+    public function testSetWithoutEscape()
+    {
+        $this->db->table('job')
+            ->set('description', 'name', false)
+            ->update();
+
+        $this->seeInDatabase('job', [
+            'name'        => 'Developer',
+            'description' => 'Developer',
+        ]);
+    }
 }
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index de1bfbc223f9..ce87bbd3c7f4 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -1,236 +1,225 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class WhereTest extends CIUnitTestCase
+final class WhereTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testWhereSimpleKeyValue()
-	{
-		$row = $this->db->table('job')->where('id', 1)->get()->getRow();
-
-		$this->assertEquals(1, $row->id);
-		$this->assertEquals('Developer', $row->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereCustomKeyValue()
-	{
-		$jobs = $this->db->table('job')->where('id !=', 1)->get()->getResult();
-
-		$this->assertCount(3, $jobs);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereArray()
-	{
-		$jobs = $this->db->table('job')->where([
-			'id >'    => 2,
-			'name !=' => 'Accountant',
-		])->get()->getResult();
-
-		$this->assertCount(1, $jobs);
-
-		$job = current($jobs);
-		$this->assertEquals('Musician', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereCustomString()
-	{
-		$jobs = $this->db->table('job')->where("id > 2 AND name != 'Accountant'")
-							->get()
-							->getResult();
-
-		$this->assertCount(1, $jobs);
-
-		$job = current($jobs);
-		$this->assertEquals('Musician', $job->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrWhere()
-	{
-		$jobs = $this->db->table('job')
-						->where('name !=', 'Accountant')
-						->orWhere('id >', 3)
-						->get()
-						->getResult();
-
-		$this->assertCount(3, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Politician', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrWhereSameColumn()
-	{
-		$jobs = $this->db->table('job')
-						->where('name', 'Developer')
-						->orWhere('name', 'Politician')
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Politician', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereIn()
-	{
-		$jobs = $this->db->table('job')
-						->whereIn('name', ['Politician', 'Accountant'])
-						->get()
-						->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Politician', $jobs[0]->name);
-		$this->assertEquals('Accountant', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group single
-	 */
-	public function testWhereNotIn()
-	{
-		$jobs = $this->db->table('job')
-						 ->whereNotIn('name', ['Politician', 'Accountant'])
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(2, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-		$this->assertEquals('Musician', $jobs[1]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSubQuery()
-	{
-		$subQuery = $this->db->table('job')
-							 ->select('id')
-							 ->where('name', 'Developer')
-							 ->getCompiledSelect();
-
-		$jobs = $this->db->table('job')
-						 ->where('id not in (' . $subQuery . ')', null, false)
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(3, $jobs);
-		$this->assertEquals('Politician', $jobs[0]->name);
-		$this->assertEquals('Accountant', $jobs[1]->name);
-		$this->assertEquals('Musician', $jobs[2]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSubQueryAnotherType()
-	{
-		$subQuery = $this->db->table('job')
-							 ->select('id')
-							 ->where('name', 'Developer')
-							 ->getCompiledSelect();
-
-		$jobs = $this->db->table('job')
-						 ->where('id = (' . $subQuery . ')', null, false)
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Developer', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereNullParam()
-	{
-		$this->db->table('job')
-				 ->insert([
-					 'name'        => 'Brewmaster',
-					 'description' => null,
-				 ]);
-
-		$jobs = $this->db->table('job')
-						 ->where('description', null)
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Brewmaster', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereIsNull()
-	{
-		$this->db->table('job')
-				 ->insert([
-					 'name'        => 'Brewmaster',
-					 'description' => null,
-				 ]);
-
-		$jobs = $this->db->table('job')
-						 ->where('description IS NULL')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(1, $jobs);
-		$this->assertEquals('Brewmaster', $jobs[0]->name);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWhereIsNotNull()
-	{
-		$this->db->table('job')
-				 ->insert([
-					 'name'        => 'Brewmaster',
-					 'description' => null,
-				 ]);
-
-		$jobs = $this->db->table('job')
-						 ->where('description IS NOT NULL')
-						 ->get()
-						 ->getResult();
-
-		$this->assertCount(4, $jobs);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4443
-	 */
-	public function testWhereWithLower()
-	{
-		$builder = $this->db->table('job');
-		$builder->insert([
-			'name'        => 'Brewmaster',
-			'description' => null,
-		]);
-
-		$job = $builder
-			->where(sprintf('LOWER(%s.name)', $this->db->prefixTable('job')), 'brewmaster')
-			->get()
-			->getResult();
-		$this->assertCount(1, $job);
-	}
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testWhereSimpleKeyValue()
+    {
+        $row = $this->db->table('job')->where('id', 1)->get()->getRow();
+
+        $this->assertSame(1, (int) $row->id);
+        $this->assertSame('Developer', $row->name);
+    }
+
+    public function testWhereCustomKeyValue()
+    {
+        $jobs = $this->db->table('job')->where('id !=', 1)->get()->getResult();
+
+        $this->assertCount(3, $jobs);
+    }
+
+    public function testWhereArray()
+    {
+        $jobs = $this->db->table('job')->where([
+            'id >'    => 2,
+            'name !=' => 'Accountant',
+        ])->get()->getResult();
+
+        $this->assertCount(1, $jobs);
+
+        $job = current($jobs);
+        $this->assertSame('Musician', $job->name);
+    }
+
+    public function testWhereCustomString()
+    {
+        $jobs = $this->db->table('job')->where("id > 2 AND name != 'Accountant'")
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+
+        $job = current($jobs);
+        $this->assertSame('Musician', $job->name);
+    }
+
+    public function testOrWhere()
+    {
+        $jobs = $this->db->table('job')
+            ->where('name !=', 'Accountant')
+            ->orWhere('id >', 3)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+    }
+
+    public function testOrWhereSameColumn()
+    {
+        $jobs = $this->db->table('job')
+            ->where('name', 'Developer')
+            ->orWhere('name', 'Politician')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+    }
+
+    public function testWhereIn()
+    {
+        $jobs = $this->db->table('job')
+            ->whereIn('name', ['Politician', 'Accountant'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+    }
+
+    /**
+     * @group single
+     */
+    public function testWhereNotIn()
+    {
+        $jobs = $this->db->table('job')
+            ->whereNotIn('name', ['Politician', 'Accountant'])
+            ->get()
+            ->getResult();
+
+        $this->assertCount(2, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+    }
+
+    public function testSubQuery()
+    {
+        $subQuery = $this->db->table('job')
+            ->select('id')
+            ->where('name', 'Developer')
+            ->getCompiledSelect();
+
+        $jobs = $this->db->table('job')
+            ->where('id not in (' . $subQuery . ')', null, false)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(3, $jobs);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+    }
+
+    public function testSubQueryAnotherType()
+    {
+        $subQuery = $this->db->table('job')
+            ->select('id')
+            ->where('name', 'Developer')
+            ->getCompiledSelect();
+
+        $jobs = $this->db->table('job')
+            ->where('id = (' . $subQuery . ')', null, false)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+        $this->assertSame('Developer', $jobs[0]->name);
+    }
+
+    public function testWhereNullParam()
+    {
+        $this->db->table('job')
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
+
+        $jobs = $this->db->table('job')
+            ->where('description', null)
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+        $this->assertSame('Brewmaster', $jobs[0]->name);
+    }
+
+    public function testWhereIsNull()
+    {
+        $this->db->table('job')
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
+
+        $jobs = $this->db->table('job')
+            ->where('description IS NULL')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(1, $jobs);
+        $this->assertSame('Brewmaster', $jobs[0]->name);
+    }
+
+    public function testWhereIsNotNull()
+    {
+        $this->db->table('job')
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
+
+        $jobs = $this->db->table('job')
+            ->where('description IS NOT NULL')
+            ->get()
+            ->getResult();
+
+        $this->assertCount(4, $jobs);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4443
+     */
+    public function testWhereWithLower()
+    {
+        $builder = $this->db->table('job');
+        $builder->insert([
+            'name'        => 'Brewmaster',
+            'description' => null,
+        ]);
+
+        $job = $builder
+            ->where(sprintf('LOWER(%s.name)', $this->db->prefixTable('job')), 'brewmaster')
+            ->get()
+            ->getResult();
+        $this->assertCount(1, $job);
+    }
 }
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index 4dfc14207e60..31dd848c41a2 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Live;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,220 +17,197 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class WriteTypeQueryTest extends CIUnitTestCase
+final class WriteTypeQueryTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	public function testSet()
-	{
-		$sql = 'SET FOREIGN_KEY_CHECKS=0';
-
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testInsert()
-	{
-		$builder = $this->db->table('jobs');
-
-		$insertData = [
-			'id'   => 1,
-			'name' => 'Grocery Sales',
-		];
-		$builder->testMode()->insert($insertData, true);
-		$sql = $builder->getCompiledInsert();
-
-		$this->assertTrue($this->db->isWriteType($sql));
-
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$sql = "INSERT INTO my_table (col1, col2) VALUES ('Joe', 'Cool') RETURNING id;";
-
-			$this->assertFalse($this->db->isWriteType($sql));
-		}
-	}
+    use DatabaseTestTrait;
 
-	//--------------------------------------------------------------------
+    protected $refresh = true;
 
-	public function testUpdate()
-	{
-		$builder = new BaseBuilder('jobs', $this->db);
-		$builder->testMode()->where('id', 1)->update(['name' => 'Programmer'], null, null);
-		$sql = $builder->getCompiledInsert();
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-		$this->assertTrue($this->db->isWriteType($sql));
+    public function testSet()
+    {
+        $sql = 'SET FOREIGN_KEY_CHECKS=0';
 
-		if ($this->db->DBDriver === 'Postgre')
-		{
-			$sql = "UPDATE my_table SET col1 = 'foo' WHERE id = 2 RETURNING *;";
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-			$this->assertFalse($this->db->isWriteType($sql));
-		}
-	}
+    public function testInsert()
+    {
+        $builder = $this->db->table('jobs');
 
-	//--------------------------------------------------------------------
+        $insertData = [
+            'id'   => 1,
+            'name' => 'Grocery Sales',
+        ];
+        $builder->testMode()->insert($insertData, true);
+        $sql = $builder->getCompiledInsert();
 
-	public function testDelete()
-	{
-		$builder = $this->db->table('jobs');
-		$sql     = $builder->testMode()->delete(['id' => 1], null, true);
+        $this->assertTrue($this->db->isWriteType($sql));
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        if ($this->db->DBDriver === 'Postgre') {
+            $sql = "INSERT INTO my_table (col1, col2) VALUES ('Joe', 'Cool') RETURNING id;";
 
-	//--------------------------------------------------------------------
+            $this->assertFalse($this->db->isWriteType($sql));
+        }
+    }
 
-	public function testReplace()
-	{
-		if (in_array($this->db->DBDriver, ['Postgre', 'SQLSRV'], true))
-		{
-			// these two were complaining about the builder stuff so i just cooked up this
-			$sql = 'REPLACE INTO `db_jobs` (`title`, `name`, `date`) VALUES (:title:, :name:, :date:)';
-		}
-		else
-		{
-			$builder = $this->db->table('jobs');
-			$data    = [
-				'title' => 'My title',
-				'name'  => 'My Name',
-				'date'  => 'My date',
-			];
-			$sql     = $builder->testMode()->replace($data);
-		}
+    public function testUpdate()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $builder->testMode()->where('id', 1)->update(['name' => 'Programmer'], null, null);
+        $sql = $builder->getCompiledInsert();
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        $this->assertTrue($this->db->isWriteType($sql));
 
-	//--------------------------------------------------------------------
+        if ($this->db->DBDriver === 'Postgre') {
+            $sql = "UPDATE my_table SET col1 = 'foo' WHERE id = 2 RETURNING *;";
 
-	public function testCreate()
-	{
-		$sql = 'CREATE DATABASE foo';
+            $this->assertFalse($this->db->isWriteType($sql));
+        }
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testDelete()
+    {
+        $builder = $this->db->table('jobs');
+        $sql     = $builder->testMode()->delete(['id' => 1], null, true);
 
-	//--------------------------------------------------------------------
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-	public function testDrop()
-	{
-		$sql = 'DROP DATABASE foo';
+    public function testReplace()
+    {
+        if (in_array($this->db->DBDriver, ['Postgre', 'SQLSRV'], true)) {
+            // these two were complaining about the builder stuff so i just cooked up this
+            $sql = 'REPLACE INTO `db_jobs` (`title`, `name`, `date`) VALUES (:title:, :name:, :date:)';
+        } else {
+            $builder = $this->db->table('jobs');
+            $data    = [
+                'title' => 'My title',
+                'name'  => 'My Name',
+                'date'  => 'My date',
+            ];
+            $sql = $builder->testMode()->replace($data);
+        }
 
-		$this->assertTrue($this->db->isWriteType($sql));
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$sql = 'DROP TABLE foo';
+    public function testCreate()
+    {
+        $sql = 'CREATE DATABASE foo';
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-	//--------------------------------------------------------------------
+    public function testDrop()
+    {
+        $sql = 'DROP DATABASE foo';
 
-	public function testTruncate()
-	{
-		$builder = new BaseBuilder('user', $this->db);
-		$sql     = $builder->testMode()->truncate();
+        $this->assertTrue($this->db->isWriteType($sql));
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        $sql = 'DROP TABLE foo';
 
-	//--------------------------------------------------------------------
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-	public function testLoad()
-	{
-		$sql = "LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test FIELDS TERMINATED BY ','  LINES STARTING BY 'xxx';";
+    public function testTruncate()
+    {
+        $builder = new BaseBuilder('user', $this->db);
+        $sql     = $builder->testMode()->truncate();
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-	//--------------------------------------------------------------------
+    public function testLoad()
+    {
+        $sql = "LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test FIELDS TERMINATED BY ','  LINES STARTING BY 'xxx';";
 
-	public function testCopy()
-	{
-		$sql = "COPY demo(firstname, lastname) TO 'demo.txt' DELIMITER ' ';";
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testCopy()
+    {
+        $sql = "COPY demo(firstname, lastname) TO 'demo.txt' DELIMITER ' ';";
 
-	public function testAlter()
-	{
-		$sql = 'ALTER TABLE supplier ADD supplier_name char(50);';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testAlter()
+    {
+        $sql = 'ALTER TABLE supplier ADD supplier_name char(50);';
 
-	public function testRename()
-	{
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$sql = 'EXEC sp_rename table1 , table2 ;';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-			$this->assertTrue($this->db->isWriteType($sql));
-		}
+    public function testRename()
+    {
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $sql = 'EXEC sp_rename table1 , table2 ;';
 
-		$sql = 'RENAME ...';
+            $this->assertTrue($this->db->isWriteType($sql));
+        }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+        $sql = 'RENAME ...';
 
-	public function testGrant()
-	{
-		$sql = 'GRANT SELECT ON TABLE my_table TO user1,user2';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testGrant()
+    {
+        $sql = 'GRANT SELECT ON TABLE my_table TO user1,user2';
 
-	public function testRevoke()
-	{
-		$sql = 'REVOKE SELECT ON TABLE my_table FROM user1,user2';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testRevoke()
+    {
+        $sql = 'REVOKE SELECT ON TABLE my_table FROM user1,user2';
 
-	public function testLock()
-	{
-		$sql = 'LOCK TABLE my_table IN SHARE MODE;';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testLock()
+    {
+        $sql = 'LOCK TABLE my_table IN SHARE MODE;';
 
-	public function testUnlock()
-	{
-		// i think this is only a valid command for MySQL?
-		$sql = 'UNLOCK TABLES;';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testUnlock()
+    {
+        // i think this is only a valid command for MySQL?
+        $sql = 'UNLOCK TABLES;';
 
-	public function testReindex()
-	{
-		// i think this is only a valid command for Postgre?
-		$sql = 'REINDEX TABLE foo';
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertTrue($this->db->isWriteType($sql));
-	}
+    public function testReindex()
+    {
+        // i think this is only a valid command for Postgre?
+        $sql = 'REINDEX TABLE foo';
 
-	public function testSelect()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-		$builder->select('*');
-		$sql = $builder->getCompiledSelect();
+        $this->assertTrue($this->db->isWriteType($sql));
+    }
 
-		$this->assertFalse($this->db->isWriteType($sql));
-	}
+    public function testSelect()
+    {
+        $builder = new BaseBuilder('users', $this->db);
+        $builder->select('*');
+        $sql = $builder->getCompiledSelect();
 
-	public function testTrick()
-	{
-		$builder = new BaseBuilder('users', $this->db);
-		$builder->select('UPDATE');
-		$sql = $builder->getCompiledSelect();
+        $this->assertFalse($this->db->isWriteType($sql));
+    }
 
-		$this->assertFalse($this->db->isWriteType($sql));
-	}
+    public function testTrick()
+    {
+        $builder = new BaseBuilder('users', $this->db);
+        $builder->select('UPDATE');
+        $sql = $builder->getCompiledSelect();
 
+        $this->assertFalse($this->db->isWriteType($sql));
+    }
 }
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index dc1fdd8db7bd..9dee57a3434e 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Migrations;
 
 use CodeIgniter\Database\BaseConnection;
@@ -16,392 +25,389 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class MigrationRunnerTest extends CIUnitTestCase
+final class MigrationRunnerTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
+    use DatabaseTestTrait;
 
-	protected $root;
-	protected $start;
-	protected $config;
+    protected $refresh = true;
 
-	public function setUp(): void
-	{
-		parent::setUp();
+    protected $root;
+    protected $start;
+    protected $config;
 
-		$this->root            = vfsStream::setup('root');
-		$this->start           = $this->root->url() . '/';
-		$this->config          = new Migrations();
-		$this->config->enabled = true;
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', TESTPATH . '_support/MigrationTestMigrations');
-	}
+        $this->root   = vfsStream::setup('root');
+        $this->start  = $this->root->url() . '/';
+        $this->config = new Migrations();
 
-	public function testLoadsDefaultDatabaseWhenNoneSpecified()
-	{
-		$dbConfig = new Database();
-		$runner   = new MigrationRunner($this->config);
+        $this->config->enabled = true;
 
-		$db = $this->getPrivateProperty($runner, 'db');
+        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', TESTPATH . '_support/MigrationTestMigrations');
+    }
 
-		$this->assertInstanceOf(BaseConnection::class, $db);
-		$this->assertEquals(
-			($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '' ) . $dbConfig->tests['database'],
-			$this->getPrivateProperty($db, 'database')
-		);
-		$this->assertEquals($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
-	}
+    public function testLoadsDefaultDatabaseWhenNoneSpecified()
+    {
+        $dbConfig = new Database();
+        $runner   = new MigrationRunner($this->config);
 
-	public function testGetCliMessages()
-	{
-		$runner = new MigrationRunner($this->config);
+        $db = $this->getPrivateProperty($runner, 'db');
 
-		$messages = [
-			'foo',
-			'bar',
-		];
+        $this->assertInstanceOf(BaseConnection::class, $db);
+        $this->assertSame(
+            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '') . $dbConfig->tests['database'],
+            $this->getPrivateProperty($db, 'database')
+        );
+        $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+    }
 
-		$this->setPrivateProperty($runner, 'cliMessages', $messages);
+    public function testGetCliMessages()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		$this->assertEquals($messages, $runner->getCliMessages());
-	}
+        $messages = ['foo', 'bar'];
 
-	public function testGetHistory()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->ensureTable();
+        $this->setPrivateProperty($runner, 'cliMessages', $messages);
 
-		$history = [
-			'id'        => 4,
-			'version'   => 'abc123',
-			'class'     => 'changesomething',
-			'group'     => 'default',
-			'namespace' => 'App',
-			'time'      => time(),
-			'batch'     => 1,
-		];
+        $this->assertSame($messages, $runner->getCliMessages());
+    }
 
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' ON');
-		}
+    public function testGetHistory()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->ensureTable();
 
-		$this->hasInDatabase('migrations', $history);
+        $expected = [
+            'id'        => 4,
+            'version'   => 'abc123',
+            'class'     => 'changesomething',
+            'group'     => 'default',
+            'namespace' => 'App',
+            'time'      => time(),
+            'batch'     => 1,
+        ];
 
-		$this->assertEquals($history, (array) $runner->getHistory()[0]);
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' ON');
+        }
 
-		if ($this->db->DBDriver === 'SQLSRV')
-		{
-			$this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' OFF');
+        $this->hasInDatabase('migrations', $expected);
 
-			$db = $this->getPrivateProperty($runner, 'db');
-			$db->table('migrations')->delete(['id' => 4]);
-		}
-	}
+        $history = (array) $runner->getHistory()[0];
+        $history = array_map(static function ($value) {
+            if (is_numeric($value)) {
+                return (int) $value;
+            }
 
-	public function testGetHistoryReturnsEmptyArrayWithNoResults()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->ensureTable();
+            return $value;
+        }, $history);
 
-		$this->assertEquals([], $runner->getHistory());
-	}
+        $this->assertSame($expected, $history);
 
-	public function testGetMigrationNumberAllDigits()
-	{
-		$runner = new MigrationRunner($this->config);
+        if ($this->db->DBDriver === 'SQLSRV') {
+            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' OFF');
 
-		$method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
+            $db = $this->getPrivateProperty($runner, 'db');
+            $db->table('migrations')->delete(['id' => 4]);
+        }
+    }
 
-		$this->assertEquals('20190806235100', $method('20190806235100_Foo'));
-	}
+    public function testGetHistoryReturnsEmptyArrayWithNoResults()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->ensureTable();
 
-	public function testGetMigrationNumberDashes()
-	{
-		$runner = new MigrationRunner($this->config);
+        $this->assertSame([], $runner->getHistory());
+    }
 
-		$method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
-
-		$this->assertEquals('2019-08-06-235100', $method('2019-08-06-235100_Foo'));
-	}
+    public function testGetMigrationNumberAllDigits()
+    {
+        $runner = new MigrationRunner($this->config);
 
-	public function testGetMigrationNumberUnderscores()
-	{
-		$runner = new MigrationRunner($this->config);
+        $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-		$method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
-
-		$this->assertEquals('2019_08_06_235100', $method('2019_08_06_235100_Foo'));
-	}
+        $this->assertSame('20190806235100', $method('20190806235100_Foo'));
+    }
 
-	public function testGetMigrationNumberReturnsZeroIfNoneFound()
-	{
-		$runner = new MigrationRunner($this->config);
+    public function testGetMigrationNumberDashes()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		$method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
+        $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-		$this->assertEquals('0', $method('Foo'));
-	}
+        $this->assertSame('2019-08-06-235100', $method('2019-08-06-235100_Foo'));
+    }
 
-	public function testSetSilentStoresValue()
-	{
-		$runner = new MigrationRunner($this->config);
+    public function testGetMigrationNumberUnderscores()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		$runner->setSilent(true);
-		$this->assertTrue($this->getPrivateProperty($runner, 'silent'));
+        $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-		$runner->setSilent(false);
-		$this->assertFalse($this->getPrivateProperty($runner, 'silent'));
-	}
+        $this->assertSame('2019_08_06_235100', $method('2019_08_06_235100_Foo'));
+    }
 
-	public function testSetNameStoresValue()
-	{
-		$runner = new MigrationRunner($this->config);
+    public function testGetMigrationNumberReturnsZeroIfNoneFound()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		$runner->setName('foo');
-		$this->assertEquals('foo', $this->getPrivateProperty($runner, 'name'));
-	}
+        $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-	public function testSetGroupStoresValue()
-	{
-		$runner = new MigrationRunner($this->config);
+        $this->assertSame('0', $method('Foo'));
+    }
 
-		$runner->setGroup('foo');
-		$this->assertEquals('foo', $this->getPrivateProperty($runner, 'group'));
-	}
+    public function testSetSilentStoresValue()
+    {
+        $runner = new MigrationRunner($this->config);
 
-	public function testSetNamespaceStoresValue()
-	{
-		$runner = new MigrationRunner($this->config);
+        $runner->setSilent(true);
+        $this->assertTrue($this->getPrivateProperty($runner, 'silent'));
 
-		$runner->setNamespace('foo');
-		$this->assertEquals('foo', $this->getPrivateProperty($runner, 'namespace'));
-	}
+        $runner->setSilent(false);
+        $this->assertFalse($this->getPrivateProperty($runner, 'silent'));
+    }
 
-	public function testFindMigrationsReturnsEmptyArrayWithNoneFound()
-	{
-		$config       = $this->config;
-		$config->type = 'timestamp';
-		$runner       = new MigrationRunner($config);
+    public function testSetNameStoresValue()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		//      $runner->setPath($this->start);
+        $runner->setName('foo');
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'name'));
+    }
 
-		$this->assertEquals([], $runner->findMigrations());
-	}
+    public function testSetGroupStoresValue()
+    {
+        $runner = new MigrationRunner($this->config);
 
-	public function testFindMigrationsSuccessTimestamp()
-	{
-		$config       = $this->config;
-		$config->type = 'timestamp';
-		$runner       = new MigrationRunner($config);
+        $runner->setGroup('foo');
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'group'));
+    }
 
-		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
+    public function testSetNamespaceStoresValue()
+    {
+        $runner = new MigrationRunner($this->config);
 
-		$mig1      = (object)[
-								 'name'      => 'Some_migration',
-								 'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php',
-								 'version'   => '2018-01-24-102301',
-								 'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
-								 'namespace' => 'Tests\Support\MigrationTestMigrations',
-							 ];
-		$mig1->uid = $runner->getObjectUid($mig1);
+        $runner->setNamespace('foo');
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'namespace'));
+    }
 
-		$mig2      = (object)[
-								 'name'      => 'Another_migration',
-								 'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php',
-								 'version'   => '2018-01-24-102302',
-								 'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
-								 'namespace' => 'Tests\Support\MigrationTestMigrations',
-								 'uid'       => '20180124102302Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
-							 ];
-		$mig1->uid = $runner->getObjectUid($mig1);
+    public function testFindMigrationsReturnsEmptyArrayWithNoneFound()
+    {
+        $config       = $this->config;
+        $config->type = 'timestamp';
 
-		$migrations = $runner->findMigrations();
+        $runner = new MigrationRunner($config);
+        $this->assertSame([], $runner->findMigrations());
+    }
 
-		$this->assertCount(2, $migrations);
-		$this->assertEquals($mig1, array_shift($migrations));
-		$this->assertEquals($mig2, array_shift($migrations));
-	}
+    public function testFindMigrationsSuccessTimestamp()
+    {
+        $config       = $this->config;
+        $config->type = 'timestamp';
+        $runner       = new MigrationRunner($config);
 
-	public function testMigrationThrowsDisabledException()
-	{
-		$this->expectException('CodeIgniter\Exceptions\ConfigException');
-		$this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
+        $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$config          = $this->config;
-		$config->enabled = false;
-		$runner          = new MigrationRunner($config);
-
-		$runner->setSilent(false);
+        $mig1 = (object) [
+            'version'   => '2018-01-24-102301',
+            'name'      => 'Some_migration',
+            'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php',
+            'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
+            'namespace' => 'Tests\Support\MigrationTestMigrations',
+        ];
+        $mig1->uid = $runner->getObjectUid($mig1);
 
-		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
-
-		vfsStream::copyFromFileSystem(
-			TESTPATH . '_support/MigrationTestMigrations/Database/Migrations',
-			$this->root
-		);
-
-		$this->expectException(ConfigException::class);
-		$this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
-
-		$runner->latest();
-	}
-
-	public function testVersionReturnsUpDownSuccess()
-	{
-		$forge = Database::forge();
-		$forge->dropTable('foo', true);
-
-		$config = $this->config;
-		$runner = new MigrationRunner($config);
-		$runner->setSilent(false);
-		$runner->clearHistory();
-
-		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
-
-		$runner->latest();
-		$version = $runner->getBatchEnd($runner->getLastBatch());
-
-		$this->assertEquals('2018-01-24-102302', $version);
-		$this->seeInDatabase('foo', ['key' => 'foobar']);
+        $mig2 = (object) [
+            'version'   => '2018-01-24-102302',
+            'name'      => 'Another_migration',
+            'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php',
+            'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
+            'namespace' => 'Tests\Support\MigrationTestMigrations',
+            'uid'       => '20180124102302Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
+        ];
+        $mig1->uid = $runner->getObjectUid($mig1);
 
-		$runner->regress(0);
-		$version = $runner->getBatchEnd($runner->getLastBatch());
+        $migrations = $runner->findMigrations();
 
-		$this->assertEquals('0', $version);
-		$this->assertFalse($this->db->tableExists('foo'));
-	}
-
-	public function testLatestSuccess()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->setSilent(false)
-			->setNamespace('Tests\Support\MigrationTestMigrations')
-			->clearHistory();
-
-		$runner->latest();
-		$version = $runner->getBatchEnd($runner->getLastBatch());
-
-		$this->assertEquals('2018-01-24-102302', $version);
-		$this->assertTrue(db_connect()->tableExists('foo'));
+        $this->assertCount(2, $migrations);
+        $this->assertSame((array) $mig1, (array) array_shift($migrations));
+        $this->assertSame((array) $mig2, (array) array_shift($migrations));
+    }
 
-		$this->seeInDatabase('migrations', [
-			'batch' => 1,
-		]);
-	}
-
-	public function testRegressSuccess()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->setSilent(false)
-			->setNamespace('Tests\Support\MigrationTestMigrations')
-			->clearHistory();
-
-		$runner->latest();
-		$runner->regress();
-
-		$version = $runner->getBatchEnd($runner->getLastBatch());
-
-		$this->assertEquals(0, $version);
-		$this->assertFalse(db_connect()->tableExists('foo'));
+    public function testMigrationThrowsDisabledException()
+    {
+        $this->expectException('CodeIgniter\Exceptions\ConfigException');
+        $this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
 
-		$history = $runner->getHistory();
-		$this->assertEmpty($history);
-	}
+        $config          = $this->config;
+        $config->enabled = false;
+        $runner          = new MigrationRunner($config);
+
+        $runner->setSilent(false);
+
+        $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
+
+        vfsStream::copyFromFileSystem(
+            TESTPATH . '_support/MigrationTestMigrations/Database/Migrations',
+            $this->root
+        );
+
+        $this->expectException(ConfigException::class);
+        $this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
+
+        $runner->latest();
+    }
+
+    public function testVersionReturnsUpDownSuccess()
+    {
+        $forge = Database::forge();
+        $forge->dropTable('foo', true);
+
+        $config = $this->config;
+        $runner = new MigrationRunner($config);
+        $runner->setSilent(false);
+        $runner->clearHistory();
+
+        $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
+
+        $runner->latest();
+        $version = $runner->getBatchEnd($runner->getLastBatch());
+
+        $this->assertSame('2018-01-24-102302', $version);
+        $this->seeInDatabase('foo', ['key' => 'foobar']);
+
+        $runner->regress(0);
+        $version = $runner->getBatchEnd($runner->getLastBatch());
+
+        $this->assertSame('0', $version);
+        $this->assertFalse($this->db->tableExists('foo'));
+    }
+
+    public function testLatestSuccess()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->setSilent(false)
+            ->setNamespace('Tests\Support\MigrationTestMigrations')
+            ->clearHistory();
+
+        $runner->latest();
+        $version = $runner->getBatchEnd($runner->getLastBatch());
+
+        $this->assertSame('2018-01-24-102302', $version);
+        $this->assertTrue(db_connect()->tableExists('foo'));
 
-	public function testLatestTriggersEvent()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->setSilent(false)
-			->setNamespace('Tests\Support\MigrationTestMigrations')
-			->clearHistory();
+        $this->seeInDatabase('migrations', [
+            'batch' => 1,
+        ]);
+    }
+
+    public function testRegressSuccess()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->setSilent(false)
+            ->setNamespace('Tests\Support\MigrationTestMigrations')
+            ->clearHistory();
+
+        $runner->latest();
+        $runner->regress();
+
+        $version = $runner->getBatchEnd($runner->getLastBatch());
+
+        $this->assertSame('0', $version);
+        $this->assertFalse(db_connect()->tableExists('foo'));
 
-		$result = null;
-		Events::on('migrate', function ($arg) use (&$result) {
-			$result = $arg;
-		});
+        $history = $runner->getHistory();
+        $this->assertEmpty($history);
+    }
 
-		$runner->latest();
+    public function testLatestTriggersEvent()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->setSilent(false)
+            ->setNamespace('Tests\Support\MigrationTestMigrations')
+            ->clearHistory();
 
-		$this->assertIsArray($result);
-		$this->assertEquals('latest', $result['method']);
-	}
+        $result = null;
+        Events::on('migrate', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
 
-	public function testRegressTriggersEvent()
-	{
-		$runner = new MigrationRunner($this->config);
-		$runner->setSilent(false)
-			->setNamespace('Tests\Support\MigrationTestMigrations')
-			->clearHistory();
+        $runner->latest();
 
-		$result = null;
-		Events::on('migrate', function ($arg) use (&$result) {
-			$result = $arg;
-		});
+        $this->assertIsArray($result);
+        $this->assertSame('latest', $result['method']);
+    }
 
-		$runner->latest();
-		$runner->regress();
+    public function testRegressTriggersEvent()
+    {
+        $runner = new MigrationRunner($this->config);
+        $runner->setSilent(false)
+            ->setNamespace('Tests\Support\MigrationTestMigrations')
+            ->clearHistory();
 
-		$this->assertIsArray($result);
-		$this->assertEquals('regress', $result['method']);
-	}
+        $result = null;
+        Events::on('migrate', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
 
-	public function testHistoryRecordsBatches()
-	{
-		$config = $this->config;
-		$runner = new MigrationRunner($config);
-		$runner->setSilent(false);
-		$runner->clearHistory();
-		$this->resetTables();
+        $runner->latest();
+        $runner->regress();
 
-		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
+        $this->assertIsArray($result);
+        $this->assertSame('regress', $result['method']);
+    }
 
-		$runner->latest();
-		$version = $runner->getBatchEnd($runner->getLastBatch());
+    public function testHistoryRecordsBatches()
+    {
+        $config = $this->config;
+        $runner = new MigrationRunner($config);
+        $runner->setSilent(false);
+        $runner->clearHistory();
+        $this->resetTables();
 
-		$this->assertEquals('2018-01-24-102302', $version);
+        $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$history = $runner->getHistory('tests');
-
-		$this->assertEquals(1, $history[0]->batch);
+        $runner->latest();
+        $version = $runner->getBatchEnd($runner->getLastBatch());
 
-		$this->assertEquals(1, $history[0]->batch);
-		$this->assertEquals(1, $history[1]->batch);
+        $this->assertSame('2018-01-24-102302', $version);
 
-		$this->seeInDatabase('migrations', [
-			'batch' => 1,
-		]);
-	}
-
-	public function testGetBatchVersions()
-	{
-		$config = $this->config;
-		$runner = new MigrationRunner($config);
-		$runner->setSilent(false);
-		$runner->clearHistory();
-		$this->resetTables();
+        $history = $runner->getHistory('tests');
+
+        $this->assertSame(1, (int) $history[0]->batch);
+        $this->assertSame(1, (int) $history[1]->batch);
+
+        $this->seeInDatabase('migrations', ['batch' => 1]);
+    }
+
+    public function testGetBatchVersions()
+    {
+        $config = $this->config;
+        $runner = new MigrationRunner($config);
+        $runner->setSilent(false);
+        $runner->clearHistory();
+        $this->resetTables();
 
-		$runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
-
-		$runner->latest();
+        $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
-		$this->assertEquals('2018-01-24-102301', $runner->getBatchStart(1));
-		$this->assertEquals('2018-01-24-102302', $runner->getBatchEnd(1));
-	}
+        $runner->latest();
 
-	protected function resetTables()
-	{
-		$db    = db_connect();
-		$forge = Config::forge();
+        $this->assertSame('2018-01-24-102301', $runner->getBatchStart(1));
+        $this->assertSame('2018-01-24-102302', $runner->getBatchEnd(1));
+    }
 
-		$tables = $db->listTables();
-		foreach ($tables as $table)
-		{
-			$table = str_replace('db_', '', $table);
+    protected function resetTables()
+    {
+        $forge = Config::forge();
 
-			$forge->dropTable($table, true);
-		}
-	}
+        foreach (db_connect()->listTables() as $table) {
+            $table = str_replace('db_', '', $table);
+            $forge->dropTable($table, true);
+        }
+    }
 }
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index 755954574a9a..1c1561044be0 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -1,34 +1,48 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class MigrationTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MigrationTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	public function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	public function testDBGroup()
-	{
-		$migration = new class extends Migration {
-			protected $DBGroup = 'tests';
-			function up()
-			{
-			}
-			function down()
-			{
-			}
-		};
-
-		$dbGroup = $migration->getDBGroup();
-
-		$this->assertEquals('tests', $dbGroup);
-	}
+    use DatabaseTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    public function testDBGroup()
+    {
+        $migration             = new class () extends Migration {
+            protected $DBGroup = 'tests';
+
+            public function up()
+            {
+            }
+
+            public function down()
+            {
+            }
+        };
+
+        $dbGroup = $migration->getDBGroup();
+
+        $this->assertSame('tests', $dbGroup);
+    }
 }
diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php
index 05e1f99c8df6..0be0341cc999 100644
--- a/tests/system/Database/ModelFactoryTest.php
+++ b/tests/system/Database/ModelFactoryTest.php
@@ -1,61 +1,75 @@
-<?php namespace CodeIgniter\Database;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\UserModel;
 
-class ModelFactoryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ModelFactoryTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
+    use DatabaseTestTrait;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		ModelFactory::reset();
-	}
+        ModelFactory::reset();
+    }
 
-	public function testCreateSeparateInstances()
-	{
-		$basenameModel  = ModelFactory::get('JobModel', false);
-		$namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', false);
+    public function testCreateSeparateInstances()
+    {
+        $basenameModel  = ModelFactory::get('JobModel', false);
+        $namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', false);
 
-		$this->assertInstanceOf(JobModel::class, $basenameModel);
-		$this->assertInstanceOf(JobModel::class, $namespaceModel);
-		$this->assertNotSame($basenameModel, $namespaceModel);
-	}
+        $this->assertInstanceOf(JobModel::class, $basenameModel);
+        $this->assertInstanceOf(JobModel::class, $namespaceModel);
+        $this->assertNotSame($basenameModel, $namespaceModel);
+    }
 
-	public function testCreateSharedInstance()
-	{
-		$basenameModel  = ModelFactory::get('JobModel', true);
-		$namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', true);
+    public function testCreateSharedInstance()
+    {
+        $basenameModel  = ModelFactory::get('JobModel', true);
+        $namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', true);
 
-		$this->assertSame($basenameModel, $namespaceModel);
-	}
+        $this->assertSame($basenameModel, $namespaceModel);
+    }
 
-	public function testInjection()
-	{
-		ModelFactory::injectMock('Banana', new JobModel());
+    public function testInjection()
+    {
+        ModelFactory::injectMock('Banana', new JobModel());
 
-		$this->assertInstanceOf(JobModel::class, ModelFactory::get('Banana'));
-	}
+        $this->assertInstanceOf(JobModel::class, ModelFactory::get('Banana'));
+    }
 
-	public function testReset()
-	{
-		ModelFactory::injectMock('Banana', new JobModel());
+    public function testReset()
+    {
+        ModelFactory::injectMock('Banana', new JobModel());
 
-		ModelFactory::reset();
+        ModelFactory::reset();
 
-		$this->assertNull(ModelFactory::get('Banana'));
-	}
+        $this->assertNull(ModelFactory::get('Banana'));
+    }
 
-	public function testBasenameReturnsExistingNamespaceInstance()
-	{
-		ModelFactory::injectMock(UserModel::class, new JobModel());
+    public function testBasenameReturnsExistingNamespaceInstance()
+    {
+        ModelFactory::injectMock(UserModel::class, new JobModel());
 
-		$basenameModel = ModelFactory::get('UserModel');
+        $basenameModel = ModelFactory::get('UserModel');
 
-		$this->assertInstanceOf(JobModel::class, $basenameModel);
-	}
+        $this->assertInstanceOf(JobModel::class, $basenameModel);
+    }
 }
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 6b374258d493..115ae335c5e1 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -1,45 +1,62 @@
-<?php namespace CodeIgniter\Debug;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 
-class ExceptionsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ExceptionsTest extends CIUnitTestCase
 {
-	public function testNew()
-	{
-		$actual = new Exceptions(new \Config\Exceptions(), Services::request(), Services::response());
-		$this->assertInstanceOf(Exceptions::class, $actual);
-	}
+    public function testNew()
+    {
+        $actual = new Exceptions(new \Config\Exceptions(), Services::request(), Services::response());
+        $this->assertInstanceOf(Exceptions::class, $actual);
+    }
 
-	/**
-	 * @dataProvider dirtyPathsProvider
-	 */
-	public function testCleanPaths($file, $expected)
-	{
-		$this->assertEquals($expected, Exceptions::cleanPath($file));
-	}
+    /**
+     * @dataProvider dirtyPathsProvider
+     *
+     * @param mixed $file
+     * @param mixed $expected
+     */
+    public function testCleanPaths($file, $expected)
+    {
+        $this->assertSame($expected, Exceptions::cleanPath($file));
+    }
 
-	public function dirtyPathsProvider()
-	{
-		$ds = DIRECTORY_SEPARATOR;
+    public function dirtyPathsProvider()
+    {
+        $ds = DIRECTORY_SEPARATOR;
 
-		return [
-			[
-				APPPATH . 'Config' . $ds . 'App.php',
-				'APPPATH' . $ds . 'Config' . $ds . 'App.php',
-			],
-			[
-				SYSTEMPATH . 'CodeIgniter.php',
-				'SYSTEMPATH' . $ds . 'CodeIgniter.php',
-			],
-			[
-				VENDORPATH . 'autoload.php',
-				'VENDORPATH' . $ds . 'autoload.php',
-			],
-			[
-				FCPATH . 'index.php',
-				'FCPATH' . $ds . 'index.php',
-			],
-		];
-	}
+        return [
+            [
+                APPPATH . 'Config' . $ds . 'App.php',
+                'APPPATH' . $ds . 'Config' . $ds . 'App.php',
+            ],
+            [
+                SYSTEMPATH . 'CodeIgniter.php',
+                'SYSTEMPATH' . $ds . 'CodeIgniter.php',
+            ],
+            [
+                VENDORPATH . 'autoload.php',
+                'VENDORPATH' . $ds . 'autoload.php',
+            ],
+            [
+                FCPATH . 'index.php',
+                'FCPATH' . $ds . 'index.php',
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index d637c27a35e7..7b7b75199ea9 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -1,112 +1,124 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class TimerTest extends CIUnitTestCase
 {
-	/**
-	 * We do most of our tests in this one method. While I usually frown
-	 * on this, it's handy here so that we don't stall the tests any
-	 * longer then needed.
-	 *
-	 * @timeLimit 1.5
-	 */
-	public function testStoresTimers()
-	{
-		$timer = new Timer();
-
-		$timer->start('test1');
-		sleep(1);
-		$timer->stop('test1');
-
-		$timers = $timer->getTimers();
-
-		$this->assertCount(1, $timers, 'No timers were stored.');
-		$this->assertArrayHasKey('test1', $timers, 'No "test1" array found.');
-		$this->assertArrayHasKey('start', $timers['test1'], 'No "start" value found.');
-		$this->assertArrayHasKey('end', $timers['test1'], 'No "end" value found.');
-
-		// Since the timer has been stopped - it will have a value. In this
-		// case it should be over 1 second.
-		$this->assertArrayHasKey('duration', $timers['test1'], 'No duration was calculated.');
-		$this->assertGreaterThanOrEqual(1.0, $timers['test1']['duration']);
-	}
-
-	/**
-	 * @timeLimit 1.5
-	 */
-	public function testAutoCalcsTimerEnd()
-	{
-		$timer = new Timer();
-
-		$timer->start('test1');
-		sleep(1);
-
-		$timers = $timer->getTimers();
-
-		$this->assertArrayHasKey('duration', $timers['test1'], 'No duration was calculated.');
-		$this->assertGreaterThanOrEqual(1.0, $timers['test1']['duration']);
-	}
-
-	/**
-	 * @timeLimit 1.5
-	 */
-	public function testElapsedTimeGivesSameResultAsTimersArray()
-	{
-		$timer = new Timer();
-
-		$timer->start('test1');
-		sleep(1);
-		$timer->stop('test1');
-
-		$timers = $timer->getTimers();
-
-		$expected = $timers['test1']['duration'];
-
-		$this->assertEquals($expected, $timer->getElapsedTime('test1'));
-	}
-
-	public function testThrowsExceptionStoppingNonTimer()
-	{
-		$this->expectException('RunTimeException');
-
-		$timer = new Timer();
-
-		$timer->stop('test1');
-	}
-
-	public function testLongExecutionTime()
-	{
-		$timer = new Timer();
-		$timer->start('longjohn', strtotime('-11 minutes'));
-		$this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
-	}
-
-	public function testLongExecutionTimeThroughCommonFunc()
-	{
-		$timer = new Timer();
-		$timer->start('longjohn', strtotime('-11 minutes'));
-		$this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
-	}
-
-	/**
-	 * @timeLimit 1.5
-	 */
-	public function testCommonStartStop()
-	{
-		timer('test1');
-		sleep(1);
-		timer('test1');
-
-		$this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('test1'));
-	}
-
-	public function testReturnsNullGettingElapsedTimeOfNonTimer()
-	{
-		$timer = new Timer();
-
-		$this->assertNull($timer->getElapsedTime('test1'));
-	}
+    /**
+     * We do most of our tests in this one method. While I usually frown
+     * on this, it's handy here so that we don't stall the tests any
+     * longer then needed.
+     *
+     * @timeLimit 1.5
+     */
+    public function testStoresTimers()
+    {
+        $timer = new Timer();
+
+        $timer->start('test1');
+        sleep(1);
+        $timer->stop('test1');
+
+        $timers = $timer->getTimers();
+
+        $this->assertCount(1, $timers, 'No timers were stored.');
+        $this->assertArrayHasKey('test1', $timers, 'No "test1" array found.');
+        $this->assertArrayHasKey('start', $timers['test1'], 'No "start" value found.');
+        $this->assertArrayHasKey('end', $timers['test1'], 'No "end" value found.');
+
+        // Since the timer has been stopped - it will have a value. In this
+        // case it should be over 1 second.
+        $this->assertArrayHasKey('duration', $timers['test1'], 'No duration was calculated.');
+        $this->assertGreaterThanOrEqual(1.0, $timers['test1']['duration']);
+    }
+
+    /**
+     * @timeLimit 1.5
+     */
+    public function testAutoCalcsTimerEnd()
+    {
+        $timer = new Timer();
+
+        $timer->start('test1');
+        sleep(1);
+
+        $timers = $timer->getTimers();
+
+        $this->assertArrayHasKey('duration', $timers['test1'], 'No duration was calculated.');
+        $this->assertGreaterThanOrEqual(1.0, $timers['test1']['duration']);
+    }
+
+    /**
+     * @timeLimit 1.5
+     */
+    public function testElapsedTimeGivesSameResultAsTimersArray()
+    {
+        $timer = new Timer();
+
+        $timer->start('test1');
+        sleep(1);
+        $timer->stop('test1');
+
+        $timers = $timer->getTimers();
+
+        $expected = $timers['test1']['duration'];
+
+        $this->assertSame($expected, $timer->getElapsedTime('test1'));
+    }
+
+    public function testThrowsExceptionStoppingNonTimer()
+    {
+        $this->expectException('RunTimeException');
+
+        $timer = new Timer();
+
+        $timer->stop('test1');
+    }
+
+    public function testLongExecutionTime()
+    {
+        $timer = new Timer();
+        $timer->start('longjohn', strtotime('-11 minutes'));
+        $this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+    }
+
+    public function testLongExecutionTimeThroughCommonFunc()
+    {
+        $timer = new Timer();
+        $timer->start('longjohn', strtotime('-11 minutes'));
+        $this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+    }
+
+    /**
+     * @timeLimit 1.5
+     */
+    public function testCommonStartStop()
+    {
+        timer('test1');
+        sleep(1);
+        timer('test1');
+
+        $this->assertGreaterThanOrEqual(1.0, timer()->getElapsedTime('test1'));
+    }
+
+    public function testReturnsNullGettingElapsedTimeOfNonTimer()
+    {
+        $timer = new Timer();
+
+        $this->assertNull($timer->getElapsedTime('test1'));
+    }
 }
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
index 36355fb40dd5..c0a787bb5ef0 100644
--- a/tests/system/DebugTraceableTraitTest.php
+++ b/tests/system/DebugTraceableTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Exceptions\DebugTraceableTrait;
@@ -7,19 +16,21 @@
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
+ * @internal
+ *
  * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
  */
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
-	public function testFactoryInstanceReturnsWhereItIsRaised(): void
-	{
-		$e1 = new FrameworkException('I am on line 16');
-		$e2 = FrameworkException::forEnabledZlibOutputCompression();
+    public function testFactoryInstanceReturnsWhereItIsRaised(): void
+    {
+        $e1 = new FrameworkException('I am on line 27.');
+        $e2 = FrameworkException::forEnabledZlibOutputCompression();
 
-		$this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
-		$this->assertSame(16, $e1->getLine());
-		$this->assertSame(__FILE__, $e1->getFile());
-		$this->assertSame(17, $e2->getLine());
-		$this->assertSame(__FILE__, $e2->getFile());
-	}
+        $this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
+        $this->assertSame(27, $e1->getLine());
+        $this->assertSame(__FILE__, $e1->getFile());
+        $this->assertSame(28, $e2->getLine());
+        $this->assertSame(__FILE__, $e2->getFile());
+    }
 }
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index 54e32b8a5d75..e4fc3ec26780 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -1,127 +1,142 @@
-<?php namespace CodeIgniter\Email;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Email;
 
 use CodeIgniter\Events\Events;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockEmail;
 
-class EmailTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EmailTest extends CIUnitTestCase
 {
-	public function testEmailValidation()
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new Email($config);
-		$email->setTo('invalid');
-		$this->assertStringContainsString('Invalid email address: invalid', $email->printDebugger());
-	}
-
-	public function autoClearProvider()
-	{
-		return [
-			'autoclear'     => [true],
-			'not autoclear' => [false],
-		];
-	}
-
-	/**
-	 * @dataProvider autoClearProvider
-	 */
-	public function testEmailSendWithClearance($autoClear)
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-
-		$this->assertTrue($email->send($autoClear));
-
-		if (! $autoClear)
-		{
-			$this->assertEquals('foo@foo.com', $email->archive['recipients'][0]);
-		}
-	}
-
-	public function testEmailSendStoresArchive()
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-		$email->setFrom('bar@foo.com');
-		$email->setSubject('Archive Test');
-
-		$this->assertTrue($email->send());
-
-		$this->assertNotEmpty($email->archive);
-		$this->assertEquals(['foo@foo.com'], $email->archive['recipients']);
-		$this->assertEquals('bar@foo.com', $email->archive['fromEmail']);
-		$this->assertEquals('Archive Test', $email->archive['subject']);
-	}
-
-	public function testAutoClearLeavesArchive()
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-
-		$this->assertTrue($email->send(true));
-
-		$this->assertNotEmpty($email->archive);
-	}
-
-	public function testEmailSendRepeatUpdatesArchive()
-	{
-		$config = config('Email');
-		$email  = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-		$email->setFrom('bar@foo.com');
-
-		$this->assertTrue($email->send());
-
-		$email->setFrom('');
-		$email->setSubject('Archive Test');
-		$this->assertTrue($email->send());
-
-		$this->assertEquals('', $email->archive['fromEmail']);
-		$this->assertEquals('Archive Test', $email->archive['subject']);
-	}
-
-	public function testSuccessDoesTriggerEvent()
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-
-		$result = null;
-
-		Events::on('email', function ($arg) use (&$result) {
-			$result = $arg;
-		});
-
-		$this->assertTrue($email->send());
-
-		$this->assertIsArray($result);
-		$this->assertEquals(['foo@foo.com'], $result['recipients']);
-	}
-
-	public function testFailureDoesNotTriggerEvent()
-	{
-		$config           = config('Email');
-		$config->validate = true;
-		$email            = new MockEmail($config);
-		$email->setTo('foo@foo.com');
-		$email->returnValue = false;
-
-		$result = null;
-
-		Events::on('email', function ($arg) use (&$result) {
-			$result = $arg;
-		});
-
-		$this->assertFalse($email->send());
-
-		$this->assertNull($result);
-	}
+    public function testEmailValidation()
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new Email($config);
+        $email->setTo('invalid');
+        $this->assertStringContainsString('Invalid email address: invalid', $email->printDebugger());
+    }
+
+    public function autoClearProvider()
+    {
+        return [
+            'autoclear'     => [true],
+            'not autoclear' => [false],
+        ];
+    }
+
+    /**
+     * @dataProvider autoClearProvider
+     *
+     * @param mixed $autoClear
+     */
+    public function testEmailSendWithClearance($autoClear)
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+
+        $this->assertTrue($email->send($autoClear));
+
+        if (! $autoClear) {
+            $this->assertSame('foo@foo.com', $email->archive['recipients'][0]);
+        }
+    }
+
+    public function testEmailSendStoresArchive()
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+        $email->setFrom('bar@foo.com');
+        $email->setSubject('Archive Test');
+
+        $this->assertTrue($email->send());
+
+        $this->assertNotEmpty($email->archive);
+        $this->assertSame(['foo@foo.com'], $email->archive['recipients']);
+        $this->assertSame('bar@foo.com', $email->archive['fromEmail']);
+        $this->assertSame('Archive Test', $email->archive['subject']);
+    }
+
+    public function testAutoClearLeavesArchive()
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+
+        $this->assertTrue($email->send(true));
+
+        $this->assertNotEmpty($email->archive);
+    }
+
+    public function testEmailSendRepeatUpdatesArchive()
+    {
+        $config = config('Email');
+        $email  = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+        $email->setFrom('bar@foo.com');
+
+        $this->assertTrue($email->send());
+
+        $email->setFrom('');
+        $email->setSubject('Archive Test');
+        $this->assertTrue($email->send());
+
+        $this->assertSame('', $email->archive['fromEmail']);
+        $this->assertSame('Archive Test', $email->archive['subject']);
+    }
+
+    public function testSuccessDoesTriggerEvent()
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+
+        $result = null;
+
+        Events::on('email', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
+
+        $this->assertTrue($email->send());
+
+        $this->assertIsArray($result);
+        $this->assertSame(['foo@foo.com'], $result['recipients']);
+    }
+
+    public function testFailureDoesNotTriggerEvent()
+    {
+        $config           = config('Email');
+        $config->validate = true;
+        $email            = new MockEmail($config);
+        $email->setTo('foo@foo.com');
+        $email->returnValue = false;
+
+        $result = null;
+
+        Events::on('email', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
+
+        $this->assertFalse($email->send());
+
+        $this->assertNull($result);
+    }
 }
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 11cd9b4356ab..a1f6085a33a6 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -1,142 +1,153 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption;
 
-use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 use Config\Services;
 
-class EncryptionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EncryptionTest extends CIUnitTestCase
 {
-	/**
-	 * @var \CodeIgniter\Encryption\Encryption
-	 */
-	protected $encryption;
-
-	protected function setUp(): void
-	{
-		$this->encryption = new Encryption();
-	}
-
-	/**
-	 * __construct test
-	 *
-	 * Covers behavior with config encryption key set or not
-	 */
-	public function testConstructor()
-	{
-		// Assume no configuration from set_up()
-		$this->assertEmpty($this->encryption->key);
-
-		// Try with an empty value
-		$config           = new EncryptionConfig();
-		$this->encryption = new Encryption($config);
-		$this->assertEmpty($this->encryption->key);
-
-		// try a different key
-		$ikm              = 'Secret stuff';
-		$config->key      = $ikm;
-		$this->encryption = new Encryption($config);
-		$this->assertEquals($ikm, $this->encryption->key);
-	}
-
-	/**
-	 * Covers behavior with invalid parameters
-	 */
-	public function testBadDriver()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		// ask for a bad driver
-		$config         = new EncryptionConfig();
-		$config->driver = 'Bogus';
-		$config->key    = 'anything';
-
-		$this->encryption->initialize($config);
-	}
-
-	/**
-	 * Covers behavior with invalid parameters
-	 */
-	public function testMissingDriver()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		// ask for a bad driver
-		$config         = new EncryptionConfig();
-		$config->driver = '';
-		$config->key    = 'anything';
-
-		$this->encryption->initialize($config);
-	}
-
-	public function testKeyCreation()
-	{
-		$this->assertNotEmpty($this->encryption->createKey());
-		$this->assertEquals(32, strlen($this->encryption->createKey()));
-		$this->assertEquals(16, strlen($this->encryption->createKey(16)));
-	}
-
-	public function testServiceSuccess()
-	{
-		$config         = new EncryptionConfig();
-		$config->driver = 'OpenSSL';
-		$config->key    = 'anything';
-
-		$encrypter = Services::encrypter($config);
-		$this->assertInstanceOf(EncrypterInterface::class, $encrypter);
-	}
-
-	public function testServiceFailure()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		// ask for a bad driver
-		$config         = new EncryptionConfig();
-		$config->driver = 'Kazoo';
-		$config->key    = 'anything';
-
-		Services::encrypter($config);
-	}
-
-	public function testServiceWithoutKey()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		Services::encrypter();
-	}
-
-	public function testServiceShared()
-	{
-		$config         = new EncryptionConfig();
-		$config->driver = 'OpenSSL';
-		$config->key    = 'anything';
-
-		$encrypter = Services::encrypter($config, true);
-
-		$config->key = 'Abracadabra';
-		$encrypter   = Services::encrypter($config, true);
-		$this->assertEquals('anything', $encrypter->key);
-	}
-
-	public function testMagicIssetTrue()
-	{
-		$this->assertTrue(isset($this->encryption->digest));
-	}
-
-	public function testMagicIssetFalse()
-	{
-		$this->assertFalse(isset($this->encryption->bogus));
-	}
-
-	public function testMagicGet()
-	{
-		$this->assertEquals('SHA512', $this->encryption->digest);
-	}
-
-	public function testMagicGetMissing()
-	{
-		$this->assertNull($this->encryption->bogus);
-	}
+    /**
+     * @var \CodeIgniter\Encryption\Encryption
+     */
+    protected $encryption;
+
+    protected function setUp(): void
+    {
+        $this->encryption = new Encryption();
+    }
+
+    /**
+     * __construct test
+     *
+     * Covers behavior with config encryption key set or not
+     */
+    public function testConstructor()
+    {
+        // Assume no configuration from set_up()
+        $this->assertEmpty($this->encryption->key);
+
+        // Try with an empty value
+        $config           = new EncryptionConfig();
+        $this->encryption = new Encryption($config);
+        $this->assertEmpty($this->encryption->key);
+
+        // try a different key
+        $ikm              = 'Secret stuff';
+        $config->key      = $ikm;
+        $this->encryption = new Encryption($config);
+        $this->assertSame($ikm, $this->encryption->key);
+    }
+
+    /**
+     * Covers behavior with invalid parameters
+     */
+    public function testBadDriver()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        // ask for a bad driver
+        $config         = new EncryptionConfig();
+        $config->driver = 'Bogus';
+        $config->key    = 'anything';
+
+        $this->encryption->initialize($config);
+    }
+
+    /**
+     * Covers behavior with invalid parameters
+     */
+    public function testMissingDriver()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        // ask for a bad driver
+        $config         = new EncryptionConfig();
+        $config->driver = '';
+        $config->key    = 'anything';
+
+        $this->encryption->initialize($config);
+    }
+
+    public function testKeyCreation()
+    {
+        $this->assertNotEmpty($this->encryption->createKey());
+        $this->assertSame(32, strlen($this->encryption->createKey()));
+        $this->assertSame(16, strlen($this->encryption->createKey(16)));
+    }
+
+    public function testServiceSuccess()
+    {
+        $config         = new EncryptionConfig();
+        $config->driver = 'OpenSSL';
+        $config->key    = 'anything';
+
+        $encrypter = Services::encrypter($config);
+        $this->assertInstanceOf(EncrypterInterface::class, $encrypter);
+    }
+
+    public function testServiceFailure()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        // ask for a bad driver
+        $config         = new EncryptionConfig();
+        $config->driver = 'Kazoo';
+        $config->key    = 'anything';
+
+        Services::encrypter($config);
+    }
+
+    public function testServiceWithoutKey()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        Services::encrypter();
+    }
+
+    public function testServiceShared()
+    {
+        $config         = new EncryptionConfig();
+        $config->driver = 'OpenSSL';
+        $config->key    = 'anything';
+
+        $encrypter = Services::encrypter($config, true);
+
+        $config->key = 'Abracadabra';
+        $encrypter   = Services::encrypter($config, true);
+        $this->assertSame('anything', $encrypter->key);
+    }
+
+    public function testMagicIssetTrue()
+    {
+        $this->assertTrue(isset($this->encryption->digest));
+    }
+
+    public function testMagicIssetFalse()
+    {
+        $this->assertFalse(isset($this->encryption->bogus));
+    }
+
+    public function testMagicGet()
+    {
+        $this->assertSame('SHA512', $this->encryption->digest);
+    }
+
+    public function testMagicGetMissing()
+    {
+        $this->assertNull($this->encryption->bogus);
+    }
 }
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index a6b69c5462c0..89886b6f8901 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -1,128 +1,138 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
-use CodeIgniter\Encryption\Handlers\OpenSSLHandler;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
-class OpenSSLHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class OpenSSLHandlerTest extends CIUnitTestCase
 {
-	/**
-	 * @var \CodeIgniter\Encryption\Encryption
-	 */
-	protected $encryption;
-
-	protected function setUp(): void
-	{
-		if (! extension_loaded('openssl'))
-		{
-			$this->markTestSkipped('OpenSSL is not available.');
-		}
-
-		$this->encryption = new Encryption();
-	}
-
-	/**
-	 * Sanity test
-	 */
-	public function testSanity()
-	{
-		$params         = new EncryptionConfig();
-		$params->driver = 'OpenSSL';
-		$params->key    = 'Something other than an empty string';
-
-		$encrypter = $this->encryption->initialize($params);
-
-		$this->assertEquals('AES-256-CTR', $encrypter->cipher);
-		$this->assertEquals('Something other than an empty string', $encrypter->key);
-	}
-
-	/**
-	 * initialize(), encrypt(), decrypt() test
-	 *
-	 * Testing the three methods separately is not realistic as they are
-	 * designed to work together.
-	 */
-	public function testSimple()
-	{
-		$params         = new EncryptionConfig();
-		$params->driver = 'OpenSSL';
-		$params->key    = '\xd0\xc9\x08\xc4\xde\x52\x12\x6e\xf8\xcc\xdb\x03\xea\xa0\x3a\x5c';
-		// Default state (AES-256/Rijndael-256 in CTR mode)
-		$encrypter = $this->encryption->initialize($params);
-
-		// Was the key properly set?
-		$this->assertEquals($params->key, $encrypter->key);
-
-		// simple encrypt/decrypt, default parameters
-		$message1 = 'This is a plain-text message.';
-		$this->assertEquals($message1, $encrypter->decrypt($encrypter->encrypt($message1)));
-		$message2 = 'This is a different plain-text message.';
-		$this->assertEquals($message2, $encrypter->decrypt($encrypter->encrypt($message2)));
-		$this->assertNotEquals($message2, $encrypter->decrypt($encrypter->encrypt($message1)));
-	}
-
-	/**
-	 * Starter key needed
-	 */
-	public function testWithoutKey()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$encrypter = new OpenSSLHandler();
-		$message1  = 'This is a plain-text message.';
-		$encrypter->encrypt($message1, ['key' => '']);
-	}
-
-	public function testWithKeyString()
-	{
-		$key       = 'abracadabra';
-		$encrypter = new OpenSSLHandler();
-		$message1  = 'This is a plain-text message.';
-		$encoded   = $encrypter->encrypt($message1, $key);
-		$this->assertEquals($message1, $encrypter->decrypt($encoded, $key));
-	}
-
-	/**
-	 * Authentication will fail decrypting with the wrong key
-	 */
-	public function testWithWrongKeyString()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$key1      = 'abracadabra';
-		$encrypter = new OpenSSLHandler();
-		$message1  = 'This is a plain-text message.';
-		$encoded   = $encrypter->encrypt($message1, $key1);
-		$this->assertNotEquals($message1, $encoded);
-		$key2 = 'Holy cow, batman!';
-		$this->assertNotEquals($message1, $encrypter->decrypt($encoded, $key2));
-	}
-
-	public function testWithKeyArray()
-	{
-		$key       = 'abracadabra';
-		$encrypter = new OpenSSLHandler();
-		$message1  = 'This is a plain-text message.';
-		$encoded   = $encrypter->encrypt($message1, ['key' => $key]);
-		$this->assertEquals($message1, $encrypter->decrypt($encoded, ['key' => $key]));
-	}
-
-	/**
-	 * Authentication will fail decrypting with the wrong key
-	 */
-	public function testWithWrongKeyArray()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$key1      = 'abracadabra';
-		$encrypter = new OpenSSLHandler();
-		$message1  = 'This is a plain-text message.';
-		$encoded   = $encrypter->encrypt($message1, ['key' => $key1]);
-		$this->assertNotEquals($message1, $encoded);
-		$key2 = 'Holy cow, batman!';
-		$this->assertNotEquals($message1, $encrypter->decrypt($encoded, ['key' => $key2]));
-	}
+    /**
+     * @var \CodeIgniter\Encryption\Encryption
+     */
+    protected $encryption;
+
+    protected function setUp(): void
+    {
+        if (! extension_loaded('openssl')) {
+            $this->markTestSkipped('OpenSSL is not available.');
+        }
+
+        $this->encryption = new Encryption();
+    }
+
+    /**
+     * Sanity test
+     */
+    public function testSanity()
+    {
+        $params         = new EncryptionConfig();
+        $params->driver = 'OpenSSL';
+        $params->key    = 'Something other than an empty string';
+
+        $encrypter = $this->encryption->initialize($params);
+
+        $this->assertSame('AES-256-CTR', $encrypter->cipher);
+        $this->assertSame('Something other than an empty string', $encrypter->key);
+    }
+
+    /**
+     * initialize(), encrypt(), decrypt() test
+     *
+     * Testing the three methods separately is not realistic as they are
+     * designed to work together.
+     */
+    public function testSimple()
+    {
+        $params         = new EncryptionConfig();
+        $params->driver = 'OpenSSL';
+        $params->key    = '\xd0\xc9\x08\xc4\xde\x52\x12\x6e\xf8\xcc\xdb\x03\xea\xa0\x3a\x5c';
+        // Default state (AES-256/Rijndael-256 in CTR mode)
+        $encrypter = $this->encryption->initialize($params);
+
+        // Was the key properly set?
+        $this->assertSame($params->key, $encrypter->key);
+
+        // simple encrypt/decrypt, default parameters
+        $message1 = 'This is a plain-text message.';
+        $this->assertSame($message1, $encrypter->decrypt($encrypter->encrypt($message1)));
+        $message2 = 'This is a different plain-text message.';
+        $this->assertSame($message2, $encrypter->decrypt($encrypter->encrypt($message2)));
+        $this->assertNotSame($message2, $encrypter->decrypt($encrypter->encrypt($message1)));
+    }
+
+    /**
+     * Starter key needed
+     */
+    public function testWithoutKey()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $encrypter = new OpenSSLHandler();
+        $message1  = 'This is a plain-text message.';
+        $encrypter->encrypt($message1, ['key' => '']);
+    }
+
+    public function testWithKeyString()
+    {
+        $key       = 'abracadabra';
+        $encrypter = new OpenSSLHandler();
+        $message1  = 'This is a plain-text message.';
+        $encoded   = $encrypter->encrypt($message1, $key);
+        $this->assertSame($message1, $encrypter->decrypt($encoded, $key));
+    }
+
+    /**
+     * Authentication will fail decrypting with the wrong key
+     */
+    public function testWithWrongKeyString()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $key1      = 'abracadabra';
+        $encrypter = new OpenSSLHandler();
+        $message1  = 'This is a plain-text message.';
+        $encoded   = $encrypter->encrypt($message1, $key1);
+        $this->assertNotSame($message1, $encoded);
+        $key2 = 'Holy cow, batman!';
+        $this->assertNotSame($message1, $encrypter->decrypt($encoded, $key2));
+    }
+
+    public function testWithKeyArray()
+    {
+        $key       = 'abracadabra';
+        $encrypter = new OpenSSLHandler();
+        $message1  = 'This is a plain-text message.';
+        $encoded   = $encrypter->encrypt($message1, ['key' => $key]);
+        $this->assertSame($message1, $encrypter->decrypt($encoded, ['key' => $key]));
+    }
+
+    /**
+     * Authentication will fail decrypting with the wrong key
+     */
+    public function testWithWrongKeyArray()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $key1      = 'abracadabra';
+        $encrypter = new OpenSSLHandler();
+        $message1  = 'This is a plain-text message.';
+        $encoded   = $encrypter->encrypt($message1, ['key' => $key1]);
+        $this->assertNotSame($message1, $encoded);
+        $key2 = 'Holy cow, batman!';
+        $this->assertNotSame($message1, $encrypter->decrypt($encoded, ['key' => $key2]));
+    }
 }
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index dd0ffdf30fc9..fc5f353d2ffb 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -1,115 +1,126 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
-class SodiumHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SodiumHandlerTest extends CIUnitTestCase
 {
-	/**
-	 * @var \CodeIgniter\Encryption\Encryption
-	 */
-	protected $encryption;
-
-	/**
-	 * @var \Config\Encryption
-	 */
-	protected $config;
-
-	protected function setUp(): void
-	{
-		if (! extension_loaded('sodium'))
-		{
-			$this->markTestSkipped('Libsodium is not available.');
-		}
-
-		parent::setUp();
-
-		$this->config         = new EncryptionConfig();
-		$this->config->driver = 'Sodium';
-		$this->config->key    = sodium_crypto_secretbox_keygen();
-		$this->encryption     = new Encryption($this->config);
-	}
-
-	public function testPropertiesGetter()
-	{
-		$this->config->key       = sodium_crypto_secretbox_keygen();
-		$this->config->blockSize = 256;
-		$encrypter               = $this->encryption->initialize($this->config);
-
-		$this->assertSame($this->config->key, $encrypter->key);
-		$this->assertSame($this->config->blockSize, $encrypter->blockSize);
-		$this->assertNull($encrypter->driver);
-	}
-
-	public function testEmptyKeyThrowsErrorOnInitialize()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$this->config->key = '';
-		$this->encryption->initialize($this->config);
-	}
-
-	public function testEmptyKeyThrowsErrorOnEncrypt()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$encrypter = $this->encryption->initialize($this->config);
-		$encrypter->encrypt('Some message to encrypt', '');
-	}
-
-	public function testInvalidBlockSizeThrowsErrorOnEncrypt()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-		$this->config->blockSize = -1;
-
-		$encrypter = $this->encryption->initialize($this->config);
-		$encrypter->encrypt('Some message.');
-	}
-
-	public function testEmptyKeyThrowsErrorOnDecrypt()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$encrypter  = $this->encryption->initialize($this->config);
-		$ciphertext = $encrypter->encrypt('Some message to encrypt');
-		// After encrypt, the message and key are wiped from buffer
-		$encrypter->decrypt($ciphertext);
-	}
-
-	public function testInvalidBlockSizeThrowsErrorOnDecrypt()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-		$key = $this->config->key;
-
-		$encrypter  = $this->encryption->initialize($this->config);
-		$ciphertext = $encrypter->encrypt('Some message.');
-		// After encrypt, the message and key are wiped from buffer.
-		$encrypter->decrypt($ciphertext, ['key' => $key, 'blockSize' => 0]);
-	}
-
-	public function testTruncatedMessageThrowsErrorOnDecrypt()
-	{
-		$this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
-
-		$encrypter  = $this->encryption->initialize($this->config);
-		$ciphertext = $encrypter->encrypt('Some message to encrypt');
-		$truncated  = mb_substr($ciphertext, 0, 24, '8bit');
-		$encrypter->decrypt($truncated, ['blockSize' => 256, 'key' => sodium_crypto_secretbox_keygen()]);
-	}
-
-	public function testDecryptingMessages()
-	{
-		$key = sodium_crypto_secretbox_keygen();
-		$msg = 'A plaintext message for you.';
-
-		$this->config->key = $key;
-		$encrypter         = $this->encryption->initialize($this->config);
-		$ciphertext        = $encrypter->encrypt($msg);
-
-		$this->assertSame($msg, $encrypter->decrypt($ciphertext, $key));
-		$this->assertNotSame('A plain-text message for you.', $encrypter->decrypt($ciphertext, $key));
-	}
+    /**
+     * @var \CodeIgniter\Encryption\Encryption
+     */
+    protected $encryption;
+
+    /**
+     * @var \Config\Encryption
+     */
+    protected $config;
+
+    protected function setUp(): void
+    {
+        if (! extension_loaded('sodium')) {
+            $this->markTestSkipped('Libsodium is not available.');
+        }
+
+        parent::setUp();
+
+        $this->config         = new EncryptionConfig();
+        $this->config->driver = 'Sodium';
+        $this->config->key    = sodium_crypto_secretbox_keygen();
+        $this->encryption     = new Encryption($this->config);
+    }
+
+    public function testPropertiesGetter()
+    {
+        $this->config->key       = sodium_crypto_secretbox_keygen();
+        $this->config->blockSize = 256;
+        $encrypter               = $this->encryption->initialize($this->config);
+
+        $this->assertSame($this->config->key, $encrypter->key);
+        $this->assertSame($this->config->blockSize, $encrypter->blockSize);
+        $this->assertNull($encrypter->driver);
+    }
+
+    public function testEmptyKeyThrowsErrorOnInitialize()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $this->config->key = '';
+        $this->encryption->initialize($this->config);
+    }
+
+    public function testEmptyKeyThrowsErrorOnEncrypt()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $encrypter = $this->encryption->initialize($this->config);
+        $encrypter->encrypt('Some message to encrypt', '');
+    }
+
+    public function testInvalidBlockSizeThrowsErrorOnEncrypt()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->config->blockSize = -1;
+
+        $encrypter = $this->encryption->initialize($this->config);
+        $encrypter->encrypt('Some message.');
+    }
+
+    public function testEmptyKeyThrowsErrorOnDecrypt()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $encrypter  = $this->encryption->initialize($this->config);
+        $ciphertext = $encrypter->encrypt('Some message to encrypt');
+        // After encrypt, the message and key are wiped from buffer
+        $encrypter->decrypt($ciphertext);
+    }
+
+    public function testInvalidBlockSizeThrowsErrorOnDecrypt()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $key = $this->config->key;
+
+        $encrypter  = $this->encryption->initialize($this->config);
+        $ciphertext = $encrypter->encrypt('Some message.');
+        // After encrypt, the message and key are wiped from buffer.
+        $encrypter->decrypt($ciphertext, ['key' => $key, 'blockSize' => 0]);
+    }
+
+    public function testTruncatedMessageThrowsErrorOnDecrypt()
+    {
+        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+
+        $encrypter  = $this->encryption->initialize($this->config);
+        $ciphertext = $encrypter->encrypt('Some message to encrypt');
+        $truncated  = mb_substr($ciphertext, 0, 24, '8bit');
+        $encrypter->decrypt($truncated, ['blockSize' => 256, 'key' => sodium_crypto_secretbox_keygen()]);
+    }
+
+    public function testDecryptingMessages()
+    {
+        $key = sodium_crypto_secretbox_keygen();
+        $msg = 'A plaintext message for you.';
+
+        $this->config->key = $key;
+        $encrypter         = $this->encryption->initialize($this->config);
+        $ciphertext        = $encrypter->encrypt($msg);
+
+        $this->assertSame($msg, $encrypter->decrypt($ciphertext, $key));
+        $this->assertNotSame('A plain-text message for you.', $encrypter->decrypt($ciphertext, $key));
+    }
 }
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
new file mode 100644
index 000000000000..c995f5d7c191
--- /dev/null
+++ b/tests/system/Entity/EntityTest.php
@@ -0,0 +1,1137 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Entity;
+
+use Closure;
+use CodeIgniter\Entity\Exceptions\CastException;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ReflectionHelper;
+use DateTime;
+use ReflectionException;
+use stdClass;
+use Tests\Support\Entity\Cast\CastBase64;
+use Tests\Support\Entity\Cast\CastPassParameters;
+use Tests\Support\Entity\Cast\NotExtendsBaseCast;
+use Tests\Support\SomeEntity;
+
+/**
+ * @internal
+ */
+final class EntityTest extends CIUnitTestCase
+{
+    use ReflectionHelper;
+
+    public function testSimpleSetAndGet()
+    {
+        $entity = $this->getEntity();
+
+        $entity->foo = 'to wong';
+
+        $this->assertSame('to wong', $entity->foo);
+    }
+
+    public function testGetterSetters()
+    {
+        $entity = $this->getEntity();
+
+        $entity->bar = 'thanks';
+
+        $this->assertSame('bar:thanks:bar', $entity->bar);
+    }
+
+    public function testUnsetUnsetsAttribute()
+    {
+        $entity = $this->getEntity();
+
+        $this->assertSame('sumfin', $entity->default);
+
+        $entity->default = 'else';
+
+        $this->assertSame('else', $entity->default);
+
+        unset($entity->default);
+
+        $this->assertNull($entity->default);
+    }
+
+    public function testIssetWorksLikeTraditionalIsset()
+    {
+        $entity = $this->getEntity();
+
+        $this->assertFalse(isset($entity->foo));
+
+        $attributes = $this->getPrivateProperty($entity, 'attributes');
+        $this->assertFalse(isset($attributes['foo']));
+        $this->assertTrue(isset($attributes['default']));
+    }
+
+    public function testFill()
+    {
+        $entity = $this->getEntity();
+
+        $entity->fill([
+            'foo' => 123,
+            'bar' => 234,
+            'baz' => 4556,
+        ]);
+
+        $this->assertSame(123, $entity->foo);
+        $this->assertSame('bar:234:bar', $entity->bar);
+        $this->assertObjectNotHasAttribute('baz', $entity);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1567
+     */
+    public function testFillMapsEntities()
+    {
+        $entity = $this->getMappedEntity();
+
+        $data = [
+            'bar'  => 'foo',
+            'orig' => 'simple',
+        ];
+        $entity->fill($data);
+
+        $this->assertSame('foo', $entity->bar);
+        $this->assertSame('oo:simple:oo', $entity->orig);
+    }
+
+    public function testDataMappingConvertsOriginalName()
+    {
+        $entity = $this->getMappedEntity();
+
+        $entity->bar = 'made it';
+
+        // Check mapped field
+        $this->assertSame('made it', $entity->foo);
+
+        // Should also get from original name
+        // since Model's would be looking for the original name
+        $this->assertSame('made it', $entity->bar);
+
+        // But it shouldn't actually set a class property for the original name...
+        $this->expectException(ReflectionException::class);
+        $this->getPrivateProperty($entity, 'bar');
+    }
+
+    public function testDataMappingWorksWithCustomSettersAndGetters()
+    {
+        $entity = $this->getMappedEntity();
+
+        // Will map to "simple"
+        $entity->orig = 'first';
+
+        $this->assertSame('oo:first:oo', $entity->simple);
+
+        $entity->simple = 'second';
+
+        $this->assertSame('oo:second:oo', $entity->simple);
+    }
+
+    public function testIssetWorksWithMapping()
+    {
+        $entity = $this->getMappedEntity();
+
+        // maps to 'foo'
+        $entity->bar = 'here';
+
+        $attributes = $this->getPrivateProperty($entity, 'attributes');
+
+        $this->assertArrayHasKey('foo', $attributes);
+        $this->assertArrayNotHasKey('bar', $attributes);
+    }
+
+    public function testUnsetWorksWithMapping()
+    {
+        $entity = $this->getMappedEntity();
+
+        // maps to 'foo'
+        $entity->bar = 'here';
+
+        // doesn't work on original name
+        unset($entity->bar);
+        $this->assertSame('here', $entity->bar);
+        $this->assertSame('here', $entity->foo);
+
+        // does work on mapped field
+        unset($entity->foo);
+        $this->assertNull($entity->foo);
+        $this->assertNull($entity->bar);
+    }
+
+    public function testDateMutationFromString()
+    {
+        $entity     = $this->getEntity();
+        $attributes = ['created_at' => '2017-07-15 13:23:34'];
+        $this->setPrivateProperty($entity, 'attributes', $attributes);
+
+        $time = $entity->created_at;
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertSame('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationFromTimestamp()
+    {
+        $stamp = time();
+
+        $entity     = $this->getEntity();
+        $attributes = ['created_at' => $stamp];
+        $this->setPrivateProperty($entity, 'attributes', $attributes);
+
+        $time = $entity->created_at;
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString(date('Y-m-d H:i:s', $stamp), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationFromDatetime()
+    {
+        $dt         = new DateTime('now');
+        $entity     = $this->getEntity();
+        $attributes = ['created_at' => $dt];
+        $this->setPrivateProperty($entity, 'attributes', $attributes);
+
+        $time = $entity->created_at;
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationFromTime()
+    {
+        $dt         = Time::now();
+        $entity     = $this->getEntity();
+        $attributes = ['created_at' => $dt];
+        $this->setPrivateProperty($entity, 'attributes', $attributes);
+
+        $time = $entity->created_at;
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationStringToTime()
+    {
+        $entity = $this->getEntity();
+
+        $entity->created_at = '2017-07-15 13:23:34';
+
+        $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertSame('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationTimestampToTime()
+    {
+        $stamp  = time();
+        $entity = $this->getEntity();
+
+        $entity->created_at = $stamp;
+
+        $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString(date('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationDatetimeToTime()
+    {
+        $dt     = new DateTime('now');
+        $entity = $this->getEntity();
+
+        $entity->created_at = $dt;
+
+        $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testDateMutationTimeToTime()
+    {
+        $dt     = Time::now();
+        $entity = $this->getEntity();
+
+        $entity->created_at = $dt;
+
+        $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
+
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
+    }
+
+    public function testCastInteger()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->first = 3.1;
+        $this->assertIsInt($entity->first);
+        $this->assertSame(3, $entity->first);
+
+        $entity->first = 3.6;
+        $this->assertSame(3, $entity->first);
+    }
+
+    public function testCastFloat()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->second = 3;
+        $this->assertIsFloat($entity->second);
+        $this->assertSame(3.0, $entity->second);
+
+        $entity->second = '3.6';
+        $this->assertIsFloat($entity->second);
+        $this->assertSame(3.6, $entity->second);
+    }
+
+    public function testCastDouble()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->third = 3;
+        $this->assertIsFloat($entity->third);
+        $this->assertSame(3.0, $entity->third);
+
+        $entity->third = '3.6';
+        $this->assertIsFloat($entity->third);
+        $this->assertSame(3.6, $entity->third);
+    }
+
+    public function testCastString()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->fourth = 3.1415;
+        $this->assertIsString($entity->fourth);
+        $this->assertSame('3.1415', $entity->fourth);
+    }
+
+    public function testCastBoolean()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->fifth = 1;
+        $this->assertIsBool($entity->fifth);
+        $this->assertTrue($entity->fifth);
+
+        $entity->fifth = 0;
+        $this->assertIsBool($entity->fifth);
+        $this->assertFalse($entity->fifth);
+    }
+
+    public function testCastCSV()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = ['foo', 'bar', 'bam'];
+
+        $entity->twelfth = $data;
+
+        $result = $entity->toRawArray();
+        $this->assertIsString($result['twelfth']);
+        $this->assertSame('foo,bar,bam', $result['twelfth']);
+
+        $this->assertIsArray($entity->twelfth);
+        $this->assertSame($data, $entity->twelfth);
+    }
+
+    public function testCastObject()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = ['foo' => 'bar'];
+
+        $entity->sixth = $data;
+        $this->assertIsObject($entity->sixth);
+        $this->assertInstanceOf(stdClass::class, $entity->sixth);
+        $this->assertSame($data, (array) $entity->sixth);
+    }
+
+    public function testCastDateTime()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->eighth = 'March 12, 2017';
+        $this->assertInstanceOf('DateTime', $entity->eighth);
+        $this->assertSame('2017-03-12', $entity->eighth->format('Y-m-d'));
+    }
+
+    public function testCastTimestamp()
+    {
+        $entity = $this->getCastEntity();
+
+        $date = 'March 12, 2017';
+
+        $entity->ninth = $date;
+        $this->assertIsInt($entity->ninth);
+        $this->assertSame(strtotime($date), $entity->ninth);
+    }
+
+    public function testCastTimestampException()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->ninth = 'some string';
+
+        $this->expectException(CastException::class);
+        $this->expectErrorMessage('Type casting "timestamp" expects a correct timestamp.');
+
+        $entity->ninth;
+    }
+
+    public function testCastArray()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->seventh = ['foo' => 'bar'];
+
+        $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
+        $this->assertSame(serialize(['foo' => 'bar']), $check);
+
+        $this->assertSame(['foo' => 'bar'], $entity->seventh);
+    }
+
+    public function testCastArrayByStringSerialize()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->seventh = 'foobar';
+
+        // Should be a serialized string now...
+        $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
+        $this->assertSame(serialize('foobar'), $check);
+
+        $this->assertSame(['foobar'], $entity->seventh);
+    }
+
+    public function testCastArrayByArraySerialize()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->seventh = ['foo' => 'bar'];
+
+        // Should be a serialized string now...
+        $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
+        $this->assertSame(serialize(['foo' => 'bar']), $check);
+
+        $this->assertSame(['foo' => 'bar'], $entity->seventh);
+    }
+
+    public function testCastArrayByFill()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = ['seventh' => [1, 2, 3]];
+
+        $entity->fill($data);
+
+        // Check if serialiazed
+        $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
+        $this->assertSame(serialize([1, 2, 3]), $check);
+
+        // Check if unserialized
+        $this->assertSame([1, 2, 3], $entity->seventh);
+    }
+
+    public function testCastArrayByConstructor()
+    {
+        $data = ['seventh' => [1, 2, 3]];
+
+        $entity = $this->getCastEntity($data);
+
+        // Check if serialiazed
+        $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
+        $this->assertSame(serialize([1, 2, 3]), $check);
+
+        // Check if unserialized
+        $this->assertSame([1, 2, 3], $entity->seventh);
+    }
+
+    public function testCastNullable()
+    {
+        $entity = $this->getCastNullableEntity();
+
+        $this->assertNull($entity->string_null);
+        $this->assertSame('', $entity->string_empty);
+        $this->assertNull($entity->integer_null);
+        $this->assertSame(0, $entity->integer_0);
+        $this->assertSame('value', $entity->string_value_not_null);
+    }
+
+    public function testCastURI()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = 'https://codeigniter.com/banana';
+
+        $entity->thirteenth = $data;
+        $this->assertInstanceOf(URI::class, $entity->thirteenth);
+        $this->assertSame($data, (string) $entity->thirteenth);
+        $this->assertSame('/banana', $entity->thirteenth->getPath());
+    }
+
+    public function testURICastURI()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = 'https://codeigniter.com/banana';
+
+        $entity->thirteenth = new URI($data);
+        $this->assertInstanceOf(URI::class, $entity->thirteenth);
+        $this->assertSame($data, (string) $entity->thirteenth);
+        $this->assertSame('/banana', $entity->thirteenth->getPath());
+    }
+
+    public function testCastAsJSON()
+    {
+        $entity = $this->getCastEntity();
+
+        $entity->tenth = ['foo' => 'bar'];
+
+        // Should be a JSON-encoded string now...
+        $check = $this->getPrivateProperty($entity, 'attributes')['tenth'];
+        $this->assertSame('{"foo":"bar"}', $check);
+
+        $this->assertInstanceOf(stdClass::class, $entity->tenth);
+        $this->assertSame(['foo' => 'bar'], (array) $entity->tenth);
+    }
+
+    public function testCastAsJSONArray()
+    {
+        $entity = $this->getCastEntity();
+
+        $data = ['Sun', 'Mon', 'Tue'];
+
+        $entity->eleventh = $data;
+
+        // Should be a JSON-encoded string now...
+        $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
+        $this->assertSame('["Sun","Mon","Tue"]', $check);
+
+        $this->assertSame($data, $entity->eleventh);
+    }
+
+    public function testCastAsJsonByFill()
+    {
+        $entity = $this->getCastEntity();
+        $data   = ['eleventh' => [1, 2, 3]];
+
+        $entity->fill($data);
+
+        // Check if serialiazed
+        $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
+        $this->assertSame(json_encode([1, 2, 3]), $check);
+
+        // Check if unserialized
+        $this->assertSame([1, 2, 3], $entity->eleventh);
+    }
+
+    public function testCastAsJsonByConstructor()
+    {
+        $data   = ['eleventh' => [1, 2, 3]];
+        $entity = $this->getCastEntity($data);
+
+        // Check if serialiazed
+        $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
+        $this->assertSame(json_encode([1, 2, 3]), $check);
+
+        // Check if unserialized
+        $this->assertSame([1, 2, 3], $entity->eleventh);
+    }
+
+    public function testCastAsJSONErrorDepth()
+    {
+        $entity = $this->getCastEntity();
+
+        // Create array with depth 513 to get depth error
+        $array   = [];
+        $value   = 'test value';
+        $keys    = rtrim(str_repeat('test.', 513), '.');
+        $keys    = explode('.', $keys);
+        $current = &$array;
+
+        foreach ($keys as $key) {
+            $current = &$current[$key];
+        }
+
+        $current = $value;
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Maximum stack depth exceeded');
+
+        $entity->tenth = $array;
+        $this->getPrivateProperty($entity, 'tenth');
+    }
+
+    public function testCastAsJSONErrorUTF8()
+    {
+        $entity = $this->getCastEntity();
+
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
+
+        $entity->tenth = "\xB1\x31";
+        $this->getPrivateProperty($entity, 'tenth');
+    }
+
+    public function testCastAsJSONSyntaxError()
+    {
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Syntax error, malformed JSON');
+
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))('{ this is bad string');
+    }
+
+    public function testCastAsJSONAnotherErrorDepth()
+    {
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Maximum stack depth exceeded');
+
+        $string = '{' . str_repeat('"test":{', 513) . '"test":"value"' . str_repeat('}', 513) . '}';
+
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
+    }
+
+    public function testCastAsJSONControlCharCheck()
+    {
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Unexpected control character found');
+
+        $string = "{\n\t\"property1\": \"The quick brown fox\njumps over the lazy dog\",\n\t\"property2\":\"value2\"\n}";
+
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
+    }
+
+    public function testCastAsJSONStateMismatch()
+    {
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Underflow or the modes mismatch');
+
+        $string = '[{"name":"jack","product_id":"1234"]';
+
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
+    }
+
+    public function testCastSetter()
+    {
+        $string = '321 String with numbers 123';
+        $entity = $this->getCastEntity();
+
+        $entity->first = $string;
+
+        $entity->cast(false);
+        $this->assertIsString($entity->first);
+        $this->assertSame($string, $entity->first);
+
+        $entity->cast(true);
+        $this->assertIsInt($entity->first);
+        $this->assertSame((int) $string, $entity->first);
+    }
+
+    public function testCastGetter()
+    {
+        $entity = new Entity();
+
+        $this->assertIsBool($entity->cast());
+    }
+
+    public function testCustomCast()
+    {
+        $entity = $this->getCustomCastEntity();
+
+        $entity->first = 'base 64';
+
+        $fieldValue = $this->getPrivateProperty($entity, 'attributes')['first'];
+
+        $this->assertSame(base64_encode('base 64'), $fieldValue);
+
+        $this->assertSame('base 64', $entity->first);
+    }
+
+    public function testCustomCastException()
+    {
+        $entity = $this->getCustomCastEntity();
+
+        $this->expectException(CastException::class);
+        $this->expectErrorMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class');
+        $entity->second = 'throw Exception';
+    }
+
+    public function testCustomCastParams()
+    {
+        $entity = $this->getCustomCastEntity();
+
+        $entity->third = 'value';
+
+        $this->assertSame('value:["param1","param2","param3"]', $entity->third);
+
+        $entity->fourth = 'test_nullable_type';
+        $this->assertSame('test_nullable_type:["nullable"]', $entity->fourth);
+    }
+
+    public function testAsArray()
+    {
+        $entity = $this->getEntity();
+        $result = $entity->toArray();
+
+        $this->assertSame($result, [
+            'foo'       => null,
+            'bar'       => ':bar',
+            'default'   => 'sumfin',
+            'createdAt' => null,
+        ]);
+    }
+
+    public function testAsArrayRecursive()
+    {
+        $entity         = $this->getEntity();
+        $entity->entity = $this->getEntity();
+
+        $result = $entity->toArray(false, true, true);
+
+        $this->assertSame([
+            'foo'     => null,
+            'bar'     => ':bar',
+            'default' => 'sumfin',
+            'entity'  => [
+                'foo'       => null,
+                'bar'       => ':bar',
+                'default'   => 'sumfin',
+                'createdAt' => null,
+            ],
+            'createdAt' => null,
+        ], $result);
+    }
+
+    public function testAsArrayMapped()
+    {
+        $entity = $this->getMappedEntity();
+        $result = $entity->toArray();
+
+        $this->assertSame($result, [
+            'bar'  => null,
+            'orig' => ':oo',
+        ]);
+    }
+
+    public function testAsArraySwapped()
+    {
+        $entity = $this->getSwappedEntity();
+        $result = $entity->toArray();
+
+        $this->assertSame($result, [
+            'bar'          => 'foo',
+            'foo'          => 'bar',
+            'original_bar' => 'bar',
+        ]);
+    }
+
+    public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
+    {
+        $entity                   = new class () extends Entity {
+            protected $attributes = [
+                '_foo' => null,
+                'bar'  => null,
+            ];
+        };
+
+        $result = $entity->toArray();
+
+        $this->assertSame($result, [
+            'bar' => null,
+        ]);
+    }
+
+    public function testAsArrayOnlyChanged()
+    {
+        $entity = $this->getEntity();
+
+        $entity->bar = 'foo';
+
+        $result = $entity->toArray(true);
+
+        $this->assertSame($result, [
+            'bar' => 'bar:foo:bar',
+        ]);
+    }
+
+    public function testToRawArray()
+    {
+        $entity = $this->getEntity();
+
+        $result = $entity->toRawArray();
+
+        $this->assertSame($result, [
+            'foo'        => null,
+            'bar'        => null,
+            'default'    => 'sumfin',
+            'created_at' => null,
+        ]);
+    }
+
+    public function testToRawArrayRecursive()
+    {
+        $entity         = $this->getEntity();
+        $entity->entity = $this->getEntity();
+
+        $result = $entity->toRawArray(false, true);
+
+        $this->assertSame($result, [
+            'foo'        => null,
+            'bar'        => null,
+            'default'    => 'sumfin',
+            'created_at' => null,
+            'entity'     => [
+                'foo'        => null,
+                'bar'        => null,
+                'default'    => 'sumfin',
+                'created_at' => null,
+            ],
+        ]);
+    }
+
+    public function testToRawArrayOnlyChanged()
+    {
+        $entity = $this->getEntity();
+
+        $entity->bar = 'foo';
+
+        $result = $entity->toRawArray(true);
+
+        $this->assertSame($result, [
+            'bar' => 'bar:foo',
+        ]);
+    }
+
+    public function testFilledConstruction()
+    {
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $something = new SomeEntity($data);
+        $this->assertSame('bar', $something->foo);
+        $this->assertSame('baz', $something->bar);
+    }
+
+    public function testChangedArray()
+    {
+        $data = ['bar' => 'baz'];
+
+        $something = new SomeEntity($data);
+        $this->assertSame($data, $something->toArray(true));
+
+        $something->magic = 'rockin';
+
+        $this->assertSame([
+            'foo'   => null,
+            'bar'   => 'baz',
+            'magic' => 'rockin',
+        ], $something->toArray(false));
+    }
+
+    public function testHasChangedNotExists()
+    {
+        $entity = new SomeEntity();
+
+        $this->assertFalse($entity->hasChanged('foo'));
+    }
+
+    public function testHasChangedNewElement()
+    {
+        $entity = new SomeEntity();
+
+        $entity->foo = 'bar';
+
+        $this->assertTrue($entity->hasChanged('foo'));
+    }
+
+    public function testHasChangedNoChange()
+    {
+        $entity = $this->getEntity();
+
+        $this->assertFalse($entity->hasChanged('default'));
+    }
+
+    public function testHasChangedWholeEntity()
+    {
+        $entity = $this->getEntity();
+
+        $entity->foo = 'bar';
+
+        $this->assertTrue($entity->hasChanged());
+    }
+
+    public function testHasChangedKeyNotExists()
+    {
+        $entity = $this->getEntity();
+        $this->assertFalse($entity->hasChanged('xxx'));
+    }
+
+    public function testIssetKeyMap()
+    {
+        $entity = $this->getEntity();
+
+        $entity->created_at = '12345678';
+        $this->assertTrue(isset($entity->createdAt));
+
+        $entity->bar = 'foo';
+        $this->assertTrue(isset($entity->FakeBar));
+    }
+
+    public function testJsonSerializableEntity()
+    {
+        $entity = $this->getEntity();
+        $entity->setBar('foo');
+        $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
+    }
+
+    protected function getEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'foo'        => null,
+                'bar'        => null,
+                'default'    => 'sumfin',
+                'created_at' => null,
+            ];
+
+            protected $original = [
+                'foo'        => null,
+                'bar'        => null,
+                'default'    => 'sumfin',
+                'created_at' => null,
+            ];
+
+            protected $datamap = [
+                'createdAt' => 'created_at',
+            ];
+
+            public function setBar($value)
+            {
+                $this->attributes['bar'] = "bar:{$value}";
+
+                return $this;
+            }
+
+            public function getBar()
+            {
+                return "{$this->attributes['bar']}:bar";
+            }
+
+            public function getFakeBar()
+            {
+                return "{$this->attributes['bar']}:bar";
+            }
+        };
+    }
+
+    protected function getMappedEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'foo'    => null,
+                'simple' => null,
+            ];
+
+            protected $_original = [
+                'foo'    => null,
+                'simple' => null,
+            ];
+
+            // 'bar' is db column, 'foo' is internal representation
+            protected $datamap = [
+                'bar'  => 'foo',
+                'orig' => 'simple',
+            ];
+
+            protected function setSimple(string $val)
+            {
+                $this->attributes['simple'] = 'oo:' . $val;
+            }
+
+            protected function getSimple()
+            {
+                return $this->attributes['simple'] . ':oo';
+            }
+        };
+    }
+
+    protected function getSwappedEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'foo' => 'foo',
+                'bar' => 'bar',
+            ];
+
+            protected $_original = [
+                'foo' => 'foo',
+                'bar' => 'bar',
+            ];
+
+            protected $datamap = [
+                'bar'          => 'foo',
+                'foo'          => 'bar',
+                'original_bar' => 'bar',
+            ];
+        };
+    }
+
+    protected function getCastEntity($data = null): Entity
+    {
+        return new class ($data) extends Entity {
+            protected $attributes = [
+                'first'      => null,
+                'second'     => null,
+                'third'      => null,
+                'fourth'     => null,
+                'fifth'      => null,
+                'sixth'      => null,
+                'seventh'    => null,
+                'eighth'     => null,
+                'ninth'      => null,
+                'tenth'      => null,
+                'eleventh'   => null,
+                'twelfth'    => null,
+                'thirteenth' => null,
+            ];
+
+            protected $_original = [
+                'first'      => null,
+                'second'     => null,
+                'third'      => null,
+                'fourth'     => null,
+                'fifth'      => null,
+                'sixth'      => null,
+                'seventh'    => null,
+                'eighth'     => null,
+                'ninth'      => null,
+                'tenth'      => null,
+                'eleventh'   => null,
+                'twelfth'    => null,
+                'thirteenth' => null,
+            ];
+
+            // 'bar' is db column, 'foo' is internal representation
+            protected $casts = [
+                'first'      => 'integer',
+                'second'     => 'float',
+                'third'      => 'double',
+                'fourth'     => 'string',
+                'fifth'      => 'boolean',
+                'sixth'      => 'object',
+                'seventh'    => 'array',
+                'eighth'     => 'datetime',
+                'ninth'      => 'timestamp',
+                'tenth'      => 'json',
+                'eleventh'   => 'json-array',
+                'twelfth'    => 'csv',
+                'thirteenth' => 'uri',
+            ];
+
+            public function setSeventh($seventh)
+            {
+                $this->attributes['seventh'] = $seventh;
+            }
+        };
+    }
+
+    protected function getCastNullableEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'string_null'           => null,
+                'string_empty'          => null,
+                'integer_null'          => null,
+                'integer_0'             => null,
+                'string_value_not_null' => 'value',
+            ];
+
+            protected $_original = [
+                'string_null'           => null,
+                'string_empty'          => null,
+                'integer_null'          => null,
+                'integer_0'             => null,
+                'string_value_not_null' => 'value',
+            ];
+
+            // 'bar' is db column, 'foo' is internal representation
+            protected $casts = [
+                'string_null'           => '?string',
+                'string_empty'          => 'string',
+                'integer_null'          => '?integer',
+                'integer_0'             => 'integer',
+                'string_value_not_null' => '?string',
+            ];
+        };
+    }
+
+    protected function getCustomCastEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'first'  => null,
+                'second' => null,
+                'third'  => null,
+                'fourth' => null,
+            ];
+
+            protected $_original = [
+                'first'  => null,
+                'second' => null,
+                'third'  => null,
+                'fourth' => null,
+            ];
+
+            // 'bar' is db column, 'foo' is internal representation
+            protected $casts = [
+                'first'  => 'base64',
+                'second' => 'someType',
+                'third'  => 'type[param1, param2,param3]',
+                'fourth' => '?type',
+            ];
+
+            protected $castHandlers = [
+                'base64'   => CastBase64::class,
+                'someType' => NotExtendsBaseCast::class,
+                'type'     => CastPassParameters::class,
+            ];
+        };
+    }
+}
diff --git a/tests/system/EntityTest.php b/tests/system/EntityTest.php
deleted file mode 100644
index 6dd89c8d280b..000000000000
--- a/tests/system/EntityTest.php
+++ /dev/null
@@ -1,1200 +0,0 @@
-<?php
-
-namespace CodeIgniter;
-
-use CodeIgniter\Entity\Exceptions\CastException;
-use CodeIgniter\I18n\Time;
-use CodeIgniter\HTTP\URI;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\ReflectionHelper;
-use DateTime;
-use ReflectionException;
-use Tests\Support\Entity\Cast\CastBase64;
-use Tests\Support\Entity\Cast\CastPassParameters;
-use Tests\Support\Entity\Cast\NotExtendsBaseCast;
-use Tests\Support\SomeEntity;
-
-class EntityTest extends CIUnitTestCase
-{
-	use ReflectionHelper;
-
-	public function testSimpleSetAndGet()
-	{
-		$entity = $this->getEntity();
-
-		$entity->foo = 'to wong';
-
-		$this->assertEquals('to wong', $entity->foo);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetterSetters()
-	{
-		$entity = $this->getEntity();
-
-		$entity->bar = 'thanks';
-
-		$this->assertEquals('bar:thanks:bar', $entity->bar);
-	}
-
-	public function testUnsetUnsetsAttribute()
-	{
-		$entity = $this->getEntity();
-
-		$this->assertEquals('sumfin', $entity->default);
-
-		$entity->default = 'else';
-
-		$this->assertEquals('else', $entity->default);
-
-		unset($entity->default);
-
-		$this->assertNull($entity->default);
-	}
-
-	public function testIssetWorksLikeTraditionalIsset()
-	{
-		$entity = $this->getEntity();
-
-		$this->assertFalse(isset($entity->foo));
-
-		$attributes = $this->getPrivateProperty($entity, 'attributes');
-		$this->assertFalse(isset($attributes['foo']));
-		$this->assertTrue(isset($attributes['default']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFill()
-	{
-		$entity = $this->getEntity();
-
-		$entity->fill([
-			'foo' => 123,
-			'bar' => 234,
-			'baz' => 4556,
-		]);
-
-		$this->assertEquals(123, $entity->foo);
-		$this->assertEquals('bar:234:bar', $entity->bar);
-		$this->assertObjectNotHasAttribute('baz', $entity);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1567
-	 */
-	public function testFillMapsEntities()
-	{
-		$entity = $this->getMappedEntity();
-
-		$data = [
-			'bar'  => 'foo',
-			'orig' => 'simple',
-		];
-		$entity->fill($data);
-
-		$this->assertEquals('foo', $entity->bar);
-		$this->assertEquals('oo:simple:oo', $entity->orig);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDataMappingConvertsOriginalName()
-	{
-		$entity = $this->getMappedEntity();
-
-		$entity->bar = 'made it';
-
-		// Check mapped field
-		$this->assertEquals('made it', $entity->foo);
-
-		// Should also get from original name
-		// since Model's would be looking for the original name
-		$this->assertEquals('made it', $entity->bar);
-
-		// But it shouldn't actually set a class property for the original name...
-		$this->expectException(ReflectionException::class);
-		$this->getPrivateProperty($entity, 'bar');
-	}
-
-	public function testDataMappingWorksWithCustomSettersAndGetters()
-	{
-		$entity = $this->getMappedEntity();
-
-		// Will map to "simple"
-		$entity->orig = 'first';
-
-		$this->assertEquals('oo:first:oo', $entity->simple);
-
-		$entity->simple = 'second';
-
-		$this->assertEquals('oo:second:oo', $entity->simple);
-	}
-
-	public function testIssetWorksWithMapping()
-	{
-		$entity = $this->getMappedEntity();
-
-		// maps to 'foo'
-		$entity->bar = 'here';
-
-		$attributes = $this->getPrivateProperty($entity, 'attributes');
-
-		$this->assertTrue(array_key_exists('foo', $attributes));
-		$this->assertFalse(array_key_exists('bar', $attributes));
-	}
-
-	public function testUnsetWorksWithMapping()
-	{
-		$entity = $this->getMappedEntity();
-
-		// maps to 'foo'
-		$entity->bar = 'here';
-
-		// doesn't work on original name
-		unset($entity->bar);
-		$this->assertEquals('here', $entity->bar);
-		$this->assertEquals('here', $entity->foo);
-
-		// does work on mapped field
-		unset($entity->foo);
-		$this->assertNull($entity->foo);
-		$this->assertNull($entity->bar);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDateMutationFromString()
-	{
-		$entity     = $this->getEntity();
-		$attributes = [
-			'created_at' => '2017-07-15 13:23:34',
-		];
-		$this->setPrivateProperty($entity, 'attributes', $attributes);
-
-		$time = $entity->created_at;
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertEquals('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationFromTimestamp()
-	{
-		$stamp = time();
-
-		$entity     = $this->getEntity();
-		$attributes = [
-			'created_at' => $stamp,
-		];
-		$this->setPrivateProperty($entity, 'attributes', $attributes);
-
-		$time = $entity->created_at;
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString(date('Y-m-d H:i:s', $stamp), $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationFromDatetime()
-	{
-		$dt         = new DateTime('now');
-		$entity     = $this->getEntity();
-		$attributes = [
-			'created_at' => $dt,
-		];
-		$this->setPrivateProperty($entity, 'attributes', $attributes);
-
-		$time = $entity->created_at;
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationFromTime()
-	{
-		$dt         = Time::now();
-		$entity     = $this->getEntity();
-		$attributes = [
-			'created_at' => $dt,
-		];
-		$this->setPrivateProperty($entity, 'attributes', $attributes);
-
-		$time = $entity->created_at;
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationStringToTime()
-	{
-		$entity = $this->getEntity();
-
-		$entity->created_at = '2017-07-15 13:23:34';
-
-		$time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertEquals('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationTimestampToTime()
-	{
-		$stamp  = time();
-		$entity = $this->getEntity();
-
-		$entity->created_at = $stamp;
-
-		$time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString(date('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationDatetimeToTime()
-	{
-		$dt     = new DateTime('now');
-		$entity = $this->getEntity();
-
-		$entity->created_at = $dt;
-
-		$time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
-	}
-
-	public function testDateMutationTimeToTime()
-	{
-		$dt     = Time::now();
-		$entity = $this->getEntity();
-
-		$entity->created_at = $dt;
-
-		$time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCastInteger()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->first = 3.1;
-		$this->assertIsInt($entity->first);
-		$this->assertEquals(3, $entity->first);
-
-		$entity->first = 3.6;
-		$this->assertEquals(3, $entity->first);
-	}
-
-	public function testCastFloat()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->second = 3;
-		$this->assertIsFloat($entity->second);
-		$this->assertEquals(3.0, $entity->second);
-
-		$entity->second = '3.6';
-		$this->assertIsFloat($entity->second);
-		$this->assertEquals(3.6, $entity->second);
-	}
-
-	public function testCastDouble()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->third = 3;
-		$this->assertIsFloat($entity->third);
-		$this->assertSame(3.0, $entity->third);
-
-		$entity->third = '3.6';
-		$this->assertIsFloat($entity->third);
-		$this->assertSame(3.6, $entity->third);
-	}
-
-	public function testCastString()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->fourth = 3.1415;
-		$this->assertIsString($entity->fourth);
-		$this->assertSame('3.1415', $entity->fourth);
-	}
-
-	public function testCastBoolean()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->fifth = 1;
-		$this->assertIsBool($entity->fifth);
-		$this->assertTrue($entity->fifth);
-
-		$entity->fifth = 0;
-		$this->assertIsBool($entity->fifth);
-		$this->assertFalse($entity->fifth);
-	}
-
-	public function testCastCSV()
-	{
-		$entity = $this->getCastEntity();
-
-		$data = [
-			'foo',
-			'bar',
-			'bam',
-		];
-
-		$entity->twelfth = $data;
-
-		$result = $entity->toRawArray();
-		$this->assertIsString($result['twelfth']);
-		$this->assertEquals('foo,bar,bam', $result['twelfth']);
-
-		$this->assertIsArray($entity->twelfth);
-		$this->assertEquals($data, $entity->twelfth);
-	}
-
-	public function testCastObject()
-	{
-		$entity = $this->getCastEntity();
-
-		$data = ['foo' => 'bar'];
-
-		$entity->sixth = $data;
-		$this->assertIsObject($entity->sixth);
-		$this->assertEquals((object) $data, $entity->sixth);
-	}
-
-	public function testCastDateTime()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->eighth = 'March 12, 2017';
-		$this->assertInstanceOf('DateTime', $entity->eighth);
-		$this->assertEquals('2017-03-12', $entity->eighth->format('Y-m-d'));
-	}
-
-	public function testCastTimestamp()
-	{
-		$entity = $this->getCastEntity();
-
-		$date = 'March 12, 2017';
-
-		$entity->ninth = $date;
-		$this->assertIsInt($entity->ninth);
-		$this->assertEquals(strtotime($date), $entity->ninth);
-	}
-
-	public function testCastTimestampException()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->ninth = 'some string';
-
-		$this->expectException(CastException::class);
-		$this->expectErrorMessage('Type casting "timestamp" expects a correct timestamp.');
-
-		$entity->ninth;
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCastArray()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->seventh = ['foo' => 'bar'];
-
-		$check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-		$this->assertEquals(serialize(['foo' => 'bar']), $check);
-
-		$this->assertEquals(['foo' => 'bar'], $entity->seventh);
-	}
-
-	public function testCastArrayByStringSerialize()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->seventh = 'foobar';
-
-		// Should be a serialized string now...
-		$check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-		$this->assertEquals(serialize('foobar'), $check);
-
-		$this->assertEquals(['foobar'], $entity->seventh);
-	}
-
-	public function testCastArrayByArraySerialize()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->seventh = ['foo' => 'bar'];
-
-		// Should be a serialized string now...
-		$check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-		$this->assertEquals(serialize(['foo' => 'bar']), $check);
-
-		$this->assertEquals(['foo' => 'bar'], $entity->seventh);
-	}
-
-	public function testCastArrayByFill()
-	{
-		$entity = $this->getCastEntity();
-
-		$data = [
-			'seventh' => [
-				1,
-				2,
-				3,
-			],
-		];
-
-		$entity->fill($data);
-
-		// Check if serialiazed
-		$check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-		$this->assertEquals(serialize([1, 2, 3]), $check);
-
-		// Check if unserialized
-		$this->assertEquals([1, 2, 3], $entity->seventh);
-	}
-
-	public function testCastArrayByConstructor()
-	{
-		$data = [
-			'seventh' => [
-				1,
-				2,
-				3,
-			],
-		];
-
-		$entity = $this->getCastEntity($data);
-
-		// Check if serialiazed
-		$check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-		$this->assertEquals(serialize([1, 2, 3]), $check);
-
-		// Check if unserialized
-		$this->assertEquals([1, 2, 3], $entity->seventh);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCastNullable()
-	{
-		$entity = $this->getCastNullableEntity();
-
-		$this->assertSame(null, $entity->string_null);
-		$this->assertSame('', $entity->string_empty);
-		$this->assertSame(null, $entity->integer_null);
-		$this->assertSame(0, $entity->integer_0);
-		$this->assertSame('value', $entity->string_value_not_null);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCastURI()
-	{
-		$entity = $this->getCastEntity();
-
-		$data = 'https://codeigniter.com/banana';
-
-		$entity->thirteenth = $data;
-		$this->assertInstanceOf(URI::class, $entity->thirteenth);
-		$this->assertSame($data, (string) $entity->thirteenth);
-		$this->assertSame('/banana', $entity->thirteenth->getPath());
-	}
-
-	public function testURICastURI()
-	{
-		$entity = $this->getCastEntity();
-
-		$data = 'https://codeigniter.com/banana';
-
-		$entity->thirteenth = new URI($data);
-		$this->assertInstanceOf(URI::class, $entity->thirteenth);
-		$this->assertSame($data, (string) $entity->thirteenth);
-		$this->assertSame('/banana', $entity->thirteenth->getPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCastAsJSON()
-	{
-		$entity = $this->getCastEntity();
-
-		$entity->tenth = ['foo' => 'bar'];
-
-		// Should be a JSON-encoded string now...
-		$check = $this->getPrivateProperty($entity, 'attributes')['tenth'];
-		$this->assertEquals('{"foo":"bar"}', $check);
-
-		$this->assertEquals((object) ['foo' => 'bar'], $entity->tenth);
-	}
-
-	public function testCastAsJSONArray()
-	{
-		$entity = $this->getCastEntity();
-
-		$data             = [
-			'Sun',
-			'Mon',
-			'Tue',
-		];
-		$entity->eleventh = $data;
-
-		// Should be a JSON-encoded string now...
-		$check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-		$this->assertEquals('["Sun","Mon","Tue"]', $check);
-
-		$this->assertEquals($data, $entity->eleventh);
-	}
-
-	public function testCastAsJsonByFill()
-	{
-		$entity = $this->getCastEntity();
-		$data   = [
-			'eleventh' => [
-				1,
-				2,
-				3,
-			],
-		];
-
-		$entity->fill($data);
-
-		// Check if serialiazed
-		$check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-		$this->assertEquals(json_encode([1, 2, 3]), $check);
-
-		// Check if unserialized
-		$this->assertEquals([1, 2, 3], $entity->eleventh);
-	}
-
-	public function testCastAsJsonByConstructor()
-	{
-		$data = [
-			'eleventh' => [
-				1,
-				2,
-				3,
-			],
-		];
-
-		$entity = $this->getCastEntity($data);
-
-		// Check if serialiazed
-		$check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-		$this->assertEquals(json_encode([1, 2, 3]), $check);
-
-		// Check if unserialized
-		$this->assertEquals([1, 2, 3], $entity->eleventh);
-	}
-
-	public function testCastAsJSONErrorDepth()
-	{
-		$entity = $this->getCastEntity();
-
-		// Create array with depth 513 to get depth error
-		$array   = [];
-		$value   = 'test value';
-		$keys    = rtrim(str_repeat('test.', 513), '.');
-		$keys    = explode('.', $keys);
-		$current = &$array;
-		foreach ($keys as $key)
-		{
-			$current = &$current[$key];
-		}
-		$current = $value;
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Maximum stack depth exceeded');
-
-		$entity->tenth = $array;
-		$this->getPrivateProperty($entity, 'tenth');
-	}
-
-	public function testCastAsJSONErrorUTF8()
-	{
-		$entity = $this->getCastEntity();
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
-
-		$entity->tenth = "\xB1\x31";
-		$this->getPrivateProperty($entity, 'tenth');
-	}
-
-	public function testCastAsJSONSyntaxError()
-	{
-		$entity = new Entity();
-
-		$method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Syntax error, malformed JSON');
-
-		$method('{ this is bad string', true);
-	}
-
-	public function testCastAsJSONAnotherErrorDepth()
-	{
-		$entity = new Entity();
-
-		$method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Maximum stack depth exceeded');
-
-		$string = '{' . str_repeat('"test":{', 513) . '"test":"value"' . str_repeat('}', 513) . '}';
-
-		$method($string, true);
-	}
-
-	public function testCastAsJSONControlCharCheck()
-	{
-		$entity = new Entity();
-
-		$method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Unexpected control character found');
-
-		$string = "{\n\t\"property1\": \"The quick brown fox\njumps over the lazy dog\",\n\t\"property2\":\"value2\"\n}";
-
-		$method($string, true);
-	}
-
-	public function testCastAsJSONStateMismatch()
-	{
-		$entity = new Entity();
-
-		$method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
-		$this->expectException(CastException::class);
-		$this->expectExceptionMessage('Underflow or the modes mismatch');
-
-		$string = '[{"name":"jack","product_id":"1234"]';
-
-		$method($string, true);
-	}
-	//--------------------------------------------------------------------
-
-	public function testCastSetter()
-	{
-		$string = '321 String with numbers 123';
-		$entity = $this->getCastEntity();
-
-		$entity->first = $string;
-
-		$entity->cast(false);
-		$this->assertIsString($entity->first);
-		$this->assertEquals($string, $entity->first);
-
-		$entity->cast(true);
-		$this->assertIsInt($entity->first);
-		$this->assertEquals((int) $string, $entity->first);
-	}
-
-	public function testCastGetter()
-	{
-		$entity = new Entity();
-
-		$this->assertIsBool($entity->cast());
-	}
-
-	public function testCustomCast()
-	{
-		$entity = $this->getCustomCastEntity();
-
-		$entity->first = 'base 64';
-
-		$fieldValue = $this->getPrivateProperty($entity, 'attributes')['first'];
-
-		$this->assertEquals(base64_encode('base 64'), $fieldValue);
-
-		$this->assertEquals('base 64', $entity->first);
-	}
-
-	public function testCustomCastException()
-	{
-		$entity = $this->getCustomCastEntity();
-
-		$this->expectException(CastException::class);
-		$this->expectErrorMessage(
-			'The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class '
-			. 'must inherit the "CodeIgniter\Entity\Cast\BaseCast" class'
-		);
-		$entity->second = 'throw Exception';
-	}
-
-	public function testCustomCastParams()
-	{
-		$entity = $this->getCustomCastEntity();
-
-		$entity->third = 'value';
-
-		$this->assertEquals('value:["param1","param2","param3"]', $entity->third);
-
-		$entity->fourth = 'test_nullable_type';
-		$this->assertEquals('test_nullable_type:["nullable"]', $entity->fourth);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAsArray()
-	{
-		$entity = $this->getEntity();
-
-		$result = $entity->toArray();
-
-		$this->assertEquals($result, [
-			'foo'       => null,
-			'bar'       => ':bar',
-			'default'   => 'sumfin',
-			'createdAt' => null,
-		]);
-	}
-
-	public function testAsArrayRecursive()
-	{
-		$entity         = $this->getEntity();
-		$entity->entity = $this->getEntity();
-
-		$result = $entity->toArray(false, true, true);
-
-		$this->assertEquals($result, [
-			'foo'       => null,
-			'bar'       => ':bar',
-			'default'   => 'sumfin',
-			'createdAt' => null,
-			'entity'    => [
-				'foo'       => null,
-				'bar'       => ':bar',
-				'default'   => 'sumfin',
-				'createdAt' => null,
-			],
-		]);
-	}
-
-	public function testAsArrayMapped()
-	{
-		$entity = $this->getMappedEntity();
-
-		$result = $entity->toArray();
-
-		$this->assertEquals($result, [
-			'bar'  => null,
-			'orig' => ':oo',
-		]);
-	}
-
-	public function testAsArraySwapped()
-	{
-		$entity = $this->getSwappedEntity();
-
-		$result = $entity->toArray();
-
-		$this->assertEquals($result, [
-			'bar'          => 'foo',
-			'foo'          => 'bar',
-			'original_bar' => 'bar',
-		]);
-	}
-
-	public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
-	{
-		$entity = new class extends Entity
-		{
-			protected $attributes = [
-				'_foo' => null,
-				'bar'  => null,
-			];
-		};
-
-		$result = $entity->toArray();
-
-		$this->assertEquals($result, [
-			'bar' => null,
-		]);
-	}
-
-	public function testAsArrayOnlyChanged()
-	{
-		$entity = $this->getEntity();
-
-		$entity->bar = 'foo';
-
-		$result = $entity->toArray(true);
-
-		$this->assertEquals($result, [
-			'bar' => 'bar:foo:bar',
-		]);
-	}
-
-	public function testToRawArray()
-	{
-		$entity = $this->getEntity();
-
-		$result = $entity->toRawArray();
-
-		$this->assertEquals($result, [
-			'foo'        => null,
-			'bar'        => null,
-			'default'    => 'sumfin',
-			'created_at' => null,
-		]);
-	}
-
-	public function testToRawArrayRecursive()
-	{
-		$entity         = $this->getEntity();
-		$entity->entity = $this->getEntity();
-
-		$result = $entity->toRawArray(false, true);
-
-		$this->assertEquals($result, [
-			'foo'        => null,
-			'bar'        => null,
-			'default'    => 'sumfin',
-			'created_at' => null,
-			'entity'     => [
-				'foo'        => null,
-				'bar'        => null,
-				'default'    => 'sumfin',
-				'created_at' => null,
-			],
-		]);
-	}
-
-	public function testToRawArrayOnlyChanged()
-	{
-		$entity = $this->getEntity();
-
-		$entity->bar = 'foo';
-
-		$result = $entity->toRawArray(true);
-
-		$this->assertEquals($result, [
-			'bar' => 'bar:foo',
-		]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFilledConstruction()
-	{
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$something = new SomeEntity($data);
-		$this->assertEquals('bar', $something->foo);
-		$this->assertEquals('baz', $something->bar);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testChangedArray()
-	{
-		$data = [
-			'bar' => 'baz',
-		];
-
-		$something = new SomeEntity($data);
-		$whatsnew  = $something->toArray(true);
-		$expected  = $data;
-		$this->assertEquals($expected, $whatsnew);
-
-		$something->magic  = 'rockin';
-		$expected['magic'] = 'rockin';
-		$expected['foo']   = null;
-		$whatsnew          = $something->toArray(false);
-		$this->assertEquals($expected, $whatsnew);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasChangedNotExists()
-	{
-		$entity = new SomeEntity();
-
-		$this->assertFalse($entity->hasChanged('foo'));
-	}
-
-	public function testHasChangedNewElement()
-	{
-		$entity = new SomeEntity();
-
-		$entity->foo = 'bar';
-
-		$this->assertTrue($entity->hasChanged('foo'));
-	}
-
-	public function testHasChangedNoChange()
-	{
-		$entity = $this->getEntity();
-
-		$this->assertFalse($entity->hasChanged('default'));
-	}
-
-	public function testHasChangedWholeEntity()
-	{
-		$entity = $this->getEntity();
-
-		$entity->foo = 'bar';
-
-		$this->assertTrue($entity->hasChanged());
-	}
-
-	public function testHasChangedKeyNotExists()
-	{
-		$entity = $this->getEntity();
-		$this->assertFalse($entity->hasChanged('xxx'));
-	}
-
-	public function testIssetKeyMap()
-	{
-		$entity = $this->getEntity();
-
-		$entity->created_at = '12345678';
-		$this->assertTrue(isset($entity->createdAt));
-
-		$entity->bar = 'foo';
-		$this->assertTrue(isset($entity->FakeBar));
-	}
-
-	public function testJsonSerializableEntity()
-	{
-		$entity = $this->getEntity();
-		$entity->setBar('foo');
-		$this->assertEquals(json_encode($entity->toArray()), json_encode($entity));
-	}
-
-	protected function getEntity() : Entity
-	{
-		return new class extends Entity
-		{
-			protected $attributes = [
-				'foo'        => null,
-				'bar'        => null,
-				'default'    => 'sumfin',
-				'created_at' => null,
-			];
-
-			protected $original = [
-				'foo'        => null,
-				'bar'        => null,
-				'default'    => 'sumfin',
-				'created_at' => null,
-			];
-
-			protected $datamap = [
-				'createdAt' => 'created_at',
-			];
-
-			public function setBar($value)
-			{
-				$this->attributes['bar'] = "bar:{$value}";
-
-				return $this;
-			}
-
-			public function getBar()
-			{
-				return "{$this->attributes['bar']}:bar";
-			}
-
-			public function getFakeBar()
-			{
-				return "{$this->attributes['bar']}:bar";
-			}
-		};
-	}
-
-	protected function getMappedEntity() : Entity
-	{
-		return new class extends Entity
-		{
-			protected $attributes = [
-				'foo'    => null,
-				'simple' => null,
-			];
-
-			protected $_original = [
-				'foo'    => null,
-				'simple' => null,
-			];
-
-			// 'bar' is db column, 'foo' is internal representation
-			protected $datamap = [
-				'bar'  => 'foo',
-				'orig' => 'simple',
-			];
-
-			protected function setSimple(string $val)
-			{
-				$this->attributes['simple'] = 'oo:' . $val;
-			}
-
-			protected function getSimple()
-			{
-				return $this->attributes['simple'] . ':oo';
-			}
-		};
-	}
-
-	protected function getSwappedEntity() : Entity
-	{
-		return new class extends Entity
-		{
-			protected $attributes = [
-				'foo' => 'foo',
-				'bar' => 'bar',
-			];
-
-			protected $_original = [
-				'foo' => 'foo',
-				'bar' => 'bar',
-			];
-
-			protected $datamap = [
-				'bar'          => 'foo',
-				'foo'          => 'bar',
-				'original_bar' => 'bar',
-			];
-		};
-	}
-
-	protected function getCastEntity($data = null) : Entity
-	{
-		return new class($data) extends Entity
-		{
-			protected $attributes = [
-				'first'      => null,
-				'second'     => null,
-				'third'      => null,
-				'fourth'     => null,
-				'fifth'      => null,
-				'sixth'      => null,
-				'seventh'    => null,
-				'eighth'     => null,
-				'ninth'      => null,
-				'tenth'      => null,
-				'eleventh'   => null,
-				'twelfth'    => null,
-				'thirteenth' => null,
-			];
-
-			protected $_original = [
-				'first'      => null,
-				'second'     => null,
-				'third'      => null,
-				'fourth'     => null,
-				'fifth'      => null,
-				'sixth'      => null,
-				'seventh'    => null,
-				'eighth'     => null,
-				'ninth'      => null,
-				'tenth'      => null,
-				'eleventh'   => null,
-				'twelfth'    => null,
-				'thirteenth' => null,
-			];
-
-			// 'bar' is db column, 'foo' is internal representation
-			protected $casts = [
-				'first'      => 'integer',
-				'second'     => 'float',
-				'third'      => 'double',
-				'fourth'     => 'string',
-				'fifth'      => 'boolean',
-				'sixth'      => 'object',
-				'seventh'    => 'array',
-				'eighth'     => 'datetime',
-				'ninth'      => 'timestamp',
-				'tenth'      => 'json',
-				'eleventh'   => 'json-array',
-				'twelfth'    => 'csv',
-				'thirteenth' => 'uri',
-			];
-
-			public function setSeventh($seventh)
-			{
-				$this->attributes['seventh'] = $seventh;
-			}
-		};
-	}
-
-	protected function getCastNullableEntity() : Entity
-	{
-		return new class extends Entity
-		{
-			protected $attributes = [
-				'string_null'           => null,
-				'string_empty'          => null,
-				'integer_null'          => null,
-				'integer_0'             => null,
-				'string_value_not_null' => 'value',
-			];
-
-			protected $_original = [
-				'string_null'           => null,
-				'string_empty'          => null,
-				'integer_null'          => null,
-				'integer_0'             => null,
-				'string_value_not_null' => 'value',
-			];
-
-			// 'bar' is db column, 'foo' is internal representation
-			protected $casts = [
-				'string_null'           => '?string',
-				'string_empty'          => 'string',
-				'integer_null'          => '?integer',
-				'integer_0'             => 'integer',
-				'string_value_not_null' => '?string',
-			];
-		};
-	}
-
-	protected function getCustomCastEntity() : Entity
-	{
-		return new class extends Entity
-		{
-
-			protected $attributes = [
-				'first'  => null,
-				'second' => null,
-				'third'  => null,
-				'fourth' => null,
-			];
-
-			protected $_original = [
-				'first'  => null,
-				'second' => null,
-				'third'  => null,
-				'fourth' => null,
-			];
-
-			// 'bar' is db column, 'foo' is internal representation
-			protected $casts = [
-				'first'  => 'base64',
-				'second' => 'someType',
-				'third'  => 'type[param1, param2,param3]',
-				'fourth' => '?type',
-			];
-
-			protected $castHandlers = [
-				'base64'   => CastBase64::class,
-				'someType' => NotExtendsBaseCast::class,
-				'type'     => CastPassParameters::class,
-			];
-		};
-	}
-}
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 406f2a826b89..bb3b3e87a827 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -1,299 +1,314 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Events;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockEvents;
 use Config\Modules;
 
-class EventsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EventsTest extends CIUnitTestCase
 {
-	/**
-	 * Accessible event manager instance
-	 *
-	 * @var MockEvents
-	 */
-	protected $manager;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->manager = new MockEvents();
-
-		Events::removeAllListeners();
-	}
-
-	protected function tearDown(): void
-	{
-		Events::simulate(false);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testInitialize()
-	{
-		/**
-		 * @var Modules
-		 */
-		$config          = config('Modules');
-		$config->aliases = [];
-
-		// it should start out empty
-		MockEvents::setFiles([]);
-		$this->assertEmpty($this->manager->getFiles());
-
-		// make sure we have a default events file
-		$default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php'];
-		$this->manager->unInitialize();
-		MockEvents::initialize();
-		$this->assertEquals($default, $this->manager->getFiles());
-
-		// but we should be able to change it through the backdoor
-		MockEvents::setFiles(['/peanuts']);
-		$this->assertEquals(['/peanuts'], $this->manager->getFiles());
-
-		// re-initializing should have no effect
-		MockEvents::initialize();
-		$this->assertEquals(['/peanuts'], $this->manager->getFiles());
-	}
-
-	public function testPerformance()
-	{
-		$result = null;
-		Events::on('foo', function ($arg) use (&$result) {
-			$result = $arg;
-		});
-		Events::trigger('foo', 'bar');
-
-		$logged = Events::getPerformanceLogs();
-		// there should be some event activity logged
-		$this->assertGreaterThan(0, count($logged));
-	}
-
-	public function testListeners()
-	{
-		$callback1 = function () {
-		};
-		$callback2 = function () {
-		};
-
-		Events::on('foo', $callback1, EVENT_PRIORITY_HIGH);
-		Events::on('foo', $callback2, EVENT_PRIORITY_NORMAL);
-
-		$this->assertEquals([$callback2, $callback1], Events::listeners('foo'));
-	}
-
-	public function testHandleEvent()
-	{
-		$result = null;
-
-		Events::on('foo', function ($arg) use (&$result) {
-			$result = $arg;
-		});
-
-		$this->assertTrue(Events::trigger('foo', 'bar'));
-
-		$this->assertEquals('bar', $result);
-	}
-
-	public function testCancelEvent()
-	{
-		$result = 0;
-
-		// This should cancel the flow of events, and leave
-		// $result = 1.
-		Events::on('foo', function ($arg) use (&$result) {
-			$result = 1;
-			return false;
-		});
-		Events::on('foo', function ($arg) use (&$result) {
-			$result = 2;
-		});
-
-		$this->assertFalse(Events::trigger('foo', 'bar'));
-		$this->assertEquals(1, $result);
-	}
-
-	public function testPriority()
-	{
-		$result = 0;
-
-		Events::on('foo', function () use (&$result) {
-			$result = 1;
-			return false;
-		}, EVENT_PRIORITY_NORMAL);
-		// Since this has a higher priority, it will
-		// run first.
-		Events::on('foo', function () use (&$result) {
-			$result = 2;
-			return false;
-		}, EVENT_PRIORITY_HIGH);
-
-		$this->assertFalse(Events::trigger('foo', 'bar'));
-		$this->assertEquals(2, $result);
-	}
-
-	public function testPriorityWithMultiple()
-	{
-		$result = [];
+    /**
+     * Accessible event manager instance
+     *
+     * @var MockEvents
+     */
+    protected $manager;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->manager = new MockEvents();
+
+        Events::removeAllListeners();
+    }
+
+    protected function tearDown(): void
+    {
+        Events::simulate(false);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testInitialize()
+    {
+        /**
+         * @var Modules $config
+         */
+        $config          = config('Modules');
+        $config->aliases = [];
+
+        // it should start out empty
+        MockEvents::setFiles([]);
+        $this->assertEmpty($this->manager->getFiles());
+
+        // make sure we have a default events file
+        $default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php'];
+        $this->manager->unInitialize();
+        MockEvents::initialize();
+        $this->assertSame($default, $this->manager->getFiles());
+
+        // but we should be able to change it through the backdoor
+        MockEvents::setFiles(['/peanuts']);
+        $this->assertSame(['/peanuts'], $this->manager->getFiles());
+
+        // re-initializing should have no effect
+        MockEvents::initialize();
+        $this->assertSame(['/peanuts'], $this->manager->getFiles());
+    }
+
+    public function testPerformance()
+    {
+        $result = null;
+        Events::on('foo', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
+        Events::trigger('foo', 'bar');
+
+        $logged = Events::getPerformanceLogs();
+        // there should be some event activity logged
+        $this->assertGreaterThan(0, count($logged));
+    }
+
+    public function testListeners()
+    {
+        $callback1 = static function () {
+        };
+        $callback2 = static function () {
+        };
+
+        Events::on('foo', $callback1, EVENT_PRIORITY_HIGH);
+        Events::on('foo', $callback2, EVENT_PRIORITY_NORMAL);
+
+        $this->assertSame([$callback1, $callback2], Events::listeners('foo'));
+    }
+
+    public function testHandleEvent()
+    {
+        $result = null;
+
+        Events::on('foo', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
+
+        $this->assertTrue(Events::trigger('foo', 'bar'));
+
+        $this->assertSame('bar', $result);
+    }
+
+    public function testCancelEvent()
+    {
+        $result = 0;
+
+        // This should cancel the flow of events, and leave
+        // $result = 1.
+        Events::on('foo', static function ($arg) use (&$result) {
+            $result = 1;
+
+            return false;
+        });
+        Events::on('foo', static function ($arg) use (&$result) {
+            $result = 2;
+        });
+
+        $this->assertFalse(Events::trigger('foo', 'bar'));
+        $this->assertSame(1, $result);
+    }
+
+    public function testPriority()
+    {
+        $result = 0;
+
+        Events::on('foo', static function () use (&$result) {
+            $result = 1;
+
+            return false;
+        }, EVENT_PRIORITY_NORMAL);
+        // Since this has a higher priority, it will
+        // run first.
+        Events::on('foo', static function () use (&$result) {
+            $result = 2;
+
+            return false;
+        }, EVENT_PRIORITY_HIGH);
+
+        $this->assertFalse(Events::trigger('foo', 'bar'));
+        $this->assertSame(2, $result);
+    }
+
+    public function testPriorityWithMultiple()
+    {
+        $result = [];
 
-		Events::on('foo', function () use (&$result) {
-			$result[] = 'a';
-		}, EVENT_PRIORITY_NORMAL);
+        Events::on('foo', static function () use (&$result) {
+            $result[] = 'a';
+        }, EVENT_PRIORITY_NORMAL);
 
-		Events::on('foo', function () use (&$result) {
-			$result[] = 'b';
-		}, EVENT_PRIORITY_LOW);
+        Events::on('foo', static function () use (&$result) {
+            $result[] = 'b';
+        }, EVENT_PRIORITY_LOW);
 
-		Events::on('foo', function () use (&$result) {
-			$result[] = 'c';
-		}, EVENT_PRIORITY_HIGH);
+        Events::on('foo', static function () use (&$result) {
+            $result[] = 'c';
+        }, EVENT_PRIORITY_HIGH);
 
-		Events::on('foo', function () use (&$result) {
-			$result[] = 'd';
-		}, 75);
+        Events::on('foo', static function () use (&$result) {
+            $result[] = 'd';
+        }, 75);
 
-		Events::trigger('foo');
-		$this->assertEquals(['c', 'd', 'a', 'b'], $result);
-	}
+        Events::trigger('foo');
+        $this->assertSame(['c', 'd', 'a', 'b'], $result);
+    }
 
-	public function testRemoveListener()
-	{
-		$result = false;
+    public function testRemoveListener()
+    {
+        $result = false;
 
-		$callback = function () use (&$result) {
-			$result = true;
-		};
+        $callback = static function () use (&$result) {
+            $result = true;
+        };
 
-		Events::on('foo', $callback);
+        Events::on('foo', $callback);
 
-		Events::trigger('foo');
-		$this->assertTrue($result);
+        Events::trigger('foo');
+        $this->assertTrue($result);
 
-		$result = false;
-		$this->assertTrue(Events::removeListener('foo', $callback));
+        $result = false;
+        $this->assertTrue(Events::removeListener('foo', $callback));
 
-		Events::trigger('foo');
-		$this->assertFalse($result);
-	}
+        Events::trigger('foo');
+        $this->assertFalse($result);
+    }
 
-	public function testRemoveListenerTwice()
-	{
-		$result = false;
+    public function testRemoveListenerTwice()
+    {
+        $result = false;
 
-		$callback = function () use (&$result) {
-			$result = true;
-		};
+        $callback = static function () use (&$result) {
+            $result = true;
+        };
 
-		Events::on('foo', $callback);
+        Events::on('foo', $callback);
 
-		Events::trigger('foo');
-		$this->assertTrue($result);
+        Events::trigger('foo');
+        $this->assertTrue($result);
 
-		$result = false;
-		$this->assertTrue(Events::removeListener('foo', $callback));
-		$this->assertFalse(Events::removeListener('foo', $callback));
+        $result = false;
+        $this->assertTrue(Events::removeListener('foo', $callback));
+        $this->assertFalse(Events::removeListener('foo', $callback));
 
-		Events::trigger('foo');
-		$this->assertFalse($result);
-	}
+        Events::trigger('foo');
+        $this->assertFalse($result);
+    }
 
-	public function testRemoveUnknownListener()
-	{
-		$result = false;
+    public function testRemoveUnknownListener()
+    {
+        $result = false;
 
-		$callback = function () use (&$result) {
-			$result = true;
-		};
+        $callback = static function () use (&$result) {
+            $result = true;
+        };
 
-		Events::on('foo', $callback);
+        Events::on('foo', $callback);
 
-		Events::trigger('foo');
-		$this->assertTrue($result);
+        Events::trigger('foo');
+        $this->assertTrue($result);
 
-		$result = false;
-		$this->assertFalse(Events::removeListener('bar', $callback));
+        $result = false;
+        $this->assertFalse(Events::removeListener('bar', $callback));
 
-		Events::trigger('foo');
-		$this->assertTrue($result);
-	}
+        Events::trigger('foo');
+        $this->assertTrue($result);
+    }
 
-	public function testRemoveAllListenersWithSingleEvent()
-	{
-		$result = false;
+    public function testRemoveAllListenersWithSingleEvent()
+    {
+        $result = false;
 
-		$callback = function () use (&$result) {
-			$result = true;
-		};
+        $callback = static function () use (&$result) {
+            $result = true;
+        };
 
-		Events::on('foo', $callback);
+        Events::on('foo', $callback);
 
-		Events::removeAllListeners('foo');
+        Events::removeAllListeners('foo');
 
-		$listeners = Events::listeners('foo');
+        $listeners = Events::listeners('foo');
 
-		$this->assertEquals([], $listeners);
-	}
+        $this->assertSame([], $listeners);
+    }
 
-	public function testRemoveAllListenersWithMultipleEvents()
-	{
-		$result = false;
+    public function testRemoveAllListenersWithMultipleEvents()
+    {
+        $result = false;
 
-		$callback = function () use (&$result) {
-			$result = true;
-		};
+        $callback = static function () use (&$result) {
+            $result = true;
+        };
 
-		Events::on('foo', $callback);
-		Events::on('bar', $callback);
+        Events::on('foo', $callback);
+        Events::on('bar', $callback);
 
-		Events::removeAllListeners();
+        Events::removeAllListeners();
 
-		$this->assertEquals([], Events::listeners('foo'));
-		$this->assertEquals([], Events::listeners('bar'));
-	}
+        $this->assertSame([], Events::listeners('foo'));
+        $this->assertSame([], Events::listeners('bar'));
+    }
 
-	// Basically if it doesn't crash this should be good...
-	public function testHandleEventCallableInternalFunc()
-	{
-		Events::on('foo', 'strlen');
+    // Basically if it doesn't crash this should be good...
+    public function testHandleEventCallableInternalFunc()
+    {
+        Events::on('foo', 'strlen');
 
-		$this->assertTrue(Events::trigger('foo', 'bar'));
-	}
+        $this->assertTrue(Events::trigger('foo', 'bar'));
+    }
 
-	public function testHandleEventCallableClass()
-	{
-		$box = new class() {
-			public $logged;
+    public function testHandleEventCallableClass()
+    {
+        $box = new class () {
+            public $logged;
 
-			public function hold(string $value)
-			{
-				$this->logged = $value;
-			}
-		};
+            public function hold(string $value)
+            {
+                $this->logged = $value;
+            }
+        };
 
-		Events::on('foo', [$box, 'hold']);
+        Events::on('foo', [$box, 'hold']);
 
-		$this->assertTrue(Events::trigger('foo', 'bar'));
+        $this->assertTrue(Events::trigger('foo', 'bar'));
 
-		$this->assertEquals('bar', $box->logged);
-	}
+        $this->assertSame('bar', $box->logged);
+    }
 
-	public function testSimulate()
-	{
-		$result = 0;
+    public function testSimulate()
+    {
+        $result = 0;
 
-		$callback = function () use (&$result) {
-			$result += 2;
-		};
+        $callback = static function () use (&$result) {
+            $result += 2;
+        };
 
-		Events::on('foo', $callback);
+        Events::on('foo', $callback);
 
-		Events::simulate(true);
-		Events::trigger('foo');
+        Events::simulate(true);
+        Events::trigger('foo');
 
-		$this->assertEquals(0, $result);
-	}
+        $this->assertSame(0, $result);
+    }
 }
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index d57ffb9262c6..6ff5b77fd3bc 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -1,80 +1,108 @@
-<?php namespace CodeIgniter\Files;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class FileTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileTest extends CIUnitTestCase
 {
+    public function testNewGoodChecked()
+    {
+        $path = SYSTEMPATH . 'Common.php';
+        $file = new File($path, true);
+        $this->assertSame($path, $file->getRealPath());
+    }
+
+    public function testNewGoodUnchecked()
+    {
+        $path = SYSTEMPATH . 'Common.php';
+        $file = new File($path, false);
+        $this->assertSame($path, $file->getRealPath());
+    }
+
+    public function testNewBadUnchecked()
+    {
+        $path = SYSTEMPATH . 'bogus';
+        $file = new File($path, false);
+        $this->assertFalse($file->getRealPath());
+    }
+
+    public function testGuessExtension()
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        $this->assertSame('php', $file->guessExtension());
+        $file = new File(SYSTEMPATH . 'index.html');
+        $this->assertSame('html', $file->guessExtension());
+        $file = new File(ROOTPATH . 'phpunit.xml.dist');
+        $this->assertSame('xml', $file->guessExtension());
+    }
+
+    public function testRandomName()
+    {
+        $file    = new File(SYSTEMPATH . 'Common.php');
+        $result1 = $file->getRandomName();
+        $this->assertNotSame($result1, $file->getRandomName());
+    }
+
+    public function testCanAccessSplFileInfoMethods()
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        $this->assertSame('file', $file->getType());
+    }
+
+    public function testGetSizeReturnsKB()
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        $size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
+        $this->assertSame($size, $file->getSizeByUnit('kb'));
+    }
+
+    public function testGetSizeReturnsMB()
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        $size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
+        $this->assertSame($size, $file->getSizeByUnit('mb'));
+    }
+
+    public function testGetSizeReturnsBytes()
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        $size = filesize(SYSTEMPATH . 'Common.php');
+        $this->assertSame($size, $file->getSizeByUnit('b'));
+    }
+
+    public function testThrowsExceptionIfNotAFile()
+    {
+        $this->expectException('CodeIgniter\Files\Exceptions\FileNotFoundException');
+
+        new File(SYSTEMPATH . 'Commoner.php', true);
+    }
+
+    public function testGetDestination(): void
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        copy(SYSTEMPATH . 'Common.php', SYSTEMPATH . 'Common_Copy.php');
+
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_1.php', $file->getDestination(SYSTEMPATH . 'Common_Copy.php', ''));
+        $this->assertSame(SYSTEMPATH . 'Common_1.php', $file->getDestination(SYSTEMPATH . 'Common.php'));
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_5.php', $file->getDestination(SYSTEMPATH . 'Common_Copy_5.php'));
 
-	public function testNewGoodChecked()
-	{
-		$path = SYSTEMPATH . 'Common.php';
-		$file = new File($path, true);
-		$this->assertEquals($path, $file->getRealPath());
-	}
-
-	public function testNewGoodUnchecked()
-	{
-		$path = SYSTEMPATH . 'Common.php';
-		$file = new File($path, false);
-		$this->assertEquals($path, $file->getRealPath());
-	}
-
-	public function testNewBadUnchecked()
-	{
-		$path = SYSTEMPATH . 'bogus';
-		$file = new File($path, false);
-		$this->assertFalse($file->getRealPath());
-	}
-
-	public function testGuessExtension()
-	{
-		$file = new File(SYSTEMPATH . 'Common.php');
-		$this->assertEquals('php', $file->guessExtension());
-		$file = new File(SYSTEMPATH . 'index.html');
-		$this->assertEquals('html', $file->guessExtension());
-		$file = new File(ROOTPATH . 'phpunit.xml.dist');
-		$this->assertEquals('xml', $file->guessExtension());
-	}
-
-	public function testRandomName()
-	{
-		$file    = new File(SYSTEMPATH . 'Common.php');
-		$result1 = $file->getRandomName();
-		$this->assertNotEquals($result1, $file->getRandomName());
-	}
-
-	public function testCanAccessSplFileInfoMethods()
-	{
-		$file = new File(SYSTEMPATH . 'Common.php');
-		$this->assertEquals('file', $file->getType());
-	}
-
-	public function testGetSizeReturnsKB()
-	{
-		$file = new File(SYSTEMPATH . 'Common.php');
-		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
-		$this->assertEquals($size, $file->getSizeByUnit('kb'));
-	}
-
-	public function testGetSizeReturnsMB()
-	{
-		$file = new File(SYSTEMPATH . 'Common.php');
-		$size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
-		$this->assertEquals($size, $file->getSizeByUnit('mb'));
-	}
-
-	public function testGetSizeReturnsBytes()
-	{
-		$file = new File(SYSTEMPATH . 'Common.php');
-		$size = filesize(SYSTEMPATH . 'Common.php');
-		$this->assertEquals($size, $file->getSizeByUnit('b'));
-	}
-
-	public function testThrowsExceptionIfNotAFile()
-	{
-		$this->expectException('CodeIgniter\Files\Exceptions\FileNotFoundException');
-
-		$file = new File(SYSTEMPATH . 'Commoner.php', true);
-	}
+        copy(SYSTEMPATH . 'Common_Copy.php', SYSTEMPATH . 'Common_Copy_5.php');
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_6.php', $file->getDestination(SYSTEMPATH . 'Common_Copy_5.php'));
 
+        unlink(SYSTEMPATH . 'Common_Copy.php');
+        unlink(SYSTEMPATH . 'Common_Copy_5.php');
+    }
 }
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 053181efdc7f..33a87535ed54 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -1,140 +1,153 @@
-<?php namespace CodeIgniter\Files;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class FileWithVfsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileWithVfsTest extends CIUnitTestCase
 {
-
-	// For VFS stuff
-	protected $root;
-	protected $path;
-	protected $start;
-
-	/**
-	 * @var File
-	 */
-	protected $file;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->root = vfsStream::setup();
-		$this->path = '_support/Files/';
-		vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
-		$this->start = $this->root->url() . '/';
-		$this->file  = new File($this->start . 'able/apple.php');
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		$this->root = null;
-	}
-
-	public function testDestinationUnknown()
-	{
-		$destination = $this->start . 'charlie/cherry.php';
-		$this->assertEquals($destination, $this->file->getDestination($destination));
-	}
-
-	public function testDestinationSameFileSameFolder()
-	{
-		$destination = $this->start . 'able/apple.php';
-		$this->assertEquals($this->start . 'able/apple_1.php', $this->file->getDestination($destination));
-	}
-
-	public function testDestinationSameFileDifferentFolder()
-	{
-		$destination = $this->start . 'baker/apple.php';
-		$this->assertEquals($destination, $this->file->getDestination($destination));
-	}
-
-	public function testDestinationDifferentFileSameFolder()
-	{
-		$destination = $this->start . 'able/date.php';
-		$this->assertEquals($destination, $this->file->getDestination($destination));
-	}
-
-	public function testDestinationDifferentFileDifferentFolder()
-	{
-		$destination = $this->start . 'baker/date.php';
-		$this->assertEquals($destination, $this->file->getDestination($destination));
-	}
-
-	public function testDestinationExistingFileDifferentFolder()
-	{
-		$destination = $this->start . 'baker/banana.php';
-		$this->assertEquals($this->start . 'baker/banana_1.php', $this->file->getDestination($destination));
-	}
-
-	public function testDestinationDelimited()
-	{
-		$destination = $this->start . 'able/fig_3.php';
-		$this->assertEquals($this->start . 'able/fig_4.php', $this->file->getDestination($destination));
-	}
-
-	public function testDestinationDelimitedAlpha()
-	{
-		$destination = $this->start . 'able/prune_ripe.php';
-		$this->assertEquals($this->start . 'able/prune_ripe_1.php', $this->file->getDestination($destination));
-	}
-
-	public function testMoveNormal()
-	{
-		$destination = $this->start . 'baker';
-		$this->file->move($destination);
-		$this->assertTrue($this->root->hasChild('baker/apple.php'));
-		$this->assertFalse($this->root->hasChild('able/apple.php'));
-	}
-
-	public function testMoveRename()
-	{
-		$destination = $this->start . 'baker';
-		$this->file->move($destination, 'popcorn.php');
-		$this->assertTrue($this->root->hasChild('baker/popcorn.php'));
-		$this->assertFalse($this->root->hasChild('able/apple.php'));
-	}
-
-	public function testMoveOverwrite()
-	{
-		$destination = $this->start . 'baker';
-		$this->file->move($destination, 'banana.php', true);
-		$this->assertTrue($this->root->hasChild('baker/banana.php'));
-		$this->assertFalse($this->root->hasChild('able/apple.php'));
-	}
-
-	public function testMoveDontOverwrite()
-	{
-		$destination = $this->start . 'baker';
-		$this->file->move($destination, 'banana.php');
-		$this->assertTrue($this->root->hasChild('baker/banana_1.php'));
-		$this->assertFalse($this->root->hasChild('able/apple.php'));
-	}
-
-	public function testMoveFailure()
-	{
-		$this->expectException('Exception');
-
-		$here = $this->root->url();
-
-		chmod($here, 400); // make a read-only folder
-		$destination = $here . '/charlie';
-		$this->file->move($destination); // try to move our file there
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1782
-	 */
-	public function testMoveReturnsNewInstance()
-	{
-		$destination = $this->start . 'baker';
-		$file        = $this->file->move($destination);
-
-		$this->assertTrue($this->root->hasChild('baker/apple.php'));
-		$this->assertInstanceOf(File::class, $file);
-		$this->assertEquals($destination . '/apple.php', $file->getPathname());
-	}
+    // For VFS stuff
+    protected $root;
+    protected $path;
+    protected $start;
+
+    /**
+     * @var File
+     */
+    protected $file;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->root = vfsStream::setup();
+        $this->path = '_support/Files/';
+        vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
+        $this->start = $this->root->url() . '/';
+        $this->file  = new File($this->start . 'able/apple.php');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->root = null;
+    }
+
+    public function testDestinationUnknown()
+    {
+        $destination = $this->start . 'charlie/cherry.php';
+        $this->assertSame($destination, $this->file->getDestination($destination));
+    }
+
+    public function testDestinationSameFileSameFolder()
+    {
+        $destination = $this->start . 'able/apple.php';
+        $this->assertSame($this->start . 'able/apple_1.php', $this->file->getDestination($destination));
+    }
+
+    public function testDestinationSameFileDifferentFolder()
+    {
+        $destination = $this->start . 'baker/apple.php';
+        $this->assertSame($destination, $this->file->getDestination($destination));
+    }
+
+    public function testDestinationDifferentFileSameFolder()
+    {
+        $destination = $this->start . 'able/date.php';
+        $this->assertSame($destination, $this->file->getDestination($destination));
+    }
+
+    public function testDestinationDifferentFileDifferentFolder()
+    {
+        $destination = $this->start . 'baker/date.php';
+        $this->assertSame($destination, $this->file->getDestination($destination));
+    }
+
+    public function testDestinationExistingFileDifferentFolder()
+    {
+        $destination = $this->start . 'baker/banana.php';
+        $this->assertSame($this->start . 'baker/banana_1.php', $this->file->getDestination($destination));
+    }
+
+    public function testDestinationDelimited()
+    {
+        $destination = $this->start . 'able/fig_3.php';
+        $this->assertSame($this->start . 'able/fig_4.php', $this->file->getDestination($destination));
+    }
+
+    public function testDestinationDelimitedAlpha()
+    {
+        $destination = $this->start . 'able/prune_ripe.php';
+        $this->assertSame($this->start . 'able/prune_ripe_1.php', $this->file->getDestination($destination));
+    }
+
+    public function testMoveNormal()
+    {
+        $destination = $this->start . 'baker';
+        $this->file->move($destination);
+        $this->assertTrue($this->root->hasChild('baker/apple.php'));
+        $this->assertFalse($this->root->hasChild('able/apple.php'));
+    }
+
+    public function testMoveRename()
+    {
+        $destination = $this->start . 'baker';
+        $this->file->move($destination, 'popcorn.php');
+        $this->assertTrue($this->root->hasChild('baker/popcorn.php'));
+        $this->assertFalse($this->root->hasChild('able/apple.php'));
+    }
+
+    public function testMoveOverwrite()
+    {
+        $destination = $this->start . 'baker';
+        $this->file->move($destination, 'banana.php', true);
+        $this->assertTrue($this->root->hasChild('baker/banana.php'));
+        $this->assertFalse($this->root->hasChild('able/apple.php'));
+    }
+
+    public function testMoveDontOverwrite()
+    {
+        $destination = $this->start . 'baker';
+        $this->file->move($destination, 'banana.php');
+        $this->assertTrue($this->root->hasChild('baker/banana_1.php'));
+        $this->assertFalse($this->root->hasChild('able/apple.php'));
+    }
+
+    public function testMoveFailure()
+    {
+        $this->expectException('Exception');
+
+        $here = $this->root->url();
+
+        chmod($here, 400); // make a read-only folder
+        $destination = $here . '/charlie';
+        $this->file->move($destination); // try to move our file there
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1782
+     */
+    public function testMoveReturnsNewInstance()
+    {
+        $destination = $this->start . 'baker';
+        $file        = $this->file->move($destination);
+
+        $this->assertTrue($this->root->hasChild('baker/apple.php'));
+        $this->assertInstanceOf(File::class, $file);
+        $this->assertSame($destination . '/apple.php', $file->getPathname());
+    }
 }
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 02c529809d31..5ad75c055393 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
@@ -6,38 +16,37 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CSRFTest extends CIUnitTestCase
+final class CSRFTest extends CIUnitTestCase
 {
-
-	protected $config;
-	protected $request;
-	protected $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->config = new \Config\Filters();
-	}
-
-	//--------------------------------------------------------------------
-	public function testNormal()
-	{
-		$this->config->globals = [
-			'before' => ['csrf'],
-			'after'  => [],
-		];
-
-		$this->request  = Services::request(null, false);
-		$this->response = Services::response();
-
-		$filters = new Filters($this->config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		// we expect CSRF requests to be ignored in CLI
-		$expected = $this->request;
-		$request  = $filters->run($uri, 'before');
-		$this->assertEquals($expected, $request);
-	}
-
+    protected $config;
+    protected $request;
+    protected $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->config = new \Config\Filters();
+    }
+
+    public function testNormal()
+    {
+        $this->config->globals = [
+            'before' => ['csrf'],
+            'after'  => [],
+        ];
+
+        $this->request  = Services::request(null, false);
+        $this->response = Services::response();
+
+        $filters = new Filters($this->config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        // we expect CSRF requests to be ignored in CLI
+        $expected = $this->request;
+        $request  = $filters->run($uri, 'before');
+        $this->assertSame($expected, $request);
+    }
 }
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index 2c37c8fb0ebd..543eb6941def 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
@@ -7,45 +17,43 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class DebugToolbarTest extends CIUnitTestCase
+final class DebugToolbarTest extends CIUnitTestCase
 {
+    protected $request;
+    protected $response;
 
-	protected $request;
-	protected $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->request  = Services::request();
-		$this->response = Services::response();
-	}
-
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	public function testDebugToolbarFilter()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
+        $this->request  = Services::request();
+        $this->response = Services::response();
+    }
 
-		$config          = new FilterConfig();
-		$config->globals = [
-			'before' => ['toolbar'], // not normal; exercising its before()
-			'after'  => ['toolbar'],
-		];
+    public function testDebugToolbarFilter()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$filter = new DebugToolbar();
+        $config          = new FilterConfig();
+        $config->globals = [
+            'before' => ['toolbar'], // not normal; exercising its before()
+            'after'  => ['toolbar'],
+        ];
 
-		$expectedBefore = $this->request;
-		$expectedAfter  = $this->response;
+        $filter = new DebugToolbar();
 
-		// nothing should change here, since we have no before logic
-		$filter->before($this->request);
-		$this->assertEquals($expectedBefore, $this->request);
+        $expectedBefore = $this->request;
+        $expectedAfter  = $this->response;
 
-		// nothing should change here, since we are running in the CLI
-		$filter->after($this->request, $this->response);
-		$this->assertEquals($expectedAfter, $this->response);
-	}
+        // nothing should change here, since we have no before logic
+        $filter->before($this->request);
+        $this->assertSame($expectedBefore, $this->request);
 
+        // nothing should change here, since we are running in the CLI
+        $filter->after($this->request, $this->response);
+        $this->assertSame($expectedAfter, $this->response);
+    }
 }
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 9e009b2a09f6..dbe88c4879c5 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
@@ -18,1077 +27,1082 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class FiltersTest extends CIUnitTestCase
+final class FiltersTest extends CIUnitTestCase
 {
-	protected $request;
-	protected $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		Services::reset();
-
-		$defaults = [
-			'Config'        => APPPATH . 'Config',
-			'App'           => APPPATH,
-			'Tests\Support' => TESTPATH . '_support',
-		];
-
-		Services::autoloader()->addNamespace($defaults);
-
-		$this->request  = Services::request();
-		$this->response = Services::response();
-	}
-
-	public function testProcessMethodDetectsCLI()
-	{
-		$config  = [
-			'aliases' => ['foo' => ''],
-			'methods' => [
-				'cli' => ['foo'],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$expected = [
-			'before' => ['foo'],
-			'after'  => [],
-		];
-
-		$this->assertEquals($expected, $filters->initialize()->getFilters());
-	}
-
-	public function testProcessMethodDetectsGetRequests()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => ['foo' => ''],
-			'methods' => [
-				'get' => ['foo'],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$expected = [
-			'before' => ['foo'],
-			'after'  => [],
-		];
-
-		$this->assertEquals($expected, $filters->initialize()->getFilters());
-	}
-
-	public function testProcessMethodRespectsMethod()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-			],
-			'methods' => [
-				'post' => ['foo'],
-				'get'  => ['bar'],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$expected = [
-			'before' => ['bar'],
-			'after'  => [],
-		];
-
-		$this->assertEquals($expected, $filters->initialize()->getFilters());
-	}
-
-	public function testProcessMethodIgnoresMethod()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'DELETE';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-			],
-			'methods' => [
-				'post' => ['foo'],
-				'get'  => ['bar'],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$expected = [
-			'before' => [],
-			'after'  => [],
-		];
-
-		$this->assertEquals($expected, $filters->initialize()->getFilters());
-	}
-
-	public function testProcessMethodProcessGlobals()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['bar'], // not excluded
-					'bar'
-				],
-				'after'  => [
-					'baz'
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$expected = [
-			'before' => [
-				'foo',
-				'bar',
-			],
-			'after'  => ['baz'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize()->getFilters());
-	}
-
-	public function provideExcept()
-	{
-		return [
-			[
-				['admin/*'],
-			],
-			[
-				[],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider provideExcept
-	 */
-	public function testProcessMethodProcessGlobalsWithExcept(array $except)
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => $except],
-					'bar'
-				],
-				'after'  => [
-					'baz'
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'bar'
-			],
-			'after'  => ['baz'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testProcessMethodProcessesFiltersBefore()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'filters' => [
-				'foo' => [
-					'before' => ['admin/*'],
-					'after'  => ['/users/*'],
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => ['foo'],
-			'after'  => [],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testProcessMethodProcessesFiltersAfter()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'filters' => [
-				'foo' => [
-					'before' => ['admin/*'],
-					'after'  => ['/users/*'],
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'users/foo/bar';
-
-		$expected = [
-			'before' => [],
-			'after'  => [
-				'foo',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testProcessMethodProcessesCombined()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foog' => '',
-				'barg' => '',
-				'bazg' => '',
-				'foo'  => '',
-				'bar'  => '',
-				'foof' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foog' => ['except' => ['admin/*']],
-					'barg'
-				],
-				'after'  => [
-					'bazg'
-				],
-			],
-			'methods' => [
-				'post' => ['foo'],
-				'get'  => ['bar'],
-			],
-			'filters' => [
-				'foof' => [
-					'before' => ['admin/*'],
-					'after'  => ['/users/*'],
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'barg',
-				'bar',
-				'foof',
-			],
-			'after'  => ['bazg'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testProcessMethodProcessesCombinedAfterForToolbar()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'toolbar' => '',
-				'bazg'    => '',
-				'bar'     => '',
-				'foof'    => '',
-			],
-			'globals' => [
-				'after' => [
-					'toolbar',
-					'bazg',
-				],
-			],
-			'methods' => [
-				'get' => ['bar'],
-			],
-			'filters' => [
-				'foof' => [
-					'after' => ['admin/*'],
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => ['bar'],
-			'after'  => [
-				'bazg',
-				'foof',
-				'toolbar',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testRunThrowsWithInvalidAlias()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [],
-			'globals' => [
-				'before' => ['invalid'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$this->expectException(FilterException::class);
-		$uri = 'admin/foo/bar';
-
-		$filters->run($uri);
-	}
-
-	public function testCustomFiltersLoad()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [],
-			'globals' => [
-				'before' => ['test-customfilter'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$request = $filters->run($uri, 'before');
-
-		$this->assertEquals('http://hellowworld.com', $request->url);
-	}
-
-	public function testRunThrowsWithInvalidClassType()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['invalid' => 'CodeIgniter\Filters\fixtures\InvalidClass'],
-			'globals' => [
-				'before' => ['invalid'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$this->expectException(FilterException::class);
-		$uri = 'admin/foo/bar';
-
-		$filters->run($uri);
-	}
-
-	public function testRunDoesBefore()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
-			'globals' => [
-				'before' => ['google'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$request = $filters->run($uri, 'before');
-
-		$this->assertEquals('http://google.com', $request->url);
-	}
-
-	public function testRunDoesAfter()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
-			'globals' => [
-				'before' => [],
-				'after'  => ['google'],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$response = $filters->run($uri, 'after');
-
-		$this->assertEquals('http://google.com', $response->csp);
-	}
-
-	public function testShortCircuit()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['banana' => 'CodeIgniter\Filters\fixtures\GoogleYou'],
-			'globals' => [
-				'before' => ['banana'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$response = $filters->run($uri, 'before');
-		$this->assertTrue($response instanceof ResponseInterface);
-		$this->assertEquals('http://google.com', $response->csp);
-	}
-
-	public function testOtherResult()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'nowhere' => 'CodeIgniter\Filters\fixtures\GoogleEmpty',
-				'banana'  => 'CodeIgniter\Filters\fixtures\GoogleCurious',
-			],
-			'globals' => [
-				'before' => [
-					'nowhere',
-					'banana',
-				],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$response = $filters->run($uri, 'before');
-
-		$this->assertEquals('This is curious', $response);
-	}
-
-	public function testBeforeExceptString()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'admin/*'],
-					'bar'
-				],
-				'after'  => [
-					'baz'
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'bar'
-			],
-			'after'  => ['baz'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testBeforeExceptInapplicable()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'george/*'],
-					'bar'
-				],
-				'after'  => [
-					'baz'
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'foo',
-				'bar',
-			],
-			'after'  => ['baz'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testAfterExceptString()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'bar'
-				],
-				'after'  => [
-					'foo' => ['except' => 'admin/*'],
-					'baz'
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'bar'
-			],
-			'after'  => ['baz'],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testAfterExceptInapplicable()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo' => '',
-				'bar' => '',
-				'baz' => '',
-			],
-			'globals' => [
-				'before' => [
-					'bar'
-				],
-				'after'  => [
-					'foo' => ['except' => 'george/*'],
-					'baz'
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'bar'
-			],
-			'after'  => [
-				'foo',
-				'baz',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	public function testAddFilter()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
-			'globals' => [
-				'before' => ['google'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$filters = $filters->addFilter('Some\Class', 'some_alias');
-
-		$filters = $filters->initialize('admin/foo/bar');
-
-		$filters = $filters->getFilters();
-
-		$this->assertTrue(in_array('some_alias', $filters['before'], true));
-	}
-
-	public function testAddFilterSection()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$filters = $filters->addFilter('Some\OtherClass', 'another', 'before', 'globals')
-				->initialize('admin/foo/bar');
-		$list    = $filters->getFilters();
-
-		$this->assertTrue(in_array('another', $list['before'], true));
-	}
-
-	public function testInitializeTwice()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [];
+    protected $request;
+    protected $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        Services::reset();
+
+        $defaults = [
+            'Config'        => APPPATH . 'Config',
+            'App'           => APPPATH,
+            'Tests\Support' => TESTPATH . '_support',
+        ];
+
+        Services::autoloader()->addNamespace($defaults);
+
+        $this->request  = Services::request();
+        $this->response = Services::response();
+    }
+
+    public function testProcessMethodDetectsCLI()
+    {
+        $config = [
+            'aliases' => ['foo' => ''],
+            'methods' => [
+                'cli' => ['foo'],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $expected = [
+            'before' => ['foo'],
+            'after'  => [],
+        ];
+
+        $this->assertSame($expected, $filters->initialize()->getFilters());
+    }
+
+    public function testProcessMethodDetectsGetRequests()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['foo' => ''],
+            'methods' => [
+                'get' => ['foo'],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $expected = [
+            'before' => ['foo'],
+            'after'  => [],
+        ];
+
+        $this->assertSame($expected, $filters->initialize()->getFilters());
+    }
+
+    public function testProcessMethodRespectsMethod()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+            ],
+            'methods' => [
+                'post' => ['foo'],
+                'get'  => ['bar'],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $expected = [
+            'before' => ['bar'],
+            'after'  => [],
+        ];
+
+        $this->assertSame($expected, $filters->initialize()->getFilters());
+    }
+
+    public function testProcessMethodIgnoresMethod()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'DELETE';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+            ],
+            'methods' => [
+                'post' => ['foo'],
+                'get'  => ['bar'],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $expected = [
+            'before' => [],
+            'after'  => [],
+        ];
+
+        $this->assertSame($expected, $filters->initialize()->getFilters());
+    }
+
+    public function testProcessMethodProcessGlobals()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['bar'], // not excluded
+                    'bar',
+                ],
+                'after' => [
+                    'baz',
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $expected = [
+            'before' => [
+                'foo',
+                'bar',
+            ],
+            'after' => ['baz'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize()->getFilters());
+    }
+
+    public function provideExcept()
+    {
+        return [
+            [
+                ['admin/*'],
+            ],
+            [
+                [],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideExcept
+     */
+    public function testProcessMethodProcessGlobalsWithExcept(array $except)
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => $except],
+                    'bar',
+                ],
+                'after' => [
+                    'baz',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'bar',
+            ],
+            'after' => ['baz'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testProcessMethodProcessesFiltersBefore()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'filters' => [
+                'foo' => [
+                    'before' => ['admin/*'],
+                    'after'  => ['/users/*'],
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => ['foo'],
+            'after'  => [],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testProcessMethodProcessesFiltersAfter()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'filters' => [
+                'foo' => [
+                    'before' => ['admin/*'],
+                    'after'  => ['/users/*'],
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'users/foo/bar';
+
+        $expected = [
+            'before' => [],
+            'after'  => [
+                'foo',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testProcessMethodProcessesCombined()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foog' => '',
+                'barg' => '',
+                'bazg' => '',
+                'foo'  => '',
+                'bar'  => '',
+                'foof' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foog' => ['except' => ['admin/*']],
+                    'barg',
+                ],
+                'after' => [
+                    'bazg',
+                ],
+            ],
+            'methods' => [
+                'post' => ['foo'],
+                'get'  => ['bar'],
+            ],
+            'filters' => [
+                'foof' => [
+                    'before' => ['admin/*'],
+                    'after'  => ['/users/*'],
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'barg',
+                'bar',
+                'foof',
+            ],
+            'after' => ['bazg'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testProcessMethodProcessesCombinedAfterForToolbar()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'toolbar' => '',
+                'bazg'    => '',
+                'bar'     => '',
+                'foof'    => '',
+            ],
+            'globals' => [
+                'after' => [
+                    'toolbar',
+                    'bazg',
+                ],
+            ],
+            'methods' => [
+                'get' => ['bar'],
+            ],
+            'filters' => [
+                'foof' => [
+                    'after' => ['admin/*'],
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => ['bar'],
+            'after'  => [
+                'bazg',
+                'foof',
+                'toolbar',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testRunThrowsWithInvalidAlias()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [],
+            'globals' => [
+                'before' => ['invalid'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $this->expectException(FilterException::class);
+        $uri = 'admin/foo/bar';
+
+        $filters->run($uri);
+    }
+
+    public function testCustomFiltersLoad()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [],
+            'globals' => [
+                'before' => ['test-customfilter'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $request = $filters->run($uri, 'before');
+
+        $this->assertSame('http://hellowworld.com', $request->url);
+    }
+
+    public function testRunThrowsWithInvalidClassType()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['invalid' => 'CodeIgniter\Filters\fixtures\InvalidClass'],
+            'globals' => [
+                'before' => ['invalid'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $this->expectException(FilterException::class);
+        $uri = 'admin/foo/bar';
+
+        $filters->run($uri);
+    }
+
+    public function testRunDoesBefore()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'globals' => [
+                'before' => ['google'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $request = $filters->run($uri, 'before');
+
+        $this->assertSame('http://google.com', $request->url);
+    }
+
+    public function testRunDoesAfter()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'globals' => [
+                'before' => [],
+                'after'  => ['google'],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $response = $filters->run($uri, 'after');
+
+        $this->assertSame('http://google.com', $response->csp);
+    }
+
+    public function testShortCircuit()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['banana' => 'CodeIgniter\Filters\fixtures\GoogleYou'],
+            'globals' => [
+                'before' => ['banana'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $response = $filters->run($uri, 'before');
+        $this->assertTrue($response instanceof ResponseInterface);
+        $this->assertSame('http://google.com', $response->csp);
+    }
+
+    public function testOtherResult()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'nowhere' => 'CodeIgniter\Filters\fixtures\GoogleEmpty',
+                'banana'  => 'CodeIgniter\Filters\fixtures\GoogleCurious',
+            ],
+            'globals' => [
+                'before' => [
+                    'nowhere',
+                    'banana',
+                ],
+                'after' => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $response = $filters->run($uri, 'before');
+
+        $this->assertSame('This is curious', $response);
+    }
+
+    public function testBeforeExceptString()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'admin/*'],
+                    'bar',
+                ],
+                'after' => [
+                    'baz',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'bar',
+            ],
+            'after' => ['baz'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testBeforeExceptInapplicable()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'george/*'],
+                    'bar',
+                ],
+                'after' => [
+                    'baz',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'foo',
+                'bar',
+            ],
+            'after' => ['baz'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testAfterExceptString()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'bar',
+                ],
+                'after' => [
+                    'foo' => ['except' => 'admin/*'],
+                    'baz',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'bar',
+            ],
+            'after' => ['baz'],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testAfterExceptInapplicable()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'bar' => '',
+                'baz' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'bar',
+                ],
+                'after' => [
+                    'foo' => ['except' => 'george/*'],
+                    'baz',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'bar',
+            ],
+            'after' => [
+                'foo',
+                'baz',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    public function testAddFilter()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'globals' => [
+                'before' => ['google'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $filters = $filters->addFilter('Some\Class', 'some_alias');
+
+        $filters = $filters->initialize('admin/foo/bar');
+
+        $filters = $filters->getFilters();
+
+        $this->assertTrue(in_array('some_alias', $filters['before'], true));
+    }
+
+    public function testAddFilterSection()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $filters = $filters
+            ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
+            ->initialize('admin/foo/bar');
+
+        $list = $filters->getFilters();
+
+        $this->assertTrue(in_array('another', $list['before'], true));
+    }
+
+    public function testInitializeTwice()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [];
 
-		$filters = new Filters((object) $config, $this->request, $this->response);
+        $filters = new Filters((object) $config, $this->request, $this->response);
 
-		$filters = $filters->addFilter('Some\OtherClass', 'another', 'before', 'globals')
-				->initialize('admin/foo/bar')
-				->initialize();
-		$list    = $filters->getFilters();
+        $filters = $filters
+            ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
+            ->initialize('admin/foo/bar')
+            ->initialize();
 
-		$this->assertTrue(in_array('another', $list['before'], true));
-	}
+        $list = $filters->getFilters();
 
-	public function testEnableFilter()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
+        $this->assertTrue(in_array('another', $list['before'], true));
+    }
 
-		$config = [
-			'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
-			'globals' => [
-				'before' => [],
-				'after'  => [],
-			],
-		];
+    public function testEnableFilter()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$filters = new Filters((object) $config, $this->request, $this->response);
+        $config = [
+            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'globals' => [
+                'before' => [],
+                'after'  => [],
+            ],
+        ];
 
-		$filters = $filters->initialize('admin/foo/bar');
+        $filters = new Filters((object) $config, $this->request, $this->response);
 
-		$filters->enableFilter('google', 'before');
+        $filters = $filters->initialize('admin/foo/bar');
 
-		$filters = $filters->getFilters();
+        $filters->enableFilter('google', 'before');
 
-		$this->assertTrue(in_array('google', $filters['before'], true));
-	}
+        $filters = $filters->getFilters();
 
-	public function testEnableFilterWithArguments()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
+        $this->assertTrue(in_array('google', $filters['before'], true));
+    }
 
-		$config = [
-			'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
-			'globals' => [
-				'before' => [],
-				'after'  => [],
-			],
-		];
+    public function testEnableFilterWithArguments()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$filters = new Filters((object)$config, $this->request, $this->response);
+        $config = [
+            'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
+            'globals' => [
+                'before' => [],
+                'after'  => [],
+            ],
+        ];
 
-		$filters = $filters->initialize('admin/foo/bar');
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $filters = $filters->initialize('admin/foo/bar');
 
-		$filters->enableFilter('role:admin , super', 'before');
-		$filters->enableFilter('role:admin , super', 'after');
+        $filters->enableFilter('role:admin , super', 'before');
+        $filters->enableFilter('role:admin , super', 'after');
 
-		$found = $filters->getFilters();
+        $found = $filters->getFilters();
 
-		$this->assertTrue(in_array('role', $found['before'], true));
-		$this->assertEquals(['admin', 'super'], $filters->getArguments('role'));
-		$this->assertEquals(['role' => ['admin', 'super']], $filters->getArguments());
+        $this->assertTrue(in_array('role', $found['before'], true));
+        $this->assertSame(['admin', 'super'], $filters->getArguments('role'));
+        $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments());
 
-		$response = $filters->run('admin/foo/bar', 'before');
-		$this->assertEquals('admin;super', $response);
+        $response = $filters->run('admin/foo/bar', 'before');
+        $this->assertSame('admin;super', $response);
 
-		$response = $filters->run('admin/foo/bar', 'after');
-		$this->assertEquals('admin;super', $response->getBody());
-	}
+        $response = $filters->run('admin/foo/bar', 'after');
+        $this->assertSame('admin;super', $response->getBody());
+    }
 
-	public function testEnableFilterWithNoArguments()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
+    public function testEnableFilterWithNoArguments()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$config = [
-			'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
-			'globals' => [
-				'before' => [],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object)$config, $this->request, $this->response);
-
-		$filters = $filters->initialize('admin/foo/bar');
-
-		$filters->enableFilter('role', 'before');
-		$filters->enableFilter('role', 'after');
-
-		$found = $filters->getFilters();
-
-		$this->assertTrue(in_array('role', $found['before'], true));
-
-		$response = $filters->run('admin/foo/bar', 'before');
-		$this->assertEquals('Is null', $response);
-
-		$response = $filters->run('admin/foo/bar', 'after');
-		$this->assertEquals('Is null', $response->getBody());
-	}
-
-	public function testEnableNonFilter()
-	{
-		$this->expectException('CodeIgniter\Filters\Exceptions\FilterException');
-
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
-			'globals' => [
-				'before' => [],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$filters = $filters->initialize('admin/foo/bar');
-
-		$filters->enableFilter('goggle', 'before');
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1664
-	 */
-	public function testMatchesURICaseInsensitively()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config  = [
-			'aliases' => [
-				'foo'  => '',
-				'bar'  => '',
-				'frak' => '',
-				'baz'  => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'Admin/*'],
-					'bar'
-				],
-				'after'  => [
-					'foo' => ['except' => 'Admin/*'],
-					'baz'
-				],
-			],
-			'filters' => [
-				'frak' => [
-					'before' => ['Admin/*'],
-					'after'  => ['Admin/*'],
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$expected = [
-			'before' => [
-				'bar',
-				'frak',
-			],
-			'after'  => [
-				'baz',
-				'frak',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
-	 */
-	public function testFilterMatching()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo'  => '',
-				'bar'  => '',
-				'frak' => '',
-			],
-			'filters' => [
-				'frak' => [
-					'before' => ['admin*'],
-					'after'  => ['admin/*'],
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin';
-
-		$expected = [
-			'before' => [
-				'frak',
-			],
-			'after'  => [],
-		];
-
-		$actual = $filters->initialize($uri)->getFilters();
-		$this->assertEquals($expected, $actual);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
-	 */
-	public function testGlobalFilterMatching()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo' => '',
-				'one' => '',
-				'two' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'admin*'],
-					'one',
-				],
-				'after'  => [
-					'foo' => ['except' => 'admin/*'],
-					'two',
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin';
-
-		$expected = [
-			'before' => [
-				'one'
-			],
-			'after'  => [
-				'foo',
-				'two',
-			],
-		];
-
-		$actual = $filters->initialize($uri)->getFilters();
-		$this->assertEquals($expected, $actual);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
-	 */
-	public function testCombinedFilterMatching()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo'  => '',
-				'one'  => '',
-				'frak' => '',
-				'two'  => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'admin*'],
-					'one',
-				],
-				'after'  => [
-					'foo' => ['except' => 'admin/*'],
-					'two',
-				],
-			],
-			'filters' => [
-				'frak' => [
-					'before' => ['admin*'],
-					'after'  => ['admin/*'],
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin123';
-
-		$expected = [
-			'before' => [
-				'one',
-				'frak',
-			],
-			'after'  => [
-				'foo',
-				'two',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
-	 */
-	public function testSegmentedFilterMatching()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo'  => '',
-				'one'  => '',
-				'frak' => '',
-			],
-			'globals' => [
-				'before' => [
-					'foo' => ['except' => 'admin*'],
-				],
-				'after'  => [
-					'foo' => ['except' => 'admin/*'],
-				],
-			],
-			'filters' => [
-				'frak' => [
-					'before' => ['admin*'],
-					'after'  => ['admin/*'],
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/123';
-
-		$expected = [
-			'before' => [
-				'frak',
-			],
-			'after'  => [
-				'frak',
-			],
-		];
-
-		$this->assertEquals($expected, $filters->initialize($uri)->getFilters());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2831
-	 */
-	public function testFilterAlitasMultiple()
-	{
-		$config  = [
-			'aliases' => [
-				'multipeTest' => [
-					'CodeIgniter\Filters\fixtures\Multiple1',
-					'CodeIgniter\Filters\fixtures\Multiple2',
-				],
-			],
-			'globals' => [
-				'before' => [
-					'multipeTest',
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$request = $filters->run($uri, 'before');
-		$this->assertEquals('http://exampleMultipleURL.com', $request->url);
-		$this->assertEquals('http://exampleMultipleCSP.com', $request->csp);
-	}
-
-	public function testFilterClass()
-	{
-		$config  = [
-			'aliases' => [
-				'multipleTest' => [
-					'CodeIgniter\Filters\fixtures\Multiple1',
-					'CodeIgniter\Filters\fixtures\Multiple2',
-				],
-			],
-			'globals' => [
-				'after' => [
-					'multipleTest',
-				],
-			],
-		];
-		$filters = new Filters((object) $config, $this->request, $this->response);
-
-		$filters->run('admin/foo/bar', 'before');
-		$expected = [
-			'after'  => [
-				'CodeIgniter\Filters\fixtures\Multiple1',
-				'CodeIgniter\Filters\fixtures\Multiple2',
-			],
-			'before' => [],
-		];
-		$this->assertEquals($expected, $filters->getFiltersClass());
-	}
-
-	public function testReset()
-	{
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$config = [
-			'aliases' => [
-				'foo' => '',
-			],
-			'filters' => [
-				'foo' => [
-					'before' => ['admin*'],
-				],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin';
-
-		$this->assertEquals(['foo'], $filters->initialize($uri)->getFilters()['before']);
-		$this->assertSame([], $filters->reset()->getFilters()['before']);
-	}
+        $config = [
+            'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
+            'globals' => [
+                'before' => [],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $filters = $filters->initialize('admin/foo/bar');
+
+        $filters->enableFilter('role', 'before');
+        $filters->enableFilter('role', 'after');
+
+        $found = $filters->getFilters();
+
+        $this->assertTrue(in_array('role', $found['before'], true));
+
+        $response = $filters->run('admin/foo/bar', 'before');
+        $this->assertSame('Is null', $response);
+
+        $response = $filters->run('admin/foo/bar', 'after');
+        $this->assertSame('Is null', $response->getBody());
+    }
+
+    public function testEnableNonFilter()
+    {
+        $this->expectException('CodeIgniter\Filters\Exceptions\FilterException');
+
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'globals' => [
+                'before' => [],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $filters = $filters->initialize('admin/foo/bar');
+
+        $filters->enableFilter('goggle', 'before');
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1664
+     */
+    public function testMatchesURICaseInsensitively()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo'  => '',
+                'bar'  => '',
+                'frak' => '',
+                'baz'  => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'Admin/*'],
+                    'bar',
+                ],
+                'after' => [
+                    'foo' => ['except' => 'Admin/*'],
+                    'baz',
+                ],
+            ],
+            'filters' => [
+                'frak' => [
+                    'before' => ['Admin/*'],
+                    'after'  => ['Admin/*'],
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $expected = [
+            'before' => [
+                'bar',
+                'frak',
+            ],
+            'after' => [
+                'baz',
+                'frak',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
+     */
+    public function testFilterMatching()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo'  => '',
+                'bar'  => '',
+                'frak' => '',
+            ],
+            'filters' => [
+                'frak' => [
+                    'before' => ['admin*'],
+                    'after'  => ['admin/*'],
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin';
+
+        $expected = [
+            'before' => [
+                'frak',
+            ],
+            'after' => [],
+        ];
+
+        $actual = $filters->initialize($uri)->getFilters();
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
+     */
+    public function testGlobalFilterMatching()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+                'one' => '',
+                'two' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'admin*'],
+                    'one',
+                ],
+                'after' => [
+                    'foo' => ['except' => 'admin/*'],
+                    'two',
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin';
+
+        $expected = [
+            'before' => [
+                'one',
+            ],
+            'after' => [
+                'foo',
+                'two',
+            ],
+        ];
+
+        $actual = $filters->initialize($uri)->getFilters();
+        $this->assertSame($expected, $actual);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
+     */
+    public function testCombinedFilterMatching()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo'  => '',
+                'one'  => '',
+                'frak' => '',
+                'two'  => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'admin*'],
+                    'one',
+                ],
+                'after' => [
+                    'foo' => ['except' => 'admin/*'],
+                    'two',
+                ],
+            ],
+            'filters' => [
+                'frak' => [
+                    'before' => ['admin*'],
+                    'after'  => ['admin/*'],
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin123';
+
+        $expected = [
+            'before' => [
+                'one',
+                'frak',
+            ],
+            'after' => [
+                'foo',
+                'two',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1907
+     */
+    public function testSegmentedFilterMatching()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo'  => '',
+                'one'  => '',
+                'frak' => '',
+            ],
+            'globals' => [
+                'before' => [
+                    'foo' => ['except' => 'admin*'],
+                ],
+                'after' => [
+                    'foo' => ['except' => 'admin/*'],
+                ],
+            ],
+            'filters' => [
+                'frak' => [
+                    'before' => ['admin*'],
+                    'after'  => ['admin/*'],
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/123';
+
+        $expected = [
+            'before' => [
+                'frak',
+            ],
+            'after' => [
+                'frak',
+            ],
+        ];
+
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2831
+     */
+    public function testFilterAlitasMultiple()
+    {
+        $config = [
+            'aliases' => [
+                'multipeTest' => [
+                    'CodeIgniter\Filters\fixtures\Multiple1',
+                    'CodeIgniter\Filters\fixtures\Multiple2',
+                ],
+            ],
+            'globals' => [
+                'before' => [
+                    'multipeTest',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $request = $filters->run($uri, 'before');
+        $this->assertSame('http://exampleMultipleURL.com', $request->url);
+        $this->assertSame('http://exampleMultipleCSP.com', $request->csp);
+    }
+
+    public function testFilterClass()
+    {
+        $config = [
+            'aliases' => [
+                'multipleTest' => [
+                    'CodeIgniter\Filters\fixtures\Multiple1',
+                    'CodeIgniter\Filters\fixtures\Multiple2',
+                ],
+            ],
+            'globals' => [
+                'after' => [
+                    'multipleTest',
+                ],
+            ],
+        ];
+        $filters = new Filters((object) $config, $this->request, $this->response);
+
+        $filters->run('admin/foo/bar', 'before');
+        $expected = [
+            'before' => [],
+            'after'  => [
+                'CodeIgniter\Filters\fixtures\Multiple1',
+                'CodeIgniter\Filters\fixtures\Multiple2',
+            ],
+        ];
+        $this->assertSame($expected, $filters->getFiltersClass());
+    }
+
+    public function testReset()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [
+                'foo' => '',
+            ],
+            'filters' => [
+                'foo' => [
+                    'before' => ['admin*'],
+                ],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin';
+
+        $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);
+        $this->assertSame([], $filters->reset()->getFilters()['before']);
+    }
 }
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 4e5b20046f0a..938f0fe525f5 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
@@ -8,111 +18,105 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class HoneypotTest extends CIUnitTestCase
+final class HoneypotTest extends CIUnitTestCase
 {
-
-	protected $config;
-	protected $honey;
-	protected $request;
-	protected $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->config = new \Config\Filters();
-		$this->honey  = new Honeypot();
-
-		unset($_POST[$this->honey->name]);
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-		$_POST[$this->honey->name] = 'hey';
-	}
-
-	//--------------------------------------------------------------------
-	public function testBeforeTriggered()
-	{
-		$this->config->globals = [
-			'before' => ['honeypot'],
-			'after'  => [],
-		];
-
-		$this->request  = Services::request(null, false);
-		$this->response = Services::response();
-
-		$filters = new Filters($this->config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$this->expectException(HoneypotException::class);
-		$request = $filters->run($uri, 'before');
-	}
-
-	//--------------------------------------------------------------------
-	public function testBeforeClean()
-	{
-		$this->config->globals = [
-			'before' => ['honeypot'],
-			'after'  => [],
-		];
-
-		unset($_POST[$this->honey->name]);
-		$this->request  = Services::request(null, false);
-		$this->response = Services::response();
-
-		$expected = $this->request;
-
-		$filters = new Filters($this->config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$request = $filters->run($uri, 'before');
-		$this->assertEquals($expected, $request);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testAfter()
-	{
-		$this->config->globals = [
-			'before' => [],
-			'after'  => ['honeypot'],
-		];
-
-		$this->request  = Services::request(null, false);
-		$this->response = Services::response();
-
-		$filters = new Filters($this->config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$this->response->setBody('<form></form>');
-		$this->response = $filters->run($uri, 'after');
-		$this->assertStringContainsString($this->honey->name, $this->response->getBody());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testAfterNotApplicable()
-	{
-		$this->config->globals = [
-			'before' => [],
-			'after'  => ['honeypot'],
-		];
-
-		$this->request  = Services::request(null, false);
-		$this->response = Services::response();
-
-		$filters = new Filters($this->config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$this->response->setBody('<div></div>');
-		$this->response = $filters->run($uri, 'after');
-		$this->assertStringNotContainsString($this->honey->name, $this->response->getBody());
-	}
-
+    protected $config;
+    protected $honey;
+    protected $request;
+    protected $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->config = new \Config\Filters();
+        $this->honey  = new Honeypot();
+
+        unset($_POST[$this->honey->name]);
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST[$this->honey->name] = 'hey';
+    }
+
+    public function testBeforeTriggered()
+    {
+        $this->config->globals = [
+            'before' => ['honeypot'],
+            'after'  => [],
+        ];
+
+        $this->request  = Services::request(null, false);
+        $this->response = Services::response();
+
+        $filters = new Filters($this->config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $this->expectException(HoneypotException::class);
+        $request = $filters->run($uri, 'before');
+    }
+
+    public function testBeforeClean()
+    {
+        $this->config->globals = [
+            'before' => ['honeypot'],
+            'after'  => [],
+        ];
+
+        unset($_POST[$this->honey->name]);
+        $this->request  = Services::request(null, false);
+        $this->response = Services::response();
+
+        $expected = $this->request;
+
+        $filters = new Filters($this->config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $request = $filters->run($uri, 'before');
+        $this->assertSame($expected, $request);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testAfter()
+    {
+        $this->config->globals = [
+            'before' => [],
+            'after'  => ['honeypot'],
+        ];
+
+        $this->request  = Services::request(null, false);
+        $this->response = Services::response();
+
+        $filters = new Filters($this->config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $this->response->setBody('<form></form>');
+        $this->response = $filters->run($uri, 'after');
+        $this->assertStringContainsString($this->honey->name, $this->response->getBody());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testAfterNotApplicable()
+    {
+        $this->config->globals = [
+            'before' => [],
+            'after'  => ['honeypot'],
+        ];
+
+        $this->request  = Services::request(null, false);
+        $this->response = Services::response();
+
+        $filters = new Filters($this->config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $this->response->setBody('<div></div>');
+        $this->response = $filters->run($uri, 'after');
+        $this->assertStringNotContainsString($this->honey->name, $this->response->getBody());
+    }
 }
diff --git a/tests/system/Filters/fixtures/GoogleCurious.php b/tests/system/Filters/fixtures/GoogleCurious.php
index 599b1cfaaaf3..53d8c7f2b337 100644
--- a/tests/system/Filters/fixtures/GoogleCurious.php
+++ b/tests/system/Filters/fixtures/GoogleCurious.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
@@ -6,14 +17,12 @@
 
 class GoogleCurious implements FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        return 'This is curious';
+    }
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-				return 'This is curious';
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
-
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/system/Filters/fixtures/GoogleEmpty.php b/tests/system/Filters/fixtures/GoogleEmpty.php
index 5147a3688e87..16d4eb19347a 100644
--- a/tests/system/Filters/fixtures/GoogleEmpty.php
+++ b/tests/system/Filters/fixtures/GoogleEmpty.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
@@ -6,14 +17,12 @@
 
 class GoogleEmpty implements FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        return '';
+    }
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		return '';
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
-
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/system/Filters/fixtures/GoogleMe.php b/tests/system/Filters/fixtures/GoogleMe.php
index f9b8bb767a54..8fedc4312111 100644
--- a/tests/system/Filters/fixtures/GoogleMe.php
+++ b/tests/system/Filters/fixtures/GoogleMe.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
@@ -6,21 +17,17 @@
 
 class GoogleMe implements FilterInterface
 {
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$request->url = 'http://google.com';
-
-		return $request;
-	}
-
-	//--------------------------------------------------------------------
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $request->url = 'http://google.com';
 
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-		$response->csp = 'http://google.com';
+        return $request;
+    }
 
-		return $response;
-	}
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        $response->csp = 'http://google.com';
 
-	//--------------------------------------------------------------------
+        return $response;
+    }
 }
diff --git a/tests/system/Filters/fixtures/GoogleYou.php b/tests/system/Filters/fixtures/GoogleYou.php
index 3cfbe16fd538..0ef4d0bb2f6d 100644
--- a/tests/system/Filters/fixtures/GoogleYou.php
+++ b/tests/system/Filters/fixtures/GoogleYou.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Filters\FilterInterface;
@@ -7,16 +18,15 @@
 
 class GoogleYou implements FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $response      = Services::response();
+        $response->csp = 'http://google.com';
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$response      = Services::response();
-		$response->csp = 'http://google.com';
-		return $response;
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
+        return $response;
+    }
 
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/system/Filters/fixtures/InvalidClass.php b/tests/system/Filters/fixtures/InvalidClass.php
index d0e7e80523ad..65a42fa25d45 100644
--- a/tests/system/Filters/fixtures/InvalidClass.php
+++ b/tests/system/Filters/fixtures/InvalidClass.php
@@ -1,12 +1,20 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
 
-class InvalidClass
-{
-	public function index()
-	{
-		return 'bad';
-	}
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-	//--------------------------------------------------------------------
+namespace CodeIgniter\Filters\fixtures;
 
+class InvalidClass
+{
+    public function index()
+    {
+        return 'bad';
+    }
 }
diff --git a/tests/system/Filters/fixtures/Multiple1.php b/tests/system/Filters/fixtures/Multiple1.php
index d253495493f8..22f57e40184f 100644
--- a/tests/system/Filters/fixtures/Multiple1.php
+++ b/tests/system/Filters/fixtures/Multiple1.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
@@ -6,15 +17,14 @@
 
 class Multiple1 implements FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $request->csp = 'http://exampleMultipleCSP.com';
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$request->csp = 'http://exampleMultipleCSP.com';
-		return $request;
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
+        return $request;
+    }
 
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/system/Filters/fixtures/Multiple2.php b/tests/system/Filters/fixtures/Multiple2.php
index 4dbcb584c4ef..9b2e61f98938 100644
--- a/tests/system/Filters/fixtures/Multiple2.php
+++ b/tests/system/Filters/fixtures/Multiple2.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Filters\fixtures;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
@@ -6,15 +17,14 @@
 
 class Multiple2 implements FilterInterface
 {
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $request->url = 'http://exampleMultipleURL.com';
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		$request->url = 'http://exampleMultipleURL.com';
-		return $request;
-	}
-
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-	}
+        return $request;
+    }
 
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
 }
diff --git a/tests/system/Filters/fixtures/Role.php b/tests/system/Filters/fixtures/Role.php
index 62361a599c78..54c016140a41 100644
--- a/tests/system/Filters/fixtures/Role.php
+++ b/tests/system/Filters/fixtures/Role.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
@@ -8,35 +17,28 @@
 
 class Role implements FilterInterface
 {
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        if (is_array($arguments)) {
+            $response->setBody(implode(';', $arguments));
+        } elseif ($arguments === null) {
+            $response->setBody('Is null');
+        } else {
+            $response->setBody('Something else');
+        }
 
-	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-	{
-		if (is_array($arguments))
-		{
-			$response->setBody(join(';', $arguments));
-		}
-		elseif (is_null($arguments))
-		{
-			$response->setBody('Is null');
-		}
-		else
-		{
-			$response->setBody('Something else');
-		}
-		return $response;
-	}
+        return $response;
+    }
 
-	public function before(RequestInterface $request, $arguments = null)
-	{
-		if (is_array($arguments))
-		{
-			return join(';', $arguments);
-		}
-		if (is_null($arguments))
-		{
-			return 'Is null';
-		}
-		return 'Something else';
-	}
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if (is_array($arguments)) {
+            return implode(';', $arguments);
+        }
+        if ($arguments === null) {
+            return 'Is null';
+        }
 
+        return 'Something else';
+    }
 }
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index da46ebc5e771..0cd53e62a22c 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -1,64 +1,76 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class FormatTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormatTest extends CIUnitTestCase
 {
-	/**
-	 * @var Format
-	 */
-	protected $format;
+    /**
+     * @var Format
+     */
+    protected $format;
 
-	protected function setUp(): void
-	{
-		$this->format = new Format(new \Config\Format());
-	}
+    protected function setUp(): void
+    {
+        $this->format = new Format(new \Config\Format());
+    }
 
-	public function testFormatConfigType()
-	{
-		$config = new \Config\Format();
-		$format = new Format($config);
+    public function testFormatConfigType()
+    {
+        $config = new \Config\Format();
+        $format = new Format($config);
 
-		$this->assertInstanceOf('Config\Format', $format->getConfig());
-		$this->assertSame($config, $format->getConfig());
-	}
+        $this->assertInstanceOf('Config\Format', $format->getConfig());
+        $this->assertSame($config, $format->getConfig());
+    }
 
-	public function testGetFormatter()
-	{
-		$this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
-	}
+    public function testGetFormatter()
+    {
+        $this->assertInstanceof(FormatterInterface::class, $this->format->getFormatter('application/json'));
+    }
 
-	public function testGetFormatterExpectsExceptionOnUndefinedMime()
-	{
-		$this->expectException(FormatException::class);
-		$this->expectExceptionMessage('No Formatter defined for mime type: "application/x-httpd-php".');
-		$this->format->getFormatter('application/x-httpd-php');
-	}
+    public function testGetFormatterExpectsExceptionOnUndefinedMime()
+    {
+        $this->expectException(FormatException::class);
+        $this->expectExceptionMessage('No Formatter defined for mime type: "application/x-httpd-php".');
+        $this->format->getFormatter('application/x-httpd-php');
+    }
 
-	public function testGetFormatterExpectsExceptionOnUndefinedClass()
-	{
-		$this->format->getConfig()->formatters = array_merge(
-			$this->format->getConfig()->formatters,
-			['text/xml' => 'App\Foo']
-		);
+    public function testGetFormatterExpectsExceptionOnUndefinedClass()
+    {
+        $this->format->getConfig()->formatters = array_merge(
+            $this->format->getConfig()->formatters,
+            ['text/xml' => 'App\Foo']
+        );
 
-		$this->expectException(FormatException::class);
-		$this->expectExceptionMessage('"App\Foo" is not a valid Formatter class.');
-		$this->format->getFormatter('text/xml');
-	}
+        $this->expectException(FormatException::class);
+        $this->expectExceptionMessage('"App\Foo" is not a valid Formatter class.');
+        $this->format->getFormatter('text/xml');
+    }
 
-	public function testGetFormatterExpectsExceptionOnClassNotImplementingFormatterInterface()
-	{
-		$this->format->getConfig()->formatters = array_merge(
-			$this->format->getConfig()->formatters,
-			['text/xml' => 'CodeIgniter\HTTP\URI']
-		);
+    public function testGetFormatterExpectsExceptionOnClassNotImplementingFormatterInterface()
+    {
+        $this->format->getConfig()->formatters = array_merge(
+            $this->format->getConfig()->formatters,
+            ['text/xml' => 'CodeIgniter\HTTP\URI']
+        );
 
-		$this->expectException(FormatException::class);
-		$this->expectExceptionMessage('"CodeIgniter\HTTP\URI" is not a valid Formatter class.');
-		$this->format->getFormatter('text/xml');
-	}
+        $this->expectException(FormatException::class);
+        $this->expectExceptionMessage('"CodeIgniter\HTTP\URI" is not a valid Formatter class.');
+        $this->format->getFormatter('text/xml');
+    }
 }
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index 2722f9c5d108..b2eb5f2e0d5e 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -1,63 +1,76 @@
-<?php namespace CodeIgniter\Format;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class JSONFormatterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class JSONFormatterTest extends CIUnitTestCase
 {
-	protected $jsonFormatter;
+    protected $jsonFormatter;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->jsonFormatter = new JSONFormatter();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->jsonFormatter = new JSONFormatter();
+    }
 
-	public function testBasicJSON()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
+    public function testBasicJSON()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
 
-		$expected = '{
+        $expected = '{
     "foo": "bar"
 }';
 
-		$this->assertEquals($expected, $this->jsonFormatter->format($data));
-	}
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
+    }
 
-	public function testUnicodeOutput()
-	{
-		$data = [
-			'foo' => 'База данни грешка',
-		];
+    public function testUnicodeOutput()
+    {
+        $data = [
+            'foo' => 'База данни грешка',
+        ];
 
-		$expected = '{
+        $expected = '{
     "foo": "База данни грешка"
 }';
 
-		$this->assertEquals($expected, $this->jsonFormatter->format($data));
-	}
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
+    }
 
-	public function testKeepsURLs()
-	{
-		$data = [
-			'foo' => 'https://www.example.com/foo/bar',
-		];
+    public function testKeepsURLs()
+    {
+        $data = [
+            'foo' => 'https://www.example.com/foo/bar',
+        ];
 
-		$expected = '{
+        $expected = '{
     "foo": "https://www.example.com/foo/bar"
 }';
 
-		$this->assertEquals($expected, $this->jsonFormatter->format($data));
-	}
-
-	public function testJSONError()
-	{
-		$this->expectException('RuntimeException');
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
+    }
 
-		$data     = ["\xB1\x31"];
-		$expected = 'Boom';
-		$this->assertEquals($expected, $this->jsonFormatter->format($data));
-	}
+    public function testJSONError()
+    {
+        $this->expectException('RuntimeException');
 
+        $data     = ["\xB1\x31"];
+        $expected = 'Boom';
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
+    }
 }
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index c1ff253f40fa..5e0d7fda9340 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -1,217 +1,228 @@
-<?php namespace CodeIgniter\Format;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use DOMDocument;
 
-class XMLFormatterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class XMLFormatterTest extends CIUnitTestCase
 {
-	protected $xmlFormatter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->xmlFormatter = new XMLFormatter();
-	}
-
-	public function testBasicXML()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><foo>bar</foo></response>
-
-EOH;
-
-		$this->assertEquals($expected, $this->xmlFormatter->format($data));
-	}
-
-	public function testFormatXMLWithMultilevelArray()
-	{
-		$data = [
-			'foo' => ['bar'],
-		];
-
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><foo><item0>bar</item0></foo></response>
-
-EOH;
-
-		$this->assertEquals($expected, $this->xmlFormatter->format($data));
-	}
-
-	public function testFormatXMLWithMultilevelArrayAndNumericKey()
-	{
-		$data = [
-			['foo'],
-		];
-
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><item0><item0>foo</item0></item0></response>
-
-EOH;
-
-		$this->assertEquals($expected, $this->xmlFormatter->format($data));
-	}
-
-	public function testStringFormatting()
-	{
-		$data     = ['Something'];
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><item0>Something</item0></response>
-
-EOH;
-
-		$this->assertEquals($expected, $this->xmlFormatter->format($data));
-	}
-
-	public function testValidatingXmlTags()
-	{
-		$data     = [
-			'BBB096630BD' => 'foo',
-			'096630FR'    => 'bar',
-		];
-		$expected = <<<EOH
-<?xml version="1.0"?>
-<response><BBB096630BD>foo</BBB096630BD><item096630FR>bar</item096630FR></response>
-
-EOH;
-
-		$this->assertEquals($expected, $this->xmlFormatter->format($data));
-	}
-
-	/**
-	 * @param string $expected
-	 * @param array  $input
-	 *
-	 * @dataProvider invalidTagsProvider
-	 */
-	public function testValidatingInvalidTags(string $expected, array $input)
-	{
-		$expectedXML = <<<EOH
-<?xml version="1.0"?>
-<response><{$expected}>bar</{$expected}></response>
-
-EOH;
-
-		$this->assertEquals($expectedXML, $this->xmlFormatter->format($input));
-	}
-
-	public function invalidTagsProvider()
-	{
-		return [
-			[
-				'foo',
-				[' foo ' => 'bar'],
-			],
-			[
-				'foobar',
-				['foo:bar' => 'bar'],
-			],
-			[
-				'foobar',
-				['foo bar' => 'bar'],
-			],
-			[
-				'itemxmltest',
-				['xmltest' => 'bar'],
-			],
-			[
-				'itemXMLtest',
-				['XMLtest' => 'bar'],
-			],
-			[
-				'itemXmltest',
-				['Xmltest' => 'bar'],
-			],
-		];
-	}
-
-	public function testDeepNestedArrayToXml()
-	{
-		$data = [
-			'data' => [
-				'master' => [
-					'name'       => 'Foo',
-					'email'      => 'foo@bar.com',
-					'dependents' => [],
-				],
-				'vote'   => [
-					'list' => [],
-				],
-				'user'   => [
-					'account' => [
-						'demo' => [
-							'info' => [
-								'is_banned'     => 'true',
-								'last_login'    => '2020-08-31',
-								'last_login_ip' => '127.0.0.1',
-							],
-						],
-					],
-				],
-				'xml'    => [
-					'xml_version'  => '1.0',
-					'xml_encoding' => 'utf-8',
-				],
-				[
-					'misc' => 'miscellaneous',
-				],
-				[
-					'misc_data' => 'miscellaneous data',
-				],
-			],
-		];
-
-		// do not change to tabs!!
-		$expectedXML = <<<EOF
-<?xml version="1.0"?>
-<response>
-  <data>
-    <master>
-      <name>Foo</name>
-      <email>foo@bar.com</email>
-      <dependents/>
-    </master>
-    <vote>
-      <list/>
-    </vote>
-    <user>
-      <account>
-        <demo>
-          <info>
-            <is_banned>true</is_banned>
-            <last_login>2020-08-31</last_login>
-            <last_login_ip>127.0.0.1</last_login_ip>
-          </info>
-        </demo>
-      </account>
-    </user>
-    <itemxml>
-      <itemxml_version>1.0</itemxml_version>
-      <itemxml_encoding>utf-8</itemxml_encoding>
-    </itemxml>
-    <item0>
-      <misc>miscellaneous</misc>
-    </item0>
-    <item1>
-      <misc_data>miscellaneous data</misc_data>
-    </item1>
-  </data>
-</response>
-
-EOF;
-
-		$dom                     = new DOMDocument('1.0');
-		$dom->preserveWhiteSpace = false;
-		$dom->formatOutput       = true;
-		$dom->loadXML($this->xmlFormatter->format($data));
-
-		$this->assertEquals($expectedXML, $dom->saveXML());
-	}
+    protected $xmlFormatter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->xmlFormatter = new XMLFormatter();
+    }
+
+    public function testBasicXML()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><foo>bar</foo></response>
+
+            EOH;
+
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
+    }
+
+    public function testFormatXMLWithMultilevelArray()
+    {
+        $data = [
+            'foo' => ['bar'],
+        ];
+
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><foo><item0>bar</item0></foo></response>
+
+            EOH;
+
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
+    }
+
+    public function testFormatXMLWithMultilevelArrayAndNumericKey()
+    {
+        $data = [
+            ['foo'],
+        ];
+
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><item0><item0>foo</item0></item0></response>
+
+            EOH;
+
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
+    }
+
+    public function testStringFormatting()
+    {
+        $data     = ['Something'];
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><item0>Something</item0></response>
+
+            EOH;
+
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
+    }
+
+    public function testValidatingXmlTags()
+    {
+        $data = [
+            'BBB096630BD' => 'foo',
+            '096630FR'    => 'bar',
+        ];
+        $expected = <<<'EOH'
+            <?xml version="1.0"?>
+            <response><BBB096630BD>foo</BBB096630BD><item096630FR>bar</item096630FR></response>
+
+            EOH;
+
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
+    }
+
+    /**
+     * @dataProvider invalidTagsProvider
+     */
+    public function testValidatingInvalidTags(string $expected, array $input)
+    {
+        $expectedXML = <<<EOH
+            <?xml version="1.0"?>
+            <response><{$expected}>bar</{$expected}></response>
+
+            EOH;
+
+        $this->assertSame($expectedXML, $this->xmlFormatter->format($input));
+    }
+
+    public function invalidTagsProvider()
+    {
+        return [
+            [
+                'foo',
+                [' foo ' => 'bar'],
+            ],
+            [
+                'foobar',
+                ['foo:bar' => 'bar'],
+            ],
+            [
+                'foobar',
+                ['foo bar' => 'bar'],
+            ],
+            [
+                'itemxmltest',
+                ['xmltest' => 'bar'],
+            ],
+            [
+                'itemXMLtest',
+                ['XMLtest' => 'bar'],
+            ],
+            [
+                'itemXmltest',
+                ['Xmltest' => 'bar'],
+            ],
+        ];
+    }
+
+    public function testDeepNestedArrayToXml()
+    {
+        $data = [
+            'data' => [
+                'master' => [
+                    'name'       => 'Foo',
+                    'email'      => 'foo@bar.com',
+                    'dependents' => [],
+                ],
+                'vote' => [
+                    'list' => [],
+                ],
+                'user' => [
+                    'account' => [
+                        'demo' => [
+                            'info' => [
+                                'is_banned'     => 'true',
+                                'last_login'    => '2020-08-31',
+                                'last_login_ip' => '127.0.0.1',
+                            ],
+                        ],
+                    ],
+                ],
+                'xml' => [
+                    'xml_version'  => '1.0',
+                    'xml_encoding' => 'utf-8',
+                ],
+                [
+                    'misc' => 'miscellaneous',
+                ],
+                [
+                    'misc_data' => 'miscellaneous data',
+                ],
+            ],
+        ];
+
+        // do not change to tabs!!
+        $expectedXML = <<<'EOF'
+            <?xml version="1.0"?>
+            <response>
+              <data>
+                <master>
+                  <name>Foo</name>
+                  <email>foo@bar.com</email>
+                  <dependents/>
+                </master>
+                <vote>
+                  <list/>
+                </vote>
+                <user>
+                  <account>
+                    <demo>
+                      <info>
+                        <is_banned>true</is_banned>
+                        <last_login>2020-08-31</last_login>
+                        <last_login_ip>127.0.0.1</last_login_ip>
+                      </info>
+                    </demo>
+                  </account>
+                </user>
+                <itemxml>
+                  <itemxml_version>1.0</itemxml_version>
+                  <itemxml_encoding>utf-8</itemxml_encoding>
+                </itemxml>
+                <item0>
+                  <misc>miscellaneous</misc>
+                </item0>
+                <item1>
+                  <misc_data>miscellaneous data</misc_data>
+                </item1>
+              </data>
+            </response>
+
+            EOF;
+
+        $dom                     = new DOMDocument('1.0');
+        $dom->preserveWhiteSpace = false;
+        $dom->formatOutput       = true;
+        $dom->loadXML($this->xmlFormatter->format($data));
+
+        $this->assertSame($expectedXML, $dom->saveXML());
+    }
 }
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index ddf281845451..c31bace6b554 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -10,624 +19,602 @@
  * except also testing the methods added by CLIRequest
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CLIRequestTest extends CIUnitTestCase
+final class CLIRequestTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var CLIRequest
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->request = new CLIRequest(new App());
-		$_POST         = [];
-		$_GET          = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testParsingSegments()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'-foo',
-			'bar',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$segments = [
-			'users',
-			'21',
-			'profile',
-		];
-		$this->assertEquals($segments, $this->request->getSegments());
-	}
-
-	public function testParsingOptions()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'bar',
-			'--foo-bar',
-			'yes',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$options = [
-			'foo'     => 'bar',
-			'foo-bar' => 'yes',
-		];
-		$this->assertEquals($options, $this->request->getOptions());
-	}
-
-	public function testParsingOptionDetails()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'bar',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('bar', $this->request->getOption('foo'));
-		$this->assertNull($this->request->getOption('notthere'));
-	}
-
-	public function testParsingOptionString()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'bar',
-			'--baz',
-			'queue some stuff',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
-		$this->assertEquals('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
-	}
-
-	public function testParsingNoOptions()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$expected = '';
-		$this->assertEquals($expected, $this->request->getOptionString());
-	}
-
-	public function testParsingPath()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'bar',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('users/21/profile', $this->request->getPath());
-	}
-
-	public function testParsingMalformed()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'pro-file',
-			'--foo',
-			'bar',
-			'--baz',
-			'queue some stuff',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
-		$this->assertEquals('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
-		$this->assertEquals('users/21/pro-file', $this->request->getPath());
-	}
-
-	public function testParsingMalformed2()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'oops-bar',
-			'--baz',
-			'queue some stuff',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('-foo oops-bar -baz "queue some stuff"', $this->request->getOptionString());
-		$this->assertEquals('--foo oops-bar --baz "queue some stuff"', $this->request->getOptionString(true));
-		$this->assertEquals('users/21/profile', $this->request->getPath());
-	}
-
-	public function testParsingMalformed3()
-	{
-		$_SERVER['argv'] = [
-			'index.php',
-			'users',
-			'21',
-			'profile',
-			'--foo',
-			'oops',
-			'bar',
-			'--baz',
-			'queue some stuff',
-		];
-
-		// reinstantiate it to force parsing
-		$this->request = new CLIRequest(new App());
-
-		$this->assertEquals('-foo oops -baz "queue some stuff"', $this->request->getOptionString());
-		$this->assertEquals('--foo oops --baz "queue some stuff"', $this->request->getOptionString(true));
-		$this->assertEquals('users/21/profile/bar', $this->request->getPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalsSingleValue()
-	{
-		$_POST['foo'] = 'bar';
-		$_GET['bar']  = 'baz';
-
-		$this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
-		$this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
-	}
-
-	public function testFetchGlobalsReturnsNullWhenNotFound()
-	{
-		$this->assertNull($this->request->fetchGlobal('post', 'foo'));
-	}
-
-	public function testFetchGlobalsFiltersValues()
-	{
-		$this->request->setGlobal('post', [
-			'foo' => 'bar<script>',
-			'bar' => 'baz',
-		]);
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
-		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
-	}
-
-	public function testFetchGlobalsWithFilterFlag()
-	{
-		$this->request->setGlobal('post', [
-			'foo' => '`bar<script>',
-			'bar' => 'baz',
-		]);
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
-	}
-
-	public function testFetchGlobalReturnsAllWhenEmpty()
-	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz',
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($post, $this->request->fetchGlobal('post'));
-	}
-
-	public function testFetchGlobalFiltersAllValues()
-	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
-	}
-
-	public function testFetchGlobalFilterWithFlagAllValues()
-	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	public function testFetchGlobalReturnsSelectedKeys()
-	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
-	}
-
-	public function testFetchGlobalFiltersSelectedValues()
-	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
-	}
-
-	public function testFetchGlobalFilterWithFlagSelectedValues()
-	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/353
-	 */
-	public function testFetchGlobalReturnsArrayValues()
-	{
-		$post = [
-			'ANNOUNCEMENTS' => [
-				1 => [
-					'DETAIL' => 'asdf',
-				],
-				2 => [
-					'DETAIL' => 'sdfg',
-				],
-			],
-			'submit'        => 'SAVE',
-		];
-		$this->request->setGlobal('post', $post);
-		$result = $this->request->fetchGlobal('post');
-
-		$this->assertEquals($post, $result);
-		$this->assertIsArray($result['ANNOUNCEMENTS']);
-		$this->assertCount(2, $result['ANNOUNCEMENTS']);
-	}
-
-	public function testFetchGlobalWithArrayTop()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
-	}
-
-	public function testFetchGlobalWithArrayChildNumeric()
-	{
-		$post = [
-			'clients' => [
-				[
-					'address' => [
-						'zipcode' => 90210,
-					],
-				],
-				[
-					'address' => [
-						'zipcode' => 60610,
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
-	}
-
-	public function testFetchGlobalWithArrayChildElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
-		$this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
-	}
-
-	public function testFetchGlobalWithKeylessArrayChildElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-				'stuff'   => [['a']],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
-	}
-
-	public function testFetchGlobalWithArrayLastElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
-	}
-
-	public function testFetchGlobalWithEmptyNotation()
-	{
-		$expected = [
-			[
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-			[
-				'address' => [
-					'zipcode' => 60610,
-				],
-			],
-		];
-		$post     = [
-			'clients' => $expected,
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function ipAddressChecks()
-	{
-		return [
-			'empty'         => [
-				false,
-				'',
-			],
-			'zero'          => [
-				false,
-				0,
-			],
-			'large_ipv4'    => [
-				false,
-				'256.256.256.999',
-				'ipv4',
-			],
-			'good_ipv4'     => [
-				true,
-				'100.100.100.0',
-				'ipv4',
-			],
-			'good_default'  => [
-				true,
-				'100.100.100.0',
-			],
-			'zeroed_ipv4'   => [
-				true,
-				'0.0.0.0',
-			],
-			'large_ipv6'    => [
-				false,
-				'h123:0000:0000:0000:0000:0000:0000:0000',
-				'ipv6',
-			],
-			'good_ipv6'     => [
-				true,
-				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-			],
-			'confused_ipv6' => [
-				false,
-				'255.255.255.255',
-				'ipv6',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider ipAddressChecks
-	 */
-	public function testValidIPAddress($expected, $address, $type = null)
-	{
-		$this->assertEquals($expected, $this->request->isValidIP($address, $type));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetIPAddressDefault()
-	{
-		$this->assertEquals('0.0.0.0', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressNormal()
-	{
-		$expected               = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR'] = $expected;
-		$this->request          = new Request(new App());
-		$this->assertEquals($expected, $this->request->getIPAddress());
-		// call a second time to exercise the initial conditional block in getIPAddress()
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxy()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyInvalid()
-	{
-		$expected                        = '123.456.23.123';
-		$_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// spoofed address invalid
-		$this->assertEquals('10.0.1.200', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyNotWhitelisted()
-	{
-		$expected                        = '123.456.23.123';
-		$_SERVER['REMOTE_ADDR']          = '10.10.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// spoofed address invalid
-		$this->assertEquals('10.10.1.200', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxySubnet()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-		$config                          = new App();
-		$config->proxyIPs                = ['192.168.5.0/24'];
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyOutofSubnet()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-		$config                          = new App();
-		$config->proxyIPs                = ['192.168.5.0/28'];
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals('192.168.5.21', $this->request->getIPAddress());
-	}
-
-	//FIXME getIPAddress should have more testing, to 100% code coverage
-
-	//--------------------------------------------------------------------
-
-	public function testMethodReturnsRightStuff()
-	{
-		// Defaults method to CLI now.
-		$this->assertEquals('cli', $this->request->getMethod());
-		$this->assertEquals('CLI', $this->request->getMethod(true));
-	}
-
-	//---------------------------------------------------------------------
-
-	public function testMethodIsCliReturnsAlwaysTrue()
-	{
-		$this->assertTrue($this->request->isCLI());
-	}
+    /**
+     * @var CLIRequest
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->request = new CLIRequest(new App());
+
+        $_POST = [];
+        $_GET  = [];
+    }
+
+    public function testParsingSegments()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '-foo',
+            'bar',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $segments = [
+            'users',
+            '21',
+            'profile',
+        ];
+        $this->assertSame($segments, $this->request->getSegments());
+    }
+
+    public function testParsingOptions()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'bar',
+            '--foo-bar',
+            'yes',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $options = [
+            'foo'     => 'bar',
+            'foo-bar' => 'yes',
+        ];
+        $this->assertSame($options, $this->request->getOptions());
+    }
+
+    public function testParsingOptionDetails()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'bar',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('bar', $this->request->getOption('foo'));
+        $this->assertNull($this->request->getOption('notthere'));
+    }
+
+    public function testParsingOptionString()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'bar',
+            '--baz',
+            'queue some stuff',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
+    }
+
+    public function testParsingNoOptions()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $expected = '';
+        $this->assertSame($expected, $this->request->getOptionString());
+    }
+
+    public function testParsingPath()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'bar',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('users/21/profile', $this->request->getPath());
+    }
+
+    public function testParsingMalformed()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'pro-file',
+            '--foo',
+            'bar',
+            '--baz',
+            'queue some stuff',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/pro-file', $this->request->getPath());
+    }
+
+    public function testParsingMalformed2()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'oops-bar',
+            '--baz',
+            'queue some stuff',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('-foo oops-bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo oops-bar --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/profile', $this->request->getPath());
+    }
+
+    public function testParsingMalformed3()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'profile',
+            '--foo',
+            'oops',
+            'bar',
+            '--baz',
+            'queue some stuff',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $this->assertSame('-foo oops -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo oops --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/profile/bar', $this->request->getPath());
+    }
+
+    public function testFetchGlobalsSingleValue()
+    {
+        $_POST['foo'] = 'bar';
+        $_GET['bar']  = 'baz';
+
+        $this->assertSame('bar', $this->request->fetchGlobal('post', 'foo'));
+        $this->assertSame('baz', $this->request->fetchGlobal('get', 'bar'));
+    }
+
+    public function testFetchGlobalsReturnsNullWhenNotFound()
+    {
+        $this->assertNull($this->request->fetchGlobal('post', 'foo'));
+    }
+
+    public function testFetchGlobalsFiltersValues()
+    {
+        $this->request->setGlobal('post', [
+            'foo' => 'bar<script>',
+            'bar' => 'baz',
+        ]);
+
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
+    }
+
+    public function testFetchGlobalsWithFilterFlag()
+    {
+        $this->request->setGlobal('post', [
+            'foo' => '`bar<script>',
+            'bar' => 'baz',
+        ]);
+
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
+    }
+
+    public function testFetchGlobalReturnsAllWhenEmpty()
+    {
+        $post = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+            'xxx' => 'yyy',
+            'yyy' => 'zzz',
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($post, $this->request->fetchGlobal('post'));
+    }
+
+    public function testFetchGlobalFiltersAllValues()
+    {
+        $post = [
+            'foo' => 'bar<script>',
+            'bar' => 'baz<script>',
+            'xxx' => 'yyy<script>',
+            'yyy' => 'zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+            'xxx' => 'yyy%3Cscript%3E',
+            'yyy' => 'zzz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+    }
+
+    public function testFetchGlobalFilterWithFlagAllValues()
+    {
+        $post = [
+            'foo' => '`bar<script>',
+            'bar' => '`baz<script>',
+            'xxx' => '`yyy<script>',
+            'yyy' => '`zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+            'xxx' => 'yyy%3Cscript%3E',
+            'yyy' => 'zzz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+    }
+
+    public function testFetchGlobalReturnsSelectedKeys()
+    {
+        $post = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+            'xxx' => 'yyy',
+            'yyy' => 'zzz',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+    }
+
+    public function testFetchGlobalFiltersSelectedValues()
+    {
+        $post = [
+            'foo' => 'bar<script>',
+            'bar' => 'baz<script>',
+            'xxx' => 'yyy<script>',
+            'yyy' => 'zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+    }
+
+    public function testFetchGlobalFilterWithFlagSelectedValues()
+    {
+        $post = [
+            'foo' => '`bar<script>',
+            'bar' => '`baz<script>',
+            'xxx' => '`yyy<script>',
+            'yyy' => '`zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/353
+     */
+    public function testFetchGlobalReturnsArrayValues()
+    {
+        $post = [
+            'ANNOUNCEMENTS' => [
+                1 => [
+                    'DETAIL' => 'asdf',
+                ],
+                2 => [
+                    'DETAIL' => 'sdfg',
+                ],
+            ],
+            'submit' => 'SAVE',
+        ];
+        $this->request->setGlobal('post', $post);
+        $result = $this->request->fetchGlobal('post');
+
+        $this->assertSame($post, $result);
+        $this->assertIsArray($result['ANNOUNCEMENTS']);
+        $this->assertCount(2, $result['ANNOUNCEMENTS']);
+    }
+
+    public function testFetchGlobalWithArrayTop()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
+    }
+
+    public function testFetchGlobalWithArrayChildNumeric()
+    {
+        $post = [
+            'clients' => [
+                [
+                    'address' => [
+                        'zipcode' => 90210,
+                    ],
+                ],
+                [
+                    'address' => [
+                        'zipcode' => 60610,
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
+    }
+
+    public function testFetchGlobalWithArrayChildElement()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+        $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
+    }
+
+    public function testFetchGlobalWithKeylessArrayChildElement()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+                'stuff' => [['a']],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
+    }
+
+    public function testFetchGlobalWithArrayLastElement()
+    {
+        $post = ['clients' => ['address' => ['zipcode' => 90210]]];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame('90210', $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+    }
+
+    public function testFetchGlobalWithEmptyNotation()
+    {
+        $expected = [
+            ['address' => ['zipcode' => '90210']],
+            ['address' => ['zipcode' => '60610']],
+        ];
+        $post = ['clients' => $expected];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
+    }
+
+    public function ipAddressChecks()
+    {
+        return [
+            'empty' => [
+                false,
+                '',
+            ],
+            'zero' => [
+                false,
+                0,
+            ],
+            'large_ipv4' => [
+                false,
+                '256.256.256.999',
+                'ipv4',
+            ],
+            'good_ipv4' => [
+                true,
+                '100.100.100.0',
+                'ipv4',
+            ],
+            'good_default' => [
+                true,
+                '100.100.100.0',
+            ],
+            'zeroed_ipv4' => [
+                true,
+                '0.0.0.0',
+            ],
+            'large_ipv6' => [
+                false,
+                'h123:0000:0000:0000:0000:0000:0000:0000',
+                'ipv6',
+            ],
+            'good_ipv6' => [
+                true,
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+            ],
+            'confused_ipv6' => [
+                false,
+                '255.255.255.255',
+                'ipv6',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider ipAddressChecks
+     *
+     * @param mixed      $expected
+     * @param mixed      $address
+     * @param mixed|null $type
+     */
+    public function testValidIPAddress($expected, $address, $type = null)
+    {
+        $this->assertSame($expected, $this->request->isValidIP($address, $type));
+    }
+
+    public function testGetIPAddressDefault()
+    {
+        $this->assertSame('0.0.0.0', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressNormal()
+    {
+        $expected               = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR'] = $expected;
+        $this->request          = new Request(new App());
+        $this->assertSame($expected, $this->request->getIPAddress());
+        // call a second time to exercise the initial conditional block in getIPAddress()
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxy()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyInvalid()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyNotWhitelisted()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.10.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxySubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/24'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyOutofSubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/28'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
+    }
+
+    // FIXME getIPAddress should have more testing, to 100% code coverage
+
+    public function testMethodReturnsRightStuff()
+    {
+        // Defaults method to CLI now.
+        $this->assertSame('cli', $this->request->getMethod());
+        $this->assertSame('CLI', $this->request->getMethod(true));
+    }
+
+    public function testMethodIsCliReturnsAlwaysTrue()
+    {
+        $this->assertTrue($this->request->isCLI());
+    }
 }
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 003b8298acc7..c1ac77765a44 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Services;
@@ -9,392 +18,346 @@
 use Config\App;
 use CURLFile;
 
-class CURLRequestTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CURLRequestTest extends CIUnitTestCase
 {
-	/**
-	 * @var MockCURLRequest
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset();
-		$this->request = $this->getRequest();
-	}
-
-	protected function getRequest(array $options = [])
-	{
-		$uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
-
-		return new MockCURLRequest(($app = new App()), $uri, new Response($app), $options);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707
-	 */
-	public function testPrepareURLIgnoresAppConfig()
-	{
-		config('App')->baseURL = 'http://example.com/fruit/';
-
-		$request = $this->getRequest([
-			'base_uri' => 'http://example.com/v1/',
-		]);
-
-		$method = $this->getPrivateMethodInvoker($request, 'prepareURL');
-
-		$this->assertEquals('http://example.com/v1/bananas', $method('bananas'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
-	 */
-	public function testGetRemembersBaseURI()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-		]);
-
-		$request->get('products');
-
-		$options = $request->curl_options;
-
-		$this->assertEquals('http://www.foo.com/api/v1/products', $options[CURLOPT_URL]);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
-	 */
-	public function testGetRemembersBaseURIWithHelperMethod()
-	{
-		$request = Services::curlrequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-		]);
-
-		$uri = $this->getPrivateProperty($request, 'baseURI');
-		$this->assertEquals('www.foo.com', $uri->getHost());
-		$this->assertEquals('/api/v1/', $uri->getPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSendReturnsResponse()
-	{
-		$output = 'Howdy Stranger.';
-
-		$response = $this->request->setOutput($output)
-			->send('get', 'http://example.com');
-
-		$this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
-		$this->assertEquals($output, $response->getBody());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetSetsCorrectMethod()
-	{
-		$this->request->get('http://example.com');
-
-		$this->assertEquals('get', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('GET', $options[CURLOPT_CUSTOMREQUEST]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDeleteSetsCorrectMethod()
-	{
-		$this->request->delete('http://example.com');
-
-		$this->assertEquals('delete', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('DELETE', $options[CURLOPT_CUSTOMREQUEST]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHeadSetsCorrectMethod()
-	{
-		$this->request->head('http://example.com');
-
-		$this->assertEquals('head', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('HEAD', $options[CURLOPT_CUSTOMREQUEST]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOptionsSetsCorrectMethod()
-	{
-		$this->request->options('http://example.com');
-
-		$this->assertEquals('options', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOptionsBaseURIOption()
-	{
-		$options = [
-			'base_uri' => 'http://www.foo.com/api/v1/',
-		];
-		$request = $this->getRequest($options);
-
-		$this->assertEquals('http://www.foo.com/api/v1/', $request->getBaseURI());
-	}
-
-	public function testOptionsBaseURIOverride()
-	{
-		$options = [
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'baseURI'  => 'http://bogus/com',
-		];
-		$request = $this->getRequest($options);
-
-		$this->assertEquals('http://bogus/com', $request->getBaseURI());
-	}
+    /**
+     * @var MockCURLRequest
+     */
+    protected $request;
 
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	public function testOptionsHeaders()
-	{
-		$options = [
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'headers'  => ['fruit' => 'apple'],
-		];
-		$request = $this->getRequest();
-		$this->assertNull($request->header('fruit'));
+        Services::reset();
+        $this->request = $this->getRequest();
+    }
 
-		$request = $this->getRequest($options);
-		$this->assertEquals('apple', $request->header('fruit')->getValue());
-	}
+    protected function getRequest(array $options = [])
+    {
+        $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
 
-	//--------------------------------------------------------------------
+        return new MockCURLRequest(($app = new App()), $uri, new Response($app), $options);
+    }
 
-	/**
-	 * @backupGlobals enabled
-	 */
-	public function testOptionHeadersUsingPopulate()
-	{
-		$_SERVER['HTTP_HOST']            = 'site1.com';
-		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
-		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707
+     */
+    public function testPrepareURLIgnoresAppConfig()
+    {
+        config('App')->baseURL = 'http://example.com/fruit/';
 
-		$options = [
-			'base_uri' => 'http://www.foo.com/api/v1/',
-		];
+        $request = $this->getRequest(['base_uri' => 'http://example.com/v1/']);
 
-		$request = $this->getRequest($options);
-		$request->get('example');
-		// we fill the Accept-Language header from _SERVER when no headers are defined for the request
-		$this->assertEquals('en-US', $request->header('Accept-Language')->getValue());
-		// but we skip Host header - since it would corrupt the request
-		$this->assertNull($request->header('Host'));
-		// and Accept-Encoding
-		$this->assertNull($request->header('Accept-Encoding'));
-	}
+        $method = $this->getPrivateMethodInvoker($request, 'prepareURL');
 
-	/**
-	 * @backupGlobals enabled
-	 */
-	public function testOptionHeadersNotUsingPopulate()
-	{
-		$_SERVER['HTTP_HOST']            = 'site1.com';
-		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
-		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
+        $this->assertSame('http://example.com/v1/bananas', $method('bananas'));
+    }
 
-		$options = [
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'headers'  => [
-				'Host'            => 'www.foo.com',
-				'Accept-Encoding' => '',
-			],
-		];
-		$request = $this->getRequest($options);
-		$request->get('example');
-		// if headers for the request are defined we use them
-		$this->assertNull($request->header('Accept-Language'));
-		$this->assertEquals('www.foo.com', $request->header('Host')->getValue());
-		$this->assertEquals('', $request->header('Accept-Encoding')->getValue());
-	}
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
+     */
+    public function testGetRemembersBaseURI()
+    {
+        $request = $this->getRequest(['base_uri' => 'http://www.foo.com/api/v1/']);
 
-	//--------------------------------------------------------------------
+        $request->get('products');
 
-	public function testOptionsDelay()
-	{
-		$options = [
-			'delay'   => 2000,
-			'headers' => ['fruit' => 'apple'],
-		];
-		$request = $this->getRequest();
-		$this->assertEquals(0.0, $request->getDelay());
+        $options = $request->curl_options;
 
-		$request = $this->getRequest($options);
-		$this->assertEquals(2.0, $request->getDelay());
-	}
+        $this->assertSame('http://www.foo.com/api/v1/products', $options[CURLOPT_URL]);
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
+     */
+    public function testGetRemembersBaseURIWithHelperMethod()
+    {
+        $request = Services::curlrequest(['base_uri' => 'http://www.foo.com/api/v1/']);
 
-	public function testPatchSetsCorrectMethod()
-	{
-		$this->request->patch('http://example.com');
+        $uri = $this->getPrivateProperty($request, 'baseURI');
+        $this->assertSame('www.foo.com', $uri->getHost());
+        $this->assertSame('/api/v1/', $uri->getPath());
+    }
 
-		$this->assertEquals('patch', $this->request->getMethod());
+    public function testSendReturnsResponse()
+    {
+        $output = 'Howdy Stranger.';
 
-		$options = $this->request->curl_options;
+        $response = $this->request->setOutput($output)->send('get', 'http://example.com');
 
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('PATCH', $options[CURLOPT_CUSTOMREQUEST]);
-	}
+        $this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
+        $this->assertSame($output, $response->getBody());
+    }
 
-	//--------------------------------------------------------------------
+    public function testGetSetsCorrectMethod()
+    {
+        $this->request->get('http://example.com');
 
-	public function testPostSetsCorrectMethod()
-	{
-		$this->request->post('http://example.com');
+        $this->assertSame('get', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('GET', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testDeleteSetsCorrectMethod()
+    {
+        $this->request->delete('http://example.com');
+
+        $this->assertSame('delete', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('DELETE', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testHeadSetsCorrectMethod()
+    {
+        $this->request->head('http://example.com');
+
+        $this->assertSame('head', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('HEAD', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testOptionsSetsCorrectMethod()
+    {
+        $this->request->options('http://example.com');
+
+        $this->assertSame('options', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testOptionsBaseURIOption()
+    {
+        $options = ['base_uri' => 'http://www.foo.com/api/v1/'];
+        $request = $this->getRequest($options);
+
+        $this->assertSame('http://www.foo.com/api/v1/', $request->getBaseURI()->__toString());
+    }
+
+    public function testOptionsBaseURIOverride()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'baseURI'  => 'http://bogus/com',
+        ];
+        $request = $this->getRequest($options);
+
+        $this->assertSame('http://bogus/com', $request->getBaseURI()->__toString());
+    }
+
+    public function testOptionsHeaders()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'headers'  => ['fruit' => 'apple'],
+        ];
+        $request = $this->getRequest();
+        $this->assertNull($request->header('fruit'));
+
+        $request = $this->getRequest($options);
+        $this->assertSame('apple', $request->header('fruit')->getValue());
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testOptionHeadersUsingPopulate()
+    {
+        $_SERVER['HTTP_HOST']            = 'site1.com';
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
+        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
+
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+        ];
+
+        $request = $this->getRequest($options);
+        $request->get('example');
+        // we fill the Accept-Language header from _SERVER when no headers are defined for the request
+        $this->assertSame('en-US', $request->header('Accept-Language')->getValue());
+        // but we skip Host header - since it would corrupt the request
+        $this->assertNull($request->header('Host'));
+        // and Accept-Encoding
+        $this->assertNull($request->header('Accept-Encoding'));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testOptionHeadersNotUsingPopulate()
+    {
+        $_SERVER['HTTP_HOST']            = 'site1.com';
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
+        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
 
-		$this->assertEquals('post', $this->request->getMethod());
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'headers'  => [
+                'Host'            => 'www.foo.com',
+                'Accept-Encoding' => '',
+            ],
+        ];
+        $request = $this->getRequest($options);
+        $request->get('example');
+        // if headers for the request are defined we use them
+        $this->assertNull($request->header('Accept-Language'));
+        $this->assertSame('www.foo.com', $request->header('Host')->getValue());
+        $this->assertSame('', $request->header('Accept-Encoding')->getValue());
+    }
+
+    public function testOptionsDelay()
+    {
+        $options = [
+            'delay'   => 2000,
+            'headers' => ['fruit' => 'apple'],
+        ];
+        $request = $this->getRequest();
+        $this->assertSame(0.0, $request->getDelay());
+
+        $request = $this->getRequest($options);
+        $this->assertSame(2.0, $request->getDelay());
+    }
+
+    public function testPatchSetsCorrectMethod()
+    {
+        $this->request->patch('http://example.com');
+
+        $this->assertSame('patch', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('PATCH', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testPostSetsCorrectMethod()
+    {
+        $this->request->post('http://example.com');
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('POST', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testPutSetsCorrectMethod()
+    {
+        $this->request->put('http://example.com');
+
+        $this->assertSame('put', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('PUT', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testCustomMethodSetsCorrectMethod()
+    {
+        $this->request->request('custom', 'http://example.com');
+
+        $this->assertSame('custom', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testRequestMethodGetsSanitized()
+    {
+        $this->request->request('<script>Custom</script>', 'http://example.com');
+
+        $this->assertSame('custom', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+    }
 
-		$options = $this->request->curl_options;
+    public function testRequestSetsBasicCurlOptions()
+    {
+        $this->request->request('get', 'http://example.com');
 
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('POST', $options[CURLOPT_CUSTOMREQUEST]);
-	}
+        $options = $this->request->curl_options;
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey(CURLOPT_URL, $options);
+        $this->assertSame('http://example.com', $options[CURLOPT_URL]);
 
-	public function testPutSetsCorrectMethod()
-	{
-		$this->request->put('http://example.com');
+        $this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options);
+        $this->assertTrue($options[CURLOPT_RETURNTRANSFER]);
 
-		$this->assertEquals('put', $this->request->getMethod());
+        $this->assertArrayHasKey(CURLOPT_HEADER, $options);
+        $this->assertTrue($options[CURLOPT_HEADER]);
 
-		$options = $this->request->curl_options;
+        $this->assertArrayHasKey(CURLOPT_FRESH_CONNECT, $options);
+        $this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
 
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('PUT', $options[CURLOPT_CUSTOMREQUEST]);
-	}
+        $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
+        $this->assertSame(0.0, $options[CURLOPT_TIMEOUT_MS]);
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
+        $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]);
+    }
 
-	public function testCustomMethodSetsCorrectMethod()
-	{
-		$this->request->request('custom', 'http://example.com');
+    public function testAuthBasicOption()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+            ],
+        ]);
 
-		$this->assertEquals('custom', $this->request->getMethod());
+        $options = $this->request->curl_options;
 
-		$options = $this->request->curl_options;
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
-	}
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
 
-	//--------------------------------------------------------------------
+    public function testAuthBasicOptionExplicit()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+                'basic',
+            ],
+        ]);
 
-	public function testRequestMethodGetsSanitized()
-	{
-		$this->request->request('<script>Custom</script>', 'http://example.com');
+        $options = $this->request->curl_options;
 
-		$this->assertEquals('custom', $this->request->getMethod());
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
-		$options = $this->request->curl_options;
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
 
-		$this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-		$this->assertEquals('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequestSetsBasicCurlOptions()
-	{
-		$this->request->request('get', 'http://example.com');
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_URL, $options);
-		$this->assertEquals('http://example.com', $options[CURLOPT_URL]);
-
-		$this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options);
-		$this->assertTrue($options[CURLOPT_RETURNTRANSFER]);
-
-		$this->assertArrayHasKey(CURLOPT_HEADER, $options);
-		$this->assertTrue($options[CURLOPT_HEADER]);
-
-		$this->assertArrayHasKey(CURLOPT_FRESH_CONNECT, $options);
-		$this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
-
-		$this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
-		$this->assertEquals(0.0, $options[CURLOPT_TIMEOUT_MS]);
-
-		$this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
-		$this->assertEquals(150 * 1000, $options[CURLOPT_CONNECTTIMEOUT_MS]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAuthBasicOption()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'auth' => [
-				'username',
-				'password',
-			],
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-		$this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
-
-		$this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-		$this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAuthBasicOptionExplicit()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'auth' => [
-				'username',
-				'password',
-				'basic',
-			],
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-		$this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
-
-		$this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-		$this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAuthDigestOption()
-	{
-		$output = "HTTP/1.1 401 Unauthorized
+    public function testAuthDigestOption()
+    {
+        $output = "HTTP/1.1 401 Unauthorized
 		Server: ddos-guard
 		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
 		WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
@@ -410,46 +373,44 @@ public function testAuthDigestOption()
 		Content-Type: application/xml; charset=utf-8
 		Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
 
-		$this->request->setOutput($output);
+        $this->request->setOutput($output);
 
-		$response = $this->request->request('get', 'http://example.com', [
-			'auth' => [
-				'username',
-				'password',
-				'digest',
-			],
-		]);
+        $response = $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+                'digest',
+            ],
+        ]);
 
-		$options = $this->request->curl_options;
+        $options = $this->request->curl_options;
 
-		$this->assertEquals('<title>Update success! config</title>', $response->getBody());
-		$this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
 
-		$this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-		$this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
-		$this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-		$this->assertEquals(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
-	}
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetAuthBasic()
+    {
+        $this->request->setAuth('username', 'password')->get('http://example.com');
 
-	public function testSetAuthBasic()
-	{
-		$this->request->setAuth('username', 'password')->get('http://example.com');
+        $options = $this->request->curl_options;
 
-		$options = $this->request->curl_options;
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
-		$this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-		$this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
 
-		$this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-		$this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
-	}
-
-	public function testSetAuthDigest()
-	{
-		$output = "HTTP/1.1 401 Unauthorized
+    public function testSetAuthDigest()
+    {
+        $output = "HTTP/1.1 401 Unauthorized
 		Server: ddos-guard
 		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
 		WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
@@ -465,296 +426,282 @@ public function testSetAuthDigest()
 		Content-Type: application/xml; charset=utf-8
 		Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
 
-		$this->request->setOutput($output);
-
-		$response = $this->request->setAuth('username', 'password', 'digest')->get('http://example.com');
-
-		$options = $this->request->curl_options;
-
-		$this->assertEquals('<title>Update success! config</title>', $response->getBody());
-		$this->assertEquals(200, $response->getStatusCode());
-
-		$this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-		$this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
-
-		$this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-		$this->assertEquals(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCertOption()
-	{
-		$file = __FILE__;
-
-		$this->request->request('get', 'http://example.com', [
-			'cert' => $file,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
-		$this->assertEquals($file, $options[CURLOPT_SSLCERT]);
-	}
-
-	public function testCertOptionWithPassword()
-	{
-		$file = __FILE__;
-
-		$this->request->request('get', 'http://example.com', [
-			'cert' => [
-				$file,
-				'password',
-			],
-		]);
-
-		$options = $this->request->curl_options;
+        $this->request->setOutput($output);
 
-		$this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
-		$this->assertEquals($file, $options[CURLOPT_SSLCERT]);
+        $response = $this->request->setAuth('username', 'password', 'digest')->get('http://example.com');
 
-		$this->assertArrayHasKey(CURLOPT_SSLCERTPASSWD, $options);
-		$this->assertEquals('password', $options[CURLOPT_SSLCERTPASSWD]);
-	}
+        $options = $this->request->curl_options;
 
-	public function testMissingCertOption()
-	{
-		$file = 'something_obviously_bogus';
-		$this->expectException(HTTPException::class);
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
 
-		$this->request->request('get', 'http://example.com', [
-			'cert' => $file,
-		]);
-	}
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+    }
 
-	public function testSSLVerification()
-	{
-		$file = __FILE__;
+    public function testCertOption()
+    {
+        $file = __FILE__;
 
-		$this->request->request('get', 'http://example.com', [
-			'verify'  => 'yes',
-			'ssl_key' => $file,
-		]);
+        $this->request->request('get', 'http://example.com', [
+            'cert' => $file,
+        ]);
 
-		$options = $this->request->curl_options;
+        $options = $this->request->curl_options;
 
-		$this->assertArrayHasKey(CURLOPT_CAINFO, $options);
-		$this->assertEquals($file, $options[CURLOPT_CAINFO]);
+        $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
+    }
 
-		$this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
-		$this->assertEquals(1, $options[CURLOPT_SSL_VERIFYPEER]);
-	}
+    public function testCertOptionWithPassword()
+    {
+        $file = __FILE__;
 
-	public function testSSLWithBadKey()
-	{
-		$file = 'something_obviously_bogus';
-		$this->expectException(HTTPException::class);
+        $this->request->request('get', 'http://example.com', [
+            'cert' => [
+                $file,
+                'password',
+            ],
+        ]);
 
-		$this->request->request('get', 'http://example.com', [
-			'verify'  => 'yes',
-			'ssl_key' => $file,
-		]);
-	}
+        $options = $this->request->curl_options;
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
 
-	public function testDebugOptionTrue()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'debug' => true,
-		]);
+        $this->assertArrayHasKey(CURLOPT_SSLCERTPASSWD, $options);
+        $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]);
+    }
 
-		$options = $this->request->curl_options;
+    public function testMissingCertOption()
+    {
+        $file = 'something_obviously_bogus';
+        $this->expectException(HTTPException::class);
 
-		$this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
-		$this->assertEquals(1, $options[CURLOPT_VERBOSE]);
+        $this->request->request('get', 'http://example.com', [
+            'cert' => $file,
+        ]);
+    }
 
-		$this->assertArrayHasKey(CURLOPT_STDERR, $options);
-		$this->assertTrue(is_resource($options[CURLOPT_STDERR]));
-	}
+    public function testSSLVerification()
+    {
+        $file = __FILE__;
 
-	public function testDebugOptionFalse()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'debug' => false,
-		]);
+        $this->request->request('get', 'http://example.com', [
+            'verify'  => 'yes',
+            'ssl_key' => $file,
+        ]);
 
-		$options = $this->request->curl_options;
+        $options = $this->request->curl_options;
 
-		$this->assertArrayNotHasKey(CURLOPT_VERBOSE, $options);
-		$this->assertArrayNotHasKey(CURLOPT_STDERR, $options);
-	}
+        $this->assertArrayHasKey(CURLOPT_CAINFO, $options);
+        $this->assertSame($file, $options[CURLOPT_CAINFO]);
 
-	public function testDebugOptionFile()
-	{
-		$file = SUPPORTPATH . 'Files/baker/banana.php';
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
+        $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
+    }
 
-		$this->request->request('get', 'http://example.com', [
-			'debug' => $file,
-		]);
+    public function testSSLWithBadKey()
+    {
+        $file = 'something_obviously_bogus';
+        $this->expectException(HTTPException::class);
 
-		$options = $this->request->curl_options;
+        $this->request->request('get', 'http://example.com', [
+            'verify'  => 'yes',
+            'ssl_key' => $file,
+        ]);
+    }
 
-		$this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
-		$this->assertEquals(1, $options[CURLOPT_VERBOSE]);
+    public function testDebugOptionTrue()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'debug' => true,
+        ]);
 
-		$this->assertArrayHasKey(CURLOPT_STDERR, $options);
-		$this->assertTrue(is_resource($options[CURLOPT_STDERR]));
-	}
+        $options = $this->request->curl_options;
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
 
-	public function testDecodeContent()
-	{
-		$this->request->setHeader('Accept-Encoding', 'cobol');
-		$this->request->request('get', 'http://example.com', [
-			'decode_content' => true,
-		]);
+        $this->assertArrayHasKey(CURLOPT_STDERR, $options);
+        $this->assertIsResource($options[CURLOPT_STDERR]);
+    }
 
-		$options = $this->request->curl_options;
+    public function testDebugOptionFalse()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'debug' => false,
+        ]);
 
-		$this->assertArrayHasKey(CURLOPT_ENCODING, $options);
-		$this->assertEquals('cobol', $options[CURLOPT_ENCODING]);
-	}
+        $options = $this->request->curl_options;
 
-	public function testDecodeContentWithoutAccept()
-	{
-		//      $this->request->setHeader('Accept-Encoding', 'cobol');
-		$this->request->request('get', 'http://example.com', [
-			'decode_content' => true,
-		]);
+        $this->assertArrayNotHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertArrayNotHasKey(CURLOPT_STDERR, $options);
+    }
 
-		$options = $this->request->curl_options;
+    public function testDebugOptionFile()
+    {
+        $file = SUPPORTPATH . 'Files/baker/banana.php';
 
-		$this->assertArrayHasKey(CURLOPT_ENCODING, $options);
-		$this->assertEquals('', $options[CURLOPT_ENCODING]);
-		$this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options);
-		$this->assertEquals('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
-	}
+        $this->request->request('get', 'http://example.com', [
+            'debug' => $file,
+        ]);
 
-	//--------------------------------------------------------------------
+        $options = $this->request->curl_options;
 
-	public function testAllowRedirectsOptionFalse()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'allow_redirects' => false,
-		]);
+        $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
+
+        $this->assertArrayHasKey(CURLOPT_STDERR, $options);
+        $this->assertIsResource($options[CURLOPT_STDERR]);
+    }
+
+    public function testDecodeContent()
+    {
+        $this->request->setHeader('Accept-Encoding', 'cobol');
+        $this->request->request('get', 'http://example.com', [
+            'decode_content' => true,
+        ]);
 
-		$options = $this->request->curl_options;
+        $options = $this->request->curl_options;
 
-		$this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-		$this->assertEquals(0, $options[CURLOPT_FOLLOWLOCATION]);
+        $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+        $this->assertSame('cobol', $options[CURLOPT_ENCODING]);
+    }
+
+    public function testDecodeContentWithoutAccept()
+    {
+        //      $this->request->setHeader('Accept-Encoding', 'cobol');
+        $this->request->request('get', 'http://example.com', [
+            'decode_content' => true,
+        ]);
 
-		$this->assertArrayNotHasKey(CURLOPT_MAXREDIRS, $options);
-		$this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
-	}
-
-	public function testAllowRedirectsOptionTrue()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'allow_redirects' => true,
-		]);
+        $options = $this->request->curl_options;
 
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-		$this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
-
-		$this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
-		$this->assertEquals(5, $options[CURLOPT_MAXREDIRS]);
-		$this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
-		$this->assertEquals(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
-	}
-
-	public function testAllowRedirectsOptionDefaults()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'allow_redirects' => true,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-		$this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
-
-		$this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
-		$this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
-	}
-
-	public function testAllowRedirectsArray()
-	{
-		$this->request->request('get', 'http://example.com', [
-			'allow_redirects' => ['max' => 2],
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-		$this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
-
-		$this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
-		$this->assertEquals(2, $options[CURLOPT_MAXREDIRS]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSendWithQuery()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'query'    => [
-				'name' => 'Henry',
-				'd.t'  => 'value',
-			],
-		]);
-
-		$request->get('products');
-
-		$options = $request->curl_options;
-
-		$this->assertEquals('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
-	}
-
-	//--------------------------------------------------------------------
-	public function testSendWithDelay()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->get('products');
-
-		// we still need to check the code coverage to make sure this was done
-		$this->assertEquals(1.0, $request->getDelay());
-	}
-
-	//--------------------------------------------------------------------
-	public function testSendContinued()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
-		$response = $request->get('answer');
-		$this->assertEquals('Hi there', $response->getBody());
-	}
-
-	/**
-	 * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261
-	 */
-	public function testSendContinuedWithManyHeaders()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$output = "HTTP/1.1 100 Continue
+        $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+        $this->assertSame('', $options[CURLOPT_ENCODING]);
+        $this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options);
+        $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
+    }
+
+    public function testAllowRedirectsOptionFalse()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => false,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(0, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayNotHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+    }
+
+    public function testAllowRedirectsOptionTrue()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertSame(5, $options[CURLOPT_MAXREDIRS]);
+        $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+        $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
+    }
+
+    public function testAllowRedirectsOptionDefaults()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+    }
+
+    public function testAllowRedirectsArray()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => ['max' => 2],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertSame(2, $options[CURLOPT_MAXREDIRS]);
+    }
+
+    public function testSendWithQuery()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'query'    => [
+                'name' => 'Henry',
+                'd.t'  => 'value',
+            ],
+        ]);
+
+        $request->get('products');
+
+        $options = $request->curl_options;
+
+        $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
+    }
+
+    public function testSendWithDelay()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->get('products');
+
+        // we still need to check the code coverage to make sure this was done
+        $this->assertSame(1.0, $request->getDelay());
+    }
+
+    public function testSendContinued()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('answer');
+        $this->assertSame('Hi there', $response->getBody());
+    }
+
+    /**
+     * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261
+     */
+    public function testSendContinuedWithManyHeaders()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $output = "HTTP/1.1 100 Continue
 Server: ddos-guard
 Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
 Server: ddos-guard
@@ -769,253 +716,238 @@ public function testSendContinuedWithManyHeaders()
 Content-Type: application/xml; charset=utf-8
 Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
 
-		$request->setOutput($output);
-		$response = $request->get('answer');
-
-		$this->assertEquals('<title>Update success! config</title>', $response->getBody());
-
-		$responseHeaderKeys = [
-			'Cache-control',
-			'Content-Type',
-			'Server',
-			'Connection',
-			'Keep-Alive',
-			'Set-Cookie',
-			'Date',
-			'Expires',
-			'Pragma',
-			'Transfer-Encoding',
-		];
-		$this->assertEquals($responseHeaderKeys, array_keys($response->headers()));
-
-		$this->assertEquals(200, $response->getStatusCode());
-	}
-
-	//--------------------------------------------------------------------
-	public function testSplitResponse()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
-		$response = $request->get('answer');
-		$this->assertEquals('Hi there', $response->getBody());
-	}
-
-	//--------------------------------------------------------------------
-	public function testApplyBody()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->setBody('name=George');
-		$request->setOutput('Hi there');
-		$response = $request->post('answer');
-
-		$this->assertEquals('Hi there', $response->getBody());
-		$this->assertEquals('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
-	}
-
-	//--------------------------------------------------------------------
-	public function testResponseHeaders()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
-		$response = $request->get('bogus');
-
-		$this->assertEquals('2.0', $response->getProtocolVersion());
-		$this->assertEquals(234, $response->getStatusCode());
-	}
-
-	public function testResponseHeadersShortProtocol()
-	{
-		$request = $this->getRequest([
-			'base_uri' => 'http://www.foo.com/api/v1/',
-			'delay'    => 1000,
-		]);
-
-		$request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");
-		$response = $request->get('bogus');
-
-		$this->assertEquals('2.0', $response->getProtocolVersion());
-		$this->assertEquals(235, $response->getStatusCode());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPostFormEncoded()
-	{
-		$params = [
-			'foo' => 'bar',
-			'baz' => [
-				'hi',
-				'there',
-			],
-		];
-		$this->request->request('POST', '/post', [
-			'form_params' => $params,
-		]);
-
-		$this->assertEquals('post', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$expected = http_build_query($params);
-		$this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
-		$this->assertEquals($expected, $options[CURLOPT_POSTFIELDS]);
-	}
-
-	public function testPostFormMultipart()
-	{
-		$params = [
-			'foo'   => 'bar',
-			'baz'   => [
-				'hi',
-				'there',
-			],
-			'afile' => new CURLFile(__FILE__),
-		];
-		$this->request->request('POST', '/post', [
-			'multipart' => $params,
-		]);
-
-		$this->assertEquals('post', $this->request->getMethod());
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
-		$this->assertEquals($params, $options[CURLOPT_POSTFIELDS]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetForm()
-	{
-		$params = [
-			'foo' => 'bar',
-			'baz' => [
-				'hi',
-				'there',
-			],
-		];
-
-		$this->request->setForm($params)->post('/post');
-
-		$this->assertEquals(
-			http_build_query($params),
-			$this->request->curl_options[CURLOPT_POSTFIELDS]
-		);
-
-		$params['afile'] = new CURLFile(__FILE__);
-
-		$this->request->setForm($params, true)->post('/post');
-
-		$this->assertEquals(
-			$params,
-			$this->request->curl_options[CURLOPT_POSTFIELDS]
-		);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testJSONData()
-	{
-		$params = [
-			'foo' => 'bar',
-			'baz' => [
-				'hi',
-				'there',
-			],
-		];
-		$this->request->request('POST', '/post', [
-			'json' => $params,
-		]);
-
-		$this->assertEquals('post', $this->request->getMethod());
-
-		$expected = json_encode($params);
-		$this->assertEquals($expected, $this->request->getBody());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetJSON()
-	{
-		$params = [
-			'foo' => 'bar',
-			'baz' => [
-				'hi',
-				'there',
-			],
-		];
-		$this->request->setJSON($params)->post('/post');
-
-		$this->assertEquals(json_encode($params), $this->request->getBody());
-		$this->assertEquals('application/json', $this->request->getHeaderLine('Content-Type'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHTTPv1()
-	{
-		$this->request->request('POST', '/post', [
-			'version' => 1.0,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
-		$this->assertEquals(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
-	}
-
-	public function testHTTPv11()
-	{
-		$this->request->request('POST', '/post', [
-			'version' => 1.1,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
-		$this->assertEquals(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCookieOption()
-	{
-		$holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';
-		$this->request->request('POST', '/post', [
-			'cookie' => $holder,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options);
-		$this->assertEquals($holder, $options[CURLOPT_COOKIEJAR]);
-		$this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options);
-		$this->assertEquals($holder, $options[CURLOPT_COOKIEFILE]);
-	}
-
-	public function testUserAgentOption()
-	{
-		$agent = 'CodeIgniter Framework';
-
-		$this->request->request('POST', '/post', [
-			'user_agent' => $agent,
-		]);
-
-		$options = $this->request->curl_options;
-
-		$this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
-		$this->assertEquals($agent, $options[CURLOPT_USERAGENT]);
-	}
+        $request->setOutput($output);
+        $response = $request->get('answer');
+
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+
+        $responseHeaderKeys = [
+            'Cache-control',
+            'Content-Type',
+            'Server',
+            'Connection',
+            'Keep-Alive',
+            'Set-Cookie',
+            'Date',
+            'Expires',
+            'Pragma',
+            'Transfer-Encoding',
+        ];
+        $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
+    public function testSplitResponse()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('answer');
+        $this->assertSame('Hi there', $response->getBody());
+    }
+
+    public function testApplyBody()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setBody('name=George');
+        $request->setOutput('Hi there');
+        $response = $request->post('answer');
+
+        $this->assertSame('Hi there', $response->getBody());
+        $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testResponseHeaders()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('bogus');
+
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(234, $response->getStatusCode());
+    }
+
+    public function testResponseHeadersShortProtocol()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");
+        $response = $request->get('bogus');
+
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(235, $response->getStatusCode());
+    }
+
+    public function testPostFormEncoded()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->request('POST', '/post', [
+            'form_params' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $expected = http_build_query($params);
+        $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+        $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testPostFormMultipart()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+            'afile' => new CURLFile(__FILE__),
+        ];
+        $this->request->request('POST', '/post', [
+            'multipart' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+        $this->assertSame($params, $options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testSetForm()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+
+        $this->request->setForm($params)->post('/post');
+
+        $this->assertSame(
+            http_build_query($params),
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
+
+        $params['afile'] = new CURLFile(__FILE__);
+
+        $this->request->setForm($params, true)->post('/post');
+
+        $this->assertSame(
+            $params,
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
+    }
+
+    public function testJSONData()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->request('POST', '/post', [
+            'json' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $expected = json_encode($params);
+        $this->assertSame($expected, $this->request->getBody());
+    }
+
+    public function testSetJSON()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->setJSON($params)->post('/post');
+
+        $this->assertSame(json_encode($params), $this->request->getBody());
+        $this->assertSame('application/json', $this->request->getHeaderLine('Content-Type'));
+    }
+
+    public function testHTTPv1()
+    {
+        $this->request->request('POST', '/post', [
+            'version' => 1.0,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+        $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
+    }
+
+    public function testHTTPv11()
+    {
+        $this->request->request('POST', '/post', [
+            'version' => 1.1,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+        $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
+    }
+
+    public function testCookieOption()
+    {
+        $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';
+        $this->request->request('POST', '/post', [
+            'cookie' => $holder,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEJAR]);
+        $this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]);
+    }
+
+    public function testUserAgentOption()
+    {
+        $agent = 'CodeIgniter Framework';
+
+        $this->request->request('POST', '/post', [
+            'user_agent' => $agent,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
+        $this->assertSame($agent, $options[CURLOPT_USERAGENT]);
+    }
 }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index b59143ed492d..0bbb6f60f988 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -9,516 +19,504 @@
  *
  * See https://apimirror.com/http/headers/content-security-policy
  * See https://cspvalidator.org/
+ *
+ * @internal
  */
-class ContentSecurityPolicyTest extends CIUnitTestCase
+final class ContentSecurityPolicyTest extends CIUnitTestCase
 {
-
-	// Having this method as setUp() doesn't work - can't find Config\App !?
-	protected function prepare(bool $CSPEnabled = true)
-	{
-		$config             = new App();
-		$config->CSPEnabled = $CSPEnabled;
-		$this->response     = new Response($config);
-		$this->response->pretend(false);
-		$this->csp = $this->response->CSP;
-	}
-
-	protected function work(string $parm = 'Hello')
-	{
-		$body = $parm;
-		$this->response->setBody($body);
-		$this->response->setCookie('foo', 'bar');
-
-		ob_start();
-		$this->response->send();
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-		return $buffer;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testExistence()
-	{
-		$this->prepare();
-		$result = $this->work();
-
-		$this->assertHeaderEmitted('Content-Security-Policy:');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testReportOnly()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(false);
-		$result = $this->work();
-
-		$this->assertHeaderEmitted('Content-Security-Policy:');
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testDefaults()
-	{
-		$this->prepare();
-
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("base-uri 'self';", $result);
-		$this->assertStringContainsString("connect-src 'self';", $result);
-		$this->assertStringContainsString("default-src 'self';", $result);
-		$this->assertStringContainsString("img-src 'self';", $result);
-		$this->assertStringContainsString("script-src 'self';", $result);
-		$this->assertStringContainsString("style-src 'self';", $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testChildSrc()
-	{
-		$this->prepare();
-		$this->csp->addChildSrc('evil.com', true);
-		$this->csp->addChildSrc('good.com', false);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('child-src evil.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("child-src 'self' good.com;", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testConnectSrc()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(true);
-		$this->csp->addConnectSrc('iffy.com');
-		$this->csp->addConnectSrc('maybe.com');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('connect-src iffy.com maybe.com;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testFontSrc()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(true);
-		$this->csp->addFontSrc('iffy.com');
-		$this->csp->addFontSrc('fontsrus.com', false);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('font-src iffy.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('font-src fontsrus.com;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testFormAction()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(true);
-		$this->csp->addFormAction('surveysrus.com');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('form-action surveysrus.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("form-action 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testFrameAncestor()
-	{
-		$this->prepare();
-		$this->csp->addFrameAncestor('self');
-		$this->csp->addFrameAncestor('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('frame-ancestors them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("frame-ancestors 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testFrameSrc()
-	{
-		$this->prepare();
-		$this->csp->addFrameSrc('self');
-		$this->csp->addFrameSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('frame-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("frame-src 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testImageSrc()
-	{
-		$this->prepare();
-		$this->csp->addImageSrc('cdn.cloudy.com');
-		$this->csp->addImageSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('img-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("img-src 'self' cdn.cloudy.com;", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testMediaSrc()
-	{
-		$this->prepare();
-		$this->csp->addMediaSrc('self');
-		$this->csp->addMediaSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('media-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("media-src 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testManifestSrc()
-	{
-		$this->prepare();
-		$this->csp->addManifestSrc('cdn.cloudy.com');
-		$this->csp->addManifestSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('manifest-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('manifest-src cdn.cloudy.com;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testPluginType()
-	{
-		$this->prepare();
-		$this->csp->addPluginType('self');
-		$this->csp->addPluginType('application/x-shockwave-flash', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('plugin-types application/x-shockwave-flash;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("plugin-types 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testPluginArray()
-	{
-		$this->prepare();
-		$this->csp->addPluginType('application/x-shockwave-flash');
-		$this->csp->addPluginType('application/wacky-hacky');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('plugin-types application/x-shockwave-flash application/wacky-hacky;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testObjectSrc()
-	{
-		$this->prepare();
-		$this->csp->addObjectSrc('cdn.cloudy.com');
-		$this->csp->addObjectSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('object-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("object-src 'self' cdn.cloudy.com;", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testScriptSrc()
-	{
-		$this->prepare();
-		$this->csp->addScriptSrc('cdn.cloudy.com');
-		$this->csp->addScriptSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('script-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("script-src 'self' cdn.cloudy.com;", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testStyleSrc()
-	{
-		$this->prepare();
-		$this->csp->addStyleSrc('cdn.cloudy.com');
-		$this->csp->addStyleSrc('them.com', true);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
-		$this->assertStringContainsString('style-src them.com;', $result);
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBaseURIDefault()
-	{
-		$this->prepare();
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("base-uri 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBaseURI()
-	{
-		$this->prepare();
-		$this->csp->addBaseURI('example.com');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('base-uri example.com;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBaseURIRich()
-	{
-		$this->prepare();
-		$this->csp->addBaseURI(['self', 'example.com']);
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString("base-uri 'self' example.com;", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testDefaultSrc()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(false);
-		$this->csp->setDefaultSrc('maybe.com');
-		$this->csp->setDefaultSrc('iffy.com');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('default-src iffy.com;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testReportURI()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(false);
-		$this->csp->setReportURI('http://example.com/csptracker');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('report-uri http://example.com/csptracker;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSandboxFlags()
-	{
-		$this->prepare();
-		$this->csp->reportOnly(false);
-		$this->csp->addSandbox(['allow-popups', 'allow-top-navigation']);
-		//      $this->csp->addSandbox('allow-popups');
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('sandbox allow-popups allow-top-navigation;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testUpgradeInsecureRequests()
-	{
-		$this->prepare();
-		$this->csp->upgradeInsecureRequests();
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('upgrade-insecure-requests;', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBodyEmpty()
-	{
-		$this->prepare();
-		$body = '';
-		$this->response->setBody($body);
-		$this->csp->finalize($this->response);
-		$this->assertEquals($body, $this->response->getBody());
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBodyScriptNonce()
-	{
-		$this->prepare();
-		$body = 'Blah blah {csp-script-nonce} blah blah';
-		$this->response->setBody($body);
-		$this->csp->addScriptSrc('cdn.cloudy.com');
-
-		$result = $this->work($body);
-
-		$this->assertStringContainsString('nonce=', $this->response->getBody());
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('nonce-', $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testBodyStyleNonce()
-	{
-		$this->prepare();
-		$body = 'Blah blah {csp-style-nonce} blah blah';
-		$this->response->setBody($body);
-		$this->csp->addStyleSrc('cdn.cloudy.com');
-
-		$result = $this->work($body);
-
-		$this->assertStringContainsString('nonce=', $this->response->getBody());
-		$result = $this->getHeaderEmitted('Content-Security-Policy');
-		$this->assertStringContainsString('nonce-', $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeaderWrongCaseNotFound()
-	{
-		$this->prepare();
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('content-security-policy');
-		$this->assertNull($result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeaderIgnoreCase()
-	{
-		$this->prepare();
-		$result = $this->work();
-
-		$result = $this->getHeaderEmitted('content-security-policy', true);
-		$this->assertStringContainsString("base-uri 'self';", $result);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testCSPDisabled()
-	{
-		$this->prepare(false);
-		$result = $this->work();
-		$this->response->CSP->addStyleSrc('https://example.com');
-
-		$this->assertHeaderNotEmitted('content-security-policy', true);
-	}
-
+    // Having this method as setUp() doesn't work - can't find Config\App !?
+    protected function prepare(bool $CSPEnabled = true)
+    {
+        $config             = new App();
+        $config->CSPEnabled = $CSPEnabled;
+        $this->response     = new Response($config);
+        $this->response->pretend(false);
+        $this->csp = $this->response->CSP;
+    }
+
+    protected function work(string $parm = 'Hello')
+    {
+        $body = $parm;
+        $this->response->setBody($body);
+        $this->response->setCookie('foo', 'bar');
+
+        ob_start();
+        $this->response->send();
+        $buffer = ob_clean();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        return $buffer;
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testExistence()
+    {
+        $this->prepare();
+        $this->work();
+
+        $this->assertHeaderEmitted('Content-Security-Policy:');
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testReportOnly()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(false);
+        $this->work();
+
+        $this->assertHeaderEmitted('Content-Security-Policy:');
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testDefaults()
+    {
+        $this->prepare();
+
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("base-uri 'self';", $result);
+        $this->assertStringContainsString("connect-src 'self';", $result);
+        $this->assertStringContainsString("default-src 'self';", $result);
+        $this->assertStringContainsString("img-src 'self';", $result);
+        $this->assertStringContainsString("script-src 'self';", $result);
+        $this->assertStringContainsString("style-src 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testChildSrc()
+    {
+        $this->prepare();
+        $this->csp->addChildSrc('evil.com', true);
+        $this->csp->addChildSrc('good.com', false);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('child-src evil.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("child-src 'self' good.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testConnectSrc()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(true);
+        $this->csp->addConnectSrc('iffy.com');
+        $this->csp->addConnectSrc('maybe.com');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('connect-src iffy.com maybe.com;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testFontSrc()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(true);
+        $this->csp->addFontSrc('iffy.com');
+        $this->csp->addFontSrc('fontsrus.com', false);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('font-src iffy.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('font-src fontsrus.com;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testFormAction()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(true);
+        $this->csp->addFormAction('surveysrus.com');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('form-action surveysrus.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("form-action 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testFrameAncestor()
+    {
+        $this->prepare();
+        $this->csp->addFrameAncestor('self');
+        $this->csp->addFrameAncestor('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('frame-ancestors them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("frame-ancestors 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testFrameSrc()
+    {
+        $this->prepare();
+        $this->csp->addFrameSrc('self');
+        $this->csp->addFrameSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('frame-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("frame-src 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testImageSrc()
+    {
+        $this->prepare();
+        $this->csp->addImageSrc('cdn.cloudy.com');
+        $this->csp->addImageSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('img-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("img-src 'self' cdn.cloudy.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testMediaSrc()
+    {
+        $this->prepare();
+        $this->csp->addMediaSrc('self');
+        $this->csp->addMediaSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('media-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("media-src 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testManifestSrc()
+    {
+        $this->prepare();
+        $this->csp->addManifestSrc('cdn.cloudy.com');
+        $this->csp->addManifestSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('manifest-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('manifest-src cdn.cloudy.com;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testPluginType()
+    {
+        $this->prepare();
+        $this->csp->addPluginType('self');
+        $this->csp->addPluginType('application/x-shockwave-flash', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('plugin-types application/x-shockwave-flash;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("plugin-types 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testPluginArray()
+    {
+        $this->prepare();
+        $this->csp->addPluginType('application/x-shockwave-flash');
+        $this->csp->addPluginType('application/wacky-hacky');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('plugin-types application/x-shockwave-flash application/wacky-hacky;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testObjectSrc()
+    {
+        $this->prepare();
+        $this->csp->addObjectSrc('cdn.cloudy.com');
+        $this->csp->addObjectSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('object-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("object-src 'self' cdn.cloudy.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testScriptSrc()
+    {
+        $this->prepare();
+        $this->csp->addScriptSrc('cdn.cloudy.com');
+        $this->csp->addScriptSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('script-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("script-src 'self' cdn.cloudy.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testStyleSrc()
+    {
+        $this->prepare();
+        $this->csp->addStyleSrc('cdn.cloudy.com');
+        $this->csp->addStyleSrc('them.com', true);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy-Report-Only');
+        $this->assertStringContainsString('style-src them.com;', $result);
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBaseURIDefault()
+    {
+        $this->prepare();
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("base-uri 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBaseURI()
+    {
+        $this->prepare();
+        $this->csp->addBaseURI('example.com');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('base-uri example.com;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBaseURIRich()
+    {
+        $this->prepare();
+        $this->csp->addBaseURI(['self', 'example.com']);
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("base-uri 'self' example.com;", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testDefaultSrc()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(false);
+        $this->csp->setDefaultSrc('maybe.com');
+        $this->csp->setDefaultSrc('iffy.com');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('default-src iffy.com;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testReportURI()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(false);
+        $this->csp->setReportURI('http://example.com/csptracker');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('report-uri http://example.com/csptracker;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSandboxFlags()
+    {
+        $this->prepare();
+        $this->csp->reportOnly(false);
+        $this->csp->addSandbox(['allow-popups', 'allow-top-navigation']);
+        //      $this->csp->addSandbox('allow-popups');
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('sandbox allow-popups allow-top-navigation;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testUpgradeInsecureRequests()
+    {
+        $this->prepare();
+        $this->csp->upgradeInsecureRequests();
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('upgrade-insecure-requests;', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBodyEmpty()
+    {
+        $this->prepare();
+        $body = '';
+        $this->response->setBody($body);
+        $this->csp->finalize($this->response);
+        $this->assertSame($body, $this->response->getBody());
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBodyScriptNonce()
+    {
+        $this->prepare();
+        $body = 'Blah blah {csp-script-nonce} blah blah';
+        $this->response->setBody($body);
+        $this->csp->addScriptSrc('cdn.cloudy.com');
+
+        $result = $this->work($body);
+
+        $this->assertStringContainsString('nonce=', $this->response->getBody());
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('nonce-', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testBodyStyleNonce()
+    {
+        $this->prepare();
+        $body = 'Blah blah {csp-style-nonce} blah blah';
+        $this->response->setBody($body);
+        $this->csp->addStyleSrc('cdn.cloudy.com');
+
+        $result = $this->work($body);
+
+        $this->assertStringContainsString('nonce=', $this->response->getBody());
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString('nonce-', $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeaderWrongCaseNotFound()
+    {
+        $this->prepare();
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('content-security-policy');
+        $this->assertNull($result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeaderIgnoreCase()
+    {
+        $this->prepare();
+        $result = $this->work();
+
+        $result = $this->getHeaderEmitted('content-security-policy', true);
+        $this->assertStringContainsString("base-uri 'self';", $result);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testCSPDisabled()
+    {
+        $this->prepare(false);
+        $this->work();
+        $this->response->CSP->addStyleSrc('https://example.com');
+
+        $this->assertHeaderNotEmitted('content-security-policy', true);
+    }
 }
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 7459aadc122e..736558dcf9d2 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Exceptions\DownloadException;
@@ -7,309 +17,303 @@
 use DateTime;
 use DateTimeZone;
 
-class DownloadResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DownloadResponseTest extends CIUnitTestCase
 {
+    protected function tearDown(): void
+    {
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
+            unset($_SERVER['HTTP_USER_AGENT']);
+        }
+    }
 
-	public function tearDown(): void
-	{
-		if (isset($_SERVER['HTTP_USER_AGENT']))
-		{
-			unset($_SERVER['HTTP_USER_AGENT']);
-		}
-	}
-
-	public function testCanGetStatusCode()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
-
-		$this->assertSame(200, $response->getStatusCode());
-	}
-
-	public function testCantSetStatusCode()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testCanGetStatusCode()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->expectException(DownloadException::class);
-		$response->setStatusCode(200);
-	}
+        $this->assertSame(200, $response->getStatusCode());
+    }
 
-	public function testSetDateRemembersDateInUTC()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testCantSetStatusCode()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$response->setDate(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
+        $this->expectException(DownloadException::class);
+        $response->setStatusCode(200);
+    }
 
-		$date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
-		$date->setTimezone(new DateTimeZone('UTC'));
+    public function testSetDateRemembersDateInUTC()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$header = $response->getHeaderLine('Date');
+        $response->setDate(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
 
-		$this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
-	}
+        $date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $date->setTimezone(new DateTimeZone('UTC'));
 
-	public function testSetLastModifiedWithDateTimeObject()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+        $header = $response->getHeaderLine('Date');
 
-		$response->setLastModified(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
+    }
 
-		$date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
-		$date->setTimezone(new DateTimeZone('UTC'));
+    public function testSetLastModifiedWithDateTimeObject()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$header = $response->getHeaderLine('Last-Modified');
+        $response->setLastModified(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
 
-		$this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
-	}
+        $date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $date->setTimezone(new DateTimeZone('UTC'));
 
-	public function testSetLastModifiedWithString()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+        $header = $response->getHeaderLine('Last-Modified');
 
-		$response->setLastModified('2000-03-10 10:23:45');
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
+    }
 
-		$header = $response->getHeaderLine('Last-Modified');
+    public function testSetLastModifiedWithString()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->assertEquals('2000-03-10 10:23:45', $header);
-	}
+        $response->setLastModified('2000-03-10 10:23:45');
 
-	public function testsentMethodSouldReturnRedirectResponse()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+        $header = $response->getHeaderLine('Last-Modified');
 
-		$this->assertInstanceOf(DownloadResponse::class, $response);
-	}
+        $this->assertSame('2000-03-10 10:23:45', $header);
+    }
 
-	public function testSetContentType()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testsentMethodSouldReturnRedirectResponse()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$response->setContentType('text/json');
+        $this->assertInstanceOf(DownloadResponse::class, $response);
+    }
 
-		$this->assertEquals('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
-	}
+    public function testSetContentType()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-	public function testSetContentTypeNoCharSet()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+        $response->setContentType('text/json');
 
-		$response->setContentType('application/octet-stream', '');
+        $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+    }
 
-		$this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
-	}
+    public function testSetContentTypeNoCharSet()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-	public function testSetFileName()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
-		$response->setFileName('myFile.txt');
-		$response->buildHeaders();
+        $response->setContentType('application/octet-stream', '');
 
-		$this->assertSame('attachment; filename="myFile.txt"; filename*=UTF-8\'\'myFile.txt', $response->getHeaderLine('Content-Disposition'));
-	}
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
+    }
 
-	public function testNoCache()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testSetFileName()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
+        $response->setFileName('myFile.txt');
+        $response->buildHeaders();
 
-		$response->noCache();
+        $this->assertSame('attachment; filename="myFile.txt"; filename*=UTF-8\'\'myFile.txt', $response->getHeaderLine('Content-Disposition'));
+    }
 
-		$this->assertSame('private, no-transform, no-store, must-revalidate', $response->getHeaderLine('Cache-control'));
-	}
+    public function testNoCache()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-	public function testCantSetCache()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+        $response->noCache();
 
-		$this->expectException(DownloadException::class);
-		$response->setCache();
-	}
+        $this->assertSame('private, no-transform, no-store, must-revalidate', $response->getHeaderLine('Cache-control'));
+    }
 
-	public function testWhenFilepathIsSetBinaryCanNotBeSet()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testCantSetCache()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->expectException(DownloadException::class);
-		$response->setFilePath(__FILE__);
-		$response->setBinary('test');
-	}
+        $this->expectException(DownloadException::class);
+        $response->setCache();
+    }
 
-	public function testWhenBinaryIsSetFilepathCanNotBeSet()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testWhenFilepathIsSetBinaryCanNotBeSet()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->expectException(DownloadException::class);
-		$response->setBinary('test');
-		$response->setFilePath(__FILE__);
-	}
+        $this->expectException(DownloadException::class);
+        $response->setFilePath(__FILE__);
+        $response->setBinary('test');
+    }
 
-	public function testCanNotSetNoFilepath()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testWhenBinaryIsSetFilepathCanNotBeSet()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->expectException(FileNotFoundException::class);
-		$response->setFilePath('unit test');
-	}
+        $this->expectException(DownloadException::class);
+        $response->setBinary('test');
+        $response->setFilePath(__FILE__);
+    }
 
-	public function testCanGetContentLength()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testCanNotSetNoFilepath()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$this->assertSame(0, $response->getContentLength());
+        $this->expectException(FileNotFoundException::class);
+        $response->setFilePath('unit test');
+    }
 
-		$response = new DownloadResponse('unit-test.txt', true);
+    public function testCanGetContentLength()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$response->setBinary('1');
-		$this->assertSame(1, $response->getContentLength());
+        $this->assertSame(0, $response->getContentLength());
 
-		$response = new DownloadResponse('unit-test.txt', true);
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$size = filesize(SYSTEMPATH . 'Common.php');
-		$response->setFilePath(SYSTEMPATH . 'Common.php');
-		$this->assertSame($size, $response->getContentLength());
-	}
+        $response->setBinary('1');
+        $this->assertSame(1, $response->getContentLength());
 
-	public function testIsSetDownloadableHeadlersFromBinary()
-	{
-		$response = new DownloadResponse('unit test.txt', false);
+        $response = new DownloadResponse('unit-test.txt', true);
 
-		$response->setBinary('test');
-		$response->buildHeaders();
+        $size = filesize(SYSTEMPATH . 'Common.php');
+        $response->setFilePath(SYSTEMPATH . 'Common.php');
+        $this->assertSame($size, $response->getContentLength());
+    }
 
-		$this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
-		$this->assertEquals('attachment; filename="unit test.txt"; filename*=UTF-8\'\'unit%20test.txt', $response->getHeaderLine('Content-Disposition'));
-		$this->assertEquals('0', $response->getHeaderLine('Expires-Disposition'));
-		$this->assertEquals('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
-		$this->assertEquals('4', $response->getHeaderLine('Content-Length'));
-	}
+    public function testIsSetDownloadableHeadlersFromBinary()
+    {
+        $response = new DownloadResponse('unit test.txt', false);
 
-	public function testIsSetDownloadableHeadlersFromFile()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
+        $response->setBinary('test');
+        $response->buildHeaders();
 
-		$response->setFilePath(__FILE__);
-		$response->buildHeaders();
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('attachment; filename="unit test.txt"; filename*=UTF-8\'\'unit%20test.txt', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('0', $response->getHeaderLine('Expires-Disposition'));
+        $this->assertSame('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
+        $this->assertSame('4', $response->getHeaderLine('Content-Length'));
+    }
 
-		$this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
-		$this->assertEquals('attachment; filename="unit-test.php"; filename*=UTF-8\'\'unit-test.php', $response->getHeaderLine('Content-Disposition'));
-		$this->assertEquals('0', $response->getHeaderLine('Expires-Disposition'));
-		$this->assertEquals('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
-		$this->assertEquals(filesize(__FILE__), $response->getHeaderLine('Content-Length'));
-	}
+    public function testIsSetDownloadableHeadlersFromFile()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
 
-	public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurlencode()
-	{
-		$response = new DownloadResponse(mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8'), false);
+        $response->setFilePath(__FILE__);
+        $response->buildHeaders();
 
-		$response->setFilePath(__FILE__);
-		$response->setContentType('application/octet-stream', 'Shift-JIS');
-		$response->buildHeaders();
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('attachment; filename="unit-test.php"; filename*=UTF-8\'\'unit-test.php', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('0', $response->getHeaderLine('Expires-Disposition'));
+        $this->assertSame('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
+        $this->assertSame(filesize(__FILE__), (int) $response->getHeaderLine('Content-Length'));
+    }
 
-		$this->assertEquals('attachment; filename="' . mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8') . '"; filename*=UTF-8\'\'%E3%83%86%E3%82%B9%E3%83%88.php', $response->getHeaderLine('Content-Disposition'));
-	}
+    public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurlencode()
+    {
+        $response = new DownloadResponse(mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8'), false);
 
-	public function testFileExtensionIsUpperCaseWhenAndroidOSIs2()
-	{
-		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Linux; U; Android 2.0.3; ja-jp; SC-02C Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30';
-		$response                   = new DownloadResponse('unit-test.php', false);
-
-		$response->setFilePath(__FILE__);
-		$response->buildHeaders();
+        $response->setFilePath(__FILE__);
+        $response->setContentType('application/octet-stream', 'Shift-JIS');
+        $response->buildHeaders();
 
-		$this->assertEquals('attachment; filename="unit-test.PHP"; filename*=UTF-8\'\'unit-test.PHP', $response->getHeaderLine('Content-Disposition'));
-	}
-
-	public function testIsSetContentTypeFromFilename()
-	{
-		$response = new DownloadResponse('unit-test.txt', true);
-
-		$response->setBinary('test');
-		$response->buildHeaders();
-
-		$this->assertEquals('text/plain; charset=UTF-8', $response->getHeaderLine('Content-Type'));
-	}
+        $this->assertSame('attachment; filename="' . mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8') . '"; filename*=UTF-8\'\'%E3%83%86%E3%82%B9%E3%83%88.php', $response->getHeaderLine('Content-Disposition'));
+    }
 
-	public function testCanOutputFileBodyFromBinary()
-	{
-		$response = new DownloadResponse('unit-test.txt', false);
+    public function testFileExtensionIsUpperCaseWhenAndroidOSIs2()
+    {
+        $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Linux; U; Android 2.0.3; ja-jp; SC-02C Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30';
+        $response                   = new DownloadResponse('unit-test.php', false);
 
-		$response->setBinary('test');
-
-		ob_start();
-		$response->sendBody();
-		$actual = ob_get_contents();
-		ob_end_clean();
+        $response->setFilePath(__FILE__);
+        $response->buildHeaders();
+
+        $this->assertSame('attachment; filename="unit-test.PHP"; filename*=UTF-8\'\'unit-test.PHP', $response->getHeaderLine('Content-Disposition'));
+    }
+
+    public function testIsSetContentTypeFromFilename()
+    {
+        $response = new DownloadResponse('unit-test.txt', true);
+
+        $response->setBinary('test');
+        $response->buildHeaders();
+
+        $this->assertSame('text/plain; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+    }
 
-		$this->assertSame('test', $actual);
-	}
+    public function testCanOutputFileBodyFromBinary()
+    {
+        $response = new DownloadResponse('unit-test.txt', false);
 
-	public function testCanOutputFileBodyFromFile()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
+        $response->setBinary('test');
+
+        ob_start();
+        $response->sendBody();
+        $actual = ob_get_contents();
+        ob_end_clean();
+
+        $this->assertSame('test', $actual);
+    }
 
-		$response->setFilePath(__FILE__);
+    public function testCanOutputFileBodyFromFile()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
 
-		ob_start();
-		$response->sendBody();
-		$actual = ob_get_contents();
-		ob_end_clean();
+        $response->setFilePath(__FILE__);
 
-		$this->assertSame(file_get_contents(__FILE__), $actual);
-	}
+        ob_start();
+        $response->sendBody();
+        $actual = ob_get_contents();
+        ob_end_clean();
 
-	public function testThrowExceptionWhenNoSetDownloadSource()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
-
-		$this->expectException(DownloadException::class);
-		$response->sendBody();
-	}
-
-	//--------------------------------------------------------------------
-	public function testGetReason()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
-		$this->assertEquals('OK', $response->getReason());
-	}
-
-	//--------------------------------------------------------------------
-	public function testPretendOutput()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
-		$response->pretend(true);
-
-		$response->setFilePath(__FILE__);
-
-		ob_start();
-		$response->send();
-		$actual = ob_get_contents();
-		ob_end_clean();
-
-		$this->assertSame(file_get_contents(__FILE__), $actual);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testRealOutput()
-	{
-		$response = new DownloadResponse('unit-test.php', false);
-		$response->pretend(false);
-		$response->setFilePath(__FILE__);
-
-		// send it
-		ob_start();
-		$response->send();
-
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-
-		// and what actually got sent?
-		$this->assertHeaderEmitted('Content-Length: ' . filesize(__FILE__));
-		$this->assertHeaderEmitted('Date:');
-	}
+        $this->assertSame(file_get_contents(__FILE__), $actual);
+    }
 
+    public function testThrowExceptionWhenNoSetDownloadSource()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
+
+        $this->expectException(DownloadException::class);
+        $response->sendBody();
+    }
+
+    public function testGetReason()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
+        $this->assertSame('OK', $response->getReason());
+    }
+
+    public function testPretendOutput()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
+        $response->pretend(true);
+
+        $response->setFilePath(__FILE__);
+
+        ob_start();
+        $response->send();
+        $actual = ob_get_contents();
+        ob_end_clean();
+
+        $this->assertSame(file_get_contents(__FILE__), $actual);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testRealOutput()
+    {
+        $response = new DownloadResponse('unit-test.php', false);
+        $response->pretend(false);
+        $response->setFilePath(__FILE__);
+
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        // and what actually got sent?
+        $this->assertHeaderEmitted('Content-Length: ' . filesize(__FILE__));
+        $this->assertHeaderEmitted('Date:');
+    }
 }
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index cc9f9ec83ad6..6b3c7533ff96 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -1,892 +1,860 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Mimes;
 
-class FileCollectionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileCollectionTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$_FILES = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAllReturnsArrayWithNoFiles()
-	{
-		$files = new FileCollection();
-
-		$this->assertEquals([], $files->all());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAllReturnsValidSingleFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$files      = $collection->all();
-		$this->assertCount(1, $files);
-
-		$file = array_shift($files);
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('someFile.txt', $file->getName());
-		$this->assertEquals(124, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAllReturnsValidMultipleFilesSameName()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'fileA.txt',
-					'fileB.txt',
-				],
-				'type'     => [
-					'text/plain',
-					'text/csv',
-				],
-				'size'     => [
-					'124',
-					'248',
-				],
-				'tmp_name' => [
-					'/tmp/fileA.txt',
-					'/tmp/fileB.txt',
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$files      = $collection->all();
-		$this->assertCount(1, $files);
-		$this->assertEquals('userfile', key($files));
-
-		$files = array_shift($files);
-		$this->assertCount(2, $files);
-
-		$file = $files[0];
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('fileA.txt', $file->getName());
-		$this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-		$this->assertEquals('txt', $file->getClientExtension());
-		$this->assertEquals('text/plain', $file->getClientMimeType());
-		$this->assertEquals(124, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAllReturnsValidMultipleFilesDifferentName()
-	{
-		$_FILES = [
-			'userfile1' => [
-				'name'     => 'fileA.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-			'userfile2' => [
-				'name'     => 'fileB.txt',
-				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$files      = $collection->all();
-		$this->assertCount(2, $files);
-		$this->assertEquals('userfile1', key($files));
-
-		$file = array_shift($files);
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('fileA.txt', $file->getName());
-		$this->assertEquals('fileA.txt', $file->getClientName());
-		$this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-		$this->assertEquals('txt', $file->getClientExtension());
-		$this->assertEquals('text/plain', $file->getClientMimeType());
-		$this->assertEquals(124, $file->getSize());
-
-		$file = array_pop($files);
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('fileB.txt', $file->getName());
-		$this->assertEquals('fileB.txt', $file->getClientName());
-		$this->assertEquals('/tmp/fileB.txt', $file->getTempName());
-		$this->assertEquals('txt', $file->getClientExtension());
-		$this->assertEquals('text/csv', $file->getClientMimeType());
-		$this->assertEquals(248, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExtensionGuessing()
-	{
-		$_FILES = [
-			'userfile1' => [
-				'name'     => 'fileA.txt',
-				'type'     => 'text/plain',
-				'size'     => 4,
-				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileA.txt',
-				'error'    => 0,
-			],
-			'userfile2' => [
-				'name'     => 'fileB.txt',
-				'type'     => 'text/csv',
-				'size'     => 9,
-				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileB.txt',
-				'error'    => 0,
-			],
-			'userfile3' => [
-				'name'     => 'fileC.csv',
-				'type'     => 'text/csv',
-				'size'     => 16,
-				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileC.csv',
-				'error'    => 0,
-			],
-			'userfile4' => [
-				'name'     => 'fileD.zip',
-				'type'     => 'application/zip',
-				'size'     => 441,
-				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileD.zip',
-				'error'    => 0,
-			],
-			'userfile5' => [
-				'name'     => 'fileE.zip.rar',
-				'type'     => 'application/rar',
-				'size'     => 441,
-				'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileE.zip.rar',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		// proposed extension matches finfo_open mime type (text/plain)
-		$file = $collection->getFile('userfile1');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertEquals('txt', $file->getExtension());
-
-		// proposed extension matches finfo_open mime type (text/plain)
-		$file = $collection->getFile('userfile2');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertEquals('txt', $file->getExtension());
-		// but not client mime type
-		$this->assertEquals(null, Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
-
-		// proposed extension does not match finfo_open mime type (text/plain)
-		// but can be resolved by reverse searching
-		$file = $collection->getFile('userfile3');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertEquals('csv', $file->getExtension());
-
-		// proposed extension matches finfo_open mime type (application/zip)
-		$file = $collection->getFile('userfile4');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertEquals('zip', $file->getExtension());
-
-		// proposed extension matches client mime type, but not finfo_open mime type (application/zip)
-		// this is a zip file (userFile4) but hat been renamed to 'rar'
-		$file = $collection->getFile('userfile5');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		// getExtension falls back to clientExtension (insecure)
-		$this->assertEquals('rar', $file->getExtension());
-		$this->assertEquals('rar', Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
-		// guessExtension is secure and does not returns empty
-		$this->assertEquals('', $file->guessExtension());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group single
-	 */
-	public function testAllReturnsValidSingleFileNestedName()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'foo' => [
-						'bar' => 'fileA.txt',
-					],
-				],
-				'type'     => [
-					'foo' => [
-						'bar' => 'text/plain',
-					],
-				],
-				'size'     => [
-					'foo' => [
-						'bar' => 124,
-					],
-				],
-				'tmp_name' => [
-					'foo' => [
-						'bar' => '/tmp/fileA.txt',
-					],
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$files      = $collection->all();
-		$this->assertCount(1, $files);
-		$this->assertEquals('userfile', key($files));
-
-		$this->assertArrayHasKey('bar', $files['userfile']['foo']);
-
-		$file = $files['userfile']['foo']['bar'];
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('fileA.txt', $file->getName());
-		$this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-		$this->assertEquals('txt', $file->getClientExtension());
-		$this->assertEquals('text/plain', $file->getClientMimeType());
-		$this->assertEquals(124, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasFileWithSingleFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile'));
-		$this->assertFalse($collection->hasFile('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasFileWithMultipleFilesWithDifferentNames()
-	{
-		$_FILES = [
-			'userfile1' => [
-				'name'     => 'fileA.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-			'userfile2' => [
-				'name'     => 'fileB.txt',
-				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-		$this->assertTrue($collection->hasFile('userfile2'));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group single
-	 */
-	public function testHasFileWithSingleFileNestedName()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'foo' => [
-						'bar' => 'fileA.txt',
-					],
-				],
-				'type'     => [
-					'foo' => [
-						'bar' => 'text/plain',
-					],
-				],
-				'size'     => [
-					'foo' => [
-						'bar' => 124,
-					],
-				],
-				'tmp_name' => [
-					'foo' => [
-						'bar' => '/tmp/fileA.txt',
-					],
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile'));
-		$this->assertTrue($collection->hasFile('userfile.foo'));
-		$this->assertTrue($collection->hasFile('userfile.foo.bar'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testErrorString()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => UPLOAD_ERR_INI_SIZE,
-			],
-		];
-
-		$expected = 'The file "someFile.txt" exceeds your upload_max_filesize ini directive.';
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals($expected, $file->getErrorString());
-	}
-
-	public function testErrorStringWithUnknownError()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 123,
-			],
-		];
-
-		$expected = 'The file "someFile.txt" was not uploaded due to an unknown error.';
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals($expected, $file->getErrorString());
-	}
-
-	public function testErrorStringWithNoError()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-			],
-		];
-
-		$expected = 'The file uploaded with success.';
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals($expected, $file->getErrorString());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testError()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => UPLOAD_ERR_INI_SIZE,
-			],
-		];
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
-	}
-
-	public function testErrorWithUnknownError()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-			],
-		];
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals(0, $file->getError());
-	}
-
-	public function testErrorWithNoError()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->assertEquals(UPLOAD_ERR_OK, $file->getError());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFileReturnsValidSingleFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('someFile.txt', $file->getName());
-		$this->assertEquals(124, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFileNoExistSingleFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('fileuser');
-		$this->AssertNull($file);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFileReturnValidMultipleFiles()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'fileA.txt',
-					'fileB.txt',
-				],
-				'type'     => [
-					'text/plain',
-					'text/csv',
-				],
-				'size'     => [
-					'124',
-					'248',
-				],
-				'tmp_name' => [
-					'/tmp/fileA.txt',
-					'/tmp/fileB.txt',
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$file1 = $collection->getFile('userfile.0');
-		$this->assertInstanceOf(UploadedFile::class, $file1);
-		$this->assertEquals('fileA.txt', $file1->getName());
-		$this->assertEquals('/tmp/fileA.txt', $file1->getTempName());
-		$this->assertEquals('txt', $file1->getClientExtension());
-		$this->assertEquals('text/plain', $file1->getClientMimeType());
-		$this->assertEquals(124, $file1->getSize());
-
-		$file2 = $collection->getFile('userfile.1');
-		$this->assertInstanceOf(UploadedFile::class, $file2);
-		$this->assertEquals('fileB.txt', $file2->getName());
-		$this->assertEquals('/tmp/fileB.txt', $file2->getTempName());
-		$this->assertEquals('txt', $file2->getClientExtension());
-		$this->assertEquals('text/csv', $file2->getClientMimeType());
-		$this->assertEquals(248, $file2->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFileWithMultipleFilesNestedName()
-	{
-		$_FILES = [
-			'my-form' => [
-				'name'     => [
-					'details' => [
-						'avatars' => [
-							'fileA.txt',
-							'fileB.txt',
-						],
-					],
-				],
-				'type'     => [
-					'details' => [
-						'avatars' => [
-							'text/plain',
-							'text/plain',
-						],
-					],
-				],
-				'size'     => [
-					'details' => [
-						'avatars' => [
-							125,
-							243,
-						],
-					],
-				],
-				'tmp_name' => [
-					'details' => [
-						'avatars' => [
-							'/tmp/fileA.txt',
-							'/tmp/fileB.txt',
-						],
-					],
-				],
-				'error'    => [
-					'details' => [
-						'avatars' => [
-							0,
-							0,
-						],
-					],
-				],
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$file1 = $collection->getFile('my-form.details.avatars.0');
-		$this->assertInstanceOf(UploadedFile::class, $file1);
-		$this->assertEquals('fileA.txt', $file1->getName());
-		$this->assertEquals('/tmp/fileA.txt', $file1->getTempName());
-		$this->assertEquals('txt', $file1->getClientExtension());
-		$this->assertEquals('text/plain', $file1->getClientMimeType());
-		$this->assertEquals(125, $file1->getSize());
-
-		$file2 = $collection->getFile('my-form.details.avatars.1');
-		$this->assertInstanceOf(UploadedFile::class, $file2);
-		$this->assertEquals('fileB.txt', $file2->getName());
-		$this->assertEquals('/tmp/fileB.txt', $file2->getTempName());
-		$this->assertEquals('txt', $file2->getClientExtension());
-		$this->assertEquals('text/plain', $file2->getClientMimeType());
-		$this->assertEquals(243, $file2->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDoesntHaveFile()
-	{
-		$_FILES = [
-			'my-form' => [
-				'name'     => [
-					'details' => [
-						'avatars' => [
-							'fileA.txt',
-							'fileB.txt',
-						],
-					],
-				],
-				'type'     => [
-					'details' => [
-						'avatars' => [
-							'text/plain',
-							'text/plain',
-						],
-					],
-				],
-				'size'     => [
-					'details' => [
-						'avatars' => [
-							125,
-							243,
-						],
-					],
-				],
-				'tmp_name' => [
-					'details' => [
-						'avatars' => [
-							'/tmp/fileA.txt',
-							'/tmp/fileB.txt',
-						],
-					],
-				],
-				'error'    => [
-					'details' => [
-						'avatars' => [
-							0,
-							0,
-						],
-					],
-				],
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertFalse($collection->hasFile('my-form.detailz.avatars.0'));
-		$this->assertNull($collection->getFile('my-form.detailz.avatars.0'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultipleHasNoFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'fileA.txt',
-					'fileB.txt',
-				],
-				'type'     => [
-					'text/plain',
-					'text/csv',
-				],
-				'size'     => [
-					'124',
-					'248',
-				],
-				'tmp_name' => [
-					'/tmp/fileA.txt',
-					'/tmp/fileB.txt',
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$files = $collection->getFileMultiple('userfiletest');
-
-		$this->assertNull( $files);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultipleReturnValidDotNotationSyntax()
-	{
-		$_FILES = [
-			'my-form' => [
-				'name'     => [
-					'details' => [
-						'avatars' => [
-							'fileA.txt',
-							'fileB.txt',
-						],
-					],
-				],
-				'type'     => [
-					'details' => [
-						'avatars' => [
-							'text/plain',
-							'text/plain',
-						],
-					],
-				],
-				'size'     => [
-					'details' => [
-						'avatars' => [
-							125,
-							243,
-						],
-					],
-				],
-				'tmp_name' => [
-					'details' => [
-						'avatars' => [
-							'/tmp/fileA.txt',
-							'/tmp/fileB.txt',
-						],
-					],
-				],
-				'error'    => [
-					'details' => [
-						'avatars' => [
-							0,
-							0,
-						],
-					],
-				],
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$files = $collection->getFileMultiple('my-form.details.avatars');
-		$this->assertIsArray( $files);
-		$this->assertCount(2, $files);
-
-		$this->assertInstanceOf(UploadedFile::class, $files[0]);
-		$this->assertEquals('fileA.txt', $files[0]->getName());
-		$this->assertEquals('/tmp/fileA.txt', $files[0]->getTempName());
-		$this->assertEquals('txt', $files[0]->getClientExtension());
-		$this->assertEquals('text/plain', $files[0]->getClientMimeType());
-		$this->assertEquals(125, $files[0]->getSize());
-
-		$this->assertInstanceOf(UploadedFile::class, $files[1]);
-		$this->assertEquals('fileB.txt', $files[1]->getName());
-		$this->assertEquals('/tmp/fileB.txt', $files[1]->getTempName());
-		$this->assertEquals('txt', $files[1]->getClientExtension());
-		$this->assertEquals('text/plain', $files[1]->getClientMimeType());
-		$this->assertEquals(243, $files[1]->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultipleReturnInvalidDotNotationSyntax()
-	{
-		$_FILES = [
-			'my-form' => [
-				'name'     => [
-					'details' => [
-						'avatars' => 'fileA.txt',
-					],
-				],
-				'type'     => [
-					'details' => [
-						'avatars' => 'text/plain',
-					],
-				],
-				'size'     => [
-					'details' => [
-						'avatars' => 243,
-					],
-				],
-				'tmp_name' => [
-					'details' => [
-						'avatars' => '/tmp/fileA.txt',
-					],
-				],
-				'error'    => [
-					'details' => [
-						'avatars' => 0,
-					],
-				],
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$files = $collection->getFileMultiple('my-form.details.avatars');
-		$this->assertNull( $files);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultipleReturnValidMultipleFiles()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'fileA.txt',
-					'fileB.txt',
-				],
-				'type'     => [
-					'text/plain',
-					'text/csv',
-				],
-				'size'     => [
-					'124',
-					'248',
-				],
-				'tmp_name' => [
-					'/tmp/fileA.txt',
-					'/tmp/fileB.txt',
-				],
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$files = $collection->getFileMultiple('userfile');
-		$this->assertCount(2, $files);
-		$this->assertIsArray( $files);
-
-		$this->assertInstanceOf(UploadedFile::class, $files[0]);
-		$this->assertEquals(124, $files[0]->getSize());
-		$this->assertEquals('fileA.txt', $files[0]->getName());
-		$this->assertEquals('/tmp/fileA.txt', $files[0]->getTempName());
-		$this->assertEquals('txt', $files[0]->getClientExtension());
-		$this->assertEquals('text/plain', $files[0]->getClientMimeType());
-
-		$this->assertInstanceOf(UploadedFile::class, $files[1]);
-		$this->assertEquals(248, $files[1]->getSize());
-		$this->assertEquals('fileB.txt', $files[1]->getName());
-		$this->assertEquals('/tmp/fileB.txt', $files[1]->getTempName());
-		$this->assertEquals('txt', $files[1]->getClientExtension());
-		$this->assertEquals('text/csv', $files[1]->getClientMimeType());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultipleReturnInvalidSingleFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'fileA.txt',
-				'type'     => 'text/csv',
-				'size'     => '248',
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$files = $collection->getFileMultiple('userfile');
-		$this->assertNull( $files);
-	}
-
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $_FILES = [];
+    }
+
+    public function testAllReturnsArrayWithNoFiles()
+    {
+        $files = new FileCollection();
+
+        $this->assertSame([], $files->all());
+    }
+
+    public function testAllReturnsValidSingleFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $files      = $collection->all();
+        $this->assertCount(1, $files);
+
+        $file = array_shift($files);
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
+    }
+
+    public function testAllReturnsValidMultipleFilesSameName()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'fileA.txt',
+                    'fileB.txt',
+                ],
+                'type' => [
+                    'text/plain',
+                    'text/csv',
+                ],
+                'size' => [
+                    '124',
+                    '248',
+                ],
+                'tmp_name' => [
+                    '/tmp/fileA.txt',
+                    '/tmp/fileB.txt',
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $files      = $collection->all();
+        $this->assertCount(1, $files);
+        $this->assertSame('userfile', key($files));
+
+        $files = array_shift($files);
+        $this->assertCount(2, $files);
+
+        $file = $files[0];
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
+    }
+
+    public function testAllReturnsValidMultipleFilesDifferentName()
+    {
+        $_FILES = [
+            'userfile1' => [
+                'name'     => 'fileA.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+            'userfile2' => [
+                'name'     => 'fileB.txt',
+                'type'     => 'text/csv',
+                'size'     => 248,
+                'tmp_name' => '/tmp/fileB.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $files      = $collection->all();
+        $this->assertCount(2, $files);
+        $this->assertSame('userfile1', key($files));
+
+        $file = array_shift($files);
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('fileA.txt', $file->getClientName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
+
+        $file = array_pop($files);
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('fileB.txt', $file->getName());
+        $this->assertSame('fileB.txt', $file->getClientName());
+        $this->assertSame('/tmp/fileB.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/csv', $file->getClientMimeType());
+        $this->assertSame(248, $file->getSize());
+    }
+
+    public function testExtensionGuessing()
+    {
+        $_FILES = [
+            'userfile1' => [
+                'name'     => 'fileA.txt',
+                'type'     => 'text/plain',
+                'size'     => 4,
+                'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+            'userfile2' => [
+                'name'     => 'fileB.txt',
+                'type'     => 'text/csv',
+                'size'     => 9,
+                'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileB.txt',
+                'error'    => 0,
+            ],
+            'userfile3' => [
+                'name'     => 'fileC.csv',
+                'type'     => 'text/csv',
+                'size'     => 16,
+                'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileC.csv',
+                'error'    => 0,
+            ],
+            'userfile4' => [
+                'name'     => 'fileD.zip',
+                'type'     => 'application/zip',
+                'size'     => 441,
+                'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileD.zip',
+                'error'    => 0,
+            ],
+            'userfile5' => [
+                'name'     => 'fileE.zip.rar',
+                'type'     => 'application/rar',
+                'size'     => 441,
+                'tmp_name' => SUPPORTPATH . 'HTTP/Files/tmp/fileE.zip.rar',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        // proposed extension matches finfo_open mime type (text/plain)
+        $file = $collection->getFile('userfile1');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $this->assertSame('txt', $file->getExtension());
+
+        // proposed extension matches finfo_open mime type (text/plain)
+        $file = $collection->getFile('userfile2');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $this->assertSame('txt', $file->getExtension());
+        // but not client mime type
+        $this->assertNull(Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
+
+        // proposed extension does not match finfo_open mime type (text/plain)
+        // but can be resolved by reverse searching
+        $file = $collection->getFile('userfile3');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $this->assertSame('csv', $file->getExtension());
+
+        // proposed extension matches finfo_open mime type (application/zip)
+        $file = $collection->getFile('userfile4');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $this->assertSame('zip', $file->getExtension());
+
+        // proposed extension matches client mime type, but not finfo_open mime type (application/zip)
+        // this is a zip file (userFile4) but hat been renamed to 'rar'
+        $file = $collection->getFile('userfile5');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        // getExtension falls back to clientExtension (insecure)
+        $this->assertSame('rar', $file->getExtension());
+        $this->assertSame('rar', Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
+        // guessExtension is secure and does not returns empty
+        $this->assertSame('', $file->guessExtension());
+    }
+
+    /**
+     * @group single
+     */
+    public function testAllReturnsValidSingleFileNestedName()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'foo' => [
+                        'bar' => 'fileA.txt',
+                    ],
+                ],
+                'type' => [
+                    'foo' => [
+                        'bar' => 'text/plain',
+                    ],
+                ],
+                'size' => [
+                    'foo' => [
+                        'bar' => 124,
+                    ],
+                ],
+                'tmp_name' => [
+                    'foo' => [
+                        'bar' => '/tmp/fileA.txt',
+                    ],
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $files      = $collection->all();
+        $this->assertCount(1, $files);
+        $this->assertSame('userfile', key($files));
+
+        $this->assertArrayHasKey('bar', $files['userfile']['foo']);
+
+        $file = $files['userfile']['foo']['bar'];
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
+    }
+
+    public function testHasFileWithSingleFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile'));
+        $this->assertFalse($collection->hasFile('foo'));
+    }
+
+    public function testHasFileWithMultipleFilesWithDifferentNames()
+    {
+        $_FILES = [
+            'userfile1' => [
+                'name'     => 'fileA.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+            'userfile2' => [
+                'name'     => 'fileB.txt',
+                'type'     => 'text/csv',
+                'size'     => 248,
+                'tmp_name' => '/tmp/fileB.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+        $this->assertTrue($collection->hasFile('userfile2'));
+    }
+
+    /**
+     * @group single
+     */
+    public function testHasFileWithSingleFileNestedName()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'foo' => [
+                        'bar' => 'fileA.txt',
+                    ],
+                ],
+                'type' => [
+                    'foo' => [
+                        'bar' => 'text/plain',
+                    ],
+                ],
+                'size' => [
+                    'foo' => [
+                        'bar' => 124,
+                    ],
+                ],
+                'tmp_name' => [
+                    'foo' => [
+                        'bar' => '/tmp/fileA.txt',
+                    ],
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile'));
+        $this->assertTrue($collection->hasFile('userfile.foo'));
+        $this->assertTrue($collection->hasFile('userfile.foo.bar'));
+    }
+
+    public function testErrorString()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => UPLOAD_ERR_INI_SIZE,
+            ],
+        ];
+
+        $expected = 'The file "someFile.txt" exceeds your upload_max_filesize ini directive.';
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame($expected, $file->getErrorString());
+    }
+
+    public function testErrorStringWithUnknownError()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 123,
+            ],
+        ];
+
+        $expected = 'The file "someFile.txt" was not uploaded due to an unknown error.';
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame($expected, $file->getErrorString());
+    }
+
+    public function testErrorStringWithNoError()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+            ],
+        ];
+
+        $expected = 'The file uploaded with success.';
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame($expected, $file->getErrorString());
+    }
+
+    public function testError()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => UPLOAD_ERR_INI_SIZE,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame(UPLOAD_ERR_INI_SIZE, $file->getError());
+    }
+
+    public function testErrorWithUnknownError()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame(0, $file->getError());
+    }
+
+    public function testErrorWithNoError()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->assertSame(UPLOAD_ERR_OK, $file->getError());
+    }
+
+    public function testFileReturnsValidSingleFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
+    }
+
+    public function testFileNoExistSingleFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('fileuser');
+        $this->AssertNull($file);
+    }
+
+    public function testFileReturnValidMultipleFiles()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'fileA.txt',
+                    'fileB.txt',
+                ],
+                'type' => [
+                    'text/plain',
+                    'text/csv',
+                ],
+                'size' => [
+                    '124',
+                    '248',
+                ],
+                'tmp_name' => [
+                    '/tmp/fileA.txt',
+                    '/tmp/fileB.txt',
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $file1 = $collection->getFile('userfile.0');
+        $this->assertInstanceOf(UploadedFile::class, $file1);
+        $this->assertSame('fileA.txt', $file1->getName());
+        $this->assertSame('/tmp/fileA.txt', $file1->getTempName());
+        $this->assertSame('txt', $file1->getClientExtension());
+        $this->assertSame('text/plain', $file1->getClientMimeType());
+        $this->assertSame(124, $file1->getSize());
+
+        $file2 = $collection->getFile('userfile.1');
+        $this->assertInstanceOf(UploadedFile::class, $file2);
+        $this->assertSame('fileB.txt', $file2->getName());
+        $this->assertSame('/tmp/fileB.txt', $file2->getTempName());
+        $this->assertSame('txt', $file2->getClientExtension());
+        $this->assertSame('text/csv', $file2->getClientMimeType());
+        $this->assertSame(248, $file2->getSize());
+    }
+
+    public function testFileWithMultipleFilesNestedName()
+    {
+        $_FILES = [
+            'my-form' => [
+                'name' => [
+                    'details' => [
+                        'avatars' => [
+                            'fileA.txt',
+                            'fileB.txt',
+                        ],
+                    ],
+                ],
+                'type' => [
+                    'details' => [
+                        'avatars' => [
+                            'text/plain',
+                            'text/plain',
+                        ],
+                    ],
+                ],
+                'size' => [
+                    'details' => [
+                        'avatars' => [
+                            125,
+                            243,
+                        ],
+                    ],
+                ],
+                'tmp_name' => [
+                    'details' => [
+                        'avatars' => [
+                            '/tmp/fileA.txt',
+                            '/tmp/fileB.txt',
+                        ],
+                    ],
+                ],
+                'error' => [
+                    'details' => [
+                        'avatars' => [
+                            0,
+                            0,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $file1 = $collection->getFile('my-form.details.avatars.0');
+        $this->assertInstanceOf(UploadedFile::class, $file1);
+        $this->assertSame('fileA.txt', $file1->getName());
+        $this->assertSame('/tmp/fileA.txt', $file1->getTempName());
+        $this->assertSame('txt', $file1->getClientExtension());
+        $this->assertSame('text/plain', $file1->getClientMimeType());
+        $this->assertSame(125, $file1->getSize());
+
+        $file2 = $collection->getFile('my-form.details.avatars.1');
+        $this->assertInstanceOf(UploadedFile::class, $file2);
+        $this->assertSame('fileB.txt', $file2->getName());
+        $this->assertSame('/tmp/fileB.txt', $file2->getTempName());
+        $this->assertSame('txt', $file2->getClientExtension());
+        $this->assertSame('text/plain', $file2->getClientMimeType());
+        $this->assertSame(243, $file2->getSize());
+    }
+
+    public function testDoesntHaveFile()
+    {
+        $_FILES = [
+            'my-form' => [
+                'name' => [
+                    'details' => [
+                        'avatars' => [
+                            'fileA.txt',
+                            'fileB.txt',
+                        ],
+                    ],
+                ],
+                'type' => [
+                    'details' => [
+                        'avatars' => [
+                            'text/plain',
+                            'text/plain',
+                        ],
+                    ],
+                ],
+                'size' => [
+                    'details' => [
+                        'avatars' => [
+                            125,
+                            243,
+                        ],
+                    ],
+                ],
+                'tmp_name' => [
+                    'details' => [
+                        'avatars' => [
+                            '/tmp/fileA.txt',
+                            '/tmp/fileB.txt',
+                        ],
+                    ],
+                ],
+                'error' => [
+                    'details' => [
+                        'avatars' => [
+                            0,
+                            0,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertFalse($collection->hasFile('my-form.detailz.avatars.0'));
+        $this->assertNull($collection->getFile('my-form.detailz.avatars.0'));
+    }
+
+    public function testGetFileMultipleHasNoFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'fileA.txt',
+                    'fileB.txt',
+                ],
+                'type' => [
+                    'text/plain',
+                    'text/csv',
+                ],
+                'size' => [
+                    '124',
+                    '248',
+                ],
+                'tmp_name' => [
+                    '/tmp/fileA.txt',
+                    '/tmp/fileB.txt',
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $files = $collection->getFileMultiple('userfiletest');
+
+        $this->assertNull($files);
+    }
+
+    public function testGetFileMultipleReturnValidDotNotationSyntax()
+    {
+        $_FILES = [
+            'my-form' => [
+                'name' => [
+                    'details' => [
+                        'avatars' => [
+                            'fileA.txt',
+                            'fileB.txt',
+                        ],
+                    ],
+                ],
+                'type' => [
+                    'details' => [
+                        'avatars' => [
+                            'text/plain',
+                            'text/plain',
+                        ],
+                    ],
+                ],
+                'size' => [
+                    'details' => [
+                        'avatars' => [
+                            125,
+                            243,
+                        ],
+                    ],
+                ],
+                'tmp_name' => [
+                    'details' => [
+                        'avatars' => [
+                            '/tmp/fileA.txt',
+                            '/tmp/fileB.txt',
+                        ],
+                    ],
+                ],
+                'error' => [
+                    'details' => [
+                        'avatars' => [
+                            0,
+                            0,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $files = $collection->getFileMultiple('my-form.details.avatars');
+        $this->assertIsArray($files);
+        $this->assertCount(2, $files);
+
+        $this->assertInstanceOf(UploadedFile::class, $files[0]);
+        $this->assertSame('fileA.txt', $files[0]->getName());
+        $this->assertSame('/tmp/fileA.txt', $files[0]->getTempName());
+        $this->assertSame('txt', $files[0]->getClientExtension());
+        $this->assertSame('text/plain', $files[0]->getClientMimeType());
+        $this->assertSame(125, $files[0]->getSize());
+
+        $this->assertInstanceOf(UploadedFile::class, $files[1]);
+        $this->assertSame('fileB.txt', $files[1]->getName());
+        $this->assertSame('/tmp/fileB.txt', $files[1]->getTempName());
+        $this->assertSame('txt', $files[1]->getClientExtension());
+        $this->assertSame('text/plain', $files[1]->getClientMimeType());
+        $this->assertSame(243, $files[1]->getSize());
+    }
+
+    public function testGetFileMultipleReturnInvalidDotNotationSyntax()
+    {
+        $_FILES = [
+            'my-form' => [
+                'name' => [
+                    'details' => [
+                        'avatars' => 'fileA.txt',
+                    ],
+                ],
+                'type' => [
+                    'details' => [
+                        'avatars' => 'text/plain',
+                    ],
+                ],
+                'size' => [
+                    'details' => [
+                        'avatars' => 243,
+                    ],
+                ],
+                'tmp_name' => [
+                    'details' => [
+                        'avatars' => '/tmp/fileA.txt',
+                    ],
+                ],
+                'error' => [
+                    'details' => [
+                        'avatars' => 0,
+                    ],
+                ],
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $files = $collection->getFileMultiple('my-form.details.avatars');
+        $this->assertNull($files);
+    }
+
+    public function testGetFileMultipleReturnValidMultipleFiles()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'fileA.txt',
+                    'fileB.txt',
+                ],
+                'type' => [
+                    'text/plain',
+                    'text/csv',
+                ],
+                'size' => [
+                    '124',
+                    '248',
+                ],
+                'tmp_name' => [
+                    '/tmp/fileA.txt',
+                    '/tmp/fileB.txt',
+                ],
+                'error' => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $files = $collection->getFileMultiple('userfile');
+        $this->assertCount(2, $files);
+        $this->assertIsArray($files);
+
+        $this->assertInstanceOf(UploadedFile::class, $files[0]);
+        $this->assertSame(124, $files[0]->getSize());
+        $this->assertSame('fileA.txt', $files[0]->getName());
+        $this->assertSame('/tmp/fileA.txt', $files[0]->getTempName());
+        $this->assertSame('txt', $files[0]->getClientExtension());
+        $this->assertSame('text/plain', $files[0]->getClientMimeType());
+
+        $this->assertInstanceOf(UploadedFile::class, $files[1]);
+        $this->assertSame(248, $files[1]->getSize());
+        $this->assertSame('fileB.txt', $files[1]->getName());
+        $this->assertSame('/tmp/fileB.txt', $files[1]->getTempName());
+        $this->assertSame('txt', $files[1]->getClientExtension());
+        $this->assertSame('text/csv', $files[1]->getClientMimeType());
+    }
+
+    public function testGetFileMultipleReturnInvalidSingleFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'fileA.txt',
+                'type'     => 'text/csv',
+                'size'     => '248',
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $files = $collection->getFileMultiple('userfile');
+        $this->assertNull($files);
+    }
 }
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 217e398b231d..9797ca46c301 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -1,289 +1,292 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP\Files;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class FileMovingTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileMovingTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->root = vfsStream::setup();
-		$this->path = '_support/Files/';
-		vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
-		$this->start = $this->root->url() . '/';
-
-		$this->destination = $this->start . 'destination';
-		if (is_dir($this->destination))
-		{
-			rmdir($this->destination);
-		}
-
-		$_FILES = [];
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-		$this->root = null;
-
-		// cleanup folder being left behind (why?)
-		$leftover = WRITEPATH . 'uploads/vfs:';
-		if (is_dir($leftover))
-		{
-			rrmdir($leftover);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMove()
-	{
-		$finalFilename = 'fileA';
-
-		$_FILES = [
-			'userfile1' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-			'userfile2' => [
-				'name'     => 'fileA.txt',
-				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-		$this->assertTrue($collection->hasFile('userfile2'));
-
-		$destination = $this->destination;
-
-		// Create the destination if not exists
-		is_dir($destination) || mkdir($destination, 0777, true);
-
-		foreach ($collection->all() as $file)
-		{
-			$this->assertInstanceOf(UploadedFile::class, $file);
-			$file->move($destination, $file->getName(), false);
-		}
-
-		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
-		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMoveOverwriting()
-	{
-		$finalFilename = 'file_with_delimiters_underscore';
-
-		$_FILES = [
-			'userfile1' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-			'userfile2' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/tmp/fileB.txt',
-				'error'    => 0,
-			],
-			'userfile3' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/csv',
-				'size'     => 248,
-				'tmp_name' => '/tmp/fileC.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-		$this->assertTrue($collection->hasFile('userfile2'));
-		$this->assertTrue($collection->hasFile('userfile3'));
-
-		$destination = $this->destination;
-
-		// Create the destination if not exists
-		is_dir($destination) || mkdir($destination, 0777, true);
-
-		foreach ($collection->all() as $file)
-		{
-			$this->assertInstanceOf(UploadedFile::class, $file);
-			$file->move($destination, $file->getName(), true);
-		}
-
-		$this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
-		$this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
-		$this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_2.txt'));
-		$this->assertFileExists($destination . '/' . $finalFilename . '.txt');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMoved()
-	{
-		$finalFilename = 'fileA';
-
-		$_FILES = [
-			'userfile1' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-
-		$destination = $this->destination;
-
-		// Create the destination if not exists
-		is_dir($destination) || mkdir($destination, 0777, true);
-
-		$file = $collection->getFile('userfile1');
-
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$this->assertFalse($file->hasMoved());
-		$file->move($destination, $file->getName(), false);
-		$this->assertTrue($file->hasMoved());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testStore()
-	{
-		$finalFilename = 'fileA';
-
-		$_FILES = [
-			'userfile1' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-
-		$destination = $this->destination;
-
-		// Create the destination if not exists
-		is_dir($destination) || mkdir($destination, 0777, true);
-
-		$file = $collection->getFile('userfile1');
-
-		$this->assertInstanceOf(UploadedFile::class, $file);
-		$path = $file->store($destination, $file->getName());
-		$this->assertEquals($destination . '/fileA.txt', $path);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAlreadyMoved()
-	{
-		$finalFilename = 'fileA';
-
-		$_FILES = [
-			'userfile1' => [
-				'name'     => $finalFilename . '.txt',
-				'type'     => 'text/plain',
-				'size'     => 124,
-				'tmp_name' => '/tmp/fileA.txt',
-				'error'    => 0,
-			],
-		];
-
-		$collection = new FileCollection();
-
-		$this->assertTrue($collection->hasFile('userfile1'));
-
-		$destination = $this->destination;
-
-		// Create the destination if not exists
-		is_dir($destination) || mkdir($destination, 0777, true);
-
-		$this->expectException(HTTPException::class);
-
-		foreach ($collection->all() as $file)
-		{
-			$file->move($destination, $file->getName(), false);
-			$file->move($destination, $file->getName(), false);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testInvalidFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => UPLOAD_ERR_INI_SIZE,
-			],
-		];
-
-		$destination = $this->destination;
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->expectException(HTTPException::class);
-		$file->move($destination, $file->getName(), false);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFailedMove()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$destination = $this->destination;
-
-		// Create the destination and make it read only
-		is_dir($destination) || mkdir($destination, 0400, true);
-
-		$collection = new FileCollection();
-		$file       = $collection->getFile('userfile');
-
-		$this->expectException(HTTPException::class);
-		$file->move($destination, $file->getName(), false);
-	}
-
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->root = vfsStream::setup();
+        $this->path = '_support/Files/';
+        vfsStream::copyFromFileSystem(TESTPATH . $this->path, $this->root);
+        $this->start = $this->root->url() . '/';
+
+        $this->destination = $this->start . 'destination';
+        if (is_dir($this->destination)) {
+            rmdir($this->destination);
+        }
+
+        $_FILES = [];
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->root = null;
+
+        // cleanup folder being left behind (why?)
+        $leftover = WRITEPATH . 'uploads/vfs:';
+        if (is_dir($leftover)) {
+            rrmdir($leftover);
+        }
+    }
+
+    public function testMove()
+    {
+        $finalFilename = 'fileA';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+            'userfile2' => [
+                'name'     => 'fileA.txt',
+                'type'     => 'text/csv',
+                'size'     => 248,
+                'tmp_name' => '/tmp/fileB.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+        $this->assertTrue($collection->hasFile('userfile2'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        foreach ($collection->all() as $file) {
+            $this->assertInstanceOf(UploadedFile::class, $file);
+            $file->move($destination, $file->getName(), false);
+        }
+
+        $this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
+        $this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
+    }
+
+    public function testMoveOverwriting()
+    {
+        $finalFilename = 'file_with_delimiters_underscore';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+            'userfile2' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/csv',
+                'size'     => 248,
+                'tmp_name' => '/tmp/fileB.txt',
+                'error'    => 0,
+            ],
+            'userfile3' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/csv',
+                'size'     => 248,
+                'tmp_name' => '/tmp/fileC.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+        $this->assertTrue($collection->hasFile('userfile2'));
+        $this->assertTrue($collection->hasFile('userfile3'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        foreach ($collection->all() as $file) {
+            $this->assertInstanceOf(UploadedFile::class, $file);
+            $file->move($destination, $file->getName(), true);
+        }
+
+        $this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '.txt'));
+        $this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
+        $this->assertFalse($this->root->hasChild('destination/' . $finalFilename . '_2.txt'));
+        $this->assertFileExists($destination . '/' . $finalFilename . '.txt');
+    }
+
+    public function testMoved()
+    {
+        $finalFilename = 'fileA';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        $file = $collection->getFile('userfile1');
+
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $this->assertFalse($file->hasMoved());
+        $file->move($destination, $file->getName(), false);
+        $this->assertTrue($file->hasMoved());
+    }
+
+    public function testStore()
+    {
+        $finalFilename = 'fileA';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        $file = $collection->getFile('userfile1');
+
+        $this->assertInstanceOf(UploadedFile::class, $file);
+        $path = $file->store($destination, $file->getName());
+        $this->assertSame($destination . '/fileA.txt', $path);
+    }
+
+    public function testAlreadyMoved()
+    {
+        $finalFilename = 'fileA';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        $this->expectException(HTTPException::class);
+
+        foreach ($collection->all() as $file) {
+            $file->move($destination, $file->getName(), false);
+            $file->move($destination, $file->getName(), false);
+        }
+    }
+
+    public function testInvalidFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => UPLOAD_ERR_INI_SIZE,
+            ],
+        ];
+
+        $destination = $this->destination;
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->expectException(HTTPException::class);
+        $file->move($destination, $file->getName(), false);
+    }
+
+    public function testFailedMove()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $destination = $this->destination;
+
+        // Create the destination and make it read only
+        if (! is_dir($destination)) {
+            mkdir($destination, 0400, true);
+        }
+
+        $collection = new FileCollection();
+        $file       = $collection->getFile('userfile');
+
+        $this->expectException(HTTPException::class);
+        $file->move($destination, $file->getName(), false);
+    }
 }
 
 /*
@@ -295,11 +298,11 @@ public function testFailedMove()
 
 function is_uploaded_file($filename)
 {
-	if (! file_exists($filename))
-	{
-		file_put_contents($filename, 'data');
-	}
-	return file_exists($filename);
+    if (! file_exists($filename)) {
+        file_put_contents($filename, 'data');
+    }
+
+    return file_exists($filename);
 }
 
 /*
@@ -310,28 +313,26 @@ function is_uploaded_file($filename)
 
 function move_uploaded_file($filename, $destination)
 {
-	copy($filename, $destination);
-	unlink($filename);
+    copy($filename, $destination);
+    unlink($filename);
 }
 
 function rrmdir($src)
 {
-	$dir = opendir($src);
-	while (false !== ( $file = readdir($dir)))
-	{
-		if (( $file !== '.' ) && ( $file !== '..' ))
-		{
-			$full = $src . '/' . $file;
-			if (is_dir($full))
-			{
-				rrmdir($full);
-			}
-			else
-			{
-				unlink($full);
-			}
-		}
-	}
-	closedir($dir);
-	rmdir($src);
+    $dir = opendir($src);
+
+    while (false !== $file = readdir($dir)) {
+        if (($file !== '.') && ($file !== '..')) {
+            $full = $src . '/' . $file;
+
+            if (is_dir($full)) {
+                rrmdir($full);
+            } else {
+                unlink($full);
+            }
+        }
+    }
+
+    closedir($dir);
+    rmdir($src);
 }
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 291b645b6a82..3b02009235e4 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -1,212 +1,209 @@
-<?php namespace CodeIgniter\HTTP;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use stdClass;
 
-class HeaderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HeaderTest extends CIUnitTestCase
 {
-	public function testHeaderStoresBasics()
-	{
-		$name  = 'foo';
-		$value = 'bar';
-
-		$header = new Header($name, $value);
-
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($value, $header->getValue());
-	}
-
-	public function testHeaderStoresBasicsWithNull()
-	{
-		$name  = 'foo';
-		$value = null;
-
-		$header = new Header($name, $value);
-
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals('', $header->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHeaderStoresArrayValues()
-	{
-		$name  = 'foo';
-		$value = [
-			'bar',
-			'baz',
-		];
-
-		$header = new Header($name, $value);
-
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($value, $header->getValue());
-	}
+    public function testHeaderStoresBasics()
+    {
+        $name  = 'foo';
+        $value = 'bar';
+
+        $header = new Header($name, $value);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
+    }
+
+    public function testHeaderStoresBasicsWithNull()
+    {
+        $name  = 'foo';
+        $value = null;
 
-	public function testHeaderSetters()
-	{
-		$name  = 'foo';
-		$value = [
-			'bar',
-			'baz',
-		];
+        $header = new Header($name, $value);
 
-				$header = new Header($name);
-				$this->assertEquals($name, $header->getName());
-				$this->assertEquals(null, $header->getValue());
-				$this->assertEquals($name . ': ', (string) $header);
+        $this->assertSame($name, $header->getName());
+        $this->assertSame('', $header->getValue());
+    }
 
-				$name = 'foo2';
-		$header->setName($name)->setValue($value);
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($value, $header->getValue());
-				$this->assertEquals($name . ': bar, baz', (string) $header);
-	}
+    public function testHeaderStoresArrayValues()
+    {
+        $name  = 'foo';
+        $value = [
+            'bar',
+            'baz',
+        ];
 
-	//--------------------------------------------------------------------
+        $header = new Header($name, $value);
 
-	public function testHeaderAppendsValueSkippedForNull()
-	{
-		$name     = 'foo';
-		$value    = 'bar';
-		$expected = 'bar';
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
+    }
 
-		$header = new Header($name, $value);
+    public function testHeaderSetters()
+    {
+        $name  = 'foo';
+        $value = [
+            'bar',
+            'baz',
+        ];
 
-		$header->appendValue(null);
+        $header = new Header($name);
+        $this->assertSame($name, $header->getName());
+        $this->assertEmpty($header->getValue());
+        $this->assertSame($name . ': ', (string) $header);
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValue());
-	}
+        $name = 'foo2';
+        $header->setName($name)->setValue($value);
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
+        $this->assertSame($name . ': bar, baz', (string) $header);
+    }
 
-	public function testHeaderConvertsSingleToArray()
-	{
-		$name  = 'foo';
-		$value = 'bar';
+    public function testHeaderAppendsValueSkippedForNull()
+    {
+        $name     = 'foo';
+        $value    = 'bar';
+        $expected = 'bar';
 
-		$expected = [
-			'bar',
-			'baz',
-		];
+        $header = new Header($name, $value);
 
-		$header = new Header($name, $value);
+        $header->appendValue(null);
 
-		$header->appendValue('baz');
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
+    }
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValue());
-	}
+    public function testHeaderConvertsSingleToArray()
+    {
+        $name  = 'foo';
+        $value = 'bar';
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'bar',
+            'baz',
+        ];
 
-	public function testHeaderPrependsValueSkippedForNull()
-	{
-		$name     = 'foo';
-		$value    = 'bar';
-		$expected = 'bar';
+        $header = new Header($name, $value);
 
-		$header = new Header($name, $value);
+        $header->appendValue('baz');
 
-		$header->prependValue(null);
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
+    }
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValue());
-	}
+    public function testHeaderPrependsValueSkippedForNull()
+    {
+        $name     = 'foo';
+        $value    = 'bar';
+        $expected = 'bar';
 
-	public function testHeaderPrependsValue()
-	{
-		$name  = 'foo';
-		$value = 'bar';
+        $header = new Header($name, $value);
 
-		$expected = [
-			'baz',
-			'bar',
-		];
+        $header->prependValue(null);
 
-		$header = new Header($name, $value);
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
+    }
 
-		$header->prependValue('baz');
+    public function testHeaderPrependsValue()
+    {
+        $name  = 'foo';
+        $value = 'bar';
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValue());
-	}
+        $expected = [
+            'baz',
+            'bar',
+        ];
 
-	//--------------------------------------------------------------------
+        $header = new Header($name, $value);
 
-	public function testHeaderLineSimple()
-	{
-		$name  = 'foo';
-		$value = [
-			'bar',
-			'baz',
-		];
+        $header->prependValue('baz');
 
-		$expected = 'bar, baz';
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
+    }
 
-		$header = new Header($name, $value);
+    public function testHeaderLineSimple()
+    {
+        $name  = 'foo';
+        $value = [
+            'bar',
+            'baz',
+        ];
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValueLine());
-	}
+        $expected = 'bar, baz';
 
-	public function testHeaderLineValueNotStringOrArray()
-	{
-		$name  = 'foo';
-		$value = new stdClass;
+        $header = new Header($name, $value);
 
-		$expected = '';
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
+    }
 
-		$header = new Header($name, $value);
+    public function testHeaderLineValueNotStringOrArray()
+    {
+        $name  = 'foo';
+        $value = new stdClass();
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValueLine());
-	}
+        $expected = '';
 
-	//--------------------------------------------------------------------
+        $header = new Header($name, $value);
 
-	public function testHeaderSetValueWithNullWillMarkAsEmptyString()
-	{
-		$name     = 'foo';
-		$expected = '';
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
+    }
 
-		$header = new Header($name);
-		$header->setValue('bar')
-			   ->setValue(null);
+    public function testHeaderSetValueWithNullWillMarkAsEmptyString()
+    {
+        $name     = 'foo';
+        $expected = '';
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValueLine());
-	}
+        $header = new Header($name);
+        $header->setValue('bar')->setValue(null);
 
-	public function testHeaderLineWithArrayValues()
-	{
-		$name = 'foo';
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
+    }
 
-		$expected = 'bar, baz=fuzz';
+    public function testHeaderLineWithArrayValues()
+    {
+        $name = 'foo';
 
-		$header = new Header($name);
+        $expected = 'bar, baz=fuzz';
 
-		$header->setValue('bar')
-			   ->appendValue(['baz' => 'fuzz']);
+        $header = new Header($name);
 
-		$this->assertEquals($name, $header->getName());
-		$this->assertEquals($expected, $header->getValueLine());
-	}
+        $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
+    }
 
-	public function testHeaderToStringShowsEntireHeader()
-	{
-		$name = 'foo';
+    public function testHeaderToStringShowsEntireHeader()
+    {
+        $name = 'foo';
 
-		$expected = 'foo: bar, baz=fuzz';
+        $expected = 'foo: bar, baz=fuzz';
 
-		$header = new Header($name);
+        $header = new Header($name);
 
-		$header->setValue('bar')
-			   ->appendValue(['baz' => 'fuzz']);
+        $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
-		$this->assertEquals($expected, (string)$header);
-	}
+        $this->assertSame($expected, (string) $header);
+    }
 }
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 5e084e69e9a9..a28fd86525da 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,155 +16,150 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class IncomingRequestDetectingTest extends CIUnitTestCase
+final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$_POST         = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
-		$origin        = 'http://www.example.com/index.php/woot?code=good#pos';
-		$this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPathDefault()
-	{
-		$this->request->uri     = '/index.php/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/index.php/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath());
-	}
-
-	public function testPathEmpty()
-	{
-		$this->request->uri     = '/';
-		$_SERVER['REQUEST_URI'] = '/';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = '/';
-		$this->assertEquals($expected, $this->request->detectPath());
-	}
-
-	public function testPathRequestURI()
-	{
-		$this->request->uri     = '/index.php/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/index.php/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURINested()
-	{
-		$this->request->uri     = '/ci/index.php/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/index.php/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURISubfolder()
-	{
-		$this->request->uri     = '/ci/index.php/popcorn/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot';
-		$_SERVER['SCRIPT_NAME'] = '/ci/index.php';
-		$expected               = 'popcorn/woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURINoIndex()
-	{
-		$this->request->uri     = '/sub/example';
-		$_SERVER['REQUEST_URI'] = '/sub/example';
-		$_SERVER['SCRIPT_NAME'] = '/sub/index.php';
-		$expected               = 'example';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURINginx()
-	{
-		$this->request->uri     = '/ci/index.php/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/index.php/woot?code=good';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURINginxRedirecting()
-	{
-		$this->request->uri     = '/?/ci/index.php/woot';
-		$_SERVER['REQUEST_URI'] = '/?/ci/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'ci/woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	public function testPathRequestURISuppressed()
-	{
-		$this->request->uri     = '/woot?code=good#pos';
-		$_SERVER['REQUEST_URI'] = '/woot';
-		$_SERVER['SCRIPT_NAME'] = '/';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPathQueryString()
-	{
-		$this->request->uri      = '/?/ci/index.php/woot';
-		$_SERVER['REQUEST_URI']  = '/?/ci/woot';
-		$_SERVER['QUERY_STRING'] = '/ci/woot';
-		$_SERVER['SCRIPT_NAME']  = '/index.php';
-		$expected                = 'ci/woot';
-		$this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
-	}
-
-	public function testPathQueryStringEmpty()
-	{
-		$this->request->uri      = '/?/ci/index.php/woot';
-		$_SERVER['REQUEST_URI']  = '/?/ci/woot';
-		$_SERVER['QUERY_STRING'] = '';
-		$_SERVER['SCRIPT_NAME']  = '/index.php';
-		$expected                = '';
-		$this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPathPathInfo()
-	{
-		$this->request->uri = '/index.php/woot?code=good#pos';
-		$this->request->setGlobal('server', [
-			'PATH_INFO' => null,
-		]);
-		$_SERVER['REQUEST_URI'] = '/index.php/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-		$expected               = 'woot';
-		$this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
-	}
-
-	public function testPathPathInfoGlobal()
-	{
-		$this->request->uri = '/index.php/woot?code=good#pos';
-		$this->request->uri = '/index.php/woot?code=good#pos';
-		$this->request->setGlobal('server', [
-			'PATH_INFO' => 'silliness',
-		]);
-		$_SERVER['REQUEST_URI'] = '/index.php/woot';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-
-		$expected = 'silliness';
-		$this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
-	}
-
+    /**
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
+
+        $origin = 'http://www.example.com/index.php/woot?code=good#pos';
+
+        $this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent());
+    }
+
+    public function testPathDefault()
+    {
+        $this->request->uri     = '/index.php/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/index.php/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath());
+    }
+
+    public function testPathEmpty()
+    {
+        $this->request->uri     = '/';
+        $_SERVER['REQUEST_URI'] = '/';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = '/';
+        $this->assertSame($expected, $this->request->detectPath());
+    }
+
+    public function testPathRequestURI()
+    {
+        $this->request->uri     = '/index.php/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/index.php/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINested()
+    {
+        $this->request->uri     = '/ci/index.php/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/index.php/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURISubfolder()
+    {
+        $this->request->uri     = '/ci/index.php/popcorn/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot';
+        $_SERVER['SCRIPT_NAME'] = '/ci/index.php';
+        $expected               = 'popcorn/woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINoIndex()
+    {
+        $this->request->uri     = '/sub/example';
+        $_SERVER['REQUEST_URI'] = '/sub/example';
+        $_SERVER['SCRIPT_NAME'] = '/sub/index.php';
+        $expected               = 'example';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINginx()
+    {
+        $this->request->uri     = '/ci/index.php/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURINginxRedirecting()
+    {
+        $this->request->uri     = '/?/ci/index.php/woot';
+        $_SERVER['REQUEST_URI'] = '/?/ci/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'ci/woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathRequestURISuppressed()
+    {
+        $this->request->uri     = '/woot?code=good#pos';
+        $_SERVER['REQUEST_URI'] = '/woot';
+        $_SERVER['SCRIPT_NAME'] = '/';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
+    }
+
+    public function testPathQueryString()
+    {
+        $this->request->uri      = '/?/ci/index.php/woot';
+        $_SERVER['REQUEST_URI']  = '/?/ci/woot';
+        $_SERVER['QUERY_STRING'] = '/ci/woot';
+        $_SERVER['SCRIPT_NAME']  = '/index.php';
+        $expected                = 'ci/woot';
+        $this->assertSame($expected, $this->request->detectPath('QUERY_STRING'));
+    }
+
+    public function testPathQueryStringEmpty()
+    {
+        $this->request->uri      = '/?/ci/index.php/woot';
+        $_SERVER['REQUEST_URI']  = '/?/ci/woot';
+        $_SERVER['QUERY_STRING'] = '';
+        $_SERVER['SCRIPT_NAME']  = '/index.php';
+        $expected                = '';
+        $this->assertSame($expected, $this->request->detectPath('QUERY_STRING'));
+    }
+
+    public function testPathPathInfo()
+    {
+        $this->request->uri = '/index.php/woot?code=good#pos';
+        $this->request->setGlobal('server', [
+            'PATH_INFO' => null,
+        ]);
+        $_SERVER['REQUEST_URI'] = '/index.php/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $expected               = 'woot';
+        $this->assertSame($expected, $this->request->detectPath('PATH_INFO'));
+    }
+
+    public function testPathPathInfoGlobal()
+    {
+        $this->request->uri = '/index.php/woot?code=good#pos';
+        $this->request->setGlobal('server', [
+            'PATH_INFO' => 'silliness',
+        ]);
+        $_SERVER['REQUEST_URI'] = '/index.php/woot';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+
+        $expected = 'silliness';
+        $this->assertSame($expected, $this->request->detectPath('PATH_INFO'));
+    }
 }
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 98f74b44ba27..a64445232aba 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
@@ -8,679 +18,639 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class IncomingRequestTest extends CIUnitTestCase
+final class IncomingRequestTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanGrabRequestVars()
-	{
-		$_REQUEST['TEST'] = 5;
-
-		$this->assertEquals(5, $this->request->getVar('TEST'));
-		$this->assertNull($this->request->getVar('TESTY'));
-	}
-
-	public function testCanGrabGetVars()
-	{
-		$_GET['TEST'] = 5;
-
-		$this->assertEquals(5, $this->request->getGet('TEST'));
-		$this->assertNull($this->request->getGet('TESTY'));
-	}
-
-	public function testCanGrabPostVars()
-	{
-		$_POST['TEST'] = 5;
-
-		$this->assertEquals(5, $this->request->getPost('TEST'));
-		$this->assertNull($this->request->getPost('TESTY'));
-	}
-
-	public function testCanGrabPostBeforeGet()
-	{
-		$_POST['TEST'] = 5;
-		$_GET['TEST']  = 3;
-
-		$this->assertEquals(5, $this->request->getPostGet('TEST'));
-		$this->assertEquals(3, $this->request->getGetPost('TEST'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNoOldInput()
-	{
-		$this->assertNull($this->request->getOldInput('name'));
-	}
-
-	public function testCanGetOldInput()
-	{
-		$_SESSION['_ci_old_input'] = [
-			'get'  => ['one' => 'two'],
-			'post' => ['name' => 'foo'],
-		];
-
-		$this->assertEquals('foo', $this->request->getOldInput('name'));
-		$this->assertEquals('two', $this->request->getOldInput('one'));
-	}
-
-	public function testCanGetOldInputDotted()
-	{
-		$_SESSION['_ci_old_input'] = [
-			'get'  => ['apple' => ['name' => 'two']],
-			'post' => ['banana' => ['name' => 'foo']],
-		];
-
-		$this->assertEquals('foo', $this->request->getOldInput('banana.name'));
-		$this->assertEquals('two', $this->request->getOldInput('apple.name'));
-	}
-
-	public function testMissingOldInput()
-	{
-		$_SESSION['_ci_old_input'] = [
-			'get'  => ['apple' => ['name' => 'two']],
-			'post' => ['banana' => ['name' => 'foo']],
-		];
-
-		$this->assertNull($this->request->getOldInput('pineapple.name'));
-	}
-
-	// Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
-	public function testCanGetOldInputArray()
-	{
-		$_SESSION['_ci_old_input'] = [
-			'get'  => ['apple' => ['name' => 'two']],
-			'post' => ['banana' => ['name' => 'foo']],
-		];
-
-		$this->assertEquals(['name' => 'two'], $this->request->getOldInput('apple'));
-		$this->assertEquals(['name' => 'foo'], $this->request->getOldInput('banana'));
-	}
-
-	// Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testCanSerializeOldArray()
-	{
-		$locations = [
-			'AB' => 'Alberta',
-			'BC' => 'British Columbia',
-			'SK' => 'Saskatchewan',
-		];
-		$session   = service('session');
-		$session->set(['_ci_old_input' => ['post' => ['location' => $locations]]]);
-
-		$this->assertEquals($locations, $this->request->getOldInput('location'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanGrabServerVars()
-	{
-		$server                   = $this->getPrivateProperty($this->request, 'globals');
-		$server['server']['TEST'] = 5;
-		$this->setPrivateProperty($this->request, 'globals', $server);
-
-		$this->assertEquals(5, $this->request->getServer('TEST'));
-		$this->assertNull($this->request->getServer('TESTY'));
-	}
-
-	public function testCanGrabEnvVars()
-	{
-		$server                = $this->getPrivateProperty($this->request, 'globals');
-		$server['env']['TEST'] = 5;
-		$this->setPrivateProperty($this->request, 'globals', $server);
-
-		$this->assertEquals(5, $this->request->getEnv('TEST'));
-		$this->assertNull($this->request->getEnv('TESTY'));
-	}
-
-	public function testCanGrabCookieVars()
-	{
-		$_COOKIE['TEST'] = 5;
-
-		$this->assertEquals(5, $this->request->getCookie('TEST'));
-		$this->assertNull($this->request->getCookie('TESTY'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testStoresDefaultLocale()
-	{
-		$config = new App();
-
-		$this->assertEquals($config->defaultLocale, $this->request->getDefaultLocale());
-		$this->assertEquals($config->defaultLocale, $this->request->getLocale());
-	}
-
-	public function testSetLocaleSaves()
-	{
-		$config                   = new App();
-		$config->supportedLocales = [
-			'en',
-			'es',
-		];
-		$config->defaultLocale    = 'es';
-		$config->baseURL          = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
-
-		$request->setLocale('en');
-		$this->assertEquals('en', $request->getLocale());
-	}
-
-	public function testSetBadLocale()
-	{
-		$config                   = new App();
-		$config->supportedLocales = [
-			'en',
-			'es',
-		];
-		$config->defaultLocale    = 'es';
-		$config->baseURL          = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
-
-		$request->setLocale('xx');
-		$this->assertEquals('es', $request->getLocale());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
-	 */
-	public function testNegotiatesLocale()
-	{
-		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr-FR; q=1.0, en; q=0.5';
-
-		$config                   = new App();
-		$config->negotiateLocale  = true;
-		$config->supportedLocales = [
-			'fr',
-			'en',
-		];
-		$config->baseURL          = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
-
-		$this->assertEquals($config->defaultLocale, $request->getDefaultLocale());
-		$this->assertEquals('fr', $request->getLocale());
-	}
-
-	public function testNegotiatesLocaleOnlyBroad()
-	{
-		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr; q=1.0, en; q=0.5';
-
-		$config                   = new App();
-		$config->negotiateLocale  = true;
-		$config->supportedLocales = [
-			'fr',
-			'en',
-		];
-		$config->baseURL          = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), null, new UserAgent());
-
-		$this->assertEquals($config->defaultLocale, $request->getDefaultLocale());
-		$this->assertEquals('fr', $request->getLocale());
-	}
-
-	// The negotiation tests below are not intended to exercise the HTTP\Negotiate class -
-	// that is up to the NegotiateTest. These are only to make sure that the requests
-	// flow through to the negotiator
-
-	public function testNegotiatesNot()
-	{
-		$this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
-
-		$this->expectException(HTTPException::class);
-		$this->request->negotiate('something bogus', ['iso-8859-5', 'unicode-1-1']);
-	}
-
-	public function testNegotiatesCharset()
-	{
-		//      $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
-		$this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
-
-		$this->assertEquals(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
-	}
-
-	public function testNegotiatesMedia()
-	{
-		$this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
-		$this->assertEquals('text/html', $this->request->negotiate('media', ['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
-	}
-
-	public function testNegotiatesEncoding()
-	{
-		$this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
-		$this->assertEquals('gzip', $this->request->negotiate('encoding', ['gzip', 'compress']));
-	}
-
-	public function testNegotiatesLanguage()
-	{
-		$this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
-		$this->assertEquals('en', $this->request->negotiate('language', ['en', 'da']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanGrabGetRawJSON()
-	{
-		$json = '{"code":1, "message":"ok"}';
-
-		$expected = [
-			'code'    => 1,
-			'message' => 'ok',
-		];
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-
-		$this->assertEquals($expected, $request->getJSON(true));
-	}
-
-	public function testCanGetAVariableFromJson()
-	{
-		$jsonObj = [
-			'foo' => 'bar',
-			'baz' => [
-				'fizz' => 'buzz',
-			],
-		];
-		$json    = json_encode($jsonObj);
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-
-		$this->assertEquals('bar', $request->getJsonVar('foo'));
-		$jsonVar = $request->getJsonVar('baz');
-		$this->assertIsObject($jsonVar);
-		$this->assertEquals('buzz', $jsonVar->fizz);
-		$this->assertEquals('buzz', $request->getJsonVar('baz.fizz'));
-	}
-
-	public function testGetJsonVarAsArray()
-	{
-		$jsonObj = [
-			'baz' => [
-				'fizz' => 'buzz',
-				'foo'  => 'bar',
-			],
-		];
-		$json    = json_encode($jsonObj);
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-
-		$jsonVar = $request->getJsonVar('baz', true);
-		$this->assertIsArray($jsonVar);
-		$this->assertEquals('buzz', $jsonVar['fizz']);
-		$this->assertEquals('bar', $jsonVar['foo']);
-	}
-
-	public function testGetJsonVarCanFilter()
-	{
-		$json = json_encode(['foo' => 'bar']);
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-
-		$this->assertFalse($request->getJsonVar('foo', false, FILTER_VALIDATE_INT));
-	}
-
-	public function testGetVarWorksWithJson()
-	{
-		$jsonObj = [
-			'foo'  => 'bar',
-			'fizz' => 'buzz',
-		];
-		$json    = json_encode($jsonObj);
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-		$request->setHeader('Content-Type', 'application/json');
-
-		$this->assertEquals('bar', $request->getVar('foo'));
-		$this->assertEquals('buzz', $request->getVar('fizz'));
-
-		$multiple = $request->getVar(['foo', 'fizz']);
-		$this->assertIsArray($multiple);
-		$this->assertEquals('bar', $multiple['foo']);
-		$this->assertEquals('buzz', $multiple['fizz']);
-
-		$all = $request->getVar();
-		$this->assertIsObject($all);
-		$this->assertEquals('bar', $all->foo);
-		$this->assertEquals('buzz', $all->fizz);
-	}
-
-	public function testGetVarWorksWithJsonAndGetParams()
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		// GET method
-		$_REQUEST['foo']  = 'bar';
-		$_REQUEST['fizz'] = 'buzz';
-
-		$request = new IncomingRequest($config, new URI('http://example.com/path?foo=bar&fizz=buzz'), 'php://input', new UserAgent());
-		$request = $request->withMethod('GET');
-
-		// JSON type
-		$request->setHeader('Content-Type', 'application/json');
-
-		$this->assertEquals('bar', $request->getVar('foo'));
-		$this->assertEquals('buzz', $request->getVar('fizz'));
-
-		$multiple = $request->getVar(['foo', 'fizz']);
-		$this->assertIsArray($multiple);
-		$this->assertEquals('bar', $multiple['foo']);
-		$this->assertEquals('buzz', $multiple['fizz']);
-
-		$all = $request->getVar();
-		$this->assertIsArray($all);
-		$this->assertEquals('bar', $all['foo']);
-		$this->assertEquals('buzz', $all['fizz']);
-	}
-
-	public function testCanGrabGetRawInput()
-	{
-		$rawstring = 'username=admin001&role=administrator&usepass=0';
-
-		$expected = [
-			'username' => 'admin001',
-			'role'     => 'administrator',
-			'usepass'  => 0,
-		];
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
-
-		$this->assertEquals($expected, $request->getRawInput());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIsCLI()
-	{
-		// this should be the case in unit testing
-		$this->assertTrue($this->request->isCLI());
-	}
-
-	public function testIsAJAX()
-	{
-		$this->request->appendHeader('X-Requested-With', 'XMLHttpRequest');
-		$this->assertTrue($this->request->isAJAX());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIsSecure()
-	{
-		$_SERVER['HTTPS'] = 'on';
-		$this->assertTrue($this->request->isSecure());
-	}
-
-	public function testIsSecureFrontEnd()
-	{
-		$this->request->appendHeader('Front-End-Https', 'on');
-		$this->assertTrue($this->request->isSecure());
-	}
-
-	public function testIsSecureForwarded()
-	{
-		$this->request->appendHeader('X-Forwarded-Proto', 'https');
-		$this->assertTrue($this->request->isSecure());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUserAgent()
-	{
-		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla';
-		$config                     = new App();
-		$request                    = new IncomingRequest($config, new URI(), null, new UserAgent());
-		$this->assertEquals('Mozilla', $request->getUserAgent());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFileCollectionFactory()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$files = $this->request->getFiles();
-		$this->assertCount(1, $files);
-
-		$file = array_shift($files);
-		$this->assertInstanceOf(UploadedFile::class, $file);
-
-		$this->assertEquals('someFile.txt', $file->getName());
-		$this->assertEquals(124, $file->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileMultiple()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => [
-					'someFile.txt',
-					'someFile2.txt',
-				],
-				'type'     => [
-					'text/plain',
-					'text/plain',
-				],
-				'size'     => [
-					'124',
-					'125',
-				],
-				'tmp_name' => [
-					'/tmp/myTempFile.txt',
-					'/tmp/myTempFile2.txt',
-				],
-				'error'    => [
-					0,
-					0,
-				],
-			],
-		];
-
-		$gotit = $this->request->getFileMultiple('userfile');
-		$this->assertEquals(124, $gotit[0]->getSize());
-		$this->assertEquals(125, $gotit[1]->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFile()
-	{
-		$_FILES = [
-			'userfile' => [
-				'name'     => 'someFile.txt',
-				'type'     => 'text/plain',
-				'size'     => '124',
-				'tmp_name' => '/tmp/myTempFile.txt',
-				'error'    => 0,
-			],
-		];
-
-		$gotit = $this->request->getFile('userfile');
-		$this->assertEquals(124, $gotit->getSize());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSpoofing()
-	{
-		$this->request->setMethod('WINK');
-		$this->assertEquals('wink', $this->request->getMethod());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2839
-	 */
-	public function testGetPostEmpty()
-	{
-		$_POST['TEST'] = 5;
-		$_GET['TEST']  = 3;
-		$this->assertEquals($_POST, $this->request->getPostGet());
-		$this->assertEquals($_GET, $this->request->getGetPost());
-	}
-
-	public function testWithFalseBody()
-	{
-		// Use `false` here to simulate file_get_contents returning a false value
-		$request = new IncomingRequest(new App(), new URI(), false, new UserAgent());
-
-		$this->assertTrue($request->getBody() !== false);
-		$this->assertTrue($request->getBody() === null);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3020
-	 */
-	public function testGetPostIndexNotExists()
-	{
-		$_POST['TEST'] = 5;
-		$_GET['TEST']  = 3;
-		$this->assertNull($this->request->getPostGet('gc'));
-		$this->assertNull($this->request->getGetPost('gc'));
-	}
-
-	public function providePathChecks()
-	{
-		return [
-			'not /index.php' => [
-				'/test.php',
-				'/',
-			],
-			'/index.php'     => [
-				'/index.php',
-				'/',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider providePathChecks
-	 */
-	public function testExtensionPHP($path, $detectPath)
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$_SERVER['REQUEST_URI'] = $path;
-		$_SERVER['SCRIPT_NAME'] = $path;
-		$request                = new IncomingRequest($config, new URI($path), null, new UserAgent());
-		$this->assertEquals($detectPath, $request->detectPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetPath()
-	{
-		$_SERVER['REQUEST_URI'] = '/index.php/fruits/banana';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$this->assertEquals('fruits/banana', $request->getPath());
-	}
-
-	public function testGetPathIsRelative()
-	{
-		$_SERVER['REQUEST_URI'] = '/sub/folder/index.php/fruits/banana';
-		$_SERVER['SCRIPT_NAME'] = '/sub/folder/index.php';
-
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$this->assertEquals('fruits/banana', $request->getPath());
-	}
-
-	public function testGetPathStoresDetectedValue()
-	{
-		$_SERVER['REQUEST_URI'] = '/fruits/banana';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$_SERVER['REQUEST_URI'] = '/candy/snickers';
-
-		$this->assertEquals('fruits/banana', $request->getPath());
-	}
-
-	public function testGetPathIsRediscovered()
-	{
-		$_SERVER['REQUEST_URI'] = '/fruits/banana';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$_SERVER['REQUEST_URI'] = '/candy/snickers';
-		$request->detectPath();
-
-		$this->assertEquals('candy/snickers', $request->getPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPath()
-	{
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-		$this->assertEquals('', $request->getPath());
-
-		$request->setPath('foobar');
-		$this->assertEquals('foobar', $request->getPath());
-	}
-
-	public function testSetPathUpdatesURI()
-	{
-		$request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-
-		$request->setPath('apples');
-
-		$this->assertEquals('apples', $request->uri->getPath());
-	}
+    /**
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
+    }
+
+    public function testCanGrabRequestVars()
+    {
+        $_REQUEST['TEST'] = 5;
+
+        $this->assertSame('5', $this->request->getVar('TEST'));
+        $this->assertNull($this->request->getVar('TESTY'));
+    }
+
+    public function testCanGrabGetVars()
+    {
+        $_GET['TEST'] = 5;
+
+        $this->assertSame('5', $this->request->getGet('TEST'));
+        $this->assertNull($this->request->getGet('TESTY'));
+    }
+
+    public function testCanGrabPostVars()
+    {
+        $_POST['TEST'] = 5;
+
+        $this->assertSame('5', $this->request->getPost('TEST'));
+        $this->assertNull($this->request->getPost('TESTY'));
+    }
+
+    public function testCanGrabPostBeforeGet()
+    {
+        $_POST['TEST'] = 5;
+        $_GET['TEST']  = 3;
+
+        $this->assertSame('5', $this->request->getPostGet('TEST'));
+        $this->assertSame('3', $this->request->getGetPost('TEST'));
+    }
+
+    public function testNoOldInput()
+    {
+        $this->assertNull($this->request->getOldInput('name'));
+    }
+
+    public function testCanGetOldInput()
+    {
+        $_SESSION['_ci_old_input'] = [
+            'get'  => ['one' => 'two'],
+            'post' => ['name' => 'foo'],
+        ];
+
+        $this->assertSame('foo', $this->request->getOldInput('name'));
+        $this->assertSame('two', $this->request->getOldInput('one'));
+    }
+
+    public function testCanGetOldInputDotted()
+    {
+        $_SESSION['_ci_old_input'] = [
+            'get'  => ['apple' => ['name' => 'two']],
+            'post' => ['banana' => ['name' => 'foo']],
+        ];
+
+        $this->assertSame('foo', $this->request->getOldInput('banana.name'));
+        $this->assertSame('two', $this->request->getOldInput('apple.name'));
+    }
+
+    public function testMissingOldInput()
+    {
+        $_SESSION['_ci_old_input'] = [
+            'get'  => ['apple' => ['name' => 'two']],
+            'post' => ['banana' => ['name' => 'foo']],
+        ];
+
+        $this->assertNull($this->request->getOldInput('pineapple.name'));
+    }
+
+    // Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
+    public function testCanGetOldInputArray()
+    {
+        $_SESSION['_ci_old_input'] = [
+            'get'  => ['apple' => ['name' => 'two']],
+            'post' => ['banana' => ['name' => 'foo']],
+        ];
+
+        $this->assertSame(['name' => 'two'], $this->request->getOldInput('apple'));
+        $this->assertSame(['name' => 'foo'], $this->request->getOldInput('banana'));
+    }
+
+    // Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testCanSerializeOldArray()
+    {
+        $locations = [
+            'AB' => 'Alberta',
+            'BC' => 'British Columbia',
+            'SK' => 'Saskatchewan',
+        ];
+        $session = service('session');
+        $session->set(['_ci_old_input' => ['post' => ['location' => $locations]]]);
+
+        $this->assertSame($locations, $this->request->getOldInput('location'));
+    }
+
+    public function testCanGrabServerVars()
+    {
+        $server                   = $this->getPrivateProperty($this->request, 'globals');
+        $server['server']['TEST'] = 5;
+        $this->setPrivateProperty($this->request, 'globals', $server);
+
+        $this->assertSame('5', $this->request->getServer('TEST'));
+        $this->assertNull($this->request->getServer('TESTY'));
+    }
+
+    public function testCanGrabEnvVars()
+    {
+        $server                = $this->getPrivateProperty($this->request, 'globals');
+        $server['env']['TEST'] = 5;
+        $this->setPrivateProperty($this->request, 'globals', $server);
+
+        $this->assertSame('5', $this->request->getEnv('TEST'));
+        $this->assertNull($this->request->getEnv('TESTY'));
+    }
+
+    public function testCanGrabCookieVars()
+    {
+        $_COOKIE['TEST'] = 5;
+
+        $this->assertSame('5', $this->request->getCookie('TEST'));
+        $this->assertNull($this->request->getCookie('TESTY'));
+    }
+
+    public function testStoresDefaultLocale()
+    {
+        $config = new App();
+
+        $this->assertSame($config->defaultLocale, $this->request->getDefaultLocale());
+        $this->assertSame($config->defaultLocale, $this->request->getLocale());
+    }
+
+    public function testSetLocaleSaves()
+    {
+        $config                   = new App();
+        $config->supportedLocales = ['en', 'es'];
+        $config->defaultLocale    = 'es';
+        $config->baseURL          = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $request->setLocale('en');
+        $this->assertSame('en', $request->getLocale());
+    }
+
+    public function testSetBadLocale()
+    {
+        $config                   = new App();
+        $config->supportedLocales = ['en', 'es'];
+        $config->defaultLocale    = 'es';
+        $config->baseURL          = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $request->setLocale('xx');
+        $this->assertSame('es', $request->getLocale());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
+     */
+    public function testNegotiatesLocale()
+    {
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr-FR; q=1.0, en; q=0.5';
+
+        $config                   = new App();
+        $config->negotiateLocale  = true;
+        $config->supportedLocales = ['fr', 'en'];
+        $config->baseURL          = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $this->assertSame($config->defaultLocale, $request->getDefaultLocale());
+        $this->assertSame('fr', $request->getLocale());
+    }
+
+    public function testNegotiatesLocaleOnlyBroad()
+    {
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'fr; q=1.0, en; q=0.5';
+
+        $config                   = new App();
+        $config->negotiateLocale  = true;
+        $config->supportedLocales = ['fr', 'en'];
+        $config->baseURL          = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $this->assertSame($config->defaultLocale, $request->getDefaultLocale());
+        $this->assertSame('fr', $request->getLocale());
+    }
+
+    // The negotiation tests below are not intended to exercise the HTTP\Negotiate class -
+    // that is up to the NegotiateTest. These are only to make sure that the requests
+    // flow through to the negotiator
+
+    public function testNegotiatesNot()
+    {
+        $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
+
+        $this->expectException(HTTPException::class);
+        $this->request->negotiate('something bogus', ['iso-8859-5', 'unicode-1-1']);
+    }
+
+    public function testNegotiatesCharset()
+    {
+        //      $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
+        $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
+
+        $this->assertSame(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
+    }
+
+    public function testNegotiatesMedia()
+    {
+        $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
+        $this->assertSame('text/html', $this->request->negotiate('media', ['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
+    }
+
+    public function testNegotiatesEncoding()
+    {
+        $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
+        $this->assertSame('gzip', $this->request->negotiate('encoding', ['gzip', 'compress']));
+    }
+
+    public function testNegotiatesLanguage()
+    {
+        $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
+        $this->assertSame('en', $this->request->negotiate('language', ['en', 'da']));
+    }
+
+    public function testCanGrabGetRawJSON()
+    {
+        $json = '{"code":1, "message":"ok"}';
+
+        $expected = ['code' => 1, 'message' => 'ok'];
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $this->assertSame($expected, $request->getJSON(true));
+    }
+
+    public function testCanGetAVariableFromJson()
+    {
+        $jsonObj = [
+            'foo' => 'bar',
+            'baz' => ['fizz' => 'buzz'],
+        ];
+        $json = json_encode($jsonObj);
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $this->assertSame('bar', $request->getJsonVar('foo'));
+        $jsonVar = $request->getJsonVar('baz');
+        $this->assertIsObject($jsonVar);
+        $this->assertSame('buzz', $jsonVar->fizz);
+        $this->assertSame('buzz', $request->getJsonVar('baz.fizz'));
+    }
+
+    public function testGetJsonVarAsArray()
+    {
+        $jsonObj = [
+            'baz' => [
+                'fizz' => 'buzz',
+                'foo'  => 'bar',
+            ],
+        ];
+        $json = json_encode($jsonObj);
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $jsonVar = $request->getJsonVar('baz', true);
+        $this->assertIsArray($jsonVar);
+        $this->assertSame('buzz', $jsonVar['fizz']);
+        $this->assertSame('bar', $jsonVar['foo']);
+    }
+
+    public function testGetJsonVarCanFilter()
+    {
+        $json = json_encode(['foo' => 'bar']);
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $this->assertFalse($request->getJsonVar('foo', false, FILTER_VALIDATE_INT));
+    }
+
+    public function testGetVarWorksWithJson()
+    {
+        $jsonObj = [
+            'foo'  => 'bar',
+            'fizz' => 'buzz',
+        ];
+        $json = json_encode($jsonObj);
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+        $request->setHeader('Content-Type', 'application/json');
+
+        $this->assertSame('bar', $request->getVar('foo'));
+        $this->assertSame('buzz', $request->getVar('fizz'));
+
+        $multiple = $request->getVar(['foo', 'fizz']);
+        $this->assertIsArray($multiple);
+        $this->assertSame('bar', $multiple['foo']);
+        $this->assertSame('buzz', $multiple['fizz']);
+
+        $all = $request->getVar();
+        $this->assertIsObject($all);
+        $this->assertSame('bar', $all->foo);
+        $this->assertSame('buzz', $all->fizz);
+    }
+
+    public function testGetVarWorksWithJsonAndGetParams()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        // GET method
+        $_REQUEST['foo']  = 'bar';
+        $_REQUEST['fizz'] = 'buzz';
+
+        $request = new IncomingRequest($config, new URI('http://example.com/path?foo=bar&fizz=buzz'), 'php://input', new UserAgent());
+        $request = $request->withMethod('GET');
+
+        // JSON type
+        $request->setHeader('Content-Type', 'application/json');
+
+        $this->assertSame('bar', $request->getVar('foo'));
+        $this->assertSame('buzz', $request->getVar('fizz'));
+
+        $multiple = $request->getVar(['foo', 'fizz']);
+        $this->assertIsArray($multiple);
+        $this->assertSame('bar', $multiple['foo']);
+        $this->assertSame('buzz', $multiple['fizz']);
+
+        $all = $request->getVar();
+        $this->assertIsArray($all);
+        $this->assertSame('bar', $all['foo']);
+        $this->assertSame('buzz', $all['fizz']);
+    }
+
+    public function testCanGrabGetRawInput()
+    {
+        $rawstring = 'username=admin001&role=administrator&usepass=0';
+
+        $expected = [
+            'username' => 'admin001',
+            'role'     => 'administrator',
+            'usepass'  => '0',
+        ];
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
+
+        $this->assertSame($expected, $request->getRawInput());
+    }
+
+    public function testIsCLI()
+    {
+        // this should be the case in unit testing
+        $this->assertTrue($this->request->isCLI());
+    }
+
+    public function testIsAJAX()
+    {
+        $this->request->appendHeader('X-Requested-With', 'XMLHttpRequest');
+        $this->assertTrue($this->request->isAJAX());
+    }
+
+    public function testIsSecure()
+    {
+        $_SERVER['HTTPS'] = 'on';
+        $this->assertTrue($this->request->isSecure());
+    }
+
+    public function testIsSecureFrontEnd()
+    {
+        $this->request->appendHeader('Front-End-Https', 'on');
+        $this->assertTrue($this->request->isSecure());
+    }
+
+    public function testIsSecureForwarded()
+    {
+        $this->request->appendHeader('X-Forwarded-Proto', 'https');
+        $this->assertTrue($this->request->isSecure());
+    }
+
+    public function testUserAgent()
+    {
+        $_SERVER['HTTP_USER_AGENT'] = 'Mozilla';
+
+        $config  = new App();
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $this->assertSame('Mozilla', $request->getUserAgent()->__toString());
+    }
+
+    public function testFileCollectionFactory()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $files = $this->request->getFiles();
+        $this->assertCount(1, $files);
+
+        $file = array_shift($files);
+        $this->assertInstanceOf(UploadedFile::class, $file);
+
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
+    }
+
+    public function testGetFileMultiple()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name' => [
+                    'someFile.txt',
+                    'someFile2.txt',
+                ],
+                'type' => [
+                    'text/plain',
+                    'text/plain',
+                ],
+                'size' => [
+                    '124',
+                    '125',
+                ],
+                'tmp_name' => [
+                    '/tmp/myTempFile.txt',
+                    '/tmp/myTempFile2.txt',
+                ],
+                'error' => [
+                    0,
+                    0,
+                ],
+            ],
+        ];
+
+        $gotit = $this->request->getFileMultiple('userfile');
+        $this->assertSame(124, $gotit[0]->getSize());
+        $this->assertSame(125, $gotit[1]->getSize());
+    }
+
+    public function testGetFile()
+    {
+        $_FILES = [
+            'userfile' => [
+                'name'     => 'someFile.txt',
+                'type'     => 'text/plain',
+                'size'     => '124',
+                'tmp_name' => '/tmp/myTempFile.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $gotit = $this->request->getFile('userfile');
+        $this->assertSame(124, $gotit->getSize());
+    }
+
+    public function testSpoofing()
+    {
+        $this->request->setMethod('WINK');
+        $this->assertSame('wink', $this->request->getMethod());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2839
+     */
+    public function testGetPostEmpty()
+    {
+        $_POST['TEST'] = '5';
+        $_GET['TEST']  = '3';
+        $this->assertSame($_POST, $this->request->getPostGet());
+        $this->assertSame($_GET, $this->request->getGetPost());
+    }
+
+    public function testWithFalseBody()
+    {
+        // Use `false` here to simulate file_get_contents returning a false value
+        $request = new IncomingRequest(new App(), new URI(), false, new UserAgent());
+
+        $this->assertTrue($request->getBody() !== false);
+        $this->assertTrue($request->getBody() === null);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3020
+     */
+    public function testGetPostIndexNotExists()
+    {
+        $_POST['TEST'] = 5;
+        $_GET['TEST']  = 3;
+        $this->assertNull($this->request->getPostGet('gc'));
+        $this->assertNull($this->request->getGetPost('gc'));
+    }
+
+    public function providePathChecks()
+    {
+        return [
+            'not /index.php' => [
+                '/test.php',
+                '/',
+            ],
+            '/index.php' => [
+                '/index.php',
+                '/',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider providePathChecks
+     *
+     * @param mixed $path
+     * @param mixed $detectPath
+     */
+    public function testExtensionPHP($path, $detectPath)
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_SERVER['REQUEST_URI'] = $path;
+        $_SERVER['SCRIPT_NAME'] = $path;
+        $request                = new IncomingRequest($config, new URI($path), null, new UserAgent());
+        $this->assertSame($detectPath, $request->detectPath());
+    }
+
+    public function testGetPath()
+    {
+        $_SERVER['REQUEST_URI'] = '/index.php/fruits/banana';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $this->assertSame('fruits/banana', $request->getPath());
+    }
+
+    public function testGetPathIsRelative()
+    {
+        $_SERVER['REQUEST_URI'] = '/sub/folder/index.php/fruits/banana';
+        $_SERVER['SCRIPT_NAME'] = '/sub/folder/index.php';
+
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $this->assertSame('fruits/banana', $request->getPath());
+    }
+
+    public function testGetPathStoresDetectedValue()
+    {
+        $_SERVER['REQUEST_URI'] = '/fruits/banana';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $_SERVER['REQUEST_URI'] = '/candy/snickers';
+
+        $this->assertSame('fruits/banana', $request->getPath());
+    }
+
+    public function testGetPathIsRediscovered()
+    {
+        $_SERVER['REQUEST_URI'] = '/fruits/banana';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $_SERVER['REQUEST_URI'] = '/candy/snickers';
+        $request->detectPath();
+
+        $this->assertSame('candy/snickers', $request->getPath());
+    }
+
+    public function testSetPath()
+    {
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+        $this->assertSame('', $request->getPath());
+
+        $request->setPath('foobar');
+        $this->assertSame('foobar', $request->getPath());
+    }
+
+    public function testSetPathUpdatesURI()
+    {
+        $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+
+        $request->setPath('apples');
+
+        $this->assertSame('apples', $request->uri->getPath());
+    }
 }
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 2be3de4e3a0c..38361fdb1ce4 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -1,335 +1,313 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class MessageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MessageTest extends CIUnitTestCase
 {
+    /**
+     * @var Message
+     */
+    protected $message;
 
-	/**
-	 * @var Message
-	 */
-	protected $message;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->message = new Message();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function tearDown(): void
-	{
-		$this->message = null;
-		unset($this->message);
-	}
-
-	//--------------------------------------------------------------------
-	// We can only test the headers retrieved from $_SERVER
-	// This test might fail under apache.
-	public function testHeadersRetrievesHeaders()
-	{
-		$this->message->setHeader('Host', 'daisyduke.com');
-		$this->message->setHeader('Referer', 'RoscoePekoTrain.com');
-
-		$headers = $this->message->headers();
-
-		// Content-Type is likely set...
-		$this->assertGreaterThanOrEqual(2, count($headers));
-
-		$this->assertSame('daisyduke.com', $headers['Host']->getValue());
-		$this->assertSame('RoscoePekoTrain.com', $headers['Referer']->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanGrabSingleHeader()
-	{
-		$this->message->setHeader('Host', 'daisyduke.com');
-
-		$header = $this->message->header('Host');
-
-		$this->assertInstanceOf(Header::class, $header);
-		$this->assertEquals('daisyduke.com', $header->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCaseInsensitiveheader()
-	{
-		$this->message->setHeader('Host', 'daisyduke.com');
-
-		$this->assertEquals('daisyduke.com', $this->message->header('host')->getValue());
-		$this->assertEquals('daisyduke.com', $this->message->header('HOST')->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanSetHeaders()
-	{
-		$this->message->setHeader('first', 'kiss');
-		$this->message->setHeader('second', ['black', 'book']);
-
-		$this->assertEquals('kiss', $this->message->header('FIRST')->getValue());
-		$this->assertEquals(['black', 'book'], $this->message->header('Second')->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetHeaderOverwritesPrevious()
-	{
-		$this->message->setHeader('Pragma', 'cache');
-		$this->message->setHeader('Pragma', 'no-cache');
-
-		$this->assertEquals('no-cache', $this->message->header('Pragma')->getValue());
-	}
-
-	public function testHeaderLineIsReadable()
-	{
-		$this->message->setHeader('Accept', ['json', 'html']);
-		$this->message->setHeader('Host', 'daisyduke.com');
-
-		$this->assertEquals('json, html', $this->message->header('Accept')->getValueLine());
-		$this->assertEquals('daisyduke.com', $this->message->header('Host')->getValueLine());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanRemoveHeader()
-	{
-		$this->message->setHeader('Host', 'daisyduke.com');
-
-		$this->message->removeHeader('host');
-
-		$this->assertEquals('', $this->message->header('host'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanAppendHeader()
-	{
-		$this->message->setHeader('accept', ['json', 'html']);
-
-		$this->message->appendHeader('Accept', 'xml');
-
-		$this->assertEquals(['json', 'html', 'xml'], $this->message->header('accept')->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanPrependHeader()
-	{
-		$this->message->setHeader('accept', ['json', 'html']);
-
-		$this->message->prependHeader('Accept', 'xml');
-
-		$this->assertEquals(['xml', 'json', 'html'], $this->message->header('accept')->getValue());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetProtocolWorks()
-	{
-		$this->message->setProtocolVersion('1.1');
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->assertEquals('1.1', $this->message->getProtocolVersion());
-	}
+        $this->message = new Message();
+    }
 
-	//--------------------------------------------------------------------
+    protected function tearDown(): void
+    {
+        $this->message = null;
+        unset($this->message);
+    }
 
-	public function testSetProtocolWorksWithNonNumericVersion()
-	{
-		$this->message->setProtocolVersion('HTTP/1.1');
+    // We can only test the headers retrieved from $_SERVER
+    // This test might fail under apache.
+    public function testHeadersRetrievesHeaders()
+    {
+        $this->message->setHeader('Host', 'daisyduke.com');
+        $this->message->setHeader('Referer', 'RoscoePekoTrain.com');
 
-		$this->assertEquals('1.1', $this->message->getProtocolVersion());
-	}
+        $headers = $this->message->headers();
 
-	//--------------------------------------------------------------------
+        // Content-Type is likely set...
+        $this->assertGreaterThanOrEqual(2, count($headers));
 
-	public function testSetProtocolThrowsExceptionWithInvalidProtocol()
-	{
-		$this->expectException(HTTPException::class);
-		$this->message->setProtocolVersion('1.2');
-	}
+        $this->assertSame('daisyduke.com', $headers['Host']->getValue());
+        $this->assertSame('RoscoePekoTrain.com', $headers['Referer']->getValue());
+    }
 
-	//--------------------------------------------------------------------
+    public function testCanGrabSingleHeader()
+    {
+        $this->message->setHeader('Host', 'daisyduke.com');
 
-	public function testBodyBasics()
-	{
-		$body = 'a strange little fellow.';
+        $header = $this->message->header('Host');
 
-		$this->message->setBody($body);
+        $this->assertInstanceOf(Header::class, $header);
+        $this->assertSame('daisyduke.com', $header->getValue());
+    }
 
-		$this->assertEquals($body, $this->message->getBody());
-	}
+    public function testCaseInsensitiveheader()
+    {
+        $this->message->setHeader('Host', 'daisyduke.com');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('daisyduke.com', $this->message->header('host')->getValue());
+        $this->assertSame('daisyduke.com', $this->message->header('HOST')->getValue());
+    }
 
-	public function testAppendBody()
-	{
-		$this->message->setBody('moo');
+    public function testCanSetHeaders()
+    {
+        $this->message->setHeader('first', 'kiss');
+        $this->message->setHeader('second', ['black', 'book']);
 
-		$this->message->appendBody('\n');
+        $this->assertSame('kiss', $this->message->header('FIRST')->getValue());
+        $this->assertSame(['black', 'book'], $this->message->header('Second')->getValue());
+    }
 
-		$this->assertEquals('moo' . '\n', $this->message->getBody());
-	}
+    public function testSetHeaderOverwritesPrevious()
+    {
+        $this->message->setHeader('Pragma', 'cache');
+        $this->message->setHeader('Pragma', 'no-cache');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('no-cache', $this->message->header('Pragma')->getValue());
+    }
 
-	public function testSetHeaderReplacingHeader()
-	{
-		$this->message->setHeader('Accept', 'json');
+    public function testHeaderLineIsReadable()
+    {
+        $this->message->setHeader('Accept', ['json', 'html']);
+        $this->message->setHeader('Host', 'daisyduke.com');
 
-		$this->assertEquals('json', $this->message->getHeaderLine('Accept'));
-	}
+        $this->assertSame('json, html', $this->message->header('Accept')->getValueLine());
+        $this->assertSame('daisyduke.com', $this->message->header('Host')->getValueLine());
+    }
 
-	public function testSetHeaderDuplicateSettings()
-	{
-		$this->message->setHeader('Accept', 'json');
-		$this->message->setHeader('Accept', 'xml');
+    public function testCanRemoveHeader()
+    {
+        $this->message->setHeader('Host', 'daisyduke.com');
 
-		$this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
-	}
+        $this->message->removeHeader('host');
 
-	public function testSetHeaderDuplicateSettingsInsensitive()
-	{
-		$this->message->setHeader('Accept', 'json');
-		$this->message->setHeader('accept', 'xml');
+        $this->assertNull($this->message->header('host'));
+    }
 
-		$this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
-	}
+    public function testCanAppendHeader()
+    {
+        $this->message->setHeader('accept', ['json', 'html']);
 
-	public function testSetHeaderArrayValues()
-	{
-		$this->message->setHeader('Accept', ['json', 'html', 'xml']);
+        $this->message->appendHeader('Accept', 'xml');
 
-			$this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
-	}
+        $this->assertSame(['json', 'html', 'xml'], $this->message->header('accept')->getValue());
+    }
+
+    public function testCanPrependHeader()
+    {
+        $this->message->setHeader('accept', ['json', 'html']);
+
+        $this->message->prependHeader('Accept', 'xml');
+
+        $this->assertSame(['xml', 'json', 'html'], $this->message->header('accept')->getValue());
+    }
 
-	public function provideArrayHeaderValue()
-	{
-		return [
-			'existing for next not append' => [
-				[
-					'json',
-					'html',
-					'xml',
-				],
-			],
-			'existing for next append'     => [
-				[
-					'json',
-					'html',
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider provideArrayHeaderValue
-	 */
-	public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue)
-	{
-		$this->message->setHeader('Accept', $arrayHeaderValue);
-		$this->message->setHeader('Accept', 'xml');
-
-		$this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
-	}
-
-	/**
-	 * @dataProvider provideArrayHeaderValue
-	 */
-	public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue)
-	{
-		$this->message->setHeader('Accept', $arrayHeaderValue);
-		$this->message->setHeader('Accept', ['xml']);
-
-		$this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
-	}
-
-	public function testSetHeaderWithExistingArrayValuesAppendNullValue()
-	{
-		$this->message->setHeader('Accept', ['json', 'html', 'xml']);
-		$this->message->setHeader('Accept', null);
-
-		$this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPopulateHeadersWithoutContentType()
-	{
-		// fail path, if the CONTENT_TYPE doesn't exist
-		$original    = $_SERVER;
-		$_SERVER     = ['HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.50'];
-		$originalEnv = getenv('CONTENT_TYPE');
-		putenv('CONTENT_TYPE');
-
-		$this->message->populateHeaders();
-
-		$this->assertNull($this->message->header('content-type'));
-		putenv("CONTENT_TYPE=$originalEnv");
-		$this->message->removeHeader('accept-language');
-		$_SERVER = $original; // restore so code coverage doesn't break
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPopulateHeadersWithoutHTTP()
-	{
-		// fail path, if arguement does't have the HTTP_*
-		$original = $_SERVER;
-		$_SERVER  = [
-			'USER_AGENT'     => 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405',
-			'REQUEST_METHOD' => 'POST',
-		];
-
-		$this->message->populateHeaders();
-
-		$this->assertNull($this->message->header('user-agent'));
-		$this->assertNull($this->message->header('request-method'));
-		$_SERVER = $original; // restore so code coverage doesn't break
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPopulateHeadersKeyNotExists()
-	{
-		// Success path, if array key is not exists, assign empty string to it's value
-		$original = $_SERVER;
-		$_SERVER  = [
-			'CONTENT_TYPE'        => 'text/html; charset=utf-8',
-			'HTTP_ACCEPT_CHARSET' => null,
-		];
-
-		$this->message->populateHeaders();
-
-		$this->assertEquals('', $this->message->header('accept-charset')->getValue());
-		$this->message->removeHeader('accept-charset');
-		$_SERVER = $original; // restore so code coverage doesn't break
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPopulateHeaders()
-	{
-		// success path
-		$original = $_SERVER;
-		$_SERVER  = [
-			'CONTENT_TYPE'         => 'text/html; charset=utf-8',
-			'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.50',
-		];
-
-		$this->message->populateHeaders();
-
-		$this->assertEquals('text/html; charset=utf-8', $this->message->header('content-type')->getValue());
-		$this->assertEquals('en-us,en;q=0.50', $this->message->header('accept-language')->getValue());
-		$this->message->removeHeader('content-type');
-		$this->message->removeHeader('accept-language');
-		$_SERVER = $original; // restore so code coverage doesn't break
-	}
+    public function testSetProtocolWorks()
+    {
+        $this->message->setProtocolVersion('1.1');
+
+        $this->assertSame('1.1', $this->message->getProtocolVersion());
+    }
+
+    public function testSetProtocolWorksWithNonNumericVersion()
+    {
+        $this->message->setProtocolVersion('HTTP/1.1');
+
+        $this->assertSame('1.1', $this->message->getProtocolVersion());
+    }
+
+    public function testSetProtocolThrowsExceptionWithInvalidProtocol()
+    {
+        $this->expectException(HTTPException::class);
+        $this->message->setProtocolVersion('1.2');
+    }
+
+    public function testBodyBasics()
+    {
+        $body = 'a strange little fellow.';
+
+        $this->message->setBody($body);
+
+        $this->assertSame($body, $this->message->getBody());
+    }
+
+    public function testAppendBody()
+    {
+        $this->message->setBody('moo');
+
+        $this->message->appendBody('\n');
+
+        $this->assertSame('moo' . '\n', $this->message->getBody());
+    }
+
+    public function testSetHeaderReplacingHeader()
+    {
+        $this->message->setHeader('Accept', 'json');
+
+        $this->assertSame('json', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function testSetHeaderDuplicateSettings()
+    {
+        $this->message->setHeader('Accept', 'json');
+        $this->message->setHeader('Accept', 'xml');
+
+        $this->assertSame('xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function testSetHeaderDuplicateSettingsInsensitive()
+    {
+        $this->message->setHeader('Accept', 'json');
+        $this->message->setHeader('accept', 'xml');
+
+        $this->assertSame('xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function testSetHeaderArrayValues()
+    {
+        $this->message->setHeader('Accept', ['json', 'html', 'xml']);
+
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function provideArrayHeaderValue()
+    {
+        return [
+            'existing for next not append' => [
+                [
+                    'json',
+                    'html',
+                    'xml',
+                ],
+            ],
+            'existing for next append' => [
+                [
+                    'json',
+                    'html',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideArrayHeaderValue
+     *
+     * @param mixed $arrayHeaderValue
+     */
+    public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue)
+    {
+        $this->message->setHeader('Accept', $arrayHeaderValue);
+        $this->message->setHeader('Accept', 'xml');
+
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    /**
+     * @dataProvider provideArrayHeaderValue
+     *
+     * @param mixed $arrayHeaderValue
+     */
+    public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue)
+    {
+        $this->message->setHeader('Accept', $arrayHeaderValue);
+        $this->message->setHeader('Accept', ['xml']);
+
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function testSetHeaderWithExistingArrayValuesAppendNullValue()
+    {
+        $this->message->setHeader('Accept', ['json', 'html', 'xml']);
+        $this->message->setHeader('Accept', null);
+
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
+    }
+
+    public function testPopulateHeadersWithoutContentType()
+    {
+        // fail path, if the CONTENT_TYPE doesn't exist
+        $original    = $_SERVER;
+        $_SERVER     = ['HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.50'];
+        $originalEnv = getenv('CONTENT_TYPE');
+        putenv('CONTENT_TYPE');
+
+        $this->message->populateHeaders();
+
+        $this->assertNull($this->message->header('content-type'));
+        putenv("CONTENT_TYPE={$originalEnv}");
+        $this->message->removeHeader('accept-language');
+        $_SERVER = $original; // restore so code coverage doesn't break
+    }
+
+    public function testPopulateHeadersWithoutHTTP()
+    {
+        // fail path, if arguement does't have the HTTP_*
+        $original = $_SERVER;
+        $_SERVER  = [
+            'USER_AGENT'     => 'Mozilla/5.0 (iPad; U; CPU OS 3_2_1 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Mobile/7B405',
+            'REQUEST_METHOD' => 'POST',
+        ];
+
+        $this->message->populateHeaders();
+
+        $this->assertNull($this->message->header('user-agent'));
+        $this->assertNull($this->message->header('request-method'));
+        $_SERVER = $original; // restore so code coverage doesn't break
+    }
+
+    public function testPopulateHeadersKeyNotExists()
+    {
+        // Success path, if array key is not exists, assign empty string to it's value
+        $original = $_SERVER;
+        $_SERVER  = [
+            'CONTENT_TYPE'        => 'text/html; charset=utf-8',
+            'HTTP_ACCEPT_CHARSET' => null,
+        ];
+
+        $this->message->populateHeaders();
+
+        $this->assertSame('', $this->message->header('accept-charset')->getValue());
+        $this->message->removeHeader('accept-charset');
+        $_SERVER = $original; // restore so code coverage doesn't break
+    }
+
+    public function testPopulateHeaders()
+    {
+        // success path
+        $original = $_SERVER;
+        $_SERVER  = [
+            'CONTENT_TYPE'         => 'text/html; charset=utf-8',
+            'HTTP_ACCEPT_LANGUAGE' => 'en-us,en;q=0.50',
+        ];
+
+        $this->message->populateHeaders();
+
+        $this->assertSame('text/html; charset=utf-8', $this->message->header('content-type')->getValue());
+        $this->assertSame('en-us,en;q=0.50', $this->message->header('accept-language')->getValue());
+        $this->message->removeHeader('content-type');
+        $this->message->removeHeader('accept-language');
+        $_SERVER = $original; // restore so code coverage doesn't break
+    }
 }
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index 3bd83d539db8..af7549e30239 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -1,202 +1,190 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
-class NegotiateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class NegotiateTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var Request
-	 */
-	protected $request;
-
-	/**
-	 * @var Negotiate
-	 */
-	protected $negotiate;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->request = new Request(new App());
-
-		$this->negotiate = new Negotiate($this->request);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function tearDown(): void
-	{
-		$this->request = $this->negotiate = null;
-		unset($this->request, $this->negotiate);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiateMediaFindsHighestMatch()
-	{
-		$this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
-		$this->negotiate->setRequest($this->request);
-
-		$this->assertEquals('text/html', $this->negotiate->media(['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
-		$this->assertEquals('text/x-c', $this->negotiate->media(['text/x-c', 'text/x-dvi', 'text/plain']));
-		$this->assertEquals('text/x-dvi', $this->negotiate->media(['text/plain', 'text/x-dvi']));
-		$this->assertEquals('text/x-dvi', $this->negotiate->media(['text/x-dvi']));
-
-		// No matches? Return the first that we support...
-		$this->assertEquals('text/md', $this->negotiate->media(['text/md']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testParseHeaderDeterminesCorrectPrecedence()
-	{
-		$header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
-
-		$this->assertEquals('text/plain', $header[0]['value']);
-		$this->assertEquals('flowed', $header[0]['params']['format']);
-		$this->assertEquals('text/plain', $header[1]['value']);
-		$this->assertEquals('*/*', $header[3]['value']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable()
-	{
-		$this->request->setHeader('Accept', 'image/*, text/*');
-
-		$this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiateMediaRecognizesMediaTypes()
-	{
-		// Image has a higher specificity, but is the wrong type...
-		$this->request->setHeader('Accept', 'text/*, image/jpeg');
-
-		$this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiateMediaSupportsStrictMatching()
-	{
-		// Image has a higher specificity, but is the wrong type...
-		$this->request->setHeader('Accept', 'text/md, image/jpeg');
-
-		$this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
-		$this->assertEquals('', $this->negotiate->media(['text/plain'], true));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group single
-	 */
-	public function testAcceptCharsetMatchesBasics()
-	{
-		$this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
-
-		$this->assertEquals('iso-8859-5', $this->negotiate->charset(['iso-8859-5', 'unicode-1-1']));
-		$this->assertEquals('unicode-1-1', $this->negotiate->charset(['utf-8', 'unicode-1-1']));
-
-		// No match will default to utf-8
-		$this->assertEquals('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists()
-	{
-		$this->assertEquals('compress', $this->negotiate->encoding(['compress', 'gzip']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNegotiatesEncodingBasics()
-	{
-		$this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
-
-		$this->assertEquals('gzip', $this->negotiate->encoding(['gzip', 'compress']));
-		$this->assertEquals('compress', $this->negotiate->encoding(['compress']));
-		$this->assertEquals('identity', $this->negotiate->encoding());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAcceptLanguageBasics()
-	{
-		$this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
-
-		$this->assertEquals('da', $this->negotiate->language(['da', 'en']));
-		$this->assertEquals('en-gb', $this->negotiate->language(['en-gb', 'en']));
-		$this->assertEquals('en', $this->negotiate->language(['en']));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
-	 */
-	public function testAcceptLanguageMatchesBroadly()
-	{
-		$this->request->setHeader('Accept-Language', 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7');
-
-		$this->assertEquals('fr', $this->negotiate->language(['fr', 'en']));
-	}
-
-	public function testBestMatchEmpty()
-	{
-		$this->expectException(HTTPException::class);
-		$this->negotiate->media([]);
-	}
-
-	public function testBestMatchNoHeader()
-	{
-		$this->request->setHeader('Accept', '');
-		$this->assertEquals('', $this->negotiate->media(['apple', 'banana'], true));
-		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
-	}
-
-	public function testBestMatchNotAcceptable()
-	{
-		$this->request->setHeader('Accept', 'popcorn/cheddar');
-		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
-		$this->assertEquals('banana/yellow', $this->negotiate->media(['banana/yellow', 'apple/mac'], false));
-	}
-
-	public function testBestMatchFirstSupported()
-	{
-		$this->request->setHeader('Accept', 'popcorn/cheddar, */*');
-		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
-	}
-
-	public function testBestMatchLowQuality()
-	{
-		$this->request->setHeader('Accept', 'popcorn/cheddar;q=0, apple/mac, */*');
-		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
-		$this->assertEquals('apple/mac', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
-	}
-
-	public function testBestMatchOnlyLowQuality()
-	{
-		$this->request->setHeader('Accept', 'popcorn/cheddar;q=0');
-		// the first supported should be returned, since nothing will make us happy
-		$this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
-		$this->assertEquals('popcorn/cheddar', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
-	}
-
-	public function testParameterMatching()
-	{
-		$this->request->setHeader('Accept', 'popcorn/cheddar;a=0;b=1');
-		$this->assertEquals('popcorn/cheddar;a=2', $this->negotiate->media(['popcorn/cheddar;a=2'], false));
-		$this->assertEquals('popcorn/cheddar;a=0', $this->negotiate->media(['popcorn/cheddar;a=0', 'popcorn/cheddar;a=2;b=1'], false));
-	}
-
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * @var Negotiate
+     */
+    protected $negotiate;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->request = new Request(new App());
+
+        $this->negotiate = new Negotiate($this->request);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->request = $this->negotiate = null;
+        unset($this->request, $this->negotiate);
+    }
+
+    public function testNegotiateMediaFindsHighestMatch()
+    {
+        $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
+        $this->negotiate->setRequest($this->request);
+
+        $this->assertSame('text/html', $this->negotiate->media(['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
+        $this->assertSame('text/x-c', $this->negotiate->media(['text/x-c', 'text/x-dvi', 'text/plain']));
+        $this->assertSame('text/x-dvi', $this->negotiate->media(['text/plain', 'text/x-dvi']));
+        $this->assertSame('text/x-dvi', $this->negotiate->media(['text/x-dvi']));
+
+        // No matches? Return the first that we support...
+        $this->assertSame('text/md', $this->negotiate->media(['text/md']));
+    }
+
+    public function testParseHeaderDeterminesCorrectPrecedence()
+    {
+        $header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
+
+        $this->assertSame('text/plain', $header[0]['value']);
+        $this->assertSame('flowed', $header[0]['params']['format']);
+        $this->assertSame('text/plain', $header[1]['value']);
+        $this->assertSame('*/*', $header[3]['value']);
+    }
+
+    public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable()
+    {
+        $this->request->setHeader('Accept', 'image/*, text/*');
+
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
+    }
+
+    public function testNegotiateMediaRecognizesMediaTypes()
+    {
+        // Image has a higher specificity, but is the wrong type...
+        $this->request->setHeader('Accept', 'text/*, image/jpeg');
+
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
+    }
+
+    public function testNegotiateMediaSupportsStrictMatching()
+    {
+        // Image has a higher specificity, but is the wrong type...
+        $this->request->setHeader('Accept', 'text/md, image/jpeg');
+
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
+        $this->assertSame('', $this->negotiate->media(['text/plain'], true));
+    }
+
+    /**
+     * @group single
+     */
+    public function testAcceptCharsetMatchesBasics()
+    {
+        $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
+
+        $this->assertSame('iso-8859-5', $this->negotiate->charset(['iso-8859-5', 'unicode-1-1']));
+        $this->assertSame('unicode-1-1', $this->negotiate->charset(['utf-8', 'unicode-1-1']));
+
+        // No match will default to utf-8
+        $this->assertSame('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2']));
+    }
+
+    public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists()
+    {
+        $this->assertSame('compress', $this->negotiate->encoding(['compress', 'gzip']));
+    }
+
+    public function testNegotiatesEncodingBasics()
+    {
+        $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
+
+        $this->assertSame('gzip', $this->negotiate->encoding(['gzip', 'compress']));
+        $this->assertSame('compress', $this->negotiate->encoding(['compress']));
+        $this->assertSame('identity', $this->negotiate->encoding());
+    }
+
+    public function testAcceptLanguageBasics()
+    {
+        $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
+
+        $this->assertSame('da', $this->negotiate->language(['da', 'en']));
+        $this->assertSame('en-gb', $this->negotiate->language(['en-gb', 'en']));
+        $this->assertSame('en', $this->negotiate->language(['en']));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
+     */
+    public function testAcceptLanguageMatchesBroadly()
+    {
+        $this->request->setHeader('Accept-Language', 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7');
+
+        $this->assertSame('fr', $this->negotiate->language(['fr', 'en']));
+    }
+
+    public function testBestMatchEmpty()
+    {
+        $this->expectException(HTTPException::class);
+        $this->negotiate->media([]);
+    }
+
+    public function testBestMatchNoHeader()
+    {
+        $this->request->setHeader('Accept', '');
+        $this->assertSame('', $this->negotiate->media(['apple', 'banana'], true));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+    }
+
+    public function testBestMatchNotAcceptable()
+    {
+        $this->request->setHeader('Accept', 'popcorn/cheddar');
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+        $this->assertSame('banana/yellow', $this->negotiate->media(['banana/yellow', 'apple/mac'], false));
+    }
+
+    public function testBestMatchFirstSupported()
+    {
+        $this->request->setHeader('Accept', 'popcorn/cheddar, */*');
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+    }
+
+    public function testBestMatchLowQuality()
+    {
+        $this->request->setHeader('Accept', 'popcorn/cheddar;q=0, apple/mac, */*');
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
+    }
+
+    public function testBestMatchOnlyLowQuality()
+    {
+        $this->request->setHeader('Accept', 'popcorn/cheddar;q=0');
+        // the first supported should be returned, since nothing will make us happy
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
+        $this->assertSame('popcorn/cheddar', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
+    }
+
+    public function testParameterMatching()
+    {
+        $this->request->setHeader('Accept', 'popcorn/cheddar;a=0;b=1');
+        $this->assertSame('popcorn/cheddar;a=2', $this->negotiate->media(['popcorn/cheddar;a=2'], false));
+        $this->assertSame('popcorn/cheddar;a=0', $this->negotiate->media(['popcorn/cheddar;a=0', 'popcorn/cheddar;a=2;b=1'], false));
+    }
 }
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index a154b6fce3f1..0e8e49a74588 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
@@ -12,270 +21,257 @@
 use Config\Modules;
 use Config\Services;
 
-class RedirectResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RedirectResponseTest extends CIUnitTestCase
 {
-	/**
-	 * @var RouteCollection
-	 */
-	protected $routes;
-	protected $request;
-	protected $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		$this->config          = new App();
-		$this->config->baseURL = 'http://example.com/';
-
-		$this->routes = new RouteCollection(Services::locator(), new Modules());
-		Services::injectMock('routes', $this->routes);
-
-		$this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
-		Services::injectMock('request', $this->request);
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * @var RouteCollection
+     */
+    protected $routes;
+    protected $request;
+    protected $config;
 
-	public function testRedirectToFullURI()
-	{
-		$response = new RedirectResponse(new App());
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$response = $response->to('http://example.com/foo');
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$this->assertTrue($response->hasHeader('Location'));
-		$this->assertEquals('http://example.com/foo', $response->getHeaderLine('Location'));
-	}
+        $this->config          = new App();
+        $this->config->baseURL = 'http://example.com/';
 
-	//--------------------------------------------------------------------
+        $this->routes = new RouteCollection(Services::locator(), new Modules());
+        Services::injectMock('routes', $this->routes);
 
-	public function testRedirectRoute()
-	{
-		$response = new RedirectResponse(new App());
+        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        Services::injectMock('request', $this->request);
+    }
 
-		$this->routes->add('exampleRoute', 'Home::index');
+    public function testRedirectToFullURI()
+    {
+        $response = new RedirectResponse(new App());
 
-		$response->route('exampleRoute');
+        $response = $response->to('http://example.com/foo');
 
-		$this->assertTrue($response->hasHeader('Location'));
-		$this->assertEquals('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
+        $this->assertTrue($response->hasHeader('Location'));
+        $this->assertSame('http://example.com/foo', $response->getHeaderLine('Location'));
+    }
 
-		$this->routes->add('exampleRoute', 'Home::index', ['as' => 'home']);
+    public function testRedirectRoute()
+    {
+        $response = new RedirectResponse(new App());
 
-		$response->route('home');
+        $this->routes->add('exampleRoute', 'Home::index');
 
-		$this->assertTrue($response->hasHeader('Location'));
-		$this->assertEquals('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
-	}
+        $response->route('exampleRoute');
 
-	public function testRedirectRouteBad()
-	{
-		$this->expectException(HTTPException::class);
+        $this->assertTrue($response->hasHeader('Location'));
+        $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
 
-		$response = new RedirectResponse(new App());
+        $this->routes->add('exampleRoute', 'Home::index', ['as' => 'home']);
 
-		$this->routes->add('exampleRoute', 'Home::index');
+        $response->route('home');
 
-		$response->route('differentRoute');
-	}
+        $this->assertTrue($response->hasHeader('Location'));
+        $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
+    }
 
-	//--------------------------------------------------------------------
+    public function testRedirectRouteBad()
+    {
+        $this->expectException(HTTPException::class);
 
-	public function testRedirectRelativeConvertsToFullURI()
-	{
-		$response = new RedirectResponse($this->config);
+        $response = new RedirectResponse(new App());
 
-		$response = $response->to('/foo');
+        $this->routes->add('exampleRoute', 'Home::index');
 
-		$this->assertTrue($response->hasHeader('Location'));
-		$this->assertEquals('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
-	}
+        $response->route('differentRoute');
+    }
 
-	//--------------------------------------------------------------------
+    public function testRedirectRelativeConvertsToFullURI()
+    {
+        $response = new RedirectResponse($this->config);
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testWithInput()
-	{
-		$_SESSION = [];
-		$_GET     = ['foo' => 'bar'];
-		$_POST    = ['bar' => 'baz'];
+        $response = $response->to('/foo');
 
-		$response = new RedirectResponse(new App());
+        $this->assertTrue($response->hasHeader('Location'));
+        $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
+    }
 
-		$returned = $response->withInput();
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testWithInput()
+    {
+        $_SESSION = [];
+        $_GET     = ['foo' => 'bar'];
+        $_POST    = ['bar' => 'baz'];
 
-		$this->assertSame($response, $returned);
-		$this->assertArrayHasKey('_ci_old_input', $_SESSION);
-		$this->assertEquals('bar', $_SESSION['_ci_old_input']['get']['foo']);
-		$this->assertEquals('baz', $_SESSION['_ci_old_input']['post']['bar']);
-	}
+        $response = new RedirectResponse(new App());
 
-	//--------------------------------------------------------------------
+        $returned = $response->withInput();
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testWithValidationErrors()
-	{
-		$_SESSION = [];
+        $this->assertSame($response, $returned);
+        $this->assertArrayHasKey('_ci_old_input', $_SESSION);
+        $this->assertSame('bar', $_SESSION['_ci_old_input']['get']['foo']);
+        $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']);
+    }
 
-		$response = new RedirectResponse(new App());
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testWithValidationErrors()
+    {
+        $_SESSION = [];
 
-		$validation = $this->createMock(Validation::class);
-		$validation->method('getErrors')
-				->willReturn(['foo' => 'bar']);
+        $response = new RedirectResponse(new App());
 
-		Services::injectMock('validation', $validation);
+        $validation = $this->createMock(Validation::class);
+        $validation->method('getErrors')->willReturn(['foo' => 'bar']);
 
-		$response->withInput();
+        Services::injectMock('validation', $validation);
 
-		$this->assertArrayHasKey('_ci_validation_errors', $_SESSION);
-	}
+        $response->withInput();
 
-	//--------------------------------------------------------------------
+        $this->assertArrayHasKey('_ci_validation_errors', $_SESSION);
+    }
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testWith()
-	{
-		$_SESSION = [];
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testWith()
+    {
+        $_SESSION = [];
 
-		$response = new RedirectResponse(new App());
+        $response = new RedirectResponse(new App());
 
-		$returned = $response->with('foo', 'bar');
+        $returned = $response->with('foo', 'bar');
 
-		$this->assertSame($response, $returned);
-		$this->assertArrayHasKey('foo', $_SESSION);
-	}
+        $this->assertSame($response, $returned);
+        $this->assertArrayHasKey('foo', $_SESSION);
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testRedirectBack()
+    {
+        $_SERVER['HTTP_REFERER'] = 'http://somewhere.com';
+        $this->request           = new MockIncomingRequest($this->config, new URI('http://somewhere.com'), null, new UserAgent());
+        Services::injectMock('request', $this->request);
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testRedirectBack()
-	{
-		$_SERVER['HTTP_REFERER'] = 'http://somewhere.com';
-		$this->request           = new MockIncomingRequest($this->config, new URI('http://somewhere.com'), null, new UserAgent());
-		Services::injectMock('request', $this->request);
+        $response = new RedirectResponse(new App());
 
-		$response = new RedirectResponse(new App());
+        $returned = $response->back();
+        $this->assertSame('http://somewhere.com', $returned->header('location')->getValue());
+    }
 
-		$returned = $response->back();
-		$this->assertEquals('http://somewhere.com', $returned->header('location')->getValue());
-	}
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testRedirectBackMissing()
+    {
+        $_SESSION = [];
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testRedirectBackMissing()
-	{
-		$_SESSION = [];
+        $response = new RedirectResponse(new App());
 
-		$response = new RedirectResponse(new App());
+        $returned = $response->back();
 
-		$returned = $response->back();
+        $this->assertSame($response, $returned);
+    }
 
-		$this->assertSame($response, $returned);
-	}
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119
+     */
+    public function testRedirectRouteBaseUrl()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/test/';
+        Factories::injectMock('config', 'App', $config);
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2119
-	 */
-	public function testRedirectRouteBaseUrl()
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/test/';
-		Factories::injectMock('config', 'App', $config);
+        $request = new MockIncomingRequest($config, new URI('http://example.com/test/'), null, new UserAgent());
+        Services::injectMock('request', $request);
 
-		$request = new MockIncomingRequest($config, new URI('http://example.com/test/'), null, new UserAgent());
-		Services::injectMock('request', $request);
+        $response = new RedirectResponse(new App());
 
-		$response = new RedirectResponse(new App());
+        $this->routes->add('exampleRoute', 'Home::index');
 
-		$this->routes->add('exampleRoute', 'Home::index');
+        $response->route('exampleRoute');
 
-		$response->route('exampleRoute');
+        $this->assertTrue($response->hasHeader('Location'));
+        $this->assertSame('http://example.com/test/index.php/exampleRoute', $response->getHeaderLine('Location'));
 
-		$this->assertTrue($response->hasHeader('Location'));
-		$this->assertEquals('http://example.com/test/index.php/exampleRoute', $response->getHeaderLine('Location'));
+        Factories::reset('config');
+    }
 
-		Factories::reset('config');
-	}
+    public function testWithCookies()
+    {
+        $_SESSION = [];
 
-	public function testWithCookies()
-	{
-		$_SESSION = [];
+        $baseResponse = Services::response();
+        $baseResponse->setCookie('foo', 'bar');
 
-		$baseResponse = Services::response();
-		$baseResponse->setCookie('foo', 'bar');
+        $response = new RedirectResponse(new App());
+        $this->assertFalse($response->hasCookie('foo', 'bar'));
 
-		$response = new RedirectResponse(new App());
-		$this->assertFalse($response->hasCookie('foo', 'bar'));
+        $response = $response->withCookies();
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
+    }
 
-		$response = $response->withCookies();
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
-	}
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testWithCookiesWithEmptyCookies()
+    {
+        $_SESSION = [];
 
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testWithCookiesWithEmptyCookies()
-	{
-		$_SESSION = [];
+        $response = new RedirectResponse(new App());
+        $response = $response->withCookies();
 
-		$response = new RedirectResponse(new App());
-		$response = $response->withCookies();
+        $this->assertEmpty($response->getCookies());
+    }
 
-		$this->assertEmpty($response->getCookies());
-	}
+    public function testWithHeaders()
+    {
+        $_SESSION = [];
 
-	public function testWithHeaders()
-	{
-		$_SESSION = [];
+        $baseResponse = service('response');
+        $baseResponse->setHeader('foo', 'bar');
 
-		$baseResponse = service('response');
-		$baseResponse->setHeader('foo', 'bar');
+        $response = new RedirectResponse(new App());
+        $this->assertFalse($response->hasHeader('foo'));
 
-		$response = new RedirectResponse(new App());
-		$this->assertFalse($response->hasHeader('foo'));
+        $response = $response->withHeaders();
 
-		$response = $response->withHeaders();
+        foreach ($baseResponse->headers() as $name => $header) {
+            $this->assertTrue($response->hasHeader($name));
+            $this->assertSame($header->getValue(), $response->header($name)->getValue());
+        }
+    }
 
-		foreach ($baseResponse->headers() as $name => $header)
-		{
-			$this->assertTrue($response->hasHeader($name));
-			$this->assertEquals($header->getValue(), $response->header($name)->getValue());
-		}
-	}
+    public function testWithHeadersWithEmptyHeaders()
+    {
+        $_SESSION = [];
 
-	public function testWithHeadersWithEmptyHeaders()
-	{
-		$_SESSION = [];
+        $baseResponse = service('response');
 
-		$baseResponse = service('response');
-		foreach (array_keys($baseResponse->headers()) as $key)
-		{
-			$baseResponse->removeHeader($key);
-		}
+        foreach (array_keys($baseResponse->headers()) as $key) {
+            $baseResponse->removeHeader($key);
+        }
 
-		$response = new RedirectResponse(new App());
-		$response = $response->withHeaders();
+        $response = new RedirectResponse(new App());
+        $response = $response->withHeaders();
 
-		$this->assertEmpty($baseResponse->headers());
-	}
+        $this->assertEmpty($baseResponse->headers());
+    }
 }
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index ffc7282539dc..e4ad2d6bf340 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,676 +16,667 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class RequestTest extends CIUnitTestCase
+final class RequestTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var Request
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->request = new Request(new App());
-		$_POST         = [];
-		$_GET          = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalsSingleValue()
-	{
-		$_POST['foo'] = 'bar';
-		$_GET['bar']  = 'baz';
-
-		$this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
-		$this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
-	}
-
-	public function testFetchGlobalsReturnsNullWhenNotFound()
-	{
-		$this->assertNull($this->request->fetchGlobal('post', 'foo'));
-	}
-
-	public function testFetchGlobalsFiltersValues()
-	{
-		$this->request->setGlobal('post', [
-			'foo' => 'bar<script>',
-			'bar' => 'baz',
-		]);
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
-		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
-	}
-
-	public function testFetchGlobalsWithFilterFlag()
-	{
-		$this->request->setGlobal('post', [
-			'foo' => '`bar<script>',
-			'bar' => 'baz',
-		]);
-
-		$this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-		$this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
-	}
-
-	public function testFetchGlobalReturnsAllWhenEmpty()
-	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz',
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($post, $this->request->fetchGlobal('post'));
-	}
-
-	public function testFetchGlobalFiltersAllValues()
-	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
-	}
-
-	public function testFetchGlobalFilterWithFlagAllValues()
-	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-			'xxx' => 'yyy%3Cscript%3E',
-			'yyy' => 'zzz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	public function testFetchGlobalReturnsSelectedKeys()
-	{
-		$post = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-			'xxx' => 'yyy',
-			'yyy' => 'zzz',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
-	}
-
-	public function testFetchGlobalFiltersSelectedValues()
-	{
-		$post = [
-			'foo' => 'bar<script>',
-			'bar' => 'baz<script>',
-			'xxx' => 'yyy<script>',
-			'yyy' => 'zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
-	}
-
-	public function testFetchGlobalFilterWithFlagSelectedValues()
-	{
-		$post = [
-			'foo' => '`bar<script>',
-			'bar' => '`baz<script>',
-			'xxx' => '`yyy<script>',
-			'yyy' => '`zzz<script>',
-		];
-		$this->request->setGlobal('post', $post);
-		$expected = [
-			'foo' => 'bar%3Cscript%3E',
-			'bar' => 'baz%3Cscript%3E',
-		];
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/353
-	 */
-	public function testFetchGlobalReturnsArrayValues()
-	{
-		$post = [
-			'ANNOUNCEMENTS' => [
-				1 => [
-					'DETAIL' => 'asdf',
-				],
-				2 => [
-					'DETAIL' => 'sdfg',
-				],
-			],
-			'submit'        => 'SAVE',
-		];
-		$this->request->setGlobal('post', $post);
-		$result = $this->request->fetchGlobal('post');
-
-		$this->assertEquals($post, $result);
-		$this->assertIsArray($result['ANNOUNCEMENTS']);
-		$this->assertCount(2, $result['ANNOUNCEMENTS']);
-	}
-
-	public function testFetchGlobalWithArrayTop()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
-	}
-
-	public function testFetchGlobalWithArrayChildNumeric()
-	{
-		$post = [
-			'clients' => [
-				[
-					'address' => [
-						'zipcode' => 90210,
-					],
-				],
-				[
-					'address' => [
-						'zipcode' => 60610,
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
-	}
-
-	public function testFetchGlobalWithArrayChildElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
-		$this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
-	}
-
-	public function testFetchGlobalWithKeylessArrayChildElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-				'stuff'   => [['a']],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
-	}
-
-	public function testFetchGlobalWithArrayLastElement()
-	{
-		$post = [
-			'clients' => [
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
-	}
-
-	public function testFetchGlobalWithEmptyNotation()
-	{
-		$expected = [
-			[
-				'address' => [
-					'zipcode' => 90210,
-				],
-			],
-			[
-				'address' => [
-					'zipcode' => 60610,
-				],
-			],
-		];
-		$post     = [
-			'clients' => $expected,
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFetchGlobalFiltersWithNull()
-	{
-		$expected = [
-			'foo'     => false,
-			'number'  => 5,
-			'address' => [
-				'street'  => false,
-				'zipcode' => 91210,
-			],
-			'people'  => [
-				[
-					'name' => false,
-					'age'  => 26,
-					'pets' => [
-						'cats' => [
-							'name' => false,
-							'age'  => 3,
-						],
-					],
-				],
-				[
-					'name' => false,
-					'age'  => 23,
-					'pets' => [
-						'fishes' => [
-							'name' => false,
-							'age'  => 1,
-						],
-					],
-				],
-			],
-		];
-		$post     = [
-			'foo'     => 'bar',
-			'number'  => '5',
-			'address' => [
-				'street'  => 'Beverly Hills',
-				'zipcode' => '91210',
-			],
-			'people'  => [
-				[
-					'name' => 'Brandon',
-					'age'  => '26',
-					'pets' => [
-						'cats' => [
-							'name' => 'Simon',
-							'age'  => '3',
-						],
-					],
-				],
-				[
-					'name' => 'Brenda',
-					'age'  => '23',
-					'pets' => [
-						'fishes' => [
-							'name' => 'Nemo',
-							'age'  => '1',
-						],
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_VALIDATE_INT));
-	}
-
-	public function testFetchGlobalFiltersWithValue()
-	{
-		$expected = [
-			[
-				'name' => false,
-				'age'  => 26,
-				'pets' => [
-					'cats' => [
-						'name' => false,
-						'age'  => 3,
-					],
-				],
-			],
-			[
-				'name' => false,
-				'age'  => 23,
-				'pets' => [
-					'fishes' => [
-						'name' => false,
-						'age'  => 1,
-					],
-				],
-			],
-		];
-		$post     = [
-			'foo'     => 'bar',
-			'number'  => '5',
-			'address' => [
-				'street'  => 'Beverly Hills',
-				'zipcode' => '91210',
-			],
-			'people'  => [
-				[
-					'name' => 'Brandon',
-					'age'  => '26',
-					'pets' => [
-						'cats' => [
-							'name' => 'Simon',
-							'age'  => '3',
-						],
-					],
-				],
-				[
-					'name' => 'Brenda',
-					'age'  => '23',
-					'pets' => [
-						'fishes' => [
-							'name' => 'Nemo',
-							'age'  => '1',
-						],
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'people', FILTER_VALIDATE_INT));
-	}
-
-	public function testFetchGlobalFiltersWithValues()
-	{
-		$expected = [
-			'address' => [
-				'street'  => false,
-				'zipcode' => 91210,
-			],
-			'people'  => [
-				[
-					'name' => false,
-					'age'  => 26,
-					'pets' => [
-						'cats' => [
-							'name' => false,
-							'age'  => 3,
-						],
-					],
-				],
-				[
-					'name' => false,
-					'age'  => 23,
-					'pets' => [
-						'fishes' => [
-							'name' => false,
-							'age'  => 1,
-						],
-					],
-				],
-			],
-		];
-		$post     = [
-			'foo'     => 'bar',
-			'number'  => '5',
-			'address' => [
-				'street'  => 'Beverly Hills',
-				'zipcode' => '91210',
-			],
-			'people'  => [
-				[
-					'name' => 'Brandon',
-					'age'  => '26',
-					'pets' => [
-						'cats' => [
-							'name' => 'Simon',
-							'age'  => '3',
-						],
-					],
-				],
-				[
-					'name' => 'Brenda',
-					'age'  => '23',
-					'pets' => [
-						'fishes' => [
-							'name' => 'Nemo',
-							'age'  => '1',
-						],
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', ['address', 'people'], FILTER_VALIDATE_INT));
-	}
-
-	public function testFetchGlobalFiltersWithArrayChildElement()
-	{
-		$expected = [
-			'name' => false,
-			'age'  => 26,
-			'pets' => [
-				'cats' => [
-					'name' => false,
-					'age'  => 3,
-				],
-			],
-		];
-		$post     = [
-			'foo'     => 'bar',
-			'number'  => '5',
-			'address' => [
-				'street'  => 'Beverly Hills',
-				'zipcode' => '91210',
-			],
-			'people'  => [
-				[
-					'name' => 'Brandon',
-					'age'  => '26',
-					'pets' => [
-						'cats' => [
-							'name' => 'Simon',
-							'age'  => '3',
-						],
-					],
-				],
-				[
-					'name' => 'Brenda',
-					'age'  => '23',
-					'pets' => [
-						'fishes' => [
-							'name' => 'Nemo',
-							'age'  => '1',
-						],
-					],
-				],
-			],
-		];
-		$this->request->setGlobal('post', $post);
-
-		$this->assertEquals($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function ipAddressChecks()
-	{
-		return [
-			'empty'         => [
-				false,
-				'',
-			],
-			'zero'          => [
-				false,
-				0,
-			],
-			'large_ipv4'    => [
-				false,
-				'256.256.256.999',
-				'ipv4',
-			],
-			'good_ipv4'     => [
-				true,
-				'100.100.100.0',
-				'ipv4',
-			],
-			'good_default'  => [
-				true,
-				'100.100.100.0',
-			],
-			'zeroed_ipv4'   => [
-				true,
-				'0.0.0.0',
-			],
-			'large_ipv6'    => [
-				false,
-				'h123:0000:0000:0000:0000:0000:0000:0000',
-				'ipv6',
-			],
-			'good_ipv6'     => [
-				true,
-				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-			],
-			'confused_ipv6' => [
-				false,
-				'255.255.255.255',
-				'ipv6',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider ipAddressChecks
-	 */
-	public function testValidIPAddress($expected, $address, $type = null)
-	{
-		$this->assertEquals($expected, $this->request->isValidIP($address, $type));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetIPAddressDefault()
-	{
-		$this->assertEquals('0.0.0.0', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressNormal()
-	{
-		$expected               = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR'] = $expected;
-		$this->request          = new Request(new App());
-		$this->assertEquals($expected, $this->request->getIPAddress());
-		// call a second time to exercise the initial conditional block in getIPAddress()
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxy()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyInvalid()
-	{
-		$expected                        = '123.456.23.123';
-		$_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// spoofed address invalid
-		$this->assertEquals('10.0.1.200', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyNotWhitelisted()
-	{
-		$expected                        = '123.456.23.123';
-		$_SERVER['REMOTE_ADDR']          = '10.10.1.200';
-		$config                          = new App();
-		$config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// spoofed address invalid
-		$this->assertEquals('10.10.1.200', $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxySubnet()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-		$config                          = new App();
-		$config->proxyIPs                = ['192.168.5.0/24'];
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals($expected, $this->request->getIPAddress());
-	}
-
-	public function testGetIPAddressThruProxyOutofSubnet()
-	{
-		$expected                        = '123.123.123.123';
-		$_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-		$config                          = new App();
-		$config->proxyIPs                = ['192.168.5.0/28'];
-		$_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-		$this->request                   = new Request($config);
-
-		// we should see the original forwarded address
-		$this->assertEquals('192.168.5.21', $this->request->getIPAddress());
-	}
-
-	//FIXME getIPAddress should have more testing, to 100% code coverage
-
-	//--------------------------------------------------------------------
-
-	public function testMethodReturnsRightStuff()
-	{
-		// Defaults method to GET now.
-		$this->assertEquals('get', $this->request->getMethod());
-		$this->assertEquals('GET', $this->request->getMethod(true));
-	}
-
+    /**
+     * @var Request
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->request = new Request(new App());
+
+        $_POST = [];
+        $_GET  = [];
+    }
+
+    public function testFetchGlobalsSingleValue()
+    {
+        $_POST['foo'] = 'bar';
+        $_GET['bar']  = 'baz';
+
+        $this->assertSame('bar', $this->request->fetchGlobal('post', 'foo'));
+        $this->assertSame('baz', $this->request->fetchGlobal('get', 'bar'));
+    }
+
+    public function testFetchGlobalsReturnsNullWhenNotFound()
+    {
+        $this->assertNull($this->request->fetchGlobal('post', 'foo'));
+    }
+
+    public function testFetchGlobalsFiltersValues()
+    {
+        $this->request->setGlobal('post', [
+            'foo' => 'bar<script>',
+            'bar' => 'baz',
+        ]);
+
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
+    }
+
+    public function testFetchGlobalsWithFilterFlag()
+    {
+        $this->request->setGlobal('post', [
+            'foo' => '`bar<script>',
+            'bar' => 'baz',
+        ]);
+
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
+    }
+
+    public function testFetchGlobalReturnsAllWhenEmpty()
+    {
+        $post = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+            'xxx' => 'yyy',
+            'yyy' => 'zzz',
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($post, $this->request->fetchGlobal('post'));
+    }
+
+    public function testFetchGlobalFiltersAllValues()
+    {
+        $post = [
+            'foo' => 'bar<script>',
+            'bar' => 'baz<script>',
+            'xxx' => 'yyy<script>',
+            'yyy' => 'zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+            'xxx' => 'yyy%3Cscript%3E',
+            'yyy' => 'zzz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+    }
+
+    public function testFetchGlobalFilterWithFlagAllValues()
+    {
+        $post = [
+            'foo' => '`bar<script>',
+            'bar' => '`baz<script>',
+            'xxx' => '`yyy<script>',
+            'yyy' => '`zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+            'xxx' => 'yyy%3Cscript%3E',
+            'yyy' => 'zzz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+    }
+
+    public function testFetchGlobalReturnsSelectedKeys()
+    {
+        $post = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+            'xxx' => 'yyy',
+            'yyy' => 'zzz',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+    }
+
+    public function testFetchGlobalFiltersSelectedValues()
+    {
+        $post = [
+            'foo' => 'bar<script>',
+            'bar' => 'baz<script>',
+            'xxx' => 'yyy<script>',
+            'yyy' => 'zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+    }
+
+    public function testFetchGlobalFilterWithFlagSelectedValues()
+    {
+        $post = [
+            'foo' => '`bar<script>',
+            'bar' => '`baz<script>',
+            'xxx' => '`yyy<script>',
+            'yyy' => '`zzz<script>',
+        ];
+        $this->request->setGlobal('post', $post);
+        $expected = [
+            'foo' => 'bar%3Cscript%3E',
+            'bar' => 'baz%3Cscript%3E',
+        ];
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/353
+     */
+    public function testFetchGlobalReturnsArrayValues()
+    {
+        $post = [
+            'ANNOUNCEMENTS' => [
+                1 => ['DETAIL' => 'asdf'],
+                2 => ['DETAIL' => 'sdfg'],
+            ],
+            'submit' => 'SAVE',
+        ];
+        $this->request->setGlobal('post', $post);
+        $result = $this->request->fetchGlobal('post');
+
+        $this->assertSame($post, $result);
+        $this->assertIsArray($result['ANNOUNCEMENTS']);
+        $this->assertCount(2, $result['ANNOUNCEMENTS']);
+    }
+
+    public function testFetchGlobalWithArrayTop()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
+    }
+
+    public function testFetchGlobalWithArrayChildNumeric()
+    {
+        $post = [
+            'clients' => [
+                [
+                    'address' => [
+                        'zipcode' => 90210,
+                    ],
+                ],
+                [
+                    'address' => [
+                        'zipcode' => 60610,
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
+    }
+
+    public function testFetchGlobalWithArrayChildElement()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+        $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
+    }
+
+    public function testFetchGlobalWithKeylessArrayChildElement()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+                'stuff' => [['a']],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
+    }
+
+    public function testFetchGlobalWithArrayLastElement()
+    {
+        $post = [
+            'clients' => [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame('90210', $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+    }
+
+    public function testFetchGlobalWithEmptyNotation()
+    {
+        $expected = [
+            [
+                'address' => [
+                    'zipcode' => 90210,
+                ],
+            ],
+            [
+                'address' => [
+                    'zipcode' => 60610,
+                ],
+            ],
+        ];
+        $post = [
+            'clients' => $expected,
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
+    }
+
+    public function testFetchGlobalFiltersWithNull()
+    {
+        $expected = [
+            'foo'     => false,
+            'number'  => 5,
+            'address' => [
+                'street'  => false,
+                'zipcode' => 91210,
+            ],
+            'people' => [
+                [
+                    'name' => false,
+                    'age'  => 26,
+                    'pets' => [
+                        'cats' => [
+                            'name' => false,
+                            'age'  => 3,
+                        ],
+                    ],
+                ],
+                [
+                    'name' => false,
+                    'age'  => 23,
+                    'pets' => [
+                        'fishes' => [
+                            'name' => false,
+                            'age'  => 1,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $post = [
+            'foo'     => 'bar',
+            'number'  => '5',
+            'address' => [
+                'street'  => 'Beverly Hills',
+                'zipcode' => '91210',
+            ],
+            'people' => [
+                [
+                    'name' => 'Brandon',
+                    'age'  => '26',
+                    'pets' => [
+                        'cats' => [
+                            'name' => 'Simon',
+                            'age'  => '3',
+                        ],
+                    ],
+                ],
+                [
+                    'name' => 'Brenda',
+                    'age'  => '23',
+                    'pets' => [
+                        'fishes' => [
+                            'name' => 'Nemo',
+                            'age'  => '1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_VALIDATE_INT));
+    }
+
+    public function testFetchGlobalFiltersWithValue()
+    {
+        $expected = [
+            [
+                'name' => false,
+                'age'  => 26,
+                'pets' => [
+                    'cats' => [
+                        'name' => false,
+                        'age'  => 3,
+                    ],
+                ],
+            ],
+            [
+                'name' => false,
+                'age'  => 23,
+                'pets' => [
+                    'fishes' => [
+                        'name' => false,
+                        'age'  => 1,
+                    ],
+                ],
+            ],
+        ];
+        $post = [
+            'foo'     => 'bar',
+            'number'  => '5',
+            'address' => [
+                'street'  => 'Beverly Hills',
+                'zipcode' => '91210',
+            ],
+            'people' => [
+                [
+                    'name' => 'Brandon',
+                    'age'  => '26',
+                    'pets' => [
+                        'cats' => [
+                            'name' => 'Simon',
+                            'age'  => '3',
+                        ],
+                    ],
+                ],
+                [
+                    'name' => 'Brenda',
+                    'age'  => '23',
+                    'pets' => [
+                        'fishes' => [
+                            'name' => 'Nemo',
+                            'age'  => '1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'people', FILTER_VALIDATE_INT));
+    }
+
+    public function testFetchGlobalFiltersWithValues()
+    {
+        $expected = [
+            'address' => [
+                'street'  => false,
+                'zipcode' => 91210,
+            ],
+            'people' => [
+                [
+                    'name' => false,
+                    'age'  => 26,
+                    'pets' => [
+                        'cats' => [
+                            'name' => false,
+                            'age'  => 3,
+                        ],
+                    ],
+                ],
+                [
+                    'name' => false,
+                    'age'  => 23,
+                    'pets' => [
+                        'fishes' => [
+                            'name' => false,
+                            'age'  => 1,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $post = [
+            'foo'     => 'bar',
+            'number'  => '5',
+            'address' => [
+                'street'  => 'Beverly Hills',
+                'zipcode' => '91210',
+            ],
+            'people' => [
+                [
+                    'name' => 'Brandon',
+                    'age'  => '26',
+                    'pets' => [
+                        'cats' => [
+                            'name' => 'Simon',
+                            'age'  => '3',
+                        ],
+                    ],
+                ],
+                [
+                    'name' => 'Brenda',
+                    'age'  => '23',
+                    'pets' => [
+                        'fishes' => [
+                            'name' => 'Nemo',
+                            'age'  => '1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['address', 'people'], FILTER_VALIDATE_INT));
+    }
+
+    public function testFetchGlobalFiltersWithArrayChildElement()
+    {
+        $expected = [
+            'name' => false,
+            'age'  => 26,
+            'pets' => [
+                'cats' => [
+                    'name' => false,
+                    'age'  => 3,
+                ],
+            ],
+        ];
+        $post = [
+            'foo'     => 'bar',
+            'number'  => '5',
+            'address' => [
+                'street'  => 'Beverly Hills',
+                'zipcode' => '91210',
+            ],
+            'people' => [
+                [
+                    'name' => 'Brandon',
+                    'age'  => '26',
+                    'pets' => [
+                        'cats' => [
+                            'name' => 'Simon',
+                            'age'  => '3',
+                        ],
+                    ],
+                ],
+                [
+                    'name' => 'Brenda',
+                    'age'  => '23',
+                    'pets' => [
+                        'fishes' => [
+                            'name' => 'Nemo',
+                            'age'  => '1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+        $this->request->setGlobal('post', $post);
+
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT));
+    }
+
+    public function ipAddressChecks()
+    {
+        return [
+            'empty' => [
+                false,
+                '',
+            ],
+            'zero' => [
+                false,
+                0,
+            ],
+            'large_ipv4' => [
+                false,
+                '256.256.256.999',
+                'ipv4',
+            ],
+            'good_ipv4' => [
+                true,
+                '100.100.100.0',
+                'ipv4',
+            ],
+            'good_default' => [
+                true,
+                '100.100.100.0',
+            ],
+            'zeroed_ipv4' => [
+                true,
+                '0.0.0.0',
+            ],
+            'large_ipv6' => [
+                false,
+                'h123:0000:0000:0000:0000:0000:0000:0000',
+                'ipv6',
+            ],
+            'good_ipv6' => [
+                true,
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+            ],
+            'confused_ipv6' => [
+                false,
+                '255.255.255.255',
+                'ipv6',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider ipAddressChecks
+     *
+     * @param mixed      $expected
+     * @param mixed      $address
+     * @param mixed|null $type
+     */
+    public function testValidIPAddress($expected, $address, $type = null)
+    {
+        $this->assertSame($expected, $this->request->isValidIP($address, $type));
+    }
+
+    public function testGetIPAddressDefault()
+    {
+        $this->assertSame('0.0.0.0', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressNormal()
+    {
+        $expected               = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR'] = $expected;
+        $this->request          = new Request(new App());
+        $this->assertSame($expected, $this->request->getIPAddress());
+        // call a second time to exercise the initial conditional block in getIPAddress()
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxy()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyInvalid()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyNotWhitelisted()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.10.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxySubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/24'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyOutofSubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/28'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
+    }
+
+    // FIXME getIPAddress should have more testing, to 100% code coverage
+
+    public function testMethodReturnsRightStuff()
+    {
+        // Defaults method to GET now.
+        $this->assertSame('get', $this->request->getMethod());
+        $this->assertSame('GET', $this->request->getMethod(true));
+    }
 }
diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
index aaa92a57871a..721a2fbd47b7 100644
--- a/tests/system/HTTP/ResponseCookieTest.php
+++ b/tests/system/HTTP/ResponseCookieTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Cookie\Cookie;
@@ -13,292 +23,292 @@
  */
 final class ResponseCookieTest extends CIUnitTestCase
 {
-	/**
-	 * @var array
-	 */
-	private $defaults;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->defaults = Cookie::setDefaults();
-	}
-
-	protected function tearDown(): void
-	{
-		Cookie::setDefaults($this->defaults);
-	}
-
-	public function testCookiePrefixed()
-	{
-		$config         = config('Cookie');
-		$config->prefix = 'mine';
-		$response       = new Response(new App());
-		$response->setCookie('foo', 'bar');
-
-		$this->assertInstanceOf(Cookie::class, $response->getCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
-		$this->assertTrue($response->hasCookie('foo', 'bar', 'mine'));
-		$this->assertTrue($response->hasCookie('foo', null, 'mine'));
-		$this->assertFalse($response->hasCookie('foo', null, 'yours'));
-	}
-
-	public function testCookiesAll()
-	{
-		$response = new Response(new App());
-		$response->setCookie('foo', 'bar');
-		$response->setCookie('bee', 'bop');
-
-		$this->assertCount(2, $response->getCookies());
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('bee'));
-	}
-
-	public function testCookieGet()
-	{
-		$response = new Response(new App());
-		$response->setCookie('foo', 'bar');
-		$response->setCookie('bee', 'bop');
-
-		$this->assertCount(2, $response->getCookie());
-		$this->assertNull($response->getCookie('bogus'));
-	}
-
-	public function testCookieDomain()
-	{
-		$response = new Response(new App());
-
-		$response->setCookie('foo', 'bar');
-		$cookie = $response->getCookie('foo');
-		$this->assertSame('', $cookie->getDomain());
-
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'domain' => 'somewhere.com']);
-		$cookie = $response->getCookie('bee');
-		$this->assertSame('somewhere.com', $cookie->getDomain());
-
-		$config         = config('Cookie');
-		$config->domain = 'mine.com';
-		$response       = new Response(new App());
-		$response->setCookie('alu', 'la');
-		$cookie = $response->getCookie('alu');
-		$this->assertSame('mine.com', $cookie->getDomain());
-	}
-
-	public function testCookiePath()
-	{
-		$response = new Response(new App());
-
-		$response->setCookie('foo', 'bar');
-		$cookie = $response->getCookie('foo');
-		$this->assertSame('/', $cookie->getPath());
-
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'path' => '/tmp/here']);
-		$cookie = $response->getCookie('bee');
-		$this->assertSame('/tmp/here', $cookie->getPath());
-	}
-
-	public function testCookieSecure()
-	{
-		$response = new Response(new App());
-
-		$response->setCookie('foo', 'bar');
-		$cookie = $response->getCookie('foo');
-		$this->assertFalse($cookie->isSecure());
-
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'secure' => true]);
-		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie->isSecure());
-	}
-
-	public function testCookieHTTPOnly()
-	{
-		$response = new Response(new App());
-
-		$response->setCookie('foo', 'bar');
-		$cookie = $response->getCookie('foo');
-		$this->assertFalse($cookie->isHTTPOnly());
-
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'httponly' => true]);
-		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie->isHTTPOnly());
-	}
-
-	public function testCookieExpiry()
-	{
-		$response = new Response(new App());
-
-		$response->setCookie('foo', 'bar');
-		$cookie = $response->getCookie('foo');
-		$this->assertTrue($cookie->isExpired());
-
-		$response = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$cookie = $response->getCookie('bee');
-		$this->assertFalse($cookie->isExpired());
-
-		$response = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => -1000]);
-		$cookie = $response->getCookie('bee');
-		$this->assertSame(0, $cookie->getExpiresTimestamp());
-	}
-
-	public function testCookieDelete()
-	{
-		$response = new Response(new App());
-
-		// foo is already expired, bee will stick around
-		$response->setCookie('foo', 'bar');
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$cookie = $response->getCookie('bee');
-		$this->assertFalse($cookie->isExpired());
-
-		// delete cookie manually
-		$response = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => '']);
-		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
-
-		// delete with no effect
-		$response = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$response->deleteCookie();
-		$cookie = $response->getCookie('bee');
-		$this->assertFalse($cookie->isExpired());
-
-		// delete cookie for real
-		$response = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$response->deleteCookie('bee');
-		$cookie = $response->getCookie('bee');
-		$this->assertTrue($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
-
-		$config = config('Cookie');
-		// delete cookie for real, with prefix
-		$config->prefix = 'mine';
-		$response       = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$response->deleteCookie('bee');
-		$cookie = $response->getCookie('bee');
-		$this->assertSame($cookie->getExpiresTimestamp(), 0);
-
-		// delete cookie with wrong prefix?
-		$config->prefix = 'mine';
-		$response       = new Response(new App());
-		$response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
-		$response->deleteCookie('bee', '', '', 'wrong');
-		$cookie = $response->getCookie('bee');
-		$this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
-		$response->deleteCookie('bee', '', '', 'mine');
-		$cookie = $response->getCookie('bee');
-		$this->assertSame($cookie->getExpiresTimestamp(), 0);
-
-		// delete cookie with wrong domain?
-		$config->domain = '.mine.com';
-		$response       = new Response(new App());
-		$response->setCookie(['name' => 'bees', 'value' => 'bop', 'expire' => 1000]);
-		$response->deleteCookie('bees', 'wrong', '', '');
-		$cookie = $response->getCookie('bees');
-		$this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
-		$response->deleteCookie('bees', '.mine.com', '', '');
-		$cookie = $response->getCookie('bees');
-		$this->assertSame($cookie->getExpiresTimestamp(), 0);
-	}
-
-	public function testCookieDefaultSetSameSite()
-	{
-		$response = new Response(new App());
-		$response->setCookie([
-			'name'  => 'bar',
-			'value' => 'foo',
-		]);
-
-		$allCookies = $response->getCookies();
-		$this->assertCount(1, $allCookies);
-		$this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
-		$this->assertSame('Lax', $allCookies['bar;/;']->getSameSite());
-	}
-
-	public function testCookieStrictSetSameSite()
-	{
-		$config           = config('Cookie');
-		$config->samesite = 'Strict';
-		$response         = new Response(new App());
-		$response->setCookie([
-			'name'  => 'bar',
-			'value' => 'foo',
-		]);
-
-		$allCookies = $response->getCookies();
-		$this->assertCount(1, $allCookies);
-		$this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
-		$this->assertSame('Strict', $allCookies['bar;/;']->getSameSite());
-	}
-
-	public function testCookieBlankSetSameSite()
-	{
-		$config           = config('Cookie');
-		$config->samesite = '';
-		$response         = new Response(new App());
-		$response->setCookie([
-			'name'  => 'bar',
-			'value' => 'foo',
-		]);
-
-		$allCookies = $response->getCookies();
-		$this->assertCount(1, $allCookies);
-		$this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
-		$this->assertSame('', $allCookies['bar;/;']->getSameSite());
-	}
-
-	public function testCookieWithoutSameSite()
-	{
-		$config = new CookieConfig();
-		unset($config->samesite);
-		$response = new Response(new App());
-		$response->setCookie([
-			'name'  => 'bar',
-			'value' => 'foo',
-		]);
-
-		$allCookies = $response->getCookies();
-		$this->assertCount(1, $allCookies);
-		$this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
-		$this->assertSame('Lax', $allCookies['bar;/;']->getSameSite());
-	}
-
-	public function testCookieStrictSameSite()
-	{
-		$response = new Response(new App());
-		$response->setCookie([
-			'name'     => 'bar',
-			'value'    => 'foo',
-			'samesite' => 'Strict',
-		]);
-
-		$allCookies = $response->getCookies();
-		$this->assertCount(1, $allCookies);
-		$this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
-		$this->assertSame('Strict', $allCookies['bar;/;']->getSameSite());
-	}
-
-	public function testCookieInvalidSameSite()
-	{
-		$response = new Response(new App());
-
-		$this->expectException(CookieException::class);
-		$this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
-
-		$response->setCookie([
-			'name'     => 'bar',
-			'value'    => 'foo',
-			'samesite' => 'Invalid',
-		]);
-	}
-
-	public function testGetCookieStore()
-	{
-		$response = new Response(new App());
-		$this->assertInstanceOf(CookieStore::class, $response->getCookieStore());
-	}
+    /**
+     * @var array
+     */
+    private $defaults;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->defaults = Cookie::setDefaults();
+    }
+
+    protected function tearDown(): void
+    {
+        Cookie::setDefaults($this->defaults);
+    }
+
+    public function testCookiePrefixed()
+    {
+        $config         = config('Cookie');
+        $config->prefix = 'mine';
+        $response       = new Response(new App());
+        $response->setCookie('foo', 'bar');
+
+        $this->assertInstanceOf(Cookie::class, $response->getCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
+        $this->assertTrue($response->hasCookie('foo', 'bar', 'mine'));
+        $this->assertTrue($response->hasCookie('foo', null, 'mine'));
+        $this->assertFalse($response->hasCookie('foo', null, 'yours'));
+    }
+
+    public function testCookiesAll()
+    {
+        $response = new Response(new App());
+        $response->setCookie('foo', 'bar');
+        $response->setCookie('bee', 'bop');
+
+        $this->assertCount(2, $response->getCookies());
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('bee'));
+    }
+
+    public function testCookieGet()
+    {
+        $response = new Response(new App());
+        $response->setCookie('foo', 'bar');
+        $response->setCookie('bee', 'bop');
+
+        $this->assertCount(2, $response->getCookie());
+        $this->assertNull($response->getCookie('bogus'));
+    }
+
+    public function testCookieDomain()
+    {
+        $response = new Response(new App());
+
+        $response->setCookie('foo', 'bar');
+        $cookie = $response->getCookie('foo');
+        $this->assertSame('', $cookie->getDomain());
+
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'domain' => 'somewhere.com']);
+        $cookie = $response->getCookie('bee');
+        $this->assertSame('somewhere.com', $cookie->getDomain());
+
+        $config         = config('Cookie');
+        $config->domain = 'mine.com';
+        $response       = new Response(new App());
+        $response->setCookie('alu', 'la');
+        $cookie = $response->getCookie('alu');
+        $this->assertSame('mine.com', $cookie->getDomain());
+    }
+
+    public function testCookiePath()
+    {
+        $response = new Response(new App());
+
+        $response->setCookie('foo', 'bar');
+        $cookie = $response->getCookie('foo');
+        $this->assertSame('/', $cookie->getPath());
+
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'path' => '/tmp/here']);
+        $cookie = $response->getCookie('bee');
+        $this->assertSame('/tmp/here', $cookie->getPath());
+    }
+
+    public function testCookieSecure()
+    {
+        $response = new Response(new App());
+
+        $response->setCookie('foo', 'bar');
+        $cookie = $response->getCookie('foo');
+        $this->assertFalse($cookie->isSecure());
+
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'secure' => true]);
+        $cookie = $response->getCookie('bee');
+        $this->assertTrue($cookie->isSecure());
+    }
+
+    public function testCookieHTTPOnly()
+    {
+        $response = new Response(new App());
+
+        $response->setCookie('foo', 'bar');
+        $cookie = $response->getCookie('foo');
+        $this->assertFalse($cookie->isHTTPOnly());
+
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'httponly' => true]);
+        $cookie = $response->getCookie('bee');
+        $this->assertTrue($cookie->isHTTPOnly());
+    }
+
+    public function testCookieExpiry()
+    {
+        $response = new Response(new App());
+
+        $response->setCookie('foo', 'bar');
+        $cookie = $response->getCookie('foo');
+        $this->assertTrue($cookie->isExpired());
+
+        $response = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $cookie = $response->getCookie('bee');
+        $this->assertFalse($cookie->isExpired());
+
+        $response = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => -1000]);
+        $cookie = $response->getCookie('bee');
+        $this->assertSame(0, $cookie->getExpiresTimestamp());
+    }
+
+    public function testCookieDelete()
+    {
+        $response = new Response(new App());
+
+        // foo is already expired, bee will stick around
+        $response->setCookie('foo', 'bar');
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $cookie = $response->getCookie('bee');
+        $this->assertFalse($cookie->isExpired());
+
+        // delete cookie manually
+        $response = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => '']);
+        $cookie = $response->getCookie('bee');
+        $this->assertTrue($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
+
+        // delete with no effect
+        $response = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $response->deleteCookie();
+        $cookie = $response->getCookie('bee');
+        $this->assertFalse($cookie->isExpired());
+
+        // delete cookie for real
+        $response = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $response->deleteCookie('bee');
+        $cookie = $response->getCookie('bee');
+        $this->assertTrue($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
+
+        $config = config('Cookie');
+        // delete cookie for real, with prefix
+        $config->prefix = 'mine';
+        $response       = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $response->deleteCookie('bee');
+        $cookie = $response->getCookie('bee');
+        $this->assertSame($cookie->getExpiresTimestamp(), 0);
+
+        // delete cookie with wrong prefix?
+        $config->prefix = 'mine';
+        $response       = new Response(new App());
+        $response->setCookie(['name' => 'bee', 'value' => 'bop', 'expire' => 1000]);
+        $response->deleteCookie('bee', '', '', 'wrong');
+        $cookie = $response->getCookie('bee');
+        $this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
+        $response->deleteCookie('bee', '', '', 'mine');
+        $cookie = $response->getCookie('bee');
+        $this->assertSame($cookie->getExpiresTimestamp(), 0);
+
+        // delete cookie with wrong domain?
+        $config->domain = '.mine.com';
+        $response       = new Response(new App());
+        $response->setCookie(['name' => 'bees', 'value' => 'bop', 'expire' => 1000]);
+        $response->deleteCookie('bees', 'wrong', '', '');
+        $cookie = $response->getCookie('bees');
+        $this->assertFalse($cookie->isExpired(), $cookie->getExpiresTimestamp() . ' should be less than ' . time());
+        $response->deleteCookie('bees', '.mine.com', '', '');
+        $cookie = $response->getCookie('bees');
+        $this->assertSame($cookie->getExpiresTimestamp(), 0);
+    }
+
+    public function testCookieDefaultSetSameSite()
+    {
+        $response = new Response(new App());
+        $response->setCookie([
+            'name'  => 'bar',
+            'value' => 'foo',
+        ]);
+
+        $allCookies = $response->getCookies();
+        $this->assertCount(1, $allCookies);
+        $this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
+        $this->assertSame('Lax', $allCookies['bar;/;']->getSameSite());
+    }
+
+    public function testCookieStrictSetSameSite()
+    {
+        $config           = config('Cookie');
+        $config->samesite = 'Strict';
+        $response         = new Response(new App());
+        $response->setCookie([
+            'name'  => 'bar',
+            'value' => 'foo',
+        ]);
+
+        $allCookies = $response->getCookies();
+        $this->assertCount(1, $allCookies);
+        $this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
+        $this->assertSame('Strict', $allCookies['bar;/;']->getSameSite());
+    }
+
+    public function testCookieBlankSetSameSite()
+    {
+        $config           = config('Cookie');
+        $config->samesite = '';
+        $response         = new Response(new App());
+        $response->setCookie([
+            'name'  => 'bar',
+            'value' => 'foo',
+        ]);
+
+        $allCookies = $response->getCookies();
+        $this->assertCount(1, $allCookies);
+        $this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
+        $this->assertSame('', $allCookies['bar;/;']->getSameSite());
+    }
+
+    public function testCookieWithoutSameSite()
+    {
+        $config = new CookieConfig();
+        unset($config->samesite);
+        $response = new Response(new App());
+        $response->setCookie([
+            'name'  => 'bar',
+            'value' => 'foo',
+        ]);
+
+        $allCookies = $response->getCookies();
+        $this->assertCount(1, $allCookies);
+        $this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
+        $this->assertSame('Lax', $allCookies['bar;/;']->getSameSite());
+    }
+
+    public function testCookieStrictSameSite()
+    {
+        $response = new Response(new App());
+        $response->setCookie([
+            'name'     => 'bar',
+            'value'    => 'foo',
+            'samesite' => 'Strict',
+        ]);
+
+        $allCookies = $response->getCookies();
+        $this->assertCount(1, $allCookies);
+        $this->assertInstanceOf(Cookie::class, $allCookies['bar;/;']);
+        $this->assertSame('Strict', $allCookies['bar;/;']->getSameSite());
+    }
+
+    public function testCookieInvalidSameSite()
+    {
+        $response = new Response(new App());
+
+        $this->expectException(CookieException::class);
+        $this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
+
+        $response->setCookie([
+            'name'     => 'bar',
+            'value'    => 'foo',
+            'samesite' => 'Invalid',
+        ]);
+    }
+
+    public function testGetCookieStore()
+    {
+        $response = new Response(new App());
+        $this->assertInstanceOf(CookieStore::class, $response->getCookieStore());
+    }
 }
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 8332d72a9850..5fedc69da7b1 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -9,130 +19,120 @@
  * TestCaseTest because it messes with output
  * buffering from PHPUnit, and the individual
  * test cases need to be run as separate processes.
+ *
+ * @internal
  */
-class ResponseSendTest extends CIUnitTestCase
+final class ResponseSendTest extends CIUnitTestCase
 {
-
-	/**
-	 * These need to be run as a separate process, since phpunit
-	 * has already captured the "normal" output, and we will get
-	 * a "Cannot modify headers" message if we try to change
-	 * headers or cookies now.
-	 *
-	 * Furthermore, these tests needs to flush the output buffering
-	 * that might be in progress, and start our own output buffer
-	 * capture.
-	 *
-	 * The tests includes a basic sanity check, to make sure that
-	 * the body we thought would be sent actually was.
-	 */
-	//--------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeadersMissingDate()
-	{
-		$response = new Response(new App());
-		$response->pretend(false);
-
-		$body = 'Hello';
-		$response->setBody($body);
-
-		$response->setCookie('foo', 'bar');
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
-
-		// Drop the date header, to make sure it gets put back in
-		$response->removeHeader('Date');
-
-		// send it
-		ob_start();
-		$response->send();
-
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-
-		// and what actually got sent?
-		$this->assertHeaderEmitted('Date:');
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * This test does not test that CSP is handled properly -
-	 * it makes sure that sending gives CSP a chance to do its thing.
-	 *
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeadersWithCSP()
-	{
-		$config             = new App();
-		$config->CSPEnabled = true;
-		$response           = new Response($config);
-		$response->pretend(false);
-
-		$body = 'Hello';
-		$response->setBody($body);
-
-		$response->setCookie('foo', 'bar');
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
-
-		// send it
-		ob_start();
-		$response->send();
-
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-
-		// and what actually got sent?; test both ways
-		$this->assertHeaderEmitted('Content-Security-Policy:');
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	// Make sure cookies are set by RedirectResponse this way
-	// See https://github.com/codeigniter4/CodeIgniter4/issues/1393
-	public function testRedirectResponseCookies()
-	{
-		$loginTime = time();
-
-		$response = new Response(new App());
-		$response->pretend(false);
-
-		$routes = service('routes');
-		$routes->add('user/login', 'Auth::verify', ['as' => 'login']);
-
-		$answer1 = $response->redirect('/login')
-				->setCookie('foo', 'bar', YEAR)
-				->setCookie('login_time', $loginTime, YEAR);
-		$this->assertTrue($answer1->hasCookie('foo', 'bar'));
-		$this->assertTrue($answer1->hasCookie('login_time'));
-		$response->setBody('Hello');
-
-		// send it
-		ob_start();
-		$response->send();
-
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
-
-		// and what actually got sent?
-		$this->assertHeaderEmitted('Set-Cookie: foo=bar;');
-		$this->assertHeaderEmitted('Set-Cookie: login_time');
-	}
-
+    /**
+     * These need to be run as a separate process, since phpunit
+     * has already captured the "normal" output, and we will get
+     * a "Cannot modify headers" message if we try to change
+     * headers or cookies now.
+     *
+     * Furthermore, these tests needs to flush the output buffering
+     * that might be in progress, and start our own output buffer
+     * capture.
+     *
+     * The tests includes a basic sanity check, to make sure that
+     * the body we thought would be sent actually was.
+     */
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeadersMissingDate()
+    {
+        $response = new Response(new App());
+        $response->pretend(false);
+
+        $body = 'Hello';
+        $response->setBody($body);
+
+        $response->setCookie('foo', 'bar');
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
+
+        // Drop the date header, to make sure it gets put back in
+        $response->removeHeader('Date');
+
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        // and what actually got sent?
+        $this->assertHeaderEmitted('Date:');
+    }
+
+    /**
+     * This test does not test that CSP is handled properly -
+     * it makes sure that sending gives CSP a chance to do its thing.
+     *
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeadersWithCSP()
+    {
+        $config             = new App();
+        $config->CSPEnabled = true;
+        $response           = new Response($config);
+        $response->pretend(false);
+
+        $body = 'Hello';
+        $response->setBody($body);
+
+        $response->setCookie('foo', 'bar');
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
+
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        // and what actually got sent?; test both ways
+        $this->assertHeaderEmitted('Content-Security-Policy:');
+    }
+
+    /**
+     * Make sure cookies are set by RedirectResponse this way
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1393
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testRedirectResponseCookies()
+    {
+        $loginTime = time();
+
+        $response = new Response(new App());
+        $response->pretend(false);
+
+        $routes = service('routes');
+        $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
+
+        $answer1 = $response->redirect('/login')
+            ->setCookie('foo', 'bar', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
+        $this->assertTrue($answer1->hasCookie('foo', 'bar'));
+        $this->assertTrue($answer1->hasCookie('login_time'));
+        $response->setBody('Hello');
+
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
+
+        // and what actually got sent?
+        $this->assertHeaderEmitted('Set-Cookie: foo=bar;');
+        $this->assertHeaderEmitted('Set-Cookie: login_time');
+    }
 }
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 3142446d2e9b..dc50aa432140 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
@@ -12,548 +21,495 @@
 use DateTime;
 use DateTimeZone;
 
-class ResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ResponseTest extends CIUnitTestCase
 {
-	protected $server;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->server = $_SERVER;
-	}
-
-	public function tearDown(): void
-	{
-		$_SERVER = $this->server;
-		Factories::reset('config');
-	}
-
-	public function testCanSetStatusCode()
-	{
-		$response = new Response(new App());
-
-		$response->setStatusCode(200);
-
-		$this->assertEquals(200, $response->getStatusCode());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetStatusCodeThrowsExceptionForBadCodes()
-	{
-		$response = new Response(new App());
-
-		$this->expectException(HTTPException::class);
-		$response->setStatusCode(54322);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstructWithCSPEnabled()
-	{
-		$config             = new App();
-		$config->CSPEnabled = true;
-		$response           = new Response($config);
-
-		$this->assertTrue($response instanceof Response);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetStatusCodeSetsReason()
-	{
-		$response = new Response(new App());
-
-		$response->setStatusCode(200);
-
-		$this->assertEquals('OK', $response->getReasonPhrase());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanSetCustomReasonCode()
-	{
-		$response = new Response(new App());
-
-		$response->setStatusCode(200, 'Not the mama');
-
-		$this->assertEquals('Not the mama', $response->getReasonPhrase());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiresMessageWithUnknownStatusCode()
-	{
-		$response = new Response(new App());
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.unknownStatusCode', [115]));
-		$response->setStatusCode(115);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiresMessageWithSmallStatusCode()
-	{
-		$response = new Response(new App());
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.invalidStatusCode', [95]));
-		$response->setStatusCode(95);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiresMessageWithLargeStatusCode()
-	{
-		$response = new Response(new App());
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.invalidStatusCode', [695]));
-		$response->setStatusCode(695);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetStatusCodeInterpretsReason()
-	{
-		$response = new Response(new App());
-
-		$response->setStatusCode(300);
-
-		$this->assertEquals('Multiple Choices', $response->getReasonPhrase());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetStatusCodeSavesCustomReason()
-	{
-		$response = new Response(new App());
-
-		$response->setStatusCode(300, 'My Little Pony');
-
-		$this->assertEquals('My Little Pony', $response->getReasonPhrase());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetReasonDefaultsToOK()
-	{
-		$response = new Response(new App());
-
-		$this->assertEquals('OK', $response->getReasonPhrase());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetDateRemembersDateInUTC()
-	{
-		$response = new Response(new App());
-
-		$response->setDate(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
-
-		$date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
-		$date->setTimezone(new DateTimeZone('UTC'));
-
-		$header = $response->getHeaderLine('Date');
-
-		$this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetLink()
-	{
-		// Ensure our URL is not getting overridden
-		$config          = new App();
-		$config->baseURL = 'http://example.com/test/';
-		Factories::injectMock('config', 'App', $config);
-
-		$response = new Response($config);
-		$pager    = Services::pager();
-
-		$pager->store('default', 3, 10, 200);
-		$response->setLink($pager);
-
-		$this->assertEquals(
-			'<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=2>; rel="prev",<http://example.com/test/index.php?page=4>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
-			$response->header('Link')->getValue()
-		);
-
-		$pager->store('default', 1, 10, 200);
-		$response->setLink($pager);
-
-		$this->assertEquals(
-			'<http://example.com/test/index.php?page=2>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
-			$response->header('Link')->getValue()
-		);
+    protected $server;
 
-		$pager->store('default', 20, 10, 200);
-		$response->setLink($pager);
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->server = $_SERVER;
+    }
 
-		$this->assertEquals(
-			'<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=19>; rel="prev"',
-			$response->header('Link')->getValue()
-		);
-	}
+    protected function tearDown(): void
+    {
+        $_SERVER = $this->server;
+        Factories::reset('config');
+    }
 
-	//--------------------------------------------------------------------
+    public function testCanSetStatusCode()
+    {
+        $response = new Response(new App());
 
-	public function testSetContentType()
-	{
-		$response = new Response(new App());
+        $response->setStatusCode(200);
 
-		$response->setContentType('text/json');
+        $this->assertSame(200, $response->getStatusCode());
+    }
 
-		$this->assertEquals('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
-	}
+    public function testSetStatusCodeThrowsExceptionForBadCodes()
+    {
+        $response = new Response(new App());
 
-	//--------------------------------------------------------------------
+        $this->expectException(HTTPException::class);
+        $response->setStatusCode(54322);
+    }
 
-	public function testNoCache()
-	{
-		$response = new Response(new App());
+    public function testConstructWithCSPEnabled()
+    {
+        $config             = new App();
+        $config->CSPEnabled = true;
+        $response           = new Response($config);
 
-		$response->noCache();
+        $this->assertTrue($response instanceof Response);
+    }
 
-		$this->assertEquals('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-control'));
-	}
+    public function testSetStatusCodeSetsReason()
+    {
+        $response = new Response(new App());
 
-	//--------------------------------------------------------------------
+        $response->setStatusCode(200);
 
-	public function testSetCache()
-	{
-		$response = new Response(new App());
+        $this->assertSame('OK', $response->getReasonPhrase());
+    }
 
-		$date = date('r');
+    public function testCanSetCustomReasonCode()
+    {
+        $response = new Response(new App());
 
-		$options = [
-			'etag'          => '12345678',
-			'last-modified' => $date,
-			'max-age'       => 300,
-			'must-revalidate'
-		];
+        $response->setStatusCode(200, 'Not the mama');
 
-		$response->setCache($options);
+        $this->assertSame('Not the mama', $response->getReasonPhrase());
+    }
 
-		$this->assertEquals('12345678', $response->getHeaderLine('ETag'));
-		$this->assertEquals($date, $response->getHeaderLine('Last-Modified'));
-		$this->assertEquals('max-age=300, must-revalidate', $response->getHeaderLine('Cache-Control'));
-	}
+    public function testRequiresMessageWithUnknownStatusCode()
+    {
+        $response = new Response(new App());
 
-	public function testSetCacheNoOptions()
-	{
-		$response = new Response(new App());
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.unknownStatusCode', [115]));
+        $response->setStatusCode(115);
+    }
 
-		$date = date('r');
+    public function testRequiresMessageWithSmallStatusCode()
+    {
+        $response = new Response(new App());
 
-		$options = [];
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.invalidStatusCode', [95]));
+        $response->setStatusCode(95);
+    }
 
-		$response->setCache($options);
+    public function testRequiresMessageWithLargeStatusCode()
+    {
+        $response = new Response(new App());
 
-		$this->assertEquals('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-Control'));
-	}
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.invalidStatusCode', [695]));
+        $response->setStatusCode(695);
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetStatusCodeInterpretsReason()
+    {
+        $response = new Response(new App());
 
-	public function testSetLastModifiedWithDateTimeObject()
-	{
-		$response = new Response(new App());
+        $response->setStatusCode(300);
 
-		$response->setLastModified(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
+        $this->assertSame('Multiple Choices', $response->getReasonPhrase());
+    }
 
-		$date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
-		$date->setTimezone(new DateTimeZone('UTC'));
+    public function testSetStatusCodeSavesCustomReason()
+    {
+        $response = new Response(new App());
 
-		$header = $response->getHeaderLine('Last-Modified');
+        $response->setStatusCode(300, 'My Little Pony');
 
-		$this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
-	}
+        $this->assertSame('My Little Pony', $response->getReasonPhrase());
+    }
 
-	//--------------------------------------------------------------------
+    public function testGetReasonDefaultsToOK()
+    {
+        $response = new Response(new App());
 
-	public function testRedirectSetsDefaultCodeAndLocationHeader()
-	{
-		$response = new Response(new App());
+        $this->assertSame('OK', $response->getReasonPhrase());
+    }
 
-		$response->redirect('example.com');
+    public function testSetDateRemembersDateInUTC()
+    {
+        $response = new Response(new App());
 
-		$this->assertTrue($response->hasHeader('location'));
-		$this->assertEquals('example.com', $response->getHeaderLine('Location'));
-		$this->assertEquals(302, $response->getStatusCode());
-	}
+        $response->setDate(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
 
-	//--------------------------------------------------------------------
+        $date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $date->setTimezone(new DateTimeZone('UTC'));
 
-	public function testRedirectSetsCode()
-	{
-		$response = new Response(new App());
+        $header = $response->getHeaderLine('Date');
 
-		$response->redirect('example.com', 'auto', 307);
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
+    }
 
-		$this->assertTrue($response->hasHeader('location'));
-		$this->assertEquals('example.com', $response->getHeaderLine('Location'));
-		$this->assertEquals(307, $response->getStatusCode());
-	}
+    public function testSetLink()
+    {
+        // Ensure our URL is not getting overridden
+        $config          = new App();
+        $config->baseURL = 'http://example.com/test/';
+        Factories::injectMock('config', 'App', $config);
 
-	//--------------------------------------------------------------------
+        $response = new Response($config);
+        $pager    = Services::pager();
 
-	public function testRedirectWithIIS()
-	{
-		$_SERVER['SERVER_SOFTWARE'] = 'Microsoft-IIS';
-		$response                   = new Response(new App());
-		$response->redirect('example.com', 'auto', 307);
-		$this->assertEquals('0;url=example.com', $response->getHeaderLine('Refresh'));
-	}
+        $pager->store('default', 3, 10, 200);
+        $response->setLink($pager);
 
-	//--------------------------------------------------------------------
+        $this->assertSame(
+            '<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=2>; rel="prev",<http://example.com/test/index.php?page=4>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
+            $response->header('Link')->getValue()
+        );
 
-	public function testSetCookieFails()
-	{
-		$response = new Response(new App());
+        $pager->store('default', 1, 10, 200);
+        $response->setLink($pager);
 
-		$this->assertFalse($response->hasCookie('foo'));
-	}
+        $this->assertSame(
+            '<http://example.com/test/index.php?page=2>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
+            $response->header('Link')->getValue()
+        );
 
-	public function testSetCookieMatch()
-	{
-		$response = new Response(new App());
-		$response->setCookie('foo', 'bar');
+        $pager->store('default', 20, 10, 200);
+        $response->setLink($pager);
 
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
-	}
+        $this->assertSame(
+            '<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=19>; rel="prev"',
+            $response->header('Link')->getValue()
+        );
+    }
 
-	public function testSetCookieFailDifferentPrefix()
-	{
-		$response = new Response(new App());
-		$response->setCookie('foo', 'bar', '', '', '', 'ack');
+    public function testSetContentType()
+    {
+        $response = new Response(new App());
 
-		$this->assertFalse($response->hasCookie('foo'));
-	}
+        $response->setContentType('text/json');
 
-	public function testSetCookieSuccessOnPrefix()
-	{
-		$response = new Response(new App());
-		$response->setCookie('foo', 'bar', '', '', '', 'ack');
+        $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+    }
 
-		$this->assertTrue($response->hasCookie('foo', null, 'ack'));
-		$this->assertFalse($response->hasCookie('foo', null, 'nak'));
-	}
+    public function testNoCache()
+    {
+        $response = new Response(new App());
 
-	//--------------------------------------------------------------------
+        $response->noCache();
 
-	public function testJSONWithArray()
-	{
-		$body     = [
-			'foo' => 'bar',
-			'bar' => [
-				1,
-				2,
-				3,
-			],
-		];
-		$expected = Services::format()->getFormatter('application/json')->format($body);
-
-		$response = new Response(new App());
-		$response->setJSON($body);
-
-		$this->assertEquals($expected, $response->getJSON());
-		$this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
-	}
-
-	public function testJSONGetFromNormalBody()
-	{
-		$body     = [
-			'foo' => 'bar',
-			'bar' => [
-				1,
-				2,
-				3,
-			],
-		];
-		$expected = Services::format()->getFormatter('application/json')->format($body);
-
-		$response = new Response(new App());
-		$response->setBody($body);
-
-		$this->assertEquals($expected, $response->getJSON());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testXMLWithArray()
-	{
-		$body     = [
-			'foo' => 'bar',
-			'bar' => [
-				1,
-				2,
-				3,
-			],
-		];
-		$expected = Services::format()->getFormatter('application/xml')->format($body);
-
-		$response = new Response(new App());
-		$response->setXML($body);
-
-		$this->assertEquals($expected, $response->getXML());
-		$this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
-	}
-
-	public function testXMLGetFromNormalBody()
-	{
-		$body     = [
-			'foo' => 'bar',
-			'bar' => [
-				1,
-				2,
-				3,
-			],
-		];
-		$expected = Services::format()->getFormatter('application/xml')->format($body);
-
-		$response = new Response(new App());
-		$response->setBody($body);
-
-		$this->assertEquals($expected, $response->getXML());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetDownloadResponseByData()
-	{
-		$response = new Response(new App());
-
-		$actual = $response->download('unit-test.txt', 'data');
-
-		$this->assertInstanceOf(DownloadResponse::class, $actual);
-		$actual->buildHeaders();
-		$this->assertSame('attachment; filename="unit-test.txt"; filename*=UTF-8\'\'unit-test.txt', $actual->getHeaderLine('Content-Disposition'));
-
-		ob_start();
-		$actual->sendBody();
-		$actualOutput = ob_get_contents();
-		ob_end_clean();
-
-		$this->assertSame('data', $actualOutput);
-	}
-
-	public function testGetDownloadResponseByFilePath()
-	{
-		$response = new Response(new App());
-
-		$actual = $response->download(__FILE__, null);
-
-		$this->assertInstanceOf(DownloadResponse::class, $actual);
-		$actual->buildHeaders();
-		$this->assertSame('attachment; filename="' . basename(__FILE__) . '"; filename*=UTF-8\'\'' . basename(__FILE__), $actual->getHeaderLine('Content-Disposition'));
-
-		ob_start();
-		$actual->sendBody();
-		$actualOutput = ob_get_contents();
-		ob_end_clean();
-
-		$this->assertSame(file_get_contents(__FILE__), $actualOutput);
-	}
-
-	public function testVagueDownload()
-	{
-		$response = new Response(new App());
-
-		$actual = $response->download();
-
-		$this->assertNull($actual);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPretendMode()
-	{
-		$response = new MockResponse(new App());
-		$response->pretend(true);
-		$this->assertTrue($response->getPretend());
-		$response->pretend(false);
-		$this->assertFalse($response->getPretend());
-	}
-
-	public function testMisbehaving()
-	{
-		$response = new MockResponse(new App());
-		$response->misbehave();
-
-		$this->expectException(HTTPException::class);
-		$response->getStatusCode();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTemporaryRedirect11()
-	{
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-		$_SERVER['REQUEST_METHOD']  = 'POST';
-		$response                   = new Response(new App());
+        $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-control'));
+    }
 
-		$response->setProtocolVersion('HTTP/1.1');
-		$response->redirect('/foo');
+    public function testSetCache()
+    {
+        $response = new Response(new App());
 
-		$this->assertEquals(303, $response->getStatusCode());
-	}
+        $date = date('r');
 
-	public function testTemporaryRedirectGet11()
-	{
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-		$_SERVER['REQUEST_METHOD']  = 'GET';
-		$response                   = new Response(new App());
+        $options = [
+            'etag'          => '12345678',
+            'last-modified' => $date,
+            'max-age'       => 300,
+            'must-revalidate',
+        ];
 
-		$response->setProtocolVersion('HTTP/1.1');
-		$response->redirect('/foo');
+        $response->setCache($options);
 
-		$this->assertEquals(307, $response->getStatusCode());
-	}
+        $this->assertSame('12345678', $response->getHeaderLine('ETag'));
+        $this->assertSame($date, $response->getHeaderLine('Last-Modified'));
+        $this->assertSame('max-age=300, must-revalidate', $response->getHeaderLine('Cache-Control'));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetCacheNoOptions()
+    {
+        $response = new Response(new App());
 
-	// Make sure cookies are set by RedirectResponse this way
-	// See https://github.com/codeigniter4/CodeIgniter4/issues/1393
-	public function testRedirectResponseCookies()
-	{
-		$loginTime = time();
+        $options = [];
 
-		$response = new Response(new App());
-		$answer1  = $response->redirect('/login')
-				->setCookie('foo', 'bar', YEAR)
-				->setCookie('login_time', $loginTime, YEAR);
+        $response->setCache($options);
 
-		$this->assertTrue($answer1->hasCookie('foo'));
-		$this->assertTrue($answer1->hasCookie('login_time'));
-	}
+        $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-Control'));
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetLastModifiedWithDateTimeObject()
+    {
+        $response = new Response(new App());
 
-	// Make sure we don't blow up if pretending to send headers
-	public function testPretendOutput()
-	{
-		$response = new Response(new App());
-		$response->pretend(true);
+        $response->setLastModified(DateTime::createFromFormat('Y-m-d', '2000-03-10'));
 
-		$response->setBody('Happy days');
+        $date = DateTime::createFromFormat('Y-m-d', '2000-03-10');
+        $date->setTimezone(new DateTimeZone('UTC'));
 
-		ob_start();
-		$response->send();
-		$actual = ob_get_contents();
-		ob_end_clean();
+        $header = $response->getHeaderLine('Last-Modified');
 
-		$this->assertEquals('Happy days', $actual);
-	}
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
+    }
 
-	public function testInvalidSameSiteCookie()
-	{
-		$config                 = new App();
-		$config->cookieSameSite = 'Invalid';
+    public function testRedirectSetsDefaultCodeAndLocationHeader()
+    {
+        $response = new Response(new App());
+
+        $response->redirect('example.com');
+
+        $this->assertTrue($response->hasHeader('location'));
+        $this->assertSame('example.com', $response->getHeaderLine('Location'));
+        $this->assertSame(302, $response->getStatusCode());
+    }
+
+    public function testRedirectSetsCode()
+    {
+        $response = new Response(new App());
+
+        $response->redirect('example.com', 'auto', 307);
+
+        $this->assertTrue($response->hasHeader('location'));
+        $this->assertSame('example.com', $response->getHeaderLine('Location'));
+        $this->assertSame(307, $response->getStatusCode());
+    }
+
+    public function testRedirectWithIIS()
+    {
+        $_SERVER['SERVER_SOFTWARE'] = 'Microsoft-IIS';
+        $response                   = new Response(new App());
+        $response->redirect('example.com', 'auto', 307);
+        $this->assertSame('0;url=example.com', $response->getHeaderLine('Refresh'));
+    }
+
+    public function testSetCookieFails()
+    {
+        $response = new Response(new App());
+
+        $this->assertFalse($response->hasCookie('foo'));
+    }
+
+    public function testSetCookieMatch()
+    {
+        $response = new Response(new App());
+        $response->setCookie('foo', 'bar');
+
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
+    }
+
+    public function testSetCookieFailDifferentPrefix()
+    {
+        $response = new Response(new App());
+        $response->setCookie('foo', 'bar', '', '', '', 'ack');
+
+        $this->assertFalse($response->hasCookie('foo'));
+    }
+
+    public function testSetCookieSuccessOnPrefix()
+    {
+        $response = new Response(new App());
+        $response->setCookie('foo', 'bar', '', '', '', 'ack');
+
+        $this->assertTrue($response->hasCookie('foo', null, 'ack'));
+        $this->assertFalse($response->hasCookie('foo', null, 'nak'));
+    }
+
+    public function testJSONWithArray()
+    {
+        $body = [
+            'foo' => 'bar',
+            'bar' => [
+                1,
+                2,
+                3,
+            ],
+        ];
+        $expected = Services::format()->getFormatter('application/json')->format($body);
+
+        $response = new Response(new App());
+        $response->setJSON($body);
+
+        $this->assertSame($expected, $response->getJSON());
+        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
+    }
+
+    public function testJSONGetFromNormalBody()
+    {
+        $body = [
+            'foo' => 'bar',
+            'bar' => [
+                1,
+                2,
+                3,
+            ],
+        ];
+        $expected = Services::format()->getFormatter('application/json')->format($body);
+
+        $response = new Response(new App());
+        $response->setBody($body);
+
+        $this->assertSame($expected, $response->getJSON());
+    }
+
+    public function testXMLWithArray()
+    {
+        $body = [
+            'foo' => 'bar',
+            'bar' => [
+                1,
+                2,
+                3,
+            ],
+        ];
+        $expected = Services::format()->getFormatter('application/xml')->format($body);
+
+        $response = new Response(new App());
+        $response->setXML($body);
+
+        $this->assertSame($expected, $response->getXML());
+        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
+    }
+
+    public function testXMLGetFromNormalBody()
+    {
+        $body = [
+            'foo' => 'bar',
+            'bar' => [
+                1,
+                2,
+                3,
+            ],
+        ];
+        $expected = Services::format()->getFormatter('application/xml')->format($body);
+
+        $response = new Response(new App());
+        $response->setBody($body);
+
+        $this->assertSame($expected, $response->getXML());
+    }
+
+    public function testGetDownloadResponseByData()
+    {
+        $response = new Response(new App());
+
+        $actual = $response->download('unit-test.txt', 'data');
+
+        $this->assertInstanceOf(DownloadResponse::class, $actual);
+        $actual->buildHeaders();
+        $this->assertSame('attachment; filename="unit-test.txt"; filename*=UTF-8\'\'unit-test.txt', $actual->getHeaderLine('Content-Disposition'));
+
+        ob_start();
+        $actual->sendBody();
+        $actualOutput = ob_get_contents();
+        ob_end_clean();
+
+        $this->assertSame('data', $actualOutput);
+    }
+
+    public function testGetDownloadResponseByFilePath()
+    {
+        $response = new Response(new App());
+
+        $actual = $response->download(__FILE__, null);
+
+        $this->assertInstanceOf(DownloadResponse::class, $actual);
+        $actual->buildHeaders();
+        $this->assertSame('attachment; filename="' . basename(__FILE__) . '"; filename*=UTF-8\'\'' . basename(__FILE__), $actual->getHeaderLine('Content-Disposition'));
+
+        ob_start();
+        $actual->sendBody();
+        $actualOutput = ob_get_contents();
+        ob_end_clean();
+
+        $this->assertSame(file_get_contents(__FILE__), $actualOutput);
+    }
+
+    public function testVagueDownload()
+    {
+        $response = new Response(new App());
+
+        $actual = $response->download();
+
+        $this->assertNull($actual);
+    }
+
+    public function testPretendMode()
+    {
+        $response = new MockResponse(new App());
+        $response->pretend(true);
+        $this->assertTrue($response->getPretend());
+        $response->pretend(false);
+        $this->assertFalse($response->getPretend());
+    }
+
+    public function testMisbehaving()
+    {
+        $response = new MockResponse(new App());
+        $response->misbehave();
+
+        $this->expectException(HTTPException::class);
+        $response->getStatusCode();
+    }
+
+    public function testTemporaryRedirect11()
+    {
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'POST';
+        $response                   = new Response(new App());
+
+        $response->setProtocolVersion('HTTP/1.1');
+        $response->redirect('/foo');
+
+        $this->assertSame(303, $response->getStatusCode());
+    }
+
+    public function testTemporaryRedirectGet11()
+    {
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'GET';
+        $response                   = new Response(new App());
+
+        $response->setProtocolVersion('HTTP/1.1');
+        $response->redirect('/foo');
+
+        $this->assertSame(307, $response->getStatusCode());
+    }
+
+    // Make sure cookies are set by RedirectResponse this way
+    // See https://github.com/codeigniter4/CodeIgniter4/issues/1393
+    public function testRedirectResponseCookies()
+    {
+        $loginTime = time();
 
-		$this->expectException(CookieException::class);
-		$this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
-		new Response($config);
-	}
+        $response = new Response(new App());
+        $answer1  = $response->redirect('/login')
+            ->setCookie('foo', 'bar', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
+
+        $this->assertTrue($answer1->hasCookie('foo'));
+        $this->assertTrue($answer1->hasCookie('login_time'));
+    }
+
+    // Make sure we don't blow up if pretending to send headers
+    public function testPretendOutput()
+    {
+        $response = new Response(new App());
+        $response->pretend(true);
+
+        $response->setBody('Happy days');
+
+        ob_start();
+        $response->send();
+        $actual = ob_get_contents();
+        ob_end_clean();
+
+        $this->assertSame('Happy days', $actual);
+    }
+
+    public function testInvalidSameSiteCookie()
+    {
+        $config                 = new App();
+        $config->cookieSameSite = 'Invalid';
+
+        $this->expectException(CookieException::class);
+        $this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
+        new Response($config);
+    }
 }
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 3013acaf4cab..89cb106ed607 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
@@ -10,1062 +19,970 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class URITest extends CIUnitTestCase
+final class URITest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        Factories::reset('config');
+    }
+
+    public function testConstructorSetsAllParts()
+    {
+        $uri = new URI('http://username:password@hostname:9090/path?arg=value#anchor');
+
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame('username', $uri->getUserInfo());
+        $this->assertSame('hostname', $uri->getHost());
+        $this->assertSame('/path', $uri->getPath());
+        $this->assertSame('arg=value', $uri->getQuery());
+        $this->assertSame(9090, $uri->getPort());
+        $this->assertSame('anchor', $uri->getFragment());
+
+        // Password ignored by default for security reasons.
+        $this->assertSame('username@hostname:9090', $uri->getAuthority());
+
+        $this->assertSame(['path'], $uri->getSegments());
+    }
+
+    public function testSegmentsIsPopulatedRightForMultipleSegments()
+    {
+        $uri = new URI('http://hostname/path/to/script');
+
+        $this->assertSame(['path', 'to', 'script'], $uri->getSegments());
+        $this->assertSame('path', $uri->getSegment(1));
+        $this->assertSame('to', $uri->getSegment(2));
+        $this->assertSame('script', $uri->getSegment(3));
+        $this->assertSame('', $uri->getSegment(4));
+
+        $this->assertSame(3, $uri->getTotalSegments());
+    }
+
+    public function testSegmentOutOfRange()
+    {
+        $this->expectException(HTTPException::class);
+        $uri = new URI('http://hostname/path/to/script');
+        $uri->getSegment(5);
+    }
+
+    public function testSegmentOutOfRangeWithSilent()
+    {
+        $url = 'http://abc.com/a123/b/c';
+        $uri = new URI($url);
+        $this->assertSame('', $uri->setSilent()->getSegment(22));
+    }
+
+    public function testSegmentOutOfRangeWithDefaultValue()
+    {
+        $this->expectException(HTTPException::class);
+        $url = 'http://abc.com/a123/b/c';
+        $uri = new URI($url);
+        $uri->getSegment(22, 'something');
+    }
+
+    public function testSegmentOutOfRangeWithSilentAndDefaultValue()
+    {
+        $url = 'http://abc.com/a123/b/c';
+        $uri = new URI($url);
+        $this->assertSame('something', $uri->setSilent()->getSegment(22, 'something'));
+    }
+
+    public function testSegmentsWithDefaultValueAndSilent()
+    {
+        $uri = new URI('http://hostname/path/to');
+        $uri->setSilent();
+
+        $this->assertSame(['path', 'to'], $uri->getSegments());
+        $this->assertSame('path', $uri->getSegment(1));
+        $this->assertSame('to', $uri->getSegment(2, 'different'));
+        $this->assertSame('script', $uri->getSegment(3, 'script'));
+        $this->assertSame('', $uri->getSegment(3));
+
+        $this->assertSame(2, $uri->getTotalSegments());
+    }
+
+    public function testSegmentOutOfRangeWithDefaultValuesAndSilent()
+    {
+        $uri = new URI('http://hostname/path/to/script');
+        $uri->setSilent();
+
+        $this->assertSame('', $uri->getSegment(22));
+        $this->assertSame('something', $uri->getSegment(33, 'something'));
+
+        $this->assertSame(3, $uri->getTotalSegments());
+        $this->assertSame(['path', 'to', 'script'], $uri->getSegments());
+    }
+
+    public function testCanCastAsString()
+    {
+        $url = 'http://username:password@hostname:9090/path?arg=value#anchor';
+        $uri = new URI($url);
+
+        $expected = 'http://username@hostname:9090/path?arg=value#anchor';
+
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSimpleUri()
+    {
+        $url = 'http://example.com';
+        $uri = new URI($url);
+        $this->assertSame($url, (string) $uri);
+
+        $url = 'http://example.com/';
+        $uri = new URI($url);
+        $this->assertSame($url, (string) $uri);
+    }
+
+    public function testEmptyUri()
+    {
+        $url = '';
+        $uri = new URI($url);
+        $this->assertSame('http://' . $url, (string) $uri);
+        $url = '/';
+        $uri = new URI($url);
+        $this->assertSame('http://', (string) $uri);
+    }
+
+    public function testMalformedUri()
+    {
+        $this->expectException(HTTPException::class);
+        $url = 'http://abc:a123';
+        $uri = new URI($url);
+    }
+
+    public function testMissingScheme()
+    {
+        $url = 'http://foo.bar/baz';
+        $uri = new URI($url);
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame('foo.bar', $uri->getAuthority());
+        $this->assertSame('/baz', $uri->getPath());
+        $this->assertSame($url, (string) $uri);
+    }
+
+    public function testSchemeSub()
+    {
+        $url = 'example.com';
+        $uri = new URI('http://' . $url);
+        $uri->setScheme('x');
+        $this->assertSame('x://' . $url, (string) $uri);
+    }
+
+    public function testSetSchemeSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'https://example.com/path';
+
+        $uri->setScheme('https');
+        $this->assertSame('https', $uri->getScheme());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetUserInfoSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://user@example.com/path';
+
+        $uri->setUserInfo('user', 'password');
+        $this->assertSame('user', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testUserInfoCanShowPassword()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://user@example.com/path';
+
+        $uri->setUserInfo('user', 'password');
+        $this->assertSame('user', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
+
+        $uri->showPassword();
+
+        $expected = 'http://user:password@example.com/path';
+
+        $this->assertSame('user:password', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetHostSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://another.com/path';
+
+        $uri->setHost('another.com');
+        $this->assertSame('another.com', $uri->getHost());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetPortSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com:9000/path';
+
+        $uri->setPort(9000);
+        $this->assertSame(9000, $uri->getPort());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetPortInvalidValues()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $errorString = lang('HTTP.invalidPort', [70000]);
+        $this->assertNotEmpty($errorString);
+
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.invalidPort', ['70000']));
+        $uri->setPort(70000);
+    }
+
+    public function testSetPortInvalidValuesSilent()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $uri->setSilent()->setPort(70000);
+
+        $this->assertNull($uri->getPort());
+    }
+
+    public function testSetPortTooSmall()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.invalidPort', [-1]));
+        $uri->setPort(-1);
+    }
+
+    public function testSetPortZero()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.invalidPort', [0]));
+        $uri->setPort(0);
+    }
+
+    public function testCatchesBadPort()
+    {
+        $this->expectException(HTTPException::class);
+        $url = 'http://username:password@hostname:90909/path?arg=value#anchor';
+        $uri = new URI();
+        $uri->setURI($url);
+    }
+
+    public function testSetPathSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/somewhere/else';
+
+        $uri->setPath('somewhere/else');
+        $this->assertSame('somewhere/else', $uri->getPath());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function invalidPaths()
+    {
+        return [
+            'dot-segment' => [
+                '/./path/to/nowhere',
+                '/path/to/nowhere',
+            ],
+            'double-dots' => [
+                '/../path/to/nowhere',
+                '/path/to/nowhere',
+            ],
+            'start-dot' => [
+                './path/to/nowhere',
+                '/path/to/nowhere',
+            ],
+            'start-double' => [
+                '../path/to/nowhere',
+                '/path/to/nowhere',
+            ],
+            'decoded' => [
+                '../%41path',
+                '/Apath',
+            ],
+            'encoded' => [
+                '/path^here',
+                '/path%5Ehere',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidPaths
+     *
+     * @param mixed $path
+     * @param mixed $expected
+     */
+    public function testPathGetsFiltered($path, $expected)
+    {
+        $uri = new URI();
+        $uri->setPath($path);
+        $this->assertSame($expected, $uri->getPath());
+    }
+
+    public function testSetFragmentSetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/path#good-stuff';
+
+        $uri->setFragment('#good-stuff');
+        $this->assertSame('good-stuff', $uri->getFragment());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetQuerySetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/path?key=value&second_key=value.2';
+
+        $uri->setQuery('?key=value&second.key=value.2');
+        $this->assertSame('key=value&second_key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetQuerySetsValueWithUseRawQueryString()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/path?key=value&second.key=value.2';
+
+        $uri->useRawQueryString()->setQuery('?key=value&second.key=value.2');
+        $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetQueryArraySetsValue()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/path?key=value&second_key=value.2';
+
+        $uri->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
+        $this->assertSame('key=value&second_key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetQueryArraySetsValueWithUseRawQueryString()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $expected = 'http://example.com/path?key=value&second.key=value.2';
+
+        $uri->useRawQueryString()->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
+        $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetQueryThrowsErrorWhenFragmentPresent()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $this->expectException(HTTPException::class);
+        $uri->setQuery('?key=value#fragment');
+    }
+
+    public function testSetQueryThrowsErrorWhenFragmentPresentSilent()
+    {
+        $url = 'http://example.com/path';
+        $uri = new URI($url);
+
+        $uri->setSilent()->setQuery('?key=value#fragment');
+
+        $this->assertSame('', $uri->getQuery());
+    }
+
+    public function authorityInfo()
+    {
+        return [
+            'host-only' => [
+                'http://foo.com/bar',
+                'foo.com',
+            ],
+            'host-port' => [
+                'http://foo.com:3000/bar',
+                'foo.com:3000',
+            ],
+            'user-host' => [
+                'http://me@foo.com/bar',
+                'me@foo.com',
+            ],
+            'user-host-port' => [
+                'http://me@foo.com:3000/bar',
+                'me@foo.com:3000',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider authorityInfo
+     *
+     * @param mixed $url
+     * @param mixed $expected
+     */
+    public function testAuthorityReturnsExceptedValues($url, $expected)
+    {
+        $uri = new URI($url);
+        $this->assertSame($expected, $uri->getAuthority());
+    }
+
+    public function defaultPorts()
+    {
+        return [
+            'http' => [
+                'http',
+                80,
+            ],
+            'https' => [
+                'https',
+                443,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider defaultPorts
+     *
+     * @param mixed $scheme
+     * @param mixed $port
+     */
+    public function testAuthorityRemovesDefaultPorts($scheme, $port)
+    {
+        $url = "{$scheme}://example.com:{$port}/path";
+        $uri = new URI($url);
+
+        $expected = "{$scheme}://example.com/path";
+
+        $this->assertSame($expected, (string) $uri);
+    }
+
+    public function testSetAuthorityReconstitutes()
+    {
+        $authority = 'me@foo.com:3000';
+
+        $uri = new URI();
+        $uri->setAuthority($authority);
+
+        $this->assertSame($authority, $uri->getAuthority());
+    }
+
+    public function defaultDots()
+    {
+        return [
+            [
+                '',
+                '',
+            ],
+            [
+                '/',
+                '/',
+            ],
+            [
+                '.',
+                '',
+            ],
+            [
+                '..',
+                '',
+            ],
+            [
+                '/.',
+                '/',
+            ],
+            [
+                '/..',
+                '/',
+            ],
+            [
+                '//',
+                '/',
+            ],
+            [
+                '/foo/..',
+                '/',
+            ],
+            [
+                '//foo//..',
+                '/',
+            ],
+            [
+                '/foo/../..',
+                '/',
+            ],
+            [
+                '/foo/../.',
+                '/',
+            ],
+            [
+                '/./foo/..',
+                '/',
+            ],
+            [
+                '/./foo',
+                '/foo',
+            ],
+            [
+                '/./foo/',
+                '/foo/',
+            ],
+            [
+                '/./foo/bar/baz/pho/../..',
+                '/foo/bar',
+            ],
+            [
+                '*',
+                '*',
+            ],
+            [
+                '/foo',
+                '/foo',
+            ],
+            [
+                '/abc/123/../foo/',
+                '/abc/foo/',
+            ],
+            [
+                '/a/b/c/./../../g',
+                '/a/g',
+            ],
+            [
+                '/b/c/./../../g',
+                '/g',
+            ],
+            [
+                '/b/c/./../../g',
+                '/g',
+            ],
+            [
+                '/c/./../../g',
+                '/g',
+            ],
+            [
+                '/./../../g',
+                '/g',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider defaultDots
+     *
+     * @param mixed $path
+     * @param mixed $expected
+     */
+    public function testRemoveDotSegments($path, $expected)
+    {
+        $this->assertSame($expected, URI::removeDotSegments($path));
+    }
+
+    public function defaultResolutions()
+    {
+        return [
+            [
+                'g',
+                'http://a/b/c/g',
+            ],
+            [
+                'g/',
+                'http://a/b/c/g/',
+            ],
+            [
+                '/g',
+                'http://a/g',
+            ],
+            [
+                '#s',
+                'http://a/b/c/d#s',
+            ],
+            [
+                'http://abc.com/x',
+                'http://abc.com/x',
+            ],
+            [
+                '?fruit=banana',
+                'http://a/b/c/d?fruit=banana',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider defaultResolutions
+     *
+     * @param mixed $rel
+     * @param mixed $expected
+     */
+    public function testResolveRelativeURI($rel, $expected)
+    {
+        $base = 'http://a/b/c/d';
+
+        $uri = new URI($base);
+
+        $new = $uri->resolveRelativeURI($rel);
+
+        $this->assertSame($expected, (string) $new);
+    }
+
+    /**
+     * @dataProvider defaultResolutions
+     * @group        single
+     *
+     * @param mixed $rel
+     * @param mixed $expected
+     */
+    public function testResolveRelativeURIHTTPS($rel, $expected)
+    {
+        $base = 'https://a/b/c/d';
+
+        $expected = str_replace('http:', 'https:', $expected);
+
+        $uri = new URI($base);
+
+        $new = $uri->resolveRelativeURI($rel);
+
+        $this->assertSame($expected, (string) $new);
+    }
+
+    public function testResolveRelativeURIWithNoBase()
+    {
+        $base = 'http://a';
+
+        $uri = new URI($base);
+
+        $new = $uri->resolveRelativeURI('x');
+
+        $this->assertSame('http://a/x', (string) $new);
+    }
+
+    public function testAddQueryVar()
+    {
+        $base = 'http://example.com/foo';
+
+        $uri = new URI($base);
+
+        $uri->addQuery('bar', 'baz');
+
+        $this->assertSame('http://example.com/foo?bar=baz', (string) $uri);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/pull/954
+     */
+    public function testSetQueryDecode()
+    {
+        $base = 'http://example.com/foo';
+
+        $uri     = new URI($base);
+        $encoded = urlencode('you+alice+to+the+little');
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function tearDown(): void
-	{
-		Factories::reset('config');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstructorSetsAllParts()
-	{
-		$uri = new URI('http://username:password@hostname:9090/path?arg=value#anchor');
-
-		$this->assertEquals('http', $uri->getScheme());
-		$this->assertEquals('username', $uri->getUserInfo());
-		$this->assertEquals('hostname', $uri->getHost());
-		$this->assertEquals('/path', $uri->getPath());
-		$this->assertEquals('arg=value', $uri->getQuery());
-		$this->assertEquals('9090', $uri->getPort());
-		$this->assertEquals('anchor', $uri->getFragment());
-
-		// Password ignored by default for security reasons.
-		$this->assertEquals('username@hostname:9090', $uri->getAuthority());
-
-		$this->assertEquals(['path'], $uri->getSegments());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentsIsPopulatedRightForMultipleSegments()
-	{
-		$uri = new URI('http://hostname/path/to/script');
-
-		$this->assertEquals(['path', 'to', 'script'], $uri->getSegments());
-		$this->assertEquals('path', $uri->getSegment(1));
-		$this->assertEquals('to', $uri->getSegment(2));
-		$this->assertEquals('script', $uri->getSegment(3));
-		$this->assertEquals('', $uri->getSegment(4));
-
-		$this->assertEquals(3, $uri->getTotalSegments());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentOutOfRange()
-	{
-		$this->expectException(HTTPException::class);
-		$uri = new URI('http://hostname/path/to/script');
-		$uri->getSegment(5);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentOutOfRangeWithSilent()
-	{
-		$url = 'http://abc.com/a123/b/c';
-		$uri = new URI($url);
-		$this->assertEquals('', $uri->setSilent()->getSegment(22));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentOutOfRangeWithDefaultValue()
-	{
-		$this->expectException(HTTPException::class);
-		$url = 'http://abc.com/a123/b/c';
-		$uri = new URI($url);
-		$uri->getSegment(22, 'something');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentOutOfRangeWithSilentAndDefaultValue()
-	{
-		$url = 'http://abc.com/a123/b/c';
-		$uri = new URI($url);
-		$this->assertEquals('something', $uri->setSilent()->getSegment(22, 'something'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentsWithDefaultValueAndSilent()
-	{
-		$uri = new URI('http://hostname/path/to');
-		$uri->setSilent();
-
-		$this->assertEquals(['path', 'to'], $uri->getSegments());
-		$this->assertEquals('path', $uri->getSegment(1));
-		$this->assertEquals('to', $uri->getSegment(2, 'different'));
-		$this->assertEquals('script', $uri->getSegment(3, 'script'));
-		$this->assertEquals('', $uri->getSegment(3));
-
-		$this->assertEquals(2, $uri->getTotalSegments());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSegmentOutOfRangeWithDefaultValuesAndSilent()
-	{
-		$uri = new URI('http://hostname/path/to/script');
-		$uri->setSilent();
-
-		$this->assertEquals('', $uri->getSegment(22));
-		$this->assertEquals('something', $uri->getSegment(33, 'something'));
-
-		$this->assertEquals(3, $uri->getTotalSegments());
-		$this->assertEquals(['path', 'to', 'script'], $uri->getSegments());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCanCastAsString()
-	{
-		$url = 'http://username:password@hostname:9090/path?arg=value#anchor';
-		$uri = new URI($url);
-
-		$expected = 'http://username@hostname:9090/path?arg=value#anchor';
-
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSimpleUri()
-	{
-		$url = 'http://example.com';
-		$uri = new URI($url);
-		$this->assertEquals($url, (string) $uri);
-
-		$url = 'http://example.com/';
-		$uri = new URI($url);
-		$this->assertEquals($url, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEmptyUri()
-	{
-		$url = '';
-		$uri = new URI($url);
-		$this->assertEquals('http://' . $url, (string) $uri);
-		$url = '/';
-		$uri = new URI($url);
-		$this->assertEquals('http://', (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMalformedUri()
-	{
-		$this->expectException(HTTPException::class);
-		$url = 'http://abc:a123';
-		$uri = new URI($url);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMissingScheme()
-	{
-		$url = 'http://foo.bar/baz';
-		$uri = new URI($url);
-		$this->assertEquals('http', $uri->getScheme());
-		$this->assertEquals('foo.bar', $uri->getAuthority());
-		$this->assertEquals('/baz', $uri->getPath());
-		$this->assertEquals($url, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSchemeSub()
-	{
-		$url = 'example.com';
-		$uri = new URI('http://' . $url);
-		$uri->setScheme('x');
-		$this->assertEquals('x://' . $url, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetSchemeSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'https://example.com/path';
-
-		$uri->setScheme('https');
-		$this->assertEquals('https', $uri->getScheme());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetUserInfoSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://user@example.com/path';
-
-		$uri->setUserInfo('user', 'password');
-		$this->assertEquals('user', $uri->getUserInfo());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUserInfoCanShowPassword()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://user@example.com/path';
-
-		$uri->setUserInfo('user', 'password');
-		$this->assertEquals('user', $uri->getUserInfo());
-		$this->assertEquals($expected, (string) $uri);
-
-		$uri->showPassword();
-
-		$expected = 'http://user:password@example.com/path';
-
-		$this->assertEquals('user:password', $uri->getUserInfo());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetHostSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://another.com/path';
-
-		$uri->setHost('another.com');
-		$this->assertEquals('another.com', $uri->getHost());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPortSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com:9000/path';
-
-		$uri->setPort(9000);
-		$this->assertEquals(9000, $uri->getPort());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPortInvalidValues()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$errorString = lang('HTTP.invalidPort', [70000]);
-		$this->assertNotEmpty($errorString);
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.invalidPort', ['70000']));
-		$uri->setPort(70000);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPortInvalidValuesSilent()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$uri->setSilent()->setPort(70000);
-
-		$this->assertEquals(null, $uri->getPort());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPortTooSmall()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.invalidPort', [-1]));
-		$uri->setPort(-1);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPortZero()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.invalidPort', [0]));
-		$uri->setPort(0);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCatchesBadPort()
-	{
-		$this->expectException(HTTPException::class);
-		$url = 'http://username:password@hostname:90909/path?arg=value#anchor';
-		$uri = new URI();
-		$uri->setURI($url);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetPathSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/somewhere/else';
-
-		$uri->setPath('somewhere/else');
-		$this->assertEquals('somewhere/else', $uri->getPath());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function invalidPaths()
-	{
-		return [
-			'dot-segment'  => [
-				'/./path/to/nowhere',
-				'/path/to/nowhere',
-			],
-			'double-dots'  => [
-				'/../path/to/nowhere',
-				'/path/to/nowhere',
-			],
-			'start-dot'    => [
-				'./path/to/nowhere',
-				'/path/to/nowhere',
-			],
-			'start-double' => [
-				'../path/to/nowhere',
-				'/path/to/nowhere',
-			],
-			'decoded'      => [
-				'../%41path',
-				'/Apath',
-			],
-			'encoded'      => [
-				'/path^here',
-				'/path%5Ehere',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider invalidPaths
-	 */
-	public function testPathGetsFiltered($path, $expected)
-	{
-		$uri = new URI();
-		$uri->setPath($path);
-		$this->assertEquals($expected, $uri->getPath());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetFragmentSetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path#good-stuff';
-
-		$uri->setFragment('#good-stuff');
-		$this->assertEquals('good-stuff', $uri->getFragment());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQuerySetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path?key=value&second_key=value.2';
-
-		$uri->setQuery('?key=value&second.key=value.2');
-		$this->assertEquals('key=value&second_key=value.2', $uri->getQuery());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQuerySetsValueWithUseRawQueryString()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path?key=value&second.key=value.2';
-
-		$uri->useRawQueryString()->setQuery('?key=value&second.key=value.2');
-		$this->assertEquals('key=value&second.key=value.2', $uri->getQuery());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQueryArraySetsValue()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path?key=value&second_key=value.2';
-
-		$uri->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
-		$this->assertEquals('key=value&second_key=value.2', $uri->getQuery());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQueryArraySetsValueWithUseRawQueryString()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path?key=value&second.key=value.2';
-
-		$uri->useRawQueryString()->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
-		$this->assertEquals('key=value&second.key=value.2', $uri->getQuery());
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQueryThrowsErrorWhenFragmentPresent()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$expected = 'http://example.com/path?key=value';
-
-		$this->expectException(HTTPException::class);
-		$uri->setQuery('?key=value#fragment');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetQueryThrowsErrorWhenFragmentPresentSilent()
-	{
-		$url = 'http://example.com/path';
-		$uri = new URI($url);
-
-		$uri->setSilent()->setQuery('?key=value#fragment');
-
-		$this->assertEquals('', $uri->getQuery());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function authorityInfo()
-	{
-		return [
-			'host-only'      => [
-				'http://foo.com/bar',
-				'foo.com',
-			],
-			'host-port'      => [
-				'http://foo.com:3000/bar',
-				'foo.com:3000',
-			],
-			'user-host'      => [
-				'http://me@foo.com/bar',
-				'me@foo.com',
-			],
-			'user-host-port' => [
-				'http://me@foo.com:3000/bar',
-				'me@foo.com:3000',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider authorityInfo
-	 */
-	public function testAuthorityReturnsExceptedValues($url, $expected)
-	{
-		$uri = new URI($url);
-		$this->assertEquals($expected, $uri->getAuthority());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function defaultPorts()
-	{
-		return [
-			'http'  => [
-				'http',
-				80,
-			],
-			'https' => [
-				'https',
-				443,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider defaultPorts
-	 */
-	public function testAuthorityRemovesDefaultPorts($scheme, $port)
-	{
-		$url = "{$scheme}://example.com:{$port}/path";
-		$uri = new URI($url);
-
-		$expected = "{$scheme}://example.com/path";
-
-		$this->assertEquals($expected, (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetAuthorityReconstitutes()
-	{
-		$authority = 'me@foo.com:3000';
-
-		$uri = new URI();
-		$uri->setAuthority($authority);
-
-		$this->assertEquals($authority, $uri->getAuthority());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function defaultDots()
-	{
-		return [
-			[
-				'',
-				'',
-			],
-			[
-				'/',
-				'/',
-			],
-			[
-				'.',
-				'',
-			],
-			[
-				'..',
-				'',
-			],
-			[
-				'/.',
-				'/',
-			],
-			[
-				'/..',
-				'/',
-			],
-			[
-				'//',
-				'/',
-			],
-			[
-				'/foo/..',
-				'/',
-			],
-			[
-				'//foo//..',
-				'/',
-			],
-			[
-				'/foo/../..',
-				'/',
-			],
-			[
-				'/foo/../.',
-				'/',
-			],
-			[
-				'/./foo/..',
-				'/',
-			],
-			[
-				'/./foo',
-				'/foo',
-			],
-			[
-				'/./foo/',
-				'/foo/',
-			],
-			[
-				'/./foo/bar/baz/pho/../..',
-				'/foo/bar',
-			],
-			[
-				'*',
-				'*',
-			],
-			[
-				'/foo',
-				'/foo',
-			],
-			[
-				'/abc/123/../foo/',
-				'/abc/foo/',
-			],
-			[
-				'/a/b/c/./../../g',
-				'/a/g',
-			],
-			[
-				'/b/c/./../../g',
-				'/g',
-			],
-			[
-				'/b/c/./../../g',
-				'/g',
-			],
-			[
-				'/c/./../../g',
-				'/g',
-			],
-			[
-				'/./../../g',
-				'/g',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider defaultDots
-	 */
-	public function testRemoveDotSegments($path, $expected)
-	{
-		$this->assertEquals($expected, URI::removeDotSegments($path));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function defaultResolutions()
-	{
-		return [
-			[
-				'g',
-				'http://a/b/c/g',
-			],
-			[
-				'g/',
-				'http://a/b/c/g/',
-			],
-			[
-				'/g',
-				'http://a/g',
-			],
-			[
-				'#s',
-				'http://a/b/c/d#s',
-			],
-			[
-				'http://abc.com/x',
-				'http://abc.com/x',
-			],
-			[
-				'?fruit=banana',
-				'http://a/b/c/d?fruit=banana',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider defaultResolutions
-	 */
-	public function testResolveRelativeURI($rel, $expected)
-	{
-		$base = 'http://a/b/c/d';
-
-		$uri = new URI($base);
-
-		$new = $uri->resolveRelativeURI($rel);
-
-		$this->assertEquals($expected, (string) $new);
-	}
-
-	/**
-	 * @dataProvider defaultResolutions
-	 * @group        single
-	 */
-	public function testResolveRelativeURIHTTPS($rel, $expected)
-	{
-		$base = 'https://a/b/c/d';
-
-		$expected = str_replace('http:', 'https:', $expected);
-
-		$uri = new URI($base);
-
-		$new = $uri->resolveRelativeURI($rel);
-
-		$this->assertEquals($expected, (string) $new);
-	}
-
-	public function testResolveRelativeURIWithNoBase()
-	{
-		$base = 'http://a';
-
-		$uri = new URI($base);
-
-		$new = $uri->resolveRelativeURI('x');
-
-		$this->assertEquals('http://a/x', (string) $new);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddQueryVar()
-	{
-		$base = 'http://example.com/foo';
-
-		$uri = new URI($base);
-
-		$uri->addQuery('bar', 'baz');
-
-		$this->assertEquals('http://example.com/foo?bar=baz', (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/pull/954
-	 */
-	public function testSetQueryDecode()
-	{
-		$base = 'http://example.com/foo';
-
-		$uri     = new URI($base);
-		$encoded = urlencode('you+alice+to+the+little');
-
-		$uri->setQuery("q={$encoded}");
-
-		// Should NOT be double-encoded, since http_build_query
-		// will encode the value again.
-		$this->assertEquals("q={$encoded}", $uri->getQuery());
-	}
-
-	public function testAddQueryVarRespectsExistingQueryVars()
-	{
-		$base = 'http://example.com/foo?bar=baz';
-
-		$uri = new URI($base);
-
-		$uri->addQuery('baz', 'foz');
-
-		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testStripQueryVars()
-	{
-		$base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
-
-		$uri = new URI($base);
-
-		$uri->stripQuery('bar', 'baz');
+        $uri->setQuery("q={$encoded}");
 
-		$this->assertEquals('http://example.com/foo?foo=bar', (string) $uri);
-	}
+        // Should NOT be double-encoded, since http_build_query
+        // will encode the value again.
+        $this->assertSame("q={$encoded}", $uri->getQuery());
+    }
 
-	//--------------------------------------------------------------------
+    public function testAddQueryVarRespectsExistingQueryVars()
+    {
+        $base = 'http://example.com/foo?bar=baz';
 
-	public function testKeepQueryVars()
-	{
-		$base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
+        $uri = new URI($base);
 
-		$uri = new URI($base);
+        $uri->addQuery('baz', 'foz');
 
-		$uri->keepQuery('bar', 'baz');
+        $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
+    }
 
-		$this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
-	}
+    public function testStripQueryVars()
+    {
+        $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
 
-	//--------------------------------------------------------------------
+        $uri = new URI($base);
 
-	public function testEmptyQueryVars()
-	{
-		$base = 'http://example.com/foo';
+        $uri->stripQuery('bar', 'baz');
 
-		$uri = new URI($base);
-		$uri->setQuery('foo=&bar=baz&baz=foz');
-		$this->assertEquals('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
-	}
+        $this->assertSame('http://example.com/foo?foo=bar', (string) $uri);
+    }
 
-	//--------------------------------------------------------------------
+    public function testKeepQueryVars()
+    {
+        $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
 
-	public function testGetQueryExcept()
-	{
-		$base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
+        $uri = new URI($base);
 
-		$uri = new URI($base);
+        $uri->keepQuery('bar', 'baz');
 
-		$this->assertEquals('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']]));
-	}
+        $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
+    }
 
-	//--------------------------------------------------------------------
+    public function testEmptyQueryVars()
+    {
+        $base = 'http://example.com/foo';
 
-	public function testGetQueryOnly()
-	{
-		$base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
+        $uri = new URI($base);
+        $uri->setQuery('foo=&bar=baz&baz=foz');
+        $this->assertSame('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
+    }
 
-		$uri = new URI($base);
+    public function testGetQueryExcept()
+    {
+        $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
 
-		$this->assertEquals('bar=baz', $uri->getQuery(['only' => ['bar']]));
-		$this->assertEquals('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar']));
-	}
+        $uri = new URI($base);
 
-	//--------------------------------------------------------------------
+        $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']]));
+    }
 
-	public function testGetQueryWithStrings()
-	{
-		$base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
+    public function testGetQueryOnly()
+    {
+        $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
 
-		$uri = new URI($base);
+        $uri = new URI($base);
 
-		$this->assertEquals('bar=baz', $uri->getQuery(['only' => 'bar']));
-	}
+        $this->assertSame('bar=baz', $uri->getQuery(['only' => ['bar']]));
+        $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar']));
+    }
 
-	//--------------------------------------------------------------------
+    public function testGetQueryWithStrings()
+    {
+        $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
 
-	/**
-	 * @see   https://github.com/codeigniter4/CodeIgniter4/issues/331
-	 * @group single
-	 */
-	public function testNoExtraSlashes()
-	{
-		$this->assertEquals('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder')));
-		$this->assertEquals('http://localhost/subfolder', (string) (new URI('localhost/subfolder')));
-		$this->assertEquals('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
-	}
+        $uri = new URI($base);
 
-	//--------------------------------------------------------------------
+        $this->assertSame('bar=baz', $uri->getQuery(['only' => 'bar']));
+    }
 
-	public function testSetSegment()
-	{
-		$base = 'http://example.com/foo/bar/baz';
+    /**
+     * @see   https://github.com/codeigniter4/CodeIgniter4/issues/331
+     * @group single
+     */
+    public function testNoExtraSlashes()
+    {
+        $this->assertSame('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder')));
+        $this->assertSame('http://localhost/subfolder', (string) (new URI('localhost/subfolder')));
+        $this->assertSame('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
+    }
 
-		$uri = new URI($base);
-		$uri->setSegment(2, 'banana');
+    public function testSetSegment()
+    {
+        $base = 'http://example.com/foo/bar/baz';
 
-		$this->assertEquals('foo/banana/baz', $uri->getPath());
-	}
+        $uri = new URI($base);
+        $uri->setSegment(2, 'banana');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('foo/banana/baz', $uri->getPath());
+    }
 
-	public function testSetSegmentFallback()
-	{
-		$base = 'http://example.com';
+    public function testSetSegmentFallback()
+    {
+        $base = 'http://example.com';
 
-		$uri = new URI($base);
-		$uri->setSegment(1, 'first');
-		$uri->setSegment(3, 'third');
+        $uri = new URI($base);
+        $uri->setSegment(1, 'first');
+        $uri->setSegment(3, 'third');
 
-		$this->assertEquals('first/third', $uri->getPath());
+        $this->assertSame('first/third', $uri->getPath());
 
-		$uri->setSegment(2, 'second');
+        $uri->setSegment(2, 'second');
 
-		$this->assertEquals('first/second', $uri->getPath());
+        $this->assertSame('first/second', $uri->getPath());
 
-		$uri->setSegment(3, 'third');
+        $uri->setSegment(3, 'third');
 
-		$this->assertEquals('first/second/third', $uri->getPath());
+        $this->assertSame('first/second/third', $uri->getPath());
 
-		$uri->setSegment(5, 'fifth');
+        $uri->setSegment(5, 'fifth');
 
-		$this->assertEquals('first/second/third/fifth', $uri->getPath());
+        $this->assertSame('first/second/third/fifth', $uri->getPath());
 
-		// sixth or seventh was not set
-		$this->expectException(HTTPException::class);
+        // sixth or seventh was not set
+        $this->expectException(HTTPException::class);
 
-		$uri->setSegment(8, 'eighth');
-	}
+        $uri->setSegment(8, 'eighth');
+    }
 
-	public function testSetBadSegment()
-	{
-		$this->expectException(HTTPException::class);
-		$base = 'http://example.com/foo/bar/baz';
+    public function testSetBadSegment()
+    {
+        $this->expectException(HTTPException::class);
+        $base = 'http://example.com/foo/bar/baz';
 
-		$uri = new URI($base);
-		$uri->setSegment(6, 'banana');
-	}
+        $uri = new URI($base);
+        $uri->setSegment(6, 'banana');
+    }
 
-	public function testSetBadSegmentSilent()
-	{
-		$base = 'http://example.com/foo/bar/baz';
+    public function testSetBadSegmentSilent()
+    {
+        $base = 'http://example.com/foo/bar/baz';
 
-		$uri = new URI($base);
+        $uri = new URI($base);
 
-		$segments = $uri->getSegments();
-		$uri->setSilent()->setSegment(6, 'banana');
+        $segments = $uri->getSegments();
+        $uri->setSilent()->setSegment(6, 'banana');
 
-		$this->assertEquals($segments, $uri->getSegments());
-	}
+        $this->assertSame($segments, $uri->getSegments());
+    }
 
-	//--------------------------------------------------------------------
-	// Exploratory testing, investigating https://github.com/codeigniter4/CodeIgniter4/issues/2016
+    // Exploratory testing, investigating https://github.com/codeigniter4/CodeIgniter4/issues/2016
 
-	public function testBasedNoIndex()
-	{
-		Services::reset();
+    public function testBasedNoIndex()
+    {
+        Services::reset();
 
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
 
-		$config            = new App();
-		$config->baseURL   = 'http://example.com/ci/v4';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/ci/v4/controller/method');
+        $config            = new App();
+        $config->baseURL   = 'http://example.com/ci/v4';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/ci/v4/controller/method');
 
-		Services::injectMock('request', $request);
+        Services::injectMock('request', $request);
 
-		// going through request
-		$this->assertEquals('http://example.com/ci/v4/controller/method', (string) $request->uri);
-		$this->assertEquals('/ci/v4/controller/method', $request->uri->getPath());
+        // going through request
+        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->uri);
+        $this->assertSame('/ci/v4/controller/method', $request->uri->getPath());
 
-		// standalone
-		$uri = new URI('http://example.com/ci/v4/controller/method');
-		$this->assertEquals('http://example.com/ci/v4/controller/method', (string) $uri);
-		$this->assertEquals('/ci/v4/controller/method', $uri->getPath());
+        // standalone
+        $uri = new URI('http://example.com/ci/v4/controller/method');
+        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $uri);
+        $this->assertSame('/ci/v4/controller/method', $uri->getPath());
 
-		$this->assertEquals($uri->getPath(), $request->uri->getPath());
-	}
+        $this->assertSame($uri->getPath(), $request->uri->getPath());
+    }
 
-	public function testBasedWithIndex()
-	{
-		Services::reset();
+    public function testBasedWithIndex()
+    {
+        Services::reset();
 
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/ci/v4/index.php/controller/method';
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/ci/v4/index.php/controller/method';
 
-		$config            = new App();
-		$config->baseURL   = 'http://example.com/ci/v4';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/ci/v4/index.php/controller/method');
+        $config            = new App();
+        $config->baseURL   = 'http://example.com/ci/v4';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/ci/v4/index.php/controller/method');
 
-		Services::injectMock('request', $request);
+        Services::injectMock('request', $request);
 
-		// going through request
-		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
-		$this->assertEquals('/ci/v4/index.php/controller/method', $request->uri->getPath());
+        // going through request
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
+        $this->assertSame('/ci/v4/index.php/controller/method', $request->uri->getPath());
 
-		// standalone
-		$uri = new URI('http://example.com/ci/v4/index.php/controller/method');
-		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
-		$this->assertEquals('/ci/v4/index.php/controller/method', $uri->getPath());
+        // standalone
+        $uri = new URI('http://example.com/ci/v4/index.php/controller/method');
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
+        $this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath());
 
-		$this->assertEquals($uri->getPath(), $request->uri->getPath());
-	}
+        $this->assertSame($uri->getPath(), $request->uri->getPath());
+    }
 
-	public function testForceGlobalSecureRequests()
-	{
-		Services::reset();
+    public function testForceGlobalSecureRequests()
+    {
+        Services::reset();
 
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
 
-		$config                            = new App();
-		$config->baseURL                   = 'http://example.com/ci/v4';
-		$config->indexPage                 = 'index.php';
-		$config->forceGlobalSecureRequests = true;
+        $config                            = new App();
+        $config->baseURL                   = 'http://example.com/ci/v4';
+        $config->indexPage                 = 'index.php';
+        $config->forceGlobalSecureRequests = true;
 
-		Factories::injectMock('config', 'App', $config);
+        Factories::injectMock('config', 'App', $config);
 
-		$uri     = new URI('http://example.com/ci/v4/controller/method');
-		$request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());
+        $uri     = new URI('http://example.com/ci/v4/controller/method');
+        $request = new IncomingRequest($config, $uri, 'php://input', new UserAgent());
 
-		Services::injectMock('request', $request);
+        Services::injectMock('request', $request);
 
-		// Detected by request
-		$this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);
+        // Detected by request
+        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->uri);
 
-		// Standalone
-		$uri = new URI('http://example.com/ci/v4/controller/method');
-		$this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);
+        // Standalone
+        $uri = new URI('http://example.com/ci/v4/controller/method');
+        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $uri);
 
-		$this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
-	}
+        $this->assertSame(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
+    }
 
-	public function testZeroAsURIPath()
-	{
-		$url = 'http://example.com/0';
-		$uri = new URI($url);
-		$this->assertEquals($url, (string) $uri);
-		$this->assertEquals('/0', $uri->getPath());
-	}
+    public function testZeroAsURIPath()
+    {
+        $url = 'http://example.com/0';
+        $uri = new URI($url);
+        $this->assertSame($url, (string) $uri);
+        $this->assertSame('/0', $uri->getPath());
+    }
 
-	public function testEmptyURIPath()
-	{
-		$url = 'http://example.com/';
-		$uri = new URI($url);
-		$this->assertEquals([], $uri->getSegments());
-		$this->assertEquals(0, $uri->getTotalSegments());
-	}
+    public function testEmptyURIPath()
+    {
+        $url = 'http://example.com/';
+        $uri = new URI($url);
+        $this->assertSame([], $uri->getSegments());
+        $this->assertSame(0, $uri->getTotalSegments());
+    }
 
-	public function testSetURI()
-	{
-		$url = ':';
-		$uri = new URI();
+    public function testSetURI()
+    {
+        $url = ':';
+        $uri = new URI();
 
-		$this->expectException(HTTPException::class);
-		$this->expectExceptionMessage(lang('HTTP.cannotParseURI', [$url]));
+        $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage(lang('HTTP.cannotParseURI', [$url]));
 
-		$uri->setURI($url);
-	}
+        $uri->setURI($url);
+    }
 
-	public function testSetURISilent()
-	{
-		$url = ':';
-		$uri = new URI();
-		$uri->setSilent()->setURI($url);
+    public function testSetURISilent()
+    {
+        $url = ':';
+        $uri = new URI();
+        $uri->setSilent()->setURI($url);
 
-		$this->assertTrue(true);
-	}
+        $this->assertTrue(true);
+    }
 
-	public function testCreateURIString()
-	{
-		$expected = 'https://example.com/';
-		$uri      = URI::createURIString('https', 'example.com/', '/');
+    public function testCreateURIString()
+    {
+        $expected = 'https://example.com/';
+        $uri      = URI::createURIString('https', 'example.com/', '/');
 
-		$this->assertEquals($expected, $uri);
-	}
+        $this->assertSame($expected, $uri);
+    }
 }
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index c0076a25eb08..6b80d8f25b30 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -1,118 +1,117 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class UserAgentTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class UserAgentTest extends CIUnitTestCase
 {
-
-	protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
-	protected $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
-
-	/**
-	 * @var UserAgent
-	 */
-	protected $agent;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		// set a baseline user agent
-		$_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
-
-		$this->agent = new UserAgent();
-
-		helper('url');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testMobile()
-	{
-		// Mobile Not Set
-		$_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
-		$this->assertEquals('', $this->agent->isMobile());
-		unset($_SERVER['HTTP_USER_AGENT']);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testIsFunctions()
-	{
-		$this->assertTrue($this->agent->isBrowser());
-		$this->assertTrue($this->agent->isBrowser('Safari'));
-		$this->assertFalse($this->agent->isBrowser('Firefox'));
-		$this->assertFalse($this->agent->isRobot());
-		$this->assertFalse($this->agent->isMobile());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testReferrer()
-	{
-		$_SERVER['HTTP_REFERER'] = 'http://codeigniter.com/user_guide/';
-		$this->assertTrue($this->agent->isReferral());
-		$this->assertEquals('http://codeigniter.com/user_guide/', $this->agent->getReferrer());
-
-		$this->setPrivateProperty($this->agent, 'referrer', null);
-		unset($_SERVER['HTTP_REFERER']);
-		$this->assertFalse($this->agent->isReferral());
-		$this->assertEquals('', $this->agent->getReferrer());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testAgentString()
-	{
-		$this->assertEquals($this->_user_agent, $this->agent->getAgentString());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testBrowserInfo()
-	{
-		$this->assertEquals('Mac OS X', $this->agent->getPlatform());
-		$this->assertEquals('Safari', $this->agent->getBrowser());
-		$this->assertEquals('533.20.27', $this->agent->getVersion());
-		$this->assertEquals('', $this->agent->getRobot());
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParse()
-	{
-		$newAgent = 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0';
-		$this->agent->parse($newAgent);
-
-		$this->assertEquals('Android', $this->agent->getPlatform());
-		$this->assertEquals('Firefox', $this->agent->getBrowser());
-		$this->assertEquals('13.0', $this->agent->getVersion());
-		$this->assertEquals('', $this->agent->getRobot());
-		$this->assertEquals('Android', $this->agent->getMobile());
-		$this->assertEquals($newAgent, $this->agent->getAgentString());
-		$this->assertTrue($this->agent->isBrowser());
-		$this->assertFalse($this->agent->isRobot());
-		$this->assertTrue($this->agent->isMobile());
-		$this->assertTrue($this->agent->isMobile('android'));
-	}
-
-	public function testParseBot()
-	{
-		$newAgent = 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)';
-		$this->agent->parse($newAgent);
-
-		$this->assertFalse($this->agent->isBrowser());
-		$this->assertTrue($this->agent->isRobot());
-		$this->assertFalse($this->agent->isRobot('Bob'));
-		$this->assertFalse($this->agent->isMobile());
-	}
-
-	public function testEmptyUserAgentVariable()
-	{
-		unset($_SERVER['HTTP_USER_AGENT']);
-		$agent = new UserAgent();
-		$this->assertEmpty((string) $agent);
-	}
+    protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
+    protected $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
+
+    /**
+     * @var UserAgent
+     */
+    protected $agent;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // set a baseline user agent
+        $_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
+
+        $this->agent = new UserAgent();
+
+        helper('url');
+    }
+
+    public function testMobile()
+    {
+        // Mobile Not Set
+        $_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
+        $this->assertFalse($this->agent->isMobile());
+        unset($_SERVER['HTTP_USER_AGENT']);
+    }
+
+    public function testIsFunctions()
+    {
+        $this->assertTrue($this->agent->isBrowser());
+        $this->assertTrue($this->agent->isBrowser('Safari'));
+        $this->assertFalse($this->agent->isBrowser('Firefox'));
+        $this->assertFalse($this->agent->isRobot());
+        $this->assertFalse($this->agent->isMobile());
+    }
+
+    public function testReferrer()
+    {
+        $_SERVER['HTTP_REFERER'] = 'http://codeigniter.com/user_guide/';
+        $this->assertTrue($this->agent->isReferral());
+        $this->assertSame('http://codeigniter.com/user_guide/', $this->agent->getReferrer());
+
+        $this->setPrivateProperty($this->agent, 'referrer', null);
+        unset($_SERVER['HTTP_REFERER']);
+        $this->assertFalse($this->agent->isReferral());
+        $this->assertSame('', $this->agent->getReferrer());
+    }
+
+    public function testAgentString()
+    {
+        $this->assertSame($this->_user_agent, $this->agent->getAgentString());
+    }
+
+    public function testBrowserInfo()
+    {
+        $this->assertSame('Mac OS X', $this->agent->getPlatform());
+        $this->assertSame('Safari', $this->agent->getBrowser());
+        $this->assertSame('533.20.27', $this->agent->getVersion());
+        $this->assertSame('', $this->agent->getRobot());
+    }
+
+    public function testParse()
+    {
+        $newAgent = 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0';
+        $this->agent->parse($newAgent);
+
+        $this->assertSame('Android', $this->agent->getPlatform());
+        $this->assertSame('Firefox', $this->agent->getBrowser());
+        $this->assertSame('13.0', $this->agent->getVersion());
+        $this->assertSame('', $this->agent->getRobot());
+        $this->assertSame('Android', $this->agent->getMobile());
+        $this->assertSame($newAgent, $this->agent->getAgentString());
+        $this->assertTrue($this->agent->isBrowser());
+        $this->assertFalse($this->agent->isRobot());
+        $this->assertTrue($this->agent->isMobile());
+        $this->assertTrue($this->agent->isMobile('android'));
+    }
+
+    public function testParseBot()
+    {
+        $newAgent = 'Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)';
+        $this->agent->parse($newAgent);
+
+        $this->assertFalse($this->agent->isBrowser());
+        $this->assertTrue($this->agent->isRobot());
+        $this->assertFalse($this->agent->isRobot('Bob'));
+        $this->assertFalse($this->agent->isMobile());
+    }
+
+    public function testEmptyUserAgentVariable()
+    {
+        unset($_SERVER['HTTP_USER_AGENT']);
+        $agent = new UserAgent();
+        $this->assertEmpty((string) $agent);
+    }
 }
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 58ba11644a03..f6ae751e1bda 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -1,448 +1,471 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class ArrayHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ArrayHelperTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-		helper('array');
-	}
-
-	public function testArrayDotSimple()
-	{
-		$data = [
-			'foo' => [
-				'bar' => 23,
-			],
-		];
-
-		$this->assertEquals(23, dot_array_search('foo.bar', $data));
-	}
-
-	public function testArrayDotTooManyLevels()
-	{
-		$data = [
-			'foo' => [
-				'bar' => 23,
-			],
-		];
-
-		$this->assertEquals(23, dot_array_search('foo.bar.baz', $data));
-	}
-
-	public function testArrayDotEscape()
-	{
-		$data = [
-			'foo'     => [
-				'bar.baz' => 23,
-			],
-			'foo.bar' => [
-				'baz' => 42,
-			],
-		];
-
-		$this->assertEquals(23, dot_array_search('foo.bar\.baz', $data));
-		$this->assertEquals(42, dot_array_search('foo\.bar.baz', $data));
-	}
-
-	public function testArraySearchDotMultiLevels()
-	{
-		$data1 = ['bar' => [['foo' => 'baz']]];
-		$data2 = ['bar' => [
-			['foo' => 'bizz'],
-			['foo' => 'buzz'],
-		]];
-		$data3 = ['baz' => 'none'];
-
-		$this->assertSame('baz', dot_array_search('bar.*.foo', $data1));
-		$this->assertSame(['bizz', 'buzz'], dot_array_search('bar.*.foo', $data2));
-		$this->assertNull(dot_array_search('bar.*.foo', $data3));
-	}
-
-	public function testArrayDotReturnNullEmptyArray()
-	{
-		$data = [];
-
-		$this->assertNull(dot_array_search('foo.bar', $data));
-	}
-
-	public function testArrayDotReturnNullMissingValue()
-	{
-		$data = [
-			'foo' => [
-				'bar' => 23,
-			],
-		];
-
-		$this->assertNull(dot_array_search('foo.baz', $data));
-	}
-
-	public function testArrayDotReturnNullEmptyIndex()
-	{
-		$data = [
-			'foo' => [
-				'bar' => 23,
-			],
-		];
-
-		$this->assertNull(dot_array_search('', $data));
-	}
-
-	public function testArrayDotEarlyIndex()
-	{
-		$data = [
-			'foo' => [
-				'bar' => 23,
-			],
-		];
-
-		$this->assertEquals(['bar' => 23], dot_array_search('foo', $data));
-	}
-
-	public function testArrayDotWildcard()
-	{
-		$data = [
-			'foo' => [
-				'bar' => [
-					'baz' => 23,
-				],
-			],
-		];
-
-		$this->assertEquals(23, dot_array_search('foo.*.baz', $data));
-	}
-
-	public function testArrayDotWildcardWithMultipleChoices()
-	{
-		$data = [
-			'foo' => [
-				'buzz' => [
-					'fizz' => 11,
-				],
-				'bar'  => [
-					'baz' => 23,
-				],
-			],
-		];
-
-		$this->assertEquals(11, dot_array_search('foo.*.fizz', $data));
-		$this->assertEquals(23, dot_array_search('foo.*.baz', $data));
-	}
-
-	public function testArrayDotNestedNotFound()
-	{
-		$data = [
-			'foo' => [
-				'buzz' => [
-					'fizz' => 11,
-				],
-				'bar'  => [
-					'baz' => 23,
-				],
-			],
-		];
-
-		$this->assertNull(dot_array_search('foo.*.notthere', $data));
-	}
-
-	public function testArrayDotIgnoresLastWildcard()
-	{
-		$data = [
-			'foo' => [
-				'bar' => [
-					'baz' => 23,
-				],
-			],
-		];
-
-		$this->assertEquals(['baz' => 23], dot_array_search('foo.bar.*', $data));
-	}
-
-	/**
-	 * @dataProvider deepSearchProvider
-	 */
-	public function testArrayDeepSearch($key, $expected)
-	{
-		$data = [
-			'key1' => 'Value 1',
-			'key5' => [
-				'key51' => 'Value 5.1',
-			],
-			'key6' => [
-				'key61' => [
-					'key61' => 'Value 6.1',
-					'key64' => [
-						42       => 'Value 42',
-						'key641' => 'Value 6.4.1',
-						'key644' => [
-							'key6441' => 'Value 6.4.4.1',
-						],
-					],
-				],
-			],
-		];
-
-		$result = array_deep_search($key, $data);
-
-		$this->assertEquals($expected, $result);
-	}
-
-	public function testArrayDeepSearchReturnNullEmptyArray()
-	{
-		$data = [];
-
-		$this->assertNull(array_deep_search('key644', $data));
-	}
-
-	/**
-	 * @dataProvider sortByMultipleKeysProvider
-	 */
-	public function testArraySortByMultipleKeysWithArray($data, $sortColumns, $expected)
-	{
-		$success = array_sort_by_multiple_keys($data, $sortColumns);
-
-		$this->assertTrue($success);
-		$this->assertEquals($expected, array_column($data, 'name'));
-	}
-
-	/**
-	 * @dataProvider sortByMultipleKeysProvider
-	 */
-	public function testArraySortByMultipleKeysWithObjects($data, $sortColumns, $expected)
-	{
-		// Morph to objects
-		foreach ($data as $index => $dataSet)
-		{
-			$data[$index] = (object) $dataSet;
-		}
-
-		$success = array_sort_by_multiple_keys($data, $sortColumns);
-
-		$this->assertTrue($success);
-		$this->assertEquals($expected, array_column((array) $data, 'name'));
-	}
-
-	/**
-	 * @dataProvider sortByMultipleKeysProvider
-	 */
-	public function testArraySortByMultipleKeysFailsEmptyParameter($data, $sortColumns, $expected)
-	{
-		// Both filled
-		$success = array_sort_by_multiple_keys($data, $sortColumns);
-
-		$this->assertTrue($success);
-
-		// Empty $sortColumns
-		$success = array_sort_by_multiple_keys($data, []);
-
-		$this->assertFalse($success);
-
-		// Empty &$array
-		$data    = [];
-		$success = array_sort_by_multiple_keys($data, $sortColumns);
-
-		$this->assertFalse($success);
-	}
-
-	/**
-	 * @dataProvider sortByMultipleKeysProvider
-	 */
-	public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data)
-	{
-		// PHP 8 changes this error type
-		if (version_compare(PHP_VERSION, '8.0', '<'))
-		{
-			$this->expectException('ErrorException');
-		}
-		else
-		{
-			$this->expectException('ValueError');
-		}
-
-		$this->expectExceptionMessage('Array sizes are inconsistent');
-
-		$sortColumns = [
-			'team.orders' => SORT_ASC,
-			'positions'   => SORT_ASC,
-		];
-
-		array_sort_by_multiple_keys($data, $sortColumns);
-	}
-
-	public static function deepSearchProvider()
-	{
-		return [
-			[
-				'key6441',
-				'Value 6.4.4.1',
-			],
-			[
-				'key64421',
-				null,
-			],
-			[
-				42,
-				'Value 42',
-			],
-			[
-				'key644',
-				['key6441' => 'Value 6.4.4.1'],
-			],
-			[
-				'',
-				null,
-			],
-		];
-	}
-
-	public static function sortByMultipleKeysProvider()
-	{
-		$seed = [
-			0 => [
-				'name'     => 'John',
-				'position' => 3,
-				'team'     => [
-					'order' => 2,
-				],
-			],
-			1 => [
-				'name'     => 'Maria',
-				'position' => 4,
-				'team'     => [
-					'order' => 1,
-				],
-			],
-			2 => [
-				'name'     => 'Frank',
-				'position' => 1,
-				'team'     => [
-					'order' => 1,
-				],
-			],
-		];
-
-		return [
-			[
-				$seed,
-				[
-					'name' => SORT_STRING,
-				],
-				[
-					'Frank',
-					'John',
-					'Maria',
-				],
-			],
-			[
-				$seed,
-				[
-					'team.order' => SORT_ASC,
-					'position'   => SORT_ASC,
-				],
-				[
-					'Frank',
-					'Maria',
-					'John',
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider arrayFlattenProvider
-	 *
-	 * @param iterable $input
-	 * @param iterable $expected
-	 *
-	 * @return void
-	 */
-	public function testArrayFlattening($input, $expected): void
-	{
-		$this->assertSame($expected, array_flatten_with_dots($input));
-	}
-
-	public function arrayFlattenProvider(): iterable
-	{
-		yield 'normal' => [
-				  [
-					  'id'   => '12',
-					  'user' => [
-						  'first_name' => 'john',
-						  'last_name'  => 'smith',
-						  'age'        => '26 years',
-					  ],
-				  ],
-				  [
-					  'id'              => '12',
-					  'user.first_name' => 'john',
-					  'user.last_name'  => 'smith',
-					  'user.age'        => '26 years',
-				  ],
-			  ];
-
-		yield 'many-levels' => [
-				  [
-					  'foo' => 1,
-					  'bar' => [
-						  'bax' => [
-							  'baz' => 2,
-							  'biz' => 3,
-						  ],
-					  ],
-					  'baz' => [
-						  'fizz' => 4,
-					  ],
-				  ],
-				  [
-					  'foo'         => 1,
-					  'bar.bax.baz' => 2,
-					  'bar.bax.biz' => 3,
-					  'baz.fizz'    => 4,
-				  ],
-			  ];
-
-		yield 'with-empty-arrays' => [
-				  [
-					  'foo' => 'bar',
-					  'baz' => [],
-					  'bar' => [
-						  'fizz' => 'buzz',
-						  'nope' => 'yeah',
-						  'why'  => [],
-					  ],
-				  ],
-				  [
-					  'foo'      => 'bar',
-					  'bar.fizz' => 'buzz',
-					  'bar.nope' => 'yeah',
-				  ],
-			  ];
-
-		yield 'with-mixed-empty' => [
-				  [
-					  'foo' => 1,
-					  ''    => [
-						  'bar' => 2,
-						  'baz' => 3,
-					  ],
-					  0     => [
-						  'fizz' => 4,
-					  ],
-					  1     => [
-						  'buzz' => 5,
-					  ],
-				  ],
-				  [
-					  'foo'    => 1,
-					  '.bar'   => 2,
-					  '.baz'   => 3,
-					  '0.fizz' => 4,
-					  '1.buzz' => 5,
-				  ],
-			  ];
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        helper('array');
+    }
+
+    public function testArrayDotSimple()
+    {
+        $data = [
+            'foo' => [
+                'bar' => 23,
+            ],
+        ];
+
+        $this->assertSame(23, dot_array_search('foo.bar', $data));
+    }
+
+    public function testArrayDotTooManyLevels()
+    {
+        $data = [
+            'foo' => [
+                'bar' => 23,
+            ],
+        ];
+
+        $this->assertSame(23, dot_array_search('foo.bar.baz', $data));
+    }
+
+    public function testArrayDotEscape()
+    {
+        $data = [
+            'foo' => [
+                'bar.baz' => 23,
+            ],
+            'foo.bar' => [
+                'baz' => 42,
+            ],
+        ];
+
+        $this->assertSame(23, dot_array_search('foo.bar\.baz', $data));
+        $this->assertSame(42, dot_array_search('foo\.bar.baz', $data));
+    }
+
+    public function testArraySearchDotMultiLevels()
+    {
+        $data1 = ['bar' => [['foo' => 'baz']]];
+        $data2 = ['bar' => [
+            ['foo' => 'bizz'],
+            ['foo' => 'buzz'],
+        ]];
+        $data3 = ['baz' => 'none'];
+
+        $this->assertSame('baz', dot_array_search('bar.*.foo', $data1));
+        $this->assertSame(['bizz', 'buzz'], dot_array_search('bar.*.foo', $data2));
+        $this->assertNull(dot_array_search('bar.*.foo', $data3));
+    }
+
+    public function testArrayDotReturnNullEmptyArray()
+    {
+        $data = [];
+
+        $this->assertNull(dot_array_search('foo.bar', $data));
+    }
+
+    public function testArrayDotReturnNullMissingValue()
+    {
+        $data = [
+            'foo' => [
+                'bar' => 23,
+            ],
+        ];
+
+        $this->assertNull(dot_array_search('foo.baz', $data));
+    }
+
+    public function testArrayDotReturnNullEmptyIndex()
+    {
+        $data = [
+            'foo' => [
+                'bar' => 23,
+            ],
+        ];
+
+        $this->assertNull(dot_array_search('', $data));
+    }
+
+    public function testArrayDotEarlyIndex()
+    {
+        $data = [
+            'foo' => [
+                'bar' => 23,
+            ],
+        ];
+
+        $this->assertSame(['bar' => 23], dot_array_search('foo', $data));
+    }
+
+    public function testArrayDotWildcard()
+    {
+        $data = [
+            'foo' => [
+                'bar' => [
+                    'baz' => 23,
+                ],
+            ],
+        ];
+
+        $this->assertSame(23, dot_array_search('foo.*.baz', $data));
+    }
+
+    public function testArrayDotWildcardWithMultipleChoices()
+    {
+        $data = [
+            'foo' => [
+                'buzz' => [
+                    'fizz' => 11,
+                ],
+                'bar' => [
+                    'baz' => 23,
+                ],
+            ],
+        ];
+
+        $this->assertSame(11, dot_array_search('foo.*.fizz', $data));
+        $this->assertSame(23, dot_array_search('foo.*.baz', $data));
+    }
+
+    public function testArrayDotNestedNotFound()
+    {
+        $data = [
+            'foo' => [
+                'buzz' => [
+                    'fizz' => 11,
+                ],
+                'bar' => [
+                    'baz' => 23,
+                ],
+            ],
+        ];
+
+        $this->assertNull(dot_array_search('foo.*.notthere', $data));
+    }
+
+    public function testArrayDotIgnoresLastWildcard()
+    {
+        $data = [
+            'foo' => [
+                'bar' => [
+                    'baz' => 23,
+                ],
+            ],
+        ];
+
+        $this->assertSame(['baz' => 23], dot_array_search('foo.bar.*', $data));
+    }
+
+    /**
+     * @dataProvider deepSearchProvider
+     *
+     * @param mixed $key
+     * @param mixed $expected
+     */
+    public function testArrayDeepSearch($key, $expected)
+    {
+        $data = [
+            'key1' => 'Value 1',
+            'key5' => [
+                'key51' => 'Value 5.1',
+            ],
+            'key6' => [
+                'key61' => [
+                    'key61' => 'Value 6.1',
+                    'key64' => [
+                        42       => 'Value 42',
+                        'key641' => 'Value 6.4.1',
+                        'key644' => [
+                            'key6441' => 'Value 6.4.4.1',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $result = array_deep_search($key, $data);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testArrayDeepSearchReturnNullEmptyArray()
+    {
+        $data = [];
+
+        $this->assertNull(array_deep_search('key644', $data));
+    }
+
+    /**
+     * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
+     */
+    public function testArraySortByMultipleKeysWithArray($data, $sortColumns, $expected)
+    {
+        $success = array_sort_by_multiple_keys($data, $sortColumns);
+
+        $this->assertTrue($success);
+        $this->assertSame($expected, array_column($data, 'name'));
+    }
+
+    /**
+     * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
+     */
+    public function testArraySortByMultipleKeysWithObjects($data, $sortColumns, $expected)
+    {
+        // Morph to objects
+        foreach ($data as $index => $dataSet) {
+            $data[$index] = (object) $dataSet;
+        }
+
+        $success = array_sort_by_multiple_keys($data, $sortColumns);
+
+        $this->assertTrue($success);
+        $this->assertSame($expected, array_column((array) $data, 'name'));
+    }
+
+    /**
+     * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
+     */
+    public function testArraySortByMultipleKeysFailsEmptyParameter($data, $sortColumns, $expected)
+    {
+        // Both filled
+        $success = array_sort_by_multiple_keys($data, $sortColumns);
+
+        $this->assertTrue($success);
+
+        // Empty $sortColumns
+        $success = array_sort_by_multiple_keys($data, []);
+
+        $this->assertFalse($success);
+
+        // Empty &$array
+        $data    = [];
+        $success = array_sort_by_multiple_keys($data, $sortColumns);
+
+        $this->assertFalse($success);
+    }
+
+    /**
+     * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     */
+    public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data)
+    {
+        // PHP 8 changes this error type
+        if (version_compare(PHP_VERSION, '8.0', '<')) {
+            $this->expectException('ErrorException');
+        } else {
+            $this->expectException('ValueError');
+        }
+
+        $this->expectExceptionMessage('Array sizes are inconsistent');
+
+        $sortColumns = [
+            'team.orders' => SORT_ASC,
+            'positions'   => SORT_ASC,
+        ];
+
+        array_sort_by_multiple_keys($data, $sortColumns);
+    }
+
+    public static function deepSearchProvider()
+    {
+        return [
+            [
+                'key6441',
+                'Value 6.4.4.1',
+            ],
+            [
+                'key64421',
+                null,
+            ],
+            [
+                42,
+                'Value 42',
+            ],
+            [
+                'key644',
+                ['key6441' => 'Value 6.4.4.1'],
+            ],
+            [
+                '',
+                null,
+            ],
+        ];
+    }
+
+    public static function sortByMultipleKeysProvider()
+    {
+        $seed = [
+            0 => [
+                'name'     => 'John',
+                'position' => 3,
+                'team'     => [
+                    'order' => 2,
+                ],
+            ],
+            1 => [
+                'name'     => 'Maria',
+                'position' => 4,
+                'team'     => [
+                    'order' => 1,
+                ],
+            ],
+            2 => [
+                'name'     => 'Frank',
+                'position' => 1,
+                'team'     => [
+                    'order' => 1,
+                ],
+            ],
+        ];
+
+        return [
+            [
+                $seed,
+                [
+                    'name' => SORT_STRING,
+                ],
+                [
+                    'Frank',
+                    'John',
+                    'Maria',
+                ],
+            ],
+            [
+                $seed,
+                [
+                    'team.order' => SORT_ASC,
+                    'position'   => SORT_ASC,
+                ],
+                [
+                    'Frank',
+                    'Maria',
+                    'John',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider arrayFlattenProvider
+     *
+     * @param iterable $input
+     * @param iterable $expected
+     */
+    public function testArrayFlattening($input, $expected): void
+    {
+        $this->assertSame($expected, array_flatten_with_dots($input));
+    }
+
+    public function arrayFlattenProvider(): iterable
+    {
+        yield 'normal' => [
+            [
+                'id'   => '12',
+                'user' => [
+                    'first_name' => 'john',
+                    'last_name'  => 'smith',
+                    'age'        => '26 years',
+                ],
+            ],
+            [
+                'id'              => '12',
+                'user.first_name' => 'john',
+                'user.last_name'  => 'smith',
+                'user.age'        => '26 years',
+            ],
+        ];
+
+        yield 'many-levels' => [
+            [
+                'foo' => 1,
+                'bar' => [
+                    'bax' => [
+                        'baz' => 2,
+                        'biz' => 3,
+                    ],
+                ],
+                'baz' => [
+                    'fizz' => 4,
+                ],
+            ],
+            [
+                'foo'         => 1,
+                'bar.bax.baz' => 2,
+                'bar.bax.biz' => 3,
+                'baz.fizz'    => 4,
+            ],
+        ];
+
+        yield 'with-empty-arrays' => [
+            [
+                'foo' => 'bar',
+                'baz' => [],
+                'bar' => [
+                    'fizz' => 'buzz',
+                    'nope' => 'yeah',
+                    'why'  => [],
+                ],
+            ],
+            [
+                'foo'      => 'bar',
+                'bar.fizz' => 'buzz',
+                'bar.nope' => 'yeah',
+            ],
+        ];
+
+        yield 'with-mixed-empty' => [
+            [
+                'foo' => 1,
+                ''    => [
+                    'bar' => 2,
+                    'baz' => 3,
+                ],
+                0 => [
+                    'fizz' => 4,
+                ],
+                1 => [
+                    'buzz' => 5,
+                ],
+            ],
+            [
+                'foo'    => 1,
+                '.bar'   => 2,
+                '.baz'   => 3,
+                '0.fizz' => 4,
+                '1.buzz' => 5,
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 512bfc2158cb..13eae956faea 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Cookie\Exceptions\CookieException;
@@ -10,172 +20,175 @@
 use Config\App;
 use Config\Services;
 
+/**
+ * @internal
+ */
 final class CookieHelperTest extends CIUnitTestCase
 {
-	private $name;
-	private $value;
-	private $expire;
-	private $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->name   = 'greetings';
-		$this->value  = 'hello world';
-		$this->expire = 9999;
-
-		Services::injectMock('response', new MockResponse(new App()));
-		$this->response = Services::response();
-		$this->request  = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-		Services::injectMock('request', $this->request);
-
-		helper('cookie');
-	}
-
-	public function testSetCookie()
-	{
-		set_cookie($this->name, $this->value, $this->expire);
-
-		$this->assertTrue($this->response->hasCookie($this->name));
-
-		delete_cookie($this->name);
-	}
-
-	public function testHasCookie()
-	{
-		$cookieAttr = [
-			'name'   => $this->name,
-			'value'  => $this->value,
-			'expire' => $this->expire,
-		];
-		set_cookie($cookieAttr);
-
-		$this->assertTrue(has_cookie($this->name, $this->value));
-
-		delete_cookie($this->name);
-	}
-
-	public function testSetCookieByArrayParameters()
-	{
-		$cookieAttr = [
-			'name'   => $this->name,
-			'value'  => $this->value,
-			'expire' => $this->expire,
-		];
-		set_cookie($cookieAttr);
-
-		$this->assertTrue($this->response->hasCookie($this->name, $this->value));
-
-		delete_cookie($this->name);
-	}
-
-	public function testSetCookieSecured()
-	{
-		$pre       = 'Hello, I try to';
-		$pst       = 'your site';
-		$unsec     = "$pre <script>alert('Hack');</script> $pst";
-		$sec       = "$pre [removed]alert&#40;&#39;Hack&#39;&#41;;[removed] $pst";
-		$unsecured = 'unsecured';
-		$secured   = 'secured';
-
-		set_cookie($unsecured, $unsec, $this->expire);
-		set_cookie($secured, $sec, $this->expire);
-
-		$this->assertTrue($this->response->hasCookie($unsecured, $unsec));
-		$this->assertTrue($this->response->hasCookie($secured, $sec));
-
-		delete_cookie($unsecured);
-		delete_cookie($secured);
-	}
-
-	public function testDeleteCookie()
-	{
-		$this->response->setCookie($this->name, $this->value, $this->expire);
-
-		delete_cookie($this->name);
-
-		$cookie = $this->response->getCookie($this->name);
-
-		// The cookie is set to be cleared when the request is sent....
-		$this->assertEquals('', $cookie->getValue());
-		$this->assertEquals(0, $cookie->getExpiresTimestamp());
-	}
-
-	public function testGetCookie()
-	{
-		$_COOKIE['TEST'] = 5;
-
-		$this->assertEquals(5, get_cookie('TEST'));
-	}
-
-	public function testDeleteCookieAfterLastSet()
-	{
-		delete_cookie($this->name);
-
-		$cookie = $this->response->getCookie($this->name);
-		// The cookie is set to be cleared when the request is sent....
-		$this->assertEquals('', $cookie->getValue());
-	}
-
-	public function testSameSiteDefault()
-	{
-		$cookieAttr = [
-			'name'   => $this->name,
-			'value'  => $this->value,
-			'expire' => $this->expire,
-		];
-
-		set_cookie($cookieAttr);
-
-		$this->assertTrue($this->response->hasCookie($this->name));
-		$theCookie = $this->response->getCookie($this->name);
-		$this->assertEquals('Lax', $theCookie->getSameSite());
-
-		delete_cookie($this->name);
-	}
-
-	public function testSameSiteInvalid()
-	{
-		$cookieAttr = [
-			'name'     => $this->name,
-			'value'    => $this->value,
-			'expire'   => $this->expire,
-			'samesite' => 'Invalid',
-		];
-
-		$this->expectException(CookieException::class);
-		$this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
-
-		set_cookie($cookieAttr);
-	}
-
-	public function testSameSiteParamArray()
-	{
-		$cookieAttr = [
-			'name'     => $this->name,
-			'value'    => $this->value,
-			'expire'   => $this->expire,
-			'samesite' => 'Strict',
-		];
-
-		set_cookie($cookieAttr);
-
-		$this->assertTrue($this->response->hasCookie($this->name));
-		$theCookie = $this->response->getCookie($this->name);
-		$this->assertEquals('Strict', $theCookie->getSameSite());
+    private $name;
+    private $value;
+    private $expire;
+    private $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->name   = 'greetings';
+        $this->value  = 'hello world';
+        $this->expire = 9999;
+
+        Services::injectMock('response', new MockResponse(new App()));
+        $this->response = Services::response();
+        $this->request  = new IncomingRequest(new App(), new URI(), null, new UserAgent());
+        Services::injectMock('request', $this->request);
+
+        helper('cookie');
+    }
+
+    public function testSetCookie()
+    {
+        set_cookie($this->name, $this->value, $this->expire);
+
+        $this->assertTrue($this->response->hasCookie($this->name));
+
+        delete_cookie($this->name);
+    }
+
+    public function testHasCookie()
+    {
+        $cookieAttr = [
+            'name'   => $this->name,
+            'value'  => $this->value,
+            'expire' => $this->expire,
+        ];
+        set_cookie($cookieAttr);
+
+        $this->assertTrue(has_cookie($this->name, $this->value));
+
+        delete_cookie($this->name);
+    }
+
+    public function testSetCookieByArrayParameters()
+    {
+        $cookieAttr = [
+            'name'   => $this->name,
+            'value'  => $this->value,
+            'expire' => $this->expire,
+        ];
+        set_cookie($cookieAttr);
+
+        $this->assertTrue($this->response->hasCookie($this->name, $this->value));
+
+        delete_cookie($this->name);
+    }
+
+    public function testSetCookieSecured()
+    {
+        $pre       = 'Hello, I try to';
+        $pst       = 'your site';
+        $unsec     = "{$pre} <script>alert('Hack');</script> {$pst}";
+        $sec       = "{$pre} [removed]alert&#40;&#39;Hack&#39;&#41;;[removed] {$pst}";
+        $unsecured = 'unsecured';
+        $secured   = 'secured';
+
+        set_cookie($unsecured, $unsec, $this->expire);
+        set_cookie($secured, $sec, $this->expire);
+
+        $this->assertTrue($this->response->hasCookie($unsecured, $unsec));
+        $this->assertTrue($this->response->hasCookie($secured, $sec));
+
+        delete_cookie($unsecured);
+        delete_cookie($secured);
+    }
+
+    public function testDeleteCookie()
+    {
+        $this->response->setCookie($this->name, $this->value, $this->expire);
+
+        delete_cookie($this->name);
+
+        $cookie = $this->response->getCookie($this->name);
+
+        // The cookie is set to be cleared when the request is sent....
+        $this->assertSame('', $cookie->getValue());
+        $this->assertSame(0, $cookie->getExpiresTimestamp());
+    }
+
+    public function testGetCookie()
+    {
+        $_COOKIE['TEST'] = 5;
+
+        $this->assertSame('5', get_cookie('TEST'));
+    }
+
+    public function testDeleteCookieAfterLastSet()
+    {
+        delete_cookie($this->name);
+
+        $cookie = $this->response->getCookie($this->name);
+        // The cookie is set to be cleared when the request is sent....
+        $this->assertSame('', $cookie->getValue());
+    }
+
+    public function testSameSiteDefault()
+    {
+        $cookieAttr = [
+            'name'   => $this->name,
+            'value'  => $this->value,
+            'expire' => $this->expire,
+        ];
+
+        set_cookie($cookieAttr);
+
+        $this->assertTrue($this->response->hasCookie($this->name));
+        $theCookie = $this->response->getCookie($this->name);
+        $this->assertSame('Lax', $theCookie->getSameSite());
+
+        delete_cookie($this->name);
+    }
+
+    public function testSameSiteInvalid()
+    {
+        $cookieAttr = [
+            'name'     => $this->name,
+            'value'    => $this->value,
+            'expire'   => $this->expire,
+            'samesite' => 'Invalid',
+        ];
+
+        $this->expectException(CookieException::class);
+        $this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
+
+        set_cookie($cookieAttr);
+    }
+
+    public function testSameSiteParamArray()
+    {
+        $cookieAttr = [
+            'name'     => $this->name,
+            'value'    => $this->value,
+            'expire'   => $this->expire,
+            'samesite' => 'Strict',
+        ];
+
+        set_cookie($cookieAttr);
+
+        $this->assertTrue($this->response->hasCookie($this->name));
+        $theCookie = $this->response->getCookie($this->name);
+        $this->assertSame('Strict', $theCookie->getSameSite());
 
-		delete_cookie($this->name);
-	}
-
-	public function testSameSiteParam()
-	{
-		set_cookie($this->name, $this->value, $this->expire, '', '', '', '', '', 'Strict');
-
-		$this->assertTrue($this->response->hasCookie($this->name));
-		$theCookie = $this->response->getCookie($this->name);
-		$this->assertEquals('Strict', $theCookie->getSameSite());
+        delete_cookie($this->name);
+    }
+
+    public function testSameSiteParam()
+    {
+        set_cookie($this->name, $this->value, $this->expire, '', '', '', '', '', 'Strict');
+
+        $this->assertTrue($this->response->hasCookie($this->name));
+        $theCookie = $this->response->getCookie($this->name);
+        $this->assertSame('Strict', $theCookie->getSameSite());
 
-		delete_cookie($this->name);
-	}
+        delete_cookie($this->name);
+    }
 }
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index 806d4e8a1fd9..0f7befd5a975 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -1,31 +1,37 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use DateTime;
 
+/**
+ * @internal
+ */
 final class DateHelperTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-		helper('date');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNowDefault()
-	{
-		$time = new DateTime();
-		$this->assertCloseEnough(now(), time());  // close enough
-	}
-
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
+        helper('date');
+    }
 
-	public function testNowSpecific()
-	{
-		// Chicago should be two hours ahead of Vancouver
-		$this->assertCloseEnough(7200, now('America/Chicago') - now('America/Vancouver'));
-	}
+    public function testNowDefault()
+    {
+        $this->assertCloseEnough(now(), time());  // close enough
+    }
 
+    public function testNowSpecific()
+    {
+        // Chicago should be two hours ahead of Vancouver
+        $this->assertCloseEnough(7200, now('America/Chicago') - now('America/Vancouver'));
+    }
 }
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 324e670b4f14..25a1cb1680bd 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -1,527 +1,513 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 
-use org\bovigo\vfs\vfsStreamDirectory;
-use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
-
-class FilesystemHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FilesystemHelperTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->structure = [
-			'foo'           => [
-				'bar' => 'Once upon a midnight dreary',
-				'baz' => 'While I pondered weak and weary',
-			],
-			'boo'           => [
-				'far' => 'Upon a tome of long-forgotten lore',
-				'faz' => 'There came a tapping up on the door',
-			],
-			'AnEmptyFolder' => [],
-			'simpleFile'    => 'A tap-tap-tapping upon my door',
-			'.hidden'       => 'There is no spoon',
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDirectoryMapDefaults()
-	{
-		helper('filesystem');
-		$this->assertTrue(function_exists('directory_map'));
-
-		$expected = [
-			'foo' . DIRECTORY_SEPARATOR           => [
-						'bar',
-						'baz',
-					],
-			'boo' . DIRECTORY_SEPARATOR           => [
-						'far',
-						'faz',
-					],
-			'AnEmptyFolder' . DIRECTORY_SEPARATOR => [],
-			'simpleFile'
-		];
-
-		$root = vfsStream::setup('root', null, $this->structure);
-		$this->assertTrue($root->hasChild('foo'));
-
-		$this->assertEquals($expected, directory_map(vfsStream::url('root')));
-	}
-
-	public function testDirectoryMapShowsHiddenFiles()
-	{
-		helper('filesystem');
-		$this->assertTrue(function_exists('directory_map'));
-
-		$expected = [
-			'foo' . DIRECTORY_SEPARATOR => [
-						'bar',
-						'baz',
-					],
-			'boo' . DIRECTORY_SEPARATOR => [
-						'far',
-						'faz',
-					],
-			'AnEmptyFolder' . DIRECTORY_SEPARATOR => [],
-			'simpleFile',
-			'.hidden'
-		];
-
-		$root = vfsStream::setup('root', null, $this->structure);
-		$this->assertTrue($root->hasChild('foo'));
-
-		$this->assertEquals($expected, directory_map(vfsStream::url('root'), false, true));
-	}
-
-	public function testDirectoryMapLimitsRecursion()
-	{
-		$this->assertTrue(function_exists('directory_map'));
-
-		$expected = [
-			'foo' . DIRECTORY_SEPARATOR,
-			'boo' . DIRECTORY_SEPARATOR,
-			'AnEmptyFolder' . DIRECTORY_SEPARATOR,
-			'simpleFile',
-			'.hidden',
-		];
-
-		$root = vfsStream::setup('root', null, $this->structure);
-		$this->assertTrue($root->hasChild('foo'));
-
-		$this->assertEquals($expected, directory_map(vfsStream::url('root'), 1, true));
-	}
-
-	public function testDirectoryMapHandlesNotfound()
-	{
-		$this->assertEquals([], directory_map(SUPPORTPATH . 'Files/shaker/'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDirectoryMirror()
-	{
-		$this->assertTrue(function_exists('directory_mirror'));
-
-		// Create a subdirectory
-		$this->structure['foo']['bam'] = ['zab' => 'A deep file'];
-
-		$vfs  = vfsStream::setup('root', null, $this->structure);
-		$root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-		directory_mirror($root . 'foo', $root . 'boo');
-
-		$this->assertFileExists($root . 'boo/bar');
-		$this->assertFileExists($root . 'boo/bam/zab');
-	}
-
-	public function testDirectoryMirrorOverwrites()
-	{
-		$this->assertTrue(function_exists('directory_mirror'));
-
-		// Create duplicate files
-		$this->structure['foo']['far'] = 'all your base';
-		$this->structure['foo']['faz'] = 'are belong to us';
-
-		$vfs  = vfsStream::setup('root', null, $this->structure);
-		$root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-		directory_mirror($root . 'foo', $root . 'boo', true);
-		$result = file_get_contents($root . 'boo/faz');
-
-		$this->assertEquals($this->structure['foo']['faz'], $result);
-	}
-
-	public function testDirectoryMirrorNotOverwrites()
-	{
-		$this->assertTrue(function_exists('directory_mirror'));
-
-		// Create duplicate files
-		$this->structure['foo']['far'] = 'all your base';
-		$this->structure['foo']['faz'] = 'are belong to us';
-
-		$vfs  = vfsStream::setup('root', null, $this->structure);
-		$root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-
-		directory_mirror($root . 'foo', $root . 'boo', false);
-		$result = file_get_contents($root . 'boo/faz');
-
-		$this->assertEquals($this->structure['boo']['faz'], $result);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWriteFileSuccess()
-	{
-		$vfs = vfsStream::setup('root');
-
-		$this->assertTrue(write_file(vfsStream::url('root/test.php'), 'Simple'));
-		$this->assertFileExists($vfs->getChild('test.php')->url());
-	}
-
-	public function testWriteFileFailure()
-	{
-		$vfs = vfsStream::setup('root');
-
-		$this->assertFalse(write_file(vfsStream::url('apple#test.php'), 'Simple'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDeleteFilesDefaultsToOneLevelDeep()
-	{
-		$this->assertTrue(function_exists('delete_files'));
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		delete_files(vfsStream::url('root'));
-
-		$this->assertFalse($vfs->hasChild('simpleFile'));
-		$this->assertTrue($vfs->hasChild('.hidden'));
-		$this->assertTrue($vfs->hasChild('foo'));
-		$this->assertTrue($vfs->hasChild('boo'));
-		$this->assertTrue($vfs->hasChild('AnEmptyFolder'));
-	}
-
-	public function testDeleteFilesHandlesRecursion()
-	{
-		$this->assertTrue(function_exists('delete_files'));
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		delete_files(vfsStream::url('root'), true);
-
-		$this->assertFalse($vfs->hasChild('simpleFile'));
-		$this->assertTrue($vfs->hasChild('.hidden'));
-		$this->assertFalse($vfs->hasChild('foo'));
-		$this->assertFalse($vfs->hasChild('boo'));
-		$this->assertFalse($vfs->hasChild('AnEmptyFolder'));
-	}
-
-	public function testDeleteFilesLeavesHTFiles()
-	{
-		$structure = array_merge($this->structure, [
-			'.htaccess'  => 'Deny All',
-			'index.html' => 'foo',
-			'index.php'  => 'blah',
-		]);
-
-		$vfs = vfsStream::setup('root', null, $structure);
-
-		delete_files(vfsStream::url('root'), true, true);
-
-		$this->assertFalse($vfs->hasChild('simpleFile'));
-		$this->assertTrue($vfs->hasChild('.hidden'));
-		$this->assertFalse($vfs->hasChild('foo'));
-		$this->assertFalse($vfs->hasChild('boo'));
-		$this->assertFalse($vfs->hasChild('AnEmptyFolder'));
-		$this->assertTrue($vfs->hasChild('.htaccess'));
-		$this->assertTrue($vfs->hasChild('index.html'));
-		$this->assertTrue($vfs->hasChild('index.php'));
-	}
-
-	public function testDeleteFilesIncludingHidden()
-	{
-		$structure = array_merge($this->structure, [
-			'.htaccess'  => 'Deny All',
-			'index.html' => 'foo',
-			'index.php'  => 'blah',
-		]);
-
-		$vfs = vfsStream::setup('root', null, $structure);
-
-		delete_files(vfsStream::url('root'), true, true, true);
-
-		$this->assertFalse($vfs->hasChild('simpleFile'));
-		$this->assertFalse($vfs->hasChild('.hidden'));
-		$this->assertFalse($vfs->hasChild('foo'));
-		$this->assertFalse($vfs->hasChild('boo'));
-		$this->assertFalse($vfs->hasChild('AnEmptyFolder'));
-		$this->assertTrue($vfs->hasChild('.htaccess'));
-		$this->assertTrue($vfs->hasChild('index.html'));
-		$this->assertTrue($vfs->hasChild('index.php'));
-	}
-
-	public function testDeleteFilesFailure()
-	{
-		$this->assertFalse(delete_files(SUPPORTPATH . 'Files/shaker/'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFilenames()
-	{
-		$this->assertTrue(function_exists('delete_files'));
-
-		// Not sure the directory names should actually show up
-		// here but this matches v3.x results.
-		$expected = [
-			'AnEmptyFolder',
-			'bar',
-			'baz',
-			'boo',
-			'far',
-			'faz',
-			'foo',
-			'simpleFile',
-		];
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		$this->assertEquals($expected, get_filenames($vfs->url(), false));
-	}
-
-	public function testGetFilenamesWithHidden()
-	{
-		$this->assertTrue(function_exists('delete_files'));
-
-		// Not sure the directory names should actually show up
-		// here but this matches v3.x results.
-		$expected = [
-			'.hidden',
-			'AnEmptyFolder',
-			'bar',
-			'baz',
-			'boo',
-			'far',
-			'faz',
-			'foo',
-			'simpleFile',
-		];
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		$this->assertEquals($expected, get_filenames($vfs->url(), false, true));
-	}
-
-	public function testGetFilenamesWithRelativeSource()
-	{
-		$this->assertTrue(function_exists('get_filenames'));
-
-		$expected = [
-			'AnEmptyFolder',
-			'boo',
-			'boo/far',
-			'boo/faz',
-			'foo',
-			'foo/bar',
-			'foo/baz',
-			'simpleFile',
-		];
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		$this->assertEquals($expected, get_filenames($vfs->url(), null));
-	}
-
-	public function testGetFilenamesWithFullSource()
-	{
-		$this->assertTrue(function_exists('get_filenames'));
-
-		$vfs = vfsStream::setup('root', null, $this->structure);
-
-		$expected = [
-			$vfs->url() . DIRECTORY_SEPARATOR . 'AnEmptyFolder',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'boo',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'boo/far',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'boo/faz',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'foo',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'foo/bar',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'foo/baz',
-			$vfs->url() . DIRECTORY_SEPARATOR . 'simpleFile',
-		];
-
-		$this->assertEquals($expected, get_filenames($vfs->url(), true));
-	}
-
-	public function testGetFilenamesFailure()
-	{
-		$this->assertEquals([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetDirFileInfo()
-	{
-		$file = SUPPORTPATH . 'Files/baker/banana.php';
-		$info = get_file_info($file);
-
-		$expected = [
-			'banana.php' => [
-				'name'          => 'banana.php',
-				'server_path'   => $file,
-				'size'          => $info['size'],
-				'date'          => $info['date'],
-				'relative_path' => realpath(__DIR__ . '/../../_support/Files/baker'),
-			],
-		];
-
-		$this->assertEquals($expected, get_dir_file_info(SUPPORTPATH . 'Files/baker'));
-	}
-
-	public function testGetDirFileInfoNested()
-	{
-		$expected = [
-			'banana.php',
-			'prune_ripe.php',
-			'fig_3.php',
-			'apple.php',
-		];
-
-		$results = get_dir_file_info(SUPPORTPATH . 'Files', false);
-		$this->assertEmpty(array_diff($expected, array_keys($results)));
-	}
-
-	public function testGetDirFileInfoFailure()
-	{
-		$expected = [];
-
-		$this->assertEquals($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFileInfo()
-	{
-		$file = SUPPORTPATH . 'Files/baker/banana.php';
-		$info = get_file_info($file);
-
-		$expected = [
-			'name'        => 'banana.php',
-			'server_path' => $file,
-			'size'        => $info['size'],
-			'date'        => $info['date'],
-		];
-
-		$this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php'));
-	}
-
-	public function testGetFileInfoCustom()
-	{
-		$expected = [
-			'readable'   => true,
-			'writable'   => true,
-			'executable' => false,
-		];
-
-		$this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php', 'readable,writable,executable'));
-	}
-
-	public function testGetFileInfoPerms()
-	{
-		$file     = SUPPORTPATH . 'Files/baker/banana.php';
-		$expected = 0664;
-		chmod($file, $expected);
-
-		$stuff = get_file_info($file, 'fileperms');
-
-		$this->assertEquals($expected, $stuff['fileperms'] & 0777);
-	}
-
-	public function testGetFileNotThereInfo()
-	{
-		$expected = null;
-
-		$this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/icer'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSameFileSame()
-	{
-		$file1 = SUPPORTPATH . 'Files/able/apple.php';
-		$file2 = SUPPORTPATH . 'Files/able/apple.php';
-
-		$this->assertTrue(same_file($file1, $file2));
-	}
-
-	public function testSameFileIdentical()
-	{
-		$file1 = SUPPORTPATH . 'Files/able/apple.php';
-		$file2 = SUPPORTPATH . 'Files/baker/banana.php';
-
-		$this->assertTrue(same_file($file1, $file2));
-	}
-
-	public function testSameFileDifferent()
-	{
-		$file1 = SUPPORTPATH . 'Files/able/apple.php';
-		$file2 = SUPPORTPATH . 'Images/ci-logo.gif';
-
-		$this->assertFalse(same_file($file1, $file2));
-	}
-
-	public function testSameFileOrder()
-	{
-		$file1 = SUPPORTPATH . 'Files/able/apple.php';
-		$file2 = SUPPORTPATH . 'Images/ci-logo.gif';
-
-		$this->assertFalse(same_file($file2, $file1));
-	}
-
-	public function testSameFileDirectory()
-	{
-		$file1 = SUPPORTPATH . 'Files/able/apple.php';
-		$file2 = SUPPORTPATH . 'Images/';
-
-		$this->assertFalse(same_file($file1, $file2));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOctalPermissions()
-	{
-		$this->assertEquals('777', octal_permissions(0777));
-		$this->assertEquals('655', octal_permissions(0655));
-		$this->assertEquals('123', octal_permissions(0123));
-	}
-
-	public function testSymbolicPermissions()
-	{
-		$expected = [
-			0777    => 'urwxrwxrwx',
-			0655    => 'urw-r-xr-x',
-			0123    => 'u--x-w--wx',
-			010655  => 'prw-r-xr-x',
-			020655  => 'crw-r-xr-x',
-			040655  => 'drw-r-xr-x',
-			060655  => 'brw-r-xr-x',
-			0100655 => '-rw-r-xr-x',
-			0120655 => 'lrw-r-xr-x',
-			0140655 => 'srw-r-xr-x',
-		];
-
-		foreach ($expected as $perm => $value)
-		{
-			$this->assertEquals($value, symbolic_permissions($perm));
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRealPathURL()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		set_realpath('http://somewhere.com/overtherainbow');
-	}
-
-	public function testRealPathInvalid()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		set_realpath(SUPPORTPATH . 'root/../', true);
-	}
-
-	public function testRealPathResolved()
-	{
-		$this->assertEquals(SUPPORTPATH . 'Models/', set_realpath(SUPPORTPATH . 'Files/../Models', true));
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->structure = [
+            'foo' => [
+                'bar' => 'Once upon a midnight dreary',
+                'baz' => 'While I pondered weak and weary',
+            ],
+            'boo' => [
+                'far' => 'Upon a tome of long-forgotten lore',
+                'faz' => 'There came a tapping up on the door',
+            ],
+            'AnEmptyFolder' => [],
+            'simpleFile'    => 'A tap-tap-tapping upon my door',
+            '.hidden'       => 'There is no spoon',
+        ];
+    }
+
+    public function testDirectoryMapDefaults()
+    {
+        helper('filesystem');
+        $this->assertTrue(function_exists('directory_map'));
+
+        $expected = [
+            'foo' . DIRECTORY_SEPARATOR => [
+                'bar',
+                'baz',
+            ],
+            'boo' . DIRECTORY_SEPARATOR => [
+                'far',
+                'faz',
+            ],
+            'AnEmptyFolder' . DIRECTORY_SEPARATOR => [],
+            'simpleFile',
+        ];
+
+        $root = vfsStream::setup('root', null, $this->structure);
+        $this->assertTrue($root->hasChild('foo'));
+
+        $this->assertSame($expected, directory_map(vfsStream::url('root')));
+    }
+
+    public function testDirectoryMapShowsHiddenFiles()
+    {
+        helper('filesystem');
+        $this->assertTrue(function_exists('directory_map'));
+
+        $expected = [
+            'foo' . DIRECTORY_SEPARATOR => [
+                'bar',
+                'baz',
+            ],
+            'boo' . DIRECTORY_SEPARATOR => [
+                'far',
+                'faz',
+            ],
+            'AnEmptyFolder' . DIRECTORY_SEPARATOR => [],
+            'simpleFile',
+            '.hidden',
+        ];
+
+        $root = vfsStream::setup('root', null, $this->structure);
+        $this->assertTrue($root->hasChild('foo'));
+
+        $this->assertSame($expected, directory_map(vfsStream::url('root'), false, true));
+    }
+
+    public function testDirectoryMapLimitsRecursion()
+    {
+        $this->assertTrue(function_exists('directory_map'));
+
+        $expected = [
+            'foo' . DIRECTORY_SEPARATOR,
+            'boo' . DIRECTORY_SEPARATOR,
+            'AnEmptyFolder' . DIRECTORY_SEPARATOR,
+            'simpleFile',
+            '.hidden',
+        ];
+
+        $root = vfsStream::setup('root', null, $this->structure);
+        $this->assertTrue($root->hasChild('foo'));
+
+        $this->assertSame($expected, directory_map(vfsStream::url('root'), 1, true));
+    }
+
+    public function testDirectoryMapHandlesNotfound()
+    {
+        $this->assertSame([], directory_map(SUPPORTPATH . 'Files/shaker/'));
+    }
+
+    public function testDirectoryMirror()
+    {
+        $this->assertTrue(function_exists('directory_mirror'));
+
+        // Create a subdirectory
+        $this->structure['foo']['bam'] = ['zab' => 'A deep file'];
+
+        vfsStream::setup('root', null, $this->structure);
+        $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        directory_mirror($root . 'foo', $root . 'boo');
+
+        $this->assertFileExists($root . 'boo/bar');
+        $this->assertFileExists($root . 'boo/bam/zab');
+    }
+
+    public function testDirectoryMirrorOverwrites()
+    {
+        $this->assertTrue(function_exists('directory_mirror'));
+
+        // Create duplicate files
+        $this->structure['foo']['far'] = 'all your base';
+        $this->structure['foo']['faz'] = 'are belong to us';
+
+        vfsStream::setup('root', null, $this->structure);
+        $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        directory_mirror($root . 'foo', $root . 'boo', true);
+        $result = file_get_contents($root . 'boo/faz');
+
+        $this->assertSame($this->structure['foo']['faz'], $result);
+    }
+
+    public function testDirectoryMirrorNotOverwrites()
+    {
+        $this->assertTrue(function_exists('directory_mirror'));
+
+        // Create duplicate files
+        $this->structure['foo']['far'] = 'all your base';
+        $this->structure['foo']['faz'] = 'are belong to us';
+
+        vfsStream::setup('root', null, $this->structure);
+        $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        directory_mirror($root . 'foo', $root . 'boo', false);
+        $result = file_get_contents($root . 'boo/faz');
+
+        $this->assertSame($this->structure['boo']['faz'], $result);
+    }
+
+    public function testWriteFileSuccess()
+    {
+        $vfs = vfsStream::setup('root');
+
+        $this->assertTrue(write_file(vfsStream::url('root/test.php'), 'Simple'));
+        $this->assertFileExists($vfs->getChild('test.php')->url());
+    }
+
+    public function testWriteFileFailure()
+    {
+        vfsStream::setup('root');
+
+        $this->assertFalse(write_file(vfsStream::url('apple#test.php'), 'Simple'));
+    }
+
+    public function testDeleteFilesDefaultsToOneLevelDeep()
+    {
+        $this->assertTrue(function_exists('delete_files'));
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        delete_files(vfsStream::url('root'));
+
+        $this->assertFalse($vfs->hasChild('simpleFile'));
+        $this->assertTrue($vfs->hasChild('.hidden'));
+        $this->assertTrue($vfs->hasChild('foo'));
+        $this->assertTrue($vfs->hasChild('boo'));
+        $this->assertTrue($vfs->hasChild('AnEmptyFolder'));
+    }
+
+    public function testDeleteFilesHandlesRecursion()
+    {
+        $this->assertTrue(function_exists('delete_files'));
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        delete_files(vfsStream::url('root'), true);
+
+        $this->assertFalse($vfs->hasChild('simpleFile'));
+        $this->assertTrue($vfs->hasChild('.hidden'));
+        $this->assertFalse($vfs->hasChild('foo'));
+        $this->assertFalse($vfs->hasChild('boo'));
+        $this->assertFalse($vfs->hasChild('AnEmptyFolder'));
+    }
+
+    public function testDeleteFilesLeavesHTFiles()
+    {
+        $structure = array_merge($this->structure, [
+            '.htaccess'  => 'Deny All',
+            'index.html' => 'foo',
+            'index.php'  => 'blah',
+        ]);
+
+        $vfs = vfsStream::setup('root', null, $structure);
+
+        delete_files(vfsStream::url('root'), true, true);
+
+        $this->assertFalse($vfs->hasChild('simpleFile'));
+        $this->assertTrue($vfs->hasChild('.hidden'));
+        $this->assertFalse($vfs->hasChild('foo'));
+        $this->assertFalse($vfs->hasChild('boo'));
+        $this->assertFalse($vfs->hasChild('AnEmptyFolder'));
+        $this->assertTrue($vfs->hasChild('.htaccess'));
+        $this->assertTrue($vfs->hasChild('index.html'));
+        $this->assertTrue($vfs->hasChild('index.php'));
+    }
+
+    public function testDeleteFilesIncludingHidden()
+    {
+        $structure = array_merge($this->structure, [
+            '.htaccess'  => 'Deny All',
+            'index.html' => 'foo',
+            'index.php'  => 'blah',
+        ]);
+
+        $vfs = vfsStream::setup('root', null, $structure);
+
+        delete_files(vfsStream::url('root'), true, true, true);
+
+        $this->assertFalse($vfs->hasChild('simpleFile'));
+        $this->assertFalse($vfs->hasChild('.hidden'));
+        $this->assertFalse($vfs->hasChild('foo'));
+        $this->assertFalse($vfs->hasChild('boo'));
+        $this->assertFalse($vfs->hasChild('AnEmptyFolder'));
+        $this->assertTrue($vfs->hasChild('.htaccess'));
+        $this->assertTrue($vfs->hasChild('index.html'));
+        $this->assertTrue($vfs->hasChild('index.php'));
+    }
+
+    public function testDeleteFilesFailure()
+    {
+        $this->assertFalse(delete_files(SUPPORTPATH . 'Files/shaker/'));
+    }
+
+    public function testGetFilenames()
+    {
+        $this->assertTrue(function_exists('delete_files'));
+
+        // Not sure the directory names should actually show up
+        // here but this matches v3.x results.
+        $expected = [
+            'AnEmptyFolder',
+            'bar',
+            'baz',
+            'boo',
+            'far',
+            'faz',
+            'foo',
+            'simpleFile',
+        ];
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        $this->assertSame($expected, get_filenames($vfs->url(), false));
+    }
+
+    public function testGetFilenamesWithHidden()
+    {
+        $this->assertTrue(function_exists('delete_files'));
+
+        // Not sure the directory names should actually show up
+        // here but this matches v3.x results.
+        $expected = [
+            '.hidden',
+            'AnEmptyFolder',
+            'bar',
+            'baz',
+            'boo',
+            'far',
+            'faz',
+            'foo',
+            'simpleFile',
+        ];
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        $this->assertSame($expected, get_filenames($vfs->url(), false, true));
+    }
+
+    public function testGetFilenamesWithRelativeSource()
+    {
+        $this->assertTrue(function_exists('get_filenames'));
+
+        $expected = [
+            'AnEmptyFolder',
+            'boo',
+            'boo/far',
+            'boo/faz',
+            'foo',
+            'foo/bar',
+            'foo/baz',
+            'simpleFile',
+        ];
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        $this->assertSame($expected, get_filenames($vfs->url(), null));
+    }
+
+    public function testGetFilenamesWithFullSource()
+    {
+        $this->assertTrue(function_exists('get_filenames'));
+
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        $expected = [
+            $vfs->url() . DIRECTORY_SEPARATOR . 'AnEmptyFolder',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'boo',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'boo/far',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'boo/faz',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'foo',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'foo/bar',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'foo/baz',
+            $vfs->url() . DIRECTORY_SEPARATOR . 'simpleFile',
+        ];
+
+        $this->assertSame($expected, get_filenames($vfs->url(), true));
+    }
+
+    public function testGetFilenamesFailure()
+    {
+        $this->assertSame([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
+    }
+
+    public function testGetDirFileInfo()
+    {
+        $file = SUPPORTPATH . 'Files/baker/banana.php';
+        $info = get_file_info($file);
+
+        $expected = [
+            'banana.php' => [
+                'name'          => 'banana.php',
+                'server_path'   => $file,
+                'size'          => $info['size'],
+                'date'          => $info['date'],
+                'relative_path' => realpath(__DIR__ . '/../../_support/Files/baker'),
+            ],
+        ];
+
+        $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files/baker'));
+    }
+
+    public function testGetDirFileInfoNested()
+    {
+        $expected = [
+            'banana.php',
+            'prune_ripe.php',
+            'fig_3.php',
+            'apple.php',
+        ];
+
+        $results = get_dir_file_info(SUPPORTPATH . 'Files', false);
+        $this->assertEmpty(array_diff($expected, array_keys($results)));
+    }
+
+    public function testGetDirFileInfoFailure()
+    {
+        $expected = [];
+
+        $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
+    }
+
+    public function testGetFileInfo()
+    {
+        $file = SUPPORTPATH . 'Files/baker/banana.php';
+        $info = get_file_info($file);
+
+        $expected = [
+            'name'        => 'banana.php',
+            'server_path' => $file,
+            'size'        => $info['size'],
+            'date'        => $info['date'],
+        ];
+
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php'));
+    }
+
+    public function testGetFileInfoCustom()
+    {
+        $expected = [
+            'readable'   => true,
+            'writable'   => true,
+            'executable' => false,
+        ];
+
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php', 'readable,writable,executable'));
+    }
+
+    public function testGetFileInfoPerms()
+    {
+        $file     = SUPPORTPATH . 'Files/baker/banana.php';
+        $expected = 0664;
+        chmod($file, $expected);
+
+        $stuff = get_file_info($file, 'fileperms');
+
+        $this->assertSame($expected, $stuff['fileperms'] & 0777);
+    }
+
+    public function testGetFileNotThereInfo()
+    {
+        $expected = null;
+
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/icer'));
+    }
+
+    public function testSameFileSame()
+    {
+        $file1 = SUPPORTPATH . 'Files/able/apple.php';
+        $file2 = SUPPORTPATH . 'Files/able/apple.php';
+
+        $this->assertTrue(same_file($file1, $file2));
+    }
+
+    public function testSameFileIdentical()
+    {
+        $file1 = SUPPORTPATH . 'Files/able/apple.php';
+        $file2 = SUPPORTPATH . 'Files/baker/banana.php';
+
+        $this->assertTrue(same_file($file1, $file2));
+    }
+
+    public function testSameFileDifferent()
+    {
+        $file1 = SUPPORTPATH . 'Files/able/apple.php';
+        $file2 = SUPPORTPATH . 'Images/ci-logo.gif';
+
+        $this->assertFalse(same_file($file1, $file2));
+    }
+
+    public function testSameFileOrder()
+    {
+        $file1 = SUPPORTPATH . 'Files/able/apple.php';
+        $file2 = SUPPORTPATH . 'Images/ci-logo.gif';
+
+        $this->assertFalse(same_file($file2, $file1));
+    }
+
+    public function testSameFileDirectory()
+    {
+        $file1 = SUPPORTPATH . 'Files/able/apple.php';
+        $file2 = SUPPORTPATH . 'Images/';
+
+        $this->assertFalse(same_file($file1, $file2));
+    }
+
+    public function testOctalPermissions()
+    {
+        $this->assertSame('777', octal_permissions(0777));
+        $this->assertSame('655', octal_permissions(0655));
+        $this->assertSame('123', octal_permissions(0123));
+    }
+
+    public function testSymbolicPermissions()
+    {
+        $expected = [
+            0777    => 'urwxrwxrwx',
+            0655    => 'urw-r-xr-x',
+            0123    => 'u--x-w--wx',
+            010655  => 'prw-r-xr-x',
+            020655  => 'crw-r-xr-x',
+            040655  => 'drw-r-xr-x',
+            060655  => 'brw-r-xr-x',
+            0100655 => '-rw-r-xr-x',
+            0120655 => 'lrw-r-xr-x',
+            0140655 => 'srw-r-xr-x',
+        ];
+
+        foreach ($expected as $perm => $value) {
+            $this->assertSame($value, symbolic_permissions($perm));
+        }
+    }
+
+    public function testRealPathURL()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        set_realpath('http://somewhere.com/overtherainbow');
+    }
+
+    public function testRealPathInvalid()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        set_realpath(SUPPORTPATH . 'root/../', true);
+    }
+
+    public function testRealPathResolved()
+    {
+        $this->assertSame(SUPPORTPATH . 'Models/', set_realpath(SUPPORTPATH . 'Files/../Models', true));
+    }
 }
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 513ae5a39ada..4a1ef8fcddcd 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
@@ -8,978 +17,943 @@
 use Config\App;
 use Config\Filters;
 
-class FormHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormHelperTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('form');
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenBasic()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before, true) || array_key_exists('csrf', $before))
-		{
-			$Value    = csrf_hash();
-			$Name     = csrf_token();
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-<input type="hidden" name="$Name" value="$Value" style="display:none;" />
-
-EOH;
-		}
-		else
-		{
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-
-EOH;
-		}
-
-		$attributes = [
-			'name'   => 'form',
-			'id'     => 'form',
-			'method' => 'POST',
-		];
-		$this->assertEquals($expected, form_open('foo/bar', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenHasLocale()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$expected = <<<EOH
-<form action="http://example.com/index.php/en/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-
-EOH;
-
-		$attributes = [
-			'name'   => 'form',
-			'id'     => 'form',
-			'method' => 'POST',
-		];
-		$this->assertEquals($expected, form_open('{locale}/foo/bar', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenWithoutAction()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before, true) || array_key_exists('csrf', $before))
-		{
-			$Value    = csrf_hash();
-			$Name     = csrf_token();
-			$expected = <<<EOH
-<form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
-<input type="hidden" name="$Name" value="$Value" style="display:none;" />
-
-EOH;
-		}
-		else
-		{
-			$expected = <<<EOH
-<form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
-
-EOH;
-		}
-		$attributes = [
-			'name'   => 'form',
-			'id'     => 'form',
-			'method' => 'POST',
-		];
-		$this->assertEquals($expected, form_open('', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenWithoutMethod()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before, true) || array_key_exists('csrf', $before))
-		{
-			$Value    = csrf_hash();
-			$Name     = csrf_token();
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
-<input type="hidden" name="$Name" value="$Value" style="display:none;" />
-
-EOH;
-		}
-		else
-		{
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
-
-EOH;
-		}
-
-		$attributes = [
-			'name' => 'form',
-			'id'   => 'form',
-		];
-		$this->assertEquals($expected, form_open('foo/bar', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenWithHidden()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before, true) || array_key_exists('csrf', $before))
-		{
-			$Value    = csrf_hash();
-			$Name     = csrf_token();
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-<input type="hidden" name="foo" value="bar" />
-<input type="hidden" name="$Name" value="$Value" />
-
-EOH;
-		}
-		else
-		{
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-
-<input type="hidden" name="foo" value="bar" />
-
-EOH;
-		}
-
-		$attributes = [
-			'name'   => 'form',
-			'id'     => 'form',
-			'method' => 'POST',
-		];
-		$hidden     = [
-			'foo' => 'bar',
-		];
-		$this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormOpenMultipart()
-	{
-		$config            = new App();
-		$config->baseURL   = '';
-		$config->indexPage = 'index.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$before = (new Filters())->globals['before'];
-		if (in_array('csrf', $before, true) || array_key_exists('csrf', $before))
-		{
-			$Value    = csrf_hash();
-			$Name     = csrf_token();
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
-<input type="hidden" name="$Name" value="$Value" style="display:none;" />
-
-EOH;
-		}
-		else
-		{
-			$expected = <<<EOH
-<form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
-
-EOH;
-		}
-		$attributes = [
-			'name'   => 'form',
-			'id'     => 'form',
-			'method' => 'POST',
-		];
-		$this->assertEquals($expected, form_open_multipart('foo/bar', $attributes));
-
-		// make sure it works with attributes as a string too
-		$attributesString = 'name="form" id="form" method="POST"';
-		$this->assertEquals($expected, form_open_multipart('foo/bar', $attributesString));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormHidden()
-	{
-		$expected = <<<EOH
-
-<input type="hidden" name="username" value="johndoe" />\n
-EOH;
-		$this->assertEquals($expected, form_hidden('username', 'johndoe'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormHiddenArrayInput()
-	{
-		$data     = [
-			'foo' => 'bar',
-		];
-		$expected = <<<EOH
-
-<input type="hidden" name="foo" value="bar" />
-
-EOH;
-		$this->assertEquals($expected, form_hidden($data, null));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormHiddenArrayValues()
-	{
-		$data     = [
-			'foo' => 'bar',
-		];
-		$expected = <<<EOH
-
-<input type="hidden" name="name[foo]" value="bar" />
-
-EOH;
-		$this->assertEquals($expected, form_hidden('name', $data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormInput()
-	{
-		$expected = <<<EOH
-<input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
-EOH;
-		$data     = [
-			'name'      => 'username',
-			'id'        => 'username',
-			'value'     => 'johndoe',
-			'maxlength' => '100',
-			'size'      => '50',
-			'style'     => 'width:50%',
-		];
-		$this->assertEquals($expected, form_input($data));
-	}
-
-	public function testFormInputWithExtra()
-	{
-		$expected = <<<EOH
-<input type="email" name="identity" value="" id="identity" class="form-control form-control-lg" />\n
-EOH;
-		$data     = [
-			'id'   => 'identity',
-			'name' => 'identity',
-			'type' => 'email',
-		];
-		$extra    = [
-			'class' => 'form-control form-control-lg',
-		];
-		$this->assertEquals($expected, form_input($data, '', $extra));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormPassword()
-	{
-		$expected = <<<EOH
-<input type="password" name="password" value="" />\n
-EOH;
-		$this->assertEquals($expected, form_password('password'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormUpload()
-	{
-		$expected = <<<EOH
-<input type="file" name="attachment" />\n
-EOH;
-		$this->assertEquals($expected, form_upload('attachment'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormTextarea()
-	{
-		$expected = <<<EOH
-<textarea name="notes" cols="40" rows="10">Notes</textarea>\n
-EOH;
-		$this->assertEquals($expected, form_textarea('notes', 'Notes'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormTextareaWithValueAttribute()
-	{
-		$data     = [
-			'name'  => 'foo',
-			'value' => 'bar',
-		];
-		$expected = <<<EOH
-<textarea name="foo" cols="40" rows="10">bar</textarea>
-
-EOH;
-		$this->assertEquals($expected, form_textarea($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormTextareaExtraRowsColsArray()
-	{
-		$extra    = [
-			'cols' => '30',
-			'rows' => '5',
-		];
-		$expected = <<<EOH
-<textarea name="notes" cols="30" rows="5">Notes</textarea>\n
-EOH;
-		$this->assertEquals($expected, form_textarea('notes', 'Notes', $extra));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormTextareaExtraRowsColsString()
-	{
-		$extra    = 'cols="30" rows="5"';
-		$expected = <<<EOH
-<textarea name="notes" cols="30" rows="5">Notes</textarea>\n
-EOH;
-		$this->assertEquals($expected, form_textarea('notes', 'Notes', $extra));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormDropdown()
-	{
-		$expected = <<<EOH
-<select name="shirts">
-<option value="small">Small Shirt</option>
-<option value="med">Medium Shirt</option>
-<option value="large" selected="selected">Large Shirt</option>
-<option value="xlarge">Extra Large Shirt</option>
-</select>\n
-EOH;
-		$options  = [
-			'small'  => 'Small Shirt',
-			'med'    => 'Medium Shirt',
-			'large'  => 'Large Shirt',
-			'xlarge' => 'Extra Large Shirt',
-		];
-		$this->assertEquals($expected, form_dropdown('shirts', $options, 'large'));
-		$expected     = <<<EOH
-<select name="shirts" multiple="multiple">
-<option value="small" selected="selected">Small Shirt</option>
-<option value="med">Medium Shirt</option>
-<option value="large" selected="selected">Large Shirt</option>
-<option value="xlarge">Extra Large Shirt</option>
-</select>\n
-EOH;
-		$shirtsOnSale = [
-			'small',
-			'large',
-		];
-		$this->assertEquals($expected, form_dropdown('shirts', $options, $shirtsOnSale));
-		$options  = [
-			'Swedish Cars' => [
-				'volvo' => 'Volvo',
-				'saab'  => 'Saab',
-			],
-			'German Cars'  => [
-				'mercedes' => 'Mercedes',
-				'audi'     => 'Audi',
-			],
-		];
-		$expected = <<<EOH
-<select name="cars" multiple="multiple">
-<optgroup label="Swedish Cars">
-<option value="volvo" selected="selected">Volvo</option>
-<option value="saab">Saab</option>
-</optgroup>
-<optgroup label="German Cars">
-<option value="mercedes">Mercedes</option>
-<option value="audi" selected="selected">Audi</option>
-</optgroup>
-</select>\n
-EOH;
-		$this->assertEquals($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
-	}
-
-	public function testFormDropdownUnselected()
-	{
-		$options  = [
-			'Swedish Cars' => [
-				'volvo' => 'Volvo',
-				'saab'  => 'Saab',
-			],
-			'German Cars'  => [
-				'mercedes' => 'Mercedes',
-				'audi'     => 'Audi',
-			],
-		];
-		$expected = <<<EOH
-<select name="cars">
-<optgroup label="Swedish Cars">
-<option value="volvo">Volvo</option>
-<option value="saab">Saab</option>
-</optgroup>
-<optgroup label="German Cars">
-<option value="mercedes">Mercedes</option>
-<option value="audi">Audi</option>
-</optgroup>
-</select>\n
-EOH;
-		$this->assertEquals($expected, form_dropdown('cars', $options));
-	}
-
-	public function testFormDropdownInferred()
-	{
-		$options       = [
-			'Swedish Cars' => [
-				'volvo' => 'Volvo',
-				'saab'  => 'Saab',
-			],
-			'German Cars'  => [
-				'mercedes' => 'Mercedes',
-				'audi'     => 'Audi',
-			],
-		];
-		$expected      = <<<EOH
-<select name="cars">
-<optgroup label="Swedish Cars">
-<option value="volvo">Volvo</option>
-<option value="saab">Saab</option>
-</optgroup>
-<optgroup label="German Cars">
-<option value="mercedes">Mercedes</option>
-<option value="audi" selected="selected">Audi</option>
-</optgroup>
-</select>\n
-EOH;
-		$_POST['cars'] = 'audi';
-		$this->assertEquals($expected, form_dropdown('cars', $options));
-		unset($_POST['cars']);
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormDropdownWithSelectedAttribute()
-	{
-		$expected = <<<EOH
-<select name="foo">
-<option value="bar" selected="selected">Bar</option>
-</select>
-
-EOH;
-		$data     = [
-			'name'     => 'foo',
-			'selected' => 'bar',
-		];
-		$options  = [
-			'bar' => 'Bar',
-		];
-		$this->assertEquals($expected, form_dropdown($data, $options));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormDropdownWithOptionsAttribute()
-	{
-		$expected = <<<EOH
-<select name="foo">
-<option value="bar">Bar</option>
-</select>
-
-EOH;
-		$data     = [
-			'name'    => 'foo',
-			'options' => [
-				'bar' => 'Bar',
-			],
-		];
-		$this->assertEquals($expected, form_dropdown($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormDropdownWithEmptyArrayOptionValue()
-	{
-		$expected = <<<EOH
-<select name="foo">
-</select>
-
-EOH;
-		$options  = [
-			'bar' => [],
-		];
-		$this->assertEquals($expected, form_dropdown('foo', $options));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormMultiselect()
-	{
-		$expected = <<<EOH
-<select name="shirts[]"  multiple="multiple">
-<option value="small">Small Shirt</option>
-<option value="med" selected="selected">Medium Shirt</option>
-<option value="large" selected="selected">Large Shirt</option>
-<option value="xlarge">Extra Large Shirt</option>
-</select>\n
-EOH;
-		$options  = [
-			'small'  => 'Small Shirt',
-			'med'    => 'Medium Shirt',
-			'large'  => 'Large Shirt',
-			'xlarge' => 'Extra Large Shirt',
-		];
-		$this->assertEquals($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormMultiselectArrayData()
-	{
-		$expected = <<<EOH
-<select name="shirts[]"  multiple="multiple">
-<option value="small">Small Shirt</option>
-<option value="med" selected="selected">Medium Shirt</option>
-<option value="large" selected="selected">Large Shirt</option>
-<option value="xlarge">Extra Large Shirt</option>
-</select>\n
-EOH;
-		$options  = [
-			'small'  => 'Small Shirt',
-			'med'    => 'Medium Shirt',
-			'large'  => 'Large Shirt',
-			'xlarge' => 'Extra Large Shirt',
-		];
-
-		$data = [
-			'name'     => 'shirts[]',
-			'options'  => $options,
-			'selected' => [
-				'med',
-				'large',
-			],
-		];
-
-		$this->assertEquals($expected, form_multiselect($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormFieldset()
-	{
-		$expected = <<<EOH
-<fieldset>
-<legend>Address Information</legend>\n
-EOH;
-		$this->assertEquals($expected, form_fieldset('Address Information'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormFieldsetWithNoLegent()
-	{
-		$expected = <<<EOH
-<fieldset>
-
-EOH;
-		$this->assertEquals($expected, form_fieldset());
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormFieldsetWithAttributes()
-	{
-		$attributes = [
-			'name' => 'bar',
-		];
-		$expected   = <<<EOH
-<fieldset name="bar">
-<legend>Foo</legend>
-
-EOH;
-		$this->assertEquals($expected, form_fieldset('Foo', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormFieldsetClose()
-	{
-		$expected = <<<EOH
-</fieldset></div></div>
-EOH;
-		$this->assertEquals($expected, form_fieldset_close('</div></div>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormCheckbox()
-	{
-		$expected = <<<EOH
-<input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
-EOH;
-		$this->assertEquals($expected, form_checkbox('newsletter', 'accept', true));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormCheckboxArrayData()
-	{
-		$data     = [
-			'name'    => 'foo',
-			'value'   => 'bar',
-			'checked' => true,
-		];
-		$expected = <<<EOH
-<input type="checkbox" name="foo" value="bar" checked="checked" />
-
-EOH;
-		$this->assertEquals($expected, form_checkbox($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormCheckboxArrayDataWithCheckedFalse()
-	{
-		$data     = [
-			'name'    => 'foo',
-			'value'   => 'bar',
-			'checked' => false,
-		];
-		$expected = <<<EOH
-<input type="checkbox" name="foo" value="bar" />
-
-EOH;
-		$this->assertEquals($expected, form_checkbox($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormRadio()
-	{
-		$expected = <<<EOH
-<input type="radio" name="newsletter" value="accept" checked="checked" />\n
-EOH;
-		$this->assertEquals($expected, form_radio('newsletter', 'accept', true));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormSubmit()
-	{
-		$expected = <<<EOH
-<input type="submit" name="mysubmit" value="Submit Post!" />\n
-EOH;
-		$this->assertEquals($expected, form_submit('mysubmit', 'Submit Post!'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormLabel()
-	{
-		$expected = <<<EOH
-<label for="username">What is your Name</label>
-EOH;
-		$this->assertEquals($expected, form_label('What is your Name', 'username'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormLabelWithAttributes()
-	{
-		$attributes = [
-			'id' => 'label1',
-		];
-		$expected   = <<<EOH
-<label for="foo" id="label1">bar</label>
-EOH;
-		$this->assertEquals($expected, form_label('bar', 'foo', $attributes));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormReset()
-	{
-		$expected = <<<EOH
-<input type="reset" name="myreset" value="Reset" />\n
-EOH;
-		$this->assertEquals($expected, form_reset('myreset', 'Reset'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormButton()
-	{
-		$expected = <<<EOH
-<button name="name" type="button">content</button>\n
-EOH;
-		$this->assertEquals($expected, form_button('name', 'content'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormButtonWithDataArray()
-	{
-		$data     = [
-			'name'    => 'foo',
-			'content' => 'bar',
-		];
-		$expected = <<<EOH
-<button name="foo" type="button">bar</button>
-
-EOH;
-		$this->assertEquals($expected, form_button($data));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormClose()
-	{
-		$expected = <<<EOH
-</form></div></div>
-EOH;
-		$this->assertEquals($expected, form_close('</div></div>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormDatalist()
-	{
-		$options  = [
-			'foo1',
-			'bar1',
-		];
-		$expected = <<<EOH
-<input type="text" name="foo" value="bar" list="foo_list" />
-
-<datalist id='foo_list'><option value='foo1'>
-<option value='bar1'>
-</datalist>
-
-EOH;
-		$this->assertEquals($expected, form_datalist('foo', 'bar', $options));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testSetValue()
-	{
-		$_SESSION['_ci_old_input']['post']['foo'] = '<bar';
-		$this->assertEquals('&lt;bar', set_value('foo'));
-
-		unset($_SESSION['_ci_old_input']['post']['foo']);
-		$this->assertEquals('baz', set_value('foo', 'baz'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testSetSelect()
-	{
-		$_SESSION['_ci_old_input']['post']['foo'] = 'bar';
-		$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
-
-		$_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
-		$this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
-		$this->assertEquals('', set_select('foo', 'baz'));
-
-		unset($_SESSION['_ci_old_input']['post']['foo']);
-		$this->assertEquals(' selected="selected"', set_select('foo', 'baz', true));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testSetCheckbox()
-	{
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'foo' => 'bar',
-				],
-			],
-		];
-
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
-
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'foo' => ['foo' => 'bar'],
-				],
-			],
-		];
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
-		$this->assertEquals('', set_checkbox('foo', 'baz'));
-
-		$_SESSION = [];
-		$this->assertEquals('', set_checkbox('foo', 'bar'));
-
-		$_SESSION = [];
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar', true));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testSetCheckboxWithValueZero()
-	{
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'foo' => '0',
-				],
-			],
-		];
-
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', '0'));
-
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'foo' => ['foo' => '0'],
-				],
-			],
-		];
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', '0'));
-		$this->assertEquals('', set_checkbox('foo', 'baz'));
-
-		$_SESSION = [];
-		$this->assertEquals('', set_checkbox('foo', 'bar'));
-
-		$_SESSION = [];
-		$this->assertEquals(' checked="checked"', set_checkbox('foo', '0', true));
-	}
-
-	// ------------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSetRadio()
-	{
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'foo' => 'bar',
-				],
-			],
-		];
-
-		$this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
-		$this->assertEquals('', set_radio('foo', 'baz'));
-		unset($_SESSION['_ci_old_input']);
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSetRadioFromPost()
-	{
-		$_POST['bar'] = 'baz';
-		$this->assertEquals(' checked="checked"', set_radio('bar', 'baz'));
-		$this->assertEquals('', set_radio('bar', 'boop'));
-		$this->assertEquals(' checked="checked"', set_radio('bar', 'boop', true));
-	}
-
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testSetRadioFromPostWithValueZero()
-	{
-		$_POST['bar'] = 0;
-		$this->assertEquals(' checked="checked"', set_radio('bar', '0'));
-		$this->assertEquals('', set_radio('bar', 'boop'));
-
-		$_POST = [];
-		$this->assertEquals(' checked="checked"', set_radio('bar', '0', true));
-	}
-
-	public function testSetRadioFromPostArray()
-	{
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'bar' => [
-						'boop',
-						'fuzzy',
-					],
-				],
-			],
-		];
-		$this->assertEquals(' checked="checked"', set_radio('bar', 'boop'));
-		$this->assertEquals('', set_radio('bar', 'baz'));
-	}
-
-	public function testSetRadioFromPostArrayWithValueZero()
-	{
-		$_SESSION = [
-			'_ci_old_input' => [
-				'post' => [
-					'bar' => [
-						'0',
-						'fuzzy',
-					],
-				],
-			],
-		];
-		$this->assertEquals(' checked="checked"', set_radio('bar', '0'));
-		$this->assertEquals('', set_radio('bar', 'baz'));
-	}
-
-	public function testSetRadioDefault()
-	{
-		$this->assertEquals(' checked="checked"', set_radio('code', 'alpha', true));
-		$this->assertEquals('', set_radio('code', 'beta', false));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesTrue()
-	{
-		$expected = 'readonly ';
-		$this->assertEquals($expected, parse_form_attributes(['readonly' => true], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesFalse()
-	{
-		$expected = 'disabled ';
-		$this->assertEquals($expected, parse_form_attributes(['disabled' => false], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesNull()
-	{
-		$expected = 'bar=""';
-		$this->assertEquals($expected, parse_form_attributes(['bar' => null], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesStringEmpty()
-	{
-		$expected = 'bar=""';
-		$this->assertEquals($expected, parse_form_attributes(['bar' => ''], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesStringFoo()
-	{
-		$expected = 'bar="foo"';
-		$this->assertEquals($expected, parse_form_attributes(['bar' => 'foo'], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesInt0()
-	{
-		$expected = 'ok="0"';
-		$this->assertEquals($expected, parse_form_attributes(['ok' => 0], []));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testFormParseFormAttributesInt1()
-	{
-		$expected = 'ok="1"';
-		$this->assertEquals($expected, parse_form_attributes(['ok' => 1], []));
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('form');
+    }
+
+    public function testFormOpenBasic()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $before = (new Filters())->globals['before'];
+        if (in_array('csrf', $before, true) || array_key_exists('csrf', $before)) {
+            $Value    = csrf_hash();
+            $Name     = csrf_token();
+            $expected = <<<EOH
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
+
+                EOH;
+        } else {
+            $expected = <<<'EOH'
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+
+                EOH;
+        }
+
+        $attributes = [
+            'name'   => 'form',
+            'id'     => 'form',
+            'method' => 'POST',
+        ];
+        $this->assertSame($expected, form_open('foo/bar', $attributes));
+    }
+
+    public function testFormOpenHasLocale()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $expected = <<<'EOH'
+            <form action="http://example.com/index.php/en/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+
+            EOH;
+
+        $attributes = [
+            'name'   => 'form',
+            'id'     => 'form',
+            'method' => 'POST',
+        ];
+        $this->assertSame($expected, form_open('{locale}/foo/bar', $attributes));
+    }
+
+    public function testFormOpenWithoutAction()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $before = (new Filters())->globals['before'];
+        if (in_array('csrf', $before, true) || array_key_exists('csrf', $before)) {
+            $Value    = csrf_hash();
+            $Name     = csrf_token();
+            $expected = <<<EOH
+                <form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
+
+                EOH;
+        } else {
+            $expected = <<<'EOH'
+                <form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
+
+                EOH;
+        }
+        $attributes = [
+            'name'   => 'form',
+            'id'     => 'form',
+            'method' => 'POST',
+        ];
+        $this->assertSame($expected, form_open('', $attributes));
+    }
+
+    public function testFormOpenWithoutMethod()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $before = (new Filters())->globals['before'];
+        if (in_array('csrf', $before, true) || array_key_exists('csrf', $before)) {
+            $Value    = csrf_hash();
+            $Name     = csrf_token();
+            $expected = <<<EOH
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
+
+                EOH;
+        } else {
+            $expected = <<<'EOH'
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
+
+                EOH;
+        }
+
+        $attributes = [
+            'name' => 'form',
+            'id'   => 'form',
+        ];
+        $this->assertSame($expected, form_open('foo/bar', $attributes));
+    }
+
+    public function testFormOpenWithHidden()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $before = (new Filters())->globals['before'];
+        if (in_array('csrf', $before, true) || array_key_exists('csrf', $before)) {
+            $Value    = csrf_hash();
+            $Name     = csrf_token();
+            $expected = <<<EOH
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+                <input type="hidden" name="foo" value="bar" />
+                <input type="hidden" name="{$Name}" value="{$Value}" />
+
+                EOH;
+        } else {
+            $expected = <<<'EOH'
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
+
+                <input type="hidden" name="foo" value="bar" />
+
+                EOH;
+        }
+
+        $attributes = [
+            'name'   => 'form',
+            'id'     => 'form',
+            'method' => 'POST',
+        ];
+        $hidden = [
+            'foo' => 'bar',
+        ];
+        $this->assertSame($expected, form_open('foo/bar', $attributes, $hidden));
+    }
+
+    public function testFormOpenMultipart()
+    {
+        $config            = new App();
+        $config->baseURL   = '';
+        $config->indexPage = 'index.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $before = (new Filters())->globals['before'];
+        if (in_array('csrf', $before, true) || array_key_exists('csrf', $before)) {
+            $Value    = csrf_hash();
+            $Name     = csrf_token();
+            $expected = <<<EOH
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
+
+                EOH;
+        } else {
+            $expected = <<<'EOH'
+                <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
+
+                EOH;
+        }
+        $attributes = [
+            'name'   => 'form',
+            'id'     => 'form',
+            'method' => 'POST',
+        ];
+        $this->assertSame($expected, form_open_multipart('foo/bar', $attributes));
+
+        // make sure it works with attributes as a string too
+        $attributesString = 'name="form" id="form" method="POST"';
+        $this->assertSame($expected, form_open_multipart('foo/bar', $attributesString));
+    }
+
+    public function testFormHidden()
+    {
+        $expected = <<<EOH
+
+            <input type="hidden" name="username" value="johndoe" />\n
+            EOH;
+        $this->assertSame($expected, form_hidden('username', 'johndoe'));
+    }
+
+    public function testFormHiddenArrayInput()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+        $expected = <<<'EOH'
+
+            <input type="hidden" name="foo" value="bar" />
+
+            EOH;
+        $this->assertSame($expected, form_hidden($data, null));
+    }
+
+    public function testFormHiddenArrayValues()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+        $expected = <<<'EOH'
+
+            <input type="hidden" name="name[foo]" value="bar" />
+
+            EOH;
+        $this->assertSame($expected, form_hidden('name', $data));
+    }
+
+    public function testFormInput()
+    {
+        $expected = <<<EOH
+            <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />\n
+            EOH;
+        $data = [
+            'name'      => 'username',
+            'id'        => 'username',
+            'value'     => 'johndoe',
+            'maxlength' => '100',
+            'size'      => '50',
+            'style'     => 'width:50%',
+        ];
+        $this->assertSame($expected, form_input($data));
+    }
+
+    public function testFormInputWithExtra()
+    {
+        $expected = <<<EOH
+            <input type="email" name="identity" value="" id="identity" class="form-control form-control-lg" />\n
+            EOH;
+        $data = [
+            'id'   => 'identity',
+            'name' => 'identity',
+            'type' => 'email',
+        ];
+        $extra = [
+            'class' => 'form-control form-control-lg',
+        ];
+        $this->assertSame($expected, form_input($data, '', $extra));
+    }
+
+    public function testFormPassword()
+    {
+        $expected = <<<EOH
+            <input type="password" name="password" value="" />\n
+            EOH;
+        $this->assertSame($expected, form_password('password'));
+    }
+
+    public function testFormUpload()
+    {
+        $expected = <<<EOH
+            <input type="file" name="attachment" />\n
+            EOH;
+        $this->assertSame($expected, form_upload('attachment'));
+    }
+
+    public function testFormTextarea()
+    {
+        $expected = <<<EOH
+            <textarea name="notes" cols="40" rows="10">Notes</textarea>\n
+            EOH;
+        $this->assertSame($expected, form_textarea('notes', 'Notes'));
+    }
+
+    public function testFormTextareaWithValueAttribute()
+    {
+        $data = [
+            'name'  => 'foo',
+            'value' => 'bar',
+        ];
+        $expected = <<<'EOH'
+            <textarea name="foo" cols="40" rows="10">bar</textarea>
+
+            EOH;
+        $this->assertSame($expected, form_textarea($data));
+    }
+
+    public function testFormTextareaExtraRowsColsArray()
+    {
+        $extra = [
+            'cols' => '30',
+            'rows' => '5',
+        ];
+        $expected = <<<EOH
+            <textarea name="notes" cols="30" rows="5">Notes</textarea>\n
+            EOH;
+        $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
+    }
+
+    public function testFormTextareaExtraRowsColsString()
+    {
+        $extra    = 'cols="30" rows="5"';
+        $expected = <<<EOH
+            <textarea name="notes" cols="30" rows="5">Notes</textarea>\n
+            EOH;
+        $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
+    }
+
+    public function testFormDropdown()
+    {
+        $expected = <<<EOH
+            <select name="shirts">
+            <option value="small">Small Shirt</option>
+            <option value="med">Medium Shirt</option>
+            <option value="large" selected="selected">Large Shirt</option>
+            <option value="xlarge">Extra Large Shirt</option>
+            </select>\n
+            EOH;
+        $options = [
+            'small'  => 'Small Shirt',
+            'med'    => 'Medium Shirt',
+            'large'  => 'Large Shirt',
+            'xlarge' => 'Extra Large Shirt',
+        ];
+        $this->assertSame($expected, form_dropdown('shirts', $options, 'large'));
+        $expected = <<<EOH
+            <select name="shirts" multiple="multiple">
+            <option value="small" selected="selected">Small Shirt</option>
+            <option value="med">Medium Shirt</option>
+            <option value="large" selected="selected">Large Shirt</option>
+            <option value="xlarge">Extra Large Shirt</option>
+            </select>\n
+            EOH;
+        $shirtsOnSale = [
+            'small',
+            'large',
+        ];
+        $this->assertSame($expected, form_dropdown('shirts', $options, $shirtsOnSale));
+        $options = [
+            'Swedish Cars' => [
+                'volvo' => 'Volvo',
+                'saab'  => 'Saab',
+            ],
+            'German Cars' => [
+                'mercedes' => 'Mercedes',
+                'audi'     => 'Audi',
+            ],
+        ];
+        $expected = <<<EOH
+            <select name="cars" multiple="multiple">
+            <optgroup label="Swedish Cars">
+            <option value="volvo" selected="selected">Volvo</option>
+            <option value="saab">Saab</option>
+            </optgroup>
+            <optgroup label="German Cars">
+            <option value="mercedes">Mercedes</option>
+            <option value="audi" selected="selected">Audi</option>
+            </optgroup>
+            </select>\n
+            EOH;
+        $this->assertSame($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
+    }
+
+    public function testFormDropdownUnselected()
+    {
+        $options = [
+            'Swedish Cars' => [
+                'volvo' => 'Volvo',
+                'saab'  => 'Saab',
+            ],
+            'German Cars' => [
+                'mercedes' => 'Mercedes',
+                'audi'     => 'Audi',
+            ],
+        ];
+        $expected = <<<EOH
+            <select name="cars">
+            <optgroup label="Swedish Cars">
+            <option value="volvo">Volvo</option>
+            <option value="saab">Saab</option>
+            </optgroup>
+            <optgroup label="German Cars">
+            <option value="mercedes">Mercedes</option>
+            <option value="audi">Audi</option>
+            </optgroup>
+            </select>\n
+            EOH;
+        $this->assertSame($expected, form_dropdown('cars', $options));
+    }
+
+    public function testFormDropdownKeyCasting()
+    {
+        $options = [
+            'Swedish Cars' => [
+                '1' => 'Volvo',
+                '2' => 'Saab',
+            ],
+            2 => [
+                3   => 'Mercedes',
+                '4' => 'Audi',
+            ],
+        ];
+        $selected = [2];
+        $expected = <<<EOH
+            <select name="cars">
+            <optgroup label="Swedish Cars">
+            <option value="1">Volvo</option>
+            <option value="2" selected="selected">Saab</option>
+            </optgroup>
+            <optgroup label="2">
+            <option value="3">Mercedes</option>
+            <option value="4">Audi</option>
+            </optgroup>
+            </select>\n
+            EOH;
+        $this->assertSame($expected, form_dropdown('cars', $options, $selected));
+    }
+
+    public function testFormDropdownInferred()
+    {
+        $options = [
+            'Swedish Cars' => [
+                'volvo' => 'Volvo',
+                'saab'  => 'Saab',
+            ],
+            'German Cars' => [
+                'mercedes' => 'Mercedes',
+                'audi'     => 'Audi',
+            ],
+        ];
+        $expected = <<<EOH
+            <select name="cars">
+            <optgroup label="Swedish Cars">
+            <option value="volvo">Volvo</option>
+            <option value="saab">Saab</option>
+            </optgroup>
+            <optgroup label="German Cars">
+            <option value="mercedes">Mercedes</option>
+            <option value="audi" selected="selected">Audi</option>
+            </optgroup>
+            </select>\n
+            EOH;
+        $_POST['cars'] = 'audi';
+        $this->assertSame($expected, form_dropdown('cars', $options));
+        unset($_POST['cars']);
+    }
+
+    public function testFormDropdownWithSelectedAttribute()
+    {
+        $expected = <<<'EOH'
+            <select name="foo">
+            <option value="bar" selected="selected">Bar</option>
+            </select>
+
+            EOH;
+        $data = [
+            'name'     => 'foo',
+            'selected' => 'bar',
+        ];
+        $options = [
+            'bar' => 'Bar',
+        ];
+        $this->assertSame($expected, form_dropdown($data, $options));
+    }
+
+    public function testFormDropdownWithOptionsAttribute()
+    {
+        $expected = <<<'EOH'
+            <select name="foo">
+            <option value="bar">Bar</option>
+            </select>
+
+            EOH;
+        $data = [
+            'name'    => 'foo',
+            'options' => [
+                'bar' => 'Bar',
+            ],
+        ];
+        $this->assertSame($expected, form_dropdown($data));
+    }
+
+    public function testFormDropdownWithEmptyArrayOptionValue()
+    {
+        $expected = <<<'EOH'
+            <select name="foo">
+            </select>
+
+            EOH;
+        $options = [
+            'bar' => [],
+        ];
+        $this->assertSame($expected, form_dropdown('foo', $options));
+    }
+
+    public function testFormMultiselect()
+    {
+        $expected = <<<EOH
+            <select name="shirts[]"  multiple="multiple">
+            <option value="small">Small Shirt</option>
+            <option value="med" selected="selected">Medium Shirt</option>
+            <option value="large" selected="selected">Large Shirt</option>
+            <option value="xlarge">Extra Large Shirt</option>
+            </select>\n
+            EOH;
+        $options = [
+            'small'  => 'Small Shirt',
+            'med'    => 'Medium Shirt',
+            'large'  => 'Large Shirt',
+            'xlarge' => 'Extra Large Shirt',
+        ];
+        $this->assertSame($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
+    }
+
+    public function testFormMultiselectArrayData()
+    {
+        $expected = <<<EOH
+            <select name="shirts[]"  multiple="multiple">
+            <option value="small">Small Shirt</option>
+            <option value="med" selected="selected">Medium Shirt</option>
+            <option value="large" selected="selected">Large Shirt</option>
+            <option value="xlarge">Extra Large Shirt</option>
+            </select>\n
+            EOH;
+        $options = [
+            'small'  => 'Small Shirt',
+            'med'    => 'Medium Shirt',
+            'large'  => 'Large Shirt',
+            'xlarge' => 'Extra Large Shirt',
+        ];
+
+        $data = [
+            'name'     => 'shirts[]',
+            'options'  => $options,
+            'selected' => [
+                'med',
+                'large',
+            ],
+        ];
+
+        $this->assertSame($expected, form_multiselect($data));
+    }
+
+    public function testFormFieldset()
+    {
+        $expected = <<<EOH
+            <fieldset>
+            <legend>Address Information</legend>\n
+            EOH;
+        $this->assertSame($expected, form_fieldset('Address Information'));
+    }
+
+    public function testFormFieldsetWithNoLegent()
+    {
+        $expected = <<<'EOH'
+            <fieldset>
+
+            EOH;
+        $this->assertSame($expected, form_fieldset());
+    }
+
+    public function testFormFieldsetWithAttributes()
+    {
+        $attributes = [
+            'name' => 'bar',
+        ];
+        $expected = <<<'EOH'
+            <fieldset name="bar">
+            <legend>Foo</legend>
+
+            EOH;
+        $this->assertSame($expected, form_fieldset('Foo', $attributes));
+    }
+
+    public function testFormFieldsetClose()
+    {
+        $expected = <<<'EOH'
+            </fieldset></div></div>
+            EOH;
+        $this->assertSame($expected, form_fieldset_close('</div></div>'));
+    }
+
+    public function testFormCheckbox()
+    {
+        $expected = <<<EOH
+            <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
+            EOH;
+        $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));
+    }
+
+    public function testFormCheckboxArrayData()
+    {
+        $data = [
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'checked' => true,
+        ];
+        $expected = <<<'EOH'
+            <input type="checkbox" name="foo" value="bar" checked="checked" />
+
+            EOH;
+        $this->assertSame($expected, form_checkbox($data));
+    }
+
+    public function testFormCheckboxArrayDataWithCheckedFalse()
+    {
+        $data = [
+            'name'    => 'foo',
+            'value'   => 'bar',
+            'checked' => false,
+        ];
+        $expected = <<<'EOH'
+            <input type="checkbox" name="foo" value="bar" />
+
+            EOH;
+        $this->assertSame($expected, form_checkbox($data));
+    }
+
+    public function testFormRadio()
+    {
+        $expected = <<<EOH
+            <input type="radio" name="newsletter" value="accept" checked="checked" />\n
+            EOH;
+        $this->assertSame($expected, form_radio('newsletter', 'accept', true));
+    }
+
+    public function testFormSubmit()
+    {
+        $expected = <<<EOH
+            <input type="submit" name="mysubmit" value="Submit Post!" />\n
+            EOH;
+        $this->assertSame($expected, form_submit('mysubmit', 'Submit Post!'));
+    }
+
+    public function testFormLabel()
+    {
+        $expected = <<<'EOH'
+            <label for="username">What is your Name</label>
+            EOH;
+        $this->assertSame($expected, form_label('What is your Name', 'username'));
+    }
+
+    public function testFormLabelWithAttributes()
+    {
+        $attributes = [
+            'id' => 'label1',
+        ];
+        $expected = <<<'EOH'
+            <label for="foo" id="label1">bar</label>
+            EOH;
+        $this->assertSame($expected, form_label('bar', 'foo', $attributes));
+    }
+
+    public function testFormReset()
+    {
+        $expected = <<<EOH
+            <input type="reset" name="myreset" value="Reset" />\n
+            EOH;
+        $this->assertSame($expected, form_reset('myreset', 'Reset'));
+    }
+
+    public function testFormButton()
+    {
+        $expected = <<<EOH
+            <button name="name" type="button">content</button>\n
+            EOH;
+        $this->assertSame($expected, form_button('name', 'content'));
+    }
+
+    public function testFormButtonWithDataArray()
+    {
+        $data = [
+            'name'    => 'foo',
+            'content' => 'bar',
+        ];
+        $expected = <<<'EOH'
+            <button name="foo" type="button">bar</button>
+
+            EOH;
+        $this->assertSame($expected, form_button($data));
+    }
+
+    public function testFormClose()
+    {
+        $expected = <<<'EOH'
+            </form></div></div>
+            EOH;
+        $this->assertSame($expected, form_close('</div></div>'));
+    }
+
+    public function testFormDatalist()
+    {
+        $options = [
+            'foo1',
+            'bar1',
+        ];
+        $expected = <<<'EOH'
+            <input type="text" name="foo" value="bar" list="foo_list" />
+
+            <datalist id='foo_list'><option value='foo1'>
+            <option value='bar1'>
+            </datalist>
+
+            EOH;
+        $this->assertSame($expected, form_datalist('foo', 'bar', $options));
+    }
+
+    public function testSetValue()
+    {
+        $_SESSION['_ci_old_input']['post']['foo'] = '<bar';
+        $this->assertSame('&lt;bar', set_value('foo'));
+
+        unset($_SESSION['_ci_old_input']['post']['foo']);
+        $this->assertSame('baz', set_value('foo', 'baz'));
+    }
+
+    public function testSetSelect()
+    {
+        $_SESSION['_ci_old_input']['post']['foo'] = 'bar';
+        $this->assertSame(' selected="selected"', set_select('foo', 'bar'));
+
+        $_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
+        $this->assertSame(' selected="selected"', set_select('foo', 'bar'));
+        $this->assertSame('', set_select('foo', 'baz'));
+
+        unset($_SESSION['_ci_old_input']['post']['foo']);
+        $this->assertSame(' selected="selected"', set_select('foo', 'baz', true));
+    }
+
+    public function testSetCheckbox()
+    {
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'foo' => 'bar',
+                ],
+            ],
+        ];
+
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar'));
+
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'foo' => ['foo' => 'bar'],
+                ],
+            ],
+        ];
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar'));
+        $this->assertSame('', set_checkbox('foo', 'baz'));
+
+        $_SESSION = [];
+        $this->assertSame('', set_checkbox('foo', 'bar'));
+
+        $_SESSION = [];
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar', true));
+    }
+
+    public function testSetCheckboxWithValueZero()
+    {
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'foo' => '0',
+                ],
+            ],
+        ];
+
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0'));
+
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'foo' => ['foo' => '0'],
+                ],
+            ],
+        ];
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0'));
+        $this->assertSame('', set_checkbox('foo', 'baz'));
+
+        $_SESSION = [];
+        $this->assertSame('', set_checkbox('foo', 'bar'));
+
+        $_SESSION = [];
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0', true));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSetRadio()
+    {
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'foo' => 'bar',
+                ],
+            ],
+        ];
+
+        $this->assertSame(' checked="checked"', set_radio('foo', 'bar'));
+        $this->assertSame('', set_radio('foo', 'baz'));
+        unset($_SESSION['_ci_old_input']);
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSetRadioFromPost()
+    {
+        $_POST['bar'] = 'baz';
+        $this->assertSame(' checked="checked"', set_radio('bar', 'baz'));
+        $this->assertSame('', set_radio('bar', 'boop'));
+        $this->assertSame(' checked="checked"', set_radio('bar', 'boop', true));
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testSetRadioFromPostWithValueZero()
+    {
+        $_POST['bar'] = 0;
+        $this->assertSame(' checked="checked"', set_radio('bar', '0'));
+        $this->assertSame('', set_radio('bar', 'boop'));
+
+        $_POST = [];
+        $this->assertSame(' checked="checked"', set_radio('bar', '0', true));
+    }
+
+    public function testSetRadioFromPostArray()
+    {
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'bar' => [
+                        'boop',
+                        'fuzzy',
+                    ],
+                ],
+            ],
+        ];
+        $this->assertSame(' checked="checked"', set_radio('bar', 'boop'));
+        $this->assertSame('', set_radio('bar', 'baz'));
+    }
+
+    public function testSetRadioFromPostArrayWithValueZero()
+    {
+        $_SESSION = [
+            '_ci_old_input' => [
+                'post' => [
+                    'bar' => [
+                        '0',
+                        'fuzzy',
+                    ],
+                ],
+            ],
+        ];
+        $this->assertSame(' checked="checked"', set_radio('bar', '0'));
+        $this->assertSame('', set_radio('bar', 'baz'));
+    }
+
+    public function testSetRadioDefault()
+    {
+        $this->assertSame(' checked="checked"', set_radio('code', 'alpha', true));
+        $this->assertSame('', set_radio('code', 'beta', false));
+    }
+
+    public function testFormParseFormAttributesTrue()
+    {
+        $expected = 'readonly ';
+        $this->assertSame($expected, parse_form_attributes(['readonly' => true], []));
+    }
+
+    public function testFormParseFormAttributesFalse()
+    {
+        $expected = 'disabled ';
+        $this->assertSame($expected, parse_form_attributes(['disabled' => false], []));
+    }
+
+    public function testFormParseFormAttributesNull()
+    {
+        $expected = 'bar=""';
+        $this->assertSame($expected, parse_form_attributes(['bar' => null], []));
+    }
+
+    public function testFormParseFormAttributesStringEmpty()
+    {
+        $expected = 'bar=""';
+        $this->assertSame($expected, parse_form_attributes(['bar' => ''], []));
+    }
+
+    public function testFormParseFormAttributesStringFoo()
+    {
+        $expected = 'bar="foo"';
+        $this->assertSame($expected, parse_form_attributes(['bar' => 'foo'], []));
+    }
+
+    public function testFormParseFormAttributesInt0()
+    {
+        $expected = 'ok="0"';
+        $this->assertSame($expected, parse_form_attributes(['ok' => 0], []));
+    }
+
+    public function testFormParseFormAttributesInt1()
+    {
+        $expected = 'ok="1"';
+        $this->assertSame($expected, parse_form_attributes(['ok' => 1], []));
+    }
 }
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index cfbdcbd3d84f..c5665ea94e05 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -1,572 +1,561 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class HTMLHelperTest extends CIUnitTestCase
 {
-	private $tracks;
-
-	/**
-	 * @var string Path to the test file for img_data
-	 */
-	private $imgPath = SUPPORTPATH . 'Images' . DIRECTORY_SEPARATOR . 'ci-logo.gif';
-
-	/**
-	 * @var string Expected base64 encoding of $imgPath
-	 */
-	private $imgData = 'R0lGODlhmwDIAOcAAAAAAAEBAQICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVVVVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+vr7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///yH5BAEKAP8ALAAAAACbAMgAAAj+AP8JHEiwoMGDCBMqXMiwocOHECNKnEhRIoCKGDNq3MixIYCLHUOKHEkS4UeQJVOqXAnxJEqWMGPCdCmzpk2SLl/e3MnTIs2eQIMuzKlTqNGgRIseXWozqVKmUFc6jUo1ptOnVbNqvPpRq9eOXLF+HeswrFiyaE2aTcvW49q2cA+aPRm37sC5Xe3GxUtXb1u+ef2mBRxY8FfChQ1rRXxWsVHGiR1DhdxYMk/KlS3fxJxZs1XOno9yjhx65+jOpUueJp165mrUrcG+jt30NWzaGG2zxi1S927eHH3/Bp5R+HDiFY3fRs5Q+XLmCZ0/h25Q+nTqd61jz239OvXux7f+ywXvHTn58sTPo+etfj3t9u5bwxdfdj79ofDjh84f/jt//Zb91x9zAg6YXoEAGoZggoItyKBfDt5HkIMP1kWhhAJRWCFcGm7IVoceogViiGONSKJXJp6YVYoqUsVii5O96B+L0L1ooEIwFmfjen0dtiOPPa74441q/VTVkESOl9ORSKJ3VYxNehfWUlEaOdFbQlUZZER8IaXllg8B1tOXS3JJmGlkllkfYpvx949wblFW038ZGhfdaZ/ll12UrulZZ5VSubknoCkJOiihI9E5YZqJGroomb05eqiWsvlZXZpJKmmfpl9uJCCOmG4l6aWhJqcoqKVeeSqqkKq6Kqv+nfr0KqyIhvlpS4ziOmtzua45apyU+rorr7ESe6urfBp7LLJNKjusrcnS+qusQ+IXoahISvsstTZqOy1F2XK6YKTdiotgozKaey66KZLaoWo0FtQuvCO6+26h9co7L773TtovvRf6C2KgAf8ZL8HrGnywStcqvDC/BQpsYp6nNtunoNGydGutCLfn8I8yYcxxx+R9DHLIHr/pJ2hzqmeydipj1mbJMZ8nsZgt05zyyzjn3B3PcD4q88ww26wvy0Q7B7Rt6p6JZtE/N91z0nbWrLTUXV4GtXR3Iv20ckuPZi1kWV7N9diMlV211b4567SXQYdNNrBvw932zV6jnfX+Y3GzvZqZU6utm9CzcTslU337LTazU7k4OOF4cpfUYo9DnndslVs+NHtM23v5e4UfHfmBo3sup3l/F/k56KWLvjnpq+ONV42tm84mgYt7Gzhwues+F3axu3477afTXTfsaUObPO5z6zo86s0rfzzv0Tu/O+fPAz499ttLPzvx11v/PfTha7839eUbjiX64weXfmndm3o+bvFL3j7rvwO8Pubzs3s4/ffTH1cAmL+LDRB/B0TZ/jwTQAM2Dn4L9NmTIJjAMUVQQf+z2wMlc0GtVRCDE4RSCBv0QRFOjoQbFFIK9zJCH53QQiskSwxl+EIWEoVDNwShlUqkJsfUUIUVYOJgDx0XxP0UUXAzQlymGCiaqgQEADs=';
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		//URL is needed by the HTML Helper.
-		helper('url');
-		helper('html');
-
-		$this->tracks = [
-			track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
-			track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes'),
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testBasicUL()
-	{
-		$expected = <<<EOH
-<ul>
-  <li>foo</li>
-  <li>bar</li>
-</ul>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-		];
-
-		$this->assertEquals(ltrim($expected), ul($list));
-	}
-
-	public function testULWithClass()
-	{
-		$expected = <<<EOH
-<ul class="test">
-  <li>foo</li>
-  <li>bar</li>
-</ul>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-		];
-
-		$this->assertEquals($expected, ul($list, 'class="test"'));
-	}
-
-	public function testMultiLevelUL()
-	{
-		$expected = <<<EOH
-<ul>
-  <li>foo</li>
-  <li>bar</li>
-  <li>2
-    <ul>
-      <li>foo</li>
-      <li>bar</li>
-    </ul>
-  </li>
-</ul>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-			[
-				'foo',
-				'bar',
-			],
-		];
-
-		$this->assertEquals(ltrim($expected), ul($list));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testBasicOL()
-	{
-		$expected = <<<EOH
-<ol>
-  <li>foo</li>
-  <li>bar</li>
-</ol>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-		];
-
-		$this->assertEquals(ltrim($expected), ol($list));
-	}
-
-	public function testOLWithClass()
-	{
-		$expected = <<<EOH
-<ol class="test">
-  <li>foo</li>
-  <li>bar</li>
-</ol>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-		];
-
-		$this->assertEquals($expected, ol($list, 'class="test"'));
-	}
-
-	public function testMultiLevelOL()
-	{
-		$expected = <<<EOH
-<ol>
-  <li>foo</li>
-  <li>bar</li>
-  <li>2
-    <ol>
-      <li>foo</li>
-      <li>bar</li>
-    </ol>
-  </li>
-</ol>
-
-EOH;
-
-		$expected = ltrim($expected);
-		$list     = [
-			'foo',
-			'bar',
-			[
-				'foo',
-				'bar',
-			],
-		];
-
-		$this->assertEquals(ltrim($expected), ol($list));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testIMG()
-	{
-		$target   = 'http://site.com/images/picture.jpg';
-		$expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
-		$this->assertEquals($expected, img($target));
-	}
-
-	public function testIMGWithoutProtocol()
-	{
-		$target   = 'assets/mugshot.jpg';
-		$expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
-		$this->assertEquals($expected, img($target));
-	}
-
-	public function testIMGWithIndexpage()
-	{
-		$target   = 'assets/mugshot.jpg';
-		$expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
-		$this->assertEquals($expected, img($target, true));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testImgData()
-	{
-		$expected = 'data:image/gif;base64,' . $this->imgData;
-
-		$this->assertEquals($expected, img_data($this->imgPath));
-	}
-
-	public function testImgDataWithMime()
-	{
-		$expected = 'data:image/png;base64,' . $this->imgData;
-
-		$this->assertEquals($expected, img_data($this->imgPath, 'image/png'));
-	}
-
-	public function testImgDataUnknownMime()
-	{
-		$path   = SUPPORTPATH . 'Validation' . DIRECTORY_SEPARATOR . 'uploads' . DIRECTORY_SEPARATOR . 'phpUxc0ty';
-		$result = img_data($path);
-
-		$this->assertEquals(0, strpos($result, 'data:image/jpg'));
-	}
-
-	public function testImgDataNoFile()
-	{
-		$this->expectException(FileNotFoundException::class);
-
-		img_data($this->imgPath . 'gobbledygook');
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testScriptTag()
-	{
-		$target   = 'http://site.com/js/mystyles.js';
-		$expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
-		$this->assertEquals($expected, script_tag($target));
-	}
-
-	public function testScriptTagWithoutProtocol()
-	{
-		$target   = 'js/mystyles.js';
-		$expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
-		$this->assertEquals($expected, script_tag($target));
-	}
-
-	public function testScriptTagWithIndexpage()
-	{
-		$target   = 'js/mystyles.js';
-		$expected = '<script src="http://example.com/index.php/js/mystyles.js" type="text/javascript"></script>';
-		$this->assertEquals($expected, script_tag($target, true));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testLinkTag()
-	{
-		$target   = 'css/mystyles.css';
-		$expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
-		$this->assertEquals($expected, link_tag($target));
-	}
-
-	public function testLinkTagComplete()
-	{
-		$target   = 'https://styles.com/css/mystyles.css';
-		$expected = '<link href="https://styles.com/css/mystyles.css" rel="banana" type="fruit" media="VHS" title="Go away" />';
-		$this->assertEquals($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
-	}
-
-	public function testLinkTagArray()
-	{
-		$parms    = [
-			'href'      => 'css/mystyles.css',
-			'indexPage' => true,
-		];
-		$expected = '<link href="http://example.com/index.php/css/mystyles.css" rel="stylesheet" type="text/css" />';
-		$this->assertEquals($expected, link_tag($parms));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testDocType()
-	{
-		$target   = 'html4-strict';
-		$expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
-		$this->assertEquals($expected, doctype($target));
-	}
-
-	public function testDocTypeDefault()
-	{
-		$expected = '<!DOCTYPE html>';
-		$this->assertEquals($expected, doctype());
-	}
-
-	public function testDocTypeInvalid()
-	{
-		$target = 'good-guess';
-		$this->assertEquals(false, doctype($target));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testVideo()
-	{
-		$expected = <<<EOH
-<video src="http://www.codeigniter.com/test.mp4" controls>
-  Your browser does not support the video tag.
-</video>
-
-EOH;
-
-		$target  = 'http://www.codeigniter.com/test.mp4';
-		$message = 'Your browser does not support the video tag.';
-		$video   = video($target, $message, 'controls');
-		$this->assertEquals($expected, $video);
-	}
-
-	public function testVideoWithTracks()
-	{
-		$expected = <<<EOH
-<video src="http://example.com/test.mp4" controls>
-  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
-  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
-  Your browser does not support the video tag.
-</video>
-
-EOH;
-
-		$target  = 'test.mp4';
-		$message = 'Your browser does not support the video tag.';
-		$video   = video($target, $message, 'controls', $this->tracks);
-		$this->assertEquals($expected, $video);
-	}
-
-	public function testVideoWithTracksAndIndex()
-	{
-		$expected = <<<EOH
-<video src="http://example.com/index.php/test.mp4" controls>
-  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
-  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
-  Your browser does not support the video tag.
-</video>
-
-EOH;
-
-		$target  = 'test.mp4';
-		$message = 'Your browser does not support the video tag.';
-		$video   = video($target, $message, 'controls', $this->tracks, true);
-		$this->assertEquals($expected, $video);
-	}
-
-	public function testVideoMultipleSources()
-	{
-		$expected = <<<EOH
-<video class="test" controls>
-  <source src="http://example.com/movie.mp4" type="video/mp4" class="test" />
-  <source src="http://example.com/movie.ogg" type="video/ogg" />
-  <source src="http://example.com/movie.mov" type="video/quicktime" />
-  <source src="http://example.com/movie.ogv" type="video/ogv; codecs=dirac, speex" />
-  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
-  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
-  Your browser does not support the video tag.
-</video>
-
-EOH;
-
-		$sources = [
-			source('movie.mp4', 'video/mp4', 'class="test"'),
-			source('movie.ogg', 'video/ogg'),
-			source('movie.mov', 'video/quicktime'),
-			source('movie.ogv', 'video/ogv; codecs=dirac, speex'),
-		];
-		$message = 'Your browser does not support the video tag.';
-		$video   = video($sources, $message, 'class="test" controls', $this->tracks);
-
-		$this->assertEquals($expected, $video);
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testAudio()
-	{
-		$expected = <<<EOH
-<audio id="test" controls>
-  <source src="http://example.com/sound.ogg" type="audio/ogg" />
-  <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
-  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
-  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
-  Your browser does not support the audio tag.
-</audio>
-
-EOH;
-
-		$sources = [
-			source('sound.ogg', 'audio/ogg'),
-			source('sound.mpeg', 'audio/mpeg'),
-		];
-		$message = 'Your browser does not support the audio tag.';
-		$audio   = audio($sources, $message, 'id="test" controls', $this->tracks);
-
-		$this->assertEquals($expected, $audio);
-	}
-
-	public function testAudioSimple()
-	{
-		$expected = <<<EOH
-<audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
-  Your browser does not support the audio tag.
-</audio>
-
-EOH;
-
-		$source  = 'sound.mpeg';
-		$message = 'Your browser does not support the audio tag.';
-		$audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
-
-		$this->assertEquals($expected, $audio);
-	}
-
-	public function testAudioWithSource()
-	{
-		$expected = <<<EOH
-<audio src="http://codeigniter.com/sound.mpeg" type="audio/mpeg" id="test" controls>
-  Your browser does not support the audio tag.
-</audio>
-
-EOH;
-
-		$source  = 'http://codeigniter.com/sound.mpeg';
-		$message = 'Your browser does not support the audio tag.';
-		$audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
-
-		$this->assertEquals($expected, $audio);
-	}
-
-	public function testAudioWithIndex()
-	{
-		$expected = <<<EOH
-<audio src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" id="test" controls>
-  Your browser does not support the audio tag.
-</audio>
-
-EOH;
-
-		$source  = 'sound.mpeg';
-		$message = 'Your browser does not support the audio tag.';
-		$audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', [], true);
-
-		$this->assertEquals($expected, $audio);
-	}
-
-	public function testAudioWithTracks()
-	{
-		$expected = <<<EOH
-<audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
-  <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
-  <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
-  Your browser does not support the audio tag.
-</audio>
-
-EOH;
-
-		$source  = 'sound.mpeg';
-		$message = 'Your browser does not support the audio tag.';
-		$audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', $this->tracks);
-
-		$this->assertEquals($expected, $audio);
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testMediaNameOnly()
-	{
-		$expected = <<<EOH
-<av>
-</av>
-
-EOH;
-		$this->assertEquals($expected, _media('av'));
-	}
-
-	public function testMediaWithSources()
-	{
-		$expected = <<<EOH
-<av>
-  <source src="http://example.com/sound.ogg" type="audio/ogg" />
-  <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
-</av>
-
-EOH;
-		$sources  = [
-			source('sound.ogg', 'audio/ogg'),
-			source('sound.mpeg', 'audio/mpeg'),
-		];
-		$this->assertEquals($expected, _media('av', $sources));
-	}
-
-	public function testSource()
-	{
-		$expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
-		$this->assertEquals($expected, source('sound.mpeg', 'audio/mpeg', '', true));
-	}
-
-	// ------------------------------------------------------------------------
-
-	public function testEmbed()
-	{
-		$expected = <<<EOH
-<embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
-
-EOH;
-
-		$type  = 'video/quicktime';
-		$embed = embed('movie.mov', $type, 'class="test"');
-		$this->assertEquals($expected, $embed);
-	}
-
-	public function testEmbedIndexed()
-	{
-		$expected = <<<EOH
-<embed src="http://example.com/index.php/movie.mov" type="video/quicktime" class="test" />
-
-EOH;
-
-		$type  = 'video/quicktime';
-		$embed = embed('movie.mov', $type, 'class="test"', true);
-		$this->assertEquals($expected, $embed, '');
-	}
-
-	public function testObject()
-	{
-		$expected = <<<EOH
-<object data="http://example.com/movie.swf" class="test"></object>
-
-EOH;
-
-		$type   = 'application/x-shockwave-flash';
-		$object = object('movie.swf', $type, 'class="test"');
-
-		$this->assertEquals($expected, $object);
-	}
-
-	public function testObjectWithParams()
-	{
-		$expected = <<<EOH
-<object data="http://example.com/movie.swf" class="test">
-  <param name="foo" type="ref" value="bar" class="test" />
-  <param name="hello" type="ref" value="world" class="test" />
-</object>
-
-EOH;
-
-		$type   = 'application/x-shockwave-flash';
-		$parms  = [
-			param('foo', 'bar', 'ref', 'class="test"'),
-			param('hello', 'world', 'ref', 'class="test"'),
-		];
-		$object = object('movie.swf', $type, 'class="test"', $parms);
-		$this->assertEquals($expected, $object);
-	}
-
-	public function testObjectIndexed()
-	{
-		$expected = <<<EOH
-<object data="http://example.com/index.php/movie.swf" class="test"></object>
-
-EOH;
-
-		$type   = 'application/x-shockwave-flash';
-		$object = object('movie.swf', $type, 'class="test"', [], true);
-
-		$this->assertEquals($expected, $object);
-	}
-
-	// ------------------------------------------------------------------------
+    private $tracks;
+
+    /**
+     * @var string Path to the test file for img_data
+     */
+    private $imgPath = SUPPORTPATH . 'Images' . DIRECTORY_SEPARATOR . 'ci-logo.gif';
+
+    /**
+     * @var string Expected base64 encoding of img path
+     */
+    private $imgData = 'R0lGODlhmwDIAOcAAAAAAAEBAQICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVVVVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+vr7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///yH5BAEKAP8ALAAAAACbAMgAAAj+AP8JHEiwoMGDCBMqXMiwocOHECNKnEhRIoCKGDNq3MixIYCLHUOKHEkS4UeQJVOqXAnxJEqWMGPCdCmzpk2SLl/e3MnTIs2eQIMuzKlTqNGgRIseXWozqVKmUFc6jUo1ptOnVbNqvPpRq9eOXLF+HeswrFiyaE2aTcvW49q2cA+aPRm37sC5Xe3GxUtXb1u+ef2mBRxY8FfChQ1rRXxWsVHGiR1DhdxYMk/KlS3fxJxZs1XOno9yjhx65+jOpUueJp165mrUrcG+jt30NWzaGG2zxi1S927eHH3/Bp5R+HDiFY3fRs5Q+XLmCZ0/h25Q+nTqd61jz239OvXux7f+ywXvHTn58sTPo+etfj3t9u5bwxdfdj79ofDjh84f/jt//Zb91x9zAg6YXoEAGoZggoItyKBfDt5HkIMP1kWhhAJRWCFcGm7IVoceogViiGONSKJXJp6YVYoqUsVii5O96B+L0L1ooEIwFmfjen0dtiOPPa74441q/VTVkESOl9ORSKJ3VYxNehfWUlEaOdFbQlUZZER8IaXllg8B1tOXS3JJmGlkllkfYpvx949wblFW038ZGhfdaZ/ll12UrulZZ5VSubknoCkJOiihI9E5YZqJGroomb05eqiWsvlZXZpJKmmfpl9uJCCOmG4l6aWhJqcoqKVeeSqqkKq6Kqv+nfr0KqyIhvlpS4ziOmtzua45apyU+rorr7ESe6urfBp7LLJNKjusrcnS+qusQ+IXoahISvsstTZqOy1F2XK6YKTdiotgozKaey66KZLaoWo0FtQuvCO6+26h9co7L773TtovvRf6C2KgAf8ZL8HrGnywStcqvDC/BQpsYp6nNtunoNGydGutCLfn8I8yYcxxx+R9DHLIHr/pJ2hzqmeydipj1mbJMZ8nsZgt05zyyzjn3B3PcD4q88ww26wvy0Q7B7Rt6p6JZtE/N91z0nbWrLTUXV4GtXR3Iv20ckuPZi1kWV7N9diMlV211b4567SXQYdNNrBvw932zV6jnfX+Y3GzvZqZU6utm9CzcTslU337LTazU7k4OOF4cpfUYo9DnndslVs+NHtM23v5e4UfHfmBo3sup3l/F/k56KWLvjnpq+ONV42tm84mgYt7Gzhwues+F3axu3477afTXTfsaUObPO5z6zo86s0rfzzv0Tu/O+fPAz499ttLPzvx11v/PfTha7839eUbjiX64weXfmndm3o+bvFL3j7rvwO8Pubzs3s4/ffTH1cAmL+LDRB/B0TZ/jwTQAM2Dn4L9NmTIJjAMUVQQf+z2wMlc0GtVRCDE4RSCBv0QRFOjoQbFFIK9zJCH53QQiskSwxl+EIWEoVDNwShlUqkJsfUUIUVYOJgDx0XxP0UUXAzQlymGCiaqgQEADs=';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // URL is needed by the HTML Helper.
+        helper('url');
+        helper('html');
+
+        $this->tracks = [
+            track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
+            track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes'),
+        ];
+    }
+
+    public function testBasicUL()
+    {
+        $expected = <<<'EOH'
+            <ul>
+              <li>foo</li>
+              <li>bar</li>
+            </ul>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+        ];
+
+        $this->assertSame(ltrim($expected), ul($list));
+    }
+
+    public function testULWithClass()
+    {
+        $expected = <<<'EOH'
+            <ul class="test">
+              <li>foo</li>
+              <li>bar</li>
+            </ul>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+        ];
+
+        $this->assertSame($expected, ul($list, 'class="test"'));
+    }
+
+    public function testMultiLevelUL()
+    {
+        $expected = <<<'EOH'
+            <ul>
+              <li>foo</li>
+              <li>bar</li>
+              <li>2
+                <ul>
+                  <li>foo</li>
+                  <li>bar</li>
+                </ul>
+              </li>
+            </ul>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+            [
+                'foo',
+                'bar',
+            ],
+        ];
+
+        $this->assertSame(ltrim($expected), ul($list));
+    }
+
+    public function testBasicOL()
+    {
+        $expected = <<<'EOH'
+            <ol>
+              <li>foo</li>
+              <li>bar</li>
+            </ol>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+        ];
+
+        $this->assertSame(ltrim($expected), ol($list));
+    }
+
+    public function testOLWithClass()
+    {
+        $expected = <<<'EOH'
+            <ol class="test">
+              <li>foo</li>
+              <li>bar</li>
+            </ol>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+        ];
+
+        $this->assertSame($expected, ol($list, 'class="test"'));
+    }
+
+    public function testMultiLevelOL()
+    {
+        $expected = <<<'EOH'
+            <ol>
+              <li>foo</li>
+              <li>bar</li>
+              <li>2
+                <ol>
+                  <li>foo</li>
+                  <li>bar</li>
+                </ol>
+              </li>
+            </ol>
+
+            EOH;
+
+        $expected = ltrim($expected);
+        $list     = [
+            'foo',
+            'bar',
+            [
+                'foo',
+                'bar',
+            ],
+        ];
+
+        $this->assertSame(ltrim($expected), ol($list));
+    }
+
+    public function testIMG()
+    {
+        $target   = 'http://site.com/images/picture.jpg';
+        $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
+        $this->assertSame($expected, img($target));
+    }
+
+    public function testIMGWithoutProtocol()
+    {
+        $target   = 'assets/mugshot.jpg';
+        $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
+        $this->assertSame($expected, img($target));
+    }
+
+    public function testIMGWithIndexpage()
+    {
+        $target   = 'assets/mugshot.jpg';
+        $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
+        $this->assertSame($expected, img($target, true));
+    }
+
+    public function testImgData()
+    {
+        $expected = 'data:image/gif;base64,' . $this->imgData;
+
+        $this->assertSame($expected, img_data($this->imgPath));
+    }
+
+    public function testImgDataWithMime()
+    {
+        $expected = 'data:image/png;base64,' . $this->imgData;
+
+        $this->assertSame($expected, img_data($this->imgPath, 'image/png'));
+    }
+
+    public function testImgDataUnknownMime()
+    {
+        $path   = SUPPORTPATH . 'Validation' . DIRECTORY_SEPARATOR . 'uploads' . DIRECTORY_SEPARATOR . 'phpUxc0ty';
+        $result = img_data($path);
+
+        $this->assertSame(0, strpos($result, 'data:image/jpg'));
+    }
+
+    public function testImgDataNoFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+
+        img_data($this->imgPath . 'gobbledygook');
+    }
+
+    public function testScriptTag()
+    {
+        $target   = 'http://site.com/js/mystyles.js';
+        $expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithoutProtocol()
+    {
+        $target   = 'js/mystyles.js';
+        $expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithIndexpage()
+    {
+        $target   = 'js/mystyles.js';
+        $expected = '<script src="http://example.com/index.php/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target, true));
+    }
+
+    public function testLinkTag()
+    {
+        $target   = 'css/mystyles.css';
+        $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
+        $this->assertSame($expected, link_tag($target));
+    }
+
+    public function testLinkTagComplete()
+    {
+        $target   = 'https://styles.com/css/mystyles.css';
+        $expected = '<link href="https://styles.com/css/mystyles.css" rel="banana" type="fruit" media="VHS" title="Go away" />';
+        $this->assertSame($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
+    }
+
+    public function testLinkTagArray()
+    {
+        $parms = [
+            'href'      => 'css/mystyles.css',
+            'indexPage' => true,
+        ];
+        $expected = '<link href="http://example.com/index.php/css/mystyles.css" rel="stylesheet" type="text/css" />';
+        $this->assertSame($expected, link_tag($parms));
+    }
+
+    public function testDocType()
+    {
+        $target   = 'html4-strict';
+        $expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
+        $this->assertSame($expected, doctype($target));
+    }
+
+    public function testDocTypeDefault()
+    {
+        $expected = '<!DOCTYPE html>';
+        $this->assertSame($expected, doctype());
+    }
+
+    public function testDocTypeInvalid()
+    {
+        $target = 'good-guess';
+        $this->assertEmpty(doctype($target));
+    }
+
+    public function testVideo()
+    {
+        $expected = <<<'EOH'
+            <video src="http://www.codeigniter.com/test.mp4" controls>
+              Your browser does not support the video tag.
+            </video>
+
+            EOH;
+
+        $target  = 'http://www.codeigniter.com/test.mp4';
+        $message = 'Your browser does not support the video tag.';
+        $video   = video($target, $message, 'controls');
+        $this->assertSame($expected, $video);
+    }
+
+    public function testVideoWithTracks()
+    {
+        $expected = <<<'EOH'
+            <video src="http://example.com/test.mp4" controls>
+              <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+              <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+              Your browser does not support the video tag.
+            </video>
+
+            EOH;
+
+        $target  = 'test.mp4';
+        $message = 'Your browser does not support the video tag.';
+        $video   = video($target, $message, 'controls', $this->tracks);
+        $this->assertSame($expected, $video);
+    }
+
+    public function testVideoWithTracksAndIndex()
+    {
+        $expected = <<<'EOH'
+            <video src="http://example.com/index.php/test.mp4" controls>
+              <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+              <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+              Your browser does not support the video tag.
+            </video>
+
+            EOH;
+
+        $target  = 'test.mp4';
+        $message = 'Your browser does not support the video tag.';
+        $video   = video($target, $message, 'controls', $this->tracks, true);
+        $this->assertSame($expected, $video);
+    }
+
+    public function testVideoMultipleSources()
+    {
+        $expected = <<<'EOH'
+            <video class="test" controls>
+              <source src="http://example.com/movie.mp4" type="video/mp4" class="test" />
+              <source src="http://example.com/movie.ogg" type="video/ogg" />
+              <source src="http://example.com/movie.mov" type="video/quicktime" />
+              <source src="http://example.com/movie.ogv" type="video/ogv; codecs=dirac, speex" />
+              <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+              <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+              Your browser does not support the video tag.
+            </video>
+
+            EOH;
+
+        $sources = [
+            source('movie.mp4', 'video/mp4', 'class="test"'),
+            source('movie.ogg', 'video/ogg'),
+            source('movie.mov', 'video/quicktime'),
+            source('movie.ogv', 'video/ogv; codecs=dirac, speex'),
+        ];
+        $message = 'Your browser does not support the video tag.';
+        $video   = video($sources, $message, 'class="test" controls', $this->tracks);
+
+        $this->assertSame($expected, $video);
+    }
+
+    public function testAudio()
+    {
+        $expected = <<<'EOH'
+            <audio id="test" controls>
+              <source src="http://example.com/sound.ogg" type="audio/ogg" />
+              <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
+              <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+              <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+              Your browser does not support the audio tag.
+            </audio>
+
+            EOH;
+
+        $sources = [
+            source('sound.ogg', 'audio/ogg'),
+            source('sound.mpeg', 'audio/mpeg'),
+        ];
+        $message = 'Your browser does not support the audio tag.';
+        $audio   = audio($sources, $message, 'id="test" controls', $this->tracks);
+
+        $this->assertSame($expected, $audio);
+    }
+
+    public function testAudioSimple()
+    {
+        $expected = <<<'EOH'
+            <audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+              Your browser does not support the audio tag.
+            </audio>
+
+            EOH;
+
+        $source  = 'sound.mpeg';
+        $message = 'Your browser does not support the audio tag.';
+        $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
+
+        $this->assertSame($expected, $audio);
+    }
+
+    public function testAudioWithSource()
+    {
+        $expected = <<<'EOH'
+            <audio src="http://codeigniter.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+              Your browser does not support the audio tag.
+            </audio>
+
+            EOH;
+
+        $source  = 'http://codeigniter.com/sound.mpeg';
+        $message = 'Your browser does not support the audio tag.';
+        $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
+
+        $this->assertSame($expected, $audio);
+    }
+
+    public function testAudioWithIndex()
+    {
+        $expected = <<<'EOH'
+            <audio src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" id="test" controls>
+              Your browser does not support the audio tag.
+            </audio>
+
+            EOH;
+
+        $source  = 'sound.mpeg';
+        $message = 'Your browser does not support the audio tag.';
+        $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', [], true);
+
+        $this->assertSame($expected, $audio);
+    }
+
+    public function testAudioWithTracks()
+    {
+        $expected = <<<'EOH'
+            <audio src="http://example.com/sound.mpeg" type="audio/mpeg" id="test" controls>
+              <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+              <track src="subtitles_yes.vtt" kind="subtitles" srclang="yes" label="Norwegian Yes" />
+              Your browser does not support the audio tag.
+            </audio>
+
+            EOH;
+
+        $source  = 'sound.mpeg';
+        $message = 'Your browser does not support the audio tag.';
+        $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', $this->tracks);
+
+        $this->assertSame($expected, $audio);
+    }
+
+    public function testMediaNameOnly()
+    {
+        $expected = <<<'EOH'
+            <av>
+            </av>
+
+            EOH;
+        $this->assertSame($expected, _media('av'));
+    }
+
+    public function testMediaWithSources()
+    {
+        $expected = <<<'EOH'
+            <av>
+              <source src="http://example.com/sound.ogg" type="audio/ogg" />
+              <source src="http://example.com/sound.mpeg" type="audio/mpeg" />
+            </av>
+
+            EOH;
+        $sources = [
+            source('sound.ogg', 'audio/ogg'),
+            source('sound.mpeg', 'audio/mpeg'),
+        ];
+        $this->assertSame($expected, _media('av', $sources));
+    }
+
+    public function testSource()
+    {
+        $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
+        $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));
+    }
+
+    public function testEmbed()
+    {
+        $expected = <<<'EOH'
+            <embed src="http://example.com/movie.mov" type="video/quicktime" class="test" />
+
+            EOH;
+
+        $type  = 'video/quicktime';
+        $embed = embed('movie.mov', $type, 'class="test"');
+        $this->assertSame($expected, $embed);
+    }
+
+    public function testEmbedIndexed()
+    {
+        $expected = <<<'EOH'
+            <embed src="http://example.com/index.php/movie.mov" type="video/quicktime" class="test" />
+
+            EOH;
+
+        $type  = 'video/quicktime';
+        $embed = embed('movie.mov', $type, 'class="test"', true);
+        $this->assertSame($expected, $embed, '');
+    }
+
+    public function testObject()
+    {
+        $expected = <<<'EOH'
+            <object data="http://example.com/movie.swf" class="test"></object>
+
+            EOH;
+
+        $type   = 'application/x-shockwave-flash';
+        $object = object('movie.swf', $type, 'class="test"');
+
+        $this->assertSame($expected, $object);
+    }
+
+    public function testObjectWithParams()
+    {
+        $expected = <<<'EOH'
+            <object data="http://example.com/movie.swf" class="test">
+              <param name="foo" type="ref" value="bar" class="test" />
+              <param name="hello" type="ref" value="world" class="test" />
+            </object>
+
+            EOH;
+
+        $type  = 'application/x-shockwave-flash';
+        $parms = [
+            param('foo', 'bar', 'ref', 'class="test"'),
+            param('hello', 'world', 'ref', 'class="test"'),
+        ];
+        $object = object('movie.swf', $type, 'class="test"', $parms);
+        $this->assertSame($expected, $object);
+    }
+
+    public function testObjectIndexed()
+    {
+        $expected = <<<'EOH'
+            <object data="http://example.com/index.php/movie.swf" class="test"></object>
+
+            EOH;
+
+        $type   = 'application/x-shockwave-flash';
+        $object = object('movie.swf', $type, 'class="test"', [], true);
+
+        $this->assertSame($expected, $object);
+    }
 }
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index f66d7c0301ff..86ff1e2e9f58 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -1,306 +1,288 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class InflectorHelperTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('inflector');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSingular()
-	{
-		$strings = [
-			'matrices'  => 'matrix',
-			'oxen'      => 'ox',
-			'aliases'   => 'alias',
-			'octupus'   => 'octupus',
-			'shoes'     => 'shoe',
-			'buses'     => 'bus',
-			'campus'    => 'campus',
-			'campuses'  => 'campus',
-			'mice'      => 'mouse',
-			'movies'    => 'movie',
-			'series'    => 'series',
-			'hives'     => 'hive',
-			'lives'     => 'life',
-			'analyses'  => 'analysis',
-			'men'       => 'man',
-			'people'    => 'person',
-			'children'  => 'child',
-			'statuses'  => 'status',
-			'news'      => 'news',
-			'us'        => 'us',
-			'tests'     => 'test',
-			'queries'   => 'query',
-			'dogs'      => 'dog',
-			'cats'      => 'cat',
-			'families'  => 'family',
-			'countries' => 'country',
-		];
-
-		foreach ($strings as $pluralizedString => $singularizedString)
-		{
-			$singular = singular($pluralizedString);
-			$this->assertEquals($singular, $singularizedString);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPlural()
-	{
-		$strings = [
-			'searches'  => 'search',
-			'matrices'  => 'matrix',
-			'oxen'      => 'ox',
-			'aliases'   => 'alias',
-			'octupus'   => 'octupus',
-			'shoes'     => 'shoe',
-			'buses'     => 'bus',
-			'mice'      => 'mouse',
-			'movies'    => 'movie',
-			'series'    => 'series',
-			'hives'     => 'hive',
-			'lives'     => 'life',
-			'analyses'  => 'analysis',
-			'men'       => 'man',
-			'people'    => 'person',
-			'children'  => 'child',
-			'statuses'  => 'status',
-			'news'      => 'news',
-			'us'        => 'us',
-			'tests'     => 'test',
-			'queries'   => 'query',
-			'dogs'      => 'dog',
-			'cats'      => 'cat',
-			'families'  => 'family',
-			'countries' => 'country',
-		];
-
-		foreach ($strings as $pluralizedString => $singularizedString)
-		{
-			$plural = plural($singularizedString);
-			$this->assertEquals($plural, $pluralizedString);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCounted()
-	{
-		$triplets = [
-			[
-				3,
-				'cat',
-				'3 cats',
-			],
-			[
-				1,
-				'cat',
-				'1 cat',
-			],
-			[
-				0,
-				'cat',
-				'0 cats',
-			],
-			[
-				3,
-				'cats',
-				'3 cats',
-			],
-			[
-				1,
-				'cats',
-				'1 cat',
-			],
-			[
-				0,
-				'cats',
-				'0 cats',
-			],
-			[
-				3,
-				'fish',
-				'3 fish',
-			],
-			[
-				1,
-				'fish',
-				'1 fish',
-			],
-			[
-				0,
-				'fish',
-				'0 fish',
-			],
-		];
-
-		foreach ($triplets as $triplet)
-		{
-			$result = counted($triplet[0], $triplet[1]);
-			$this->assertEquals($triplet[2], $result);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCamelize()
-	{
-		$strings = [
-			'hello from codeIgniter 4' => 'helloFromCodeIgniter4',
-			'hello_world'              => 'helloWorld',
-		];
-
-		foreach ($strings as $lowerCasedString => $camelizedString)
-		{
-			$camelized = camelize($lowerCasedString);
-			$this->assertEquals($camelized, $camelizedString);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPascalize()
-	{
-		$strings = [
-			'hello from codeIgniter 4' => 'HelloFromCodeIgniter4',
-			'hello_world'              => 'HelloWorld',
-		];
-
-		foreach ($strings as $lowerCasedString => $pascalizedString)
-		{
-			$pascalized = pascalize($lowerCasedString);
-			$this->assertEquals($pascalized, $pascalizedString);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUnderscore()
-	{
-		$strings = [
-			'Hello From CodeIgniter 4' => 'Hello_From_CodeIgniter_4',
-			'hello world'              => 'hello_world',
-		];
-
-		foreach ($strings as $spaced => $underscore)
-		{
-			$underscored = underscore($spaced);
-			$this->assertEquals($underscored, $underscore);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHumanize()
-	{
-		$underscored = [
-			'Hello_From_CodeIgniter_4',
-			'Hello From CodeIgniter 4',
-		];
-		$dashed      = [
-			'hello-world',
-			'Hello World',
-		];
-
-		$humanizedUnderscore = humanize($underscored[0]);
-		$humanizedDash       = humanize($dashed[0], '-');
-
-		$this->assertEquals($humanizedUnderscore, $underscored[1]);
-		$this->assertEquals($humanizedDash, $dashed[1]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIsCountable()
-	{
-		$words = [
-			'tip'        => 'advice',
-			'fight'      => 'bravery',
-			'thing'      => 'equipment',
-			'deocration' => 'jewelry',
-			'line'       => 'series',
-			'letter'     => 'spelling',
-		];
-
-		foreach ($words as $countable => $unCountable)
-		{
-			$this->assertTrue(is_pluralizable($countable));
-			$this->assertFalse(is_pluralizable($unCountable));
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDasherize()
-	{
-		$strings = [
-			'hello_world'              => 'hello-world',
-			'Hello_From_CodeIgniter_4' => 'Hello-From-CodeIgniter-4',
-		];
-
-		foreach ($strings as $underscored => $dashed)
-		{
-			$dasherized = dasherize($underscored);
-			$this->assertEquals($dasherized, $dashed);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrdinal()
-	{
-		$suffixes = [
-			'st' => 1,
-			'nd' => 2,
-			'rd' => 3,
-			'th' => 4,
-			'th' => 11,
-			'th' => 20,
-			'st' => 21,
-			'nd' => 22,
-			'rd' => 23,
-			'th' => 24,
-		];
-
-		foreach ($suffixes as $suffix => $number)
-		{
-			$ordinal = ordinal($number);
-			$this->assertEquals($suffix, $ordinal);
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOrdinalize()
-	{
-		$suffixedNumbers = [
-			'1st'  => 1,
-			'2nd'  => 2,
-			'3rd'  => 3,
-			'4th'  => 4,
-			'11th' => 11,
-			'20th' => 20,
-			'21st' => 21,
-			'22nd' => 22,
-			'23rd' => 23,
-			'24th' => 24,
-		];
-
-		foreach ($suffixedNumbers as $suffixed => $number)
-		{
-			$ordinalized = ordinalize($number);
-			$this->assertEquals($suffixed, $ordinalized);
-		}
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('inflector');
+    }
+
+    public function testSingular()
+    {
+        $strings = [
+            'matrices'  => 'matrix',
+            'oxen'      => 'ox',
+            'aliases'   => 'alias',
+            'octupus'   => 'octupus',
+            'shoes'     => 'shoe',
+            'buses'     => 'bus',
+            'campus'    => 'campus',
+            'campuses'  => 'campus',
+            'mice'      => 'mouse',
+            'movies'    => 'movie',
+            'series'    => 'series',
+            'hives'     => 'hive',
+            'lives'     => 'life',
+            'analyses'  => 'analysis',
+            'men'       => 'man',
+            'people'    => 'person',
+            'children'  => 'child',
+            'statuses'  => 'status',
+            'news'      => 'news',
+            'us'        => 'us',
+            'tests'     => 'test',
+            'queries'   => 'query',
+            'dogs'      => 'dog',
+            'cats'      => 'cat',
+            'families'  => 'family',
+            'countries' => 'country',
+        ];
+
+        foreach ($strings as $pluralizedString => $singularizedString) {
+            $singular = singular($pluralizedString);
+            $this->assertSame($singular, $singularizedString);
+        }
+    }
+
+    public function testPlural()
+    {
+        $strings = [
+            'searches'  => 'search',
+            'matrices'  => 'matrix',
+            'oxen'      => 'ox',
+            'aliases'   => 'alias',
+            'octupus'   => 'octupus',
+            'shoes'     => 'shoe',
+            'buses'     => 'bus',
+            'mice'      => 'mouse',
+            'movies'    => 'movie',
+            'series'    => 'series',
+            'hives'     => 'hive',
+            'lives'     => 'life',
+            'analyses'  => 'analysis',
+            'men'       => 'man',
+            'people'    => 'person',
+            'children'  => 'child',
+            'statuses'  => 'status',
+            'news'      => 'news',
+            'us'        => 'us',
+            'tests'     => 'test',
+            'queries'   => 'query',
+            'dogs'      => 'dog',
+            'cats'      => 'cat',
+            'families'  => 'family',
+            'countries' => 'country',
+        ];
+
+        foreach ($strings as $pluralizedString => $singularizedString) {
+            $plural = plural($singularizedString);
+            $this->assertSame($plural, $pluralizedString);
+        }
+    }
+
+    public function testCounted()
+    {
+        $triplets = [
+            [
+                3,
+                'cat',
+                '3 cats',
+            ],
+            [
+                1,
+                'cat',
+                '1 cat',
+            ],
+            [
+                0,
+                'cat',
+                '0 cats',
+            ],
+            [
+                3,
+                'cats',
+                '3 cats',
+            ],
+            [
+                1,
+                'cats',
+                '1 cat',
+            ],
+            [
+                0,
+                'cats',
+                '0 cats',
+            ],
+            [
+                3,
+                'fish',
+                '3 fish',
+            ],
+            [
+                1,
+                'fish',
+                '1 fish',
+            ],
+            [
+                0,
+                'fish',
+                '0 fish',
+            ],
+        ];
+
+        foreach ($triplets as $triplet) {
+            $result = counted($triplet[0], $triplet[1]);
+            $this->assertSame($triplet[2], $result);
+        }
+    }
+
+    public function testCamelize()
+    {
+        $strings = [
+            'hello from codeIgniter 4' => 'helloFromCodeIgniter4',
+            'hello_world'              => 'helloWorld',
+        ];
+
+        foreach ($strings as $lowerCasedString => $camelizedString) {
+            $camelized = camelize($lowerCasedString);
+            $this->assertSame($camelized, $camelizedString);
+        }
+    }
+
+    public function testPascalize()
+    {
+        $strings = [
+            'hello from codeIgniter 4' => 'HelloFromCodeIgniter4',
+            'hello_world'              => 'HelloWorld',
+        ];
+
+        foreach ($strings as $lowerCasedString => $pascalizedString) {
+            $pascalized = pascalize($lowerCasedString);
+            $this->assertSame($pascalized, $pascalizedString);
+        }
+    }
+
+    public function testUnderscore()
+    {
+        $strings = [
+            'Hello From CodeIgniter 4' => 'Hello_From_CodeIgniter_4',
+            'hello world'              => 'hello_world',
+        ];
+
+        foreach ($strings as $spaced => $underscore) {
+            $underscored = underscore($spaced);
+            $this->assertSame($underscored, $underscore);
+        }
+    }
+
+    public function testHumanize()
+    {
+        $underscored = [
+            'Hello_From_CodeIgniter_4',
+            'Hello From CodeIgniter 4',
+        ];
+        $dashed = [
+            'hello-world',
+            'Hello World',
+        ];
+
+        $humanizedUnderscore = humanize($underscored[0]);
+        $humanizedDash       = humanize($dashed[0], '-');
+
+        $this->assertSame($humanizedUnderscore, $underscored[1]);
+        $this->assertSame($humanizedDash, $dashed[1]);
+    }
+
+    public function testIsCountable()
+    {
+        $words = [
+            'tip'        => 'advice',
+            'fight'      => 'bravery',
+            'thing'      => 'equipment',
+            'deocration' => 'jewelry',
+            'line'       => 'series',
+            'letter'     => 'spelling',
+        ];
+
+        foreach ($words as $countable => $unCountable) {
+            $this->assertTrue(is_pluralizable($countable));
+            $this->assertFalse(is_pluralizable($unCountable));
+        }
+    }
+
+    public function testDasherize()
+    {
+        $strings = [
+            'hello_world'              => 'hello-world',
+            'Hello_From_CodeIgniter_4' => 'Hello-From-CodeIgniter-4',
+        ];
+
+        foreach ($strings as $underscored => $dashed) {
+            $dasherized = dasherize($underscored);
+            $this->assertSame($dasherized, $dashed);
+        }
+    }
+
+    public function provideOrdinal()
+    {
+        return [
+            ['st', 1],
+            ['nd', 2],
+            ['rd', 3],
+            ['th', 4],
+            ['th', 11],
+            ['th', 20],
+            ['st', 21],
+            ['nd', 22],
+            ['rd', 23],
+            ['th', 24],
+        ];
+    }
+
+    /**
+     * @dataProvider provideOrdinal
+     */
+    public function testOrdinal(string $suffix, int $number)
+    {
+        $this->assertSame($suffix, ordinal($number));
+    }
+
+    public function testOrdinalize()
+    {
+        $suffixedNumbers = [
+            '1st'  => 1,
+            '2nd'  => 2,
+            '3rd'  => 3,
+            '4th'  => 4,
+            '11th' => 11,
+            '20th' => 20,
+            '21st' => 21,
+            '22nd' => 22,
+            '23rd' => 23,
+            '24th' => 24,
+        ];
+
+        foreach ($suffixedNumbers as $suffixed => $number) {
+            $ordinalized = ordinalize($number);
+            $this->assertSame($suffixed, $ordinalized);
+        }
+    }
 }
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 998d2c24d817..286440d7423b 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -1,128 +1,139 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class NumberHelperTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('number');
-	}
-
-	public function testRomanNumber()
-	{
-		$this->assertEquals('XCVI', number_to_roman(96));
-		$this->assertEquals('MMDCCCXCV', number_to_roman(2895));
-		$this->assertEquals('CCCXXIX', number_to_roman(329));
-		$this->assertEquals('IV', number_to_roman(4));
-		$this->assertEquals('X', number_to_roman(10));
-	}
-
-	public function testRomanNumberRange()
-	{
-		$this->assertEquals(null, number_to_roman(-1));
-		$this->assertEquals(null, number_to_roman(0));
-		$this->assertEquals(null, number_to_roman(4000));
-	}
-
-	public function testFormatNumber()
-	{
-		$this->assertEquals('123,456', format_number(123456, 0, 'en_US'));
-	}
-
-	public function testFormatNumberWithPrecision()
-	{
-		$this->assertEquals('123,456.8', format_number(123456.789, 1, 'en_US'));
-		$this->assertEquals('123,456.79', format_number(123456.789, 2, 'en_US'));
-	}
-
-	public function testFormattingOptions()
-	{
-		$options = [
-			'before' => '<<',
-			'after'  => '>>',
-		];
-		$this->assertEquals('<<123,456.79>>', format_number(123456.789, 2, 'en_US', $options));
-	}
-
-	public function testNumberToSize()
-	{
-		$this->assertEquals('456 Bytes', number_to_size(456, 1, 'en_US'));
-	}
-
-	public function testKbFormat()
-	{
-		$this->assertEquals('4.5 KB', number_to_size(4567, 1, 'en_US'));
-	}
-
-	public function testKbFormatMedium()
-	{
-		$this->assertEquals('44.6 KB', number_to_size(45678, 1, 'en_US'));
-	}
-
-	public function testKbFormatLarge()
-	{
-		$this->assertEquals('446.1 KB', number_to_size(456789, 1, 'en_US'));
-	}
-
-	public function testMbFormat()
-	{
-		$this->assertEquals('3.3 MB', number_to_size(3456789, 1, 'en_US'));
-	}
-
-	public function testGbFormat()
-	{
-		$this->assertEquals('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
-	}
-
-	public function testTbFormat()
-	{
-		$this->assertEquals('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
-	}
-
-	public function testThousands()
-	{
-		$this->assertEquals('123 thousand', number_to_amount('123,000', 0, 'en_US'));
-	}
-
-	public function testMillions()
-	{
-		$this->assertEquals('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
-	}
-
-	public function testBillions()
-	{
-		$this->assertEquals('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
-	}
-
-	public function testTrillions()
-	{
-		$this->assertEquals('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
-	}
-
-	public function testQuadrillions()
-	{
-		$this->assertEquals('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
-	}
-
-	/**
-	 * @group single
-	 */
-	public function testCurrencyCurrentLocale()
-	{
-		$this->assertEquals('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
-		$this->assertEquals('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
-		$this->assertEquals('1.234,56 RSD', number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
-	}
-
-	public function testNumbersThatArent()
-	{
-		$this->assertFalse(number_to_size('1232x'));
-		$this->assertFalse(number_to_amount('1232x'));
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('number');
+    }
+
+    public function testRomanNumber()
+    {
+        $this->assertSame('XCVI', number_to_roman(96));
+        $this->assertSame('MMDCCCXCV', number_to_roman(2895));
+        $this->assertSame('CCCXXIX', number_to_roman(329));
+        $this->assertSame('IV', number_to_roman(4));
+        $this->assertSame('X', number_to_roman(10));
+    }
+
+    public function testRomanNumberRange()
+    {
+        $this->assertNull(number_to_roman(-1));
+        $this->assertNull(number_to_roman(0));
+        $this->assertNull(number_to_roman(4000));
+    }
+
+    public function testFormatNumber()
+    {
+        $this->assertSame('123,456', format_number(123456, 0, 'en_US'));
+    }
+
+    public function testFormatNumberWithPrecision()
+    {
+        $this->assertSame('123,456.8', format_number(123456.789, 1, 'en_US'));
+        $this->assertSame('123,456.79', format_number(123456.789, 2, 'en_US'));
+    }
+
+    public function testFormattingOptions()
+    {
+        $options = [
+            'before' => '<<',
+            'after'  => '>>',
+        ];
+        $this->assertSame('<<123,456.79>>', format_number(123456.789, 2, 'en_US', $options));
+    }
+
+    public function testNumberToSize()
+    {
+        $this->assertSame('456 Bytes', number_to_size(456, 1, 'en_US'));
+    }
+
+    public function testKbFormat()
+    {
+        $this->assertSame('4.5 KB', number_to_size(4567, 1, 'en_US'));
+    }
+
+    public function testKbFormatMedium()
+    {
+        $this->assertSame('44.6 KB', number_to_size(45678, 1, 'en_US'));
+    }
+
+    public function testKbFormatLarge()
+    {
+        $this->assertSame('446.1 KB', number_to_size(456789, 1, 'en_US'));
+    }
+
+    public function testMbFormat()
+    {
+        $this->assertSame('3.3 MB', number_to_size(3456789, 1, 'en_US'));
+    }
+
+    public function testGbFormat()
+    {
+        $this->assertSame('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
+    }
+
+    public function testTbFormat()
+    {
+        $this->assertSame('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
+    }
+
+    public function testThousands()
+    {
+        $this->assertSame('123 thousand', number_to_amount('123,000', 0, 'en_US'));
+    }
+
+    public function testMillions()
+    {
+        $this->assertSame('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
+    }
+
+    public function testBillions()
+    {
+        $this->assertSame('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
+    }
+
+    public function testTrillions()
+    {
+        $this->assertSame('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
+    }
+
+    public function testQuadrillions()
+    {
+        $this->assertSame('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
+    }
+
+    /**
+     * @group single
+     */
+    public function testCurrencyCurrentLocale()
+    {
+        $this->assertSame('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
+        $this->assertSame('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
+        $this->assertSame("1.234,56\u{a0}RSD", number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
+    }
+
+    public function testNumbersThatArent()
+    {
+        $this->assertFalse(number_to_size('1232x'));
+        $this->assertFalse(number_to_amount('1232x'));
+    }
 }
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index e9c8cf41dfd9..3e1d8c332080 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -1,37 +1,50 @@
-<?php namespace CodeIgniter\Helpers;
+<?php
 
-use CodeIgniter\Test\CIUnitTestCase;
-
-class SecurityHelperTest extends CIUnitTestCase
-{
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('security');
-	}
-
-	public function testSanitizeFilenameSimpleSuccess()
-	{
-		$this->assertEquals('hello.doc', sanitize_filename('hello.doc'));
-	}
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-	public function testSanitizeFilenameStripsExtras()
-	{
-		$filename = './<!--foo -->';
-		$this->assertEquals('foo ', sanitize_filename($filename));
-	}
+namespace CodeIgniter\Helpers;
 
-	public function testStripImageTags()
-	{
-		$this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
-
-		$this->assertEquals('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
-	}
-
-	function test_encode_php_tags()
-	{
-		$this->assertEquals('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
-	}
+use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
+final class SecurityHelperTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('security');
+    }
+
+    public function testSanitizeFilenameSimpleSuccess()
+    {
+        $this->assertSame('hello.doc', sanitize_filename('hello.doc'));
+    }
+
+    public function testSanitizeFilenameStripsExtras()
+    {
+        $filename = './<!--foo -->';
+        $this->assertSame('foo ', sanitize_filename($filename));
+    }
+
+    public function testStripImageTags()
+    {
+        $this->assertSame('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
+
+        $this->assertSame('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
+    }
+
+    public function testEncodePhpTags()
+    {
+        $this->assertSame('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
+    }
 }
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 3cbfd5d1d80a..0853ed46c6f4 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -1,366 +1,351 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class TextHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TextHelperTest extends CIUnitTestCase
 {
-
-	private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('text');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testStripSlashes()
-	{
-		$expected = [
-			"Is your name O'reilly?",
-			"No, my name is O'connor.",
-		];
-		$str      = [
-			"Is your name O\'reilly?",
-			"No, my name is O\'connor.",
-		];
-		$this->assertEquals($expected, strip_slashes($str));
-	}
-
-	// --------------------------------------------------------------------
-	public function testStripQuotes()
-	{
-		$strs = [
-			'"me oh my!"'    => 'me oh my!',
-			"it's a winner!" => 'its a winner!',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, strip_quotes($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function testQuotesToEntities()
-	{
-		$strs = [
-			'"me oh my!"'    => '&quot;me oh my!&quot;',
-			"it's a winner!" => 'it&#39;s a winner!',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, quotes_to_entities($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function testReduceDoubleSlashes()
-	{
-		$strs = [
-			'http://codeigniter.com'      => 'http://codeigniter.com',
-			'//var/www/html/example.com/' => '/var/www/html/example.com/',
-			'/var/www/html//index.php'    => '/var/www/html/index.php',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_double_slashes($str));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function testReduceMultiples()
-	{
-		$strs = [
-			'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
-			'Ringo, John, Paul,,'     => 'Ringo, John, Paul,',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_multiples($str));
-		}
-		$strs = [
-			'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
-			'Ringo, John, Paul,,'     => 'Ringo, John, Paul',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, reduce_multiples($str, ',', true));
-		}
-	}
-
-	// --------------------------------------------------------------------
-	public function testRandomString()
-	{
-		$this->assertEquals(16, strlen(random_string('alnum', 16)));
-		$this->assertEquals(16, strlen(random_string('alpha', 16)));
-		$this->assertEquals(16, strlen(random_string('nozero', 16)));
-		$this->assertEquals(16, strlen(random_string('numeric', 16)));
-		$this->assertEquals(8, strlen(random_string('numeric')));
-
-		$this->assertIsString(random_string('basic'));
-		$this->assertEquals(16, strlen($random = random_string('crypto', 16)));
-		$this->assertIsString($random);
-
-		$this->assertEquals(32, strlen($random = random_string('md5')));
-		$this->assertEquals(40, strlen($random = random_string('sha1')));
-	}
-
-	// --------------------------------------------------------------------
-	public function testIncrementString()
-	{
-		$this->assertEquals('my-test_1', increment_string('my-test'));
-		$this->assertEquals('my-test-1', increment_string('my-test', '-'));
-		$this->assertEquals('file_5', increment_string('file_4'));
-		$this->assertEquals('file-5', increment_string('file-4', '-'));
-		$this->assertEquals('file-5', increment_string('file-4', '-'));
-		$this->assertEquals('file-1', increment_string('file', '-', '1'));
-		$this->assertEquals(124, increment_string('123', ''));
-	}
-
-	// -------------------------------------------------------------------
-	// Functions from text_helper_test.php
-	// -------------------------------------------------------------------
-
-	public function testWordLimiter()
-	{
-		$this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
-		$this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
-		$this->assertEquals('', word_limiter('', 4));
-		$this->assertEquals('Once upon a&hellip;', word_limiter($this->_long_string, 3, '&hellip;'));
-		$this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testCharacterLimiter()
-	{
-		$this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
-		$this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
-		$this->assertEquals('Short', character_limiter('Short', 20));
-		$this->assertEquals('Short', character_limiter('Short', 5));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testAsciiToEntities()
-	{
-		$strs = [
-			'“‘ “test” '     => '&#8220;&#8216; &#8220;test&#8221; ',
-			'†¥¨ˆøåß∂ƒ©˙∆˚¬' => '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, ascii_to_entities($str));
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function testEntitiesToAscii()
-	{
-		$strs = [
-			'&#8220;&#8216; &#8220;test&#8221; '                                                      => '“‘ “test” ',
-			'&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;' => '†¥¨ˆøåß∂ƒ©˙∆˚¬',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, entities_to_ascii($str));
-		}
-	}
-
-	public function testEntitiesToAsciiUnsafe()
-	{
-		$str = '&lt;&gt;';
-		$this->assertEquals('<>', entities_to_ascii($str, true));
-		$this->assertEquals('&lt;&gt;', entities_to_ascii($str, false));
-	}
-
-	public function testEntitiesToAsciiSmallOrdinals()
-	{
-		$str = '&#07;';
-		$this->assertEquals(pack('c', 7), entities_to_ascii($str));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testConvertAccentedCharacters()
-	{
-		//$this->ci_vfs_clone('application/Config/ForeignChars.php');
-		$this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
-		$this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testCensoredWords()
-	{
-		$censored = [
-			'boob',
-			'nerd',
-			'ass',
-			'fart',
-		];
-		$strs     = [
-			'Ted bobbled the ball'         => 'Ted bobbled the ball',
-			'Jake is a nerdo'              => 'Jake is a nerdo',
-			'The borg will assimilate you' => 'The borg will assimilate you',
-			'Did Mary Fart?'               => 'Did Mary $*#?',
-			'Jake is really a boob'        => 'Jake is really a $*#',
-			'Jake is really a (boob)'      => 'Jake is really a ($*#)',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, word_censor($str, $censored, '$*#'));
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function testHighlightCode()
-	{
-		$expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
-		$this->assertEquals($expect, highlight_code('<?php var_dump($this); ?>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testHighlightPhrase()
-	{
-		$strs = [
-			'this is a phrase'        => '<mark>this is</mark> a phrase',
-			'this is another'         => '<mark>this is</mark> another',
-			'Gimme a test, Sally'     => 'Gimme a test, Sally',
-			'Or tell me what this is' => 'Or tell me what <mark>this is</mark>',
-			''                        => '',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, highlight_phrase($str, 'this is'));
-		}
-		$this->assertEquals('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testEllipsize()
-	{
-		$strs = [
-			'0'  => [
-				'this is my string'             => '&hellip; my string',
-				"here's another one"            => '&hellip;nother one',
-				'this one is just a bit longer' => '&hellip;bit longer',
-				'short'                         => 'short',
-			],
-			'.5' => [
-				'this is my string'             => 'this &hellip;tring',
-				"here's another one"            => "here'&hellip;r one",
-				'this one is just a bit longer' => 'this &hellip;onger',
-				'short'                         => 'short',
-			],
-			'1'  => [
-				'this is my string'             => 'this is my&hellip;',
-				"here's another one"            => "here's ano&hellip;",
-				'this one is just a bit longer' => 'this one i&hellip;',
-				'short'                         => 'short',
-			],
-		];
-		foreach ($strs as $pos => $s)
-		{
-			foreach ($s as $str => $expect)
-			{
-				$this->assertEquals($expect, ellipsize($str, 10, $pos));
-			}
-		}
-	}
-
-	// ------------------------------------------------------------------------
-	public function testWordWrap()
-	{
-		$string   = 'Here is a simple string of text that will help us demonstrate this function.';
-		$expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
-		$this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
-		$this->assertEquals($expected, word_wrap($string, 25));
-
-		$string2   = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
-		$expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
-		$this->assertEquals(substr_count(word_wrap($string2, 25), "\n"), 3);
-		$this->assertEquals($expected2, word_wrap($string2, 25));
-
-		$string3   = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
-		$expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
-		$this->assertEquals(substr_count(word_wrap($string3, 25), "\n"), 4);
-		$this->assertEquals($expected3, word_wrap($string3, 25));
-	}
-
-	public function testWordWrapUnwrap()
-	{
-		$string   = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
-		$expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
-		$this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
-		$this->assertEquals($expected, word_wrap($string, 25));
-	}
-
-	public function testWordWrapLongWords()
-	{
-		// the really really long word will be split
-		$string   = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
-		$expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
-		$this->assertEquals($expected, word_wrap($string, 25));
-	}
-
-	public function testWordWrapURL()
-	{
-		// the really really long word will be split
-		$string   = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
-		$expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
-		$this->assertEquals($expected, word_wrap($string, 25));
-	}
-
-	// ------------------------------------------------------------------------
-	public function testDefaultWordWrapCharlim()
-	{
-		$string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
-		$this->assertEquals(strpos(word_wrap($string), "\n"), 73);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function testExcerpt()
-	{
-		$string = $this->_long_string;
-		$result = ' Once upon a time, a framework had no tests. It sad  So some nice people began to write tests. The more time that went on, the happier it became. ...';
-		$this->assertEquals(excerpt($string), $result);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function testExcerptRadius()
-	{
-		$string = $this->_long_string;
-		$phrase = 'began';
-		$result = '... people began to ...';
-		$this->assertEquals(excerpt($string, $phrase, 10), $result);
-	}
-
-	// -----------------------------------------------------------------------
-
-	public function testAlternator()
-	{
-		$phrase = ' scream! ';
-		$result = '';
-		alternator();
-		for ($i = 0; $i < 4; $i ++)
-		{
-			$result .= alternator('I', 'you', 'we') . $phrase;
-		}
-		$this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
-	}
-
-	public function testEmptyAlternator()
-	{
-		$phrase = ' scream! ';
-		$result = '';
-		for ($i = 0; $i < 4; $i ++)
-		{
-			$result .= alternator() . $phrase;
-		}
-		$this->assertEquals(' scream!  scream!  scream!  scream! ', $result);
-	}
-
+    private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('text');
+    }
+
+    public function testStripSlashes()
+    {
+        $expected = [
+            "Is your name O'reilly?",
+            "No, my name is O'connor.",
+        ];
+        $str = [
+            "Is your name O\\'reilly?",
+            "No, my name is O\\'connor.",
+        ];
+        $this->assertSame($expected, strip_slashes($str));
+    }
+
+    public function testStripQuotes()
+    {
+        $strs = [
+            '"me oh my!"'    => 'me oh my!',
+            "it's a winner!" => 'its a winner!',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, strip_quotes($str));
+        }
+    }
+
+    public function testQuotesToEntities()
+    {
+        $strs = [
+            '"me oh my!"'    => '&quot;me oh my!&quot;',
+            "it's a winner!" => 'it&#39;s a winner!',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, quotes_to_entities($str));
+        }
+    }
+
+    public function testReduceDoubleSlashes()
+    {
+        $strs = [
+            'http://codeigniter.com'      => 'http://codeigniter.com',
+            '//var/www/html/example.com/' => '/var/www/html/example.com/',
+            '/var/www/html//index.php'    => '/var/www/html/index.php',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, reduce_double_slashes($str));
+        }
+    }
+
+    public function testReduceMultiples()
+    {
+        $strs = [
+            'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+            'Ringo, John, Paul,,'     => 'Ringo, John, Paul,',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, reduce_multiples($str));
+        }
+        $strs = [
+            'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
+            'Ringo, John, Paul,,'     => 'Ringo, John, Paul',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, reduce_multiples($str, ',', true));
+        }
+    }
+
+    public function testRandomString()
+    {
+        $this->assertSame(16, strlen(random_string('alnum', 16)));
+        $this->assertSame(16, strlen(random_string('alpha', 16)));
+        $this->assertSame(16, strlen(random_string('nozero', 16)));
+        $this->assertSame(16, strlen(random_string('numeric', 16)));
+        $this->assertSame(8, strlen(random_string('numeric')));
+
+        $this->assertIsString(random_string('basic'));
+        $this->assertSame(16, strlen($random = random_string('crypto', 16)));
+        $this->assertIsString($random);
+
+        $this->assertSame(32, strlen($random = random_string('md5')));
+        $this->assertSame(40, strlen($random = random_string('sha1')));
+    }
+
+    public function testIncrementString()
+    {
+        $this->assertSame('my-test_1', increment_string('my-test'));
+        $this->assertSame('my-test-1', increment_string('my-test', '-'));
+        $this->assertSame('file_5', increment_string('file_4'));
+        $this->assertSame('file-5', increment_string('file-4', '-'));
+        $this->assertSame('file-5', increment_string('file-4', '-'));
+        $this->assertSame('file-1', increment_string('file', '-', '1'));
+        $this->assertSame('124', increment_string('123', ''));
+    }
+
+    // Functions from text_helper_test.php
+
+    public function testWordLimiter()
+    {
+        $this->assertSame('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
+        $this->assertSame('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
+        $this->assertSame('', word_limiter('', 4));
+        $this->assertSame('Once upon a&hellip;', word_limiter($this->_long_string, 3, '&hellip;'));
+        $this->assertSame('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
+    }
+
+    public function testCharacterLimiter()
+    {
+        $this->assertSame('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
+        $this->assertSame('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
+        $this->assertSame('Short', character_limiter('Short', 20));
+        $this->assertSame('Short', character_limiter('Short', 5));
+    }
+
+    public function testAsciiToEntities()
+    {
+        $strs = [
+            '“‘ “test” '     => '&#8220;&#8216; &#8220;test&#8221; ',
+            '†¥¨ˆøåß∂ƒ©˙∆˚¬' => '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, ascii_to_entities($str));
+        }
+    }
+
+    public function testEntitiesToAscii()
+    {
+        $strs = [
+            '&#8220;&#8216; &#8220;test&#8221; '                                                      => '“‘ “test” ',
+            '&#8224;&#165;&#168;&#710;&#248;&#229;&#223;&#8706;&#402;&#169;&#729;&#8710;&#730;&#172;' => '†¥¨ˆøåß∂ƒ©˙∆˚¬',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, entities_to_ascii($str));
+        }
+    }
+
+    public function testEntitiesToAsciiUnsafe()
+    {
+        $str = '&lt;&gt;';
+        $this->assertSame('<>', entities_to_ascii($str, true));
+        $this->assertSame('&lt;&gt;', entities_to_ascii($str, false));
+    }
+
+    public function testEntitiesToAsciiSmallOrdinals()
+    {
+        $str = '&#07;';
+        $this->assertSame(pack('c', 7), entities_to_ascii($str));
+    }
+
+    public function testConvertAccentedCharacters()
+    {
+        //$this->ci_vfs_clone('application/Config/ForeignChars.php');
+        $this->assertSame('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
+        $this->assertSame('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
+    }
+
+    public function testCensoredWords()
+    {
+        $censored = [
+            'boob',
+            'nerd',
+            'ass',
+            'fart',
+        ];
+        $strs = [
+            'Ted bobbled the ball'         => 'Ted bobbled the ball',
+            'Jake is a nerdo'              => 'Jake is a nerdo',
+            'The borg will assimilate you' => 'The borg will assimilate you',
+            'Did Mary Fart?'               => 'Did Mary $*#?',
+            'Jake is really a boob'        => 'Jake is really a $*#',
+            'Jake is really a (boob)'      => 'Jake is really a ($*#)',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, word_censor($str, $censored, '$*#'));
+        }
+    }
+
+    public function testHighlightCode()
+    {
+        $expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
+        $this->assertSame($expect, highlight_code('<?php var_dump($this); ?>'));
+    }
+
+    public function testHighlightPhrase()
+    {
+        $strs = [
+            'this is a phrase'        => '<mark>this is</mark> a phrase',
+            'this is another'         => '<mark>this is</mark> another',
+            'Gimme a test, Sally'     => 'Gimme a test, Sally',
+            'Or tell me what this is' => 'Or tell me what <mark>this is</mark>',
+            ''                        => '',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, highlight_phrase($str, 'this is'));
+        }
+
+        $this->assertSame('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
+    }
+
+    public function testEllipsize()
+    {
+        $strs = [
+            '0' => [
+                'this is my string'             => '&hellip; my string',
+                "here's another one"            => '&hellip;nother one',
+                'this one is just a bit longer' => '&hellip;bit longer',
+                'short'                         => 'short',
+            ],
+            '.5' => [
+                'this is my string'             => 'this &hellip;tring',
+                "here's another one"            => "here'&hellip;r one",
+                'this one is just a bit longer' => 'this &hellip;onger',
+                'short'                         => 'short',
+            ],
+            '1' => [
+                'this is my string'             => 'this is my&hellip;',
+                "here's another one"            => "here's ano&hellip;",
+                'this one is just a bit longer' => 'this one i&hellip;',
+                'short'                         => 'short',
+            ],
+        ];
+
+        foreach ($strs as $pos => $s) {
+            foreach ($s as $str => $expect) {
+                $this->assertSame($expect, ellipsize($str, 10, $pos));
+            }
+        }
+    }
+
+    public function testWordWrap()
+    {
+        $string   = 'Here is a simple string of text that will help us demonstrate this function.';
+        $expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
+        $this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertSame($expected, word_wrap($string, 25));
+
+        $string2   = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
+        $expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
+        $this->assertSame(substr_count(word_wrap($string2, 25), "\n"), 3);
+        $this->assertSame($expected2, word_wrap($string2, 25));
+
+        $string3   = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
+        $expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
+        $this->assertSame(substr_count(word_wrap($string3, 25), "\n"), 4);
+        $this->assertSame($expected3, word_wrap($string3, 25));
+    }
+
+    public function testWordWrapUnwrap()
+    {
+        $string   = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
+        $expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
+        $this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertSame($expected, word_wrap($string, 25));
+    }
+
+    public function testWordWrapLongWords()
+    {
+        // the really really long word will be split
+        $string   = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
+        $expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
+        $this->assertSame($expected, word_wrap($string, 25));
+    }
+
+    public function testWordWrapURL()
+    {
+        // the really really long word will be split
+        $string   = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
+        $expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
+        $this->assertSame($expected, word_wrap($string, 25));
+    }
+
+    public function testDefaultWordWrapCharlim()
+    {
+        $string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
+        $this->assertSame(strpos(word_wrap($string), "\n"), 73);
+    }
+
+    public function testExcerpt()
+    {
+        $string = $this->_long_string;
+        $result = ' Once upon a time, a framework had no tests. It sad  So some nice people began to write tests. The more time that went on, the happier it became. ...';
+        $this->assertSame(excerpt($string), $result);
+    }
+
+    public function testExcerptRadius()
+    {
+        $string = $this->_long_string;
+        $phrase = 'began';
+        $result = '... people began to ...';
+        $this->assertSame(excerpt($string, $phrase, 10), $result);
+    }
+
+    public function testAlternator()
+    {
+        $phrase = ' scream! ';
+        $result = '';
+        alternator();
+
+        for ($i = 0; $i < 4; $i++) {
+            $result .= alternator('I', 'you', 'we') . $phrase;
+        }
+        $this->assertSame('I scream! you scream! we scream! I scream! ', $result);
+    }
+
+    public function testEmptyAlternator()
+    {
+        $phrase = ' scream! ';
+        $result = '';
+
+        for ($i = 0; $i < 4; $i++) {
+            $result .= alternator() . $phrase;
+        }
+
+        $this->assertSame(' scream!  scream!  scream!  scream! ', $result);
+    }
 }
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 44e5a260211e..6dc5de5a4829 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
@@ -15,327 +23,317 @@
  * Includes: current_url, uri_string, uri_is
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class CurrentUrlTest extends CIUnitTestCase
 {
-	/**
-	 * @var App
-	 */
-	private $config;
-
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper('url');
-	}
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset(true);
-
-		// Set a common base configuration (overriden by individual tests)
-		$this->config            = new App();
-		$this->config->baseURL   = 'http://example.com/';
-		$this->config->indexPage = 'index.php';
-		Factories::injectMock('config', 'App', $this->config);
-
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		$_SERVER = [];
-	}
-
-	//--------------------------------------------------------------------
-	// current_url
-	//--------------------------------------------------------------------
-
-	public function testCurrentURLReturnsBasicURL()
-	{
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com/public';
-
-		$this->assertEquals('http://example.com/public/index.php/', current_url());
-	}
-
-	public function testCurrentURLReturnsObject()
-	{
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com/public';
+    /**
+     * @var App
+     */
+    private $config;
+
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
 
-		$url = current_url(true);
+        helper('url');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset(true);
+
+        // Set a common base configuration (overriden by individual tests)
+        $this->config            = new App();
+        $this->config->baseURL   = 'http://example.com/';
+        $this->config->indexPage = 'index.php';
+        Factories::injectMock('config', 'App', $this->config);
+
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $_SERVER = [];
+    }
+
+    public function testCurrentURLReturnsBasicURL()
+    {
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com/public';
 
-		$this->assertInstanceOf(URI::class, $url);
-		$this->assertEquals('http://example.com/public/index.php/', (string) $url);
-	}
+        $this->assertSame('http://example.com/public/index.php/', current_url());
+    }
 
-	public function testCurrentURLEquivalence()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/public';
-		$_SERVER['SCRIPT_NAME'] = '/index.php';
+    public function testCurrentURLReturnsObject()
+    {
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com/public';
 
-		// Since we're on a CLI, we must provide our own URI
-		Factories::injectMock('config', 'App', $this->config);
+        $url = current_url(true);
 
-		$request = Services::request($this->config);
-		Services::injectMock('request', $request);
+        $this->assertInstanceOf(URI::class, $url);
+        $this->assertSame('http://example.com/public/index.php/', (string) $url);
+    }
 
-		$this->assertEquals(site_url(uri_string()), current_url());
-	}
+    public function testCurrentURLEquivalence()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/public';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
 
-	public function testCurrentURLInSubfolder()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/foo/public/bar?baz=quip';
-		$_SERVER['SCRIPT_NAME'] = '/foo/public/index.php';
+        // Since we're on a CLI, we must provide our own URI
+        Factories::injectMock('config', 'App', $this->config);
 
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com/foo/public';
-		Factories::injectMock('config', 'App', $this->config);
+        $request = Services::request($this->config);
+        Services::injectMock('request', $request);
 
-		$request = Services::request($this->config);
-		Services::injectMock('request', $request);
+        $this->assertSame(site_url(uri_string()), current_url());
+    }
 
-		$this->assertEquals('http://example.com/foo/public/index.php/bar', current_url());
-		$this->assertEquals('http://example.com/foo/public/index.php/bar?baz=quip', (string) current_url(true));
+    public function testCurrentURLInSubfolder()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/foo/public/bar?baz=quip';
+        $_SERVER['SCRIPT_NAME'] = '/foo/public/index.php';
 
-		$uri = current_url(true);
-		$this->assertEquals('foo', $uri->getSegment(1));
-		$this->assertEquals('example.com', $uri->getHost());
-		$this->assertEquals('http', $uri->getScheme());
-	}
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com/foo/public';
+        Factories::injectMock('config', 'App', $this->config);
 
-	public function testCurrentURLWithPortInSubfolder()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['SERVER_PORT'] = '8080';
-		$_SERVER['REQUEST_URI'] = '/foo/public/bar?baz=quip';
-		$_SERVER['SCRIPT_NAME'] = '/foo/public/index.php';
+        $request = Services::request($this->config);
+        Services::injectMock('request', $request);
 
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com:8080/foo/public';
-		Factories::injectMock('config', 'App', $this->config);
+        $this->assertSame('http://example.com/foo/public/index.php/bar', current_url());
+        $this->assertSame('http://example.com/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
-		$request = Services::request($this->config);
-		Services::injectMock('request', $request);
+        $uri = current_url(true);
+        $this->assertSame('foo', $uri->getSegment(1));
+        $this->assertSame('example.com', $uri->getHost());
+        $this->assertSame('http', $uri->getScheme());
+    }
 
-		$this->assertEquals('http://example.com:8080/foo/public/index.php/bar', current_url());
-		$this->assertEquals('http://example.com:8080/foo/public/index.php/bar?baz=quip', (string) current_url(true));
+    public function testCurrentURLWithPortInSubfolder()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['SERVER_PORT'] = '8080';
+        $_SERVER['REQUEST_URI'] = '/foo/public/bar?baz=quip';
+        $_SERVER['SCRIPT_NAME'] = '/foo/public/index.php';
 
-		$uri = current_url(true);
-		$this->assertEquals(['foo', 'public', 'index.php', 'bar'], $uri->getSegments());
-		$this->assertEquals('foo', $uri->getSegment(1));
-		$this->assertEquals('example.com', $uri->getHost());
-		$this->assertEquals('http', $uri->getScheme());
-		$this->assertEquals('8080', $uri->getPort());
-	}
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com:8080/foo/public';
+        Factories::injectMock('config', 'App', $this->config);
 
-	//--------------------------------------------------------------------
-	// uri_string
-	//--------------------------------------------------------------------
+        $request = Services::request($this->config);
+        Services::injectMock('request', $request);
 
-	public function testUriStringAbsolute()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
+        $this->assertSame('http://example.com:8080/foo/public/index.php/bar', current_url());
+        $this->assertSame('http://example.com:8080/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/assets/image.jpg');
+        $uri = current_url(true);
+        $this->assertSame(['foo', 'public', 'index.php', 'bar'], $uri->getSegments());
+        $this->assertSame('foo', $uri->getSegment(1));
+        $this->assertSame('example.com', $uri->getHost());
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame(8080, $uri->getPort());
+    }
 
-		Services::injectMock('request', $request);
+    public function testUriStringAbsolute()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
 
-		$this->assertEquals('/assets/image.jpg', uri_string());
-	}
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/assets/image.jpg');
 
-	public function testUriStringRelative()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
+        Services::injectMock('request', $request);
 
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/assets/image.jpg');
+        $this->assertSame('/assets/image.jpg', uri_string());
+    }
 
-		Services::injectMock('request', $request);
+    public function testUriStringRelative()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
 
-		$this->assertEquals('assets/image.jpg', uri_string(true));
-	}
-
-	public function testUriStringNoTrailingSlashAbsolute()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
-
-		$this->config->baseURL = 'http://example.com';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/assets/image.jpg');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('/assets/image.jpg', uri_string());
-	}
-
-	public function testUriStringNoTrailingSlashRelative()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
-
-		$this->config->baseURL = 'http://example.com';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/assets/image.jpg');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('assets/image.jpg', uri_string(true));
-	}
-
-	public function testUriStringEmptyAbsolute()
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('/', uri_string());
-	}
-
-	public function testUriStringEmptyRelative()
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('', uri_string(true));
-	}
-
-	public function testUriStringSubfolderAbsolute()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/subfolder/assets/image.jpg';
-
-		$this->config->baseURL = 'http://example.com/subfolder/';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/subfolder/assets/image.jpg');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('/subfolder/assets/image.jpg', uri_string());
-	}
-
-	public function testUriStringSubfolderRelative()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/subfolder/assets/image.jpg';
-		$_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
-
-		$this->config->baseURL = 'http://example.com/subfolder/';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/subfolder/assets/image.jpg');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('assets/image.jpg', uri_string(true));
-	}
-
-	//--------------------------------------------------------------------
-	// uri_is
-	//--------------------------------------------------------------------
-
-	public function urlIsProvider()
-	{
-		return [
-			[
-				'foo/bar',
-				'foo/bar',
-				true,
-			],
-			[
-				'foo/bar',
-				'foo*',
-				true,
-			],
-			[
-				'foo/bar',
-				'foo',
-				false,
-			],
-			[
-				'foo/bar',
-				'baz/foo/bar',
-				false,
-			],
-			[
-				'',
-				'foo*',
-				false,
-			],
-			[
-				'foo/',
-				'foo*',
-				true,
-			],
-			[
-				'foo/',
-				'foo',
-				true,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider urlIsProvider
-	 */
-	public function testUrlIs(string $currentPath, string $testPath, bool $expected)
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/' . $currentPath;
-
-		$request      = Services::request();
-		$request->uri = new URI('http://example.com/' . $currentPath);
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($expected, url_is($testPath));
-	}
-
-	/**
-	 * @dataProvider urlIsProvider
-	 */
-	public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected)
-	{
-		$_SERVER['HTTP_HOST']    = 'example.com';
-		$_SERVER['REQUEST_URI']  = '/' . $currentPath;
-		$this->config->indexPage = '';
-
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/' . $currentPath);
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($expected, url_is($testPath));
-	}
-
-	/**
-	 * @dataProvider urlIsProvider
-	 */
-	public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected)
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/' . $currentPath;
-		$_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
-		$this->config->baseURL  = 'http://example.com/subfolder/';
-
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/subfolder/' . $currentPath);
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($expected, url_is($testPath));
-	}
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/assets/image.jpg');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('assets/image.jpg', uri_string(true));
+    }
+
+    public function testUriStringNoTrailingSlashAbsolute()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
+
+        $this->config->baseURL = 'http://example.com';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/assets/image.jpg');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('/assets/image.jpg', uri_string());
+    }
+
+    public function testUriStringNoTrailingSlashRelative()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/assets/image.jpg';
+
+        $this->config->baseURL = 'http://example.com';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/assets/image.jpg');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('assets/image.jpg', uri_string(true));
+    }
+
+    public function testUriStringEmptyAbsolute()
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('/', uri_string());
+    }
+
+    public function testUriStringEmptyRelative()
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('', uri_string(true));
+    }
+
+    public function testUriStringSubfolderAbsolute()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/subfolder/assets/image.jpg';
+
+        $this->config->baseURL = 'http://example.com/subfolder/';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/subfolder/assets/image.jpg');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('/subfolder/assets/image.jpg', uri_string());
+    }
+
+    public function testUriStringSubfolderRelative()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/subfolder/assets/image.jpg';
+        $_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
+
+        $this->config->baseURL = 'http://example.com/subfolder/';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/subfolder/assets/image.jpg');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('assets/image.jpg', uri_string(true));
+    }
+
+    public function urlIsProvider()
+    {
+        return [
+            [
+                'foo/bar',
+                'foo/bar',
+                true,
+            ],
+            [
+                'foo/bar',
+                'foo*',
+                true,
+            ],
+            [
+                'foo/bar',
+                'foo',
+                false,
+            ],
+            [
+                'foo/bar',
+                'baz/foo/bar',
+                false,
+            ],
+            [
+                '',
+                'foo*',
+                false,
+            ],
+            [
+                'foo/',
+                'foo*',
+                true,
+            ],
+            [
+                'foo/',
+                'foo',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider urlIsProvider
+     */
+    public function testUrlIs(string $currentPath, string $testPath, bool $expected)
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/' . $currentPath;
+
+        $request      = Services::request();
+        $request->uri = new URI('http://example.com/' . $currentPath);
+        Services::injectMock('request', $request);
+
+        $this->assertSame($expected, url_is($testPath));
+    }
+
+    /**
+     * @dataProvider urlIsProvider
+     */
+    public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected)
+    {
+        $_SERVER['HTTP_HOST']    = 'example.com';
+        $_SERVER['REQUEST_URI']  = '/' . $currentPath;
+        $this->config->indexPage = '';
+
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/' . $currentPath);
+        Services::injectMock('request', $request);
+
+        $this->assertSame($expected, url_is($testPath));
+    }
+
+    /**
+     * @dataProvider urlIsProvider
+     */
+    public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected)
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/' . $currentPath;
+        $_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
+        $this->config->baseURL  = 'http://example.com/subfolder/';
+
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/subfolder/' . $currentPath);
+        Services::injectMock('request', $request);
+
+        $this->assertSame($expected, url_is($testPath));
+    }
 }
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 702b4f592bfc..bb74696181a4 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
@@ -11,838 +20,868 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class MiscUrlTest extends CIUnitTestCase
 {
-	/**
-	 * @var App
-	 */
-	private $config;
-
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper('url');
-	}
+    /**
+     * @var App
+     */
+    private $config;
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset(true);
-
-		// Set a common base configuration (overriden by individual tests)
-		$this->config            = new App();
-		$this->config->baseURL   = 'http://example.com/';
-		$this->config->indexPage = 'index.php';
-		Factories::injectMock('config', 'App', $this->config);
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		$_SERVER = [];
-	}
-
-	//--------------------------------------------------------------------
-	// Test previous_url
-
-	public function testPreviousURLUsesSessionFirst()
-	{
-		$uri1 = 'http://example.com/one?two';
-		$uri2 = 'http://example.com/two?foo';
-
-		$_SERVER['HTTP_REFERER']      = $uri1;
-		$_SESSION['_ci_previous_url'] = $uri2;
-
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com/public';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/public');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($uri2, previous_url());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPreviousURLUsesRefererIfNeeded()
-	{
-		$uri1 = 'http://example.com/one?two';
-		$uri2 = 'http://example.com/two?foo';
-
-		$_SERVER['HTTP_REFERER'] = $uri1;
-
-		// Since we're on a CLI, we must provide our own URI
-		$this->config->baseURL = 'http://example.com/public';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/public');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($uri1, previous_url());
-	}
-
-	//--------------------------------------------------------------------
-	// Test index_page
-
-	public function testIndexPage()
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('index.php', index_page());
-	}
-
-	public function testIndexPageAlt()
-	{
-		$this->config->indexPage = 'banana.php';
-		$request                 = Services::request($this->config);
-		$request->uri            = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals('banana.php', index_page($this->config));
-	}
-
-	//--------------------------------------------------------------------
-	// Test anchor
-
-	public function anchorNormalPatterns()
-	{
-		return [
-			'normal01' => [
-				'<a href="http://example.com/index.php">http://example.com/index.php</a>',
-				'',
-			],
-			'normal02' => [
-				'<a href="http://example.com/index.php">Bananas</a>',
-				'/',
-				'Bananas',
-			],
-			'normal03' => [
-				'<a href="http://example.com/index.php" fruit="peach">http://example.com/index.php</a>',
-				'/',
-				'',
-				'fruit="peach"',
-			],
-			'normal04' => [
-				'<a href="http://example.com/index.php" fruit=peach>Bananas</a>',
-				'/',
-				'Bananas',
-				'fruit=peach',
-			],
-			'normal05' => [
-				'<a href="http://example.com/index.php" fruit="peach">http://example.com/index.php</a>',
-				'/',
-				'',
-				['fruit' => 'peach'],
-			],
-			'normal06' => [
-				'<a href="http://example.com/index.php" fruit="peach">Bananas</a>',
-				'/',
-				'Bananas',
-				['fruit' => 'peach'],
-			],
-			'normal07' => [
-				'<a href="http://example.com/index.php">http://example.com/index.php</a>',
-				'/',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider anchorNormalPatterns
-	 */
-	public function testAnchor($expected = '', $uri = '', $title = '', $attributes = '')
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
-	}
-
-	public function anchorNoindexPatterns()
-	{
-		return [
-			'noindex01' => [
-				'<a href="http://example.com">http://example.com</a>',
-				'',
-			],
-			'noindex02' => [
-				'<a href="http://example.com">Bananas</a>',
-				'',
-				'Bananas',
-			],
-			'noindex03' => [
-				'<a href="http://example.com" fruit="peach">http://example.com</a>',
-				'',
-				'',
-				'fruit="peach"',
-			],
-			'noindex04' => [
-				'<a href="http://example.com" fruit=peach>Bananas</a>',
-				'',
-				'Bananas',
-				'fruit=peach',
-			],
-			'noindex05' => [
-				'<a href="http://example.com" fruit="peach">http://example.com</a>',
-				'',
-				'',
-				['fruit' => 'peach'],
-			],
-			'noindex06' => [
-				'<a href="http://example.com" fruit="peach">Bananas</a>',
-				'',
-				'Bananas',
-				['fruit' => 'peach'],
-			],
-			'noindex07' => [
-				'<a href="http://example.com">http://example.com</a>',
-				'/',
-			],
-			'noindex08' => [
-				'<a href="http://example.com" class="btn btn-primary">http://example.com</a>',
-				'',
-				'',
-				['class' => 'btn btn-primary'],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider anchorNoindexPatterns
-	 */
-	public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = '')
-	{
-		$this->config->indexPage = '';
-		$request                 = Services::request($this->config);
-		$request->uri            = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
-	}
-
-	public function anchorSubpagePatterns()
-	{
-		return [
-			'subpage01' => [
-				'<a href="http://example.com/mush">http://example.com/mush</a>',
-				'/mush',
-			],
-			'subpage02' => [
-				'<a href="http://example.com/mush">Bananas</a>',
-				'/mush',
-				'Bananas',
-			],
-			'subpage03' => [
-				'<a href="http://example.com/mush" fruit="peach">http://example.com/mush</a>',
-				'/mush',
-				'',
-				'fruit="peach"',
-			],
-			'subpage04' => [
-				'<a href="http://example.com/mush" fruit=peach>Bananas</a>',
-				'/mush',
-				'Bananas',
-				'fruit=peach',
-			],
-			'subpage05' => [
-				'<a href="http://example.com/mush" fruit="peach">http://example.com/mush</a>',
-				'/mush',
-				'',
-				['fruit' => 'peach'],
-			],
-			'subpage06' => [
-				'<a href="http://example.com/mush" fruit="peach">Bananas</a>',
-				'/mush',
-				'Bananas',
-				['fruit' => 'peach'],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider anchorSubpagePatterns
-	 */
-	public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = '')
-	{
-		$this->config->indexPage = '';
-		$request                 = Services::request($this->config);
-		$request->uri            = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
-	}
-
-	public function anchorExamplePatterns()
-	{
-		return [
-			'egpage01' => [
-				'<a href="http://example.com/index.php/news/local/123" title="News title">My News</a>',
-				'news/local/123',
-				'My News',
-				'title="News title"',
-			],
-			'egpage02' => [
-				'<a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>',
-				'news/local/123',
-				'My News',
-				['title' => 'The best news!'],
-			],
-			'egpage03' => [
-				'<a href="http://example.com/index.php">Click here</a>',
-				'',
-				'Click here',
-			],
-			'egpage04' => [
-				'<a href="http://example.com/index.php">Click here</a>',
-				'/',
-				'Click here',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider anchorExamplePatterns
-	 */
-	public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = '')
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
-	}
-
-	//--------------------------------------------------------------------
-	// Test anchor_popup
-
-	public function anchorPopupPatterns()
-	{
-		return [
-			'normal01' => [
-				'<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">http://example.com/index.php</a>',
-				'',
-			],
-			'normal02' => [
-				'<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">Bananas</a>',
-				'/',
-				'Bananas',
-			],
-			'normal07' => [
-				'<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">http://example.com/index.php</a>',
-				'/',
-			],
-			'normal08' => [
-				'<a href="http://example.com/index.php/news/local/123" onclick="window.open(\'http://example.com/index.php/news/local/123\', \'_blank\', \'width=800,height=600,scrollbars=yes,menubar=no,status=yes,resizable=yes,screenx=0,screeny=0\'); return false;">Click Me!</a>',
-				'news/local/123',
-				'Click Me!',
-				[
-					'width'       => 800,
-					'height'      => 600,
-					'scrollbars'  => 'yes',
-					'status'      => 'yes',
-					'resizable'   => 'yes',
-					'screenx'     => 0,
-					'screeny'     => 0,
-					'window_name' => '_blank',
-				],
-			],
-			'normal09' => [
-				'<a href="http://example.com/index.php/news/local/123" onclick="window.open(\'http://example.com/index.php/news/local/123\', \'_blank\', \'width=800,height=600,scrollbars=yes,menubar=no,status=yes,resizable=yes,screenx=0,screeny=0\'); return false;">Click Me!</a>',
-				'news/local/123',
-				'Click Me!',
-				[],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider anchorPopupPatterns
-	 */
-	public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false)
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-		$this->assertEquals($expected, anchor_popup($uri, $title, $attributes, $this->config));
-	}
-
-	//--------------------------------------------------------------------
-	// Test mailto
-
-	public function mailtoPatterns()
-	{
-		return [
-			'page01' => [
-				'<a href="mailto:me@my-site.com">Click Here to Contact Me</a>',
-				'me@my-site.com',
-				'Click Here to Contact Me',
-			],
-			'page02' => [
-				'<a href="mailto:me@my-site.com" title="Mail me">Contact Me</a>',
-				'me@my-site.com',
-				'Contact Me',
-				['title' => 'Mail me'],
-			],
-			'page03' => [
-				'<a href="mailto:me@my-site.com">me@my-site.com</a>',
-				'me@my-site.com',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider mailtoPatterns
-	 */
-	public function testMailto($expected = '', $email = '', $title = '', $attributes = '')
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($expected, mailto($email, $title, $attributes));
-	}
-
-	//--------------------------------------------------------------------
-	// Test safe_mailto
-
-	public function safeMailtoPatterns()
-	{
-		return [
-			'page01' => [
-				"<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '|32';l[15] = '|111';l[16] = '|116';l[17] = '|32';l[18] = '|101';l[19] = '|114';l[20] = '|101';l[21] = '|72';l[22] = '|32';l[23] = '|107';l[24] = '|99';l[25] = '|105';l[26] = '|108';l[27] = '|67';l[28] = '>';l[29] = '\"';l[30] = '|109';l[31] = '|111';l[32] = '|99';l[33] = '|46';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|115';l[38] = '|45';l[39] = '|121';l[40] = '|109';l[41] = '|64';l[42] = '|101';l[43] = '|109';l[44] = ':';l[45] = 'o';l[46] = 't';l[47] = 'l';l[48] = 'i';l[49] = 'a';l[50] = 'm';l[51] = '\"';l[52] = '=';l[53] = 'f';l[54] = 'e';l[55] = 'r';l[56] = 'h';l[57] = ' ';l[58] = 'a';l[59] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-				'me@my-site.com',
-				'Click Here to Contact Me',
-			],
-			'page02' => [
-				"<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '>';l[15] = '\"';l[16] = '|101';l[17] = '|109';l[18] = '|32';l[19] = '|108';l[20] = '|105';l[21] = '|97';l[22] = '|77';l[23] = ' title=\"';l[24] = '\"';l[25] = '|109';l[26] = '|111';l[27] = '|99';l[28] = '|46';l[29] = '|101';l[30] = '|116';l[31] = '|105';l[32] = '|115';l[33] = '|45';l[34] = '|121';l[35] = '|109';l[36] = '|64';l[37] = '|101';l[38] = '|109';l[39] = ':';l[40] = 'o';l[41] = 't';l[42] = 'l';l[43] = 'i';l[44] = 'a';l[45] = 'm';l[46] = '\"';l[47] = '=';l[48] = 'f';l[49] = 'e';l[50] = 'r';l[51] = 'h';l[52] = ' ';l[53] = 'a';l[54] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-				'me@my-site.com',
-				'Contact Me',
-				['title' => 'Mail me'],
-			],
-			'page03' => [
-				"<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|101';l[9] = '|116';l[10] = '|105';l[11] = '|115';l[12] = '|45';l[13] = '|121';l[14] = '|109';l[15] = '|64';l[16] = '|101';l[17] = '|109';l[18] = '>';l[19] = '\"';l[20] = '|109';l[21] = '|111';l[22] = '|99';l[23] = '|46';l[24] = '|101';l[25] = '|116';l[26] = '|105';l[27] = '|115';l[28] = '|45';l[29] = '|121';l[30] = '|109';l[31] = '|64';l[32] = '|101';l[33] = '|109';l[34] = ':';l[35] = 'o';l[36] = 't';l[37] = 'l';l[38] = 'i';l[39] = 'a';l[40] = 'm';l[41] = '\"';l[42] = '=';l[43] = 'f';l[44] = 'e';l[45] = 'r';l[46] = 'h';l[47] = ' ';l[48] = 'a';l[49] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-				'me@my-site.com',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider safeMailtoPatterns
-	 */
-	public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = '')
-	{
-		$request      = Services::request($this->config);
-		$request->uri = new URI('http://example.com/');
-
-		Services::injectMock('request', $request);
-
-		$this->assertEquals($expected, safe_mailto($email, $title, $attributes));
-	}
-
-	//--------------------------------------------------------------------
-	// Test auto_link
-
-	public function autolinkUrls()
-	{
-		return [
-			'test01' => [
-				'www.codeigniter.com test',
-				'<a href="http://www.codeigniter.com">www.codeigniter.com</a> test',
-			],
-			'test02' => [
-				'This is my noreply@codeigniter.com test',
-				'This is my noreply@codeigniter.com test',
-			],
-			'test03' => [
-				'<br />www.google.com',
-				'<br /><a href="http://www.google.com">www.google.com</a>',
-			],
-			'test04' => [
-				'Download CodeIgniter at www.codeigniter.com. Period test.',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>. Period test.',
-			],
-			'test05' => [
-				'Download CodeIgniter at www.codeigniter.com, comma test',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>, comma test',
-			],
-			'test06' => [
-				'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
-				'This one: <a href="://codeigniter.com">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com">http://codeigniter.com</a>',
-			],
-			'test07' => [
-				'Visit example.com or email foo@bar.com',
-				'Visit example.com or email foo@bar.com',
-			],
-			'test08' => [
-				'Visit www.example.com or email foo@bar.com',
-				'Visit <a href="http://www.example.com">www.example.com</a> or email foo@bar.com',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider autolinkUrls
-	 */
-	public function testAutoLinkUrl($in, $out)
-	{
-		$this->assertEquals($out, auto_link($in, 'url'));
-	}
-
-	public function autolinkEmails()
-	{
-		return [
-			'test01' => [
-				'www.codeigniter.com test',
-				'www.codeigniter.com test',
-			],
-			'test02' => [
-				'This is my noreply@codeigniter.com test',
-				"This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test",
-			],
-			'test03' => [
-				'<br />www.google.com',
-				'<br />www.google.com',
-			],
-			'test04' => [
-				'Download CodeIgniter at www.codeigniter.com. Period test.',
-				'Download CodeIgniter at www.codeigniter.com. Period test.',
-			],
-			'test05' => [
-				'Download CodeIgniter at www.codeigniter.com, comma test',
-				'Download CodeIgniter at www.codeigniter.com, comma test',
-			],
-			'test06' => [
-				'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
-				'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
-			],
-			'test07' => [
-				'Visit example.com or email foo@bar.com',
-				"Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-			],
-			'test08' => [
-				'Visit www.example.com or email foo@bar.com',
-				"Visit www.example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider autolinkEmails
-	 */
-	public function testAutoLinkEmail($in, $out)
-	{
-		$this->assertEquals($out, auto_link($in, 'email'));
-	}
-
-	public function autolinkBoth()
-	{
-		return [
-			'test01' => [
-				'www.codeigniter.com test',
-				'<a href="http://www.codeigniter.com">www.codeigniter.com</a> test',
-			],
-			'test02' => [
-				'This is my noreply@codeigniter.com test',
-				"This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test",
-			],
-			'test03' => [
-				'<br />www.google.com',
-				'<br /><a href="http://www.google.com">www.google.com</a>',
-			],
-			'test04' => [
-				'Download CodeIgniter at www.codeigniter.com. Period test.',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>. Period test.',
-			],
-			'test05' => [
-				'Download CodeIgniter at www.codeigniter.com, comma test',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>, comma test',
-			],
-			'test06' => [
-				'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
-				'This one: <a href="://codeigniter.com">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com">http://codeigniter.com</a>',
-			],
-			'test07' => [
-				'Visit example.com or email foo@bar.com',
-				"Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-			],
-			'test08' => [
-				'Visit www.example.com or email foo@bar.com',
-				"Visit <a href=\"http://www.example.com\">www.example.com</a> or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider autolinkBoth
-	 */
-	public function testAutolinkBoth($in, $out)
-	{
-		$this->assertEquals($out, auto_link($in));
-	}
-
-	public function autolinkPopup()
-	{
-		return [
-			'test01' => [
-				'www.codeigniter.com test',
-				'<a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a> test',
-			],
-			'test02' => [
-				'This is my noreply@codeigniter.com test',
-				'This is my noreply@codeigniter.com test',
-			],
-			'test03' => [
-				'<br />www.google.com',
-				'<br /><a href="http://www.google.com" target="_blank">www.google.com</a>',
-			],
-			'test04' => [
-				'Download CodeIgniter at www.codeigniter.com. Period test.',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a>. Period test.',
-			],
-			'test05' => [
-				'Download CodeIgniter at www.codeigniter.com, comma test',
-				'Download CodeIgniter at <a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a>, comma test',
-			],
-			'test06' => [
-				'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
-				'This one: <a href="://codeigniter.com" target="_blank">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com" target="_blank">http://codeigniter.com</a>',
-			],
-			'test07' => [
-				'Visit example.com or email foo@bar.com',
-				'Visit example.com or email foo@bar.com',
-			],
-			'test08' => [
-				'Visit www.example.com or email foo@bar.com',
-				'Visit <a href="http://www.example.com" target="_blank">www.example.com</a> or email foo@bar.com',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider autolinkPopup
-	 */
-	public function testAutoLinkPopup($in, $out)
-	{
-		$this->assertEquals($out, auto_link($in, 'url', true));
-	}
-
-	//--------------------------------------------------------------------
-	// Test prep_url
-
-	public function prepUrlProvider()
-	{
-		// input, expected, secure
-		return [
-			[
-				'',
-				'',
-				false,
-			],
-			[
-				'//',
-				'',
-				false,
-			],
-			[
-				'//codeigniter.com',
-				'http://codeigniter.com',
-				false,
-			],
-			[
-				'codeigniter.com',
-				'http://codeigniter.com',
-				false,
-			],
-			[
-				'www.codeigniter.com',
-				'http://www.codeigniter.com',
-				false,
-			],
-			[
-				'http://www.codeigniter.com',
-				'http://www.codeigniter.com',
-				false,
-			],
-			[
-				'https://www.codeigniter.com',
-				'https://www.codeigniter.com',
-				false,
-			],
-			[
-				'',
-				'',
-				true,
-			],
-			[
-				'//',
-				'',
-				true,
-			],
-			[
-				'//codeigniter.com',
-				'https://codeigniter.com',
-				true,
-			],
-			[
-				'codeigniter.com',
-				'https://codeigniter.com',
-				true,
-			],
-			[
-				'www.codeigniter.com',
-				'https://www.codeigniter.com',
-				true,
-			],
-			[
-				'http://www.codeigniter.com',
-				'https://www.codeigniter.com',
-				true,
-			],
-			[
-				'https://www.codeigniter.com',
-				'https://www.codeigniter.com',
-				true,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider prepUrlProvider
-	 */
-	public function testPrepUrl(string $input, string $expected, bool $secure)
-	{
-		$this->assertSame($expected, prep_url($input, $secure));
-	}
-
-	//--------------------------------------------------------------------
-	// Test url_title
-
-	public function testUrlTitle()
-	{
-		$words = [
-			'foo bar /'       => 'foo-bar',
-			'\  testing 12'   => 'testing-12',
-			'Éléphant de PHP' => 'éléphant-de-php',
-		];
-
-		foreach ($words as $in => $out)
-		{
-			$this->assertEquals($out, url_title($in, '-', true));
-		}
-	}
-
-	public function testUrlTitleExtraDashes()
-	{
-		$words = [
-			'_foo bar_'                 => 'foo_bar',
-			'_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS',
-			'Éléphant de PHP'           => 'Éléphant_de_PHP',
-		];
-
-		foreach ($words as $in => $out)
-		{
-			$this->assertEquals($out, url_title($in, '_'));
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Test mb_url_title
-
-	public function testMbUrlTitle()
-	{
-		$words = [
-			'foo bar /'       => 'foo-bar',
-			'\  testing 12'   => 'testing-12',
-			'Éléphant de PHP' => 'elephant-de-php',
-			'ä ö ü Ĝ β ę'     => 'ae-oe-ue-g-v-e',
-		];
-
-		foreach ($words as $in => $out)
-		{
-			$this->assertEquals($out, mb_url_title($in, '-', true));
-		}
-	}
-
-	public function testMbUrlTitleExtraDashes()
-	{
-		$words = [
-			'_foo bar_'                 => 'foo_bar',
-			'_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS',
-			'Éléphant de PHP'           => 'Elephant_de_PHP',
-			'ä ö ü Ĝ β ę'               => 'ae_oe_ue_G_v_e',
-		];
-
-		foreach ($words as $in => $out)
-		{
-			$this->assertEquals($out, mb_url_title($in, '_'));
-		}
-	}
-
-	/**
-	 * @dataProvider urlToProvider
-	 */
-	public function testUrlTo(string $expected, string $input, ...$args)
-	{
-		$_SERVER['HTTP_HOST'] = 'example.com';
-
-		$routes = service('routes');
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'gotoPage']);
-		$routes->add('route/(:any)/to/(:num)', 'myOtherController::goto/$1/$2');
-
-		$this->assertEquals($expected, url_to($input, ...$args));
-	}
-
-	/**
-	 * @dataProvider urlToMissingRoutesProvider
-	 */
-	public function testUrlToThrowsOnEmptyOrMissingRoute(string $route)
-	{
-		$this->expectException(RouterException::class);
-
-		url_to($route);
-	}
-
-	public function urlToProvider()
-	{
-		$page = config('App')->indexPage !== '' ? config('App')->indexPage . '/' : '';
-
-		return [
-			[
-				"http://example.com/{$page}path/string/to/13",
-				'gotoPage',
-				'string',
-				13,
-			],
-			[
-				"http://example.com/{$page}route/string/to/13",
-				'myOtherController::goto',
-				'string',
-				13,
-			],
-		];
-	}
-
-	public function urlToMissingRoutesProvider()
-	{
-		return [
-			[
-				'',
-			],
-			[
-				'Nope::doesNotExist',
-			],
-		];
-	}
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper('url');
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset(true);
+
+        // Set a common base configuration (overriden by individual tests)
+        $this->config            = new App();
+        $this->config->baseURL   = 'http://example.com/';
+        $this->config->indexPage = 'index.php';
+        Factories::injectMock('config', 'App', $this->config);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $_SERVER = [];
+    }
+
+    public function testPreviousURLUsesSessionFirst()
+    {
+        $uri1 = 'http://example.com/one?two';
+        $uri2 = 'http://example.com/two?foo';
+
+        $_SERVER['HTTP_REFERER']      = $uri1;
+        $_SESSION['_ci_previous_url'] = $uri2;
+
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com/public';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/public');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame($uri2, previous_url());
+    }
+
+    public function testPreviousURLUsesRefererIfNeeded()
+    {
+        $uri1 = 'http://example.com/one?two';
+
+        $_SERVER['HTTP_REFERER'] = $uri1;
+
+        // Since we're on a CLI, we must provide our own URI
+        $this->config->baseURL = 'http://example.com/public';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/public');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame($uri1, previous_url());
+    }
+
+    // Test index_page
+
+    public function testIndexPage()
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('index.php', index_page());
+    }
+
+    public function testIndexPageAlt()
+    {
+        $this->config->indexPage = 'banana.php';
+        $request                 = Services::request($this->config);
+        $request->uri            = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame('banana.php', index_page($this->config));
+    }
+
+    // Test anchor
+
+    public function anchorNormalPatterns()
+    {
+        return [
+            'normal01' => [
+                '<a href="http://example.com/index.php">http://example.com/index.php</a>',
+                '',
+            ],
+            'normal02' => [
+                '<a href="http://example.com/index.php">Bananas</a>',
+                '/',
+                'Bananas',
+            ],
+            'normal03' => [
+                '<a href="http://example.com/index.php" fruit="peach">http://example.com/index.php</a>',
+                '/',
+                '',
+                'fruit="peach"',
+            ],
+            'normal04' => [
+                '<a href="http://example.com/index.php" fruit=peach>Bananas</a>',
+                '/',
+                'Bananas',
+                'fruit=peach',
+            ],
+            'normal05' => [
+                '<a href="http://example.com/index.php" fruit="peach">http://example.com/index.php</a>',
+                '/',
+                '',
+                ['fruit' => 'peach'],
+            ],
+            'normal06' => [
+                '<a href="http://example.com/index.php" fruit="peach">Bananas</a>',
+                '/',
+                'Bananas',
+                ['fruit' => 'peach'],
+            ],
+            'normal07' => [
+                '<a href="http://example.com/index.php">http://example.com/index.php</a>',
+                '/',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider anchorNormalPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testAnchor($expected = '', $uri = '', $title = '', $attributes = '')
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
+    }
+
+    public function anchorNoindexPatterns()
+    {
+        return [
+            'noindex01' => [
+                '<a href="http://example.com">http://example.com</a>',
+                '',
+            ],
+            'noindex02' => [
+                '<a href="http://example.com">Bananas</a>',
+                '',
+                'Bananas',
+            ],
+            'noindex03' => [
+                '<a href="http://example.com" fruit="peach">http://example.com</a>',
+                '',
+                '',
+                'fruit="peach"',
+            ],
+            'noindex04' => [
+                '<a href="http://example.com" fruit=peach>Bananas</a>',
+                '',
+                'Bananas',
+                'fruit=peach',
+            ],
+            'noindex05' => [
+                '<a href="http://example.com" fruit="peach">http://example.com</a>',
+                '',
+                '',
+                ['fruit' => 'peach'],
+            ],
+            'noindex06' => [
+                '<a href="http://example.com" fruit="peach">Bananas</a>',
+                '',
+                'Bananas',
+                ['fruit' => 'peach'],
+            ],
+            'noindex07' => [
+                '<a href="http://example.com">http://example.com</a>',
+                '/',
+            ],
+            'noindex08' => [
+                '<a href="http://example.com" class="btn btn-primary">http://example.com</a>',
+                '',
+                '',
+                ['class' => 'btn btn-primary'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider anchorNoindexPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = '')
+    {
+        $this->config->indexPage = '';
+        $request                 = Services::request($this->config);
+        $request->uri            = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
+    }
+
+    public function anchorSubpagePatterns()
+    {
+        return [
+            'subpage01' => [
+                '<a href="http://example.com/mush">http://example.com/mush</a>',
+                '/mush',
+            ],
+            'subpage02' => [
+                '<a href="http://example.com/mush">Bananas</a>',
+                '/mush',
+                'Bananas',
+            ],
+            'subpage03' => [
+                '<a href="http://example.com/mush" fruit="peach">http://example.com/mush</a>',
+                '/mush',
+                '',
+                'fruit="peach"',
+            ],
+            'subpage04' => [
+                '<a href="http://example.com/mush" fruit=peach>Bananas</a>',
+                '/mush',
+                'Bananas',
+                'fruit=peach',
+            ],
+            'subpage05' => [
+                '<a href="http://example.com/mush" fruit="peach">http://example.com/mush</a>',
+                '/mush',
+                '',
+                ['fruit' => 'peach'],
+            ],
+            'subpage06' => [
+                '<a href="http://example.com/mush" fruit="peach">Bananas</a>',
+                '/mush',
+                'Bananas',
+                ['fruit' => 'peach'],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider anchorSubpagePatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = '')
+    {
+        $this->config->indexPage = '';
+        $request                 = Services::request($this->config);
+        $request->uri            = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
+    }
+
+    public function anchorExamplePatterns()
+    {
+        return [
+            'egpage01' => [
+                '<a href="http://example.com/index.php/news/local/123" title="News title">My News</a>',
+                'news/local/123',
+                'My News',
+                'title="News title"',
+            ],
+            'egpage02' => [
+                '<a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>',
+                'news/local/123',
+                'My News',
+                ['title' => 'The best news!'],
+            ],
+            'egpage03' => [
+                '<a href="http://example.com/index.php">Click here</a>',
+                '',
+                'Click here',
+            ],
+            'egpage04' => [
+                '<a href="http://example.com/index.php">Click here</a>',
+                '/',
+                'Click here',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider anchorExamplePatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = '')
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
+    }
+
+    // Test anchor_popup
+
+    public function anchorPopupPatterns()
+    {
+        return [
+            'normal01' => [
+                '<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">http://example.com/index.php</a>',
+                '',
+            ],
+            'normal02' => [
+                '<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">Bananas</a>',
+                '/',
+                'Bananas',
+            ],
+            'normal07' => [
+                '<a href="http://example.com/index.php" onclick="window.open(\'http://example.com/index.php\', \'_blank\'); return false;">http://example.com/index.php</a>',
+                '/',
+            ],
+            'normal08' => [
+                '<a href="http://example.com/index.php/news/local/123" onclick="window.open(\'http://example.com/index.php/news/local/123\', \'_blank\', \'width=800,height=600,scrollbars=yes,menubar=no,status=yes,resizable=yes,screenx=0,screeny=0\'); return false;">Click Me!</a>',
+                'news/local/123',
+                'Click Me!',
+                [
+                    'width'       => 800,
+                    'height'      => 600,
+                    'scrollbars'  => 'yes',
+                    'status'      => 'yes',
+                    'resizable'   => 'yes',
+                    'screenx'     => 0,
+                    'screeny'     => 0,
+                    'window_name' => '_blank',
+                ],
+            ],
+            'normal09' => [
+                '<a href="http://example.com/index.php/news/local/123" onclick="window.open(\'http://example.com/index.php/news/local/123\', \'_blank\', \'width=800,height=600,scrollbars=yes,menubar=no,status=yes,resizable=yes,screenx=0,screeny=0\'); return false;">Click Me!</a>',
+                'news/local/123',
+                'Click Me!',
+                [],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider anchorPopupPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false)
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+        $this->assertSame($expected, anchor_popup($uri, $title, $attributes, $this->config));
+    }
+
+    // Test mailto
+
+    public function mailtoPatterns()
+    {
+        return [
+            'page01' => [
+                '<a href="mailto:me@my-site.com">Click Here to Contact Me</a>',
+                'me@my-site.com',
+                'Click Here to Contact Me',
+            ],
+            'page02' => [
+                '<a href="mailto:me@my-site.com" title="Mail me">Contact Me</a>',
+                'me@my-site.com',
+                'Contact Me',
+                ['title' => 'Mail me'],
+            ],
+            'page03' => [
+                '<a href="mailto:me@my-site.com">me@my-site.com</a>',
+                'me@my-site.com',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider mailtoPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $email
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testMailto($expected = '', $email = '', $title = '', $attributes = '')
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame($expected, mailto($email, $title, $attributes));
+    }
+
+    // Test safe_mailto
+
+    public function safeMailtoPatterns()
+    {
+        return [
+            'page01' => [
+                "<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '|32';l[15] = '|111';l[16] = '|116';l[17] = '|32';l[18] = '|101';l[19] = '|114';l[20] = '|101';l[21] = '|72';l[22] = '|32';l[23] = '|107';l[24] = '|99';l[25] = '|105';l[26] = '|108';l[27] = '|67';l[28] = '>';l[29] = '\"';l[30] = '|109';l[31] = '|111';l[32] = '|99';l[33] = '|46';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|115';l[38] = '|45';l[39] = '|121';l[40] = '|109';l[41] = '|64';l[42] = '|101';l[43] = '|109';l[44] = ':';l[45] = 'o';l[46] = 't';l[47] = 'l';l[48] = 'i';l[49] = 'a';l[50] = 'm';l[51] = '\"';l[52] = '=';l[53] = 'f';l[54] = 'e';l[55] = 'r';l[56] = 'h';l[57] = ' ';l[58] = 'a';l[59] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+                'me@my-site.com',
+                'Click Here to Contact Me',
+            ],
+            'page02' => [
+                "<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|101';l[5] = '|77';l[6] = '|32';l[7] = '|116';l[8] = '|99';l[9] = '|97';l[10] = '|116';l[11] = '|110';l[12] = '|111';l[13] = '|67';l[14] = '>';l[15] = '\"';l[16] = '|101';l[17] = '|109';l[18] = '|32';l[19] = '|108';l[20] = '|105';l[21] = '|97';l[22] = '|77';l[23] = ' title=\"';l[24] = '\"';l[25] = '|109';l[26] = '|111';l[27] = '|99';l[28] = '|46';l[29] = '|101';l[30] = '|116';l[31] = '|105';l[32] = '|115';l[33] = '|45';l[34] = '|121';l[35] = '|109';l[36] = '|64';l[37] = '|101';l[38] = '|109';l[39] = ':';l[40] = 'o';l[41] = 't';l[42] = 'l';l[43] = 'i';l[44] = 'a';l[45] = 'm';l[46] = '\"';l[47] = '=';l[48] = 'f';l[49] = 'e';l[50] = 'r';l[51] = 'h';l[52] = ' ';l[53] = 'a';l[54] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+                'me@my-site.com',
+                'Contact Me',
+                ['title' => 'Mail me'],
+            ],
+            'page03' => [
+                "<script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|101';l[9] = '|116';l[10] = '|105';l[11] = '|115';l[12] = '|45';l[13] = '|121';l[14] = '|109';l[15] = '|64';l[16] = '|101';l[17] = '|109';l[18] = '>';l[19] = '\"';l[20] = '|109';l[21] = '|111';l[22] = '|99';l[23] = '|46';l[24] = '|101';l[25] = '|116';l[26] = '|105';l[27] = '|115';l[28] = '|45';l[29] = '|121';l[30] = '|109';l[31] = '|64';l[32] = '|101';l[33] = '|109';l[34] = ':';l[35] = 'o';l[36] = 't';l[37] = 'l';l[38] = 'i';l[39] = 'a';l[40] = 'm';l[41] = '\"';l[42] = '=';l[43] = 'f';l[44] = 'e';l[45] = 'r';l[46] = 'h';l[47] = ' ';l[48] = 'a';l[49] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+                'me@my-site.com',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider safeMailtoPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $email
+     * @param mixed $title
+     * @param mixed $attributes
+     */
+    public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = '')
+    {
+        $request      = Services::request($this->config);
+        $request->uri = new URI('http://example.com/');
+
+        Services::injectMock('request', $request);
+
+        $this->assertSame($expected, safe_mailto($email, $title, $attributes));
+    }
+
+    // Test auto_link
+
+    public function autolinkUrls()
+    {
+        return [
+            'test01' => [
+                'www.codeigniter.com test',
+                '<a href="http://www.codeigniter.com">www.codeigniter.com</a> test',
+            ],
+            'test02' => [
+                'This is my noreply@codeigniter.com test',
+                'This is my noreply@codeigniter.com test',
+            ],
+            'test03' => [
+                '<br />www.google.com',
+                '<br /><a href="http://www.google.com">www.google.com</a>',
+            ],
+            'test04' => [
+                'Download CodeIgniter at www.codeigniter.com. Period test.',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>. Period test.',
+            ],
+            'test05' => [
+                'Download CodeIgniter at www.codeigniter.com, comma test',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>, comma test',
+            ],
+            'test06' => [
+                'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+                'This one: <a href="://codeigniter.com">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com">http://codeigniter.com</a>',
+            ],
+            'test07' => [
+                'Visit example.com or email foo@bar.com',
+                'Visit example.com or email foo@bar.com',
+            ],
+            'test08' => [
+                'Visit www.example.com or email foo@bar.com',
+                'Visit <a href="http://www.example.com">www.example.com</a> or email foo@bar.com',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider autolinkUrls
+     *
+     * @param mixed $in
+     * @param mixed $out
+     */
+    public function testAutoLinkUrl($in, $out)
+    {
+        $this->assertSame($out, auto_link($in, 'url'));
+    }
+
+    public function autolinkEmails()
+    {
+        return [
+            'test01' => [
+                'www.codeigniter.com test',
+                'www.codeigniter.com test',
+            ],
+            'test02' => [
+                'This is my noreply@codeigniter.com test',
+                "This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test",
+            ],
+            'test03' => [
+                '<br />www.google.com',
+                '<br />www.google.com',
+            ],
+            'test04' => [
+                'Download CodeIgniter at www.codeigniter.com. Period test.',
+                'Download CodeIgniter at www.codeigniter.com. Period test.',
+            ],
+            'test05' => [
+                'Download CodeIgniter at www.codeigniter.com, comma test',
+                'Download CodeIgniter at www.codeigniter.com, comma test',
+            ],
+            'test06' => [
+                'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+                'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+            ],
+            'test07' => [
+                'Visit example.com or email foo@bar.com',
+                "Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+            ],
+            'test08' => [
+                'Visit www.example.com or email foo@bar.com',
+                "Visit www.example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider autolinkEmails
+     *
+     * @param mixed $in
+     * @param mixed $out
+     */
+    public function testAutoLinkEmail($in, $out)
+    {
+        $this->assertSame($out, auto_link($in, 'email'));
+    }
+
+    public function autolinkBoth()
+    {
+        return [
+            'test01' => [
+                'www.codeigniter.com test',
+                '<a href="http://www.codeigniter.com">www.codeigniter.com</a> test',
+            ],
+            'test02' => [
+                'This is my noreply@codeigniter.com test',
+                "This is my <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|101';l[10] = '|116';l[11] = '|105';l[12] = '|110';l[13] = '|103';l[14] = '|105';l[15] = '|101';l[16] = '|100';l[17] = '|111';l[18] = '|99';l[19] = '|64';l[20] = '|121';l[21] = '|108';l[22] = '|112';l[23] = '|101';l[24] = '|114';l[25] = '|111';l[26] = '|110';l[27] = '>';l[28] = '\"';l[29] = '|109';l[30] = '|111';l[31] = '|99';l[32] = '|46';l[33] = '|114';l[34] = '|101';l[35] = '|116';l[36] = '|105';l[37] = '|110';l[38] = '|103';l[39] = '|105';l[40] = '|101';l[41] = '|100';l[42] = '|111';l[43] = '|99';l[44] = '|64';l[45] = '|121';l[46] = '|108';l[47] = '|112';l[48] = '|101';l[49] = '|114';l[50] = '|111';l[51] = '|110';l[52] = ':';l[53] = 'o';l[54] = 't';l[55] = 'l';l[56] = 'i';l[57] = 'a';l[58] = 'm';l[59] = '\"';l[60] = '=';l[61] = 'f';l[62] = 'e';l[63] = 'r';l[64] = 'h';l[65] = ' ';l[66] = 'a';l[67] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script> test",
+            ],
+            'test03' => [
+                '<br />www.google.com',
+                '<br /><a href="http://www.google.com">www.google.com</a>',
+            ],
+            'test04' => [
+                'Download CodeIgniter at www.codeigniter.com. Period test.',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>. Period test.',
+            ],
+            'test05' => [
+                'Download CodeIgniter at www.codeigniter.com, comma test',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com">www.codeigniter.com</a>, comma test',
+            ],
+            'test06' => [
+                'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+                'This one: <a href="://codeigniter.com">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com">http://codeigniter.com</a>',
+            ],
+            'test07' => [
+                'Visit example.com or email foo@bar.com',
+                "Visit example.com or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+            ],
+            'test08' => [
+                'Visit www.example.com or email foo@bar.com',
+                "Visit <a href=\"http://www.example.com\">www.example.com</a> or email <script type=\"text/javascript\">var l=new Array();l[0] = '>';l[1] = 'a';l[2] = '/';l[3] = '<';l[4] = '|109';l[5] = '|111';l[6] = '|99';l[7] = '|46';l[8] = '|114';l[9] = '|97';l[10] = '|98';l[11] = '|64';l[12] = '|111';l[13] = '|111';l[14] = '|102';l[15] = '>';l[16] = '\"';l[17] = '|109';l[18] = '|111';l[19] = '|99';l[20] = '|46';l[21] = '|114';l[22] = '|97';l[23] = '|98';l[24] = '|64';l[25] = '|111';l[26] = '|111';l[27] = '|102';l[28] = ':';l[29] = 'o';l[30] = 't';l[31] = 'l';l[32] = 'i';l[33] = 'a';l[34] = 'm';l[35] = '\"';l[36] = '=';l[37] = 'f';l[38] = 'e';l[39] = 'r';l[40] = 'h';l[41] = ' ';l[42] = 'a';l[43] = '<';for (var i = l.length-1; i >= 0; i=i-1) {if (l[i].substring(0, 1) === '|') document.write(\"&#\"+unescape(l[i].substring(1))+\";\");else document.write(unescape(l[i]));}</script>",
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider autolinkBoth
+     *
+     * @param mixed $in
+     * @param mixed $out
+     */
+    public function testAutolinkBoth($in, $out)
+    {
+        $this->assertSame($out, auto_link($in));
+    }
+
+    public function autolinkPopup()
+    {
+        return [
+            'test01' => [
+                'www.codeigniter.com test',
+                '<a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a> test',
+            ],
+            'test02' => [
+                'This is my noreply@codeigniter.com test',
+                'This is my noreply@codeigniter.com test',
+            ],
+            'test03' => [
+                '<br />www.google.com',
+                '<br /><a href="http://www.google.com" target="_blank">www.google.com</a>',
+            ],
+            'test04' => [
+                'Download CodeIgniter at www.codeigniter.com. Period test.',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a>. Period test.',
+            ],
+            'test05' => [
+                'Download CodeIgniter at www.codeigniter.com, comma test',
+                'Download CodeIgniter at <a href="http://www.codeigniter.com" target="_blank">www.codeigniter.com</a>, comma test',
+            ],
+            'test06' => [
+                'This one: ://codeigniter.com must not break this one: http://codeigniter.com',
+                'This one: <a href="://codeigniter.com" target="_blank">://codeigniter.com</a> must not break this one: <a href="http://codeigniter.com" target="_blank">http://codeigniter.com</a>',
+            ],
+            'test07' => [
+                'Visit example.com or email foo@bar.com',
+                'Visit example.com or email foo@bar.com',
+            ],
+            'test08' => [
+                'Visit www.example.com or email foo@bar.com',
+                'Visit <a href="http://www.example.com" target="_blank">www.example.com</a> or email foo@bar.com',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider autolinkPopup
+     *
+     * @param mixed $in
+     * @param mixed $out
+     */
+    public function testAutoLinkPopup($in, $out)
+    {
+        $this->assertSame($out, auto_link($in, 'url', true));
+    }
+
+    // Test prep_url
+
+    public function prepUrlProvider()
+    {
+        // input, expected, secure
+        return [
+            [
+                '',
+                '',
+                false,
+            ],
+            [
+                '//',
+                '',
+                false,
+            ],
+            [
+                '//codeigniter.com',
+                'http://codeigniter.com',
+                false,
+            ],
+            [
+                'codeigniter.com',
+                'http://codeigniter.com',
+                false,
+            ],
+            [
+                'www.codeigniter.com',
+                'http://www.codeigniter.com',
+                false,
+            ],
+            [
+                'http://www.codeigniter.com',
+                'http://www.codeigniter.com',
+                false,
+            ],
+            [
+                'https://www.codeigniter.com',
+                'https://www.codeigniter.com',
+                false,
+            ],
+            [
+                '',
+                '',
+                true,
+            ],
+            [
+                '//',
+                '',
+                true,
+            ],
+            [
+                '//codeigniter.com',
+                'https://codeigniter.com',
+                true,
+            ],
+            [
+                'codeigniter.com',
+                'https://codeigniter.com',
+                true,
+            ],
+            [
+                'www.codeigniter.com',
+                'https://www.codeigniter.com',
+                true,
+            ],
+            [
+                'http://www.codeigniter.com',
+                'https://www.codeigniter.com',
+                true,
+            ],
+            [
+                'https://www.codeigniter.com',
+                'https://www.codeigniter.com',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider prepUrlProvider
+     */
+    public function testPrepUrl(string $input, string $expected, bool $secure)
+    {
+        $this->assertSame($expected, prep_url($input, $secure));
+    }
+
+    // Test url_title
+
+    public function testUrlTitle()
+    {
+        $words = [
+            'foo bar /'       => 'foo-bar',
+            '\  testing 12'   => 'testing-12',
+            'Éléphant de PHP' => 'éléphant-de-php',
+        ];
+
+        foreach ($words as $in => $out) {
+            $this->assertSame($out, url_title($in, '-', true));
+        }
+    }
+
+    public function testUrlTitleExtraDashes()
+    {
+        $words = [
+            '_foo bar_'                 => 'foo_bar',
+            '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS',
+            'Éléphant de PHP'           => 'Éléphant_de_PHP',
+        ];
+
+        foreach ($words as $in => $out) {
+            $this->assertSame($out, url_title($in, '_'));
+        }
+    }
+
+    // Test mb_url_title
+
+    public function testMbUrlTitle()
+    {
+        $words = [
+            'foo bar /'       => 'foo-bar',
+            '\  testing 12'   => 'testing-12',
+            'Éléphant de PHP' => 'elephant-de-php',
+            'ä ö ü Ĝ β ę'     => 'ae-oe-ue-g-v-e',
+        ];
+
+        foreach ($words as $in => $out) {
+            $this->assertSame($out, mb_url_title($in, '-', true));
+        }
+    }
+
+    public function testMbUrlTitleExtraDashes()
+    {
+        $words = [
+            '_foo bar_'                 => 'foo_bar',
+            '_What\'s wrong with CSS?_' => 'Whats_wrong_with_CSS',
+            'Éléphant de PHP'           => 'Elephant_de_PHP',
+            'ä ö ü Ĝ β ę'               => 'ae_oe_ue_G_v_e',
+        ];
+
+        foreach ($words as $in => $out) {
+            $this->assertSame($out, mb_url_title($in, '_'));
+        }
+    }
+
+    /**
+     * @dataProvider urlToProvider
+     */
+    public function testUrlTo(string $expected, string $input, ...$args)
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $routes = service('routes');
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'gotoPage']);
+        $routes->add('route/(:any)/to/(:num)', 'myOtherController::goto/$1/$2');
+
+        $this->assertSame($expected, url_to($input, ...$args));
+    }
+
+    /**
+     * @dataProvider urlToMissingRoutesProvider
+     */
+    public function testUrlToThrowsOnEmptyOrMissingRoute(string $route)
+    {
+        $this->expectException(RouterException::class);
+
+        url_to($route);
+    }
+
+    public function urlToProvider()
+    {
+        $page = config('App')->indexPage !== '' ? config('App')->indexPage . '/' : '';
+
+        return [
+            [
+                "http://example.com/{$page}path/string/to/13",
+                'gotoPage',
+                'string',
+                13,
+            ],
+            [
+                "http://example.com/{$page}route/string/to/13",
+                'myOtherController::goto',
+                'string',
+                13,
+            ],
+        ];
+    }
+
+    public function urlToMissingRoutesProvider()
+    {
+        return [
+            [
+                '',
+            ],
+            [
+                'Nope::doesNotExist',
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index e98f5b86bd13..cd9c0f816646 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -1,11 +1,19 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
@@ -15,257 +23,255 @@
  * simultaneously.
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class SiteUrlTest extends CIUnitTestCase
 {
-	/**
-	 * @var App
-	 */
-	private $config;
-
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
+    /**
+     * @var App
+     */
+    private $config;
 
-		helper('url');
-	}
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
 
-	protected function setUp(): void
-	{
-		parent::setUp();
+        helper('url');
+    }
 
-		Services::reset(true);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$this->config = new App();
-		Factories::injectMock('config', 'App', $this->config);
-	}
+        Services::reset(true);
 
-	public function tearDown(): void
-	{
-		parent::tearDown();
+        $this->config = new App();
+        Factories::injectMock('config', 'App', $this->config);
+    }
 
-		$_SERVER = [];
-	}
+    protected function tearDown(): void
+    {
+        parent::tearDown();
 
-	//--------------------------------------------------------------------
+        $_SERVER = [];
+    }
 
-	/**
-	 * Takes a multitude of various config input and verifies
-	 * that base_url() and site_url() return the expected result.
-	 *
-	 * @param string      $baseURL
-	 * @param string      $indexPage
-	 * @param string|null $scheme
-	 * @param boolean     $secure
-	 * @param string      $path
-	 * @param string      $expectedSiteUrl
-	 *
-	 * @dataProvider configProvider
-	 */
-	public function testUrls($baseURL, $indexPage, $scheme, $secure, $path, $expectedSiteUrl)
-	{
-		// Set the config
-		$this->config->baseURL                   = $baseURL;
-		$this->config->indexPage                 = $indexPage;
-		$this->config->forceGlobalSecureRequests = $secure;
+    /**
+     * Takes a multitude of various config input and verifies
+     * that base_url() and site_url() return the expected result.
+     *
+     * @param string      $baseURL
+     * @param string      $indexPage
+     * @param string|null $scheme
+     * @param bool        $secure
+     * @param string      $path
+     * @param string      $expectedSiteUrl
+     *
+     * @dataProvider configProvider
+     */
+    public function testUrls($baseURL, $indexPage, $scheme, $secure, $path, $expectedSiteUrl)
+    {
+        // Set the config
+        $this->config->baseURL                   = $baseURL;
+        $this->config->indexPage                 = $indexPage;
+        $this->config->forceGlobalSecureRequests = $secure;
 
-		$this->assertEquals($expectedSiteUrl, site_url($path, $scheme, $this->config));
+        $this->assertSame($expectedSiteUrl, site_url($path, $scheme, $this->config));
 
-		// base_url is always the trimmed site_url without index page
-		$expectedBaseUrl = $indexPage === '' ? $expectedSiteUrl : str_replace('/' . $indexPage, '', $expectedSiteUrl);
-		$expectedBaseUrl = rtrim($expectedBaseUrl, '/');
-		$this->assertEquals($expectedBaseUrl, base_url($path, $scheme));
-	}
+        // base_url is always the trimmed site_url without index page
+        $expectedBaseUrl = $indexPage === '' ? $expectedSiteUrl : str_replace('/' . $indexPage, '', $expectedSiteUrl);
+        $expectedBaseUrl = rtrim($expectedBaseUrl, '/');
+        $this->assertSame($expectedBaseUrl, base_url($path, $scheme));
+    }
 
-	public function configProvider()
-	{
-		// baseURL, indexPage, scheme, path, expectedSiteUrl
-		return [
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'',
-				'http://example.com/index.php',
-			],
-			[
-				'http://example.com',
-				'index.php',
-				null,
-				false,
-				'',
-				'http://example.com/index.php',
-			],
-			[
-				'http://example.com/',
-				'',
-				null,
-				false,
-				'',
-				'http://example.com/',
-			],
-			[
-				'http://example.com/',
-				'banana.php',
-				null,
-				false,
-				'',
-				'http://example.com/banana.php',
-			],
-			[
-				'http://example.com/',
-				'',
-				null,
-				false,
-				'abc',
-				'http://example.com/abc',
-			],
-			[
-				'http://example.com/public/',
-				'index.php',
-				null,
-				false,
-				'',
-				'http://example.com/public/index.php',
-			],
-			[
-				'http://example.com/public/',
-				'',
-				null,
-				false,
-				'',
-				'http://example.com/public/',
-			],
-			[
-				'http://example.com/public',
-				'',
-				null,
-				false,
-				'',
-				'http://example.com/public/',
-			],
-			[
-				'http://example.com/public',
-				'index.php',
-				null,
-				false,
-				'/',
-				'http://example.com/public/index.php/',
-			],
-			[
-				'http://example.com/public/',
-				'index.php',
-				null,
-				false,
-				'/',
-				'http://example.com/public/index.php/',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'foo',
-				'http://example.com/index.php/foo',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'0',
-				'http://example.com/index.php/0',
-			],
-			[
-				'http://example.com/public',
-				'index.php',
-				null,
-				false,
-				'foo',
-				'http://example.com/public/index.php/foo',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'foo?bar=bam',
-				'http://example.com/index.php/foo?bar=bam',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'test#banana',
-				'http://example.com/index.php/test#banana',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				'ftp',
-				false,
-				'foo',
-				'ftp://example.com/index.php/foo',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				'news/local/123',
-				'http://example.com/index.php/news/local/123',
-			],
-			[
-				'http://example.com/',
-				'index.php',
-				null,
-				false,
-				['news', 'local', '123'],
-				'http://example.com/index.php/news/local/123',
-			],
-		];
-	}
+    public function configProvider()
+    {
+        // baseURL, indexPage, scheme, path, expectedSiteUrl
+        return [
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                '',
+                'http://example.com/index.php',
+            ],
+            [
+                'http://example.com',
+                'index.php',
+                null,
+                false,
+                '',
+                'http://example.com/index.php',
+            ],
+            [
+                'http://example.com/',
+                '',
+                null,
+                false,
+                '',
+                'http://example.com/',
+            ],
+            [
+                'http://example.com/',
+                'banana.php',
+                null,
+                false,
+                '',
+                'http://example.com/banana.php',
+            ],
+            [
+                'http://example.com/',
+                '',
+                null,
+                false,
+                'abc',
+                'http://example.com/abc',
+            ],
+            [
+                'http://example.com/public/',
+                'index.php',
+                null,
+                false,
+                '',
+                'http://example.com/public/index.php',
+            ],
+            [
+                'http://example.com/public/',
+                '',
+                null,
+                false,
+                '',
+                'http://example.com/public/',
+            ],
+            [
+                'http://example.com/public',
+                '',
+                null,
+                false,
+                '',
+                'http://example.com/public/',
+            ],
+            [
+                'http://example.com/public',
+                'index.php',
+                null,
+                false,
+                '/',
+                'http://example.com/public/index.php/',
+            ],
+            [
+                'http://example.com/public/',
+                'index.php',
+                null,
+                false,
+                '/',
+                'http://example.com/public/index.php/',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                'foo',
+                'http://example.com/index.php/foo',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                '0',
+                'http://example.com/index.php/0',
+            ],
+            [
+                'http://example.com/public',
+                'index.php',
+                null,
+                false,
+                'foo',
+                'http://example.com/public/index.php/foo',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                'foo?bar=bam',
+                'http://example.com/index.php/foo?bar=bam',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                'test#banana',
+                'http://example.com/index.php/test#banana',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                'ftp',
+                false,
+                'foo',
+                'ftp://example.com/index.php/foo',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                'news/local/123',
+                'http://example.com/index.php/news/local/123',
+            ],
+            [
+                'http://example.com/',
+                'index.php',
+                null,
+                false,
+                ['news', 'local', '123'],
+                'http://example.com/index.php/news/local/123',
+            ],
+        ];
+    }
 
-	//--------------------------------------------------------------------
-	// base_url
-	//--------------------------------------------------------------------
+    // base_url
 
-	/**
-	 * These tests are only really relevant to show that base_url()
-	 * has no interaction with the current request URI.
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/240
-	 */
-	public function testBaseURLDiscovery()
-	{
-		$this->config->baseURL = 'http://example.com/';
+    /**
+     * These tests are only really relevant to show that base_url()
+     * has no interaction with the current request URI.
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/240
+     */
+    public function testBaseURLDiscovery()
+    {
+        $this->config->baseURL = 'http://example.com/';
 
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/test';
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/test';
 
-		$this->assertEquals('http://example.com', base_url());
+        $this->assertSame('http://example.com', base_url());
 
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/test/page';
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/test/page';
 
-		$this->assertEquals('http://example.com', base_url());
-		$this->assertEquals('http://example.com/profile', base_url('profile'));
-	}
+        $this->assertSame('http://example.com', base_url());
+        $this->assertSame('http://example.com/profile', base_url('profile'));
+    }
 
-	public function testBaseURLService()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/ci/v4/x/y';
+    public function testBaseURLService()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/ci/v4/x/y';
 
-		$this->config->baseURL = 'http://example.com/ci/v4/';
-		$request               = Services::request($this->config);
-		$request->uri          = new URI('http://example.com/ci/v4/x/y');
+        $this->config->baseURL = 'http://example.com/ci/v4/';
+        $request               = Services::request($this->config);
+        $request->uri          = new URI('http://example.com/ci/v4/x/y');
 
-		Services::injectMock('request', $request);
+        Services::injectMock('request', $request);
 
-		$this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
-		$this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $this->config));
-	}
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
+        $this->assertSame('http://example.com/ci/v4/controller/method', base_url('controller/method', null));
+    }
 }
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index 2d6584f9add9..539383286146 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -1,34 +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\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class XMLHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class XMLHelperTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('xml');
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testConvert()
-	{
-		$original = '<p>Here is a so-so paragraph & an entity (&#123;).</p>';
-		$expected = '&lt;p&gt;Here is a so&#45;so paragraph &amp; an entity (&#123;).&lt;/p&gt;';
-		$this->assertEquals($expected, xml_convert($original));
-	}
-
-	// --------------------------------------------------------------------
-	public function testConvertProtected()
-	{
-		$original = '<p>Here is a so&so; paragraph & an entity (&#123;).</p>';
-		$expected = '&lt;p&gt;Here is a so&so; paragraph &amp; an entity (&#123;).&lt;/p&gt;';
-		$this->assertEquals($expected, xml_convert($original, true));
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('xml');
+    }
+
+    public function testConvert()
+    {
+        $original = '<p>Here is a so-so paragraph & an entity (&#123;).</p>';
+        $expected = '&lt;p&gt;Here is a so&#45;so paragraph &amp; an entity (&#123;).&lt;/p&gt;';
+        $this->assertSame($expected, xml_convert($original));
+    }
+
+    public function testConvertProtected()
+    {
+        $original = '<p>Here is a so&so; paragraph & an entity (&#123;).</p>';
+        $expected = '&lt;p&gt;Here is a so&so; paragraph &amp; an entity (&#123;).&lt;/p&gt;';
+        $this->assertSame($expected, xml_convert($original, true));
+    }
 }
diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php
index 48c1cd836eaf..fca482d3dec8 100644
--- a/tests/system/HomeTest.php
+++ b/tests/system/HomeTest.php
@@ -1,26 +1,38 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\FeatureTestTrait;
 
-class HomeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HomeTest extends CIUnitTestCase
 {
-	use FeatureTestTrait;
+    use FeatureTestTrait;
 
-	public function testPageLoadsSuccessfully()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\App\Controllers\Home::index',
-			],
-		]);
+    public function testPageLoadsSuccessfully()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\App\Controllers\Home::index',
+            ],
+        ]);
 
-		$response = $this->get('home');
-		$this->assertInstanceOf('CodeIgniter\Test\TestResponse', $response);
-		$this->assertTrue($response->isOK());
-	}
+        $response = $this->get('home');
+        $this->assertInstanceOf('CodeIgniter\Test\TestResponse', $response);
+        $this->assertTrue($response->isOK());
+    }
 }
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 67204460b6f5..e7f6893b9cf9 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Honeypot;
 
 use CodeIgniter\Config\Services;
@@ -9,155 +18,144 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class HoneypotTest extends CIUnitTestCase
+final class HoneypotTest extends CIUnitTestCase
 {
-
-	protected $config;
-	protected $honeypot;
-	protected $request;
-	protected $response;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->config   = new \Config\Honeypot();
-		$this->honeypot = new Honeypot($this->config);
-
-		unset($_POST[$this->config->name]);
-		$_SERVER['REQUEST_METHOD']  = 'POST';
-		$_POST[$this->config->name] = 'hey';
-		$this->request              = Services::request(null, false);
-		$this->response             = Services::response();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAttachHoneypot()
-	{
-		$this->response->setBody('<form></form>');
-
-		$this->honeypot->attachHoneypot($this->response);
-		$this->assertStringContainsString($this->config->name, $this->response->getBody());
-
-		$this->response->setBody('<div></div>');
-		$this->assertStringNotContainsString($this->config->name, $this->response->getBody());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAttachHoneypotAndContainer()
-	{
-		$this->response->setBody('<form></form>');
-		$this->honeypot->attachHoneypot($this->response);
-		$expected = '<form><div style="display:none"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
-		$this->assertEquals($expected, $this->response->getBody());
-
-		$this->config->container = '<div class="hidden">{template}</div>';
-		$this->response->setBody('<form></form>');
-		$this->honeypot->attachHoneypot($this->response);
-		$expected = '<form><div class="hidden"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
-		$this->assertEquals($expected, $this->response->getBody());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasntContent()
-	{
-		unset($_POST[$this->config->name]);
-		$this->request = Services::request();
-
-		$this->assertEquals(false, $this->honeypot->hasContent($this->request));
-	}
-
-	public function testHasContent()
-	{
-		$this->assertEquals(true, $this->honeypot->hasContent($this->request));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConfigHidden()
-	{
-		$this->config->hidden = '';
-		$this->expectException(HoneypotException::class);
-		$this->honeypot = new Honeypot($this->config);
-	}
-
-	public function testConfigTemplate()
-	{
-		$this->config->template = '';
-		$this->expectException(HoneypotException::class);
-		$this->honeypot = new Honeypot($this->config);
-	}
-
-	public function testConfigName()
-	{
-		$this->config->name = '';
-		$this->expectException(HoneypotException::class);
-		$this->honeypot = new Honeypot($this->config);
-	}
-
-	//--------------------------------------------------------------------
-	public function testHoneypotFilterBefore()
-	{
-		$config = [
-			'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
-			'globals' => [
-				'before' => ['trap'],
-				'after'  => [],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$this->expectException(HoneypotException::class);
-		$request = $filters->run($uri, 'before');
-	}
-
-	public function testHoneypotFilterAfter()
-	{
-		$config = [
-			'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
-			'globals' => [
-				'before' => [],
-				'after'  => ['trap'],
-			],
-		];
-
-		$filters = new Filters((object) $config, $this->request, $this->response);
-		$uri     = 'admin/foo/bar';
-
-		$this->response->setBody('<form></form>');
-		$this->response = $filters->run($uri, 'after');
-		$this->assertStringContainsString($this->config->name, $this->response->getBody());
-	}
-
-	public function testEmptyConfigContainer()
-	{
-		$config            = new \Config\Honeypot();
-		$config->container = '';
-		$honeypot          = new Honeypot($config);
-
-		$this->assertEquals(
-			'<div style="display:none">{template}</div>',
-			$this->getPrivateProperty($honeypot, 'config')->container
-		);
-	}
-
-	public function testNoTemplateConfigContainer()
-	{
-		$config            = new \Config\Honeypot();
-		$config->container = '<div></div>';
-		$honeypot          = new Honeypot($config);
-
-		$this->assertEquals(
-			'<div style="display:none">{template}</div>',
-			$this->getPrivateProperty($honeypot, 'config')->container
-		);
-	}
-
+    protected $config;
+    protected $honeypot;
+    protected $request;
+    protected $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->config   = new \Config\Honeypot();
+        $this->honeypot = new Honeypot($this->config);
+
+        unset($_POST[$this->config->name]);
+        $_SERVER['REQUEST_METHOD']  = 'POST';
+        $_POST[$this->config->name] = 'hey';
+        $this->request              = Services::request(null, false);
+        $this->response             = Services::response();
+    }
+
+    public function testAttachHoneypot()
+    {
+        $this->response->setBody('<form></form>');
+
+        $this->honeypot->attachHoneypot($this->response);
+        $this->assertStringContainsString($this->config->name, $this->response->getBody());
+
+        $this->response->setBody('<div></div>');
+        $this->assertStringNotContainsString($this->config->name, $this->response->getBody());
+    }
+
+    public function testAttachHoneypotAndContainer()
+    {
+        $this->response->setBody('<form></form>');
+        $this->honeypot->attachHoneypot($this->response);
+        $expected = '<form><div style="display:none"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
+        $this->assertSame($expected, $this->response->getBody());
+
+        $this->config->container = '<div class="hidden">{template}</div>';
+        $this->response->setBody('<form></form>');
+        $this->honeypot->attachHoneypot($this->response);
+        $expected = '<form><div class="hidden"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
+        $this->assertSame($expected, $this->response->getBody());
+    }
+
+    public function testHasntContent()
+    {
+        unset($_POST[$this->config->name]);
+        $this->request = Services::request();
+
+        $this->assertFalse($this->honeypot->hasContent($this->request));
+    }
+
+    public function testHasContent()
+    {
+        $this->assertTrue($this->honeypot->hasContent($this->request));
+    }
+
+    public function testConfigHidden()
+    {
+        $this->config->hidden = '';
+        $this->expectException(HoneypotException::class);
+        $this->honeypot = new Honeypot($this->config);
+    }
+
+    public function testConfigTemplate()
+    {
+        $this->config->template = '';
+        $this->expectException(HoneypotException::class);
+        $this->honeypot = new Honeypot($this->config);
+    }
+
+    public function testConfigName()
+    {
+        $this->config->name = '';
+        $this->expectException(HoneypotException::class);
+        $this->honeypot = new Honeypot($this->config);
+    }
+
+    public function testHoneypotFilterBefore()
+    {
+        $config = [
+            'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
+            'globals' => [
+                'before' => ['trap'],
+                'after'  => [],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $this->expectException(HoneypotException::class);
+        $request = $filters->run($uri, 'before');
+    }
+
+    public function testHoneypotFilterAfter()
+    {
+        $config = [
+            'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
+            'globals' => [
+                'before' => [],
+                'after'  => ['trap'],
+            ],
+        ];
+
+        $filters = new Filters((object) $config, $this->request, $this->response);
+        $uri     = 'admin/foo/bar';
+
+        $this->response->setBody('<form></form>');
+        $this->response = $filters->run($uri, 'after');
+        $this->assertStringContainsString($this->config->name, $this->response->getBody());
+    }
+
+    public function testEmptyConfigContainer()
+    {
+        $config            = new \Config\Honeypot();
+        $config->container = '';
+        $honeypot          = new Honeypot($config);
+
+        $this->assertSame(
+            '<div style="display:none">{template}</div>',
+            $this->getPrivateProperty($honeypot, 'config')->container
+        );
+    }
+
+    public function testNoTemplateConfigContainer()
+    {
+        $config            = new \Config\Honeypot();
+        $config->container = '<div></div>';
+        $honeypot          = new Honeypot($config);
+
+        $this->assertSame(
+            '<div style="display:none">{template}</div>',
+            $this->getPrivateProperty($honeypot, 'config')->container
+        );
+    }
 }
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index 4b208e8119c7..0e73b13341d8 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -1,247 +1,258 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\I18n;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Locale;
 
-class TimeDifferenceTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TimeDifferenceTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('date');
-		Locale::setDefault('America/Chicago');
-	}
-
-	public function testDifferenceBasics()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$test    = Time::parse('March 10, 2010', 'America/Chicago');
-
-		$diff = $current->getTimestamp() - $test->getTimestamp();
-
-		$obj = $current->difference($test);
-
-		$this->assertEquals(-7, $obj->getYears());
-		$this->assertEquals(-84, $obj->getMonths());
-		$this->assertEquals(-365, $obj->getWeeks());
-		$this->assertEquals(-2557, $obj->getDays());
-		$this->assertEquals(-61368, $obj->getHours());
-		$this->assertEquals(-3682080, $obj->getMinutes());
-		$this->assertEquals(-220924800, $obj->getSeconds());
-
-		$this->assertEquals(-7, $obj->years);
-		$this->assertEquals(-84, $obj->months);
-		$this->assertEquals(-365, $obj->weeks);
-		$this->assertEquals(-2557, $obj->days);
-		$this->assertEquals(-61368, $obj->hours);
-		$this->assertEquals(-3682080, $obj->minutes);
-		$this->assertEquals(-220924800, $obj->seconds);
-
-		$this->assertEquals($diff / YEAR, $obj->getYears(true));
-		$this->assertEquals($diff / MONTH, $obj->getMonths(true));
-		$this->assertEquals($diff / WEEK, $obj->getWeeks(true));
-		$this->assertEquals($diff / DAY, $obj->getDays(true));
-		$this->assertEquals($diff / HOUR, $obj->getHours(true));
-		$this->assertEquals($diff / MINUTE, $obj->getMinutes(true));
-		$this->assertEquals($diff / SECOND, $obj->getSeconds(true));
-	}
-
-	public function testHumanizeYearsSingle()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-
-		$diff = $current->difference('March 9, 2016 12:00:00', 'America/Chicago');
-
-		$this->assertEquals('1 year ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeYearsPlural()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 9, 2014 12:00:00', 'America/Chicago');
-
-		$this->assertEquals('3 years ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeYearsForward()
-	{
-		$current = Time::parse('January 1, 2017', 'America/Chicago');
-		$diff    = $current->difference('January 1, 2018 12:00:00', 'America/Chicago');
-
-		$this->assertEquals('in 1 year', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMonthsSingle()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('February 9, 2017', 'America/Chicago');
-
-		$this->assertEquals('1 month ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMonthsPlural()
-	{
-		$current = Time::parse('March 1, 2017', 'America/Chicago');
-		$diff    = $current->difference('January 1, 2017', 'America/Chicago');
-
-		$this->assertEquals('2 months ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMonthsForward()
-	{
-		$current = Time::parse('March 1, 2017', 'America/Chicago');
-		$diff    = $current->difference('May 1, 2017', 'America/Chicago');
-
-		$this->assertEquals('in 1 month', $diff->humanize('en'));
-	}
-
-	public function testHumanizeDaysSingle()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 9, 2017', 'America/Chicago');
-
-		$this->assertEquals('1 day ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeDaysPlural()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 8, 2017', 'America/Chicago');
-
-		$this->assertEquals('2 days ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeDaysForward()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 11, 2017', 'America/Chicago');
-
-		$this->assertEquals('in 1 day', $diff->humanize('en'));
-	}
-
-	public function testHumanizeHoursSingle()
-	{
-		$current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 11:00', 'America/Chicago');
-
-		$this->assertEquals('1 hour ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeHoursPlural()
-	{
-		$current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 10:00', 'America/Chicago');
-
-		$this->assertEquals('2 hours ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeHoursForward()
-	{
-		$current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 13:00', 'America/Chicago');
-
-		$this->assertEquals('in 1 hour', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMinutesSingle()
-	{
-		$current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 12:29', 'America/Chicago');
-
-		$this->assertEquals('1 minute ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMinutesPlural()
-	{
-		$current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 12:28', 'America/Chicago');
-
-		$this->assertEquals('2 minutes ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeMinutesForward()
-	{
-		$current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017 12:31', 'America/Chicago');
-
-		$this->assertEquals('in 1 minute', $diff->humanize('en'));
-	}
-
-	public function testHumanizeWeeksSingle()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 2, 2017', 'America/Chicago');
-
-		$this->assertEquals('1 week ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeWeeksPlural()
-	{
-		$current = Time::parse('March 30, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 15, 2017', 'America/Chicago');
-
-		$this->assertEquals('2 weeks ago', $diff->humanize('en'));
-	}
-
-	public function testHumanizeWeeksForward()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 18, 2017', 'America/Chicago');
-
-		$this->assertEquals('in 1 week', $diff->humanize('en'));
-	}
-
-	public function testHumanizeNoDifference()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 10, 2017', 'America/Chicago');
-
-		$this->assertEquals('Just now', $diff->humanize('en'));
-	}
-
-	public function testGetterUTC()
-	{
-		$current = Time::parse('March 10, 2017', 'UTC');
-		$diff    = $current->difference('March 18, 2017', 'UTC');
-
-		$this->assertEquals(8, $diff->getDays());
-		$this->assertEquals(8, $diff->days);
-		$this->assertEquals(-8, (int) round($diff->getDays(true)));
-		$this->assertNull($diff->nonsense);
-	}
-
-	public function testGetterChicagoTime()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 18, 2017', 'America/Chicago');
-
-		// Daylight Saving Time had begun since Sun, 12 Mar, 02:00.
-		$this->assertEquals(7, $diff->getDays());
-		$this->assertEquals(7, $diff->days);
-
-		// The raw value does not take Daylight Saving Time into account.
-		$this->assertEquals(-8, (int) round($diff->getDays(true)));
-		$this->assertNull($diff->nonsense);
-	}
-
-	public function testMagicIssetTrue()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 18, 2017', 'America/Chicago');
-
-		$this->assertTrue(isset($diff->days));
-		$this->assertFalse(isset($diff->nonsense));
-	}
-
-	public function testMagicIssetFalse()
-	{
-		$current = Time::parse('March 10, 2017', 'America/Chicago');
-		$diff    = $current->difference('March 18, 2017', 'America/Chicago');
-
-		$this->assertFalse(isset($diff->nonsense));
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('date');
+        Locale::setDefault('America/Chicago');
+    }
+
+    public function testDifferenceBasics()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $test    = Time::parse('March 10, 2010', 'America/Chicago');
+
+        $diff = $current->getTimestamp() - $test->getTimestamp();
+
+        $obj = $current->difference($test);
+
+        $this->assertSame(-7, $obj->getYears());
+        $this->assertSame(-84, $obj->getMonths());
+        $this->assertSame(-365, $obj->getWeeks());
+        $this->assertSame(-2557, $obj->getDays());
+        $this->assertSame(-61368, $obj->getHours());
+        $this->assertSame(-3682080, $obj->getMinutes());
+        $this->assertSame(-220924800, $obj->getSeconds());
+
+        $this->assertSame(-7, $obj->years);
+        $this->assertSame(-84, $obj->months);
+        $this->assertSame(-365, $obj->weeks);
+        $this->assertSame(-2557, $obj->days);
+        $this->assertSame(-61368, $obj->hours);
+        $this->assertSame(-3682080, $obj->minutes);
+        $this->assertSame(-220924800, $obj->seconds);
+
+        $this->assertSame($diff / YEAR, $obj->getYears(true));
+        $this->assertSame($diff / MONTH, $obj->getMonths(true));
+        $this->assertSame($diff / WEEK, $obj->getWeeks(true));
+        $this->assertSame($diff / DAY, $obj->getDays(true));
+        $this->assertSame($diff / HOUR, $obj->getHours(true));
+        $this->assertSame($diff / MINUTE, $obj->getMinutes(true));
+        $this->assertSame($diff / SECOND, $obj->getSeconds(true));
+    }
+
+    public function testHumanizeYearsSingle()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+
+        $diff = $current->difference('March 9, 2016 12:00:00', 'America/Chicago');
+
+        $this->assertSame('1 year ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeYearsPlural()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 9, 2014 12:00:00', 'America/Chicago');
+
+        $this->assertSame('3 years ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeYearsForward()
+    {
+        $current = Time::parse('January 1, 2017', 'America/Chicago');
+        $diff    = $current->difference('January 1, 2018 12:00:00', 'America/Chicago');
+
+        $this->assertSame('in 1 year', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMonthsSingle()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('February 9, 2017', 'America/Chicago');
+
+        $this->assertSame('1 month ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMonthsPlural()
+    {
+        $current = Time::parse('March 1, 2017', 'America/Chicago');
+        $diff    = $current->difference('January 1, 2017', 'America/Chicago');
+
+        $this->assertSame('2 months ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMonthsForward()
+    {
+        $current = Time::parse('March 1, 2017', 'America/Chicago');
+        $diff    = $current->difference('May 1, 2017', 'America/Chicago');
+
+        $this->assertSame('in 1 month', $diff->humanize('en'));
+    }
+
+    public function testHumanizeDaysSingle()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 9, 2017', 'America/Chicago');
+
+        $this->assertSame('1 day ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeDaysPlural()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 8, 2017', 'America/Chicago');
+
+        $this->assertSame('2 days ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeDaysForward()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 11, 2017', 'America/Chicago');
+
+        $this->assertSame('in 1 day', $diff->humanize('en'));
+    }
+
+    public function testHumanizeHoursSingle()
+    {
+        $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 11:00', 'America/Chicago');
+
+        $this->assertSame('1 hour ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeHoursPlural()
+    {
+        $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 10:00', 'America/Chicago');
+
+        $this->assertSame('2 hours ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeHoursForward()
+    {
+        $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 13:00', 'America/Chicago');
+
+        $this->assertSame('in 1 hour', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMinutesSingle()
+    {
+        $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 12:29', 'America/Chicago');
+
+        $this->assertSame('1 minute ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMinutesPlural()
+    {
+        $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 12:28', 'America/Chicago');
+
+        $this->assertSame('2 minutes ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeMinutesForward()
+    {
+        $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017 12:31', 'America/Chicago');
+
+        $this->assertSame('in 1 minute', $diff->humanize('en'));
+    }
+
+    public function testHumanizeWeeksSingle()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 2, 2017', 'America/Chicago');
+
+        $this->assertSame('1 week ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeWeeksPlural()
+    {
+        $current = Time::parse('March 30, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 15, 2017', 'America/Chicago');
+
+        $this->assertSame('2 weeks ago', $diff->humanize('en'));
+    }
+
+    public function testHumanizeWeeksForward()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 18, 2017', 'America/Chicago');
+
+        $this->assertSame('in 1 week', $diff->humanize('en'));
+    }
+
+    public function testHumanizeNoDifference()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 10, 2017', 'America/Chicago');
+
+        $this->assertSame('Just now', $diff->humanize('en'));
+    }
+
+    public function testGetterUTC()
+    {
+        $current = Time::parse('March 10, 2017', 'UTC');
+        $diff    = $current->difference('March 18, 2017', 'UTC');
+
+        $this->assertSame(8, $diff->getDays());
+        $this->assertSame(8, $diff->days);
+        $this->assertSame(-8, (int) round($diff->getDays(true)));
+        $this->assertNull($diff->nonsense);
+    }
+
+    public function testGetterChicagoTime()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 18, 2017', 'America/Chicago');
+
+        // Daylight Saving Time had begun since Sun, 12 Mar, 02:00.
+        $this->assertSame(7, $diff->getDays());
+        $this->assertSame(7, $diff->days);
+
+        // The raw value does not take Daylight Saving Time into account.
+        $this->assertSame(-8, (int) round($diff->getDays(true)));
+        $this->assertNull($diff->nonsense);
+    }
+
+    public function testMagicIssetTrue()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 18, 2017', 'America/Chicago');
+
+        $this->assertTrue(isset($diff->days));
+        $this->assertFalse(isset($diff->nonsense));
+    }
+
+    public function testMagicIssetFalse()
+    {
+        $current = Time::parse('March 10, 2017', 'America/Chicago');
+        $diff    = $current->difference('March 18, 2017', 'America/Chicago');
+
+        $this->assertFalse(isset($diff->nonsense));
+    }
 }
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 70a567eddbad..2da8e5accbf3 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\I18n;
 
 use CodeIgniter\I18n\Exceptions\I18nException;
@@ -8,1034 +18,1030 @@
 use IntlDateFormatter;
 use Locale;
 
-class TimeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TimeTest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        helper('date');
+        Locale::setDefault('America/Chicago');
+    }
+
+    public function testNewTimeNow()
+    {
+        $formatter = new IntlDateFormatter(
+            'en_US',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'America/Chicago', // Default for CodeIgniter
+            IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
+        );
+
+        $time = new Time(null, 'America/Chicago');
+
+        $this->assertSame($formatter->format($time), (string) $time);
+    }
+
+    public function testTimeWithTimezone()
+    {
+        $formatter = new IntlDateFormatter(
+            'en_US',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London', // Default for CodeIgniter
+                IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
+        );
+
+        $time = new Time('now', 'Europe/London');
+
+        $this->assertSame($formatter->format($time), (string) $time);
+    }
+
+    public function testTimeWithTimezoneAndLocale()
+    {
+        $formatter = new IntlDateFormatter(
+            'fr_FR',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London', // Default for CodeIgniter
+                IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
+        );
+
+        $time = new Time('now', 'Europe/London', 'fr_FR');
+
+        $this->assertSame($formatter->format($time), (string) $time);
+    }
+
+    public function testTimeWithDateTimeZone()
+    {
+        $formatter = new IntlDateFormatter(
+            'fr_FR',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London',
+            IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
+        );
+
+        $time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
+
+        $this->assertSame($formatter->format($time), (string) $time);
+    }
+
+    public function testToDateTime()
+    {
+        $time = new Time();
+
+        $obj = $time->toDateTime();
+
+        $this->assertInstanceOf(\DateTime::class, $obj);
+    }
+
+    public function testNow()
+    {
+        $time  = Time::now();
+        $time1 = new \DateTime();
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		helper('date');
-		Locale::setDefault('America/Chicago');
-	}
-
-	public function testNewTimeNow()
-	{
-		$formatter = new IntlDateFormatter(
-				'en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'America/Chicago', // Default for CodeIgniter
-				IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
-		);
-
-		$time = new Time(null, 'America/Chicago');
-
-		$this->assertEquals($formatter->format($time), (string) $time);
-	}
-
-	public function testTimeWithTimezone()
-	{
-		$formatter = new IntlDateFormatter(
-				'en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', // Default for CodeIgniter
-				IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
-		);
-
-		$time = new Time('now', 'Europe/London');
-
-		$this->assertEquals($formatter->format($time), (string) $time);
-	}
-
-	public function testTimeWithTimezoneAndLocale()
-	{
-		$formatter = new IntlDateFormatter(
-				'fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', // Default for CodeIgniter
-				IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
-		);
-
-		$time = new Time('now', 'Europe/London', 'fr_FR');
-
-		$this->assertEquals($formatter->format($time), (string) $time);
-	}
-
-	public function testTimeWithDateTimeZone()
-	{
-		$formatter = new IntlDateFormatter(
-				'fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
-		);
-
-		$time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
-
-		$this->assertEquals($formatter->format($time), (string) $time);
-	}
-
-	public function testToDateTime()
-	{
-		$time = new Time();
-
-		$obj = $time->toDateTime();
-
-		$this->assertInstanceOf(\DateTime::class, $obj);
-	}
-
-	public function testNow()
-	{
-		$time  = Time::now();
-		$time1 = new \DateTime();
-
-		$this->assertInstanceOf(Time::class, $time);
-		$this->assertEquals($time->getTimestamp(), $time1->getTimestamp());
-	}
-
-	public function testParse()
-	{
-		$time  = Time::parse('next Tuesday', 'America/Chicago');
-		$time1 = new \DateTime('now', new \DateTimeZone('America/Chicago'));
-		$time1->modify('next Tuesday');
-
-		$this->assertEquals($time->getTimestamp(), $time1->getTimestamp());
-	}
-
-	public function testToDateTimeString()
-	{
-		$time = Time::parse('2017-01-12 00:00', 'America/Chicago');
-
-		$this->assertEquals('2017-01-12 00:00:00', (string) $time);
-		$this->assertEquals('2017-01-12 00:00:00', $time->toDateTimeString());
-	}
+        $this->assertInstanceOf(Time::class, $time);
+        $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
+    }
 
-	public function testToDateTimeStringWithTimeZone()
-	{
-		$time = Time::parse('2017-01-12 00:00', 'Europe/London');
+    public function testParse()
+    {
+        $time  = Time::parse('next Tuesday', 'America/Chicago');
+        $time1 = new \DateTime('now', new \DateTimeZone('America/Chicago'));
+        $time1->modify('next Tuesday');
+
+        $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
+    }
 
-		$expects = new \DateTime('2017-01-12', new \DateTimeZone('Europe/London'));
+    public function testToDateTimeString()
+    {
+        $time = Time::parse('2017-01-12 00:00', 'America/Chicago');
 
-		$this->assertEquals($expects->format('Y-m-d H:i:s'), $time->toDateTimeString());
-	}
+        $this->assertSame('2017-01-12 00:00:00', (string) $time);
+        $this->assertSame('2017-01-12 00:00:00', $time->toDateTimeString());
+    }
 
-	public function testToday()
-	{
-		$time = Time::today();
+    public function testToDateTimeStringWithTimeZone()
+    {
+        $time = Time::parse('2017-01-12 00:00', 'Europe/London');
 
-		$this->assertEquals(date('Y-m-d 00:00:00'), $time->toDateTimeString());
-	}
+        $expects = new \DateTime('2017-01-12', new \DateTimeZone('Europe/London'));
 
-	public function testTodayLocalized()
-	{
-		$time = Time::today('Europe/London');
+        $this->assertSame($expects->format('Y-m-d H:i:s'), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 00:00:00'), $time->toDateTimeString());
-	}
+    public function testToday()
+    {
+        $time = Time::today();
 
-	public function testYesterday()
-	{
-		$time = Time::yesterday();
+        $this->assertSame(date('Y-m-d 00:00:00'), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 00:00:00', strtotime('-1 day')), $time->toDateTimeString());
-	}
+    public function testTodayLocalized()
+    {
+        $time = Time::today('Europe/London');
 
-	public function testTomorrow()
-	{
-		$time = Time::tomorrow();
+        $this->assertSame(date('Y-m-d 00:00:00'), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 00:00:00', strtotime('+1 day')), $time->toDateTimeString());
-	}
+    public function testYesterday()
+    {
+        $time = Time::yesterday();
 
-	public function testCreateFromDate()
-	{
-		$time = Time::createFromDate(2017, 03, 05, 'America/Chicago');
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('-1 day')), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
-	}
+    public function testTomorrow()
+    {
+        $time = Time::tomorrow();
 
-	public function testCreateFromDateLocalized()
-	{
-		$time = Time::createFromDate(2017, 03, 05, 'Europe/London');
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('+1 day')), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
-	}
+    public function testCreateFromDate()
+    {
+        $time = Time::createFromDate(2017, 03, 05, 'America/Chicago');
 
-	public function testCreateFromTime()
-	{
-		$time = Time::createFromTime(10, 03, 05, 'America/Chicago');
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 10:03:05'), $time->toDateTimeString());
-	}
+    public function testCreateFromDateLocalized()
+    {
+        $time = Time::createFromDate(2017, 03, 05, 'Europe/London');
 
-	public function testCreateFromTimeEvening()
-	{
-		$time = Time::createFromTime(20, 03, 05, 'America/Chicago');
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
+    }
 
-		$this->assertEquals(date('Y-m-d 20:03:05'), $time->toDateTimeString());
-	}
+    public function testCreateFromTime()
+    {
+        $time = Time::createFromTime(10, 03, 05, 'America/Chicago');
 
-	public function testCreateFromTimeLocalized()
-	{
-		$time = Time::createFromTime(10, 03, 05, 'Europe/London');
+        $this->assertSame(date('Y-m-d 10:03:05'), $time->toDateTimeString());
+    }
 
-		$this->assertCloseEnoughString(date('Y-m-d 10:03:05'), $time->toDateTimeString());
-	}
+    public function testCreateFromTimeEvening()
+    {
+        $time = Time::createFromTime(20, 03, 05, 'America/Chicago');
 
-	public function testCreateFromFormat()
-	{
-		$now = new \DateTime('now');
+        $this->assertSame(date('Y-m-d 20:03:05'), $time->toDateTimeString());
+    }
 
-		Time::setTestNow($now);
-		$time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');
+    public function testCreateFromTimeLocalized()
+    {
+        $time = Time::createFromTime(10, 03, 05, 'Europe/London');
 
-		$this->assertCloseEnoughString(date('2017-01-15 H:i:s', $now->getTimestamp()), $time->toDateTimeString());
-		Time::setTestNow();
-	}
+        $this->assertCloseEnoughString(date('Y-m-d 10:03:05'), $time->toDateTimeString());
+    }
 
-	public function testCreateFromFormatWithTimezoneString()
-	{
-		$time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'Europe/London');
+    public function testCreateFromFormat()
+    {
+        $now = new \DateTime('now');
 
-		$this->assertCloseEnoughString(date('2017-01-15 H:i:s'), $time->toDateTimeString());
-	}
+        Time::setTestNow($now);
+        $time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');
 
-	public function testCreateFromFormatWithTimezoneObject()
-	{
-		$tz = new \DateTimeZone('Europe/London');
+        $this->assertCloseEnoughString(date('2017-01-15 H:i:s', $now->getTimestamp()), $time->toDateTimeString());
+        Time::setTestNow();
+    }
 
-		$time = Time::createFromFormat('F j, Y', 'January 15, 2017', $tz);
+    public function testCreateFromFormatWithTimezoneString()
+    {
+        $time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'Europe/London');
 
-		$this->assertCloseEnoughString(date('2017-01-15 H:i:s'), $time->toDateTimeString());
-	}
+        $this->assertCloseEnoughString(date('2017-01-15 H:i:s'), $time->toDateTimeString());
+    }
 
-	public function testCreateFromFormatWithInvalidFormat()
-	{
-		$format = 'foobar';
+    public function testCreateFromFormatWithTimezoneObject()
+    {
+        $tz = new \DateTimeZone('Europe/London');
 
-		$this->expectException(I18nException::class);
-		$this->expectExceptionMessage(lang('Time.invalidFormat', [$format]));
+        $time = Time::createFromFormat('F j, Y', 'January 15, 2017', $tz);
 
-		$time = Time::createFromFormat($format, 'America/Chicago');
-	}
+        $this->assertCloseEnoughString(date('2017-01-15 H:i:s'), $time->toDateTimeString());
+    }
 
-	public function testCreateFromTimestamp()
-	{
-		// Se the timezone temporarily to UTC to make sure the test timestamp is correct
-		$tz = date_default_timezone_get();
-		date_default_timezone_set('UTC');
+    public function testCreateFromFormatWithInvalidFormat()
+    {
+        $format = 'foobar';
 
-		$timestamp = strtotime('2017-03-18 midnight');
+        $this->expectException(I18nException::class);
+        $this->expectExceptionMessage(lang('Time.invalidFormat', [$format]));
 
-		date_default_timezone_set($tz);
+        $time = Time::createFromFormat($format, 'America/Chicago');
+    }
 
-		$time = Time::createFromTimestamp($timestamp);
+    public function testCreateFromTimestamp()
+    {
+        // Se the timezone temporarily to UTC to make sure the test timestamp is correct
+        $tz = date_default_timezone_get();
+        date_default_timezone_set('UTC');
 
-		$this->assertEquals(date('2017-03-18 00:00:00'), $time->toDateTimeString());
-	}
+        $timestamp = strtotime('2017-03-18 midnight');
 
-	public function testTestNow()
-	{
-		$this->assertFalse(Time::hasTestNow());
-		$this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
+        date_default_timezone_set($tz);
 
-		$t = new Time('2000-01-02');
-		Time::setTestNow($t);
+        $time = Time::createFromTimestamp($timestamp);
 
-		$this->assertTrue(Time::hasTestNow());
-		$this->assertEquals('2000-01-02 00:00:00', Time::now()->toDateTimeString());
+        $this->assertSame(date('2017-03-18 00:00:00'), $time->toDateTimeString());
+    }
 
-		Time::setTestNow();
-		$this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
-	}
+    public function testTestNow()
+    {
+        $this->assertFalse(Time::hasTestNow());
+        $this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
 
-	//--------------------------------------------------------------------
+        $t = new Time('2000-01-02');
+        Time::setTestNow($t);
 
-	public function testMagicIssetTrue()
-	{
-		$time = Time::parse('January 1, 2016');
+        $this->assertTrue(Time::hasTestNow());
+        $this->assertSame('2000-01-02 00:00:00', Time::now()->toDateTimeString());
 
-		$this->assertTrue(isset($time->year));
-	}
+        Time::setTestNow();
+        $this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
+    }
 
-	public function testMagicIssetFalse()
-	{
-		$time = Time::parse('January 1, 2016');
+    public function testMagicIssetTrue()
+    {
+        $time = Time::parse('January 1, 2016');
 
-		$this->assertFalse(isset($time->foobar));
-	}
+        $this->assertTrue(isset($time->year));
+    }
 
-	//--------------------------------------------------------------------
+    public function testMagicIssetFalse()
+    {
+        $time = Time::parse('January 1, 2016');
 
-	public function testGetYear()
-	{
-		$time  = Time::parse('January 1, 2016');
-		$time2 = Time::parse('December 31, 2019');
+        $this->assertFalse(isset($time->foobar));
+    }
 
-		$this->assertEquals(2016, $time->year);
-		$this->assertEquals(2019, $time2->year);
-	}
+    public function testGetYear()
+    {
+        $time  = Time::parse('January 1, 2016');
+        $time2 = Time::parse('December 31, 2019');
 
-	public function testGetMonth()
-	{
-		$time = Time::parse('August 1, 2016');
+        $this->assertSame('2016', $time->year);
+        $this->assertSame('2019', $time2->year);
+    }
 
-		$this->assertEquals(8, $time->month);
-	}
+    public function testGetMonth()
+    {
+        $time = Time::parse('August 1, 2016');
 
-	public function testGetDay()
-	{
-		$time = Time::parse('August 12, 2016');
+        $this->assertSame('8', $time->month);
+    }
 
-		$this->assertEquals(12, $time->day);
-	}
+    public function testGetDay()
+    {
+        $time = Time::parse('August 12, 2016');
 
-	public function testGetHour()
-	{
-		$time = Time::parse('August 12, 2016 4:15pm');
+        $this->assertSame('12', $time->day);
+    }
 
-		$this->assertEquals(16, $time->hour);
-	}
+    public function testGetHour()
+    {
+        $time = Time::parse('August 12, 2016 4:15pm');
 
-	public function testGetMinute()
-	{
-		$time = Time::parse('August 12, 2016 4:15pm');
+        $this->assertSame('16', $time->hour);
+    }
 
-		$this->assertEquals(15, $time->minute);
-	}
+    public function testGetMinute()
+    {
+        $time = Time::parse('August 12, 2016 4:15pm');
 
-	public function testGetSecond()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
+        $this->assertSame('15', $time->minute);
+    }
 
-		$this->assertEquals(23, $time->second);
-	}
+    public function testGetSecond()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
 
-	public function testGetDayOfWeek()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
+        $this->assertSame('23', $time->second);
+    }
 
-		$this->assertEquals(6, $time->dayOfWeek);
-	}
+    public function testGetDayOfWeek()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
 
-	public function testGetDayOfYear()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
+        $this->assertSame('6', $time->dayOfWeek);
+    }
 
-		$this->assertEquals(225, $time->dayOfYear);
-	}
+    public function testGetDayOfYear()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
 
-	public function testGetWeekOfMonth()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
+        $this->assertSame('225', $time->dayOfYear);
+    }
 
-		$this->assertEquals(2, $time->weekOfMonth);
-	}
-
-	public function testGetWeekOfYear()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
-
-		$this->assertEquals(33, $time->weekOfYear);
-	}
-
-	public function testGetTimestamp()
-	{
-		$time     = Time::parse('August 12, 2016 4:15:23pm');
-		$expected = strtotime('August 12, 2016 4:15:23pm');
-
-		$this->assertEquals($expected, $time->timestamp);
-	}
-
-	public function testGetAge()
-	{
-		$time = Time::parse('5 years ago');
-		$this->assertEquals(5, $time->age);
-	}
-
-	public function testAgeNow()
-	{
-		$time = new Time();
-		$this->assertEquals(0, $time->age);
-	}
-
-	public function testAgeFuture()
-	{
-		$time = Time::parse('August 12, 2116 4:15:23pm');
-		$this->assertEquals(0, $time->age);
-	}
-
-	public function testGetQuarter()
-	{
-		$time = Time::parse('April 15, 2015');
-
-		$this->assertEquals(2, $time->quarter);
-	}
-
-	public function testGetDST()
-	{
-		// America/Chicago. DST from early March -> early Nov
-		$time = Time::createFromDate(2012, 1, 1);
-		$this->assertFalse($time->dst);
-		$time = Time::createFromDate(2012, 9, 1);
-		$this->assertTrue($time->dst);
-	}
-
-	public function testGetDSTUnobserved()
-	{
-		// Asia/Shanghai. DST not observed
-		$tz   = new DateTimeZone('Asia/Shanghai');
-		$time = Time::createFromDate(2012, 1, 1, $tz, 'Asia/Shanghai');
-
-		$this->assertFalse($time->dst);
-	}
-
-	public function testGetLocal()
-	{
-		$this->assertTrue(Time::now()->local);
-		$this->assertFalse(Time::now('Europe/London')->local);
-	}
-
-	public function testGetUtc()
-	{
-		$this->assertFalse(Time::now('America/Chicago')->utc);
-		$this->assertTrue(Time::now('UTC')->utc);
-	}
-
-	public function testGetTimezone()
-	{
-		$instance = Time::now()->getTimezone();
-
-		$this->assertInstanceOf(\DateTimeZone::class, $instance);
-	}
-
-	public function testGetTimezonename()
-	{
-		$this->assertEquals('America/Chicago', Time::now('America/Chicago')->getTimezoneName());
-		$this->assertEquals('Europe/London', Time::now('Europe/London')->timezoneName);
-	}
-
-	public function testSetYear()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setYear(2015);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2015-05-10 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetMonthNumber()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setMonth(4);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-04-10 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetMonthLongName()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setMonth('April');
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-04-10 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetMonthShortName()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setMonth('Feb');
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-02-10 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetDay()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setDay(15);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-05-15 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetDayOverMaxInCurrentMonth()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('Feb 02, 2009');
-		$time->setDay(29);
-	}
-
-	public function testSetDayNotOverMaxInCurrentMonth()
-	{
-		$time  = Time::parse('Feb 02, 2012');
-		$time2 = $time->setDay(29);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2012-02-29 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetHour()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setHour(15);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-05-10 15:00:00', $time2->toDateTimeString());
-	}
-
-	public function testSetMinute()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setMinute(30);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-05-10 00:30:00', $time2->toDateTimeString());
-	}
-
-	public function testSetSecond()
-	{
-		$time  = Time::parse('May 10, 2017');
-		$time2 = $time->setSecond(20);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-05-10 00:00:20', $time2->toDateTimeString());
-	}
-
-	public function testSetMonthTooSmall()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setMonth(-5);
-	}
-
-	public function testSetMonthTooBig()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setMonth(30);
-	}
-
-	public function testSetDayTooSmall()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setDay(-5);
-	}
-
-	public function testSetDayTooBig()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setDay(80);
-	}
-
-	public function testSetHourTooSmall()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setHour(-5);
-	}
-
-	public function testSetHourTooBig()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setHour(80);
-	}
-
-	public function testSetMinuteTooSmall()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setMinute(-5);
-	}
-
-	public function testSetMinuteTooBig()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setMinute(80);
-	}
-
-	public function testSetSecondTooSmall()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setSecond(-5);
-	}
-
-	public function testSetSecondTooBig()
-	{
-		$this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
-
-		$time = Time::parse('May 10, 2017');
-		$time->setSecond(80);
-	}
-
-	public function testSetTimezone()
-	{
-		$time  = Time::parse('May 10, 2017', 'America/Chicago');
-		$time2 = $time->setTimezone('Europe/London');
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('America/Chicago', $time->getTimezoneName());
-		$this->assertEquals('Europe/London', $time2->getTimezoneName());
-	}
-
-	public function testSetTimestamp()
-	{
-		$time  = Time::parse('May 10, 2017', 'America/Chicago');
-		$stamp = strtotime('April 1, 2017');
-		$time2 = $time->setTimestamp($stamp);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertNotSame($time, $time2);
-		$this->assertEquals('2017-04-01 00:00:00', $time2->toDateTimeString());
-	}
-
-	public function testToDateString()
-	{
-		$time = Time::parse('May 10, 2017', 'America/Chicago');
-		$this->assertEquals('2017-05-10', $time->toDateString());
-	}
-
-	public function testToFormattedDateString()
-	{
-		$time = Time::parse('2017-05-10', 'America/Chicago');
-		$this->assertEquals('May 10, 2017', $time->toFormattedDateString());
-	}
-
-	/**
-	 * Unfortunately, ubuntu 14.04 (on TravisCI) fails this test and
-	 * shows a numeric version of the month instead of the textual version.
-	 * Confirmed on CentOS 7 as well.
-	 * Example: format 'MMM' for November returns 'M02' instead of 'Nov'
-	 * Not sure what the fix is just yet....
-	 */
-	//    public function testToFormattedDateString()
-	//    {
-	//        $time = Time::parse('February 10, 2017', 'America/Chicago');
-	//        $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString());
-	//    }
-
-	public function testToTimeString()
-	{
-		$time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$this->assertEquals('13:20:33', $time->toTimeString());
-	}
-
-	//--------------------------------------------------------------------
-	// Add/Subtract
-	//--------------------------------------------------------------------
-
-	public function testCanAddSeconds()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addSeconds(10);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 13:20:43', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddMinutes()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addMinutes(10);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 13:30:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddHours()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addHours(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 16:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddDays()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addDays(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-13 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddMonths()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addMonths(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-04-10 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddMonthsOverYearBoundary()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addMonths(13);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2018-02-10 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanAddYears()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->addYears(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2020-01-10 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractSeconds()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subSeconds(10);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 13:20:23', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractMinutes()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subMinutes(10);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 13:10:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractHours()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subHours(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-10 10:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractDays()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subDays(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2017-01-07 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractMonths()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subMonths(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2016-10-10 13:20:33', $newTime->toDateTimeString());
-	}
-
-	public function testCanSubtractYears()
-	{
-		$time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-		$newTime = $time->subYears(3);
-		$this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-		$this->assertEquals('2014-01-10 13:20:33', $newTime->toDateTimeString());
-	}
-
-	//--------------------------------------------------------------------
-	// Comparison
-	//--------------------------------------------------------------------
-
-	public function testEqualWithDifferent()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
-
-		$this->assertTrue($time1->equals($time2));
-	}
-
-	public function testEqualWithSame()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->equals($time2));
-	}
-
-	public function testEqualWithDateTime()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = new \DateTime('January 11, 2017 03:50:00', new \DateTimeZone('Europe/London'));
-
-		$this->assertTrue($time1->equals($time2));
-	}
-
-	public function testEqualWithSameDateTime()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = new \DateTime('January 10, 2017 21:50:00', new \DateTimeZone('America/Chicago'));
-
-		$this->assertTrue($time1->equals($time2));
-	}
-
-	public function testEqualWithString()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->equals('January 11, 2017 03:50:00', 'Europe/London'));
-	}
-
-	public function testEqualWithStringAndNotimezone()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->equals('January 10, 2017 21:50:00'));
-	}
-
-	public function testSameSuccess()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->sameAs($time2));
-	}
-
-	public function testSameFailure()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
-
-		$this->assertFalse($time1->sameAs($time2));
-	}
-
-	public function testSameSuccessAsString()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->sameAs('January 10, 2017 21:50:00', 'America/Chicago'));
-	}
-
-	public function testSameFailAsString()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-
-		$this->assertFalse($time1->sameAs('January 11, 2017 03:50:00', 'Europe/London'));
-	}
-
-	public function testBefore()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
-
-		$this->assertTrue($time1->isBefore($time2));
-		$this->assertFalse($time2->isBefore($time1));
-	}
-
-	public function testAfter()
-	{
-		$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-		$time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
+    public function testGetWeekOfMonth()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
 
-		$this->assertFalse($time1->isAfter($time2));
-		$this->assertTrue($time2->isAfter($time1));
-	}
+        $this->assertSame('2', $time->weekOfMonth);
+    }
+
+    public function testGetWeekOfYear()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
+
+        $this->assertSame('33', $time->weekOfYear);
+    }
+
+    public function testGetTimestamp()
+    {
+        $time     = Time::parse('August 12, 2016 4:15:23pm');
+        $expected = strtotime('August 12, 2016 4:15:23pm');
+
+        $this->assertSame($expected, $time->timestamp);
+    }
+
+    public function testGetAge()
+    {
+        $time = Time::parse('5 years ago');
+        $this->assertSame(5, $time->age);
+    }
+
+    public function testAgeNow()
+    {
+        $time = new Time();
+        $this->assertSame(0, $time->age);
+    }
+
+    public function testAgeFuture()
+    {
+        $time = Time::parse('August 12, 2116 4:15:23pm');
+        $this->assertSame(0, $time->age);
+    }
+
+    public function testGetQuarter()
+    {
+        $time = Time::parse('April 15, 2015');
+
+        $this->assertSame('2', $time->quarter);
+    }
+
+    public function testGetDST()
+    {
+        // America/Chicago. DST from early March -> early Nov
+        $time = Time::createFromDate(2012, 1, 1);
+        $this->assertFalse($time->dst);
+        $time = Time::createFromDate(2012, 9, 1);
+        $this->assertTrue($time->dst);
+    }
+
+    public function testGetDSTUnobserved()
+    {
+        // Asia/Shanghai. DST not observed
+        $tz   = new DateTimeZone('Asia/Shanghai');
+        $time = Time::createFromDate(2012, 1, 1, $tz, 'Asia/Shanghai');
+
+        $this->assertFalse($time->dst);
+    }
+
+    public function testGetLocal()
+    {
+        $this->assertTrue(Time::now()->local);
+        $this->assertFalse(Time::now('Europe/London')->local);
+    }
+
+    public function testGetUtc()
+    {
+        $this->assertFalse(Time::now('America/Chicago')->utc);
+        $this->assertTrue(Time::now('UTC')->utc);
+    }
+
+    public function testGetTimezone()
+    {
+        $instance = Time::now()->getTimezone();
+
+        $this->assertInstanceOf(\DateTimeZone::class, $instance);
+    }
+
+    public function testGetTimezonename()
+    {
+        $this->assertSame('America/Chicago', Time::now('America/Chicago')->getTimezoneName());
+        $this->assertSame('Europe/London', Time::now('Europe/London')->timezoneName);
+    }
+
+    public function testSetYear()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setYear(2015);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2015-05-10 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetMonthNumber()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setMonth(4);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-04-10 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetMonthLongName()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setMonth('April');
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-04-10 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetMonthShortName()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setMonth('Feb');
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-02-10 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetDay()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setDay(15);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-05-15 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetDayOverMaxInCurrentMonth()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('Feb 02, 2009');
+        $time->setDay(29);
+    }
+
+    public function testSetDayNotOverMaxInCurrentMonth()
+    {
+        $time  = Time::parse('Feb 02, 2012');
+        $time2 = $time->setDay(29);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2012-02-29 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetHour()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setHour(15);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-05-10 15:00:00', $time2->toDateTimeString());
+    }
+
+    public function testSetMinute()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setMinute(30);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-05-10 00:30:00', $time2->toDateTimeString());
+    }
+
+    public function testSetSecond()
+    {
+        $time  = Time::parse('May 10, 2017');
+        $time2 = $time->setSecond(20);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-05-10 00:00:20', $time2->toDateTimeString());
+    }
+
+    public function testSetMonthTooSmall()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setMonth(-5);
+    }
+
+    public function testSetMonthTooBig()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setMonth(30);
+    }
+
+    public function testSetDayTooSmall()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setDay(-5);
+    }
+
+    public function testSetDayTooBig()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setDay(80);
+    }
+
+    public function testSetHourTooSmall()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setHour(-5);
+    }
+
+    public function testSetHourTooBig()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setHour(80);
+    }
+
+    public function testSetMinuteTooSmall()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setMinute(-5);
+    }
+
+    public function testSetMinuteTooBig()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setMinute(80);
+    }
+
+    public function testSetSecondTooSmall()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setSecond(-5);
+    }
+
+    public function testSetSecondTooBig()
+    {
+        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+
+        $time = Time::parse('May 10, 2017');
+        $time->setSecond(80);
+    }
+
+    public function testSetTimezone()
+    {
+        $time  = Time::parse('May 10, 2017', 'America/Chicago');
+        $time2 = $time->setTimezone('Europe/London');
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('America/Chicago', $time->getTimezoneName());
+        $this->assertSame('Europe/London', $time2->getTimezoneName());
+    }
+
+    public function testSetTimestamp()
+    {
+        $time  = Time::parse('May 10, 2017', 'America/Chicago');
+        $stamp = strtotime('April 1, 2017');
+        $time2 = $time->setTimestamp($stamp);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertNotSame($time, $time2);
+        $this->assertSame('2017-04-01 00:00:00', $time2->toDateTimeString());
+    }
+
+    public function testToDateString()
+    {
+        $time = Time::parse('May 10, 2017', 'America/Chicago');
+        $this->assertSame('2017-05-10', $time->toDateString());
+    }
+
+    public function testToFormattedDateString()
+    {
+        $time = Time::parse('2017-05-10', 'America/Chicago');
+        $this->assertSame('May 10, 2017', $time->toFormattedDateString());
+    }
+
+    public function testToTimeString()
+    {
+        $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $this->assertSame('13:20:33', $time->toTimeString());
+    }
+
+    // Add/Subtract
+
+    public function testCanAddSeconds()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addSeconds(10);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:43', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddMinutes()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addMinutes(10);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:30:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddHours()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addHours(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 16:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddDays()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addDays(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-13 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddMonths()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addMonths(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-04-10 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddMonthsOverYearBoundary()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addMonths(13);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2018-02-10 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanAddYears()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->addYears(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2020-01-10 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractSeconds()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subSeconds(10);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:23', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractMinutes()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subMinutes(10);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:10:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractHours()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subHours(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 10:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractDays()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subDays(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-07 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractMonths()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subMonths(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2016-10-10 13:20:33', $newTime->toDateTimeString());
+    }
+
+    public function testCanSubtractYears()
+    {
+        $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
+        $newTime = $time->subYears(3);
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2014-01-10 13:20:33', $newTime->toDateTimeString());
+    }
+
+    // Comparison
+
+    public function testEqualWithDifferent()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
+
+        $this->assertTrue($time1->equals($time2));
+    }
+
+    public function testEqualWithSame()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->equals($time2));
+    }
+
+    public function testEqualWithDateTime()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = new \DateTime('January 11, 2017 03:50:00', new \DateTimeZone('Europe/London'));
+
+        $this->assertTrue($time1->equals($time2));
+    }
+
+    public function testEqualWithSameDateTime()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = new \DateTime('January 10, 2017 21:50:00', new \DateTimeZone('America/Chicago'));
+
+        $this->assertTrue($time1->equals($time2));
+    }
+
+    public function testEqualWithString()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->equals('January 11, 2017 03:50:00', 'Europe/London'));
+    }
+
+    public function testEqualWithStringAndNotimezone()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->equals('January 10, 2017 21:50:00'));
+    }
+
+    public function testSameSuccess()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->sameAs($time2));
+    }
+
+    public function testSameFailure()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
+
+        $this->assertFalse($time1->sameAs($time2));
+    }
+
+    public function testSameSuccessAsString()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->sameAs('January 10, 2017 21:50:00', 'America/Chicago'));
+    }
+
+    public function testSameFailAsString()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+
+        $this->assertFalse($time1->sameAs('January 11, 2017 03:50:00', 'Europe/London'));
+    }
+
+    public function testBefore()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
+
+        $this->assertTrue($time1->isBefore($time2));
+        $this->assertFalse($time2->isBefore($time1));
+    }
+
+    public function testAfter()
+    {
+        $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+        $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
-	public function testHumanizeYearsSingle()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+        $this->assertFalse($time1->isAfter($time2));
+        $this->assertTrue($time2->isAfter($time1));
+    }
 
-		$this->assertEquals('1 year ago', $time->humanize());
-	}
+    public function testHumanizeYearsSingle()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-	public function testHumanizeYearsPlural()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 9, 2014 12:00:00', 'America/Chicago');
+        $this->assertSame('1 year ago', $time->humanize());
+    }
 
-		$this->assertEquals('3 years ago', $time->humanize());
-	}
+    public function testHumanizeYearsPlural()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 9, 2014 12:00:00', 'America/Chicago');
 
-	public function testHumanizeYearsForward()
-	{
-		Time::setTestNow('January 1, 2017', 'America/Chicago');
-		$time = Time::parse('January 1, 2018 12:00:00', 'America/Chicago');
+        $this->assertSame('3 years ago', $time->humanize());
+    }
 
-		$this->assertEquals('in 1 year', $time->humanize());
-	}
+    public function testHumanizeYearsForward()
+    {
+        Time::setTestNow('January 1, 2017', 'America/Chicago');
+        $time = Time::parse('January 1, 2018 12:00:00', 'America/Chicago');
 
-	public function testHumanizeMonthsSingle()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('February 9, 2017', 'America/Chicago');
+        $this->assertSame('in 1 year', $time->humanize());
+    }
 
-		$this->assertEquals('1 month ago', $time->humanize());
-	}
+    public function testHumanizeMonthsSingle()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('February 9, 2017', 'America/Chicago');
 
-	public function testHumanizeMonthsPlural()
-	{
-		Time::setTestNow('March 1, 2017', 'America/Chicago');
-		$time = Time::parse('January 1, 2017', 'America/Chicago');
+        $this->assertSame('1 month ago', $time->humanize());
+    }
 
-		$this->assertEquals('2 months ago', $time->humanize());
-	}
+    public function testHumanizeMonthsPlural()
+    {
+        Time::setTestNow('March 1, 2017', 'America/Chicago');
+        $time = Time::parse('January 1, 2017', 'America/Chicago');
 
-	public function testHumanizeMonthsForward()
-	{
-		Time::setTestNow('March 1, 2017', 'America/Chicago');
-		$time = Time::parse('April 1, 2017', 'America/Chicago');
+        $this->assertSame('2 months ago', $time->humanize());
+    }
 
-		$this->assertEquals('in 1 month', $time->humanize());
-	}
+    public function testHumanizeMonthsForward()
+    {
+        Time::setTestNow('March 1, 2017', 'America/Chicago');
+        $time = Time::parse('April 1, 2017', 'America/Chicago');
 
-	public function testHumanizeDaysSingle()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 8, 2017', 'America/Chicago');
+        $this->assertSame('in 1 month', $time->humanize());
+    }
 
-		$this->assertEquals('2 days ago', $time->humanize());
-	}
+    public function testHumanizeDaysSingle()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 8, 2017', 'America/Chicago');
 
-	public function testHumanizeDaysPlural()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 8, 2017', 'America/Chicago');
+        $this->assertSame('2 days ago', $time->humanize());
+    }
 
-		$this->assertEquals('2 days ago', $time->humanize());
-	}
+    public function testHumanizeDaysPlural()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 8, 2017', 'America/Chicago');
 
-	public function testHumanizeDaysForward()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 12, 2017', 'America/Chicago');
-
-		$this->assertEquals('in 2 days', $time->humanize());
-	}
+        $this->assertSame('2 days ago', $time->humanize());
+    }
 
-	public function testHumanizeDaysTomorrow()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 11, 2017', 'America/Chicago');
-
-		$this->assertEquals('Tomorrow', $time->humanize());
-	}
-
-	public function testHumanizeDaysYesterday()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 9, 2017', 'America/Chicago');
-
-		$this->assertEquals('Yesterday', $time->humanize());
-	}
-
-	public function testHumanizeHoursAsTime()
-	{
-		Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
-		$time = Time::parse('March 10, 2017 14:00', 'America/Chicago');
-
-		$this->assertEquals('in 2 hours', $time->humanize());
-	}
-
-	public function testHumanizeHoursAWhileAgo()
-	{
-		Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
-		$time = Time::parse('March 10, 2017 8:00', 'America/Chicago');
-
-		$this->assertEquals('4 hours ago', $time->humanize());
-	}
-
-	public function testHumanizeMinutesSingle()
-	{
-		Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
-		$time = Time::parse('March 10, 2017 12:29', 'America/Chicago');
-
-		$this->assertEquals('1 minute ago', $time->humanize());
-	}
-
-	public function testHumanizeMinutesPlural()
-	{
-		Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
-		$time = Time::parse('March 10, 2017 12:28', 'America/Chicago');
-
-		$this->assertEquals('2 minutes ago', $time->humanize());
-	}
-
-	public function testHumanizeMinutesForward()
-	{
-		Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
-		$time = Time::parse('March 10, 2017 12:31', 'America/Chicago');
-
-		$this->assertEquals('in 1 minute', $time->humanize());
-	}
-
-	public function testHumanizeWeeksSingle()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 2, 2017', 'America/Chicago');
-
-		$this->assertEquals('1 week ago', $time->humanize());
-	}
-
-	public function testHumanizeWeeksPlural()
-	{
-		Time::setTestNow('March 30, 2017', 'America/Chicago');
-		$time = Time::parse('March 15, 2017', 'America/Chicago');
-
-		$this->assertEquals('2 weeks ago', $time->humanize());
-	}
-
-	public function testHumanizeWeeksForward()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 18, 2017', 'America/Chicago');
-
-		$this->assertEquals('in 2 weeks', $time->humanize());
-	}
-
-	public function testHumanizeNow()
-	{
-		Time::setTestNow('March 10, 2017', 'America/Chicago');
-		$time = Time::parse('March 10, 2017', 'America/Chicago');
-
-		$this->assertEquals('Just now', $time->humanize());
-	}
-
-	public function testSetTimezoneDate()
-	{
-		$time  = Time::parse('13 May 2020 10:00', 'GMT');
-		$time2 = $time->setTimezone('GMT+8');
-		$this->assertEquals('2020-05-13 10:00:00', $time->toDateTimeString());
-		$this->assertEquals('2020-05-13 18:00:00', $time2->toDateTimeString());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCreateFromInstance()
-	{
-		$datetime = new DateTime();
-		$time     = Time::createFromInstance($datetime);
-		$this->assertTrue($time instanceof Time);
-		$this->assertTrue($time->sameAs($datetime));
-	}
-
-	public function testGetter()
-	{
-		$time = Time::parse('August 12, 2016 4:15:23pm');
-
-		$this->assertNull($time->weekOfWeek);
-	}
-
-	public function testUnserializeTimeObject()
-	{
-		$time1     = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
-		$timeCache = serialize($time1);
-		$time2     = unserialize($timeCache);
-
-		$this->assertInstanceOf(Time::class, $time2);
-		$this->assertTrue($time2->equals($time1));
-		$this->assertEquals($time1, $time2);
-	}
+    public function testHumanizeDaysForward()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 12, 2017', 'America/Chicago');
+
+        $this->assertSame('in 2 days', $time->humanize());
+    }
+
+    public function testHumanizeDaysTomorrow()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 11, 2017', 'America/Chicago');
+
+        $this->assertSame('Tomorrow', $time->humanize());
+    }
+
+    public function testHumanizeDaysYesterday()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 9, 2017', 'America/Chicago');
+
+        $this->assertSame('Yesterday', $time->humanize());
+    }
+
+    public function testHumanizeHoursAsTime()
+    {
+        Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
+        $time = Time::parse('March 10, 2017 14:00', 'America/Chicago');
+
+        $this->assertSame('in 2 hours', $time->humanize());
+    }
+
+    public function testHumanizeHoursAWhileAgo()
+    {
+        Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
+        $time = Time::parse('March 10, 2017 8:00', 'America/Chicago');
+
+        $this->assertSame('4 hours ago', $time->humanize());
+    }
+
+    public function testHumanizeMinutesSingle()
+    {
+        Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
+        $time = Time::parse('March 10, 2017 12:29', 'America/Chicago');
+
+        $this->assertSame('1 minute ago', $time->humanize());
+    }
+
+    public function testHumanizeMinutesPlural()
+    {
+        Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
+        $time = Time::parse('March 10, 2017 12:28', 'America/Chicago');
+
+        $this->assertSame('2 minutes ago', $time->humanize());
+    }
+
+    public function testHumanizeMinutesForward()
+    {
+        Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
+        $time = Time::parse('March 10, 2017 12:31', 'America/Chicago');
+
+        $this->assertSame('in 1 minute', $time->humanize());
+    }
+
+    public function testHumanizeWeeksSingle()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 2, 2017', 'America/Chicago');
+
+        $this->assertSame('1 week ago', $time->humanize());
+    }
+
+    public function testHumanizeWeeksPlural()
+    {
+        Time::setTestNow('March 30, 2017', 'America/Chicago');
+        $time = Time::parse('March 15, 2017', 'America/Chicago');
+
+        $this->assertSame('2 weeks ago', $time->humanize());
+    }
+
+    public function testHumanizeWeeksForward()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 18, 2017', 'America/Chicago');
+
+        $this->assertSame('in 2 weeks', $time->humanize());
+    }
+
+    public function testHumanizeNow()
+    {
+        Time::setTestNow('March 10, 2017', 'America/Chicago');
+        $time = Time::parse('March 10, 2017', 'America/Chicago');
+
+        $this->assertSame('Just now', $time->humanize());
+    }
+
+    public function testSetTimezoneDate()
+    {
+        $time  = Time::parse('13 May 2020 10:00', 'GMT');
+        $time2 = $time->setTimezone('GMT+8');
+        $this->assertSame('2020-05-13 10:00:00', $time->toDateTimeString());
+        $this->assertSame('2020-05-13 18:00:00', $time2->toDateTimeString());
+    }
+
+    public function testCreateFromInstance()
+    {
+        $datetime = new DateTime();
+        $time     = Time::createFromInstance($datetime);
+        $this->assertTrue($time instanceof Time);
+        $this->assertTrue($time->sameAs($datetime));
+    }
+
+    public function testGetter()
+    {
+        $time = Time::parse('August 12, 2016 4:15:23pm');
+
+        $this->assertNull($time->weekOfWeek);
+    }
+
+    public function testUnserializeTimeObject()
+    {
+        $time1     = new Time('August 28, 2020 10:04:00pm', 'Asia/Manila', 'en');
+        $timeCache = serialize($time1);
+        $time2     = unserialize($timeCache);
+
+        $this->assertInstanceOf(Time::class, $time2);
+        $this->assertTrue($time2->equals($time1));
+        $this->assertNotSame($time1, $time2);
+    }
 }
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index 65c479881387..dddcf2bdf097 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Images;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
@@ -14,106 +25,103 @@
  * with vfsStream, so the support files are used directly for
  * most work, and the virtual file system will be used for
  * testing saving only.
+ *
+ * @internal
  */
-class BaseHandlerTest extends CIUnitTestCase
+final class BaseHandlerTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		if (! extension_loaded('gd'))
-		{
-			$this->markTestSkipped('The GD extension is not available.');
-			return;
-		}
-
-		// create virtual file system
-		$this->root = vfsStream::setup();
-		// copy our support files
-		$this->origin = SUPPORTPATH . 'Images/';
-		vfsStream::copyFromFileSystem($this->origin, $this->root);
-		// make subfolders
-		$structure = [
-			'work'     => [],
-			'wontwork' => [],
-		];
-		vfsStream::create($structure);
-		// with one of them read only
-		$wont = $this->root->getChild('wontwork')->chmod(0400);
-
-		// for VFS tests
-		$this->start = $this->root->url() . '/';
-		$this->path  = $this->start . 'ci-logo.png';
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNew()
-	{
-		$handler = Services::image('gd', null, false);
-		$this->assertTrue($handler instanceof BaseHandler);
-	}
-
-	public function testWithFile()
-	{
-		$path    = $this->origin . 'ci-logo.png';
-		$handler = Services::image('gd', null, false);
-		$handler->withFile($path);
-
-		$image = $handler->getFile();
-		$this->assertTrue($image instanceof Image);
-		$this->assertEquals(155, $image->origWidth);
-		$this->assertEquals($path, $image->getPathname());
-	}
-
-	public function testMissingFile()
-	{
-		$this->expectException(FileNotFoundException::class);
-		$handler = Services::image('gd', null, false);
-		$handler->withFile($this->start . 'No_such_file.jpg');
-	}
-
-	public function testNonImageFile()
-	{
-		$this->expectException(ImageException::class);
-		$handler = Services::image('gd', null, false);
-		$handler->withFile(SUPPORTPATH . 'Files/baker/banana.php');
-
-		// Make any call that accesses the image
-		$handler->resize(100, 100);
-	}
-
-	public function testForgotWithFile()
-	{
-		$this->expectException(ImageException::class);
-		$handler = Services::image('gd', null, false);
-
-		// Make any call that accesses the image
-		$handler->resize(100, 100);
-	}
-
-	public function testFileTypes()
-	{
-		$handler = Services::image('gd', null, false);
-		$handler->withFile($this->start . 'ci-logo.png');
-		$image = $handler->getFile();
-		$this->assertTrue($image instanceof Image);
-
-		$handler->withFile($this->start . 'ci-logo.jpeg');
-		$image = $handler->getFile();
-		$this->assertTrue($image instanceof Image);
-
-		$handler->withFile($this->start . 'ci-logo.gif');
-		$image = $handler->getFile();
-		$this->assertTrue($image instanceof Image);
-	}
-
-	//--------------------------------------------------------------------
-	// Something handled by our Image
-	public function testImageHandled()
-	{
-		$handler = Services::image('gd', null, false);
-		$handler->withFile($this->path);
-		$this->assertEquals($this->path, $handler->getPathname());
-	}
-
+    protected function setUp(): void
+    {
+        if (! extension_loaded('gd')) {
+            $this->markTestSkipped('The GD extension is not available.');
+
+            return;
+        }
+
+        // create virtual file system
+        $this->root = vfsStream::setup();
+        // copy our support files
+        $this->origin = SUPPORTPATH . 'Images/';
+        vfsStream::copyFromFileSystem($this->origin, $this->root);
+        // make subfolders
+        $structure = [
+            'work'     => [],
+            'wontwork' => [],
+        ];
+        vfsStream::create($structure);
+        // with one of them read only
+        $this->root->getChild('wontwork')->chmod(0400);
+
+        // for VFS tests
+        $this->start = $this->root->url() . '/';
+        $this->path  = $this->start . 'ci-logo.png';
+    }
+
+    public function testNew()
+    {
+        $handler = Services::image('gd', null, false);
+        $this->assertTrue($handler instanceof BaseHandler);
+    }
+
+    public function testWithFile()
+    {
+        $path    = $this->origin . 'ci-logo.png';
+        $handler = Services::image('gd', null, false);
+        $handler->withFile($path);
+
+        $image = $handler->getFile();
+        $this->assertTrue($image instanceof Image);
+        $this->assertSame(155, $image->origWidth);
+        $this->assertSame($path, $image->getPathname());
+    }
+
+    public function testMissingFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+        $handler = Services::image('gd', null, false);
+        $handler->withFile($this->start . 'No_such_file.jpg');
+    }
+
+    public function testNonImageFile()
+    {
+        $this->expectException(ImageException::class);
+        $handler = Services::image('gd', null, false);
+        $handler->withFile(SUPPORTPATH . 'Files/baker/banana.php');
+
+        // Make any call that accesses the image
+        $handler->resize(100, 100);
+    }
+
+    public function testForgotWithFile()
+    {
+        $this->expectException(ImageException::class);
+        $handler = Services::image('gd', null, false);
+
+        // Make any call that accesses the image
+        $handler->resize(100, 100);
+    }
+
+    public function testFileTypes()
+    {
+        $handler = Services::image('gd', null, false);
+        $handler->withFile($this->start . 'ci-logo.png');
+        $image = $handler->getFile();
+        $this->assertTrue($image instanceof Image);
+
+        $handler->withFile($this->start . 'ci-logo.jpeg');
+        $image = $handler->getFile();
+        $this->assertTrue($image instanceof Image);
+
+        $handler->withFile($this->start . 'ci-logo.gif');
+        $image = $handler->getFile();
+        $this->assertTrue($image instanceof Image);
+    }
+
+    // Something handled by our Image
+    public function testImageHandled()
+    {
+        $handler = Services::image('gd', null, false);
+        $handler->withFile($this->path);
+        $this->assertSame($this->path, $handler->getPathname());
+    }
 }
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index fd317f2015ee..e93995d2072e 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Images;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Images\Exceptions\ImageException;
@@ -13,443 +24,413 @@
  * and we can make sure the code coverage is good.
  *
  * Was unable to test fontPath & related logic.
+ *
+ * @internal
  */
-class GDHandlerTest extends CIUnitTestCase
+final class GDHandlerTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		if (! extension_loaded('gd'))
-		{
-			$this->markTestSkipped('The GD extension is not available.');
-			return;
-		}
-
-		// create virtual file system
-		$this->root = vfsStream::setup();
-		// copy our support files
-		$this->origin = SUPPORTPATH . 'Images/';
-		// make subfolders
-		$structure = [
-			'work'     => [],
-			'wontwork' => [],
-		];
-		vfsStream::create($structure);
-		// with one of them read only
-		$wont = $this->root->getChild('wontwork')->chmod(0400);
-
-		$this->start = $this->root->url() . '/';
-
-		$this->path    = $this->origin . 'ci-logo.png';
-		$this->handler = Services::image('gd', null, false);
-	}
-
-	public function testGetVersion()
-	{
-		$version = $this->handler->getVersion();
-		// make sure that the call worked
-		$this->assertNotFalse($version);
-		// we should have a numeric version, with 3 digits
-		$this->assertGreaterThan(100, $version);
-		$this->assertLessThan(999, $version);
-	}
-
-	public function testImageProperties()
-	{
-		$this->handler->withFile($this->path);
-		$file  = $this->handler->getFile();
-		$props = $file->getProperties(true);
-
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(155, $props['width']);
-		$this->assertEquals(155, $file->origWidth);
-
-		$this->assertEquals(200, $this->handler->getHeight());
-		$this->assertEquals(200, $props['height']);
-		$this->assertEquals(200, $file->origHeight);
-
-		$this->assertEquals('width="155" height="200"', $props['size_str']);
-	}
-
-	public function testImageTypeProperties()
-	{
-		$this->handler->withFile($this->path);
-		$file  = $this->handler->getFile();
-		$props = $file->getProperties(true);
-
-		$this->assertEquals(IMAGETYPE_PNG, $props['image_type']);
-		$this->assertEquals('image/png', $props['mime_type']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResizeIgnored()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(155, 200); // 155x200 result
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testResizeAbsolute()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 456, false); // 123x456 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(456, $this->handler->getHeight());
-	}
-
-	public function testResizeAspect()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 456, true); // 123x159 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(159, $this->handler->getHeight());
-	}
-
-	public function testResizeAspectWidth()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 0, true); // 123x159 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(159, $this->handler->getHeight());
-	}
-
-	public function testResizeAspectHeight()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(0, 456, true); // 354x456 result
-		$this->assertEquals(354, $this->handler->getWidth());
-		$this->assertEquals(456, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCropTopLeft()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropMiddle()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 50, 50, false); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropMiddlePreserved()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 50, 50, true); // 78x100 result
-		$this->assertEquals(78, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropTopLeftPreserveAspect()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropNothing()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(155, 200); // 155x200 result
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testCropOutOfBounds()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 100); // 55x100 result in 100x100
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRotate()
-	{
-		$this->handler->withFile($this->path); // 155x200
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-
-		// first rotation
-		$this->handler->rotate(90); // 200x155
-		$this->assertEquals(200, $this->handler->getWidth());
-
-		// check image size again after another rotation
-		$this->handler->rotate(180); // 200x155
-		$this->assertEquals(200, $this->handler->getWidth());
-	}
-
-	public function testRotateBadAngle()
-	{
-		$this->handler->withFile($this->path);
-		$this->expectException(ImageException::class);
-		$this->handler->rotate(77);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFlatten()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flatten();
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFlip()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip();
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testHorizontal()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip('horizontal');
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testFlipVertical()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip('vertical');
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testFlipUnknown()
-	{
-		$this->handler->withFile($this->path);
-		$this->expectException(ImageException::class);
-		$this->handler->flip('bogus');
-	}
-
-	//--------------------------------------------------------------------
-	public function testFit()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100, 100);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testFitTaller()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100, 400);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(400, $this->handler->getHeight());
-	}
-
-	public function testFitAutoHeight()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(129, $this->handler->getHeight());
-	}
-
-	public function testFitPositions()
-	{
-		$choices = [
-			'top-left',
-			'top',
-			'top-right',
-			'left',
-			'center',
-			'right',
-			'bottom-left',
-			'bottom',
-			'bottom-right',
-		];
-		$this->handler->withFile($this->path);
-		foreach ($choices as $position)
-		{
-			$this->handler->fit(100, 100, $position);
-			$this->assertEquals(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
-			$this->assertEquals(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testText()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMoreText()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testImageCreation()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! function_exists('imagecreatefromwebp'))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->text('vertical');
-			$this->assertEquals(155, $this->handler->getWidth());
-			$this->assertEquals(200, $this->handler->getHeight());
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testImageCopy()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! function_exists('imagecreatefromwebp'))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->save($this->start . 'work/ci-logo.' . $type);
-			$this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				$this->root->getChild('work/ci-logo.' . $type)->getContent()
-			);
-		}
-	}
-
-	public function testImageCopyWithNoTargetAndMaxQuality()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->save(null, 100);
-			$this->assertTrue(file_exists($this->origin . 'ci-logo.' . $type));
-
-			$this->assertEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				file_get_contents($this->origin . 'ci-logo.' . $type)
-			);
-		}
-	}
-
-	public function testImageCompressionGetResource()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! function_exists('imagecreatefromwebp'))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->getResource(); // make sure resource is loaded
-			$this->handler->save($this->start . 'work/ci-logo.' . $type);
-			$this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				$this->root->getChild('work/ci-logo.' . $type)->getContent()
-			);
-		}
-	}
-
-	public function testImageCompressionWithResource()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! function_exists('imagecreatefromwebp'))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type)
-				->withResource() // make sure resource is loaded
-				->save($this->start . 'work/ci-logo.' . $type);
-
-			$this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				$this->root->getChild('work/ci-logo.' . $type)->getContent()
-			);
-		}
-	}
-
-	public function testImageConvert()
-	{
-		$this->handler->withFile($this->origin . 'ci-logo.jpeg');
-		$this->handler->getResource(); // make sure resource is loaded
-		$this->handler->convert(IMAGETYPE_PNG);
-		$this->handler->save($this->start . 'work/ci-logo.png');
-		$this->assertEquals(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
-	}
-
-	public function testImageReorientLandscape()
-	{
-		for ($i = 0; $i <= 8; $i++)
-		{
-			$source = $this->origin . 'EXIFsamples/landscape_' . '' . $i . '.jpg';
-
-			$this->handler->withFile($source);
-			$this->handler->reorient();
-
-			$resource = $this->handler->getResource();
-			$point    = imagecolorat($resource, 0, 0);
-			$rgb      = imagecolorsforindex($resource, $point);
-
-			$this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
-		}
-	}
-
-	public function testImageReorientPortrait()
-	{
-		for ($i = 0; $i <= 8; $i++)
-		{
-			$source = $this->origin . 'EXIFsamples/portrait_' . '' . $i . '.jpg';
-
-			$this->handler->withFile($source);
-			$this->handler->reorient();
-
-			$resource = $this->handler->getResource();
-			$point    = imagecolorat($resource, 0, 0);
-			$rgb      = imagecolorsforindex($resource, $point);
-
-			$this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
-		}
-	}
-
+    protected function setUp(): void
+    {
+        if (! extension_loaded('gd')) {
+            $this->markTestSkipped('The GD extension is not available.');
+
+            return;
+        }
+
+        // create virtual file system
+        $this->root = vfsStream::setup();
+        // copy our support files
+        $this->origin = SUPPORTPATH . 'Images/';
+        // make subfolders
+        $structure = [
+            'work'     => [],
+            'wontwork' => [],
+        ];
+        vfsStream::create($structure);
+        // with one of them read only
+        $this->root->getChild('wontwork')->chmod(0400);
+
+        $this->start = $this->root->url() . '/';
+
+        $this->path    = $this->origin . 'ci-logo.png';
+        $this->handler = Services::image('gd', null, false);
+    }
+
+    public function testGetVersion()
+    {
+        $version = $this->handler->getVersion();
+        // make sure that the call worked
+        $this->assertNotFalse($version);
+        // we should have a numeric version, with 3 digits
+        $this->assertGreaterThan(100, $version);
+        $this->assertLessThan(999, $version);
+    }
+
+    public function testImageProperties()
+    {
+        $this->handler->withFile($this->path);
+        $file  = $this->handler->getFile();
+        $props = $file->getProperties(true);
+
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(155, $props['width']);
+        $this->assertSame(155, $file->origWidth);
+
+        $this->assertSame(200, $this->handler->getHeight());
+        $this->assertSame(200, $props['height']);
+        $this->assertSame(200, $file->origHeight);
+
+        $this->assertSame('width="155" height="200"', $props['size_str']);
+    }
+
+    public function testImageTypeProperties()
+    {
+        $this->handler->withFile($this->path);
+        $file  = $this->handler->getFile();
+        $props = $file->getProperties(true);
+
+        $this->assertSame(IMAGETYPE_PNG, $props['image_type']);
+        $this->assertSame('image/png', $props['mime_type']);
+    }
+
+    public function testResizeIgnored()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(155, 200); // 155x200 result
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testResizeAbsolute()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 456, false); // 123x456 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
+    }
+
+    public function testResizeAspect()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 456, true); // 123x159 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
+    }
+
+    public function testResizeAspectWidth()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 0, true); // 123x159 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
+    }
+
+    public function testResizeAspectHeight()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(0, 456, true); // 354x456 result
+        $this->assertSame(354, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
+    }
+
+    public function testCropTopLeft()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropMiddle()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 50, 50, false); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropMiddlePreserved()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 50, 50, true); // 78x100 result
+        $this->assertSame(78, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropTopLeftPreserveAspect()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropNothing()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(155, 200); // 155x200 result
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testCropOutOfBounds()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 100); // 55x100 result in 100x100
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testRotate()
+    {
+        $this->handler->withFile($this->path); // 155x200
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+
+        // first rotation
+        $this->handler->rotate(90); // 200x155
+        $this->assertSame(200, $this->handler->getWidth());
+
+        // check image size again after another rotation
+        $this->handler->rotate(180); // 200x155
+        $this->assertSame(200, $this->handler->getWidth());
+    }
+
+    public function testRotateBadAngle()
+    {
+        $this->handler->withFile($this->path);
+        $this->expectException(ImageException::class);
+        $this->handler->rotate(77);
+    }
+
+    public function testFlatten()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flatten();
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlip()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip();
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testHorizontal()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip('horizontal');
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlipVertical()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip('vertical');
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlipUnknown()
+    {
+        $this->handler->withFile($this->path);
+        $this->expectException(ImageException::class);
+        $this->handler->flip('bogus');
+    }
+
+    public function testFit()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100, 100);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testFitTaller()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100, 400);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(400, $this->handler->getHeight());
+    }
+
+    public function testFitAutoHeight()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(129, $this->handler->getHeight());
+    }
+
+    public function testFitPositions()
+    {
+        $choices = [
+            'top-left',
+            'top',
+            'top-right',
+            'left',
+            'center',
+            'right',
+            'bottom-left',
+            'bottom',
+            'bottom-right',
+        ];
+        $this->handler->withFile($this->path);
+
+        foreach ($choices as $position) {
+            $this->handler->fit(100, 100, $position);
+            $this->assertSame(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
+        }
+    }
+
+    public function testText()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testMoreText()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testImageCreation()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! function_exists('imagecreatefromwebp')) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->text('vertical');
+            $this->assertSame(155, $this->handler->getWidth());
+            $this->assertSame(200, $this->handler->getHeight());
+        }
+    }
+
+    public function testImageCopy()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! function_exists('imagecreatefromwebp')) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->save($this->start . 'work/ci-logo.' . $type);
+            $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                $this->root->getChild('work/ci-logo.' . $type)->getContent()
+            );
+        }
+    }
+
+    public function testImageCopyWithNoTargetAndMaxQuality()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->save(null, 100);
+            $this->assertFileExists($this->origin . 'ci-logo.' . $type);
+
+            $this->assertSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                file_get_contents($this->origin . 'ci-logo.' . $type)
+            );
+        }
+    }
+
+    public function testImageCompressionGetResource()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! function_exists('imagecreatefromwebp')) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->getResource(); // make sure resource is loaded
+            $this->handler->save($this->start . 'work/ci-logo.' . $type);
+            $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                $this->root->getChild('work/ci-logo.' . $type)->getContent()
+            );
+        }
+    }
+
+    public function testImageCompressionWithResource()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! function_exists('imagecreatefromwebp')) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type)
+                ->withResource() // make sure resource is loaded
+                ->save($this->start . 'work/ci-logo.' . $type);
+
+            $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                $this->root->getChild('work/ci-logo.' . $type)->getContent()
+            );
+        }
+    }
+
+    public function testImageConvert()
+    {
+        $this->handler->withFile($this->origin . 'ci-logo.jpeg');
+        $this->handler->getResource(); // make sure resource is loaded
+        $this->handler->convert(IMAGETYPE_PNG);
+        $this->handler->save($this->start . 'work/ci-logo.png');
+        $this->assertSame(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
+    }
+
+    public function testImageReorientLandscape()
+    {
+        for ($i = 0; $i <= 8; $i++) {
+            $source = $this->origin . 'EXIFsamples/landscape_' . '' . $i . '.jpg';
+
+            $this->handler->withFile($source);
+            $this->handler->reorient();
+
+            $resource = $this->handler->getResource();
+            $point    = imagecolorat($resource, 0, 0);
+            $rgb      = imagecolorsforindex($resource, $point);
+
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+        }
+    }
+
+    public function testImageReorientPortrait()
+    {
+        for ($i = 0; $i <= 8; $i++) {
+            $source = $this->origin . 'EXIFsamples/portrait_' . '' . $i . '.jpg';
+
+            $this->handler->withFile($source);
+            $this->handler->reorient();
+
+            $resource = $this->handler->getResource();
+            $point    = imagecolorat($resource, 0, 0);
+            $rgb      = imagecolorsforindex($resource, $point);
+
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+        }
+    }
 }
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index e00bda6bbfb1..1c97baeac0e5 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -1,10 +1,21 @@
-<?php namespace CodeIgniter\Images;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
 
-use Imagick;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Images\Exceptions\ImageException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Images;
+use Imagick;
 
 /**
  * Unit testing for the ImageMagick image handler.
@@ -14,446 +25,416 @@
  * and we can make sure the code coverage is good.
  *
  * Was unable to test fontPath & related logic.
+ *
+ * @internal
  */
-class ImageMagickHandlerTest extends CIUnitTestCase
+final class ImageMagickHandlerTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		if (! extension_loaded('imagick'))
-		{
-			$this->markTestSkipped('The ImageMagick extension is not available.');
-			return;
-		}
-
-		$this->root = WRITEPATH . 'cache/';
-
-		// cleanup everything
-		helper('filesystem');
-		delete_files($this->root, false, true);
-
-		// copy our support files
-		$this->origin = SUPPORTPATH . 'Images/';
-
-		$this->path = $this->origin . 'ci-logo.png';
-
-		$handlerConfig              = new Images;
-		$handlerConfig->libraryPath = '/usr/bin/convert';
-		$this->handler              = Services::image('imagick', $handlerConfig, false);
-	}
-
-	public function testGetVersion()
-	{
-		$version = $this->handler->getVersion();
-		// make sure that the call worked
-		$this->assertNotFalse($version);
-		// we should have a numeric version, greater than 6
-		$this->assertTrue(version_compare($version, '6.0.0') >= 0);
-		$this->assertTrue(version_compare($version, '99.0.0') < 0);
-	}
-
-	public function testImageProperties()
-	{
-		$this->handler->withFile($this->path);
-		$file  = $this->handler->getFile();
-		$props = $file->getProperties(true);
-
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(155, $props['width']);
-		$this->assertEquals(155, $file->origWidth);
-
-		$this->assertEquals(200, $this->handler->getHeight());
-		$this->assertEquals(200, $props['height']);
-		$this->assertEquals(200, $file->origHeight);
-
-		$this->assertEquals('width="155" height="200"', $props['size_str']);
-	}
-
-	public function testImageTypeProperties()
-	{
-		$this->handler->withFile($this->path);
-		$file  = $this->handler->getFile();
-		$props = $file->getProperties(true);
-
-		$this->assertEquals(IMAGETYPE_PNG, $props['image_type']);
-		$this->assertEquals('image/png', $props['mime_type']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResizeIgnored()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(155, 200); // 155x200 result
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testResizeAbsolute()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 456, false); // 123x456 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(456, $this->handler->getHeight());
-	}
-
-	public function testResizeAspect()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 456, true); // 123x159 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(159, $this->handler->getHeight());
-	}
-
-	public function testResizeAspectWidth()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(123, 0, true); // 123x159 result
-		$this->assertEquals(123, $this->handler->getWidth());
-		$this->assertEquals(159, $this->handler->getHeight());
-	}
-
-	public function testResizeAspectHeight()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->resize(0, 456, true); // 353x456 result
-		$this->assertEquals(353, $this->handler->getWidth());
-		$this->assertEquals(456, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCropTopLeft()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropMiddle()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 50, 50, false); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropMiddlePreserved()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 50, 50, true); // 78x100 result
-		$this->assertEquals(78, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropTopLeftPreserveAspect()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100); // 100x100 result
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testCropNothing()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(155, 200); // 155x200 result
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testCropOutOfBounds()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->crop(100, 100, 100); // 55x100 result in 100x100
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRotate()
-	{
-		$this->handler->withFile($this->path); // 155x200
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-
-		// first rotation
-		$this->handler->rotate(90); // 200x155
-		$this->assertEquals(200, $this->handler->getWidth());
-
-		// check image size again after another rotation
-		$this->handler->rotate(180); // 200x155
-		$this->assertEquals(200, $this->handler->getWidth());
-	}
-
-	public function testRotateBadAngle()
-	{
-		$this->handler->withFile($this->path);
-		$this->expectException(ImageException::class);
-		$this->handler->rotate(77);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFlatten()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flatten();
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFlip()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip();
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testHorizontal()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip('horizontal');
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testFlipVertical()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->flip('vertical');
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	public function testFlipUnknown()
-	{
-		$this->handler->withFile($this->path);
-		$this->expectException(ImageException::class);
-		$this->handler->flip('bogus');
-	}
-
-	//--------------------------------------------------------------------
-	public function testFit()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100, 100);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(100, $this->handler->getHeight());
-	}
-
-	public function testFitTaller()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100, 400);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(400, $this->handler->getHeight());
-	}
-
-	public function testFitAutoHeight()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->fit(100);
-		$this->assertEquals(100, $this->handler->getWidth());
-		$this->assertEquals(129, $this->handler->getHeight());
-	}
-
-	public function testFitPositions()
-	{
-		$choices = [
-			'top-left',
-			'top',
-			'top-right',
-			'left',
-			'center',
-			'right',
-			'bottom-left',
-			'bottom',
-			'bottom-right',
-		];
-		$this->handler->withFile($this->path);
-		foreach ($choices as $position)
-		{
-			$this->handler->fit(100, 100, $position);
-			$this->assertEquals(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
-			$this->assertEquals(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testText()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMoreText()
-	{
-		$this->handler->withFile($this->path);
-		$this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
-		$this->assertEquals(155, $this->handler->getWidth());
-		$this->assertEquals(200, $this->handler->getHeight());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testImageCreation()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->text('vertical');
-			$this->assertEquals(155, $this->handler->getWidth());
-			$this->assertEquals(200, $this->handler->getHeight());
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testImageCopy()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->save($this->root . 'ci-logo.' . $type);
-			$this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				file_get_contents($this->root . 'ci-logo.' . $type)
-			);
-		}
-	}
-
-	public function testImageCopyWithNoTargetAndMaxQuality()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->save(null, 100);
-			$this->assertTrue(file_exists($this->origin . 'ci-logo.' . $type));
-
-			$this->assertEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				file_get_contents($this->origin . 'ci-logo.' . $type)
-			);
-		}
-	}
-
-	public function testImageCompressionGetResource()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type);
-			$this->handler->getResource(); // make sure resource is loaded
-			$this->handler->save($this->root . 'ci-logo.' . $type);
-			$this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				file_get_contents($this->root . 'ci-logo.' . $type)
-			);
-		}
-	}
-
-	public function testImageCompressionWithResource()
-	{
-		foreach (['gif', 'jpeg', 'png', 'webp'] as $type)
-		{
-			if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true))
-			{
-				$this->expectException(ImageException::class);
-				$this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
-			}
-
-			$this->handler->withFile($this->origin . 'ci-logo.' . $type)
-				->withResource() // make sure resource is loaded
-				->save($this->root . 'ci-logo.' . $type);
-
-			$this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
-
-			$this->assertNotEquals(
-				file_get_contents($this->origin . 'ci-logo.' . $type),
-				file_get_contents($this->root . 'ci-logo.' . $type)
-			);
-		}
-	}
-
-	public function testImageConvert()
-	{
-		$this->handler->withFile($this->origin . 'ci-logo.jpeg');
-		$this->handler->getResource(); // make sure resource is loaded
-		$this->handler->convert(IMAGETYPE_PNG);
-		$this->handler->save($this->root . 'ci-logo.png');
-		$this->assertEquals(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);
-	}
-
-	public function testImageReorientLandscape()
-	{
-		for ($i = 0; $i <= 8; $i++)
-		{
-			$source = $this->origin . 'EXIFsamples/landscape_' . '' . $i . '.jpg';
-			$result = $this->root . 'landscape_' . $i . '_reoriented.jpg';
-
-			$this->handler->withFile($source);
-			$this->handler->reorient();
-
-			$resource = imagecreatefromstring(file_get_contents($this->handler->getResource()));
-			$point    = imagecolorat($resource, 0, 0);
-			$rgb      = imagecolorsforindex($resource, $point);
-
-			$this->handler->save($result);
-
-			$this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
-		}
-	}
-
-	public function testImageReorientPortrait()
-	{
-		for ($i = 0; $i <= 8; $i++)
-		{
-			$source = $this->origin . 'EXIFsamples/portrait_' . '' . $i . '.jpg';
-			$result = $this->root . 'portrait_' . $i . '_reoriented.jpg';
-
-			$this->handler->withFile($source);
-			$this->handler->reorient();
-
-			$resource = imagecreatefromstring(file_get_contents($this->handler->getResource()));
-			$point    = imagecolorat($resource, 0, 0);
-			$rgb      = imagecolorsforindex($resource, $point);
-
-			$this->handler->save($result);
-
-			$this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
-		}
-	}
-
+    protected function setUp(): void
+    {
+        if (! extension_loaded('imagick')) {
+            $this->markTestSkipped('The ImageMagick extension is not available.');
+
+            return;
+        }
+
+        $this->root = WRITEPATH . 'cache/';
+
+        // cleanup everything
+        helper('filesystem');
+        delete_files($this->root, false, true);
+
+        // copy our support files
+        $this->origin = SUPPORTPATH . 'Images/';
+
+        $this->path = $this->origin . 'ci-logo.png';
+
+        $handlerConfig              = new Images();
+        $handlerConfig->libraryPath = '/usr/bin/convert';
+        $this->handler              = Services::image('imagick', $handlerConfig, false);
+    }
+
+    public function testGetVersion()
+    {
+        $version = $this->handler->getVersion();
+        // make sure that the call worked
+        $this->assertNotFalse($version);
+        // we should have a numeric version, greater than 6
+        $this->assertTrue(version_compare($version, '6.0.0') >= 0);
+        $this->assertTrue(version_compare($version, '99.0.0') < 0);
+    }
+
+    public function testImageProperties()
+    {
+        $this->handler->withFile($this->path);
+        $file  = $this->handler->getFile();
+        $props = $file->getProperties(true);
+
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(155, $props['width']);
+        $this->assertSame(155, $file->origWidth);
+
+        $this->assertSame(200, $this->handler->getHeight());
+        $this->assertSame(200, $props['height']);
+        $this->assertSame(200, $file->origHeight);
+
+        $this->assertSame('width="155" height="200"', $props['size_str']);
+    }
+
+    public function testImageTypeProperties()
+    {
+        $this->handler->withFile($this->path);
+        $file  = $this->handler->getFile();
+        $props = $file->getProperties(true);
+
+        $this->assertSame(IMAGETYPE_PNG, $props['image_type']);
+        $this->assertSame('image/png', $props['mime_type']);
+    }
+
+    public function testResizeIgnored()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(155, 200); // 155x200 result
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testResizeAbsolute()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 456, false); // 123x456 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
+    }
+
+    public function testResizeAspect()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 456, true); // 123x159 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
+    }
+
+    public function testResizeAspectWidth()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(123, 0, true); // 123x159 result
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
+    }
+
+    public function testResizeAspectHeight()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->resize(0, 456, true); // 353x456 result
+        $this->assertSame(353, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
+    }
+
+    public function testCropTopLeft()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropMiddle()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 50, 50, false); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropMiddlePreserved()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 50, 50, true); // 78x100 result
+        $this->assertSame(78, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropTopLeftPreserveAspect()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100); // 100x100 result
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testCropNothing()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(155, 200); // 155x200 result
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testCropOutOfBounds()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->crop(100, 100, 100); // 55x100 result in 100x100
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testRotate()
+    {
+        $this->handler->withFile($this->path); // 155x200
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+
+        // first rotation
+        $this->handler->rotate(90); // 200x155
+        $this->assertSame(200, $this->handler->getWidth());
+
+        // check image size again after another rotation
+        $this->handler->rotate(180); // 200x155
+        $this->assertSame(200, $this->handler->getWidth());
+    }
+
+    public function testRotateBadAngle()
+    {
+        $this->handler->withFile($this->path);
+        $this->expectException(ImageException::class);
+        $this->handler->rotate(77);
+    }
+
+    public function testFlatten()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flatten();
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlip()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip();
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testHorizontal()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip('horizontal');
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlipVertical()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->flip('vertical');
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testFlipUnknown()
+    {
+        $this->handler->withFile($this->path);
+        $this->expectException(ImageException::class);
+        $this->handler->flip('bogus');
+    }
+
+    public function testFit()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100, 100);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
+    }
+
+    public function testFitTaller()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100, 400);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(400, $this->handler->getHeight());
+    }
+
+    public function testFitAutoHeight()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->fit(100);
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(129, $this->handler->getHeight());
+    }
+
+    public function testFitPositions()
+    {
+        $choices = [
+            'top-left',
+            'top',
+            'top-right',
+            'left',
+            'center',
+            'right',
+            'bottom-left',
+            'bottom',
+            'bottom-right',
+        ];
+        $this->handler->withFile($this->path);
+
+        foreach ($choices as $position) {
+            $this->handler->fit(100, 100, $position);
+            $this->assertSame(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
+        }
+    }
+
+    public function testText()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testMoreText()
+    {
+        $this->handler->withFile($this->path);
+        $this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
+    }
+
+    public function testImageCreation()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true)) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->text('vertical');
+            $this->assertSame(155, $this->handler->getWidth());
+            $this->assertSame(200, $this->handler->getHeight());
+        }
+    }
+
+    public function testImageCopy()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true)) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->save($this->root . 'ci-logo.' . $type);
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                file_get_contents($this->root . 'ci-logo.' . $type)
+            );
+        }
+    }
+
+    public function testImageCopyWithNoTargetAndMaxQuality()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->save(null, 100);
+            $this->assertFileExists($this->origin . 'ci-logo.' . $type);
+
+            $this->assertSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                file_get_contents($this->origin . 'ci-logo.' . $type)
+            );
+        }
+    }
+
+    public function testImageCompressionGetResource()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true)) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type);
+            $this->handler->getResource(); // make sure resource is loaded
+            $this->handler->save($this->root . 'ci-logo.' . $type);
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                file_get_contents($this->root . 'ci-logo.' . $type)
+            );
+        }
+    }
+
+    public function testImageCompressionWithResource()
+    {
+        foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
+            if ($type === 'webp' && ! in_array('WEBP', Imagick::queryFormats(), true)) {
+                $this->expectException(ImageException::class);
+                $this->expectExceptionMessage('Your server does not support the GD function required to process this type of image.');
+            }
+
+            $this->handler->withFile($this->origin . 'ci-logo.' . $type)
+                ->withResource() // make sure resource is loaded
+                ->save($this->root . 'ci-logo.' . $type);
+
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
+
+            $this->assertNotSame(
+                file_get_contents($this->origin . 'ci-logo.' . $type),
+                file_get_contents($this->root . 'ci-logo.' . $type)
+            );
+        }
+    }
+
+    public function testImageConvert()
+    {
+        $this->handler->withFile($this->origin . 'ci-logo.jpeg');
+        $this->handler->getResource(); // make sure resource is loaded
+        $this->handler->convert(IMAGETYPE_PNG);
+        $this->handler->save($this->root . 'ci-logo.png');
+        $this->assertSame(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);
+    }
+
+    public function testImageReorientLandscape()
+    {
+        for ($i = 0; $i <= 8; $i++) {
+            $source = $this->origin . 'EXIFsamples/landscape_' . '' . $i . '.jpg';
+            $result = $this->root . 'landscape_' . $i . '_reoriented.jpg';
+
+            $this->handler->withFile($source);
+            $this->handler->reorient();
+
+            $resource = imagecreatefromstring(file_get_contents($this->handler->getResource()));
+            $point    = imagecolorat($resource, 0, 0);
+            $rgb      = imagecolorsforindex($resource, $point);
+
+            $this->handler->save($result);
+
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+        }
+    }
+
+    public function testImageReorientPortrait()
+    {
+        for ($i = 0; $i <= 8; $i++) {
+            $source = $this->origin . 'EXIFsamples/portrait_' . '' . $i . '.jpg';
+            $result = $this->root . 'portrait_' . $i . '_reoriented.jpg';
+
+            $this->handler->withFile($source);
+            $this->handler->reorient();
+
+            $resource = imagecreatefromstring(file_get_contents($this->handler->getResource()));
+            $point    = imagecolorat($resource, 0, 0);
+            $rgb      = imagecolorsforindex($resource, $point);
+
+            $this->handler->save($result);
+
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+        }
+    }
 }
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 03276963e14a..f011a76a2bc8 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -1,93 +1,105 @@
-<?php namespace CodeIgniter\Images;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images;
 
 use CodeIgniter\Images\Exceptions\ImageException;
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class ImageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ImageTest extends CIUnitTestCase
 {
-
-	protected $path = 'tests/_support/ci-logo.png';
-
-	protected function setUp(): void
-	{
-		// create virtual file system
-		$this->root = vfsStream::setup();
-		// copy our support files
-		$this->origin = '_support/Images/';
-		vfsStream::copyFromFileSystem(TESTPATH . $this->origin, $this->root);
-		// make subfolders
-		$structure = [
-			'work'     => [],
-			'wontwork' => [],
-		];
-		vfsStream::create($structure);
-		// with one of them read only
-		$wont = $this->root->getChild('wontwork')->chmod(0400);
-
-		$this->start = $this->root->url() . '/';
-
-		$this->image = new Image($this->start . 'ci-logo.png');
-	}
-
-	public function testBasicPropertiesInherited()
-	{
-		$this->assertEquals('ci-logo.png', $this->image->getFilename());
-		$this->assertEquals($this->start . 'ci-logo.png', $this->image->getPathname());
-		$this->assertEquals($this->root->url(), $this->image->getPath());
-		$this->assertEquals('ci-logo.png', $this->image->getBasename());
-	}
-
-	public function testGetProperties()
-	{
-		$expected = [
-			'width'      => 155,
-			'height'     => 200,
-			'image_type' => IMAGETYPE_PNG,
-			'size_str'   => 'width="155" height="200"',
-			'mime_type'  => 'image/png',
-		];
-
-		$this->assertEquals($expected, $this->image->getProperties(true));
-	}
-
-	public function testExtractProperties()
-	{
-		// extract properties from the image
-		$this->assertTrue($this->image->getProperties(false));
-
-		$this->assertEquals(155, $this->image->origWidth);
-		$this->assertEquals(200, $this->image->origHeight);
-		$this->assertEquals(IMAGETYPE_PNG, $this->image->imageType);
-		$this->assertEquals('width="155" height="200"', $this->image->sizeStr);
-		$this->assertEquals('image/png', $this->image->mime);
-	}
-
-	public function testCopyDefaultName()
-	{
-		$targetPath = $this->start . 'work';
-		$this->image->copy($targetPath);
-		$this->assertTrue($this->root->hasChild('work/ci-logo.png'));
-	}
-
-	public function testCopyNewName()
-	{
-		$this->image->copy($this->root->url(), 'new-logo.png');
-		$this->assertTrue($this->root->hasChild('new-logo.png'));
-	}
-
-	public function testCopyNewFolder()
-	{
-		$targetPath = $this->start . 'work/subfolder';
-		$this->image->copy($targetPath, 'new-logo.png');
-		$this->assertTrue($this->root->hasChild('work/subfolder/new-logo.png'));
-	}
-
-	public function testCopyNowhere()
-	{
-		$this->expectException(ImageException::class);
-		$targetPath = $this->start . 'work';
-		$this->image->copy($targetPath, '');
-	}
-
+    protected $path = 'tests/_support/ci-logo.png';
+
+    protected function setUp(): void
+    {
+        // create virtual file system
+        $this->root = vfsStream::setup();
+        // copy our support files
+        $this->origin = '_support/Images/';
+        vfsStream::copyFromFileSystem(TESTPATH . $this->origin, $this->root);
+        // make subfolders
+        $structure = [
+            'work'     => [],
+            'wontwork' => [],
+        ];
+        vfsStream::create($structure);
+        // with one of them read only
+        $this->root->getChild('wontwork')->chmod(0400);
+
+        $this->start = $this->root->url() . '/';
+
+        $this->image = new Image($this->start . 'ci-logo.png');
+    }
+
+    public function testBasicPropertiesInherited()
+    {
+        $this->assertSame('ci-logo.png', $this->image->getFilename());
+        $this->assertSame($this->start . 'ci-logo.png', $this->image->getPathname());
+        $this->assertSame($this->root->url(), $this->image->getPath());
+        $this->assertSame('ci-logo.png', $this->image->getBasename());
+    }
+
+    public function testGetProperties()
+    {
+        $expected = [
+            'width'      => 155,
+            'height'     => 200,
+            'image_type' => IMAGETYPE_PNG,
+            'size_str'   => 'width="155" height="200"',
+            'mime_type'  => 'image/png',
+        ];
+
+        $this->assertSame($expected, $this->image->getProperties(true));
+    }
+
+    public function testExtractProperties()
+    {
+        // extract properties from the image
+        $this->assertTrue($this->image->getProperties(false));
+
+        $this->assertSame(155, $this->image->origWidth);
+        $this->assertSame(200, $this->image->origHeight);
+        $this->assertSame(IMAGETYPE_PNG, $this->image->imageType);
+        $this->assertSame('width="155" height="200"', $this->image->sizeStr);
+        $this->assertSame('image/png', $this->image->mime);
+    }
+
+    public function testCopyDefaultName()
+    {
+        $targetPath = $this->start . 'work';
+        $this->image->copy($targetPath);
+        $this->assertTrue($this->root->hasChild('work/ci-logo.png'));
+    }
+
+    public function testCopyNewName()
+    {
+        $this->image->copy($this->root->url(), 'new-logo.png');
+        $this->assertTrue($this->root->hasChild('new-logo.png'));
+    }
+
+    public function testCopyNewFolder()
+    {
+        $targetPath = $this->start . 'work/subfolder';
+        $this->image->copy($targetPath, 'new-logo.png');
+        $this->assertTrue($this->root->hasChild('work/subfolder/new-logo.png'));
+    }
+
+    public function testCopyNowhere()
+    {
+        $this->expectException(ImageException::class);
+        $targetPath = $this->start . 'work';
+        $this->image->copy($targetPath, '');
+    }
 }
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 2631696a6e47..0dd8b3d69adc 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Language;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,328 +16,301 @@
 use Config\Services;
 use Tests\Support\Language\SecondMockLanguage;
 
-class LanguageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LanguageTest extends CIUnitTestCase
 {
-	/**
-	 * @var MockLanguage
-	 */
-	private $lang;
-
-	protected function setUp(): void
-	{
-		$this->lang = new MockLanguage('en');
-	}
-
-	public function testReturnsStringWithNoFileInMessage()
-	{
-		$this->assertEquals('something', $this->lang->getLine('something'));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3822
-	 */
-	public function testReturnParsedStringWithNoFileInMessage()
-	{
-		$this->lang->setLocale('en-GB');
-
-		$line = '{price, number, currency}';
-
-		$this->assertSame('£7.41', $this->lang->getLine($line, ['price' => '7.41']));
-		$this->assertSame('£7.41', lang($line, ['price' => '7.41'], 'en-GB'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLineReturnsLine()
-	{
-		$this->lang->setData('books', [
-			'bookSaved'  => 'We kept the book free from the boogeyman',
-			'booksSaved' => 'We saved some more',
-		]);
-
-		$this->assertEquals('We saved some more', $this->lang->getLine('books.booksSaved'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLineReturnsFallbackLine()
-	{
-		$this->lang
-			->setLocale('en-US')
-			->setData('equivalent', [
-				'touchWood'   => 'touch wood',
-				'lieOfLand'   => 'lie of the land',
-				'leaseOfLife' => 'a new lease of life',
-				'slowcoach'   => 'slowcoach',
-			], 'en')
-			->setData('equivalent', [
-				'lieOfLand' => 'lay of the land',
-				'slowcoach' => 'slowpoke',
-			], 'en-US');
-
-		$this->assertEquals('lay of the land', $this->lang->getLine('equivalent.lieOfLand'));
-		$this->assertEquals('slowpoke', $this->lang->getLine('equivalent.slowcoach'));
-		$this->assertEquals('a new lease of life', $this->lang->getLine('equivalent.leaseOfLife'));
-		$this->assertEquals('touch wood', $this->lang->getLine('equivalent.touchWood'));
-		$this->assertEquals('equivalent.unknown', $this->lang->getLine('equivalent.unknown'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLineArrayReturnsLineArray()
-	{
-		$this->lang->setData('books', [
-			'booksList' => [
-				'The Boogeyman',
-				'We Saved',
-			],
-		]);
-
-		$this->assertEquals([
-			'The Boogeyman',
-			'We Saved',
-		], $this->lang->getLine('books.booksList'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLineFormatsMessage()
-	{
-		// No intl extension? then we can't test this - go away....
-		if (! class_exists('MessageFormatter'))
-		{
-			$this->markTestSkipped('No intl support.');
-		}
-
-		$this->lang->setData('books', [
-			'bookCount' => '{0, number, integer} books have been saved.',
-		]);
-
-		$this->assertEquals('45 books have been saved.', $this->lang->getLine('books.bookCount', [91 / 2]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLineArrayFormatsMessages()
-	{
-		// No intl extension? Then we can't test this - go away...
-		if (! class_exists('MessageFormatter'))
-		{
-			$this->markTestSkipped('No intl support.');
-		}
-
-		$this->lang->setData('books', [
-			'bookList' => [
-				'{0, number, integer} related books.'
-			],
-		]);
-
-		$this->assertEquals(['45 related books.'], $this->lang->getLine('books.bookList', [91 / 2]));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/891
-	 */
-	public function testLangAllowsOtherLocales()
-	{
-		$str1 = lang('Language.languageGetLineInvalidArgumentException', [], 'en');
-		$str2 = lang('Language.languageGetLineInvalidArgumentException', [], 'ru');
-
-		$this->assertEquals('Get line must be a string or array of strings.', $str1);
-		$this->assertEquals('Whatever this would be, translated', $str2);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLangDoesntFormat()
-	{
-		$this->lang->disableIntlSupport();
-
-		$this->lang->setData('books', [
-			'bookList' => [
-				'{0, number, integer} related books.'
-			],
-		]);
-
-		$this->assertEquals(['{0, number, integer} related books.'], $this->lang->getLine('books.bookList', [15]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLanguageDuplicateKey()
-	{
-		$this->lang = new Language('en');
-		$this->assertEquals('These are not the droids you are looking for', $this->lang->getLine('More.strongForce', []));
-		$this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
-		$this->assertEquals('Could not move file {0} to {1} ({2}).', $this->lang->getLine('Files.cannotMove', []));
-		$this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLanguageFileLoading()
-	{
-		$this->lang = new SecondMockLanguage('en');
-
-		$this->lang->loadem('More', 'en');
-		$this->assertTrue(in_array('More', $this->lang->loaded(), true));
-
-		$this->lang->loadem('More', 'en');
-		$this->assertEquals(1, count($this->lang->loaded())); // should only be there once
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLanguageFileLoadingReturns()
-	{
-		$this->lang = new SecondMockLanguage('en');
-
-		$result = $this->lang->loadem('More', 'en', true);
-		$this->assertFalse(in_array('More', $this->lang->loaded(), true));
-		$this->assertEquals(3, count($result));
-
-		$result = $this->lang->loadem('More', 'en');
-		$this->assertTrue(in_array('More', $this->lang->loaded(), true));
-		$this->assertEquals(1, count($this->lang->loaded()));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLanguageSameKeyAndFileName()
-	{
-		// first file data | example.message
-		$this->lang->setData('example', ['message' => 'This is an example message']);
-
-		// force loading data into file Example
-		$this->assertEquals('This is an example message', $this->lang->getLine('example.message'));
-
-		// second file data | another.example
-		$this->lang->setData('another', ['example' => 'Another example']);
-
-		$this->assertEquals('Another example', $this->lang->getLine('another.example'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetLocale()
-	{
-		$this->lang = Services::language('en', false);
-		$this->assertEquals('en', $this->lang->getLocale());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrioritizedLocator()
-	{
-		// this should load the replacement bundle of messages
-		$message = lang('Core.missingExtension', [], 'en');
-		$this->assertEquals('The framework needs the following extension(s) installed and loaded: {0}.', $message);
-		// and we should have our new message too
-		$this->assertEquals('billions and billions', lang('Core.bazillion', [], 'en'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function MessageBundles()
-	{
-		return [
-			['CLI'],
-			['Cache'],
-			['Cast'],
-			['Core'],
-			['Database'],
-			['Files'],
-			['Filters'],
-			['Format'],
-			['HTTP'],
-			['Images'],
-			['Log'],
-			['Migrations'],
-			['Number'],
-			['Pager'],
-			['RESTful'],
-			['Router'],
-			['Session'],
-			['Time'],
-			['Validation'],
-			['View'],
-		];
-	}
-
-	/**
-	 * There's not a whole lot that can be done with message bundles,
-	 * but we can at least try loading them ... more accurate code coverage?
-	 *
-	 * @dataProvider MessageBundles
-	 */
-	public function testBundleUniqueKeys($bundle)
-	{
-		$messages = require SYSTEMPATH . 'Language/en/' . $bundle . '.php';
-		$this->assertGreaterThan(0, count($messages));
-	}
-
-	//--------------------------------------------------------------------
-	// Testing base locale vs variants
-
-	public function testBaseFallbacks()
-	{
-		$this->lang = Services::language('en-ZZ', false);
-		// key is in both base and variant; should pick variant
-		$this->assertEquals("It's made of cheese", $this->lang->getLine('More.notaMoon'));
-
-		// key is in base but not variant; should pick base
-		$this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove'));
-
-		// key is in variant but not base; should pick variant
-		$this->assertEquals('There is no try', $this->lang->getLine('More.wisdom'));
-
-		// key isn't in either base or variant; should return bad key
-		$this->assertEquals('More.shootMe', $this->lang->getLine('More.shootMe'));
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * Testing base locale vs variants, with fallback to English.
-	 *
-	 * Key	en	ab	ac-CD
-	 * none	N	N	N
-	 * one	N	N	Y
-	 * two	N	Y	N
-	 * tre	N	Y	Y
-	 * for	Y	N	N
-	 * fiv	Y	N	Y
-	 * six	Y	Y	N
-	 * sev	Y	Y	Y
-	 */
-	public function testAllTheWayFallbacks()
-	{
-		$this->lang = Services::language('ab-CD', false);
-		$this->assertEquals('Allin.none', $this->lang->getLine('Allin.none'));
-		$this->assertEquals('Pyramid of Giza', $this->lang->getLine('Allin.one'));
-		$this->assertEquals('gluttony', $this->lang->getLine('Allin.two'));
-		$this->assertEquals('Colossus of Rhodes', $this->lang->getLine('Allin.tre'));
-		$this->assertEquals('four calling birds', $this->lang->getLine('Allin.for'));
-		$this->assertEquals('Temple of Artemis', $this->lang->getLine('Allin.fiv'));
-		$this->assertEquals('envy', $this->lang->getLine('Allin.six'));
-		$this->assertEquals('Hanging Gardens of Babylon', $this->lang->getLine('Allin.sev'));
-	}
-
-	public function testLanguageNestedArrayDefinition()
-	{
-		$this->lang = new SecondMockLanguage('en');
-		$this->lang->loadem('Nested', 'en');
-
-		$this->assertEquals('e', $this->lang->getLine('Nested.a.b.c.d'));
-	}
-
-	public function testLanguageKeySeparatedByDot()
-	{
-		$this->lang = new SecondMockLanguage('en');
-		$this->lang->loadem('Foo', 'en');
-
-		$this->assertEquals('The fieldname field is very short.', $this->lang->getLine('Foo.bar.min_length1', ['field' => 'fieldname']));
-		$this->assertEquals('The fieldname field is very short.', $this->lang->getLine('Foo.baz.min_length3.short', ['field' => 'fieldname']));
-	}
+    /**
+     * @var MockLanguage
+     */
+    private $lang;
+
+    protected function setUp(): void
+    {
+        $this->lang = new MockLanguage('en');
+    }
+
+    public function testReturnsStringWithNoFileInMessage()
+    {
+        $this->assertSame('something', $this->lang->getLine('something'));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3822
+     */
+    public function testReturnParsedStringWithNoFileInMessage()
+    {
+        $this->lang->setLocale('en-GB');
+
+        $line = '{price, number, currency}';
+
+        $this->assertSame('£7.41', $this->lang->getLine($line, ['price' => '7.41']));
+        $this->assertSame('£7.41', lang($line, ['price' => '7.41'], 'en-GB'));
+    }
+
+    public function testGetLineReturnsLine()
+    {
+        $this->lang->setData('books', [
+            'bookSaved'  => 'We kept the book free from the boogeyman',
+            'booksSaved' => 'We saved some more',
+        ]);
+
+        $this->assertSame('We saved some more', $this->lang->getLine('books.booksSaved'));
+    }
+
+    public function testGetLineReturnsFallbackLine()
+    {
+        $this->lang
+            ->setLocale('en-US')
+            ->setData('equivalent', [
+                'touchWood'   => 'touch wood',
+                'lieOfLand'   => 'lie of the land',
+                'leaseOfLife' => 'a new lease of life',
+                'slowcoach'   => 'slowcoach',
+            ], 'en')
+            ->setData('equivalent', [
+                'lieOfLand' => 'lay of the land',
+                'slowcoach' => 'slowpoke',
+            ], 'en-US');
+
+        $this->assertSame('lay of the land', $this->lang->getLine('equivalent.lieOfLand'));
+        $this->assertSame('slowpoke', $this->lang->getLine('equivalent.slowcoach'));
+        $this->assertSame('a new lease of life', $this->lang->getLine('equivalent.leaseOfLife'));
+        $this->assertSame('touch wood', $this->lang->getLine('equivalent.touchWood'));
+        $this->assertSame('equivalent.unknown', $this->lang->getLine('equivalent.unknown'));
+    }
+
+    public function testGetLineArrayReturnsLineArray()
+    {
+        $this->lang->setData('books', [
+            'booksList' => [
+                'The Boogeyman',
+                'We Saved',
+            ],
+        ]);
+
+        $this->assertSame([
+            'The Boogeyman',
+            'We Saved',
+        ], $this->lang->getLine('books.booksList'));
+    }
+
+    public function testGetLineFormatsMessage()
+    {
+        // No intl extension? then we can't test this - go away....
+        if (! class_exists('MessageFormatter')) {
+            $this->markTestSkipped('No intl support.');
+        }
+
+        $this->lang->setData('books', [
+            'bookCount' => '{0, number, integer} books have been saved.',
+        ]);
+
+        $this->assertSame('45 books have been saved.', $this->lang->getLine('books.bookCount', [91 / 2]));
+    }
+
+    public function testGetLineArrayFormatsMessages()
+    {
+        // No intl extension? Then we can't test this - go away...
+        if (! class_exists('MessageFormatter')) {
+            $this->markTestSkipped('No intl support.');
+        }
+
+        $this->lang->setData('books', [
+            'bookList' => [
+                '{0, number, integer} related books.',
+            ],
+        ]);
+
+        $this->assertSame(['45 related books.'], $this->lang->getLine('books.bookList', [91 / 2]));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/891
+     */
+    public function testLangAllowsOtherLocales()
+    {
+        $str1 = lang('Language.languageGetLineInvalidArgumentException', [], 'en');
+        $str2 = lang('Language.languageGetLineInvalidArgumentException', [], 'ru');
+
+        $this->assertSame('Get line must be a string or array of strings.', $str1);
+        $this->assertSame('Whatever this would be, translated', $str2);
+    }
+
+    public function testLangDoesntFormat()
+    {
+        $this->lang->disableIntlSupport();
+
+        $this->lang->setData('books', [
+            'bookList' => [
+                '{0, number, integer} related books.',
+            ],
+        ]);
+
+        $this->assertSame(['{0, number, integer} related books.'], $this->lang->getLine('books.bookList', [15]));
+    }
+
+    public function testLanguageDuplicateKey()
+    {
+        $this->lang = new Language('en');
+        $this->assertSame('These are not the droids you are looking for', $this->lang->getLine('More.strongForce', []));
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
+        $this->assertSame('Could not move file {0} to {1} ({2}).', $this->lang->getLine('Files.cannotMove', []));
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
+    }
+
+    public function testLanguageFileLoading()
+    {
+        $this->lang = new SecondMockLanguage('en');
+
+        $this->lang->loadem('More', 'en');
+        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+
+        $this->lang->loadem('More', 'en');
+        $this->assertCount(1, $this->lang->loaded()); // should only be there once
+    }
+
+    public function testLanguageFileLoadingReturns()
+    {
+        $this->lang = new SecondMockLanguage('en');
+
+        $result = $this->lang->loadem('More', 'en', true);
+        $this->assertFalse(in_array('More', $this->lang->loaded(), true));
+        $this->assertCount(3, $result);
+
+        $result = $this->lang->loadem('More', 'en');
+        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+        $this->assertCount(1, $this->lang->loaded());
+    }
+
+    public function testLanguageSameKeyAndFileName()
+    {
+        // first file data | example.message
+        $this->lang->setData('example', ['message' => 'This is an example message']);
+
+        // force loading data into file Example
+        $this->assertSame('This is an example message', $this->lang->getLine('example.message'));
+
+        // second file data | another.example
+        $this->lang->setData('another', ['example' => 'Another example']);
+
+        $this->assertSame('Another example', $this->lang->getLine('another.example'));
+    }
+
+    public function testGetLocale()
+    {
+        $this->lang = Services::language('en', false);
+        $this->assertSame('en', $this->lang->getLocale());
+    }
+
+    public function testPrioritizedLocator()
+    {
+        // this should load the replacement bundle of messages
+        $message = lang('Core.missingExtension', [], 'en');
+        $this->assertSame('The framework needs the following extension(s) installed and loaded: {0}.', $message);
+        // and we should have our new message too
+        $this->assertSame('billions and billions', lang('Core.bazillion', [], 'en'));
+    }
+
+    public function MessageBundles()
+    {
+        return [
+            ['CLI'],
+            ['Cache'],
+            ['Cast'],
+            ['Core'],
+            ['Database'],
+            ['Files'],
+            ['Filters'],
+            ['Format'],
+            ['HTTP'],
+            ['Images'],
+            ['Log'],
+            ['Migrations'],
+            ['Number'],
+            ['Pager'],
+            ['RESTful'],
+            ['Router'],
+            ['Session'],
+            ['Time'],
+            ['Validation'],
+            ['View'],
+        ];
+    }
+
+    /**
+     * There's not a whole lot that can be done with message bundles,
+     * but we can at least try loading them ... more accurate code coverage?
+     *
+     * @dataProvider MessageBundles
+     *
+     * @param mixed $bundle
+     */
+    public function testBundleUniqueKeys($bundle)
+    {
+        $messages = require SYSTEMPATH . 'Language/en/' . $bundle . '.php';
+        $this->assertGreaterThan(0, count($messages));
+    }
+
+    // Testing base locale vs variants
+
+    public function testBaseFallbacks()
+    {
+        $this->lang = Services::language('en-ZZ', false);
+        // key is in both base and variant; should pick variant
+        $this->assertSame("It's made of cheese", $this->lang->getLine('More.notaMoon'));
+
+        // key is in base but not variant; should pick base
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove'));
+
+        // key is in variant but not base; should pick variant
+        $this->assertSame('There is no try', $this->lang->getLine('More.wisdom'));
+
+        // key isn't in either base or variant; should return bad key
+        $this->assertSame('More.shootMe', $this->lang->getLine('More.shootMe'));
+    }
+
+    /**
+     * Testing base locale vs variants, with fallback to English.
+     *
+     * Key	en	ab	ac-CD
+     * none	N	N	N
+     * one	N	N	Y
+     * two	N	Y	N
+     * tre	N	Y	Y
+     * for	Y	N	N
+     * fiv	Y	N	Y
+     * six	Y	Y	N
+     * sev	Y	Y	Y
+     */
+    public function testAllTheWayFallbacks()
+    {
+        $this->lang = Services::language('ab-CD', false);
+        $this->assertSame('Allin.none', $this->lang->getLine('Allin.none'));
+        $this->assertSame('Pyramid of Giza', $this->lang->getLine('Allin.one'));
+        $this->assertSame('gluttony', $this->lang->getLine('Allin.two'));
+        $this->assertSame('Colossus of Rhodes', $this->lang->getLine('Allin.tre'));
+        $this->assertSame('four calling birds', $this->lang->getLine('Allin.for'));
+        $this->assertSame('Temple of Artemis', $this->lang->getLine('Allin.fiv'));
+        $this->assertSame('envy', $this->lang->getLine('Allin.six'));
+        $this->assertSame('Hanging Gardens of Babylon', $this->lang->getLine('Allin.sev'));
+    }
+
+    public function testLanguageNestedArrayDefinition()
+    {
+        $this->lang = new SecondMockLanguage('en');
+        $this->lang->loadem('Nested', 'en');
+
+        $this->assertSame('e', $this->lang->getLine('Nested.a.b.c.d'));
+    }
+
+    public function testLanguageKeySeparatedByDot()
+    {
+        $this->lang = new SecondMockLanguage('en');
+        $this->lang->loadem('Foo', 'en');
+
+        $this->assertSame('The fieldname field is very short.', $this->lang->getLine('Foo.bar.min_length1', ['field' => 'fieldname']));
+        $this->assertSame('The fieldname field is very short.', $this->lang->getLine('Foo.baz.min_length3.short', ['field' => 'fieldname']));
+    }
 }
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index 1b2244caf06e..1060f90da512 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Log\Handlers;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Services;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -7,75 +18,76 @@
 use Config\App;
 use stdClass;
 
-class ChromeLoggerHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ChromeLoggerHandlerTest extends CIUnitTestCase
 {
+    public function testCanHandleLogLevel()
+    {
+        $config = new LoggerConfig();
 
-	public function testCanHandleLogLevel()
-	{
-		$config = new LoggerConfig();
-
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
-
-		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
-		$this->assertFalse($logger->canHandle('foo'));
-	}
+        $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-	public function testHandle()
-	{
-		$config = new LoggerConfig();
+        $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+        $this->assertFalse($logger->canHandle('foo'));
+    }
 
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
+    public function testHandle()
+    {
+        $config = new LoggerConfig();
 
-		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
-		$this->assertTrue($logger->handle('warning', 'This a log test'));
-	}
+        $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-	public function testSendLogs()
-	{
-		$config = new LoggerConfig();
+        $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+        $this->assertTrue($logger->handle('warning', 'This a log test'));
+    }
 
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
+    public function testSendLogs()
+    {
+        $config = new LoggerConfig();
 
-		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
-		$logger->sendLogs();
+        $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-		$response = Services::response(null, true);
+        $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+        $logger->sendLogs();
 
-		$this->assertTrue($response->hasHeader('X-ChromeLogger-Data'));
-	}
+        $response = Services::response(null, true);
 
-	public function testSetDateFormat()
-	{
-		$config = new LoggerConfig();
+        $this->assertTrue($response->hasHeader('X-ChromeLogger-Data'));
+    }
 
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
+    public function testSetDateFormat()
+    {
+        $config = new LoggerConfig();
 
-		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
-		$result = $logger->setDateFormat('F j, Y');
+        $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-		$this->assertObjectHasAttribute('dateFormat', $result);
-		$this->assertObjectHasAttribute('dateFormat', $logger);
-	}
+        $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+        $result = $logger->setDateFormat('F j, Y');
 
-	public function testChromeLoggerHeaderSent()
-	{
-		Services::injectMock('response', new MockResponse(new App()));
-		$response = service('response');
+        $this->assertObjectHasAttribute('dateFormat', $result);
+        $this->assertObjectHasAttribute('dateFormat', $logger);
+    }
 
-		$config = new LoggerConfig();
+    public function testChromeLoggerHeaderSent()
+    {
+        Services::injectMock('response', new MockResponse(new App()));
+        $response = service('response');
 
-		$config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
+        $config = new LoggerConfig();
 
-		$logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+        $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-		$data              = new stdClass();
-		$data->code        = 123;
-		$data->explanation = "That's no moon, it's a pumpkin";
-		$result            = $logger->setDateFormat('F j, Y');
+        $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
 
-		$logger->handle('warning', $data);
+        $data              = new stdClass();
+        $data->code        = 123;
+        $data->explanation = "That's no moon, it's a pumpkin";
+        $logger->setDateFormat('F j, Y');
 
-		$this->assertTrue($response->hasHeader('x-chromelogger-data'));
-	}
+        $logger->handle('warning', $data);
 
+        $this->assertTrue($response->hasHeader('x-chromelogger-data'));
+    }
 }
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index 43a56e7f6088..d564fab7e660 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -1,37 +1,47 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Log\Exceptions\LogException;
 use CodeIgniter\Test\CIUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
+/**
+ * @internal
+ */
 final class ErrorlogHandlerTest extends CIUnitTestCase
 {
-	public function testHandlerThrowsOnInvalidMessageType(): void
-	{
-		$this->expectException(LogException::class);
-		$this->getMockedHandler(['messageType' => 2]);
-	}
+    public function testHandlerThrowsOnInvalidMessageType(): void
+    {
+        $this->expectException(LogException::class);
+        $this->getMockedHandler(['messageType' => 2]);
+    }
 
-	public function testErrorLoggingWithErrorLog(): void
-	{
-		$logger = $this->getMockedHandler(['handles' => ['critical', 'error']]);
-		$logger->method('errorLog')->willReturn(true);
-		$logger->expects($this->once())->method('errorLog')->with("ERROR --> Test message.\n", 0);
-		$this->assertTrue($logger->handle('error', 'Test message.'));
-	}
+    public function testErrorLoggingWithErrorLog(): void
+    {
+        $logger = $this->getMockedHandler(['handles' => ['critical', 'error']]);
+        $logger->method('errorLog')->willReturn(true);
+        $logger->expects($this->once())->method('errorLog')->with("ERROR --> Test message.\n", 0);
+        $this->assertTrue($logger->handle('error', 'Test message.'));
+    }
 
-	/**
-	 * @param array $config
-	 *
-	 * @return MockObject&ErrorlogHandler
-	 */
-	private function getMockedHandler(array $config = [])
-	{
-		return $this->getMockBuilder(ErrorlogHandler::class)
-			->onlyMethods(['errorLog'])
-			->setConstructorArgs([$config])
-			->getMock();
-	}
+    /**
+     * @return MockObject&ErrorlogHandler
+     */
+    private function getMockedHandler(array $config = [])
+    {
+        return $this->getMockBuilder(ErrorlogHandler::class)
+            ->onlyMethods(['errorLog'])
+            ->setConstructorArgs([$config])
+            ->getMock();
+    }
 }
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index 00fbd98ed94f..e2ea5246ad86 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -6,78 +16,77 @@
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use org\bovigo\vfs\vfsStream;
 
-class FileHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileHandlerTest extends CIUnitTestCase
 {
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->root  = vfsStream::setup('root');
-		$this->start = $this->root->url() . '/';
-	}
-
-	public function testHandle()
-	{
-		$config = new LoggerConfig();
-
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
-
-		$logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
-		$logger->setDateFormat('Y-m-d H:i:s:u');
-		$this->assertTrue($logger->handle('warning', 'This is a test log'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testBasicHandle()
-	{
-		$config                                                                = new LoggerConfig();
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['path']    = $this->start . 'charlie/';
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
-
-		$logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
-		$logger->setDateFormat('Y-m-d H:i:s:u');
-		$expected = 'log-' . date('Y-m-d') . '.log';
-		vfsStream::newFile($expected)->at(vfsStream::setup('root/charlie'))->withContent('This is a test log');
-		$this->assertTrue($logger->handle('warning', 'This is a test log'));
-	}
-
-	public function testHandleCreateFile()
-	{
-		$config                                                             = new LoggerConfig();
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
-		$logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
-
-		$logger->setDateFormat('Y-m-d H:i:s:u');
-		$expected = 'log-' . date('Y-m-d') . '.log';
-		vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('This is a test log');
-		$logger->handle('warning', 'This is a test log');
-
-		$fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'r');
-		$line = fgets($fp);
-		fclose($fp);
-
-		// did the log file get created?
-		$expectedResult = 'This is a test log';
-		$this->assertStringContainsString($expectedResult, $line);
-	}
-
-	public function testHandleDateTimeCorrectly()
-	{
-		$config                                                             = new LoggerConfig();
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
-		$logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
-
-		$logger->setDateFormat('Y-m-d');
-		$expected = 'log-' . date('Y-m-d') . '.log';
-		vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('Test message');
-		$logger->handle('debug', 'Test message');
-		$fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'r');
-		$line = fgets($fp); // and get the second line
-		fclose($fp);
-
-		$expectedResult = 'Test message';
-		$this->assertStringContainsString($expectedResult, $line);
-	}
-
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->root  = vfsStream::setup('root');
+        $this->start = $this->root->url() . '/';
+    }
+
+    public function testHandle()
+    {
+        $config = new LoggerConfig();
+
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
+
+        $logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $logger->setDateFormat('Y-m-d H:i:s:u');
+        $this->assertTrue($logger->handle('warning', 'This is a test log'));
+    }
+
+    public function testBasicHandle()
+    {
+        $config                                                                = new LoggerConfig();
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path']    = $this->start . 'charlie/';
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
+
+        $logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $logger->setDateFormat('Y-m-d H:i:s:u');
+        $expected = 'log-' . date('Y-m-d') . '.log';
+        vfsStream::newFile($expected)->at(vfsStream::setup('root/charlie'))->withContent('This is a test log');
+        $this->assertTrue($logger->handle('warning', 'This is a test log'));
+    }
+
+    public function testHandleCreateFile()
+    {
+        $config                                                             = new LoggerConfig();
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
+        $logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+
+        $logger->setDateFormat('Y-m-d H:i:s:u');
+        $expected = 'log-' . date('Y-m-d') . '.log';
+        vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('This is a test log');
+        $logger->handle('warning', 'This is a test log');
+
+        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
+        $line = fgets($fp);
+        fclose($fp);
+
+        // did the log file get created?
+        $expectedResult = 'This is a test log';
+        $this->assertStringContainsString($expectedResult, $line);
+    }
+
+    public function testHandleDateTimeCorrectly()
+    {
+        $config                                                             = new LoggerConfig();
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
+        $logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+
+        $logger->setDateFormat('Y-m-d');
+        $expected = 'log-' . date('Y-m-d') . '.log';
+        vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('Test message');
+        $logger->handle('debug', 'Test message');
+        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
+        $line = fgets($fp); // and get the second line
+        fclose($fp);
+
+        $expectedResult = 'Test message';
+        $this->assertStringContainsString($expectedResult, $line);
+    }
 }
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 1f93170eea12..b092cb31041b 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -1,439 +1,400 @@
-<?php namespace CodeIgniter\Log;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log;
 
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Log\Exceptions\LogException;
-use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\TestLogger;
 use Exception;
 use Tests\Support\Log\Handlers\TestHandler;
 
-class LoggerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LoggerTest extends CIUnitTestCase
 {
+    public function testThrowsExceptionWithBadHandlerSettings()
+    {
+        $config           = new LoggerConfig();
+        $config->handlers = null;
 
-	public function testThrowsExceptionWithBadHandlerSettings()
-	{
-		$config           = new LoggerConfig();
-		$config->handlers = null;
-
-		$this->expectException(FrameworkException::class);
-		$this->expectExceptionMessage(lang('Core.noHandlers', ['LoggerConfig']));
-
-		$logger = new Logger($config);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLogThrowsExceptionOnInvalidLevel()
-	{
-		$config = new LoggerConfig();
-
-		$this->expectException(LogException::class);
-		$this->expectExceptionMessage(lang('Log.invalidLogLevel', ['foo']));
-
-		$logger = new Logger($config);
-
-		$logger->log('foo', '');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLogReturnsFalseWhenLogNotHandled()
-	{
-		$config            = new LoggerConfig();
-		$config->threshold = 3;
-
-		$logger = new Logger($config);
-
-		$this->assertFalse($logger->log('debug', ''));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLogActuallyLogs()
-	{
-		$config = new LoggerConfig();
-		//      $Config->handlers['TestHandler']['handles'] =  [LogLevel::CRITICAL];
-
-		$logger = new Logger($config);
-
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message';
-
-		$logger->log('debug', 'Test message');
-
-		$logs = TestHandler::getLogs();
-
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLogDoesnotLogUnhandledLevels()
-	{
-		$config                                                                = new LoggerConfig();
-		$config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
-
-		$logger = new Logger($config);
-
-		$logger->log('debug', 'Test message');
-
-		$logs = TestHandler::getLogs();
-
-		$this->assertCount(0, $logs);
-	}
-
-	//--------------------------------------------------------------------
+        $this->expectException(FrameworkException::class);
+        $this->expectExceptionMessage(lang('Core.noHandlers', ['LoggerConfig']));
 
-	public function testLogInterpolatesMessage()
-	{
-		$config = new LoggerConfig();
+        $logger = new Logger($config);
+    }
 
-		$logger = new Logger($config);
+    public function testLogThrowsExceptionOnInvalidLevel()
+    {
+        $config = new LoggerConfig();
 
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message bar baz';
+        $this->expectException(LogException::class);
+        $this->expectExceptionMessage(lang('Log.invalidLogLevel', ['foo']));
 
-		$logger->log('debug', 'Test message {foo} {bar}', ['foo' => 'bar', 'bar' => 'baz']);
+        $logger = new Logger($config);
 
-		$logs = TestHandler::getLogs();
+        $logger->log('foo', '');
+    }
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+    public function testLogReturnsFalseWhenLogNotHandled()
+    {
+        $config            = new LoggerConfig();
+        $config->threshold = 3;
 
-	//--------------------------------------------------------------------
+        $logger = new Logger($config);
 
-	public function testLogInterpolatesPost()
-	{
-		$config = new LoggerConfig();
+        $this->assertFalse($logger->log('debug', ''));
+    }
 
-		$logger = new Logger($config);
+    public function testLogActuallyLogs()
+    {
+        $config = new LoggerConfig();
+        //      $Config->handlers['TestHandler']['handles'] =  [LogLevel::CRITICAL];
 
-		$_POST    = ['foo' => 'bar'];
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_POST: ' . print_r($_POST, true);
+        $logger = new Logger($config);
 
-		$logger->log('debug', 'Test message {post_vars}');
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message';
 
-		$logs = TestHandler::getLogs();
+        $logger->log('debug', 'Test message');
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logs = TestHandler::getLogs();
 
-	//--------------------------------------------------------------------
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	public function testLogInterpolatesGet()
-	{
-		$config = new LoggerConfig();
+    public function testLogDoesnotLogUnhandledLevels()
+    {
+        $config                                                                = new LoggerConfig();
+        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
-		$logger = new Logger($config);
+        $logger = new Logger($config);
 
-		$_GET     = ['bar' => 'baz'];
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_GET: ' . print_r($_GET, true);
+        $logger->log('debug', 'Test message');
 
-		$logger->log('debug', 'Test message {get_vars}');
+        $logs = TestHandler::getLogs();
 
-		$logs = TestHandler::getLogs();
+        $this->assertCount(0, $logs);
+    }
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+    public function testLogInterpolatesMessage()
+    {
+        $config = new LoggerConfig();
 
-	//--------------------------------------------------------------------
+        $logger = new Logger($config);
 
-	public function testLogInterpolatesSession()
-	{
-		$config = new LoggerConfig();
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message bar baz';
 
-		$logger = new Logger($config);
+        $logger->log('debug', 'Test message {foo} {bar}', ['foo' => 'bar', 'bar' => 'baz']);
 
-		$_SESSION = ['xxx' => 'yyy'];
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_SESSION: ' . print_r($_SESSION, true);
+        $logs = TestHandler::getLogs();
 
-		$logger->log('debug', 'Test message {session_vars}');
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logs = TestHandler::getLogs();
+    public function testLogInterpolatesPost()
+    {
+        $config = new LoggerConfig();
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logger = new Logger($config);
 
-	//--------------------------------------------------------------------
+        $_POST    = ['foo' => 'bar'];
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_POST: ' . print_r($_POST, true);
 
-	public function testLogInterpolatesCurrentEnvironment()
-	{
-		$config = new LoggerConfig();
+        $logger->log('debug', 'Test message {post_vars}');
 
-		$logger = new Logger($config);
+        $logs = TestHandler::getLogs();
 
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message ' . ENVIRONMENT;
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logger->log('debug', 'Test message {env}');
+    public function testLogInterpolatesGet()
+    {
+        $config = new LoggerConfig();
 
-		$logs = TestHandler::getLogs();
+        $logger = new Logger($config);
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $_GET     = ['bar' => 'baz'];
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_GET: ' . print_r($_GET, true);
 
-	//--------------------------------------------------------------------
+        $logger->log('debug', 'Test message {get_vars}');
 
-	public function testLogInterpolatesEnvironmentVars()
-	{
-		$config = new LoggerConfig();
+        $logs = TestHandler::getLogs();
 
-		$logger = new Logger($config);
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$_ENV['foo'] = 'bar';
+    public function testLogInterpolatesSession()
+    {
+        $config = new LoggerConfig();
 
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message bar';
+        $logger = new Logger($config);
 
-		$logger->log('debug', 'Test message {env:foo}');
+        $_SESSION = ['xxx' => 'yyy'];
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message $_SESSION: ' . print_r($_SESSION, true);
 
-		$logs = TestHandler::getLogs();
+        $logger->log('debug', 'Test message {session_vars}');
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logs = TestHandler::getLogs();
 
-	//--------------------------------------------------------------------
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	public function testLogInterpolatesFileAndLine()
-	{
-		$config = new LoggerConfig();
+    public function testLogInterpolatesCurrentEnvironment()
+    {
+        $config = new LoggerConfig();
 
-		$logger = new Logger($config);
+        $logger = new Logger($config);
 
-		$_ENV['foo'] = 'bar';
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message ' . ENVIRONMENT;
 
-		$logger->log('debug', 'Test message {file} {line}');
-		$line     = __LINE__ - 1;
-		$expected = "LoggerTest.php $line";
+        $logger->log('debug', 'Test message {env}');
 
-		$logs = TestHandler::getLogs();
+        $logs = TestHandler::getLogs();
 
-		$this->assertTrue(strpos($logs[0], $expected) > 1);
-	}
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	//--------------------------------------------------------------------
+    public function testLogInterpolatesEnvironmentVars()
+    {
+        $config = new LoggerConfig();
 
-	public function testLogInterpolatesExceptions()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $logger = new Logger($config);
 
-		$expected = 'ERROR - ' . date('Y-m-d') . ' --> [ERROR] These are not the droids you are looking for';
+        $_ENV['foo'] = 'bar';
 
-		try
-		{
-			throw new Exception('These are not the droids you are looking for');
-		}
-		catch (Exception $e)
-		{
-			$logger->log('error', '[ERROR] {exception}', ['exception' => $e]);
-		}
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message bar';
 
-		$logs = TestHandler::getLogs();
+        $logger->log('debug', 'Test message {env:foo}');
 
-		$this->assertCount(1, $logs);
-		$this->assertTrue(strpos($logs[0], $expected) === 0);
-	}
+        $logs = TestHandler::getLogs();
 
-	//--------------------------------------------------------------------
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	public function testEmergencyLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+    public function testLogInterpolatesFileAndLine()
+    {
+        $config = new LoggerConfig();
 
-		$expected = 'EMERGENCY - ' . date('Y-m-d') . ' --> Test message';
+        $logger = new Logger($config);
 
-		$logger->emergency('Test message');
+        $_ENV['foo'] = 'bar';
 
-		$logs = TestHandler::getLogs();
+        $logger->log('debug', 'Test message {file} {line}');
+        $line     = __LINE__ - 1;
+        $expected = "LoggerTest.php {$line}";
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logs = TestHandler::getLogs();
 
-	//--------------------------------------------------------------------
+        $this->assertTrue(strpos($logs[0], $expected) > 1);
+    }
 
-	public function testAlertLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+    public function testLogInterpolatesExceptions()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$expected = 'ALERT - ' . date('Y-m-d') . ' --> Test message';
+        $expected = 'ERROR - ' . date('Y-m-d') . ' --> [ERROR] These are not the droids you are looking for';
 
-		$logger->alert('Test message');
+        try {
+            throw new Exception('These are not the droids you are looking for');
+        } catch (Exception $e) {
+            $logger->log('error', '[ERROR] {exception}', ['exception' => $e]);
+        }
 
-		$logs = TestHandler::getLogs();
+        $logs = TestHandler::getLogs();
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $this->assertCount(1, $logs);
+        $this->assertTrue(strpos($logs[0], $expected) === 0);
+    }
 
-	//--------------------------------------------------------------------
+    public function testEmergencyLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-	public function testCriticalLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $expected = 'EMERGENCY - ' . date('Y-m-d') . ' --> Test message';
 
-		$expected = 'CRITICAL - ' . date('Y-m-d') . ' --> Test message';
+        $logger->emergency('Test message');
 
-		$logger->critical('Test message');
+        $logs = TestHandler::getLogs();
 
-		$logs = TestHandler::getLogs();
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+    public function testAlertLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-	//--------------------------------------------------------------------
+        $expected = 'ALERT - ' . date('Y-m-d') . ' --> Test message';
 
-	public function testErrorLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $logger->alert('Test message');
 
-		$expected = 'ERROR - ' . date('Y-m-d') . ' --> Test message';
+        $logs = TestHandler::getLogs();
 
-		$logger->error('Test message');
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logs = TestHandler::getLogs();
+    public function testCriticalLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $expected = 'CRITICAL - ' . date('Y-m-d') . ' --> Test message';
 
-	//--------------------------------------------------------------------
+        $logger->critical('Test message');
 
-	public function testWarningLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $logs = TestHandler::getLogs();
 
-		$expected = 'WARNING - ' . date('Y-m-d') . ' --> Test message';
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logger->warning('Test message');
+    public function testErrorLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$logs = TestHandler::getLogs();
+        $expected = 'ERROR - ' . date('Y-m-d') . ' --> Test message';
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logger->error('Test message');
 
-	//--------------------------------------------------------------------
+        $logs = TestHandler::getLogs();
 
-	public function testNoticeLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$expected = 'NOTICE - ' . date('Y-m-d') . ' --> Test message';
+    public function testWarningLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$logger->notice('Test message');
+        $expected = 'WARNING - ' . date('Y-m-d') . ' --> Test message';
 
-		$logs = TestHandler::getLogs();
+        $logger->warning('Test message');
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $logs = TestHandler::getLogs();
 
-	//--------------------------------------------------------------------
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	public function testInfoLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+    public function testNoticeLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$expected = 'INFO - ' . date('Y-m-d') . ' --> Test message';
+        $expected = 'NOTICE - ' . date('Y-m-d') . ' --> Test message';
 
-		$logger->info('Test message');
+        $logger->notice('Test message');
 
-		$logs = TestHandler::getLogs();
+        $logs = TestHandler::getLogs();
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-	//--------------------------------------------------------------------
+    public function testInfoLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-	public function testDebugLogsCorrectly()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $expected = 'INFO - ' . date('Y-m-d') . ' --> Test message';
 
-		$expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message';
+        $logger->info('Test message');
 
-		$logger->debug('Test message');
+        $logs = TestHandler::getLogs();
 
-		$logs = TestHandler::getLogs();
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+    public function testDebugLogsCorrectly()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-	//--------------------------------------------------------------------
+        $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message';
 
-	public function testLogLevels()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $logger->debug('Test message');
 
-		$expected = 'WARNING - ' . date('Y-m-d') . ' --> Test message';
+        $logs = TestHandler::getLogs();
 
-		$logger->log(5, 'Test message');
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logs = TestHandler::getLogs();
+    public function testLogLevels()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$this->assertCount(1, $logs);
-		$this->assertEquals($expected, $logs[0]);
-	}
+        $expected = 'WARNING - ' . date('Y-m-d') . ' --> Test message';
 
-	//--------------------------------------------------------------------
+        $logger->log(5, 'Test message');
 
-	public function testNonStringMessage()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+        $logs = TestHandler::getLogs();
 
-		$expected = '[Tests\Support\Log\Handlers\TestHandler]';
-		$logger->log(5, $config);
+        $this->assertCount(1, $logs);
+        $this->assertSame($expected, $logs[0]);
+    }
 
-		$logs = TestHandler::getLogs();
+    public function testNonStringMessage()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$this->assertCount(1, $logs);
-		$this->assertStringContainsString($expected, $logs[0]);
-	}
+        $expected = '[Tests\Support\Log\Handlers\TestHandler]';
+        $logger->log(5, $config);
 
-	//--------------------------------------------------------------------
+        $logs = TestHandler::getLogs();
 
-	public function testFilenameCleaning()
-	{
-		$config = new LoggerConfig();
-		$logger = new TestLogger($config);
+        $this->assertCount(1, $logs);
+        $this->assertStringContainsString($expected, $logs[0]);
+    }
 
-		$ohoh     = APPPATH . 'LoggerTest';
-		$expected = 'APPPATH/LoggerTest';
+    public function testFilenameCleaning()
+    {
+        $config = new LoggerConfig();
+        $logger = new TestLogger($config);
 
-		$this->assertEquals($expected, $logger->cleanup($ohoh));
-	}
+        $ohoh     = APPPATH . 'LoggerTest';
+        $expected = 'APPPATH/LoggerTest';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $logger->cleanup($ohoh));
+    }
 
-	public function testDetermineFileNoStackTrace()
-	{
-		$config = new LoggerConfig();
-		$logger = new Logger($config);
+    public function testDetermineFileNoStackTrace()
+    {
+        $config = new LoggerConfig();
+        $logger = new Logger($config);
 
-		$expected = [
-			'unknown',
-			'unknown',
-		];
+        $expected = [
+            'unknown',
+            'unknown',
+        ];
 
-		$this->assertEquals($expected, $logger->determineFile());
-	}
+        $this->assertSame($expected, $logger->determineFile());
+    }
 }
diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php
index ece479097393..f4c89e2bbeec 100644
--- a/tests/system/Models/CountAllModelTest.php
+++ b/tests/system/Models/CountAllModelTest.php
@@ -1,97 +1,108 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
-use CodeIgniter\Database\BaseBuilder;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class CountAllModelTest extends LiveModelTestCase
 {
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1617
-	 */
-	public function testCountAllResultsRespectsSoftDeletes(): void
-	{
-		$this->createModel(UserModel::class);
-
-		// testSeeder has 4 users....
-		$this->assertSame(4, $this->model->countAllResults());
-
-		$this->model->where('name', 'Derek Jones')->delete();
-		$this->assertSame(3, $this->model->countAllResults());
-	}
-
-	public function testcountAllResultsRecoverTempUseSoftDeletes(): void
-	{
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-		$this->assertSame(4, $this->model->withDeleted()->countAllResults());
-		$this->assertSame(3, $this->model->countAllResults());
-	}
-
-	public function testcountAllResultsFalseWithDeletedTrue(): void
-	{
-		$builder     = $this->loadBuilder('user');
-		$expectedSQL = $builder->testMode()->countAllResults();
-
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-
-		$this->assertSame(4, $this->model->withDeleted()->countAllResults(false));
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-		$this->assertSame(4, $this->model->countAllResults());
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertTrue($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-	}
-
-	public function testcountAllResultsFalseWithDeletedFalse(): void
-	{
-		$builder     = $this->loadBuilder('user');
-		$expectedSQL = $builder->testMode()->where('user.deleted_at', null)->countAllResults();
-
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-
-		$this->assertSame(3, $this->model->withDeleted(false)->countAllResults(false));
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-		$this->assertSame(3, $this->model->countAllResults());
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertTrue($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-	}
-
-	public function testcountAllResultsFalseWithDeletedTrueUseSoftDeletesFalse(): void
-	{
-		$builder     = $this->loadBuilder('user');
-		$expectedSQL = $builder->testMode()->countAllResults();
-
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-		$this->setPrivateProperty($this->model, 'useSoftDeletes', false);
-
-		$this->assertSame(4, $this->model->withDeleted()->countAllResults(false));
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-		$this->assertSame(4, $this->model->countAllResults());
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-	}
-
-	public function testcountAllResultsFalseWithDeletedFalseUseSoftDeletesFalse(): void
-	{
-		$builder     = $this->loadBuilder('user');
-		$expectedSQL = $builder->testMode()->where('user.deleted_at', null)->countAllResults();
-
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-		$this->setPrivateProperty($this->model, 'useSoftDeletes', false);
-
-		$this->assertSame(3, $this->model->withDeleted(false)->countAllResults(false));
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-		$this->assertSame(3, $this->model->countAllResults());
-		$this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
-		$this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
-	}
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1617
+     */
+    public function testCountAllResultsRespectsSoftDeletes(): void
+    {
+        $this->createModel(UserModel::class);
+
+        // testSeeder has 4 users....
+        $this->assertSame(4, $this->model->countAllResults());
+
+        $this->model->where('name', 'Derek Jones')->delete();
+        $this->assertSame(3, $this->model->countAllResults());
+    }
+
+    public function testcountAllResultsRecoverTempUseSoftDeletes(): void
+    {
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+        $this->assertSame(4, $this->model->withDeleted()->countAllResults());
+        $this->assertSame(3, $this->model->countAllResults());
+    }
+
+    public function testcountAllResultsFalseWithDeletedTrue(): void
+    {
+        $builder     = $this->loadBuilder('user');
+        $expectedSQL = $builder->testMode()->countAllResults();
+
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+
+        $this->assertSame(4, $this->model->withDeleted()->countAllResults(false));
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+        $this->assertSame(4, $this->model->countAllResults());
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertTrue($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+    }
+
+    public function testcountAllResultsFalseWithDeletedFalse(): void
+    {
+        $builder     = $this->loadBuilder('user');
+        $expectedSQL = $builder->testMode()->where('user.deleted_at', null)->countAllResults();
+
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+
+        $this->assertSame(3, $this->model->withDeleted(false)->countAllResults(false));
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+        $this->assertSame(3, $this->model->countAllResults());
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertTrue($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+    }
+
+    public function testcountAllResultsFalseWithDeletedTrueUseSoftDeletesFalse(): void
+    {
+        $builder     = $this->loadBuilder('user');
+        $expectedSQL = $builder->testMode()->countAllResults();
+
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+        $this->setPrivateProperty($this->model, 'useSoftDeletes', false);
+
+        $this->assertSame(4, $this->model->withDeleted()->countAllResults(false));
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+        $this->assertSame(4, $this->model->countAllResults());
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+    }
+
+    public function testcountAllResultsFalseWithDeletedFalseUseSoftDeletesFalse(): void
+    {
+        $builder     = $this->loadBuilder('user');
+        $expectedSQL = $builder->testMode()->where('user.deleted_at', null)->countAllResults();
+
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+        $this->setPrivateProperty($this->model, 'useSoftDeletes', false);
+
+        $this->assertSame(3, $this->model->withDeleted(false)->countAllResults(false));
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+        $this->assertSame(3, $this->model->countAllResults());
+        $this->assertSame($expectedSQL, (string) $this->db->getLastQuery());
+        $this->assertFalse($this->getPrivateProperty($this->model, 'tempUseSoftDeletes'));
+    }
 }
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index 2f30371b9bd9..ecd09b2ed76c 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
@@ -8,195 +17,204 @@
 use Tests\Support\Models\StringifyPkeyModel;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class DeleteModelTest extends LiveModelTestCase
 {
-	public function testDeleteBasics(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->seeInDatabase('job', ['name' => 'Developer']);
-
-		$result = $this->model->delete(1);
-		$this->assertTrue($result);
-		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
-	}
-
-	public function testDeleteFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		$this->createModel(JobModel::class);
-		$this->seeInDatabase('job', ['name' => 'Developer']);
-
-		$result = $this->model->where('name123', 'Developer')->delete();
-		$this->assertFalse($result);
-		$this->seeInDatabase('job', ['name' => 'Developer']);
-	}
-
-	public function testDeleteStringPrimaryKey(): void
-	{
-		$this->createModel(StringifyPkeyModel::class);
-		$this->seeInDatabase('stringifypkey', ['value' => 'test']);
-
-		$this->model->delete('A01');
-		$this->dontSeeInDatabase('stringifypkey', ['value' => 'test']);
-	}
-
-	public function testDeleteWithSoftDeletes(): void
-	{
-		$this->createModel(UserModel::class);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-
-		$result = $this->model->delete(1);
-		$this->assertTrue($result);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NOT NULL' => null]);
-	}
-
-	public function testDeleteWithSoftDeleteFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		$this->createModel(UserModel::class);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-
-		$result = $this->model->where('name123', 'Derek Jones')->delete();
-		$this->assertFalse($result);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-	}
-
-	public function testDeleteWithSoftDeletesPurge(): void
-	{
-		$this->createModel(UserModel::class);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-
-		$this->model->delete(1, true);
-		$this->dontSeeInDatabase('user', ['name' => 'Derek Jones']);
-	}
-
-	public function testDeleteMultiple(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->seeInDatabase('job', ['name' => 'Developer']);
-		$this->seeInDatabase('job', ['name' => 'Politician']);
-
-		$this->model->delete([1, 2]);
-		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
-		$this->dontSeeInDatabase('job', ['name' => 'Politician']);
-		$this->seeInDatabase('job', ['name' => 'Accountant']);
-	}
-
-	public function testDeleteNoParams(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->seeInDatabase('job', ['name' => 'Developer']);
-
-		$this->model->where('id', 1)->delete();
-		$this->dontSeeInDatabase('job', ['name' => 'Developer']);
-	}
-
-	public function testPurgeDeleted(): void
-	{
-		$this->createModel(UserModel::class);
-
-		$this->db->table('user')
-				 ->where('id', 1)
-				 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
-
-		$this->model->purgeDeleted();
-
-		$users = $this->model->withDeleted()->findAll();
-		$this->assertCount(3, $users);
-	}
-
-	public function testOnlyDeleted(): void
-	{
-		$this->createModel(UserModel::class);
-
-		$this->db->table('user')
-				 ->where('id', 1)
-				 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
-
-		$users = $this->model->onlyDeleted()->findAll();
-		$this->assertCount(1, $users);
-	}
-
-	/**
-	 * If where condition is set, beyond the value was empty (0,'', NULL, etc.),
-	 * Exception should not be thrown because condition was explicity set
-	 *
-	 * @dataProvider emptyPkValues
-	 */
-	public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void
-	{
-		$this->createModel(UserModel::class);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-
-		$this->model->where('id', $emptyValue)->delete();
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-	}
-
-	/**
-	 * @dataProvider emptyPkValues
-	 */
-	public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): void
-	{
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Deletes are not allowed unless they contain a "where" or "like" clause.');
-
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-		$this->createModel(UserModel::class)->delete($emptyValue);
-	}
-
-	/**
-	 * @dataProvider emptyPkValues
-	 */
-	public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void
-	{
-		$this->expectException(DatabaseException::class);
-		$this->expectExceptionMessage('Deletes are not allowed unless they contain a "where" or "like" clause.');
-
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-
-		$this->createModel(UserModel::class)->delete($emptyValue);
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
-	}
-
-	public static function emptyPkValues(): iterable
-	{
-		return [
-			[0],
-			[null],
-			['0'],
-		];
-	}
-
-	public function testThrowsWithNoDateFormat(): void
-	{
-		$this->expectException(ModelException::class);
-		$this->expectExceptionMessage('`Tests\Support\Models\UserModel` model class does not have a valid dateFormat.');
-
-		$this->createModel(UserModel::class);
-		$this->setPrivateProperty($this->model, 'dateFormat', '');
-		$this->model->delete(1);
-	}
-
-	public function testDeleteWithSoftDelete(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->setPrivateProperty($this->model, 'useSoftDeletes', true);
-
-		$this->model->delete(1);
-		$this->seeInDatabase('job', ['id' => 1, 'deleted_at IS NOT NULL' => null]);
-	}
-
-	public function testPurgeDeletedWithSoftDeleteFalse(): void
-	{
-		$this->db->table('job')
-				 ->where('id', 1)
-				 ->update(['deleted_at' => time()]);
-
-		$this->createModel(JobModel::class);
-		$this->model->purgeDeleted();
-
-		$jobs = $this->model->findAll();
-		$this->assertCount(4, $jobs);
-	}
+    public function testDeleteBasics(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->seeInDatabase('job', ['name' => 'Developer']);
+
+        $result = $this->model->delete(1);
+        $this->assertTrue($result);
+        $this->dontSeeInDatabase('job', ['name' => 'Developer']);
+    }
+
+    public function testDeleteFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        $this->createModel(JobModel::class);
+        $this->seeInDatabase('job', ['name' => 'Developer']);
+
+        $result = $this->model->where('name123', 'Developer')->delete();
+        $this->assertFalse($result);
+        $this->seeInDatabase('job', ['name' => 'Developer']);
+    }
+
+    public function testDeleteStringPrimaryKey(): void
+    {
+        $this->createModel(StringifyPkeyModel::class);
+        $this->seeInDatabase('stringifypkey', ['value' => 'test']);
+
+        $this->model->delete('A01');
+        $this->dontSeeInDatabase('stringifypkey', ['value' => 'test']);
+    }
+
+    public function testDeleteWithSoftDeletes(): void
+    {
+        $this->createModel(UserModel::class);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+
+        $result = $this->model->delete(1);
+        $this->assertTrue($result);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NOT NULL' => null]);
+    }
+
+    public function testDeleteWithSoftDeleteFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        $this->createModel(UserModel::class);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+
+        $result = $this->model->where('name123', 'Derek Jones')->delete();
+        $this->assertFalse($result);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+    }
+
+    public function testDeleteWithSoftDeletesPurge(): void
+    {
+        $this->createModel(UserModel::class);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+
+        $this->model->delete(1, true);
+        $this->dontSeeInDatabase('user', ['name' => 'Derek Jones']);
+    }
+
+    public function testDeleteMultiple(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->seeInDatabase('job', ['name' => 'Developer']);
+        $this->seeInDatabase('job', ['name' => 'Politician']);
+
+        $this->model->delete([1, 2]);
+        $this->dontSeeInDatabase('job', ['name' => 'Developer']);
+        $this->dontSeeInDatabase('job', ['name' => 'Politician']);
+        $this->seeInDatabase('job', ['name' => 'Accountant']);
+    }
+
+    public function testDeleteNoParams(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->seeInDatabase('job', ['name' => 'Developer']);
+
+        $this->model->where('id', 1)->delete();
+        $this->dontSeeInDatabase('job', ['name' => 'Developer']);
+    }
+
+    public function testPurgeDeleted(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $this->db->table('user')
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+
+        $this->model->purgeDeleted();
+
+        $users = $this->model->withDeleted()->findAll();
+        $this->assertCount(3, $users);
+    }
+
+    public function testOnlyDeleted(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $this->db->table('user')
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+
+        $users = $this->model->onlyDeleted()->findAll();
+        $this->assertCount(1, $users);
+    }
+
+    /**
+     * If where condition is set, beyond the value was empty (0,'', NULL, etc.),
+     * Exception should not be thrown because condition was explicity set
+     *
+     * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
+     */
+    public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void
+    {
+        $this->createModel(UserModel::class);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+
+        $this->model->where('id', $emptyValue)->delete();
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+    }
+
+    /**
+     * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
+     */
+    public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): void
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Deletes are not allowed unless they contain a "where" or "like" clause.');
+
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+        $this->createModel(UserModel::class)->delete($emptyValue);
+    }
+
+    /**
+     * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
+     */
+    public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Deletes are not allowed unless they contain a "where" or "like" clause.');
+
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+
+        $this->createModel(UserModel::class)->delete($emptyValue);
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NULL' => null]);
+    }
+
+    public static function emptyPkValues(): iterable
+    {
+        return [
+            [0],
+            [null],
+            ['0'],
+        ];
+    }
+
+    public function testThrowsWithNoDateFormat(): void
+    {
+        $this->expectException(ModelException::class);
+        $this->expectExceptionMessage('`Tests\Support\Models\UserModel` model class does not have a valid dateFormat.');
+
+        $this->createModel(UserModel::class);
+        $this->setPrivateProperty($this->model, 'dateFormat', '');
+        $this->model->delete(1);
+    }
+
+    public function testDeleteWithSoftDelete(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->setPrivateProperty($this->model, 'useSoftDeletes', true);
+
+        $this->model->delete(1);
+        $this->seeInDatabase('job', ['id' => 1, 'deleted_at IS NOT NULL' => null]);
+    }
+
+    public function testPurgeDeletedWithSoftDeleteFalse(): void
+    {
+        $this->db->table('job')
+            ->where('id', 1)
+            ->update(['deleted_at' => time()]);
+
+        $this->createModel(JobModel::class);
+        $this->model->purgeDeleted();
+
+        $jobs = $this->model->findAll();
+        $this->assertCount(4, $jobs);
+    }
 }
diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php
index 43ddecd8862c..09194396099c 100644
--- a/tests/system/Models/EventsModelTest.php
+++ b/tests/system/Models/EventsModelTest.php
@@ -1,161 +1,173 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
 use Tests\Support\Models\EventModel;
 
+/**
+ * @internal
+ */
 final class EventsModelTest extends LiveModelTestCase
 {
-	/**
-	 * @var EventModel
-	 */
-	protected $model;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->createModel(EventModel::class);
-	}
-
-	public function testInsertEvent(): void
-	{
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$this->model->insert($data);
-		$this->assertTrue($this->model->hasToken('beforeInsert'));
-		$this->assertTrue($this->model->hasToken('afterInsert'));
-	}
-
-	public function testUpdateEvent(): void
-	{
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$id = $this->model->insert($data);
-
-		$this->model->update($id, $data);
-		$this->assertTrue($this->model->hasToken('beforeUpdate'));
-		$this->assertTrue($this->model->hasToken('afterUpdate'));
-	}
-
-	public function testDeleteEvent(): void
-	{
-		$this->model->delete(1);
-		$this->assertTrue($this->model->hasToken('beforeDelete'));
-		$this->assertTrue($this->model->hasToken('afterDelete'));
-	}
-
-	public function testFindEvent(): void
-	{
-		$this->model->find(1);
-		$this->assertTrue($this->model->hasToken('beforeFind'));
-		$this->assertTrue($this->model->hasToken('afterFind'));
-	}
-
-	public function testBeforeFindReturnsData(): void
-	{
-		$this->model->beforeFindReturnData = true;
-
-		$result = $this->model->find(1);
-		$this->assertTrue($this->model->hasToken('beforeFind'));
-		$this->assertSame($result, 'foobar');
-	}
-
-	public function testBeforeFindReturnDataPreventsAfterFind(): void
-	{
-		$this->model->beforeFindReturnData = true;
-		$this->model->find(1);
-		$this->assertFalse($this->model->hasToken('afterFind'));
-	}
-
-	public function testFindEventSingletons(): void
-	{
-		// afterFind
-		$this->model->first();
-		$this->assertTrue($this->model->eventData['singleton']);
-
-		$this->model->find(1);
-		$this->assertTrue($this->model->eventData['singleton']);
-
-		$this->model->find();
-		$this->assertFalse($this->model->eventData['singleton']);
-
-		$this->model->findAll();
-		$this->assertFalse($this->model->eventData['singleton']);
-
-		// beforeFind
-		$this->model->beforeFindReturnData = true;
-
-		$this->model->first();
-		$this->assertTrue($this->model->eventData['singleton']);
-
-		$this->model->find(1);
-		$this->assertTrue($this->model->eventData['singleton']);
-
-		$this->model->find();
-		$this->assertFalse($this->model->eventData['singleton']);
-
-		$this->model->findAll();
-		$this->assertFalse($this->model->eventData['singleton']);
-	}
-
-	public function testAllowCallbacksFalsePreventsTriggers(): void
-	{
-		$this->model->allowCallbacks(false)->find(1);
-		$this->assertFalse($this->model->hasToken('afterFind'));
-	}
-
-	public function testAllowCallbacksTrueFiresTriggers(): void
-	{
-		$this->setPrivateProperty($this->model, 'allowCallbacks', false);
-		$this->model->allowCallbacks(true)->find(1);
-		$this->assertTrue($this->model->hasToken('afterFind'));
-	}
-
-	public function testAllowCallbacksResetsAfterTrigger(): void
-	{
-		$this->model->allowCallbacks(false)->find(1);
-		$this->model->delete(1);
-
-		$this->assertFalse($this->model->hasToken('afterFind'));
-		$this->assertTrue($this->model->hasToken('afterDelete'));
-	}
-
-	public function testAllowCallbacksUsesModelProperty(): void
-	{
-		$this->setPrivateProperty($this->model, 'allowCallbacks', false);
-		$this->setPrivateProperty($this->model, 'tempAllowCallbacks', false); // Was already set by the constructor
-
-		$this->model->find(1);
-		$this->model->delete(1);
-
-		$this->assertFalse($this->model->hasToken('afterFind'));
-		$this->assertFalse($this->model->hasToken('afterDelete'));
-	}
-
-	public function testInvalidEventException(): void
-	{
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$this->setPrivateProperty($this->model, 'beforeInsert', ['anotherBeforeInsertMethod']);
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('anotherBeforeInsertMethod is not a valid Model Event callback.');
-		$this->model->insert($data);
-	}
+    /**
+     * @var EventModel
+     */
+    protected $model;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->createModel(EventModel::class);
+    }
+
+    public function testInsertEvent(): void
+    {
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $this->model->insert($data);
+        $this->assertTrue($this->model->hasToken('beforeInsert'));
+        $this->assertTrue($this->model->hasToken('afterInsert'));
+    }
+
+    public function testUpdateEvent(): void
+    {
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $id = $this->model->insert($data);
+
+        $this->model->update($id, $data);
+        $this->assertTrue($this->model->hasToken('beforeUpdate'));
+        $this->assertTrue($this->model->hasToken('afterUpdate'));
+    }
+
+    public function testDeleteEvent(): void
+    {
+        $this->model->delete(1);
+        $this->assertTrue($this->model->hasToken('beforeDelete'));
+        $this->assertTrue($this->model->hasToken('afterDelete'));
+    }
+
+    public function testFindEvent(): void
+    {
+        $this->model->find(1);
+        $this->assertTrue($this->model->hasToken('beforeFind'));
+        $this->assertTrue($this->model->hasToken('afterFind'));
+    }
+
+    public function testBeforeFindReturnsData(): void
+    {
+        $this->model->beforeFindReturnData = true;
+
+        $result = $this->model->find(1);
+        $this->assertTrue($this->model->hasToken('beforeFind'));
+        $this->assertSame($result, 'foobar');
+    }
+
+    public function testBeforeFindReturnDataPreventsAfterFind(): void
+    {
+        $this->model->beforeFindReturnData = true;
+        $this->model->find(1);
+        $this->assertFalse($this->model->hasToken('afterFind'));
+    }
+
+    public function testFindEventSingletons(): void
+    {
+        // afterFind
+        $this->model->first();
+        $this->assertTrue($this->model->eventData['singleton']);
+
+        $this->model->find(1);
+        $this->assertTrue($this->model->eventData['singleton']);
+
+        $this->model->find();
+        $this->assertFalse($this->model->eventData['singleton']);
+
+        $this->model->findAll();
+        $this->assertFalse($this->model->eventData['singleton']);
+
+        // beforeFind
+        $this->model->beforeFindReturnData = true;
+
+        $this->model->first();
+        $this->assertTrue($this->model->eventData['singleton']);
+
+        $this->model->find(1);
+        $this->assertTrue($this->model->eventData['singleton']);
+
+        $this->model->find();
+        $this->assertFalse($this->model->eventData['singleton']);
+
+        $this->model->findAll();
+        $this->assertFalse($this->model->eventData['singleton']);
+    }
+
+    public function testAllowCallbacksFalsePreventsTriggers(): void
+    {
+        $this->model->allowCallbacks(false)->find(1);
+        $this->assertFalse($this->model->hasToken('afterFind'));
+    }
+
+    public function testAllowCallbacksTrueFiresTriggers(): void
+    {
+        $this->setPrivateProperty($this->model, 'allowCallbacks', false);
+        $this->model->allowCallbacks(true)->find(1);
+        $this->assertTrue($this->model->hasToken('afterFind'));
+    }
+
+    public function testAllowCallbacksResetsAfterTrigger(): void
+    {
+        $this->model->allowCallbacks(false)->find(1);
+        $this->model->delete(1);
+
+        $this->assertFalse($this->model->hasToken('afterFind'));
+        $this->assertTrue($this->model->hasToken('afterDelete'));
+    }
+
+    public function testAllowCallbacksUsesModelProperty(): void
+    {
+        $this->setPrivateProperty($this->model, 'allowCallbacks', false);
+        $this->setPrivateProperty($this->model, 'tempAllowCallbacks', false); // Was already set by the constructor
+
+        $this->model->find(1);
+        $this->model->delete(1);
+
+        $this->assertFalse($this->model->hasToken('afterFind'));
+        $this->assertFalse($this->model->hasToken('afterDelete'));
+    }
+
+    public function testInvalidEventException(): void
+    {
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $this->setPrivateProperty($this->model, 'beforeInsert', ['anotherBeforeInsertMethod']);
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('anotherBeforeInsertMethod is not a valid Model Event callback.');
+        $this->model->insert($data);
+    }
 }
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index eac062db1571..bf06422d8f5f 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
@@ -8,296 +17,300 @@
 use Tests\Support\Models\SecondaryModel;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class FindModelTest extends LiveModelTestCase
 {
-	public function testFindReturnsRow(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->assertSame('Musician', $this->model->find(4)->name);
-	}
-
-	public function testFindReturnsMultipleRows(): void
-	{
-		$this->createModel(JobModel::class);
-		$jobs = $this->model->find([1, 4]);
-
-		$this->assertSame('Developer', $jobs[0]->name);
-		$this->assertSame('Musician', $jobs[1]->name);
-	}
-
-	public function testGetColumnWithStringColumnName(): void
-	{
-		$this->createModel(JobModel::class);
-		$job = $this->model->findColumn('name');
-
-		$this->assertSame('Developer', $job[0]);
-		$this->assertSame('Politician', $job[1]);
-		$this->assertSame('Accountant', $job[2]);
-		$this->assertSame('Musician', $job[3]);
-	}
-
-	public function testGetColumnsWithMultipleColumnNames(): void
-	{
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('Only single column allowed in Column name.');
-		$this->createModel(JobModel::class)->findColumn('name,description');
-	}
-
-	public function testFindActsAsGetWithNoParams(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$jobs = $this->model->asArray()->find();
-		$this->assertCount(4, $jobs);
-
-		$names = array_column($jobs, 'name');
-		$this->assertContains('Developer', $names);
-		$this->assertContains('Politician', $names);
-		$this->assertContains('Accountant', $names);
-		$this->assertContains('Musician', $names);
-	}
-
-	public function testFindRespectsReturnArray(): void
-	{
-		$job = $this->createModel(JobModel::class)->asArray()->find(4);
-		$this->assertIsArray($job);
-	}
-
-	public function testFindRespectsReturnObject(): void
-	{
-		$job = $this->createModel(JobModel::class)->asObject()->find(4);
-		$this->assertIsObject($job);
-	}
-
-	public function testFindRespectsSoftDeletes(): void
-	{
-		$this->db->table('user')
-				 ->where('id', 4)
-				 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
-
-		$this->createModel(UserModel::class);
-
-		$user = $this->model->find(4);
-		$this->assertEmpty($user);
-
-		$user  = $this->model->withDeleted()->find(4);
-		$count = is_object($user) ? 1 : 0;
-		$this->assertSame(1, $count);
-	}
-
-	public function testFindClearsBinds(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->model->find(1);
-		$this->model->find(1);
-
-		// Binds should be reset to 0 after each one
-		$binds = $this->model->builder()->getBinds();
-		$this->assertCount(0, $binds);
-
-		$query = $this->model->getLastQuery();
-		$this->assertCount(1, $this->getPrivateProperty($query, 'binds'));
-	}
-
-	public function testFindAllReturnsAllRecords(): void
-	{
-		$users = $this->createModel(UserModel::class)->findAll();
-		$this->assertCount(4, $users);
-	}
-
-	public function testFindAllRespectsLimits(): void
-	{
-		$users = $this->createModel(UserModel::class)->findAll(2);
-		$this->assertCount(2, $users);
-		$this->assertSame('Derek Jones', $users[0]->name);
-	}
-
-	public function testFindAllRespectsLimitsAndOffset(): void
-	{
-		$users = $this->createModel(UserModel::class)->findAll(2, 2);
-		$this->assertCount(2, $users);
-		$this->assertSame('Richard A Causey', $users[0]->name);
-	}
-
-	public function testFindAllRespectsSoftDeletes(): void
-	{
-		$this->db->table('user')
-				 ->where('id', 4)
-				 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
-
-		$this->createModel(UserModel::class);
-
-		$user = $this->model->findAll();
-		$this->assertCount(3, $user);
-
-		$user = $this->model->withDeleted()->findAll();
-		$this->assertCount(4, $user);
-	}
-
-	public function testFirst(): void
-	{
-		$user  = $this->createModel(UserModel::class)->where('id >', 2)->first();
-		$count = is_object($user) ? 1 : 0;
-		$this->assertSame(1, $count);
-		$this->assertSame(3, (int) $user->id);
-	}
-
-	/**
-	 * @dataProvider provideGroupBy
-	 */
-	public function testFirstAggregate($groupBy, $total): void
-	{
-		$this->createModel(UserModel::class);
-
-		if ($groupBy)
-		{
-			$this->model->groupBy('id');
-		}
-
-		$user = $this->model->select('SUM(id) as total')->where('id >', 2)->first();
-		$this->assertSame($total, (int) $user->total);
-	}
-
-	public static function provideGroupBy(): iterable
-	{
-		return [
-			[true, 3],
-			[false, 7],
-		];
-	}
-
-	/**
-	 * @dataProvider provideAggregateAndGroupBy
-	 */
-	public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
-	{
-		$this->db->table('user')
-				 ->where('id', 1)
-				 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
-
-		$this->createModel(UserModel::class);
-
-		if ($aggregate)
-		{
-			$this->model->select('SUM(id) as id');
-		}
-
-		if ($groupBy)
-		{
-			$this->model->groupBy('id');
-		}
-
-		$user = $this->model->first();
-
-		if (! $aggregate || $groupBy)
-		{
-			$count = is_object($user) ? 1 : 0;
-			$this->assertSame(1, $count);
-			$this->assertSame(2, (int) $user->id);
-		}
-		else
-		{
-			$this->assertSame(9, (int) $user->id);
-		}
-
-		$user = $this->model->withDeleted()->first();
-		$this->assertSame(1, (int) $user->id);
-	}
-
-	/**
-	 * @dataProvider provideAggregateAndGroupBy
-	 */
-	public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
-	{
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-
-		if ($aggregate)
-		{
-			$this->model->select('sum(id) as id');
-		}
-
-		if ($groupBy)
-		{
-			$this->model->groupBy('id');
-		}
-
-		$user = $this->model->withDeleted()->first();
-		$this->assertSame(1, (int) $user->id);
-
-		$user2 = $this->model->first();
-		$this->assertSame(2, (int) $user2->id);
-	}
-
-	public static function provideAggregateAndGroupBy(): iterable
-	{
-		return [
-			[true, true],
-			[false, false],
-			[true, false],
-			[false, true],
-		];
-	}
-
-	public function testFirstWithNoPrimaryKey(): void
-	{
-		$this->createModel(SecondaryModel::class);
-
-		$this->db->table('secondary')->insert([
-			'key'   => 'foo',
-			'value' => 'bar',
-		]);
-
-		$this->db->table('secondary')->insert([
-			'key'   => 'bar',
-			'value' => 'baz',
-		]);
-
-		$record = $this->model->first();
-		$this->assertInstanceOf('stdClass', $record);
-		$this->assertSame('foo', $record->key);
-	}
-
-	public function testThrowsWithNoPrimaryKey(): void
-	{
-		$this->expectException(ModelException::class);
-		$this->expectExceptionMessage('`Tests\Support\Models\UserModel` model class does not specify a Primary Key.');
-
-		$this->createModel(UserModel::class);
-		$this->setPrivateProperty($this->model, 'primaryKey', '');
-		$this->model->find(1);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
-	 */
-	public function testSoftDeleteWithTableJoinsFindAll(): void
-	{
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
-
-		$results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->findAll();
-		$this->assertCount(4, $results);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
-	 */
-	public function testSoftDeleteWithTableJoinsFind(): void
-	{
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
-
-		$results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->find(1);
-		$this->assertSame(1, (int) $results->id);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
-	 */
-	public function testSoftDeleteWithTableJoinsFirst(): void
-	{
-		$this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
-
-		$results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first(1);
-		$this->assertSame(1, (int) $results->id);
-	}
+    public function testFindReturnsRow(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->assertSame('Musician', $this->model->find(4)->name);
+    }
+
+    public function testFindReturnsMultipleRows(): void
+    {
+        $this->createModel(JobModel::class);
+        $jobs = $this->model->find([1, 4]);
+
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+    }
+
+    public function testGetColumnWithStringColumnName(): void
+    {
+        $this->createModel(JobModel::class);
+        $job = $this->model->findColumn('name');
+
+        $this->assertSame('Developer', $job[0]);
+        $this->assertSame('Politician', $job[1]);
+        $this->assertSame('Accountant', $job[2]);
+        $this->assertSame('Musician', $job[3]);
+    }
+
+    public function testGetColumnsWithMultipleColumnNames(): void
+    {
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('Only single column allowed in Column name.');
+        $this->createModel(JobModel::class)->findColumn('name,description');
+    }
+
+    public function testFindActsAsGetWithNoParams(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $jobs = $this->model->asArray()->find();
+        $this->assertCount(4, $jobs);
+
+        $names = array_column($jobs, 'name');
+        $this->assertContains('Developer', $names);
+        $this->assertContains('Politician', $names);
+        $this->assertContains('Accountant', $names);
+        $this->assertContains('Musician', $names);
+    }
+
+    public function testFindRespectsReturnArray(): void
+    {
+        $job = $this->createModel(JobModel::class)->asArray()->find(4);
+        $this->assertIsArray($job);
+    }
+
+    public function testFindRespectsReturnObject(): void
+    {
+        $job = $this->createModel(JobModel::class)->asObject()->find(4);
+        $this->assertIsObject($job);
+    }
+
+    public function testFindRespectsSoftDeletes(): void
+    {
+        $this->db->table('user')
+            ->where('id', 4)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+
+        $this->createModel(UserModel::class);
+
+        $user = $this->model->find(4);
+        $this->assertEmpty($user);
+
+        $user  = $this->model->withDeleted()->find(4);
+        $count = is_object($user) ? 1 : 0;
+        $this->assertSame(1, $count);
+    }
+
+    public function testFindClearsBinds(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->model->find(1);
+        $this->model->find(1);
+
+        // Binds should be reset to 0 after each one
+        $binds = $this->model->builder()->getBinds();
+        $this->assertCount(0, $binds);
+
+        $query = $this->model->getLastQuery();
+        $this->assertCount(1, $this->getPrivateProperty($query, 'binds'));
+    }
+
+    public function testFindAllReturnsAllRecords(): void
+    {
+        $users = $this->createModel(UserModel::class)->findAll();
+        $this->assertCount(4, $users);
+    }
+
+    public function testFindAllRespectsLimits(): void
+    {
+        $users = $this->createModel(UserModel::class)->findAll(2);
+        $this->assertCount(2, $users);
+        $this->assertSame('Derek Jones', $users[0]->name);
+    }
+
+    public function testFindAllRespectsLimitsAndOffset(): void
+    {
+        $users = $this->createModel(UserModel::class)->findAll(2, 2);
+        $this->assertCount(2, $users);
+        $this->assertSame('Richard A Causey', $users[0]->name);
+    }
+
+    public function testFindAllRespectsSoftDeletes(): void
+    {
+        $this->db->table('user')
+            ->where('id', 4)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+
+        $this->createModel(UserModel::class);
+
+        $user = $this->model->findAll();
+        $this->assertCount(3, $user);
+
+        $user = $this->model->withDeleted()->findAll();
+        $this->assertCount(4, $user);
+    }
+
+    public function testFirst(): void
+    {
+        $user  = $this->createModel(UserModel::class)->where('id >', 2)->first();
+        $count = is_object($user) ? 1 : 0;
+        $this->assertSame(1, $count);
+        $this->assertSame(3, (int) $user->id);
+    }
+
+    /**
+     * @dataProvider provideGroupBy
+     *
+     * @param mixed $groupBy
+     * @param mixed $total
+     */
+    public function testFirstAggregate($groupBy, $total): void
+    {
+        $this->createModel(UserModel::class);
+
+        if ($groupBy) {
+            $this->model->groupBy('id');
+        }
+
+        $user = $this->model->select('SUM(id) as total')->where('id >', 2)->first();
+        $this->assertSame($total, (int) $user->total);
+    }
+
+    public static function provideGroupBy(): iterable
+    {
+        return [
+            [true, 3],
+            [false, 7],
+        ];
+    }
+
+    /**
+     * @dataProvider provideAggregateAndGroupBy
+     *
+     * @param mixed $aggregate
+     * @param mixed $groupBy
+     */
+    public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
+    {
+        $this->db->table('user')
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+
+        $this->createModel(UserModel::class);
+
+        if ($aggregate) {
+            $this->model->select('SUM(id) as id');
+        }
+
+        if ($groupBy) {
+            $this->model->groupBy('id');
+        }
+
+        $user = $this->model->first();
+
+        if (! $aggregate || $groupBy) {
+            $count = is_object($user) ? 1 : 0;
+            $this->assertSame(1, $count);
+            $this->assertSame(2, (int) $user->id);
+        } else {
+            $this->assertSame(9, (int) $user->id);
+        }
+
+        $user = $this->model->withDeleted()->first();
+        $this->assertSame(1, (int) $user->id);
+    }
+
+    /**
+     * @dataProvider provideAggregateAndGroupBy
+     *
+     * @param mixed $aggregate
+     * @param mixed $groupBy
+     */
+    public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
+    {
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+
+        if ($aggregate) {
+            $this->model->select('sum(id) as id');
+        }
+
+        if ($groupBy) {
+            $this->model->groupBy('id');
+        }
+
+        $user = $this->model->withDeleted()->first();
+        $this->assertSame(1, (int) $user->id);
+
+        $user2 = $this->model->first();
+        $this->assertSame(2, (int) $user2->id);
+    }
+
+    public static function provideAggregateAndGroupBy(): iterable
+    {
+        return [
+            [true, true],
+            [false, false],
+            [true, false],
+            [false, true],
+        ];
+    }
+
+    public function testFirstWithNoPrimaryKey(): void
+    {
+        $this->createModel(SecondaryModel::class);
+
+        $this->db->table('secondary')->insert([
+            'key'   => 'foo',
+            'value' => 'bar',
+        ]);
+
+        $this->db->table('secondary')->insert([
+            'key'   => 'bar',
+            'value' => 'baz',
+        ]);
+
+        $record = $this->model->first();
+        $this->assertInstanceOf('stdClass', $record);
+        $this->assertSame('foo', $record->key);
+    }
+
+    public function testThrowsWithNoPrimaryKey(): void
+    {
+        $this->expectException(ModelException::class);
+        $this->expectExceptionMessage('`Tests\Support\Models\UserModel` model class does not specify a Primary Key.');
+
+        $this->createModel(UserModel::class);
+        $this->setPrivateProperty($this->model, 'primaryKey', '');
+        $this->model->find(1);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
+     */
+    public function testSoftDeleteWithTableJoinsFindAll(): void
+    {
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
+
+        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->findAll();
+        $this->assertCount(4, $results);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
+     */
+    public function testSoftDeleteWithTableJoinsFind(): void
+    {
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
+
+        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->find(1);
+        $this->assertSame(1, (int) $results->id);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1881
+     */
+    public function testSoftDeleteWithTableJoinsFirst(): void
+    {
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
+
+        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first(1);
+        $this->assertSame(1, (int) $results->id);
+    }
 }
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index cfca5c039a9e..cc41c453603b 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use BadMethodCallException;
@@ -12,154 +21,147 @@
 /**
  * GeneralModelTest should be used when only testing Model's
  * features without requiring a database connection.
+ *
+ * @internal
  */
 final class GeneralModelTest extends CIUnitTestCase
 {
-	/**
-	 * Current instance of the Model.
-	 *
-	 * @var Model
-	 */
-	private $model;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-		$this->resetServices();
-	}
-
-	/**
-	 * Create an instance of Model for use in testing.
-	 *
-	 * @param string              $modelName
-	 * @param BaseConnection|null $db
-	 *
-	 * @return Model
-	 */
-	private function createModel(string $modelName, BaseConnection $db = null): Model
-	{
-		$this->model = new $modelName($db);
-
-		return $this->model;
-	}
-
-	public function testGetModelDetails(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$this->assertSame('job', $this->model->table);
-		$this->assertSame('id', $this->model->primaryKey);
-		$this->assertSame('object', $this->model->returnType);
-		$this->assertNull($this->model->DBGroup);
-	}
-
-	public function testMagicGetters(): void
-	{
-		$this->createModel(UserModel::class);
-
-		$this->assertTrue(isset($this->model->table));
-		$this->assertSame('user', $this->model->table);
-		$this->assertFalse(isset($this->model->foobar));
-		$this->assertNull($this->model->foobar);
-
-		$this->model->flavor = 'chocolate';
-		$this->assertTrue(isset($this->model->flavor));
-		$this->assertSame('chocolate', $this->model->flavor);
-
-		// from DB
-		$this->assertTrue(isset($this->model->DBPrefix));
-		$this->assertSame('utf8', $this->model->charset);
-
-		// from Builder
-		$this->assertTrue(isset($this->model->QBNoEscape));
-		$this->assertIsArray($this->model->QBNoEscape);
-	}
-
-	public function testUndefinedModelMethod(): void
-	{
-		$this->expectException(BadMethodCallException::class);
-		$this->expectExceptionMessage('Call to undefined method Tests\Support\Models\UserModel::undefinedMethodCall');
-		$this->createModel(UserModel::class)->undefinedMethodCall();
-	}
-
-	public function testSetAllowedFields(): void
-	{
-		$allowed1 = [
-			'id',
-			'created_at',
-		];
-		$allowed2 = [
-			'id',
-			'updated_at',
-		];
-
-		$model = new class extends Model
-		{
-			protected $allowedFields = [
-				'id',
-				'created_at',
-			];
-		};
-
-		$this->assertSame($allowed1, $this->getPrivateProperty($model, 'allowedFields'));
-
-		$model->setAllowedFields($allowed2);
-		$this->assertSame($allowed2, $this->getPrivateProperty($model, 'allowedFields'));
-	}
-
-	public function testBuilderUsesModelTable(): void
-	{
-		$builder = $this->createModel(UserModel::class)->builder();
-		$this->assertSame('user', $builder->getTable());
-	}
-
-	public function testBuilderRespectsTableParameter(): void
-	{
-		$this->createModel(UserModel::class);
-		$builder1 = $this->model->builder('jobs');
-		$builder2 = $this->model->builder();
-
-		$this->assertSame('jobs', $builder1->getTable());
-		$this->assertSame('user', $builder2->getTable());
-	}
-
-	public function testBuilderWithParameterIgnoresShared(): void
-	{
-		$this->createModel(UserModel::class);
-		$builder1 = $this->model->builder();
-		$builder2 = $this->model->builder('jobs');
-		$builder3 = $this->model->builder();
-
-		$this->assertSame('user', $builder1->getTable());
-		$this->assertSame('jobs', $builder2->getTable());
-		$this->assertSame('user', $builder3->getTable());
-	}
-
-	public function testInitialize(): void
-	{
-		$model = new class extends Model {
-
-			/**
-			 * @var boolean
-			 */
-			public $initialized = false;
-
-			/**
-			 * Marks the model as initialized.
-			 *
-			 * @return void
-			 */
-			protected function initialize(): void
-			{
-				$this->initialized = true;
-			}
-		};
-
-		$this->assertTrue($model->initialized);
-	}
+    /**
+     * Current instance of the Model.
+     *
+     * @var Model
+     */
+    private $model;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->resetServices();
+    }
+
+    /**
+     * Create an instance of Model for use in testing.
+     */
+    private function createModel(string $modelName, ?BaseConnection $db = null): Model
+    {
+        $this->model = new $modelName($db);
+
+        return $this->model;
+    }
+
+    public function testGetModelDetails(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $this->assertSame('job', $this->model->table);
+        $this->assertSame('id', $this->model->primaryKey);
+        $this->assertSame('object', $this->model->returnType);
+        $this->assertNull($this->model->DBGroup);
+    }
+
+    public function testMagicGetters(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $this->assertTrue(isset($this->model->table));
+        $this->assertSame('user', $this->model->table);
+        $this->assertFalse(isset($this->model->foobar));
+        $this->assertNull($this->model->foobar);
+
+        $this->model->flavor = 'chocolate';
+        $this->assertTrue(isset($this->model->flavor));
+        $this->assertSame('chocolate', $this->model->flavor);
+
+        // from DB
+        $this->assertTrue(isset($this->model->DBPrefix));
+        $this->assertSame('utf8', $this->model->charset);
+
+        // from Builder
+        $this->assertTrue(isset($this->model->QBNoEscape));
+        $this->assertIsArray($this->model->QBNoEscape);
+    }
+
+    public function testUndefinedModelMethod(): void
+    {
+        $this->expectException(BadMethodCallException::class);
+        $this->expectExceptionMessage('Call to undefined method Tests\Support\Models\UserModel::undefinedMethodCall');
+        $this->createModel(UserModel::class)->undefinedMethodCall();
+    }
+
+    public function testSetAllowedFields(): void
+    {
+        $allowed1 = [
+            'id',
+            'created_at',
+        ];
+        $allowed2 = [
+            'id',
+            'updated_at',
+        ];
+
+        $model                       = new class () extends Model {
+            protected $allowedFields = [
+                'id',
+                'created_at',
+            ];
+        };
+
+        $this->assertSame($allowed1, $this->getPrivateProperty($model, 'allowedFields'));
+
+        $model->setAllowedFields($allowed2);
+        $this->assertSame($allowed2, $this->getPrivateProperty($model, 'allowedFields'));
+    }
+
+    public function testBuilderUsesModelTable(): void
+    {
+        $builder = $this->createModel(UserModel::class)->builder();
+        $this->assertSame('user', $builder->getTable());
+    }
+
+    public function testBuilderRespectsTableParameter(): void
+    {
+        $this->createModel(UserModel::class);
+        $builder1 = $this->model->builder('jobs');
+        $builder2 = $this->model->builder();
+
+        $this->assertSame('jobs', $builder1->getTable());
+        $this->assertSame('user', $builder2->getTable());
+    }
+
+    public function testBuilderWithParameterIgnoresShared(): void
+    {
+        $this->createModel(UserModel::class);
+        $builder1 = $this->model->builder();
+        $builder2 = $this->model->builder('jobs');
+        $builder3 = $this->model->builder();
+
+        $this->assertSame('user', $builder1->getTable());
+        $this->assertSame('jobs', $builder2->getTable());
+        $this->assertSame('user', $builder3->getTable());
+    }
+
+    public function testInitialize(): void
+    {
+        $model = new class () extends Model {
+            /**
+             * @var bool
+             */
+            public $initialized = false;
+
+            /**
+             * Marks the model as initialized.
+             */
+            protected function initialize(): void
+            {
+                $this->initialized = true;
+            }
+        };
+
+        $this->assertTrue($model->initialized);
+    }
 }
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 1ad45d67859e..38b86eb67e30 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
@@ -10,272 +19,273 @@
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class InsertModelTest extends LiveModelTestCase
 {
-	public function testSetWorksWithInsert(): void
-	{
-		$this->dontSeeInDatabase('user', [
-			'email' => 'foo@example.com',
-		]);
-
-		$this->createModel(UserModel::class)->set([
-			'email'   => 'foo@example.com',
-			'name'    => 'Foo Bar',
-			'country' => 'US',
-		])->insert();
-
-		$this->seeInDatabase('user', [
-			'email' => 'foo@example.com',
-		]);
-	}
-
-	public function testInsertBatchSuccess(): void
-	{
-		$jobData = [
-			[
-				'name'        => 'Comedian',
-				'description' => 'There\'s something in your teeth',
-			],
-			[
-				'name'        => 'Cab Driver',
-				'description' => 'I am yellow',
-			],
-		];
-
-		$this->createModel(JobModel::class)->insertBatch($jobData);
-		$this->seeInDatabase('job', ['name' => 'Comedian']);
-		$this->seeInDatabase('job', ['name' => 'Cab Driver']);
-	}
-
-	public function testInsertBatchValidationFail(): void
-	{
-		$jobData = [
-			[
-				'name'        => 'Comedian',
-				'description' => null,
-			],
-		];
-
-		$this->createModel(JobModel::class);
-
-		$this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
-		$this->assertFalse($this->model->insertBatch($jobData));
-
-		$error = $this->model->errors();
-		$this->assertTrue(isset($error['description']));
-	}
-
-	public function testInsertBatchSetsIntTimestamps(): void
-	{
-		$jobData = [
-			[
-				'name' => 'Philosopher',
-			],
-			[
-				'name' => 'Laborer',
-			],
-		];
-
-		$this->createModel(JobModel::class);
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->assertSame(2, $this->model->insertBatch($jobData));
-
-		$result = $this->model->where('name', 'Philosopher')->first();
-		$this->assertCloseEnough(time(), $result->created_at);
-	}
-
-	public function testInsertBatchSetsDatetimeTimestamps(): void
-	{
-		$userData = [
-			[
-				'name'    => 'Lou',
-				'email'   => 'lou@example.com',
-				'country' => 'Ireland',
-			],
-			[
-				'name'    => 'Sue',
-				'email'   => 'sue@example.com',
-				'country' => 'Ireland',
-			],
-		];
-
-		$this->createModel(UserModel::class);
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->assertSame(2, $this->model->insertBatch($userData));
-
-		$result = $this->model->where('name', 'Lou')->first();
-		$this->assertCloseEnough(time(), strtotime($result->created_at));
-	}
-
-	public function testInsertResult(): void
-	{
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->createModel(JobModel::class);
-
-		$result = $this->model->protect(false)->insert($data, false);
-		$this->assertTrue($result);
-
-		$lastInsertId = $this->model->getInsertID();
-		$this->seeInDatabase('job', ['id' => $lastInsertId]);
-	}
-
-	public function testInsertResultFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-
-		$data = [
-			'name123'     => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->createModel(JobModel::class);
-		$result = $this->model->protect(false)->insert($data, false);
-		$this->assertFalse($result);
-
-		$lastInsertId = $this->model->getInsertID();
-		$this->assertSame(0, $lastInsertId);
-		$this->dontSeeInDatabase('job', ['id' => $lastInsertId]);
-	}
-
-	public function testInsertBatchNewEntityWithDateTime(): void
-	{
-		$entity = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$this->createModel(UserModel::class);
-
-		$entity->name       = 'Mark';
-		$entity->email      = 'mark@example.com';
-		$entity->country    = 'India';
-		$entity->deleted    = 0;
-		$entity->created_at = new Time('now');
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->assertSame(2, $this->model->insertBatch([$entity, $entity]));
-	}
-
-	public function testInsertArrayWithNoDataException(): void
-	{
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to insert.');
-		$this->createModel(UserModel::class)->insert([]);
-	}
-
-	public function testInsertObjectWithNoDataException(): void
-	{
-		$data = new stdClass();
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to insert.');
-		$this->createModel(UserModel::class)->insert($data);
-	}
-
-	public function testInsertArrayWithNoDataExceptionNoAllowedData(): void
-	{
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to insert.');
-		$this->createModel(UserModel::class)->insert(['thisKeyIsNotAllowed' => 'Bar']);
-	}
-
-	public function testInsertEntityWithNoDataExceptionNoAllowedData(): void
-	{
-		$this->createModel(UserModel::class);
-
-		$entity = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$entity->fill(['thisKeyIsNotAllowed' => 'Bar']);
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to insert.');
-		$this->model->insert($entity);
-	}
-
-	public function testUseAutoIncrementSetToFalseInsertException(): void
-	{
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no primary key defined when trying to make insert');
-
-		$insert = [
-			'value' => 'some different value',
-		];
-
-		$this->createModel(WithoutAutoIncrementModel::class)->insert($insert);
-	}
-
-	public function testUseAutoIncrementSetToFalseInsert(): void
-	{
-		$insert = [
-			'key'   => 'some_random_key',
-			'value' => 'some different value',
-		];
-
-		$this->createModel(WithoutAutoIncrementModel::class);
-		$this->model->insert($insert);
-
-		$this->assertSame($insert['key'], $this->model->getInsertID());
-		$this->seeInDatabase('without_auto_increment', $insert);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4087
-	 */
-	public function testInsertWithSetAndEscape(): void
-	{
-		$userData = [
-			'name' => 'Scott',
-		];
-
-		$this->createModel(UserModel::class);
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-
-		$this->model->set('country', '1+1', false)->set('email', '2+2')->insert($userData);
-
-		$this->assertGreaterThan(0, $this->model->getInsertID());
-		$result = $this->model->where('name', 'Scott')->where('country', '2')->where('email', '2+2')->first();
-
-		$this->assertCloseEnough(time(), strtotime($result->created_at));
-	}
+    public function testSetWorksWithInsert(): void
+    {
+        $this->dontSeeInDatabase('user', [
+            'email' => 'foo@example.com',
+        ]);
+
+        $this->createModel(UserModel::class)->set([
+            'email'   => 'foo@example.com',
+            'name'    => 'Foo Bar',
+            'country' => 'US',
+        ])->insert();
+
+        $this->seeInDatabase('user', [
+            'email' => 'foo@example.com',
+        ]);
+    }
+
+    public function testInsertBatchSuccess(): void
+    {
+        $jobData = [
+            [
+                'name'        => 'Comedian',
+                'description' => 'There\'s something in your teeth',
+            ],
+            [
+                'name'        => 'Cab Driver',
+                'description' => 'I am yellow',
+            ],
+        ];
+
+        $this->createModel(JobModel::class)->insertBatch($jobData);
+        $this->seeInDatabase('job', ['name' => 'Comedian']);
+        $this->seeInDatabase('job', ['name' => 'Cab Driver']);
+    }
+
+    public function testInsertBatchValidationFail(): void
+    {
+        $jobData = [
+            [
+                'name'        => 'Comedian',
+                'description' => null,
+            ],
+        ];
+
+        $this->createModel(JobModel::class);
+
+        $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
+        $this->assertFalse($this->model->insertBatch($jobData));
+
+        $error = $this->model->errors();
+        $this->assertTrue(isset($error['description']));
+    }
+
+    public function testInsertBatchSetsIntTimestamps(): void
+    {
+        $jobData = [
+            [
+                'name' => 'Philosopher',
+            ],
+            [
+                'name' => 'Laborer',
+            ],
+        ];
+
+        $this->createModel(JobModel::class);
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->assertSame(2, $this->model->insertBatch($jobData));
+
+        $result = $this->model->where('name', 'Philosopher')->first();
+        $this->assertCloseEnough(time(), $result->created_at);
+    }
+
+    public function testInsertBatchSetsDatetimeTimestamps(): void
+    {
+        $userData = [
+            [
+                'name'    => 'Lou',
+                'email'   => 'lou@example.com',
+                'country' => 'Ireland',
+            ],
+            [
+                'name'    => 'Sue',
+                'email'   => 'sue@example.com',
+                'country' => 'Ireland',
+            ],
+        ];
+
+        $this->createModel(UserModel::class);
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->assertSame(2, $this->model->insertBatch($userData));
+
+        $result = $this->model->where('name', 'Lou')->first();
+        $this->assertCloseEnough(time(), strtotime($result->created_at));
+    }
+
+    public function testInsertResult(): void
+    {
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->createModel(JobModel::class);
+
+        $result = $this->model->protect(false)->insert($data, false);
+        $this->assertTrue($result);
+
+        $lastInsertId = $this->model->getInsertID();
+        $this->seeInDatabase('job', ['id' => $lastInsertId]);
+    }
+
+    public function testInsertResultFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+
+        $data = [
+            'name123'     => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->createModel(JobModel::class);
+        $result = $this->model->protect(false)->insert($data, false);
+        $this->assertFalse($result);
+
+        $lastInsertId = $this->model->getInsertID();
+        $this->assertSame(0, $lastInsertId);
+        $this->dontSeeInDatabase('job', ['id' => $lastInsertId]);
+    }
+
+    public function testInsertBatchNewEntityWithDateTime(): void
+    {
+        $entity = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $this->createModel(UserModel::class);
+
+        $entity->name       = 'Mark';
+        $entity->email      = 'mark@example.com';
+        $entity->country    = 'India';
+        $entity->deleted    = 0;
+        $entity->created_at = new Time('now');
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->assertSame(2, $this->model->insertBatch([$entity, $entity]));
+    }
+
+    public function testInsertArrayWithNoDataException(): void
+    {
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to insert.');
+        $this->createModel(UserModel::class)->insert([]);
+    }
+
+    public function testInsertObjectWithNoDataException(): void
+    {
+        $data = new stdClass();
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to insert.');
+        $this->createModel(UserModel::class)->insert($data);
+    }
+
+    public function testInsertArrayWithNoDataExceptionNoAllowedData(): void
+    {
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to insert.');
+        $this->createModel(UserModel::class)->insert(['thisKeyIsNotAllowed' => 'Bar']);
+    }
+
+    public function testInsertEntityWithNoDataExceptionNoAllowedData(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $entity = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $entity->fill(['thisKeyIsNotAllowed' => 'Bar']);
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to insert.');
+        $this->model->insert($entity);
+    }
+
+    public function testUseAutoIncrementSetToFalseInsertException(): void
+    {
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no primary key defined when trying to make insert');
+
+        $insert = [
+            'value' => 'some different value',
+        ];
+
+        $this->createModel(WithoutAutoIncrementModel::class)->insert($insert);
+    }
+
+    public function testUseAutoIncrementSetToFalseInsert(): void
+    {
+        $insert = [
+            'key'   => 'some_random_key',
+            'value' => 'some different value',
+        ];
+
+        $this->createModel(WithoutAutoIncrementModel::class);
+        $this->model->insert($insert);
+
+        $this->assertSame($insert['key'], $this->model->getInsertID());
+        $this->seeInDatabase('without_auto_increment', $insert);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4087
+     */
+    public function testInsertWithSetAndEscape(): void
+    {
+        $userData = [
+            'name' => 'Scott',
+        ];
+
+        $this->createModel(UserModel::class);
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+
+        $this->model->set('country', '1+1', false)->set('email', '2+2')->insert($userData);
+
+        $this->assertGreaterThan(0, $this->model->getInsertID());
+        $result = $this->model->where('name', 'Scott')->where('country', '2')->where('email', '2+2')->first();
+
+        $this->assertCloseEnough(time(), strtotime($result->created_at));
+    }
 }
diff --git a/tests/system/Models/LiveModelTestCase.php b/tests/system/Models/LiveModelTestCase.php
index 05f92a1ed950..d8052967f290 100644
--- a/tests/system/Models/LiveModelTestCase.php
+++ b/tests/system/Models/LiveModelTestCase.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\BaseConnection;
@@ -14,43 +23,38 @@
  */
 abstract class LiveModelTestCase extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-	use ReflectionHelper;
-
-	/**
-	 * Current instance of the Model.
-	 *
-	 * @var Model
-	 */
-	protected $model;
-
-	protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-		$this->resetServices();
-		$this->resetFactories();
-	}
-
-	/**
-	 * Create an instance of Model for use in testing.
-	 *
-	 * @param string              $modelName
-	 * @param BaseConnection|null $db
-	 *
-	 * @return Model
-	 */
-	protected function createModel(string $modelName, BaseConnection $db = null): Model
-	{
-		$this->db    = $db ?? $this->db;
-		$this->model = new $modelName($this->db);
-
-		return $this->model;
-	}
+    use DatabaseTestTrait;
+    use ReflectionHelper;
+
+    /**
+     * Current instance of the Model.
+     *
+     * @var Model
+     */
+    protected $model;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->resetServices();
+        $this->resetFactories();
+    }
+
+    /**
+     * Create an instance of Model for use in testing.
+     */
+    protected function createModel(string $modelName, ?BaseConnection $db = null): Model
+    {
+        $this->db    = $db ?? $this->db;
+        $this->model = new $modelName($this->db);
+
+        return $this->model;
+    }
 }
diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index b9773b308102..e70ff51c4789 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
@@ -10,97 +19,100 @@
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class MiscellaneousModelTest extends LiveModelTestCase
 {
-	public function testChunk(): void
-	{
-		$rowCount = 0;
-
-		$this->createModel(UserModel::class)->chunk(2, static function ($row) use (&$rowCount) {
-			$rowCount++;
-		});
-
-		$this->assertSame(4, $rowCount);
-	}
-
-	public function testCanCreateAndSaveEntityClasses(): void
-	{
-		$entity = $this->createModel(EntityModel::class)->where('name', 'Developer')->first();
-
-		$this->assertInstanceOf(SimpleEntity::class, $entity);
-		$this->assertSame('Developer', $entity->name);
-		$this->assertSame('Awesome job, but sometimes makes you bored', $entity->description);
-
-		$time = time();
-
-		$entity->name       = 'Senior Developer';
-		$entity->created_at = $time;
-
-		$this->assertTrue($this->model->save($entity));
-
-		$result = $this->model->where('name', 'Senior Developer')->get()->getFirstRow();
-		$this->assertSame(date('Y-m-d', $time), date('Y-m-d', $result->created_at));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/580
-	 */
-	public function testPasswordsStoreCorrectly(): void
-	{
-		$data = [
-			'name'    => password_hash('secret123', PASSWORD_BCRYPT),
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-		];
-
-		$this->createModel(UserModel::class)->insert($data);
-		$this->seeInDatabase('user', $data);
-	}
-
-	public function testReplaceObject(): void
-	{
-		$data = [
-			'id'          => 1,
-			'name'        => 'my name',
-			'description' => 'some description',
-		];
-
-		$this->createModel(ValidModel::class)->replace($data);
-		$this->seeInDatabase('job', ['id' => 1, 'name' => 'my name']);
-	}
-
-	public function testGetValidationMessagesForReplace(): void
-	{
-		$jobData = [
-			'name'        => 'Comedian',
-			'description' => null,
-		];
-
-		$this->createModel(JobModel::class);
-		$this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
-		$this->assertFalse($this->model->replace($jobData));
-
-		$error = $this->model->errors();
-		$this->assertTrue(isset($error['description']));
-	}
-
-	public function testUndefinedTypeInTransformDataToArray(): void
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage('Invalid type "whatever" used upon transforming data to array.');
-
-		$this->createModel(JobModel::class);
-		$method = $this->getPrivateMethodInvoker($this->model, 'transformDataToArray');
-		$method([], 'whatever');
-	}
-
-	public function testEmptyDataInTransformDataToArray(): void
-	{
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to insert.');
-
-		$this->createModel(JobModel::class);
-		$method = $this->getPrivateMethodInvoker($this->model, 'transformDataToArray');
-		$method([], 'insert');
-	}
+    public function testChunk(): void
+    {
+        $rowCount = 0;
+
+        $this->createModel(UserModel::class)->chunk(2, static function ($row) use (&$rowCount) {
+            $rowCount++;
+        });
+
+        $this->assertSame(4, $rowCount);
+    }
+
+    public function testCanCreateAndSaveEntityClasses(): void
+    {
+        $entity = $this->createModel(EntityModel::class)->where('name', 'Developer')->first();
+
+        $this->assertInstanceOf(SimpleEntity::class, $entity);
+        $this->assertSame('Developer', $entity->name);
+        $this->assertSame('Awesome job, but sometimes makes you bored', $entity->description);
+
+        $time = time();
+
+        $entity->name       = 'Senior Developer';
+        $entity->created_at = $time;
+
+        $this->assertTrue($this->model->save($entity));
+
+        $result = $this->model->where('name', 'Senior Developer')->get()->getFirstRow();
+        $this->assertSame(date('Y-m-d', $time), date('Y-m-d', $result->created_at));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/580
+     */
+    public function testPasswordsStoreCorrectly(): void
+    {
+        $data = [
+            'name'    => password_hash('secret123', PASSWORD_BCRYPT),
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+        ];
+
+        $this->createModel(UserModel::class)->insert($data);
+        $this->seeInDatabase('user', $data);
+    }
+
+    public function testReplaceObject(): void
+    {
+        $data = [
+            'id'          => 1,
+            'name'        => 'my name',
+            'description' => 'some description',
+        ];
+
+        $this->createModel(ValidModel::class)->replace($data);
+        $this->seeInDatabase('job', ['id' => 1, 'name' => 'my name']);
+    }
+
+    public function testGetValidationMessagesForReplace(): void
+    {
+        $jobData = [
+            'name'        => 'Comedian',
+            'description' => null,
+        ];
+
+        $this->createModel(JobModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
+        $this->assertFalse($this->model->replace($jobData));
+
+        $error = $this->model->errors();
+        $this->assertTrue(isset($error['description']));
+    }
+
+    public function testUndefinedTypeInTransformDataToArray(): void
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid type "whatever" used upon transforming data to array.');
+
+        $this->createModel(JobModel::class);
+        $method = $this->getPrivateMethodInvoker($this->model, 'transformDataToArray');
+        $method([], 'whatever');
+    }
+
+    public function testEmptyDataInTransformDataToArray(): void
+    {
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to insert.');
+
+        $this->createModel(JobModel::class);
+        $method = $this->getPrivateMethodInvoker($this->model, 'transformDataToArray');
+        $method([], 'insert');
+    }
 }
diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index 28b5dac23052..d5901bd702c4 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -1,61 +1,73 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class PaginateModelTest extends LiveModelTestCase
 {
-	public function testPaginate(): void
-	{
-		$data = $this->createModel(ValidModel::class)->paginate();
-		$this->assertCount(4, $data);
-	}
-
-	public function testPaginateChangeConfigPager(): void
-	{
-		$perPage = config('Pager')->perPage;
-
-		config('Pager')->perPage = 1;
-
-		$data = $this->createModel(ValidModel::class)->paginate();
-		$this->assertCount(1, $data);
-
-		config('Pager')->perPage = $perPage;
-	}
-
-	public function testPaginatePassPerPageParameter(): void
-	{
-		$data = $this->createModel(ValidModel::class)->paginate(2);
-		$this->assertCount(2, $data);
-	}
-
-	public function testPaginateForQueryWithGroupBy(): void
-	{
-		$this->createModel(ValidModel::class);
-		$this->model->groupBy('id');
-		$this->model->paginate();
-		$this->assertSame(4, $this->model->pager->getDetails()['total']);
-	}
-
-	public function testPaginateWithDeleted(): void
-	{
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-
-		$data = $this->model->withDeleted()->paginate();
-		$this->assertCount(4, $data);
-		$this->assertSame(4, $this->model->pager->getDetails()['total']);
-	}
-
-	public function testPaginateWithoutDeleted(): void
-	{
-		$this->createModel(UserModel::class);
-		$this->model->delete(1);
-
-		$data = $this->model->withDeleted(false)->paginate();
-		$this->assertCount(3, $data);
-		$this->assertSame(3, $this->model->pager->getDetails()['total']);
-	}
+    public function testPaginate(): void
+    {
+        $data = $this->createModel(ValidModel::class)->paginate();
+        $this->assertCount(4, $data);
+    }
+
+    public function testPaginateChangeConfigPager(): void
+    {
+        $perPage = config('Pager')->perPage;
+
+        config('Pager')->perPage = 1;
+
+        $data = $this->createModel(ValidModel::class)->paginate();
+        $this->assertCount(1, $data);
+
+        config('Pager')->perPage = $perPage;
+    }
+
+    public function testPaginatePassPerPageParameter(): void
+    {
+        $data = $this->createModel(ValidModel::class)->paginate(2);
+        $this->assertCount(2, $data);
+    }
+
+    public function testPaginateForQueryWithGroupBy(): void
+    {
+        $this->createModel(ValidModel::class);
+        $this->model->groupBy('id');
+        $this->model->paginate();
+        $this->assertSame(4, $this->model->pager->getDetails()['total']);
+    }
+
+    public function testPaginateWithDeleted(): void
+    {
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+
+        $data = $this->model->withDeleted()->paginate();
+        $this->assertCount(4, $data);
+        $this->assertSame(4, $this->model->pager->getDetails()['total']);
+    }
+
+    public function testPaginateWithoutDeleted(): void
+    {
+        $this->createModel(UserModel::class);
+        $this->model->delete(1);
+
+        $data = $this->model->withDeleted(false)->paginate();
+        $this->assertCount(3, $data);
+        $this->assertSame(3, $this->model->pager->getDetails()['total']);
+    }
 }
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index 4eabd74445c5..17f56a4cb88c 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
@@ -14,297 +23,296 @@
 use Tests\Support\Models\ValidModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class SaveModelTest extends LiveModelTestCase
 {
-	public function testSaveNewRecordObject(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$data              = new stdClass();
-		$data->name        = 'Magician';
-		$data->description = 'Makes peoples things dissappear.';
-
-		$this->model->protect(false)->save($data);
-		$this->seeInDatabase('job', ['name' => 'Magician']);
-	}
-
-	public function testSaveNewRecordArray(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->model->protect(false)->save($data);
-		$this->seeInDatabase('job', ['name' => 'Apprentice']);
-	}
-
-	public function testSaveNewRecordArrayFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		$this->createModel(JobModel::class);
-
-		$data = [
-			'name123'     => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$result = $this->model->protect(false)->save($data);
-		$this->assertFalse($result);
-		$this->dontSeeInDatabase('job', ['name' => 'Apprentice']);
-	}
-
-	public function testSaveUpdateRecordArray(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$result = $this->model->protect(false)->save($data);
-		$this->seeInDatabase('job', ['name' => 'Apprentice']);
-		$this->assertTrue($result);
-	}
-
-	public function testSaveUpdateRecordArrayFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-		$this->createModel(JobModel::class);
-
-		$data = [
-			'id'          => 1,
-			'name123'     => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$result = $this->model->protect(false)->save($data);
-		$this->assertFalse($result);
-		$this->dontSeeInDatabase('job', ['name' => 'Apprentice']);
-	}
-
-	public function testSaveUpdateRecordObject(): void
-	{
-		$this->createModel(JobModel::class);
-		$data = new stdClass();
-
-		// Sqlsrv does not allow forcing an ID into an autoincrement field.
-		if ($this->db->DBDriver !== 'SQLSRV')
-		{
-			$data->id = 1;
-		}
-
-		$data->name        = 'Engineer';
-		$data->description = 'A fancier term for Developer.';
-
-		$result = $this->model->protect(false)->save($data);
-		$this->seeInDatabase('job', ['name' => 'Engineer']);
-		$this->assertTrue($result);
-	}
-
-	public function testSaveProtected(): void
-	{
-		$this->createModel(JobModel::class);
-
-		$data               = new stdClass();
-		$data->id           = 1;
-		$data->name         = 'Engineer';
-		$data->description  = 'A fancier term for Developer.';
-		$data->random_thing = 'Something wicked'; // If not protected, this would kill the script.
-
-		$result = $this->model->protect(true)->save($data);
-		$this->assertTrue($result);
-	}
-
-	public function testSelectAndEntitiesSaveOnlyChangedValues(): void
-	{
-		$this->hasInDatabase('job', [
-			'name'        => 'Rocket Scientist',
-			'description' => 'Plays guitar for Queen',
-			'created_at'  => time(),
-		]);
-
-		$this->createModel(EntityModel::class);
-
-		$job = $this->model->select('id, name')->where('name', 'Rocket Scientist')->first();
-		$this->assertNull($job->description);
-		$this->assertSame('Rocket Scientist', $job->name);
-
-		$job->description = 'Some guitar description';
-		$this->model->save($job);
-		$this->seeInDatabase('job', [
-			'id'   => $job->id,
-			'name' => 'Rocket Scientist',
-		]);
-
-		$job = $this->model->select('id, name, description')->where('name', 'Rocket Scientist')->first();
-		$this->assertSame('Some guitar description', $job->description);
-	}
-
-	public function testInsertID(): void
-	{
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->createModel(JobModel::class);
-		$this->model->protect(false)->save($data);
-
-		$lastInsertId = $this->model->getInsertID();
-		$this->seeInDatabase('job', ['id' => $lastInsertId]);
-	}
-
-	public function testSetTable(): void
-	{
-		$this->createModel(SecondaryModel::class);
-
-		$this->model->setTable('job');
-
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->model->protect(false)->save($data);
-		$lastInsertId = $this->model->getInsertID();
-		$this->seeInDatabase('job', ['id' => $lastInsertId]);
-	}
-
-	public function testSaveObject(): void
-	{
-		$this->createModel(ValidModel::class);
-
-		$testModel = new JobModel();
-
-		$testModel->name        = 'my name';
-		$testModel->description = 'some description';
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-
-		$this->model->insert($testModel);
-		$lastInsertId = $this->model->getInsertID();
-		$this->seeInDatabase('job', ['id' => $lastInsertId]);
-	}
-
-	public function testEmptySaveData(): void
-	{
-		$this->assertTrue($this->createModel(JobModel::class)->protect(false)->save([]));
-	}
-
-	public function testSaveNewEntityWithDateTime(): void
-	{
-		$entity = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$this->createModel(UserModel::class);
-
-		$entity->name       = 'Mark';
-		$entity->email      = 'mark@example.com';
-		$entity->country    = 'India';
-		$entity->deleted    = 0;
-		$entity->created_at = new Time('now');
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->assertTrue($this->model->save($entity));
-	}
-
-	public function testSaveNewEntityWithDate(): void
-	{
-		$entity = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $created_at;
-			protected $updated_at;
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$testModel = new class extends Model
-		{
-			protected $table          = 'empty';
-			protected $allowedFields  = [
-				'name',
-			];
-			protected $returnType     = 'object';
-			protected $useSoftDeletes = true;
-			protected $dateFormat     = 'date';
-			public $name              = '';
-		};
-
-		$entity->name       = 'Mark';
-		$entity->created_at = new Time('now');
-
-		$this->setPrivateProperty($testModel, 'useTimestamps', true);
-		$this->assertTrue($testModel->save($entity));
-		$testModel->truncate();
-	}
-
-	public function testInvalidAllowedFieldException(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->model->setAllowedFields([]);
-
-		$data = [
-			'name'        => 'Apprentice',
-			'description' => 'That thing you do.',
-		];
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('Allowed fields must be specified for model: Tests\Support\Models\JobModel');
-
-		$this->model->save($data);
-	}
-
-	public function testUseAutoIncrementSetToFalseSave(): void
-	{
-		$insert = [
-			'key'   => 'some_random_key',
-			'value' => 'some value',
-		];
-
-		$this->createModel(WithoutAutoIncrementModel::class);
-		$this->model->save($insert);
-
-		$this->assertSame($insert['key'], $this->model->getInsertID());
-		$this->seeInDatabase('without_auto_increment', $insert);
-
-		$update = [
-			'key'   => 'some_random_key',
-			'value' => 'some different value',
-		];
-
-		$this->model->save($update);
-		$this->assertSame($insert['key'], $this->model->getInsertID());
-		$this->seeInDatabase('without_auto_increment', $update);
-	}
+    public function testSaveNewRecordObject(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $data              = new stdClass();
+        $data->name        = 'Magician';
+        $data->description = 'Makes peoples things dissappear.';
+
+        $this->model->protect(false)->save($data);
+        $this->seeInDatabase('job', ['name' => 'Magician']);
+    }
+
+    public function testSaveNewRecordArray(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->model->protect(false)->save($data);
+        $this->seeInDatabase('job', ['name' => 'Apprentice']);
+    }
+
+    public function testSaveNewRecordArrayFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        $this->createModel(JobModel::class);
+
+        $data = [
+            'name123'     => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $result = $this->model->protect(false)->save($data);
+        $this->assertFalse($result);
+        $this->dontSeeInDatabase('job', ['name' => 'Apprentice']);
+    }
+
+    public function testSaveUpdateRecordArray(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $result = $this->model->protect(false)->save($data);
+        $this->seeInDatabase('job', ['name' => 'Apprentice']);
+        $this->assertTrue($result);
+    }
+
+    public function testSaveUpdateRecordArrayFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+        $this->createModel(JobModel::class);
+
+        $data = [
+            'id'          => 1,
+            'name123'     => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $result = $this->model->protect(false)->save($data);
+        $this->assertFalse($result);
+        $this->dontSeeInDatabase('job', ['name' => 'Apprentice']);
+    }
+
+    public function testSaveUpdateRecordObject(): void
+    {
+        $this->createModel(JobModel::class);
+        $data = new stdClass();
+
+        // Sqlsrv does not allow forcing an ID into an autoincrement field.
+        if ($this->db->DBDriver !== 'SQLSRV') {
+            $data->id = 1;
+        }
+
+        $data->name        = 'Engineer';
+        $data->description = 'A fancier term for Developer.';
+
+        $result = $this->model->protect(false)->save($data);
+        $this->seeInDatabase('job', ['name' => 'Engineer']);
+        $this->assertTrue($result);
+    }
+
+    public function testSaveProtected(): void
+    {
+        $this->createModel(JobModel::class);
+
+        $data               = new stdClass();
+        $data->id           = 1;
+        $data->name         = 'Engineer';
+        $data->description  = 'A fancier term for Developer.';
+        $data->random_thing = 'Something wicked'; // If not protected, this would kill the script.
+
+        $result = $this->model->protect(true)->save($data);
+        $this->assertTrue($result);
+    }
+
+    public function testSelectAndEntitiesSaveOnlyChangedValues(): void
+    {
+        $this->hasInDatabase('job', [
+            'name'        => 'Rocket Scientist',
+            'description' => 'Plays guitar for Queen',
+            'created_at'  => time(),
+        ]);
+
+        $this->createModel(EntityModel::class);
+
+        $job = $this->model->select('id, name')->where('name', 'Rocket Scientist')->first();
+        $this->assertNull($job->description);
+        $this->assertSame('Rocket Scientist', $job->name);
+
+        $job->description = 'Some guitar description';
+        $this->model->save($job);
+        $this->seeInDatabase('job', [
+            'id'   => $job->id,
+            'name' => 'Rocket Scientist',
+        ]);
+
+        $job = $this->model->select('id, name, description')->where('name', 'Rocket Scientist')->first();
+        $this->assertSame('Some guitar description', $job->description);
+    }
+
+    public function testInsertID(): void
+    {
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->createModel(JobModel::class);
+        $this->model->protect(false)->save($data);
+
+        $lastInsertId = $this->model->getInsertID();
+        $this->seeInDatabase('job', ['id' => $lastInsertId]);
+    }
+
+    public function testSetTable(): void
+    {
+        $this->createModel(SecondaryModel::class);
+
+        $this->model->setTable('job');
+
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->model->protect(false)->save($data);
+        $lastInsertId = $this->model->getInsertID();
+        $this->seeInDatabase('job', ['id' => $lastInsertId]);
+    }
+
+    public function testSaveObject(): void
+    {
+        $this->createModel(ValidModel::class);
+
+        $testModel = new JobModel();
+
+        $testModel->name        = 'my name';
+        $testModel->description = 'some description';
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+
+        $this->model->insert($testModel);
+        $lastInsertId = $this->model->getInsertID();
+        $this->seeInDatabase('job', ['id' => $lastInsertId]);
+    }
+
+    public function testEmptySaveData(): void
+    {
+        $this->assertTrue($this->createModel(JobModel::class)->protect(false)->save([]));
+    }
+
+    public function testSaveNewEntityWithDateTime(): void
+    {
+        $entity = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $this->createModel(UserModel::class);
+
+        $entity->name       = 'Mark';
+        $entity->email      = 'mark@example.com';
+        $entity->country    = 'India';
+        $entity->deleted    = 0;
+        $entity->created_at = new Time('now');
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->assertTrue($this->model->save($entity));
+    }
+
+    public function testSaveNewEntityWithDate(): void
+    {
+        $entity = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $created_at;
+            protected $updated_at;
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $testModel                   = new class () extends Model {
+            protected $table         = 'empty';
+            protected $allowedFields = [
+                'name',
+            ];
+            protected $returnType     = 'object';
+            protected $useSoftDeletes = true;
+            protected $dateFormat     = 'date';
+            public $name              = '';
+        };
+
+        $entity->name       = 'Mark';
+        $entity->created_at = new Time('now');
+
+        $this->setPrivateProperty($testModel, 'useTimestamps', true);
+        $this->assertTrue($testModel->save($entity));
+        $testModel->truncate();
+    }
+
+    public function testInvalidAllowedFieldException(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->model->setAllowedFields([]);
+
+        $data = [
+            'name'        => 'Apprentice',
+            'description' => 'That thing you do.',
+        ];
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('Allowed fields must be specified for model: Tests\Support\Models\JobModel');
+
+        $this->model->save($data);
+    }
+
+    public function testUseAutoIncrementSetToFalseSave(): void
+    {
+        $insert = [
+            'key'   => 'some_random_key',
+            'value' => 'some value',
+        ];
+
+        $this->createModel(WithoutAutoIncrementModel::class);
+        $this->model->save($insert);
+
+        $this->assertSame($insert['key'], $this->model->getInsertID());
+        $this->seeInDatabase('without_auto_increment', $insert);
+
+        $update = [
+            'key'   => 'some_random_key',
+            'value' => 'some different value',
+        ];
+
+        $this->model->save($update);
+        $this->assertSame($insert['key'], $this->model->getInsertID());
+        $this->seeInDatabase('without_auto_increment', $update);
+    }
 }
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 907462ea8477..619028a748aa 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
@@ -12,357 +21,357 @@
 use Tests\Support\Models\ValidModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class UpdateModelTest extends LiveModelTestCase
 {
-	public function testSetWorksWithUpdate(): void
-	{
-		$this->dontSeeInDatabase('user', [
-			'email' => 'foo@example.com',
-		]);
-
-		$this->createModel(UserModel::class);
-
-		$userId = $this->model->insert([
-			'email'   => 'foo@example.com',
-			'name'    => 'Foo Bar',
-			'country' => 'US',
-		]);
-
-		$this->model->set([
-			'name' => 'Fred Flintstone',
-		])->update($userId);
-
-		$this->seeInDatabase('user', [
-			'id'    => $userId,
-			'email' => 'foo@example.com',
-			'name'  => 'Fred Flintstone',
-		]);
-	}
-
-	public function testSetWorksWithUpdateNoId(): void
-	{
-		$this->dontSeeInDatabase('user', [
-			'email' => 'foo@example.com',
-		]);
-
-		$this->createModel(UserModel::class);
-
-		$userId = $this->model->insert([
-			'email'   => 'foo@example.com',
-			'name'    => 'Foo Bar',
-			'country' => 'US',
-		]);
-
-		$this->model->where('id', $userId)->set([
-			'name' => 'Fred Flintstone',
-		])->update();
-
-		$this->seeInDatabase('user', [
-			'id'    => $userId,
-			'email' => 'foo@example.com',
-			'name'  => 'Fred Flintstone',
-		]);
-	}
-
-	public function testUpdateArray(): void
-	{
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$this->createModel(UserModel::class);
-		$this->model->insert($data);
-
-		$result = $this->model->update([1, 2], ['name' => 'Foo Bar']);
-		$this->assertTrue($result);
-		$this->seeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar']);
-		$this->seeInDatabase('user', ['id' => 2, 'name' => 'Foo Bar']);
-	}
-
-	public function testUpdateResultFail(): void
-	{
-		$this->setPrivateProperty($this->db, 'DBDebug', false);
-
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$this->createModel(UserModel::class);
-		$this->model->insert($data);
-
-		$this->setPrivateProperty($this->model, 'allowedFields', ['name123']);
-		$result = $this->model->update(1, ['name123' => 'Foo Bar 1']);
-		$this->assertFalse($result);
-		$this->dontSeeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar 1']);
-	}
-
-	public function testUpdateBatchSuccess(): void
-	{
-		$data = [
-			[
-				'name'    => 'Derek Jones',
-				'country' => 'Greece',
-			],
-			[
-				'name'    => 'Ahmadinejad',
-				'country' => 'Greece',
-			],
-		];
-
-		$this->createModel(UserModel::class)->updateBatch($data, 'name');
-
-		$this->seeInDatabase('user', [
-			'name'    => 'Derek Jones',
-			'country' => 'Greece',
-		]);
-		$this->seeInDatabase('user', [
-			'name'    => 'Ahmadinejad',
-			'country' => 'Greece',
-		]);
-	}
-
-	public function testUpdateBatchValidationFail(): void
-	{
-		$data = [
-			[
-				'name'    => 'Derek Jones',
-				'country' => null,
-			],
-		];
-
-		$this->createModel(UserModel::class);
-		$this->setPrivateProperty($this->model, 'validationRules', ['country' => 'required']);
-		$this->assertFalse($this->model->updateBatch($data, 'name'));
-
-		$error = $this->model->errors();
-		$this->assertTrue(isset($error['country']));
-	}
-
-	public function testUpdateBatchWithEntity(): void
-	{
-		$entity1 = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$entity2 = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$entity1->id      = 1;
-		$entity1->name    = 'Jones Martin';
-		$entity1->country = 'India';
-		$entity1->deleted = 0;
-
-		$entity2->id      = 4;
-		$entity2->name    = 'Jones Martin';
-		$entity2->country = 'India';
-		$entity2->deleted = 0;
-
-		$this->assertSame(2, $this->createModel(UserModel::class)->updateBatch([$entity1, $entity2], 'id'));
-	}
-
-	public function testUpdateNoPrimaryKey(): void
-	{
-		$this->db->table('secondary')->insert([
-			'key'   => 'foo',
-			'value' => 'bar',
-		]);
-
-		$this->dontSeeInDatabase('secondary', [
-			'key'   => 'bar',
-			'value' => 'baz',
-		]);
-
-		$this->createModel(SecondaryModel::class)
-			->where('key', 'foo')
-			->update(null, ['key' => 'bar', 'value' => 'baz']);
-
-		$this->seeInDatabase('secondary', [
-			'key'   => 'bar',
-			'value' => 'baz',
-		]);
-	}
-
-	public function testUpdateObject(): void
-	{
-		$this->createModel(ValidModel::class);
-
-		$testModel = new JobModel();
-
-		$testModel->name        = 'my name';
-		$testModel->description = 'some description';
-
-		$this->setPrivateProperty($this->model, 'useTimestamps', true);
-		$this->model->update(1, $testModel);
-		$this->seeInDatabase('job', ['id' => 1]);
-	}
-
-	public function testUpdateArrayWithDataException(): void
-	{
-		$this->createModel(EventModel::class);
-
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$id = $this->model->insert($data);
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to update.');
-		$this->model->update($id, []);
-	}
-
-	public function testUpdateObjectWithDataException(): void
-	{
-		$this->createModel(EventModel::class);
-
-		$data = (object) [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$id = $this->model->insert($data);
-
-		$data = new stdClass();
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to update.');
-		$this->model->update($id, $data);
-	}
-
-	public function testUpdateArrayWithDataExceptionNoAllowedFields(): void
-	{
-		$this->createModel(EventModel::class);
-
-		$data = [
-			'name'    => 'Foo',
-			'email'   => 'foo@example.com',
-			'country' => 'US',
-			'deleted' => 0,
-		];
-
-		$id = $this->model->insert($data);
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to update.');
-		$this->model->update($id, ['thisKeyIsNotAllowed' => 'Bar']);
-	}
-
-	public function testUpdateWithEntityNoAllowedFields(): void
-	{
-		$this->createModel(UserModel::class);
-
-		$entity = new class extends Entity
-		{
-			protected $id;
-			protected $name;
-			protected $email;
-			protected $country;
-			protected $deleted;
-			protected $created_at;
-			protected $updated_at;
-
-			protected $_options = [
-				'datamap' => [],
-				'dates'   => [
-					'created_at',
-					'updated_at',
-					'deleted_at',
-				],
-				'casts'   => [],
-			];
-		};
-
-		$entity->id      = 1;
-		$entity->name    = 'Jones Martin';
-		$entity->country = 'India';
-		$entity->deleted = 0;
-
-		$id = $this->model->insert($entity);
-
-		$entity->syncOriginal();
-
-		$entity->fill(['thisKeyIsNotAllowed' => 'Bar']);
-
-		$this->expectException(DataException::class);
-		$this->expectExceptionMessage('There is no data to update.');
-		$this->model->update($id, $entity);
-	}
-
-	public function testUseAutoIncrementSetToFalseUpdate(): void
-	{
-		$key = 'key';
-
-		$update = [
-			'value' => 'some different value',
-		];
-
-		$this->createModel(WithoutAutoIncrementModel::class)->update($key, $update);
-		$this->seeInDatabase('without_auto_increment', ['key' => $key, 'value' => $update['value']]);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4087
-	 */
-	public function testUpdateWithSetAndEscape(): void
-	{
-		$userData = [
-			'name' => 'Scott',
-		];
-
-		$this->createModel(UserModel::class);
-
-		$this->assertTrue($this->model->set('country', '2+2', false)->set('email', '1+1')->update(1, $userData));
-
-		$this->seeInDatabase('user', [
-			'name'    => 'Scott',
-			'country' => '4',
-			'email'   => '1+1',
-		]);
-	}
+    public function testSetWorksWithUpdate(): void
+    {
+        $this->dontSeeInDatabase('user', [
+            'email' => 'foo@example.com',
+        ]);
+
+        $this->createModel(UserModel::class);
+
+        $userId = $this->model->insert([
+            'email'   => 'foo@example.com',
+            'name'    => 'Foo Bar',
+            'country' => 'US',
+        ]);
+
+        $this->model->set([
+            'name' => 'Fred Flintstone',
+        ])->update($userId);
+
+        $this->seeInDatabase('user', [
+            'id'    => $userId,
+            'email' => 'foo@example.com',
+            'name'  => 'Fred Flintstone',
+        ]);
+    }
+
+    public function testSetWorksWithUpdateNoId(): void
+    {
+        $this->dontSeeInDatabase('user', [
+            'email' => 'foo@example.com',
+        ]);
+
+        $this->createModel(UserModel::class);
+
+        $userId = $this->model->insert([
+            'email'   => 'foo@example.com',
+            'name'    => 'Foo Bar',
+            'country' => 'US',
+        ]);
+
+        $this->model->where('id', $userId)->set([
+            'name' => 'Fred Flintstone',
+        ])->update();
+
+        $this->seeInDatabase('user', [
+            'id'    => $userId,
+            'email' => 'foo@example.com',
+            'name'  => 'Fred Flintstone',
+        ]);
+    }
+
+    public function testUpdateArray(): void
+    {
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $this->createModel(UserModel::class);
+        $this->model->insert($data);
+
+        $result = $this->model->update([1, 2], ['name' => 'Foo Bar']);
+        $this->assertTrue($result);
+        $this->seeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar']);
+        $this->seeInDatabase('user', ['id' => 2, 'name' => 'Foo Bar']);
+    }
+
+    public function testUpdateResultFail(): void
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', false);
+
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $this->createModel(UserModel::class);
+        $this->model->insert($data);
+
+        $this->setPrivateProperty($this->model, 'allowedFields', ['name123']);
+        $result = $this->model->update(1, ['name123' => 'Foo Bar 1']);
+        $this->assertFalse($result);
+        $this->dontSeeInDatabase('user', ['id' => 1, 'name' => 'Foo Bar 1']);
+    }
+
+    public function testUpdateBatchSuccess(): void
+    {
+        $data = [
+            [
+                'name'    => 'Derek Jones',
+                'country' => 'Greece',
+            ],
+            [
+                'name'    => 'Ahmadinejad',
+                'country' => 'Greece',
+            ],
+        ];
+
+        $this->createModel(UserModel::class)->updateBatch($data, 'name');
+
+        $this->seeInDatabase('user', [
+            'name'    => 'Derek Jones',
+            'country' => 'Greece',
+        ]);
+        $this->seeInDatabase('user', [
+            'name'    => 'Ahmadinejad',
+            'country' => 'Greece',
+        ]);
+    }
+
+    public function testUpdateBatchValidationFail(): void
+    {
+        $data = [
+            [
+                'name'    => 'Derek Jones',
+                'country' => null,
+            ],
+        ];
+
+        $this->createModel(UserModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', ['country' => 'required']);
+        $this->assertFalse($this->model->updateBatch($data, 'name'));
+
+        $error = $this->model->errors();
+        $this->assertTrue(isset($error['country']));
+    }
+
+    public function testUpdateBatchWithEntity(): void
+    {
+        $entity1 = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $entity2 = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $entity1->id      = 1;
+        $entity1->name    = 'Jones Martin';
+        $entity1->country = 'India';
+        $entity1->deleted = 0;
+
+        $entity2->id      = 4;
+        $entity2->name    = 'Jones Martin';
+        $entity2->country = 'India';
+        $entity2->deleted = 0;
+
+        $this->assertSame(2, $this->createModel(UserModel::class)->updateBatch([$entity1, $entity2], 'id'));
+    }
+
+    public function testUpdateNoPrimaryKey(): void
+    {
+        $this->db->table('secondary')->insert([
+            'key'   => 'foo',
+            'value' => 'bar',
+        ]);
+
+        $this->dontSeeInDatabase('secondary', [
+            'key'   => 'bar',
+            'value' => 'baz',
+        ]);
+
+        $this->createModel(SecondaryModel::class)
+            ->where('key', 'foo')
+            ->update(null, ['key' => 'bar', 'value' => 'baz']);
+
+        $this->seeInDatabase('secondary', [
+            'key'   => 'bar',
+            'value' => 'baz',
+        ]);
+    }
+
+    public function testUpdateObject(): void
+    {
+        $this->createModel(ValidModel::class);
+
+        $testModel = new JobModel();
+
+        $testModel->name        = 'my name';
+        $testModel->description = 'some description';
+
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $this->model->update(1, $testModel);
+        $this->seeInDatabase('job', ['id' => 1]);
+    }
+
+    public function testUpdateArrayWithDataException(): void
+    {
+        $this->createModel(EventModel::class);
+
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $id = $this->model->insert($data);
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to update.');
+        $this->model->update($id, []);
+    }
+
+    public function testUpdateObjectWithDataException(): void
+    {
+        $this->createModel(EventModel::class);
+
+        $data = (object) [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $id = $this->model->insert($data);
+
+        $data = new stdClass();
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to update.');
+        $this->model->update($id, $data);
+    }
+
+    public function testUpdateArrayWithDataExceptionNoAllowedFields(): void
+    {
+        $this->createModel(EventModel::class);
+
+        $data = [
+            'name'    => 'Foo',
+            'email'   => 'foo@example.com',
+            'country' => 'US',
+            'deleted' => 0,
+        ];
+
+        $id = $this->model->insert($data);
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to update.');
+        $this->model->update($id, ['thisKeyIsNotAllowed' => 'Bar']);
+    }
+
+    public function testUpdateWithEntityNoAllowedFields(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $entity = new class () extends Entity {
+            protected $id;
+            protected $name;
+            protected $email;
+            protected $country;
+            protected $deleted;
+            protected $created_at;
+            protected $updated_at;
+
+            protected $_options = [
+                'datamap' => [],
+                'dates'   => [
+                    'created_at',
+                    'updated_at',
+                    'deleted_at',
+                ],
+                'casts' => [],
+            ];
+        };
+
+        $entity->id      = 1;
+        $entity->name    = 'Jones Martin';
+        $entity->country = 'India';
+        $entity->deleted = 0;
+
+        $id = $this->model->insert($entity);
+
+        $entity->syncOriginal();
+
+        $entity->fill(['thisKeyIsNotAllowed' => 'Bar']);
+
+        $this->expectException(DataException::class);
+        $this->expectExceptionMessage('There is no data to update.');
+        $this->model->update($id, $entity);
+    }
+
+    public function testUseAutoIncrementSetToFalseUpdate(): void
+    {
+        $key = 'key';
+
+        $update = [
+            'value' => 'some different value',
+        ];
+
+        $this->createModel(WithoutAutoIncrementModel::class)->update($key, $update);
+        $this->seeInDatabase('without_auto_increment', ['key' => $key, 'value' => $update['value']]);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4087
+     */
+    public function testUpdateWithSetAndEscape(): void
+    {
+        $userData = [
+            'name' => 'Scott',
+        ];
+
+        $this->createModel(UserModel::class);
+
+        $this->assertTrue($this->model->set('country', '2+2', false)->set('email', '1+1')->update(1, $userData));
+
+        $this->seeInDatabase('user', [
+            'name'    => 'Scott',
+            'country' => '4',
+            'email'   => '1+1',
+        ]);
+    }
 }
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index 51cd5d194af2..b97532a09d68 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Config\Factories;
@@ -9,327 +18,330 @@
 use Tests\Support\Models\ValidErrorsModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class ValidationModelTest extends LiveModelTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->createModel(ValidModel::class);
-	}
-
-	public function testValid(): void
-	{
-		$data = [
-			'name'        => 'some name',
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->assertIsInt($this->model->insert($data));
-
-		$errors = $this->model->errors();
-		$this->assertEquals([], $errors);
-	}
-
-	public function testValidationBasics(): void
-	{
-		$data = [
-			'name'        => null,
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->assertFalse($this->model->insert($data));
-
-		$errors = $this->model->errors();
-		$this->assertSame('You forgot to name the baby.', $errors['name']);
-	}
-
-	public function testValidationWithSetValidationRule(): void
-	{
-		$data = [
-			'name'        => 'some name',
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->model->setValidationRule('description', [
-			'rules'  => 'required|min_length[50]',
-			'errors' => [
-				'min_length' => 'Description is too short baby.',
-			],
-		]);
-		$this->assertFalse($this->model->insert($data));
-
-		$errors = $this->model->errors();
-		$this->assertSame('Description is too short baby.', $errors['description']);
-	}
-
-	public function testValidationWithSetValidationRules(): void
-	{
-		$data = [
-			'name'        => '',
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->model->setValidationRules([
-			'name'        => [
-				'rules'  => 'required',
-				'errors' => [
-					'required' => 'Give me a name baby.',
-				],
-			],
-			'description' => [
-				'rules'  => 'required|min_length[50]',
-				'errors' => [
-					'min_length' => 'Description is too short baby.',
-				],
-			],
-		]);
-		$this->assertFalse($this->model->insert($data));
-
-		$errors = $this->model->errors();
-		$this->assertSame('Give me a name baby.', $errors['name']);
-		$this->assertSame('Description is too short baby.', $errors['description']);
-	}
-
-	public function testValidationWithSetValidationMessage(): void
-	{
-		$data = [
-			'name'        => null,
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->model->setValidationMessage('name', [
-			'required'   => 'Your baby name is missing.',
-			'min_length' => 'Too short, man!',
-		]);
-		$this->assertFalse($this->model->insert($data));
-
-		$errors = $this->model->errors();
-		$this->assertSame('Your baby name is missing.', $errors['name']);
-	}
-
-	public function testValidationPlaceholdersSuccess(): void
-	{
-		$data = [
-			'name'  => 'abc',
-			'id'    => 13,
-			'token' => 13,
-		];
-
-		$this->assertTrue($this->model->validate($data));
-	}
-
-	public function testValidationPlaceholdersFail(): void
-	{
-		$data = [
-			'name'  => 'abc',
-			'id'    => 13,
-			'token' => 12,
-		];
-
-		$this->assertFalse($this->model->validate($data));
-	}
-
-	public function testSkipValidation(): void
-	{
-		$data = [
-			'name'        => '2',
-			'description' => 'some great marketing stuff',
-		];
-
-		$this->assertIsNumeric($this->model->skipValidation(true)->insert($data));
-	}
-
-	public function testCleanValidationRemovesAllWhenNoDataProvided(): void
-	{
-		$cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
-
-		$rules = [
-			'name' => 'required',
-			'foo'  => 'bar',
-		];
-
-		$rules = call_user_func($cleaner, $rules, null);
-		$this->assertEmpty($rules);
-	}
-
-	public function testCleanValidationRemovesOnlyForFieldsNotProvided(): void
-	{
-		$cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
-
-		$rules = [
-			'name' => 'required',
-			'foo'  => 'required',
-		];
-
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$rules = call_user_func($cleaner, $rules, $data);
-		$this->assertArrayHasKey('foo', $rules);
-		$this->assertArrayNotHasKey('name', $rules);
-	}
-
-	public function testCleanValidationReturnsAllWhenAllExist(): void
-	{
-		$cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
-
-		$rules = [
-			'name' => 'required',
-			'foo'  => 'required',
-		];
-
-		$data = [
-			'foo'  => 'bar',
-			'name' => null,
-		];
-
-		$rules = call_user_func($cleaner, $rules, $data);
-		$this->assertArrayHasKey('foo', $rules);
-		$this->assertArrayHasKey('name', $rules);
-	}
-
-	public function testValidationPassesWithMissingFields(): void
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$result = $this->model->validate($data);
-		$this->assertTrue($result);
-	}
-
-	public function testValidationWithGroupName(): void
-	{
-		$config = new Validation();
-
-		$config->grouptest = [
-			'name'  => [
-				'required',
-				'min_length[3]',
-			],
-			'token' => 'in_list[{id}]',
-		];
-
-		$data = [
-			'name'  => 'abc',
-			'id'    => 13,
-			'token' => 13,
-		];
-
-		Factories::injectMock('config', 'Validation', $config);
-
-		$this->createModel(ValidModel::class);
-		$this->setPrivateProperty($this->model, 'validationRules', 'grouptest');
-		$this->assertTrue($this->model->validate($data));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1584
-	 */
-	public function testUpdateWithValidation(): void
-	{
-		$data = [
-			'description' => 'This is a first test!',
-			'name'        => 'valid',
-			'id'          => 42,
-			'token'       => 42,
-		];
-
-		$id = $this->model->insert($data);
-		$this->assertTrue((bool) $id);
-
-		$data['description'] = 'This is a second test!';
-		unset($data['name']);
-
-		$result = $this->model->update($id, $data);
-		$this->assertTrue($result);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
-	 */
-	public function testRequiredWithValidationEmptyString(): void
-	{
-		$this->assertFalse($this->model->insert(['name' => '']));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
-	 */
-	public function testRequiredWithValidationNull(): void
-	{
-		$this->assertFalse($this->model->insert(['name' => null]));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
-	 */
-	public function testRequiredWithValidationTrue(): void
-	{
-		$data = [
-			'name'        => 'foobar',
-			'description' => 'just because we have to',
-		];
-
-		$this->assertTrue($this->model->insert($data) !== false);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1574
-	 */
-	public function testValidationIncludingErrors(): void
-	{
-		$data = [
-			'description' => 'This is a first test!',
-			'name'        => 'valid',
-			'id'          => 42,
-			'token'       => 42,
-		];
-
-		$this->createModel(ValidErrorsModel::class);
-
-		$id = $this->model->insert($data);
-		$this->assertFalse((bool)$id);
-		$this->assertSame('Minimum Length Error', $this->model->errors()['name']);
-	}
-
-	public function testValidationByObject(): void
-	{
-		$data = new stdClass();
-
-		$data->name  = 'abc';
-		$data->id    = '13';
-		$data->token = '13';
-
-		$this->assertTrue($this->model->validate($data));
-	}
-
-	public function testGetValidationRules(): void
-	{
-		$this->createModel(JobModel::class);
-		$this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
-
-		$rules = $this->model->getValidationRules();
-		$this->assertSame('required', $rules['description']);
-	}
-
-	public function testGetValidationMessages(): void
-	{
-		$jobData = [
-			[
-				'name'        => 'Comedian',
-				'description' => null,
-			],
-		];
-
-		$this->createModel(JobModel::class);
-		$this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
-		$this->setPrivateProperty($this->model, 'validationMessages', ['description' => 'Description field is required.']);
-
-		$this->assertFalse($this->model->insertBatch($jobData));
-
-		$error = $this->model->getValidationMessages();
-		$this->assertSame('Description field is required.', $error['description']);
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->createModel(ValidModel::class);
+    }
+
+    public function testValid(): void
+    {
+        $data = [
+            'name'        => 'some name',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertIsInt($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame([], $errors);
+    }
+
+    public function testValidationBasics(): void
+    {
+        $data = [
+            'name'        => null,
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('You forgot to name the baby.', $errors['name']);
+    }
+
+    public function testValidationWithSetValidationRule(): void
+    {
+        $data = [
+            'name'        => 'some name',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->model->setValidationRule('description', [
+            'rules'  => 'required|min_length[50]',
+            'errors' => [
+                'min_length' => 'Description is too short baby.',
+            ],
+        ]);
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('Description is too short baby.', $errors['description']);
+    }
+
+    public function testValidationWithSetValidationRules(): void
+    {
+        $data = [
+            'name'        => '',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->model->setValidationRules([
+            'name' => [
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'Give me a name baby.',
+                ],
+            ],
+            'description' => [
+                'rules'  => 'required|min_length[50]',
+                'errors' => [
+                    'min_length' => 'Description is too short baby.',
+                ],
+            ],
+        ]);
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('Give me a name baby.', $errors['name']);
+        $this->assertSame('Description is too short baby.', $errors['description']);
+    }
+
+    public function testValidationWithSetValidationMessage(): void
+    {
+        $data = [
+            'name'        => null,
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->model->setValidationMessage('name', [
+            'required'   => 'Your baby name is missing.',
+            'min_length' => 'Too short, man!',
+        ]);
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('Your baby name is missing.', $errors['name']);
+    }
+
+    public function testValidationPlaceholdersSuccess(): void
+    {
+        $data = [
+            'name'  => 'abc',
+            'id'    => 13,
+            'token' => 13,
+        ];
+
+        $this->assertTrue($this->model->validate($data));
+    }
+
+    public function testValidationPlaceholdersFail(): void
+    {
+        $data = [
+            'name'  => 'abc',
+            'id'    => 13,
+            'token' => 12,
+        ];
+
+        $this->assertFalse($this->model->validate($data));
+    }
+
+    public function testSkipValidation(): void
+    {
+        $data = [
+            'name'        => '2',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertIsNumeric($this->model->skipValidation(true)->insert($data));
+    }
+
+    public function testCleanValidationRemovesAllWhenNoDataProvided(): void
+    {
+        $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
+
+        $rules = [
+            'name' => 'required',
+            'foo'  => 'bar',
+        ];
+
+        $rules = $cleaner($rules, null);
+        $this->assertEmpty($rules);
+    }
+
+    public function testCleanValidationRemovesOnlyForFieldsNotProvided(): void
+    {
+        $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
+
+        $rules = [
+            'name' => 'required',
+            'foo'  => 'required',
+        ];
+
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $rules = $cleaner($rules, $data);
+        $this->assertArrayHasKey('foo', $rules);
+        $this->assertArrayNotHasKey('name', $rules);
+    }
+
+    public function testCleanValidationReturnsAllWhenAllExist(): void
+    {
+        $cleaner = $this->getPrivateMethodInvoker($this->model, 'cleanValidationRules');
+
+        $rules = [
+            'name' => 'required',
+            'foo'  => 'required',
+        ];
+
+        $data = [
+            'foo'  => 'bar',
+            'name' => null,
+        ];
+
+        $rules = $cleaner($rules, $data);
+        $this->assertArrayHasKey('foo', $rules);
+        $this->assertArrayHasKey('name', $rules);
+    }
+
+    public function testValidationPassesWithMissingFields(): void
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $result = $this->model->validate($data);
+        $this->assertTrue($result);
+    }
+
+    public function testValidationWithGroupName(): void
+    {
+        $config = new Validation();
+
+        $config->grouptest = [
+            'name' => [
+                'required',
+                'min_length[3]',
+            ],
+            'token' => 'in_list[{id}]',
+        ];
+
+        $data = [
+            'name'  => 'abc',
+            'id'    => 13,
+            'token' => 13,
+        ];
+
+        Factories::injectMock('config', 'Validation', $config);
+
+        $this->createModel(ValidModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', 'grouptest');
+        $this->assertTrue($this->model->validate($data));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1584
+     */
+    public function testUpdateWithValidation(): void
+    {
+        $data = [
+            'description' => 'This is a first test!',
+            'name'        => 'valid',
+            'id'          => 42,
+            'token'       => 42,
+        ];
+
+        $id = $this->model->insert($data);
+        $this->assertTrue((bool) $id);
+
+        $data['description'] = 'This is a second test!';
+        unset($data['name']);
+
+        $result = $this->model->update($id, $data);
+        $this->assertTrue($result);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
+     */
+    public function testRequiredWithValidationEmptyString(): void
+    {
+        $this->assertFalse($this->model->insert(['name' => '']));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
+     */
+    public function testRequiredWithValidationNull(): void
+    {
+        $this->assertFalse($this->model->insert(['name' => null]));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1717
+     */
+    public function testRequiredWithValidationTrue(): void
+    {
+        $data = [
+            'name'        => 'foobar',
+            'description' => 'just because we have to',
+        ];
+
+        $this->assertTrue($this->model->insert($data) !== false);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1574
+     */
+    public function testValidationIncludingErrors(): void
+    {
+        $data = [
+            'description' => 'This is a first test!',
+            'name'        => 'valid',
+            'id'          => 42,
+            'token'       => 42,
+        ];
+
+        $this->createModel(ValidErrorsModel::class);
+
+        $id = $this->model->insert($data);
+        $this->assertFalse((bool) $id);
+        $this->assertSame('Minimum Length Error', $this->model->errors()['name']);
+    }
+
+    public function testValidationByObject(): void
+    {
+        $data = new stdClass();
+
+        $data->name  = 'abc';
+        $data->id    = '13';
+        $data->token = '13';
+
+        $this->assertTrue($this->model->validate($data));
+    }
+
+    public function testGetValidationRules(): void
+    {
+        $this->createModel(JobModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
+
+        $rules = $this->model->getValidationRules();
+        $this->assertSame('required', $rules['description']);
+    }
+
+    public function testGetValidationMessages(): void
+    {
+        $jobData = [
+            [
+                'name'        => 'Comedian',
+                'description' => null,
+            ],
+        ];
+
+        $this->createModel(JobModel::class);
+        $this->setPrivateProperty($this->model, 'validationRules', ['description' => 'required']);
+        $this->setPrivateProperty($this->model, 'validationMessages', ['description' => 'Description field is required.']);
+
+        $this->assertFalse($this->model->insertBatch($jobData));
+
+        $error = $this->model->getValidationMessages();
+        $this->assertSame('Description field is required.', $error['description']);
+    }
 }
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 2de0708fb67c..90546a31b117 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -1,658 +1,620 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Pager;
 
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class PagerRendererTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PagerRendererTest extends CIUnitTestCase
 {
-	/**
-	 * @var URI
-	 */
-	protected $uri;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->uri    = new URI('http://example.com/foo');
-		$this->expect = 'http://example.com/foo?page=';
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousReturnsFalseWhenFirstIsOne()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 5,
-			'currentPage' => 1,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertFalse($pager->hasPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 5,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertTrue($pager->hasPrevious());
-		$this->assertEquals('http://example.com/foo?foo=bar&page=2', $pager->getPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetPreviousWhenSurroundCountIsZero()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(0);
-
-		$this->assertTrue($pager->hasPrevious());
-		$this->assertEquals('http://example.com/foo?foo=bar&page=3', $pager->getPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextReturnsFalseWhenLastIsTotal()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 5,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertFalse($pager->hasNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertTrue($pager->hasNext());
-		$this->assertEquals('http://example.com/foo?foo=bar&page=7', $pager->getNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetNextWhenSurroundCountIsZero()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(0);
-
-		$this->assertTrue($pager->hasNext());
-		$this->assertEquals('http://example.com/foo?foo=bar&page=5', $pager->getNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLinksBasics()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(1);
-
-		$expected = [
-			[
-				'uri'    => 'http://example.com/foo?page=3',
-				'title'  => 3,
-				'active' => false,
-			],
-			[
-				'uri'    => 'http://example.com/foo?page=4',
-				'title'  => 4,
-				'active' => true,
-			],
-			[
-				'uri'    => 'http://example.com/foo?page=5',
-				'title'  => 5,
-				'active' => false,
-			],
-		];
-
-		$this->assertEquals($expected, $pager->links());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFirstAndGetLast()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertEquals('http://example.com/foo?foo=bar&page=1', $pager->getFirst());
-		$this->assertEquals('http://example.com/foo?foo=bar&page=50', $pager->getLast());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetCurrent()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 10,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertEquals('http://example.com/foo?foo=bar&page=10', $pager->getCurrent());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetCurrentWithSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 10,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertEquals('http://example.com/foo/10?foo=bar', $pager->getCurrent());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSurroundCount()
-	{
-		$uri = $this->uri;
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10, // 10 pages
-			'currentPage' => 4,
-			'total'       => 100, // 100 records, so 10 per page
-		];
-
-		$pager = new PagerRenderer($details);
-
-		// without any surround count
-		$this->assertEquals(null, $pager->getPrevious());
-		$this->assertEquals(null, $pager->getNext());
-
-		// with surropund count of 2
-		$pager->setSurroundCount(2);
-		$this->assertEquals($this->expect . '1', $pager->getPrevious());
-		$this->assertEquals($this->expect . '7', $pager->getNext());
-
-		// with unchanged surround count
-		$pager->setSurroundCount();
-		$this->assertEquals($this->expect . '1', $pager->getPrevious());
-		$this->assertEquals($this->expect . '7', $pager->getNext());
-
-		// and with huge surround count
-		$pager->setSurroundCount(100);
-		$this->assertEquals(null, $pager->getPrevious());
-		$this->assertEquals(null, $pager->getNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousReturnsFalseWhenFirstIsOneSegment()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 5,
-			'currentPage' => 1,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertFalse($pager->hasPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 5,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertTrue($pager->hasPrevious());
-		$this->assertEquals('http://example.com/foo/2?foo=bar', $pager->getPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetPreviousWhenSurroundCountIsZeroSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(0);
-
-		$this->assertTrue($pager->hasPrevious());
-		$this->assertEquals('http://example.com/foo/3?foo=bar', $pager->getPrevious());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextReturnsFalseWhenLastIsTotalSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 5,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertFalse($pager->hasNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertTrue($pager->hasNext());
-		$this->assertEquals('http://example.com/foo/7?foo=bar', $pager->getNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetNextWhenSurroundCountIsZeroSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(0);
-
-		$this->assertTrue($pager->hasNext());
-		$this->assertEquals('http://example.com/foo/5?foo=bar', $pager->getNext());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLinksBasicsSegment()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$pager->setSurroundCount(1);
-
-		$expected = [
-			[
-				'uri'    => 'http://example.com/foo/3',
-				'title'  => 3,
-				'active' => false,
-			],
-			[
-				'uri'    => 'http://example.com/foo/4',
-				'title'  => 4,
-				'active' => true,
-			],
-			[
-				'uri'    => 'http://example.com/foo/5',
-				'title'  => 5,
-				'active' => false,
-			],
-		];
-
-		$this->assertEquals($expected, $pager->links());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFirstAndGetLastSegment()
-	{
-		$uri = $this->uri;
-		$uri->addQuery('foo', 'bar');
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 50,
-			'currentPage' => 4,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertEquals('http://example.com/foo/1?foo=bar', $pager->getFirst());
-		$this->assertEquals('http://example.com/foo/50?foo=bar', $pager->getLast());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousPageReturnsFalseWhenCurrentPageIsFirst()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 5,
-			'currentPage' => 1,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertNull($pager->getPreviousPage());
-		$this->assertFalse($pager->hasPreviousPage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextPageReturnsFalseWhenCurrentPageIsLast()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 5,
-			'currentPage' => 5,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertNull($pager->getNextPage());
-		$this->assertFalse($pager->hasNextPage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasPreviousPageReturnsTrueWhenFirstIsMoreThanCurrent()
-	{
-		$uri = $this->uri;
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 3,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertNotNull($pager->getPreviousPage());
-		$this->assertTrue($pager->hasPreviousPage());
-		$this->assertEquals('http://example.com/foo?page=2', $pager->getPreviousPage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetPreviousPageWithSegmentHigherThanZero()
-	{
-		$uri = $this->uri;
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 3,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$this->assertEquals('http://example.com/foo/2', $pager->getPreviousPage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasNextPageReturnsTrueWhenLastIsMoreThanCurrent()
-	{
-		$uri = $this->uri;
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 3,
-			'total'       => 100,
-		];
-
-		$pager = new PagerRenderer($details);
-
-		$this->assertNotNull($pager->getNextPage());
-		$this->assertTrue($pager->hasNextPage());
-		$this->assertEquals('http://example.com/foo?page=4', $pager->getNextPage());
-	}
-
-	public function testGetNextPageWithSegmentHigherThanZero()
-	{
-		$uri = $this->uri;
-
-		$details = [
-			'uri'         => $uri,
-			'pageCount'   => 10,
-			'currentPage' => 3,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-
-		$pager = new PagerRenderer($details);
-		$this->assertEquals('http://example.com/foo/4', $pager->getNextPage());
-	}
-
-	public function testGetPageNumber()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 3,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-
-		$this->assertEquals(1, $pager->getFirstPageNumber());
-		$this->assertEquals(3, $pager->getCurrentPageNumber());
-		$this->assertEquals(10, $pager->getLastPageNumber());
-		$this->assertEquals(10, $pager->getPageCount());
-	}
-
-	public function testGetPageNumberSetSurroundCount()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 5,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertEquals(3, $pager->getFirstPageNumber());
-		$this->assertEquals(5, $pager->getCurrentPageNumber());
-		$this->assertEquals(7, $pager->getLastPageNumber());
-	}
-
-	public function testGetPreviousPageNumber()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 5,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertEquals(4, $pager->getPreviousPageNumber());
-	}
-
-	public function testGetPreviousPageNumberNull()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 1,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertNull($pager->getPreviousPageNumber());
-	}
-
-	public function testGetNextPageNumber()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 5,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertEquals(6, $pager->getNextPageNumber());
-	}
-
-	public function testGetNextPageNumberNull()
-	{
-		$details = [
-			'uri'         => $this->uri,
-			'pageCount'   => 10,
-			'currentPage' => 10,
-			'total'       => 100,
-			'segment'     => 2,
-		];
-		$pager   = new PagerRenderer($details);
-		$pager->setSurroundCount(2);
-
-		$this->assertNull($pager->getNextPageNumber());
-	}
+    /**
+     * @var URI
+     */
+    protected $uri;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->uri    = new URI('http://example.com/foo');
+        $this->expect = 'http://example.com/foo?page=';
+    }
+
+    public function testHasPreviousReturnsFalseWhenFirstIsOne()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 5,
+            'currentPage' => 1,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertFalse($pager->hasPrevious());
+    }
+
+    public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 5,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertTrue($pager->hasPrevious());
+        $this->assertSame('http://example.com/foo?foo=bar&page=2', $pager->getPrevious());
+    }
+
+    public function testGetPreviousWhenSurroundCountIsZero()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(0);
+
+        $this->assertTrue($pager->hasPrevious());
+        $this->assertSame('http://example.com/foo?foo=bar&page=3', $pager->getPrevious());
+    }
+
+    public function testHasNextReturnsFalseWhenLastIsTotal()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 5,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertFalse($pager->hasNext());
+    }
+
+    public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertTrue($pager->hasNext());
+        $this->assertSame('http://example.com/foo?foo=bar&page=7', $pager->getNext());
+    }
+
+    public function testGetNextWhenSurroundCountIsZero()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(0);
+
+        $this->assertTrue($pager->hasNext());
+        $this->assertSame('http://example.com/foo?foo=bar&page=5', $pager->getNext());
+    }
+
+    public function testLinksBasics()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(1);
+
+        $expected = [
+            [
+                'uri'    => 'http://example.com/foo?page=3',
+                'title'  => 3,
+                'active' => false,
+            ],
+            [
+                'uri'    => 'http://example.com/foo?page=4',
+                'title'  => 4,
+                'active' => true,
+            ],
+            [
+                'uri'    => 'http://example.com/foo?page=5',
+                'title'  => 5,
+                'active' => false,
+            ],
+        ];
+
+        $this->assertSame($expected, $pager->links());
+    }
+
+    public function testGetFirstAndGetLast()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertSame('http://example.com/foo?foo=bar&page=1', $pager->getFirst());
+        $this->assertSame('http://example.com/foo?foo=bar&page=50', $pager->getLast());
+    }
+
+    public function testGetCurrent()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 10,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertSame('http://example.com/foo?foo=bar&page=10', $pager->getCurrent());
+    }
+
+    public function testGetCurrentWithSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 10,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertSame('http://example.com/foo/10?foo=bar', $pager->getCurrent());
+    }
+
+    public function testSurroundCount()
+    {
+        $uri = $this->uri;
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10, // 10 pages
+            'currentPage' => 4,
+            'total'       => 100, // 100 records, so 10 per page
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        // without any surround count
+        $this->assertNull($pager->getPrevious());
+        $this->assertNull($pager->getNext());
+
+        // with surropund count of 2
+        $pager->setSurroundCount(2);
+        $this->assertSame($this->expect . '1', $pager->getPrevious());
+        $this->assertSame($this->expect . '7', $pager->getNext());
+
+        // with unchanged surround count
+        $pager->setSurroundCount();
+        $this->assertSame($this->expect . '1', $pager->getPrevious());
+        $this->assertSame($this->expect . '7', $pager->getNext());
+
+        // and with huge surround count
+        $pager->setSurroundCount(100);
+        $this->assertNull($pager->getPrevious());
+        $this->assertNull($pager->getNext());
+    }
+
+    public function testHasPreviousReturnsFalseWhenFirstIsOneSegment()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 5,
+            'currentPage' => 1,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertFalse($pager->hasPrevious());
+    }
+
+    public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 5,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertTrue($pager->hasPrevious());
+        $this->assertSame('http://example.com/foo/2?foo=bar', $pager->getPrevious());
+    }
+
+    public function testGetPreviousWhenSurroundCountIsZeroSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(0);
+
+        $this->assertTrue($pager->hasPrevious());
+        $this->assertSame('http://example.com/foo/3?foo=bar', $pager->getPrevious());
+    }
+
+    public function testHasNextReturnsFalseWhenLastIsTotalSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 5,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertFalse($pager->hasNext());
+    }
+
+    public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertTrue($pager->hasNext());
+        $this->assertSame('http://example.com/foo/7?foo=bar', $pager->getNext());
+    }
+
+    public function testGetNextWhenSurroundCountIsZeroSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(0);
+
+        $this->assertTrue($pager->hasNext());
+        $this->assertSame('http://example.com/foo/5?foo=bar', $pager->getNext());
+    }
+
+    public function testLinksBasicsSegment()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(1);
+
+        $expected = [
+            [
+                'uri'    => 'http://example.com/foo/3',
+                'title'  => 3,
+                'active' => false,
+            ],
+            [
+                'uri'    => 'http://example.com/foo/4',
+                'title'  => 4,
+                'active' => true,
+            ],
+            [
+                'uri'    => 'http://example.com/foo/5',
+                'title'  => 5,
+                'active' => false,
+            ],
+        ];
+
+        $this->assertSame($expected, $pager->links());
+    }
+
+    public function testGetFirstAndGetLastSegment()
+    {
+        $uri = $this->uri;
+        $uri->addQuery('foo', 'bar');
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 50,
+            'currentPage' => 4,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertSame('http://example.com/foo/1?foo=bar', $pager->getFirst());
+        $this->assertSame('http://example.com/foo/50?foo=bar', $pager->getLast());
+    }
+
+    public function testHasPreviousPageReturnsFalseWhenCurrentPageIsFirst()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 5,
+            'currentPage' => 1,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertNull($pager->getPreviousPage());
+        $this->assertFalse($pager->hasPreviousPage());
+    }
+
+    public function testHasNextPageReturnsFalseWhenCurrentPageIsLast()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 5,
+            'currentPage' => 5,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertNull($pager->getNextPage());
+        $this->assertFalse($pager->hasNextPage());
+    }
+
+    public function testHasPreviousPageReturnsTrueWhenFirstIsMoreThanCurrent()
+    {
+        $uri = $this->uri;
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 3,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertNotNull($pager->getPreviousPage());
+        $this->assertTrue($pager->hasPreviousPage());
+        $this->assertSame('http://example.com/foo?page=2', $pager->getPreviousPage());
+    }
+
+    public function testGetPreviousPageWithSegmentHigherThanZero()
+    {
+        $uri = $this->uri;
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 3,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $this->assertSame('http://example.com/foo/2', $pager->getPreviousPage());
+    }
+
+    public function testHasNextPageReturnsTrueWhenLastIsMoreThanCurrent()
+    {
+        $uri = $this->uri;
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 3,
+            'total'       => 100,
+        ];
+
+        $pager = new PagerRenderer($details);
+
+        $this->assertNotNull($pager->getNextPage());
+        $this->assertTrue($pager->hasNextPage());
+        $this->assertSame('http://example.com/foo?page=4', $pager->getNextPage());
+    }
+
+    public function testGetNextPageWithSegmentHigherThanZero()
+    {
+        $uri = $this->uri;
+
+        $details = [
+            'uri'         => $uri,
+            'pageCount'   => 10,
+            'currentPage' => 3,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+
+        $pager = new PagerRenderer($details);
+        $this->assertSame('http://example.com/foo/4', $pager->getNextPage());
+    }
+
+    public function testGetPageNumber()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 3,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+
+        $this->assertSame(1, $pager->getFirstPageNumber());
+        $this->assertSame(3, $pager->getCurrentPageNumber());
+        $this->assertSame(10, $pager->getLastPageNumber());
+        $this->assertSame(10, $pager->getPageCount());
+    }
+
+    public function testGetPageNumberSetSurroundCount()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 5,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertSame(3, $pager->getFirstPageNumber());
+        $this->assertSame(5, $pager->getCurrentPageNumber());
+        $this->assertSame(7, $pager->getLastPageNumber());
+    }
+
+    public function testGetPreviousPageNumber()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 5,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertSame(4, $pager->getPreviousPageNumber());
+    }
+
+    public function testGetPreviousPageNumberNull()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 1,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertNull($pager->getPreviousPageNumber());
+    }
+
+    public function testGetNextPageNumber()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 5,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertSame(6, $pager->getNextPageNumber());
+    }
+
+    public function testGetNextPageNumberNull()
+    {
+        $details = [
+            'uri'         => $this->uri,
+            'pageCount'   => 10,
+            'currentPage' => 10,
+            'total'       => 100,
+            'segment'     => 2,
+        ];
+        $pager = new PagerRenderer($details);
+        $pager->setSurroundCount(2);
+
+        $this->assertNull($pager->getNextPageNumber());
+    }
 }
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 308be74452d7..72deb09c2c4c 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Pager;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager;
 
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Pager\Exceptions\PagerException;
@@ -9,440 +20,451 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class PagerTest extends CIUnitTestCase
+final class PagerTest extends CIUnitTestCase
 {
+    /**
+     * @var \CodeIgniter\Pager\Pager
+     */
+    protected $pager;
+    protected $config;
 
-	/**
-	 * @var \CodeIgniter\Pager\Pager
-	 */
-	protected $pager;
-	protected $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		helper('url');
-
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/';
-		$_GET                   = [];
+    protected function setUp(): void
+    {
+        parent::setUp();
+        helper('url');
 
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-		$request         = Services::request($config);
-		$request->uri    = new URI('http://example.com');
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/';
+        $_GET                   = [];
 
-		Services::injectMock('request', $request);
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+        $request         = Services::request($config);
+        $request->uri    = new URI('http://example.com');
 
-		$_GET         = [];
-		$this->config = new Pager();
-		$this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
-	}
+        Services::injectMock('request', $request);
 
-	public function testSetPathRemembersPath()
-	{
-		$this->pager->setPath('foo/bar');
+        $_GET         = [];
+        $this->config = new Pager();
+        $this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
+    }
 
-		$details = $this->pager->getDetails();
+    public function testSetPathRemembersPath()
+    {
+        $this->pager->setPath('foo/bar');
 
-		$this->assertEquals('foo/bar', $details['uri']->getPath());
-	}
+        $details = $this->pager->getDetails();
 
-	public function testGetDetailsRecognizesPageQueryVar()
-	{
-		$_GET['page'] = 2;
+        $this->assertSame('foo/bar', $details['uri']->getPath());
+    }
 
-		// Need this to create the group.
-		$this->pager->setPath('foo/bar');
+    public function testGetDetailsRecognizesPageQueryVar()
+    {
+        $_GET['page'] = 2;
 
-		$details = $this->pager->getDetails();
+        // Need this to create the group.
+        $this->pager->setPath('foo/bar');
 
-		$this->assertEquals(2, $details['currentPage']);
-	}
+        $details = $this->pager->getDetails();
 
-	public function testGetDetailsRecognizesGroupedPageQueryVar()
-	{
-		$_GET['page_foo'] = 2;
+        $this->assertSame(2, $details['currentPage']);
+    }
 
-		// Need this to create the group.
-		$this->pager->setPath('foo/bar', 'foo');
+    public function testGetDetailsRecognizesGroupedPageQueryVar()
+    {
+        $_GET['page_foo'] = 2;
 
-		$details = $this->pager->getDetails('foo');
+        // Need this to create the group.
+        $this->pager->setPath('foo/bar', 'foo');
 
-		$this->assertEquals(2, $details['currentPage']);
-	}
+        $details = $this->pager->getDetails('foo');
 
-	public function testGetDetailsThrowExceptionIfGroupNotFound()
-	{
-		$this->expectException(PagerException::class);
+        $this->assertSame(2, $details['currentPage']);
+    }
 
-		$this->pager->getDetails('foo');
-	}
+    public function testGetDetailsThrowExceptionIfGroupNotFound()
+    {
+        $this->expectException(PagerException::class);
 
-	public function testDetailsHasConfiguredPerPageValue()
-	{
-		// Need this to create the group.
-		$this->pager->setPath('foo/bar', 'foo');
+        $this->pager->getDetails('foo');
+    }
 
-		$details = $this->pager->getDetails('foo');
+    public function testDetailsHasConfiguredPerPageValue()
+    {
+        // Need this to create the group.
+        $this->pager->setPath('foo/bar', 'foo');
 
-		$this->assertEquals($this->config->perPage, $details['perPage']);
-	}
+        $details = $this->pager->getDetails('foo');
 
-	public function testStoreDoesBasicCalcs()
-	{
-		$this->pager->store('foo', 3, 25, 100);
+        $this->assertSame($this->config->perPage, $details['perPage']);
+    }
 
-		$details = $this->pager->getDetails('foo');
+    public function testStoreDoesBasicCalcs()
+    {
+        $this->pager->store('foo', 3, 25, 100);
 
-		$this->assertEquals($details['total'], 100);
-		$this->assertEquals($details['perPage'], 25);
-		$this->assertEquals($details['currentPage'], 3);
-	}
+        $details = $this->pager->getDetails('foo');
 
-	public function testStoreDoesBasicCalcsOnPerPageReadFromPagerConfig()
-	{
-		$this->pager->store('foo', 3, null, 100);
+        $this->assertSame($details['total'], 100);
+        $this->assertSame($details['perPage'], 25);
+        $this->assertSame($details['currentPage'], 3);
+    }
 
-		$details = $this->pager->getDetails('foo');
+    public function testStoreDoesBasicCalcsOnPerPageReadFromPagerConfig()
+    {
+        $this->pager->store('foo', 3, null, 100);
 
-		$this->assertEquals($details['total'], 100);
-		$this->assertEquals($details['perPage'], 20);
-		$this->assertEquals($details['currentPage'], 3);
-	}
+        $details = $this->pager->getDetails('foo');
 
-	public function testStoreAndHasMore()
-	{
-		$this->pager->store('foo', 3, 25, 100);
+        $this->assertSame($details['total'], 100);
+        $this->assertSame($details['perPage'], 20);
+        $this->assertSame($details['currentPage'], 3);
+    }
 
-		$this->assertTrue($this->pager->hasMore('foo'));
-	}
+    public function testStoreAndHasMore()
+    {
+        $this->pager->store('foo', 3, 25, 100);
 
-	public function testStoreAndHasMoreCanBeFalse()
-	{
-		$this->pager->store('foo', 3, 25, 70);
+        $this->assertTrue($this->pager->hasMore('foo'));
+    }
 
-		$this->assertFalse($this->pager->hasMore('foo'));
-	}
+    public function testStoreAndHasMoreCanBeFalse()
+    {
+        $this->pager->store('foo', 3, 25, 70);
 
-	public function testStoreWithQueries()
-	{
-		$_GET['page'] = 3;
-		$_GET['foo']  = 'bar';
+        $this->assertFalse($this->pager->hasMore('foo'));
+    }
 
-		$this->pager->store('default', 3, 25, 100);
+    public function testStoreWithQueries()
+    {
+        $_GET['page'] = 3;
+        $_GET['foo']  = 'bar';
 
-		$this->assertEquals('http://example.com/index.php?page=2&foo=bar', $this->pager->getPreviousPageURI());
-		$this->assertEquals('http://example.com/index.php?page=4&foo=bar', $this->pager->getNextPageURI());
-		$this->assertEquals('http://example.com/index.php?page=5&foo=bar', $this->pager->getPageURI(5));
-		$this->assertEquals(
-			'http://example.com/index.php?foo=bar&page=5',
-			$this->pager->only(['foo'])->getPageURI(5)
-		);
-	}
+        $this->pager->store('default', 3, 25, 100);
 
-	public function testStoreWithSegments()
-	{
-		$_GET['page'] = 3;
-		$_GET['foo']  = 'bar';
+        $this->assertSame('http://example.com/index.php?page=2&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/index.php?page=4&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/index.php?page=5&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame(
+            'http://example.com/index.php?foo=bar&page=5',
+            $this->pager->only(['foo'])->getPageURI(5)
+        );
+    }
 
-		$this->pager->store('default', 3, 25, 100, 1);
+    public function testStoreWithSegments()
+    {
+        $_GET['page'] = 3;
+        $_GET['foo']  = 'bar';
 
-		$this->assertEquals('http://example.com/2?page=3&foo=bar', $this->pager->getPreviousPageURI());
-		$this->assertEquals('http://example.com/4?page=3&foo=bar', $this->pager->getNextPageURI());
-		$this->assertEquals('http://example.com/5?page=3&foo=bar', $this->pager->getPageURI(5));
-		$this->assertEquals(
-			'http://example.com/5?foo=bar',
-			$this->pager->only(['foo'])->getPageURI(5)
-		);
-	}
+        $this->pager->store('default', 3, 25, 100, 1);
 
-	public function testHasMoreDefaultsToFalse()
-	{
-		$this->assertFalse($this->pager->hasMore('foo'));
-	}
+        $this->assertSame('http://example.com/2?page=3&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/4?page=3&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/5?page=3&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame(
+            'http://example.com/5?foo=bar',
+            $this->pager->only(['foo'])->getPageURI(5)
+        );
+    }
 
-	public function testPerPageHasDefaultValue()
-	{
-		$this->assertEquals($this->config->perPage, $this->pager->getPerPage());
-	}
+    public function testHasMoreDefaultsToFalse()
+    {
+        $this->assertFalse($this->pager->hasMore('foo'));
+    }
 
-	public function testPerPageKeepsStoredValue()
-	{
-		$this->pager->store('foo', 3, 13, 70);
+    public function testPerPageHasDefaultValue()
+    {
+        $this->assertSame($this->config->perPage, $this->pager->getPerPage());
+    }
 
-		$this->assertEquals(13, $this->pager->getPerPage('foo'));
-	}
+    public function testPerPageKeepsStoredValue()
+    {
+        $this->pager->store('foo', 3, 13, 70);
 
-	public function testGetCurrentPageDefaultsToOne()
-	{
-		$this->assertEquals(1, $this->pager->getCurrentPage());
-	}
+        $this->assertSame(13, $this->pager->getPerPage('foo'));
+    }
 
-	public function testGetCurrentPageRemembersStoredPage()
-	{
-		$this->pager->store('foo', 3, 13, 70);
+    public function testGetCurrentPageDefaultsToOne()
+    {
+        $this->assertSame(1, $this->pager->getCurrentPage());
+    }
 
-		$this->assertEquals(3, $this->pager->getCurrentPage('foo'));
-	}
+    public function testGetCurrentPageRemembersStoredPage()
+    {
+        $this->pager->store('foo', 3, 13, 70);
 
-	public function testGetCurrentPageDetectsURI()
-	{
-		$_GET['page'] = 2;
+        $this->assertSame(3, $this->pager->getCurrentPage('foo'));
+    }
 
-		$this->assertEquals(2, $this->pager->getCurrentPage());
-	}
+    public function testGetCurrentPageDetectsURI()
+    {
+        $_GET['page'] = 2;
 
-	public function testGetCurrentPageDetectsGroupedURI()
-	{
-		$_GET['page_foo'] = 2;
+        $this->assertSame(2, $this->pager->getCurrentPage());
+    }
 
-		$this->assertEquals(2, $this->pager->getCurrentPage('foo'));
-	}
+    public function testGetCurrentPageDetectsGroupedURI()
+    {
+        $_GET['page_foo'] = 2;
 
-	public function testGetTotalPagesDefaultsToOne()
-	{
-		$this->assertEquals(1, $this->pager->getPageCount());
-	}
+        $this->assertSame(2, $this->pager->getCurrentPage('foo'));
+    }
 
-	public function testGetTotalCorrectValue()
-	{
-		$this->pager->store('foo', 3, 12, 70);
-
-		$this->assertEquals(70, $this->pager->getTotal('foo'));
-	}
+    public function testGetTotalPagesDefaultsToOne()
+    {
+        $this->assertSame(1, $this->pager->getPageCount());
+    }
 
-	public function testGetTotalPagesCalcsCorrectValue()
-	{
-		$this->pager->store('foo', 3, 12, 70);
+    public function testGetTotalCorrectValue()
+    {
+        $this->pager->store('foo', 3, 12, 70);
+
+        $this->assertSame(70, $this->pager->getTotal('foo'));
+    }
 
-		$this->assertEquals(6, $this->pager->getPageCount('foo'));
-	}
-
-	public function testGetNextURIUsesCurrentURI()
-	{
-		$_GET['page_foo'] = 2;
-
-		$this->pager->store('foo', 2, 12, 70);
-
-		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page_foo=3');
-
-		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
-	}
-
-	public function testGetNextURIReturnsNullOnLastPage()
-	{
-		$this->pager->store('foo', 6, 12, 70);
-
-		$this->assertNull($this->pager->getNextPageURI('foo'));
-	}
-
-	public function testGetNextURICorrectOnFirstPage()
-	{
-		$this->pager->store('foo', 1, 12, 70);
-
-		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page_foo=2');
-
-		$this->assertEquals($expected, $this->pager->getNextPageURI('foo'));
-	}
-
-	public function testGetPreviousURIUsesCurrentURI()
-	{
-		$_GET['page_foo'] = 2;
-
-		$this->pager->store('foo', 2, 12, 70);
-
-		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page_foo=1');
-
-		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
-	}
-
-	public function testGetNextURIReturnsNullOnFirstPage()
-	{
-		$this->pager->store('foo', 1, 12, 70);
-
-		$this->assertNull($this->pager->getPreviousPageURI('foo'));
-	}
-
-	public function testGetNextURIWithQueryStringUsesCurrentURI()
-	{
-		$_GET = [
-			'page_foo' => 3,
-			'status'   => 1,
-		];
-
-		$expected = current_url(true);
-		$expected = (string)$expected->setQueryArray($_GET);
-
-		$this->pager->store('foo', $_GET['page_foo'] - 1, 12, 70);
-
-		$this->assertEquals((string)$expected, $this->pager->getNextPageURI('foo'));
-	}
-
-	public function testGetPreviousURIWithQueryStringUsesCurrentURI()
-	{
-		$_GET     = [
-			'page_foo' => 1,
-			'status'   => 1,
-		];
-		$expected = current_url(true);
-		$expected = (string)$expected->setQueryArray($_GET);
-
-		$this->pager->store('foo', $_GET['page_foo'] + 1, 12, 70);
-
-		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
-	}
-
-	public function testGetOnlyQueries()
-	{
-		$_GET        = [
-			'page'     => 2,
-			'search'   => 'foo',
-			'order'    => 'asc',
-			'hello'    => 'xxx',
-			'category' => 'baz',
-		];
-		$onlyQueries = [
-			'search',
-			'order',
-		];
-
-		$this->pager->store('default', $_GET['page'], 10, 100);
-
-		$uri = current_url(true);
-
-		$this->assertEquals(
-			$this->pager->only($onlyQueries)
-						->getPreviousPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=1')
-		);
-		$this->assertEquals(
-			$this->pager->only($onlyQueries)
-						->getNextPageURI(), (string)$uri->setQuery('search=foo&order=asc&page=3')
-		);
-		$this->assertEquals(
-			$this->pager->only($onlyQueries)
-						->getPageURI(4), (string)$uri->setQuery('search=foo&order=asc&page=4')
-		);
-	}
-
-	public function testBadTemplate()
-	{
-		$this->expectException(PagerException::class);
-		$this->pager->links('default', 'bogus');
-	}
-
-	// the tests below are looking for specific <ul> elements.
-	// not the most rigorous, but a start :-/
-
-	public function testLinks()
-	{
-		$this->assertStringContainsString('<ul class="pagination">', $this->pager->links());
-	}
-
-	public function testSimpleLinks()
-	{
-		$this->assertStringContainsString('<ul class="pager">', $this->pager->simpleLinks());
-	}
-
-	public function testMakeLinks()
-	{
-		$this->assertStringContainsString(
-			'<ul class="pagination">', $this->pager->makeLinks(4, 10, 50)
-		);
-		$this->assertStringContainsString(
-			'<ul class="pagination">', $this->pager->makeLinks(4, 10, 50, 'default_full')
-		);
-		$this->assertStringContainsString(
-			'<ul class="pager">', $this->pager->makeLinks(4, 10, 50, 'default_simple')
-		);
-		$this->assertStringContainsString(
-			'<link rel="canonical"', $this->pager->makeLinks(4, 10, 50, 'default_head')
-		);
-		$this->assertStringContainsString(
-			'?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0)
-		);
-		$this->assertStringContainsString(
-			'?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, '')
-		);
-		$this->assertStringContainsString(
-			'?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'default')
-		);
-		$this->assertStringContainsString(
-			'?page_custom=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'custom')
-		);
-		$this->assertStringContainsString(
-			'?page_custom=1', $this->pager->makeLinks(1, null, 1, 'default_full', 0, 'custom')
-		);
-		$this->assertStringContainsString(
-			'/1', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
-		);
-		$this->assertStringContainsString(
-			'<li class="active">', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
-		);
-	}
-
-	public function testHeadLinks()
-	{
-		$firstPage = $this->pager->makeLinks(1, 10, 50, 'default_head');
-
-		$this->assertStringNotContainsString('<link rel="prev"', $firstPage);
-		$this->assertStringContainsString('<link rel="canonical"', $firstPage);
-		$this->assertStringContainsString('<link rel="next"', $firstPage);
-
-		$secondPage = $this->pager->makeLinks(2, 10, 50, 'default_head');
-
-		$this->assertStringContainsString('<link rel="prev"', $secondPage);
-		$this->assertStringContainsString('<link rel="canonical"', $secondPage);
-		$this->assertStringContainsString('<link rel="next"', $secondPage);
-
-		$lastPage = $this->pager->makeLinks(5, 10, 50, 'default_head');
-
-		$this->assertStringContainsString('<link rel="prev"', $lastPage);
-		$this->assertStringContainsString('<link rel="canonical"', $lastPage);
-		$this->assertStringNotContainsString('<link rel="next"', $lastPage);
-	}
-
-	public function testBasedURI()
-	{
-		$_SERVER['HTTP_HOST']   = 'example.com';
-		$_SERVER['REQUEST_URI'] = '/ci/v4/x/y';
-		$_GET                   = [];
-
-		$config            = new App();
-		$config->baseURL   = 'http://example.com/ci/v4/';
-		$config->indexPage = 'fc.php';
-		$request           = Services::request($config);
-		$request->uri      = new URI('http://example.com/ci/v4/x/y');
-
-		Services::injectMock('request', $request);
-
-		$this->config = new Pager();
-		$this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
-
-		$_GET['page_foo'] = 2;
-
-		$this->pager->store('foo', 2, 12, 70);
-
-		$expected = current_url(true);
-		$expected = (string)$expected->setQuery('page_foo=1');
-
-		$this->assertEquals((string)$expected, $this->pager->getPreviousPageURI('foo'));
-	}
-
-	public function testAccessPageMoreThanPageCountGetLastPage()
-	{
-		$this->pager->store('default', 11, 1, 10);
-		$this->assertEquals(10, $this->pager->getCurrentPage());
-	}
-
-	public function testSegmentOutOfBound()
-	{
-		$this->pager->store('default', 10, 1, 10, 1000);
-		$this->assertEquals(1, $this->pager->getCurrentPage());
-	}
+    public function testGetTotalPagesCalcsCorrectValue()
+    {
+        $this->pager->store('foo', 3, 12, 70);
 
+        $this->assertSame(6, $this->pager->getPageCount('foo'));
+    }
+
+    public function testGetNextURIUsesCurrentURI()
+    {
+        $_GET['page_foo'] = 2;
+
+        $this->pager->store('foo', 2, 12, 70);
+
+        $expected = current_url(true);
+        $expected = (string) $expected->setQuery('page_foo=3');
+
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
+    }
+
+    public function testGetNextURIReturnsNullOnLastPage()
+    {
+        $this->pager->store('foo', 6, 12, 70);
+
+        $this->assertNull($this->pager->getNextPageURI('foo'));
+    }
+
+    public function testGetNextURICorrectOnFirstPage()
+    {
+        $this->pager->store('foo', 1, 12, 70);
+
+        $expected = current_url(true);
+        $expected = (string) $expected->setQuery('page_foo=2');
+
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
+    }
+
+    public function testGetPreviousURIUsesCurrentURI()
+    {
+        $_GET['page_foo'] = 2;
+
+        $this->pager->store('foo', 2, 12, 70);
+
+        $expected = current_url(true);
+        $expected = (string) $expected->setQuery('page_foo=1');
+
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
+    }
+
+    public function testGetNextURIReturnsNullOnFirstPage()
+    {
+        $this->pager->store('foo', 1, 12, 70);
+
+        $this->assertNull($this->pager->getPreviousPageURI('foo'));
+    }
+
+    public function testGetNextURIWithQueryStringUsesCurrentURI()
+    {
+        $_GET = [
+            'page_foo' => 3,
+            'status'   => 1,
+        ];
+
+        $expected = current_url(true);
+        $expected = (string) $expected->setQueryArray($_GET);
+
+        $this->pager->store('foo', $_GET['page_foo'] - 1, 12, 70);
+
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
+    }
+
+    public function testGetPreviousURIWithQueryStringUsesCurrentURI()
+    {
+        $_GET = [
+            'page_foo' => 1,
+            'status'   => 1,
+        ];
+        $expected = current_url(true);
+        $expected = (string) $expected->setQueryArray($_GET);
+
+        $this->pager->store('foo', $_GET['page_foo'] + 1, 12, 70);
+
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
+    }
+
+    public function testGetOnlyQueries()
+    {
+        $_GET = [
+            'page'     => 2,
+            'search'   => 'foo',
+            'order'    => 'asc',
+            'hello'    => 'xxx',
+            'category' => 'baz',
+        ];
+        $onlyQueries = [
+            'search',
+            'order',
+        ];
+
+        $this->pager->store('default', $_GET['page'], 10, 100);
+
+        $uri = current_url(true);
+
+        $this->assertSame(
+            $this->pager->only($onlyQueries)->getPreviousPageURI(),
+            (string) $uri->setQuery('search=foo&order=asc&page=1')
+        );
+        $this->assertSame(
+            $this->pager->only($onlyQueries)->getNextPageURI(),
+            (string) $uri->setQuery('search=foo&order=asc&page=3')
+        );
+        $this->assertSame(
+            $this->pager->only($onlyQueries)->getPageURI(4),
+            (string) $uri->setQuery('search=foo&order=asc&page=4')
+        );
+    }
+
+    public function testBadTemplate()
+    {
+        $this->expectException(PagerException::class);
+        $this->pager->links('default', 'bogus');
+    }
+
+    // the tests below are looking for specific <ul> elements.
+    // not the most rigorous, but a start :-/
+
+    public function testLinks()
+    {
+        $this->assertStringContainsString('<ul class="pagination">', $this->pager->links());
+    }
+
+    public function testSimpleLinks()
+    {
+        $this->assertStringContainsString('<ul class="pager">', $this->pager->simpleLinks());
+    }
+
+    public function testMakeLinks()
+    {
+        $this->assertStringContainsString(
+            '<ul class="pagination">',
+            $this->pager->makeLinks(4, 10, 50)
+        );
+        $this->assertStringContainsString(
+            '<ul class="pagination">',
+            $this->pager->makeLinks(4, 10, 50, 'default_full')
+        );
+        $this->assertStringContainsString(
+            '<ul class="pager">',
+            $this->pager->makeLinks(4, 10, 50, 'default_simple')
+        );
+        $this->assertStringContainsString(
+            '<link rel="canonical"',
+            $this->pager->makeLinks(4, 10, 50, 'default_head')
+        );
+        $this->assertStringContainsString(
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0)
+        );
+        $this->assertStringContainsString(
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, '')
+        );
+        $this->assertStringContainsString(
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'default')
+        );
+        $this->assertStringContainsString(
+            '?page_custom=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'custom')
+        );
+        $this->assertStringContainsString(
+            '?page_custom=1',
+            $this->pager->makeLinks(1, null, 1, 'default_full', 0, 'custom')
+        );
+        $this->assertStringContainsString(
+            '/1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+        );
+        $this->assertStringContainsString(
+            '<li class="active">',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+        );
+    }
+
+    public function testHeadLinks()
+    {
+        $firstPage = $this->pager->makeLinks(1, 10, 50, 'default_head');
+
+        $this->assertStringNotContainsString('<link rel="prev"', $firstPage);
+        $this->assertStringContainsString('<link rel="canonical"', $firstPage);
+        $this->assertStringContainsString('<link rel="next"', $firstPage);
+
+        $secondPage = $this->pager->makeLinks(2, 10, 50, 'default_head');
+
+        $this->assertStringContainsString('<link rel="prev"', $secondPage);
+        $this->assertStringContainsString('<link rel="canonical"', $secondPage);
+        $this->assertStringContainsString('<link rel="next"', $secondPage);
+
+        $lastPage = $this->pager->makeLinks(5, 10, 50, 'default_head');
+
+        $this->assertStringContainsString('<link rel="prev"', $lastPage);
+        $this->assertStringContainsString('<link rel="canonical"', $lastPage);
+        $this->assertStringNotContainsString('<link rel="next"', $lastPage);
+    }
+
+    public function testBasedURI()
+    {
+        $_SERVER['HTTP_HOST']   = 'example.com';
+        $_SERVER['REQUEST_URI'] = '/ci/v4/x/y';
+        $_GET                   = [];
+
+        $config            = new App();
+        $config->baseURL   = 'http://example.com/ci/v4/';
+        $config->indexPage = 'fc.php';
+        $request           = Services::request($config);
+        $request->uri      = new URI('http://example.com/ci/v4/x/y');
+
+        Services::injectMock('request', $request);
+
+        $this->config = new Pager();
+        $this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
+
+        $_GET['page_foo'] = 2;
+
+        $this->pager->store('foo', 2, 12, 70);
+
+        $expected = current_url(true);
+        $expected = (string) $expected->setQuery('page_foo=1');
+
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
+    }
+
+    public function testAccessPageMoreThanPageCountGetLastPage()
+    {
+        $this->pager->store('default', 11, 1, 10);
+        $this->assertSame(10, $this->pager->getCurrentPage());
+    }
+
+    public function testSegmentOutOfBound()
+    {
+        $this->pager->store('default', 10, 1, 10, 1000);
+        $this->assertSame(1, $this->pager->getCurrentPage());
+    }
 }
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 9b4494409c96..5f2e58994d10 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\CodeIgniter;
@@ -24,300 +34,298 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ResourceControllerTest extends CIUnitTestCase
+final class ResourceControllerTest extends CIUnitTestCase
 {
+    /**
+     * @var CodeIgniter
+     */
+    protected $codeigniter;
+
+    /**
+     * @var \CodeIgniter\Router\RoutesCollection
+     */
+    protected $routes;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset();
+
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+
+        // Inject mock router.
+        $this->routes = Services::routes();
+        $this->routes->resource('work', ['controller' => '\Tests\Support\RESTful\Worker']);
+        Services::injectMock('routes', $this->routes);
+
+        $config            = new App();
+        $this->codeigniter = new MockCodeIgniter($config);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (count(ob_list_handlers()) > 1) {
+            ob_end_clean();
+        }
+    }
+
+    public function testResourceGet()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+        ];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']    = '/work';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $output);
+    }
+
+    public function testResourceGetNew()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'new',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/new';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
+    }
+
+    public function testResourceGetEdit()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            '1',
+            'edit',
+        ];
+        $_SERVER['argc'] = 4;
+
+        $_SERVER['REQUEST_URI']    = '/work/1/edit';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
+    }
+
+    public function testResourceGetOne()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            '1',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/1';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
+    }
+
+    public function testResourcePost()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+        ];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']    = '/work';
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
+    }
+
+    public function testResourcePatch()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            '123',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/123';
+        $_SERVER['REQUEST_METHOD'] = 'PATCH';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['patch']), $output);
+    }
+
+    public function testResourcePut()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            '123',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/123';
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['put']), $output);
+    }
+
+    public function testResourceDelete()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            '123',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/123';
+        $_SERVER['REQUEST_METHOD'] = 'DELETE';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
+    }
+
+    public function testModel()
+    {
+        $resource = new MockResourceController();
+        $this->assertEmpty($resource->getModel());
+        $this->assertEmpty($resource->getModelName());
+    }
+
+    public function testModelBogus()
+    {
+        $resource = new MockResourceController();
+
+        $resource->setModel('Something');
+        $this->assertEmpty($resource->getModel());
+        $this->assertSame('Something', $resource->getModelName());
+    }
+
+    public function testModelByName()
+    {
+        $resource = new MockResourceController();
+        $resource->setModel('\Tests\Support\Models\UserModel');
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+    }
+
+    public function testModelByObject()
+    {
+        $resource = new MockResourceController();
+        $model    = new UserModel();
+        $resource->setModel($model);
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+
+        // Note that the leading backslash is missing if we build it this way
+        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
+    }
+
+    public function testFormat()
+    {
+        $resource = new MockResourceController();
+        $this->assertSame('json', $resource->getFormat());
+
+        $resource->setFormat('Nonsense');
+        $this->assertSame('json', $resource->getFormat());
+
+        $resource->setFormat('xml');
+        $this->assertSame('xml', $resource->getFormat());
+    }
+
+    public function testJSONFormatOutput()
+    {
+        $resource = new MockResourceController();
+
+        $config = new App();
+        $uri    = new URI();
+        $agent  = new UserAgent();
+
+        $request  = new IncomingRequest($config, $uri, '', $agent);
+        $response = new Response($config);
+        $logger   = new NullLogger();
+
+        $resource->initController($request, $response, $logger);
+        $resource->setFormat('json');
+
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $theResponse = $resource->respond($data);
+        $result      = $theResponse->getBody();
+
+        $JSONFormatter = new JSONFormatter();
+        $expected      = $JSONFormatter->format($data);
+
+        $this->assertSame($expected, $result);
+    }
+
+    public function testXMLFormatOutput()
+    {
+        $resource = new MockResourceController();
+
+        $config = new App();
+        $uri    = new URI();
+        $agent  = new UserAgent();
+
+        $request  = new IncomingRequest($config, $uri, '', $agent);
+        $response = new Response($config);
+        $logger   = new NullLogger();
+
+        $resource->initController($request, $response, $logger);
+        $resource->setFormat('xml');
+
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $theResponse = $resource->respond($data);
+        $result      = $theResponse->getBody();
 
-	/**
-	 * @var CodeIgniter
-	 */
-	protected $codeigniter;
-
-	/**
-	 *
-	 * @var \CodeIgniter\Router\RoutesCollection
-	 */
-	protected $routes;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset();
-
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-
-		// Inject mock router.
-		$this->routes = Services::routes();
-		$this->routes->resource('work', ['controller' => '\Tests\Support\RESTful\Worker']);
-		Services::injectMock('routes', $this->routes);
-
-		$config            = new App();
-		$this->codeigniter = new MockCodeIgniter($config);
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		if (count(ob_list_handlers()) > 1)
-		{
-			ob_end_clean();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResourceGet()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-		];
-		$_SERVER['argc']           = 2;
-		$_SERVER['REQUEST_URI']    = '/work';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $output);
-	}
-
-	public function testResourceGetNew()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'new',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/new';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
-	}
-
-	public function testResourceGetEdit()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'1',
-			'edit',
-		];
-		$_SERVER['argc']           = 4;
-		$_SERVER['REQUEST_URI']    = '/work/1/edit';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
-	}
-
-	public function testResourceGetOne()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'1',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/1';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
-	}
-
-	public function testResourcePost()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-		];
-		$_SERVER['argc']           = 2;
-		$_SERVER['REQUEST_URI']    = '/work';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
-	}
-
-	public function testResourcePatch()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'123',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/123';
-		$_SERVER['REQUEST_METHOD'] = 'PATCH';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['patch']), $output);
-	}
-
-	public function testResourcePut()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'123',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/123';
-		$_SERVER['REQUEST_METHOD'] = 'PUT';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['put']), $output);
-	}
-
-	public function testResourceDelete()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'123',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/123';
-		$_SERVER['REQUEST_METHOD'] = 'DELETE';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
-	}
-
-	//--------------------------------------------------------------------
-	public function testModel()
-	{
-		$resource = new MockResourceController();
-		$this->assertEmpty($resource->getModel());
-		$this->assertEmpty($resource->getModelName());
-	}
-
-	public function testModelBogus()
-	{
-		$resource = new MockResourceController();
-
-		$resource->setModel('Something');
-		$this->assertEmpty($resource->getModel());
-		$this->assertEquals('Something', $resource->getModelName());
-	}
-
-	public function testModelByName()
-	{
-		$resource = new MockResourceController();
-		$resource->setModel('\Tests\Support\Models\UserModel');
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
-	}
-
-	public function testModelByObject()
-	{
-		$resource = new MockResourceController();
-		$model    = new UserModel();
-		$resource->setModel($model);
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-
-		// Note that the leading backslash is missing if we build it this way
-		$this->assertEquals('Tests\Support\Models\UserModel', $resource->getModelName());
-	}
-
-	//--------------------------------------------------------------------
-	public function testFormat()
-	{
-		$resource = new MockResourceController();
-		$this->assertEquals('json', $resource->getFormat());
-
-		$resource->setFormat('Nonsense');
-		$this->assertEquals('json', $resource->getFormat());
-
-		$resource->setFormat('xml');
-		$this->assertEquals('xml', $resource->getFormat());
-	}
-
-	//--------------------------------------------------------------------
-	public function testJSONFormatOutput()
-	{
-		$resource = new MockResourceController();
-
-		$config = new App;
-		$uri    = new URI;
-		$agent  = new UserAgent;
-
-		$request  = new IncomingRequest($config, $uri, '', $agent);
-		$response = new Response($config);
-		$logger   = new NullLogger;
-
-		$resource->initController($request, $response, $logger);
-		$resource->setFormat('json');
-
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$theResponse = $resource->respond($data);
-		$result      = $theResponse->getBody();
-
-		$JSONFormatter = new JSONFormatter;
-		$expected      = $JSONFormatter->format($data);
-
-		$this->assertEquals($expected, $result);
-	}
-
-	//--------------------------------------------------------------------
-	public function testXMLFormatOutput()
-	{
-		$resource = new MockResourceController();
-
-		$config = new App;
-		$uri    = new URI;
-		$agent  = new UserAgent;
-
-		$request  = new IncomingRequest($config, $uri, '', $agent);
-		$response = new Response($config);
-		$logger   = new NullLogger;
-
-		$resource->initController($request, $response, $logger);
-		$resource->setFormat('xml');
-
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$theResponse = $resource->respond($data);
-		$result      = $theResponse->getBody();
-
-		$XMLFormatter = new XMLFormatter;
-		$expected     = $XMLFormatter->format($data);
-
-		$this->assertEquals($expected, $result);
-	}
+        $XMLFormatter = new XMLFormatter();
+        $expected     = $XMLFormatter->format($data);
 
+        $this->assertSame($expected, $result);
+    }
 }
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 21c17da15766..2f0a332a57f9 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\CodeIgniter;
@@ -18,260 +28,261 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ResourcePresenterTest extends CIUnitTestCase
+final class ResourcePresenterTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var CodeIgniter
-	 */
-	protected $codeigniter;
-
-	/**
-	 *
-	 * @var \CodeIgniter\Router\RoutesCollection
-	 */
-	protected $routes;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset();
-
-		$_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-
-		// Inject mock router.
-		$this->routes = Services::routes();
-		$this->routes->presenter('work', ['controller' => 'Tests\Support\RESTful\Worker2']);
-		Services::injectMock('routes', $this->routes);
-
-		$config            = new App();
-		$this->codeigniter = new MockCodeIgniter($config);
-	}
-
-	public function tearDown(): void
-	{
-		parent::tearDown();
-
-		if (count(ob_list_handlers()) > 1)
-		{
-			ob_end_clean();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResourceGet()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-		];
-		$_SERVER['argc']           = 2;
-		$_SERVER['REQUEST_URI']    = '/work';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertEquals(lang('RESTful.notImplemented', ['index']), $output);
-	}
-
-	public function testResourceShow()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'show',
-			'1',
-		];
-		$_SERVER['argc']           = 4;
-		$_SERVER['REQUEST_URI']    = '/work/show/1';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
-	}
-
-	public function testResourceNew()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'new',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/new';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
-	}
-
-	public function testResourceCreate()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'create',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/create';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
-	}
-
-	public function testResourceRemove()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'remove',
-			'123',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/remove/123';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['remove']), $output);
-	}
-
-	public function testResourceDelete()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'delete',
-			'123',
-		];
-		$_SERVER['argc']           = 3;
-		$_SERVER['REQUEST_URI']    = '/work/delete/123';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
-	}
-
-	public function testResourceEdit()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'edit',
-			'1',
-			'edit',
-		];
-		$_SERVER['argc']           = 4;
-		$_SERVER['REQUEST_URI']    = '/work/edit/1';
-		$_SERVER['REQUEST_METHOD'] = 'GET';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
-	}
-
-	public function testResourceUpdate()
-	{
-		$_SERVER['argv']           = [
-			'index.php',
-			'work',
-			'update',
-			'123',
-		];
-		$_SERVER['argc']           = 4;
-		$_SERVER['REQUEST_URI']    = '/work/update/123';
-		$_SERVER['REQUEST_METHOD'] = 'POST';
-
-		ob_start();
-		$this->codeigniter->useSafeOutput(true)->run($this->routes);
-		$output = ob_get_clean();
-
-		$this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $output);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testModel()
-	{
-		$resource = new MockResourcePresenter();
-		$this->assertEmpty($resource->getModel());
-		$this->assertEmpty($resource->getModelName());
-	}
-
-	public function testModelBogus()
-	{
-		$resource = new MockResourcePresenter();
-
-		$resource->setModel('Something');
-		$this->assertEmpty($resource->getModel());
-		$this->assertEquals('Something', $resource->getModelName());
-	}
-
-	public function testModelByName()
-	{
-		$resource = new MockResourcePresenter();
-		$resource->setModel('\Tests\Support\Models\UserModel');
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
-	}
-
-	public function testModelByObject()
-	{
-		$resource = new MockResourcePresenter();
-		$model    = new UserModel();
-		$resource->setModel($model);
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-
-		// Note that the leading backslash is missing if we build it this way
-		$this->assertEquals('Tests\Support\Models\UserModel', $resource->getModelName());
-	}
-
-	public function testChangeSetModelByObject()
-	{
-		$resource = new MockResourcePresenter();
-		$resource->setModel('\Tests\Support\Models\UserModel');
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
-
-		$model = new EntityModel();
-		$resource->setModel($model);
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('Tests\Support\Models\EntityModel', $resource->getModelName());
-	}
-
-	public function testChangeSetModelByName()
-	{
-		$resource = new MockResourcePresenter();
-		$resource->setModel('\Tests\Support\Models\UserModel');
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
-
-		$resource->setModel('\Tests\Support\Models\EntityModel');
-		$this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-		$this->assertEquals('\Tests\Support\Models\EntityModel', $resource->getModelName());
-	}
+    /**
+     * @var CodeIgniter
+     */
+    protected $codeigniter;
+
+    /**
+     * @var \CodeIgniter\Router\RoutesCollection
+     */
+    protected $routes;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset();
+
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+
+        // Inject mock router.
+        $this->routes = Services::routes();
+        $this->routes->presenter('work', ['controller' => 'Tests\Support\RESTful\Worker2']);
+        Services::injectMock('routes', $this->routes);
+
+        $config            = new App();
+        $this->codeigniter = new MockCodeIgniter($config);
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if (count(ob_list_handlers()) > 1) {
+            ob_end_clean();
+        }
+    }
+
+    public function testResourceGet()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+        ];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']    = '/work';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertSame(lang('RESTful.notImplemented', ['index']), $output);
+    }
+
+    public function testResourceShow()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'show',
+            '1',
+        ];
+        $_SERVER['argc'] = 4;
+
+        $_SERVER['REQUEST_URI']    = '/work/show/1';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
+    }
+
+    public function testResourceNew()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'new',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/new';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
+    }
+
+    public function testResourceCreate()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'create',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/create';
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
+    }
+
+    public function testResourceRemove()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'remove',
+            '123',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/remove/123';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['remove']), $output);
+    }
+
+    public function testResourceDelete()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'delete',
+            '123',
+        ];
+        $_SERVER['argc'] = 3;
+
+        $_SERVER['REQUEST_URI']    = '/work/delete/123';
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
+    }
+
+    public function testResourceEdit()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'edit',
+            '1',
+            'edit',
+        ];
+        $_SERVER['argc'] = 4;
+
+        $_SERVER['REQUEST_URI']    = '/work/edit/1';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
+    }
+
+    public function testResourceUpdate()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'work',
+            'update',
+            '123',
+        ];
+        $_SERVER['argc'] = 4;
+
+        $_SERVER['REQUEST_URI']    = '/work/update/123';
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($this->routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $output);
+    }
+
+    public function testModel()
+    {
+        $resource = new MockResourcePresenter();
+        $this->assertEmpty($resource->getModel());
+        $this->assertEmpty($resource->getModelName());
+    }
+
+    public function testModelBogus()
+    {
+        $resource = new MockResourcePresenter();
+
+        $resource->setModel('Something');
+        $this->assertEmpty($resource->getModel());
+        $this->assertSame('Something', $resource->getModelName());
+    }
+
+    public function testModelByName()
+    {
+        $resource = new MockResourcePresenter();
+        $resource->setModel('\Tests\Support\Models\UserModel');
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+    }
+
+    public function testModelByObject()
+    {
+        $resource = new MockResourcePresenter();
+        $model    = new UserModel();
+        $resource->setModel($model);
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+
+        // Note that the leading backslash is missing if we build it this way
+        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
+    }
+
+    public function testChangeSetModelByObject()
+    {
+        $resource = new MockResourcePresenter();
+        $resource->setModel('\Tests\Support\Models\UserModel');
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+
+        $model = new EntityModel();
+        $resource->setModel($model);
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('Tests\Support\Models\EntityModel', $resource->getModelName());
+    }
+
+    public function testChangeSetModelByName()
+    {
+        $resource = new MockResourcePresenter();
+        $resource->setModel('\Tests\Support\Models\UserModel');
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+
+        $resource->setModel('\Tests\Support\Models\EntityModel');
+        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertSame('\Tests\Support\Models\EntityModel', $resource->getModelName());
+    }
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 4b2526ba408b..8f586a4fcbb8 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Config\Services;
@@ -8,1728 +18,1624 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class RouteCollectionTest extends CIUnitTestCase
+final class RouteCollectionTest extends CIUnitTestCase
 {
+    protected function tearDown(): void
+    {
+    }
 
-	public function tearDown(): void
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
-	{
-		$defaults = [
-			'Config' => APPPATH . 'Config',
-			'App'    => APPPATH,
-		];
-		$config   = array_merge($config, $defaults);
-
-		Services::autoloader()->addNamespace($config);
-
-		$loader = Services::locator();
-
-		if ($moduleConfig === null)
-		{
-			$moduleConfig          = new Modules();
-			$moduleConfig->enabled = false;
-		}
-
-		return (new RouteCollection($loader, $moduleConfig))->setHTTPVerb('get');
-	}
-
-	public function testBasicAdd()
-	{
-		$routes = $this->getCollector();
-
-		$routes->add('home', '\my\controller');
-
-		$expects = [
-			'home' => '\my\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddPrefixesDefaultNamespaceWhenNoneExist()
-	{
-		$routes = $this->getCollector();
-
-		$routes->add('home', 'controller');
-
-		$expects = [
-			'home' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddIgnoresDefaultNamespaceWhenExists()
-	{
-		$routes = $this->getCollector();
-
-		$routes->add('home', 'my\controller');
-
-		$expects = [
-			'home' => '\my\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddWorksWithCurrentHTTPMethods()
-	{
-		Services::request()->setMethod('get');
-
-		$routes = $this->getCollector();
-
-		$routes->match(['get'], 'home', 'controller');
-
-		$expects = [
-			'home' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddWithLeadingSlash()
-	{
-		$routes = $this->getCollector();
-
-		$routes->add('/home', 'controller');
-
-		$expects = [
-			'home' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchIgnoresInvalidHTTPMethods()
-	{
-		Services::request()->setMethod('get');
-
-		$routes = $this->getCollector();
-
-		$routes->match(['put'], 'home', 'controller');
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals([], $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddWorksWithArrayOFHTTPMethods()
-	{
-		Services::request()->setMethod('post');
-
-		$routes = $this->getCollector();
-
-		$routes->add('home', 'controller', ['get', 'post']);
-
-		$expects = [
-			'home' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddReplacesDefaultPlaceholders()
-	{
-		$routes = $this->getCollector();
-
-		$routes->add('home/(:any)', 'controller');
-
-		$expects = [
-			'home/(.*)' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddReplacesCustomPlaceholders()
-	{
-		$routes = $this->getCollector();
-		$routes->addPlaceholder('smiley', ':-)');
-
-		$routes->add('home/(:smiley)', 'controller');
-
-		$expects = [
-			'home/(:-))' => '\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddRecognizesCustomNamespaces()
-	{
-		$routes = $this->getCollector();
-		$routes->setDefaultNamespace('\CodeIgniter');
-
-		$routes->add('home', 'controller');
-
-		$expects = [
-			'home' => '\CodeIgniter\controller',
-		];
-
-		$routes = $routes->getRoutes();
-
-		$this->assertEquals($expects, $routes);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetDefaultControllerStoresIt()
-	{
-		$routes = $this->getCollector();
-		$routes->setDefaultController('godzilla');
-
-		$this->assertEquals('godzilla', $routes->getDefaultController());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetDefaultMethodStoresIt()
-	{
-		$routes = $this->getCollector();
-		$routes->setDefaultMethod('biggerBox');
-
-		$this->assertEquals('biggerBox', $routes->getDefaultMethod());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTranslateURIDashesWorks()
-	{
-		$routes = $this->getCollector();
-		$routes->setTranslateURIDashes(true);
-
-		$this->assertTrue($routes->shouldTranslateURIDashes());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAutoRouteStoresIt()
-	{
-		$routes = $this->getCollector();
-		$routes->setAutoRoute(true);
-
-		$this->assertTrue($routes->shouldAutoRoute());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupingWorks()
-	{
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'admin', function ($routes) {
-					$routes->add('users/list', '\Users::list');
-				}
-		);
-
-		$expected = [
-			'admin/users/list' => '\Users::list',
-		];
-
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupGetsSanitized()
-	{
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'<script>admin', function ($routes) {
-					$routes->add('users/list', '\Users::list');
-				}
-		);
-
-		$expected = [
-			'admin/users/list' => '\Users::list',
-		];
-
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupSetsOptions()
-	{
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'admin', ['namespace' => 'Admin'], function ($routes) {
-					$routes->add('users/list', 'Users::list');
-				}
-		);
-
-		$expected = [
-			'admin/users/list' => '\Admin\Users::list',
-		];
-
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupingWorksWithEmptyStringPrefix()
-	{
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'', function ($routes) {
-					$routes->add('users/list', '\Users::list');
-				}
-		);
-
-		$expected = [
-			'users/list' => '\Users::list',
-		];
-
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
-
-	//--------------------------------------------------------------------
+    protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
+    {
+        $defaults = [
+            'Config' => APPPATH . 'Config',
+            'App'    => APPPATH,
+        ];
+        $config = array_merge($config, $defaults);
 
-	public function testNestedGroupingWorksWithEmptyPrefix()
-	{
-		$routes = $this->getCollector();
+        Services::autoloader()->addNamespace($config);
 
-		$routes->add('verify/begin', '\VerifyController::begin');
+        $loader = Services::locator();
 
-		$routes->group('admin', function ($routes) {
-			$routes->group(
-				'', function ($routes) {
-					$routes->add('users/list', '\Users::list');
+        if ($moduleConfig === null) {
+            $moduleConfig          = new Modules();
+            $moduleConfig->enabled = false;
+        }
 
-					$routes->group('delegate', function ($routes) {
-						$routes->add('foo', '\Users::foo');
-					});
-				});
-		});
+        return (new RouteCollection($loader, $moduleConfig))->setHTTPVerb('get');
+    }
 
-		$expected = [
-			'verify/begin'       => '\VerifyController::begin',
-			'admin/users/list'   => '\Users::list',
-			'admin/delegate/foo' => '\Users::foo',
-		];
+    public function testBasicAdd()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes->add('home', '\my\controller');
 
-	//--------------------------------------------------------------------
+        $expects = [
+            'home' => '\my\controller',
+        ];
 
-	public function testHostnameOption()
-	{
-		$_SERVER['HTTP_HOST'] = 'example.com';
+        $routes = $routes->getRoutes();
 
-		$routes = $this->getCollector();
+        $this->assertSame($expects, $routes);
+    }
 
-		$routes->add('from', 'to', ['hostname' => 'example.com']);
-		$routes->add('foo', 'bar', ['hostname' => 'foobar.com']);
+    public function testAddPrefixesDefaultNamespaceWhenNoneExist()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'from' => '\to',
-		];
+        $routes->add('home', 'controller');
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $expects = [
+            'home' => '\controller',
+        ];
 
-	//--------------------------------------------------------------------
+        $routes = $routes->getRoutes();
 
-	public function testResourceScaffoldsCorrectly()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('get');
+        $this->assertSame($expects, $routes);
+    }
 
-		$routes->resource('photos');
+    public function testAddIgnoresDefaultNamespaceWhenExists()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'photos'           => '\Photos::index',
-			'photos/new'       => '\Photos::new',
-			'photos/(.*)/edit' => '\Photos::edit/$1',
-			'photos/(.*)'      => '\Photos::show/$1',
-		];
+        $routes->add('home', 'my\controller');
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $expects = [
+            'home' => '\my\controller',
+        ];
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('post');
-		$routes->resource('photos');
+        $routes = $routes->getRoutes();
 
-		$expected = [
-			'photos' => '\Photos::create',
-		];
+        $this->assertSame($expects, $routes);
+    }
 
-		$this->assertEquals($expected, $routes->getRoutes());
+    public function testAddWorksWithCurrentHTTPMethods()
+    {
+        Services::request()->setMethod('get');
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('put');
-		$routes->resource('photos');
+        $routes = $this->getCollector();
 
-		$expected = [
-			'photos/(.*)' => '\Photos::update/$1',
-		];
+        $routes->match(['get'], 'home', 'controller');
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $expects = [
+            'home' => '\controller',
+        ];
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('patch');
-		$routes->resource('photos');
+        $routes = $routes->getRoutes();
 
-		$expected = [
-			'photos/(.*)' => '\Photos::update/$1',
-		];
+        $this->assertSame($expects, $routes);
+    }
 
-		$this->assertEquals($expected, $routes->getRoutes());
+    public function testAddWithLeadingSlash()
+    {
+        $routes = $this->getCollector();
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('delete');
-		$routes->resource('photos');
+        $routes->add('/home', 'controller');
 
-		$expected = [
-			'photos/(.*)' => '\Photos::delete/$1',
-		];
+        $expects = [
+            'home' => '\controller',
+        ];
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes = $routes->getRoutes();
 
-	// Similar to the above, but with a more typical endpoint
+        $this->assertSame($expects, $routes);
+    }
 
-	public function testResourceAPIScaffoldsCorrectly()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('get');
+    public function testMatchIgnoresInvalidHTTPMethods()
+    {
+        Services::request()->setMethod('get');
 
-		$routes->resource('api/photos', ['controller' => 'Photos']);
+        $routes = $this->getCollector();
 
-		$expected = [
-			'api/photos'           => '\Photos::index',
-			'api/photos/new'       => '\Photos::new',
-			'api/photos/(.*)/edit' => '\Photos::edit/$1',
-			'api/photos/(.*)'      => '\Photos::show/$1',
-		];
+        $routes->match(['put'], 'home', 'controller');
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $routes = $routes->getRoutes();
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('post');
-		$routes->resource('api/photos', ['controller' => 'Photos']);
+        $this->assertSame([], $routes);
+    }
 
-		$expected = [
-			'api/photos' => '\Photos::create',
-		];
+    public function testAddWorksWithArrayOFHTTPMethods()
+    {
+        Services::request()->setMethod('post');
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $routes = $this->getCollector();
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('put');
-		$routes->resource('api/photos', ['controller' => 'Photos']);
+        $routes->add('home', 'controller', ['get', 'post']);
 
-		$expected = [
-			'api/photos/(.*)' => '\Photos::update/$1',
-		];
+        $expects = [
+            'home' => '\controller',
+        ];
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $routes = $routes->getRoutes();
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('patch');
-		$routes->resource('api/photos', ['controller' => 'Photos']);
+        $this->assertSame($expects, $routes);
+    }
 
-		$expected = [
-			'api/photos/(.*)' => '\Photos::update/$1',
-		];
+    public function testAddReplacesDefaultPlaceholders()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $routes->add('home/(:any)', 'controller');
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('delete');
-		$routes->resource('api/photos', ['controller' => 'Photos']);
+        $expects = [
+            'home/(.*)' => '\controller',
+        ];
 
-		$expected = [
-			'api/photos/(.*)' => '\Photos::delete/$1',
-		];
+        $routes = $routes->getRoutes();
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $this->assertSame($expects, $routes);
+    }
 
-	public function testPresenterScaffoldsCorrectly()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('get');
+    public function testAddReplacesCustomPlaceholders()
+    {
+        $routes = $this->getCollector();
+        $routes->addPlaceholder('smiley', ':-)');
 
-		$routes->presenter('photos');
+        $routes->add('home/(:smiley)', 'controller');
 
-		$expected = [
-			'photos'             => '\Photos::index',
-			'photos/show/(.*)'   => '\Photos::show/$1',
-			'photos/new'         => '\Photos::new',
-			'photos/edit/(.*)'   => '\Photos::edit/$1',
-			'photos/remove/(.*)' => '\Photos::remove/$1',
-			'photos/(.*)'        => '\Photos::show/$1',
-		];
+        $expects = [
+            'home/(:-))' => '\controller',
+        ];
 
-		$this->assertEquals($expected, $routes->getRoutes());
+        $routes = $routes->getRoutes();
 
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('post');
-		$routes->presenter('photos');
+        $this->assertSame($expects, $routes);
+    }
 
-		$expected = [
-			'photos/create'      => '\Photos::create',
-			'photos/update/(.*)' => '\Photos::update/$1',
-			'photos/delete/(.*)' => '\Photos::delete/$1',
-			'photos'             => '\Photos::create',
-		];
+    public function testAddRecognizesCustomNamespaces()
+    {
+        $routes = $this->getCollector();
+        $routes->setDefaultNamespace('\CodeIgniter');
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes->add('home', 'controller');
 
-	//--------------------------------------------------------------------
+        $expects = [
+            'home' => '\CodeIgniter\controller',
+        ];
 
-	public function testResourcesWithCustomController()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $routes = $routes->getRoutes();
 
-		$routes->resource('photos', ['controller' => '<script>gallery']);
+        $this->assertSame($expects, $routes);
+    }
 
-		$expected = [
-			'photos'           => '\Gallery::index',
-			'photos/new'       => '\Gallery::new',
-			'photos/(.*)/edit' => '\Gallery::edit/$1',
-			'photos/(.*)'      => '\Gallery::show/$1',
-		];
+    public function testSetDefaultControllerStoresIt()
+    {
+        $routes = $this->getCollector();
+        $routes->setDefaultController('godzilla');
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $this->assertSame('godzilla', $routes->getDefaultController());
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetDefaultMethodStoresIt()
+    {
+        $routes = $this->getCollector();
+        $routes->setDefaultMethod('biggerBox');
 
-	public function testResourcesWithCustomPlaceholder()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $this->assertSame('biggerBox', $routes->getDefaultMethod());
+    }
 
-		$routes->resource('photos', ['placeholder' => ':num']);
+    public function testTranslateURIDashesWorks()
+    {
+        $routes = $this->getCollector();
+        $routes->setTranslateURIDashes(true);
 
-		$expected = [
-			'photos'               => '\Photos::index',
-			'photos/new'           => '\Photos::new',
-			'photos/([0-9]+)/edit' => '\Photos::edit/$1',
-			'photos/([0-9]+)'      => '\Photos::show/$1',
-		];
+        $this->assertTrue($routes->shouldTranslateURIDashes());
+    }
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+    public function testAutoRouteStoresIt()
+    {
+        $routes = $this->getCollector();
+        $routes->setAutoRoute(true);
 
-	public function testResourcesWithDefaultPlaceholder()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $this->assertTrue($routes->shouldAutoRoute());
+    }
 
-		$routes->setDefaultConstraint('num');
-		$routes->resource('photos');
+    public function testGroupingWorks()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'photos'               => '\Photos::index',
-			'photos/new'           => '\Photos::new',
-			'photos/([0-9]+)/edit' => '\Photos::edit/$1',
-			'photos/([0-9]+)'      => '\Photos::show/$1',
-		];
+        $routes->group(
+            'admin',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
+        );
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $expected = [
+            'admin/users/list' => '\Users::list',
+        ];
 
-	public function testResourcesWithBogusDefaultPlaceholder()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->setDefaultConstraint(':num');
-		$routes->resource('photos');
+    public function testGroupGetsSanitized()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'photos'           => '\Photos::index',
-			'photos/new'       => '\Photos::new',
-			'photos/(.*)/edit' => '\Photos::edit/$1',
-			'photos/(.*)'      => '\Photos::show/$1',
-		];
+        $routes->group(
+            '<script>admin',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
+        );
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $expected = [
+            'admin/users/list' => '\Users::list',
+        ];
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	public function testResourcesWithOnly()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+    public function testGroupSetsOptions()
+    {
+        $routes = $this->getCollector();
 
-		$routes->resource('photos', ['only' => 'index']);
+        $routes->group(
+            'admin',
+            ['namespace' => 'Admin'],
+            static function ($routes) {
+                $routes->add('users/list', 'Users::list');
+            }
+        );
 
-		$expected = [
-			'photos' => '\Photos::index',
-		];
+        $expected = [
+            'admin/users/list' => '\Admin\Users::list',
+        ];
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	//--------------------------------------------------------------------
+    public function testGroupingWorksWithEmptyStringPrefix()
+    {
+        $routes = $this->getCollector();
 
-	public function testResourcesWithExcept()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $routes->group(
+            '',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
+        );
+
+        $expected = [
+            'users/list' => '\Users::list',
+        ];
+
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->resource('photos', ['except' => 'edit,new']);
+    public function testNestedGroupingWorksWithEmptyPrefix()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'photos'      => '\Photos::index',
-			'photos/(.*)' => '\Photos::show/$1',
-		];
+        $routes->add('verify/begin', '\VerifyController::begin');
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes->group('admin', static function ($routes) {
+            $routes->group(
+                '',
+                static function ($routes) {
+                    $routes->add('users/list', '\Users::list');
 
-	//--------------------------------------------------------------------
+                    $routes->group('delegate', static function ($routes) {
+                        $routes->add('foo', '\Users::foo');
+                    });
+                }
+            );
+        });
 
-	public function testResourcesWithWebsafe()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('post');
+        $expected = [
+            'verify/begin'       => '\VerifyController::begin',
+            'admin/users/list'   => '\Users::list',
+            'admin/delegate/foo' => '\Users::foo',
+        ];
 
-		$routes->resource('photos', ['websafe' => true]);
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$expected = [
-			'photos'             => '\Photos::create',
-			'photos/(.*)'        => '\Photos::update/$1',
-			'photos/(.*)/delete' => '\Photos::delete/$1',
-		];
+    public function testHostnameOption()
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com';
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes = $this->getCollector();
 
-	//--------------------------------------------------------------------
+        $routes->add('from', 'to', ['hostname' => 'example.com']);
+        $routes->add('foo', 'bar', ['hostname' => 'foobar.com']);
 
-	public function testMatchSupportsMultipleMethods()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $expected = [
+            'from' => '\to',
+        ];
 
-		$expected = ['here' => '\there'];
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->match(['get', 'post'], 'here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
+    public function testResourceScaffoldsCorrectly()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('get');
 
-		Services::request()->setMethod('post');
-		$routes = $this->getCollector();
-		$routes->match(['get', 'post'], 'here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes->resource('photos');
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'photos'           => '\Photos::index',
+            'photos/new'       => '\Photos::new',
+            'photos/(.*)/edit' => '\Photos::edit/$1',
+            'photos/(.*)'      => '\Photos::show/$1',
+        ];
 
-	public function testGet()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $this->assertSame($expected, $routes->getRoutes());
 
-		$expected = ['here' => '\there'];
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('post');
+        $routes->resource('photos');
 
-		$routes->get('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $expected = [
+            'photos' => '\Photos::create',
+        ];
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $routes->getRoutes());
 
-	public function testPost()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('post');
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('put');
+        $routes->resource('photos');
 
-		$expected = ['here' => '\there'];
+        $expected = [
+            'photos/(.*)' => '\Photos::update/$1',
+        ];
 
-		$routes->post('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $this->assertSame($expected, $routes->getRoutes());
 
-	//--------------------------------------------------------------------
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('patch');
+        $routes->resource('photos');
 
-	public function testGetDoesntAllowOtherMethods()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('get');
+        $expected = [
+            'photos/(.*)' => '\Photos::update/$1',
+        ];
 
-		$expected = ['here' => '\there'];
+        $this->assertSame($expected, $routes->getRoutes());
 
-		$routes->get('here', 'there');
-		$routes->post('from', 'to');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('delete');
+        $routes->resource('photos');
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'photos/(.*)' => '\Photos::delete/$1',
+        ];
 
-	public function testPut()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('put');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$expected = ['here' => '\there'];
+    // Similar to the above, but with a more typical endpoint
 
-		$routes->put('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+    public function testResourceAPIScaffoldsCorrectly()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('get');
 
-	//--------------------------------------------------------------------
+        $routes->resource('api/photos', ['controller' => 'Photos']);
 
-	public function testDelete()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('delete');
+        $expected = [
+            'api/photos'           => '\Photos::index',
+            'api/photos/new'       => '\Photos::new',
+            'api/photos/(.*)/edit' => '\Photos::edit/$1',
+            'api/photos/(.*)'      => '\Photos::show/$1',
+        ];
 
-		$expected = ['here' => '\there'];
+        $this->assertSame($expected, $routes->getRoutes());
 
-		$routes->delete('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('post');
+        $routes->resource('api/photos', ['controller' => 'Photos']);
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'api/photos' => '\Photos::create',
+        ];
 
-	public function testHead()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('head');
+        $this->assertSame($expected, $routes->getRoutes());
 
-		$expected = ['here' => '\there'];
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('put');
+        $routes->resource('api/photos', ['controller' => 'Photos']);
 
-		$routes->head('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $expected = [
+            'api/photos/(.*)' => '\Photos::update/$1',
+        ];
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $routes->getRoutes());
 
-	public function testPatch()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('patch');
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('patch');
+        $routes->resource('api/photos', ['controller' => 'Photos']);
 
-		$expected = ['here' => '\there'];
+        $expected = [
+            'api/photos/(.*)' => '\Photos::update/$1',
+        ];
 
-		$routes->patch('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $this->assertSame($expected, $routes->getRoutes());
 
-	//--------------------------------------------------------------------
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('delete');
+        $routes->resource('api/photos', ['controller' => 'Photos']);
 
-	public function testOptions()
-	{
-		$routes = $this->getCollector();
-		$routes->setHTTPVerb('options');
+        $expected = [
+            'api/photos/(.*)' => '\Photos::delete/$1',
+        ];
 
-		$expected = ['here' => '\there'];
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->options('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+    public function testPresenterScaffoldsCorrectly()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('get');
 
-	//--------------------------------------------------------------------
+        $routes->presenter('photos');
 
-	public function testCLI()
-	{
-		$routes = $this->getCollector();
+        $expected = [
+            'photos'             => '\Photos::index',
+            'photos/show/(.*)'   => '\Photos::show/$1',
+            'photos/new'         => '\Photos::new',
+            'photos/edit/(.*)'   => '\Photos::edit/$1',
+            'photos/remove/(.*)' => '\Photos::remove/$1',
+            'photos/(.*)'        => '\Photos::show/$1',
+        ];
 
-		$expected = ['here' => '\there'];
+        $this->assertSame($expected, $routes->getRoutes());
 
-		$routes->cli('here', 'there');
-		$this->assertEquals($expected, $routes->getRoutes('cli'));
-	}
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('post');
+        $routes->presenter('photos');
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'photos/create'      => '\Photos::create',
+            'photos/update/(.*)' => '\Photos::update/$1',
+            'photos/delete/(.*)' => '\Photos::delete/$1',
+            'photos'             => '\Photos::create',
+        ];
 
-	public function testEnvironmentRestricts()
-	{
-		// ENVIRONMENT should be 'testing'
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+    public function testResourcesWithCustomController()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-		$expected = ['here' => '\there'];
+        $routes->resource('photos', ['controller' => '<script>gallery']);
 
-		$routes->environment(
-				'testing', function ($routes) {
-					$routes->get('here', 'there');
-				}
-		);
+        $expected = [
+            'photos'           => '\Gallery::index',
+            'photos/new'       => '\Gallery::new',
+            'photos/(.*)/edit' => '\Gallery::edit/$1',
+            'photos/(.*)'      => '\Gallery::show/$1',
+        ];
 
-		$routes->environment(
-				'badenvironment', function ($routes) {
-					$routes->get('from', 'to');
-				}
-		);
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+    public function testResourcesWithCustomPlaceholder()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-	//--------------------------------------------------------------------
+        $routes->resource('photos', ['placeholder' => ':num']);
 
-	public function testReverseRoutingFindsSimpleMatch()
-	{
-		$routes = $this->getCollector();
+        $expected = [
+            'photos'               => '\Photos::index',
+            'photos/new'           => '\Photos::new',
+            'photos/([0-9]+)/edit' => '\Photos::edit/$1',
+            'photos/([0-9]+)'      => '\Photos::show/$1',
+        ];
 
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$match = $routes->reverseRoute('myController::goto', 'string', 13);
+    public function testResourcesWithDefaultPlaceholder()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-		$this->assertEquals('/path/string/to/13', $match);
-	}
+        $routes->setDefaultConstraint('num');
+        $routes->resource('photos');
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'photos'               => '\Photos::index',
+            'photos/new'           => '\Photos::new',
+            'photos/([0-9]+)/edit' => '\Photos::edit/$1',
+            'photos/([0-9]+)'      => '\Photos::show/$1',
+        ];
 
-	public function testReverseRoutingWithLocaleAndFindsSimpleMatch()
-	{
-		$routes = $this->getCollector();
+        $this->assertSame($expected, $routes->getRoutes());
+    }
+
+    public function testResourcesWithBogusDefaultPlaceholder()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->setDefaultConstraint(':num');
+        $routes->resource('photos');
 
-		$routes->add('{locale}/path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+        $expected = [
+            'photos'           => '\Photos::index',
+            'photos/new'       => '\Photos::new',
+            'photos/(.*)/edit' => '\Photos::edit/$1',
+            'photos/(.*)'      => '\Photos::show/$1',
+        ];
+
+        $this->assertSame($expected, $routes->getRoutes());
+    }
+
+    public function testResourcesWithOnly()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->resource('photos', ['only' => 'index']);
+
+        $expected = [
+            'photos' => '\Photos::index',
+        ];
 
-		$match = $routes->reverseRoute('myController::goto', 'string', 13);
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$this->assertEquals('/en/path/string/to/13', $match);
-	}
+    public function testResourcesWithExcept()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-	//--------------------------------------------------------------------
+        $routes->resource('photos', ['except' => 'edit,new']);
+
+        $expected = [
+            'photos'      => '\Photos::index',
+            'photos/(.*)' => '\Photos::show/$1',
+        ];
 
-	public function testReverseRoutingReturnsFalseWithBadParamCount()
-	{
-		$routes = $this->getCollector();
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1');
+    public function testResourcesWithWebsafe()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('post');
 
-		$this->assertFalse($routes->reverseRoute('myController::goto', 'string', 13));
-	}
+        $routes->resource('photos', ['websafe' => true]);
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'photos'             => '\Photos::create',
+            'photos/(.*)/delete' => '\Photos::delete/$1',
+            'photos/(.*)'        => '\Photos::update/$1',
+        ];
 
-	public function testReverseRoutingReturnsFalseWithNoMatch()
-	{
-		$routes = $this->getCollector();
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+    public function testMatchSupportsMultipleMethods()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-		$this->assertFalse($routes->reverseRoute('myBadController::goto', 'string', 13));
-	}
+        $expected = ['here' => '\there'];
 
-	//--------------------------------------------------------------------
+        $routes->match(['get', 'post'], 'here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
 
-	public function testReverseRoutingThrowsExceptionWithBadParamTypes()
-	{
-		$routes = $this->getCollector();
+        Services::request()->setMethod('post');
+        $routes = $this->getCollector();
+        $routes->match(['get', 'post'], 'here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+    public function testGet()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-		$this->expectException(RouterException::class);
-		$match = $routes->reverseRoute('myController::goto', 13, 'string');
-	}
-	//--------------------------------------------------------------------
+        $expected = ['here' => '\there'];
 
-	public function testReverseRoutingWithLocale()
-	{
-		$routes = $this->getCollector();
+        $routes->get('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->add('{locale}/contact', 'myController::goto');
+    public function testPost()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('post');
 
-		$this->assertEquals('/en/contact', $routes->reverseRoute('myController::goto'));
-	}
+        $expected = ['here' => '\there'];
 
-	//--------------------------------------------------------------------
+        $routes->post('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	public function testNamedRoutes()
-	{
-		$routes = $this->getCollector();
+    public function testGetDoesntAllowOtherMethods()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('get');
 
-		$routes->add('users', 'Users::index', ['as' => 'namedRoute']);
+        $expected = ['here' => '\there'];
 
-		$this->assertEquals('/users', $routes->reverseRoute('namedRoute'));
-	}
+        $routes->get('here', 'there');
+        $routes->post('from', 'to');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	//--------------------------------------------------------------------
+    public function testPut()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('put');
 
-	public function testNamedRoutesWithLocale()
-	{
-		$routes = $this->getCollector();
+        $expected = ['here' => '\there'];
 
-		$routes->add('{locale}/users', 'Users::index', ['as' => 'namedRoute']);
+        $routes->put('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$this->assertEquals('/en/users', $routes->reverseRoute('namedRoute'));
-	}
+    public function testDelete()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('delete');
 
-	//--------------------------------------------------------------------
+        $expected = ['here' => '\there'];
 
-	public function testNamedRoutesFillInParams()
-	{
-		$routes = $this->getCollector();
+        $routes->delete('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'namedRoute']);
+    public function testHead()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('head');
 
-		$match = $routes->reverseRoute('namedRoute', 'string', 13);
+        $expected = ['here' => '\there'];
 
-		$this->assertEquals('/path/string/to/13', $match);
-	}
+        $routes->head('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	//--------------------------------------------------------------------
+    public function testPatch()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('patch');
 
-	public function testNamedRoutesWithLocaleAndFillInParams()
-	{
-		$routes = $this->getCollector();
+        $expected = ['here' => '\there'];
 
-		$routes->add('{locale}/path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'namedRoute']);
+        $routes->patch('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-		$match = $routes->reverseRoute('namedRoute', 'string', 13);
+    public function testOptions()
+    {
+        $routes = $this->getCollector();
+        $routes->setHTTPVerb('options');
 
-		$this->assertEquals('/en/path/string/to/13', $match);
-	}
+        $expected = ['here' => '\there'];
 
-	//--------------------------------------------------------------------
+        $routes->options('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
-	 */
-	public function testNamedRoutesWithSameURIDifferentMethods()
-	{
-		$routes = $this->getCollector();
+    public function testCLI()
+    {
+        $routes = $this->getCollector();
 
-		$routes->get('user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
-		$routes->post(
-				'user/insert', function () {
-				}, ['as' => 'namedRoute2']
-		);
-		$routes->put(
-				'user/insert', function () {
-				}, ['as' => 'namedRoute3']
-		);
+        $expected = ['here' => '\there'];
 
-		$match1 = $routes->reverseRoute('namedRoute1');
-		$match2 = $routes->reverseRoute('namedRoute2');
-		$match3 = $routes->reverseRoute('namedRoute3');
+        $routes->cli('here', 'there');
+        $this->assertSame($expected, $routes->getRoutes('cli'));
+    }
 
-		$this->assertEquals('/user/insert', $match1);
-		$this->assertEquals('/user/insert', $match2);
-		$this->assertEquals('/user/insert', $match3);
-	}
+    public function testEnvironmentRestricts()
+    {
+        // ENVIRONMENT should be 'testing'
 
-	//--------------------------------------------------------------------
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
-	 */
-	public function testNamedRoutesWithLocaleAndWithSameURIDifferentMethods()
-	{
-		$routes = $this->getCollector();
+        $expected = ['here' => '\there'];
 
-		$routes->get('{locale}/user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
-		$routes->post(
-			'{locale}/user/insert',
-			function () {
-			},
-			['as' => 'namedRoute2']
-		);
-		$routes->put(
-			'{locale}/user/insert',
-			function () {
-			},
-			['as' => 'namedRoute3']
-		);
+        $routes->environment(
+            'testing',
+            static function ($routes) {
+                $routes->get('here', 'there');
+            }
+        );
 
-		$match1 = $routes->reverseRoute('namedRoute1');
-		$match2 = $routes->reverseRoute('namedRoute2');
-		$match3 = $routes->reverseRoute('namedRoute3');
+        $routes->environment(
+            'badenvironment',
+            static function ($routes) {
+                $routes->get('from', 'to');
+            }
+        );
 
-		$this->assertEquals('/en/user/insert', $match1);
-		$this->assertEquals('/en/user/insert', $match2);
-		$this->assertEquals('/en/user/insert', $match3);
-	}
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	//--------------------------------------------------------------------
+    public function testReverseRoutingFindsSimpleMatch()
+    {
+        $routes = $this->getCollector();
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3048
-	 */
-	public function testNamedRoutesWithPipesInRegex()
-	{
-		$routes = $this->getCollector();
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
-		$routes->get('/system/(this|that)', 'myController::system/$1', ['as' => 'pipedRoute']);
+        $match = $routes->reverseRoute('myController::goto', 'string', 13);
 
-		$this->assertEquals('/system/this', $routes->reverseRoute('pipedRoute', 'this'));
-		$this->assertEquals('/system/that', $routes->reverseRoute('pipedRoute', 'that'));
-	}
+        $this->assertSame('/path/string/to/13', $match);
+    }
 
-	//--------------------------------------------------------------------
+    public function testReverseRoutingWithLocaleAndFindsSimpleMatch()
+    {
+        $routes = $this->getCollector();
 
-	public function testReverseRouteMatching()
-	{
-		$routes = $this->getCollector();
+        $routes->add('{locale}/path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
-		$routes->get('test/(:segment)/(:segment)', 'TestController::test/$1/$2', ['as' => 'testRouter']);
+        $match = $routes->reverseRoute('myController::goto', 'string', 13);
 
-		$match = $routes->reverseRoute('testRouter', 1, 2);
+        $this->assertSame('/en/path/string/to/13', $match);
+    }
 
-		$this->assertEquals('/test/1/2', $match);
-	}
+    public function testReverseRoutingReturnsFalseWithBadParamCount()
+    {
+        $routes = $this->getCollector();
 
-	//--------------------------------------------------------------------
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1');
 
-	public function testReverseRouteMatchingWithLocale()
-	{
-		$routes = $this->getCollector();
+        $this->assertFalse($routes->reverseRoute('myController::goto', 'string', 13));
+    }
 
-		$routes->get('{locale}/test/(:segment)/(:segment)', 'TestController::test/$1/$2', ['as' => 'testRouter']);
+    public function testReverseRoutingReturnsFalseWithNoMatch()
+    {
+        $routes = $this->getCollector();
 
-		$match = $routes->reverseRoute('testRouter', 1, 2);
-
-		$this->assertEquals('/en/test/1/2', $match);
-	}
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
-	//--------------------------------------------------------------------
-
-	public function testAddRedirect()
-	{
-		$routes = $this->getCollector();
+        $this->assertFalse($routes->reverseRoute('myBadController::goto', 'string', 13));
+    }
 
-		//The second parameter is either the new URI to redirect to, or the name of a named route.
-		$routes->addRedirect('users', 'users/index', 307);
+    public function testReverseRoutingThrowsExceptionWithBadParamTypes()
+    {
+        $routes = $this->getCollector();
 
-		$expected = [
-			'users' => 'users/index',
-		];
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
-		$this->assertEquals($expected, $routes->getRoutes());
-		$this->assertTrue($routes->isRedirect('users'));
-		$this->assertEquals(307, $routes->getRedirectCode('users'));
-		$this->assertEquals(0, $routes->getRedirectCode('bosses'));
-	}
+        $this->expectException(RouterException::class);
+        $routes->reverseRoute('myController::goto', 13, 'string');
+    }
 
-	public function testAddRedirectNamed()
-	{
-		$routes = $this->getCollector();
+    public function testReverseRoutingWithLocale()
+    {
+        $routes = $this->getCollector();
 
-		$routes->add('zombies', 'Zombies::index', ['as' => 'namedRoute']);
-		$routes->addRedirect('users', 'namedRoute', 307);
+        $routes->add('{locale}/contact', 'myController::goto');
 
-		$expected = [
-			'users'   => [
-				'zombies' => '\Zombies::index',
-			],
-			'zombies' => '\Zombies::index',
-		];
+        $this->assertSame('/en/contact', $routes->reverseRoute('myController::goto'));
+    }
 
-		$this->assertEquals($expected, $routes->getRoutes());
-		$this->assertTrue($routes->isRedirect('users'));
-		$this->assertEquals(307, $routes->getRedirectCode('users'));
-	}
+    public function testNamedRoutes()
+    {
+        $routes = $this->getCollector();
 
-	public function testAddRedirectGetMethod()
-	{
-		$routes = $this->getCollector();
+        $routes->add('users', 'Users::index', ['as' => 'namedRoute']);
 
-		$routes->get('zombies', 'Zombies::index', ['as' => 'namedRoute']);
-		$routes->addRedirect('users', 'namedRoute', 307);
+        $this->assertSame('/users', $routes->reverseRoute('namedRoute'));
+    }
 
-		$expected = [
-			'users'   => [
-				'zombies' => '\Zombies::index',
-			],
-			'zombies' => '\Zombies::index',
-		];
+    public function testNamedRoutesWithLocale()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertEquals($expected, $routes->getRoutes());
-		$this->assertTrue($routes->isRedirect('users'));
-		$this->assertEquals(307, $routes->getRedirectCode('users'));
-	}
+        $routes->add('{locale}/users', 'Users::index', ['as' => 'namedRoute']);
 
-	//--------------------------------------------------------------------
+        $this->assertSame('/en/users', $routes->reverseRoute('namedRoute'));
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/497
-	 */
-	public function testWithSubdomain()
-	{
-		$routes = $this->getCollector();
+    public function testNamedRoutesFillInParams()
+    {
+        $routes = $this->getCollector();
 
-		$_SERVER['HTTP_HOST'] = 'adm.example.com';
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'namedRoute']);
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+        $match = $routes->reverseRoute('namedRoute', 'string', 13);
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
-		];
+        $this->assertSame('/path/string/to/13', $match);
+    }
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+    public function testNamedRoutesWithLocaleAndFillInParams()
+    {
+        $routes = $this->getCollector();
 
-	public function testWithSubdomainMissing()
-	{
-		$routes = $this->getCollector();
+        $routes->add('{locale}/path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'namedRoute']);
 
-		//      $_SERVER['HTTP_HOST'] = 'adm.example.com';
+        $match = $routes->reverseRoute('namedRoute', 'string', 13);
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+        $this->assertSame('/en/path/string/to/13', $match);
+    }
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
-		];
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
+     */
+    public function testNamedRoutesWithSameURIDifferentMethods()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $routes->get('user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
+        $routes->post(
+            'user/insert',
+            static function () {},
+            ['as' => 'namedRoute2']
+        );
+        $routes->put(
+            'user/insert',
+            static function () {},
+            ['as' => 'namedRoute3']
+        );
 
-	public function testWithDifferentSubdomain()
-	{
-		$routes = $this->getCollector();
+        $match1 = $routes->reverseRoute('namedRoute1');
+        $match2 = $routes->reverseRoute('namedRoute2');
+        $match3 = $routes->reverseRoute('namedRoute3');
 
-		$_SERVER['HTTP_HOST'] = 'adm.example.com';
+        $this->assertSame('/user/insert', $match1);
+        $this->assertSame('/user/insert', $match2);
+        $this->assertSame('/user/insert', $match3);
+    }
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
+     */
+    public function testNamedRoutesWithLocaleAndWithSameURIDifferentMethods()
+    {
+        $routes = $this->getCollector();
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
-		];
+        $routes->get('{locale}/user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
+        $routes->post(
+            '{locale}/user/insert',
+            static function () {
+            },
+            ['as' => 'namedRoute2']
+        );
+        $routes->put(
+            '{locale}/user/insert',
+            static function () {
+            },
+            ['as' => 'namedRoute3']
+        );
+
+        $match1 = $routes->reverseRoute('namedRoute1');
+        $match2 = $routes->reverseRoute('namedRoute2');
+        $match3 = $routes->reverseRoute('namedRoute3');
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $this->assertSame('/en/user/insert', $match1);
+        $this->assertSame('/en/user/insert', $match2);
+        $this->assertSame('/en/user/insert', $match3);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3048
+     */
+    public function testNamedRoutesWithPipesInRegex()
+    {
+        $routes = $this->getCollector();
+
+        $routes->get('/system/(this|that)', 'myController::system/$1', ['as' => 'pipedRoute']);
+
+        $this->assertSame('/system/this', $routes->reverseRoute('pipedRoute', 'this'));
+        $this->assertSame('/system/that', $routes->reverseRoute('pipedRoute', 'that'));
+    }
+
+    public function testReverseRouteMatching()
+    {
+        $routes = $this->getCollector();
+
+        $routes->get('test/(:segment)/(:segment)', 'TestController::test/$1/$2', ['as' => 'testRouter']);
+
+        $match = $routes->reverseRoute('testRouter', 1, 2);
+
+        $this->assertSame('/test/1/2', $match);
+    }
+
+    public function testReverseRouteMatchingWithLocale()
+    {
+        $routes = $this->getCollector();
+
+        $routes->get('{locale}/test/(:segment)/(:segment)', 'TestController::test/$1/$2', ['as' => 'testRouter']);
+
+        $match = $routes->reverseRoute('testRouter', 1, 2);
+
+        $this->assertSame('/en/test/1/2', $match);
+    }
+
+    public function testAddRedirect()
+    {
+        $routes = $this->getCollector();
+
+        // The second parameter is either the new URI to redirect to, or the name of a named route.
+        $routes->addRedirect('users', 'users/index', 307);
+
+        $expected = [
+            'users' => 'users/index',
+        ];
+
+        $this->assertSame($expected, $routes->getRoutes());
+        $this->assertTrue($routes->isRedirect('users'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
+        $this->assertSame(0, $routes->getRedirectCode('bosses'));
+    }
+
+    public function testAddRedirectNamed()
+    {
+        $routes = $this->getCollector();
 
-	public function testWithWWWSubdomain()
-	{
-		$routes = $this->getCollector();
+        $routes->add('zombies', 'Zombies::index', ['as' => 'namedRoute']);
+        $routes->addRedirect('users', 'namedRoute', 307);
 
-		$_SERVER['HTTP_HOST'] = 'www.example.com';
+        $expected = [
+            'zombies' => '\Zombies::index',
+            'users'   => ['zombies' => '\Zombies::index'],
+        ];
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+        $this->assertSame($expected, $routes->getRoutes());
+        $this->assertTrue($routes->isRedirect('users'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
+    }
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
-		];
+    public function testAddRedirectGetMethod()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $routes->get('zombies', 'Zombies::index', ['as' => 'namedRoute']);
+        $routes->addRedirect('users', 'namedRoute', 307);
 
-	public function testWithDotCoSubdomain()
-	{
-		$routes = $this->getCollector();
+        $expected = [
+            'zombies' => '\Zombies::index',
+            'users'   => ['zombies' => '\Zombies::index'],
+        ];
 
-		$_SERVER['HTTP_HOST'] = 'example.uk.co';
+        $this->assertSame($expected, $routes->getRoutes());
+        $this->assertTrue($routes->isRedirect('users'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
+    }
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/497
+     */
+    public function testWithSubdomain()
+    {
+        $routes = $this->getCollector();
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
-		];
+        $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
-	public function testWithDifferentSubdomainMissing()
-	{
-		$routes = $this->getCollector();
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
+        ];
 
-		$_SERVER['HTTP_HOST'] = 'adm.example.com';
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'nothere']);
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1', ['subdomain' => '*']);
+    public function testWithSubdomainMissing()
+    {
+        $routes = $this->getCollector();
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
-		];
+        //      $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
-	//--------------------------------------------------------------------
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
+        ];
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
-	 */
-	public function testWithSubdomainOrdered()
-	{
-		$routes = $this->getCollector();
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-		$_SERVER['HTTP_HOST'] = 'adm.example.com';
+    public function testWithDifferentSubdomain()
+    {
+        $routes = $this->getCollector();
 
-		$routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
-		$routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
+        $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
-		$expects = [
-			'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
-		];
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
-		$this->assertEquals($expects, $routes->getRoutes());
-	}
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
+        ];
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/568
-	 */
-	public function testReverseRoutingWithClosure()
-	{
-		$routes = $this->getCollector();
+    public function testWithWWWSubdomain()
+    {
+        $routes = $this->getCollector();
 
-		$routes->add('login', function () {
-		});
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
 
-		$match = $routes->reverseRoute('login');
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
-		$this->assertEquals('/login', $match);
-	}
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
+        ];
 
-	public function testReverseRoutingWithClosureNoMatch()
-	{
-		$routes = $this->getCollector();
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-		$routes->add('login', function () {
-		});
+    public function testWithDotCoSubdomain()
+    {
+        $routes = $this->getCollector();
 
-		$this->assertFalse($routes->reverseRoute('foobar'));
-	}
+        $_SERVER['HTTP_HOST'] = 'example.uk.co';
 
-	//--------------------------------------------------------------------
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
-	public function testWillDiscoverLocal()
-	{
-		$config = [
-			'SampleSpace' => TESTPATH . '_support',
-		];
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
+        ];
 
-		$moduleConfig          = new Modules();
-		$moduleConfig->enabled = true;
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-		$routes = $this->getCollector($config, [], $moduleConfig);
+    public function testWithDifferentSubdomainMissing()
+    {
+        $routes = $this->getCollector();
 
-		$match = $routes->getRoutes();
+        $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
-		$this->assertArrayHasKey('testing', $match);
-		$this->assertEquals($match['testing'], '\TestController::index');
-	}
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'nothere']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1', ['subdomain' => '*']);
 
-	//--------------------------------------------------------------------
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
+        ];
 
-	public function testDiscoverLocalAllowsConfigToOverridePackages()
-	{
-		$config = [
-			'SampleSpace' => TESTPATH . '_support',
-		];
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-		$moduleConfig          = new Modules();
-		$moduleConfig->enabled = true;
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
+     */
+    public function testWithSubdomainOrdered()
+    {
+        $routes = $this->getCollector();
 
-		$routes = $this->getCollector($config, [], $moduleConfig);
+        $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
-		$routes->add('testing', 'MainRoutes::index', ['as' => 'testing-index']);
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
+        $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
 
-		$match = $routes->getRoutes();
+        $expects = [
+            'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
+        ];
 
-		$this->assertArrayHasKey('testing', $match);
-		$this->assertEquals($match['testing'], '\MainRoutes::index');
-	}
+        $this->assertSame($expects, $routes->getRoutes());
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/568
+     */
+    public function testReverseRoutingWithClosure()
+    {
+        $routes = $this->getCollector();
 
-	public function testRoutesOptions()
-	{
-		$routes = $this->getCollector();
+        $routes->add('login', static function () {
+        });
 
-		// options need to be declared separately, to not confuse PHPCBF
-		$options = [
-			'as'  => 'admin',
-			'foo' => 'baz',
-		];
-		$routes->add(
-				'administrator', function () {
-				}, $options
-		);
+        $match = $routes->reverseRoute('login');
 
-		$options = $routes->getRoutesOptions('administrator');
+        $this->assertSame('/login', $match);
+    }
 
-		$this->assertEquals($options, ['as' => 'admin', 'foo' => 'baz']);
-	}
+    public function testReverseRoutingWithClosureNoMatch()
+    {
+        $routes = $this->getCollector();
 
-	public function testRoutesOptionsForDifferentVerbs()
-	{
-		$routes = $this->getCollector();
-
-		// options need to be declared separately, to not confuse PHPCBF
-		$options1 = [
-			'as'  => 'admin1',
-			'foo' => 'baz1',
-		];
-		$options2 = [
-			'as'  => 'admin2',
-			'foo' => 'baz2',
-		];
-		$options3 = [
-			'bar' => 'baz',
-		];
-		$routes->get(
-				'administrator', function () {
-				}, $options1
-		);
-		$routes->post(
-				'administrator', function () {
-				}, $options2
-		);
-		$routes->add(
-				'administrator', function () {
-				}, $options3
-		);
-
-		$options = $routes->getRoutesOptions('administrator');
-
-		$this->assertEquals($options, ['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz']);
-
-		$options = $routes->setHTTPVerb('post')->getRoutesOptions('administrator');
-
-		$this->assertEquals($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
-
-		$options = $routes->setHTTPVerb('get')->getRoutesOptions('administrator', 'post');
-
-		$this->assertEquals($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
-	}
-
-	public function testRouteGroupWithFilterSimple()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'admin', ['filter' => 'role'], function ($routes) {
-					$routes->add('users', '\Users::list');
-				}
-		);
-
-		$this->assertTrue($routes->isFiltered('admin/users'));
-		$this->assertFalse($routes->isFiltered('admin/franky'));
-		$this->assertEquals('role', $routes->getFilterForRoute('admin/users'));
-		$this->assertEquals('', $routes->getFilterForRoute('admin/bosses'));
-	}
-
-	public function testRouteGroupWithFilterWithParams()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-
-		$routes->group(
-				'admin', ['filter' => 'role:admin,manager'], function ($routes) {
-					$routes->add('users', '\Users::list');
-				}
-		);
-
-		$this->assertTrue($routes->isFiltered('admin/users'));
-		$this->assertFalse($routes->isFiltered('admin/franky'));
-		$this->assertEquals('role:admin,manager', $routes->getFilterForRoute('admin/users'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function test404OverrideNot()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-
-		$this->assertEquals(null, $routes->get404Override());
-	}
-
-	public function test404OverrideString()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-
-		$routes->set404Override('Explode');
-		$this->assertEquals('Explode', $routes->get404Override());
-	}
+        $routes->add('login', static function () {
+        });
 
-	public function test404OverrideCallable()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $this->assertFalse($routes->reverseRoute('foobar'));
+    }
 
-		$routes->set404Override(function () {
-			echo 'Explode now';
-		}
-		);
-		$this->assertTrue(is_callable($routes->get404Override()));
-	}
+    public function testWillDiscoverLocal()
+    {
+        $config = ['SampleSpace' => TESTPATH . '_support'];
 
-	//--------------------------------------------------------------------
+        $moduleConfig          = new Modules();
+        $moduleConfig->enabled = true;
 
-	public function testOffsetParameters()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
+        $routes = $this->getCollector($config, [], $moduleConfig);
 
-		$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
-		$expected = ['users/([0-9]+)' => '\users/show/$2'];
-		$this->assertEquals($expected, $routes->getRoutes());
-	}
+        $match = $routes->getRoutes();
 
-	//--------------------------------------------------------------------
-	// Battery of tests for reported issue
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/1697
+        $this->assertArrayHasKey('testing', $match);
+        $this->assertSame($match['testing'], '\TestController::index');
+    }
 
-	/**
-	 */
-	public function testRouteToWithSubdomainMatch()
-	{
-		$routes = $this->getCollector();
+    public function testDiscoverLocalAllowsConfigToOverridePackages()
+    {
+        $config = [
+            'SampleSpace' => TESTPATH . '_support',
+        ];
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.example.com';
+        $moduleConfig          = new Modules();
+        $moduleConfig->enabled = true;
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
+        $routes = $this->getCollector($config, [], $moduleConfig);
+
+        $routes->add('testing', 'MainRoutes::index', ['as' => 'testing-index']);
+
+        $match = $routes->getRoutes();
+
+        $this->assertArrayHasKey('testing', $match);
+        $this->assertSame($match['testing'], '\MainRoutes::index');
+    }
+
+    public function testRoutesOptions()
+    {
+        $routes = $this->getCollector();
+
+        // options need to be declared separately, to not confuse PHPCBF
+        $options = [
+            'as'  => 'admin',
+            'foo' => 'baz',
+        ];
+        $routes->add(
+            'administrator',
+            static function () {},
+            $options
+        );
+
+        $options = $routes->getRoutesOptions('administrator');
+
+        $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']);
+    }
+
+    public function testRoutesOptionsForDifferentVerbs()
+    {
+        $routes = $this->getCollector();
+
+        // options need to be declared separately, to not confuse PHPCBF
+        $options1 = [
+            'as'  => 'admin1',
+            'foo' => 'baz1',
+        ];
+        $options2 = [
+            'as'  => 'admin2',
+            'foo' => 'baz2',
+        ];
+        $options3 = [
+            'bar' => 'baz',
+        ];
+        $routes->get(
+            'administrator',
+            static function () {},
+            $options1
+        );
+        $routes->post(
+            'administrator',
+            static function () {},
+            $options2
+        );
+        $routes->add(
+            'administrator',
+            static function () {},
+            $options3
+        );
+
+        $options = $routes->getRoutesOptions('administrator');
+
+        $this->assertSame($options, ['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz']);
+
+        $options = $routes->setHTTPVerb('post')->getRoutesOptions('administrator');
+
+        $this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
+
+        $options = $routes->setHTTPVerb('get')->getRoutesOptions('administrator', 'post');
+
+        $this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
+    }
+
+    public function testRouteGroupWithFilterSimple()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->group(
+            'admin',
+            ['filter' => 'role'],
+            static function ($routes) {
+                $routes->add('users', '\Users::list');
+            }
+        );
+
+        $this->assertTrue($routes->isFiltered('admin/users'));
+        $this->assertFalse($routes->isFiltered('admin/franky'));
+        $this->assertSame('role', $routes->getFilterForRoute('admin/users'));
+        $this->assertSame('', $routes->getFilterForRoute('admin/bosses'));
+    }
+
+    public function testRouteGroupWithFilterWithParams()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->group(
+            'admin',
+            ['filter' => 'role:admin,manager'],
+            static function ($routes) {
+                $routes->add('users', '\Users::list');
+            }
+        );
+
+        $this->assertTrue($routes->isFiltered('admin/users'));
+        $this->assertFalse($routes->isFiltered('admin/franky'));
+        $this->assertSame('role:admin,manager', $routes->getFilterForRoute('admin/users'));
+    }
+
+    public function test404OverrideNot()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $this->assertNull($routes->get404Override());
+    }
+
+    public function test404OverrideString()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->set404Override('Explode');
+        $this->assertSame('Explode', $routes->get404Override());
+    }
+
+    public function test404OverrideCallable()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+
+        $routes->set404Override(static function () {
+            echo 'Explode now';
+        });
+        $this->assertIsCallable($routes->get404Override());
+    }
+
+    public function testOffsetParameters()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
 
-		$this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
-	}
+        $routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
+        $expected = ['users/([0-9]+)' => '\users/show/$2'];
+        $this->assertSame($expected, $routes->getRoutes());
+    }
 
-	public function testRouteToWithSubdomainMismatch()
-	{
-		$routes = $this->getCollector();
+    /**
+     * Battery of tests for reported issue
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1697
+     */
+    public function testRouteToWithSubdomainMatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
-		$this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithSubdomainNot()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithSubdomainMismatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'dev.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
-		$this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithGenericSubdomainMatch()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithSubdomainNot()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
-		$this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithGenericSubdomainMismatch()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithGenericSubdomainMatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-		$this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithGenericSubdomainNot()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithGenericSubdomainMismatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'dev.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-		$this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithoutSubdomainMatch()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithGenericSubdomainNot()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-		$this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithoutSubdomainMismatch()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithoutSubdomainMatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
-		$this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	public function testRouteToWithoutSubdomainNot()
-	{
-		$routes = $this->getCollector();
+    public function testRouteToWithoutSubdomainMismatch()
+    {
+        $routes = $this->getCollector();
 
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'dev.example.com';
 
-		$routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
-		$this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
-	}
+        $this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
+    }
 
-	//--------------------------------------------------------------------
-	// Tests for router overwritting issue
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
+    public function testRouteToWithoutSubdomainNot()
+    {
+        $routes = $this->getCollector();
 
-	public function testRouteOverwritingDifferentSubdomains()
-	{
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'example.com';
 
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->setDefaultController('Home');
-		$routes->setDefaultMethod('index');
-		$routes->setHTTPVerb('get');
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+    }
 
-		$routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
-		$routes->get('/', 'Home::index', ['subdomain' => 'dev']);
+    /**
+     * Tests for router overwritting issue
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
+     */
+    public function testRouteOverwritingDifferentSubdomains()
+    {
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.domain.com';
 
-		$expects = '\App\Controllers\Site\CDoc';
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->setDefaultController('Home');
+        $routes->setDefaultMethod('index');
+        $routes->setHTTPVerb('get');
 
-	public function testRouteOverwritingTwoRules()
-	{
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        $routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
+        $routes->get('/', 'Home::index', ['subdomain' => 'dev']);
 
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $expects = '\App\Controllers\Site\CDoc';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->setDefaultController('Home');
-		$routes->setDefaultMethod('index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
-		$routes->get('/', 'Home::index');
+    public function testRouteOverwritingTwoRules()
+    {
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.domain.com';
 
-		// the second rule applies, so overwrites the first
-		$expects = '\App\Controllers\Home';
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->setDefaultController('Home');
+        $routes->setDefaultMethod('index');
 
-	public function testRouteOverwritingTwoRulesLastApplies()
-	{
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        $routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
+        $routes->get('/', 'Home::index');
 
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        // the second rule applies, so overwrites the first
+        $expects = '\App\Controllers\Home';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->setDefaultController('Home');
-		$routes->setDefaultMethod('index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$routes->get('/', 'Home::index');
-		$routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
+    public function testRouteOverwritingTwoRulesLastApplies()
+    {
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.domain.com';
 
-		$expects = '\App\Controllers\Site\CDoc';
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->setDefaultController('Home');
+        $routes->setDefaultMethod('index');
 
-	public function testRouteOverwritingMatchingSubdomain()
-	{
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        $routes->get('/', 'Home::index');
+        $routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
 
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $expects = '\App\Controllers\Site\CDoc';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->setDefaultController('Home');
-		$routes->setDefaultMethod('index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$routes->get('/', 'Home::index', ['as' => 'ddd']);
-		$routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
+    public function testRouteOverwritingMatchingSubdomain()
+    {
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.domain.com';
 
-		$expects = '\App\Controllers\Site\CDoc';
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->setDefaultController('Home');
+        $routes->setDefaultMethod('index');
 
-	public function testRouteOverwritingMatchingHost()
-	{
-		Services::request()->setMethod('get');
-		$_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        $routes->get('/', 'Home::index', ['as' => 'ddd']);
+        $routes->get('/', '\App\Controllers\Site\CDoc::index', ['subdomain' => 'doc', 'as' => 'doc_index']);
 
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $expects = '\App\Controllers\Site\CDoc';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->setDefaultController('Home');
-		$routes->setDefaultMethod('index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$routes->get('/', 'Home::index', ['as' => 'ddd']);
-		$routes->get('/', '\App\Controllers\Site\CDoc::index', ['hostname' => 'doc.domain.com', 'as' => 'doc_index']);
+    public function testRouteOverwritingMatchingHost()
+    {
+        Services::request()->setMethod('get');
+        $_SERVER['HTTP_HOST'] = 'doc.domain.com';
 
-		$expects = '\App\Controllers\Site\CDoc';
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->setDefaultController('Home');
+        $routes->setDefaultMethod('index');
 
-	//--------------------------------------------------------------------
-	// Tests for router DefaultNameSpace issue
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/2423
+        $routes->get('/', 'Home::index', ['as' => 'ddd']);
+        $routes->get('/', '\App\Controllers\Site\CDoc::index', ['hostname' => 'doc.domain.com', 'as' => 'doc_index']);
 
-	public function testRouteDefaultNameSpace()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $expects = '\App\Controllers\Site\CDoc';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->get('/', 'Core\Home::index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$expects = '\App\Controllers\Core\Home';
+    /**
+     * Tests for router DefaultNameSpace issue
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2423
+     */
+    public function testRouteDefaultNameSpace()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->get('/', 'Core\Home::index');
 
-	public function testZeroAsURIPath()
-	{
-		Services::request()->setMethod('get');
-		$routes = $this->getCollector();
-		$router = new Router($routes, Services::request());
+        $expects = '\App\Controllers\Core\Home';
 
-		$routes->setDefaultNamespace('App\Controllers');
-		$routes->get('/0', 'Core\Home::index');
+        $this->assertSame($expects, $router->handle('/'));
+    }
 
-		$expects = '\App\Controllers\Core\Home';
+    public function testZeroAsURIPath()
+    {
+        Services::request()->setMethod('get');
+        $routes = $this->getCollector();
+        $router = new Router($routes, Services::request());
 
-		$this->assertEquals($expects, $router->handle('/0'));
-	}
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->get('/0', 'Core\Home::index');
 
-	public function provideRouteDefaultNamespace()
-	{
-		return [
-			'with \\ prefix'    => ['\App\Controllers'],
-			'without \\ prefix' => ['App\Controllers'],
-		];
-	}
+        $expects = '\App\Controllers\Core\Home';
 
-	/**
-	 * @dataProvider provideRouteDefaultNamespace
-	 */
-	public function testAutoRoutesControllerNameReturnsFQCN($namespace)
-	{
-		$routes = $this->getCollector();
-		$routes->setAutoRoute(true);
-		$routes->setDefaultNamespace($namespace);
+        $this->assertSame($expects, $router->handle('/0'));
+    }
 
-		$router = new Router($routes, Services::request());
-		$router->handle('/product');
+    public function provideRouteDefaultNamespace()
+    {
+        return [
+            'with \\ prefix'    => ['\App\Controllers'],
+            'without \\ prefix' => ['App\Controllers'],
+        ];
+    }
 
-		$this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
-	}
+    /**
+     * @dataProvider provideRouteDefaultNamespace
+     *
+     * @param mixed $namespace
+     */
+    public function testAutoRoutesControllerNameReturnsFQCN($namespace)
+    {
+        $routes = $this->getCollector();
+        $routes->setAutoRoute(true);
+        $routes->setDefaultNamespace($namespace);
 
-	/**
-	 * @dataProvider provideRouteDefaultNamespace
-	 */
-	public function testRoutesControllerNameReturnsFQCN($namespace)
-	{
-		$routes = $this->getCollector();
-		$routes->setAutoRoute(false);
-		$routes->setDefaultNamespace($namespace);
-		$routes->get('/product', 'Product');
+        $router = new Router($routes, Services::request());
+        $router->handle('/product');
 
-		$router = new Router($routes, Services::request());
-		$router->handle('/product');
+        $this->assertSame('\App\\Controllers\\Product', $router->controllerName());
+    }
 
-		$this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
-	}
+    /**
+     * @dataProvider provideRouteDefaultNamespace
+     *
+     * @param mixed $namespace
+     */
+    public function testRoutesControllerNameReturnsFQCN($namespace)
+    {
+        $routes = $this->getCollector();
+        $routes->setAutoRoute(false);
+        $routes->setDefaultNamespace($namespace);
+        $routes->get('/product', 'Product');
 
-	public function testRoutePriorityDetected()
-	{
-		$collection = $this->getCollector();
+        $router = new Router($routes, Services::request());
+        $router->handle('/product');
 
-		$this->assertEquals(false, $this->getPrivateProperty($collection, 'prioritizeDetected'));
+        $this->assertSame('\App\\Controllers\\Product', $router->controllerName());
+    }
 
-		$collection->add('/', 'Controller::method', ['priority' => 0]);
+    public function testRoutePriorityDetected()
+    {
+        $collection = $this->getCollector();
 
-		$this->assertEquals(false, $this->getPrivateProperty($collection, 'prioritizeDetected'));
+        $this->assertFalse($this->getPrivateProperty($collection, 'prioritizeDetected'));
 
-		$collection->add('priority', 'Controller::method', ['priority' => 1]);
+        $collection->add('/', 'Controller::method', ['priority' => 0]);
 
-		$this->assertEquals(true, $this->getPrivateProperty($collection, 'prioritizeDetected'));
-	}
+        $this->assertFalse($this->getPrivateProperty($collection, 'prioritizeDetected'));
 
-	public function testRoutePriorityValue()
-	{
-		$collection = $this->getCollector();
+        $collection->add('priority', 'Controller::method', ['priority' => 1]);
 
-		$collection->add('string', 'Controller::method', ['priority' => 'string']);
-		$this->assertEquals(0, $collection->getRoutesOptions('string')['priority']);
+        $this->assertTrue($this->getPrivateProperty($collection, 'prioritizeDetected'));
+    }
 
-		$collection->add('negative-integer', 'Controller::method', ['priority' => -1]);
-		$this->assertEquals(1, $collection->getRoutesOptions('negative-integer')['priority']);
+    public function testRoutePriorityValue()
+    {
+        $collection = $this->getCollector();
 
-		$collection->add('string-negative-integer', 'Controller::method', ['priority' => '-1']);
-		$this->assertEquals(1, $collection->getRoutesOptions('string-negative-integer')['priority']);
-	}
+        $collection->add('string', 'Controller::method', ['priority' => 'string']);
+        $this->assertSame(0, $collection->getRoutesOptions('string')['priority']);
+
+        $collection->add('negative-integer', 'Controller::method', ['priority' => -1]);
+        $this->assertSame(1, $collection->getRoutesOptions('negative-integer')['priority']);
+
+        $collection->add('string-negative-integer', 'Controller::method', ['priority' => '-1']);
+        $this->assertSame(1, $collection->getRoutesOptions('string-negative-integer')['priority']);
+    }
 }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 272217b1058c..82ea515f600b 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -1,778 +1,723 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Config\Services;
+use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
-use CodeIgniter\Exceptions\PageNotFoundException;
 
-class RouterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RouterTest extends CIUnitTestCase
 {
+    /**
+     * @var RouteCollection
+     */
+    protected $collection;
+
+    /**
+     * vfsStream root directory
+     *
+     * @var
+     */
+    protected $root;
+
+    /**
+     * @var IncomingRequest
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $moduleConfig          = new Modules();
+        $moduleConfig->enabled = false;
+        $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
+
+        $routes = [
+            'users'                        => 'Users::index',
+            'user-setting/show-list'       => 'User_setting::show_list',
+            'user-setting/(:segment)'      => 'User_setting::detail/$1',
+            'posts'                        => 'Blog::posts',
+            'pages'                        => 'App\Pages::list_all',
+            'posts/(:num)'                 => 'Blog::show/$1',
+            'posts/(:num)/edit'            => 'Blog::edit/$1',
+            'books/(:num)/(:alpha)/(:num)' => 'Blog::show/$3/$1',
+            'closure/(:num)/(:alpha)'      => static function ($num, $str) {
+                return $num . '-' . $str;
+            },
+            '{locale}/pages'                                  => 'App\Pages::list_all',
+            'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
+            '/some/slash'                                     => 'App\Slash::index',
+            'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
+        ];
+
+        $this->collection->map($routes);
+        $this->request = Services::request();
+        $this->request->setMethod('get');
+    }
+
+    protected function tearDown(): void
+    {
+    }
 
-	/**
-	 * @var RouteCollection $collection
-	 */
-	protected $collection;
-
-	/**
-	 * vfsStream root directory
-	 *
-	 * @var
-	 */
-	protected $root;
-
-	/**
-	 * @var IncomingRequest
-	 */
-	protected $request;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$moduleConfig          = new Modules;
-		$moduleConfig->enabled = false;
-		$this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
-
-		$routes = [
-			'users'                                           => 'Users::index',
-			'user-setting/show-list'                          => 'User_setting::show_list',
-			'user-setting/(:segment)'                         => 'User_setting::detail/$1',
-			'posts'                                           => 'Blog::posts',
-			'pages'                                           => 'App\Pages::list_all',
-			'posts/(:num)'                                    => 'Blog::show/$1',
-			'posts/(:num)/edit'                               => 'Blog::edit/$1',
-			'books/(:num)/(:alpha)/(:num)'                    => 'Blog::show/$3/$1',
-			'closure/(:num)/(:alpha)'                         => function ($num, $str) {
-				return $num . '-' . $str;
-			},
-			'{locale}/pages'                                  => 'App\Pages::list_all',
-			'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
-			'/some/slash'                                     => 'App\Slash::index',
-			'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
-		];
-
-		$this->collection->map($routes);
-		$this->request = Services::request();
-		$this->request->setMethod('get');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function tearDown(): void
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEmptyURIMatchesDefaults()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('');
-
-		$this->assertEquals($this->collection->getDefaultController(), $router->controllerName());
-		$this->assertEquals($this->collection->getDefaultMethod(), $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testZeroAsURIPath()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$this->expectException(PageNotFoundException::class);
-
-		$router->handle('0');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsToController()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('users');
-
-		$this->assertEquals('\Users', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsToControllerAltMethod()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('posts');
-
-		$this->assertEquals('\Blog', $router->controllerName());
-		$this->assertEquals('posts', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsToNamespacedController()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('pages');
-
-		$this->assertEquals('\App\Pages', $router->controllerName());
-		$this->assertEquals('list_all', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsParamsToBackReferences()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('posts/123');
-
-		$this->assertEquals('show', $router->methodName());
-		$this->assertEquals([123], $router->params());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsParamsToRearrangedBackReferences()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('posts/123/edit');
-
-		$this->assertEquals('edit', $router->methodName());
-		$this->assertEquals([123], $router->params());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testURIMapsParamsToBackReferencesWithUnused()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('books/123/sometitle/456');
-
-		$this->assertEquals('show', $router->methodName());
-		$this->assertEquals([456, 123], $router->params());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/672
-	 */
-	public function testURIMapsParamsWithMany()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('objects/123/sort/abc/FOO');
+    public function testEmptyURIMatchesDefaults()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$this->assertEquals('objectsSortCreate', $router->methodName());
-		$this->assertEquals([123, 'abc', 'FOO'], $router->params());
-	}
+        $router->handle('');
 
-	//--------------------------------------------------------------------
+        $this->assertSame($this->collection->getDefaultController(), $router->controllerName());
+        $this->assertSame($this->collection->getDefaultMethod(), $router->methodName());
+    }
 
-	public function testClosures()
-	{
-		$router = new Router($this->collection, $this->request);
+    public function testZeroAsURIPath()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router->handle('closure/123/alpha', $this->request);
+        $this->expectException(PageNotFoundException::class);
 
-		$closure = $router->controllerName();
+        $router->handle('0');
+    }
 
-		$expects = $closure(...$router->params());
+    public function testURIMapsToController()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$this->assertIsCallable($router->controllerName());
-		$this->assertEquals($expects, '123-alpha');
-	}
+        $router->handle('users');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('\Users', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-	public function testAutoRouteFindsControllerWithFileAndMethod()
-	{
-		$router = new Router($this->collection, $this->request);
+    public function testURIMapsToControllerAltMethod()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router->autoRoute('myController/someMethod');
+        $router->handle('posts');
 
-		$this->assertEquals('MyController', $router->controllerName());
-		$this->assertEquals('someMethod', $router->methodName());
-	}
+        $this->assertSame('\Blog', $router->controllerName());
+        $this->assertSame('posts', $router->methodName());
+    }
 
-	//--------------------------------------------------------------------
+    public function testURIMapsToNamespacedController()
+    {
+        $router = new Router($this->collection, $this->request);
 
-	public function testAutoRouteFindsControllerWithFile()
-	{
-		$router = new Router($this->collection, $this->request);
+        $router->handle('pages');
 
-		$router->autoRoute('myController');
+        $this->assertSame('\App\Pages', $router->controllerName());
+        $this->assertSame('list_all', $router->methodName());
+    }
 
-		$this->assertEquals('MyController', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
+    public function testURIMapsParamsToBackReferences()
+    {
+        $router = new Router($this->collection, $this->request);
 
-	//--------------------------------------------------------------------
+        $router->handle('posts/123');
 
-	public function testAutoRouteFindsControllerWithSubfolder()
-	{
-		$router = new Router($this->collection, $this->request);
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame(['123'], $router->params());
+    }
 
-		mkdir(APPPATH . 'Controllers/Subfolder');
+    public function testURIMapsParamsToRearrangedBackReferences()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router->autoRoute('subfolder/myController/someMethod');
+        $router->handle('posts/123/edit');
 
-		rmdir(APPPATH . 'Controllers/Subfolder');
+        $this->assertSame('edit', $router->methodName());
+        $this->assertSame(['123'], $router->params());
+    }
 
-		$this->assertEquals('MyController', $router->controllerName());
-		$this->assertEquals('someMethod', $router->methodName());
-	}
+    public function testURIMapsParamsToBackReferencesWithUnused()
+    {
+        $router = new Router($this->collection, $this->request);
 
-	//--------------------------------------------------------------------
+        $router->handle('books/123/sometitle/456');
 
-	public function testAutoRouteFindsDashedSubfolder()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame(['456', '123'], $router->params());
+    }
 
-		mkdir(APPPATH . 'Controllers/Dash_folder');
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/672
+     */
+    public function testURIMapsParamsWithMany()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router->autoRoute('dash-folder/mycontroller/somemethod');
+        $router->handle('objects/123/sort/abc/FOO');
 
-		rmdir(APPPATH . 'Controllers/Dash_folder');
+        $this->assertSame('objectsSortCreate', $router->methodName());
+        $this->assertSame(['123', 'abc', 'FOO'], $router->params());
+    }
 
-		$this->assertEquals('Dash_folder/', $router->directory());
-		$this->assertEquals('Mycontroller', $router->controllerName());
-		$this->assertEquals('somemethod', $router->methodName());
-	}
+    public function testClosures()
+    {
+        $router = new Router($this->collection, $this->request);
 
-	//--------------------------------------------------------------------
+        $router->handle('closure/123/alpha');
 
-	public function testAutoRouteFindsDashedController()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        $closure = $router->controllerName();
 
-		mkdir(APPPATH . 'Controllers/Dash_folder');
-		file_put_contents(APPPATH . 'Controllers/Dash_folder/Dash_controller.php', '');
+        $expects = $closure(...$router->params());
 
-		$router->autoRoute('dash-folder/dash-controller/somemethod');
+        $this->assertIsCallable($router->controllerName());
+        $this->assertSame($expects, '123-alpha');
+    }
 
-		unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
-		rmdir(APPPATH . 'Controllers/Dash_folder');
+    public function testAutoRouteFindsControllerWithFileAndMethod()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$this->assertEquals('Dash_folder/', $router->directory());
-		$this->assertEquals('Dash_controller', $router->controllerName());
-		$this->assertEquals('somemethod', $router->methodName());
-	}
+        $router->autoRoute('myController/someMethod');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
+    }
 
-	public function testAutoRouteFindsDashedMethod()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+    public function testAutoRouteFindsControllerWithFile()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		mkdir(APPPATH . 'Controllers/Dash_folder');
-		file_put_contents(APPPATH . 'Controllers/Dash_folder/Dash_controller.php', '');
+        $router->autoRoute('myController');
 
-		$router->autoRoute('dash-folder/dash-controller/dash-method');
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-		unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
-		rmdir(APPPATH . 'Controllers/Dash_folder');
+    public function testAutoRouteFindsControllerWithSubfolder()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$this->assertEquals('Dash_folder/', $router->directory());
-		$this->assertEquals('Dash_controller', $router->controllerName());
-		$this->assertEquals('dash_method', $router->methodName());
-	}
+        mkdir(APPPATH . 'Controllers/Subfolder');
 
-	//--------------------------------------------------------------------
+        $router->autoRoute('subfolder/myController/someMethod');
 
-	public function testAutoRouteFindsDefaultDashFolder()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        rmdir(APPPATH . 'Controllers/Subfolder');
 
-		mkdir(APPPATH . 'Controllers/Dash_folder');
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
+    }
 
-		$router->autoRoute('dash-folder');
+    public function testAutoRouteFindsDashedSubfolder()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		rmdir(APPPATH . 'Controllers/Dash_folder');
+        mkdir(APPPATH . 'Controllers/Dash_folder');
 
-		$this->assertEquals('Dash_folder/', $router->directory());
-		$this->assertEquals('Home', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
+        $router->autoRoute('dash-folder/mycontroller/somemethod');
 
-	//--------------------------------------------------------------------
+        rmdir(APPPATH . 'Controllers/Dash_folder');
 
-	public function testAutoRouteFindsMByteDir()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Mycontroller', $router->controllerName());
+        $this->assertSame('somemethod', $router->methodName());
+    }
 
-		mkdir(APPPATH . 'Controllers/Φ');
+    public function testAutoRouteFindsDashedController()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		$router->autoRoute('Φ');
+        mkdir(APPPATH . 'Controllers/Dash_folder');
+        file_put_contents(APPPATH . 'Controllers/Dash_folder/Dash_controller.php', '');
 
-		rmdir(APPPATH . 'Controllers/Φ');
+        $router->autoRoute('dash-folder/dash-controller/somemethod');
 
-		$this->assertEquals('Φ/', $router->directory());
-		$this->assertEquals('Home', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
+        unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
+        rmdir(APPPATH . 'Controllers/Dash_folder');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Dash_controller', $router->controllerName());
+        $this->assertSame('somemethod', $router->methodName());
+    }
 
-	public function testAutoRouteFindsMByteController()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+    public function testAutoRouteFindsDashedMethod()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		file_put_contents(APPPATH . 'Controllers/Φ', '');
+        mkdir(APPPATH . 'Controllers/Dash_folder');
+        file_put_contents(APPPATH . 'Controllers/Dash_folder/Dash_controller.php', '');
 
-		$router->autoRoute('Φ');
+        $router->autoRoute('dash-folder/dash-controller/dash-method');
 
-		unlink(APPPATH . 'Controllers/Φ');
+        unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
+        rmdir(APPPATH . 'Controllers/Dash_folder');
 
-		$this->assertEquals('Φ', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Dash_controller', $router->controllerName());
+        $this->assertSame('dash_method', $router->methodName());
+    }
 
-	//--------------------------------------------------------------------
+    public function testAutoRouteFindsDefaultDashFolder()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-	public function testAutoRouteRejectsSingleDot()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        mkdir(APPPATH . 'Controllers/Dash_folder');
 
-		$this->expectException(PageNotFoundException::class);
+        $router->autoRoute('dash-folder');
 
-		$router->autoRoute('.');
-	}
+        rmdir(APPPATH . 'Controllers/Dash_folder');
 
-	//--------------------------------------------------------------------
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-	public function testAutoRouteRejectsDoubleDot()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+    public function testAutoRouteFindsMByteDir()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		$this->expectException(PageNotFoundException::class);
+        mkdir(APPPATH . 'Controllers/Φ');
 
-		$router->autoRoute('..');
-	}
+        $router->autoRoute('Φ');
 
-	//--------------------------------------------------------------------
+        rmdir(APPPATH . 'Controllers/Φ');
 
-	public function testAutoRouteRejectsMidDot()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
+        $this->assertSame('Φ/', $router->directory());
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-		$this->expectException(PageNotFoundException::class);
+    public function testAutoRouteFindsMByteController()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		$router->autoRoute('Foo.bar');
-	}
+        file_put_contents(APPPATH . 'Controllers/Φ', '');
 
-	//--------------------------------------------------------------------
+        $router->autoRoute('Φ');
 
-	public function testDetectsLocales()
-	{
-		$router = new Router($this->collection, $this->request);
+        unlink(APPPATH . 'Controllers/Φ');
 
-		$router->handle('fr/pages');
+        $this->assertSame('Φ', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-		$this->assertTrue($router->hasLocale());
-		$this->assertEquals('fr', $router->getLocale());
-	}
+    public function testAutoRouteRejectsSingleDot()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-	//--------------------------------------------------------------------
+        $this->expectException(PageNotFoundException::class);
 
-	public function testRouteResource()
-	{
-		$router = new Router($this->collection, $this->request);
+        $router->autoRoute('.');
+    }
 
-		$router->handle('Admin/Admins');
+    public function testAutoRouteRejectsDoubleDot()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		$this->assertEquals('\App\Admin\Admins', $router->controllerName());
-		$this->assertEquals('list_all', $router->methodName());
-	}
+        $this->expectException(PageNotFoundException::class);
 
-	//--------------------------------------------------------------------
+        $router->autoRoute('..');
+    }
 
-	public function testRouteWithLeadingSlash()
-	{
-		$router = new Router($this->collection, $this->request);
+    public function testAutoRouteRejectsMidDot()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
 
-		$router->handle('some/slash');
+        $this->expectException(PageNotFoundException::class);
 
-		$this->assertEquals('\App\Slash', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
+        $router->autoRoute('Foo.bar');
+    }
 
-	//--------------------------------------------------------------------
-	// options need to be declared separately, to not confuse PHPCBF
-	public function testMatchedRouteOptions()
-	{
-		$optionsFoo = [
-			'as'  => 'login',
-			'foo' => 'baz',
-		];
-		$this->collection->add('foo', function () {
-		}, $optionsFoo);
-		$optionsBaz = [
-			'as'  => 'admin',
-			'foo' => 'bar',
-		];
-		$this->collection->add('baz', function () {
-		}, $optionsBaz);
+    public function testDetectsLocales()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router = new Router($this->collection, $this->request);
+        $router->handle('fr/pages');
 
-		$router->handle('foo');
+        $this->assertTrue($router->hasLocale());
+        $this->assertSame('fr', $router->getLocale());
+    }
 
-		$this->assertEquals($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
-	}
+    public function testRouteResource()
+    {
+        $router = new Router($this->collection, $this->request);
 
-	public function testRouteWorksWithFilters()
-	{
-		$collection = $this->collection;
+        $router->handle('Admin/Admins');
 
-		$collection->group('foo', ['filter' => 'test'], function ($routes) {
-			$routes->add('bar', 'TestController::foobar');
-		});
+        $this->assertSame('\App\Admin\Admins', $router->controllerName());
+        $this->assertSame('list_all', $router->methodName());
+    }
 
-		$router = new Router($collection, $this->request);
+    public function testRouteWithLeadingSlash()
+    {
+        $router = new Router($this->collection, $this->request);
 
-		$router->handle('foo/bar');
+        $router->handle('some/slash');
 
-		$this->assertEquals('\TestController', $router->controllerName());
-		$this->assertEquals('foobar', $router->methodName());
-		$this->assertEquals('test', $router->getFilter());
-	}
+        $this->assertSame('\App\Slash', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
 
-	//--------------------------------------------------------------------
+    // options need to be declared separately, to not confuse PHPCBF
+    public function testMatchedRouteOptions()
+    {
+        $optionsFoo = [
+            'as'  => 'login',
+            'foo' => 'baz',
+        ];
+        $this->collection->add('foo', static function () {
+        }, $optionsFoo);
+        $optionsBaz = [
+            'as'  => 'admin',
+            'foo' => 'bar',
+        ];
+        $this->collection->add('baz', static function () {
+        }, $optionsBaz);
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1247
-	 */
-	public function testGroupedResourceRoutesWithFilters()
-	{
-		$group = [
-			'api',
-			[
-				'namespace' => 'App\Controllers\Api',
-				'filter'    => 'api-auth',
-			],
-			function (RouteCollection $routes) {
-				$routes->resource('posts', [
-					'controller' => 'PostController',
-				]);
-			},
-		];
+        $router = new Router($this->collection, $this->request);
 
-		// GET
-		$this->collection->group(...$group);
+        $router->handle('foo');
 
-		$router = new Router($this->collection, $this->request);
+        $this->assertSame($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
+    }
 
-		$router->handle('api/posts');
+    public function testRouteWorksWithFilters()
+    {
+        $collection = $this->collection;
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $collection->group('foo', ['filter' => 'test'], static function ($routes) {
+            $routes->add('bar', 'TestController::foobar');
+        });
 
-		$router->handle('api/posts/new');
+        $router = new Router($collection, $this->request);
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('new', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $router->handle('foo/bar');
 
-		$router->handle('api/posts/50');
+        $this->assertSame('\TestController', $router->controllerName());
+        $this->assertSame('foobar', $router->methodName());
+        $this->assertSame('test', $router->getFilter());
+    }
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('show', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1247
+     */
+    public function testGroupedResourceRoutesWithFilters()
+    {
+        $group = [
+            'api',
+            [
+                'namespace' => 'App\Controllers\Api',
+                'filter'    => 'api-auth',
+            ],
+            static function (RouteCollection $routes) {
+                $routes->resource('posts', [
+                    'controller' => 'PostController',
+                ]);
+            },
+        ];
 
-		$router->handle('api/posts/50/edit');
+        // GET
+        $this->collection->group(...$group);
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('edit', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $router = new Router($this->collection, $this->request);
 
-		// POST
-		$this->collection->group(...$group);
+        $router->handle('api/posts');
 
-		$router = new Router($this->collection, $this->request);
-		$this->collection->setHTTPVerb('post');
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		$router->handle('api/posts');
+        $router->handle('api/posts/new');
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('create', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('new', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		// PUT
-		$this->collection->group(...$group);
+        $router->handle('api/posts/50');
 
-		$router = new Router($this->collection, $this->request);
-		$this->collection->setHTTPVerb('put');
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		$router->handle('api/posts/50');
+        $router->handle('api/posts/50/edit');
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('update', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('edit', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		// PATCH
-		$this->collection->group(...$group);
+        // POST
+        $this->collection->group(...$group);
 
-		$router = new Router($this->collection, $this->request);
-		$this->collection->setHTTPVerb('patch');
+        $router = new Router($this->collection, $this->request);
+        $this->collection->setHTTPVerb('post');
 
-		$router->handle('api/posts/50');
+        $router->handle('api/posts');
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('update', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('create', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		// DELETE
-		$this->collection->group(...$group);
+        // PUT
+        $this->collection->group(...$group);
 
-		$router = new Router($this->collection, $this->request);
-		$this->collection->setHTTPVerb('delete');
+        $router = new Router($this->collection, $this->request);
+        $this->collection->setHTTPVerb('put');
 
-		$router->handle('api/posts/50');
+        $router->handle('api/posts/50');
 
-		$this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-		$this->assertEquals('delete', $router->methodName());
-		$this->assertEquals('api-auth', $router->getFilter());
-	}
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('update', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-	//--------------------------------------------------------------------
+        // PATCH
+        $this->collection->group(...$group);
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
-	 */
-	public function testMatchesCorrectlyWithMixedVerbs()
-	{
-		$this->collection->setHTTPVerb('get');
+        $router = new Router($this->collection, $this->request);
+        $this->collection->setHTTPVerb('patch');
 
-		$this->collection->add('/', 'Home::index');
-		$this->collection->get('news', 'News::index');
-		$this->collection->get('news/(:segment)', 'News::view/$1');
-		$this->collection->add('(:any)', 'Pages::view/$1');
+        $router->handle('api/posts/50');
 
-		$router = new Router($this->collection, $this->request);
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('update', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
-		$router->handle('/');
-		$this->assertEquals('\Home', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
+        // DELETE
+        $this->collection->group(...$group);
 
-		$router->handle('news');
-		$this->assertEquals('\News', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
+        $router = new Router($this->collection, $this->request);
+        $this->collection->setHTTPVerb('delete');
 
-		$router->handle('news/daily');
-		$this->assertEquals('\News', $router->controllerName());
-		$this->assertEquals('view', $router->methodName());
+        $router->handle('api/posts/50');
 
-		$router->handle('about');
-		$this->assertEquals('\Pages', $router->controllerName());
-		$this->assertEquals('view', $router->methodName());
-	}
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('delete', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
+     */
+    public function testMatchesCorrectlyWithMixedVerbs()
+    {
+        $this->collection->setHTTPVerb('get');
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1354
-	 */
-	public function testRouteOrder()
-	{
-		$this->collection->post('auth', 'Main::auth_post');
-		$this->collection->add('auth', 'Main::index');
+        $this->collection->add('/', 'Home::index');
+        $this->collection->get('news', 'News::index');
+        $this->collection->get('news/(:segment)', 'News::view/$1');
+        $this->collection->add('(:any)', 'Pages::view/$1');
 
-		$router = new Router($this->collection, $this->request);
-		$this->collection->setHTTPVerb('post');
+        $router = new Router($this->collection, $this->request);
 
-		$router->handle('auth');
-		$this->assertEquals('\Main', $router->controllerName());
-		$this->assertEquals('auth_post', $router->methodName());
-	}
+        $router->handle('/');
+        $this->assertSame('\Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
 
-	public function testRoutePriorityOrder()
-	{
-		$this->collection->add('main', 'Main::index');
-		$this->collection->add('(.*)', 'Main::wildcard', ['priority' => 1]);
-		$this->collection->add('module', 'Module::index');
+        $router->handle('news');
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
 
-		$router = new Router($this->collection, $this->request);
+        $router->handle('news/daily');
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
 
-		$this->collection->setHTTPVerb('get');
+        $router->handle('about');
+        $this->assertSame('\Pages', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
+    }
 
-		$router->handle('module');
-		$this->assertEquals('\Main', $router->controllerName());
-		$this->assertEquals('wildcard', $router->methodName());
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1354
+     */
+    public function testRouteOrder()
+    {
+        $this->collection->post('auth', 'Main::auth_post');
+        $this->collection->add('auth', 'Main::index');
 
-		$this->collection->setPrioritize();
+        $router = new Router($this->collection, $this->request);
+        $this->collection->setHTTPVerb('post');
 
-		$router->handle('module');
-		$this->assertEquals('\Module', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
-	 */
-	public function testTranslateURIDashes()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('user-setting/show-list');
-
-		$router->setTranslateURIDashes(true);
-
-		$this->assertEquals('\User_setting', $router->controllerName());
-		$this->assertEquals('show_list', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
-	 */
-	public function testTranslateURIDashesForParams()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
-
-		$router->handle('user-setting/2018-12-02');
-
-		$this->assertEquals('\User_setting', $router->controllerName());
-		$this->assertEquals('detail', $router->methodName());
-		$this->assertEquals(['2018-12-02'], $router->params());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
-	 */
-	public function testTranslateURIDashesForAutoRoute()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setTranslateURIDashes(true);
-
-		$router->autoRoute('admin-user/show-list');
-
-		$this->assertEquals('Admin_user', $router->controllerName());
-		$this->assertEquals('show_list', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2032
-	 */
-	public function testAutoRouteMatchesZeroParams()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->autoRoute('myController/someMethod/0/abc');
-
-		$this->assertEquals('MyController', $router->controllerName());
-		$this->assertEquals('someMethod', $router->methodName());
-
-		$expected = [
-			'0',
-			'abc',
-		];
-		$this->assertEquals($expected, $router->params());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/2965
-	 */
-	public function testAutoRouteMethodEmpty()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->handle('Home/');
-		$this->assertEquals('Home', $router->controllerName());
-		$this->assertEquals('index', $router->methodName());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3169
-	 */
-	public function testRegularExpressionWithUnicode()
-	{
-		$this->collection->get('news/([a-z0-9\x{0980}-\x{09ff}-]+)', 'News::view/$1');
-
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('news/a0%E0%A6%80%E0%A7%BF-');
-		$this->assertEquals('\News', $router->controllerName());
-		$this->assertEquals('view', $router->methodName());
-
-		$expected = [
-			'a0ঀ৿-',
-		];
-		$this->assertEquals($expected, $router->params());
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3169
-	 */
-	public function testRegularExpressionPlaceholderWithUnicode()
-	{
-		$this->collection->addPlaceholder('custom', '[a-z0-9\x{0980}-\x{09ff}-]+');
-		$this->collection->get('news/(:custom)', 'News::view/$1');
-
-		$router = new Router($this->collection, $this->request);
-
-		$router->handle('news/a0%E0%A6%80%E0%A7%BF-');
-		$this->assertEquals('\News', $router->controllerName());
-		$this->assertEquals('view', $router->methodName());
-
-		$expected = [
-			'a0ঀ৿-',
-		];
-		$this->assertEquals($expected, $router->params());
-	}
-
-	public function testRouterPriorDirectory()
-	{
-		$router = new Router($this->collection, $this->request);
-
-		$router->setDirectory('foo/bar/baz', false, true);
-		$router->handle('Some_controller/some_method/param1/param2/param3');
-
-		$this->assertEquals('foo/bar/baz/', $router->directory());
-		$this->assertEquals('Some_controller', $router->controllerName());
-		$this->assertEquals('some_method', $router->methodName());
-	}
-
-	public function testSetDirectoryValid()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setDirectory('foo/bar/baz', false, true);
-
-		$this->assertEquals('foo/bar/baz/', $router->directory());
-	}
-
-	public function testSetDirectoryInvalid()
-	{
-		$router = new Router($this->collection, $this->request);
-		$router->setDirectory('foo/bad-segment/bar', false, true);
-
-		$internal = $this->getPrivateProperty($router, 'directory');
-
-		$this->assertNull($internal);
-		$this->assertEquals('', $router->directory());
-	}
+        $router->handle('auth');
+        $this->assertSame('\Main', $router->controllerName());
+        $this->assertSame('auth_post', $router->methodName());
+    }
+
+    public function testRoutePriorityOrder()
+    {
+        $this->collection->add('main', 'Main::index');
+        $this->collection->add('(.*)', 'Main::wildcard', ['priority' => 1]);
+        $this->collection->add('module', 'Module::index');
+
+        $router = new Router($this->collection, $this->request);
+
+        $this->collection->setHTTPVerb('get');
+
+        $router->handle('module');
+        $this->assertSame('\Main', $router->controllerName());
+        $this->assertSame('wildcard', $router->methodName());
+
+        $this->collection->setPrioritize();
+
+        $router->handle('module');
+        $this->assertSame('\Module', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+     */
+    public function testTranslateURIDashes()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('user-setting/show-list');
+
+        $router->setTranslateURIDashes(true);
+
+        $this->assertSame('\User_setting', $router->controllerName());
+        $this->assertSame('show_list', $router->methodName());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+     */
+    public function testTranslateURIDashesForParams()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
+
+        $router->handle('user-setting/2018-12-02');
+
+        $this->assertSame('\User_setting', $router->controllerName());
+        $this->assertSame('detail', $router->methodName());
+        $this->assertSame(['2018-12-02'], $router->params());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
+     */
+    public function testTranslateURIDashesForAutoRoute()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
+
+        $router->autoRoute('admin-user/show-list');
+
+        $this->assertSame('Admin_user', $router->controllerName());
+        $this->assertSame('show_list', $router->methodName());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2032
+     */
+    public function testAutoRouteMatchesZeroParams()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $router->autoRoute('myController/someMethod/0/abc');
+
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
+
+        $expected = [
+            '0',
+            'abc',
+        ];
+        $this->assertSame($expected, $router->params());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2965
+     */
+    public function testAutoRouteMethodEmpty()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->handle('Home/');
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3169
+     */
+    public function testRegularExpressionWithUnicode()
+    {
+        $this->collection->get('news/([a-z0-9\x{0980}-\x{09ff}-]+)', 'News::view/$1');
+
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('news/a0%E0%A6%80%E0%A7%BF-');
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
+
+        $expected = [
+            'a0ঀ৿-',
+        ];
+        $this->assertSame($expected, $router->params());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3169
+     */
+    public function testRegularExpressionPlaceholderWithUnicode()
+    {
+        $this->collection->addPlaceholder('custom', '[a-z0-9\x{0980}-\x{09ff}-]+');
+        $this->collection->get('news/(:custom)', 'News::view/$1');
+
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('news/a0%E0%A6%80%E0%A7%BF-');
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
+
+        $expected = [
+            'a0ঀ৿-',
+        ];
+        $this->assertSame($expected, $router->params());
+    }
+
+    public function testRouterPriorDirectory()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $router->setDirectory('foo/bar/baz', false, true);
+        $router->handle('Some_controller/some_method/param1/param2/param3');
+
+        $this->assertSame('foo/bar/baz/', $router->directory());
+        $this->assertSame('Some_controller', $router->controllerName());
+        $this->assertSame('some_method', $router->methodName());
+    }
+
+    public function testSetDirectoryValid()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setDirectory('foo/bar/baz', false, true);
+
+        $this->assertSame('foo/bar/baz/', $router->directory());
+    }
+
+    public function testSetDirectoryInvalid()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setDirectory('foo/bad-segment/bar', false, true);
+
+        $internal = $this->getPrivateProperty($router, 'directory');
+
+        $this->assertNull($internal);
+        $this->assertSame('', $router->directory());
+    }
 }
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index fd25d9205ad4..aadb84aa775b 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Security;
 
 use CodeIgniter\Config\Factories;
@@ -16,236 +25,238 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class SecurityTest extends CIUnitTestCase
+final class SecurityTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$_COOKIE = [];
+        $_COOKIE = [];
 
-		Factories::reset();
-	}
+        Factories::reset();
+    }
 
-	public function testBasicConfigIsSaved()
-	{
-		$security = new Security(new MockAppConfig());
+    public function testBasicConfigIsSaved()
+    {
+        $security = new Security(new MockAppConfig());
 
-		$hash = $security->getHash();
+        $hash = $security->getHash();
 
-		$this->assertEquals(32, strlen($hash));
-		$this->assertEquals('csrf_test_name', $security->getTokenName());
-	}
+        $this->assertSame(32, strlen($hash));
+        $this->assertSame('csrf_test_name', $security->getTokenName());
+    }
 
-	public function testHashIsReadFromCookie()
-	{
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+    public function testHashIsReadFromCookie()
+    {
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$security = new Security(new MockAppConfig());
+        $security = new Security(new MockAppConfig());
 
-		$this->assertEquals('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
-	}
+        $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
+    }
 
-	public function testCSRFVerifySetsCookieWhenNotPOST()
-	{
-		$security = new MockSecurity(new MockAppConfig());
+    public function testCSRFVerifySetsCookieWhenNotPOST()
+    {
+        $security = new MockSecurity(new MockAppConfig());
 
-		$_SERVER['REQUEST_METHOD'] = 'GET';
+        $_SERVER['REQUEST_METHOD'] = 'GET';
 
-		$security->verify(new Request(new MockAppConfig()));
+        $security->verify(new Request(new MockAppConfig()));
 
-		$this->assertEquals($_COOKIE['csrf_cookie_name'], $security->getHash());
-	}
+        $this->assertSame($_COOKIE['csrf_cookie_name'], $security->getHash());
+    }
 
-	public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
-		$this->expectException(SecurityException::class);
-		$security->verify($request);
-	}
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
 
-	public function testCSRFVerifyPostReturnsSelfOnMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyPostReturnsSelfOnMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_POST['foo']                = 'bar';
-		$_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['foo']                = 'bar';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$this->assertInstanceOf(Security::class, $security->verify($request));
-		$this->assertLogged('info', 'CSRF token verified.');
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
 
-		$this->assertTrue(count($_POST) === 1);
-	}
+        $this->assertTrue(count($_POST) === 1);
+    }
 
-	public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
-		$this->expectException(SecurityException::class);
-		$security->verify($request);
-	}
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
 
-	public function testCSRFVerifyHeaderReturnsSelfOnMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyHeaderReturnsSelfOnMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_POST['foo']                = 'bar';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['foo']                = 'bar';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$this->assertInstanceOf(Security::class, $security->verify($request));
-		$this->assertLogged('info', 'CSRF token verified.');
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
 
-		$this->assertCount(1, $_POST);
-	}
+        $this->assertCount(1, $_POST);
+    }
 
-	public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}');
+        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}');
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
-		$this->expectException(SecurityException::class);
-		$security->verify($request);
-	}
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
 
-	public function testCSRFVerifyJsonReturnsSelfOnMatch()
-	{
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+    public function testCSRFVerifyJsonReturnsSelfOnMatch()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
+        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$this->assertInstanceOf(Security::class, $security->verify($request));
-		$this->assertLogged('info', 'CSRF token verified.');
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
 
-		$this->assertTrue($request->getBody() === '{"foo":"bar"}');
-	}
+        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+    }
 
-	public function testSanitizeFilename()
-	{
-		$security = new MockSecurity(new MockAppConfig());
+    public function testSanitizeFilename()
+    {
+        $security = new MockSecurity(new MockAppConfig());
 
-		$filename = './<!--foo-->';
+        $filename = './<!--foo-->';
 
-		$this->assertEquals('foo', $security->sanitizeFilename($filename));
-	}
+        $this->assertSame('foo', $security->sanitizeFilename($filename));
+    }
 
-	public function testRegenerateWithFalseSecurityRegenerateProperty()
-	{
-		$config             = new SecurityConfig();
-		$config->regenerate = false;
-		Factories::injectMock('config', 'Security', $config);
+    public function testRegenerateWithFalseSecurityRegenerateProperty()
+    {
+        $config             = new SecurityConfig();
+        $config->regenerate = false;
+        Factories::injectMock('config', 'Security', $config);
 
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$oldHash = $security->getHash();
-		$security->verify($request);
-		$newHash = $security->getHash();
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
 
-		$this->assertSame($oldHash, $newHash);
-	}
+        $this->assertSame($oldHash, $newHash);
+    }
 
-	public function testRegenerateWithTrueSecurityRegenerateProperty()
-	{
-		$config             = new SecurityConfig();
-		$config->regenerate = true;
-		Factories::injectMock('config', 'Security', $config);
+    public function testRegenerateWithTrueSecurityRegenerateProperty()
+    {
+        $config             = new SecurityConfig();
+        $config->regenerate = true;
+        Factories::injectMock('config', 'Security', $config);
 
-		$security = new MockSecurity(new MockAppConfig());
-		$request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-		$_SERVER['REQUEST_METHOD']   = 'POST';
-		$_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-		$_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-		$oldHash = $security->getHash();
-		$security->verify($request);
-		$newHash = $security->getHash();
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
 
-		$this->assertNotSame($oldHash, $newHash);
-	}
+        $this->assertNotSame($oldHash, $newHash);
+    }
 
-	public function testGetters(): void
-	{
-		$security = new MockSecurity(new MockAppConfig());
+    public function testGetters(): void
+    {
+        $security = new MockSecurity(new MockAppConfig());
 
-		$this->assertIsString($security->getHash());
-		$this->assertIsString($security->getTokenName());
-		$this->assertIsString($security->getHeaderName());
-		$this->assertIsString($security->getCookieName());
-		$this->assertIsBool($security->shouldRedirect());
-	}
+        $this->assertIsString($security->getHash());
+        $this->assertIsString($security->getTokenName());
+        $this->assertIsString($security->getHeaderName());
+        $this->assertIsString($security->getCookieName());
+        $this->assertIsBool($security->shouldRedirect());
+    }
 
-	public function testSendingCookiesFalse(): void
-	{
-		$request = $this->createMock(IncomingRequest::class);
-		$request->method('isSecure')->willReturn(false);
+    public function testSendingCookiesFalse(): void
+    {
+        $request = $this->createMock(IncomingRequest::class);
+        $request->method('isSecure')->willReturn(false);
 
-		$config = new CookieConfig();
+        $config = new CookieConfig();
 
-		$config->secure = true;
-		Factories::injectMock('config', CookieConfig::class, $config);
+        $config->secure = true;
+        Factories::injectMock('config', CookieConfig::class, $config);
 
-		$security = $this->getMockBuilder(Security::class)
-			->setConstructorArgs([new MockAppConfig()])
-			->onlyMethods(['doSendCookie'])
-			->getMock();
+        $security = $this->getMockBuilder(Security::class)
+            ->setConstructorArgs([new MockAppConfig()])
+            ->onlyMethods(['doSendCookie'])
+            ->getMock();
 
-		$sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
+        $sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
 
-		$security->expects($this->never())->method('doSendCookie');
-		$this->assertFalse($sendCookie($request));
-	}
+        $security->expects($this->never())->method('doSendCookie');
+        $this->assertFalse($sendCookie($request));
+    }
 
-	public function testSendingGoodCookies(): void
-	{
-		$request = $this->createMock(IncomingRequest::class);
-		$request->method('isSecure')->willReturn(true);
+    public function testSendingGoodCookies(): void
+    {
+        $request = $this->createMock(IncomingRequest::class);
+        $request->method('isSecure')->willReturn(true);
 
-		$config = new MockAppConfig();
+        $config = new MockAppConfig();
 
-		$config->cookieSecure = true;
+        $config->cookieSecure = true;
 
-		$security = $this->getMockBuilder(Security::class)
-			->setConstructorArgs([$config])
-			->onlyMethods(['doSendCookie'])
-			->getMock();
+        $security = $this->getMockBuilder(Security::class)
+            ->setConstructorArgs([$config])
+            ->onlyMethods(['doSendCookie'])
+            ->getMock();
 
-		$sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
+        $sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
 
-		$security->expects($this->once())->method('doSendCookie');
-		$this->assertInstanceOf(Security::class, $sendCookie($request));
-	}
+        $security->expects($this->once())->method('doSendCookie');
+        $this->assertInstanceOf(Security::class, $sendCookie($request));
+    }
 }
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 9c51dee199c4..bb5afaacf515 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Session;
 
 use CodeIgniter\Config\Factories;
@@ -16,617 +25,620 @@
  * @runTestsInSeparateProcesses
  *
  * @preserveGlobalState disabled
+ *
+ * @internal
  */
-class SessionTest extends CIUnitTestCase
+final class SessionTest extends CIUnitTestCase
 {
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$_COOKIE  = [];
-		$_SESSION = [];
-	}
-
-	protected function getInstance($options = [])
-	{
-		$defaults = [
-			'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
-			'sessionCookieName'        => 'ci_session',
-			'sessionExpiration'        => 7200,
-			'sessionSavePath'          => null,
-			'sessionMatchIP'           => false,
-			'sessionTimeToUpdate'      => 300,
-			'sessionRegenerateDestroy' => false,
-			'cookieDomain'             => '',
-			'cookiePrefix'             => '',
-			'cookiePath'               => '/',
-			'cookieSecure'             => false,
-			'cookieSameSite'           => 'Lax',
-		];
-
-		$config    = array_merge($defaults, $options);
-		$appConfig = new AppConfig();
-		foreach ($config as $key => $c)
-		{
-			$appConfig->$key = $c;
-		}
-
-		$session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
-		$session->setLogger(new TestLogger(new LoggerConfig()));
-
-		return $session;
-	}
-
-	public function testSessionSetsRegenerateTime()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$this->assertTrue(isset($_SESSION['__ci_last_regenerate']) && ! empty($_SESSION['__ci_last_regenerate']));
-	}
-
-	public function testWillRegenerateSessionAutomatically()
-	{
-		$session = $this->getInstance();
-
-		$time                             = time() - 400;
-		$_SESSION['__ci_last_regenerate'] = $time;
-		$session->start();
-
-		$this->assertTrue($session->didRegenerate);
-		$this->assertGreaterThan($time + 90, $_SESSION['__ci_last_regenerate']);
-	}
-
-	public function testCanSetSingleValue()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$session->set('foo', 'bar');
-
-		$this->assertEquals('bar', $_SESSION['foo']);
-	}
-
-	public function testCanSetArray()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$session->set([
-			'foo' => 'bar',
-			'bar' => 'baz',
-		]);
-
-		$this->assertEquals('bar', $_SESSION['foo']);
-		$this->assertEquals('baz', $_SESSION['bar']);
-		$this->assertArrayNotHasKey('__ci_vars', $_SESSION);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
-	 */
-	public function testCanSerializeArray()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$locations = [
-			'AB' => 'Alberta',
-			'BC' => 'British Columbia',
-			'SK' => 'Saskatchewan',
-		];
-		$session->set(['_ci_old_input' => ['location' => $locations]]);
-
-		$this->assertEquals($locations, $session->get('_ci_old_input')['location']);
-	}
-
-	public function testGetSimpleKey()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$session->set('foo', 'bar');
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $_COOKIE  = [];
+        $_SESSION = [];
+    }
+
+    protected function getInstance($options = [])
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => null,
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
+        $session->setLogger(new TestLogger(new LoggerConfig()));
+
+        return $session;
+    }
+
+    public function testSessionSetsRegenerateTime()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $this->assertTrue(isset($_SESSION['__ci_last_regenerate']) && ! empty($_SESSION['__ci_last_regenerate']));
+    }
+
+    public function testWillRegenerateSessionAutomatically()
+    {
+        $session = $this->getInstance();
+
+        $time                             = time() - 400;
+        $_SESSION['__ci_last_regenerate'] = $time;
+        $session->start();
+
+        $this->assertTrue($session->didRegenerate);
+        $this->assertGreaterThan($time + 90, $_SESSION['__ci_last_regenerate']);
+    }
+
+    public function testCanSetSingleValue()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $session->set('foo', 'bar');
+
+        $this->assertSame('bar', $_SESSION['foo']);
+    }
+
+    public function testCanSetArray()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $session->set([
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ]);
+
+        $this->assertSame('bar', $_SESSION['foo']);
+        $this->assertSame('baz', $_SESSION['bar']);
+        $this->assertArrayNotHasKey('__ci_vars', $_SESSION);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
+     */
+    public function testCanSerializeArray()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $locations = [
+            'AB' => 'Alberta',
+            'BC' => 'British Columbia',
+            'SK' => 'Saskatchewan',
+        ];
+        $session->set(['_ci_old_input' => ['location' => $locations]]);
+
+        $this->assertSame($locations, $session->get('_ci_old_input')['location']);
+    }
+
+    public function testGetSimpleKey()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $session->set('foo', 'bar');
 
-		$this->assertEquals('bar', $session->get('foo'));
-	}
+        $this->assertSame('bar', $session->get('foo'));
+    }
 
-	public function testGetReturnsNullWhenNotFound()
-	{
-		$_SESSION = [];
+    public function testGetReturnsNullWhenNotFound()
+    {
+        $_SESSION = [];
 
-		$session = $this->getInstance();
-		$session->start();
+        $session = $this->getInstance();
+        $session->start();
 
-		$this->assertNull($session->get('foo'));
-	}
+        $this->assertNull($session->get('foo'));
+    }
 
-	public function testGetReturnsNullWhenNotFoundWithXmlHttpRequest()
-	{
-		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
-		$_SESSION                         = [];
+    public function testGetReturnsNullWhenNotFoundWithXmlHttpRequest()
+    {
+        $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+        $_SESSION                         = [];
 
-		$session = $this->getInstance();
-		$session->start();
+        $session = $this->getInstance();
+        $session->start();
 
-		$this->assertNull($session->get('foo'));
-	}
+        $this->assertNull($session->get('foo'));
+    }
 
-	public function testGetReturnsEmptyArrayWhenWithXmlHttpRequest()
-	{
-		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
-		$_SESSION                         = [];
+    public function testGetReturnsEmptyArrayWhenWithXmlHttpRequest()
+    {
+        $_SERVER['HTTP_X_REQUESTED_WITH'] = 'xmlhttprequest';
+        $_SESSION                         = [];
 
-		$session = $this->getInstance();
-		$session->start();
+        $session = $this->getInstance();
+        $session->start();
 
-		$this->assertEquals([], $session->get());
-	}
+        $this->assertSame([], $session->get());
+    }
 
-	public function testGetReturnsItemValueisZero()
-	{
-		$_SESSION = [];
+    public function testGetReturnsItemValueisZero()
+    {
+        $_SESSION = [];
 
-		$session = $this->getInstance();
-		$session->start();
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->set('foo', (int) 0);
+        $session->set('foo', 0);
 
-		$this->assertSame((int) 0, $session->get('foo'));
-	}
+        $this->assertSame(0, $session->get('foo'));
+    }
 
-	public function testGetReturnsAllWithNoKeys()
-	{
-		$_SESSION = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
+    public function testGetReturnsAllWithNoKeys()
+    {
+        $_SESSION = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$session = $this->getInstance();
-		$session->start();
+        $session = $this->getInstance();
+        $session->start();
 
-		$result = $session->get();
+        $result = $session->get();
 
-		$this->assertTrue(array_key_exists('foo', $result));
-		$this->assertTrue(array_key_exists('bar', $result));
-	}
+        $this->assertArrayHasKey('foo', $result);
+        $this->assertArrayHasKey('bar', $result);
+    }
 
-	public function testGetAsProperty()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testGetAsProperty()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->set('foo', 'bar');
+        $session->set('foo', 'bar');
 
-		$this->assertEquals('bar', $session->foo);
-	}
+        $this->assertSame('bar', $session->foo);
+    }
 
-	public function testGetAsNormal()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testGetAsNormal()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->set('foo', 'bar');
+        $session->set('foo', 'bar');
 
-		$this->assertEquals('bar', $_SESSION['foo']);
-	}
+        $this->assertSame('bar', $_SESSION['foo']);
+    }
 
-	public function testHasReturnsTrueOnSuccess()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testHasReturnsTrueOnSuccess()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION['foo'] = 'bar';
+        $_SESSION['foo'] = 'bar';
 
-		$this->assertTrue($session->has('foo'));
-	}
+        $this->assertTrue($session->has('foo'));
+    }
 
-	public function testHasReturnsFalseOnNotFound()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testHasReturnsFalseOnNotFound()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION['foo'] = 'bar';
+        $_SESSION['foo'] = 'bar';
 
-		$this->assertFalse($session->has('bar'));
-	}
+        $this->assertFalse($session->has('bar'));
+    }
 
-	public function testIssetReturnsTrueOnSuccess()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testIssetReturnsTrueOnSuccess()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION['foo'] = 'bar';
+        $_SESSION['foo'] = 'bar';
 
-		$this->assertTrue(isset($session->foo));
-	}
+        $this->assertTrue(isset($session->foo));
+    }
 
-	public function testIssetReturnsFalseOnNotFound()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testIssetReturnsFalseOnNotFound()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION['foo'] = 'bar';
+        $_SESSION['foo'] = 'bar';
 
-		$this->assertFalse(isset($session->bar));
-	}
+        $this->assertFalse(isset($session->bar));
+    }
 
-	public function testPushNewValueIntoArraySessionValue()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testPushNewValueIntoArraySessionValue()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->set('hobbies', ['cooking' => 'baking']);
-		$session->push('hobbies', ['sport' => 'tennis']);
+        $session->set('hobbies', ['cooking' => 'baking']);
+        $session->push('hobbies', ['sport' => 'tennis']);
 
-		$this->assertEquals([
-			'cooking' => 'baking',
-			'sport'   => 'tennis',
-		],
-			$session->get('hobbies')
-		);
-	}
+        $this->assertSame(
+            [
+                'cooking' => 'baking',
+                'sport'   => 'tennis',
+            ],
+            $session->get('hobbies')
+        );
+    }
 
-	public function testRemoveActuallyRemoves()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testRemoveActuallyRemoves()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION['foo'] = 'bar';
-		$session->remove('foo');
+        $_SESSION['foo'] = 'bar';
+        $session->remove('foo');
 
-		$this->assertArrayNotHasKey('foo', $_SESSION);
-		$this->assertFalse($session->has('foo'));
-	}
+        $this->assertArrayNotHasKey('foo', $_SESSION);
+        $this->assertFalse($session->has('foo'));
+    }
 
-	public function testHasReturnsCanRemoveArray()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testHasReturnsCanRemoveArray()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$_SESSION = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
+        $_SESSION = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$this->assertTrue($session->has('foo'));
+        $this->assertTrue($session->has('foo'));
 
-		$session->remove(['foo', 'bar']);
+        $session->remove(['foo', 'bar']);
 
-		$this->assertArrayNotHasKey('foo', $_SESSION);
-		$this->assertArrayNotHasKey('bar', $_SESSION);
-	}
+        $this->assertArrayNotHasKey('foo', $_SESSION);
+        $this->assertArrayNotHasKey('bar', $_SESSION);
+    }
 
-	public function testSetMagicMethod()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testSetMagicMethod()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->foo = 'bar';
+        $session->foo = 'bar';
 
-		$this->assertArrayHasKey('foo', $_SESSION);
-		$this->assertEquals('bar', $_SESSION['foo']);
-	}
+        $this->assertArrayHasKey('foo', $_SESSION);
+        $this->assertSame('bar', $_SESSION['foo']);
+    }
 
-	public function testCanFlashData()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testCanFlashData()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setFlashdata('foo', 'bar');
+        $session->setFlashdata('foo', 'bar');
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
-		// Should reset the 'new' to 'old'
-		$session->start();
+        // Should reset the 'new' to 'old'
+        $session->start();
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
 
-		// Should no longer be available
-		$session->start();
+        // Should no longer be available
+        $session->start();
 
-		$this->assertFalse($session->has('foo'));
-	}
+        $this->assertFalse($session->has('foo'));
+    }
 
-	public function testCanFlashArray()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testCanFlashArray()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setFlashdata([
-			'foo' => 'bar',
-			'bar' => 'baz',
-		]);
+        $session->setFlashdata([
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ]);
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
-		$this->assertTrue($session->has('bar'));
-		$this->assertEquals('new', $_SESSION['__ci_vars']['bar']);
-	}
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertTrue($session->has('bar'));
+        $this->assertSame('new', $_SESSION['__ci_vars']['bar']);
+    }
 
-	public function testKeepFlashData()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testKeepFlashData()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setFlashdata('foo', 'bar');
+        $session->setFlashdata('foo', 'bar');
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
-		// Should reset the 'new' to 'old'
-		$session->start();
+        // Should reset the 'new' to 'old'
+        $session->start();
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
 
-		$session->keepFlashdata('foo');
+        $session->keepFlashdata('foo');
 
-		$this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
-		// Should no longer be available
-		$session->start();
+        // Should no longer be available
+        $session->start();
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
-	}
+        $this->assertTrue($session->has('foo'));
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
+    }
 
-	public function testUnmarkFlashDataRemovesData()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testUnmarkFlashDataRemovesData()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setFlashdata('foo', 'bar');
-		$session->set('bar', 'baz');
+        $session->setFlashdata('foo', 'bar');
+        $session->set('bar', 'baz');
 
-		$this->assertTrue($session->has('foo'));
-		$this->assertArrayHasKey('foo', $_SESSION['__ci_vars']);
+        $this->assertTrue($session->has('foo'));
+        $this->assertArrayHasKey('foo', $_SESSION['__ci_vars']);
 
-		$session->unmarkFlashdata('foo');
+        $session->unmarkFlashdata('foo');
 
-		// Should still be here
-		$this->assertTrue($session->has('foo'));
-		// but no longer marked as flash
-		$this->assertFalse(isset($_SESSION['__ci_vars']['foo']));
-	}
+        // Should still be here
+        $this->assertTrue($session->has('foo'));
+        // but no longer marked as flash
+        $this->assertFalse(isset($_SESSION['__ci_vars']['foo']));
+    }
 
-	public function testGetFlashKeysOnlyReturnsFlashKeys()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testGetFlashKeysOnlyReturnsFlashKeys()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setFlashdata('foo', 'bar');
-		$session->set('bar', 'baz');
+        $session->setFlashdata('foo', 'bar');
+        $session->set('bar', 'baz');
 
-		$keys = $session->getFlashKeys();
+        $keys = $session->getFlashKeys();
 
-		$this->assertContains('foo', $keys);
-		$this->assertNotContains('bar', $keys);
-	}
+        $this->assertContains('foo', $keys);
+        $this->assertNotContains('bar', $keys);
+    }
 
-	public function testSetTempDataWorks()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testSetTempDataWorks()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$session->setTempdata('foo', 'bar', 300);
-		$this->assertGreaterThanOrEqual($_SESSION['__ci_vars']['foo'], time() + 300);
-	}
+        $session->setTempdata('foo', 'bar', 300);
+        $this->assertGreaterThanOrEqual($_SESSION['__ci_vars']['foo'], time() + 300);
+    }
 
-	public function testSetTempDataArrayMultiTTL()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testSetTempDataArrayMultiTTL()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$time = time();
+        $time = time();
 
-		$session->setTempdata([
-			'foo' => 300,
-			'bar' => 400,
-			'baz' => 100,
-		]);
+        $session->setTempdata([
+            'foo' => 300,
+            'bar' => 400,
+            'baz' => 100,
+        ]);
 
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo'], $time + 300);
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['bar'], $time + 400);
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['baz'], $time + 100);
-	}
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo'], $time + 300);
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['bar'], $time + 400);
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['baz'], $time + 100);
+    }
 
-	public function testSetTempDataArraySingleTTL()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    public function testSetTempDataArraySingleTTL()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$time = time();
+        $time = time();
 
-		$session->setTempdata(['foo', 'bar', 'baz'], null, 200);
+        $session->setTempdata(['foo', 'bar', 'baz'], null, 200);
 
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo'], $time + 200);
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['bar'], $time + 200);
-		$this->assertLessThanOrEqual($_SESSION['__ci_vars']['baz'], $time + 200);
-	}
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['foo'], $time + 200);
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['bar'], $time + 200);
+        $this->assertLessThanOrEqual($_SESSION['__ci_vars']['baz'], $time + 200);
+    }
 
-	/**
-	 * @group single
-	 */
-	public function testGetTestDataReturnsAll()
-	{
-		$session = $this->getInstance();
-		$session->start();
+    /**
+     * @group single
+     */
+    public function testGetTestDataReturnsAll()
+    {
+        $session = $this->getInstance();
+        $session->start();
 
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$session->setTempdata($data);
-		$session->set('baz', 'ballywhoo');
-
-		$this->assertEquals($data, $session->getTempdata());
-	}
-
-	public function testGetTestDataReturnsSingle()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$session->setTempdata($data);
-
-		$this->assertEquals('bar', $session->getTempdata('foo'));
-	}
-
-	public function testRemoveTempDataActuallyDeletes()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$session->setTempdata($data);
-		$session->removeTempdata('foo');
-
-		$this->assertEquals(['bar' => 'baz'], $session->getTempdata());
-	}
-
-	public function testUnMarkTempDataSingle()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$session->setTempdata($data);
-		$session->unmarkTempdata('foo');
-
-		$this->assertEquals(['bar' => 'baz'], $session->getTempdata());
-	}
-
-	public function testUnMarkTempDataArray()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$session->setTempdata($data);
-		$session->unmarkTempdata(['foo', 'bar']);
-
-		$this->assertEquals([], $session->getTempdata());
-	}
-
-	public function testGetTempdataKeys()
-	{
-		$session = $this->getInstance();
-		$session->start();
-
-		$data = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$session->setTempdata($data);
-		$session->set('baz', 'ballywhoo');
-
-		$this->assertEquals(['foo', 'bar'], $session->getTempKeys());
-	}
-
-	public function testGetDotKey()
-	{
-		$session = $this->getInstance();
-		$session->start();
-		$session->set('test.1', 'value');
-		$this->assertEquals('value', $session->get('test.1'));
-	}
-
-	public function testLaxSameSite()
-	{
-		$config           = new CookieConfig();
-		$config->samesite = 'Lax';
-		Factories::injectMock('config', CookieConfig::class, $config);
-
-		$session = $this->getInstance();
-		$session->start();
-		$cookies = $session->cookies;
-		$this->assertCount(1, $cookies);
-		$this->assertSame('Lax', $cookies[0]->getSameSite());
-	}
-
-	public function testNoneSameSite()
-	{
-		$config           = new CookieConfig();
-		$config->secure   = true;
-		$config->samesite = 'None';
-
-		Factories::injectMock('config', CookieConfig::class, $config);
-
-		$session = $this->getInstance();
-		$session->start();
-
-		$cookies = $session->cookies;
-		$this->assertCount(1, $cookies);
-		$this->assertSame('None', $cookies[0]->getSameSite());
-	}
-
-	public function testNoSameSiteReturnsDefault()
-	{
-		$config           = new CookieConfig();
-		$config->samesite = '';
-
-		Factories::injectMock('config', CookieConfig::class, $config);
-
-		$session = $this->getInstance();
-		$session->start();
-
-		$cookies = $session->cookies;
-		$this->assertCount(1, $cookies);
-		$this->assertSame('Lax', $cookies[0]->getSameSite());
-	}
-
-	public function testInvalidSameSite()
-	{
-		$this->expectException(CookieException::class);
-		$this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
-
-		$config           = new CookieConfig();
-		$config->samesite = 'Invalid';
-
-		Factories::injectMock('config', CookieConfig::class, $config);
-
-		$session = $this->getInstance();
-		$session->start();
-	}
-
-	public function testExpires()
-	{
-		$session = $this->getInstance(['sessionExpiration' => 8000]);
-		$session->start();
-
-		$cookies = $session->cookies;
-		$this->assertCount(1, $cookies);
-		$this->assertGreaterThan(8000, $cookies[0]->getExpiresTimestamp());
-	}
-
-	public function testExpiresOnClose()
-	{
-		$session = $this->getInstance(['sessionExpiration' => 0]);
-		$session->start();
-
-		$cookies = $session->cookies;
-		$this->assertCount(1, $cookies);
-		$this->assertSame(0, $cookies[0]->getExpiresTimestamp());
-	}
+        $session->setTempdata($data);
+        $session->set('baz', 'ballywhoo');
+
+        $this->assertSame($data, $session->getTempdata());
+    }
+
+    public function testGetTestDataReturnsSingle()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $session->setTempdata($data);
+
+        $this->assertSame('bar', $session->getTempdata('foo'));
+    }
+
+    public function testRemoveTempDataActuallyDeletes()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $session->setTempdata($data);
+        $session->removeTempdata('foo');
+
+        $this->assertSame(['bar' => 'baz'], $session->getTempdata());
+    }
+
+    public function testUnMarkTempDataSingle()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $session->setTempdata($data);
+        $session->unmarkTempdata('foo');
+
+        $this->assertSame(['bar' => 'baz'], $session->getTempdata());
+    }
+
+    public function testUnMarkTempDataArray()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $session->setTempdata($data);
+        $session->unmarkTempdata(['foo', 'bar']);
+
+        $this->assertSame([], $session->getTempdata());
+    }
+
+    public function testGetTempdataKeys()
+    {
+        $session = $this->getInstance();
+        $session->start();
+
+        $data = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
+
+        $session->setTempdata($data);
+        $session->set('baz', 'ballywhoo');
+
+        $this->assertSame(['foo', 'bar'], $session->getTempKeys());
+    }
+
+    public function testGetDotKey()
+    {
+        $session = $this->getInstance();
+        $session->start();
+        $session->set('test.1', 'value');
+        $this->assertSame('value', $session->get('test.1'));
+    }
+
+    public function testLaxSameSite()
+    {
+        $config           = new CookieConfig();
+        $config->samesite = 'Lax';
+        Factories::injectMock('config', CookieConfig::class, $config);
+
+        $session = $this->getInstance();
+        $session->start();
+        $cookies = $session->cookies;
+        $this->assertCount(1, $cookies);
+        $this->assertSame('Lax', $cookies[0]->getSameSite());
+    }
+
+    public function testNoneSameSite()
+    {
+        $config           = new CookieConfig();
+        $config->secure   = true;
+        $config->samesite = 'None';
+
+        Factories::injectMock('config', CookieConfig::class, $config);
+
+        $session = $this->getInstance();
+        $session->start();
+
+        $cookies = $session->cookies;
+        $this->assertCount(1, $cookies);
+        $this->assertSame('None', $cookies[0]->getSameSite());
+    }
+
+    public function testNoSameSiteReturnsDefault()
+    {
+        $config           = new CookieConfig();
+        $config->samesite = '';
+
+        Factories::injectMock('config', CookieConfig::class, $config);
+
+        $session = $this->getInstance();
+        $session->start();
+
+        $cookies = $session->cookies;
+        $this->assertCount(1, $cookies);
+        $this->assertSame('Lax', $cookies[0]->getSameSite());
+    }
+
+    public function testInvalidSameSite()
+    {
+        $this->expectException(CookieException::class);
+        $this->expectExceptionMessage(lang('Cookie.invalidSameSite', ['Invalid']));
+
+        $config           = new CookieConfig();
+        $config->samesite = 'Invalid';
+
+        Factories::injectMock('config', CookieConfig::class, $config);
+
+        $session = $this->getInstance();
+        $session->start();
+    }
+
+    public function testExpires()
+    {
+        $session = $this->getInstance(['sessionExpiration' => 8000]);
+        $session->start();
+
+        $cookies = $session->cookies;
+        $this->assertCount(1, $cookies);
+        $this->assertGreaterThan(8000, $cookies[0]->getExpiresTimestamp());
+    }
+
+    public function testExpiresOnClose()
+    {
+        $session = $this->getInstance(['sessionExpiration' => 0]);
+        $session->start();
+
+        $cookies = $session->cookies;
+        $this->assertCount(1, $cookies);
+        $this->assertSame(0, $cookies[0]->getExpiresTimestamp());
+    }
 }
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 359c69b5a5f8..c3fe92aa2d9d 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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;
 
 /**
  * Class BootstrapFCPATHTest
@@ -9,90 +20,89 @@
  * It writes a file in the temp directory that loads the bootstrap file
  * then compares its echo FCPATH; to the correct FCPATH returned
  * from correctFCPATH();
+ *
+ * @internal
  */
-
-class BootstrapFCPATHTest extends CIUnitTestCase
+final class BootstrapFCPATHTest extends CIUnitTestCase
 {
-	private $currentDir = __dir__;
-	private $dir1       = '/tmp/dir1';
-	private $file1      = '/tmp/dir1/testFile.php';
+    private $currentDir = __DIR__;
+    private $dir1       = '/tmp/dir1';
+    private $file1      = '/tmp/dir1/testFile.php';
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->deleteFiles();
-		$this->deleteDirectories();
-		$this->buildDirectories();
-		$this->writeFiles();
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->deleteFiles();
+        $this->deleteDirectories();
+        $this->buildDirectories();
+        $this->writeFiles();
+    }
 
-	public function tearDown(): void
-	{
-		parent::tearDown();
-		$this->deleteFiles();
-		$this->deleteDirectories();
-	}
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->deleteFiles();
+        $this->deleteDirectories();
+    }
 
-	public function testSetFCPATH()
-	{
-		$result1     = $this->readOutput($this->file1);
-		$correctPath = $this->correctFCPATH();
-		self::assertEquals($correctPath, $result1);
-	}
+    public function testSetFCPATH()
+    {
+        $result1     = $this->readOutput($this->file1);
+        $correctPath = $this->correctFCPATH();
+        $this->assertSame($correctPath, $result1);
+    }
 
-	private function correctFCPATH()
-	{
-		return realpath(__dir__ . '/../../../public') . DIRECTORY_SEPARATOR;
-	}
+    private function correctFCPATH()
+    {
+        return realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
+    }
 
-	private function buildDirectories() : void
-	{
-		mkdir( $this->dir1, 0777, true);
-	}
+    private function buildDirectories(): void
+    {
+        mkdir($this->dir1, 0777, true);
+    }
 
-	private function deleteDirectories() : void
-	{
-		// these need to be executed in reverse order: dir 2 in inside dir1
-		if (is_dir($this->dir1))
-		{
-			rmdir( $this->dir1 );
-		}
-	}
+    private function deleteDirectories(): void
+    {
+        // these need to be executed in reverse order: dir 2 in inside dir1
+        if (is_dir($this->dir1)) {
+            rmdir($this->dir1);
+        }
+    }
 
-	private function writeFiles() : void
-	{
-		file_put_contents( $this->file1, $this->fileContents());
-		chmod($this->file1, 0777);
-	}
+    private function writeFiles(): void
+    {
+        file_put_contents($this->file1, $this->fileContents());
+        chmod($this->file1, 0777);
+    }
 
-	private function deleteFiles() : void
-	{
-		if (file_exists($this->file1))
-		{
-			unlink( $this->file1 );
-		}
-	}
+    private function deleteFiles(): void
+    {
+        if (file_exists($this->file1)) {
+            unlink($this->file1);
+        }
+    }
 
-	private function fileContents()
-	{
-		$fileContents  = '';
-		$fileContents .= '<?php' . PHP_EOL;
-		$fileContents .= "define('HOMEPATH', '" . $this->currentDir . "' . '/../../../');" . PHP_EOL;
-		$fileContents .= "define('CONFIGPATH', '" . $this->currentDir . "' . '/../../../app/Config/');" . PHP_EOL;
-		$fileContents .= "define('PUBLICPATH', '" . $this->currentDir . "' . '/../../../public/');" . PHP_EOL;
-		$fileContents .= "include_once '" . $this->currentDir . "' . '/../../../vendor/autoload.php';" . PHP_EOL;
-		$fileContents .= "include_once '" . $this->currentDir . "' . '/../../../system/Test/bootstrap.php';" . PHP_EOL;
-		$fileContents .= '// return value of FCPATH' . PHP_EOL;
-		$fileContents .= 'echo FCPATH;' . PHP_EOL;
+    private function fileContents()
+    {
+        $fileContents = '';
+        $fileContents .= '<?php' . PHP_EOL;
+        $fileContents .= "define('HOMEPATH', '" . $this->currentDir . "' . '/../../../');" . PHP_EOL;
+        $fileContents .= "define('CONFIGPATH', '" . $this->currentDir . "' . '/../../../app/Config/');" . PHP_EOL;
+        $fileContents .= "define('PUBLICPATH', '" . $this->currentDir . "' . '/../../../public/');" . PHP_EOL;
+        $fileContents .= "include_once '" . $this->currentDir . "' . '/../../../vendor/autoload.php';" . PHP_EOL;
+        $fileContents .= "include_once '" . $this->currentDir . "' . '/../../../system/Test/bootstrap.php';" . PHP_EOL;
+        $fileContents .= '// return value of FCPATH' . PHP_EOL;
+        $fileContents .= 'echo FCPATH;' . PHP_EOL;
 
-		return $fileContents;
-	}
+        return $fileContents;
+    }
 
-	private function readOutput($file)
-	{
-		ob_start();
-		system('php -f ' . $file);
-		return ob_get_clean();
-	}
+    private function readOutput($file)
+    {
+        ob_start();
+        system('php -f ' . $file);
 
+        return ob_get_clean();
+    }
 }
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index a2d2a25755bd..65a671bf4df9 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -1,8 +1,18 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
-use App\Controllers\NeverHeardOfIt;
 use App\Controllers\Home;
+use App\Controllers\NeverHeardOfIt;
 use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use Config\App;
@@ -15,217 +25,218 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ControllerTestTraitTest extends CIUnitTestCase
+final class ControllerTestTraitTest extends CIUnitTestCase
 {
-	use ControllerTestTrait;
-
-	public function testBadController()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(NeverHeardOfIt::class)
-				->execute('index');
-	}
-
-	public function testBadControllerMethod()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Home::class)
-				->execute('nothere');
-	}
-
-	public function testController()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Home::class)
-				->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertTrue($result->isOK());
-	}
-
-	public function testControllerWithoutLogger()
-	{
-		$result = $this->withURI('http://example.com')
-				->controller(Home::class)
-				->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertTrue($result->isOK());
-	}
-
-	public function testPopcornIndex()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertTrue($result->isOK());
-	}
-
-	public function testPopcornIndex2()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertEquals('Hi there', $body);
-	}
-
-	public function testPopcornFailure()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('pop');
-
-		$this->assertEquals(567, $result->response()->getStatusCode());
-	}
-
-	public function testPopcornException()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('popper');
-
-		$this->assertEquals(500, $result->response()->getStatusCode());
-	}
-
-	public function testPopcornIndexWithSupport()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$config = new App();
-		$body   = '';
-
-		$result = $this->withURI('http://example.com')
-				->withConfig($config)
-				->withRequest(Services::request($config))
-				->withResponse(Services::response($config))
-				->withLogger($logger)
-				->withBody($body)
-				->controller(Popcorn::class)
-				->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertEquals('Hi there', $body);
-	}
-
-	public function testRequestPassthrough()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('popper');
-
-		$req = $result->request();
-		$this->assertEquals('get', $req->getMethod());
-	}
-
-	public function testFailureResponse()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('oops');
-
-		$this->assertFalse($result->isOK());
-		$this->assertEquals(401, $result->response()->getStatusCode());
-	}
-
-	public function testEmptyResponse()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('weasel');
-
-		$body = $result->response()->getBody(); // empty
-		$this->assertEmpty($body);
-		$this->assertFalse($result->isOK());
-	}
-
-	public function testRedirect()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('goaway');
-
-		$this->assertTrue($result->isRedirect());
-	}
-
-	public function testDOMParserForward()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('index');
-
-		$this->assertTrue($result->see('Hi'));
-	}
-
-	public function testFailsForward()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withURI('http://example.com')
-				->withLogger($logger)
-				->controller(Popcorn::class)
-				->execute('index');
-
-		// won't fail, but doesn't do anything
-		$this->assertNull($result->ohno('Hi'));
-	}
-
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/1834
-	public function testResponseOverriding()
-	{
-		$result = $this->withURI('http://example.com/rest/')
-				->controller(Popcorn::class)
-				->execute('index3');
-
-		$response = json_decode($result->response()->getBody());
-		$this->assertEquals('en', $response->lang);
-	}
-
-	// @see https://github.com/codeigniter4/CodeIgniter4/issues/2470
-	public function testControllerNoURI()
-	{
-		$logger = new Logger(new LoggerConfig());
-		$result = $this->withLogger($logger)
-					   ->controller(Home::class)
-					   ->execute('index');
-
-		$body = $result->response()->getBody();
-		$this->assertTrue($result->isOK());
-	}
-
-	public function testRedirectRoute()
-	{
-		$result = $this->controller(Popcorn::class)
-						->execute('toindex');
-		$this->assertTrue($result->isRedirect());
-	}
-
+    use ControllerTestTrait;
+
+    public function testBadController()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $logger = new Logger(new LoggerConfig());
+        $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(NeverHeardOfIt::class)
+            ->execute('index');
+    }
+
+    public function testBadControllerMethod()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $logger = new Logger(new LoggerConfig());
+        $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Home::class)
+            ->execute('nothere');
+    }
+
+    public function testController()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Home::class)
+            ->execute('index');
+
+        $this->assertTrue($result->isOK());
+    }
+
+    public function testControllerWithoutLogger()
+    {
+        $result = $this->withURI('http://example.com')
+            ->controller(Home::class)
+            ->execute('index');
+
+        $this->assertTrue($result->isOK());
+    }
+
+    public function testPopcornIndex()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
+
+        $this->assertTrue($result->isOK());
+    }
+
+    public function testPopcornIndex2()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
+
+        $body = $result->response()->getBody();
+        $this->assertSame('Hi there', $body);
+    }
+
+    public function testPopcornFailure()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('pop');
+
+        $this->assertSame(567, $result->response()->getStatusCode());
+    }
+
+    public function testPopcornException()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('popper');
+
+        $this->assertSame(500, $result->response()->getStatusCode());
+    }
+
+    public function testPopcornIndexWithSupport()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $config = new App();
+        $body   = '';
+
+        $result = $this->withURI('http://example.com')
+            ->withConfig($config)
+            ->withRequest(Services::request($config))
+            ->withResponse(Services::response($config))
+            ->withLogger($logger)
+            ->withBody($body)
+            ->controller(Popcorn::class)
+            ->execute('index');
+
+        $body = $result->response()->getBody();
+        $this->assertSame('Hi there', $body);
+    }
+
+    public function testRequestPassthrough()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('popper');
+
+        $req = $result->request();
+        $this->assertSame('get', $req->getMethod());
+    }
+
+    public function testFailureResponse()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('oops');
+
+        $this->assertFalse($result->isOK());
+        $this->assertSame(401, $result->response()->getStatusCode());
+    }
+
+    public function testEmptyResponse()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('weasel');
+
+        $body = $result->response()->getBody(); // empty
+        $this->assertEmpty($body);
+        $this->assertFalse($result->isOK());
+    }
+
+    public function testRedirect()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('goaway');
+
+        $this->assertTrue($result->isRedirect());
+    }
+
+    public function testDOMParserForward()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
+
+        $this->assertTrue($result->see('Hi'));
+    }
+
+    public function testFailsForward()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withURI('http://example.com')
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
+
+        // won't fail, but doesn't do anything
+        $this->assertNull($result->ohno('Hi'));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1834
+     */
+    public function testResponseOverriding()
+    {
+        $result = $this->withURI('http://example.com/rest/')
+            ->controller(Popcorn::class)
+            ->execute('index3');
+
+        $response = json_decode($result->response()->getBody());
+        $this->assertSame('en', $response->lang);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/2470
+     */
+    public function testControllerNoURI()
+    {
+        $logger = new Logger(new LoggerConfig());
+        $result = $this->withLogger($logger)
+            ->controller(Home::class)
+            ->execute('index');
+
+        $this->assertTrue($result->isOK());
+    }
+
+    public function testRedirectRoute()
+    {
+        $result = $this->controller(Popcorn::class)
+            ->execute('toindex');
+        $this->assertTrue($result->isRedirect());
+    }
 }
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index f492f66a2b22..7eeee05e4385 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -1,404 +1,418 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use InvalidArgumentException;
 
-class DOMParserTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DOMParserTest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		if (! extension_loaded('DOM'))
-		{
-			$this->markTestSkipped('DOM extension not loaded.');
-		}
-	}
-
-	public function testCanRoundTripHTML()
-	{
-		$dom = new DOMParser();
-
-		$html     = '<div><h1>Hello</h1></div>';
-		$expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">' . "\n"
-				. '<html><body><div><h1>Hello</h1></div></body></html>';
+        if (! extension_loaded('DOM')) {
+            $this->markTestSkipped('DOM extension not loaded.');
+        }
+    }
 
-		$this->assertEquals($expected . "\n", $dom->withString($html)->getBody());
-	}
+    public function testCanRoundTripHTML()
+    {
+        $dom = new DOMParser();
 
-	public function testParseSelectorWithID()
-	{
-		$dom = new DOMParser();
+        $html     = '<div><h1>Hello</h1></div>';
+        $expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">' . "\n"
+                . '<html><body><div><h1>Hello</h1></div></body></html>';
 
-		$selector = $dom->parseSelector('div#row');
+        $this->assertSame($expected . "\n", $dom->withString($html)->getBody());
+    }
 
-		$this->assertEquals('div', $selector['tag']);
-		$this->assertEquals('row', $selector['id']);
-	}
+    public function testParseSelectorWithID()
+    {
+        $dom = new DOMParser();
+
+        $selector = $dom->parseSelector('div#row');
 
-	public function testParseSelectorWithClass()
-	{
-		$dom = new DOMParser();
+        $this->assertSame('div', $selector['tag']);
+        $this->assertSame('row', $selector['id']);
+    }
 
-		$selector = $dom->parseSelector('div.row');
+    public function testParseSelectorWithClass()
+    {
+        $dom = new DOMParser();
 
-		$this->assertEquals('div', $selector['tag']);
-		$this->assertEquals('row', $selector['class']);
-	}
+        $selector = $dom->parseSelector('div.row');
 
-	public function testParseSelectorWithClassMultiple()
-	{
-		$dom = new DOMParser();
+        $this->assertSame('div', $selector['tag']);
+        $this->assertSame('row', $selector['class']);
+    }
 
-		$selector = $dom->parseSelector('div.row.another');
+    public function testParseSelectorWithClassMultiple()
+    {
+        $dom = new DOMParser();
 
-		$this->assertEquals('div', $selector['tag']);
-		// Only parses the first class
-		$this->assertEquals('row', $selector['class']);
-	}
+        $selector = $dom->parseSelector('div.row.another');
 
-	public function testParseSelectorWithAttribute()
-	{
-		$dom = new DOMParser();
+        $this->assertSame('div', $selector['tag']);
+        // Only parses the first class
+        $this->assertSame('row', $selector['class']);
+    }
 
-		$selector = $dom->parseSelector('a[ href = http://example.com ]');
+    public function testParseSelectorWithAttribute()
+    {
+        $dom = new DOMParser();
 
-		$this->assertEquals('a', $selector['tag']);
-		$this->assertEquals(['href' => 'http://example.com'], $selector['attr']);
-	}
+        $selector = $dom->parseSelector('a[ href = http://example.com ]');
 
-	public function provideText()
-	{
-		return [
-			['Hello World'],
-			['Hellö Wörld'],
-		];
-	}
+        $this->assertSame('a', $selector['tag']);
+        $this->assertSame(['href' => 'http://example.com'], $selector['attr']);
+    }
 
-	/**
-	 * @dataProvider provideText
-	 */
-	public function testSeeText($text)
-	{
-		$dom = new DOMParser();
+    public function provideText()
+    {
+        return [
+            ['Hello World'],
+            ['Hellö Wörld'],
+        ];
+    }
 
-		$html = '<html><body><h1>' . $text . '</h1></body></html>';
-		$dom->withString($html);
+    /**
+     * @dataProvider provideText
+     *
+     * @param mixed $text
+     */
+    public function testSeeText($text)
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see($text));
-	}
+        $html = '<html><body><h1>' . $text . '</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeHTML()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see($text));
+    }
 
-		$html = '<html><body><h1>Hello World</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeHTML()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('<h1>'));
-	}
+        $html = '<html><body><h1>Hello World</h1></body></html>';
+        $dom->withString($html);
 
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3984
-	 */
-	public function testSeeHTMLOutsideBodyTag()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('<h1>'));
+    }
 
-		$html = '<html><head><title>My Title</title></head><body><h1>Hello World</h1></body></html>';
-		$dom->withString($html);
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3984
+     */
+    public function testSeeHTMLOutsideBodyTag()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('My Title', 'title'));
-	}
+        $html = '<html><head><title>My Title</title></head><body><h1>Hello World</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('My Title', 'title'));
+    }
 
-		$html = '<html><body><h1>Hello World</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->see('Hello Worlds'));
-	}
+        $html = '<html><body><h1>Hello World</h1></body></html>';
+        $dom->withString($html);
 
-	/**
-	 * @dataProvider provideText
-	 */
-	public function testSeeElement($text)
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->see('Hello Worlds'));
+    }
 
-		$html = '<html><body><h1> ' . $text . '</h1></body></html>';
-		$dom->withString($html);
+    /**
+     * @dataProvider provideText
+     *
+     * @param mixed $text
+     */
+    public function testSeeElement($text)
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see($text, 'h1'));
-	}
+        $html = '<html><body><h1> ' . $text . '</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementPartialText()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see($text, 'h1'));
+    }
 
-		$html = '<html><body><h1>Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementPartialText()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('Hello World', 'h1'));
-	}
+        $html = '<html><body><h1>Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementID()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('Hello World', 'h1'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementID()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('Hello World', '#heading'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementIDFails()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('Hello World', '#heading'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementIDFails()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->see('Hello Worlds', '#heading'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementIDWithTag()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->see('Hello Worlds', '#heading'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementIDWithTag()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('Hello World', 'h1#heading'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementIDWithTagFails()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('Hello World', 'h1#heading'));
+    }
 
-		$html = '<html><body><h2 id="heading">Hello World Wide Web</h2></body></html>';
-		$dom->withString($html);
+    public function testSeeElementIDWithTagFails()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->see('Hello World', 'h1#heading'));
-	}
+        $html = '<html><body><h2 id="heading">Hello World Wide Web</h2></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementClass()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->see('Hello World', 'h1#heading'));
+    }
 
-		$html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementClass()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('Hello World', '.heading'));
-	}
+        $html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementClassFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('Hello World', '.heading'));
+    }
 
-		$html = '<html><body><h1 class="headings">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementClassFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->see('Hello World', '.heading'));
-	}
+        $html = '<html><body><h1 class="headings">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementClassWithTag()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->see('Hello World', '.heading'));
+    }
 
-		$html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementClassWithTag()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->see('Hello World', 'h1.heading'));
-	}
+        $html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementClassWithTagFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->see('Hello World', 'h1.heading'));
+    }
 
-		$html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementClassWithTagFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->see('Hello World', 'h2.heading'));
-	}
+        $html = '<html><body><h1 class="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementSuccess()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->see('Hello World', 'h2.heading'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementSuccess()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeElement('#heading'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeElementFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeElement('#heading'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testSeeElementFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->seeElement('#headings'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testDontSeeElementSuccess()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->seeElement('#headings'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testDontSeeElementSuccess()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->dontSeeElement('#head'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testDontSeeElementFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->dontSeeElement('#head'));
+    }
 
-		$html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
-		$dom->withString($html);
+    public function testDontSeeElementFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->dontSeeElement('#heading'));
-	}
+        $html = '<html><body><h1 id="heading">Hello World Wide Web</h1></body></html>';
+        $dom->withString($html);
 
-	public function testSeeLinkSuccess()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->dontSeeElement('#heading'));
+    }
 
-		$html = '<html><body><a href="http://example.com">Hello</a></body></html>';
-		$dom->withString($html);
+    public function testSeeLinkSuccess()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeLink('Hello'));
-	}
+        $html = '<html><body><a href="http://example.com">Hello</a></body></html>';
+        $dom->withString($html);
 
-	public function testSeeLinkFalse()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeLink('Hello'));
+    }
 
-		$html = '<html><body><a href="http://example.com">Hello</a></body></html>';
-		$dom->withString($html);
+    public function testSeeLinkFalse()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->seeLink('Hello World!'));
-	}
+        $html = '<html><body><a href="http://example.com">Hello</a></body></html>';
+        $dom->withString($html);
 
-	public function testSeeLinkClassSuccess()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->seeLink('Hello World!'));
+    }
 
-		$html = '<html><body><a class="btn" href="http://example.com">Hello</a></body></html>';
-		$dom->withString($html);
+    public function testSeeLinkClassSuccess()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeLink('Hello', '.btn'));
-	}
+        $html = '<html><body><a class="btn" href="http://example.com">Hello</a></body></html>';
+        $dom->withString($html);
 
-	public function testSeeLinkClassFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeLink('Hello', '.btn'));
+    }
 
-		$html = '<html><body><a class="button" href="http://example.com">Hello</a></body></html>';
-		$dom->withString($html);
+    public function testSeeLinkClassFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->seeLink('Hello', '.btn'));
-	}
+        $html = '<html><body><a class="button" href="http://example.com">Hello</a></body></html>';
+        $dom->withString($html);
 
-	public function testSeeInFieldSuccess()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->seeLink('Hello', '.btn'));
+    }
 
-		$html = '<html><body><input type="text" name="user" value="Foobar"></body></html>';
-		$dom->withString($html);
+    public function testSeeInFieldSuccess()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeInField('user', 'Foobar'));
-	}
+        $html = '<html><body><input type="text" name="user" value="Foobar"></body></html>';
+        $dom->withString($html);
 
-	public function testSeeInFieldFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeInField('user', 'Foobar'));
+    }
 
-		$html = '<html><body><input type="text" name="user" value="Foobar"></body></html>';
-		$dom->withString($html);
+    public function testSeeInFieldFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->seeInField('user', 'Foobars'));
-	}
+        $html = '<html><body><input type="text" name="user" value="Foobar"></body></html>';
+        $dom->withString($html);
 
-	public function testSeeInFieldSuccessArray()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->seeInField('user', 'Foobars'));
+    }
 
-		$html = '<html><body><input type="text" name="user[name]" value="Foobar"></body></html>';
-		$dom->withString($html);
+    public function testSeeInFieldSuccessArray()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeInField('user[name]', 'Foobar'));
-	}
+        $html = '<html><body><input type="text" name="user[name]" value="Foobar"></body></html>';
+        $dom->withString($html);
 
-	public function testSeeCheckboxIsCheckedByIDTrue()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeInField('user[name]', 'Foobar'));
+    }
 
-		$html = '<html><body><input type="checkbox" name="user" id="user" value="1" checked></body></html>';
-		$dom->withString($html);
+    public function testSeeCheckboxIsCheckedByIDTrue()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeCheckboxIsChecked('#user'));
-	}
+        $html = '<html><body><input type="checkbox" name="user" id="user" value="1" checked></body></html>';
+        $dom->withString($html);
 
-	public function testSeeCheckboxIsCheckedByIDFail()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeCheckboxIsChecked('#user'));
+    }
 
-		$html = '<html><body><input type="checkbox" name="user" id="users" value="1" checked></body></html>';
-		$dom->withString($html);
+    public function testSeeCheckboxIsCheckedByIDFail()
+    {
+        $dom = new DOMParser();
 
-		$this->assertFalse($dom->seeCheckboxIsChecked('#user'));
-	}
+        $html = '<html><body><input type="checkbox" name="user" id="users" value="1" checked></body></html>';
+        $dom->withString($html);
 
-	public function testSeeCheckboxIsCheckedByClassTrue()
-	{
-		$dom = new DOMParser();
+        $this->assertFalse($dom->seeCheckboxIsChecked('#user'));
+    }
 
-		$html = '<html><body><input type="checkbox" name="user" class="btn" value="1" checked></body></html>';
-		$dom->withString($html);
+    public function testSeeCheckboxIsCheckedByClassTrue()
+    {
+        $dom = new DOMParser();
 
-		$this->assertTrue($dom->seeCheckboxIsChecked('.btn'));
-	}
+        $html = '<html><body><input type="checkbox" name="user" class="btn" value="1" checked></body></html>';
+        $dom->withString($html);
 
-	public function testWithFile()
-	{
-		$dom = new DOMParser();
+        $this->assertTrue($dom->seeCheckboxIsChecked('.btn'));
+    }
 
-		$filename = APPPATH . 'index.html';
+    public function testWithFile()
+    {
+        $dom = new DOMParser();
 
-		$dom->withFile($filename);
-		$this->assertTrue($dom->see('Directory access is forbidden.'));
-	}
+        $filename = APPPATH . 'index.html';
 
-	public function testWithNotFile()
-	{
-		$dom = new DOMParser();
+        $dom->withFile($filename);
+        $this->assertTrue($dom->see('Directory access is forbidden.'));
+    }
 
-		$filename = APPPATH . 'bogus.html';
+    public function testWithNotFile()
+    {
+        $dom = new DOMParser();
 
-		$this->expectException(InvalidArgumentException::class);
-		$dom->withFile($filename);
-	}
+        $filename = APPPATH . 'bogus.html';
 
-	public function testSeeAttribute()
-	{
-		$dom = new DOMParser();
+        $this->expectException(InvalidArgumentException::class);
+        $dom->withFile($filename);
+    }
 
-		$path     = '[ name = user ]';
-		$selector = $dom->parseSelector($path);
+    public function testSeeAttribute()
+    {
+        $dom = new DOMParser();
 
-		$this->assertEquals(['name' => 'user'], $selector['attr']);
+        $path     = '[ name = user ]';
+        $selector = $dom->parseSelector($path);
 
-		$html = '<html><body><div name="user">George</div></body></html>';
-		$dom->withString($html);
+        $this->assertSame(['name' => 'user'], $selector['attr']);
 
-		$this->assertTrue($dom->see(null, '*[ name = user ]'));
-		$this->assertFalse($dom->see(null, '*[ name = notthere ]'));
-	}
+        $html = '<html><body><div name="user">George</div></body></html>';
+        $dom->withString($html);
 
+        $this->assertTrue($dom->see(null, '*[ name = user ]'));
+        $this->assertFalse($dom->see(null, '*[ name = notthere ]'));
+    }
 }
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index c838749c42cf..f7ba5781979a 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -1,7 +1,17 @@
-<?php namespace CodeIgniter\Test;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\ModelFactory;
-use CodeIgniter\Test\CIUnitTestCase;
 use InvalidArgumentException;
 use stdClass;
 use Tests\Support\Models\EntityModel;
@@ -9,488 +19,471 @@
 use Tests\Support\Models\FabricatorModel;
 use Tests\Support\Models\UserModel;
 
-class FabricatorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FabricatorTest extends CIUnitTestCase
 {
-	/**
-	 * Default formatters to use for UserModel. Should match detected version.
-	 *
-	 * @var array
-	 */
-	protected $formatters = [
-		'name'       => 'name',
-		'email'      => 'email',
-		'country'    => 'country',
-		'deleted_at' => 'date',
-	];
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-
-		Fabricator::resetCounts();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstructorWithString()
-	{
-		$fabricator = new Fabricator(UserModel::class);
-
-		$this->assertInstanceOf(Fabricator::class, $fabricator);
-	}
-
-	public function testConstructorWithInstance()
-	{
-		$model = new UserModel();
-
-		$fabricator = new Fabricator($model);
-
-		$this->assertInstanceOf(Fabricator::class, $fabricator);
-	}
-
-	public function testConstructorWithInvalid()
-	{
-		$this->expectException(InvalidArgumentException::class);
-		$this->expectExceptionMessage(lang('Fabricator.invalidModel'));
-
-		$fabricator = new Fabricator('SillyRabbit\Models\AreForKids');
-	}
+    /**
+     * Default formatters to use for UserModel. Should match detected version.
+     *
+     * @var array
+     */
+    protected $formatters = [
+        'name'       => 'name',
+        'email'      => 'email',
+        'country'    => 'country',
+        'deleted_at' => 'date',
+    ];
 
-	public function testConstructorSetsFormatters()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
+    protected function tearDown(): void
+    {
+        parent::tearDown();
 
-		$this->assertEquals($this->formatters, $fabricator->getFormatters());
-	}
+        Fabricator::resetCounts();
+    }
 
-	public function testConstructorGuessesFormatters()
-	{
-		$fabricator = new Fabricator(UserModel::class, null);
+    public function testConstructorWithString()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$this->assertEquals($this->formatters, $fabricator->getFormatters());
-	}
+        $this->assertInstanceOf(Fabricator::class, $fabricator);
+    }
 
-	public function testConstructorDefaultsToAppLocale()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+    public function testConstructorWithInstance()
+    {
+        $model = new UserModel();
 
-		$this->assertEquals(config('App')->defaultLocale, $fabricator->getLocale());
-	}
+        $fabricator = new Fabricator($model);
 
-	public function testConstructorUsesProvidedLocale()
-	{
-		$locale = 'fr_FR';
+        $this->assertInstanceOf(Fabricator::class, $fabricator);
+    }
 
-		$fabricator = new Fabricator(UserModel::class, null, $locale);
+    public function testConstructorWithInvalid()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage(lang('Fabricator.invalidModel'));
 
-		$this->assertEquals($locale, $fabricator->getLocale());
-	}
+        new Fabricator('SillyRabbit\Models\AreForKids');
+    }
 
-	//--------------------------------------------------------------------
+    public function testConstructorSetsFormatters()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-	public function testModelUsesNewInstance()
-	{
-		// Inject the wrong model for UserModel to show it is ignored by Fabricator
-		$mock = new FabricatorModel();
-		ModelFactory::injectMock('Tests\Support\Models\UserModel', $mock);
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
+    }
 
-		$fabricator = new Fabricator(UserModel::class);
-		$this->assertInstanceOf(UserModel::class, $fabricator->getModel());
-	}
+    public function testConstructorGuessesFormatters()
+    {
+        $fabricator = new Fabricator(UserModel::class, null);
 
-	public function testGetModelReturnsModel()
-	{
-		$fabricator = new Fabricator(UserModel::class);
-		$this->assertInstanceOf(UserModel::class, $fabricator->getModel());
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
+    }
 
-		$model       = new UserModel();
-		$fabricator2 = new Fabricator($model);
-		$this->assertInstanceOf(UserModel::class, $fabricator2->getModel());
-	}
+    public function testConstructorDefaultsToAppLocale()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-	public function testGetFakerReturnsUsableGenerator()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertSame(config('App')->defaultLocale, $fabricator->getLocale());
+    }
 
-		$faker = $fabricator->getFaker();
+    public function testConstructorUsesProvidedLocale()
+    {
+        $locale = 'fr_FR';
 
-		$this->assertIsNumeric($faker->randomDigit);
-	}
+        $fabricator = new Fabricator(UserModel::class, null, $locale);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($locale, $fabricator->getLocale());
+    }
 
-	public function testSetFormattersChangesFormatters()
-	{
-		$formatters = ['boo' => 'hiss'];
-		$fabricator = new Fabricator(UserModel::class);
+    public function testModelUsesNewInstance()
+    {
+        // Inject the wrong model for UserModel to show it is ignored by Fabricator
+        $mock = new FabricatorModel();
+        ModelFactory::injectMock('Tests\Support\Models\UserModel', $mock);
 
-		$fabricator->setFormatters($formatters);
+        $fabricator = new Fabricator(UserModel::class);
+        $this->assertInstanceOf(UserModel::class, $fabricator->getModel());
+    }
 
-		$this->assertEquals($formatters, $fabricator->getFormatters());
-	}
+    public function testGetModelReturnsModel()
+    {
+        $fabricator = new Fabricator(UserModel::class);
+        $this->assertInstanceOf(UserModel::class, $fabricator->getModel());
 
-	public function testSetFormattersDetectsFormatters()
-	{
-		$formatters = ['boo' => 'hiss'];
-		$fabricator = new Fabricator(UserModel::class, $formatters);
+        $model       = new UserModel();
+        $fabricator2 = new Fabricator($model);
+        $this->assertInstanceOf(UserModel::class, $fabricator2->getModel());
+    }
 
-		$fabricator->setFormatters();
+    public function testGetFakerReturnsUsableGenerator()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$this->assertEquals($this->formatters, $fabricator->getFormatters());
-	}
+        $faker = $fabricator->getFaker();
 
-	public function testDetectFormattersDetectsFormatters()
-	{
-		$formatters = ['boo' => 'hiss'];
-		$fabricator = new Fabricator(UserModel::class, $formatters);
+        $this->assertIsNumeric($faker->randomDigit);
+    }
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'detectFormatters');
+    public function testSetFormattersChangesFormatters()
+    {
+        $formatters = ['boo' => 'hiss'];
+        $fabricator = new Fabricator(UserModel::class);
 
-		$method();
+        $fabricator->setFormatters($formatters);
 
-		$this->assertEquals($this->formatters, $fabricator->getFormatters());
-	}
+        $this->assertSame($formatters, $fabricator->getFormatters());
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetFormattersDetectsFormatters()
+    {
+        $formatters = ['boo' => 'hiss'];
+        $fabricator = new Fabricator(UserModel::class, $formatters);
 
-	public function testSetOverridesSets()
-	{
-		$overrides  = ['name' => 'Steve'];
-		$fabricator = new Fabricator(UserModel::class);
+        $fabricator->setFormatters();
 
-		$fabricator->setOverrides($overrides);
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
+    }
 
-		$this->assertEquals($overrides, $fabricator->getOverrides());
-	}
+    public function testDetectFormattersDetectsFormatters()
+    {
+        $formatters = ['boo' => 'hiss'];
+        $fabricator = new Fabricator(UserModel::class, $formatters);
 
-	public function testSetOverridesDefaultPersists()
-	{
-		$overrides  = ['name' => 'Steve'];
-		$fabricator = new Fabricator(UserModel::class);
+        $method = $this->getPrivateMethodInvoker($fabricator, 'detectFormatters');
 
-		$fabricator->setOverrides($overrides);
-		$fabricator->getOverrides();
+        $method();
 
-		$this->assertEquals($overrides, $fabricator->getOverrides());
-	}
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
+    }
 
-	public function testSetOverridesOnce()
-	{
-		$overrides  = ['name' => 'Steve'];
-		$fabricator = new Fabricator(UserModel::class);
+    public function testSetOverridesSets()
+    {
+        $overrides  = ['name' => 'Steve'];
+        $fabricator = new Fabricator(UserModel::class);
 
-		$fabricator->setOverrides($overrides, false);
-		$fabricator->getOverrides();
+        $fabricator->setOverrides($overrides);
 
-		$this->assertEquals([], $fabricator->getOverrides());
-	}
+        $this->assertSame($overrides, $fabricator->getOverrides());
+    }
 
-	//--------------------------------------------------------------------
+    public function testSetOverridesDefaultPersists()
+    {
+        $overrides  = ['name' => 'Steve'];
+        $fabricator = new Fabricator(UserModel::class);
 
-	public function testGuessFormattersReturnsActual()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $fabricator->setOverrides($overrides);
+        $fabricator->getOverrides();
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
+        $this->assertSame($overrides, $fabricator->getOverrides());
+    }
 
-		$field     = 'catchPhrase';
-		$formatter = $method($field);
+    public function testSetOverridesOnce()
+    {
+        $overrides  = ['name' => 'Steve'];
+        $fabricator = new Fabricator(UserModel::class);
 
-		$this->assertEquals($field, $formatter);
-	}
+        $fabricator->setOverrides($overrides, false);
+        $fabricator->getOverrides();
 
-	public function testGuessFormattersFieldReturnsDateFormat()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertSame([], $fabricator->getOverrides());
+    }
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
+    public function testGuessFormattersReturnsActual()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$field     = 'created_at';
-		$formatter = $method($field);
+        $method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
 
-		$this->assertEquals('date', $formatter);
-	}
+        $field     = 'catchPhrase';
+        $formatter = $method($field);
 
-	public function testGuessFormattersPrimaryReturnsNumberBetween()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertSame($field, $formatter);
+    }
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
+    public function testGuessFormattersFieldReturnsDateFormat()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$field     = 'id';
-		$formatter = $method($field);
+        $method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
 
-		$this->assertEquals('numberBetween', $formatter);
-	}
+        $field     = 'created_at';
+        $formatter = $method($field);
 
-	public function testGuessFormattersMatchesPartial()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertSame('date', $formatter);
+    }
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
+    public function testGuessFormattersPrimaryReturnsNumberBetween()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$field     = 'business_email';
-		$formatter = $method($field);
+        $method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
 
-		$this->assertEquals('email', $formatter);
-	}
+        $field     = 'id';
+        $formatter = $method($field);
 
-	public function testGuessFormattersFallback()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertSame('numberBetween', $formatter);
+    }
 
-		$method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
+    public function testGuessFormattersMatchesPartial()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$field     = 'zaboomafoo';
-		$formatter = $method($field);
+        $method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
 
-		$this->assertEquals($fabricator->defaultFormatter, $formatter);
-	}
+        $field     = 'business_email';
+        $formatter = $method($field);
 
-	//--------------------------------------------------------------------
+        $this->assertSame('email', $formatter);
+    }
 
-	public function testMakeArrayReturnsArray()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
+    public function testGuessFormattersFallback()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$result = $fabricator->makeArray();
+        $method = $this->getPrivateMethodInvoker($fabricator, 'guessFormatter');
 
-		$this->assertIsArray($result);
-	}
+        $field     = 'zaboomafoo';
+        $formatter = $method($field);
 
-	public function testMakeArrayUsesOverrides()
-	{
-		$overrides = ['name' => 'The Admiral'];
+        $this->assertSame($fabricator->defaultFormatter, $formatter);
+    }
 
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
-		$fabricator->setOverrides($overrides);
+    public function testMakeArrayReturnsArray()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-		$result = $fabricator->makeArray();
+        $result = $fabricator->makeArray();
 
-		$this->assertEquals($overrides['name'], $result['name']);
-	}
+        $this->assertIsArray($result);
+    }
 
-	public function testMakeArrayReturnsValidData()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
+    public function testMakeArrayUsesOverrides()
+    {
+        $overrides = ['name' => 'The Admiral'];
 
-		$result = $fabricator->makeArray();
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
+        $fabricator->setOverrides($overrides);
 
-		$this->assertEquals($result['email'], filter_var($result['email'], FILTER_VALIDATE_EMAIL));
-	}
+        $result = $fabricator->makeArray();
 
-	public function testMakeArrayUsesFakeMethod()
-	{
-		$fabricator = new Fabricator(FabricatorModel::class);
+        $this->assertSame($overrides['name'], $result['name']);
+    }
 
-		$result = $fabricator->makeArray();
+    public function testMakeArrayReturnsValidData()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-		$this->assertEquals($result['name'], filter_var($result['name'], FILTER_VALIDATE_IP));
-	}
+        $result = $fabricator->makeArray();
 
-	//--------------------------------------------------------------------
+        $this->assertSame($result['email'], filter_var($result['email'], FILTER_VALIDATE_EMAIL));
+    }
 
-	public function testMakeObjectReturnsModelReturnType()
-	{
-		$fabricator = new Fabricator(EntityModel::class);
-		$expected   = $fabricator->getModel()->returnType;
+    public function testMakeArrayUsesFakeMethod()
+    {
+        $fabricator = new Fabricator(FabricatorModel::class);
 
-		$result = $fabricator->makeObject();
+        $result = $fabricator->makeArray();
 
-		$this->assertInstanceOf($expected, $result);
-	}
+        $this->assertSame($result['name'], filter_var($result['name'], FILTER_VALIDATE_IP));
+    }
 
-	public function testMakeObjectReturnsProvidedClass()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
-		$className  = 'Tests\Support\Models\SimpleEntity';
+    public function testMakeObjectReturnsModelReturnType()
+    {
+        $fabricator = new Fabricator(EntityModel::class);
+        $expected   = $fabricator->getModel()->returnType;
 
-		$result = $fabricator->makeObject($className);
+        $result = $fabricator->makeObject();
 
-		$this->assertInstanceOf($className, $result);
-	}
+        $this->assertInstanceOf($expected, $result);
+    }
 
-	public function testMakeObjectReturnsStdClassForArrayReturnType()
-	{
-		$fabricator = new Fabricator(EventModel::class);
+    public function testMakeObjectReturnsProvidedClass()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
+        $className  = 'Tests\Support\Models\SimpleEntity';
 
-		$result = $fabricator->makeObject();
+        $result = $fabricator->makeObject($className);
 
-		$this->assertInstanceOf(stdClass::class, $result);
-	}
+        $this->assertInstanceOf($className, $result);
+    }
 
-	public function testMakeObjectReturnsStdClassForObjectReturnType()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
+    public function testMakeObjectReturnsStdClassForArrayReturnType()
+    {
+        $fabricator = new Fabricator(EventModel::class);
 
-		$result = $fabricator->makeObject();
+        $result = $fabricator->makeObject();
 
-		$this->assertInstanceOf(stdClass::class, $result);
-	}
+        $this->assertInstanceOf(stdClass::class, $result);
+    }
 
-	public function testMakeObjectUsesOverrides()
-	{
-		$overrides = ['name' => 'The Admiral'];
+    public function testMakeObjectReturnsStdClassForObjectReturnType()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
-		$fabricator->setOverrides($overrides);
+        $result = $fabricator->makeObject();
 
-		$result = $fabricator->makeObject();
+        $this->assertInstanceOf(stdClass::class, $result);
+    }
 
-		$this->assertEquals($overrides['name'], $result->name);
-	}
+    public function testMakeObjectUsesOverrides()
+    {
+        $overrides = ['name' => 'The Admiral'];
 
-	public function testMakeObjectReturnsValidData()
-	{
-		$fabricator = new Fabricator(UserModel::class, $this->formatters);
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
+        $fabricator->setOverrides($overrides);
 
-		$result = $fabricator->makeObject();
+        $result = $fabricator->makeObject();
 
-		$this->assertEquals($result->email, filter_var($result->email, FILTER_VALIDATE_EMAIL));
-	}
+        $this->assertSame($overrides['name'], $result->name);
+    }
 
-	public function testMakeObjectUsesFakeMethod()
-	{
-		$fabricator = new Fabricator(FabricatorModel::class);
+    public function testMakeObjectReturnsValidData()
+    {
+        $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-		$result = $fabricator->makeObject();
+        $result = $fabricator->makeObject();
 
-		$this->assertEquals($result->name, filter_var($result->name, FILTER_VALIDATE_IP));
-	}
+        $this->assertSame($result->email, filter_var($result->email, FILTER_VALIDATE_EMAIL));
+    }
 
-	//--------------------------------------------------------------------
+    public function testMakeObjectUsesFakeMethod()
+    {
+        $fabricator = new Fabricator(FabricatorModel::class);
 
-	public function testMakeReturnsSingleton()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $result = $fabricator->makeObject();
 
-		$result = $fabricator->make();
+        $this->assertSame($result->name, filter_var($result->name, FILTER_VALIDATE_IP));
+    }
 
-		$this->assertInstanceOf('stdClass', $result);
-	}
+    public function testMakeReturnsSingleton()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-	public function testMakeReturnsExpectedCount()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $result = $fabricator->make();
 
-		$count  = 10;
-		$result = $fabricator->make($count);
+        $this->assertInstanceOf('stdClass', $result);
+    }
 
-		$this->assertIsArray($result);
-		$this->assertCount($count, $result);
-	}
+    public function testMakeReturnsExpectedCount()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-	//--------------------------------------------------------------------
+        $count  = 10;
+        $result = $fabricator->make($count);
 
-	public function testCreateMockReturnsSingleton()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertIsArray($result);
+        $this->assertCount($count, $result);
+    }
 
-		$result = $fabricator->create(null, true);
+    public function testCreateMockReturnsSingleton()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$this->assertInstanceOf('stdClass', $result);
-	}
+        $result = $fabricator->create(null, true);
 
-	public function testCreateMockReturnsExpectedCount()
-	{
-		$fabricator = new Fabricator(UserModel::class);
+        $this->assertInstanceOf('stdClass', $result);
+    }
 
-		$count  = 10;
-		$result = $fabricator->create($count, true);
+    public function testCreateMockReturnsExpectedCount()
+    {
+        $fabricator = new Fabricator(UserModel::class);
 
-		$this->assertIsArray($result);
-		$this->assertCount($count, $result);
-	}
+        $count  = 10;
+        $result = $fabricator->create($count, true);
 
-	public function testCreateMockSetsDatabaseFields()
-	{
-		$fabricator = new Fabricator(FabricatorModel::class);
+        $this->assertIsArray($result);
+        $this->assertCount($count, $result);
+    }
 
-		$result = $fabricator->create(null, true);
+    public function testCreateMockSetsDatabaseFields()
+    {
+        $fabricator = new Fabricator(FabricatorModel::class);
 
-		$this->assertIsInt($result->id);
-		$this->assertIsInt($result->created_at);
-		$this->assertIsInt($result->updated_at);
+        $result = $fabricator->create(null, true);
 
-		$this->assertObjectHasAttribute('deleted_at', $result);
-		$this->assertNull($result->deleted_at);
-	}
+        $this->assertIsInt($result->id);
+        $this->assertIsInt($result->created_at);
+        $this->assertIsInt($result->updated_at);
 
-	//--------------------------------------------------------------------
+        $this->assertObjectHasAttribute('deleted_at', $result);
+        $this->assertNull($result->deleted_at);
+    }
 
-	public function testSetCountReturnsCount()
-	{
-		$result = Fabricator::setCount('goblins', 42);
+    public function testSetCountReturnsCount()
+    {
+        $result = Fabricator::setCount('goblins', 42);
 
-		$this->assertEquals(42, $result);
-	}
+        $this->assertSame(42, $result);
+    }
 
-	public function testSetCountSetsValue()
-	{
-		Fabricator::setCount('trolls', 3);
-		$result = Fabricator::getCount('trolls');
+    public function testSetCountSetsValue()
+    {
+        Fabricator::setCount('trolls', 3);
+        $result = Fabricator::getCount('trolls');
 
-		$this->assertEquals(3, $result);
-	}
+        $this->assertSame(3, $result);
+    }
 
-	public function testGetCountNewTableReturnsZero()
-	{
-		$result = Fabricator::getCount('gremlins');
+    public function testGetCountNewTableReturnsZero()
+    {
+        $result = Fabricator::getCount('gremlins');
 
-		$this->assertEquals(0, $result);
-	}
+        $this->assertSame(0, $result);
+    }
 
-	public function testUpCountIncrementsValue()
-	{
-		Fabricator::setCount('orcs', 12);
-		Fabricator::upCount('orcs');
+    public function testUpCountIncrementsValue()
+    {
+        Fabricator::setCount('orcs', 12);
+        Fabricator::upCount('orcs');
 
-		$this->assertEquals(13, Fabricator::getCount('orcs'));
-	}
+        $this->assertSame(13, Fabricator::getCount('orcs'));
+    }
 
-	public function testUpCountReturnsValue()
-	{
-		Fabricator::setCount('hobgoblins', 12);
-		$result = Fabricator::upCount('hobgoblins');
+    public function testUpCountReturnsValue()
+    {
+        Fabricator::setCount('hobgoblins', 12);
+        $result = Fabricator::upCount('hobgoblins');
 
-		$this->assertEquals(13, $result);
-	}
+        $this->assertSame(13, $result);
+    }
 
-	public function testUpCountNewTableReturnsOne()
-	{
-		$result = Fabricator::upCount('ogres');
+    public function testUpCountNewTableReturnsOne()
+    {
+        $result = Fabricator::upCount('ogres');
 
-		$this->assertEquals(1, $result);
-	}
+        $this->assertSame(1, $result);
+    }
 
-	public function testDownCountDecrementsValue()
-	{
-		Fabricator::setCount('orcs', 12);
-		Fabricator::downCount('orcs');
+    public function testDownCountDecrementsValue()
+    {
+        Fabricator::setCount('orcs', 12);
+        Fabricator::downCount('orcs');
 
-		$this->assertEquals(11, Fabricator::getCount('orcs'));
-	}
+        $this->assertSame(11, Fabricator::getCount('orcs'));
+    }
 
-	public function testDownCountReturnsValue()
-	{
-		Fabricator::setCount('hobgoblins', 12);
-		$result = Fabricator::downCount('hobgoblins');
+    public function testDownCountReturnsValue()
+    {
+        Fabricator::setCount('hobgoblins', 12);
+        $result = Fabricator::downCount('hobgoblins');
 
-		$this->assertEquals(11, $result);
-	}
+        $this->assertSame(11, $result);
+    }
 
-	public function testDownCountNewTableReturnsNegativeOne()
-	{
-		$result = Fabricator::downCount('ogres');
+    public function testDownCountNewTableReturnsNegativeOne()
+    {
+        $result = Fabricator::downCount('ogres');
 
-		$this->assertEquals(-1, $result);
-	}
+        $this->assertSame(-1, $result);
+    }
 
-	public function testResetClearsValue()
-	{
-		Fabricator::setCount('giants', 1000);
-		Fabricator::resetCounts();
+    public function testResetClearsValue()
+    {
+        Fabricator::setCount('giants', 1000);
+        Fabricator::resetCounts();
 
-		$this->assertEquals(0, Fabricator::getCount('giants'));
-	}
+        $this->assertSame(0, Fabricator::getCount('giants'));
+    }
 }
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 568fbec29f71..70952b89b96d 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -1,382 +1,394 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\FeatureTestTrait;
-use CodeIgniter\Test\TestResponse;
 
 /**
  * @group                       DatabaseLive
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class FeatureTestTraitTest extends CIUnitTestCase
+final class FeatureTestTraitTest extends CIUnitTestCase
 {
-	use FeatureTestTrait;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->skipEvents();
-	}
-
-	public function testCallGet()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				function () {
-					return 'Hello World';
-				},
-			],
-		]);
-		$response = $this->get('home');
-
-		$response->assertSee('Hello World');
-		$response->assertDontSee('Again');
-	}
-
-	public function testCallSimpleGet()
-	{
-		$this->withRoutes([
-			[
-				'add',
-				'home',
-				function () {
-					return 'Hello Earth';
-				},
-			],
-		]);
-		$response = $this->call('get', 'home');
-
-		$this->assertInstanceOf(TestResponse::class, $response);
-		$this->assertInstanceOf(Response::class, $response->response());
-		$this->assertTrue($response->isOK());
-		$this->assertEquals('Hello Earth', $response->response()->getBody());
-		$this->assertEquals(200, $response->response()->getStatusCode());
-	}
-
-	public function testCallPost()
-	{
-		$this->withRoutes([
-			[
-				'post',
-				'home',
-				function () {
-					return 'Hello Mars';
-				},
-			],
-		]);
-		$response = $this->post('home');
-
-		$response->assertSee('Hello Mars');
-	}
-
-	public function testCallPostWithBody()
-	{
-		$this->withRoutes([
-			[
-				'post',
-				'home',
-				function () {
-					return 'Hello ' . service('request')->getPost('foo') . '!';
-				},
-			],
-		]);
-		$response = $this->post('home', ['foo' => 'Mars']);
-
-		$response->assertSee('Hello Mars!');
-	}
-
-	public function testCallPut()
-	{
-		$this->withRoutes([
-			[
-				'put',
-				'home',
-				function () {
-					return 'Hello Pluto';
-				},
-			],
-		]);
-		$response = $this->put('home');
-
-		$response->assertSee('Hello Pluto');
-	}
-
-	public function testCallPatch()
-	{
-		$this->withRoutes([
-			[
-				'patch',
-				'home',
-				function () {
-					return 'Hello Jupiter';
-				},
-			],
-		]);
-		$response = $this->patch('home');
-
-		$response->assertSee('Hello Jupiter');
-	}
-
-	public function testCallOptions()
-	{
-		$this->withRoutes([
-			[
-				'options',
-				'home',
-				function () {
-					return 'Hello George';
-				},
-			],
-		]);
-		$response = $this->options('home');
-
-		$response->assertSee('Hello George');
-	}
-
-	public function testCallDelete()
-	{
-		$this->withRoutes([
-			[
-				'delete',
-				'home',
-				function () {
-					return 'Hello Wonka';
-				},
-			],
-		]);
-		$response = $this->delete('home');
-
-		$response->assertSee('Hello Wonka');
-	}
-
-	public function testSession()
-	{
-		$response = $this->withRoutes([
-			[
-				'get',
-				'home',
-				function () {
-					return 'Home';
-				},
-			],
-		])->withSession([
-			  'fruit'    => 'apple',
-			  'greeting' => 'hello',
-		  ])->get('home');
-
-		$response->assertSessionHas('fruit', 'apple');
-		$response->assertSessionMissing('popcorn');
-	}
-
-	public function testWithSessionNull()
-	{
-		$_SESSION = [
-			'fruit'    => 'apple',
-			'greeting' => 'hello',
-		];
-
-		$response = $this->withRoutes([
-			[
-				'get',
-				'home',
-				function () {
-					return 'Home';
-				},
-			],
-		])->withSession()->get('home');
-
-		$response->assertSessionHas('fruit', 'apple');
-		$response->assertSessionMissing('popcorn');
-	}
-
-	public function testReturns()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::index',
-			],
-		]);
-		$response = $this->get('home');
-		$response->assertSee('Hi');
-	}
-
-	public function testIgnores()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::cat',
-			],
-		]);
-		$response = $this->get('home');
-		$response->assertEmpty($response->response()->getBody());
-	}
-
-	public function testEchoesWithParams()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::canyon',
-			],
-		]);
-
-		$response = $this->get('home', ['foo' => 'bar']);
-		$response->assertSee('Hello-o-o bar');
-	}
-
-	public function testEchoesWithQuery()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::canyon',
-			],
-		]);
-
-		$response = $this->get('home?foo=bar');
-		$response->assertSee('Hello-o-o bar');
-	}
-
-	public function testCallZeroAsPathGot404()
-	{
-		$this->expectException(PageNotFoundException::class);
-		$this->get('0');
-	}
-
-	public function provideRoutesData()
-	{
-		return [
-			'non parameterized cli'                => [
-				'hello',
-				'Hello::index',
-				'Hello',
-			],
-			'parameterized cli'                    => [
-				'hello/(:any)',
-				'Hello::index/$1',
-				'Hello/index/samsonasik',
-			],
-			'default method index'                 => [
-				'hello',
-				'Hello',
-				'Hello',
-			],
-			'capitalized controller and/or method' => [
-				'hello',
-				'Hello',
-				'HELLO/INDEX',
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider provideRoutesData
-	 */
-	public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet)
-	{
-		$this->expectException(PageNotFoundException::class);
-
-		require_once SUPPORTPATH . 'Controllers/Hello.php';
-
-		$this->withRoutes([
-			[
-				'cli',
-				$from,
-				$to,
-			],
-		]);
-		$this->get($httpGet);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3072
-	 */
-	public function testIsOkWithRedirects()
-	{
-		$this->withRoutes([
-			[
-				'get',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::goaway',
-			],
-		]);
-		$response = $this->get('home');
-		$this->assertTrue($response->isRedirect());
-		$this->assertTrue($response->isOK());
-	}
-
-	public function testCallWithJsonRequest()
-	{
-		$this->withRoutes([
-			[
-				'post',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::echoJson',
-			],
-		]);
-		$response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']);
-		$response->assertOK();
-		$response->assertJSONExact(['foo' => 'bar']);
-	}
-
-	public function testCallWithJsonRequestObject()
-	{
-		$this->withRoutes([
-			[
-				'post',
-				'home',
-				'\Tests\Support\Controllers\Popcorn::echoJson',
-			],
-		]);
-		$response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']);
-		$response->assertOK();
-		$response->assertJSONExact((object) ['foo' => 'bar']);
-	}
-
-	public function testSetupRequestBodyWithParams()
-	{
-		$request = $this->setupRequest('post', 'home');
-
-		$request = $this->withBodyFormat('json')->setRequestBody($request, ['foo1' => 'bar1']);
-
-		$this->assertJsonStringEqualsJsonString(json_encode(['foo1' => 'bar1']), $request->getBody());
-		$this->assertTrue('application/json' === $request->header('Content-Type')->getValue());
-	}
-
-	public function testSetupRequestBodyWithXml()
-	{
-		$request = $this->setupRequest('post', 'home');
-
-		$request = $this->withBodyFormat('xml')->setRequestBody($request, ['foo' => 'bar']);
-
-		$expectedXml = '<?xml version="1.0"?>
+    use FeatureTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->skipEvents();
+    }
+
+    public function testCallGet()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                static function () {
+                    return 'Hello World';
+                },
+            ],
+        ]);
+        $response = $this->get('home');
+
+        $response->assertSee('Hello World');
+        $response->assertDontSee('Again');
+    }
+
+    public function testCallSimpleGet()
+    {
+        $this->withRoutes([
+            [
+                'add',
+                'home',
+                static function () {
+                    return 'Hello Earth';
+                },
+            ],
+        ]);
+        $response = $this->call('get', 'home');
+
+        $this->assertInstanceOf(TestResponse::class, $response);
+        $this->assertInstanceOf(Response::class, $response->response());
+        $this->assertTrue($response->isOK());
+        $this->assertSame('Hello Earth', $response->response()->getBody());
+        $this->assertSame(200, $response->response()->getStatusCode());
+    }
+
+    public function testCallPost()
+    {
+        $this->withRoutes([
+            [
+                'post',
+                'home',
+                static function () {
+                    return 'Hello Mars';
+                },
+            ],
+        ]);
+        $response = $this->post('home');
+
+        $response->assertSee('Hello Mars');
+    }
+
+    public function testCallPostWithBody()
+    {
+        $this->withRoutes([
+            [
+                'post',
+                'home',
+                static function () {
+                    return 'Hello ' . service('request')->getPost('foo') . '!';
+                },
+            ],
+        ]);
+        $response = $this->post('home', ['foo' => 'Mars']);
+
+        $response->assertSee('Hello Mars!');
+    }
+
+    public function testCallPut()
+    {
+        $this->withRoutes([
+            [
+                'put',
+                'home',
+                static function () {
+                    return 'Hello Pluto';
+                },
+            ],
+        ]);
+        $response = $this->put('home');
+
+        $response->assertSee('Hello Pluto');
+    }
+
+    public function testCallPatch()
+    {
+        $this->withRoutes([
+            [
+                'patch',
+                'home',
+                static function () {
+                    return 'Hello Jupiter';
+                },
+            ],
+        ]);
+        $response = $this->patch('home');
+
+        $response->assertSee('Hello Jupiter');
+    }
+
+    public function testCallOptions()
+    {
+        $this->withRoutes([
+            [
+                'options',
+                'home',
+                static function () {
+                    return 'Hello George';
+                },
+            ],
+        ]);
+        $response = $this->options('home');
+
+        $response->assertSee('Hello George');
+    }
+
+    public function testCallDelete()
+    {
+        $this->withRoutes([
+            [
+                'delete',
+                'home',
+                static function () {
+                    return 'Hello Wonka';
+                },
+            ],
+        ]);
+        $response = $this->delete('home');
+
+        $response->assertSee('Hello Wonka');
+    }
+
+    public function testSession()
+    {
+        $response = $this->withRoutes([
+            [
+                'get',
+                'home',
+                static function () {
+                    return 'Home';
+                },
+            ],
+        ])->withSession([
+            'fruit'    => 'apple',
+            'greeting' => 'hello',
+        ])->get('home');
+
+        $response->assertSessionHas('fruit', 'apple');
+        $response->assertSessionMissing('popcorn');
+    }
+
+    public function testWithSessionNull()
+    {
+        $_SESSION = [
+            'fruit'    => 'apple',
+            'greeting' => 'hello',
+        ];
+
+        $response = $this->withRoutes([
+            [
+                'get',
+                'home',
+                static function () {
+                    return 'Home';
+                },
+            ],
+        ])->withSession()->get('home');
+
+        $response->assertSessionHas('fruit', 'apple');
+        $response->assertSessionMissing('popcorn');
+    }
+
+    public function testReturns()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::index',
+            ],
+        ]);
+        $response = $this->get('home');
+        $response->assertSee('Hi');
+    }
+
+    public function testIgnores()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::cat',
+            ],
+        ]);
+        $response = $this->get('home');
+        $response->assertEmpty($response->response()->getBody());
+    }
+
+    public function testEchoesWithParams()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::canyon',
+            ],
+        ]);
+
+        $response = $this->get('home', ['foo' => 'bar']);
+        $response->assertSee('Hello-o-o bar');
+    }
+
+    public function testEchoesWithQuery()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::canyon',
+            ],
+        ]);
+
+        $response = $this->get('home?foo=bar');
+        $response->assertSee('Hello-o-o bar');
+    }
+
+    public function testCallZeroAsPathGot404()
+    {
+        $this->expectException(PageNotFoundException::class);
+        $this->get('0');
+    }
+
+    public function provideRoutesData()
+    {
+        return [
+            'non parameterized cli' => [
+                'hello',
+                'Hello::index',
+                'Hello',
+            ],
+            'parameterized cli' => [
+                'hello/(:any)',
+                'Hello::index/$1',
+                'Hello/index/samsonasik',
+            ],
+            'default method index' => [
+                'hello',
+                'Hello',
+                'Hello',
+            ],
+            'capitalized controller and/or method' => [
+                'hello',
+                'Hello',
+                'HELLO/INDEX',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideRoutesData
+     *
+     * @param mixed $from
+     * @param mixed $to
+     * @param mixed $httpGet
+     */
+    public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet)
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        require_once SUPPORTPATH . 'Controllers/Hello.php';
+
+        $this->withRoutes([
+            [
+                'cli',
+                $from,
+                $to,
+            ],
+        ]);
+        $this->get($httpGet);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3072
+     */
+    public function testIsOkWithRedirects()
+    {
+        $this->withRoutes([
+            [
+                'get',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::goaway',
+            ],
+        ]);
+        $response = $this->get('home');
+        $this->assertTrue($response->isRedirect());
+        $this->assertTrue($response->isOK());
+    }
+
+    public function testCallWithJsonRequest()
+    {
+        $this->withRoutes([
+            [
+                'post',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::echoJson',
+            ],
+        ]);
+        $response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']);
+        $response->assertOK();
+        $response->assertJSONExact(['foo' => 'bar']);
+    }
+
+    public function testCallWithJsonRequestObject()
+    {
+        $this->withRoutes([
+            [
+                'post',
+                'home',
+                '\Tests\Support\Controllers\Popcorn::echoJson',
+            ],
+        ]);
+        $response = $this->withBodyFormat('json')->call('post', 'home', ['foo' => 'bar']);
+        $response->assertOK();
+        $response->assertJSONExact((object) ['foo' => 'bar']);
+    }
+
+    public function testSetupRequestBodyWithParams()
+    {
+        $request = $this->setupRequest('post', 'home');
+
+        $request = $this->withBodyFormat('json')->setRequestBody($request, ['foo1' => 'bar1']);
+
+        $this->assertJsonStringEqualsJsonString(json_encode(['foo1' => 'bar1']), $request->getBody());
+        $this->assertTrue($request->header('Content-Type')->getValue() === 'application/json');
+    }
+
+    public function testSetupRequestBodyWithXml()
+    {
+        $request = $this->setupRequest('post', 'home');
+
+        $request = $this->withBodyFormat('xml')->setRequestBody($request, ['foo' => 'bar']);
+
+        $expectedXml = '<?xml version="1.0"?>
 <response><foo>bar</foo></response>
 ';
 
-		$this->assertEquals($expectedXml, $request->getBody());
-		$this->assertTrue('application/xml' === $request->header('Content-Type')->getValue());
-	}
+        $this->assertSame($expectedXml, $request->getBody());
+        $this->assertTrue($request->header('Content-Type')->getValue() === 'application/xml');
+    }
 
-	public function testSetupRequestBodyWithBody()
-	{
-		$request = $this->setupRequest('post', 'home');
+    public function testSetupRequestBodyWithBody()
+    {
+        $request = $this->setupRequest('post', 'home');
 
-		$request = $this->withBody('test')->setRequestBody($request);
+        $request = $this->withBody('test')->setRequestBody($request);
 
-		$this->assertEquals('test', $request->getBody());
-	}
+        $this->assertSame('test', $request->getBody());
+    }
 }
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 9709456172e3..15b98379fbcf 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -1,17 +1,19 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
-use CodeIgniter\Filters\Exceptions\FilterException;
 use CodeIgniter\Filters\Filters;
-use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\Router\RouteCollection;
-use Config\Filters as FiltersConfig;
-use Config\Services;
 use Tests\Support\Filters\Customfilter;
-use InvalidArgumentException;
-use RuntimeException;
 
 /**
  * FilterTestTrait Test
@@ -21,81 +23,83 @@
  * in test/_support/Filters/Customfilter.php:
  *  - alias: test-customfilter
  *  - class: \Tests\Support\Filters\Customfilter::class
+ *
+ * @internal
  */
-class FilterTestTraitTest extends CIUnitTestCase
+final class FilterTestTraitTest extends CIUnitTestCase
 {
-	use FilterTestTrait;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		// Apply the Custom Filter
-		$this->filtersConfig->aliases['test-customfilter'] = Customfilter::class;
-		$this->filtersConfig->globals['before']            = ['test-customfilter'];
-	}
-
-	public function testDidRunTraitSetUp()
-	{
-		$this->assertTrue($this->doneFilterSetUp);
-		$this->assertInstanceOf(RequestInterface::class, $this->request);
-	}
-
-	public function testGetCallerReturnsClosure()
-	{
-		$caller = $this->getFilterCaller('test-customfilter', 'before');
-
-		$this->assertIsCallable($caller);
-		$this->assertInstanceOf('Closure', $caller);
-	}
-
-	public function testGetCallerInvalidPosition()
-	{
-		$this->expectException('InvalidArgumentException');
-		$this->expectExceptionMessage('Invalid filter position passed: banana');
-
-		$caller = $this->getFilterCaller('test-customfilter', 'banana');
-	}
-
-	public function testCallerUsesClonedInstance()
-	{
-		$caller = $this->getFilterCaller('test-customfilter', 'before');
-		$result = $caller();
-
-		$this->assertObjectNotHasAttribute('url', $this->request);
-
-		$this->assertObjectHasAttribute('url', $result);
-		$this->assertEquals('http://hellowworld.com', $result->url);
-	}
-
-	public function testGetFiltersForRoute()
-	{
-		$result = $this->getFiltersForRoute('/', 'before');
-
-		$this->assertEquals(['test-customfilter'], $result);
-	}
-
-	public function testAssertFilter()
-	{
-		$this->assertFilter('/', 'before', 'test-customfilter');
-		$this->assertFilter('/', 'after', 'toolbar');
-	}
-
-	public function testAssertNotFilter()
-	{
-		$this->assertNotFilter('/', 'before', 'foobar');
-		$this->assertNotFilter('/', 'after', 'test-customfilter');
-	}
-
-	public function testAssertHasFilters()
-	{
-		$this->assertHasFilters('/', 'before');
-	}
-
-	public function testAssertNotHasFilters()
-	{
-		$this->filtersConfig->globals['before'] = [];
-
-		$this->assertNotHasFilters('/', 'before');
-	}
+    use FilterTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        // Apply the Custom Filter
+        $this->filtersConfig->aliases['test-customfilter'] = Customfilter::class;
+        $this->filtersConfig->globals['before']            = ['test-customfilter'];
+    }
+
+    public function testDidRunTraitSetUp()
+    {
+        $this->assertTrue($this->doneFilterSetUp);
+        $this->assertInstanceOf(RequestInterface::class, $this->request);
+    }
+
+    public function testGetCallerReturnsClosure()
+    {
+        $caller = $this->getFilterCaller('test-customfilter', 'before');
+
+        $this->assertIsCallable($caller);
+        $this->assertInstanceOf('Closure', $caller);
+    }
+
+    public function testGetCallerInvalidPosition()
+    {
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Invalid filter position passed: banana');
+
+        $this->getFilterCaller('test-customfilter', 'banana');
+    }
+
+    public function testCallerUsesClonedInstance()
+    {
+        $caller = $this->getFilterCaller('test-customfilter', 'before');
+        $result = $caller();
+
+        $this->assertObjectNotHasAttribute('url', $this->request);
+
+        $this->assertObjectHasAttribute('url', $result);
+        $this->assertSame('http://hellowworld.com', $result->url);
+    }
+
+    public function testGetFiltersForRoute()
+    {
+        $result = $this->getFiltersForRoute('/', 'before');
+
+        $this->assertSame(['test-customfilter'], $result);
+    }
+
+    public function testAssertFilter()
+    {
+        $this->assertFilter('/', 'before', 'test-customfilter');
+        $this->assertFilter('/', 'after', 'toolbar');
+    }
+
+    public function testAssertNotFilter()
+    {
+        $this->assertNotFilter('/', 'before', 'foobar');
+        $this->assertNotFilter('/', 'after', 'test-customfilter');
+    }
+
+    public function testAssertHasFilters()
+    {
+        $this->assertHasFilters('/', 'before');
+    }
+
+    public function testAssertNotHasFilters()
+    {
+        $this->filtersConfig->globals['before'] = [];
+
+        $this->assertNotHasFilters('/', 'before');
+    }
 }
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 61cb6a4ca3be..c2f514695973 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -1,92 +1,116 @@
-<?php namespace CodeIgniter\Test;
+<?php
 
-class ReflectionHelperTest extends CIUnitTestCase
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <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;
+
+/**
+ * @internal
+ */
+final class ReflectionHelperTest extends CIUnitTestCase
 {
-	public function testGetPrivatePropertyWithObject()
-	{
-		$obj    = new __TestForReflectionHelper();
-		$actual = $this->getPrivateProperty($obj, 'private');
-		$this->assertEquals('secret', $actual);
-	}
+    public function testGetPrivatePropertyWithObject()
+    {
+        $obj    = new __TestForReflectionHelper();
+        $actual = $this->getPrivateProperty($obj, 'private');
+        $this->assertSame('secret', $actual);
+    }
 
-	public function testGetPrivatePropertyWithObjectStaticCall()
-	{
-		$obj    = new __TestForReflectionHelper();
-		$actual = CIUnitTestCase::getPrivateProperty($obj, 'private');
-		$this->assertEquals('secret', $actual);
-	}
+    public function testGetPrivatePropertyWithObjectStaticCall()
+    {
+        $obj    = new __TestForReflectionHelper();
+        $actual = CIUnitTestCase::getPrivateProperty($obj, 'private');
+        $this->assertSame('secret', $actual);
+    }
 
-	public function testGetPrivatePropertyWithStatic()
-	{
-		$actual = $this->getPrivateProperty(
-			__TestForReflectionHelper::class, 'static_private'
-		);
-		$this->assertEquals('xyz', $actual);
-	}
+    public function testGetPrivatePropertyWithStatic()
+    {
+        $actual = $this->getPrivateProperty(
+            __TestForReflectionHelper::class,
+            'static_private'
+        );
+        $this->assertSame('xyz', $actual);
+    }
 
-	public function testSetPrivatePropertyWithObject()
-	{
-		$obj = new __TestForReflectionHelper();
-		$this->setPrivateProperty(
-			$obj, 'private', 'open'
-		);
-		$this->assertEquals('open', $obj->getPrivate());
-	}
+    public function testSetPrivatePropertyWithObject()
+    {
+        $obj = new __TestForReflectionHelper();
+        $this->setPrivateProperty(
+            $obj,
+            'private',
+            'open'
+        );
+        $this->assertSame('open', $obj->getPrivate());
+    }
 
-	public function testSetPrivatePropertyWithStatic()
-	{
-		$this->setPrivateProperty(
-			__TestForReflectionHelper::class, 'static_private', 'abc'
-		);
-		$this->assertEquals(
-			'abc', __TestForReflectionHelper::getStaticPrivate()
-		);
-	}
+    public function testSetPrivatePropertyWithStatic()
+    {
+        $this->setPrivateProperty(
+            __TestForReflectionHelper::class,
+            'static_private',
+            'abc'
+        );
+        $this->assertSame(
+            'abc',
+            __TestForReflectionHelper::getStaticPrivate()
+        );
+    }
 
-	public function testGetPrivateMethodInvokerWithObject()
-	{
-		$obj    = new __TestForReflectionHelper();
-		$method = $this->getPrivateMethodInvoker(
-			$obj, 'privateMethod'
-		);
-		$this->assertEquals(
-			'private param1param2', $method('param1', 'param2')
-		);
-	}
+    public function testGetPrivateMethodInvokerWithObject()
+    {
+        $obj    = new __TestForReflectionHelper();
+        $method = $this->getPrivateMethodInvoker(
+            $obj,
+            'privateMethod'
+        );
+        $this->assertSame(
+            'private param1param2',
+            $method('param1', 'param2')
+        );
+    }
 
-	public function testGetPrivateMethodInvokerWithStatic()
-	{
-		$method = $this->getPrivateMethodInvoker(
-			__TestForReflectionHelper::class, 'privateStaticMethod'
-		);
-		$this->assertEquals(
-			'private_static param1param2', $method('param1', 'param2')
-		);
-	}
+    public function testGetPrivateMethodInvokerWithStatic()
+    {
+        $method = $this->getPrivateMethodInvoker(
+            __TestForReflectionHelper::class,
+            'privateStaticMethod'
+        );
+        $this->assertSame(
+            'private_static param1param2',
+            $method('param1', 'param2')
+        );
+    }
 }
 
 class __TestForReflectionHelper
 {
-	private $private               = 'secret';
-	private static $static_private = 'xyz';
+    private $private               = 'secret';
+    private static $static_private = 'xyz';
 
-	public function getPrivate()
-	{
-		return $this->private;
-	}
+    public function getPrivate()
+    {
+        return $this->private;
+    }
 
-	public static function getStaticPrivate()
-	{
-		return self::$static_private;
-	}
+    public static function getStaticPrivate()
+    {
+        return self::$static_private;
+    }
 
-	private function privateMethod($param1, $param2)
-	{
-		return 'private ' . $param1 . $param2;
-	}
+    private function privateMethod($param1, $param2)
+    {
+        return 'private ' . $param1 . $param2;
+    }
 
-	private static function privateStaticMethod($param1, $param2)
-	{
-		return 'private_static ' . $param1 . $param2;
-	}
+    private static function privateStaticMethod($param1, $param2)
+    {
+        return 'private_static ' . $param1 . $param2;
+    }
 }
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 8b1edfcf328a..5374cd61d327 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\Response;
@@ -9,84 +19,77 @@
  * TestCaseTest because it messes with output
  * buffering from PHPUnit, and the individual
  * test cases need to be run as separate processes.
+ *
+ * @internal
  */
-class TestCaseEmissionsTest extends CIUnitTestCase
+final class TestCaseEmissionsTest extends CIUnitTestCase
 {
+    /**
+     * These need to be run as a separate process, since phpunit
+     * has already captured the "normal" output, and we will get
+     * a "Cannot modify headers" message if we try to change
+     * headers or cookies now.
+     *
+     * Furthermore, these tests needs to flush the output buffering
+     * that might be in progress, and start our own output buffer
+     * capture.
+     *
+     * The tests includes a basic sanity check, to make sure that
+     * the body we thought would be sent actually was.
+     */
 
-	/**
-	 * These need to be run as a separate process, since phpunit
-	 * has already captured the "normal" output, and we will get
-	 * a "Cannot modify headers" message if we try to change
-	 * headers or cookies now.
-	 *
-	 * Furthermore, these tests needs to flush the output buffering
-	 * that might be in progress, and start our own output buffer
-	 * capture.
-	 *
-	 * The tests includes a basic sanity check, to make sure that
-	 * the body we thought would be sent actually was.
-	 */
-
-	//--------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeadersEmitted()
-	{
-		$response = new Response(new App());
-		$response->pretend(false);
-
-		$body = 'Hello';
-		$response->setBody($body);
-
-		$response->setCookie('foo', 'bar');
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeadersEmitted()
+    {
+        $response = new Response(new App());
+        $response->pretend(false);
 
-		// send it
-		ob_start();
-		$response->send();
+        $body = 'Hello';
+        $response->setBody($body);
 
-		$buffer = ob_clean();
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
+        $response->setCookie('foo', 'bar');
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
 
-		// and what actually got sent?; test both ways
-		$this->assertHeaderEmitted('Set-Cookie: foo=bar;');
-		$this->assertHeaderEmitted('set-cookie: FOO=bar', true);
-	}
+        // send it
+        ob_start();
+        $response->send();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
 
-	//--------------------------------------------------------------------
-	/**
-	 * @runInSeparateProcess
-	 * @preserveGlobalState  disabled
-	 */
-	public function testHeadersNotEmitted()
-	{
-		$response = new Response(new App());
-		$response->pretend(false);
+        // and what actually got sent?; test both ways
+        $this->assertHeaderEmitted('Set-Cookie: foo=bar;');
+        $this->assertHeaderEmitted('set-cookie: FOO=bar', true);
+    }
 
-		$body = 'Hello';
-		$response->setBody($body);
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeadersNotEmitted()
+    {
+        $response = new Response(new App());
+        $response->pretend(false);
 
-		// what do we think we're about to send?
-		$response->setCookie('foo', 'bar');
-		$this->assertTrue($response->hasCookie('foo'));
-		$this->assertTrue($response->hasCookie('foo', 'bar'));
+        $body = 'Hello';
+        $response->setBody($body);
 
-		// send it
-		ob_start();
-		$response->send();
-		$output = ob_clean(); // what really was sent
-		if (ob_get_level() > 0)
-		{
-			ob_end_clean();
-		}
+        // what do we think we're about to send?
+        $response->setCookie('foo', 'bar');
+        $this->assertTrue($response->hasCookie('foo'));
+        $this->assertTrue($response->hasCookie('foo', 'bar'));
 
-		$this->assertHeaderNotEmitted('Set-Cookie: pop=corn', true);
-	}
+        // send it
+        ob_start();
+        $response->send(); // what really was sent
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
 
+        $this->assertHeaderNotEmitted('Set-Cookie: pop=corn', true);
+    }
 }
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index b2c4532abf6d..5db2832fa12d 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\CLI\CLI;
@@ -7,104 +17,87 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\App;
 
-class TestCaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TestCaseTest extends CIUnitTestCase
 {
-
-	//  protected function tearDown(): void
-	//  {
-	//      $buffer = ob_clean();
-	//      if (ob_get_level() > 0)
-	//      {
-	//          ob_end_clean();
-	//      }
-	//  }
-	//
-	public function testGetPrivatePropertyWithObject()
-	{
-		$obj    = new __TestForReflectionHelper();
-		$actual = $this->getPrivateProperty($obj, 'private');
-		$this->assertEquals('secret', $actual);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testLogging()
-	{
-		log_message('error', 'Some variable did not contain a value.');
-		$this->assertLogged('error', 'Some variable did not contain a value.');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEventTriggering()
-	{
-		Events::on('foo', function ($arg) use (&$result) {
-			$result = $arg;
-		});
-
-		Events::trigger('foo', 'bar');
-
-		$this->assertEventTriggered('foo');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testStreamFilter()
-	{
-		CITestStreamFilter::$buffer = '';
-		$this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		CLI::write('first.');
-		$expected = "first.\n";
-		$this->assertEquals($expected, CITestStreamFilter::$buffer);
-		stream_filter_remove($this->stream_filter);
-	}
-
-	//--------------------------------------------------------------------
-	/**
-	 * PHPunit emits headers before we get nominal control of
-	 * the output stream, making header testing awkward, to say
-	 * the least. This test is intended to make sure that this
-	 * is happening as expected.
-	 *
-	 * TestCaseEmissionsTest is intended to circumvent PHPunit,
-	 * and allow us to test our own header emissions.
-	 */
-	public function testPHPUnitHeadersEmitted()
-	{
-		$response = new Response(new App());
-		$response->pretend(true);
-
-		$body = 'Hello';
-		$response->setBody($body);
-
-		ob_start();
-		$response->send();
-		ob_end_clean();
-
-		// Did PHPunit do its thing?
-		$this->assertHeaderEmitted('Content-type: text/html;');
-		$this->assertHeaderNotEmitted('Set-Cookie: foo=bar;');
-	}
-
-	//--------------------------------------------------------------------
-	public function testCloseEnough()
-	{
-		$this->assertCloseEnough(1, 1);
-		$this->assertCloseEnough(1, 0);
-		$this->assertCloseEnough(1, 2);
-	}
-
-	public function testCloseEnoughString()
-	{
-		$this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('09:59:59'));
-		$this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('10:00:00'));
-		$this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('10:00:01'));
-	}
-
-	public function testCloseEnoughStringBadLength()
-	{
-		$result = $this->assertCloseEnoughString('apples & oranges', 'apples');
-		$this->assertFalse($result, 'Different string lengths should have returned false');
-	}
-
+    public function testGetPrivatePropertyWithObject()
+    {
+        $obj    = new __TestForReflectionHelper();
+        $actual = $this->getPrivateProperty($obj, 'private');
+        $this->assertSame('secret', $actual);
+    }
+
+    public function testLogging()
+    {
+        log_message('error', 'Some variable did not contain a value.');
+        $this->assertLogged('error', 'Some variable did not contain a value.');
+    }
+
+    public function testEventTriggering()
+    {
+        Events::on('foo', static function ($arg) use (&$result) {
+            $result = $arg;
+        });
+
+        Events::trigger('foo', 'bar');
+
+        $this->assertEventTriggered('foo');
+    }
+
+    public function testStreamFilter()
+    {
+        CITestStreamFilter::$buffer = '';
+        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        CLI::write('first.');
+        $expected = "first.\n";
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+        stream_filter_remove($this->stream_filter);
+    }
+
+    /**
+     * PHPunit emits headers before we get nominal control of
+     * the output stream, making header testing awkward, to say
+     * the least. This test is intended to make sure that this
+     * is happening as expected.
+     *
+     * TestCaseEmissionsTest is intended to circumvent PHPunit,
+     * and allow us to test our own header emissions.
+     */
+    public function testPHPUnitHeadersEmitted()
+    {
+        $response = new Response(new App());
+        $response->pretend(true);
+
+        $body = 'Hello';
+        $response->setBody($body);
+
+        ob_start();
+        $response->send();
+        ob_end_clean();
+
+        $this->assertHeaderEmitted('Content-type: text/html;');
+        $this->assertHeaderNotEmitted('Set-Cookie: foo=bar;');
+    }
+
+    public function testCloseEnough()
+    {
+        $this->assertCloseEnough(1, 1);
+        $this->assertCloseEnough(1, 0);
+        $this->assertCloseEnough(1, 2);
+    }
+
+    public function testCloseEnoughString()
+    {
+        $this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('09:59:59'));
+        $this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('10:00:00'));
+        $this->assertCloseEnoughString(strtotime('10:00:00'), strtotime('10:00:01'));
+    }
+
+    public function testCloseEnoughStringBadLength()
+    {
+        $result = $this->assertCloseEnoughString('apples & oranges', 'apples');
+        $this->assertFalse($result, 'Different string lengths should have returned false');
+    }
 }
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 24ef181ebd80..5bb3da21f1e7 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -1,435 +1,440 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 use Config\Services;
 use PHPUnit\Framework\AssertionFailedError;
 
-class TestResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TestResponseTest extends CIUnitTestCase
 {
-	/**
-	 * @var TestResponse
-	 */
-	protected $testResponse;
-
-	/**
-	 * @var ResponseInterface
-	 */
-	protected $response;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-	}
-
-	/**
-	 * @dataProvider statusCodeProvider
-	 */
-	public function testIsOK(int $code, bool $isOk)
-	{
-		$this->getTestResponse('Hello World');
-		$this->response->setStatusCode($code);
-
-		$this->assertEquals($isOk, $this->testResponse->isOK());
-	}
-
-	/**
-	 * Provides status codes and their expected "OK"
-	 */
-	public function statusCodeProvider(): array
-	{
-		return [
-			[
-				100,
-				false,
-			],
-			[
-				200,
-				true,
-			],
-			[
-				201,
-				true,
-			],
-			[
-				300,
-				true,
-			], // Redirects are acceptable if the body is empty
-			[
-				301,
-				true,
-			],
-			[
-				400,
-				false,
-			],
-			[
-				401,
-				false,
-			],
-			[
-				599,
-				false,
-			],
-		];
-	}
-
-	public function testIsOKEmpty()
-	{
-		$this->getTestResponse('Hi there');
-		$this->response->setStatusCode(200);
-		$this->response->setBody('');
-
-		$this->assertFalse($this->testResponse->isOK());
-	}
-
-	public function testAssertSee()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->testResponse->assertSee('Hello');
-		$this->testResponse->assertSee('World', 'h1');
-	}
-
-	public function testAssertDontSee()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->testResponse->assertDontSee('Worlds');
-		$this->testResponse->assertDontSee('World', 'h2');
-	}
-
-	public function testAssertSeeElement()
-	{
-		$this->getTestResponse('<h1 class="header">Hello <span>World</span></h1>');
-
-		$this->testResponse->assertSeeElement('h1');
-		$this->testResponse->assertSeeElement('span');
-		$this->testResponse->assertSeeElement('h1.header');
-	}
-
-	public function testAssertDontSeeElement()
-	{
-		$this->getTestResponse('<h1 class="header">Hello <span>World</span></h1>');
-
-		$this->testResponse->assertDontSeeElement('h2');
-		$this->testResponse->assertDontSeeElement('.span');
-		$this->testResponse->assertDontSeeElement('h1.para');
-	}
-
-	public function testAssertSeeLink()
-	{
-		$this->getTestResponse('<h1 class="header"><a href="http://example.com/hello">Hello</a> <span>World</span></h1>');
-
-		$this->testResponse->assertSeeElement('h1');
-		$this->testResponse->assertSeeLink('Hello');
-	}
-
-	public function testAssertSeeInField()
-	{
-		$this->getTestResponse('<html><body><input type="text" name="user[name]" value="Foobar"></body></html>');
-
-		$this->testResponse->assertSeeInField('user[name]', 'Foobar');
-	}
-
-	public function testAssertRedirectFail()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
-		$this->assertFalse($this->testResponse->isRedirect());
-		$this->testResponse->assertNotRedirect();
-	}
-
-	public function testAssertRedirectSuccess()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->testResponse->setResponse(new RedirectResponse(new App()));
-
-		$this->assertTrue($this->testResponse->response() instanceof RedirectResponse);
-		$this->assertTrue($this->testResponse->isRedirect());
-		$this->testResponse->assertRedirect();
-	}
-
-	public function testAssertRedirectSuccessWithoutRedirectResponse()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->response->redirect('foo/bar');
-
-		$this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
-		$this->assertTrue($this->testResponse->isRedirect());
-		$this->testResponse->assertRedirect();
-		$this->assertEquals('foo/bar', $this->testResponse->getRedirectUrl());
-	}
-
-	public function testGetRedirectUrlReturnsUrl()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->testResponse->setResponse(new RedirectResponse(new App()));
-		$this->testResponse->response()->redirect('foo/bar');
-
-		$this->assertEquals('foo/bar', $this->testResponse->getRedirectUrl());
-	}
-
-	public function testGetRedirectUrlReturnsNull()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->assertNull($this->testResponse->getRedirectUrl());
-	}
-
-	public function testRedirectToSuccess()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->testResponse->setResponse(new RedirectResponse(new App()));
-		$this->testResponse->response()->redirect('foo/bar');
-
-		$this->testResponse->assertRedirectTo('foo/bar');
-	}
-
-	public function testRedirectToSuccessFullURL()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->testResponse->setResponse(new RedirectResponse(new App()));
-		$this->testResponse->response()->redirect('http://foo.com/bar');
-
-		$this->testResponse->assertRedirectTo('http://foo.com/bar');
-	}
-
-	public function testRedirectToSuccessMixedURL()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->testResponse->setResponse(new RedirectResponse(new App()));
-		$this->testResponse->response()->redirect('bar');
-
-		$this->testResponse->assertRedirectTo('http://example.com/index.php/bar');
-	}
-
-	public function testAssertStatus()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>', ['statusCode' => 201]);
-
-		$this->testResponse->assertStatus(201);
-	}
-
-	/**
-	 * @dataProvider statusCodeProvider
-	 */
-	public function testAssertIsOK(int $code, bool $isOk)
-	{
-		$this->getTestResponse('<h1>Hello World</h1>', ['statusCode' => $code]);
-
-		if ($isOk)
-		{
-			$this->testResponse->assertOK();
-		}
-		else
-		{
-			$this->testResponse->assertNotOK();
-		}
-	}
-
-	public function testAssertSessionHas()
-	{
-		$_SESSION['foo'] = 'bar';
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->testResponse->assertSessionHas('foo');
-		$this->testResponse->assertSessionHas('foo', 'bar');
-	}
-
-	public function testAssertSessionMissing()
-	{
-		$_SESSION = [];
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->testResponse->assertSessionMissing('foo');
-	}
-
-	public function testAssertHeader()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
-
-		$this->testResponse->assertHeader('foo');
-		$this->testResponse->assertHeader('foo', 'bar');
-	}
-
-	public function testAssertHeaderMissing()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
-
-		$this->testResponse->assertHeader('foo');
-		$this->testResponse->assertHeaderMissing('banana');
-	}
-
-	public function testAssertCookie()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->response = $this->response->setCookie('foo', 'bar');
-
-		$this->testResponse->assertCookie('foo');
-		$this->testResponse->assertCookie('foo', 'bar');
-	}
-
-	public function testAssertCookieMissing()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->response = $this->response->setCookie('foo', 'bar');
-
-		$this->testResponse->assertCookieMissing('bar');
-	}
-
-	public function testAssertCookieExpired()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-
-		$this->response = $this->response->setCookie('foo', 'bar', strtotime('-1 day'));
-
-		$this->testResponse->assertCookieExpired('foo');
-	}
-
-	public function testGetJSON()
-	{
-		$this->getTestResponse(['foo' => 'bar']);
-		$formatter = Services::format()->getFormatter('application/json');
-
-		$this->assertEquals($formatter->format(['foo' => 'bar']), $this->testResponse->getJSON());
-	}
-
-	public function testEmptyJSON()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->response->setJSON('', true);
-
-		// this should be "" - json_encode('');
-		$this->assertEquals('""', $this->testResponse->getJSON());
-	}
-
-	public function testFalseJSON()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->response->setJSON(false, true);
-
-		// this should be FALSE - json_encode(false)
-		$this->assertEquals('false', $this->testResponse->getJSON());
-	}
-
-	public function testTrueJSON()
-	{
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->response->setJSON(true, true);
-
-		// this should be TRUE - json_encode(true)
-		$this->assertEquals('true', $this->testResponse->getJSON());
-	}
-
-	public function testInvalidJSON()
-	{
-		$tmp = ' test " case ';
-		$this->getTestResponse('<h1>Hello World</h1>');
-		$this->response->setBody($tmp);
-
-		// this should be FALSE - invalid JSON - will see if this is working that way ;-)
-		$this->assertFalse($this->response->getBody() === $this->testResponse->getJSON());
-	}
-
-	public function testGetXML()
-	{
-		$this->getTestResponse(['foo' => 'bar']);
-		$formatter = Services::format()->getFormatter('application/xml');
-
-		$this->assertEquals($formatter->format(['foo' => 'bar']), $this->testResponse->getXML());
-	}
-
-	public function testJsonFragment()
-	{
-		$this->getTestResponse([
-			'config' => [
-				'key-a',
-				'key-b',
-			],
-		]);
-
-		$this->testResponse->assertJSONFragment(['config' => ['key-a']]);
-		$this->testResponse->assertJSONFragment(['config' => ['key-a']], true);
-	}
-
-	public function testAssertJSONFragmentFollowingAssertArraySubset()
-	{
-		$this->getTestResponse([
-			'config' => '124',
-		]);
-
-		$this->testResponse->assertJSONFragment(['config' => 124]); // must fail on strict
-		$this->testResponse->assertJSONFragment(['config' => '124'], true);
-	}
-
-	public function testAssertJSONFragmentFailsGracefullyWhenNotGivenJson()
-	{
-		$this->getTestResponse('<h1>Hello World!</h1>');
-
-		$this->expectException(AssertionFailedError::class);
-		$this->expectExceptionMessage('Response does not have valid json');
-
-		$this->testResponse->assertJSONFragment(['foo' => 'bar']);
-	}
-
-	public function testJsonExact()
-	{
-		$data = [
-			'config' => [
-				'key-a',
-				'key-b',
-			],
-		];
-
-		$this->getTestResponse($data);
-
-		$this->testResponse->assertJSONExact($data);
-	}
-
-	public function testJsonExactString()
-	{
-		$data = [
-			'config' => [
-				'key-a',
-				'key-b',
-			],
-		];
-
-		$this->getTestResponse($data);
-		$formatter = Services::format()->getFormatter('application/json');
-
-		$this->testResponse->assertJSONExact($formatter->format($data));
-	}
-
-	protected function getTestResponse($body = null, array $responseOptions = [], array $headers = [])
-	{
-		$this->response = new Response(new App());
-		$this->response->setBody($body);
-
-		foreach ($responseOptions as $key => $value)
-		{
-			$method = 'set' . ucfirst($key);
-
-			if (method_exists($this->response, $method))
-			{
-				$this->response = $this->response->$method($value);
-			}
-		}
-
-		foreach ($headers as $key => $value)
-		{
-			$this->response = $this->response->setHeader($key, $value);
-		}
-
-		$this->testResponse = new TestResponse($this->response);
-	}
+    /**
+     * @var TestResponse
+     */
+    protected $testResponse;
+
+    /**
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+    }
+
+    /**
+     * @dataProvider statusCodeProvider
+     */
+    public function testIsOK(int $code, bool $isOk)
+    {
+        $this->getTestResponse('Hello World');
+        $this->response->setStatusCode($code);
+
+        $this->assertSame($isOk, $this->testResponse->isOK());
+    }
+
+    /**
+     * Provides status codes and their expected "OK"
+     */
+    public function statusCodeProvider(): array
+    {
+        return [
+            [
+                100,
+                false,
+            ],
+            [
+                200,
+                true,
+            ],
+            [
+                201,
+                true,
+            ],
+            [
+                300,
+                true,
+            ], // Redirects are acceptable if the body is empty
+            [
+                301,
+                true,
+            ],
+            [
+                400,
+                false,
+            ],
+            [
+                401,
+                false,
+            ],
+            [
+                599,
+                false,
+            ],
+        ];
+    }
+
+    public function testIsOKEmpty()
+    {
+        $this->getTestResponse('Hi there');
+        $this->response->setStatusCode(200);
+        $this->response->setBody('');
+
+        $this->assertFalse($this->testResponse->isOK());
+    }
+
+    public function testAssertSee()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->testResponse->assertSee('Hello');
+        $this->testResponse->assertSee('World', 'h1');
+    }
+
+    public function testAssertDontSee()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->testResponse->assertDontSee('Worlds');
+        $this->testResponse->assertDontSee('World', 'h2');
+    }
+
+    public function testAssertSeeElement()
+    {
+        $this->getTestResponse('<h1 class="header">Hello <span>World</span></h1>');
+
+        $this->testResponse->assertSeeElement('h1');
+        $this->testResponse->assertSeeElement('span');
+        $this->testResponse->assertSeeElement('h1.header');
+    }
+
+    public function testAssertDontSeeElement()
+    {
+        $this->getTestResponse('<h1 class="header">Hello <span>World</span></h1>');
+
+        $this->testResponse->assertDontSeeElement('h2');
+        $this->testResponse->assertDontSeeElement('.span');
+        $this->testResponse->assertDontSeeElement('h1.para');
+    }
+
+    public function testAssertSeeLink()
+    {
+        $this->getTestResponse('<h1 class="header"><a href="http://example.com/hello">Hello</a> <span>World</span></h1>');
+
+        $this->testResponse->assertSeeElement('h1');
+        $this->testResponse->assertSeeLink('Hello');
+    }
+
+    public function testAssertSeeInField()
+    {
+        $this->getTestResponse('<html><body><input type="text" name="user[name]" value="Foobar"></body></html>');
+
+        $this->testResponse->assertSeeInField('user[name]', 'Foobar');
+    }
+
+    public function testAssertRedirectFail()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertFalse($this->testResponse->isRedirect());
+        $this->testResponse->assertNotRedirect();
+    }
+
+    public function testAssertRedirectSuccess()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->testResponse->setResponse(new RedirectResponse(new App()));
+
+        $this->assertTrue($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertTrue($this->testResponse->isRedirect());
+        $this->testResponse->assertRedirect();
+    }
+
+    public function testAssertRedirectSuccessWithoutRedirectResponse()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->response->redirect('foo/bar');
+
+        $this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertTrue($this->testResponse->isRedirect());
+        $this->testResponse->assertRedirect();
+        $this->assertSame('foo/bar', $this->testResponse->getRedirectUrl());
+    }
+
+    public function testGetRedirectUrlReturnsUrl()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->testResponse->setResponse(new RedirectResponse(new App()));
+        $this->testResponse->response()->redirect('foo/bar');
+
+        $this->assertSame('foo/bar', $this->testResponse->getRedirectUrl());
+    }
+
+    public function testGetRedirectUrlReturnsNull()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->assertNull($this->testResponse->getRedirectUrl());
+    }
+
+    public function testRedirectToSuccess()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->testResponse->setResponse(new RedirectResponse(new App()));
+        $this->testResponse->response()->redirect('foo/bar');
+
+        $this->testResponse->assertRedirectTo('foo/bar');
+    }
+
+    public function testRedirectToSuccessFullURL()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->testResponse->setResponse(new RedirectResponse(new App()));
+        $this->testResponse->response()->redirect('http://foo.com/bar');
+
+        $this->testResponse->assertRedirectTo('http://foo.com/bar');
+    }
+
+    public function testRedirectToSuccessMixedURL()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->testResponse->setResponse(new RedirectResponse(new App()));
+        $this->testResponse->response()->redirect('bar');
+
+        $this->testResponse->assertRedirectTo('http://example.com/index.php/bar');
+    }
+
+    public function testAssertStatus()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>', ['statusCode' => 201]);
+
+        $this->testResponse->assertStatus(201);
+    }
+
+    /**
+     * @dataProvider statusCodeProvider
+     */
+    public function testAssertIsOK(int $code, bool $isOk)
+    {
+        $this->getTestResponse('<h1>Hello World</h1>', ['statusCode' => $code]);
+
+        if ($isOk) {
+            $this->testResponse->assertOK();
+        } else {
+            $this->testResponse->assertNotOK();
+        }
+    }
+
+    public function testAssertSessionHas()
+    {
+        $_SESSION['foo'] = 'bar';
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->testResponse->assertSessionHas('foo');
+        $this->testResponse->assertSessionHas('foo', 'bar');
+    }
+
+    public function testAssertSessionMissing()
+    {
+        $_SESSION = [];
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->testResponse->assertSessionMissing('foo');
+    }
+
+    public function testAssertHeader()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
+
+        $this->testResponse->assertHeader('foo');
+        $this->testResponse->assertHeader('foo', 'bar');
+    }
+
+    public function testAssertHeaderMissing()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>', [], ['foo' => 'bar']);
+
+        $this->testResponse->assertHeader('foo');
+        $this->testResponse->assertHeaderMissing('banana');
+    }
+
+    public function testAssertCookie()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->response = $this->response->setCookie('foo', 'bar');
+
+        $this->testResponse->assertCookie('foo');
+        $this->testResponse->assertCookie('foo', 'bar');
+    }
+
+    public function testAssertCookieMissing()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->response = $this->response->setCookie('foo', 'bar');
+
+        $this->testResponse->assertCookieMissing('bar');
+    }
+
+    public function testAssertCookieExpired()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+
+        $this->response = $this->response->setCookie('foo', 'bar', strtotime('-1 day'));
+
+        $this->testResponse->assertCookieExpired('foo');
+    }
+
+    public function testGetJSON()
+    {
+        $this->getTestResponse(['foo' => 'bar']);
+        $formatter = Services::format()->getFormatter('application/json');
+
+        $this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getJSON());
+    }
+
+    public function testEmptyJSON()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->response->setJSON('', true);
+
+        // this should be "" - json_encode('');
+        $this->assertSame('""', $this->testResponse->getJSON());
+    }
+
+    public function testFalseJSON()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->response->setJSON(false, true);
+
+        // this should be FALSE - json_encode(false)
+        $this->assertSame('false', $this->testResponse->getJSON());
+    }
+
+    public function testTrueJSON()
+    {
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->response->setJSON(true, true);
+
+        // this should be TRUE - json_encode(true)
+        $this->assertSame('true', $this->testResponse->getJSON());
+    }
+
+    public function testInvalidJSON()
+    {
+        $tmp = ' test " case ';
+        $this->getTestResponse('<h1>Hello World</h1>');
+        $this->response->setBody($tmp);
+
+        // this should be FALSE - invalid JSON - will see if this is working that way ;-)
+        $this->assertFalse($this->response->getBody() === $this->testResponse->getJSON());
+    }
+
+    public function testGetXML()
+    {
+        $this->getTestResponse(['foo' => 'bar']);
+        $formatter = Services::format()->getFormatter('application/xml');
+
+        $this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getXML());
+    }
+
+    public function testJsonFragment()
+    {
+        $this->getTestResponse([
+            'config' => [
+                'key-a',
+                'key-b',
+            ],
+        ]);
+
+        $this->testResponse->assertJSONFragment(['config' => ['key-a']]);
+        $this->testResponse->assertJSONFragment(['config' => ['key-a']], true);
+    }
+
+    public function testAssertJSONFragmentFollowingAssertArraySubset()
+    {
+        $this->getTestResponse([
+            'config' => '124',
+        ]);
+
+        $this->testResponse->assertJSONFragment(['config' => 124]); // must fail on strict
+        $this->testResponse->assertJSONFragment(['config' => '124'], true);
+    }
+
+    public function testAssertJSONFragmentFailsGracefullyWhenNotGivenJson()
+    {
+        $this->getTestResponse('<h1>Hello World!</h1>');
+
+        $this->expectException(AssertionFailedError::class);
+        $this->expectExceptionMessage('Response does not have valid json');
+
+        $this->testResponse->assertJSONFragment(['foo' => 'bar']);
+    }
+
+    public function testJsonExact()
+    {
+        $data = [
+            'config' => [
+                'key-a',
+                'key-b',
+            ],
+        ];
+
+        $this->getTestResponse($data);
+
+        $this->testResponse->assertJSONExact($data);
+    }
+
+    public function testJsonExactString()
+    {
+        $data = [
+            'config' => [
+                'key-a',
+                'key-b',
+            ],
+        ];
+
+        $this->getTestResponse($data);
+        $formatter = Services::format()->getFormatter('application/json');
+
+        $this->testResponse->assertJSONExact($formatter->format($data));
+    }
+
+    protected function getTestResponse($body = null, array $responseOptions = [], array $headers = [])
+    {
+        $this->response = new Response(new App());
+        $this->response->setBody($body);
+
+        foreach ($responseOptions as $key => $value) {
+            $method = 'set' . ucfirst($key);
+
+            if (method_exists($this->response, $method)) {
+                $this->response = $this->response->{$method}($value);
+            }
+        }
+
+        foreach ($headers as $key => $value) {
+            $this->response = $this->response->setHeader($key, $value);
+        }
+
+        $this->testResponse = new TestResponse($this->response);
+    }
 }
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 5a82dad066e3..a7905a2f59bf 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -1,137 +1,149 @@
-<?php namespace CodeIgniter\Throttle;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Throttle;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
 
-class ThrottleTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ThrottleTest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->cache = new MockCache();
+    }
 
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->cache = new MockCache();
-	}
-
-	public function testTokenTime()
-	{
-		$throttler = new Throttler($this->cache);
-
-		// tokenTime should be 0 to start
-		$this->assertEquals(0, $throttler->getTokenTime());
+    public function testTokenTime()
+    {
+        $throttler = new Throttler($this->cache);
 
-		// set $rate
-		$rate = 1;    // allow 1 request per minute
+        // tokenTime should be 0 to start
+        $this->assertSame(0, $throttler->getTokenTime());
 
-		// first check just creates a bucket, so tokenTime should be 0
-		$throttler->check('127.0.0.1', $rate, MINUTE);
-		$this->assertEquals(0, $throttler->getTokenTime());
+        // set $rate
+        $rate = 1;    // allow 1 request per minute
+
+        // first check just creates a bucket, so tokenTime should be 0
+        $throttler->check('127.0.0.1', $rate, MINUTE);
+        $this->assertSame(0, $throttler->getTokenTime());
+
+        // additional check affects tokenTime, so tokenTime should be 1 or greater
+        $throttler->check('127.0.0.1', $rate, MINUTE);
+        $this->assertGreaterThanOrEqual(1, $throttler->getTokenTime());
+    }
 
-		// additional check affects tokenTime, so tokenTime should be 1 or greater
-		$throttler->check('127.0.0.1', $rate, MINUTE);
-		$this->assertGreaterThanOrEqual(1, $throttler->getTokenTime());
-	}
+    public function testIPSavesBucket()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testIPSavesBucket()
-	{
-		$throttler = new Throttler($this->cache);
+        $this->assertTrue($throttler->check('127.0.0.1', 60, MINUTE));
+        $this->assertSame(59, $this->cache->get('throttler_127.0.0.1'));
+    }
 
-		$this->assertTrue($throttler->check('127.0.0.1', 60, MINUTE));
-		$this->assertEquals(59, $this->cache->get('throttler_127.0.0.1'));
-	}
+    public function testRemove()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testRemove()
-	{
-		$throttler = new Throttler($this->cache);
+        $this->assertTrue($throttler->check('127.0.0.1', 1, MINUTE));
+        $this->assertFalse($throttler->check('127.0.0.1', 1, MINUTE));
 
-		$this->assertTrue($throttler->check('127.0.0.1', 1, MINUTE));
-		$this->assertFalse($throttler->check('127.0.0.1', 1, MINUTE));
+        $throttler->remove('127.0.0.1');
 
-		$throttler->remove('127.0.0.1');
+        $this->assertNull($this->cache->get('throttler_127.0.0.1'));
+        $this->assertTrue($throttler->check('127.0.0.1', 1, MINUTE));
+    }
 
-		$this->assertNull($this->cache->get('throttler_127.0.0.1'));
-		$this->assertTrue($throttler->check('127.0.0.1', 1, MINUTE));
-	}
+    /**
+     * @group single
+     */
+    public function testDecrementsValues()
+    {
+        $throttler = new Throttler($this->cache);
 
-	/**
-	 * @group single
-	 */
-	public function testDecrementsValues()
-	{
-		$throttler = new Throttler($this->cache);
+        $throttler->check('127.0.0.1', 60, MINUTE);
+        $throttler->check('127.0.0.1', 60, MINUTE);
+        $throttler->check('127.0.0.1', 60, MINUTE);
 
-		$throttler->check('127.0.0.1', 60, MINUTE);
-		$throttler->check('127.0.0.1', 60, MINUTE);
-		$throttler->check('127.0.0.1', 60, MINUTE);
+        $this->assertSame(57, $this->cache->get('throttler_127.0.0.1'));
+    }
 
-		$this->assertEquals(57, $this->cache->get('throttler_127.0.0.1'));
-	}
+    public function testReturnsFalseIfBucketEmpty()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testReturnsFalseIfBucketEmpty()
-	{
-		$throttler = new Throttler($this->cache);
+        $throttler->check('127.0.0.1', 1, MINUTE);
 
-		$throttler->check('127.0.0.1', 1, MINUTE);
+        $this->assertFalse($throttler->check('127.0.0.1', 1, MINUTE));
+    }
 
-		$this->assertFalse($throttler->check('127.0.0.1', 1, MINUTE));
-	}
+    public function testCosting()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testCosting()
-	{
-		$throttler = new Throttler($this->cache);
+        $rate = 60; // allow 1 per second
+        $cost = 10;
+        $throttler->check('127.0.0.1', $rate, MINUTE, $cost);
+        $this->assertSame($rate - $cost, $this->cache->get('throttler_127.0.0.1'));
+    }
 
-		$rate = 60; // allow 1 per second
-		$cost = 10;
-		$throttler->check('127.0.0.1', $rate, MINUTE, $cost);
-		$this->assertEquals($rate - $cost, $this->cache->get('throttler_127.0.0.1'));
-	}
+    public function testUnderload()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testUnderload()
-	{
-		$throttler = new Throttler($this->cache);
+        $rate = 120; // allow 2 per second, in theory
+        $throttler->check('127.0.0.1', $rate, MINUTE);
+        $this->assertSame($rate - 1, $this->cache->get('throttler_127.0.0.1'));
 
-		$rate = 120; // allow 2 per second, in theory
-		$throttler->check('127.0.0.1', $rate, MINUTE);
-		$this->assertEquals($rate - 1, $this->cache->get('throttler_127.0.0.1'));
+        $throttler->setTestTime(strtotime('+2 seconds')); // should be more tokens available
+        $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE));
+        // but the bucket should not be over-filled
+        $this->assertSame($rate - 1, $this->cache->get('throttler_127.0.0.1'));
+    }
 
-		$throttler->setTestTime(strtotime('+2 seconds')); // should be more tokens available
-		$this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE));
-		// but the bucket should not be over-filled
-		$this->assertEquals($rate - 1, $this->cache->get('throttler_127.0.0.1'));
-	}
+    public function testOverload()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testOverload()
-	{
-		$throttler = new Throttler($this->cache);
+        $rate = 60; // allow 1 per second, in theory
+        $cost = 100; // except we blow it
+        // but the first request succeeds
+        $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
+        // and a second one doesn't
+        $this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
+    }
 
-		$rate = 60; // allow 1 per second, in theory
-		$cost = 100; // except we blow it
-		// but the first request succeeds
-		$this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
-		// and a second one doesn't
-		$this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
-	}
+    public function testFlooding()
+    {
+        $throttler = new Throttler($this->cache);
 
-	public function testFlooding()
-	{
-		$throttler = new Throttler($this->cache);
+        $rate = 60; // allow 1 per second after the bucket is emptied
+        $cost = 1;
 
-		$rate = 60; // allow 1 per second after the bucket is emptied
-		$cost = 1;
-
-		// Blow through the bucket in a natural way., with 1 second "grace"
-		for ($i = 0; $i <= $rate; $i++)
-		{
-			$throttler->check('127.0.0.1', $rate, MINUTE, $cost);
-		}
-
-		// Should be empty now.
-		$this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
-		$this->assertEquals(0, $this->cache->get('throttler_127.0.0.1'));
-
-		$throttler = $throttler->setTestTime(strtotime('+10 seconds'));
-
-		$this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
-		$this->assertEquals(10, round($this->cache->get('throttler_127.0.0.1')));
-	}
+        // Blow through the bucket in a natural way., with 1 second "grace"
+        for ($i = 0; $i <= $rate; $i++) {
+            $throttler->check('127.0.0.1', $rate, MINUTE, $cost);
+        }
+
+        // Should be empty now.
+        $this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
+        $this->assertSame(0, $this->cache->get('throttler_127.0.0.1'));
+
+        $throttler = $throttler->setTestTime(strtotime('+10 seconds'));
+
+        $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
+        $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1')));
+    }
 }
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index d9796f5e0164..ad242ee273c7 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -1,137 +1,151 @@
-<?php namespace CodeIgniter\Typography;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Typography;
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class TypographyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TypographyTest extends CIUnitTestCase
 {
-	protected $typography;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->typography = new Typography();
-	}
-
-	public function testAutoTypographyEmptyString()
-	{
-		$this->assertEquals('', $this->typography->autoTypography(''));
-	}
-
-	public function testAutoTypographyNormalString()
-	{
-		$strs = [
-			'this sentence has no punctuations' => '<p>this sentence has no punctuations</p>',
-			'Hello World !!, How are you?'      => '<p>Hello World !!, How are you?</p>',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testAutoTypographyMultipleSpaces()
-	{
-		$strs = [
-			'this sentence has  a double spacing'              => '<p>this sentence has  a double spacing</p>',
-			'this  sentence   has    a     weird      spacing' => '<p>this  sentence &nbsp; has &nbsp;  a &nbsp;   weird &nbsp;  &nbsp; spacing</p>',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testAutoTypographyLineBreaks()
-	{
-		$strs = [
-			"\n"                                   => "\n\n<p>&nbsp;</p>",
-			"\n\n"                                 => "\n\n<p>&nbsp;</p>",
-			"\n\n\n"                               => "\n\n<p>&nbsp;</p>",
-			"Line One\n"                           => "<p>Line One</p>\n\n",
-			"Line One\nLine Two"                   => "<p>Line One<br />\nLine Two</p>",
-			"Line One\r\n"                         => "<p>Line One</p>\n\n",
-			"Line One\r\nLine Two"                 => "<p>Line One<br />\nLine Two</p>",
-			"Line One\r"                           => "<p>Line One</p>\n\n",
-			"Line One\rLine Two"                   => "<p>Line One<br />\nLine Two</p>",
-			"Line One\n\nLine Two\n\n\nLine Three" => "<p>Line One</p>\n\n<p>Line Two</p>\n\n<p>Line Three</p>",
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testAutoTypographyReduceLineBreaks()
-	{
-		$strs = [
-			"\n"                                   => "\n\n",
-			"\n\n"                                 => "\n\n",
-			"\n\n\n"                               => "\n\n\n\n",
-			"Line One\n"                           => "<p>Line One</p>\n\n",
-			"Line One\nLine Two"                   => "<p>Line One<br />\nLine Two</p>",
-			"Line One\r\n"                         => "<p>Line One</p>\n\n",
-			"Line One\r\nLine Two"                 => "<p>Line One<br />\nLine Two</p>",
-			"Line One\r"                           => "<p>Line One</p>\n\n",
-			"Line One\rLine Two"                   => "<p>Line One<br />\nLine Two</p>",
-			"Line One\n\nLine Two\n\n\nLine Three" => "<p>Line One</p>\n\n<p>Line Two</p>\n\n<p><br />\nLine Three</p>",
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str, true));
-		}
-	}
-
-	public function testAutoTypographyHTMLComment()
-	{
-		$strs = [
-			'<!-- this is an HTML comment -->'                       => '<!-- this is an HTML comment -->',
-			'This is not a comment.<!-- this is an HTML comment -->' => '<p>This is not a comment.<!-- this is an HTML comment --></p>',
-			'<!-- this is an HTML comment -->This is not a comment.' => '<p><!-- this is an HTML comment -->This is not a comment.</p>',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testAutoTypographyHTMLTags()
-	{
-		$strs = [
-			'<b>Hello World !!</b>, How are you?'               => '<p><b>Hello World !!</b>, How are you?</p>',
-			'<p>Hello World !!, How are you?</p>'               => '<p>Hello World !!, How are you?</p>',
-			'<pre>Code goes here.</pre>'                        => '<pre>Code goes here.</pre>',
-			"<pre>Line One\nLine Two\n\nLine Three\n\n\n</pre>" => "<pre>Line One\nLine Two\n\nLine Three\n\n</pre>",
-			'Line One</pre>'                                    => 'Line One</pre>',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testAutoTypographySpecialCharacters()
-	{
-		$strs = [
-			'\'Text in single quotes\''      => '<p>&#8216;Text in single quotes&#8217;</p>',
-			'"Text in double quotes"'        => '<p>&#8220;Text in double quotes&#8221;</p>',
-			'Double dash -- becomes em-dash' => '<p>Double dash&#8212;becomes em-dash</p>',
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->autoTypography($str));
-		}
-	}
-
-	public function testNewlinesToHTMLLineBreaksExceptWithinPRE()
-	{
-		$strs = [
-			"Line One\nLine Two"            => "Line One<br />\nLine Two",
-			"<pre>Line One\nLine Two</pre>" => "<pre>Line One\nLine Two</pre>",
-			"<div>Line One\nLine Two</div>" => "<div>Line One<br />\nLine Two</div>",
-		];
-		foreach ($strs as $str => $expect)
-		{
-			$this->assertEquals($expect, $this->typography->nl2brExceptPre($str));
-		}
-	}
+    protected $typography;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->typography = new Typography();
+    }
+
+    public function testAutoTypographyEmptyString()
+    {
+        $this->assertSame('', $this->typography->autoTypography(''));
+    }
+
+    public function testAutoTypographyNormalString()
+    {
+        $strs = [
+            'this sentence has no punctuations' => '<p>this sentence has no punctuations</p>',
+            'Hello World !!, How are you?'      => '<p>Hello World !!, How are you?</p>',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testAutoTypographyMultipleSpaces()
+    {
+        $strs = [
+            'this sentence has  a double spacing'              => '<p>this sentence has  a double spacing</p>',
+            'this  sentence   has    a     weird      spacing' => '<p>this  sentence &nbsp; has &nbsp;  a &nbsp;   weird &nbsp;  &nbsp; spacing</p>',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testAutoTypographyLineBreaks()
+    {
+        $strs = [
+            "\n"                                   => "\n\n<p>&nbsp;</p>",
+            "\n\n"                                 => "\n\n<p>&nbsp;</p>",
+            "\n\n\n"                               => "\n\n<p>&nbsp;</p>",
+            "Line One\n"                           => "<p>Line One</p>\n\n",
+            "Line One\nLine Two"                   => "<p>Line One<br />\nLine Two</p>",
+            "Line One\r\n"                         => "<p>Line One</p>\n\n",
+            "Line One\r\nLine Two"                 => "<p>Line One<br />\nLine Two</p>",
+            "Line One\r"                           => "<p>Line One</p>\n\n",
+            "Line One\rLine Two"                   => "<p>Line One<br />\nLine Two</p>",
+            "Line One\n\nLine Two\n\n\nLine Three" => "<p>Line One</p>\n\n<p>Line Two</p>\n\n<p>Line Three</p>",
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testAutoTypographyReduceLineBreaks()
+    {
+        $strs = [
+            "\n"                                   => "\n\n",
+            "\n\n"                                 => "\n\n",
+            "\n\n\n"                               => "\n\n\n\n",
+            "Line One\n"                           => "<p>Line One</p>\n\n",
+            "Line One\nLine Two"                   => "<p>Line One<br />\nLine Two</p>",
+            "Line One\r\n"                         => "<p>Line One</p>\n\n",
+            "Line One\r\nLine Two"                 => "<p>Line One<br />\nLine Two</p>",
+            "Line One\r"                           => "<p>Line One</p>\n\n",
+            "Line One\rLine Two"                   => "<p>Line One<br />\nLine Two</p>",
+            "Line One\n\nLine Two\n\n\nLine Three" => "<p>Line One</p>\n\n<p>Line Two</p>\n\n<p><br />\nLine Three</p>",
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str, true));
+        }
+    }
+
+    public function testAutoTypographyHTMLComment()
+    {
+        $strs = [
+            '<!-- this is an HTML comment -->'                       => '<!-- this is an HTML comment -->',
+            'This is not a comment.<!-- this is an HTML comment -->' => '<p>This is not a comment.<!-- this is an HTML comment --></p>',
+            '<!-- this is an HTML comment -->This is not a comment.' => '<p><!-- this is an HTML comment -->This is not a comment.</p>',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testAutoTypographyHTMLTags()
+    {
+        $strs = [
+            '<b>Hello World !!</b>, How are you?'               => '<p><b>Hello World !!</b>, How are you?</p>',
+            '<p>Hello World !!, How are you?</p>'               => '<p>Hello World !!, How are you?</p>',
+            '<pre>Code goes here.</pre>'                        => '<pre>Code goes here.</pre>',
+            "<pre>Line One\nLine Two\n\nLine Three\n\n\n</pre>" => "<pre>Line One\nLine Two\n\nLine Three\n\n</pre>",
+            'Line One</pre>'                                    => 'Line One</pre>',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testAutoTypographySpecialCharacters()
+    {
+        $strs = [
+            '\'Text in single quotes\''      => '<p>&#8216;Text in single quotes&#8217;</p>',
+            '"Text in double quotes"'        => '<p>&#8220;Text in double quotes&#8221;</p>',
+            'Double dash -- becomes em-dash' => '<p>Double dash&#8212;becomes em-dash</p>',
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->autoTypography($str));
+        }
+    }
+
+    public function testNewlinesToHTMLLineBreaksExceptWithinPRE()
+    {
+        $strs = [
+            "Line One\nLine Two"            => "Line One<br />\nLine Two",
+            "<pre>Line One\nLine Two</pre>" => "<pre>Line One\nLine Two</pre>",
+            "<div>Line One\nLine Two</div>" => "<div>Line One<br />\nLine Two</div>",
+        ];
+
+        foreach ($strs as $str => $expect) {
+            $this->assertSame($expect, $this->typography->nl2brExceptPre($str));
+        }
+    }
 }
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index c0c756fe2109..a1e8f74d8a27 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -1,1269 +1,1264 @@
-<?php namespace CodeIgniter\Validation;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class CreditCardRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CreditCardRulesTest extends CIUnitTestCase
 {
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
 
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'      => [
-			Rules::class,
-			FormatRules::class,
-			FileRules::class,
-			CreditCardRules::class,
-			TestRules::class,
-		],
-		'groupA'        => [
-			'foo' => 'required|min_length[5]',
-		],
-		'groupA_errors' => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-	];
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->validation = new Validation((object) $this->config, Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [];
-	}
-
-	//--------------------------------------------------------------------
-	// Credit Card Rules
-	//--------------------------------------------------------------------
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
 
-	/**
-	 * @dataProvider creditCardProvider
-	 *
-	 * @param $type
-	 * @param $number
-	 * @param boolean $expected
-	 */
-	public function testValidCCNumber($type, $number, $expected = false)
-	{
-		$data = [
-			'cc' => $number,
-		];
+        $_FILES = [];
+    }
 
-		$this->validation->setRules([
-			'cc' => "valid_cc_number[{$type}]",
-		]);
+    // Credit Card Rules
 
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
+    /**
+     * @dataProvider creditCardProvider
+     *
+     * @param string      $type
+     * @param string|null $number
+     * @param bool        $expected
+     */
+    public function testValidCCNumber($type, $number, $expected = false)
+    {
+        $data = [
+            'cc' => $number,
+        ];
 
-	//--------------------------------------------------------------------
+        $this->validation->setRules([
+            'cc' => "valid_cc_number[{$type}]",
+        ]);
 
-	/**
-	 * Cards shown are test cards found around the web.
-	 *
-	 * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
-	 *
-	 * @return array
-	 */
-	public function creditCardProvider()
-	{
-		return [
-			'null_test'      => [
-				'amex',
-				null,
-				false,
-			],
-			'random_test'    => [
-				'amex',
-				$this->generateCardNum('37', 16),
-				false,
-			],
-			'invalid_type'   => [
-				'shorty',
-				'1111 1111 1111 1111',
-				false,
-			],
-			'invalid_length' => [
-				'amex',
-				'',
-				false,
-			],
-			'not_numeric'    => [
-				'amex',
-				'abcd efgh ijkl mnop',
-				false,
-			],
-			'bad_length'     => [
-				'amex',
-				'3782 8224 6310 0051',
-				false,
-			],
-			'bad_prefix'     => [
-				'amex',
-				'3582 8224 6310 0051',
-				false,
-			],
-			'amex1'          => [
-				'amex',
-				'3782 8224 6310 005',
-				true,
-			],
-			'amex2'          => [
-				'amex',
-				'3714 4963 5398 431',
-				true,
-			],
-			'dinersclub1'    => [
-				'dinersclub',
-				'3056 9309 0259 04',
-				true,
-			],
-			'dinersculb2'    => [
-				'dinersclub',
-				'3852 0000 0232 37',
-				true,
-			],
-			'discover1'      => [
-				'discover',
-				'6011 1111 1111 1117',
-				true,
-			],
-			'discover2'      => [
-				'discover',
-				'6011 0009 9013 9424',
-				true,
-			],
-			'jcb1'           => [
-				'jcb',
-				'3530 1113 3330 0000',
-				true,
-			],
-			'jcb2'           => [
-				'jcb',
-				'3566 0020 2036 0505',
-				true,
-			],
-			'mastercard1'    => [
-				'mastercard',
-				'5555 5555 5555 4444',
-				true,
-			],
-			'mastercard2'    => [
-				'mastercard',
-				'5105 1051 0510 5100',
-				true,
-			],
-			'visa1'          => [
-				'visa',
-				'4111 1111 1111 1111',
-				true,
-			],
-			'visa2'          => [
-				'visa',
-				'4012 8888 8888 1881',
-				true,
-			],
-			'visa3'          => [
-				'visa',
-				'4222 2222 2222 2',
-				true,
-			],
-			'dankort1'       => [
-				'dankort',
-				'5019 7170 1010 3742',
-				true,
-			],
-			'unionpay1'      => [
-				'unionpay',
-				$this->generateCardNum(62, 16),
-				true,
-			],
-			'unionpay2'      => [
-				'unionpay',
-				$this->generateCardNum(62, 17),
-				true,
-			],
-			'unionpay3'      => [
-				'unionpay',
-				$this->generateCardNum(62, 18),
-				true,
-			],
-			'unionpay4'      => [
-				'unionpay',
-				$this->generateCardNum(62, 19),
-				true,
-			],
-			'unionpay5'      => [
-				'unionpay',
-				$this->generateCardNum(63, 19),
-				false,
-			],
-			'carteblanche1'  => [
-				'carteblanche',
-				$this->generateCardNum(300, 14),
-				true,
-			],
-			'carteblanche2'  => [
-				'carteblanche',
-				$this->generateCardNum(301, 14),
-				true,
-			],
-			'carteblanche3'  => [
-				'carteblanche',
-				$this->generateCardNum(302, 14),
-				true,
-			],
-			'carteblanche4'  => [
-				'carteblanche',
-				$this->generateCardNum(303, 14),
-				true,
-			],
-			'carteblanche5'  => [
-				'carteblanche',
-				$this->generateCardNum(304, 14),
-				true,
-			],
-			'carteblanche6'  => [
-				'carteblanche',
-				$this->generateCardNum(305, 14),
-				true,
-			],
-			'carteblanche7'  => [
-				'carteblanche',
-				$this->generateCardNum(306, 14),
-				false,
-			],
-			'dinersclub3'    => [
-				'dinersclub',
-				$this->generateCardNum(300, 14),
-				true,
-			],
-			'dinersclub4'    => [
-				'dinersclub',
-				$this->generateCardNum(301, 14),
-				true,
-			],
-			'dinersclub5'    => [
-				'dinersclub',
-				$this->generateCardNum(302, 14),
-				true,
-			],
-			'dinersclub6'    => [
-				'dinersclub',
-				$this->generateCardNum(303, 14),
-				true,
-			],
-			'dinersclub7'    => [
-				'dinersclub',
-				$this->generateCardNum(304, 14),
-				true,
-			],
-			'dinersclub8'    => [
-				'dinersclub',
-				$this->generateCardNum(305, 14),
-				true,
-			],
-			'dinersclub9'    => [
-				'dinersclub',
-				$this->generateCardNum(309, 14),
-				true,
-			],
-			'dinersclub10'   => [
-				'dinersclub',
-				$this->generateCardNum(36, 14),
-				true,
-			],
-			'dinersclub11'   => [
-				'dinersclub',
-				$this->generateCardNum(38, 14),
-				true,
-			],
-			'dinersclub12'   => [
-				'dinersclub',
-				$this->generateCardNum(39, 14),
-				true,
-			],
-			'dinersclub13'   => [
-				'dinersclub',
-				$this->generateCardNum(54, 14),
-				true,
-			],
-			'dinersclub14'   => [
-				'dinersclub',
-				$this->generateCardNum(55, 14),
-				true,
-			],
-			'dinersclub15'   => [
-				'dinersclub',
-				$this->generateCardNum(300, 16),
-				true,
-			],
-			'dinersclub16'   => [
-				'dinersclub',
-				$this->generateCardNum(301, 16),
-				true,
-			],
-			'dinersclub17'   => [
-				'dinersclub',
-				$this->generateCardNum(302, 16),
-				true,
-			],
-			'dinersclub18'   => [
-				'dinersclub',
-				$this->generateCardNum(303, 16),
-				true,
-			],
-			'dinersclub19'   => [
-				'dinersclub',
-				$this->generateCardNum(304, 16),
-				true,
-			],
-			'dinersclub20'   => [
-				'dinersclub',
-				$this->generateCardNum(305, 16),
-				true,
-			],
-			'dinersclub21'   => [
-				'dinersclub',
-				$this->generateCardNum(309, 16),
-				true,
-			],
-			'dinersclub22'   => [
-				'dinersclub',
-				$this->generateCardNum(36, 16),
-				true,
-			],
-			'dinersclub23'   => [
-				'dinersclub',
-				$this->generateCardNum(38, 16),
-				true,
-			],
-			'dinersclub24'   => [
-				'dinersclub',
-				$this->generateCardNum(39, 16),
-				true,
-			],
-			'dinersclub25'   => [
-				'dinersclub',
-				$this->generateCardNum(54, 16),
-				true,
-			],
-			'dinersclub26'   => [
-				'dinersclub',
-				$this->generateCardNum(55, 16),
-				true,
-			],
-			'discover3'      => [
-				'discover',
-				$this->generateCardNum(6011, 16),
-				true,
-			],
-			'discover4'      => [
-				'discover',
-				$this->generateCardNum(622, 16),
-				true,
-			],
-			'discover5'      => [
-				'discover',
-				$this->generateCardNum(644, 16),
-				true,
-			],
-			'discover6'      => [
-				'discover',
-				$this->generateCardNum(645, 16),
-				true,
-			],
-			'discover7'      => [
-				'discover',
-				$this->generateCardNum(656, 16),
-				true,
-			],
-			'discover8'      => [
-				'discover',
-				$this->generateCardNum(647, 16),
-				true,
-			],
-			'discover9'      => [
-				'discover',
-				$this->generateCardNum(648, 16),
-				true,
-			],
-			'discover10'     => [
-				'discover',
-				$this->generateCardNum(649, 16),
-				true,
-			],
-			'discover11'     => [
-				'discover',
-				$this->generateCardNum(65, 16),
-				true,
-			],
-			'discover12'     => [
-				'discover',
-				$this->generateCardNum(6011, 19),
-				true,
-			],
-			'discover13'     => [
-				'discover',
-				$this->generateCardNum(622, 19),
-				true,
-			],
-			'discover14'     => [
-				'discover',
-				$this->generateCardNum(644, 19),
-				true,
-			],
-			'discover15'     => [
-				'discover',
-				$this->generateCardNum(645, 19),
-				true,
-			],
-			'discover16'     => [
-				'discover',
-				$this->generateCardNum(656, 19),
-				true,
-			],
-			'discover17'     => [
-				'discover',
-				$this->generateCardNum(647, 19),
-				true,
-			],
-			'discover18'     => [
-				'discover',
-				$this->generateCardNum(648, 19),
-				true,
-			],
-			'discover19'     => [
-				'discover',
-				$this->generateCardNum(649, 19),
-				true,
-			],
-			'discover20'     => [
-				'discover',
-				$this->generateCardNum(65, 19),
-				true,
-			],
-			'interpayment1'  => [
-				'interpayment',
-				$this->generateCardNum(4, 16),
-				true,
-			],
-			'interpayment2'  => [
-				'interpayment',
-				$this->generateCardNum(4, 17),
-				true,
-			],
-			'interpayment3'  => [
-				'interpayment',
-				$this->generateCardNum(4, 18),
-				true,
-			],
-			'interpayment4'  => [
-				'interpayment',
-				$this->generateCardNum(4, 19),
-				true,
-			],
-			'jcb1'           => [
-				'jcb',
-				$this->generateCardNum(352, 16),
-				true,
-			],
-			'jcb2'           => [
-				'jcb',
-				$this->generateCardNum(353, 16),
-				true,
-			],
-			'jcb3'           => [
-				'jcb',
-				$this->generateCardNum(354, 16),
-				true,
-			],
-			'jcb4'           => [
-				'jcb',
-				$this->generateCardNum(355, 16),
-				true,
-			],
-			'jcb5'           => [
-				'jcb',
-				$this->generateCardNum(356, 16),
-				true,
-			],
-			'jcb6'           => [
-				'jcb',
-				$this->generateCardNum(357, 16),
-				true,
-			],
-			'jcb7'           => [
-				'jcb',
-				$this->generateCardNum(358, 16),
-				true,
-			],
-			'maestro1'       => [
-				'maestro',
-				$this->generateCardNum(50, 12),
-				true,
-			],
-			'maestro2'       => [
-				'maestro',
-				$this->generateCardNum(56, 12),
-				true,
-			],
-			'maestro3'       => [
-				'maestro',
-				$this->generateCardNum(57, 12),
-				true,
-			],
-			'maestro4'       => [
-				'maestro',
-				$this->generateCardNum(58, 12),
-				true,
-			],
-			'maestro5'       => [
-				'maestro',
-				$this->generateCardNum(59, 12),
-				true,
-			],
-			'maestro6'       => [
-				'maestro',
-				$this->generateCardNum(60, 12),
-				true,
-			],
-			'maestro7'       => [
-				'maestro',
-				$this->generateCardNum(61, 12),
-				true,
-			],
-			'maestro8'       => [
-				'maestro',
-				$this->generateCardNum(62, 12),
-				true,
-			],
-			'maestro9'       => [
-				'maestro',
-				$this->generateCardNum(63, 12),
-				true,
-			],
-			'maestro10'      => [
-				'maestro',
-				$this->generateCardNum(64, 12),
-				true,
-			],
-			'maestro11'      => [
-				'maestro',
-				$this->generateCardNum(65, 12),
-				true,
-			],
-			'maestro12'      => [
-				'maestro',
-				$this->generateCardNum(66, 12),
-				true,
-			],
-			'maestro13'      => [
-				'maestro',
-				$this->generateCardNum(67, 12),
-				true,
-			],
-			'maestro14'      => [
-				'maestro',
-				$this->generateCardNum(68, 12),
-				true,
-			],
-			'maestro15'      => [
-				'maestro',
-				$this->generateCardNum(69, 12),
-				true,
-			],
-			'maestro16'      => [
-				'maestro',
-				$this->generateCardNum(50, 13),
-				true,
-			],
-			'maestro17'      => [
-				'maestro',
-				$this->generateCardNum(56, 13),
-				true,
-			],
-			'maestro18'      => [
-				'maestro',
-				$this->generateCardNum(57, 13),
-				true,
-			],
-			'maestro19'      => [
-				'maestro',
-				$this->generateCardNum(58, 13),
-				true,
-			],
-			'maestro20'      => [
-				'maestro',
-				$this->generateCardNum(59, 13),
-				true,
-			],
-			'maestro21'      => [
-				'maestro',
-				$this->generateCardNum(60, 13),
-				true,
-			],
-			'maestro22'      => [
-				'maestro',
-				$this->generateCardNum(61, 13),
-				true,
-			],
-			'maestro23'      => [
-				'maestro',
-				$this->generateCardNum(62, 13),
-				true,
-			],
-			'maestro24'      => [
-				'maestro',
-				$this->generateCardNum(63, 13),
-				true,
-			],
-			'maestro25'      => [
-				'maestro',
-				$this->generateCardNum(64, 13),
-				true,
-			],
-			'maestro26'      => [
-				'maestro',
-				$this->generateCardNum(65, 13),
-				true,
-			],
-			'maestro27'      => [
-				'maestro',
-				$this->generateCardNum(66, 13),
-				true,
-			],
-			'maestro28'      => [
-				'maestro',
-				$this->generateCardNum(67, 13),
-				true,
-			],
-			'maestro29'      => [
-				'maestro',
-				$this->generateCardNum(68, 13),
-				true,
-			],
-			'maestro30'      => [
-				'maestro',
-				$this->generateCardNum(69, 13),
-				true,
-			],
-			'maestro31'      => [
-				'maestro',
-				$this->generateCardNum(50, 14),
-				true,
-			],
-			'maestro32'      => [
-				'maestro',
-				$this->generateCardNum(56, 14),
-				true,
-			],
-			'maestro33'      => [
-				'maestro',
-				$this->generateCardNum(57, 14),
-				true,
-			],
-			'maestro34'      => [
-				'maestro',
-				$this->generateCardNum(58, 14),
-				true,
-			],
-			'maestro35'      => [
-				'maestro',
-				$this->generateCardNum(59, 14),
-				true,
-			],
-			'maestro36'      => [
-				'maestro',
-				$this->generateCardNum(60, 14),
-				true,
-			],
-			'maestro37'      => [
-				'maestro',
-				$this->generateCardNum(61, 14),
-				true,
-			],
-			'maestro38'      => [
-				'maestro',
-				$this->generateCardNum(62, 14),
-				true,
-			],
-			'maestro39'      => [
-				'maestro',
-				$this->generateCardNum(63, 14),
-				true,
-			],
-			'maestro40'      => [
-				'maestro',
-				$this->generateCardNum(64, 14),
-				true,
-			],
-			'maestro41'      => [
-				'maestro',
-				$this->generateCardNum(65, 14),
-				true,
-			],
-			'maestro42'      => [
-				'maestro',
-				$this->generateCardNum(66, 14),
-				true,
-			],
-			'maestro43'      => [
-				'maestro',
-				$this->generateCardNum(67, 14),
-				true,
-			],
-			'maestro44'      => [
-				'maestro',
-				$this->generateCardNum(68, 14),
-				true,
-			],
-			'maestro45'      => [
-				'maestro',
-				$this->generateCardNum(69, 14),
-				true,
-			],
-			'maestro46'      => [
-				'maestro',
-				$this->generateCardNum(50, 15),
-				true,
-			],
-			'maestro47'      => [
-				'maestro',
-				$this->generateCardNum(56, 15),
-				true,
-			],
-			'maestro48'      => [
-				'maestro',
-				$this->generateCardNum(57, 15),
-				true,
-			],
-			'maestro49'      => [
-				'maestro',
-				$this->generateCardNum(58, 15),
-				true,
-			],
-			'maestro50'      => [
-				'maestro',
-				$this->generateCardNum(59, 15),
-				true,
-			],
-			'maestro51'      => [
-				'maestro',
-				$this->generateCardNum(60, 15),
-				true,
-			],
-			'maestro52'      => [
-				'maestro',
-				$this->generateCardNum(61, 15),
-				true,
-			],
-			'maestro53'      => [
-				'maestro',
-				$this->generateCardNum(62, 15),
-				true,
-			],
-			'maestro54'      => [
-				'maestro',
-				$this->generateCardNum(63, 15),
-				true,
-			],
-			'maestro55'      => [
-				'maestro',
-				$this->generateCardNum(64, 15),
-				true,
-			],
-			'maestro56'      => [
-				'maestro',
-				$this->generateCardNum(65, 15),
-				true,
-			],
-			'maestro57'      => [
-				'maestro',
-				$this->generateCardNum(66, 15),
-				true,
-			],
-			'maestro58'      => [
-				'maestro',
-				$this->generateCardNum(67, 15),
-				true,
-			],
-			'maestro59'      => [
-				'maestro',
-				$this->generateCardNum(68, 15),
-				true,
-			],
-			'maestro60'      => [
-				'maestro',
-				$this->generateCardNum(69, 15),
-				true,
-			],
-			'maestro61'      => [
-				'maestro',
-				$this->generateCardNum(50, 16),
-				true,
-			],
-			'maestro62'      => [
-				'maestro',
-				$this->generateCardNum(56, 16),
-				true,
-			],
-			'maestro63'      => [
-				'maestro',
-				$this->generateCardNum(57, 16),
-				true,
-			],
-			'maestro64'      => [
-				'maestro',
-				$this->generateCardNum(58, 16),
-				true,
-			],
-			'maestro65'      => [
-				'maestro',
-				$this->generateCardNum(59, 16),
-				true,
-			],
-			'maestro66'      => [
-				'maestro',
-				$this->generateCardNum(60, 16),
-				true,
-			],
-			'maestro67'      => [
-				'maestro',
-				$this->generateCardNum(61, 16),
-				true,
-			],
-			'maestro68'      => [
-				'maestro',
-				$this->generateCardNum(62, 16),
-				true,
-			],
-			'maestro69'      => [
-				'maestro',
-				$this->generateCardNum(63, 16),
-				true,
-			],
-			'maestro70'      => [
-				'maestro',
-				$this->generateCardNum(64, 16),
-				true,
-			],
-			'maestro71'      => [
-				'maestro',
-				$this->generateCardNum(65, 16),
-				true,
-			],
-			'maestro72'      => [
-				'maestro',
-				$this->generateCardNum(66, 16),
-				true,
-			],
-			'maestro73'      => [
-				'maestro',
-				$this->generateCardNum(67, 16),
-				true,
-			],
-			'maestro74'      => [
-				'maestro',
-				$this->generateCardNum(68, 16),
-				true,
-			],
-			'maestro75'      => [
-				'maestro',
-				$this->generateCardNum(69, 16),
-				true,
-			],
-			'maestro91'      => [
-				'maestro',
-				$this->generateCardNum(50, 18),
-				true,
-			],
-			'maestro92'      => [
-				'maestro',
-				$this->generateCardNum(56, 18),
-				true,
-			],
-			'maestro93'      => [
-				'maestro',
-				$this->generateCardNum(57, 18),
-				true,
-			],
-			'maestro94'      => [
-				'maestro',
-				$this->generateCardNum(58, 18),
-				true,
-			],
-			'maestro95'      => [
-				'maestro',
-				$this->generateCardNum(59, 18),
-				true,
-			],
-			'maestro96'      => [
-				'maestro',
-				$this->generateCardNum(60, 18),
-				true,
-			],
-			'maestro97'      => [
-				'maestro',
-				$this->generateCardNum(61, 18),
-				true,
-			],
-			'maestro98'      => [
-				'maestro',
-				$this->generateCardNum(62, 18),
-				true,
-			],
-			'maestro99'      => [
-				'maestro',
-				$this->generateCardNum(63, 18),
-				true,
-			],
-			'maestro100'     => [
-				'maestro',
-				$this->generateCardNum(64, 18),
-				true,
-			],
-			'maestro101'     => [
-				'maestro',
-				$this->generateCardNum(65, 18),
-				true,
-			],
-			'maestro102'     => [
-				'maestro',
-				$this->generateCardNum(66, 18),
-				true,
-			],
-			'maestro103'     => [
-				'maestro',
-				$this->generateCardNum(67, 18),
-				true,
-			],
-			'maestro104'     => [
-				'maestro',
-				$this->generateCardNum(68, 18),
-				true,
-			],
-			'maestro105'     => [
-				'maestro',
-				$this->generateCardNum(69, 18),
-				true,
-			],
-			'maestro106'     => [
-				'maestro',
-				$this->generateCardNum(50, 19),
-				true,
-			],
-			'maestro107'     => [
-				'maestro',
-				$this->generateCardNum(56, 19),
-				true,
-			],
-			'maestro108'     => [
-				'maestro',
-				$this->generateCardNum(57, 19),
-				true,
-			],
-			'maestro109'     => [
-				'maestro',
-				$this->generateCardNum(58, 19),
-				true,
-			],
-			'maestro110'     => [
-				'maestro',
-				$this->generateCardNum(59, 19),
-				true,
-			],
-			'maestro111'     => [
-				'maestro',
-				$this->generateCardNum(60, 19),
-				true,
-			],
-			'maestro112'     => [
-				'maestro',
-				$this->generateCardNum(61, 19),
-				true,
-			],
-			'maestro113'     => [
-				'maestro',
-				$this->generateCardNum(62, 19),
-				true,
-			],
-			'maestro114'     => [
-				'maestro',
-				$this->generateCardNum(63, 19),
-				true,
-			],
-			'maestro115'     => [
-				'maestro',
-				$this->generateCardNum(64, 19),
-				true,
-			],
-			'maestro116'     => [
-				'maestro',
-				$this->generateCardNum(65, 19),
-				true,
-			],
-			'maestro117'     => [
-				'maestro',
-				$this->generateCardNum(66, 19),
-				true,
-			],
-			'maestro118'     => [
-				'maestro',
-				$this->generateCardNum(67, 19),
-				true,
-			],
-			'maestro119'     => [
-				'maestro',
-				$this->generateCardNum(68, 19),
-				true,
-			],
-			'maestro120'     => [
-				'maestro',
-				$this->generateCardNum(69, 19),
-				true,
-			],
-			'dankort1'       => [
-				'dankort',
-				$this->generateCardNum(5019, 16),
-				true,
-			],
-			'dankort2'       => [
-				'dankort',
-				$this->generateCardNum(4175, 16),
-				true,
-			],
-			'dankort3'       => [
-				'dankort',
-				$this->generateCardNum(4571, 16),
-				true,
-			],
-			'dankort4'       => [
-				'dankort',
-				$this->generateCardNum(4, 16),
-				true,
-			],
-			'mir1'           => [
-				'mir',
-				$this->generateCardNum(2200, 16),
-				true,
-			],
-			'mir2'           => [
-				'mir',
-				$this->generateCardNum(2201, 16),
-				true,
-			],
-			'mir3'           => [
-				'mir',
-				$this->generateCardNum(2202, 16),
-				true,
-			],
-			'mir4'           => [
-				'mir',
-				$this->generateCardNum(2203, 16),
-				true,
-			],
-			'mir5'           => [
-				'mir',
-				$this->generateCardNum(2204, 16),
-				true,
-			],
-			'mastercard1'    => [
-				'mastercard',
-				$this->generateCardNum(51, 16),
-				true,
-			],
-			'mastercard2'    => [
-				'mastercard',
-				$this->generateCardNum(52, 16),
-				true,
-			],
-			'mastercard3'    => [
-				'mastercard',
-				$this->generateCardNum(53, 16),
-				true,
-			],
-			'mastercard4'    => [
-				'mastercard',
-				$this->generateCardNum(54, 16),
-				true,
-			],
-			'mastercard5'    => [
-				'mastercard',
-				$this->generateCardNum(55, 16),
-				true,
-			],
-			'mastercard6'    => [
-				'mastercard',
-				$this->generateCardNum(22, 16),
-				true,
-			],
-			'mastercard7'    => [
-				'mastercard',
-				$this->generateCardNum(23, 16),
-				true,
-			],
-			'mastercard8'    => [
-				'mastercard',
-				$this->generateCardNum(24, 16),
-				true,
-			],
-			'mastercard9'    => [
-				'mastercard',
-				$this->generateCardNum(25, 16),
-				true,
-			],
-			'mastercard10'   => [
-				'mastercard',
-				$this->generateCardNum(26, 16),
-				true,
-			],
-			'mastercard11'   => [
-				'mastercard',
-				$this->generateCardNum(27, 16),
-				true,
-			],
-			'visa1'          => [
-				'visa',
-				$this->generateCardNum(4, 13),
-				true,
-			],
-			'visa2'          => [
-				'visa',
-				$this->generateCardNum(4, 16),
-				true,
-			],
-			'visa3'          => [
-				'visa',
-				$this->generateCardNum(4, 19),
-				true,
-			],
-			'uatp'           => [
-				'uatp',
-				$this->generateCardNum(1, 15),
-				true,
-			],
-			'verve1'         => [
-				'verve',
-				$this->generateCardNum(506, 16),
-				true,
-			],
-			'verve2'         => [
-				'verve',
-				$this->generateCardNum(650, 16),
-				true,
-			],
-			'verve3'         => [
-				'verve',
-				$this->generateCardNum(506, 19),
-				true,
-			],
-			'verve4'         => [
-				'verve',
-				$this->generateCardNum(650, 19),
-				true,
-			],
-			'cibc1'          => [
-				'cibc',
-				$this->generateCardNum(4506, 16),
-				true,
-			],
-			'rbc1'           => [
-				'rbc',
-				$this->generateCardNum(45, 16),
-				true,
-			],
-			'tdtrust'        => [
-				'tdtrust',
-				$this->generateCardNum(589297, 16),
-				true,
-			],
-			'scotia1'        => [
-				'scotia',
-				$this->generateCardNum(4536, 16),
-				true,
-			],
-			'bmoabm1'        => [
-				'bmoabm',
-				$this->generateCardNum(500, 16),
-				true,
-			],
-			'hsbc'           => [
-				'hsbc',
-				$this->generateCardNum(56, 16),
-				true,
-			],
-			'hsbc'           => [
-				'hsbc',
-				$this->generateCardNum(57, 16),
-				false,
-			],
-		];
-	}
+        $this->assertSame($expected, $this->validation->run($data));
+    }
 
-	//--------------------------------------------------------------------
+    /**
+     * Cards shown are test cards found around the web.
+     *
+     * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
+     *
+     * @return array
+     */
+    public function creditCardProvider()
+    {
+        return [
+            'null_test' => [
+                'amex',
+                null,
+                false,
+            ],
+            'random_test' => [
+                'amex',
+                $this->generateCardNum('37', 16),
+                false,
+            ],
+            'invalid_type' => [
+                'shorty',
+                '1111 1111 1111 1111',
+                false,
+            ],
+            'invalid_length' => [
+                'amex',
+                '',
+                false,
+            ],
+            'not_numeric' => [
+                'amex',
+                'abcd efgh ijkl mnop',
+                false,
+            ],
+            'bad_length' => [
+                'amex',
+                '3782 8224 6310 0051',
+                false,
+            ],
+            'bad_prefix' => [
+                'amex',
+                '3582 8224 6310 0051',
+                false,
+            ],
+            'amex1' => [
+                'amex',
+                '3782 8224 6310 005',
+                true,
+            ],
+            'amex2' => [
+                'amex',
+                '3714 4963 5398 431',
+                true,
+            ],
+            'dinersclub1' => [
+                'dinersclub',
+                '3056 9309 0259 04',
+                true,
+            ],
+            'dinersculb2' => [
+                'dinersclub',
+                '3852 0000 0232 37',
+                true,
+            ],
+            'discover1' => [
+                'discover',
+                '6011 1111 1111 1117',
+                true,
+            ],
+            'discover2' => [
+                'discover',
+                '6011 0009 9013 9424',
+                true,
+            ],
+            'jcb8' => [
+                'jcb',
+                '3530 1113 3330 0000',
+                true,
+            ],
+            'jcb9' => [
+                'jcb',
+                '3566 0020 2036 0505',
+                true,
+            ],
+            'mastercard12' => [
+                'mastercard',
+                '5555 5555 5555 4444',
+                true,
+            ],
+            'mastercard13' => [
+                'mastercard',
+                '5105 1051 0510 5100',
+                true,
+            ],
+            'visa4' => [
+                'visa',
+                '4111 1111 1111 1111',
+                true,
+            ],
+            'visa5' => [
+                'visa',
+                '4012 8888 8888 1881',
+                true,
+            ],
+            'visa6' => [
+                'visa',
+                '4222 2222 2222 2',
+                true,
+            ],
+            'dankort5' => [
+                'dankort',
+                '5019 7170 1010 3742',
+                true,
+            ],
+            'unionpay1' => [
+                'unionpay',
+                $this->generateCardNum(62, 16),
+                true,
+            ],
+            'unionpay2' => [
+                'unionpay',
+                $this->generateCardNum(62, 17),
+                true,
+            ],
+            'unionpay3' => [
+                'unionpay',
+                $this->generateCardNum(62, 18),
+                true,
+            ],
+            'unionpay4' => [
+                'unionpay',
+                $this->generateCardNum(62, 19),
+                true,
+            ],
+            'unionpay5' => [
+                'unionpay',
+                $this->generateCardNum(63, 19),
+                false,
+            ],
+            'carteblanche1' => [
+                'carteblanche',
+                $this->generateCardNum(300, 14),
+                true,
+            ],
+            'carteblanche2' => [
+                'carteblanche',
+                $this->generateCardNum(301, 14),
+                true,
+            ],
+            'carteblanche3' => [
+                'carteblanche',
+                $this->generateCardNum(302, 14),
+                true,
+            ],
+            'carteblanche4' => [
+                'carteblanche',
+                $this->generateCardNum(303, 14),
+                true,
+            ],
+            'carteblanche5' => [
+                'carteblanche',
+                $this->generateCardNum(304, 14),
+                true,
+            ],
+            'carteblanche6' => [
+                'carteblanche',
+                $this->generateCardNum(305, 14),
+                true,
+            ],
+            'carteblanche7' => [
+                'carteblanche',
+                $this->generateCardNum(306, 14),
+                false,
+            ],
+            'dinersclub3' => [
+                'dinersclub',
+                $this->generateCardNum(300, 14),
+                true,
+            ],
+            'dinersclub4' => [
+                'dinersclub',
+                $this->generateCardNum(301, 14),
+                true,
+            ],
+            'dinersclub5' => [
+                'dinersclub',
+                $this->generateCardNum(302, 14),
+                true,
+            ],
+            'dinersclub6' => [
+                'dinersclub',
+                $this->generateCardNum(303, 14),
+                true,
+            ],
+            'dinersclub7' => [
+                'dinersclub',
+                $this->generateCardNum(304, 14),
+                true,
+            ],
+            'dinersclub8' => [
+                'dinersclub',
+                $this->generateCardNum(305, 14),
+                true,
+            ],
+            'dinersclub9' => [
+                'dinersclub',
+                $this->generateCardNum(309, 14),
+                true,
+            ],
+            'dinersclub10' => [
+                'dinersclub',
+                $this->generateCardNum(36, 14),
+                true,
+            ],
+            'dinersclub11' => [
+                'dinersclub',
+                $this->generateCardNum(38, 14),
+                true,
+            ],
+            'dinersclub12' => [
+                'dinersclub',
+                $this->generateCardNum(39, 14),
+                true,
+            ],
+            'dinersclub13' => [
+                'dinersclub',
+                $this->generateCardNum(54, 14),
+                true,
+            ],
+            'dinersclub14' => [
+                'dinersclub',
+                $this->generateCardNum(55, 14),
+                true,
+            ],
+            'dinersclub15' => [
+                'dinersclub',
+                $this->generateCardNum(300, 16),
+                true,
+            ],
+            'dinersclub16' => [
+                'dinersclub',
+                $this->generateCardNum(301, 16),
+                true,
+            ],
+            'dinersclub17' => [
+                'dinersclub',
+                $this->generateCardNum(302, 16),
+                true,
+            ],
+            'dinersclub18' => [
+                'dinersclub',
+                $this->generateCardNum(303, 16),
+                true,
+            ],
+            'dinersclub19' => [
+                'dinersclub',
+                $this->generateCardNum(304, 16),
+                true,
+            ],
+            'dinersclub20' => [
+                'dinersclub',
+                $this->generateCardNum(305, 16),
+                true,
+            ],
+            'dinersclub21' => [
+                'dinersclub',
+                $this->generateCardNum(309, 16),
+                true,
+            ],
+            'dinersclub22' => [
+                'dinersclub',
+                $this->generateCardNum(36, 16),
+                true,
+            ],
+            'dinersclub23' => [
+                'dinersclub',
+                $this->generateCardNum(38, 16),
+                true,
+            ],
+            'dinersclub24' => [
+                'dinersclub',
+                $this->generateCardNum(39, 16),
+                true,
+            ],
+            'dinersclub25' => [
+                'dinersclub',
+                $this->generateCardNum(54, 16),
+                true,
+            ],
+            'dinersclub26' => [
+                'dinersclub',
+                $this->generateCardNum(55, 16),
+                true,
+            ],
+            'discover3' => [
+                'discover',
+                $this->generateCardNum(6011, 16),
+                true,
+            ],
+            'discover4' => [
+                'discover',
+                $this->generateCardNum(622, 16),
+                true,
+            ],
+            'discover5' => [
+                'discover',
+                $this->generateCardNum(644, 16),
+                true,
+            ],
+            'discover6' => [
+                'discover',
+                $this->generateCardNum(645, 16),
+                true,
+            ],
+            'discover7' => [
+                'discover',
+                $this->generateCardNum(656, 16),
+                true,
+            ],
+            'discover8' => [
+                'discover',
+                $this->generateCardNum(647, 16),
+                true,
+            ],
+            'discover9' => [
+                'discover',
+                $this->generateCardNum(648, 16),
+                true,
+            ],
+            'discover10' => [
+                'discover',
+                $this->generateCardNum(649, 16),
+                true,
+            ],
+            'discover11' => [
+                'discover',
+                $this->generateCardNum(65, 16),
+                true,
+            ],
+            'discover12' => [
+                'discover',
+                $this->generateCardNum(6011, 19),
+                true,
+            ],
+            'discover13' => [
+                'discover',
+                $this->generateCardNum(622, 19),
+                true,
+            ],
+            'discover14' => [
+                'discover',
+                $this->generateCardNum(644, 19),
+                true,
+            ],
+            'discover15' => [
+                'discover',
+                $this->generateCardNum(645, 19),
+                true,
+            ],
+            'discover16' => [
+                'discover',
+                $this->generateCardNum(656, 19),
+                true,
+            ],
+            'discover17' => [
+                'discover',
+                $this->generateCardNum(647, 19),
+                true,
+            ],
+            'discover18' => [
+                'discover',
+                $this->generateCardNum(648, 19),
+                true,
+            ],
+            'discover19' => [
+                'discover',
+                $this->generateCardNum(649, 19),
+                true,
+            ],
+            'discover20' => [
+                'discover',
+                $this->generateCardNum(65, 19),
+                true,
+            ],
+            'interpayment1' => [
+                'interpayment',
+                $this->generateCardNum(4, 16),
+                true,
+            ],
+            'interpayment2' => [
+                'interpayment',
+                $this->generateCardNum(4, 17),
+                true,
+            ],
+            'interpayment3' => [
+                'interpayment',
+                $this->generateCardNum(4, 18),
+                true,
+            ],
+            'interpayment4' => [
+                'interpayment',
+                $this->generateCardNum(4, 19),
+                true,
+            ],
+            'jcb1' => [
+                'jcb',
+                $this->generateCardNum(352, 16),
+                true,
+            ],
+            'jcb2' => [
+                'jcb',
+                $this->generateCardNum(353, 16),
+                true,
+            ],
+            'jcb3' => [
+                'jcb',
+                $this->generateCardNum(354, 16),
+                true,
+            ],
+            'jcb4' => [
+                'jcb',
+                $this->generateCardNum(355, 16),
+                true,
+            ],
+            'jcb5' => [
+                'jcb',
+                $this->generateCardNum(356, 16),
+                true,
+            ],
+            'jcb6' => [
+                'jcb',
+                $this->generateCardNum(357, 16),
+                true,
+            ],
+            'jcb7' => [
+                'jcb',
+                $this->generateCardNum(358, 16),
+                true,
+            ],
+            'maestro1' => [
+                'maestro',
+                $this->generateCardNum(50, 12),
+                true,
+            ],
+            'maestro2' => [
+                'maestro',
+                $this->generateCardNum(56, 12),
+                true,
+            ],
+            'maestro3' => [
+                'maestro',
+                $this->generateCardNum(57, 12),
+                true,
+            ],
+            'maestro4' => [
+                'maestro',
+                $this->generateCardNum(58, 12),
+                true,
+            ],
+            'maestro5' => [
+                'maestro',
+                $this->generateCardNum(59, 12),
+                true,
+            ],
+            'maestro6' => [
+                'maestro',
+                $this->generateCardNum(60, 12),
+                true,
+            ],
+            'maestro7' => [
+                'maestro',
+                $this->generateCardNum(61, 12),
+                true,
+            ],
+            'maestro8' => [
+                'maestro',
+                $this->generateCardNum(62, 12),
+                true,
+            ],
+            'maestro9' => [
+                'maestro',
+                $this->generateCardNum(63, 12),
+                true,
+            ],
+            'maestro10' => [
+                'maestro',
+                $this->generateCardNum(64, 12),
+                true,
+            ],
+            'maestro11' => [
+                'maestro',
+                $this->generateCardNum(65, 12),
+                true,
+            ],
+            'maestro12' => [
+                'maestro',
+                $this->generateCardNum(66, 12),
+                true,
+            ],
+            'maestro13' => [
+                'maestro',
+                $this->generateCardNum(67, 12),
+                true,
+            ],
+            'maestro14' => [
+                'maestro',
+                $this->generateCardNum(68, 12),
+                true,
+            ],
+            'maestro15' => [
+                'maestro',
+                $this->generateCardNum(69, 12),
+                true,
+            ],
+            'maestro16' => [
+                'maestro',
+                $this->generateCardNum(50, 13),
+                true,
+            ],
+            'maestro17' => [
+                'maestro',
+                $this->generateCardNum(56, 13),
+                true,
+            ],
+            'maestro18' => [
+                'maestro',
+                $this->generateCardNum(57, 13),
+                true,
+            ],
+            'maestro19' => [
+                'maestro',
+                $this->generateCardNum(58, 13),
+                true,
+            ],
+            'maestro20' => [
+                'maestro',
+                $this->generateCardNum(59, 13),
+                true,
+            ],
+            'maestro21' => [
+                'maestro',
+                $this->generateCardNum(60, 13),
+                true,
+            ],
+            'maestro22' => [
+                'maestro',
+                $this->generateCardNum(61, 13),
+                true,
+            ],
+            'maestro23' => [
+                'maestro',
+                $this->generateCardNum(62, 13),
+                true,
+            ],
+            'maestro24' => [
+                'maestro',
+                $this->generateCardNum(63, 13),
+                true,
+            ],
+            'maestro25' => [
+                'maestro',
+                $this->generateCardNum(64, 13),
+                true,
+            ],
+            'maestro26' => [
+                'maestro',
+                $this->generateCardNum(65, 13),
+                true,
+            ],
+            'maestro27' => [
+                'maestro',
+                $this->generateCardNum(66, 13),
+                true,
+            ],
+            'maestro28' => [
+                'maestro',
+                $this->generateCardNum(67, 13),
+                true,
+            ],
+            'maestro29' => [
+                'maestro',
+                $this->generateCardNum(68, 13),
+                true,
+            ],
+            'maestro30' => [
+                'maestro',
+                $this->generateCardNum(69, 13),
+                true,
+            ],
+            'maestro31' => [
+                'maestro',
+                $this->generateCardNum(50, 14),
+                true,
+            ],
+            'maestro32' => [
+                'maestro',
+                $this->generateCardNum(56, 14),
+                true,
+            ],
+            'maestro33' => [
+                'maestro',
+                $this->generateCardNum(57, 14),
+                true,
+            ],
+            'maestro34' => [
+                'maestro',
+                $this->generateCardNum(58, 14),
+                true,
+            ],
+            'maestro35' => [
+                'maestro',
+                $this->generateCardNum(59, 14),
+                true,
+            ],
+            'maestro36' => [
+                'maestro',
+                $this->generateCardNum(60, 14),
+                true,
+            ],
+            'maestro37' => [
+                'maestro',
+                $this->generateCardNum(61, 14),
+                true,
+            ],
+            'maestro38' => [
+                'maestro',
+                $this->generateCardNum(62, 14),
+                true,
+            ],
+            'maestro39' => [
+                'maestro',
+                $this->generateCardNum(63, 14),
+                true,
+            ],
+            'maestro40' => [
+                'maestro',
+                $this->generateCardNum(64, 14),
+                true,
+            ],
+            'maestro41' => [
+                'maestro',
+                $this->generateCardNum(65, 14),
+                true,
+            ],
+            'maestro42' => [
+                'maestro',
+                $this->generateCardNum(66, 14),
+                true,
+            ],
+            'maestro43' => [
+                'maestro',
+                $this->generateCardNum(67, 14),
+                true,
+            ],
+            'maestro44' => [
+                'maestro',
+                $this->generateCardNum(68, 14),
+                true,
+            ],
+            'maestro45' => [
+                'maestro',
+                $this->generateCardNum(69, 14),
+                true,
+            ],
+            'maestro46' => [
+                'maestro',
+                $this->generateCardNum(50, 15),
+                true,
+            ],
+            'maestro47' => [
+                'maestro',
+                $this->generateCardNum(56, 15),
+                true,
+            ],
+            'maestro48' => [
+                'maestro',
+                $this->generateCardNum(57, 15),
+                true,
+            ],
+            'maestro49' => [
+                'maestro',
+                $this->generateCardNum(58, 15),
+                true,
+            ],
+            'maestro50' => [
+                'maestro',
+                $this->generateCardNum(59, 15),
+                true,
+            ],
+            'maestro51' => [
+                'maestro',
+                $this->generateCardNum(60, 15),
+                true,
+            ],
+            'maestro52' => [
+                'maestro',
+                $this->generateCardNum(61, 15),
+                true,
+            ],
+            'maestro53' => [
+                'maestro',
+                $this->generateCardNum(62, 15),
+                true,
+            ],
+            'maestro54' => [
+                'maestro',
+                $this->generateCardNum(63, 15),
+                true,
+            ],
+            'maestro55' => [
+                'maestro',
+                $this->generateCardNum(64, 15),
+                true,
+            ],
+            'maestro56' => [
+                'maestro',
+                $this->generateCardNum(65, 15),
+                true,
+            ],
+            'maestro57' => [
+                'maestro',
+                $this->generateCardNum(66, 15),
+                true,
+            ],
+            'maestro58' => [
+                'maestro',
+                $this->generateCardNum(67, 15),
+                true,
+            ],
+            'maestro59' => [
+                'maestro',
+                $this->generateCardNum(68, 15),
+                true,
+            ],
+            'maestro60' => [
+                'maestro',
+                $this->generateCardNum(69, 15),
+                true,
+            ],
+            'maestro61' => [
+                'maestro',
+                $this->generateCardNum(50, 16),
+                true,
+            ],
+            'maestro62' => [
+                'maestro',
+                $this->generateCardNum(56, 16),
+                true,
+            ],
+            'maestro63' => [
+                'maestro',
+                $this->generateCardNum(57, 16),
+                true,
+            ],
+            'maestro64' => [
+                'maestro',
+                $this->generateCardNum(58, 16),
+                true,
+            ],
+            'maestro65' => [
+                'maestro',
+                $this->generateCardNum(59, 16),
+                true,
+            ],
+            'maestro66' => [
+                'maestro',
+                $this->generateCardNum(60, 16),
+                true,
+            ],
+            'maestro67' => [
+                'maestro',
+                $this->generateCardNum(61, 16),
+                true,
+            ],
+            'maestro68' => [
+                'maestro',
+                $this->generateCardNum(62, 16),
+                true,
+            ],
+            'maestro69' => [
+                'maestro',
+                $this->generateCardNum(63, 16),
+                true,
+            ],
+            'maestro70' => [
+                'maestro',
+                $this->generateCardNum(64, 16),
+                true,
+            ],
+            'maestro71' => [
+                'maestro',
+                $this->generateCardNum(65, 16),
+                true,
+            ],
+            'maestro72' => [
+                'maestro',
+                $this->generateCardNum(66, 16),
+                true,
+            ],
+            'maestro73' => [
+                'maestro',
+                $this->generateCardNum(67, 16),
+                true,
+            ],
+            'maestro74' => [
+                'maestro',
+                $this->generateCardNum(68, 16),
+                true,
+            ],
+            'maestro75' => [
+                'maestro',
+                $this->generateCardNum(69, 16),
+                true,
+            ],
+            'maestro91' => [
+                'maestro',
+                $this->generateCardNum(50, 18),
+                true,
+            ],
+            'maestro92' => [
+                'maestro',
+                $this->generateCardNum(56, 18),
+                true,
+            ],
+            'maestro93' => [
+                'maestro',
+                $this->generateCardNum(57, 18),
+                true,
+            ],
+            'maestro94' => [
+                'maestro',
+                $this->generateCardNum(58, 18),
+                true,
+            ],
+            'maestro95' => [
+                'maestro',
+                $this->generateCardNum(59, 18),
+                true,
+            ],
+            'maestro96' => [
+                'maestro',
+                $this->generateCardNum(60, 18),
+                true,
+            ],
+            'maestro97' => [
+                'maestro',
+                $this->generateCardNum(61, 18),
+                true,
+            ],
+            'maestro98' => [
+                'maestro',
+                $this->generateCardNum(62, 18),
+                true,
+            ],
+            'maestro99' => [
+                'maestro',
+                $this->generateCardNum(63, 18),
+                true,
+            ],
+            'maestro100' => [
+                'maestro',
+                $this->generateCardNum(64, 18),
+                true,
+            ],
+            'maestro101' => [
+                'maestro',
+                $this->generateCardNum(65, 18),
+                true,
+            ],
+            'maestro102' => [
+                'maestro',
+                $this->generateCardNum(66, 18),
+                true,
+            ],
+            'maestro103' => [
+                'maestro',
+                $this->generateCardNum(67, 18),
+                true,
+            ],
+            'maestro104' => [
+                'maestro',
+                $this->generateCardNum(68, 18),
+                true,
+            ],
+            'maestro105' => [
+                'maestro',
+                $this->generateCardNum(69, 18),
+                true,
+            ],
+            'maestro106' => [
+                'maestro',
+                $this->generateCardNum(50, 19),
+                true,
+            ],
+            'maestro107' => [
+                'maestro',
+                $this->generateCardNum(56, 19),
+                true,
+            ],
+            'maestro108' => [
+                'maestro',
+                $this->generateCardNum(57, 19),
+                true,
+            ],
+            'maestro109' => [
+                'maestro',
+                $this->generateCardNum(58, 19),
+                true,
+            ],
+            'maestro110' => [
+                'maestro',
+                $this->generateCardNum(59, 19),
+                true,
+            ],
+            'maestro111' => [
+                'maestro',
+                $this->generateCardNum(60, 19),
+                true,
+            ],
+            'maestro112' => [
+                'maestro',
+                $this->generateCardNum(61, 19),
+                true,
+            ],
+            'maestro113' => [
+                'maestro',
+                $this->generateCardNum(62, 19),
+                true,
+            ],
+            'maestro114' => [
+                'maestro',
+                $this->generateCardNum(63, 19),
+                true,
+            ],
+            'maestro115' => [
+                'maestro',
+                $this->generateCardNum(64, 19),
+                true,
+            ],
+            'maestro116' => [
+                'maestro',
+                $this->generateCardNum(65, 19),
+                true,
+            ],
+            'maestro117' => [
+                'maestro',
+                $this->generateCardNum(66, 19),
+                true,
+            ],
+            'maestro118' => [
+                'maestro',
+                $this->generateCardNum(67, 19),
+                true,
+            ],
+            'maestro119' => [
+                'maestro',
+                $this->generateCardNum(68, 19),
+                true,
+            ],
+            'maestro120' => [
+                'maestro',
+                $this->generateCardNum(69, 19),
+                true,
+            ],
+            'dankort1' => [
+                'dankort',
+                $this->generateCardNum(5019, 16),
+                true,
+            ],
+            'dankort2' => [
+                'dankort',
+                $this->generateCardNum(4175, 16),
+                true,
+            ],
+            'dankort3' => [
+                'dankort',
+                $this->generateCardNum(4571, 16),
+                true,
+            ],
+            'dankort4' => [
+                'dankort',
+                $this->generateCardNum(4, 16),
+                true,
+            ],
+            'mir1' => [
+                'mir',
+                $this->generateCardNum(2200, 16),
+                true,
+            ],
+            'mir2' => [
+                'mir',
+                $this->generateCardNum(2201, 16),
+                true,
+            ],
+            'mir3' => [
+                'mir',
+                $this->generateCardNum(2202, 16),
+                true,
+            ],
+            'mir4' => [
+                'mir',
+                $this->generateCardNum(2203, 16),
+                true,
+            ],
+            'mir5' => [
+                'mir',
+                $this->generateCardNum(2204, 16),
+                true,
+            ],
+            'mastercard1' => [
+                'mastercard',
+                $this->generateCardNum(51, 16),
+                true,
+            ],
+            'mastercard2' => [
+                'mastercard',
+                $this->generateCardNum(52, 16),
+                true,
+            ],
+            'mastercard3' => [
+                'mastercard',
+                $this->generateCardNum(53, 16),
+                true,
+            ],
+            'mastercard4' => [
+                'mastercard',
+                $this->generateCardNum(54, 16),
+                true,
+            ],
+            'mastercard5' => [
+                'mastercard',
+                $this->generateCardNum(55, 16),
+                true,
+            ],
+            'mastercard6' => [
+                'mastercard',
+                $this->generateCardNum(22, 16),
+                true,
+            ],
+            'mastercard7' => [
+                'mastercard',
+                $this->generateCardNum(23, 16),
+                true,
+            ],
+            'mastercard8' => [
+                'mastercard',
+                $this->generateCardNum(24, 16),
+                true,
+            ],
+            'mastercard9' => [
+                'mastercard',
+                $this->generateCardNum(25, 16),
+                true,
+            ],
+            'mastercard10' => [
+                'mastercard',
+                $this->generateCardNum(26, 16),
+                true,
+            ],
+            'mastercard11' => [
+                'mastercard',
+                $this->generateCardNum(27, 16),
+                true,
+            ],
+            'visa1' => [
+                'visa',
+                $this->generateCardNum(4, 13),
+                true,
+            ],
+            'visa2' => [
+                'visa',
+                $this->generateCardNum(4, 16),
+                true,
+            ],
+            'visa3' => [
+                'visa',
+                $this->generateCardNum(4, 19),
+                true,
+            ],
+            'uatp' => [
+                'uatp',
+                $this->generateCardNum(1, 15),
+                true,
+            ],
+            'verve1' => [
+                'verve',
+                $this->generateCardNum(506, 16),
+                true,
+            ],
+            'verve2' => [
+                'verve',
+                $this->generateCardNum(650, 16),
+                true,
+            ],
+            'verve3' => [
+                'verve',
+                $this->generateCardNum(506, 19),
+                true,
+            ],
+            'verve4' => [
+                'verve',
+                $this->generateCardNum(650, 19),
+                true,
+            ],
+            'cibc1' => [
+                'cibc',
+                $this->generateCardNum(4506, 16),
+                true,
+            ],
+            'rbc1' => [
+                'rbc',
+                $this->generateCardNum(45, 16),
+                true,
+            ],
+            'tdtrust' => [
+                'tdtrust',
+                $this->generateCardNum(589297, 16),
+                true,
+            ],
+            'scotia1' => [
+                'scotia',
+                $this->generateCardNum(4536, 16),
+                true,
+            ],
+            'bmoabm1' => [
+                'bmoabm',
+                $this->generateCardNum(500, 16),
+                true,
+            ],
+            'hsbc1' => [
+                'hsbc',
+                $this->generateCardNum(56, 16),
+                true,
+            ],
+            'hsbc2' => [
+                'hsbc',
+                $this->generateCardNum(57, 16),
+                false,
+            ],
+        ];
+    }
 
-	/**
-	 * Used to generate fake credit card numbers that will still pass the Luhn
-	 * check used to validate the card so we can be sure the cards are recognized correctly.
-	 *
-	 * @param integer $prefix
-	 * @param integer $length
-	 *
-	 * @return string
-	 */
-	protected function generateCardNum(int $prefix, int $length)
-	{
-		$pos        = mb_strlen($prefix);
-		$finalDigit = 0;
-		$sum        = 0;
+    /**
+     * Used to generate fake credit card numbers that will still pass the Luhn
+     * check used to validate the card so we can be sure the cards are recognized correctly.
+     *
+     * @return string
+     */
+    protected function generateCardNum(int $prefix, int $length)
+    {
+        $pos        = mb_strlen($prefix);
+        $finalDigit = 0;
+        $sum        = 0;
 
-		// Fill in the first values of the string based on $prefix
-		$string = str_split($prefix);
+        // Fill in the first values of the string based on $prefix
+        $string = str_split($prefix);
 
-		// Pad out the array to the appropriate length
-		$string = array_pad($string, $length, 0);
+        // Pad out the array to the appropriate length
+        $string = array_pad($string, $length, 0);
 
-		// Fill all of the remaining values with random numbers, except the last one.
-		while ($pos < $length - 1)
-		{
-			$string[$pos ++] = random_int(0, 9);
-		}
+        // Fill all of the remaining values with random numbers, except the last one.
+        while ($pos < $length - 1) {
+            $string[$pos++] = random_int(0, 9);
+        }
 
-		// Calculate the Luhn checksum of the current values.
-		$lenOffset = ($length + 1) % 2;
-		for ($pos = 0; $pos < $length - 1; $pos ++)
-		{
-			if (($pos + $lenOffset) % 2)
-			{
-				$temp = $string[$pos] * 2;
-				if ($temp > 9)
-				{
-					$temp -= 9;
-				}
+        // Calculate the Luhn checksum of the current values.
+        $lenOffset = ($length + 1) % 2;
 
-				$sum += $temp;
-			}
-			else
-			{
-				$sum += $string[$pos];
-			}
-		}
+        for ($pos = 0; $pos < $length - 1; $pos++) {
+            if (($pos + $lenOffset) % 2) {
+                $temp = $string[$pos] * 2;
+                if ($temp > 9) {
+                    $temp -= 9;
+                }
 
-		// Make the last number whatever would cause the entire number to pass the checksum
-		$finalDigit          = (10 - ($sum % 10)) % 10;
-		$string[$length - 1] = $finalDigit;
+                $sum += $temp;
+            } else {
+                $sum += $string[$pos];
+            }
+        }
 
-		return implode('', $string);
-	}
+        // Make the last number whatever would cause the entire number to pass the checksum
+        $finalDigit          = (10 - ($sum % 10)) % 10;
+        $string[$length - 1] = $finalDigit;
 
-	//--------------------------------------------------------------------
+        return implode('', $string);
+    }
 }
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index a97ea8983716..0e4e70ec537f 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -1,333 +1,331 @@
-<?php namespace CodeIgniter\Validation;
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class FileRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileRulesTest extends CIUnitTestCase
 {
-
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'      => [
-			Rules::class,
-			FormatRules::class,
-			FileRules::class,
-			CreditCardRules::class,
-			TestRules::class,
-		],
-		'groupA'        => [
-			'foo' => 'required|min_length[5]',
-		],
-		'groupA_errors' => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-	];
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->validation = new Validation((object) $this->config, Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [
-			'avatar'  => [
-				'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-				'name'     => 'my-avatar.png',
-				'size'     => 4614,
-				'type'     => 'image/png',
-				'error'    => 0,
-				'width'    => 640,
-				'height'   => 400,
-			],
-			'bigfile' => [
-				'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-				'name'     => 'my-big-file.png',
-				'size'     => 1024000,
-				'type'     => 'image/png',
-				'error'    => 0,
-				'width'    => 640,
-				'height'   => 400,
-			],
-			'photo'   => [
-				'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-				'name'     => 'my-photo.png',
-				'size'     => 4614,
-				'type'     => 'image/png',
-				'error'    => 1, // upload_max_filesize exceeded
-				'width'    => 640,
-				'height'   => 400,
-			],
-			'images'  => [
-				'tmp_name' => [
-					TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-					TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-				],
-				'name'     => [
-					'my_avatar.png',
-					'my_bigfile.png',
-				],
-				'size'     => [
-					4614,
-					1024000,
-				],
-				'type'     => [
-					'image/png',
-					'image/png',
-				],
-				'error'    => [
-					0,
-					0,
-				],
-				'width'    => [
-					640,
-					640,
-				],
-				'height'   => [
-					400,
-					400,
-				],
-			],
-			'photos'  => [
-				'tmp_name' => [
-					TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-					TESTPATH . '_support/Validation/uploads/phpUxc0ty',
-				],
-				'name'     => [
-					'my_avatar.png',
-					'my_bigfile.png',
-				],
-				'size'     => [
-					4614,
-					1024000,
-				],
-				'type'     => [
-					'image/png',
-					'image/png',
-				],
-				'error'    => [
-					1,
-					0,
-				],
-				'width'    => [
-					640,
-					640,
-				],
-				'height'   => [
-					400,
-					400,
-				],
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testUploadedTrue()
-	{
-		$this->validation->setRules([
-			'avatar' => 'uploaded[avatar]',
-		]);
-
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testUploadedFalse()
-	{
-		$this->validation->setRules([
-			'avatar' => 'uploaded[userfile]',
-		]);
-
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testUploadedArrayReturnsTrue()
-	{
-		$this->validation->setRules([
-			'images' => 'uploaded[images]',
-		]);
-
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testUploadedArrayReturnsFalse()
-	{
-		$this->validation->setRules([
-			'photos' => 'uploaded[photos]',
-		]);
-
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxSize()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_size[avatar,100]',
-		]);
-
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testMaxSizeBigFile()
-	{
-		$this->validation->setRules([
-			'bigfile' => 'max_size[bigfile,9999]',
-		]);
-
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testMaxSizeFail()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_size[avatar,4]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testMaxSizeFailDueToUploadMaxFilesizeExceededInPhpIni()
-	{
-		$this->validation->setRules([
-			'photo' => 'max_size[photo,100]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testMaxSizeBigFileFail()
-	{
-		$this->validation->setRules([
-			'bigfile' => 'max_size[bigfile,10]',
-		]);
-
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testMaxSizeBad()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_size[userfile,50]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxDims()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_dims[avatar,640,480]',
-		]);
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testMaxDimsFail()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_dims[avatar,600,480]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testMaxDimsBad()
-	{
-		$this->validation->setRules([
-			'avatar' => 'max_dims[unknown,640,480]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIsImage()
-	{
-		$this->validation->setRules([
-			'avatar' => 'is_image[avatar]',
-		]);
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testIsntImage()
-	{
-		$_FILES['stuff'] = [
-			'tmp_name' => TESTPATH . '_support/Validation/uploads/abc77tz',
-			'name'     => 'address.book',
-			'size'     => 12345,
-			'type'     => 'application/address',
-			'error'    => 0,
-		];
-		$this->validation->setRules([
-			'avatar' => 'is_image[stuff]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testAlsoIsntImage()
-	{
-		$this->validation->setRules([
-			'avatar' => 'is_image[unknown]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMimeTypeOk()
-	{
-		$this->validation->setRules([
-			'avatar' => 'mime_in[avatar,image/jpg,image/jpeg,image/gif,image/png]',
-		]);
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testMimeTypeNotOk()
-	{
-		$this->validation->setRules([
-			'avatar' => 'mime_in[avatar,application/xls,application/doc,application/ppt]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testMimeTypeImpossible()
-	{
-		$this->validation->setRules([
-			'avatar' => 'mime_in[unknown,application/xls,application/doc,application/ppt]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExtensionOk()
-	{
-		$this->validation->setRules([
-			'avatar' => 'ext_in[avatar,jpg,jpeg,gif,png]',
-		]);
-		$this->assertTrue($this->validation->run([]));
-	}
-
-	public function testExtensionNotOk()
-	{
-		$this->validation->setRules([
-			'avatar' => 'ext_in[avatar,xls,doc,ppt]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	public function testExtensionImpossible()
-	{
-		$this->validation->setRules([
-			'avatar' => 'ext_in[unknown,xls,doc,ppt]',
-		]);
-		$this->assertFalse($this->validation->run([]));
-	}
-
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [
+            'avatar' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-avatar.png',
+                'size'     => 4614,
+                'type'     => 'image/png',
+                'error'    => 0,
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'bigfile' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-big-file.png',
+                'size'     => 1024000,
+                'type'     => 'image/png',
+                'error'    => 0,
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'photo' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-photo.png',
+                'size'     => 4614,
+                'type'     => 'image/png',
+                'error'    => 1, // upload_max_filesize exceeded
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'images' => [
+                'tmp_name' => [
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                ],
+                'name' => [
+                    'my_avatar.png',
+                    'my_bigfile.png',
+                ],
+                'size' => [
+                    4614,
+                    1024000,
+                ],
+                'type' => [
+                    'image/png',
+                    'image/png',
+                ],
+                'error' => [
+                    0,
+                    0,
+                ],
+                'width' => [
+                    640,
+                    640,
+                ],
+                'height' => [
+                    400,
+                    400,
+                ],
+            ],
+            'photos' => [
+                'tmp_name' => [
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                ],
+                'name' => [
+                    'my_avatar.png',
+                    'my_bigfile.png',
+                ],
+                'size' => [
+                    4614,
+                    1024000,
+                ],
+                'type' => [
+                    'image/png',
+                    'image/png',
+                ],
+                'error' => [
+                    1,
+                    0,
+                ],
+                'width' => [
+                    640,
+                    640,
+                ],
+                'height' => [
+                    400,
+                    400,
+                ],
+            ],
+        ];
+    }
+
+    public function testUploadedTrue()
+    {
+        $this->validation->setRules([
+            'avatar' => 'uploaded[avatar]',
+        ]);
+
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testUploadedFalse()
+    {
+        $this->validation->setRules([
+            'avatar' => 'uploaded[userfile]',
+        ]);
+
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testUploadedArrayReturnsTrue()
+    {
+        $this->validation->setRules([
+            'images' => 'uploaded[images]',
+        ]);
+
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testUploadedArrayReturnsFalse()
+    {
+        $this->validation->setRules([
+            'photos' => 'uploaded[photos]',
+        ]);
+
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSize()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_size[avatar,100]',
+        ]);
+
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxSizeBigFile()
+    {
+        $this->validation->setRules([
+            'bigfile' => 'max_size[bigfile,9999]',
+        ]);
+
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxSizeFail()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_size[avatar,4]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeFailDueToUploadMaxFilesizeExceededInPhpIni()
+    {
+        $this->validation->setRules([
+            'photo' => 'max_size[photo,100]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeBigFileFail()
+    {
+        $this->validation->setRules([
+            'bigfile' => 'max_size[bigfile,10]',
+        ]);
+
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeBad()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_size[userfile,50]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxDims()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_dims[avatar,640,480]',
+        ]);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxDimsFail()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_dims[avatar,600,480]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxDimsBad()
+    {
+        $this->validation->setRules([
+            'avatar' => 'max_dims[unknown,640,480]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testIsImage()
+    {
+        $this->validation->setRules([
+            'avatar' => 'is_image[avatar]',
+        ]);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testIsntImage()
+    {
+        $_FILES['stuff'] = [
+            'tmp_name' => TESTPATH . '_support/Validation/uploads/abc77tz',
+            'name'     => 'address.book',
+            'size'     => 12345,
+            'type'     => 'application/address',
+            'error'    => 0,
+        ];
+        $this->validation->setRules([
+            'avatar' => 'is_image[stuff]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testAlsoIsntImage()
+    {
+        $this->validation->setRules([
+            'avatar' => 'is_image[unknown]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMimeTypeOk()
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[avatar,image/jpg,image/jpeg,image/gif,image/png]',
+        ]);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMimeTypeNotOk()
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[avatar,application/xls,application/doc,application/ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMimeTypeImpossible()
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[unknown,application/xls,application/doc,application/ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testExtensionOk()
+    {
+        $this->validation->setRules([
+            'avatar' => 'ext_in[avatar,jpg,jpeg,gif,png]',
+        ]);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testExtensionNotOk()
+    {
+        $this->validation->setRules([
+            'avatar' => 'ext_in[avatar,xls,doc,ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testExtensionImpossible()
+    {
+        $this->validation->setRules([
+            'avatar' => 'ext_in[unknown,xls,doc,ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
 }
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 8154c6035882..725824607748 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -1,1297 +1,1311 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class FormatRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormatRulesTest extends CIUnitTestCase
 {
-
-	const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
-	const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
-
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'      => [
-			Rules::class,
-			FormatRules::class,
-			FileRules::class,
-			CreditCardRules::class,
-			TestRules::class,
-		],
-		'groupA'        => [
-			'foo' => 'required|min_length[5]',
-		],
-		'groupA_errors' => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-	];
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		$this->validation = new Validation((object) $this->config, Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [];
-	}
-
-	public function testRegexMatch()
-	{
-		$data = [
-			'foo'   => 'abcde',
-			'phone' => '0987654321',
-		];
-
-		$this->validation->setRules([
-			'foo'   => 'regex_match[/[a-z]/]',
-			'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	public function testRegexMatchFalse()
-	{
-		$data = [
-			'foo'   => 'abcde',
-			'phone' => '09876543214',
-		];
-
-		$this->validation->setRules([
-			'foo'   => 'regex_match[\d]',
-			'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	/**
-	 * @dataProvider urlProvider
-	 */
-	public function testValidURL(?string $url, bool $expected)
-	{
-		$data = [
-			'foo' => $url,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'valid_url',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function urlProvider()
-	{
-		return [
-			[
-				'www.codeigniter.com',
-				true,
-			],
-			[
-				'http://codeigniter.com',
-				true,
-			],
-			//https://bugs.php.net/bug.php?id=51192
-			[
-				'http://accept-dashes.tld',
-				true,
-			],
-			[
-				'http://reject_underscores',
-				false,
-			],
-			// https://github.com/codeigniter4/CodeIgniter/issues/4415
-			[
-				'http://[::1]/ipv6',
-				true,
-			],
-			[
-				'htt://www.codeigniter.com',
-				false,
-			],
-			[
-				'',
-				false,
-			],
-			[
-				'code igniter',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-			[
-				'http://',
-				true,
-			], // this is apparently valid!
-			[
-				'http:///oops.com',
-				false,
-			],
-			[
-				'123.com',
-				true,
-			],
-			[
-				'abc.123',
-				true,
-			],
-			[
-				'http:8080//abc.com',
-				true,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider emailProviderSingle
-	 *
-	 * @param $email
-	 * @param $expected
-	 */
-	public function testValidEmail($email, $expected)
-	{
-		$data = [
-			'foo' => $email,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'valid_email',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	/**
-	 * @dataProvider emailsProvider
-	 *
-	 * @param $email
-	 * @param $expected
-	 */
-	public function testValidEmails($email, $expected)
-	{
-		$data = [
-			'foo' => $email,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'valid_emails',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function emailProviderSingle()
-	{
-		return [
-			[
-				'email@sample.com',
-				true,
-			],
-			[
-				'valid_email',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	public function emailsProvider()
-	{
-		return [
-			[
-				'1@sample.com,2@sample.com',
-				true,
-			],
-			[
-				'1@sample.com, 2@sample.com',
-				true,
-			],
-			[
-				'email@sample.com',
-				true,
-			],
-			[
-				'@sample.com,2@sample.com,validemail@email.ca',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-			[
-				',',
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider ipProvider
-	 *
-	 * @param $ip
-	 * @param $which
-	 * @param $expected
-	 */
-	public function testValidIP($ip, $which, $expected)
-	{
-		$data = [
-			'foo' => $ip,
-		];
-
-		$this->validation->setRules([
-			'foo' => "valid_ip[{$which}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function ipProvider()
-	{
-		return [
-			[
-				'127.0.0.1',
-				null,
-				true,
-			],
-			[
-				'127.0.0.1',
-				'ipv4',
-				true,
-			],
-			[
-				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-				null,
-				true,
-			],
-			[
-				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-				'ipv6',
-				true,
-			],
-			[
-				'2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-				'ipv4',
-				false,
-			],
-			[
-				'127.0.0.1',
-				'ipv6',
-				false,
-			],
-			[
-				'H001:0db8:85a3:0000:0000:8a2e:0370:7334',
-				null,
-				false,
-			],
-			[
-				'127.0.0.259',
-				null,
-				false,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider stringProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testString($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'string',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function stringProvider()
-	{
-		return [
-			[
-				'123',
-				true,
-			],
-			[
-				123,
-				false,
-			],
-			[
-				'hello',
-				true,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider alphaProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testAlpha($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaProvider()
-	{
-		return [
-			[
-				FormatRulesTest::ALPHABET,
-				true,
-			],
-			[
-				FormatRulesTest::ALPHABET . ' ',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHABET . '1',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHABET . '*',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * Test alpha with spaces.
-	 *
-	 * @param mixed   $value    Value.
-	 * @param boolean $expected Expected.
-	 *
-	 * @dataProvider alphaSpaceProvider
-	 */
-	public function testAlphaSpace($value, $expected)
-	{
-		$data = [
-			'foo' => $value,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha_space',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaSpaceProvider()
-	{
-		return [
-			[
-				null,
-				true,
-			],
-			[
-				FormatRulesTest::ALPHABET,
-				true,
-			],
-			[
-				FormatRulesTest::ALPHABET . ' ',
-				true,
-			],
-			[
-				FormatRulesTest::ALPHABET . "\n",
-				false,
-			],
-			[
-				FormatRulesTest::ALPHABET . '1',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHABET . '*',
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider alphaNumericProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testAlphaNumeric($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha_numeric',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaNumericProvider()
-	{
-		return [
-			[
-				FormatRulesTest::ALPHANUMERIC,
-				true,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '\ ',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '_',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider alphaNumericPunctProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testAlphaNumericPunct($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha_numeric_punct',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaNumericPunctProvider()
-	{
-		return [
-			[
-				FormatRulesTest::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
-				true,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '`',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . "\n",
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '@',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '^',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '(',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . ')',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '\\',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '{',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '}',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '[',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . ']',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '"',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . "'",
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '<',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '>',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '/',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider alphaNumericProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testAlphaNumericSpace($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha_numeric_space',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaNumericSpaceProvider()
-	{
-		return [
-			[
-				' ' . FormatRulesTest::ALPHANUMERIC,
-				true,
-			],
-			[
-				' ' . FormatRulesTest::ALPHANUMERIC . '-',
-				false,
-			],
-			[
-				' ' . FormatRulesTest::ALPHANUMERIC . "\n",
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider alphaDashProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testAlphaDash($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'alpha_dash',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function alphaDashProvider()
-	{
-		return [
-			[
-				FormatRulesTest::ALPHANUMERIC . '-',
-				true,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . '-\ ',
-				false,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC . "-\n",
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider hexProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testHex($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'hex',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function hexProvider()
-	{
-		return [
-			[
-				'abcdefABCDEF0123456789',
-				true,
-			],
-			[
-				FormatRulesTest::ALPHANUMERIC,
-				false,
-			],
-			[
-				'asdfjkl;',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider numericProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testNumeric($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'numeric',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function numericProvider()
-	{
-		return [
-			[
-				'0',
-				true,
-			],
-			[
-				'12314',
-				true,
-			],
-			[
-				'-42',
-				true,
-			],
-			[
-				'+42',
-				true,
-			],
-			[
-				"+42\n",
-				false,
-			],
-			[
-				'123a',
-				false,
-			],
-			[
-				'--1',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider integerProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testInteger($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'integer',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function integerProvider()
-	{
-		return [
-			[
-				'0',
-				true,
-			],
-			[
-				'42',
-				true,
-			],
-			[
-				'-1',
-				true,
-			],
-			[
-				"+42\n",
-				false,
-			],
-			[
-				'123a',
-				false,
-			],
-			[
-				'1.9',
-				false,
-			],
-			[
-				'--1',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider decimalProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testDecimal($str, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'decimal',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function decimalProvider()
-	{
-		return [
-			[
-				'1.0',
-				true,
-			],
-			[
-				'-0.98',
-				true,
-			],
-			[
-				'0',
-				true,
-			],
-			[
-				"0\n",
-				false,
-			],
-			[
-				'1.0a',
-				false,
-			],
-			[
-				'-i',
-				false,
-			],
-			[
-				'--1',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-			[
-				'.25',
-				true,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider naturalProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testNatural($first, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_natural',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function naturalProvider()
-	{
-		return [
-			[
-				'0',
-				true,
-			],
-			[
-				'12',
-				true,
-			],
-			[
-				'42a',
-				false,
-			],
-			[
-				'-1',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider naturalZeroProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testNaturalNoZero($first, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_natural_no_zero',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function naturalZeroProvider()
-	{
-		return [
-			[
-				'0',
-				false,
-			],
-			[
-				'12',
-				true,
-			],
-			[
-				'42a',
-				false,
-			],
-			[
-				'-1',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider base64Provider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testBase64($first, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'valid_base64',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function base64Provider()
-	{
-		return [
-			[
-				base64_encode('string'),
-				true,
-			],
-			[
-				'FA08GG',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider jsonProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testJson($first, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'valid_json',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function jsonProvider()
-	{
-		return [
-			[
-				'null',
-				true,
-			],
-			[
-				'"null"',
-				true,
-			],
-			[
-				'600100825',
-				true,
-			],
-			[
-				'{"A":"Yay.", "B":[0,5]}',
-				true,
-			],
-			[
-				'[0,"2",2.2,"3.3"]',
-				true,
-			],
-			[
-				null,
-				false,
-			],
-			[
-				'600-Nope. Should not pass.',
-				false,
-			],
-			[
-				'{"A":SHOULD_NOT_PASS}',
-				false,
-			],
-			[
-				'[0,"2",2.2 "3.3"]',
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider timezoneProvider
-	 *
-	 * @param $value
-	 * @param $expected
-	 */
-	public function testTimeZone($value, $expected)
-	{
-		$data = [
-			'foo' => $value,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'timezone',
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function timezoneProvider()
-	{
-		return [
-			[
-				'America/Chicago',
-				true,
-			],
-			[
-				'america/chicago',
-				false,
-			],
-			[
-				'foo/bar',
-				false,
-			],
-			[
-				null,
-				false,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider validDateProvider
-	 *
-	 * @param $str
-	 * @param $format
-	 * @param $expected
-	 */
-	public function testValidDate($str, $format, $expected)
-	{
-		$data = [
-			'foo' => $str,
-		];
-
-		$this->validation->setRules([
-			'foo' => "valid_date[{$format}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	public function validDateProvider()
-	{
-		return [
-			[
-				'Sun',
-				'D',
-				true,
-			],
-			[
-				'Sun',
-				'd',
-				false,
-			],
-			[
-				'Sun',
-				null,
-				true,
-			],
-			[
-				'1500',
-				'Y',
-				true,
-			],
-			[
-				'1500',
-				'y',
-				false,
-			],
-			[
-				'1500',
-				null,
-				true,
-			],
-			[
-				'09:26:05',
-				'H:i:s',
-				true,
-			],
-			[
-				'09:26:5',
-				'H:i:s',
-				false,
-			],
-			[
-				'1992-02-29',
-				'Y-m-d',
-				true,
-			],
-			[
-				'1991-02-29',
-				'Y-m-d',
-				false,
-			],
-			[
-				'1718-05-10 15:25:59',
-				'Y-m-d H:i:s',
-				true,
-			],
-			[
-				'1718-05-10 15:5:59',
-				'Y-m-d H:i:s',
-				false,
-			],
-			[
-				'Thu, 31 Oct 2013 13:31:00',
-				'D, d M Y H:i:s',
-				true,
-			],
-			[
-				'Thu, 31 Jun 2013 13:31:00',
-				'D, d M Y H:i:s',
-				false,
-			],
-			[
-				'Thu, 31 Jun 2013 13:31:00',
-				null,
-				true,
-			],
-			[
-				'07.05.03',
-				'm.d.y',
-				true,
-			],
-			[
-				'07.05.1803',
-				'm.d.y',
-				false,
-			],
-			[
-				'19890109',
-				'Ymd',
-				true,
-			],
-			[
-				'198919',
-				'Ymd',
-				false,
-			],
-			[
-				'2, 7, 2001',
-				'j, n, Y',
-				true,
-			],
-			[
-				'2, 17, 2001',
-				'j, n, Y',
-				false,
-			],
-			[
-				'09-42-25, 12-11-17',
-				'h-i-s, j-m-y',
-				true,
-			],
-			[
-				'09-42-25, 12-00-17',
-				'h-i-s, j-m-y',
-				false,
-			],
-			[
-				'09-42-25, 12-00-17',
-				null,
-				false,
-			],
-			[
-				'November 12, 2017, 9:42 am',
-				'F j, Y, g:i a',
-				true,
-			],
-			[
-				'November 12, 2017, 19:42 am',
-				'F j, Y, g:i a',
-				false,
-			],
-			[
-				'November 12, 2017, 9:42 am',
-				null,
-				true,
-			],
-			[
-				'Monday 8th of August 2005 03:12:46 PM',
-				'l jS \of F Y h:i:s A',
-				true,
-			],
-			[
-				'Monday 8th of August 2005 13:12:46 PM',
-				'l jS \of F Y h:i:s A',
-				false,
-			],
-			[
-				'23:01:59 is now',
-				'H:m:s \i\s \n\o\w',
-				true,
-			],
-			[
-				'23:01:59 is now',
-				'H:m:s is now',
-				false,
-			],
-			[
-				'12/11/2017',
-				'd/m/Y',
-				true,
-			],
-		];
-	}
-
+    public const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
+    public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
+
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [];
+    }
+
+    public function testRegexMatch()
+    {
+        $data = [
+            'foo'   => 'abcde',
+            'phone' => '0987654321',
+        ];
+
+        $this->validation->setRules([
+            'foo'   => 'regex_match[/[a-z]/]',
+            'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testRegexMatchFalse()
+    {
+        $data = [
+            'foo'   => 'abcde',
+            'phone' => '09876543214',
+        ];
+
+        $this->validation->setRules([
+            'foo'   => 'regex_match[\d]',
+            'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider urlProvider
+     */
+    public function testValidURL(?string $url, bool $expected)
+    {
+        $data = [
+            'foo' => $url,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function urlProvider()
+    {
+        return [
+            [
+                'www.codeigniter.com',
+                true,
+            ],
+            [
+                'http://codeigniter.com',
+                true,
+            ],
+            //https://bugs.php.net/bug.php?id=51192
+            [
+                'http://accept-dashes.tld',
+                true,
+            ],
+            [
+                'http://reject_underscores',
+                false,
+            ],
+            // https://github.com/codeigniter4/CodeIgniter/issues/4415
+            [
+                'http://[::1]/ipv6',
+                true,
+            ],
+            [
+                'htt://www.codeigniter.com',
+                false,
+            ],
+            [
+                '',
+                false,
+            ],
+            [
+                'code igniter',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                'http://',
+                true,
+            ], // this is apparently valid!
+            [
+                'http:///oops.com',
+                false,
+            ],
+            [
+                '123.com',
+                true,
+            ],
+            [
+                'abc.123',
+                true,
+            ],
+            [
+                'http:8080//abc.com',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider emailProviderSingle
+     *
+     * @param $email
+     * @param $expected
+     */
+    public function testValidEmail($email, $expected)
+    {
+        $data = [
+            'foo' => $email,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_email',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider emailsProvider
+     *
+     * @param $email
+     * @param $expected
+     */
+    public function testValidEmails($email, $expected)
+    {
+        $data = [
+            'foo' => $email,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_emails',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function emailProviderSingle()
+    {
+        return [
+            [
+                'email@sample.com',
+                true,
+            ],
+            [
+                'valid_email',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    public function emailsProvider()
+    {
+        return [
+            [
+                '1@sample.com,2@sample.com',
+                true,
+            ],
+            [
+                '1@sample.com, 2@sample.com',
+                true,
+            ],
+            [
+                'email@sample.com',
+                true,
+            ],
+            [
+                '@sample.com,2@sample.com,validemail@email.ca',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                ',',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider ipProvider
+     *
+     * @param $ip
+     * @param $which
+     * @param $expected
+     */
+    public function testValidIP($ip, $which, $expected)
+    {
+        $data = [
+            'foo' => $ip,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "valid_ip[{$which}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function ipProvider()
+    {
+        return [
+            [
+                '127.0.0.1',
+                null,
+                true,
+            ],
+            [
+                '127.0.0.1',
+                'ipv4',
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                null,
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                'ipv6',
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                'ipv4',
+                false,
+            ],
+            [
+                '127.0.0.1',
+                'ipv6',
+                false,
+            ],
+            [
+                'H001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                null,
+                false,
+            ],
+            [
+                '127.0.0.259',
+                null,
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider stringProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testString($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'string',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function stringProvider()
+    {
+        return [
+            [
+                '123',
+                true,
+            ],
+            [
+                123,
+                false,
+            ],
+            [
+                'hello',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlpha($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaProvider()
+    {
+        return [
+            [
+                self::ALPHABET,
+                true,
+            ],
+            [
+                self::ALPHABET . ' ',
+                false,
+            ],
+            [
+                self::ALPHABET . '1',
+                false,
+            ],
+            [
+                self::ALPHABET . '*',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * Test alpha with spaces.
+     *
+     * @param mixed $value    Value.
+     * @param bool  $expected Expected.
+     *
+     * @dataProvider alphaSpaceProvider
+     */
+    public function testAlphaSpace($value, $expected)
+    {
+        $data = [
+            'foo' => $value,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_space',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaSpaceProvider()
+    {
+        return [
+            [
+                null,
+                true,
+            ],
+            [
+                self::ALPHABET,
+                true,
+            ],
+            [
+                self::ALPHABET . ' ',
+                true,
+            ],
+            [
+                self::ALPHABET . "\n",
+                false,
+            ],
+            [
+                self::ALPHABET . '1',
+                false,
+            ],
+            [
+                self::ALPHABET . '*',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlphaNumeric($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericProvider()
+    {
+        return [
+            [
+                self::ALPHANUMERIC,
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '\ ',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '_',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericPunctProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlphaNumericPunct($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric_punct',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericPunctProvider()
+    {
+        return [
+            [
+                self::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '`',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "\n",
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '@',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '^',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '(',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . ')',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '\\',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '{',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '}',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '[',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . ']',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '"',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "'",
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '<',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '>',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '/',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlphaNumericSpace($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric_space',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericSpaceProvider()
+    {
+        return [
+            [
+                ' ' . self::ALPHANUMERIC,
+                true,
+            ],
+            [
+                ' ' . self::ALPHANUMERIC . '-',
+                false,
+            ],
+            [
+                ' ' . self::ALPHANUMERIC . "\n",
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaDashProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlphaDash($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_dash',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaDashProvider()
+    {
+        return [
+            [
+                self::ALPHANUMERIC . '-',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '-\ ',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "-\n",
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider hexProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testHex($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'hex',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function hexProvider()
+    {
+        return [
+            [
+                'abcdefABCDEF0123456789',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC,
+                false,
+            ],
+            [
+                'asdfjkl;',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider numericProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testNumeric($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'numeric',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function numericProvider()
+    {
+        return [
+            [
+                '0',
+                true,
+            ],
+            [
+                '12314',
+                true,
+            ],
+            [
+                '-42',
+                true,
+            ],
+            [
+                '+42',
+                true,
+            ],
+            [
+                "+42\n",
+                false,
+            ],
+            [
+                '123a',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider integerProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testInteger($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'integer',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function integerProvider()
+    {
+        return [
+            [
+                '0',
+                true,
+            ],
+            [
+                '42',
+                true,
+            ],
+            [
+                '-1',
+                true,
+            ],
+            [
+                "+42\n",
+                false,
+            ],
+            [
+                '123a',
+                false,
+            ],
+            [
+                '1.9',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider decimalProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testDecimal($str, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'decimal',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function decimalProvider()
+    {
+        return [
+            [
+                '1.0',
+                true,
+            ],
+            [
+                '-0.98',
+                true,
+            ],
+            [
+                '0',
+                true,
+            ],
+            [
+                "0\n",
+                false,
+            ],
+            [
+                '1.0a',
+                false,
+            ],
+            [
+                '-i',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                '.25',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider naturalProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     */
+    public function testNatural($first, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_natural',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function naturalProvider()
+    {
+        return [
+            [
+                '0',
+                true,
+            ],
+            [
+                '12',
+                true,
+            ],
+            [
+                '42a',
+                false,
+            ],
+            [
+                '-1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider naturalZeroProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     */
+    public function testNaturalNoZero($first, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_natural_no_zero',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function naturalZeroProvider()
+    {
+        return [
+            [
+                '0',
+                false,
+            ],
+            [
+                '12',
+                true,
+            ],
+            [
+                '42a',
+                false,
+            ],
+            [
+                '-1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider base64Provider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     */
+    public function testBase64($first, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_base64',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function base64Provider()
+    {
+        return [
+            [
+                base64_encode('string'),
+                true,
+            ],
+            [
+                'FA08GG',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider jsonProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     */
+    public function testJson($first, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_json',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function jsonProvider()
+    {
+        return [
+            [
+                'null',
+                true,
+            ],
+            [
+                '"null"',
+                true,
+            ],
+            [
+                '600100825',
+                true,
+            ],
+            [
+                '{"A":"Yay.", "B":[0,5]}',
+                true,
+            ],
+            [
+                '[0,"2",2.2,"3.3"]',
+                true,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                '600-Nope. Should not pass.',
+                false,
+            ],
+            [
+                '{"A":SHOULD_NOT_PASS}',
+                false,
+            ],
+            [
+                '[0,"2",2.2 "3.3"]',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider timezoneProvider
+     *
+     * @param $value
+     * @param $expected
+     */
+    public function testTimeZone($value, $expected)
+    {
+        $data = [
+            'foo' => $value,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'timezone',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function timezoneProvider()
+    {
+        return [
+            [
+                'America/Chicago',
+                true,
+            ],
+            [
+                'america/chicago',
+                false,
+            ],
+            [
+                'foo/bar',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider validDateProvider
+     *
+     * @param $str
+     * @param $format
+     * @param $expected
+     */
+    public function testValidDate($str, $format, $expected)
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "valid_date[{$format}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function validDateProvider()
+    {
+        return [
+            [
+                'Sun',
+                'D',
+                true,
+            ],
+            [
+                'Sun',
+                'd',
+                false,
+            ],
+            [
+                'Sun',
+                null,
+                true,
+            ],
+            [
+                '1500',
+                'Y',
+                true,
+            ],
+            [
+                '1500',
+                'y',
+                false,
+            ],
+            [
+                '1500',
+                null,
+                true,
+            ],
+            [
+                '09:26:05',
+                'H:i:s',
+                true,
+            ],
+            [
+                '09:26:5',
+                'H:i:s',
+                false,
+            ],
+            [
+                '1992-02-29',
+                'Y-m-d',
+                true,
+            ],
+            [
+                '1991-02-29',
+                'Y-m-d',
+                false,
+            ],
+            [
+                '1718-05-10 15:25:59',
+                'Y-m-d H:i:s',
+                true,
+            ],
+            [
+                '1718-05-10 15:5:59',
+                'Y-m-d H:i:s',
+                false,
+            ],
+            [
+                'Thu, 31 Oct 2013 13:31:00',
+                'D, d M Y H:i:s',
+                true,
+            ],
+            [
+                'Thu, 31 Jun 2013 13:31:00',
+                'D, d M Y H:i:s',
+                false,
+            ],
+            [
+                'Thu, 31 Jun 2013 13:31:00',
+                null,
+                true,
+            ],
+            [
+                '07.05.03',
+                'm.d.y',
+                true,
+            ],
+            [
+                '07.05.1803',
+                'm.d.y',
+                false,
+            ],
+            [
+                '19890109',
+                'Ymd',
+                true,
+            ],
+            [
+                '198919',
+                'Ymd',
+                false,
+            ],
+            [
+                '2, 7, 2001',
+                'j, n, Y',
+                true,
+            ],
+            [
+                '2, 17, 2001',
+                'j, n, Y',
+                false,
+            ],
+            [
+                '09-42-25, 12-11-17',
+                'h-i-s, j-m-y',
+                true,
+            ],
+            [
+                '09-42-25, 12-00-17',
+                'h-i-s, j-m-y',
+                false,
+            ],
+            [
+                '09-42-25, 12-00-17',
+                null,
+                false,
+            ],
+            [
+                'November 12, 2017, 9:42 am',
+                'F j, Y, g:i a',
+                true,
+            ],
+            [
+                'November 12, 2017, 19:42 am',
+                'F j, Y, g:i a',
+                false,
+            ],
+            [
+                'November 12, 2017, 9:42 am',
+                null,
+                true,
+            ],
+            [
+                'Monday 8th of August 2005 03:12:46 PM',
+                'l jS \of F Y h:i:s A',
+                true,
+            ],
+            [
+                'Monday 8th of August 2005 13:12:46 PM',
+                'l jS \of F Y h:i:s A',
+                false,
+            ],
+            [
+                '23:01:59 is now',
+                'H:m:s \i\s \n\o\w',
+                true,
+            ],
+            [
+                '23:01:59 is now',
+                'H:m:s is now',
+                false,
+            ],
+            [
+                '12/11/2017',
+                'd/m/Y',
+                true,
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 0dd4161babf7..f4f171b87bbb 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
@@ -9,1666 +18,1537 @@
 use stdClass;
 use Tests\Support\Validation\TestRules;
 
-class RulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RulesTest extends CIUnitTestCase
 {
-	use DatabaseTestTrait;
-
-	protected $refresh = true;
-
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'      => [
-			Rules::class,
-			FormatRules::class,
-			FileRules::class,
-			CreditCardRules::class,
-			TestRules::class,
-		],
-		'groupA'        => [
-			'foo' => 'required|min_length[5]',
-		],
-		'groupA_errors' => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-	];
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->validation = new Validation((object)$this->config, Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [];
-	}
-
-	//--------------------------------------------------------------------
-	// Rules Tests
-	//--------------------------------------------------------------------
-
-	public function testRequiredNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required|alpha',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredTrueString()
-	{
-		$data = [
-			'foo' => 123,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredFalseString()
-	{
-		$data = [
-			'foo' => null,
-			'bar' => 123,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredTrueArray()
-	{
-		$data = [
-			'foo' => [123],
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredFalseArray()
-	{
-		$data = [
-			'foo' => [],
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRequiredObject()
-	{
-		$data = [
-			'foo' => new stdClass(),
-		];
-
-		$this->validation->setRules([
-			'foo' => 'required',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider ifExistProvider
-	 *
-	 * @param $rules
-	 * @param $data
-	 * @param $expected
-	 */
-	public function testIfExist($rules, $data, $expected)
-	{
-		$this->validation->setRules($rules);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function ifExistProvider()
-	{
-		return [
-			[
-				['foo' => 'required'],
-				['foo' => ''],
-				false,
-			],
-			[
-				['foo' => 'required'],
-				['foo' => null],
-				false,
-			],
-			[
-				['foo' => 'if_exist|required'],
-				['foo' => ''],
-				false,
-			],
-			// Input data does not exist then the other rules will be ignored
-			[
-				['foo' => 'if_exist|required'],
-				[],
-				true,
-			],
-			// Testing for multi-dimensional data
-			[
-				['foo.bar' => 'if_exist|required'],
-				['foo' => ['bar' => '']],
-				false,
-			],
-			[
-				['foo.bar' => 'if_exist|required'],
-				['foo' => []],
-				true,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider emptysProvider
-	 *
-	 * @param $rules
-	 * @param $data
-	 * @param $expected
-	 */
-	public function testEmptys($rules, $data, $expected)
-	{
-		$this->validation->setRules($rules);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function emptysProvider()
-	{
-		return [
-			[
-				['foo' => 'permit_empty'],
-				['foo' => ''],
-				true,
-			],
-			[
-				['foo' => 'permit_empty'],
-				['foo' => '0'],
-				true,
-			],
-			[
-				['foo' => 'permit_empty'],
-				['foo' => 0],
-				true,
-			],
-			[
-				['foo' => 'permit_empty'],
-				['foo' => 0.0],
-				true,
-			],
-			[
-				['foo' => 'permit_empty'],
-				['foo' => null],
-				true,
-			],
-			[
-				['foo' => 'permit_empty'],
-				['foo' => false],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|valid_email'],
-				['foo' => ''],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|valid_email'],
-				['foo' => 'user@domain.tld'],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|valid_email'],
-				['foo' => 'invalid'],
-				false,
-			],
-			// Required has more priority
-			[
-				['foo' => 'permit_empty|required|valid_email'],
-				['foo' => ''],
-				false,
-			],
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => ''],
-				false,
-			],
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => null],
-				false,
-			],
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => false],
-				false,
-			],
-			// This tests will return true because the input data is trimmed
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => '0'],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => 0],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|required'],
-				['foo' => 0.0],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|required_with[bar]'],
-				['foo' => ''],
-				true,
-			],
-			[
-				['foo' => 'permit_empty|required_with[bar]'],
-				['foo' => 0],
-				true,
-			],
-			[
-				[
-					'foo' => 'permit_empty|required_with[bar]',
-				],
-				[
-					'foo' => 0.0,
-					'bar' => 1,
-				],
-				true,
-			],
-			[
-				[
-					'foo' => 'permit_empty|required_with[bar]',
-				],
-				[
-					'foo' => '',
-					'bar' => 1,
-				],
-				false,
-			],
-			[
-				['foo' => 'permit_empty|required_without[bar]'],
-				['foo' => ''],
-				false,
-			],
-			[
-				['foo' => 'permit_empty|required_without[bar]'],
-				['foo' => 0],
-				true,
-			],
-			[
-				[
-					'foo' => 'permit_empty|required_without[bar]',
-				],
-				[
-					'foo' => 0.0,
-					'bar' => 1,
-				],
-				true,
-			],
-			[
-				[
-					'foo' => 'permit_empty|required_without[bar]',
-				],
-				[
-					'foo' => '',
-					'bar' => 1,
-				],
-				true,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesNull()
-	{
-		$data = [
-			'foo' => null,
-			'bar' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesTrue()
-	{
-		$data = [
-			'foo' => 'match',
-			'bar' => 'match',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesFalse()
-	{
-		$data = [
-			'foo' => 'match',
-			'bar' => 'nope',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'matches[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatcheNestedsTrue()
-	{
-		$data = [
-			'nested' => [
-				'foo' => 'match',
-				'bar' => 'match',
-			],
-		];
-
-		$this->validation->setRules([
-			'nested.foo' => 'matches[nested.bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMatchesNestedFalse()
-	{
-		$data = [
-			'nested' => [
-				'foo' => 'match',
-				'bar' => 'nope',
-			],
-		];
-
-		$this->validation->setRules([
-			'nested.foo' => 'matches[nested.bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersNull()
-	{
-		$data = [
-			'foo' => null,
-			'bar' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersTrue()
-	{
-		$data = [
-			'foo' => 'match',
-			'bar' => 'nope',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersFalse()
-	{
-		$data = [
-			'foo' => 'match',
-			'bar' => 'match',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'differs[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersNestedTrue()
-	{
-		$data = [
-			'nested' => [
-				'foo' => 'match',
-				'bar' => 'nope',
-			],
-		];
-
-		$this->validation->setRules([
-			'nested.foo' => 'differs[nested.bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiffersNestedFalse()
-	{
-		$data = [
-			'nested' => [
-				'foo' => 'match',
-				'bar' => 'match',
-			],
-		];
-
-		$this->validation->setRules([
-			'nested.foo' => 'differs[nested.bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEqualsNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'equals[]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEqualsEmptyIsEmpty()
-	{
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'equals[]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEqualsReturnsFalseOnFailure()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'equals[notbar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEqualsReturnsTrueOnSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'equals[bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testEqualsReturnsFalseOnCaseMismatch()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'equals[Bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotEqualsNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'not_equals[]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotEqualsEmptyIsEmpty()
-	{
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'not_equals[]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotEqualsReturnsFalseOnFailure()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'not_equals[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotEqualsReturnsTrueOnSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'not_equals[notbar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotEqualsReturnsTrueOnCaseMismatch()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'not_equals[Bar]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueFalse()
-	{
-		$db = Database::connect();
-		$db->table('user')
-		   ->insert([
-			   'name'    => 'Derek Travis',
-			   'email'   => 'derek@world.com',
-			   'country' => 'Elbonia',
-		   ]);
-
-		$data = [
-			'email' => 'derek@world.com',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_unique[user.email]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueTrue()
-	{
-		$data = [
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_unique[user.email]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueIgnoresParams()
-	{
-		$db   = Database::connect();
-		$user = $db->table('user')
-				   ->insert([
-					   'name'    => 'Developer A',
-					   'email'   => 'deva@example.com',
-					   'country' => 'Elbonia',
-				   ]);
-		$row  = $db->table('user')
-				   ->limit(1)
-				   ->get()
-				   ->getRow();
-
-		$data = [
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => "is_unique[user.email,id,{$row->id}]",
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueIgnoresParamsPlaceholders()
-	{
-		$this->hasInDatabase('user', [
-			'name'    => 'Derek',
-			'email'   => 'derek@world.co.uk',
-			'country' => 'GB',
-		]);
-
-		$db  = Database::connect();
-		$row = $db->table('user')
-				  ->limit(1)
-				  ->get()
-				  ->getRow();
-
-		$data = [
-			'id'    => $row->id,
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_unique[user.email,id,{id}]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsUniqueByManualRun()
-	{
-		$db = Database::connect();
-		$db->table('user')
-				   ->insert([
-					   'name'    => 'Developer A',
-					   'email'   => 'deva@example.com',
-					   'country' => 'Elbonia',
-				   ]);
-
-		$this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsNotUniqueFalse()
-	{
-		$db = Database::connect();
-		$db->table('user')
-		   ->insert([
-			   'name'    => 'Derek Travis',
-			   'email'   => 'derek@world.com',
-			   'country' => 'Elbonia',
-		   ]);
-
-		$data = [
-			'email' => 'derek1@world.com',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_not_unique[user.email]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsNotUniqueTrue()
-	{
-		$db = Database::connect();
-		$db->table('user')
-		   ->insert([
-			   'name'    => 'Derek Travis',
-			   'email'   => 'derek@world.com',
-			   'country' => 'Elbonia',
-		   ]);
-
-		$data = [
-			'email' => 'derek@world.com',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_not_unique[user.email]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsNotUniqueIgnoresParams()
-	{
-		$db   = Database::connect();
-		$user = $db->table('user')
-				   ->insert([
-					   'name'    => 'Developer A',
-					   'email'   => 'deva@example.com',
-					   'country' => 'Elbonia',
-				   ]);
-		$row  = $db->table('user')
-				   ->limit(1)
-				   ->get()
-				   ->getRow();
-
-		$data = [
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => "is_not_unique[user.email,id,{$row->id}]",
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsNotUniqueIgnoresParamsPlaceholders()
-	{
-		$this->hasInDatabase('user', [
-			'name'    => 'Derek',
-			'email'   => 'derek@world.co.uk',
-			'country' => 'GB',
-		]);
-
-		$db  = Database::connect();
-		$row = $db->table('user')
-				  ->limit(1)
-				  ->get()
-				  ->getRow();
-
-		$data = [
-			'id'    => $row->id,
-			'email' => 'derek@world.co.uk',
-		];
-
-		$this->validation->setRules([
-			'email' => 'is_not_unique[user.email,id,{id}]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group DatabaseLive
-	 */
-	public function testIsNotUniqueByManualRun()
-	{
-		$db = Database::connect();
-		$db->table('user')
-				   ->insert([
-					   'name'    => 'Developer A',
-					   'email'   => 'deva@example.com',
-					   'country' => 'Elbonia',
-				   ]);
-
-		$this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[3]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthReturnsTrueWithSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[2]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthReturnsTrueWithExactLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[3]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMinLengthReturnsFalseWhenWrong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'min_length[4]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'max_length[1]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxLengthReturnsFalseWithNonNumericVal()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'max_length[bar]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxLengthReturnsTrueWithSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'max_length[4]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxLengthReturnsTrueWithExactLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'max_length[3]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMaxLengthReturnsFalseWhenWrong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'max_length[2]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthNull()
-	{
-		$data = [
-			'foo' => null,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[3]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthReturnsTrueOnSuccess()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[3]',
-		]);
-
-		$this->assertTrue($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthDetectsBadLength()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[abc]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthReturnsFalseWhenShort()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[2]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testExactLengthReturnsFalseWhenLong()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'exact_length[4]',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider greaterThanProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testGreaterThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "greater_than[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function greaterThanProvider()
-	{
-		return [
-			[
-				'-10',
-				'-11',
-				true,
-			],
-			[
-				'10',
-				'9',
-				true,
-			],
-			[
-				'10',
-				'10',
-				false,
-			],
-			[
-				'10',
-				'a',
-				false,
-			],
-			[
-				'10a',
-				'10',
-				false,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider greaterThanEqualProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testGreaterThanEqual($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "greater_than_equal_to[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function greaterThanEqualProvider()
-	{
-		return [
-			[
-				'0',
-				'0',
-				true,
-			],
-			[
-				'1',
-				'0',
-				true,
-			],
-			[
-				'-1',
-				'0',
-				false,
-			],
-			[
-				'10a',
-				'0',
-				false,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-			[
-				1,
-				null,
-				true,
-			],
-			[
-				null,
-				1,
-				false,
-			],
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider lessThanProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testLessThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "less_than[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function lessThanProvider()
-	{
-		return [
-			[
-				'4',
-				'5',
-				true,
-			],
-			[
-				'-1',
-				'0',
-				true,
-			],
-			[
-				'4',
-				'4',
-				false,
-			],
-			[
-				'10a',
-				'5',
-				false,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-			[
-				1,
-				null,
-				false,
-			],
-			[
-				null,
-				1,
-				false,
-			],
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider lessThanEqualProvider
-	 *
-	 * @param $str
-	 * @param $expected
-	 */
-	public function testLessEqualThan($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "less_than_equal_to[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function lessThanEqualProvider()
-	{
-		return [
-			[
-				'-1',
-				'0',
-				true,
-			],
-			[
-				'-1',
-				'-1',
-				true,
-			],
-			[
-				'4',
-				'4',
-				true,
-			],
-			[
-				'0',
-				'-1',
-				false,
-			],
-			[
-				'10a',
-				'0',
-				false,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-			[
-				null,
-				1,
-				false,
-			],
-			[
-				1,
-				null,
-				false,
-			],
-		];
-	}
-
-	//-------------------------------------------------------------------
-
-	/**
-	 * @dataProvider inListProvider
-	 *
-	 * @param string  $first
-	 * @param string  $second
-	 * @param boolean $expected
-	 */
-	public function testInList($first, $second, $expected)
-	{
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "in_list[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider inListProvider
-	 *
-	 * @param string  $first
-	 * @param string  $second
-	 * @param boolean $expected
-	 */
-	public function testNotInList($first, $second, $expected)
-	{
-		$expected = ! $expected;
-
-		$data = [
-			'foo' => $first,
-		];
-
-		$this->validation->setRules([
-			'foo' => "not_in_list[{$second}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function inListProvider()
-	{
-		return [
-			[
-				'red',
-				'red,Blue,123',
-				true,
-			],
-			[
-				'Blue',
-				'red, Blue,123',
-				true,
-			],
-			[
-				'Blue',
-				'red,Blue,123',
-				true,
-			],
-			[
-				'123',
-				'red,Blue,123',
-				true,
-			],
-			[
-				'Red',
-				'red,Blue,123',
-				false,
-			],
-			[
-				' red',
-				'red,Blue,123',
-				false,
-			],
-			[
-				'1234',
-				'red,Blue,123',
-				false,
-			],
-			[
-				null,
-				'red,Blue,123',
-				false,
-			],
-			[
-				'red',
-				null,
-				false,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider requiredWithProvider
-	 *
-	 * @param $check
-	 * @param $expected
-	 */
-	public function testRequiredWith($field, $check, $expected = false)
-	{
-		$data = [
-			'foo'   => 'bar',
-			'bar'   => 'something',
-			'baz'   => null,
-			'array' => [
-				'nonEmptyField1' => 'value1',
-				'nonEmptyField2' => 'value2',
-				'emptyField1'    => null,
-				'emptyField2'    => null,
-			],
-		];
-
-		$this->validation->setRules([
-			$field => "required_with[{$check}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function requiredWithProvider()
-	{
-		return [
-			[
-				'nope',
-				'bar',
-				false,
-			],
-			[
-				'foo',
-				'bar',
-				true,
-			],
-			[
-				'nope',
-				'baz',
-				true,
-			],
-			[
-				null,
-				null,
-				true,
-			],
-			[
-				null,
-				'foo',
-				false,
-			],
-			[
-				'foo',
-				null,
-				true,
-			],
-			[
-				'array.emptyField1',
-				'array.emptyField2',
-				true,
-			],
-			[
-				'array.nonEmptyField1',
-				'array.emptyField2',
-				true,
-			],
-			[
-				'array.emptyField1',
-				'array.nonEmptyField2',
-				false,
-			],
-			[
-				'array.nonEmptyField1',
-				'array.nonEmptyField2',
-				true,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider requiredWithoutProvider
-	 *
-	 * @param $check
-	 * @param $expected
-	 */
-	public function testRequiredWithout($field, $check, $expected = false)
-	{
-		$data = [
-			'foo'   => 'bar',
-			'bar'   => 'something',
-			'baz'   => null,
-			'array' => [
-				'nonEmptyField1' => 'value1',
-				'nonEmptyField2' => 'value2',
-				'emptyField1'    => null,
-				'emptyField2'    => null,
-			],
-		];
-
-		$this->validation->setRules([
-			$field => "required_without[{$check}]",
-		]);
-
-		$this->assertEquals($expected, $this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function requiredWithoutProvider()
-	{
-		return [
-			[
-				'nope',
-				'bars',
-				false,
-			],
-			[
-				'foo',
-				'nope',
-				true,
-			],
-			[
-				null,
-				null,
-				false,
-			],
-			[
-				null,
-				'foo',
-				true,
-			],
-			[
-				'foo',
-				null,
-				true,
-			],
-			[
-				'array.emptyField1',
-				'array.emptyField2',
-				false,
-			],
-			[
-				'array.nonEmptyField1',
-				'array.emptyField2',
-				true,
-			],
-			[
-				'array.emptyField1',
-				'array.nonEmptyField2',
-				true,
-			],
-			[
-				'array.nonEmptyField1',
-				'array.nonEmptyField2',
-				true,
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [];
+    }
+
+    // Rules Tests
+
+    public function testRequiredNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required|alpha',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testRequiredTrueString()
+    {
+        $data = [
+            'foo' => 123,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testRequiredFalseString()
+    {
+        $data = [
+            'foo' => null,
+            'bar' => 123,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testRequiredTrueArray()
+    {
+        $data = [
+            'foo' => [123],
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testRequiredFalseArray()
+    {
+        $data = [
+            'foo' => [],
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testRequiredObject()
+    {
+        $data = [
+            'foo' => new stdClass(),
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'required',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider ifExistProvider
+     *
+     * @param $rules
+     * @param $data
+     * @param $expected
+     */
+    public function testIfExist($rules, $data, $expected)
+    {
+        $this->validation->setRules($rules);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function ifExistProvider()
+    {
+        return [
+            [
+                ['foo' => 'required'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'required'],
+                ['foo' => null],
+                false,
+            ],
+            [
+                ['foo' => 'if_exist|required'],
+                ['foo' => ''],
+                false,
+            ],
+            // Input data does not exist then the other rules will be ignored
+            [
+                ['foo' => 'if_exist|required'],
+                [],
+                true,
+            ],
+            // Testing for multi-dimensional data
+            [
+                ['foo.bar' => 'if_exist|required'],
+                ['foo' => ['bar' => '']],
+                false,
+            ],
+            [
+                ['foo.bar' => 'if_exist|required'],
+                ['foo' => []],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider emptysProvider
+     *
+     * @param $rules
+     * @param $data
+     * @param $expected
+     */
+    public function testEmptys($rules, $data, $expected)
+    {
+        $this->validation->setRules($rules);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function emptysProvider()
+    {
+        return [
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => '0'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => 0.0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => null],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => false],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => 'user@domain.tld'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => 'invalid'],
+                false,
+            ],
+            // Required has more priority
+            [
+                ['foo' => 'permit_empty|required|valid_email'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => null],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => false],
+                false,
+            ],
+            // This tests will return true because the input data is trimmed
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => '0'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => 0.0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                [
+                    'foo' => 'permit_empty|required_with[bar]',
+                ],
+                [
+                    'foo' => 0.0,
+                    'bar' => 1,
+                ],
+                true,
+            ],
+            [
+                [
+                    'foo' => 'permit_empty|required_with[bar]',
+                ],
+                [
+                    'foo' => '',
+                    'bar' => 1,
+                ],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                [
+                    'foo' => 'permit_empty|required_without[bar]',
+                ],
+                [
+                    'foo' => 0.0,
+                    'bar' => 1,
+                ],
+                true,
+            ],
+            [
+                [
+                    'foo' => 'permit_empty|required_without[bar]',
+                ],
+                [
+                    'foo' => '',
+                    'bar' => 1,
+                ],
+                true,
+            ],
+        ];
+    }
+
+    public function testMatchesNull()
+    {
+        $data = [
+            'foo' => null,
+            'bar' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMatchesTrue()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'match',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMatchesFalse()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'nope',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'matches[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testMatcheNestedsTrue()
+    {
+        $data = [
+            'nested' => [
+                'foo' => 'match',
+                'bar' => 'match',
+            ],
+        ];
+
+        $this->validation->setRules([
+            'nested.foo' => 'matches[nested.bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMatchesNestedFalse()
+    {
+        $data = [
+            'nested' => [
+                'foo' => 'match',
+                'bar' => 'nope',
+            ],
+        ];
+
+        $this->validation->setRules([
+            'nested.foo' => 'matches[nested.bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testDiffersNull()
+    {
+        $data = [
+            'foo' => null,
+            'bar' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testDiffersTrue()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'nope',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testDiffersFalse()
+    {
+        $data = [
+            'foo' => 'match',
+            'bar' => 'match',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'differs[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testDiffersNestedTrue()
+    {
+        $data = [
+            'nested' => [
+                'foo' => 'match',
+                'bar' => 'nope',
+            ],
+        ];
+
+        $this->validation->setRules([
+            'nested.foo' => 'differs[nested.bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testDiffersNestedFalse()
+    {
+        $data = [
+            'nested' => [
+                'foo' => 'match',
+                'bar' => 'match',
+            ],
+        ];
+
+        $this->validation->setRules([
+            'nested.foo' => 'differs[nested.bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testEqualsNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'equals[]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testEqualsEmptyIsEmpty()
+    {
+        $data = [
+            'foo' => '',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'equals[]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testEqualsReturnsFalseOnFailure()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'equals[notbar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testEqualsReturnsTrueOnSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'equals[bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testEqualsReturnsFalseOnCaseMismatch()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'equals[Bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testNotEqualsNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'not_equals[]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testNotEqualsEmptyIsEmpty()
+    {
+        $data = [
+            'foo' => '',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'not_equals[]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testNotEqualsReturnsFalseOnFailure()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'not_equals[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testNotEqualsReturnsTrueOnSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'not_equals[notbar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testNotEqualsReturnsTrueOnCaseMismatch()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'not_equals[Bar]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueFalse()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = [
+            'email' => 'derek@world.com',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_unique[user.email]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueTrue()
+    {
+        $data = [
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_unique[user.email]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueIgnoresParams()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => "is_unique[user.email,id,{$row->id}]",
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueIgnoresParamsPlaceholders()
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $db  = Database::connect();
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_unique[user.email,id,{id}]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsUniqueByManualRun()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsNotUniqueFalse()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = [
+            'email' => 'derek1@world.com',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_not_unique[user.email]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsNotUniqueTrue()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = [
+            'email' => 'derek@world.com',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_not_unique[user.email]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsNotUniqueIgnoresParams()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => "is_not_unique[user.email,id,{$row->id}]",
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsNotUniqueIgnoresParamsPlaceholders()
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $db  = Database::connect();
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules([
+            'email' => 'is_not_unique[user.email,id,{id}]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    /**
+     * @group DatabaseLive
+     */
+    public function testIsNotUniqueByManualRun()
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+
+    public function testMinLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[3]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testMinLengthReturnsTrueWithSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[2]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMinLengthReturnsTrueWithExactLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[3]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMinLengthReturnsFalseWhenWrong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'min_length[4]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testMaxLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'max_length[1]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMaxLengthReturnsFalseWithNonNumericVal()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'max_length[bar]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testMaxLengthReturnsTrueWithSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'max_length[4]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMaxLengthReturnsTrueWithExactLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'max_length[3]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testMaxLengthReturnsFalseWhenWrong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'max_length[2]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testExactLengthNull()
+    {
+        $data = [
+            'foo' => null,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[3]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testExactLengthReturnsTrueOnSuccess()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[3]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testExactLengthDetectsBadLength()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[abc]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testExactLengthReturnsFalseWhenShort()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[2]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testExactLengthReturnsFalseWhenLong()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'exact_length[4]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider greaterThanProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     * @param mixed $second
+     */
+    public function testGreaterThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "greater_than[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function greaterThanProvider()
+    {
+        return [
+            [
+                '-10',
+                '-11',
+                true,
+            ],
+            [
+                '10',
+                '9',
+                true,
+            ],
+            [
+                '10',
+                '10',
+                false,
+            ],
+            [
+                '10',
+                'a',
+                false,
+            ],
+            [
+                '10a',
+                '10',
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider greaterThanEqualProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     * @param mixed $second
+     */
+    public function testGreaterThanEqual($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "greater_than_equal_to[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function greaterThanEqualProvider()
+    {
+        return [
+            [
+                '0',
+                '0',
+                true,
+            ],
+            [
+                '1',
+                '0',
+                true,
+            ],
+            [
+                '-1',
+                '0',
+                false,
+            ],
+            [
+                '10a',
+                '0',
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+            [
+                1,
+                null,
+                true,
+            ],
+            [
+                null,
+                1,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider lessThanProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     * @param mixed $second
+     */
+    public function testLessThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "less_than[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function lessThanProvider()
+    {
+        return [
+            [
+                '4',
+                '5',
+                true,
+            ],
+            [
+                '-1',
+                '0',
+                true,
+            ],
+            [
+                '4',
+                '4',
+                false,
+            ],
+            [
+                '10a',
+                '5',
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+            [
+                1,
+                null,
+                false,
+            ],
+            [
+                null,
+                1,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider lessThanEqualProvider
+     *
+     * @param $str
+     * @param $expected
+     * @param mixed $first
+     * @param mixed $second
+     */
+    public function testLessEqualThan($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "less_than_equal_to[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function lessThanEqualProvider()
+    {
+        return [
+            [
+                '-1',
+                '0',
+                true,
+            ],
+            [
+                '-1',
+                '-1',
+                true,
+            ],
+            [
+                '4',
+                '4',
+                true,
+            ],
+            [
+                '0',
+                '-1',
+                false,
+            ],
+            [
+                '10a',
+                '0',
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+            [
+                null,
+                1,
+                false,
+            ],
+            [
+                1,
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider inListProvider
+     *
+     * @param string $first
+     * @param string $second
+     * @param bool   $expected
+     */
+    public function testInList($first, $second, $expected)
+    {
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "in_list[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider inListProvider
+     *
+     * @param string $first
+     * @param string $second
+     * @param bool   $expected
+     */
+    public function testNotInList($first, $second, $expected)
+    {
+        $expected = ! $expected;
+
+        $data = [
+            'foo' => $first,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "not_in_list[{$second}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function inListProvider()
+    {
+        return [
+            [
+                'red',
+                'red,Blue,123',
+                true,
+            ],
+            [
+                'Blue',
+                'red, Blue,123',
+                true,
+            ],
+            [
+                'Blue',
+                'red,Blue,123',
+                true,
+            ],
+            [
+                '123',
+                'red,Blue,123',
+                true,
+            ],
+            [
+                'Red',
+                'red,Blue,123',
+                false,
+            ],
+            [
+                ' red',
+                'red,Blue,123',
+                false,
+            ],
+            [
+                '1234',
+                'red,Blue,123',
+                false,
+            ],
+            [
+                null,
+                'red,Blue,123',
+                false,
+            ],
+            [
+                'red',
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider requiredWithProvider
+     *
+     * @param $check
+     * @param $expected
+     * @param mixed $field
+     */
+    public function testRequiredWith($field, $check, $expected = false)
+    {
+        $data = [
+            'foo'   => 'bar',
+            'bar'   => 'something',
+            'baz'   => null,
+            'array' => [
+                'nonEmptyField1' => 'value1',
+                'nonEmptyField2' => 'value2',
+                'emptyField1'    => null,
+                'emptyField2'    => null,
+            ],
+        ];
+
+        $this->validation->setRules([
+            $field => "required_with[{$check}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function requiredWithProvider()
+    {
+        return [
+            [
+                'nope',
+                'bar',
+                false,
+            ],
+            [
+                'foo',
+                'bar',
+                true,
+            ],
+            [
+                'nope',
+                'baz',
+                true,
+            ],
+            [
+                null,
+                null,
+                true,
+            ],
+            [
+                null,
+                'foo',
+                false,
+            ],
+            [
+                'foo',
+                null,
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.nonEmptyField2',
+                false,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider requiredWithoutProvider
+     *
+     * @param $check
+     * @param $expected
+     * @param mixed $field
+     */
+    public function testRequiredWithout($field, $check, $expected = false)
+    {
+        $data = [
+            'foo'   => 'bar',
+            'bar'   => 'something',
+            'baz'   => null,
+            'array' => [
+                'nonEmptyField1' => 'value1',
+                'nonEmptyField2' => 'value2',
+                'emptyField1'    => null,
+                'emptyField2'    => null,
+            ],
+        ];
+
+        $this->validation->setRules([
+            $field => "required_without[{$check}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function requiredWithoutProvider()
+    {
+        return [
+            [
+                'nope',
+                'bars',
+                false,
+            ],
+            [
+                'foo',
+                'nope',
+                true,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+            [
+                null,
+                'foo',
+                true,
+            ],
+            [
+                'foo',
+                null,
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.emptyField2',
+                false,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 330874492cce..836b892a2931 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\HTTP\IncomingRequest;
@@ -16,1065 +25,963 @@
  */
 final class ValidationTest extends CIUnitTestCase
 {
-	/**
-	 * @var Validation
-	 */
-	protected $validation;
-	protected $config = [
-		'ruleSets'      => [
-			Rules::class,
-			FormatRules::class,
-			FileRules::class,
-			CreditCardRules::class,
-			TestRules::class,
-		],
-		'groupA'        => [
-			'foo' => 'required|min_length[5]',
-		],
-		'login'         => [
-			'username' => [
-				'label'  => 'Username',
-				'rules'  => 'required',
-				'errors' => [
-					'required' => 'custom username required error msg.',
-				],
-			],
-			'password' => [
-				'label'  => 'Password',
-				'rules'  => 'required',
-				'errors' => [
-					'required' => 'custom password required error msg.',
-				],
-			],
-		],
-		'groupA_errors' => [
-			'foo' => [
-				'min_length' => 'Shame, shame. Too short.',
-			],
-		],
-		'groupX'        => 'Not an array, so not a real group',
-		'templates'     => [
-			'list'   => 'CodeIgniter\Validation\Views\list',
-			'single' => 'CodeIgniter\Validation\Views\single',
-		],
-	];
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset(true);
-
-		$this->validation = new Validation((object) $this->config, Services::renderer());
-		$this->validation->reset();
-
-		$_FILES = [];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetRulesStoresRules()
-	{
-		$rules = [
-			'foo' => 'bar|baz',
-			'bar' => 'baz|belch',
-		];
-
-		$this->validation->setRules($rules);
-
-		$this->assertEquals($rules, $this->validation->getRules());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunReturnsFalseWithNothingToDo()
-	{
-		$this->validation->setRules([]);
-
-		$this->assertFalse($this->validation->run([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunDoesTheBasics()
-	{
-		$data = [
-			'foo' => 'notanumber',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunReturnsLocalizedErrors()
-	{
-		$data = [
-			'foo' => 'notanumber',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->assertFalse($this->validation->run($data));
-		$this->assertEquals('Validation.is_numeric', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunWithCustomErrors()
-	{
-		$data = [
-			'foo' => 'notanumber',
-		];
-
-		$messages = [
-			'foo' => [
-				'is_numeric' => 'Nope. Not a number.',
-			],
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		], $messages);
-
-		$this->validation->run($data);
-		$this->assertEquals('Nope. Not a number.', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCheck()
-	{
-		$this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCheckLocalizedError()
-	{
-		$this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
-		$this->assertEquals('Validation.is_numeric', $this->validation->getError());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCheckCustomError()
-	{
-		$this->validation->check('notanumber', 'is_numeric', [
-			'is_numeric' => 'Nope. Not a number.',
-		]);
-		$this->assertEquals('Nope. Not a number.', $this->validation->getError());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetErrors()
-	{
-		$data = [
-			'foo' => 'notanumber',
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->validation->run($data);
-
-		$this->assertEquals(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetErrorsWhenNone()
-	{
-		$_SESSION = [];
-
-		$data = [
-			'foo' => 123,
-		];
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->validation->run($data);
-
-		$this->assertEquals([], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetErrors()
-	{
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->validation->setError('foo', 'Nadda');
-
-		$this->assertEquals(['foo' => 'Nadda'], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRulesReturnErrors()
-	{
-		$this->validation->setRules([
-			'foo' => 'customError',
-		]);
-
-		$this->validation->run(['foo' => 'bar']);
-
-		$this->assertEquals(['foo' => 'My lovely error'], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupsReadFromConfig()
-	{
-		$data = [
-			'foo' => 'bar',
-		];
-
-		$this->assertFalse($this->validation->run($data, 'groupA'));
-		$this->assertEquals('Shame, shame. Too short.', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGroupsReadFromConfigValid()
-	{
-		$data = [
-			'foo' => 'barsteps',
-		];
-
-		$this->assertTrue($this->validation->run($data, 'groupA'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetRuleGroup()
-	{
-		$this->assertEquals([
-			'foo' => 'required|min_length[5]',
-		], $this->validation->getRuleGroup('groupA'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetRuleGroupException()
-	{
-		$this->expectException(ValidationException::class);
-		$this->validation->getRuleGroup('groupZ');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetRuleGroup()
-	{
-		$this->validation->setRuleGroup('groupA');
-
-		$this->assertEquals([
-			'foo' => 'required|min_length[5]',
-		], $this->validation->getRules());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetRuleGroupException()
-	{
-		$this->expectException(ValidationException::class);
-
-		$this->validation->setRuleGroup('groupZ');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetRuleGroupWithCustomErrorMessage()
-	{
-		$this->validation->reset();
-		$this->validation->setRuleGroup('login');
-		$this->validation->run([
-			'username' => 'codeigniter',
-		]);
-
-		$this->assertEquals([
-			'password' => 'custom password required error msg.',
-		], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRunGroupWithCustomErrorMessage()
-	{
-		$this->validation->reset();
-		$this->validation->run([
-			'username' => 'codeigniter',
-		], 'login');
-
-		$this->assertEquals([
-			'password' => 'custom password required error msg.',
-		], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider rulesSetupProvider
-	 */
-	public function testRulesSetup($rules, $expected, $errors = [])
-	{
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->setRules([
-			'foo' => $rules,
-		], $errors);
-
-		$this->validation->run($data);
-
-		$this->assertEquals($expected, $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function rulesSetupProvider()
-	{
-		return [
-			[
-				'min_length[10]',
-				'The foo field must be at least 10 characters in length.',
-			],
-			[
-				'min_length[10]',
-				'The foo field is very short.',
-				['foo' => ['min_length' => 'The {field} field is very short.']],
-			],
-			[
-				['min_length[10]'],
-				'The foo field must be at least 10 characters in length.',
-			],
-			[
-				['min_length[10]'],
-				'The foo field is very short.',
-				['foo' => ['min_length' => 'The {field} field is very short.']],
-			],
-			[
-				['rules' => 'min_length[10]'],
-				'The foo field must be at least 10 characters in length.',
-			],
-			[
-				[
-					'label' => 'Foo Bar',
-					'rules' => 'min_length[10]',
-				],
-				'The Foo Bar field must be at least 10 characters in length.',
-			],
-			[
-				[
-					'label' => 'Foo Bar',
-					'rules' => 'min_length[10]',
-				],
-				'The Foo Bar field is very short.',
-				['foo' => ['min_length' => 'The {field} field is very short.']],
-			],
-			[
-				[
-					'label'  => 'Foo Bar',
-					'rules'  => 'min_length[10]',
-					'errors' => ['min_length' => 'The {field} field is very short.'],
-				],
-				'The Foo Bar field is very short.',
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetRulesRemovesErrorsArray()
-	{
-		$rules = [
-			'foo' => [
-				'label'  => 'Foo Bar',
-				'rules'  => 'min_length[10]',
-				'errors' => [
-					'min_length' => 'The {field} field is very short.',
-				],
-			],
-		];
-
-		$this->validation->setRules($rules, []);
-
-		$this->validation->run(['foo' => 'abc']);
-
-		$this->assertEquals('The Foo Bar field is very short.', $this->validation->getError('foo'));
-	}
-
-	public function testInvalidRule()
-	{
-		$this->expectException(ValidationException::class);
-
-		$rules = [
-			'foo' => 'bar|baz',
-			'bar' => 'baz|belch',
-		];
-		$this->validation->setRules($rules);
-
-		$data = [
-			'foo' => '',
-		];
-		$this->validation->run($data);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRawInput()
-	{
-		$rawstring = 'username=admin001&role=administrator&usepass=0';
-
-		$data = [
-			'username' => 'admin001',
-			'role'     => 'administrator',
-			'usepass'  => 0,
-		];
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
-
-		$rules = [
-			'role' => 'required|min_length[5]',
-		];
-		$this->validation->withRequest($request->withMethod('patch'))->run($data);
-		$this->assertEquals([], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testJsonInput()
-	{
-		$data = [
-			'username' => 'admin001',
-			'role'     => 'administrator',
-			'usepass'  => 0,
-		];
-		$json = json_encode($data);
-
-		$_SERVER['CONTENT_TYPE'] = 'application/json';
-
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), $json, new UserAgent());
-
-		$rules     = [
-			'role' => 'required|min_length[5]',
-		];
-		$validated = $this->validation
-			->withRequest($request->withMethod('patch'))
-			->setRules($rules)
-			->run();
-
-		$this->assertTrue($validated);
-		$this->assertEquals([], $this->validation->getErrors());
-
-		unset($_SERVER['CONTENT_TYPE']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasRule()
-	{
-		$this->validation->setRuleGroup('groupA');
-
-		$this->assertTrue($this->validation->hasRule('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotARealGroup()
-	{
-		$this->expectException(ValidationException::class);
-		$this->validation->setRuleGroup('groupX');
-		$this->validation->getRuleGroup('groupX');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testBadTemplate()
-	{
-		$this->expectException(ValidationException::class);
-		$this->validation->listErrors('obviouslyBadTemplate');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testShowNonError()
-	{
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-
-		$this->validation->setError('foo', 'Nadda');
-
-		$this->assertEquals('', $this->validation->showError('bogus'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testShowBadTemplate()
-	{
-		$this->expectException(ValidationException::class);
-
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
-		$this->validation->setError('foo', 'Nadda');
-
-		$this->assertEquals('We should never get here', $this->validation->showError('foo', 'bogus_template'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNoRuleSetsSetup()
-	{
-		$this->expectException(ValidationException::class);
-
-		$this->config['ruleSets'] = null;
-		$this->validation         = new Validation((object) $this->config, Services::renderer());
-		$this->validation->reset();
-
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->run($data);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotCustomRuleGroup()
-	{
-		$this->expectException(ValidationException::class);
-
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->run($data, 'GeorgeRules');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNotRealCustomRule()
-	{
-		$this->expectException(ValidationException::class);
-
-		$data = [
-			'foo' => '',
-		];
-
-		$this->validation->run($data, 'groupX');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testHasError()
-	{
-		$data = [
-			'foo' => 'notanumber',
-		];
+    /**
+     * @var Validation
+     */
+    protected $validation;
+    protected $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'login' => [
+            'username' => [
+                'label'  => 'Username',
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'custom username required error msg.',
+                ],
+            ],
+            'password' => [
+                'label'  => 'Password',
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'custom password required error msg.',
+                ],
+            ],
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+        'groupX'    => 'Not an array, so not a real group',
+        'templates' => [
+            'list'   => 'CodeIgniter\Validation\Views\list',
+            'single' => 'CodeIgniter\Validation\Views\single',
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset(true);
+
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [];
+    }
+
+    public function testSetRulesStoresRules()
+    {
+        $rules = [
+            'foo' => 'bar|baz',
+            'bar' => 'baz|belch',
+        ];
+
+        $this->validation->setRules($rules);
+
+        $this->assertSame($rules, $this->validation->getRules());
+    }
+
+    public function testRunReturnsFalseWithNothingToDo()
+    {
+        $this->validation->setRules([]);
+
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testRunDoesTheBasics()
+    {
+        $data = [
+            'foo' => 'notanumber',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testRunReturnsLocalizedErrors()
+    {
+        $data = [
+            'foo' => 'notanumber',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+        $this->assertSame('Validation.is_numeric', $this->validation->getError('foo'));
+    }
+
+    public function testRunWithCustomErrors()
+    {
+        $data = [
+            'foo' => 'notanumber',
+        ];
+
+        $messages = [
+            'foo' => [
+                'is_numeric' => 'Nope. Not a number.',
+            ],
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ], $messages);
+
+        $this->validation->run($data);
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+    }
+
+    public function testCheck()
+    {
+        $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
+    }
+
+    public function testCheckLocalizedError()
+    {
+        $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
+        $this->assertSame('Validation.is_numeric', $this->validation->getError());
+    }
+
+    public function testCheckCustomError()
+    {
+        $this->validation->check('notanumber', 'is_numeric', [
+            'is_numeric' => 'Nope. Not a number.',
+        ]);
+        $this->assertSame('Nope. Not a number.', $this->validation->getError());
+    }
+
+    public function testGetErrors()
+    {
+        $data = [
+            'foo' => 'notanumber',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->validation->run($data);
+
+        $this->assertSame(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
+    }
+
+    public function testGetErrorsWhenNone()
+    {
+        $_SESSION = [];
+
+        $data = [
+            'foo' => 123,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->validation->run($data);
+
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testSetErrors()
+    {
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->validation->setError('foo', 'Nadda');
+
+        $this->assertSame(['foo' => 'Nadda'], $this->validation->getErrors());
+    }
+
+    public function testRulesReturnErrors()
+    {
+        $this->validation->setRules([
+            'foo' => 'customError',
+        ]);
+
+        $this->validation->run(['foo' => 'bar']);
+
+        $this->assertSame(['foo' => 'My lovely error'], $this->validation->getErrors());
+    }
+
+    public function testGroupsReadFromConfig()
+    {
+        $data = [
+            'foo' => 'bar',
+        ];
+
+        $this->assertFalse($this->validation->run($data, 'groupA'));
+        $this->assertSame('Shame, shame. Too short.', $this->validation->getError('foo'));
+    }
+
+    public function testGroupsReadFromConfigValid()
+    {
+        $data = [
+            'foo' => 'barsteps',
+        ];
+
+        $this->assertTrue($this->validation->run($data, 'groupA'));
+    }
+
+    public function testGetRuleGroup()
+    {
+        $this->assertSame([
+            'foo' => 'required|min_length[5]',
+        ], $this->validation->getRuleGroup('groupA'));
+    }
+
+    public function testGetRuleGroupException()
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->getRuleGroup('groupZ');
+    }
+
+    public function testSetRuleGroup()
+    {
+        $this->validation->setRuleGroup('groupA');
+
+        $this->assertSame([
+            'foo' => 'required|min_length[5]',
+        ], $this->validation->getRules());
+    }
+
+    public function testSetRuleGroupException()
+    {
+        $this->expectException(ValidationException::class);
+
+        $this->validation->setRuleGroup('groupZ');
+    }
+
+    public function testSetRuleGroupWithCustomErrorMessage()
+    {
+        $this->validation->reset();
+        $this->validation->setRuleGroup('login');
+        $this->validation->run([
+            'username' => 'codeigniter',
+        ]);
+
+        $this->assertSame([
+            'password' => 'custom password required error msg.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testRunGroupWithCustomErrorMessage()
+    {
+        $this->validation->reset();
+        $this->validation->run([
+            'username' => 'codeigniter',
+        ], 'login');
+
+        $this->assertSame([
+            'password' => 'custom password required error msg.',
+        ], $this->validation->getErrors());
+    }
+
+    /**
+     * @dataProvider rulesSetupProvider
+     *
+     * @param mixed $rules
+     * @param mixed $expected
+     * @param mixed $errors
+     */
+    public function testRulesSetup($rules, $expected, $errors = [])
+    {
+        $data = [
+            'foo' => '',
+        ];
+
+        $this->validation->setRules([
+            'foo' => $rules,
+        ], $errors);
+
+        $this->validation->run($data);
+
+        $this->assertSame($expected, $this->validation->getError('foo'));
+    }
+
+    public function rulesSetupProvider()
+    {
+        return [
+            [
+                'min_length[10]',
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                'min_length[10]',
+                'The foo field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                ['min_length[10]'],
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                ['min_length[10]'],
+                'The foo field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                ['rules' => 'min_length[10]'],
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                [
+                    'label' => 'Foo Bar',
+                    'rules' => 'min_length[10]',
+                ],
+                'The Foo Bar field must be at least 10 characters in length.',
+            ],
+            [
+                [
+                    'label' => 'Foo Bar',
+                    'rules' => 'min_length[10]',
+                ],
+                'The Foo Bar field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                [
+                    'label'  => 'Foo Bar',
+                    'rules'  => 'min_length[10]',
+                    'errors' => ['min_length' => 'The {field} field is very short.'],
+                ],
+                'The Foo Bar field is very short.',
+            ],
+        ];
+    }
+
+    public function testSetRulesRemovesErrorsArray()
+    {
+        $rules = [
+            'foo' => [
+                'label'  => 'Foo Bar',
+                'rules'  => 'min_length[10]',
+                'errors' => [
+                    'min_length' => 'The {field} field is very short.',
+                ],
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+
+        $this->validation->run(['foo' => 'abc']);
+
+        $this->assertSame('The Foo Bar field is very short.', $this->validation->getError('foo'));
+    }
+
+    public function testInvalidRule()
+    {
+        $this->expectException(ValidationException::class);
+
+        $rules = [
+            'foo' => 'bar|baz',
+            'bar' => 'baz|belch',
+        ];
+        $this->validation->setRules($rules);
+
+        $data = [
+            'foo' => '',
+        ];
+        $this->validation->run($data);
+    }
+
+    public function testRawInput()
+    {
+        $rawstring = 'username=admin001&role=administrator&usepass=0';
+
+        $data = [
+            'username' => 'admin001',
+            'role'     => 'administrator',
+            'usepass'  => 0,
+        ];
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
+        $this->validation->withRequest($request->withMethod('patch'))->run($data);
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testJsonInput()
+    {
+        $data = [
+            'username' => 'admin001',
+            'role'     => 'administrator',
+            'usepass'  => 0,
+        ];
+        $json = json_encode($data);
+
+        $_SERVER['CONTENT_TYPE'] = 'application/json';
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $rules = [
+            'role' => 'required|min_length[5]',
+        ];
+        $validated = $this->validation
+            ->withRequest($request->withMethod('patch'))
+            ->setRules($rules)
+            ->run();
+
+        $this->assertTrue($validated);
+        $this->assertSame([], $this->validation->getErrors());
+
+        unset($_SERVER['CONTENT_TYPE']);
+    }
+
+    public function testHasRule()
+    {
+        $this->validation->setRuleGroup('groupA');
+
+        $this->assertTrue($this->validation->hasRule('foo'));
+    }
+
+    public function testNotARealGroup()
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->setRuleGroup('groupX');
+        $this->validation->getRuleGroup('groupX');
+    }
+
+    public function testBadTemplate()
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->listErrors('obviouslyBadTemplate');
+    }
+
+    public function testShowNonError()
+    {
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
 
-		$this->validation->setRules([
-			'foo' => 'is_numeric',
-		]);
+        $this->validation->setError('foo', 'Nadda');
 
-		$this->validation->run($data);
+        $this->assertSame('', $this->validation->showError('bogus'));
+    }
+
+    public function testShowBadTemplate()
+    {
+        $this->expectException(ValidationException::class);
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+        $this->validation->setError('foo', 'Nadda');
+
+        $this->assertSame('We should never get here', $this->validation->showError('foo', 'bogus_template'));
+    }
 
-		$this->assertTrue($this->validation->hasError('foo'));
-	}
+    public function testNoRuleSetsSetup()
+    {
+        $this->expectException(ValidationException::class);
 
-	//--------------------------------------------------------------------
+        $this->config['ruleSets'] = null;
+        $this->validation         = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
 
-	public function testSplitRulesTrue()
-	{
-		$data = [
-			'phone' => '0987654321',
-		];
+        $data = [
+            'foo' => '',
+        ];
 
-		$this->validation->setRules([
-			'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
-		]);
+        $this->validation->run($data);
+    }
+
+    public function testNotCustomRuleGroup()
+    {
+        $this->expectException(ValidationException::class);
 
-		$result = $this->validation->run($data);
+        $data = [
+            'foo' => '',
+        ];
+
+        $this->validation->run($data, 'GeorgeRules');
+    }
 
-		$this->assertTrue($result);
-	}
+    public function testNotRealCustomRule()
+    {
+        $this->expectException(ValidationException::class);
 
-	public function testSplitRulesFalse()
-	{
-		$data = [
-			'phone' => '09876543214',
-		];
+        $data = [
+            'foo' => '',
+        ];
 
-		$this->validation->setRules([
-			'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
-		]);
+        $this->validation->run($data, 'groupX');
+    }
 
-		$result = $this->validation->run($data);
-
-		$this->assertFalse($result);
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/1201
-	 */
-	public function testSplitNotRegex()
-	{
-		$method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
-
-		$result = $method('uploaded[avatar]|max_size[avatar,1024]');
-
-		$this->assertEquals('uploaded[avatar]', $result[0]);
-	}
-
-	public function testSplitRegex()
-	{
-		$method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
-
-		$result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
-
-		$this->assertEquals('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTagReplacement()
-	{
-		// data
-		$data = [
-			'Username' => 'Pizza',
-		];
-
-		// rules
-		$this->validation->setRules([
-			'Username' => 'min_length[6]',
-		], [
-			'Username' => [
-				'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
-			],
-		]);
-
-		// run validation
-		$this->validation->run($data);
-
-		// $errors should contain an associative array
-		$errors = $this->validation->getErrors();
-
-		// if "Username" doesn't exist in errors
-		if (! isset($errors['Username']))
-		{
-			$this->fail('Unable to find "Username"');
-		}
-
-		// expected error message
-		$expected = 'Supplied value (Pizza) for Username must have at least 6 characters.';
-
-		// check if they are the same!
-		$this->assertEquals($expected, $errors['Username']);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @dataProvider arrayFieldDataProvider
-	 */
-	public function testRulesForArrayField($body, $rules, $results)
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$request = new IncomingRequest($config, new URI(), http_build_query($body), new UserAgent());
-
-		$this->validation->setRules($rules);
-		$this->validation->withRequest($request->withMethod('post'))->run($body);
-		$this->assertEquals($results, $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function arrayFieldDataProvider()
-	{
-		return [
-			'all_rules_should_pass'                                            => [
-				'body'    => [
-					'foo' => [
-						'a',
-						'b',
-						'c',
-					],
-				],
-				'rules'   => [
-					'foo.0' => 'required|alpha|max_length[2]',
-					'foo.1' => 'required|alpha|max_length[2]',
-					'foo.2' => 'required|alpha|max_length[2]',
-				],
-				'results' => [],
-			],
-			'first_field_will_return_required_error'                           => [
-				'body'    => [
-					'foo' => [
-						'',
-						'b',
-						'c',
-					],
-				],
-				'rules'   => [
-					'foo.0' => 'required|alpha|max_length[2]',
-					'foo.1' => 'required|alpha|max_length[2]',
-					'foo.2' => 'required|alpha|max_length[2]',
-				],
-				'results' => [
-					'foo.0' => 'The foo.0 field is required.',
-				],
-			],
-			'first_and second_field_will_return_required_and_min_length_error' => [
-				'body'    => [
-					'foo' => [
-						'',
-						'b',
-						'c',
-					],
-				],
-				'rules'   => [
-					'foo.0' => 'required|alpha|max_length[2]',
-					'foo.1' => 'required|alpha|min_length[2]|max_length[4]',
-					'foo.2' => 'required|alpha|max_length[2]',
-				],
-				'results' => [
-					'foo.0' => 'The foo.0 field is required.',
-					'foo.1' => 'The foo.1 field must be at least 2 characters in length.',
-				],
-			],
-		];
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$_REQUEST = [
-			'id_user'   => [
-				1,
-				3,
-			],
-			'name_user' => [
-				'abc123',
-				'xyz098',
-			],
-		];
-
-		$request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
-
-		$this->validation->setRules([
-			'id_user.*'   => 'numeric',
-			'name_user.*' => 'alpha_numeric',
-		]);
-
-		$this->validation->withRequest($request->withMethod('post'))->run();
-		$this->assertEquals([], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRulesForSingleRuleWithAsteriskWillReturnError()
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$_REQUEST = [
-			'id_user'   => [
-				'1dfd',
-				3,
-			],
-			'name_user' => [
-				123,
-				'xyz098',
-			],
-		];
-
-		$request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
-
-		$this->validation->setRules([
-			'id_user.*'   => 'numeric',
-			'name_user.*' => 'alpha',
-		]);
-
-		$this->validation->withRequest($request->withMethod('post'))->run();
-		$this->assertEquals([
-			'id_user.*'   => 'The id_user.* field must contain only numbers.',
-			'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
-		], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRulesForSingleRuleWithSingleValue()
-	{
-		$config          = new App();
-		$config->baseURL = 'http://example.com/';
-
-		$_REQUEST = [
-			'id_user' => 'gh',
-		];
-
-		$request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
-
-		$this->validation->setRules([
-			'id_user' => 'numeric',
-		]);
-
-		$this->validation->withRequest($request->withMethod('post'))->run();
-		$this->assertEquals([
-			'id_user' => 'The id_user field must contain only numbers.',
-		], $this->validation->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTranslatedLabel()
-	{
-		$rules = [
-			'foo' => [
-				'label' => 'Foo.bar',
-				'rules' => 'min_length[10]',
-			],
-		];
-
-		$this->validation->setRules($rules, []);
-
-		$this->validation->run(['foo' => 'abc']);
-
-		$this->assertEquals('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTranslatedLabelIsMissing()
-	{
-		$rules = [
-			'foo' => [
-				'label' => 'Foo.bar.is.missing',
-				'rules' => 'min_length[10]',
-			],
-		];
-
-		$this->validation->setRules($rules, []);
-
-		$this->validation->run(['foo' => 'abc']);
-
-		$this->assertEquals('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTranslatedLabelWithCustomErrorMessage()
-	{
-		$rules = [
-			'foo' => [
-				'label'  => 'Foo.bar',
-				'rules'  => 'min_length[10]',
-				'errors' => [
-					'min_length' => 'Foo.bar.min_length1',
-				],
-			],
-		];
-
-		$this->validation->setRules($rules, []);
-
-		$this->validation->run(['foo' => 'abc']);
-
-		$this->assertEquals('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testTranslatedLabelTagReplacement()
-	{
-		// data
-		$data = [
-			'Username' => 'Pizza',
-		];
-
-		// rules
-		$this->validation->setRules([
-			'Username' => [
-				'label' => 'Foo.bar',
-				'rules' => 'min_length[6]',
-			],
-		], [
-			'Username' => [
-				'min_length' => 'Foo.bar.min_length2',
-			],
-		]);
-
-		// run validation
-		$this->validation->run($data);
-
-		// $errors should contain an associative array
-		$errors = $this->validation->getErrors();
-
-		// if "Username" doesn't exist in errors
-		if (! isset($errors['Username']))
-		{
-			$this->fail('Unable to find "Username"');
-		}
-
-		// expected error message
-		$expected = 'Supplied value (Pizza) for Foo Bar Translated must have at least 6 characters.';
-
-		// check if they are the same!
-		$this->assertEquals($expected, $errors['Username']);
-	}
-
-	/**
-	 * @dataProvider dotNotationForIfExistProvider
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521
-	 *
-	 * @param boolean $expected
-	 * @param array $rules
-	 * @param array $data
-	 *
-	 * @return void
-	 */
-	public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $data): void
-	{
-		$actual = $this->validation->setRules($rules)->run($data);
-		$this->assertSame($expected, $actual);
-	}
-
-	public function dotNotationForIfExistProvider()
-	{
-		yield 'dot-on-end-fail' => [
-			false,
-			['status.*' => 'if_exist|in_list[status_1,status_2]'],
-			['status'   => ['bad-status']],
-		];
-
-		yield 'dot-on-end-pass' => [
-			true,
-			['status.*' => 'if_exist|in_list[status_1,status_2]'],
-			['status'   => ['status_1']],
-		];
-
-		yield 'dot-on-middle-fail' => [
-			false,
-			['fizz.*.baz' => 'if_exist|numeric'],
-			['fizz'       => [
-				'bar' => ['baz' => 'yes'],
-			]],
-		];
-
-		yield 'dot-on-middle-pass' => [
-			true,
-			['fizz.*.baz' => 'if_exist|numeric'],
-			['fizz'       => [
-				'bar' => ['baz' => 30],
-			]],
-		];
-
-		yield 'dot-multiple-fail' => [
-			false,
-			['fizz.*.bar.*' => 'if_exist|numeric'],
-			['fizz' => [
-				'bos' => [
-					'bar' => [
-						'bub' => 'noo',
-					],
-				],
-			]],
-		];
-
-		yield 'dot-multiple-pass' => [
-			true,
-			['fizz.*.bar.*' => 'if_exist|numeric'],
-			['fizz' => [
-				'bos' => [
-					'bar' => [
-						'bub' => 5,
-					],
-				],
-			]],
-		];
-	}
-
-	/**
-	 * @dataProvider validationArrayDataCaseProvider
-	 *
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510
-	 *
-	 * @param boolean $expected
-	 * @param array $rules
-	 * @param array $data
-	 *
-	 * @return void
-	 */
-	public function testValidationOfArrayData(bool $expected, array $rules, array $data): void
-	{
-		$actual = $this->validation->setRules($rules)->run($data);
-		$this->assertSame($expected, $actual);
-	}
-
-	public function validationArrayDataCaseProvider(): iterable
-	{
-		yield 'fail-empty-string' => [
-			false,
-			['bar.*.foo' => 'required'],
-			['bar' => [
-				['foo' => 'baz'],
-				['foo' => ''],
-			]],
-		];
-
-		yield 'pass-nonempty-string' => [
-			true,
-			['bar.*.foo' => 'required'],
-			['bar' => [
-				['foo' => 'baz'],
-				['foo' => 'boz'],
-			]],
-		];
-
-		yield 'fail-empty-array' => [
-			false,
-			['bar.*.foo' => 'required'],
-			['bar' => [
-				['foo' => 'baz'],
-				['foo' => []],
-			]],
-		];
-
-		yield 'pass-nonempty-array' => [
-			true,
-			['bar.*.foo' => 'required'],
-			['bar' => [
-				['foo' => 'baz'],
-				['foo' => ['boz']],
-			]],
-		];
-	}
+    public function testHasError()
+    {
+        $data = [
+            'foo' => 'notanumber',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_numeric',
+        ]);
+
+        $this->validation->run($data);
+
+        $this->assertTrue($this->validation->hasError('foo'));
+    }
+
+    public function testSplitRulesTrue()
+    {
+        $data = [
+            'phone' => '0987654321',
+        ];
+
+        $this->validation->setRules([
+            'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+        ]);
+
+        $result = $this->validation->run($data);
+
+        $this->assertTrue($result);
+    }
+
+    public function testSplitRulesFalse()
+    {
+        $data = [
+            'phone' => '09876543214',
+        ];
+
+        $this->validation->setRules([
+            'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+        ]);
+
+        $result = $this->validation->run($data);
+
+        $this->assertFalse($result);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1201
+     */
+    public function testSplitNotRegex()
+    {
+        $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+
+        $result = $method('uploaded[avatar]|max_size[avatar,1024]');
+
+        $this->assertSame('uploaded[avatar]', $result[0]);
+    }
+
+    public function testSplitRegex()
+    {
+        $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+
+        $result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
+
+        $this->assertSame('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
+    }
+
+    public function testTagReplacement()
+    {
+        // data
+        $data = [
+            'Username' => 'Pizza',
+        ];
+
+        // rules
+        $this->validation->setRules([
+            'Username' => 'min_length[6]',
+        ], [
+            'Username' => [
+                'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
+            ],
+        ]);
+
+        // run validation
+        $this->validation->run($data);
+
+        // $errors should contain an associative array
+        $errors = $this->validation->getErrors();
+
+        // if "Username" doesn't exist in errors
+        if (! isset($errors['Username'])) {
+            $this->fail('Unable to find "Username"');
+        }
+
+        // expected error message
+        $expected = 'Supplied value (Pizza) for Username must have at least 6 characters.';
+
+        // check if they are the same!
+        $this->assertSame($expected, $errors['Username']);
+    }
+
+    /**
+     * @dataProvider arrayFieldDataProvider
+     *
+     * @param mixed $body
+     * @param mixed $rules
+     * @param mixed $results
+     */
+    public function testRulesForArrayField($body, $rules, $results)
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), http_build_query($body), new UserAgent());
+
+        $this->validation->setRules($rules);
+        $this->validation->withRequest($request->withMethod('post'))->run($body);
+        $this->assertSame($results, $this->validation->getErrors());
+    }
+
+    public function arrayFieldDataProvider()
+    {
+        return [
+            'all_rules_should_pass' => [
+                'body' => [
+                    'foo' => [
+                        'a',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|max_length[2]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [],
+            ],
+            'first_field_will_return_required_error' => [
+                'body' => [
+                    'foo' => [
+                        '',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|max_length[2]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [
+                    'foo.0' => 'The foo.0 field is required.',
+                ],
+            ],
+            'first_and second_field_will_return_required_and_min_length_error' => [
+                'body' => [
+                    'foo' => [
+                        '',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|min_length[2]|max_length[4]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [
+                    'foo.0' => 'The foo.0 field is required.',
+                    'foo.1' => 'The foo.1 field must be at least 2 characters in length.',
+                ],
+            ],
+        ];
+    }
+
+    public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => [
+                1,
+                3,
+            ],
+            'name_user' => [
+                'abc123',
+                'xyz098',
+            ],
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user.*'   => 'numeric',
+            'name_user.*' => 'alpha_numeric',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testRulesForSingleRuleWithAsteriskWillReturnError()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => [
+                '1dfd',
+                3,
+            ],
+            'name_user' => [
+                123,
+                'xyz098',
+            ],
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user.*'   => 'numeric',
+            'name_user.*' => 'alpha',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([
+            'id_user.*'   => 'The id_user.* field must contain only numbers.',
+            'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testRulesForSingleRuleWithSingleValue()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => 'gh',
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user' => 'numeric',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([
+            'id_user' => 'The id_user field must contain only numbers.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testTranslatedLabel()
+    {
+        $rules = [
+            'foo' => [
+                'label' => 'Foo.bar',
+                'rules' => 'min_length[10]',
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+
+        $this->validation->run(['foo' => 'abc']);
+
+        $this->assertSame('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelIsMissing()
+    {
+        $rules = [
+            'foo' => [
+                'label' => 'Foo.bar.is.missing',
+                'rules' => 'min_length[10]',
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+
+        $this->validation->run(['foo' => 'abc']);
+
+        $this->assertSame('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelWithCustomErrorMessage()
+    {
+        $rules = [
+            'foo' => [
+                'label'  => 'Foo.bar',
+                'rules'  => 'min_length[10]',
+                'errors' => [
+                    'min_length' => 'Foo.bar.min_length1',
+                ],
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+
+        $this->validation->run(['foo' => 'abc']);
+
+        $this->assertSame('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelTagReplacement()
+    {
+        // data
+        $data = [
+            'Username' => 'Pizza',
+        ];
+
+        // rules
+        $this->validation->setRules([
+            'Username' => [
+                'label' => 'Foo.bar',
+                'rules' => 'min_length[6]',
+            ],
+        ], [
+            'Username' => [
+                'min_length' => 'Foo.bar.min_length2',
+            ],
+        ]);
+
+        // run validation
+        $this->validation->run($data);
+
+        // $errors should contain an associative array
+        $errors = $this->validation->getErrors();
+
+        // if "Username" doesn't exist in errors
+        if (! isset($errors['Username'])) {
+            $this->fail('Unable to find "Username"');
+        }
+
+        // expected error message
+        $expected = 'Supplied value (Pizza) for Foo Bar Translated must have at least 6 characters.';
+
+        // check if they are the same!
+        $this->assertSame($expected, $errors['Username']);
+    }
+
+    /**
+     * @dataProvider dotNotationForIfExistProvider
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521
+     */
+    public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $data): void
+    {
+        $actual = $this->validation->setRules($rules)->run($data);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function dotNotationForIfExistProvider()
+    {
+        yield 'dot-on-end-fail' => [
+            false,
+            ['status.*' => 'if_exist|in_list[status_1,status_2]'],
+            ['status'   => ['bad-status']],
+        ];
+
+        yield 'dot-on-end-pass' => [
+            true,
+            ['status.*' => 'if_exist|in_list[status_1,status_2]'],
+            ['status'   => ['status_1']],
+        ];
+
+        yield 'dot-on-middle-fail' => [
+            false,
+            ['fizz.*.baz' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bar' => ['baz' => 'yes'],
+            ]],
+        ];
+
+        yield 'dot-on-middle-pass' => [
+            true,
+            ['fizz.*.baz' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bar' => ['baz' => 30],
+            ]],
+        ];
+
+        yield 'dot-multiple-fail' => [
+            false,
+            ['fizz.*.bar.*' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bos' => [
+                    'bar' => [
+                        'bub' => 'noo',
+                    ],
+                ],
+            ]],
+        ];
+
+        yield 'dot-multiple-pass' => [
+            true,
+            ['fizz.*.bar.*' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bos' => [
+                    'bar' => [
+                        'bub' => 5,
+                    ],
+                ],
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider validationArrayDataCaseProvider
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510
+     */
+    public function testValidationOfArrayData(bool $expected, array $rules, array $data): void
+    {
+        $actual = $this->validation->setRules($rules)->run($data);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function validationArrayDataCaseProvider(): iterable
+    {
+        yield 'fail-empty-string' => [
+            false,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => ''],
+            ]],
+        ];
+
+        yield 'pass-nonempty-string' => [
+            true,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => 'boz'],
+            ]],
+        ];
+
+        yield 'fail-empty-array' => [
+            false,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => []],
+            ]],
+        ];
+
+        yield 'pass-nonempty-array' => [
+            true,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => ['boz']],
+            ]],
+        ];
+    }
 }
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index e8c6370e6896..2d05fad5fbf2 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -1,281 +1,257 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
-use CodeIgniter\View\Cell;
 use CodeIgniter\View\Exceptions\ViewException;
 
-class CellTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CellTest extends CIUnitTestCase
 {
-
-	protected $cache;
-
-	/**
-	 * @var Cell
-	 */
-	protected $cell;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->cache = new MockCache();
-		$this->cell  = new Cell($this->cache);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsReturnsEmptyArrayWithInvalidParam()
-	{
-		$this->assertEquals([], $this->cell->prepareParams(1.023));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsReturnsNullWithEmptyString()
-	{
-		$this->assertEquals([], $this->cell->prepareParams(''));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsReturnsSelfWhenArray()
-	{
-		$object = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals($object, $this->cell->prepareParams($object));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsReturnsEmptyArrayWithEmptyArray()
-	{
-		$this->assertEquals([], $this->cell->prepareParams([]));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsReturnsArrayWithString()
-	{
-		$params   = 'one=two three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals($expected, $this->cell->prepareParams($params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsHandlesCommas()
-	{
-		$params   = 'one=2, three=4.15';
-		$expected = [
-			'one'   => 2,
-			'three' => 4.15,
-		];
-
-		$this->assertEquals($expected, $this->cell->prepareParams($params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsWorksWithoutSpaces()
-	{
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals($expected, $this->cell->prepareParams($params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPrepareParamsWorksWithOddEqualsSpaces()
-	{
-		$params   = 'one= two,three =four, five = six';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-			'five'  => 'six',
-		];
-
-		$this->assertEquals($expected, $this->cell->prepareParams($params));
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Render
-	//--------------------------------------------------------------------
-
-	public function testDisplayRendersWithNamespacedClass()
-	{
-		$expected = 'Hello';
-
-		$this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDisplayRendersWithValidParamString()
-	{
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDisplayRendersWithStaticMethods()
-	{
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testOptionsEmptyArray()
-	{
-		$params   = [];
-		$expected = [];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
-	}
-
-	public function testOptionsNoParams()
-	{
-		$expected = [];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho'));
-	}
-
-	public function testCellEmptyParams()
-	{
-		$params   = ',';
-		$expected = 'Hello World';
-
-		$this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::index', $params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCellClassMissing()
-	{
-		$this->expectException(ViewException::class);
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('::echobox', $params));
-	}
-
-	public function testCellMethodMissing()
-	{
-		$this->expectException(ViewException::class);
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::', $params));
-	}
-
-	public function testCellBadClass()
-	{
-		$this->expectException(ViewException::class);
-		$params   = 'one=two,three=four';
-		$expected = 'Hello World';
-
-		$this->assertEquals($expected, $this->cell->render('\CodeIgniter\View\GoodQuestion::', $params));
-	}
-
-	public function testCellBadMethod()
-	{
-		$this->expectException(ViewException::class);
-		$params   = 'one=two,three=four';
-		$expected = 'Hello World';
-
-		$this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::notThere', $params));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRenderCached()
-	{
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60, 'rememberme'));
-		$params = 'one=six,three=five';
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1, 'rememberme'));
-	}
-
-	public function testRenderCachedAutoName()
-	{
-		$params   = 'one=two,three=four';
-		$expected = [
-			'one'   => 'two',
-			'three' => 'four',
-		];
-
-		$this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60));
-		$params = 'one=six,three=five';
-		// When auto-generating it takes the params as part of cachename, so it wouldn't have actually cached this, but
-		// we want to make sure it doesn't throw us a curveball here.
-		$this->assertEquals('six,five', $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testParametersMatch()
-	{
-		$params   = [
-			'p1' => 'one',
-			'p2' => 'two',
-			'p4' => 'three',
-		];
-		$expected = 'Right on';
-
-		$this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
-	}
-
-	public function testParametersDontMatch()
-	{
-		$this->expectException(ViewException::class);
-		$params   = 'p1=one,p2=two,p3=three';
-		$expected = 'Right on';
-
-		$this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
-	}
-
-	public function testCallInitControllerIfMethodExists()
-	{
-		$this->assertEquals('CodeIgniter\HTTP\Response', $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
-	}
-
+    protected $cache;
+
+    /**
+     * @var Cell
+     */
+    protected $cell;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->cache = new MockCache();
+        $this->cell  = new Cell($this->cache);
+    }
+
+    public function testPrepareParamsReturnsEmptyArrayWithInvalidParam()
+    {
+        $this->assertSame([], $this->cell->prepareParams(1.023));
+    }
+
+    public function testPrepareParamsReturnsNullWithEmptyString()
+    {
+        $this->assertSame([], $this->cell->prepareParams(''));
+    }
+
+    public function testPrepareParamsReturnsSelfWhenArray()
+    {
+        $object = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame($object, $this->cell->prepareParams($object));
+    }
+
+    public function testPrepareParamsReturnsEmptyArrayWithEmptyArray()
+    {
+        $this->assertSame([], $this->cell->prepareParams([]));
+    }
+
+    public function testPrepareParamsReturnsArrayWithString()
+    {
+        $params   = 'one=two three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame($expected, $this->cell->prepareParams($params));
+    }
+
+    public function testPrepareParamsHandlesCommas()
+    {
+        $params   = 'one=2, three=4.15';
+        $expected = [
+            'one'   => '2',
+            'three' => '4.15',
+        ];
+
+        $this->assertSame($expected, $this->cell->prepareParams($params));
+    }
+
+    public function testPrepareParamsWorksWithoutSpaces()
+    {
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame($expected, $this->cell->prepareParams($params));
+    }
+
+    public function testPrepareParamsWorksWithOddEqualsSpaces()
+    {
+        $params   = 'one= two,three =four, five = six';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+            'five'  => 'six',
+        ];
+
+        $this->assertSame($expected, $this->cell->prepareParams($params));
+    }
+
+    // Render
+
+    public function testDisplayRendersWithNamespacedClass()
+    {
+        $expected = 'Hello';
+
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
+    }
+
+    public function testDisplayRendersWithValidParamString()
+    {
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params));
+    }
+
+    public function testDisplayRendersWithStaticMethods()
+    {
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
+    }
+
+    public function testOptionsEmptyArray()
+    {
+        $params   = [];
+        $expected = [];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
+    }
+
+    public function testOptionsNoParams()
+    {
+        $expected = [];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho'));
+    }
+
+    public function testCellEmptyParams()
+    {
+        $params   = ',';
+        $expected = 'Hello World';
+
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::index', $params));
+    }
+
+    public function testCellClassMissing()
+    {
+        $this->expectException(ViewException::class);
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('::echobox', $params));
+    }
+
+    public function testCellMethodMissing()
+    {
+        $this->expectException(ViewException::class);
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::', $params));
+    }
+
+    public function testCellBadClass()
+    {
+        $this->expectException(ViewException::class);
+        $params   = 'one=two,three=four';
+        $expected = 'Hello World';
+
+        $this->assertSame($expected, $this->cell->render('\CodeIgniter\View\GoodQuestion::', $params));
+    }
+
+    public function testCellBadMethod()
+    {
+        $this->expectException(ViewException::class);
+        $params   = 'one=two,three=four';
+        $expected = 'Hello World';
+
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::notThere', $params));
+    }
+
+    public function testRenderCached()
+    {
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60, 'rememberme'));
+        $params = 'one=six,three=five';
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1, 'rememberme'));
+    }
+
+    public function testRenderCachedAutoName()
+    {
+        $params   = 'one=two,three=four';
+        $expected = [
+            'one'   => 'two',
+            'three' => 'four',
+        ];
+
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60));
+        $params = 'one=six,three=five';
+        // When auto-generating it takes the params as part of cachename, so it wouldn't have actually cached this, but
+        // we want to make sure it doesn't throw us a curveball here.
+        $this->assertSame('six,five', $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1));
+    }
+
+    public function testParametersMatch()
+    {
+        $params = [
+            'p1' => 'one',
+            'p2' => 'two',
+            'p4' => 'three',
+        ];
+        $expected = 'Right on';
+
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
+    }
+
+    public function testParametersDontMatch()
+    {
+        $this->expectException(ViewException::class);
+        $params   = 'p1=one,p2=two,p3=three';
+        $expected = 'Right on';
+
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
+    }
+
+    public function testCallInitControllerIfMethodExists()
+    {
+        $this->assertSame('CodeIgniter\HTTP\Response', $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
+    }
 }
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 47ec31fc2ca3..d1670f60a119 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -1,477 +1,449 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\View\Parser;
 use Config\View;
 
-class ParserFilterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserFilterTest extends CIUnitTestCase
 {
-	protected $loader;
-	protected $viewsDir;
-	protected $config;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->loader = Services::locator();
-		;
-		$this->viewsDir = __DIR__ . '/Views';
-		$this->config   = new View();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAbs()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'value1' => -5,
-			'value2' => 5,
-		];
-
-		$template = '{ value1|abs }{ value2|abs }';
-
-		$parser->setData($data);
-		$this->assertEquals('55', $parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCapitalize()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'value1' => 'wonder',
-			'value2' => 'TWInS',
-		];
-
-		$template = '{ value1|capitalize } { value2|capitalize }';
-
-		$parser->setData($data);
-		$this->assertEquals('Wonder Twins', $parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDate()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$todayDash      = date('Y-m-d');
-		$todayDot       = date('Y.m.d');
-		$todaySpace     = date('Y m d');
-		$todayColon     = date('Y:m:d');
-		$todaySlash     = date('Y/m/d');
-		$todayBackslash = date('Y\\\m\\\d');
-
-		$data = [
-			'value1' => time(),
-			'value2' => date('Y-m-d H:i:s'),
-		];
-
-		$template = '{ value1|date(Y-m-d) } { value2|date(Y-m-d) } { value1|date(Y.m.d) } { value1|date(Y m d) } { value1|date(Y:m:d) } { value1|date(Y/m/d) } { value1|date(Y\\\m\\\d) }';
-
-		$parser->setData($data);
-		$this->assertEquals("{$todayDash} {$todayDash} {$todayDot} {$todaySpace} {$todayColon} {$todaySlash} {$todayBackslash}", $parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDateModify()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$today     = date('Y-m-d');
-		$tommorrow = date('Y-m-d', strtotime('+1 day'));
-
-		$data = [
-			'value1' => time(),
-			'value2' => date('Y-m-d H:i:s'),
-		];
-
-		$template = '{ value1|date_modify(+1 day)|date(Y-m-d) } { value2|date_modify(+1 day)|date(Y-m-d) }';
-
-		$parser->setData($data);
-		$this->assertEquals("{$tommorrow} {$tommorrow}", $parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
+    protected $loader;
+    protected $viewsDir;
+    protected $config;
 
-	public function testDefault()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$data = [
-			'value1' => null,
-			'value2' => 0,
-			'value3' => 'test',
-		];
+        $this->loader   = Services::locator();
+        $this->viewsDir = __DIR__ . '/Views';
+        $this->config   = new View();
+    }
 
-		$template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }';
+    public function testAbs()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$parser->setData($data);
-		$this->assertEquals('foo bar test', $parser->renderString($template));
-	}
+        $data = [
+            'value1' => -5,
+            'value2' => 5,
+        ];
 
-	//--------------------------------------------------------------------
+        $template = '{ value1|abs }{ value2|abs }';
 
-	public function testEsc()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setData($data);
+        $this->assertSame('55', $parser->renderString($template));
+    }
 
-		$value1 = esc('<script>');
-		$value2 = esc('<script>', 'js');
+    public function testCapitalize()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$data = [
-			'value1' => '<script>',
-		];
+        $data = [
+            'value1' => 'wonder',
+            'value2' => 'TWInS',
+        ];
 
-		$template = '{ value1|esc(html) } { value1|esc(js) }';
+        $template = '{ value1|capitalize } { value2|capitalize }';
 
-		$parser->setData($data);
-		$this->assertEquals("{$value1} {$value2}", $parser->renderString($template));
-	}
+        $parser->setData($data);
+        $this->assertSame('Wonder Twins', $parser->renderString($template));
+    }
 
-	//--------------------------------------------------------------------
+    public function testDate()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	public function testExcerpt()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $todayDash      = date('Y-m-d');
+        $todayDot       = date('Y.m.d');
+        $todaySpace     = date('Y m d');
+        $todayColon     = date('Y:m:d');
+        $todaySlash     = date('Y/m/d');
+        $todayBackslash = date('Y\\\m\\\d');
 
-		$data = [
-			'value1' => 'The quick red fox jumped over the lazy brown dog',
-		];
+        $data = [
+            'value1' => time(),
+            'value2' => date('Y-m-d H:i:s'),
+        ];
 
-		$template = '{ value1|excerpt(jumped, 10) }';
+        $template = '{ value1|date(Y-m-d) } { value2|date(Y-m-d) } { value1|date(Y.m.d) } { value1|date(Y m d) } { value1|date(Y:m:d) } { value1|date(Y/m/d) } { value1|date(Y\\\m\\\d) }';
 
-		$parser->setData($data);
-		$this->assertEquals('... red fox jumped over ...', $parser->renderString($template));
-	}
+        $parser->setData($data);
+        $this->assertSame("{$todayDash} {$todayDash} {$todayDot} {$todaySpace} {$todayColon} {$todaySlash} {$todayBackslash}", $parser->renderString($template));
+    }
 
-	//--------------------------------------------------------------------
+    public function testDateModify()
+    {
+        $parser    = new Parser($this->config, $this->viewsDir, $this->loader);
+        $tommorrow = date('Y-m-d', strtotime('+1 day'));
 
-	public function testHighlight()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $data = [
+            'value1' => time(),
+            'value2' => date('Y-m-d H:i:s'),
+        ];
 
-		$data = [
-			'value1' => 'The quick red fox jumped over the lazy brown dog',
-		];
+        $template = '{ value1|date_modify(+1 day)|date(Y-m-d) } { value2|date_modify(+1 day)|date(Y-m-d) }';
+
+        $parser->setData($data);
+        $this->assertSame("{$tommorrow} {$tommorrow}", $parser->renderString($template));
+    }
+
+    public function testDefault()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$template = '{ value1|highlight(jumped over) }';
+        $data = [
+            'value1' => null,
+            'value2' => 0,
+            'value3' => 'test',
+        ];
 
-		$parser->setData($data);
-		$this->assertEquals('The quick red fox <mark>jumped over</mark> the lazy brown dog', $parser->renderString($template));
-	}
+        $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }';
 
-	public function testHighlightCode()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setData($data);
+        $this->assertSame('foo bar test', $parser->renderString($template));
+    }
 
-		$data = [
-			'value1' => 'Sincerely',
-		];
-		$parser->setData($data);
+    public function testEsc()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$template = '{ value1|highlight_code }';
-		$expected = <<<EOF
-<code><span style="color: #000000">
-<span style="color: #0000BB">Sincerely&nbsp;</span>
-</span>
-</code>
-EOF;
-		$this->assertEquals($expected, $parser->renderString($template));
-	}
+        $value1 = esc('<script>');
+        $value2 = esc('<script>', 'js');
 
-	public function testProse()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $data = [
+            'value1' => '<script>',
+        ];
 
-		$data = [
-			'value1' => 'Sincerely\nMe',
-		];
-		$parser->setData($data);
+        $template = '{ value1|esc(html) } { value1|esc(js) }';
 
-		$template = '{ value1|prose }';
-		$expected = '<p>Sincerely\nMe</p>';
-		$this->assertEquals($expected, $parser->renderString($template));
-	}
+        $parser->setData($data);
+        $this->assertSame("{$value1} {$value2}", $parser->renderString($template));
+    }
 
-	//--------------------------------------------------------------------
+    public function testExcerpt()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	public function testLimitChars()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $data = [
+            'value1' => 'The quick red fox jumped over the lazy brown dog',
+        ];
 
-		$data = [
-			'value1' => 'The quick red fox jumped over the lazy brown dog',
-		];
+        $template = '{ value1|excerpt(jumped, 10) }';
 
-		$template = '{ value1|limit_chars(10) }';
+        $parser->setData($data);
+        $this->assertSame('... red fox jumped over ...', $parser->renderString($template));
+    }
 
-		$parser->setData($data);
-		$this->assertEquals('The quick&#8230;', $parser->renderString($template));
-	}
+    public function testHighlight()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	//--------------------------------------------------------------------
+        $data = [
+            'value1' => 'The quick red fox jumped over the lazy brown dog',
+        ];
 
-	public function testLimitWords()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $template = '{ value1|highlight(jumped over) }';
 
-		$data = [
-			'value1' => 'The quick red fox jumped over the lazy brown dog',
-		];
+        $parser->setData($data);
+        $this->assertSame('The quick red fox <mark>jumped over</mark> the lazy brown dog', $parser->renderString($template));
+    }
 
-		$template = '{ value1|limit_words(4) }';
+    public function testHighlightCode()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$parser->setData($data);
-		$this->assertEquals('The quick red fox&#8230;', $parser->renderString($template));
-	}
+        $data = [
+            'value1' => 'Sincerely',
+        ];
+        $parser->setData($data);
 
-	//--------------------------------------------------------------------
+        $template = '{ value1|highlight_code }';
+        $expected = <<<'EOF'
+            <code><span style="color: #000000">
+            <span style="color: #0000BB">Sincerely&nbsp;</span>
+            </span>
+            </code>
+            EOF;
+        $this->assertSame($expected, $parser->renderString($template));
+    }
 
-	public function testLower()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+    public function testProse()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$data = [
-			'value1' => 'SOMETHING',
-		];
+        $data = [
+            'value1' => 'Sincerely\nMe',
+        ];
+        $parser->setData($data);
 
-		$template = '{ value1|lower }';
+        $template = '{ value1|prose }';
+        $expected = '<p>Sincerely\nMe</p>';
+        $this->assertSame($expected, $parser->renderString($template));
+    }
 
-		$parser->setData($data);
-		$this->assertEquals('something', $parser->renderString($template));
-	}
+    public function testLimitChars()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	//--------------------------------------------------------------------
+        $data = [
+            'value1' => 'The quick red fox jumped over the lazy brown dog',
+        ];
 
-	public function testNL2BR()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $template = '{ value1|limit_chars(10) }';
 
-		$data = [
-			'value1' => "first\nsecond",
-		];
+        $parser->setData($data);
+        $this->assertSame('The quick&#8230;', $parser->renderString($template));
+    }
 
-		$template = '{ value1|nl2br }';
+    public function testLimitWords()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$parser->setData($data);
-		$this->assertEquals("first<br />\nsecond", $parser->renderString($template));
-	}
+        $data = [
+            'value1' => 'The quick red fox jumped over the lazy brown dog',
+        ];
 
-	//--------------------------------------------------------------------
+        $template = '{ value1|limit_words(4) }';
 
-	public function testNumberFormat()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setData($data);
+        $this->assertSame('The quick red fox&#8230;', $parser->renderString($template));
+    }
 
-		$data = [
-			'value1' => 1098.3455433553,
-		];
+    public function testLower()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$template = '{ value1|number_format(2) }';
+        $data = [
+            'value1' => 'SOMETHING',
+        ];
 
-		$parser->setData($data);
-		$this->assertEquals('1,098.35', $parser->renderString($template));
-	}
+        $template = '{ value1|lower }';
 
-	//--------------------------------------------------------------------
+        $parser->setData($data);
+        $this->assertSame('something', $parser->renderString($template));
+    }
 
-	public function testRound()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+    public function testNL2BR()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$data = [
-			'value1' => 5.55,
-		];
+        $data = [
+            'value1' => "first\nsecond",
+        ];
 
-		$template = '{ value1|round(1) } { value1|round(1, common) } { value1|round(ceil) } { value1|round(floor) } { value1|round(unknown) }';
+        $template = '{ value1|nl2br }';
 
-		$parser->setData($data);
-		$this->assertEquals('5.6 5.6 6 5 5.55', $parser->renderString($template));
-	}
+        $parser->setData($data);
+        $this->assertSame("first<br />\nsecond", $parser->renderString($template));
+    }
 
-	//--------------------------------------------------------------------
+    public function testNumberFormat()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	public function testStripTags()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $data = [
+            'value1' => 1098.3455433553,
+        ];
 
-		$data = [
-			'value1' => '<p><b>Middle</b></p>',
-		];
+        $template = '{ value1|number_format(2) }';
 
-		$template = '{ value1|strip_tags } { value1|strip_tags(<b>) }';
+        $parser->setData($data);
+        $this->assertSame('1,098.35', $parser->renderString($template));
+    }
 
-		$parser->setData($data);
-		$this->assertEquals('Middle <b>Middle</b>', $parser->renderString($template));
-	}
+    public function testRound()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-	//--------------------------------------------------------------------
+        $data = [
+            'value1' => 5.55,
+        ];
 
-	public function testTitle()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $template = '{ value1|round(1) } { value1|round(1, common) } { value1|round(ceil) } { value1|round(floor) } { value1|round(unknown) }';
 
-		$data = [
-			'value1' => 'THOUGH SHE BE LITTLE',
-		];
+        $parser->setData($data);
+        $this->assertSame('5.6 5.6 6 5 5.55', $parser->renderString($template));
+    }
 
-		$template = '{ value1|title }';
+    public function testStripTags()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$parser->setData($data);
-		$this->assertEquals('Though She Be Little', $parser->renderString($template));
-	}
+        $data = [
+            'value1' => '<p><b>Middle</b></p>',
+        ];
 
-	//--------------------------------------------------------------------
+        $template = '{ value1|strip_tags } { value1|strip_tags(<b>) }';
 
-	public function testUpper()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setData($data);
+        $this->assertSame('Middle <b>Middle</b>', $parser->renderString($template));
+    }
 
-		$data = [
-			'value1' => 'Though She Be Little',
-		];
+    public function testTitle()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$template = '{ value1|upper }';
+        $data = [
+            'value1' => 'THOUGH SHE BE LITTLE',
+        ];
 
-		$parser->setData($data);
-		$this->assertEquals('THOUGH SHE BE LITTLE', $parser->renderString($template));
-	}
+        $template = '{ value1|title }';
 
-	//--------------------------------------------------------------------
+        $parser->setData($data);
+        $this->assertSame('Though She Be Little', $parser->renderString($template));
+    }
 
-	public function testLocalNumberBase()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
+    public function testUpper()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
-		$data = [
-			'mynum' => 1234567.891234567890000,
-		];
+        $data = [
+            'value1' => 'Though She Be Little',
+        ];
 
-		$template = '{ mynum|local_number }';
+        $template = '{ value1|upper }';
 
-		$parser->setData($data);
-		$this->assertEquals('1,234,567.8912', $parser->renderString($template));
-	}
+        $parser->setData($data);
+        $this->assertSame('THOUGH SHE BE LITTLE', $parser->renderString($template));
+    }
 
-	public function testLocalNumberPrecision()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'mynum' => 1234567.891234567890000,
-		];
-
-		$template = '{ mynum|local_number(decimal,2) }';
-
-		$parser->setData($data);
-		$this->assertEquals('1,234,567.89', $parser->renderString($template));
-	}
-
-	public function testLocalNumberType()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'mynum' => 1234567.891234567890000,
-		];
-
-		$template = '{ mynum|local_number(spellout) }';
-
-		$parser->setData($data);
-		$this->assertEquals('one million two hundred thirty-four thousand five hundred sixty-seven point eight nine one two three four six', $parser->renderString($template));
-	}
-
-	public function testLocalNumberLocale()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'mynum' => 1234567.891234567890000,
-		];
-
-		$template = '{ mynum|local_number(decimal,4,de_DE) }';
-
-		$parser->setData($data);
-		$this->assertEquals('1.234.567,8912', $parser->renderString($template));
-	}
-
-	public function testLocalCurrency()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'mynum' => 1234567.891234567890000,
-		];
-
-		$template = '{ mynum|local_currency(EUR,de_DE,2) }';
-
-		$parser->setData($data);
-		$this->assertEquals('1.234.567,89 €', $parser->renderString($template));
-	}
-
-	public function testParsePairWithAbs()
-	{
-		$parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-		$data = [
-			'value1' => -1,
-			'value2' => 1,
-			'single' => [
-				[
-					'svalue1' => -2,
-					'svalue2' => 2,
-				],
-			],
-			'loop'   => [
-				[
-					'lvalue' => -3,
-				],
-				[
-					'lvalue' => 3,
-				],
-			],
-			'nested' => [
-				[
-					'nvalue1' => -4,
-					'nvalue2' => 4,
-					'nsingle' => [
-						[
-							'nsvalue1' => -5,
-							'nsvalue2' => 5,
-						],
-					],
-					'nsloop'  => [
-						[
-							'nlvalue' => -6,
-						],
-						[
-							'nlvalue' => 6,
-						],
-					],
-				],
-			],
-		];
-
-		$template = '{ value1|abs }{ value2|abs }'
-			. '{single}{ svalue1|abs }{ svalue2|abs }{/single}'
-			. '{loop}{ lvalue|abs }{/loop}'
-			. '{nested}'
-			. '{ nvalue1|abs }{ nvalue2|abs }'
-			. '{nsingle}{ nsvalue1|abs }{ nsvalue2|abs }{/nsingle}'
-			. '{nsloop}{ nlvalue|abs }{/nsloop}'
-			. '{/nested}';
-
-		$parser->setData($data);
-		$this->assertEquals('112233445566', $parser->renderString($template));
-	}
+    public function testLocalNumberBase()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'mynum' => 1234567.891234567890000,
+        ];
+
+        $template = '{ mynum|local_number }';
+
+        $parser->setData($data);
+        $this->assertSame('1,234,567.8912', $parser->renderString($template));
+    }
+
+    public function testLocalNumberPrecision()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'mynum' => 1234567.891234567890000,
+        ];
+
+        $template = '{ mynum|local_number(decimal,2) }';
+
+        $parser->setData($data);
+        $this->assertSame('1,234,567.89', $parser->renderString($template));
+    }
+
+    public function testLocalNumberType()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'mynum' => 1234567.891234567890000,
+        ];
+
+        $template = '{ mynum|local_number(spellout) }';
+
+        $parser->setData($data);
+        $this->assertSame('one million two hundred thirty-four thousand five hundred sixty-seven point eight nine one two three four six', $parser->renderString($template));
+    }
+
+    public function testLocalNumberLocale()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'mynum' => 1234567.891234567890000,
+        ];
+
+        $template = '{ mynum|local_number(decimal,4,de_DE) }';
+
+        $parser->setData($data);
+        $this->assertSame('1.234.567,8912', $parser->renderString($template));
+    }
+
+    public function testLocalCurrency()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'mynum' => 1234567.891234567890000,
+        ];
+
+        $template = '{ mynum|local_currency(EUR,de_DE,2) }';
+
+        $parser->setData($data);
+        $this->assertSame("1.234.567,89\u{a0}€", $parser->renderString($template));
+    }
+
+    public function testParsePairWithAbs()
+    {
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+
+        $data = [
+            'value1' => -1,
+            'value2' => 1,
+            'single' => [
+                [
+                    'svalue1' => -2,
+                    'svalue2' => 2,
+                ],
+            ],
+            'loop' => [
+                [
+                    'lvalue' => -3,
+                ],
+                [
+                    'lvalue' => 3,
+                ],
+            ],
+            'nested' => [
+                [
+                    'nvalue1' => -4,
+                    'nvalue2' => 4,
+                    'nsingle' => [
+                        [
+                            'nsvalue1' => -5,
+                            'nsvalue2' => 5,
+                        ],
+                    ],
+                    'nsloop' => [
+                        [
+                            'nlvalue' => -6,
+                        ],
+                        [
+                            'nlvalue' => 6,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $template = '{ value1|abs }{ value2|abs }'
+            . '{single}{ svalue1|abs }{ svalue2|abs }{/single}'
+            . '{loop}{ lvalue|abs }{/loop}'
+            . '{nested}'
+            . '{ nvalue1|abs }{ nvalue2|abs }'
+            . '{nsingle}{ nsvalue1|abs }{ nsvalue2|abs }{/nsingle}'
+            . '{nsloop}{ nlvalue|abs }{/nsloop}'
+            . '{/nested}';
+
+        $parser->setData($data);
+        $this->assertSame('112233445566', $parser->renderString($template));
+    }
 }
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 24bba9e7f96b..df773a375df8 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -1,124 +1,135 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Validation;
 use Config\Services;
 
-class ParserPluginTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserPluginTest extends CIUnitTestCase
 {
-	/**
-	 * @var Parser
-	 */
-	protected $parser;
-	/**
-	 * @var Validation
-	 */
-	protected $validator;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		Services::reset(true);
-
-		$this->parser    = Services::parser();
-		$this->validator = Services::validation();
-	}
-
-	public function testCurrentURL()
-	{
-		helper('url');
-		$template = '{+ current_url +}';
-
-		$this->assertEquals(current_url(), $this->parser->renderString($template));
-	}
-
-	public function testPreviousURL()
-	{
-		helper('url');
-		$template = '{+ previous_url +}';
-
-		// Ensure a previous URL exists to work with.
-		$_SESSION['_ci_previous_url'] = 'http://example.com/foo';
-
-		$this->assertEquals(previous_url(), $this->parser->renderString($template));
-	}
-
-	public function testMailto()
-	{
-		helper('url');
-		$template = '{+ mailto email=foo@example.com title=Silly +}';
-
-		$this->assertEquals(mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3523
-	 */
-	public function testMailtoWithDashAndParenthesis()
-	{
-		helper('url');
-		$template = '{+ mailto email=foo-bar@example.com title="Scilly (the Great)" +}';
-
-		$this->assertSame(mailto('foo-bar@example.com', 'Scilly (the Great)'), $this->parser->renderString($template));
-	}
-
-	public function testSafeMailto()
-	{
-		helper('url');
-		$template = '{+ safe_mailto email=foo@example.com title=Silly +}';
-
-		$this->assertEquals(safe_mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
-	}
-
-	public function testLang()
-	{
-		$template = '{+ lang Number.terabyteAbbr +}';
-
-		$this->assertEquals('TB', $this->parser->renderString($template));
-	}
-
-	public function testValidationErrors()
-	{
-		$this->validator->setError('email', 'Invalid email address');
-
-		$template = '{+ validation_errors field=email +}';
-
-		$this->assertEquals($this->setHints($this->validator->showError('email')), $this->setHints($this->parser->renderString($template)));
-	}
-
-	public function testRoute()
-	{
-		// prime the pump
-		$routes = service('routes');
-		$routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
-
-		$template = '{+ route myController::goto string 13 +}';
-
-		$this->assertEquals('/path/string/to/13', $this->parser->renderString($template));
-	}
-
-	public function testSiteURL()
-	{
-		$template = '{+ siteURL +}';
-
-		$this->assertEquals('http://example.com/index.php', $this->parser->renderString($template));
-	}
-
-	public function testValidationErrorsList()
-	{
-		$this->validator->setError('email', 'Invalid email address');
-		$this->validator->setError('username', 'User name must be unique');
-		$template = '{+ validation_errors +}';
+    /**
+     * @var Parser
+     */
+    protected $parser;
+    /**
+     * @var Validation
+     */
+    protected $validator;
 
-		$this->assertEquals($this->setHints($this->validator->listErrors()), $this->setHints($this->parser->renderString($template)));
-	}
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset(true);
+
+        $this->parser    = Services::parser();
+        $this->validator = Services::validation();
+    }
+
+    public function testCurrentURL()
+    {
+        helper('url');
+        $template = '{+ current_url +}';
+
+        $this->assertSame(current_url(), $this->parser->renderString($template));
+    }
+
+    public function testPreviousURL()
+    {
+        helper('url');
+        $template = '{+ previous_url +}';
+
+        // Ensure a previous URL exists to work with.
+        $_SESSION['_ci_previous_url'] = 'http://example.com/foo';
+
+        $this->assertSame(previous_url(), $this->parser->renderString($template));
+    }
+
+    public function testMailto()
+    {
+        helper('url');
+        $template = '{+ mailto email=foo@example.com title=Silly +}';
+
+        $this->assertSame(mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3523
+     */
+    public function testMailtoWithDashAndParenthesis()
+    {
+        helper('url');
+        $template = '{+ mailto email=foo-bar@example.com title="Scilly (the Great)" +}';
+
+        $this->assertSame(mailto('foo-bar@example.com', 'Scilly (the Great)'), $this->parser->renderString($template));
+    }
+
+    public function testSafeMailto()
+    {
+        helper('url');
+        $template = '{+ safe_mailto email=foo@example.com title=Silly +}';
+
+        $this->assertSame(safe_mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
+    }
+
+    public function testLang()
+    {
+        $template = '{+ lang Number.terabyteAbbr +}';
+
+        $this->assertSame('TB', $this->parser->renderString($template));
+    }
+
+    public function testValidationErrors()
+    {
+        $this->validator->setError('email', 'Invalid email address');
+
+        $template = '{+ validation_errors field=email +}';
+
+        $this->assertSame($this->setHints($this->validator->showError('email')), $this->setHints($this->parser->renderString($template)));
+    }
+
+    public function testRoute()
+    {
+        // prime the pump
+        $routes = service('routes');
+        $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
+
+        $template = '{+ route myController::goto string 13 +}';
+
+        $this->assertSame('/path/string/to/13', $this->parser->renderString($template));
+    }
+
+    public function testSiteURL()
+    {
+        $template = '{+ siteURL +}';
+
+        $this->assertSame('http://example.com/index.php', $this->parser->renderString($template));
+    }
+
+    public function testValidationErrorsList()
+    {
+        $this->validator->setError('email', 'Invalid email address');
+        $this->validator->setError('username', 'User name must be unique');
+        $template = '{+ validation_errors +}';
 
-	public function setHints($output)
-	{
-		return preg_replace('/(<!-- DEBUG-VIEW+) (\w+) (\d+)/', '${1}', $output);
-	}
+        $this->assertSame($this->setHints($this->validator->listErrors()), $this->setHints($this->parser->renderString($template)));
+    }
 
+    public function setHints($output)
+    {
+        return preg_replace('/(<!-- DEBUG-VIEW+) (\w+) (\d+)/', '${1}', $output);
+    }
 }
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index d3b2c22a87f8..a7a97f00c51a 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Autoloader\FileLocator;
@@ -10,1012 +19,950 @@
 use Config\View as ViewConfig;
 use stdClass;
 
-class ParserTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserTest extends CIUnitTestCase
 {
-	/**
-	 * @var FileLocator
-	 */
-	private $loader;
-
-	/**
-	 * @var string
-	 */
-	private $viewsDir;
-
-	/**
-	 * @var ViewConfig
-	 */
-	private $config;
-
-	/**
-	 * @var Parser
-	 */
-	private $parser;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->loader   = Services::locator();
-		$this->viewsDir = __DIR__ . '/Views';
-		$this->config   = new ViewConfig();
-		$this->parser   = new Parser($this->config, $this->viewsDir, $this->loader);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testSetDelimiters()
-	{
-		// Make sure default delimiters are there
-		$this->assertEquals('{', $this->parser->leftDelimiter);
-		$this->assertEquals('}', $this->parser->rightDelimiter);
-
-		// Change them to square brackets
-		$this->parser->setDelimiters('[', ']');
-
-		// Make sure they changed
-		$this->assertEquals('[', $this->parser->leftDelimiter);
-		$this->assertEquals(']', $this->parser->rightDelimiter);
-
-		// Reset them
-		$this->parser->setDelimiters();
-
-		// Make sure default delimiters are there
-		$this->assertEquals('{', $this->parser->leftDelimiter);
-		$this->assertEquals('}', $this->parser->rightDelimiter);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseSimple()
-	{
-		$this->parser->setVar('teststring', 'Hello World');
-		$this->assertEquals("<h1>Hello World</h1>\n", $this->parser->render('template1'));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseString()
-	{
-		$data = [
-			'title' => 'Page Title',
-			'body'  => 'Lorem ipsum dolor sit amet.',
-		];
-
-		$template = "{title}\n{body}";
-
-		$result = implode("\n", $data);
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseStringMissingData()
-	{
-		$data = [
-			'title' => 'Page Title',
-			'body'  => 'Lorem ipsum dolor sit amet.',
-		];
-
-		$template = "{title}\n{body}\n{name}";
-
-		$result = implode("\n", $data) . "\n{name}";
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseStringUnusedData()
-	{
-		$data = [
-			'title' => 'Page Title',
-			'body'  => 'Lorem ipsum dolor sit amet.',
-			'name'  => 'Someone',
-		];
-
-		$template = "{title}\n{body}";
-
-		$result = "Page Title\nLorem ipsum dolor sit amet.";
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseNoTemplate()
-	{
-		$this->assertEquals('', $this->parser->renderString(''));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseArraySingle()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => 'no',
-				],
-			],
-		];
-
-		$template = "{title}\n{powers}{invisibility}\n{flying}{/powers}";
-
-		$this->parser->setData($data);
-		$this->assertEquals("Super Heroes\nyes\nno", $this->parser->renderString($template));
-	}
-
-	public function testParseArrayMulti()
-	{
-		$data = [
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => 'no',
-				],
-			],
-		];
-
-		$template = "{powers}{invisibility}\n{flying}{/powers}\nsecond:{powers} {invisibility} {flying}{ /powers}";
-
-		$this->parser->setData($data);
-		$this->assertEquals("yes\nno\nsecond: yes no", $this->parser->renderString($template));
-	}
-
-	public function testParseArrayNested()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => [
-						[
-							'by'     => 'plane',
-							'with'   => 'broomstick',
-							'scared' => 'yes',
-						],
-					],
-				],
-			],
-		];
-
-		$template = "{title}\n{powers}{invisibility}\n{flying}{by} {with}{/flying}{/powers}";
-
-		$this->parser->setData($data);
-		$this->assertEquals("Super Heroes\nyes\nplane broomstick", $this->parser->renderString($template));
-	}
-
-	public function testParseArrayNestedObject()
-	{
-		$eagle       = new stdClass();
-		$eagle->name = 'Baldy';
-		$eagle->home = 'Rockies';
-
-		$data = [
-			'birds' => [[
-							'pop'  => $eagle,
-							'mom'  => 'Owl',
-							'kids' => [
-								'Tom',
-								'Dick',
-								'Harry',
-							],
-							'home' => opendir('.'),
-						],
-			],
-		];
-
-		$template = '{birds}{mom} and {pop} work at {home}{/birds}';
-
-		$this->parser->setData($data);
-		$this->assertEquals('Owl and Class: stdClass work at Resource', $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseLoop()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				['name' => 'Tom'],
-				['name' => 'Dick'],
-				['name' => 'Henry'],
-			],
-		];
-
-		$template = "{title}\n{powers}{name} {/powers}";
-
-		$this->parser->setData($data);
-		$this->assertEquals("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
-	}
-
-	public function testParseLoopObjectProperties()
-	{
-		$obj1 = new stdClass();
-		$obj2 = new stdClass();
-		$obj3 = new stdClass();
-
-		$obj1->name = 'Tom';
-		$obj2->name = 'Dick';
-		$obj3->name = 'Henry';
-
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				$obj1,
-				$obj2,
-				$obj3,
-			],
-		];
-
-		$template = "{title}\n{powers}{name} {/powers}";
-
-		$this->parser->setData($data, 'html');
-		$this->assertEquals("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseLoopEntityProperties()
-	{
-		$power = new class extends Entity {
-			public $foo    = 'bar';
-			protected $bar = 'baz';
-			public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
-			{
-				return [
-					'foo'     => $this->foo,
-					'bar'     => $this->bar,
-					'bobbles' => [
-						['name' => 'first'],
-						['name' => 'second'],
-					],
-				];
-			}
-
-		};
-
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				$power
-			],
-		];
-
-		$template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
-
-		$this->parser->setData($data);
-		$this->assertEquals("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
-	}
-
-	public function testParseLoopEntityObjectProperties()
-	{
-		$power = new class extends Entity
-		{
-			protected $attributes = [
-				'foo'     => 'bar',
-				'bar'     => 'baz',
-				'obj1'    => null,
-				'obj2'    => null,
-				'bobbles' => [],
-			];
-
-			public function __construct()
-			{
-				$this->obj1       = new stdClass();
-				$this->obj2       = new stdClass();
-				$this->obj1->name = 'first';
-				$this->obj2->name = 'second';
-				$this->bobbles    = [
-					$this->obj1,
-					$this->obj2,
-				];
-			}
-		};
-
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				$power
-			],
-		];
-
-		$template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
-
-		$this->parser->setData($data, 'html');
-		$this->assertEquals("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testMismatchedVarPair()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => 'no',
-				],
-			],
-		];
-
-		$template = "{title}\n{powers}{invisibility}\n{flying}";
-		$result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	public function escValueTypes()
-	{
-		return [
-			'scalar'      => [42],
-			'string'      => ['George'],
-			'scalarlist'  => [
-				[
-					1,
-					2,
-					17,
-					-4,
-				],
-			],
-			'stringlist'  => [
-				[
-					'George',
-					'Paul',
-					'John',
-					'Ringo',
-				],
-			],
-			'associative' => [
-				[
-					'name' => 'George',
-					'role' => 'guitar',
-				],
-			],
-			'compound'    => [
-				[
-					'name'    => 'George',
-					'address' => [
-						'line1'  => '123 Some St',
-						'planet' => 'Naboo',
-					],
-				],
-			],
-			'pseudo'      => [
-				[
-					'name'   => 'George',
-					'emails' => [
-						[
-							'email' => 'me@here.com',
-							'type'  => 'home',
-						],
-						[
-							'email' => 'me@there.com',
-							'type'  => 'work',
-						],
-					],
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider escValueTypes
-	 */
-	public function testEscHandling($value, $expected = null)
-	{
-		if ($expected === null)
-		{
-			$expected = $value;
-		}
-		$this->assertEquals($expected, \esc($value));
-	}
-
-	//------------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3726
-	 */
-	public function testParseSimilarVariableNames()
-	{
-		$template = '{foo} {foo_bar}';
-
-		$this->parser->setData(['foo' => 'bar', 'foo_bar' => 'foo-bar'], 'raw');
-		$this->assertEquals('bar foo-bar', $this->parser->renderString($template));
-	}
-
-	public function testParsePairSimilarVariableNames()
-	{
-		$data = [
-			'title'  => '<script>Heroes</script>',
-			'powers' => [
-				[
-					'link'        => "<a href='test'>Link</a>",
-					'link_second' => "<a href='test2'>Link second</a>",
-				],
-			],
-		];
-
-		$template = '{title} {powers}{link} {link_second}{/powers}';
-		$this->parser->setData($data);
-		$this->assertEquals('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt; &lt;a href=&#039;test2&#039;&gt;Link second&lt;/a&gt;', $this->parser->renderString($template));
-	}
-
-	//------------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/788
-	 */
-	public function testEscapingRespectsSetDataRaw()
-	{
-		$template = '{ foo }';
-
-		$this->parser->setData(['foo' => '<script>'], 'raw');
-		$this->assertEquals('<script>', $this->parser->renderString($template));
-	}
-
-	public function testEscapingSetDataWithOtherContext()
-	{
-		$template = '{ foo }';
-
-		$this->parser->setData(['foo' => 'http://foo.com'], 'url');
-		$this->assertEquals('http%3A%2F%2Ffoo.com', $this->parser->renderString($template));
-	}
-
-	public function testNoEscapingSetData()
-	{
-		$template = '{ foo | noescape}';
-
-		$this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
-		$this->assertEquals('http://foo.com', $this->parser->renderString($template));
-	}
-
-	public function testAutoEscaping()
-	{
-		$this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
-
-		$this->assertEquals('html', $this->parser->shouldAddEscaping('{ foo | this | that }'));
-	}
-
-	public function testAutoEscapingNot()
-	{
-		$this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
-		$this->assertFalse($this->parser->shouldAddEscaping('{ foo | noescape }'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testFilterWithNoArgument()
-	{
-		$data = [
-			'that_thing' => '<script>alert("ci4")</script>',
-		];
-
-		$template = '{ that_thing|esc }';
-
-		$this->parser->setData($data);
-		$this->assertEquals('&lt;script&gt;alert(&quot;ci4&quot;)&lt;/script&gt;', $this->parser->renderString($template));
-	}
-
-	public function testFilterWithArgument()
-	{
-		$date = time();
-
-		$data = [
-			'my_date' => $date,
-		];
-
-		$template = '{ my_date| date(Y-m-d ) }';
-
-		$this->parser->setData($data);
-		$this->assertEquals(date('Y-m-d', $date), $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testParserEscapesDataDefaultsToHTML()
-	{
-		$data = [
-			'title'  => '<script>Heroes</script>',
-			'powers' => [
-				['link' => "<a href='test'>Link</a>"],
-			],
-		];
-
-		$template = '{title} {powers}{link}{/powers}';
-		$this->parser->setData($data);
-		$this->assertEquals('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt;', $this->parser->renderString($template));
-	}
-
-	public function testParserNoEscape()
-	{
-		$data = [
-			'title' => '<script>Heroes</script>',
-		];
-
-		$template = '{! title!}';
-		$this->parser->setData($data);
-		$this->assertEquals('<script>Heroes</script>', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIgnoresComments()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => 'no',
-				],
-			],
-		];
-
-		$template = "{# Comments #}{title}\n{powers}{invisibility}\n{flying}";
-		$result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testNoParse()
-	{
-		$data = [
-			'title'  => 'Super Heroes',
-			'powers' => [
-				[
-					'invisibility' => 'yes',
-					'flying'       => 'no',
-				],
-			],
-		];
-
-		$template = "{noparse}{title}\n{powers}{invisibility}\n{flying}{/noparse}";
-		$result   = "{title}\n{powers}{invisibility}\n{flying}";
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testIfConditionalTrue()
-	{
-		$data = [
-			'doit'     => true,
-			'dontdoit' => false,
-		];
-
-		$template = '{if $doit}Howdy{endif}{ if $dontdoit === false}Welcome{ endif }';
-		$this->parser->setData($data);
-
-		$this->assertEquals('HowdyWelcome', $this->parser->renderString($template));
-	}
-
-	public function testElseConditionalFalse()
-	{
-		$data = [
-			'doit' => true,
-		];
-
-		$template = '{if $doit}Howdy{else}Welcome{ endif }';
-		$this->parser->setData($data);
-
-		$this->assertEquals('Howdy', $this->parser->renderString($template));
-	}
-
-	public function testElseConditionalTrue()
-	{
-		$data = [
-			'doit' => false,
-		];
-
-		$template = '{if $doit}Howdy{else}Welcome{ endif }';
-		$this->parser->setData($data);
-
-		$this->assertEquals('Welcome', $this->parser->renderString($template));
-	}
-
-	public function testElseifConditionalTrue()
-	{
-		$data = [
-			'doit'     => false,
-			'dontdoit' => true,
-		];
-
-		$template = '{if $doit}Howdy{elseif $dontdoit}Welcome{ endif }';
-		$this->parser->setData($data);
-
-		$this->assertEquals('Welcome', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConditionalBadSyntax()
-	{
-		$this->expectException(ViewException::class);
-		$data = [
-			'doit'     => true,
-			'dontdoit' => false,
-		];
-
-		// the template is purposefully malformed
-		$template = '{if doit}Howdy{elseif doit}Welcome{ endif )}';
-
-		$this->parser->setData($data);
-		$this->assertEquals('HowdyWelcome', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWontParsePHP()
-	{
-		$template = "<?php echo 'Foo' ?> - <?= 'Bar' ?>";
-		$this->assertEquals('&lt;?php echo \'Foo\' ?&gt; - &lt;?= \'Bar\' ?&gt;', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testParseHandlesSpaces()
-	{
-		$data = [
-			'title' => 'Page Title',
-			'body'  => 'Lorem ipsum dolor sit amet.',
-		];
-
-		$template = "{ title}\n{ body }";
-
-		$result = implode("\n", $data);
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testParseRuns()
-	{
-		$data = [
-			'title' => 'Page Title',
-			'body'  => 'Lorem ipsum dolor sit amet.',
-		];
-
-		$template = "{ title}\n{ body }";
-
-		$result = implode("\n", $data);
-
-		$this->parser->setData($data);
-		$this->assertEquals($result, $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testCanAddAndRemovePlugins()
-	{
-		$this->parser->addPlugin('first', function ($str) {
-			return $str;
-		});
-
-		$setParsers = $this->getPrivateProperty($this->parser, 'plugins');
-
-		$this->assertArrayHasKey('first', $setParsers);
-
-		$this->parser->removePlugin('first');
-
-		$setParsers = $this->getPrivateProperty($this->parser, 'plugins');
-
-		$this->assertArrayNotHasKey('first', $setParsers);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserPluginNoMatches()
-	{
-		$template = 'hit:it';
-
-		$this->assertEquals('hit:it', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserPluginNoParams()
-	{
-		$this->parser->addPlugin('hit:it', function ($str) {
-			return str_replace('here', 'Hip to the Hop', $str);
-		}, true);
-
-		$template = '{+ hit:it +} stuff here {+ /hit:it +}';
-
-		$this->assertEquals(' stuff Hip to the Hop ', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserPluginClosure()
-	{
-		$config                   = $this->config;
-		$config->plugins['hello'] = function (array $params = []) {
-			return 'Hello, ' . trim($params[0]);
-		};
-
-		$this->parser = new Parser($config, $this->viewsDir, $this->loader);
-
-		$template = '{+ hello world +}';
-
-		$this->assertEquals('Hello, world', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserPluginParams()
-	{
-		$this->parser->addPlugin('growth', function ($str, array $params) {
-			$step  = $params['step'] ?? 1;
-			$count = $params['count'] ?? 2;
-
-			$out = '';
-
-			for ($i = 1; $i <= $count; $i ++)
-			{
-				$out .= ' ' . $i * $step;
-			}
-
-			return $out;
-		}, true);
-
-		$template = '{+ growth step=2 count=4 +}  {+ /growth +}';
-
-		$this->assertEquals(' 2 4 6 8', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserSingleTag()
-	{
-		$this->parser->addPlugin('hit:it', function () {
-			return 'Hip to the Hop';
-		}, false);
-
-		$template = '{+ hit:it +}';
-
-		$this->assertEquals('Hip to the Hop', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserSingleTagWithParams()
-	{
-		$this->parser->addPlugin('hit:it', function (array $params = []) {
-			return "{$params['first']} to the {$params['last']}";
-		}, false);
-
-		$template = '{+ hit:it first=foo last=bar +}';
-
-		$this->assertEquals('foo to the bar', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserSingleTagWithSingleParams()
-	{
-		$this->parser->addPlugin('hit:it', function (array $params = []) {
-			return "{$params[0]} to the {$params[1]}";
-		}, false);
-
-		$template = '{+ hit:it foo bar +}';
-
-		$this->assertEquals('foo to the bar', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserSingleTagWithQuotedParams()
-	{
-		$this->parser->addPlugin('count', function (array $params = []) {
-			$out = '';
-
-			foreach ($params as $index => $param)
-			{
-				$out .= "{$index}. {$param} ";
-			}
-
-			return $out;
-		}, false);
-
-		$template = '{+ count "foo bar" baz "foo bar" +}';
-
-		$this->assertEquals('0. foo bar 1. baz 2. foo bar ', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @group parserplugins
-	 */
-	public function testParserSingleTagWithNamedParams()
-	{
-		$this->parser->addPlugin('read_params', function (array $params = []) {
-			$out = '';
-
-			foreach ($params as $index => $param)
-			{
-				$out .= "{$index}: {$param}. ";
-			}
-
-			return $out;
-		}, false);
-
-		$template = '{+ read_params title="Hello world" page=5 email=test@test.net +}';
-
-		$this->assertEquals('title: Hello world. page: 5. email: test@test.net. ', $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/705
-	 */
-	public function testParseLoopWithDollarSign()
-	{
-		$data = [
-			'books' => [
-				['price' => '12.50'],
-			],
-		];
-
-		$template = '{books}<p>Price $: {price}</p>{/books}';
-
-		$this->parser->setData($data);
-		$this->assertEquals('<p>Price $: 12.50</p>', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3824
-	 */
-	public function testParseLoopWithHashSign(): void
-	{
-		$data = [
-			'books' => [
-				['price' => '12.50'],
-			],
-		];
-
-		$template = '{books}<p style="color: #f00">Price $: {price}</p>{/books}';
-
-		$this->parser->setData($data);
-		$this->assertSame('<p style="color: #f00">Price $: 12.50</p>', $this->parser->renderString($template));
-	}
-
-	/**
-	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/4367
-	 */
-	public function testParseLoopWithHashInPrecession(): void
-	{
-		$data = [
-			'heading' => 'My Title',
-			'entries' => [
-				[
-					'title' => 'Subtitle',
-					'body'  => 'Lorem ipsum',
-				],
-			],
-		];
-
-		$template = <<<'EOF'
-		<h3>#{heading}</h3>
-		{entries}
-			<h5>#{title}</h5>
-			<p>{body}</p>
-		{/entries}
-		EOF;
-
-		$expected = <<<'EOF'
-		<h3>#My Title</h3>
-
-			<h5>#Subtitle</h5>
-			<p>Lorem ipsum</p>
-
-		EOF;
-
-		$this->parser->setData($data);
-		$this->assertSame($expected, $this->parser->renderString($template));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCachedRender()
-	{
-		$this->parser->setVar('teststring', 'Hello World');
-
-		$expected = "<h1>Hello World</h1>\n";
-		$this->assertEquals($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
-		// this second renderings should go thru the cache
-		$this->assertEquals($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRenderFindsView()
-	{
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->assertEquals("<h1>Hello World</h1>\n", $this->parser->render('Simpler'));
-	}
-
-	public function testRenderCannotFindView()
-	{
-		$this->expectException(ViewException::class);
-		$this->expectExceptionMessageMatches('!\AInvalid file: (?:.+)View(?:/|\\\\)Views(?:/|\\\\)Simplest\.php\z!');
-
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->parser->render('Simplest');
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRenderSavingData()
-	{
-		$expected = "<h1>Hello World</h1>\n";
-
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->assertEquals($expected, $this->parser->render('Simpler', [], false));
-		$this->assertArrayNotHasKey('testString', $this->parser->getData());
-
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->assertEquals($expected, $this->parser->render('Simpler', [], true));
-		$this->assertArrayHasKey('testString', $this->parser->getData());
-	}
-
-	public function testRenderStringSavingData()
-	{
-		$expected = '<h1>Hello World</h1>';
-		$pattern  = '<h1>{testString}</h1>';
-
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->assertEquals($expected, $this->parser->renderString($pattern, [], false));
-		$this->assertArrayNotHasKey('testString', $this->parser->getData());
-		//last set data is not saved
-		$this->parser->setData(['testString' => 'Hello World']);
-		$this->assertEquals($expected, $this->parser->renderString($pattern, [], true));
-		$this->assertArrayHasKey('testString', $this->parser->getData());
-	}
-
-	public function testRenderFindsOtherView()
-	{
-		$this->parser->setData(['testString' => 'Hello World']);
-		$expected = '<h1>Hello World</h1>';
-		$this->assertEquals($expected, $this->parser->render('Simpler.html'));
-	}
+    /**
+     * @var FileLocator
+     */
+    private $loader;
+
+    /**
+     * @var string
+     */
+    private $viewsDir;
+
+    /**
+     * @var ViewConfig
+     */
+    private $config;
+
+    /**
+     * @var Parser
+     */
+    private $parser;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loader   = Services::locator();
+        $this->viewsDir = __DIR__ . '/Views';
+        $this->config   = new ViewConfig();
+        $this->parser   = new Parser($this->config, $this->viewsDir, $this->loader);
+    }
+
+    public function testSetDelimiters()
+    {
+        // Make sure default delimiters are there
+        $this->assertSame('{', $this->parser->leftDelimiter);
+        $this->assertSame('}', $this->parser->rightDelimiter);
+
+        // Change them to square brackets
+        $this->parser->setDelimiters('[', ']');
+
+        // Make sure they changed
+        $this->assertSame('[', $this->parser->leftDelimiter);
+        $this->assertSame(']', $this->parser->rightDelimiter);
+
+        // Reset them
+        $this->parser->setDelimiters();
+
+        // Make sure default delimiters are there
+        $this->assertSame('{', $this->parser->leftDelimiter);
+        $this->assertSame('}', $this->parser->rightDelimiter);
+    }
+
+    public function testParseSimple()
+    {
+        $this->parser->setVar('teststring', 'Hello World');
+        $this->assertSame("<h1>Hello World</h1>\n", $this->parser->render('template1'));
+    }
+
+    public function testParseString()
+    {
+        $data = [
+            'title' => 'Page Title',
+            'body'  => 'Lorem ipsum dolor sit amet.',
+        ];
+
+        $template = "{title}\n{body}";
+
+        $result = implode("\n", $data);
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testParseStringMissingData()
+    {
+        $data = [
+            'title' => 'Page Title',
+            'body'  => 'Lorem ipsum dolor sit amet.',
+        ];
+
+        $template = "{title}\n{body}\n{name}";
+
+        $result = implode("\n", $data) . "\n{name}";
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testParseStringUnusedData()
+    {
+        $data = [
+            'title' => 'Page Title',
+            'body'  => 'Lorem ipsum dolor sit amet.',
+            'name'  => 'Someone',
+        ];
+
+        $template = "{title}\n{body}";
+
+        $result = "Page Title\nLorem ipsum dolor sit amet.";
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testParseNoTemplate()
+    {
+        $this->assertSame('', $this->parser->renderString(''));
+    }
+
+    public function testParseArraySingle()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => 'no',
+                ],
+            ],
+        ];
+
+        $template = "{title}\n{powers}{invisibility}\n{flying}{/powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("Super Heroes\nyes\nno", $this->parser->renderString($template));
+    }
+
+    public function testParseArrayMulti()
+    {
+        $data = [
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => 'no',
+                ],
+            ],
+        ];
+
+        $template = "{powers}{invisibility}\n{flying}{/powers}\nsecond:{powers} {invisibility} {flying}{ /powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("yes\nno\nsecond: yes no", $this->parser->renderString($template));
+    }
+
+    public function testParseArrayNested()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => [
+                        [
+                            'by'     => 'plane',
+                            'with'   => 'broomstick',
+                            'scared' => 'yes',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        $template = "{title}\n{powers}{invisibility}\n{flying}{by} {with}{/flying}{/powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("Super Heroes\nyes\nplane broomstick", $this->parser->renderString($template));
+    }
+
+    public function testParseArrayNestedObject()
+    {
+        $eagle       = new stdClass();
+        $eagle->name = 'Baldy';
+        $eagle->home = 'Rockies';
+
+        $data = [
+            'birds' => [
+                [
+                    'pop'  => $eagle,
+                    'mom'  => 'Owl',
+                    'kids' => [
+                        'Tom',
+                        'Dick',
+                        'Harry',
+                    ],
+                    'home' => opendir('.'),
+                ],
+            ],
+        ];
+
+        $template = '{birds}{mom} and {pop} work at {home}{/birds}';
+
+        $this->parser->setData($data);
+        $this->assertSame('Owl and Class: stdClass work at Resource', $this->parser->renderString($template));
+    }
+
+    public function testParseLoop()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                ['name' => 'Tom'],
+                ['name' => 'Dick'],
+                ['name' => 'Henry'],
+            ],
+        ];
+
+        $template = "{title}\n{powers}{name} {/powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
+    }
+
+    public function testParseLoopObjectProperties()
+    {
+        $obj1 = new stdClass();
+        $obj2 = new stdClass();
+        $obj3 = new stdClass();
+
+        $obj1->name = 'Tom';
+        $obj2->name = 'Dick';
+        $obj3->name = 'Henry';
+
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                $obj1,
+                $obj2,
+                $obj3,
+            ],
+        ];
+
+        $template = "{title}\n{powers}{name} {/powers}";
+
+        $this->parser->setData($data, 'html');
+        $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
+    }
+
+    public function testParseLoopEntityProperties()
+    {
+        $power             = new class () extends Entity {
+            public $foo    = 'bar';
+            protected $bar = 'baz';
+
+            public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
+            {
+                return [
+                    'foo'     => $this->foo,
+                    'bar'     => $this->bar,
+                    'bobbles' => [
+                        ['name' => 'first'],
+                        ['name' => 'second'],
+                    ],
+                ];
+            }
+        };
+
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [$power],
+        ];
+
+        $template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
+    }
+
+    public function testParseLoopEntityObjectProperties()
+    {
+        $power                    = new class () extends Entity {
+            protected $attributes = [
+                'foo'     => 'bar',
+                'bar'     => 'baz',
+                'obj1'    => null,
+                'obj2'    => null,
+                'bobbles' => [],
+            ];
+
+            public function __construct()
+            {
+                $this->obj1       = new stdClass();
+                $this->obj2       = new stdClass();
+                $this->obj1->name = 'first';
+                $this->obj2->name = 'second';
+                $this->bobbles    = [
+                    $this->obj1,
+                    $this->obj2,
+                ];
+            }
+        };
+
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                $power,
+            ],
+        ];
+
+        $template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
+
+        $this->parser->setData($data, 'html');
+        $this->assertSame("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
+    }
+
+    public function testMismatchedVarPair()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => 'no',
+                ],
+            ],
+        ];
+
+        $template = "{title}\n{powers}{invisibility}\n{flying}";
+        $result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function escValueTypes()
+    {
+        return [
+            'scalar'     => [42],
+            'string'     => ['George'],
+            'scalarlist' => [
+                [
+                    1,
+                    2,
+                    17,
+                    -4,
+                ],
+            ],
+            'stringlist' => [
+                [
+                    'George',
+                    'Paul',
+                    'John',
+                    'Ringo',
+                ],
+            ],
+            'associative' => [
+                [
+                    'name' => 'George',
+                    'role' => 'guitar',
+                ],
+            ],
+            'compound' => [
+                [
+                    'name'    => 'George',
+                    'address' => [
+                        'line1'  => '123 Some St',
+                        'planet' => 'Naboo',
+                    ],
+                ],
+            ],
+            'pseudo' => [
+                [
+                    'name'   => 'George',
+                    'emails' => [
+                        [
+                            'email' => 'me@here.com',
+                            'type'  => 'home',
+                        ],
+                        [
+                            'email' => 'me@there.com',
+                            'type'  => 'work',
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider escValueTypes
+     *
+     * @param mixed      $value
+     * @param mixed|null $expected
+     */
+    public function testEscHandling($value, $expected = null)
+    {
+        if ($expected === null) {
+            $expected = $value;
+        }
+        $this->assertSame($expected, \esc($value));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3726
+     */
+    public function testParseSimilarVariableNames()
+    {
+        $template = '{foo} {foo_bar}';
+
+        $this->parser->setData(['foo' => 'bar', 'foo_bar' => 'foo-bar'], 'raw');
+        $this->assertSame('bar foo-bar', $this->parser->renderString($template));
+    }
+
+    public function testParsePairSimilarVariableNames()
+    {
+        $data = [
+            'title'  => '<script>Heroes</script>',
+            'powers' => [
+                [
+                    'link'        => "<a href='test'>Link</a>",
+                    'link_second' => "<a href='test2'>Link second</a>",
+                ],
+            ],
+        ];
+
+        $template = '{title} {powers}{link} {link_second}{/powers}';
+        $this->parser->setData($data);
+        $this->assertSame('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt; &lt;a href=&#039;test2&#039;&gt;Link second&lt;/a&gt;', $this->parser->renderString($template));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/788
+     */
+    public function testEscapingRespectsSetDataRaw()
+    {
+        $template = '{ foo }';
+
+        $this->parser->setData(['foo' => '<script>'], 'raw');
+        $this->assertSame('<script>', $this->parser->renderString($template));
+    }
+
+    public function testEscapingSetDataWithOtherContext()
+    {
+        $template = '{ foo }';
+
+        $this->parser->setData(['foo' => 'http://foo.com'], 'url');
+        $this->assertSame('http%3A%2F%2Ffoo.com', $this->parser->renderString($template));
+    }
+
+    public function testNoEscapingSetData()
+    {
+        $template = '{ foo | noescape}';
+
+        $this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
+        $this->assertSame('http://foo.com', $this->parser->renderString($template));
+    }
+
+    public function testAutoEscaping()
+    {
+        $this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
+
+        $this->assertSame('html', $this->parser->shouldAddEscaping('{ foo | this | that }'));
+    }
+
+    public function testAutoEscapingNot()
+    {
+        $this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
+        $this->assertFalse($this->parser->shouldAddEscaping('{ foo | noescape }'));
+    }
+
+    public function testFilterWithNoArgument()
+    {
+        $data = [
+            'that_thing' => '<script>alert("ci4")</script>',
+        ];
+
+        $template = '{ that_thing|esc }';
+
+        $this->parser->setData($data);
+        $this->assertSame('&lt;script&gt;alert(&quot;ci4&quot;)&lt;/script&gt;', $this->parser->renderString($template));
+    }
+
+    public function testFilterWithArgument()
+    {
+        $date = time();
+
+        $data = [
+            'my_date' => $date,
+        ];
+
+        $template = '{ my_date| date(Y-m-d ) }';
+
+        $this->parser->setData($data);
+        $this->assertSame(date('Y-m-d', $date), $this->parser->renderString($template));
+    }
+
+    public function testParserEscapesDataDefaultsToHTML()
+    {
+        $data = [
+            'title'  => '<script>Heroes</script>',
+            'powers' => [
+                ['link' => "<a href='test'>Link</a>"],
+            ],
+        ];
+
+        $template = '{title} {powers}{link}{/powers}';
+        $this->parser->setData($data);
+        $this->assertSame('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt;', $this->parser->renderString($template));
+    }
+
+    public function testParserNoEscape()
+    {
+        $data = [
+            'title' => '<script>Heroes</script>',
+        ];
+
+        $template = '{! title!}';
+        $this->parser->setData($data);
+        $this->assertSame('<script>Heroes</script>', $this->parser->renderString($template));
+    }
+
+    public function testIgnoresComments()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => 'no',
+                ],
+            ],
+        ];
+
+        $template = "{# Comments #}{title}\n{powers}{invisibility}\n{flying}";
+        $result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testNoParse()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                [
+                    'invisibility' => 'yes',
+                    'flying'       => 'no',
+                ],
+            ],
+        ];
+
+        $template = "{noparse}{title}\n{powers}{invisibility}\n{flying}{/noparse}";
+        $result   = "{title}\n{powers}{invisibility}\n{flying}";
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testIfConditionalTrue()
+    {
+        $data = [
+            'doit'     => true,
+            'dontdoit' => false,
+        ];
+
+        $template = '{if $doit}Howdy{endif}{ if $dontdoit === false}Welcome{ endif }';
+        $this->parser->setData($data);
+
+        $this->assertSame('HowdyWelcome', $this->parser->renderString($template));
+    }
+
+    public function testElseConditionalFalse()
+    {
+        $data = [
+            'doit' => true,
+        ];
+
+        $template = '{if $doit}Howdy{else}Welcome{ endif }';
+        $this->parser->setData($data);
+
+        $this->assertSame('Howdy', $this->parser->renderString($template));
+    }
+
+    public function testElseConditionalTrue()
+    {
+        $data = [
+            'doit' => false,
+        ];
+
+        $template = '{if $doit}Howdy{else}Welcome{ endif }';
+        $this->parser->setData($data);
+
+        $this->assertSame('Welcome', $this->parser->renderString($template));
+    }
+
+    public function testElseifConditionalTrue()
+    {
+        $data = [
+            'doit'     => false,
+            'dontdoit' => true,
+        ];
+
+        $template = '{if $doit}Howdy{elseif $dontdoit}Welcome{ endif }';
+        $this->parser->setData($data);
+
+        $this->assertSame('Welcome', $this->parser->renderString($template));
+    }
+
+    public function testConditionalBadSyntax()
+    {
+        $this->expectException(ViewException::class);
+        $data = [
+            'doit'     => true,
+            'dontdoit' => false,
+        ];
+
+        // the template is purposefully malformed
+        $template = '{if doit}Howdy{elseif doit}Welcome{ endif )}';
+
+        $this->parser->setData($data);
+        $this->assertSame('HowdyWelcome', $this->parser->renderString($template));
+    }
+
+    public function testWontParsePHP()
+    {
+        $template = "<?php echo 'Foo' ?> - <?= 'Bar' ?>";
+        $this->assertSame('&lt;?php echo \'Foo\' ?&gt; - &lt;?= \'Bar\' ?&gt;', $this->parser->renderString($template));
+    }
+
+    public function testParseHandlesSpaces()
+    {
+        $data = [
+            'title' => 'Page Title',
+            'body'  => 'Lorem ipsum dolor sit amet.',
+        ];
+
+        $template = "{ title}\n{ body }";
+
+        $result = implode("\n", $data);
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    public function testParseRuns()
+    {
+        $data = [
+            'title' => 'Page Title',
+            'body'  => 'Lorem ipsum dolor sit amet.',
+        ];
+
+        $template = "{ title}\n{ body }";
+
+        $result = implode("\n", $data);
+
+        $this->parser->setData($data);
+        $this->assertSame($result, $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testCanAddAndRemovePlugins()
+    {
+        $this->parser->addPlugin('first', static function ($str) {
+            return $str;
+        });
+
+        $setParsers = $this->getPrivateProperty($this->parser, 'plugins');
+
+        $this->assertArrayHasKey('first', $setParsers);
+
+        $this->parser->removePlugin('first');
+
+        $setParsers = $this->getPrivateProperty($this->parser, 'plugins');
+
+        $this->assertArrayNotHasKey('first', $setParsers);
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserPluginNoMatches()
+    {
+        $template = 'hit:it';
+
+        $this->assertSame('hit:it', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserPluginNoParams()
+    {
+        $this->parser->addPlugin('hit:it', static function ($str) {
+            return str_replace('here', 'Hip to the Hop', $str);
+        }, true);
+
+        $template = '{+ hit:it +} stuff here {+ /hit:it +}';
+
+        $this->assertSame(' stuff Hip to the Hop ', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserPluginClosure()
+    {
+        $config                   = $this->config;
+        $config->plugins['hello'] = static function (array $params = []) {
+            return 'Hello, ' . trim($params[0]);
+        };
+
+        $this->parser = new Parser($config, $this->viewsDir, $this->loader);
+
+        $template = '{+ hello world +}';
+
+        $this->assertSame('Hello, world', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserPluginParams()
+    {
+        $this->parser->addPlugin('growth', static function ($str, array $params) {
+            $step = $params['step'] ?? 1;
+            $count = $params['count'] ?? 2;
+
+            $out = '';
+
+            for ($i = 1; $i <= $count; $i++) {
+                $out .= ' ' . $i * $step;
+            }
+
+            return $out;
+        }, true);
+
+        $template = '{+ growth step=2 count=4 +}  {+ /growth +}';
+
+        $this->assertSame(' 2 4 6 8', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserSingleTag()
+    {
+        $this->parser->addPlugin('hit:it', static function () {
+            return 'Hip to the Hop';
+        }, false);
+
+        $template = '{+ hit:it +}';
+
+        $this->assertSame('Hip to the Hop', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserSingleTagWithParams()
+    {
+        $this->parser->addPlugin('hit:it', static function (array $params = []) {
+            return "{$params['first']} to the {$params['last']}";
+        }, false);
+
+        $template = '{+ hit:it first=foo last=bar +}';
+
+        $this->assertSame('foo to the bar', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserSingleTagWithSingleParams()
+    {
+        $this->parser->addPlugin('hit:it', static function (array $params = []) {
+            return "{$params[0]} to the {$params[1]}";
+        }, false);
+
+        $template = '{+ hit:it foo bar +}';
+
+        $this->assertSame('foo to the bar', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserSingleTagWithQuotedParams()
+    {
+        $this->parser->addPlugin('count', static function (array $params = []) {
+            $out = '';
+
+            foreach ($params as $index => $param) {
+                $out .= "{$index}. {$param} ";
+            }
+
+            return $out;
+        }, false);
+
+        $template = '{+ count "foo bar" baz "foo bar" +}';
+
+        $this->assertSame('0. foo bar 1. baz 2. foo bar ', $this->parser->renderString($template));
+    }
+
+    /**
+     * @group parserplugins
+     */
+    public function testParserSingleTagWithNamedParams()
+    {
+        $this->parser->addPlugin('read_params', static function (array $params = []) {
+            $out = '';
+
+            foreach ($params as $index => $param) {
+                $out .= "{$index}: {$param}. ";
+            }
+
+            return $out;
+        }, false);
+
+        $template = '{+ read_params title="Hello world" page=5 email=test@test.net +}';
+
+        $this->assertSame('title: Hello world. page: 5. email: test@test.net. ', $this->parser->renderString($template));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/705
+     */
+    public function testParseLoopWithDollarSign()
+    {
+        $data = [
+            'books' => [
+                ['price' => '12.50'],
+            ],
+        ];
+
+        $template = '{books}<p>Price $: {price}</p>{/books}';
+
+        $this->parser->setData($data);
+        $this->assertSame('<p>Price $: 12.50</p>', $this->parser->renderString($template));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3824
+     */
+    public function testParseLoopWithHashSign(): void
+    {
+        $data = [
+            'books' => [
+                ['price' => '12.50'],
+            ],
+        ];
+
+        $template = '{books}<p style="color: #f00">Price $: {price}</p>{/books}';
+
+        $this->parser->setData($data);
+        $this->assertSame('<p style="color: #f00">Price $: 12.50</p>', $this->parser->renderString($template));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4367
+     */
+    public function testParseLoopWithHashInPrecession(): void
+    {
+        $data = [
+            'heading' => 'My Title',
+            'entries' => [
+                [
+                    'title' => 'Subtitle',
+                    'body'  => 'Lorem ipsum',
+                ],
+            ],
+        ];
+
+        $template = <<<'EOF'
+            <h3>#{heading}</h3>
+            {entries}
+            	<h5>#{title}</h5>
+            	<p>{body}</p>
+            {/entries}
+            EOF;
+
+        $expected = <<<'EOF'
+            <h3>#My Title</h3>
+
+            	<h5>#Subtitle</h5>
+            	<p>Lorem ipsum</p>
+
+            EOF;
+
+        $this->parser->setData($data);
+        $this->assertSame($expected, $this->parser->renderString($template));
+    }
+
+    public function testCachedRender()
+    {
+        $this->parser->setVar('teststring', 'Hello World');
+
+        $expected = "<h1>Hello World</h1>\n";
+        $this->assertSame($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
+        // this second renderings should go thru the cache
+        $this->assertSame($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
+    }
+
+    public function testRenderFindsView()
+    {
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->assertSame("<h1>Hello World</h1>\n", $this->parser->render('Simpler'));
+    }
+
+    public function testRenderCannotFindView()
+    {
+        $this->expectException(ViewException::class);
+        $this->expectExceptionMessageMatches('!\AInvalid file: (?:.+)View(?:/|\\\\)Views(?:/|\\\\)Simplest\.php\z!');
+
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->parser->render('Simplest');
+    }
+
+    public function testRenderSavingData()
+    {
+        $expected = "<h1>Hello World</h1>\n";
+
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->assertSame($expected, $this->parser->render('Simpler', [], false));
+        $this->assertArrayNotHasKey('testString', $this->parser->getData());
+
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->assertSame($expected, $this->parser->render('Simpler', [], true));
+        $this->assertArrayHasKey('testString', $this->parser->getData());
+    }
+
+    public function testRenderStringSavingData()
+    {
+        $expected = '<h1>Hello World</h1>';
+        $pattern  = '<h1>{testString}</h1>';
+
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->assertSame($expected, $this->parser->renderString($pattern, [], false));
+        $this->assertArrayNotHasKey('testString', $this->parser->getData());
+        // last set data is not saved
+        $this->parser->setData(['testString' => 'Hello World']);
+        $this->assertSame($expected, $this->parser->renderString($pattern, [], true));
+        $this->assertArrayHasKey('testString', $this->parser->getData());
+    }
+
+    public function testRenderFindsOtherView()
+    {
+        $this->parser->setData(['testString' => 'Hello World']);
+        $expected = '<h1>Hello World</h1>';
+        $this->assertSame($expected, $this->parser->render('Simpler.html'));
+    }
 }
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index b50e2dc95521..a96d03bf7657 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -1,4 +1,14 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Database\MySQLi\Result;
@@ -6,524 +16,509 @@
 use CodeIgniter\Test\Mock\MockTable;
 use stdClass;
 
-class TableTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TableTest extends CIUnitTestCase
 {
-
-	public function setUp(): void
-	{
-		$this->table = new MockTable();
-	}
-
-	// Setter Methods
-	// --------------------------------------------------------------------
-
-	public function testSetTemplate()
-	{
-		$this->assertFalse($this->table->setTemplate('not an array'));
-
-		$template = ['a' => 'b'];
-
-		$this->table->setTemplate($template);
-		$this->assertEquals($template, $this->table->template);
-	}
-
-	public function testSetEmpty()
-	{
-		$this->table->setEmpty('nada');
-		$this->assertEquals('nada', $this->table->emptyCells);
-	}
-
-	public function testSetCaption()
-	{
-		$this->table->setCaption('awesome cap');
-		$this->assertEquals('awesome cap', $this->table->caption);
-	}
-
-	/*
-	 * @depends	test_prep_args
-	 */
-
-	public function testSetHeading()
-	{
-		// uses _prep_args internally, so we'll just do a quick
-		// check to verify that func_get_args and prep_args are
-		// being called.
-
-		$this->table->setHeading('name', 'color', 'size');
-
-		$this->assertEquals([
-			['data' => 'name'],
-			['data' => 'color'],
-			['data' => 'size'],
-		],
-				$this->table->heading
-		);
-	}
-
-	public function testSetFooting()
-	{
-		// uses _prep_args internally, so we'll just do a quick
-		// check to verify that func_get_args and prep_args are
-		// being called.
-
-		$subtotal = 12345;
-
-		$this->table->setFooting('Subtotal', $subtotal);
-
-		$this->assertEquals([
-			['data' => 'Subtotal'],
-			['data' => $subtotal],
-		],
-				$this->table->footing
-		);
-	}
-
-	/*
-	 * @depends	test_prep_args
-	 */
-
-	public function testAddRow()
-	{
-		// uses _prep_args internally, so we'll just do a quick
-		// check to verify that func_get_args and prep_args are
-		// being called.
-
-		$this->table->addRow('my', 'pony', 'sings');
-		$this->table->addRow('your', 'pony', 'stinks');
-		$this->table->addRow('my pony', '>', 'your pony');
-
-		$this->assertCount(3, $this->table->rows);
-
-		$this->assertEquals([
-			['data' => 'your'],
-			['data' => 'pony'],
-			['data' => 'stinks'],
-		],
-				$this->table->rows[1]
-		);
-	}
-
-	// Uility Methods
-	// --------------------------------------------------------------------
-
-	public function testPrepArgs()
-	{
-		$expected = [
-			['data' => 'name'],
-			['data' => 'color'],
-			['data' => 'size'],
-		];
-
-		$this->assertEquals(
-				$expected,
-				$this->table->prepArgs(['name', 'color', 'size'])
-		);
-
-		// with cell attributes
-		// need to add that new argument row to our expected outcome
-		$expected[] = [
-			'data'  => 'weight',
-			'class' => 'awesome',
-		];
-
-		$this->assertEquals(
-				$expected,
-				$this->table->prepArgs(['name', 'color', 'size', ['data' => 'weight', 'class' => 'awesome']])
-		);
-	}
-
-	public function testDefaultTemplateKeys()
-	{
-		$keys = [
-			'table_open',
-			'thead_open',
-			'thead_close',
-			'heading_row_start',
-			'heading_row_end',
-			'heading_cell_start',
-			'heading_cell_end',
-			'tbody_open',
-			'tbody_close',
-			'row_start',
-			'row_end',
-			'cell_start',
-			'cell_end',
-			'row_alt_start',
-			'row_alt_end',
-			'cell_alt_start',
-			'cell_alt_end',
-			'table_close',
-		];
-
-		foreach ($keys as $key)
-		{
-			$this->assertArrayHasKey($key, $this->table->defaultTemplate());
-		}
-	}
-
-	public function testCompileTemplate()
-	{
-		$this->assertFalse($this->table->setTemplate('invalid_junk'));
-
-		// non default key
-		$this->table->setTemplate(['nonsense' => 'foo']);
-		$this->table->compileTemplate();
-
-		$this->assertArrayHasKey('nonsense', $this->table->template);
-		$this->assertEquals('foo', $this->table->template['nonsense']);
-
-		// override default
-		$this->table->setTemplate(['table_close' => '</table junk>']);
-		$this->table->compileTemplate();
-
-		$this->assertArrayHasKey('table_close', $this->table->template);
-		$this->assertEquals('</table junk>', $this->table->template['table_close']);
-	}
-
-	public function testMakeColumns()
-	{
-		// Test bogus parameters
-		$this->assertFalse($this->table->makeColumns('invalid_junk'));
-		$this->assertFalse($this->table->makeColumns([]));
-		$this->assertFalse($this->table->makeColumns(['one', 'two'], '2.5'));
-
-		// Now on to the actual column creation
-
-		$fiveValues = [
-			'Laura',
-			'Red',
-			'15',
-			'Katie',
-			'Blue',
-		];
-
-		// No column count - no changes to the array
-		$this->assertEquals(
-				$fiveValues,
-				$this->table->makeColumns($fiveValues)
-		);
-
-		// Column count of 3 leaves us with one &nbsp;
-		$this->assertEquals([
-			[
-				'Laura',
-				'Red',
-				'15',
-			],
-			[
-				'Katie',
-				'Blue',
-				'&nbsp;',
-			],
-		],
-				$this->table->makeColumns($fiveValues, 3)
-		);
-	}
-
-	public function testClear()
-	{
-		$this->table->setHeading('Name', 'Color', 'Size');
-
-		// Make columns changes auto_heading
-		$rows = $this->table->makeColumns([
-			'Laura',
-			'Red',
-			'15',
-			'Katie',
-			'Blue',
-		], 3);
-
-		foreach ($rows as $row)
-		{
-			$this->table->addRow($row);
-		}
-
-		$this->assertFalse($this->table->autoHeading);
-		$this->assertCount(3, $this->table->heading);
-		$this->assertCount(2, $this->table->rows);
-
-		$this->table->clear();
-
-		$this->assertTrue($this->table->autoHeading);
-		$this->assertEmpty($this->table->heading);
-		$this->assertEmpty($this->table->rows);
-	}
-
-	public function testSetFromArray()
-	{
-		$data = [
-			[
-				'name',
-				'color',
-				'number',
-			],
-			[
-				'Laura',
-				'Red',
-				'22',
-			],
-			[
-				'Katie',
-				'Blue',
-			],
-		];
-
-		$this->table->autoHeading = false;
-		$this->table->setFromArray($data);
-		$this->assertEmpty($this->table->heading);
-
-		$this->table->clear();
-
-		$this->table->setFromArray($data);
-		$this->assertCount(2, $this->table->rows);
-
-		$expected = [
-			['data' => 'name'],
-			['data' => 'color'],
-			['data' => 'number'],
-		];
-
-		$this->assertEquals($expected, $this->table->heading);
-
-		$expected = [
-			['data' => 'Katie'],
-			['data' => 'Blue'],
-		];
-
-		$this->assertEquals($expected, $this->table->rows[1]);
-	}
-
-	public function testSetFromObject()
-	{
-		// This needs to be passed by reference to CI_DB_result::__construct()
-		$dummy           = new stdClass();
-		$dummy->connID   = null;
-		$dummy->resultID = null;
-
-		$DBResult = new DBResultDummy($dummy->connID, $dummy->resultID);
-
-		$this->table->setFromDBResult($DBResult);
-
-		$expected = [
-			['data' => 'name'],
-			['data' => 'email'],
-		];
-
-		$this->assertEquals($expected, $this->table->heading);
-
-		$expected = [
-			'name'  => ['data' => 'Foo Bar'],
-			'email' => ['data' => 'foo@bar.com'],
-		];
-
-		$this->assertEquals($expected, $this->table->rows[1]);
-	}
-
-	public function testGenerate()
-	{
-		// Prepare the data
-		$data = [
-			[
-				'Name',
-				'Color',
-				'Size',
-			],
-			[
-				'Fred',
-				'Blue',
-				'Small',
-			],
-			[
-				'Mary',
-				'Red',
-				'Large',
-			],
-			[
-				'John',
-				'Green',
-				'Medium',
-			],
-		];
-
-		$this->table->setCaption('Awesome table');
-
-		$subtotal = 12345;
-
-		$this->table->setFooting('Subtotal', $subtotal);
-
-		$table = $this->table->generate($data);
-
-		// Test the table header
-		$this->assertStringContainsString('<th>Name</th>', $table);
-		$this->assertStringContainsString('<th>Color</th>', $table);
-		$this->assertStringContainsString('<th>Size</th>', $table);
-
-		// Test the first entry
-		$this->assertStringContainsString('<td>Fred</td>', $table);
-		$this->assertStringContainsString('<td>Blue</td>', $table);
-		$this->assertStringContainsString('<td>Small</td>', $table);
-
-		// Check for the caption
-		$this->assertStringContainsString('<caption>Awesome table</caption>', $table);
-
-		// Test the table footing
-		$this->assertStringContainsString('<td>Subtotal</td>', $table);
-		$this->assertStringContainsString('<td>12345</td>', $table);
-	}
-
-	public function testGenerateEmptyCell()
-	{
-		// Prepare the data
-		$data = [
-			[
-				'Name',
-				'Color',
-				'Size',
-			],
-			[
-				'Fred',
-				'Blue',
-				'Small',
-			],
-			[
-				'Mary',
-				'Red',
-				null,
-			],
-			[
-				'John',
-				'Green',
-				'Medium',
-			],
-		];
-
-		$this->table->setCaption('Awesome table');
-		$this->table->setEmpty('Huh?');
-		$table = $this->table->generate($data);
-
-		$this->assertStringContainsString('<td>Huh?</td>', $table);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testWithConfig()
-	{
-		$customSettings = [
-			'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
-		];
-
-		$table = new Table($customSettings);
-
-		// Prepare the data
-		$data = [
-			[
-				'Name',
-				'Color',
-				'Size',
-			],
-			[
-				'Fred',
-				'Blue',
-				'Small',
-			],
-			[
-				'Mary',
-				'Red',
-				'Large',
-			],
-			[
-				'John',
-				'Green',
-				'Medium',
-			],
-		];
-
-		$generated = $table->generate($data);
-
-		$this->assertStringContainsString('<table border="1" cellpadding="2" cellspacing="1" class="mytable">', $generated);
-	}
-
-	public function testGenerateFromDBResult()
-	{
-		// This needs to be passed by reference to CI_DB_result::__construct()
-		$dummy           = new stdClass();
-		$dummy->connID   = null;
-		$dummy->resultID = null;
-		$DBResult        = new DBResultDummy($dummy->connID, $dummy->resultID);
-
-		$table = $this->table->generate($DBResult);
-
-		// Test the table header
-		$this->assertStringContainsString('<th>name</th>', $table);
-		$this->assertStringContainsString('<th>email</th>', $table);
-
-		// Test the first entry
-		$this->assertStringContainsString('<td>John Doe</td>', $table);
-		$this->assertStringContainsString('<td>foo@bar.com</td>', $table);
-	}
-
-	public function testUndefined()
-	{
-		// Prepare the data
-		$data = [];
-
-		$table = $this->table->generate($data);
-
-		$this->assertEquals('Undefined table data', $table);
-	}
-
-	// --------------------------------------------------------------------
-
-	public function testCallback()
-	{
-		$this->table->setHeading('Name', 'Color', 'Size');
-		$this->table->addRow('Fred', '<strong>Blue</strong>', 'Small');
-
-		$this->table->function = 'htmlspecialchars';
-
-		$generated = $this->table->generate();
-
-		$this->assertStringContainsString('<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>', $generated);
-	}
-
-	public function testInvalidCallback()
-	{
-		$this->table->setHeading('Name', 'Color', 'Size');
-		$this->table->addRow('Fred', '<strong>Blue</strong>', 'Small');
-
-		$this->table->function = 'ticklemyfancy';
-
-		$generated = $this->table->generate();
-
-		$this->assertStringContainsString('<td>Fred</td><td><strong>Blue</strong></td><td>Small</td>', $generated);
-	}
-
+    protected function setUp(): void
+    {
+        $this->table = new MockTable();
+    }
+
+    // Setter Methods
+
+    public function testSetTemplate()
+    {
+        $this->assertFalse($this->table->setTemplate('not an array'));
+
+        $template = ['a' => 'b'];
+
+        $this->table->setTemplate($template);
+        $this->assertSame($template, $this->table->template);
+    }
+
+    public function testSetEmpty()
+    {
+        $this->table->setEmpty('nada');
+        $this->assertSame('nada', $this->table->emptyCells);
+    }
+
+    public function testSetCaption()
+    {
+        $this->table->setCaption('awesome cap');
+        $this->assertSame('awesome cap', $this->table->caption);
+    }
+
+    /**
+     * @depends testPrepArgs
+     */
+    public function testSetHeading()
+    {
+        // uses _prep_args internally, so we'll just do a quick
+        // check to verify that func_get_args and prep_args are
+        // being called.
+
+        $this->table->setHeading('name', 'color', 'size');
+
+        $this->assertSame(
+            [
+                ['data' => 'name'],
+                ['data' => 'color'],
+                ['data' => 'size'],
+            ],
+            $this->table->heading
+        );
+    }
+
+    public function testSetFooting()
+    {
+        // uses _prep_args internally, so we'll just do a quick
+        // check to verify that func_get_args and prep_args are
+        // being called.
+
+        $subtotal = 12345;
+
+        $this->table->setFooting('Subtotal', $subtotal);
+
+        $this->assertSame(
+            [
+                ['data' => 'Subtotal'],
+                ['data' => $subtotal],
+            ],
+            $this->table->footing
+        );
+    }
+
+    /**
+     * @depends testPrepArgs
+     */
+    public function testAddRow()
+    {
+        // uses _prep_args internally, so we'll just do a quick
+        // check to verify that func_get_args and prep_args are
+        // being called.
+
+        $this->table->addRow('my', 'pony', 'sings');
+        $this->table->addRow('your', 'pony', 'stinks');
+        $this->table->addRow('my pony', '>', 'your pony');
+
+        $this->assertCount(3, $this->table->rows);
+
+        $this->assertSame(
+            [
+                ['data' => 'your'],
+                ['data' => 'pony'],
+                ['data' => 'stinks'],
+            ],
+            $this->table->rows[1]
+        );
+    }
+
+    // Uility Methods
+
+    public function testPrepArgs()
+    {
+        $expected = [
+            ['data' => 'name'],
+            ['data' => 'color'],
+            ['data' => 'size'],
+        ];
+
+        $this->assertSame(
+            $expected,
+            $this->table->prepArgs(['name', 'color', 'size'])
+        );
+
+        // with cell attributes
+        // need to add that new argument row to our expected outcome
+        $expected[] = [
+            'data'  => 'weight',
+            'class' => 'awesome',
+        ];
+
+        $this->assertSame(
+            $expected,
+            $this->table->prepArgs(['name', 'color', 'size', ['data' => 'weight', 'class' => 'awesome']])
+        );
+    }
+
+    public function testDefaultTemplateKeys()
+    {
+        $keys = [
+            'table_open',
+            'thead_open',
+            'thead_close',
+            'heading_row_start',
+            'heading_row_end',
+            'heading_cell_start',
+            'heading_cell_end',
+            'tbody_open',
+            'tbody_close',
+            'row_start',
+            'row_end',
+            'cell_start',
+            'cell_end',
+            'row_alt_start',
+            'row_alt_end',
+            'cell_alt_start',
+            'cell_alt_end',
+            'table_close',
+        ];
+
+        foreach ($keys as $key) {
+            $this->assertArrayHasKey($key, $this->table->defaultTemplate());
+        }
+    }
+
+    public function testCompileTemplate()
+    {
+        $this->assertFalse($this->table->setTemplate('invalid_junk'));
+
+        // non default key
+        $this->table->setTemplate(['nonsense' => 'foo']);
+        $this->table->compileTemplate();
+
+        $this->assertArrayHasKey('nonsense', $this->table->template);
+        $this->assertSame('foo', $this->table->template['nonsense']);
+
+        // override default
+        $this->table->setTemplate(['table_close' => '</table junk>']);
+        $this->table->compileTemplate();
+
+        $this->assertArrayHasKey('table_close', $this->table->template);
+        $this->assertSame('</table junk>', $this->table->template['table_close']);
+    }
+
+    public function testMakeColumns()
+    {
+        // Test bogus parameters
+        $this->assertFalse($this->table->makeColumns('invalid_junk'));
+        $this->assertFalse($this->table->makeColumns([]));
+        $this->assertFalse($this->table->makeColumns(['one', 'two'], '2.5'));
+
+        // Now on to the actual column creation
+
+        $fiveValues = [
+            'Laura',
+            'Red',
+            '15',
+            'Katie',
+            'Blue',
+        ];
+
+        // No column count - no changes to the array
+        $this->assertSame(
+            $fiveValues,
+            $this->table->makeColumns($fiveValues)
+        );
+
+        // Column count of 3 leaves us with one &nbsp;
+        $this->assertSame(
+            [
+                ['Laura', 'Red', '15'],
+                ['Katie', 'Blue', '&nbsp;'],
+            ],
+            $this->table->makeColumns($fiveValues, 3)
+        );
+    }
+
+    public function testClear()
+    {
+        $this->table->setHeading('Name', 'Color', 'Size');
+
+        // Make columns changes auto_heading
+        $rows = $this->table->makeColumns([
+            'Laura',
+            'Red',
+            '15',
+            'Katie',
+            'Blue',
+        ], 3);
+
+        foreach ($rows as $row) {
+            $this->table->addRow($row);
+        }
+
+        $this->assertFalse($this->table->autoHeading);
+        $this->assertCount(3, $this->table->heading);
+        $this->assertCount(2, $this->table->rows);
+
+        $this->table->clear();
+
+        $this->assertTrue($this->table->autoHeading);
+        $this->assertEmpty($this->table->heading);
+        $this->assertEmpty($this->table->rows);
+    }
+
+    public function testSetFromArray()
+    {
+        $data = [
+            [
+                'name',
+                'color',
+                'number',
+            ],
+            [
+                'Laura',
+                'Red',
+                '22',
+            ],
+            [
+                'Katie',
+                'Blue',
+            ],
+        ];
+
+        $this->table->autoHeading = false;
+        $this->table->setFromArray($data);
+        $this->assertEmpty($this->table->heading);
+
+        $this->table->clear();
+
+        $this->table->setFromArray($data);
+        $this->assertCount(2, $this->table->rows);
+
+        $expected = [
+            ['data' => 'name'],
+            ['data' => 'color'],
+            ['data' => 'number'],
+        ];
+
+        $this->assertSame($expected, $this->table->heading);
+
+        $expected = [
+            ['data' => 'Katie'],
+            ['data' => 'Blue'],
+        ];
+
+        $this->assertSame($expected, $this->table->rows[1]);
+    }
+
+    public function testSetFromObject()
+    {
+        // This needs to be passed by reference to CI_DB_result::__construct()
+        $dummy           = new stdClass();
+        $dummy->connID   = null;
+        $dummy->resultID = null;
+
+        $DBResult = new DBResultDummy($dummy->connID, $dummy->resultID);
+
+        $this->table->setFromDBResult($DBResult);
+
+        $expected = [
+            ['data' => 'name'],
+            ['data' => 'email'],
+        ];
+
+        $this->assertSame($expected, $this->table->heading);
+
+        $expected = [
+            'name'  => ['data' => 'Foo Bar'],
+            'email' => ['data' => 'foo@bar.com'],
+        ];
+
+        $this->assertSame($expected, $this->table->rows[1]);
+    }
+
+    public function testGenerate()
+    {
+        // Prepare the data
+        $data = [
+            [
+                'Name',
+                'Color',
+                'Size',
+            ],
+            [
+                'Fred',
+                'Blue',
+                'Small',
+            ],
+            [
+                'Mary',
+                'Red',
+                'Large',
+            ],
+            [
+                'John',
+                'Green',
+                'Medium',
+            ],
+        ];
+
+        $this->table->setCaption('Awesome table');
+
+        $subtotal = 12345;
+
+        $this->table->setFooting('Subtotal', $subtotal);
+
+        $table = $this->table->generate($data);
+
+        // Test the table header
+        $this->assertStringContainsString('<th>Name</th>', $table);
+        $this->assertStringContainsString('<th>Color</th>', $table);
+        $this->assertStringContainsString('<th>Size</th>', $table);
+
+        // Test the first entry
+        $this->assertStringContainsString('<td>Fred</td>', $table);
+        $this->assertStringContainsString('<td>Blue</td>', $table);
+        $this->assertStringContainsString('<td>Small</td>', $table);
+
+        // Check for the caption
+        $this->assertStringContainsString('<caption>Awesome table</caption>', $table);
+
+        // Test the table footing
+        $this->assertStringContainsString('<td>Subtotal</td>', $table);
+        $this->assertStringContainsString('<td>12345</td>', $table);
+    }
+
+    public function testGenerateEmptyCell()
+    {
+        // Prepare the data
+        $data = [
+            [
+                'Name',
+                'Color',
+                'Size',
+            ],
+            [
+                'Fred',
+                'Blue',
+                'Small',
+            ],
+            [
+                'Mary',
+                'Red',
+                null,
+            ],
+            [
+                'John',
+                'Green',
+                'Medium',
+            ],
+        ];
+
+        $this->table->setCaption('Awesome table');
+        $this->table->setEmpty('Huh?');
+        $table = $this->table->generate($data);
+
+        $this->assertStringContainsString('<td>Huh?</td>', $table);
+    }
+
+    public function testWithConfig()
+    {
+        $customSettings = [
+            'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
+        ];
+
+        $table = new Table($customSettings);
+
+        // Prepare the data
+        $data = [
+            [
+                'Name',
+                'Color',
+                'Size',
+            ],
+            [
+                'Fred',
+                'Blue',
+                'Small',
+            ],
+            [
+                'Mary',
+                'Red',
+                'Large',
+            ],
+            [
+                'John',
+                'Green',
+                'Medium',
+            ],
+        ];
+
+        $generated = $table->generate($data);
+
+        $this->assertStringContainsString('<table border="1" cellpadding="2" cellspacing="1" class="mytable">', $generated);
+    }
+
+    public function testGenerateFromDBResult()
+    {
+        // This needs to be passed by reference to CI_DB_result::__construct()
+        $dummy           = new stdClass();
+        $dummy->connID   = null;
+        $dummy->resultID = null;
+        $DBResult        = new DBResultDummy($dummy->connID, $dummy->resultID);
+
+        $table = $this->table->generate($DBResult);
+
+        // Test the table header
+        $this->assertStringContainsString('<th>name</th>', $table);
+        $this->assertStringContainsString('<th>email</th>', $table);
+
+        // Test the first entry
+        $this->assertStringContainsString('<td>John Doe</td>', $table);
+        $this->assertStringContainsString('<td>foo@bar.com</td>', $table);
+    }
+
+    public function testUndefined()
+    {
+        // Prepare the data
+        $data = [];
+
+        $table = $this->table->generate($data);
+
+        $this->assertSame('Undefined table data', $table);
+    }
+
+    public function testCallback()
+    {
+        $this->table->setHeading('Name', 'Color', 'Size');
+        $this->table->addRow('Fred', '<strong>Blue</strong>', 'Small');
+
+        $this->table->function = 'htmlspecialchars';
+
+        $generated = $this->table->generate();
+
+        $this->assertStringContainsString('<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>', $generated);
+    }
+
+    public function testInvalidCallback()
+    {
+        $this->table->setHeading('Name', 'Color', 'Size');
+        $this->table->addRow('Fred', '<strong>Blue</strong>', 'Small');
+
+        $this->table->function = 'ticklemyfancy';
+
+        $generated = $this->table->generate();
+
+        $this->assertStringContainsString('<td>Fred</td><td><strong>Blue</strong></td><td>Small</td>', $generated);
+    }
 }
 
 // We need this for the _set_from_db_result() test
 class DBResultDummy extends Result
 {
-
-	public function getFieldNames(): array
-	{
-		return [
-			'name',
-			'email',
-		];
-	}
-
-	public function getResultArray(): array
-	{
-		return [
-			[
-				'name'  => 'John Doe',
-				'email' => 'john@doe.com',
-			],
-			[
-				'name'  => 'Foo Bar',
-				'email' => 'foo@bar.com',
-			],
-		];
-	}
-
+    public function getFieldNames(): array
+    {
+        return [
+            'name',
+            'email',
+        ];
+    }
+
+    public function getResultArray(): array
+    {
+        return [
+            [
+                'name'  => 'John Doe',
+                'email' => 'john@doe.com',
+            ],
+            [
+                'name'  => 'Foo Bar',
+                'email' => 'foo@bar.com',
+            ],
+        ];
+    }
 }
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 7d2cf84becbb..7abeff5793e6 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -1,403 +1,387 @@
 <?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\View\View;
 use Config;
 use RuntimeException;
 
-class ViewTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ViewTest extends CIUnitTestCase
 {
+    protected $loader;
+    protected $viewsDir;
+    protected $config;
 
-	protected $loader;
-	protected $viewsDir;
-	protected $config;
-
-	//--------------------------------------------------------------------
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->loader   = Services::locator();
-		$this->viewsDir = __DIR__ . '/Views';
-		$this->config   = new Config\View();
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetVarStoresData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-
-		$view->setVar('foo', 'bar');
-
-		$this->assertEquals(['foo' => 'bar'], $view->getData());
-	}
-
-	public function testSetVarOverwrites()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-
-		$view->setVar('foo', 'bar');
-		$view->setVar('foo', 'baz');
-
-		$this->assertEquals(['foo' => 'baz'], $view->getData());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testSetDataStoresValue()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
-
-		$view->setData($expected);
-
-		$this->assertEquals($expected, $view->getData());
-	}
-
-	public function testSetDataMergesData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-
-		$expected = [
-			'fee' => 'fi',
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-		$view->setVar('fee', 'fi');
-		$view->setData([
-			'foo' => 'bar',
-			'bar' => 'baz',
-		]);
+        $this->loader   = Services::locator();
+        $this->viewsDir = __DIR__ . '/Views';
+        $this->config   = new Config\View();
+    }
 
-		$this->assertEquals($expected, $view->getData());
-	}
+    public function testSetVarStoresData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-	public function testSetDataOverwritesData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setVar('foo', 'bar');
 
-		$expected = [
-			'foo' => 'bar',
-			'bar' => 'baz',
-		];
+        $this->assertSame(['foo' => 'bar'], $view->getData());
+    }
 
-		$view->setVar('foo', 'fi');
-		$view->setData([
-			'foo' => 'bar',
-			'bar' => 'baz',
-		]);
+    public function testSetVarOverwrites()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$this->assertEquals($expected, $view->getData());
-	}
+        $view->setVar('foo', 'bar');
+        $view->setVar('foo', 'baz');
 
-	//--------------------------------------------------------------------
+        $this->assertSame(['foo' => 'baz'], $view->getData());
+    }
 
-	public function testSetVarWillEscape()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testSetDataStoresValue()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('foo', 'bar&', 'html');
+        $expected = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$this->assertEquals(['foo' => 'bar&amp;'], $view->getData());
-	}
+        $view->setData($expected);
 
-	public function testSetDataWillEscapeAll()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->assertSame($expected, $view->getData());
+    }
 
-		$expected = [
-			'foo' => 'bar&amp;',
-			'bar' => 'baz&lt;',
-		];
+    public function testSetDataMergesData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setData([
-			'foo' => 'bar&',
-			'bar' => 'baz<',
-		], 'html');
+        $expected = [
+            'fee' => 'fi',
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$this->assertEquals($expected, $view->getData());
-	}
+        $view->setVar('fee', 'fi');
+        $view->setData([
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $view->getData());
+    }
 
-	public function testRenderFindsView()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testSetDataOverwritesData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
+        $expected = [
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ];
 
-		$this->assertStringContainsString($expected, $view->render('simple'));
-	}
+        $view->setVar('foo', 'fi');
+        $view->setData([
+            'foo' => 'bar',
+            'bar' => 'baz',
+        ]);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $view->getData());
+    }
 
-	public function testRenderString()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testSetVarWillEscape()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
+        $view->setVar('foo', 'bar&', 'html');
 
-		$this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>'));
-	}
+        $this->assertSame(['foo' => 'bar&amp;'], $view->getData());
+    }
 
-	public function testRenderStringNullTempdata()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-		$this->assertEquals('test string', $view->renderString('test string'));
-	}
+    public function testSetDataWillEscapeAll()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-	//--------------------------------------------------------------------
+        $expected = [
+            'foo' => 'bar&amp;',
+            'bar' => 'baz&lt;',
+        ];
 
-	public function testRendersThrowsExceptionIfFileNotFound()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setData([
+            'foo' => 'bar&',
+            'bar' => 'baz<',
+        ], 'html');
 
-		$this->expectException(ViewException::class);
-		$view->setVar('testString', 'Hello World');
+        $this->assertSame($expected, $view->getData());
+    }
 
-		$view->render('missing');
-	}
+    public function testRenderFindsView()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-	//--------------------------------------------------------------------
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
 
-	public function testRenderScrapsData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->assertStringContainsString($expected, $view->render('simple'));
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$view->render('simple', null, false);
+    public function testRenderString()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$this->assertEmpty($view->getData());
-	}
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>'));
+    }
 
-	public function testRenderCanSaveData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderStringNullTempdata()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->assertSame('test string', $view->renderString('test string'));
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$view->render('simple', null, true);
+    public function testRendersThrowsExceptionIfFileNotFound()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$expected = ['testString' => 'Hello World'];
+        $this->expectException(ViewException::class);
+        $view->setVar('testString', 'Hello World');
 
-		$this->assertEquals($expected, $view->getData());
-	}
+        $view->render('missing');
+    }
 
-	public function testRenderCanSaveDataThroughConfigSetting()
-	{
-		$this->config->saveData = true;
+    public function testRenderScrapsData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setVar('testString', 'Hello World');
+        $view->render('simple', null, false);
 
-		$view->setVar('testString', 'Hello World');
-		$view->render('simple');
+        $this->assertEmpty($view->getData());
+    }
 
-		$expected = ['testString' => 'Hello World'];
+    public function testRenderCanSaveData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$this->assertEquals($expected, $view->getData());
-	}
+        $view->setVar('testString', 'Hello World');
+        $view->render('simple', null, true);
 
-	//--------------------------------------------------------------------
+        $expected = ['testString' => 'Hello World'];
 
-	public function testCanDeleteData()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->assertSame($expected, $view->getData());
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$view->render('simple', null, true);
+    public function testRenderCanSaveDataThroughConfigSetting()
+    {
+        $this->config->saveData = true;
 
-		$view->resetData();
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$this->assertEquals([], $view->getData());
-	}
+        $view->setVar('testString', 'Hello World');
+        $view->render('simple');
 
-	//--------------------------------------------------------------------
+        $expected = ['testString' => 'Hello World'];
 
-	public function testCachedRender()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->assertSame($expected, $view->getData());
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
+    public function testCanDeleteData()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$this->assertStringContainsString($expected, $view->render('simple', ['cache' => 10]));
-		// this second renderings should go thru the cache
-		$this->assertStringContainsString($expected, $view->render('simple', ['cache' => 10]));
-	}
+        $view->setVar('testString', 'Hello World');
+        $view->render('simple', null, true);
 
-	//--------------------------------------------------------------------
+        $view->resetData();
 
-	public function testRenderStringSavingData()
-	{
-		$view     = new View($this->config, $this->viewsDir, $this->loader);
-		$expected = '<h1>Hello World</h1>';
+        $this->assertSame([], $view->getData());
+    }
 
-		//I think saveData is sava current data, is not clean already set data.
-		$view->setVar('testString', 'Hello World');
-		$this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], false));
-		$this->assertArrayNotHasKey('testString', $view->getData());
+    public function testCachedRender()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
-		$this->assertArrayHasKey('testString', $view->getData());
-	}
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
 
-	//--------------------------------------------------------------------
+        $this->assertStringContainsString($expected, $view->render('simple', ['cache' => 10]));
+        // this second renderings should go thru the cache
+        $this->assertStringContainsString($expected, $view->render('simple', ['cache' => 10]));
+    }
 
-	public function testPerformanceLogging()
-	{
-		// Make sure debugging is on for our view
-		$view = new View($this->config, $this->viewsDir, $this->loader, true);
-		$this->assertEquals(0, count($view->getPerformanceData()));
+    public function testRenderStringSavingData()
+    {
+        $view     = new View($this->config, $this->viewsDir, $this->loader);
+        $expected = '<h1>Hello World</h1>';
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
-		$this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
-		$this->assertEquals(1, count($view->getPerformanceData()));
-	}
+        // I think saveData is sava current data, is not clean already set data.
+        $view->setVar('testString', 'Hello World');
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], false));
+        $this->assertArrayNotHasKey('testString', $view->getData());
 
-	public function testPerformanceNonLogging()
-	{
-		// Make sure debugging is on for our view
-		$view = new View($this->config, $this->viewsDir, $this->loader, false);
-		$this->assertEquals(0, count($view->getPerformanceData()));
+        $view->setVar('testString', 'Hello World');
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertArrayHasKey('testString', $view->getData());
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
-		$this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
-		$this->assertEquals(0, count($view->getPerformanceData()));
-	}
+    public function testPerformanceLogging()
+    {
+        // Make sure debugging is on for our view
+        $view = new View($this->config, $this->viewsDir, $this->loader, true);
+        $this->assertCount(0, $view->getPerformanceData());
 
-	public function testRenderLayoutExtendsCorrectly()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertCount(1, $view->getPerformanceData());
+    }
 
-		$view->setVar('testString', 'Hello World');
-		$expected = "<p>Open</p>\n<h1>Hello World</h1>";
+    public function testPerformanceNonLogging()
+    {
+        // Make sure debugging is on for our view
+        $view = new View($this->config, $this->viewsDir, $this->loader, false);
+        $this->assertCount(0, $view->getPerformanceData());
 
-		$this->assertStringContainsString($expected, $view->render('extend'));
-	}
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertCount(0, $view->getPerformanceData());
+    }
 
-	public function testRenderLayoutExtendsMultipleCalls()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderLayoutExtendsCorrectly()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = "<p>Open</p>\n<h1>Hello World</h1>\n<p>Hello World</p>";
+        $view->setVar('testString', 'Hello World');
+        $expected = "<p>Open</p>\n<h1>Hello World</h1>";
 
-		$view->render('extend');
+        $this->assertStringContainsString($expected, $view->render('extend'));
+    }
 
-		$this->assertStringContainsString($expected, $view->render('extend'));
-	}
+    public function testRenderLayoutExtendsMultipleCalls()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-	public function testRenderLayoutMakesDataAvailableToBoth()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setVar('testString', 'Hello World');
+        $expected = "<p>Open</p>\n<h1>Hello World</h1>\n<p>Hello World</p>";
 
-		$view->setVar('testString', 'Hello World');
-		$expected = "<p>Open</p>\n<h1>Hello World</h1>\n<p>Hello World</p>";
+        $view->render('extend');
 
-		$this->assertStringContainsString($expected, $view->render('extend'));
-	}
+        $this->assertStringContainsString($expected, $view->render('extend'));
+    }
 
-	public function testRenderLayoutSupportsMultipleOfSameSection()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderLayoutMakesDataAvailableToBoth()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = "<p>First</p>\n<p>Second</p>";
+        $view->setVar('testString', 'Hello World');
+        $expected = "<p>Open</p>\n<h1>Hello World</h1>\n<p>Hello World</p>";
 
-		$this->assertStringContainsString($expected, $view->render('extend_two'));
-	}
+        $this->assertStringContainsString($expected, $view->render('extend'));
+    }
 
-	public function testRenderLayoutWithInclude()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderLayoutSupportsMultipleOfSameSection()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = "<p>Open</p>\n<h1>Hello World</h1>";
+        $view->setVar('testString', 'Hello World');
+        $expected = "<p>First</p>\n<p>Second</p>";
 
-		$content = $view->render('extend_include');
+        $this->assertStringContainsString($expected, $view->render('extend_two'));
+    }
 
-		$this->assertTrue(strpos($content, '<p>Open</p>') !== false);
-		$this->assertTrue(strpos($content, '<h1>Hello World</h1>') !== false);
-		$this->assertEquals(2, substr_count($content, 'Hello World'));
-	}
+    public function testRenderLayoutWithInclude()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-	public function testRenderLayoutBroken()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-
-		$view->setVar('testString', 'Hello World');
-		$expected = '';
+        $view->setVar('testString', 'Hello World');
 
-		$this->expectException(RuntimeException::class);
-		$this->assertStringContainsString($expected, $view->render('broken'));
-	}
+        $content = $view->render('extend_include');
+
+        $this->assertTrue(strpos($content, '<p>Open</p>') !== false);
+        $this->assertTrue(strpos($content, '<h1>Hello World</h1>') !== false);
+        $this->assertSame(2, substr_count($content, 'Hello World'));
+    }
+
+    public function testRenderLayoutBroken()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+
+        $view->setVar('testString', 'Hello World');
+        $expected = '';
+
+        $this->expectException(RuntimeException::class);
+        $this->assertStringContainsString($expected, $view->render('broken'));
+    }
 
-	public function testRenderLayoutNoContentSection()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderLayoutNoContentSection()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '';
+        $view->setVar('testString', 'Hello World');
+        $expected = '';
 
-		$this->assertStringContainsString($expected, $view->render('apples'));
-	}
+        $this->assertStringContainsString($expected, $view->render('apples'));
+    }
 
-	public function testRenderSaveDataCover()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-		$this->setPrivateProperty($view, 'saveData', true);
-		$view->setVar('testString', 'test');
-		$view->render('simple', null, false);
-		$this->assertEquals(true, $this->getPrivateProperty($view, 'saveData'));
-	}
+    public function testRenderSaveDataCover()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+        $this->setPrivateProperty($view, 'saveData', true);
+        $view->setVar('testString', 'test');
+        $view->render('simple', null, false);
+        $this->assertTrue($this->getPrivateProperty($view, 'saveData'));
+    }
 
-	public function testRenderSaveDataUseAfterSaveDataFalse()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
-		$view->setVar('testString', 'test');
-		$view->render('simple', null, true);
-		$view->render('simple', null, false);
-		$this->assertStringContainsString('<h1>test</h1>', $view->render('simple', null, false));
-	}
+    public function testRenderSaveDataUseAfterSaveDataFalse()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+        $view->setVar('testString', 'test');
+        $view->render('simple', null, true);
+        $view->render('simple', null, false);
+        $this->assertStringContainsString('<h1>test</h1>', $view->render('simple', null, false));
+    }
 
-	public function testCachedAutoDiscoverAndRender()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testCachedAutoDiscoverAndRender()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
-		$expected = '<h1>Hello World</h1>';
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
 
-		$this->assertStringContainsString($expected, $view->render('Nested/simple', ['cache' => 10]));
-		// this second renderings should go thru the cache
-		$this->assertStringContainsString($expected, $view->render('Nested/simple', ['cache' => 10]));
-	}
+        $this->assertStringContainsString($expected, $view->render('Nested/simple', ['cache' => 10]));
+        // this second renderings should go thru the cache
+        $this->assertStringContainsString($expected, $view->render('Nested/simple', ['cache' => 10]));
+    }
 
-	public function testRenderNestedSections()
-	{
-		$view = new View($this->config, $this->viewsDir, $this->loader);
+    public function testRenderNestedSections()
+    {
+        $view = new View($this->config, $this->viewsDir, $this->loader);
 
-		$view->setVar('testString', 'Hello World');
+        $view->setVar('testString', 'Hello World');
 
-		$content = $view->render('nested_section');
+        $content = $view->render('nested_section');
 
-		$this->assertStringContainsString('<p>First</p>', $content);
-		$this->assertStringContainsString('<p>Second</p>', $content);
-		$this->assertStringContainsString('<p>Third</p>', $content);
-	}
+        $this->assertStringContainsString('<p>First</p>', $content);
+        $this->assertStringContainsString('<p>Second</p>', $content);
+        $this->assertStringContainsString('<p>Third</p>', $content);
+    }
 }
diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index e431b242c06b..58cfe82b61ac 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -1,6 +1,54 @@
 Version 4.1.4
 =============
 
-Release Date: Not released
+Release Date: September 6, 2021
 
 **4.1.4 release of CodeIgniter4**
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
+Breaking Changes:
+
+- The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
+
+    * ``CodeIgniter\Database\MySQLi\Connection::execute()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+    * ``CodeIgniter\Database\Postgre\Connection::execute()``
+    * ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::execute()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+    * ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+    * ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+- To be compatible with the strict inheritance checks of PHP 8.1, the following method signatures were added return types to match their parents' signatures whenever possible:
+
+    * ``CodeIgniter\Cookie\Cookie::offsetExists()``
+    * ``CodeIgniter\Cookie\Cookie::offsetSet()``
+    * ``CodeIgniter\Cookie\Cookie::offsetUnset()``
+    * ``CodeIgniter\Cookie\CookieStore::getIterator()``
+    * ``CodeIgniter\I18n\Time::__wakeup()``
+    * ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
+
+- Related to the strict inheritance checks of PHP 8.1, the following session handlers implementing ``SessionHandlerInterface`` have their public methods modified to match the interface:
+
+    * ``CodeIgniter\Session\Handlers\ArrayHandler``
+    * ``CodeIgniter\Session\Handlers\DatabaseHandler``
+    * ``CodeIgniter\Session\Handlers\FileHandler``
+    * ``CodeIgniter\Session\Handlers\MemcachedHandler``
+    * ``CodeIgniter\Session\Handlers\RedisHandler``
diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 65e0f89209fc..6f0fe21ee4bd 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -187,12 +187,9 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
 
         A convenience method to maintain a consistent and clear error output to the CLI::
 
-            try
-            {
+            try {
                 . . .
-            }
-            catch (\Exception $e)
-            {
+            } catch (\Exception $e) {
                 $this->showError($e);
             }
 
@@ -208,8 +205,8 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI::
 
             $pad = $this->getPad($this->options, 6);
-            foreach ($this->options as $option => $description)
-            {
+
+            foreach ($this->options as $option => $description) {
                 CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
             }
 
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 1697c8409358..d7ddc0993015 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -119,8 +119,7 @@ Instead it prints it to the screen wherever the cursor is currently. This allows
 the same line, from different calls. This is especially helpful when you want to show a status, do something, then
 print "Done" on the same line::
 
-    for ($i = 0; $i <= 10; $i++)
-    {
+    for ($i = 0; $i <= 10; $i++) {
         CLI::print($i);
     }
 
@@ -172,8 +171,7 @@ every line after the first line, so that you will have a crisp column edge on th
     // to determine the width of the left column
     $maxlen = max(array_map('strlen', $titles));
 
-    for ($i=0; $i < count($titles); $i++)
-    {
+    for ($i = 0; $i < count($titles); $i++) {
         CLI::write(
             // Display the title on the left of the row
             $titles[$i] . '   ' .
@@ -227,8 +225,7 @@ pass ``false`` as the first parameter and the progress bar will be removed.
     $totalSteps = count($tasks);
     $currStep   = 1;
 
-    foreach ($tasks as $task)
-    {
+    foreach ($tasks as $task) {
         CLI::showProgress($currStep++, $totalSteps);
         $task->run();
     }
diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
index 6932294aa2e0..0fa29f2735ab 100644
--- a/user_guide_src/source/cli/cli_request.rst
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -37,7 +37,7 @@ Returns the value of a specific command line argument deemed to be an option::
 
     // command line: php index.php users 21 profile --foo bar
     echo $request->getOption('foo');  // bar
-    echo $request->getOption('notthere'); // NULL
+    echo $request->getOption('notthere'); // null
 
 **getOptionString()**
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 63fd4dcf46bc..f341ddfc25c4 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.3'
+release = '4.1.4'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 38be6c16efa5..53b2c3f932b0 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -22,14 +22,14 @@ prototype::
         'database' => 'database_name',
         'DBDriver' => 'MySQLi',
         'DBPrefix' => '',
-        'pConnect' => TRUE,
-        'DBDebug'  => TRUE,
+        'pConnect' => true,
+        'DBDebug'  => true,
         'charset'  => 'utf8',
         'DBCollat' => 'utf8_general_ci',
         'swapPre'  => '',
-        'encrypt'  => FALSE,
-        'compress' => FALSE,
-        'strictOn' => FALSE,
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
         'failover' => [],
     ];
 
@@ -80,14 +80,14 @@ These failovers can be specified by setting the failover for a connection like t
             'database' => '',
             'DBDriver' => 'MySQLi',
             'DBPrefix' => '',
-            'pConnect' => TRUE,
-            'DBDebug'  => TRUE,
+            'pConnect' => true,
+            'DBDebug'  => true,
             'charset'  => 'utf8',
             'DBCollat' => 'utf8_general_ci',
             'swapPre'  => '',
-            'encrypt'  => FALSE,
-            'compress' => FALSE,
-            'strictOn' => FALSE
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
         ],
         [
             'hostname' => 'localhost2',
@@ -96,14 +96,14 @@ These failovers can be specified by setting the failover for a connection like t
             'database' => '',
             'DBDriver' => 'MySQLi',
             'DBPrefix' => '',
-            'pConnect' => TRUE,
-            'DBDebug'  => TRUE,
+            'pConnect' => true,
+            'DBDebug'  => true,
             'charset'  => 'utf8',
             'DBCollat' => 'utf8_general_ci',
             'swapPre'  => '',
-            'encrypt'  => FALSE,
-            'compress' => FALSE,
-            'strictOn' => FALSE
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
         ]
     ];
 
@@ -123,14 +123,14 @@ example, to set up a "test" environment you would do this::
         'database' => 'database_name',
         'DBDriver' => 'MySQLi',
         'DBPrefix' => '',
-        'pConnect' => TRUE,
-        'DBDebug'  => TRUE,
+        'pConnect' => true,
+        'DBDebug'  => true,
         'charset'  => 'utf8',
         'DBCollat' => 'utf8_general_ci',
         'swapPre'  => '',
-        'compress' => FALSE,
-        'encrypt'  => FALSE,
-        'strictOn' => FALSE,
+        'compress' => false,
+        'encrypt'  => false,
+        'strictOn' => false,
         'failover' => []
     );
 
@@ -188,8 +188,8 @@ Explanation of Values:
 **DBPrefix**    An optional table prefix which will added to the table name when running
                 :doc:`Query Builder <query_builder>` queries. This permits multiple CodeIgniter
                 installations to share one database.
-**pConnect**    TRUE/FALSE (boolean) - Whether to use a persistent connection.
-**DBDebug**     TRUE/FALSE (boolean) - Whether database errors should be displayed.
+**pConnect**    true/false (boolean) - Whether to use a persistent connection.
+**DBDebug**     true/false (boolean) - Whether database errors should be displayed.
 **charset**     The character set used in communicating with the database.
 **DBCollat**    The character collation used in communicating with the database
 
@@ -201,7 +201,7 @@ Explanation of Values:
 **schema**      The database schema, default value varies by driver. Used by PostgreSQL and SQLSRV drivers.
 **encrypt**     Whether or not to use an encrypted connection.
 
-                - 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+                - 'sqlsrv' and 'pdo/sqlsrv' drivers accept true/false
                 - 'MySQLi' and 'pdo/mysql' drivers accept an array with the following options:
 
                     - 'ssl_key'    - Path to the private key file
@@ -209,10 +209,10 @@ Explanation of Values:
                     - 'ssl_ca'     - Path to the certificate authority file
                     - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
                     - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-                    - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('MySQLi' only)
+                    - 'ssl_verify' - true/false; Whether to verify the server certificate or not ('MySQLi' only)
 
 **compress**    Whether or not to use client compression (MySQL only).
-**strictOn**    TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
+**strictOn**    true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
                 while developing an application.
 **port**        The database port number. To use this value you have to add a line to the database config array.
                 ::
diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 994f6537766c..65a3ed086d27 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -27,7 +27,7 @@ Available Parameters
 --------------------
 
 #. The database group name, a string that must match the config class' property name. Default value is ``$config->defaultGroup``.
-#. TRUE/FALSE (boolean). Whether to return the shared connection (see
+#. true/false (boolean). Whether to return the shared connection (see
    Connecting to Multiple Databases below).
 
 Manually Connecting to a Database
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index 84358ac9963d..de41c39f1366 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -28,11 +28,10 @@ Standard Query With Multiple Results (Object Version)
 
 ::
 
-    $query = $db->query('SELECT name, title, email FROM my_table');
+    $query   = $db->query('SELECT name, title, email FROM my_table');
     $results = $query->getResult();
 
-    foreach ($results as $row)
-    {
+    foreach ($results as $row) {
         echo $row->title;
         echo $row->name;
         echo $row->email;
@@ -51,8 +50,7 @@ Standard Query With Multiple Results (Array Version)
     $query   = $db->query('SELECT name, title, email FROM my_table');
     $results = $query->getResultArray();
 
-    foreach ($results as $row)
-    {
+    foreach ($results as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['email'];
@@ -102,8 +100,7 @@ means of retrieving data::
 
     $query = $db->table('table_name')->get();
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -124,4 +121,3 @@ Query Builder Insert
 
     $db->table('mytable')->insert($data);
     // Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
-
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 60439f9d1a81..fd19a1aa35b5 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -22,8 +22,7 @@ you are currently connected to. Example::
 
     $tables = $db->listTables();
 
-    foreach ($tables as $table)
-    {
+    foreach ($tables as $table) {
         echo $table;
     }
 
@@ -35,10 +34,9 @@ Determine If a Table Exists
 **$db->tableExists();**
 
 Sometimes it's helpful to know whether a particular table exists before
-running an operation on it. Returns a boolean TRUE/FALSE. Usage example::
+running an operation on it. Returns a boolean true/false. Usage example::
 
-    if ($db->tableExists('table_name'))
-    {
+    if ($db->tableExists('table_name')) {
         // some code...
     }
 
@@ -60,8 +58,7 @@ two ways:
 
     $fields = $db->getFieldNames('table_name');
 
-    foreach ($fields as $field)
-    {
+    foreach ($fields as $field) {
         echo $field;
     }
 
@@ -70,8 +67,7 @@ calling the function from your query result object::
 
     $query = $db->query('SELECT * FROM some_table');
 
-    foreach ($query->getFieldNames() as $field)
-    {
+    foreach ($query->getFieldNames() as $field) {
         echo $field;
     }
 
@@ -81,10 +77,9 @@ Determine If a Field is Present in a Table
 **$db->fieldExists()**
 
 Sometimes it's helpful to know whether a particular field exists before
-performing an action. Returns a boolean TRUE/FALSE. Usage example::
+performing an action. Returns a boolean true/false. Usage example::
 
-    if ($db->fieldExists('field_name', 'table_name'))
-    {
+    if ($db->fieldExists('field_name', 'table_name')) {
         // some code...
     }
 
@@ -108,8 +103,7 @@ Usage example::
 
     $fields = $db->getFieldData('table_name');
 
-    foreach ($fields as $field)
-    {
+    foreach ($fields as $field) {
         echo $field->name;
         echo $field->type;
         echo $field->max_length;
@@ -141,11 +135,10 @@ Usage example::
 
     $keys = $db->getIndexData('table_name');
 
-    foreach ($keys as $key)
-    {
-    echo $key->name;
-    echo $key->type;
-    echo $key->fields; // array of field names
+    foreach ($keys as $key) {
+        echo $key->name;
+        echo $key->type;
+        echo $key->fields; // array of field names
     }
 
 The key types may be unique to the database you are using.
@@ -160,8 +153,7 @@ Usage example::
 
     $keys = $db->getForeignKeyData('table_name');
 
-    foreach ($keys as $key)
-    {
+    foreach ($keys as $key) {
         echo $key->constraint_name;
         echo $key->table_name;
         echo $key->column_name;
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 93a54f01d861..366b264cc45c 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -20,7 +20,7 @@ To submit a query, use the **query** function::
 The ``query()`` function returns a database result **object** when "read"
 type queries are run which you can use to :doc:`show your
 results <results>`. When "write" type queries are run it simply
-returns TRUE or FALSE depending on success or failure. When retrieving
+returns true or false depending on success or failure. When retrieving
 data you will typically assign the query to your own variable, like
 this::
 
@@ -36,19 +36,16 @@ compile bind data, or store your query for debugging. It simply lets you
 submit a query. Most users will rarely use this function.
 
 It returns whatever the database drivers "execute" function returns.
-That typically is TRUE/FALSE on success or failure for write type queries
+That typically is true/false on success or failure for write type queries
 such as INSERT, DELETE or UPDATE statements (which is what it really
 should be used for) and a resource/object on success for queries with
 fetchable results.
 
 ::
 
-    if ($db->simpleQuery('YOUR QUERY'))
-    {
+    if ($db->simpleQuery('YOUR QUERY')) {
         echo "Success!";
-    }
-    else
-    {
+    } else {
         echo "Query failed!";
     }
 
@@ -94,9 +91,9 @@ identifier you can use::
 
 This function will also add a table prefix to your table, assuming you
 have a prefix specified in your database config file. To enable the
-prefixing set TRUE (boolean) via the second parameter::
+prefixing set true (boolean) via the second parameter::
 
-    $db->protectIdentifiers('table_name', TRUE);
+    $db->protectIdentifiers('table_name', true);
 
 ****************
 Escaping Queries
@@ -173,7 +170,7 @@ placeholders in the query::
         $db->query($sql, [
             'id'     => 3,
             'status' => 'live',
-            'name'   => 'Rick'
+            'name'   => 'Rick',
         ]);
 
 .. note:: Each name in the query MUST be surrounded by colons.
@@ -188,8 +185,7 @@ If you need to get the last error that has occurred, the ``error()`` method
 will return an array containing its code and message. Here's a quick
 example::
 
-    if ( ! $db->simpleQuery('SELECT `example_field` FROM `example_table`'))
-    {
+    if ( ! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
         $error = $db->error(); // Has keys 'code' and 'message'
     }
 
@@ -214,14 +210,12 @@ a query object. Query objects are automatically generated by any of the "final"
 run a query. The query is not actually run, and the values don't matter since they're never applied, acting instead
 as placeholders. This returns a PreparedQuery object::
 
-    $pQuery = $db->prepare(function($db)
-    {
-        return $db->table('user')
-                  ->insert([
-                       'name'    => 'x',
-                       'email'   => 'y',
-                       'country' => 'US'
-                  ]);
+    $pQuery = $db->prepare(function ($db) {
+        return $db->table('user')->insert([
+            'name'    => 'x',
+            'email'   => 'y',
+            'country' => 'US'
+        ]);
     });
 
 If you don't want to use the Query Builder you can create the Query object manually using question marks for
@@ -229,8 +223,7 @@ value placeholders::
 
     use CodeIgniter\Database\Query;
 
-    $pQuery = $db->prepare(function($db)
-    {
+    $pQuery = $db->prepare(function ($db) {
         $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
 
         return (new Query($db))->setQuery($sql);
@@ -241,8 +234,7 @@ array through in the second parameter::
 
     use CodeIgniter\Database\Query;
 
-    $pQuery = $db->prepare(function($db)
-    {
+    $pQuery = $db->prepare(function ($db) {
         $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
 
         return (new Query($db))->setQuery($sql);
@@ -257,14 +249,12 @@ placeholders in the query. They must also be passed in the same order as the pla
 query::
 
     // Prepare the Query
-    $pQuery = $db->prepare(function($db)
-    {
-        return $db->table('user')
-                  ->insert([
-                       'name'    => 'x',
-                       'email'   => 'y',
-                       'country' => 'US'
-                  ]);
+    $pQuery = $db->prepare(function ($db) {
+        return $db->table('user')->insert([
+            'name'    => 'x',
+            'email'   => 'y',
+            'country' => 'US'
+        ]);
     });
 
     // Collect the Data
@@ -307,7 +297,7 @@ Working with Query Objects
 **************************
 
 Internally, all queries are processed and stored as instances of
-\CodeIgniter\Database\Query. This class is responsible for binding
+``CodeIgniter\Database\Query``. This class is responsible for binding
 the parameters, otherwise preparing the query, and storing performance
 data about its query.
 
@@ -317,7 +307,7 @@ When you just need to retrieve the last Query object, use the
 getLastQuery() method::
 
     $query = $db->getLastQuery();
-    echo (string)$query;
+    echo (string) $query;
 
 The Query Class
 ===============
@@ -335,7 +325,7 @@ query that was sent to the database::
 
 This same value can be retrieved by casting the Query object to a string::
 
-    $sql = (string)$query;
+    $sql = (string) $query;
 
 **getOriginalQuery()**
 
@@ -349,10 +339,9 @@ binds in it, or prefixes swapped out, etc::
 If an error was encountered during the execution of this query this method
 will return true::
 
-    if ($query->hasError())
-    {
-        echo 'Code: '. $query->getErrorCode();
-        echo 'Error: '. $query->getErrorMessage();
+    if ($query->hasError()) {
+        echo 'Code: ' . $query->getErrorCode();
+        echo 'Error: ' . $query->getErrorMessage();
     }
 
 **isWriteType()**
@@ -360,8 +349,7 @@ will return true::
 Returns true if the query was determined to be a write-type query (i.e.,
 INSERT, UPDATE, DELETE, etc)::
 
-    if ($query->isWriteType())
-    {
+    if ($query->isWriteType()) {
         // ... do something
     }
 
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 62e3aa29b0c9..78c1b3731fd5 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -60,8 +60,7 @@ $query, which can be used to show the results::
 
     $query = $builder->get();
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -310,7 +309,7 @@ methods:
 
     ::
 
-        $builder->where('advance_amount <', function(BaseBuilder $builder) {
+        $builder->where('advance_amount <', function (BaseBuilder $builder) {
             return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
         });
         // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
@@ -341,7 +340,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->whereIn('id', function(BaseBuilder $builder) {
+        $builder->whereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
         // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
@@ -361,7 +360,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->orWhereIn('id', function(BaseBuilder $builder) {
+        $builder->orWhereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -382,7 +381,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->whereNotIn('id', function(BaseBuilder $builder) {
+        $builder->whereNotIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -404,7 +403,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->orWhereNotIn('id', function(BaseBuilder $builder) {
+        $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -545,7 +544,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->havingIn('id', function(BaseBuilder $builder) {
+    $builder->havingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
     // Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
@@ -565,7 +564,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->orHavingIn('id', function(BaseBuilder $builder) {
+    $builder->orHavingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
@@ -586,7 +585,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->havingNotIn('id', function(BaseBuilder $builder) {
+    $builder->havingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
@@ -608,7 +607,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->orHavingNotIn('id', function(BaseBuilder $builder) {
+    $builder->orHavingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index 79445da9e529..e3e573d5c460 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -20,8 +20,7 @@ loop, like this::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -34,8 +33,7 @@ as an array of arrays::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResult('array') as $row)
-    {
+    foreach ($query->getResult('array') as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -50,8 +48,7 @@ instantiate for each result object
 
     $query = $db->query("SELECT * FROM users;");
 
-    foreach ($query->getResult('User') as $user)
-    {
+    foreach ($query->getResult('User') as $user) {
         echo $user->name; // access attributes
         echo $user->reverseName(); // or methods defined on the 'User' class
     }
@@ -66,8 +63,7 @@ loop, like this::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResultArray() as $row)
-    {
+    foreach ($query->getResultArray() as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -87,8 +83,7 @@ one row, it returns only the first row. The result is returned as an
 
     $row = $query->getRow();
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -117,8 +112,7 @@ Example::
 
     $row = $query->getRowArray();
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -159,8 +153,7 @@ it returns the current row and moves the internal data pointer ahead.
 
     $query = $db->query("YOUR QUERY");
 
-    while ($row = $query->getUnbufferedRow())
-    {
+    while ($row = $query->getUnbufferedRow()) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -201,16 +194,14 @@ Example::
 
         public function __set($name, $value)
         {
-            if ($name === 'lastLogin')
-            {
+            if ($name === 'lastLogin') {
                 $this->lastLogin = DateTime::createFromFormat('U', $value);
             }
         }
 
         public function __get($name)
         {
-            if (isset($this->$name))
-            {
+            if (isset($this->$name)) {
                 return $this->$name;
             }
         }
@@ -231,8 +222,7 @@ Example::
 
     $rows = $query->getCustomResultObject('User');
 
-    foreach ($rows as $row)
-    {
+    foreach ($rows as $row) {
         echo $row->id;
         echo $row->email;
         echo $row->last_login('Y-m-d');
@@ -249,8 +239,7 @@ Example::
 
     $row = $query->getCustomRowObject(0, 'User');
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row->email;               // access attributes
         echo $row->last_login('Y-m-d'); // access class methods
     }
@@ -308,8 +297,7 @@ Example::
 
     $query = $thisdb->query('SELECT title FROM my_table');
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -327,7 +315,7 @@ This method sets the internal pointer for the next result row to be
 fetched. It is only useful in combination with ``getUnbufferedRow()``.
 
 It accepts a positive integer value, which defaults to 0 and returns
-TRUE on success or FALSE on failure.
+true on success or false on failure.
 
 ::
 
@@ -335,7 +323,7 @@ TRUE on success or FALSE on failure.
     $query->dataSeek(5); // Skip the first 5 rows
     $row = $query->getUnbufferedRow();
 
-.. note:: Not all database drivers support this feature and will return FALSE.
+.. note:: Not all database drivers support this feature and will return false.
     Most notably - you won't be able to use it with PDO.
 
 ***************
@@ -388,7 +376,7 @@ Class Reference
 
         :param	int	$n: Index of the query results row to be returned
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	mixed
 
         A wrapper for the ``getRowArray()``, ``getRowObject()`` and
@@ -399,7 +387,7 @@ Class Reference
     .. php:method:: getUnbufferedRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row from the result set or NULL if it doesn't exist
+        :returns:	Next row from the result set or null if it doesn't exist
         :rtype:	mixed
 
         Fetches the next result row and returns it in the
@@ -410,7 +398,7 @@ Class Reference
     .. php:method:: getRowArray([$n = 0])
 
         :param	int	$n: Index of the query results row to be returned
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	array
 
         Returns the requested result row as an associative array.
@@ -420,7 +408,7 @@ Class Reference
     .. php:method:: getRowObject([$n = 0])
 
         :param	int	$n: Index of the query results row to be returned
-                :returns:	The requested row or NULL if it doesn't exist
+                :returns:	The requested row or null if it doesn't exist
         :rtype:	stdClass
 
         Returns the requested result row as an object of type
@@ -432,7 +420,7 @@ Class Reference
 
         :param	int	$n: Index of the results row to return
         :param	string	$class_name: Class name for the resulting row
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	$type
 
         Returns the requested result row as an instance of the
@@ -441,14 +429,14 @@ Class Reference
     .. php:method:: dataSeek([$n = 0])
 
         :param	int	$n: Index of the results row to be returned next
-        :returns:	TRUE on success, FALSE on failure
+        :returns:	true on success, false on failure
         :rtype:	bool
 
         Moves the internal results row pointer to the desired offset.
 
         Usage: see `Result Helper Methods`_.
 
-    .. php:method:: setRow($key[, $value = NULL])
+    .. php:method:: setRow($key[, $value = null])
 
         :param	mixed	$key: Column name or array of key/value pairs
         :param	mixed	$value: Value to assign to the column, $key is a single field name
@@ -459,7 +447,7 @@ Class Reference
     .. php:method:: getNextRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row of result set, or NULL if it doesn't exist
+        :returns:	Next row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the next row from the result set.
@@ -467,7 +455,7 @@ Class Reference
     .. php:method:: getPreviousRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Previous row of result set, or NULL if it doesn't exist
+        :returns:	Previous row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the previous row from the result set.
@@ -475,7 +463,7 @@ Class Reference
     .. php:method:: getFirstRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	First row of result set, or NULL if it doesn't exist
+        :returns:	First row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the first row from the result set.
@@ -483,7 +471,7 @@ Class Reference
     .. php:method:: getLastRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Last row of result set, or NULL if it doesn't exist
+        :returns:	Last row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the last row from the result set.
diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index 014b1f4ce8e5..a3c8ba9f9866 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -74,8 +74,7 @@ debugging is turned off, you can manage your own errors like this::
     $this->db->query('ANOTHER QUERY...');
     $this->db->transComplete();
 
-    if ($this->db->transStatus() === FALSE)
-    {
+    if ($this->db->transStatus() === false) {
         // generate an error... or use the log_message() function to log your error
     }
 
@@ -86,7 +85,6 @@ Transactions are enabled by default. If you would like to disable transactions y
 can do so using ``$this->db->transOff()``::
 
     $this->db->transOff();
-
     $this->db->transStart();
     $this->db->query('AN SQL QUERY...');
     $this->db->transComplete();
@@ -100,7 +98,7 @@ Test Mode
 You can optionally put the transaction system into "test mode", which
 will cause your queries to be rolled back -- even if the queries produce
 a valid result. To use test mode simply set the first parameter in the
-``$this->db->transStart()`` function to TRUE::
+``$this->db->transStart()`` function to true::
 
     $this->db->transStart(true); // Query will be rolled back
     $this->db->query('AN SQL QUERY...');
@@ -117,12 +115,9 @@ If you would like to run transactions manually you can do so as follows::
     $this->db->query('ANOTHER QUERY...');
     $this->db->query('AND YET ANOTHER QUERY...');
 
-    if ($this->db->transStatus() === FALSE)
-    {
+    if ($this->db->transStatus() === false) {
         $this->db->transRollback();
-    }
-    else
-    {
+    } else {
         $this->db->transCommit();
     }
 
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 13ee31402ef6..aba92fc634b2 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -34,29 +34,27 @@ Creating and Dropping Databases
 **$forge->createDatabase('db_name')**
 
 Permits you to create the database specified in the first parameter.
-Returns TRUE/FALSE based on success or failure::
+Returns true/false based on success or failure::
 
-	if ($forge->createDatabase('my_db'))
-	{
+	if ($forge->createDatabase('my_db')) {
 		echo 'Database created!';
 	}
 
-An optional second parameter set to TRUE will add IF EXISTS statement
+An optional second parameter set to true will add IF EXISTS statement
 or will check if a database exists before create it (depending on DBMS).
 
 ::
 
-	$forge->createDatabase('my_db', TRUE);
+	$forge->createDatabase('my_db', true);
 	// gives CREATE DATABASE IF NOT EXISTS my_db
 	// or will check if a database exists
 
 **$forge->dropDatabase('db_name')**
 
 Permits you to drop the database specified in the first parameter.
-Returns TRUE/FALSE based on success or failure::
+Returns true/false based on success or failure::
 
-	if ($forge->dropDatabase('my_db'))
-	{
+	if ($forge->dropDatabase('my_db')) {
 		echo 'Database deleted!';
 	}
 
@@ -115,8 +113,8 @@ Additionally, the following key/values can be used:
 
 -  unsigned/true : to generate "UNSIGNED" in the field definition.
 -  default/value : to generate a default value in the field definition.
--  null/true : to generate "NULL" in the field definition. Without this,
-   the field will default to "NOT NULL".
+-  null/true : to generate "null" in the field definition. Without this,
+   the field will default to "NOT null".
 -  auto_increment/true : generates an auto_increment flag on the
    field. Note that the field type must be a type that supports this,
    such as integer.
@@ -191,8 +189,8 @@ Adding Keys
 
 Generally speaking, you'll want your table to have Keys. This is
 accomplished with $forge->addKey('field'). The optional second
-parameter set to TRUE will make it a primary key and the third
-parameter set to TRUE will make it a unique key. Note that addKey()
+parameter set to true will make it a primary key and the third
+parameter set to true will make it a unique key. Note that addKey()
 must be followed by a call to createTable().
 
 Multiple column non-primary keys must be sent as an array. Sample output
@@ -200,11 +198,11 @@ below is for MySQL.
 
 ::
 
-	$forge->addKey('blog_id', TRUE);
+	$forge->addKey('blog_id', true);
 	// gives PRIMARY KEY `blog_id` (`blog_id`)
 
-	$forge->addKey('blog_id', TRUE);
-	$forge->addKey('site_id', TRUE);
+	$forge->addKey('blog_id', true);
+	$forge->addKey('site_id', true);
 	// gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
 
 	$forge->addKey('blog_name');
@@ -213,7 +211,7 @@ below is for MySQL.
 	$forge->addKey(['blog_name', 'blog_label']);
 	// gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
 
-	$forge->addKey(['blog_id', 'uri'], FALSE, TRUE);
+	$forge->addKey(['blog_id', 'uri'], false, true);
 	// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
 
 To make code reading more objective it is also possible to add primary
@@ -251,18 +249,18 @@ with
 	$forge->createTable('table_name');
 	// gives CREATE TABLE table_name
 
-An optional second parameter set to TRUE adds an "IF NOT EXISTS" clause
+An optional second parameter set to true adds an "IF NOT EXISTS" clause
 into the definition
 
 ::
 
-	$forge->createTable('table_name', TRUE);
+	$forge->createTable('table_name', true);
 	// gives CREATE TABLE IF NOT EXISTS table_name
 
 You could also pass optional table attributes, such as MySQL's ``ENGINE``::
 
 	$attributes = ['ENGINE' => 'InnoDB'];
-	$forge->createTable('table_name', FALSE, $attributes);
+	$forge->createTable('table_name', false, $attributes);
 	// produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
 
 .. note:: Unless you specify the ``CHARACTER SET`` and/or ``COLLATE`` attributes,
@@ -343,7 +341,7 @@ Examples::
 
 	// Will place the new column at the start of the table definition:
 	$fields = [
-		'preferences' => ['type' => 'TEXT', 'first' => TRUE]
+		'preferences' => ['type' => 'TEXT', 'first' => true]
 	];
 
 Dropping Columns From a Table
@@ -394,7 +392,7 @@ Class Reference
 
 		:param	string	$table: Table name to add the column to
 		:param	array	$field: Column definition(s)
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Adds a column to a table. Usage:  See `Adding a Column to a Table`_.
@@ -407,11 +405,11 @@ Class Reference
 
                 Adds a field to the set that will be used to create a table. Usage:  See `Adding fields`_.
 
-	.. php:method:: addKey($key[, $primary = FALSE[, $unique = FALSE]])
+	.. php:method:: addKey($key[, $primary = false[, $unique = false]])
 
 		:param	mixed	$key: Name of a key field or an array of fields
-		:param	bool	$primary: Set to TRUE if it should be a primary key or a regular one
-		:param	bool	$unique: Set to TRUE if it should be a unique key or a regular one
+		:param	bool	$primary: Set to true if it should be a primary key or a regular one
+		:param	bool	$unique: Set to true if it should be a unique key or a regular one
 		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
 		:rtype:	\CodeIgniter\Database\Forge
 
@@ -433,21 +431,21 @@ Class Reference
 
 		Adds a unique key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
 
-	.. php:method:: createDatabase($dbName[, $ifNotExists = FALSE])
+	.. php:method:: createDatabase($dbName[, $ifNotExists = false])
 
 		:param	string	$db_name: Name of the database to create
-		:param	string	$ifNotExists: Set to TRUE to add an 'IF NOT EXISTS' clause or check if database exists
-		:returns:	TRUE on success, FALSE on failure
+		:param	string	$ifNotExists: Set to true to add an 'IF NOT EXISTS' clause or check if database exists
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Creates a new database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: createTable($table[, $if_not_exists = FALSE[, array $attributes = []]])
+	.. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]])
 
 		:param	string	$table: Name of the table to create
-		:param	string	$if_not_exists: Set to TRUE to add an 'IF NOT EXISTS' clause
+		:param	string	$if_not_exists: Set to true to add an 'IF NOT EXISTS' clause
 		:param	string	$attributes: An associative array of table attributes
-		:returns:  Query object on success, FALSE on failure
+		:returns:  Query object on success, false on failure
 		:rtype:	mixed
 
 		Creates a new table. Usage:  See `Creating a table`_.
@@ -456,7 +454,7 @@ Class Reference
 
 		:param	string	$table: Table name
 		:param	mixed	$column_names: Comma-delimited string or an array of column names
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops single or multiple columns from a table. Usage:  See `Dropping Columns From a Table`_.
@@ -464,16 +462,16 @@ Class Reference
 	.. php:method:: dropDatabase($dbName)
 
 		:param	string	$dbName: Name of the database to drop
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops a database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: dropTable($table_name[, $if_exists = FALSE])
+	.. php:method:: dropTable($table_name[, $if_exists = false])
 
 		:param	string	$table: Name of the table to drop
-		:param	string	$if_exists: Set to TRUE to add an 'IF EXISTS' clause
-		:returns:	TRUE on success, FALSE on failure
+		:param	string	$if_exists: Set to true to add an 'IF EXISTS' clause
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops a table. Usage:  See `Dropping a table`_.
@@ -482,7 +480,7 @@ Class Reference
 
 		:param	string	$table: Table name
 		:param	array	$field: Column definition(s)
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Modifies a table column. Usage:  See `Modifying a Column in a Table`_.
@@ -491,7 +489,7 @@ Class Reference
 
 		:param	string	$table: Current of the table
 		:param	string	$new_table_name: New name of the table
-		:returns:  Query object on success, FALSE on failure
+		:returns:  Query object on success, false on failure
 		:rtype:	mixed
 
 		Renames a table. Usage:  See `Renaming a table`_.
diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 031c01992e9c..9da3e2d3e9b3 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -174,12 +174,9 @@ to update the schema::
 		{
 			$migrate = \Config\Services::migrations();
 
-			try
-			{
+			try {
 				$migrate->latest();
-			}
-			catch (\Throwable $e)
-			{
+			} catch (\Throwable $e) {
 				// Do something with the error here...
 			}
 		}
@@ -321,8 +318,8 @@ Class Reference
 		:returns:	``true`` on success, ``false`` on failure
 		:rtype:	bool
 
-		This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated. 
-		
+		This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated.
+
 		.. note:: This method is recommended only for testing and could cause data consistency issues.
 
 	.. php:method:: setNamespace($namespace)
@@ -333,8 +330,7 @@ Class Reference
 
 	  Sets the namespace the library should look for migration files::
 
-	    $migration->setNamespace($namespace)
-	              ->latest();
+	    $migration->setNamespace($namespace)->latest();
 	.. php:method:: setGroup($group)
 
 	  :param  string  $group: database group name.
@@ -343,5 +339,4 @@ Class Reference
 
 	  Sets the group the library should look for migration files::
 
-	    $migration->setGroup($group)
-	              ->latest();
+	    $migration->setGroup($group)->latest();
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 6f9a83d9d28c..6d7b0c9a3b64 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -64,8 +64,7 @@ Then  you would modify the ``routes`` service to load your class instead::
 
 	public static function routes(bool $getShared = true)
 	{
-		if ($getShared)
-		{
+		if ($getShared) {
 			return static::getSharedInstance('routes');
 		}
 
@@ -107,6 +106,8 @@ If you need to use a constructor in your class make sure you extend the parent c
         public function __construct()
         {
             parent::__construct();
+
+            // your code here
         }
     }
 
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 1ee0e0150b94..f2190ee55473 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -42,7 +42,7 @@ In this example, whenever the **pre_controller** event is executed, an instance
 	Events::on('pre_system', 'SomeClass::someMethod');
 
 	// Use a Closure
-	Events::on('pre_system', function(...$params)
+	Events::on('pre_system', function (...$params)
 	{
 		. . .
 	});
@@ -81,7 +81,7 @@ given the arguments in the same order as defined::
 
 	\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
-	Events::on('some_event', function($foo, $bar, $baz) {
+	Events::on('some_event', function ($foo, $bar, $baz) {
 		...
 	});
 
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 5bbf71fccdea..8d006197bcfe 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -268,18 +268,18 @@ Miscellaneous Functions
 .. php:function:: function_usable ( $function_name )
 
     :param string $function_name: Function to check for
-    :returns: TRUE if the function exists and is safe to call, FALSE otherwise.
+    :returns: true if the function exists and is safe to call, false otherwise.
     :rtype: bool
 
 .. php:function:: is_cli ()
 
-    :returns: TRUE if the script is being executed from the command line or FALSE otherwise.
+    :returns: true if the script is being executed from the command line or false otherwise.
     :rtype: bool
 
 .. php:function:: is_really_writable ( $file )
 
     :param string $file: The filename being checked.
-    :returns: TRUE if you can write to the file, FALSE otherwise.
+    :returns: true if you can write to the file, false otherwise.
     :rtype: bool
 
 .. php:function:: log_message ($level, $message [, $context])
@@ -287,7 +287,7 @@ Miscellaneous Functions
     :param   string   $level: The level of severity
     :param   string   $message: The message that is to be logged.
     :param   array    $context: An associative array of tags and their values that should be replaced in $message
-    :returns: TRUE if was logged successfully or FALSE if there was a problem logging it
+    :returns: true if was logged successfully or false if there was a problem logging it
     :rtype: bool
 
     Logs a message using the Log Handlers defined in **app/Config/Logger.php**.
@@ -331,14 +331,14 @@ Miscellaneous Functions
         // Go to a named/reverse-routed URI
         return redirect('named_route');
 
-.. php:function:: remove_invisible_characters($str[, $urlEncoded = TRUE])
+.. php:function:: remove_invisible_characters($str[, $urlEncoded = true])
 
     :param    string    $str: Input string
     :param    bool    $urlEncoded: Whether to remove URL-encoded characters as well
     :returns:    Sanitized string
     :rtype:    string
 
-    This function prevents inserting NULL characters between ASCII
+    This function prevents inserting null characters between ASCII
     characters, like Java\\0script.
 
     Example::
@@ -386,7 +386,7 @@ Miscellaneous Functions
 .. php:function:: slash_item ( $item )
 
     :param string $item: Config item name
-    :returns: The configuration item or NULL if the item doesn't exist
+    :returns: The configuration item or null if the item doesn't exist
     :rtype:  string|null
 
     Fetch a config file item with slash appended (if not empty)
@@ -394,7 +394,7 @@ Miscellaneous Functions
 .. php:function:: stringify_attributes ( $attributes [, $js] )
 
     :param   mixed    $attributes: string, array of key value pairs, or object
-    :param   boolean  $js: TRUE if values do not need quotes (Javascript-style)
+    :param   boolean  $js: true if values do not need quotes (Javascript-style)
     :returns: String containing the attribute key/value pairs, comma-separated
     :rtype: string
 
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index b02dce2d77d4..410e58236a8d 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -24,12 +24,9 @@ execution is then sent to the error handler which displays the appropriate error
 
 If you are calling a method that might throw an exception, you can catch that exception using a ``try/catch`` block::
 
-    try
-    {
+    try {
         $user = $userModel->find($id);
-    }
-    catch (\Exception $e)
-    {
+    } catch (\Exception $e) {
         die($e->getMessage());
     }
 
@@ -40,16 +37,14 @@ In the example above, we catch any type of Exception. If we only want to watch f
 a ``UnknownFileException``, we can specify that in the catch parameter. Any other exceptions that are thrown and are
 not child classes of the caught exception will be passed on to the error handler::
 
-    catch (\CodeIgniter\UnknownFileException $e)
-    {
+    catch (\CodeIgniter\UnknownFileException $e) {
         // do something here...
     }
 
 This can be handy for handling the error yourself, or for performing cleanup before the script ends. If you want
 the error handler to function as normal, you can throw a new exception within the catch block::
 
-    catch (\CodeIgniter\UnknownFileException $e)
-    {
+    catch (\CodeIgniter\UnknownFileException $e) {
         // do something here...
 
         throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
@@ -98,8 +93,7 @@ This is used to signal a 404, Page Not Found error. When thrown, the system will
 If, in ``Config/Routes.php``, you have specified a 404 Override, that will be called instead of the standard
 404 page::
 
-    if (! $page = $pageModel->find($id))
-    {
+    if (! $page = $pageModel->find($id)) {
         throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
     }
 
diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 02dd4a017d20..65d63d942631 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -122,10 +122,8 @@ functions::
     {
         $needle = is_array($needle) ? $needle : [$needle];
 
-        foreach ($needle as $item)
-        {
-            if (in_array($item, $haystack))
-            {
+        foreach ($needle as $item) {
+            if (in_array($item, $haystack, true)) {
                 return true;
             }
         }
@@ -137,6 +135,7 @@ functions::
     function random_element($array)
     {
         shuffle($array);
+
         return array_pop($array);
     }
 
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 19921b648b17..6a6ca1e49e0e 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -10,8 +10,7 @@ You can log information to the local log files by using the ``log_message()`` me
 the "level" of the error in the first parameter, indicating what type of message it is (debug, error, etc).
 The second parameter is the message itself::
 
-    if ($some_var == '')
-    {
+    if ($some_var === '') {
         log_message('error', 'Some variable did not contain a value.');
     }
 
@@ -80,13 +79,8 @@ Each handler's section will have one property in common: ``handles``, which is a
 ::
 
     public $handlers = [
-
-        //--------------------------------------------------------------------
         // File Handler
-        //--------------------------------------------------------------------
-
         'CodeIgniter\Log\Handlers\FileHandler' => [
-
             'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
         ]
     ];
@@ -112,12 +106,9 @@ If you want to log an Exception or an Error, you can use the key of 'exception',
 Exception or Error itself. A string will be generated from that object containing the error message, the
 file name and line number. You must still provide the exception placeholder in the message::
 
-    try
-    {
+    try {
         // Something throws error here
-    }
-    catch (\Exception $e)
-    {
+    } catch (\Exception $e) {
         log_message('error', '[ERROR] {exception}', ['exception' => $e]);
     }
 
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 35d72532670c..b744f30c0441 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -154,8 +154,7 @@ but must be specified within the Routes file itself::
 
 To reduce the amount of typing needed here, the **group** routing feature is helpful::
 
-    $routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function($routes)
-    {
+    $routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function ($routes) {
         $routes->get('/', 'Blog::index');
     });
 
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 3ccdee76dd6d..2457790e4ad6 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -33,10 +33,10 @@ The following functions are available:
         $data = [
             'foo' => [
                 'buzz' => [
-                    'fizz' => 11
+                    'fizz' => 11,
                 ],
                 'bar' => [
-                    'baz' => 23
+                    'baz' => 23,
                 ]
             ]
         ]
@@ -61,10 +61,10 @@ The following functions are available:
 
         $data = [
             'foo' => [
-                'bar.baz' => 23
+                'bar.baz' => 23,
             ],
             'foo.bar' => [
-                'baz' => 43
+                'baz' => 43,
             ],
         ];
 
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 702598d0a0d5..4175bb2b99c4 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -42,7 +42,7 @@ The following functions are available:
 
     :param	string	$index: Cookie name
     :param	bool	$xss_clean: Whether to apply XSS filtering to the returned value
-    :returns:	The cookie value or NULL if not found
+    :returns:	The cookie value or null if not found
     :rtype:	mixed
 
     This helper function gives you friendlier syntax to get browser
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 2c483668c067..0b7aeead3329 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -20,7 +20,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: now([$timezone = NULL])
+.. php:function:: now([$timezone = null])
 
     :param	string	$timezone: Timezone
     :returns:	UNIX timestamp
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 5cfffae21f33..fc91a70f111e 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -22,7 +22,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = FALSE]])
+.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = false]])
 
     :param	string  $source_dir: Path to the source directory
     :param	int	    $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
@@ -46,7 +46,7 @@ The following functions are available:
     hidden directories will be skipped. To override this behavior, you may
     set a third parameter to true (boolean)::
 
-        $map = directory_map('./mydirectory/', FALSE, TRUE);
+        $map = directory_map('./mydirectory/', false, true);
 
     Each folder name will be an array index, while its contained files will
     be numerically indexed. Here is an example of a typical array::
@@ -91,12 +91,9 @@ The following functions are available:
 
     Example::
 
-        try
-        {     
+        try {     
             directory_mirror($uploadedImages, FCPATH . 'images/');
-        }
-        catch (Throwable $e)
-        {     
+        } catch (Throwable $e) {     
             echo 'Failed to export uploads!';
         }
 
@@ -107,7 +104,7 @@ The following functions are available:
     :param	string	$path: File path
     :param	string	$data: Data to write to file
     :param	string	$mode: ``fopen()`` mode
-    :returns:	TRUE if the write was successful, FALSE in case of an error
+    :returns:	true if the write was successful, false in case of an error
     :rtype:	bool
 
     Writes data to the file specified in the path. If the file does not exist then the
@@ -116,12 +113,10 @@ The following functions are available:
     Example::
 
         $data = 'Some file data';
-        if ( ! write_file('./path/to/file.php', $data))
-        {     
+
+        if ( ! write_file('./path/to/file.php', $data)) {     
             echo 'Unable to write the file';
-        }
-        else
-        {     
+        } else {     
             echo 'File written!';
         }
 
@@ -142,13 +137,13 @@ The following functions are available:
 
     .. note:: This function acquires an exclusive lock on the file while writing to it.
 
-.. php:function:: delete_files($path[, $delDir = FALSE[, $htdocs = FALSE[, $hidden = FALSE]]])
+.. php:function:: delete_files($path[, $delDir = false[, $htdocs = false[, $hidden = false]]])
 
     :param	string	$path: Directory path
     :param	bool	$delDir: Whether to also delete directories
     :param	bool	$htdocs: Whether to skip deleting .htaccess and index page files
     :param  bool    $hidden: Whether to also delete hidden files (files beginning with a period)
-    :returns:	TRUE on success, FALSE in case of an error
+    :returns:	true on success, false in case of an error
     :rtype:	bool
 
     Deletes ALL files contained in the supplied path.
@@ -157,16 +152,16 @@ The following functions are available:
 
         delete_files('./path/to/directory/');
 
-    If the second parameter is set to TRUE, any directories contained within the supplied
+    If the second parameter is set to true, any directories contained within the supplied
     root path will be deleted as well.
 
     Example::
 
-        delete_files('./path/to/directory/', TRUE);
+        delete_files('./path/to/directory/', true);
 
     .. note:: The files must be writable or owned by the system in order to be deleted.
 
-.. php:function:: get_filenames($source_dir[, $include_path = FALSE])
+.. php:function:: get_filenames($source_dir[, $include_path = false])
 
     :param	string	$source_dir: Directory path
     :param	bool|null	$include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path
@@ -192,7 +187,7 @@ The following functions are available:
 
     Reads the specified directory and builds an array containing the filenames, filesize,
     dates, and permissions. Sub-folders contained within the specified path are only read
-    if forced by sending the second parameter to FALSE, as this can be an intensive
+    if forced by sending the second parameter to false, as this can be an intensive
     operation.
 
     Example::
@@ -203,7 +198,7 @@ The following functions are available:
 
     :param	string	        $file: File path
     :param	array|string    $returned_values: What type of info to return to be passed as array or comma separated string
-    :returns:	An array containing info on the specified file or FALSE on failure
+    :returns:	An array containing info on the specified file or false on failure
     :rtype:	array
 
     Given a file and path, returns (optionally) the *name*, *path*, *size* and *date modified*
@@ -252,7 +247,7 @@ The following functions are available:
 
         echo same_file($newFile, $oldFile) ? 'Same!' : 'Different!';
 
-.. php:function:: set_realpath($path[, $check_existence = FALSE])
+.. php:function:: set_realpath($path[, $check_existence = false])
 
     :param	string	$path: Path
     :param	bool	$check_existence: Whether to check if the path actually exists
@@ -269,12 +264,12 @@ The following functions are available:
         echo set_realpath($file); // Prints '/etc/php5/apache2/php.ini'
 
         $non_existent_file = '/path/to/non-exist-file.txt';
-        echo set_realpath($non_existent_file, TRUE);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_file, FALSE);	// Prints '/path/to/non-exist-file.txt'
+        echo set_realpath($non_existent_file, true);	// Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_file, false);	// Prints '/path/to/non-exist-file.txt'
 
         $directory = '/etc/php5';
         echo set_realpath($directory);	// Prints '/etc/php5/'
 
         $non_existent_directory = '/path/to/nowhere';
-        echo set_realpath($non_existent_directory, TRUE);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_directory, FALSE);	// Prints '/path/to/nowhere'
+        echo set_realpath($non_existent_directory, true);	// Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_directory, false);	// Prints '/path/to/nowhere'
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index f9b37070a652..f54b1166a05e 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -151,7 +151,7 @@ The following functions are available:
         $data = [
             'name'  => 'John Doe',
             'email' => 'john@example.com',
-            'url'   => 'http://example.com'
+            'url'   => 'http://example.com',
         ];
 
         echo form_hidden($data);
@@ -169,7 +169,7 @@ The following functions are available:
         $data = [
             'name'  => 'John Doe',
             'email' => 'john@example.com',
-            'url'   => 'http://example.com'
+            'url'   => 'http://example.com',
         ];
 
         echo form_hidden('my_array', $data);
@@ -189,7 +189,7 @@ The following functions are available:
             'name'  => 'email',
             'id'    => 'hiddenemail',
             'value' => 'john@example.com',
-            'class' => 'hiddenemail'
+            'class' => 'hiddenemail',
         ];
 
         echo form_input($data);
@@ -223,7 +223,7 @@ The following functions are available:
             'value'     => 'johndoe',
             'maxlength' => '100',
             'size'      => '50',
-            'style'     => 'width:50%'
+            'style'     => 'width:50%',
         ];
 
         echo form_input($data);
@@ -237,12 +237,12 @@ The following functions are available:
     If you would like your form to contain some additional data, like
     JavaScript, you can pass it as a string in the third parameter::
 
-        $js = 'onClick="some_function()"';
+        $js = 'onClick="some_function ()"';
         echo form_input('username', 'johndoe', $js);
 
     Or you can pass it as an array::
 
-        $js = ['onClick' => 'some_function();'];
+        $js = ['onClick' => 'some_function ();'];
         echo form_input('username', 'johndoe', $js);
 
     To support the expanded range of HTML5 input fields, you can pass an input type in as the fourth parameter::
@@ -442,7 +442,7 @@ The following functions are available:
         echo form_fieldset_close($string);
         // Would produce: </fieldset></div></div>
 
-.. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = FALSE[, $extra = '']]]])
+.. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
     :param	array	$data: Field attributes data
     :param	string	$value: Field value
@@ -453,10 +453,10 @@ The following functions are available:
 
     Lets you generate a checkbox field. Simple example::
 
-        echo form_checkbox('newsletter', 'accept', TRUE);
+        echo form_checkbox('newsletter', 'accept', true);
         // Would produce:  <input type="checkbox" name="newsletter" value="accept" checked="checked" />
 
-    The third parameter contains a boolean TRUE/FALSE to determine whether
+    The third parameter contains a boolean true/false to determine whether
     the box should be checked or not.
 
     Similar to the other form functions in this helper, you can also pass an
@@ -466,7 +466,7 @@ The following functions are available:
             'name'    => 'newsletter',
             'id'      => 'newsletter',
             'value'   => 'accept',
-            'checked' => TRUE,
+            'checked' => true,
             'style'   => 'margin:10px'
         ];
 
@@ -478,14 +478,14 @@ The following functions are available:
     fourth parameter::
 
         $js = 'onClick="some_function()"';
-        echo form_checkbox('newsletter', 'accept', TRUE, $js);
+        echo form_checkbox('newsletter', 'accept', true, $js);
 
     Or you can pass it as an array::
 
         $js = ['onClick' => 'some_function();'];
-        echo form_checkbox('newsletter', 'accept', TRUE, $js);
+        echo form_checkbox('newsletter', 'accept', true, $js);
 
-.. php:function:: form_radio([$data = ''[, $value = ''[, $checked = FALSE[, $extra = '']]]])
+.. php:function:: form_radio([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
     :param	array	$data: Field attributes data
     :param	string	$value: Field value
@@ -573,7 +573,7 @@ The following functions are available:
             'id'      => 'button',
             'value'   => 'true',
             'type'    => 'reset',
-            'content' => 'Reset'
+            'content' => 'Reset',
         ];
 
         echo form_button($data);
@@ -599,7 +599,7 @@ The following functions are available:
         echo form_close($string);
         // Would produce:  </form> </div></div>
 
-.. php:function:: set_value($field[, $default = ''[, $html_escape = TRUE]])
+.. php:function:: set_value($field[, $default = ''[, $html_escape = true]])
 
     :param	string	$field: Field name
     :param	string	$default: Default value
@@ -620,7 +620,7 @@ The following functions are available:
 
     The above form will show "0" when loaded for the first time.
 
-.. php:function:: set_select($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_select($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -633,17 +633,17 @@ The following functions are available:
 
     The first parameter must contain the name of the select menu, the second
     parameter must contain the value of each item, and the third (optional)
-    parameter lets you set an item as the default (use boolean TRUE/FALSE).
+    parameter lets you set an item as the default (use boolean true/false).
 
     Example::
 
         <select name="myselect">
-            <option value="one" <?= set_select('myselect', 'one', TRUE) ?>>One</option>
+            <option value="one" <?= set_select('myselect', 'one', true) ?>>One</option>
             <option value="two" <?= set_select('myselect', 'two') ?>>Two</option>
             <option value="three" <?= set_select('myselect', 'three') ?>>Three</option>
         </select>
 
-.. php:function:: set_checkbox($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_checkbox($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -655,14 +655,14 @@ The following functions are available:
 
     The first parameter must contain the name of the checkbox, the second
     parameter must contain its value, and the third (optional) parameter
-    lets you set an item as the default (use boolean TRUE/FALSE).
+    lets you set an item as the default (use boolean true/false).
 
     Example::
 
         <input type="checkbox" name="mycheck" value="1" <?= set_checkbox('mycheck', '1') ?> />
         <input type="checkbox" name="mycheck" value="2" <?= set_checkbox('mycheck', '2') ?> />
 
-.. php:function:: set_radio($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_radio($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -675,7 +675,7 @@ The following functions are available:
 
     Example::
 
-        <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', TRUE) ?> />
+        <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', true) ?> />
         <input type="radio" name="myradio" value="2" <?= set_radio('myradio', '2') ?> />
 
     .. note:: If you are using the Form Validation class, you must always specify
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 72a9ed9640a9..a477b9cbd311 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -59,7 +59,7 @@ The following functions are available:
             'width'  => '200',
             'height' => '200',
             'title'  => 'That was quite a night',
-            'rel'    => 'lightbox'
+            'rel'    => 'lightbox',
         ];
 
         img($imageProperties);
@@ -126,7 +126,7 @@ The following functions are available:
             'href'  => 'css/printer.css',
             'rel'   => 'stylesheet',
             'type'  => 'text/css',
-            'media' => 'print'
+            'media' => 'print',
         ];
 
         echo link_tag($link);
@@ -171,12 +171,12 @@ The following functions are available:
             'red',
             'blue',
             'green',
-            'yellow'
+            'yellow',
         ];
 
         $attributes = [
             'class' => 'boldlist',
-            'id'    => 'mylist'
+            'id'    => 'mylist',
         ];
 
         echo ul($list, $attributes);
@@ -196,14 +196,14 @@ The following functions are available:
 
         $attributes = [
             'class' => 'boldlist',
-            'id'    => 'mylist'
+            'id'    => 'mylist',
         ];
 
         $list = [
             'colors' => [
                 'red',
                 'blue',
-                'green'
+                'green',
             ],
             'shapes' => [
                 'round',
@@ -211,8 +211,8 @@ The following functions are available:
                 'circles' => [
                     'ellipse',
                     'oval',
-                    'sphere'
-                ]
+                    'sphere',
+                ],
             ],
             'moods'  => [
                 'happy',
@@ -220,11 +220,11 @@ The following functions are available:
                     'defeated' => [
                         'dejected',
                         'disheartened',
-                        'depressed'
+                        'depressed',
                     ],
                     'annoyed',
                     'cross',
-                    'angry'
+                    'angry',
                 ]
             ]
         ];
@@ -300,30 +300,26 @@ The following functions are available:
     Permits you to generate HTML video element from simple or
     source arrays. Example::
 
-        $tracks =
-        [
+        $tracks = [
             track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
             track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
         ];
 
         echo video('test.mp4', 'Your browser does not support the video tag.', 'controls');
 
-        echo video
-        (
+        echo video(
             'http://www.codeigniter.com/test.mp4',
             'Your browser does not support the video tag.',
             'controls',
             $tracks
         );
 
-        echo video
-        (
-            [
-              source('movie.mp4', 'video/mp4', 'class="test"'),
-              source('movie.ogg', 'video/ogg'),
-              source('movie.mov', 'video/quicktime'),
-              source('movie.ogv', 'video/ogv; codecs=dirac, speex')
-            ],
+        echo video([
+            source('movie.mp4', 'video/mp4', 'class="test"'),
+            source('movie.ogg', 'video/ogg'),
+            source('movie.mov', 'video/quicktime'),
+            source('movie.ogv', 'video/ogv; codecs=dirac, speex')
+        ],
             'Your browser does not support the video tag.',
             'class="test" controls',
             $tracks
@@ -408,8 +404,7 @@ The following functions are available:
 
         echo object('movie.swf', 'application/x-shockwave-flash', 'class="test"');
 
-        echo object
-        (
+        echo object(
             'movie.swf',
             'application/x-shockwave-flash',
             'class="test"',
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index f006869d0625..fdc70a4cd92d 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -105,12 +105,12 @@ The following functions are available:
 .. php:function:: is_pluralizable($word)
 
     :param	string	$word: Input string
-    :returns:	TRUE if the word is countable or FALSE if not
+    :returns:	true if the word is countable or false if not
     :rtype:	bool
 
     Checks if the given word has a plural version. Example::
 
-        is_pluralizable('equipment'); // Returns FALSE
+        is_pluralizable('equipment'); // Returns false
 
 .. php:function:: dasherize($string)
 
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index 4e45620b253d..6b875e3d7e36 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -72,8 +72,7 @@ The following functions are available:
     Allows two or more items to be alternated between, when cycling through
     a loop. Example::
 
-        for ($i = 0; $i < 10; $i++)
-        {     
+        for ($i = 0; $i < 10; $i++) {     
             echo alternator('string one', 'string two');
         }
 
@@ -82,8 +81,7 @@ The following functions are available:
 
     ::
 
-        for ($i = 0; $i < 10; $i++)
-        {     
+        for ($i = 0; $i < 10; $i++) {     
             echo alternator('one', 'two', 'three', 'four', 'five');
         }
 
@@ -132,7 +130,7 @@ The following functions are available:
         and handle string inputs. This however makes it just an
         alias for ``stripslashes()``.
 
-.. php:function:: reduce_multiples($str[, $character = ''[, $trim = FALSE]])
+.. php:function:: reduce_multiples($str[, $character = ''[, $trim = false]])
 
     :param	string	$str: Text to search in
     :param	string	$character: Character to reduce
@@ -146,11 +144,11 @@ The following functions are available:
         $string = "Fred, Bill,, Joe, Jimmy";
         $string = reduce_multiples($string, ","); // results in "Fred, Bill, Joe, Jimmy"
 
-    If the third parameter is set to TRUE it will remove occurrences of the
+    If the third parameter is set to true it will remove occurrences of the
     character at the beginning and the end of the string. Example::
 
         $string = ",Fred, Bill,, Joe, Jimmy,";
-        $string = reduce_multiples($string, ", ", TRUE); // results in "Fred, Bill, Joe, Jimmy"
+        $string = reduce_multiples($string, ", ", true); // results in "Fred, Bill, Joe, Jimmy"
 
 .. php:function:: quotes_to_entities($str)
 
@@ -234,7 +232,7 @@ The following functions are available:
 
         $string = ascii_to_entities($string);
 
-.. php:function:: entities_to_ascii($str[, $all = TRUE])
+.. php:function:: entities_to_ascii($str[, $all = true])
 
     :param	string	$str: Input string
     :param	bool	$all: Whether to convert unsafe entities as well
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 1c1ca5866ef8..16cd6e4534df 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -17,7 +17,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: site_url([$uri = ''[, $protocol = NULL[, $altConfig = NULL]]])
+.. php:function:: site_url([$uri = ''[, $protocol = null[, $altConfig = null]]])
 
     :param  mixed         $uri: URI string or array of URI segments
     :param  string        $protocol: Protocol, e.g., 'http' or 'https'
@@ -51,7 +51,7 @@ The following functions are available:
     different site than yours, which contains different configuration preferences.
     We use this for unit testing the framework itself.
 
-.. php:function:: base_url([$uri = ''[, $protocol = NULL]])
+.. php:function:: base_url([$uri = ''[, $protocol = null]])
 
     :param  mixed   $uri: URI string or array of URI segments
     :param  string  $protocol: Protocol, e.g., 'http' or 'https'
@@ -127,13 +127,13 @@ The following functions are available:
         /blog/comments/123
 
     Or with the optional relative parameter::
-    
+
         app.baseURL = http://some-site.com/subfolder/
 
         uri_string(); // "/subfolder/blog/comments/123"
         uri_string(true); // "blog/comments/123"
 
-.. php:function:: index_page([$altConfig = NULL])
+.. php:function:: index_page([$altConfig = null])
 
     :param \\Config\\App $altConfig: Alternate configuration to use
     :returns: 'index_page' value
@@ -149,7 +149,7 @@ The following functions are available:
     different site than yours, which contains different configuration preferences.
     We use this for unit testing the framework itself.
 
-.. php:function:: anchor([$uri = ''[, $title = ''[, $attributes = ''[, $altConfig = NULL]]]])
+.. php:function:: anchor([$uri = ''[, $title = ''[, $attributes = ''[, $altConfig = null]]]])
 
     :param  mixed         $uri: URI string or array of URI segments
     :param  string        $title: Anchor title
@@ -194,7 +194,7 @@ The following functions are available:
 
     .. note:: Attributes passed into the anchor function are automatically escaped to protected against XSS attacks.
 
-.. php:function:: anchor_popup([$uri = ''[, $title = ''[, $attributes = FALSE[, $altConfig = NULL]]]])
+.. php:function:: anchor_popup([$uri = ''[, $title = ''[, $attributes = false[, $altConfig = null]]]])
 
     :param  string          $uri: URI string
     :param  string          $title: Anchor title
@@ -219,7 +219,7 @@ The following functions are available:
             'resizable'   => 'yes',
             'screenx'     => 0,
             'screeny'     => 0,
-            'window_name' => '_blank'
+            'window_name' => '_blank',
         ];
 
         echo anchor_popup('news/local/123', 'Click Me!', $atts);
@@ -277,7 +277,7 @@ The following functions are available:
     version of the *mailto* tag using ordinal numbers written with JavaScript to
     help prevent the e-mail address from being harvested by spam bots.
 
-.. php:function:: auto_link($str[, $type = 'both'[, $popup = FALSE]])
+.. php:function:: auto_link($str[, $type = 'both'[, $popup = false]])
 
     :param  string  $str: Input string
     :param  string  $type: Link type ('email', 'url' or 'both')
@@ -304,13 +304,13 @@ The following functions are available:
         $string = auto_link($string, 'email');
 
     The third parameter determines whether links are shown in a new window.
-    The value can be TRUE or FALSE (boolean)::
+    The value can be true or false (boolean)::
 
-        $string = auto_link($string, 'both', TRUE);
+        $string = auto_link($string, 'both', true);
 
     .. note:: The only URLs recognized are those that start with "www." or with "://".
 
-.. php:function:: url_title($str[, $separator = '-'[, $lowercase = FALSE]])
+.. php:function:: url_title($str[, $separator = '-'[, $lowercase = false]])
 
     :param  string  $str: Input string
     :param  string  $separator: Word separator (usually '-' or '_')
@@ -336,15 +336,15 @@ The following functions are available:
         // Produces: Whats_wrong_with_CSS
 
     The third parameter determines whether or not lowercase characters are
-    forced. By default they are not. Options are boolean TRUE/FALSE.
+    forced. By default they are not. Options are boolean true/false.
 
     Example::
 
         $title     = "What's wrong with CSS?";
-        $url_title = url_title($title, '-', TRUE);
+        $url_title = url_title($title, '-', true);
         // Produces: whats-wrong-with-css
 
-.. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = FALSE]])
+.. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
 
     :param  string  $str: Input string
     :param  string  $separator: Word separator (usually '-' or '_')
@@ -358,7 +358,7 @@ The following functions are available:
 .. php:function:: prep_url([$str = ''[, $secure = false]])
 
     :param  string   $str: URL string
-    :param  boolean  $secure: TRUE for https://
+    :param  boolean  $secure: true for https://
     :returns: Protocol-prefixed URL string
     :rtype: string
 
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index 72d4b7c5c7a9..4f7ff453384a 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -22,7 +22,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: xml_convert($str[, $protect_all = FALSE])
+.. php:function:: xml_convert($str[, $protect_all = false])
 
     :param string $str: the text string to convert
     :param bool $protect_all: Whether to protect all content that looks like a potential entity instead of just numbered entities, e.g., &foo;
diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst
index 0b95b51f9a8c..11940b82092a 100644
--- a/user_guide_src/source/incoming/content_negotiation.rst
+++ b/user_guide_src/source/incoming/content_negotiation.rst
@@ -52,7 +52,7 @@ be able to return data as raw HTML, JSON, or XML. This list should be provided i
     $supported = [
         'application/json',
         'text/html',
-        'application/xml'
+        'application/xml',
     ];
 
     $format = $request->negotiate('media', $supported);
@@ -84,7 +84,7 @@ and German you would do something like::
 
     $supported = [
         'en',
-        'de'
+        'de',
     ];
 
     $lang = $request->negotiate('language', $supported);
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 8270b1c0701a..49075fc84500 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -224,12 +224,9 @@ be passed as a parameter to the ``_remap()`` method::
 
     public function _remap($method)
     {
-        if ($method === 'some_method')
-        {
+        if ($method === 'some_method') {
             return $this->$method();
-        }
-        else
-        {
+        } else {
             return $this->default_method();
         }
     }
@@ -242,10 +239,11 @@ Example::
     public function _remap($method, ...$params)
     {
         $method = 'process_'.$method;
-        if (method_exists($this, $method))
-        {
+
+        if (method_exists($this, $method)) {
             return $this->$method(...$params);
         }
+
         throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
     }
 
@@ -321,8 +319,7 @@ An instance of the :doc:`Logger <../general/logging>` class is available as a cl
 A convenience method for forcing a method to be accessed via HTTPS is available within all
 controllers::
 
-    if (! $this->request->isSecure())
-    {
+    if (! $this->request->isSecure()) {
         $this->forceHTTPS();
     }
 
@@ -330,9 +327,8 @@ By default, and in modern browsers that support the HTTP Strict Transport Securi
 call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
 modify this by passing the duration (in seconds) as the first parameter::
 
-    if (! $this->request->isSecure())
-    {
-        $this->forceHTTPS(31536000);    // one year
+    if (! $this->request->isSecure()) {
+        $this->forceHTTPS(31536000); // one year
     }
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including YEAR, MONTH, and more.
@@ -367,8 +363,7 @@ rule and message array formats, as well as available rules.::
         if (! $this->validate([
             'email' => "required|is_unique[users.email,id,{$userID}]",
             'name'  => 'required|alpha_numeric_spaces'
-        ]))
-        {
+        ])) {
             return view('users/update', [
                 'errors' => $this->validator->getErrors()
             ]);
@@ -382,8 +377,7 @@ the $rules array with the name of the group as defined in ``Config\Validation.ph
 
     public function updateUser(int $userID)
     {
-        if (! $this->validate('userRules'))
-        {
+        if (! $this->validate('userRules')) {
             return view('users/update', [
                 'errors' => $this->validator->getErrors()
             ]);
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index ce7ddcbc582b..a95333516503 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -67,8 +67,7 @@ This is typically used to perform redirects, like in this example::
     {
         $auth = service('auth');
 
-        if (! $auth->isLoggedIn())
-        {
+        if (! $auth->isLoggedIn()) {
             return redirect()->to(site_url('login'));
         }
     }
@@ -128,7 +127,7 @@ run on every request. Filters can be specified by adding their alias to either t
         'before' => [
             'csrf',
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
@@ -140,7 +139,7 @@ an array with the 'except' key and a uri to match as the value alongside the ali
         'before' => [
             'csrf' => ['except' => 'api/*'],
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 Any place you can use a URI in the filter settings, you can use a regular expression or, like in this example, use
@@ -152,7 +151,7 @@ URI's you can use an array of URI patterns::
         'before' => [
             'csrf' => ['except' => ['foo/*', 'bar/*']],
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 $methods
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 968872c9f218..50b152d5dd14 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -25,8 +25,7 @@ An instance of the request class already populated for you if the current class
     {
         public function index()
         {
-            if ($this->request->isAJAX())
-            {
+            if ($this->request->isAJAX()) {
                 // ...
             }
         }
@@ -63,19 +62,17 @@ A request could be of several types, including an AJAX request or a request from
 be checked with the ``isAJAX()`` and ``isCLI()`` methods::
 
     // Check for AJAX request.
-    if ($request->isAJAX())
-    {
+    if ($request->isAJAX()) {
         // ...
     }
 
     // Check for CLI Request
-    if ($request->isCLI())
-    {
+    if ($request->isCLI()) {
         // ...
     }
 
-.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, 
-    which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch). 
+.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header,
+    which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch).
     See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 
 You can check the HTTP method that this request represents with the ``method()`` method::
@@ -91,8 +88,7 @@ uppercase version by wrapping the call in ``str_to_upper()``::
 
 You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method::
 
-    if (! $request->isSecure())
-    {
+    if (! $request->isSecure()) {
         force_https();
     }
 
@@ -106,7 +102,7 @@ will return null if the item doesn't exist, and you can have the data filtered.
 use data without having to test whether an item exists first. In other words, normally you might do something
 like this::
 
-    $something = isset($_POST['foo']) ? $_POST['foo'] : NULL;
+    $something = isset($_POST['foo']) ? $_POST['foo'] : null;
 
 With CodeIgniter’s built in methods you can simply do this::
 
@@ -236,8 +232,7 @@ specified header object in a case-insensitive manner if it exists. If not, then
 
 You can always use ``hasHeader()`` to see if the header existed in this request::
 
-    if ($request->hasHeader('DNT'))
-    {
+    if ($request->hasHeader('DNT')) {
         // Don't track something...
     }
 
@@ -298,8 +293,7 @@ and uses best practices to minimize any security risks.
     $files = $request->getFiles();
 
     // Grab the file by name given in HTML form
-    if ($files->hasFile('uploadedFile'))
-    {
+    if ($files->hasFile('uploadedFile')) {
         $file = $files->getFile('uploadedfile');
 
         // Generate a new secure name
@@ -308,9 +302,9 @@ and uses best practices to minimize any security risks.
         // Move the file to it's new home
         $file->move('/path/to/dir', $name);
 
-        echo $file->getSize('mb');      // 1.23
-        echo $file->getExtension();     // jpg
-        echo $file->getType();          // image/jpg
+        echo $file->getSize('mb'); // 1.23
+        echo $file->getExtension(); // jpg
+        echo $file->getType(); // image/jpg
     }
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input::
@@ -386,9 +380,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getVar([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be found 
+        :param  int     $filter: The type of filter to apply. A list of filters can be found
                         `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:   $_REQUEST if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: mixed|null
@@ -411,7 +405,7 @@ The methods provided by the parent classes that are available are:
         first parameter to null while setting the second parameter to the filter
         you want to use::
 
-            $request->getVar(null, FILTER_SANITIZE_STRING); 
+            $request->getVar(null, FILTER_SANITIZE_STRING);
             // returns all POST items with string sanitation
 
         To return an array of multiple POST parameters, pass all the required keys as an array::
@@ -426,9 +420,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_GET if no parameters supplied, otherwise the GET value if found, or null if not
         :rtype: mixed|null
@@ -438,9 +432,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getPost([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -450,9 +444,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getPostGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -466,9 +460,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -483,9 +477,9 @@ The methods provided by the parent classes that are available are:
         :noindex:
 
         :param	mixed	$index: COOKIE name
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:	    $_COOKIE if no parameters supplied, otherwise the COOKIE value if found or null if not
         :rtype:	mixed
@@ -507,11 +501,11 @@ The methods provided by the parent classes that are available are:
         :noindex:
 
         :param	mixed	$index: Value name
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns:	    $_SERVER item value if found, NULL if not
+        :returns:	    $_SERVER item value if found, null if not
         :rtype:	mixed
 
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
@@ -527,7 +521,7 @@ The methods provided by the parent classes that are available are:
 
     .. php:method:: getUserAgent([$filter = null])
 
-        :param  int $filter: The type of filter to apply. A list of filters can be 
+        :param  int $filter: The type of filter to apply. A list of filters can be
                     found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: mixed
diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst
index 91ebd2ae789c..317f7823b8d2 100644
--- a/user_guide_src/source/incoming/message.rst
+++ b/user_guide_src/source/incoming/message.rst
@@ -123,7 +123,7 @@ Class Reference
     .. php:method:: hasHeader($name)
 
         :param  string  $name: The name of the header you want to see if it exists.
-        :returns: Returns TRUE if it exists, FALSE otherwise.
+        :returns: Returns true if it exists, false otherwise.
         :rtype: bool
 
     .. php:method:: getHeaderLine($name)
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 7c4df0d5309b..1fdbce30d5ee 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -1,5 +1,5 @@
 Request Class
-****************************************************
+*************
 
 The request class is an object-oriented representation of an HTTP request. This is meant to
 work for both incoming, such as a request to the application from a browser, and outgoing requests,
@@ -11,7 +11,7 @@ See the documentation for the :doc:`IncomingRequest Class </incoming/incomingreq
 :doc:`CURLRequest Class </libraries/curlrequest>` for more usage details.
 
 Class Reference
-============================================================
+===============
 
 .. php:class:: CodeIgniter\\HTTP\\Request
 
@@ -46,19 +46,16 @@ Class Reference
 
             ::
 
-                if ( ! $request->isValidIP($ip))
-                {
+                if ( ! $request->isValidIP($ip)) {
                     echo 'Not Valid';
-                }
-                else
-                {
+                } else {
                     echo 'Valid';
                 }
 
         Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify
         an IP format. The default checks for both formats.
 
-    .. php:method:: getMethod([$upper = FALSE])
+    .. php:method:: getMethod([$upper = false])
 
 		.. important:: Use of the ``$upper`` parameter is deprecated.
 
@@ -70,8 +67,8 @@ Class Reference
         in uppercase or lowercase.
         ::
 
-            echo $request->getMethod(TRUE); // Outputs: POST
-            echo $request->getMethod(FALSE); // Outputs: post
+            echo $request->getMethod(true); // Outputs: POST
+            echo $request->getMethod(false); // Outputs: post
             echo $request->getMethod(); // Outputs: post
 
     .. php:method:: setMethod($method)
@@ -85,7 +82,7 @@ Class Reference
         :param    mixed     $index: Value name
         :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_SERVER item value if found, NULL if not
+        :returns: $_SERVER item value if found, null if not
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
@@ -104,7 +101,7 @@ Class Reference
         :param    mixed     $index: Value name
         :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_ENV item value if found, NULL if not
+        :returns: $_ENV item value if found, null if not
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 6b8c194d67d1..d03d59ddf263 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -103,7 +103,7 @@ Note that a single ``(:any)`` will match multiple segments in the URL if present
 
 	$routes->add('product/(:any)', 'Catalog::productLookup/$1');
 
-will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the 
+will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the
 Controller should take into account the maximum parameters::
 
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
@@ -112,7 +112,7 @@ Controller should take into account the maximum parameters::
         echo $seg3; // false in first and second, 789 in third
     }
 
-If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the 
+If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above::
 
 	$routes->add('product/(:segment)', 'Catalog::productLookup/$1');
@@ -171,9 +171,9 @@ You can use an anonymous function, or Closure, as the destination that a route m
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
 a simple view::
 
-    $routes->add('feed', function()
-    {
+    $routes->add('feed', function () {
         $rss = new RSSFeeder();
+
         return $rss->feed('general');
     });
 
@@ -185,7 +185,7 @@ the ``map()`` method. Instead of calling the ``add()`` method for each route tha
 define an array of routes and then pass it as the first parameter to the ``map()`` method::
 
     $routes = [];
-    $routes['product/(:num)']      = 'Catalog::productLookupById';
+    $routes['product/(:num)'] = 'Catalog::productLookupById';
     $routes['product/(:alphanum)'] = 'Catalog::productLookupByName';
 
     $collection->map($routes);
@@ -216,8 +216,7 @@ You can group your routes under a common name with the ``group()`` method. The g
 appears prior to the routes defined inside of the group. This allows you to reduce the typing needed to build out an
 extensive set of routes that all share the opening string, like when building an admin area::
 
-    $routes->group('admin', function($routes)
-    {
+    $routes->group('admin', function ($routes) {
         $routes->add('users', 'Admin\Users::index');
         $routes->add('blog', 'Admin\Blog::index');
     });
@@ -226,8 +225,7 @@ This would prefix the 'users' and 'blog" URIs with "admin", handling URLs like `
 
 If you need to assign options to a group, like a `namespace <#assigning-namespace>`_, do it before the callback::
 
-    $routes->group('api', ['namespace' => 'App\API\v1'], function($routes)
-    {
+    $routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
         $routes->resource('users');
     });
 
@@ -236,8 +234,7 @@ This would handle a resource route to the ``App\API\v1\Users`` controller with t
 You can also use a specific `filter <filters.html>`_ for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging::
 
-    $routes->group('api', ['filter' => 'api-auth'], function($routes)
-    {
+    $routes->group('api', ['filter' => 'api-auth'], function ($routes) {
         $routes->resource('users');
     });
 
@@ -245,21 +242,18 @@ The value for the filter must match one of the aliases defined within ``app/Conf
 
 It is possible to nest groups within groups for finer organization if you need it::
 
-    $routes->group('admin', function($routes)
-    {
-        $routes->group('users', function($routes)
-        {
+    $routes->group('admin', function ($routes) {
+        $routes->group('users', function ($routes) {
             $routes->add('list', 'Admin\Users::list');
         });
-
     });
 
-This would handle the URL at ``admin/users/list``. Note that options passed to the outer ``group()`` (for example 
+This would handle the URL at ``admin/users/list``. Note that options passed to the outer ``group()`` (for example
 ``namespace`` and ``filter``) are not merged with the inner ``group()`` options.
 
-At some point, you may want to group routes for the purpose of applying filters or other route 
-config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass 
-an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the 
+At some point, you may want to group routes for the purpose of applying filters or other route
+config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass
+an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
 given route config options.
 
 Environment Restrictions
@@ -270,8 +264,7 @@ tools that only the developer can use on their local machines that are not reach
 This can be done with the ``environment()`` method. The first parameter is the name of the environment. Any
 routes defined within this closure are only accessible from the given environment::
 
-    $routes->environment('development', function($routes)
-    {
+    $routes->environment('development', function ($routes) {
         $routes->add('builder', 'Tools\Builder::index');
     });
 
@@ -354,7 +347,7 @@ can modify the generated routes, or further restrict them. The ``$options`` arra
     $routes->match(['get', 'put'], 'from', 'to', $options);
     $routes->resource('photos', $options);
     $routes->map($array, $options);
-    $routes->group('name', $options, function());
+    $routes->group('name', $options, function ());
 
 Applying Filters
 ----------------
@@ -545,7 +538,7 @@ a valid class/method pair, just like you would show in any route, or a Closure::
     $routes->set404Override('App\Errors::show404');
 
     // Will display a custom view
-    $routes->set404Override(function()
+    $routes->set404Override(function ()
     {
         echo view('my_errors/not_found.html');
     });
@@ -563,4 +556,3 @@ For an example of use lowering the priority see :ref:`priority`::
 
     // to disable
     $routes->setPrioritize(false);
-
diff --git a/user_guide_src/source/installation/upgrade_413.rst b/user_guide_src/source/installation/upgrade_413.rst
index 9be19f1542ab..2ecfd237ea0f 100644
--- a/user_guide_src/source/installation/upgrade_413.rst
+++ b/user_guide_src/source/installation/upgrade_413.rst
@@ -1,5 +1,5 @@
 #############################
-Upgrading from 4.1.1 to 4.1.2
+Upgrading from 4.1.2 to 4.1.3
 #############################
 
 **Cache TTL**
diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
new file mode 100644
index 000000000000..8f84809fb664
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -0,0 +1,95 @@
+#############################
+Upgrading from 4.1.3 to 4.1.4
+#############################
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
+**Method Scope**
+
+The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses.
+If you relied on any of these methods being public (highly unlikely) adjust your code accordingly::
+
+* ``CodeIgniter\Database\MySQLi\Connection::execute()``
+* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+* ``CodeIgniter\Database\Postgre\Connection::execute()``
+* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLite3\Connection::execute()``
+* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+
+Project Files
+=============
+
+Numerous files in the project space (root, app, public, writable) received updates. Due to
+these files being outside of the system scope they will not be changed without your intervention.
+There are some third-party CodeIgniter modules available to assist with merging changes to
+the project space: `Explore on Packagist <https://packagist.org/explore/?query=codeigniter4%20updates>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+Content Changes
+---------------
+
+The following files received significant changes (including deprecations or visual adjustments)
+and it is recommended that you merge the updated versions with your application:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Security.php``
+* ``app/Views/errors/html/*``
+* ``env``
+* ``spark``
+
+All Changes
+-----------
+
+This is a list of all files in the project space that received changes;
+many will be simple comments or formatting that have no affect on the runtime:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/ContentSecurityPolicy.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Logger.php``
+* ``app/Config/Mimes.php``
+* ``app/Config/Modules.php``
+* ``app/Config/Security.php``
+* ``app/Controllers/BaseController.php``
+* ``app/Views/errors/html/debug.css``
+* ``app/Views/errors/html/error_404.php``
+* ``app/Views/errors/html/error_exception.php``
+* ``app/Views/welcome_message.php``
+* ``composer.json``
+* ``contributing/guidelines.rst``
+* ``env``
+* ``phpstan.neon.dist``
+* ``phpunit.xml.dist``
+* ``public/.htaccess``
+* ``public/index.php``
+* ``rector.php``
+* ``spark``
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 18908f7a72c2..de8eee5c53c5 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -22,16 +22,16 @@ What has been changed
 Upgrade Guide
 =============
 
-1. You have to change the values in the default CI4 config files according to the 
+1. You have to change the values in the default CI4 config files according to the
    changes in the CI3 files. The config names are pretty much the same as in CI3.
-2. If you are using custom config files in your CI3 project you have to create those 
-   files as new php classes in your CI4 project in ``app/Config/``. These classes 
+2. If you are using custom config files in your CI3 project you have to create those
+   files as new php classes in your CI4 project in ``app/Config/``. These classes
    should be in the ``Config`` namespace and should extend ``CodeIgniter\Config\BaseConfig``.
-3. Once you have created all custom config classes, you have to copy the variables 
+3. Once you have created all custom config classes, you have to copy the variables
    from the CI3 config into the new CI4 config class as public class properties.
-4. Now, you have to change the config fetching syntax everywhere you fetch config 
-   values. The CI3 syntax is something like ``$this->config->item('item_name');``. 
-   You have to change this into ``config('MyConfigFile')->item_name;``. Alternatively, 
+4. Now, you have to change the config fetching syntax everywhere you fetch config
+   values. The CI3 syntax is something like ``$this->config->item('item_name');``.
+   You have to change this into ``config('MyConfigFile')->item_name;``. Alternatively,
    you can use the object-oriented approach: ``CodeIgniter\Config\Config::get('MyConfigFile')->item_name;``
 
 Code Example
@@ -54,14 +54,14 @@ Codeigniter Version 4.x
 
 Path: ``app/Config``::
 
-    <?php
+   <?php
 
-    namespace Config;
+   namespace Config;
 
-    use CodeIgniter\Config\BaseConfig;
+   use CodeIgniter\Config\BaseConfig;
 
-    class CustomClass extends BaseConfig
-    {
-        public $siteName  = 'My Great Site';
-        public $siteEmail = 'webmaster@example.com';
-    }
+   class CustomClass extends BaseConfig
+   {
+      public $siteName  = 'My Great Site';
+      public $siteEmail = 'webmaster@example.com';
+   }
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index c0d0446c1412..2124a67d60b0 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -57,8 +57,8 @@ Path: ``application/migrations``::
                 'blog_id' => array(
                     'type' => 'INT',
                     'constraint' => 5,
-                    'unsigned' => TRUE,
-                    'auto_increment' => TRUE,
+                    'unsigned' => true,
+                    'auto_increment' => true,
                 ),
                 'blog_title' => array(
                     'type' => 'VARCHAR',
@@ -66,10 +66,10 @@ Path: ``application/migrations``::
                 ),
                 'blog_description' => array(
                     'type' => 'TEXT',
-                    'null' => TRUE,
+                    'null' => true,
                 ),
             ));
-            $this->dbforge->add_key('blog_id', TRUE);
+            $this->dbforge->add_key('blog_id', true);
             $this->dbforge->create_table('blog');
         }
 
@@ -96,18 +96,18 @@ Path: ``app/Database/Migrations``::
         {
             $this->forge->addField([
                 'blog_id' => [
-                        'type'           => 'INT',
-                        'constraint'     => 5,
-                        'unsigned'       => true,
-                        'auto_increment' => true,
+                    'type'           => 'INT',
+                    'constraint'     => 5,
+                    'unsigned'       => true,
+                    'auto_increment' => true,
                 ],
                 'blog_title' => [
-                        'type'       => 'VARCHAR',
-                        'constraint' => '100',
+                    'type'       => 'VARCHAR',
+                    'constraint' => '100',
                 ],
                 'blog_description' => [
-                        'type' => 'TEXT',
-                        'null' => true,
+                    'type' => 'TEXT',
+                    'null' => true,
                 ],
             ]);
             $this->forge->addKey('blog_id', true);
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 333f0a0f8e66..64696e691dc7 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
     Upgrading from 4.1.1 to 4.1.2 <upgrade_412>
     Upgrading from 4.0.5 to 4.1.0 or 4.1.1 <upgrade_410>
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 87d213839f5f..6f373e9aafa4 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -19,8 +19,7 @@ The following example shows a common usage pattern within your controllers.
 
 ::
 
-    if (! $foo = cache('foo'))
-    {
+    if (! $foo = cache('foo')) {
         echo 'Saving to the cache!<br />';
         $foo = 'foobarbaz!';
 
@@ -93,7 +92,7 @@ Class Reference
     :rtype: mixed
 
     This method will attempt to fetch an item from the cache store. If the
-    item does not exist, the method will return NULL.
+    item does not exist, the method will return null.
 
     Example::
 
@@ -106,7 +105,7 @@ Class Reference
     :param Closure $callback: Callback to invoke when the cache item returns null
     :returns: The value of the cache item
     :rtype: mixed
-    
+
     Gets an item from the cache. If ``null`` was returned, this will invoke the callback
     and save the result. Either way, this will return the value.
 
@@ -136,7 +135,7 @@ Class Reference
     :rtype: bool
 
     This method will delete a specific item from the cache store. If item
-    deletion fails, the method will return FALSE.
+    deletion fails, the method will return false.
 
     Example::
 
@@ -174,7 +173,7 @@ Class Reference
     Example::
 
         // 'iterator' has a value of 2
-        $cache->increment('iterator');    // 'iterator' is now 3
+        $cache->increment('iterator'); // 'iterator' is now 3
         $cache->increment('iterator', 3); // 'iterator' is now 6
 
 .. php:method:: decrement($key[, $offset = 1]): mixed
@@ -189,7 +188,7 @@ Class Reference
     Example::
 
         // 'iterator' has a value of 6
-        $cache->decrement('iterator');    // 'iterator' is now 5
+        $cache->decrement('iterator'); // 'iterator' is now 5
         $cache->decrement('iterator', 2); // 'iterator' is now 3
 
 .. php:method:: clean()
@@ -198,7 +197,7 @@ Class Reference
     :rtype: bool
 
     This method will 'clean' the entire cache. If the deletion of the
-    cache files fails, the method will return FALSE.
+    cache files fails, the method will return false.
 
     Example::
 
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 6b5d15dea487..08dc0c0a41c9 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -34,7 +34,7 @@ The options are described later in this document::
 
 	$options = [
 		'baseURI' => 'http://example.com/api/v1/',
-		'timeout'  => 3
+		'timeout'  => 3,
 	];
 	$client = \Config\Services::curlrequest($options);
 
@@ -67,7 +67,7 @@ a Response instance to you. This takes the HTTP method, the url and an array of
 	$client = \Config\Services::curlrequest();
 
 	$response = $client->request('GET', 'https://api.github.com/user', [
-		'auth' => ['user', 'pass']
+		'auth' => ['user', 'pass'],
 	]);
 
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information
@@ -97,7 +97,7 @@ set a base URI, and then make all requests with that client using relative URLs.
 when working with APIs::
 
 	$client = \Config\Services::curlrequest([
-		'baseURI' => 'https://example.com/api/v1/'
+		'baseURI' => 'https://example.com/api/v1/',
 	]);
 
 	// GET http:example.com/api/v1/photos
@@ -130,8 +130,8 @@ methods. The most commonly used methods let you determine the response itself.
 
 You can get the status code and reason phrase of the response::
 
-	$code   = $response->getStatusCode();    // 200
-	$reason = $response->getReason();      // OK
+	$code   = $response->getStatusCode(); // 200
+	$reason = $response->getReason(); // OK
 
 You can retrieve headers from the response::
 
@@ -139,8 +139,7 @@ You can retrieve headers from the response::
 	echo $response->getHeaderLine('Content-Type');
 
 	// Get all headers
-	foreach ($response->getHeaders() as $name => $value)
-	{
+	foreach ($response->getHeaders() as $name => $value) {
 		echo $name .': '. $response->getHeaderLine($name) ."\n";
 	}
 
@@ -151,8 +150,7 @@ The body can be retrieved using the ``getBody()`` method::
 The body is the raw body provided by the remote getServer. If the content type requires formatting, you will need
 to ensure that your script handles that::
 
-	if (strpos($response->getHeader('content-type'), 'application/json') !== false)
-	{
+	if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
 		$body = json_decode($body);
 	}
 
@@ -208,8 +206,7 @@ body
 There are two ways to set the body of the request for request types that support them, like PUT, OR POST.
 The first way is to use the ``setBody()`` method::
 
-	$client->setBody($body)
-	       ->request('put', 'http://example.com');
+	$client->setBody($body) ->request('put', 'http://example.com');
 
 The second method is by passing a ``body`` option in. This is provided to maintain Guzzle API compatibility,
 and functions the exact same way as the previous example. The value must be a string::
@@ -275,8 +272,8 @@ if it's not already set::
 	$client->request('POST', '/post', [
 		'form_params' => [
 			'foo' => 'bar',
-			'baz' => ['hi', 'there']
-		]
+			'baz' => ['hi', 'there'],
+		],
 	]);
 
 .. note:: ``form_params`` cannot be used with the ``multipart`` option. You will need to use one or the other.
@@ -294,8 +291,8 @@ representing the header field values::
 		'headers' => [
 			'User-Agent' => 'testing/1.0',
 			'Accept'     => 'application/json',
-			'X-Foo'      => ['Bar', 'Baz']
-		]
+			'X-Foo'      => ['Bar', 'Baz'],
+		],
 	]);
 
 If headers are passed into the constructor they are treated as default values that will be overridden later by any
@@ -337,7 +334,7 @@ has been disabled. Any files that you want to send must be passed as instances o
 
 	$post_data = [
 		'foo'      => 'bar',
-		'userfile' => new \CURLFile('/path/to/file.txt')
+		'userfile' => new \CURLFile('/path/to/file.txt'),
 	];
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index f92be8500db6..55604ad6bbee 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -128,24 +128,24 @@ Preference          Default Value          Options                      Descript
 **SMTPPort**        25                     None                         SMTP Port. (If set to 465, TLS will be used for the connection
                                                                         regardless of SMTPCrypto setting.)
 **SMTPTimeout**     5                      None                         SMTP Timeout (in seconds).
-**SMTPKeepAlive**   FALSE                  TRUE or FALSE (boolean)      Enable persistent SMTP connections.
+**SMTPKeepAlive**   false                  true or false (boolean)      Enable persistent SMTP connections.
 **SMTPCrypto**      No Default             tls or ssl                   SMTP Encryption. Setting this to "ssl" will create a secure
                                                                         channel to the server using SSL and "tls" will issue a
                                                                         ``STARTTLS`` command to the server. Connection on port 465 should
                                                                         set this to blank.
-**wordWrap**        TRUE                   TRUE or FALSE (boolean)      Enable word-wrap.
+**wordWrap**        true                   true or false (boolean)      Enable word-wrap.
 **wrapChars**       76                                                  Character count to wrap at.
 **mailType**        text                   text or html                 Type of mail. If you send HTML email you must send it as a complete web
                                                                         page. Make sure you don't have any relative links or relative image
                                                                         paths otherwise they will not work.
 **charset**         utf-8                                               Character set (utf-8, iso-8859-1, etc.).
-**validate**        TRUE                   TRUE or FALSE (boolean)      Whether to validate the email address.
+**validate**        true                   true or false (boolean)      Whether to validate the email address.
 **priority**        3                      1, 2, 3, 4, 5                Email Priority. 1 = highest. 5 = lowest. 3 = normal.
 **CRLF**            \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
 **newline**         \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
-**BCCBatchMode**    FALSE                  TRUE or FALSE (boolean)      Enable BCC Batch Mode.
+**BCCBatchMode**    false                  true or false (boolean)      Enable BCC Batch Mode.
 **BCCBatchSize**    200                    None                         Number of emails in each BCC batch.
-**DSN**             FALSE                  TRUE or FALSE (boolean)      Enable notify message from server
+**DSN**             false                  true or false (boolean)      Enable notify message from server
 =================== ====================== ============================ =======================================================================
 
 Overriding Word Wrapping
@@ -320,7 +320,7 @@ Class Reference
 				$email->send();
 			}
 
-		If you set the parameter to TRUE any attachments will be cleared as
+		If you set the parameter to true any attachments will be cleared as
 		well::
 
 			$email->clear(true);
@@ -328,10 +328,10 @@ Class Reference
 	.. php:method:: send($autoClear = true)
 
 		:param	bool	$autoClear: Whether to clear message data automatically
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
-		The e-mail sending method. Returns boolean TRUE or FALSE based on
+		The e-mail sending method. Returns boolean true or false based on
 		success or failure, enabling it to be used conditionally::
 
 			if (! $email->send())
@@ -340,7 +340,7 @@ Class Reference
 			}
 
 		This method will automatically clear all parameters if the request was
-		successful. To stop this behaviour pass FALSE::
+		successful. To stop this behaviour pass false::
 
 			if ($email->send(false))
 			{
@@ -352,7 +352,7 @@ Class Reference
 
 		.. note:: If ``BCCBatchMode`` is enabled, and there are more than
 			``BCCBatchSize`` recipients, this method will always return
-			boolean ``TRUE``.
+			boolean ``true``.
 
 	.. php:method:: attach($filename[, $disposition = ''[, $newname = null[, $mime = '']]])
 
@@ -395,7 +395,7 @@ Class Reference
 	.. php:method:: setAttachmentCID($filename)
 
 		:param	string	$filename: Existing attachment filename
-		:returns:	Attachment Content-ID or FALSE if not found
+		:returns:	Attachment Content-ID or false if not found
 		:rtype:	string
 
 		Sets and returns an attachment's Content-ID, which enables your to embed an inline
@@ -404,8 +404,8 @@ Class Reference
 
 			$filename = '/img/photo1.jpg';
 			$email->attach($filename);
-			foreach ($list as $address)
-			{
+
+			foreach ($list as $address) {
 				$email->setTo($address);
 				$cid = $email->setAttachmentCID($filename);
 				$email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
@@ -428,7 +428,7 @@ Class Reference
 
 		Example::
 
-			// You need to pass FALSE while sending in order for the email data
+			// You need to pass false while sending in order for the email data
 			// to not be cleared - if that happens, printDebugger() would have
 			// nothing to output.
 			$email->send(false);
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index e6482642d698..9b29767d4d19 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -36,12 +36,10 @@ Once you have an instance, you have the full power of the SplFileInfo class at t
     echo $file->getPerms();
 
     // Write CSV rows to it.
-    if ($file->isWritable())
-    {
+    if ($file->isWritable()) {
         $csv = $file->openFile('w');
 
-        foreach ($rows as $row)
-        {
+        foreach ($rows as $row) {
             $csv->fputcsv($row);
         }
     }
@@ -63,16 +61,16 @@ method. This is especially useful to rename files when moving it so that the fil
 
 Returns the size of the uploaded file in bytes::
 
-	$size     = $file->getSize();      // 256901
+	$size     = $file->getSize(); // 256901
 
 **getSizeByUnit()**
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
 the results in kilobytes or megabytes, respectively::
 
-	$bytes     = $file->getSizeByUnit();      // 256901
-	$kilobytes = $file->getSizeByUnit('kb');  // 250.880
-	$megabytes = $file->getSizeByUnit('mb');  // 0.245
+	$bytes     = $file->getSizeByUnit(); // 256901
+	$kilobytes = $file->getSizeByUnit('kb'); // 250.880
+	$megabytes = $file->getSizeByUnit('mb'); // 0.245
 
 **getMimeType()**
 
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index ec780ea2218b..959a2278178e 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -18,15 +18,15 @@ To enable a Honeypot, changes have to be made to the ``app/Config/Filters.php``.
 from the ``$globals`` array, like...::
 
     public $globals = [
-            'before' => [
-                'honeypot'
-                // 'csrf',
-            ],
-            'after'  => [
-                'toolbar',
-                'honeypot'
-            ]
-        ];
+        'before' => [
+            'honeypot'
+            // 'csrf',
+        ],
+        'after' => [
+            'toolbar',
+            'honeypot',
+        ],
+    ];
 
 A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``.
 If it is not suitable, make your own at ``app/Filters/Honeypot.php``,
diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index 7dc782c15902..d22f3eba9af6 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -135,9 +135,7 @@ error upon failure, like this::
             ->withFile('/path/to/image/mypic.jpg')
             ->fit(100, 100, 'center')
             ->save('/path/to/image/mypic_thumb.jpg');
-	}
-	catch (CodeIgniter\Images\ImageException $e)
-	{
+	} catch (CodeIgniter\Images\ImageException $e) {
 		echo $e->getMessage();
 	}
 
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index c575579d2169..dc5b605c8d72 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -90,7 +90,7 @@ methods to keep the data separate::
         $data = [
             'users' => $userModel->paginate(10, 'group1'),
             'pages' => $pageModel->paginate(15, 'group2'),
-            'pager' => $userModel->pager
+            'pager' => $userModel->pager,
         ];
 
         echo view('users/index', $data);
@@ -189,7 +189,7 @@ that is used by editing **app/Config/Pager.php**::
 
     public $templates = [
         'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-        'default_simple' => 'CodeIgniter\Pager\Views\default_simple'
+        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
     ];
 
 This setting stores the alias and :doc:`namespaced view paths </outgoing/views>` for the view that
@@ -304,7 +304,7 @@ title, which is just the number, and a boolean that tells whether the link is th
 	$link = [
 		'active' => false,
 		'uri'    => 'http://example.com/foo?page=2',
-		'title'  => 1
+		'title'  => 1,
 	];
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index b52b7aafeb21..0e4d540dd899 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -28,9 +28,9 @@ and enabling the `csrf` filter globally::
 
 	public $globals = [
 		'before' => [
-			//'honeypot'
-			'csrf'
-		]
+			// 'honeypot',
+			'csrf',
+		],
 	];
 
 Select URIs can be whitelisted from CSRF protection (for example API
@@ -39,16 +39,16 @@ by adding them as exceptions in the filter::
 
 	public $globals = [
 		'before' => [
-			'csrf' => ['except' => ['api/record/save']]
-		]
+			'csrf' => ['except' => ['api/record/save']],
+		],
 	];
 
 Regular expressions are also supported (case-insensitive)::
 
     public $globals = [
 		'before' => [
-			'csrf' => ['except' => ['api/record/[0-9]+']]
-		]
+			'csrf' => ['except' => ['api/record/[0-9]+']],
+		],
 	];
 
 If you use the :doc:`form helper <../helpers/form_helper>`, then
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 2020430012aa..ac4a20719b8c 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -145,7 +145,7 @@ variable, you will do this::
 
 	$name = $session->get('name');
 
-.. note:: The ``get()`` method returns NULL if the item you are trying
+.. note:: The ``get()`` method returns null if the item you are trying
 	to access does not exist.
 
 If you want to retrieve all of the existing userdata, you can simply
@@ -180,7 +180,7 @@ an example::
 	$newdata = [
 		'username'  => 'johndoe',
 		'email'     => 'johndoe@some-site.com',
-		'logged_in' => TRUE
+		'logged_in' => true,
 	];
 
 	$session->set($newdata);
@@ -193,8 +193,8 @@ supports this syntax::
 If you want to verify that a session value exists, simply check with
 ``isset()``::
 
-	// returns FALSE if the 'some_name' item doesn't exist or is NULL,
-	// TRUE otherwise:
+	// returns false if the 'some_name' item doesn't exist or is null,
+	// true otherwise:
 	isset($_SESSION['some_name'])
 
 Or you can call ``has()``::
@@ -287,7 +287,7 @@ Or to get an array with all flashdata, simply omit the key parameter::
 
 	$session->getFlashdata();
 
-.. note:: The ``getFlashdata()`` method returns NULL if the item cannot be
+.. note:: The ``getFlashdata()`` method returns null if the item cannot be
 	found.
 
 If you find that you need to preserve a flashdata variable through an
@@ -325,7 +325,7 @@ you want them all to have the same expiry time or not::
 	// will do so after only 240 seconds
 	$session->markAsTempdata([
 		'item'	=> 300,
-		'item2'	=> 240
+		'item2'	=> 240,
 	]);
 
 To add tempdata::
@@ -339,8 +339,8 @@ Or alternatively, using the ``setTempdata()`` method::
 
 You can also pass an array to ``setTempdata()``::
 
-	$tempdata = ['newuser' => TRUE, 'message' => 'Thanks for joining!'];
-	$session->setTempdata($tempdata, NULL, $expire);
+	$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
+	$session->setTempdata($tempdata, null, $expire);
 
 .. note:: If the expiration is omitted or set to 0, the default
 	time-to-live value of 300 seconds (or 5 minutes) will be used.
@@ -363,7 +363,7 @@ And of course, if you want to retrieve all existing tempdata::
 
 	$session->getTempdata();
 
-.. note:: The ``getTempdata()`` method returns NULL if the item cannot be
+.. note:: The ``getTempdata()`` method returns null if the item cannot be
 	found.
 
 If you need to remove a tempdata value before it expires, you can directly
@@ -441,14 +441,14 @@ Preference                     Default                                      Opti
 **sessionCookieName**          ci_session                                   [A-Za-z\_-] characters only                       The name used for the session cookie.
 **sessionExpiration**          7200 (2 hours)                               Time in seconds (integer)                         The number of seconds you would like the session to last.
                                                                                                                               If you would like a non-expiring session (until browser is closed) set the value to zero: 0
-**sessionSavePath**            NULL                                         None                                              Specifies the storage location, depends on the driver being used.
-**sessionMatchIP**             FALSE                                        TRUE/FALSE (boolean)                              Whether to validate the user's IP address when reading the session cookie.
+**sessionSavePath**            null                                         None                                              Specifies the storage location, depends on the driver being used.
+**sessionMatchIP**             false                                        true/false (boolean)                              Whether to validate the user's IP address when reading the session cookie.
                                                                                                                               Note that some ISPs dynamically changes the IP, so if you want a non-expiring session you
-                                                                                                                              will likely set this to FALSE.
+                                                                                                                              will likely set this to false.
 **sessionTimeToUpdate**        300                                          Time in seconds (integer)                         This option controls how often the session class will regenerate itself and create a new
                                                                                                                               session ID. Setting it to 0 will disable session ID regeneration.
-**sessionRegenerateDestroy**   FALSE                                        TRUE/FALSE (boolean)                              Whether to destroy session data associated with the old session ID when auto-regenerating
-                                                                                                                              the session ID. When set to FALSE, the data will be later deleted by the garbage collector.
+**sessionRegenerateDestroy**   false                                        true/false (boolean)                              Whether to destroy session data associated with the old session ID when auto-regenerating
+                                                                                                                              the session ID. When set to false, the data will be later deleted by the garbage collector.
 ============================== ============================================ ================================================= ============================================================================================
 
 .. note:: As a last resort, the Session library will try to fetch PHP's
@@ -579,10 +579,10 @@ And then of course, create the database table ...
 For MySQL::
 
 	CREATE TABLE IF NOT EXISTS `ci_sessions` (
-		`id` varchar(128) NOT NULL,
-		`ip_address` varchar(45) NOT NULL,
-		`timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL,
-		`data` blob NOT NULL,
+		`id` varchar(128) NOT null,
+		`ip_address` varchar(45) NOT null,
+		`timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT null,
+		`data` blob NOT null,
 		KEY `ci_sessions_timestamp` (`timestamp`)
 	);
 
@@ -600,10 +600,10 @@ For PostgreSQL::
 You will also need to add a PRIMARY KEY **depending on your 'sessionMatchIP'
 setting**. The examples below work both on MySQL and PostgreSQL::
 
-	// When sessionMatchIP = TRUE
+	// When sessionMatchIP = true
 	ALTER TABLE ci_sessions ADD PRIMARY KEY (id, ip_address);
 
-	// When sessionMatchIP = FALSE
+	// When sessionMatchIP = false
 	ALTER TABLE ci_sessions ADD PRIMARY KEY (id);
 
 	// To drop a previously created primary key (use when changing the setting)
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 9513d266ea16..22d7829899cd 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -49,8 +49,8 @@ start using it in your application.
 The Code
 ========
 
-You could make your own Throttler filter, at **app/Filters/Throttle.php**, 
-along the lines of:: 
+You could make your own Throttler filter, at **app/Filters/Throttle.php**,
+along the lines of::
 
     <?php
 
@@ -67,8 +67,7 @@ along the lines of::
          * This is a demo implementation of using the Throttler class
          * to implement rate limiting for your application.
          *
-         * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-         * @param array|null                                         $arguments
+         * @param array|null $arguments
          *
          * @return mixed
          */
@@ -79,20 +78,15 @@ along the lines of::
             // Restrict an IP address to no more
             // than 1 request per second across the
             // entire site.
-            if ($throttler->check($request->getIPAddress(), 60, MINUTE) === false)
-            {
+            if ($throttler->check($request->getIPAddress(), 60, MINUTE) === false) {
                 return Services::response()->setStatusCode(429);
             }
         }
 
-        //--------------------------------------------------------------------
-
         /**
          * We don't have anything to do here.
          *
-         * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-         * @param ResponseInterface|\CodeIgniter\HTTP\Response       $response
-         * @param array|null                                         $arguments
+         * @param array|null $arguments
          *
          * @return mixed
          */
@@ -118,13 +112,13 @@ filter::
 
 	public $aliases = [
 		...
-		'throttle' => \App\Filters\Throttle::class
+		'throttle' => \App\Filters\Throttle::class,
 	];
 
 Next, we assign it to all POST requests made on the site::
 
     public $methods = [
-        'post' => ['throttle', 'CSRF']
+        'post' => ['throttle', 'CSRF'],
     ];
 
 And that's all there is to it. Now all POST requests made on the site will have to be rate limited.
@@ -139,7 +133,7 @@ Class Reference
     :param int $capacity: The number of tokens the bucket holds
     :param int $seconds: The number of seconds it takes for a bucket to completely fill
     :param int $cost: The number of tokens that are spent on this action
-    :returns: TRUE if action can be performed, FALSE if not
+    :returns: true if action can be performed, false if not
     :rtype: bool
 
     Checks to see if there are any tokens left within the bucket, or if too many have
@@ -151,7 +145,7 @@ Class Reference
     :returns: The number of seconds until another token should be available.
     :rtype: integer
 
-    After ``check()`` has been run and returned FALSE, this method can be used
+    After ``check()`` has been run and returned false, this method can be used
     to determine the time until a new token should be available and the action can be
     tried again. In this case, the minimum enforced wait time is one second.
 
@@ -162,4 +156,4 @@ Class Reference
     :rtype: self
 
     Removes & resets the bucket.
-    Won't fail if the bucket doesn't exist.
\ No newline at end of file
+    Won't fail if the bucket doesn't exist.
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index d964892eb91c..12f3a9f38e7e 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -85,8 +85,8 @@ Given separate inputs for **year**, **month**, and **day**, will return a new in
 are not provided, it will use the current value to fill it in. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $today       = Time::createFromDate();            // Uses current year, month, and day
-    $anniversary = Time::createFromDate(2018);  // Uses current month and day
+    $today       = Time::createFromDate(); // Uses current year, month, and day
+    $anniversary = Time::createFromDate(2018); // Uses current month and day
     $date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
 
 createFromTime()
@@ -96,8 +96,8 @@ Like **createFromDate** except it is only concerned with the **hours**, **minute
 current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $lunch  = Time::createFromTime(11, 30)       // 11:30 am today
-    $dinner = Time::createFromTime(18, 00, 00)  // 6:00 pm today
+    $lunch  = Time::createFromTime(11, 30); // 11:30 am today
+    $dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
     $time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
 
 create()
@@ -160,7 +160,7 @@ A full listing of values can be found `here <https://unicode-org.github.io/icu-d
 ::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toLocalizedString('MMM d, yyyy');   // March 9, 2016
+    echo $time->toLocalizedString('MMM d, yyyy'); // March 9, 2016
 
 toDateTimeString()
 ------------------
@@ -169,7 +169,7 @@ This is the first of three helper methods to work with the IntlDateFormatter wit
 This will return a string formatted as you would commonly use for datetime columns in a database (Y-m-d H:i:s)::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateTimeString();     // 2016-03-09 12:00:00
+    echo $time->toDateTimeString(); // 2016-03-09 12:00:00
 
 toDateString()
 --------------
@@ -177,7 +177,7 @@ toDateString()
 Displays just the date portion of the Time::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateString();     // 2016-03-09
+    echo $time->toDateString(); // 2016-03-09
 
 toTimeString()
 --------------
@@ -185,7 +185,7 @@ toTimeString()
 Displays just the time portion of the value::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toTimeString();     // 12:00:00
+    echo $time->toTimeString(); // 12:00:00
 
 humanize()
 ----------
@@ -197,7 +197,7 @@ human readable format that is geared towards being easily understood. It can cre
     // Assume current time is: March 10, 2017 (America/Chicago)
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-    echo $time->humanize();     // 1 year ago
+    echo $time->humanize(); // 1 year ago
 
 The exact time displayed is determined in the following manner:
 
@@ -234,37 +234,37 @@ The following basic getters exist::
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getYear();      // 2016
-    echo $time->getMonth();     // 8
-    echo $time->getDay();       // 12
-    echo $time->getHour();      // 16
-    echo $time->getMinute();    // 15
-    echo $time->getSecond();    // 23
+    echo $time->getYear(); // 2016
+    echo $time->getMonth(); // 8
+    echo $time->getDay(); // 12
+    echo $time->getHour(); // 16
+    echo $time->getMinute(); // 15
+    echo $time->getSecond(); // 23
 
-    echo $time->year;           // 2016
-    echo $time->month;          // 8
-    echo $time->day;            // 12
-    echo $time->hour;           // 16
-    echo $time->minute;         // 15
-    echo $time->second;         // 23
+    echo $time->year; // 2016
+    echo $time->month; // 8
+    echo $time->day; // 12
+    echo $time->hour; // 16
+    echo $time->minute; // 15
+    echo $time->second; // 23
 
 In addition to these, a number of methods exist to provide additional information about the date::
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getDayOfWeek();     // 6 - but may vary based on locale's starting day of the week
-    echo $time->getDayOfYear();     // 225
-    echo $time->getWeekOfMonth();   // 2
-    echo $time->getWeekOfYear();    // 33
-    echo $time->getTimestamp();     // 1471018523 - UNIX timestamp
-    echo $time->getQuarter();       // 3
+    echo $time->getDayOfWeek(); // 6 - but may vary based on locale's starting day of the week
+    echo $time->getDayOfYear(); // 225
+    echo $time->getWeekOfMonth(); // 2
+    echo $time->getWeekOfYear(); // 33
+    echo $time->getTimestamp(); // 1471018523 - UNIX timestamp
+    echo $time->getQuarter(); // 3
 
-    echo $time->dayOfWeek;          // 6
-    echo $time->dayOfYear;          // 225
-    echo $time->weekOfMonth;        // 2
-    echo $time->weekOfYear;         // 33
-    echo $time->timestamp;          // 1471018523
-    echo $time->quarter;            // 3
+    echo $time->dayOfWeek; // 6
+    echo $time->dayOfYear; // 225
+    echo $time->weekOfMonth; // 2
+    echo $time->weekOfYear; // 33
+    echo $time->timestamp; // 1471018523
+    echo $time->quarter; // 3
 
 getAge()
 --------
@@ -274,32 +274,32 @@ the age of someone based on their birthday::
 
     $time = Time::parse('5 years ago');
 
-    echo $time->getAge();   // 5
-    echo $time->age;        // 5
+    echo $time->getAge(); // 5
+    echo $time->age; // 5
 
 getDST()
 --------
 
 Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time::
 
-    echo Time::createFromDate(2012, 1, 1)->getDst();     // false
-    echo Time::createFromDate(2012, 9, 1)->dst;     // true
+    echo Time::createFromDate(2012, 1, 1)->getDst(); // false
+    echo Time::createFromDate(2012, 9, 1)->dst; // true
 
 getLocal()
 ----------
 
 Returns boolean true if the Time instance is in the same timezone as the application is currently running in::
 
-    echo Time::now()->getLocal();       // true
-    echo Time::now('Europe/London');    // false
+    echo Time::now()->getLocal(); // true
+    echo Time::now('Europe/London'); // false
 
 getUtc()
 --------
 
 Returns boolean true if the Time instance is in UTC time::
 
-    echo Time::now('America/Chicago')->getUtc();    // false
-    echo Time::now('UTC')->utc;                     // true
+    echo Time::now('America/Chicago')->getUtc(); // false
+    echo Time::now('UTC')->utc; // true
 
 getTimezone()
 -------------
@@ -318,8 +318,8 @@ getTimezoneName()
 
 Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance::
 
-    echo Time::now('America/Chicago')->getTimezoneName();   // America/Chicago
-    echo Time::now('Europe/London')->timezoneName;          // Europe/London
+    echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
+    echo Time::now('Europe/London')->timezoneName; // Europe/London
 
 Setters
 =======
@@ -334,11 +334,11 @@ thrown.
 ::
 
     $time = $time->setYear(2017);
-    $time = $time->setMonthNumber(4);           // April
+    $time = $time->setMonthNumber(4); // April
     $time = $time->setMonthLongName('April');
-    $time = $time->setMonthShortName('Feb');    // February
+    $time = $time->setMonthShortName('Feb'); // February
     $time = $time->setDay(25);
-    $time = $time->setHour(14);                 // 2:00 pm
+    $time = $time->setHour(14); // 2:00 pm
     $time = $time->setMinute(30);
     $time = $time->setSecond(54);
 
@@ -348,13 +348,13 @@ setTimezone()
 Converts the time from it's current timezone into the new one::
 
     $time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
-    $time2 = $time->setTimezone('Europe/London');           // Returns new instance converted to new timezone
+    $time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
 
-    echo $time->getTimezoneName();   // American/Chicago
-    echo $time2->getTimezoneName();  // Europe/London
+    echo $time->getTimezoneName(); // American/Chicago
+    echo $time2->getTimezoneName(); // Europe/London
 
-    echo $time->toDateTimeString();   // 2020-05-13 10:00:00
-    echo $time2->toDateTimeString();   // 2020-05-13 18:00:00
+    echo $time->toDateTimeString(); // 2020-05-13 10:00:00
+    echo $time2->toDateTimeString(); // 2020-05-13 18:00:00
 
 setTimestamp()
 --------------
@@ -364,8 +364,8 @@ Returns a new instance with the date set to the new timestamp::
     $time = Time::parse('May 10, 2017', 'America/Chicago');
     $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
 
-    echo $time->toDateTimeString();     // 2017-05-10 00:00:00
-    echo $time2->toDateTimeString();     // 2017-04-01 00:00:00
+    echo $time->toDateTimeString(); // 2017-05-10 00:00:00
+    echo $time2->toDateTimeString(); // 2017-04-01 00:00:00
 
 Modifying the Value
 ===================
@@ -405,13 +405,13 @@ that way::
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
-    $time1->equals($time2);    // true
+    $time1->equals($time2); // true
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used::
 
-    $time1->equals('January 11, 2017 03:50:00', 'Europe/London');  // true
+    $time1->equals('January 11, 2017 03:50:00', 'Europe/London'); // true
 
 sameAs()
 --------
@@ -423,7 +423,7 @@ all identical::
     $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
     $time1->sameAs($time2);    // false
-    $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago');    // true
+    $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago'); // true
 
 isBefore()
 ----------
@@ -434,14 +434,14 @@ both times::
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
-    $time1->isBefore($time2);  // true
-    $time2->isBefore($time1);  // false
+    $time1->isBefore($time2); // true
+    $time2->isBefore($time1); // false
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used::
 
-    $time1->isBefore('March 15, 2013', 'America/Chicago');  // false
+    $time1->isBefore('March 15, 2013', 'America/Chicago'); // false
 
 isAfter()
 ---------
@@ -451,8 +451,8 @@ Works exactly the same as **isBefore()** except checks if the time is after the
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
-    $time1->isAfter($time2);  // false
-    $time2->isAfter($time1);  // true
+    $time1->isAfter($time2); // false
+    $time2->isAfter($time1); // true
 
 Viewing Differences
 ===================
@@ -476,23 +476,23 @@ the original time::
 
     $diff = $current->difference($test);
 
-    echo $diff->getYears();     // -7
-    echo $diff->getMonths();    // -84
-    echo $diff->getWeeks();     // -365
-    echo $diff->getDays();      // -2557
-    echo $diff->getHours();     // -61368
-    echo $diff->getMinutes();   // -3682080
-    echo $diff->getSeconds();   // -220924800
+    echo $diff->getYears(); // -7
+    echo $diff->getMonths(); // -84
+    echo $diff->getWeeks(); // -365
+    echo $diff->getDays(); // -2557
+    echo $diff->getHours(); // -61368
+    echo $diff->getMinutes(); // -3682080
+    echo $diff->getSeconds(); // -220924800
 
 You can use either **getX()** methods, or access the calculate values as if they were properties::
 
-    echo $diff->years;     // -7
-    echo $diff->months;    // -84
-    echo $diff->weeks;     // -365
-    echo $diff->days;      // -2557
-    echo $diff->hours;     // -61368
-    echo $diff->minutes;   // -3682080
-    echo $diff->seconds;   // -220924800
+    echo $diff->years;   // -7
+    echo $diff->months; // -84
+    echo $diff->weeks; // -365
+    echo $diff->days; // -2557
+    echo $diff->hours; // -61368
+    echo $diff->minutes; // -3682080
+    echo $diff->seconds; // -220924800
 
 humanize()
 ----------
@@ -506,7 +506,7 @@ human readable format that is geared towards being easily understood. It can cre
 
     $diff = $current->difference($test)
 
-    echo $diff->humanize();     // 1 year ago
+    echo $diff->humanize(); // 1 year ago
 
 The exact time displayed is determined in the following manner:
 
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 7d53f61f820e..e449c6371148 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -26,7 +26,7 @@ The following functions are available:
 
 **autoTypography()**
 
-.. php:function:: autoTypography($str[, $reduce_linebreaks = FALSE])
+.. php:function:: autoTypography($str[, $reduce_linebreaks = false])
 
 	:param	string	$str: Input string
 	:param	bool	$reduce_linebreaks: Whether to reduce multiple instances of double newlines to two
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 3e76fb74c905..c4067f3e8eb6 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -110,11 +110,10 @@ In controller::
     {
        foreach($imagefile['images'] as $img)
        {
-          if ($img->isValid() && ! $img->hasMoved())
-          {
-               $newName = $img->getRandomName();
-               $img->move(WRITEPATH.'uploads', $newName);
-          }
+			if ($img->isValid() && ! $img->hasMoved()) {
+				$newName = $img->getRandomName();
+				$img->move(WRITEPATH.'uploads', $newName);
+			}
        }
     }
 
@@ -155,8 +154,7 @@ Verify A File
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
 
-	if (! $file->isValid())
-	{
+	if (! $file->isValid()) {
 		throw new \RuntimeException($file->getErrorString().'('.$file->getError().')');
 	}
 
@@ -230,8 +228,7 @@ By default, the original filename was used. You can specify a new filename by pa
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean::
 
-    if ($file->isValid() && ! $file->hasMoved())
-    {
+    if ($file->isValid() && ! $file->hasMoved()) {
         $file->move($path);
     }
 
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
index 649685db71ec..e8b7c0cefd57 100644
--- a/user_guide_src/source/libraries/uri.rst
+++ b/user_guide_src/source/libraries/uri.rst
@@ -211,8 +211,8 @@ you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actua
     // Leaves just the 'foo' variable
     $uri->keepQuery('foo');
 
-.. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data. 
-	If you want to use more liberal rules (which allow key names to contain dots), you can use a special method 
+.. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data.
+	If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
 	``useRawQueryString()`` beforehand.
 
 Fragment
@@ -238,8 +238,7 @@ what the values of the segments are. The segments start at 1 being the furthest
 	// URI = http://example.com/users/15/profile
 
 	// Prints '15'
-	if ($uri->getSegment(1) == 'users')
-	{
+	if ($uri->getSegment(1) == 'users') {
 		echo $uri->getSegment(2);
 	}
 
diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index e1d0d155b3af..f8cf92f72064 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -39,20 +39,13 @@ is available::
 
 	$agent = $this->request->getUserAgent();
 
-	if ($agent->isBrowser())
-	{
+	if ($agent->isBrowser()) {
 		$currentAgent = $agent->getBrowser().' '.$agent->getVersion();
-	}
-	elseif ($agent->isRobot())
-	{
+	} elseif ($agent->isRobot()) {
 		$currentAgent = $this->agent->robot();
-	}
-	elseif ($agent->isMobile())
-	{
+	} elseif ($agent->isMobile()) {
 		$currentAgent = $agent->getMobile();
-	}
-	else
-	{
+	} else {
 		$currentAgent = 'Unidentified User Agent';
 	}
 
@@ -66,21 +59,18 @@ Class Reference
 
 .. php:class:: CodeIgniter\\HTTP\\UserAgent
 
-	.. php:method:: isBrowser([$key = NULL])
+	.. php:method:: isBrowser([$key = null])
 
 		:param	string	$key: Optional browser name
-    		:returns:	TRUE if the user agent is a (specified) browser, FALSE if not
+    		:returns:	true if the user agent is a (specified) browser, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known web browser.
+    		Returns true/false (boolean) if the user agent is a known web browser.
     		::
 
-			if ($agent->isBrowser('Safari'))
-			{
+			if ($agent->isBrowser('Safari')) {
 				echo 'You are using Safari.';
-			}
-			elseif ($agent->isBrowser())
-			{
+			} elseif ($agent->isBrowser()) {
 				echo 'You are using a browser.';
 			}
 
@@ -88,35 +78,30 @@ Class Reference
 				  You can find this list in **app/Config/UserAgents.php** if you want to add new
 				  browsers or change the strings.
 
-	.. php:method:: isMobile([$key = NULL])
+	.. php:method:: isMobile([$key = null])
 
 		:param	string	$key: Optional mobile device name
-    		:returns:	TRUE if the user agent is a (specified) mobile device, FALSE if not
+    		:returns:	true if the user agent is a (specified) mobile device, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.
+    		Returns true/false (boolean) if the user agent is a known mobile device.
     		::
 
-			if ($agent->isMobile('iphone'))
-			{
+			if ($agent->isMobile('iphone')) {
 				echo view('iphone/home');
-			}
-			elseif ($agent->isMobile())
-			{
+			} elseif ($agent->isMobile()) {
 				echo view('mobile/home');
-			}
-			else
-			{
+			} else {
 				echo view('web/home');
 			}
 
-	.. php:method:: isRobot([$key = NULL])
+	.. php:method:: isRobot([$key = null])
 
 		:param	string	$key: Optional robot name
-    		:returns:	TRUE if the user agent is a (specified) robot, FALSE if not
+    		:returns:	true if the user agent is a (specified) robot, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known robot.
+    		Returns true/false (boolean) if the user agent is a known robot.
 
     		.. note:: The user agent library only contains the most common robot definitions. It is not a complete list of bots.
     				  There are hundreds of them so searching for each one would not be very efficient. If you find that some bots
@@ -125,10 +110,10 @@ Class Reference
 
 	.. php:method:: isReferral()
 
-		:returns:	TRUE if the user agent is a referral, FALSE if not
+		:returns:	true if the user agent is a referral, false if not
 		:rtype:	bool
 
-		Returns TRUE/FALSE (boolean) if the user agent was referred from another site.
+		Returns true/false (boolean) if the user agent was referred from another site.
 
 	.. php:method:: getBrowser()
 
@@ -172,8 +157,7 @@ Class Reference
 
 		The referrer, if the user agent was referred from another site. Typically you'll test for this as follows::
 
-			if ($agent->isReferral())
-			{
+			if ($agent->isReferral()) {
 				echo $agent->referrer();
 			}
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index ddfcf406f260..940a95953819 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -132,14 +132,11 @@ this code and save it to your **app/Controllers/** folder::
         {
             helper(['form', 'url']);
 
-            if (! $this->validate([]))
-            {
+            if (! $this->validate([])) {
                 echo view('Signup', [
                     'validation' => $this->validator,
                 ]);
-            }
-            else
-            {
+            } else {
                 echo view('Success');
             }
         }
@@ -227,14 +224,14 @@ Like, ``setRule()``, but accepts an array of field names and their rules::
 
     $validation->setRules([
         'username' => 'required',
-        'password' => 'required|min_length[10]'
+        'password' => 'required|min_length[10]',
     ]);
 
 To give a labeled error message you can set up as::
 
     $validation->setRules([
         'username' => ['label' => 'Username', 'rules' => 'required'],
-        'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]']
+        'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'],
     ]);
 
 withRequest()
@@ -245,8 +242,7 @@ data that was input from an HTTP Request. If desired, you can pass an instance o
 current Request object and it will take all of the input data and set it as the
 data to be validated::
 
-    $validation->withRequest($this->request)
-               ->run();
+    $validation->withRequest($this->request)->run();
 
 Working with Validation
 ************************************************
@@ -262,29 +258,29 @@ easily validate your data::
         'name' => 'Joe Smith',
         'friends' => [
             [
-                'name' => 'Fred Flinstone'
+                'name' => 'Fred Flinstone',
             ],
             [
-                'name' => 'Wilma'
-            ]
+                'name' => 'Wilma',
+            ],
         ]
     ]
 
     // Joe Smith
     $validation->setRules([
-        'contacts.name' => 'required'
+        'contacts.name' => 'required',
     ]);
 
     // Fred Flintsone & Wilma
     $validation->setRules([
-        'contacts.friends.name' => 'required'
+        'contacts.friends.name' => 'required',
     ]);
 
 You can use the '*' wildcard symbol to match any one level of the array::
 
     // Fred Flintsone & Wilma
     $validation->setRules([
-        'contacts.*.name' => 'required'
+        'contacts.*.name' => 'required',
     ]);
 
 "dot array syntax" can also be useful when you have single dimension array data.
@@ -294,11 +290,11 @@ For example, data returned by multi select dropdown::
     'user_ids' => [
         1,
         2,
-        3
+        3,
     ]
     // Rule
     $validation->setRules([
-        'user_ids.*' => 'required'
+        'user_ids.*' => 'required',
     ]);
 
 Validate 1 Value
@@ -331,7 +327,7 @@ rules. As shown earlier, the validation array will have this prototype::
             'username'     => 'required',
             'password'     => 'required',
             'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email'
+            'email'        => 'required|valid_email',
         ];
     }
 
@@ -349,7 +345,7 @@ be used for any errors when this group is used::
             'username'     => 'required',
             'password'     => 'required',
             'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email'
+            'email'        => 'required|valid_email',
         ];
 
         public $signup_errors = [
@@ -357,8 +353,8 @@ be used for any errors when this group is used::
                 'required'    => 'You must choose a username.',
             ],
             'email'    => [
-                'valid_email' => 'Please check the Email field. It does not appear to be valid.'
-            ]
+                'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+            ],
         ];
     }
 
@@ -370,14 +366,14 @@ Or pass all settings in an array::
             'username' => [
                 'rules'  => 'required',
                 'errors' => [
-                    'required' => 'You must choose a Username.'
-                ]
+                    'required' => 'You must choose a Username.',
+                ],
             ],
             'email'    => [
                 'rules'  => 'required|valid_email',
                 'errors' => [
-                    'valid_email' => 'Please check the Email field. It does not appear to be valid.'
-                ]
+                    'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+                ],
             ],
         ];
     }
@@ -411,10 +407,11 @@ rules after one another, you might need to call ``$validation->reset()`` before
 errors from previous run. Be aware that ``reset()`` will invalidate any data, rule or custom error
 you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeated::
 
-    for ($userAccounts as $user) {
+    foreach ($userAccounts as $user) {
         $validation->reset();
         $validation->setRules($userAccountRules);
-        if (!$validation->run($user)) {
+
+        if (! $validation->run($user)) {
             // handle validation errors
         }
     }
@@ -428,7 +425,7 @@ the name of the field (or array key) that was passed in as $data surrounded by c
 replaced by the **value** of the matched incoming field. An example should clarify this::
 
     $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,{id}]'
+        'email' => 'required|valid_email|is_unique[users.email,id,{id}]',
     ]);
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
@@ -436,13 +433,13 @@ that has an id matching the placeholder's value. Assuming that the form POST dat
 
     $_POST = [
         'id' => 4,
-        'email' => 'foo@example.com'
+        'email' => 'foo@example.com',
     ];
 
 then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule::
 
     $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,4]'
+        'email' => 'required|valid_email|is_unique[users.email,id,4]',
     ]);
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
@@ -482,8 +479,8 @@ As the last parameter::
                 'required' => 'All accounts must have usernames provided',
             ],
             'password' => [
-                'min_length' => 'Your password is too short. You want to get hacked?'
-            ]
+                'min_length' => 'Your password is too short. You want to get hacked?',
+            ],
         ]
     );
 
@@ -494,15 +491,15 @@ Or as a labeled style::
                 'label'  => 'Username',
                 'rules'  => 'required|is_unique[users.username]',
                 'errors' => [
-                    'required' => 'All accounts must have {field} provided'
-                ]
+                    'required' => 'All accounts must have {field} provided',
+                ],
             ],
             'password' => [
                 'label'  => 'Password',
                 'rules'  => 'required|min_length[10]',
                 'errors' => [
-                    'min_length' => 'Your {field} is too short. You want to get hacked?'
-                ]
+                    'min_length' => 'Your {field} is too short. You want to get hacked?',
+                ],
             ]
         ]
     );
@@ -529,16 +526,16 @@ We can simply use the language lines defined in this file, like this::
                 'label'  => 'Rules.username',
                 'rules'  => 'required|is_unique[users.username]',
                 'errors' => [
-                    'required' => 'Rules.username.required'
-                ]
+                    'required' => 'Rules.username.required',
+                ],
             ],
             'password' => [
                 'label'  => 'Rules.password',
                 'rules'  => 'required|min_length[10]',
                 'errors' => [
-                    'min_length' => 'Rules.password.min_length'
-                ]
-            ]
+                    'min_length' => 'Rules.password.min_length',
+                ],
+            ],
         ]
     );
 
@@ -572,8 +569,7 @@ Check If Error Exists
 
 You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name::
 
-    if ($validation->hasError('username'))
-    {
+    if ($validation->hasError('username')) {
         echo $validation->getError('username');
     }
 
@@ -623,7 +619,7 @@ short alias they can be referenced by. If we were to add our example file from a
     public $templates = [
         'list'    => 'CodeIgniter\Validation\Views\list',
         'single'  => 'CodeIgniter\Validation\Views\single',
-        'my_list' => '_errors_list'
+        'my_list' => '_errors_list',
     ];
 
 Specifying the Template
@@ -667,7 +663,7 @@ a boolean true or false value signifying true if it passed the test or false if
     {
         public function even(string $str): bool
         {
-            return (int)$str % 2 == 0;
+            return (int) $str % 2 == 0;
         }
     }
 
@@ -677,9 +673,9 @@ second parameter::
 
     public function even(string $str, string &$error = null): bool
     {
-        if ((int)$str % 2 != 0)
-        {
+        if ((int) $str % 2 !== 0) {
             $error = lang('myerrors.evenError');
+
             return false;
         }
 
@@ -689,7 +685,7 @@ second parameter::
 Your new custom rule could now be used just like any other rule::
 
     $this->validate($request, [
-        'foo' => 'required|even'
+        'foo' => 'required|even',
     ]);
 
 Allowing Parameters
@@ -708,8 +704,7 @@ for rules like ``require_with`` that needs to check the value of another submitt
         // search field is present or not.
         $present = $this->required($str ?? '');
 
-        if ($present)
-        {
+        if ($present) {
             return true;
         }
 
@@ -718,10 +713,8 @@ for rules like ``require_with`` that needs to check the value of another submitt
         // as $fields is the lis
         $requiredFields = [];
 
-        foreach ($fields as $field)
-        {
-            if (array_key_exists($field, $data))
-            {
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $data)) {
                 $requiredFields[] = $field;
             }
         }
@@ -887,7 +880,7 @@ file upload related rules::
 
     // In the controller
     $this->validate([
-        'avatar' => 'uploaded[avatar]|max_size[avatar,1024]'
+        'avatar' => 'uploaded[avatar]|max_size[avatar,1024]',
     ]);
 
 ======================= ========== ============================================= ===================================================
diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 0d8ae47377bc..247c0fdce0e3 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -68,7 +68,7 @@ Create the model first at **app/Models/UserModel.php** so that we can interact w
     {
         protected $table         = 'users';
         protected $allowedFields = [
-            'username', 'email', 'password'
+            'username', 'email', 'password',
         ];
         protected $returnType    = 'App\Entities\User';
         protected $useTimestamps = true;
@@ -93,10 +93,11 @@ Now that all of the pieces are in place, you would work with the Entity class as
 
     // Updating
     unset($user->username);
-    if (! isset($user->username)
-    {
+
+    if (! isset($user->username) {
         $user->username = 'something new';
     }
+
     $userModel->save($user);
 
     // Create
@@ -160,7 +161,7 @@ the attributes directly, allowing you to enforce any business logic or data conv
 Here's an updated User entity to provide some examples of how this could be used::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -230,7 +231,7 @@ with the Entity class' data mapping features.
 As an example, imagine you have the simplified User Entity that is used throughout your application::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -239,7 +240,7 @@ As an example, imagine you have the simplified User Entity that is used througho
     {
         protected $attributes = [
             'id' => null,
-            'name' => null,        // Represents a username
+            'name' => null, // Represents a username
             'email' => null,
             'password' => null,
             'created_at' => null,
@@ -257,7 +258,7 @@ property from ``$name`` to ``$full_name``, but that would require changes throug
 simply map the ``full_name`` column in the database to the ``$name`` property, and be done with the Entity changes::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -266,7 +267,7 @@ simply map the ``full_name`` column in the database to the ``$name`` property, a
     {
         protected $attributes = [
             'id' => null,
-            'name' => null,        // Represents a username
+            'name' => null, // Represents a username
             'email' => null,
             'password' => null,
             'created_at' => null,
@@ -301,7 +302,7 @@ of helpful methods in an immutable, localized way.
 You can define which properties are automatically converted by adding the name to the **options['dates']** array::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -336,7 +337,7 @@ Add a question mark at the beginning of type to mark property as nullable, i.e.,
 For example, if you had a User entity with an **is_banned** property, you can cast it as a boolean::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -344,7 +345,7 @@ For example, if you had a User entity with an **is_banned** property, you can ca
     class User extends Entity
     {
         protected $casts = [
-            'is_banned' => 'boolean',
+            'is_banned'          => 'boolean',
             'is_banned_nullable' => '?boolean',
         ];
     }
@@ -367,7 +368,7 @@ Unlike the rest of the data types that you can cast properties into, the:
 the value whenever the property is set::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -400,7 +401,7 @@ a simpler alternative will result in a string that uses less space and is more e
 by humans::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -429,7 +430,7 @@ Let's say the class will be located in the 'app/Entity/Cast' directory::
     <?php
 
     namespace App\Entity\Cast;
-    
+
     use CodeIgniter\Entity\Cast\BaseCast;
 
     //The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
@@ -476,7 +477,7 @@ Now you need to register it::
 If you don't need to change values when getting or setting a value. Then just don't implement the appropriate method::
 
     use CodeIgniter\Entity\Cast\BaseCast;
-    
+
     class CastBase64 extends BaseCast
     {
         public static function get($value, array $params = [])
@@ -506,7 +507,7 @@ Additional parameters are indicated in square brackets and listed with a comma.
     ];
 
     use CodeIgniter\Entity\Cast\BaseCast;
-    
+
     class SomeHandler extends BaseCast
     {
         public static function get($value, array $params = [])
@@ -542,4 +543,4 @@ attribute to check::
 
 Or to check the whole entity for changed values omit the parameter::
 
-    $user->hasChanged();       // true
+    $user->hasChanged(); // true
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index f2b852432298..8326f6e84bcc 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -172,7 +172,7 @@ is used with methods like ``find()`` to know what column to match the specified
 **$useAutoIncrement**
 
 Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false``
-then you are responsible for providing primary key value for every record in the table. This 
+then you are responsible for providing primary key value for every record in the table. This
 feature may be handy when we want to implement 1:1 relation or use UUIDs for our model.
 
 .. note:: If you set ``$useAutoIncrement`` to ``false`` then make sure to set your primary
@@ -321,7 +321,7 @@ Returns the first row in the result set. This is best used in combination with t
 
 **withDeleted()**
 
-If $useSoftDeletes is true, then the find* methods will not return any rows where 'deleted_at IS NOT NULL'.
+If $useSoftDeletes is true, then the find* methods will not return any rows where 'deleted_at IS NOT null'.
 To temporarily override this, you can use the withDeleted() method prior to calling the find* method.
 ::
 
@@ -329,16 +329,14 @@ To temporarily override this, you can use the withDeleted() method prior to call
     $activeUsers = $userModel->findAll();
 
     // Gets all rows
-    $allUsers = $userModel->withDeleted()
-                          ->findAll();
+    $allUsers = $userModel->withDeleted()->findAll();
 
 **onlyDeleted()**
 
 Whereas withDeleted() will return both deleted and not-deleted rows, this method modifies
 the next find* methods to return only soft deleted rows::
 
-    $deletedUsers = $userModel->onlyDeleted()
-                              ->findAll();
+    $deletedUsers = $userModel->onlyDeleted()->findAll();
 
 Saving Data
 -----------
@@ -351,7 +349,7 @@ the array's values are the values to save for that key::
 
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->insert($data);
@@ -364,7 +362,7 @@ of the columns in a $table, while the array's values are the values to save for
 
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->update($id, $data);
@@ -372,7 +370,7 @@ of the columns in a $table, while the array's values are the values to save for
 Multiple records may be updated with a single call by passing an array of primary keys as the first parameter::
 
     $data = [
-        'active' => 1
+        'active' => 1,
     ];
 
     $userModel->update([1, 2, 3], $data);
@@ -396,7 +394,7 @@ automatically, based on whether it finds an array key matching the $primaryKey v
     // Does an insert()
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->save($data);
@@ -405,7 +403,7 @@ automatically, based on whether it finds an array key matching the $primaryKey v
     $data = [
         'id'       => 3,
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
     $userModel->save($data);
 
@@ -427,16 +425,14 @@ simplest, they might look like this::
 
         public function __get($key)
         {
-            if (property_exists($this, $key))
-            {
+            if (property_exists($this, $key)) {
                 return $this->$key;
             }
         }
 
         public function __set($key, $value)
         {
-            if (property_exists($this, $key))
-            {
+            if (property_exists($this, $key)) {
                 $this->$key = $value;
             }
         }
@@ -514,13 +510,13 @@ be applied. If you have custom error message that you want to use, place them in
             'username'     => 'required|alpha_numeric_space|min_length[3]',
             'email'        => 'required|valid_email|is_unique[users.email]',
             'password'     => 'required|min_length[8]',
-            'pass_confirm' => 'required_with[password]|matches[password]'
+            'pass_confirm' => 'required_with[password]|matches[password]',
         ];
 
         protected $validationMessages = [
             'email'        => [
-                'is_unique' => 'Sorry. That email has already been taken. Please choose another.'
-            ]
+                'is_unique' => 'Sorry. That email has already been taken. Please choose another.',
+            ],
         ];
     }
 
@@ -537,7 +533,7 @@ The other way to set the validation rules to fields by functions,
 
         $fieldName = 'username';
         $fieldRules = 'required|alpha_numeric_space|min_length[3]';
-        
+
         $model->setValidationRule($fieldName, $fieldRules);
 
 .. php:function:: setValidationRules($validationRules)
@@ -751,8 +747,7 @@ parameter is a Closure that will be called for each row of data.
 This is best used during cronjobs, data exports, or other large tasks.
 ::
 
-    $userModel->chunk(100, function ($data)
-    {
+    $userModel->chunk(100, function ($data) {
         // do something.
         // $data is a single row of data.
     });
@@ -804,7 +799,7 @@ Additionally, each model may allow (default) or deny callbacks class-wide by set
 You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method::
 
     $model->allowCallbacks(false)->find(1); // No callbacks triggered
-    $model->find(1);                        // Callbacks subject to original property value
+    $model->find(1); // Callbacks subject to original property value
 
 Event Parameters
 ----------------
@@ -854,13 +849,15 @@ boolean, ``returnData``::
     protected function checkCache(array $data)
     {
         // Check if the requested item is already in our cache
-        if (isset($data['id']) && $item = $this->getCachedItem($data['id']]))
-        {
+        if (isset($data['id']) && $item = $this->getCachedItem($data['id']])) {
             $data['data']       = $item;
             $data['returnData'] = true;
 
             return $data;
-    // ...
+        }
+
+        // ...
+    }
 
 Manual Model Creation
 =====================
diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 8d570144cf4c..4758fe4f02bb 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -85,7 +85,7 @@ format both XML and JSON responses::
 
         public $supportedResponseFormats = [
             'application/json',
-            'application/xml'
+            'application/xml',
         ];
 
 This is the array that is used during :doc:`Content Negotiation </incoming/content_negotiation>` to determine which
@@ -98,7 +98,7 @@ support both JSON and XML::
 
     public $formatters = [
         'application/json' => \CodeIgniter\Format\JSONFormatter::class,
-        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class
+        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
     ];
 
 So, if your request asks for JSON formatted data in an **Accept** header, the data array you pass any of the
@@ -167,8 +167,8 @@ Class Reference
 	        'code'     => '321a',
 	        'messages' => [
 	            'Error message 1',
-	            'Error message 2'
-	        ]
+	            'Error message 2',
+	        ],
 	    ];
 
 .. php:method:: respondCreated($data = null[, string $message = ''])
@@ -317,4 +317,3 @@ Class Reference
     ::
 
     	return $this->failServerError('Server error.');
-
diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 20287bfba2ad..97d3fbdf6d5e 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -125,7 +125,7 @@ It also support nested definition::
 
     'language_key' => [
         'nested' => [
-            'key' => 'The actual message to be shown.'
+            'key' => 'The actual message to be shown.',
         ],
     ],
 
@@ -278,8 +278,8 @@ Language files also allow nested arrays to make working with lists, etc... easie
             'Grapes',
             'Lemons',
             'Oranges',
-            'Strawberries'
-        ]
+            'Strawberries',
+        ],
     ];
 
     // Displays "Apples, Bananas, Grapes, Lemons, Oranges, Strawberries"
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index e48a5af6cd08..060e2cd28291 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -37,7 +37,7 @@ You can set format an array into either JSON or XML and set the content type hea
 
     $data = [
         'success' => true,
-        'id' => 123
+        'id' => 123,
     ];
 
     return $this->response->setJSON($data);
@@ -80,10 +80,10 @@ to your computer. This sets the appropriate headers to make it happen.
 The first parameter is the **name you want the downloaded file to be named**, the second parameter is the
 file data.
 
-If you set the second parameter to NULL and ``$filename`` is an existing, readable
+If you set the second parameter to null and ``$filename`` is an existing, readable
 file path, then its content will be read instead.
 
-If you set the third parameter to boolean TRUE, then the actual file MIME type
+If you set the third parameter to boolean true, then the actual file MIME type
 (based on the filename extension) will be sent, so that if your browser has a
 handler for that type - it can use it.
 
@@ -394,7 +394,7 @@ The methods provided by the parent class that are available are:
         followed by the response body. For the main application response, you do not need to call
         this as it is handled automatically by CodeIgniter.
 
-    .. php:method:: setCookie($name = ''[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = FALSE[, $httponly = FALSE[, $samesite = null]]]]]]]])
+    .. php:method:: setCookie($name = ''[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = false[, $httponly = false[, $samesite = null]]]]]]]])
 
         :param mixed $name: Cookie name or an array of parameters
         :param string $value: Cookie value
@@ -423,8 +423,8 @@ The methods provided by the parent class that are available are:
                 'domain' => '.some-domain.com',
                 'path'   => '/',
                 'prefix' => 'myprefix_',
-                'secure' => TRUE,
-                'httponly' => FALSE,
+                'secure' => true,
+                'httponly' => false,
                 'samesite' => 'Lax'
             ];
 
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 781788491ddf..334658d08380 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -136,7 +136,7 @@ example, only the table opening tag is being changed::
 	];
 
 	$table->setTemplate($template);
-	
+
 You can also set defaults for these by passing an array of template settings
 to the Table constructor.::
 
@@ -153,7 +153,7 @@ Class Reference
 
 .. php:class:: Table
 
-	.. attribute:: $function = NULL
+	.. attribute:: $function = null
 
 		Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
 		::
@@ -170,7 +170,7 @@ Class Reference
 
 			<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>
 
-	.. php:method:: generate([$tableData = NULL])
+	.. php:method:: generate([$tableData = null])
 
 		:param	mixed	$tableData: Data to populate the table rows with
 		:returns:	HTML table
@@ -213,7 +213,7 @@ Class Reference
 
 			$table->setFooting(['Subtotal', $subtotal, $notes]);
 
-	.. php:method:: addRow([$args = array()[, ...]])
+	.. php:method:: addRow([$args = [] [, ...]])
 
 		:param	mixed	$args: An array or multiple strings containing the row values
 		:returns:	Table instance (method chaining)
@@ -267,16 +267,16 @@ Class Reference
 	.. php:method:: setTemplate($template)
 
 		:param	array	$template: An associative array containing template values
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Permits you to set your template. You can submit a full or partial template.
 		::
 
 			$template = [
-				'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+				'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
 			];
-		
+
 			$table->setTemplate($template);
 
 	.. php:method:: setEmpty($value)
@@ -304,21 +304,20 @@ Class Reference
 
 			$table = new \CodeIgniter\View\Table();
 
-
 			$table->setCaption('Preferences')
-                            ->setHeading('Name', 'Color', 'Size')
-                            ->addRow('Fred', 'Blue', 'Small')
-                            ->addRow('Mary', 'Red', 'Large')
-                            ->addRow('John', 'Green', 'Medium');
+				->setHeading('Name', 'Color', 'Size')
+				->addRow('Fred', 'Blue', 'Small')
+				->addRow('Mary', 'Red', 'Large')
+				->addRow('John', 'Green', 'Medium');
 
 			echo $table->generate();
 
 			$table->clear();
 
 			$table->setCaption('Shipping')
-                            ->setHeading('Name', 'Day', 'Delivery')
-                            ->addRow('Fred', 'Wednesday', 'Express')
-                            ->addRow('Mary', 'Monday', 'Air')
-                            ->addRow('John', 'Saturday', 'Overnight');
+				->setHeading('Name', 'Day', 'Delivery')
+				->addRow('Fred', 'Wednesday', 'Express')
+				->addRow('Mary', 'Monday', 'Air')
+				->addRow('John', 'Saturday', 'Overnight');
 
 			echo $table->generate();
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 6ba136e11536..37c20c82e11e 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -89,7 +89,7 @@ like this::
 
 	$data = [
 		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading'
+		'blog_heading' => 'My Blog Heading',
 	];
 
 	echo $parser->setData($data)
@@ -194,8 +194,8 @@ corresponding to your variable pair data. Consider this example::
 			['title' => 'Title 2', 'body' => 'Body 2'],
 			['title' => 'Title 3', 'body' => 'Body 3'],
 			['title' => 'Title 4', 'body' => 'Body 4'],
-			['title' => 'Title 5', 'body' => 'Body 5']
-		]
+			['title' => 'Title 5', 'body' => 'Body 5'],
+		],
 	];
 
 	echo $parser->setData($data)
@@ -214,11 +214,11 @@ method::
 	$data = [
 		'blog_title'   => 'My Blog Title',
 		'blog_heading' => 'My Blog Heading',
-		'blog_entries' => $query->getResultArray()
+		'blog_entries' => $query->getResultArray(),
 	];
 
 	echo $parser->setData($data)
-	             ->render('blog_template');
+	            ->render('blog_template');
 
 If the array you are trying to loop over contains objects instead of arrays,
 the parser will first look for an ``asArray`` method on the object. If it exists,
@@ -240,12 +240,13 @@ an associative array of values, like a record from a database::
 		'blog_title'   => 'My Blog Title',
 		'blog_heading' => 'My Blog Heading',
 		'blog_entry'   => [
-			'title' => 'Title 1', 'body' => 'Body 1'
-		]
+			'title' => 'Title 1',
+			'body' => 'Body 1',
+		],
 	];
 
 	echo $parser->setData($data)
-	             ->render('blog_template');
+	            ->render('blog_template');
 
 The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
@@ -292,7 +293,7 @@ The following example is not impacted by cascading::
 
 	$data = [
 		'name'     => 'George',
-		'location' => [ 'city' => 'Red City', 'planet' => 'Mars' ]
+		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 	];
 
 	echo $parser->setData($data)->renderString($template);
@@ -304,7 +305,7 @@ This example gives different results, depending on cascading::
 
 	$data = [
 		'name'     => 'George',
-		'location' => [ 'city' => 'Red City', 'planet' => 'Mars' ]
+		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 	];
 
 	echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
@@ -540,7 +541,7 @@ used within the template file. The value is any valid PHP callable, including st
 
 	public $plugins = [
 		'foo'	=> '\Some\Class::methodName',
-		'bar'	=> function($str, array $params=[]) {
+		'bar'	=> function ($str, array $params=[]) {
 			return $str;
 		},
 	];
@@ -553,7 +554,7 @@ Any closures that are being used must be defined in the config file's constructo
 
         public function __construct()
         {
-            $this->plugins['bar'] = function(array $params=[]) {
+            $this->plugins['bar'] = function (array $params=[]) {
                 return $params[0] ?? '';
             };
 
@@ -605,10 +606,10 @@ template, the original pseudo-variable is shown in the result::
 	$data = [
 		'title'     => 'Mr',
 		'firstname' => 'John',
-		'lastname'  => 'Doe'
+		'lastname'  => 'Doe',
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 	// Result: Hello, John {initials} Doe
 
@@ -623,11 +624,11 @@ pair tag, but the closing variable pair tag is not rendered properly::
 		'lastname'  => 'Doe',
 		'titles'    => [
 			['degree' => 'BSc'],
-			['degree' => 'PhD']
-		]
+			['degree' => 'PhD'],
+		],
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 	// Result: Hello, John Doe (Mr{degree} {/degrees})
 
@@ -652,7 +653,7 @@ An example with the iteration controlled in the view::
 		]
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 Result::
 
@@ -671,17 +672,16 @@ using a view fragment::
 		['title' => 'Second Link', 'link' => '/second'],
 	];
 
-	foreach ($data1 as $menuItem)
-	{
+	foreach ($data1 as $menuItem),{
 		$temp .= $parser->setData($menuItem)->renderString($template1);
 	}
 
 	$template2 = '<ul>{menuitems}</ul>';
 	$data = [
-		'menuitems' => $temp
+		'menuitems' => $temp,
 	];
 	echo $parser->setData($data)
-	             ->renderString($template2);
+	            ->renderString($template2);
 
 Result::
 
@@ -710,12 +710,12 @@ Class Reference
 
         Options supported:
 
-	        -   ``cache`` - the time in seconds, to save a view's results
-	        -   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
-	        -   ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
-	        -   ``saveData`` - true if the view data parameter should be retained for subsequent calls
-	        -   ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
-	        -   ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
+	        - ``cache`` - the time in seconds, to save a view's results
+	        - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
+	        - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
+	        - ``saveData`` - true if the view data parameter should be retained for subsequent calls
+	        - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
+	        - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
 
 		Any conditional substitutions are performed first, then remaining
 		substitutions are performed for each data pair.
@@ -770,6 +770,6 @@ Class Reference
     		:returns: The Renderer, for method chaining
     		:rtype: CodeIgniter\\View\\RendererInterface.
 
-    		Over-ride the substitution field delimiters::
+    		Override the substitution field delimiters::
 
 			$renderer->setDelimiters('[',']');
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 97485ba84774..0ea2001fe724 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -80,7 +80,7 @@ content view, and a footer view. That might look something like this::
 		public function index()
 		{
 			$data = [
-				'page_title' => 'Your title'
+				'page_title' => 'Your title',
 			];
 
 			echo view('header');
@@ -137,7 +137,7 @@ Here's an example::
 	$data = [
 		'title'   => 'My title',
 		'heading' => 'My Heading',
-		'message' => 'My Message'
+		'message' => 'My Message',
 	];
 
 	echo view('blogview', $data);
@@ -181,7 +181,7 @@ into the `$option` array in the third parameter.
 	$data = [
 		'title'   => 'My title',
 		'heading' => 'My Heading',
-		'message' => 'My Message'
+		'message' => 'My Message',
 	];
 
 	echo view('blogview', $data, ['saveData' => true]);
@@ -208,8 +208,8 @@ Here’s a simple example. Add this to your controller::
 		{
 			$data = [
 				'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
-				'title'     => "My Real Title",
-				'heading'   => "My Real Heading"
+				'title'     => 'My Real Title',
+				'heading'   => 'My Real Heading',
 			];
 
 			echo view('blogview', $data);
diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst
index 3f2a760d9428..780dcfe8ac08 100644
--- a/user_guide_src/source/testing/benchmark.rst
+++ b/user_guide_src/source/testing/benchmark.rst
@@ -57,7 +57,7 @@ This returns an array of benchmark information, including start, end, and durati
         'render view'  => [
             'start'    => 1234567890,
             'end'      => 1345678920,
-            'duration' => 15.4315      // number of seconds
+            'duration' => 15.4315, // number of seconds
         ]
     ]
 
@@ -97,18 +97,14 @@ this test by. The second parameter is the Closure, itself::
     $iterator = new \CodeIgniter\Benchmark\Iterator();
 
     // Add a new task
-    $iterator->add('single_concat', function()
-        {
-            $str = 'Some basic'.'little'.'string concatenation test.';
-        }
-    );
+    $iterator->add('single_concat', function () {
+        $str = 'Some basic'.'little'.'string concatenation test.';
+    });
 
     // Add another task
-    $iterator->add('double', function($a='little')
-        {
-            $str = "Some basic {$little} string test.";
-        }
-    );
+    $iterator->add('double', function ($a = 'little') {
+        $str = "Some basic {$little} string test.";
+    });
 
 Running the Tasks
 =================
diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 31f96b5bb565..86b91537917e 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -163,7 +163,7 @@ Asserts that a row with criteria matching the key/value pairs in ``$criteria`` D
 
     $criteria = [
         'email'  => 'joe@example.com',
-        'active' => 1
+        'active' => 1,
     ];
     $this->dontSeeInDatabase('users', $criteria);
 
@@ -174,7 +174,7 @@ Asserts that a row with criteria matching the key/value pairs in ``$criteria`` D
 
     $criteria = [
         'email'  => 'joe@example.com',
-        'active' => 1
+        'active' => 1,
     ];
     $this->seeInDatabase('users', $criteria);
 
@@ -194,7 +194,7 @@ array with the data to insert into the table.
 
     $data = [
         'email' => 'joe@example.com',
-        'name'  => 'Joe Cool'
+        'name'  => 'Joe Cool',
     ];
     $this->hasInDatabase('users', $data);
 
@@ -204,6 +204,6 @@ Asserts that a number of matching rows are found in the database that match ``$c
 ::
 
     $criteria = [
-        'active' => 1
+        'active' => 1,
     ];
     $this->seeNumRecords(2, 'users', $criteria);
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index afeb9deaade6..6149ceac9a54 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -79,7 +79,7 @@ the **app/Config/Toolbar.php** configuration file::
         \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
-         \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
@@ -182,7 +182,7 @@ it to sort it correctly and display the correct information. The inner arrays mu
         'name'      => '',     // Name displayed on the left of the timeline
         'component' => '',     // Name of the Component listed in the middle of timeline
         'start'     => 0.00,   // start time, like microtime(true)
-        'duration'  => 0.00    // duration, like mircrotime(true) - microtime(true)
+        'duration'  => 0.00,   // duration, like mircrotime(true) - microtime(true)
     ];
 
 Providing Vars
@@ -199,10 +199,10 @@ outer array's key is the name of the section on the Vars tab::
     $data = [
         'section 1' => [
             'foo' => 'bar',
-            'bar' => 'baz'
+            'bar' => 'baz',
         ],
         'section 2' => [
             'foo' => 'bar',
-            'bar' => 'baz'
-        ]
+            'bar' => 'baz',
+        ],
      ];
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 6abc1ff228ce..6ec786c67079 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -61,7 +61,7 @@ populated, while a **post** request would have the **$_POST** array populated.
 
     // Submit a form
     $result = $this->call('post', 'contact'), [
-        'name' => 'Fred Flintstone',
+        'name'  => 'Fred Flintstone',
         'email' => 'flintyfred@example.com'
     ]);
 
@@ -83,11 +83,10 @@ You can use a custom collection of routes by passing an array of "routes" into t
 override any existing routes in the system::
 
     $routes = [
-       [ 'get', 'users', 'UserController::list' ]
-     ];
+        ['get', 'users', 'UserController::list'],
+    ];
 
-    $result = $this->withRoutes($routes)
-        ->get('users');
+    $result = $this->withRoutes($routes)->get('users');
 
 Each of the "routes" is a 3 element array containing the HTTP verb (or "add" for all),
 the URI to match, and the routing destination.
@@ -102,11 +101,10 @@ that the current values of ``$_SESSION`` should be used. This is handy for testi
 ::
 
     $values = [
-        'logged_in' => 123
+        'logged_in' => 123,
     ];
 
-    $result = $this->withSession($values)
-        ->get('admin');
+    $result = $this->withSession($values)->get('admin');
 
     // Or...
 
@@ -121,7 +119,7 @@ You can set header values with the ``withHeaders()`` method. This takes an array
 passed as a header into the call.::
 
     $headers = [
-        'CONTENT_TYPE' => 'application/json'
+        'CONTENT_TYPE' => 'application/json',
     ];
 
     $result = $this->withHeaders($headers)->post('users');
@@ -132,8 +130,7 @@ Bypassing Events
 Events are handy to use in your application, but can be problematic during testing. Especially events that are used
 to send out emails. You can tell the system to skip any event handling with the ``skipEvents()`` method::
 
-    $result = $this->skipEvents()
-        ->post('users', $userInfo);
+    $result = $this->skipEvents()->post('users', $userInfo);
 
 Formatting The Request
 -----------------------
@@ -145,8 +142,7 @@ This is useful when testing JSON or XML API's so that you can set the request in
 ::
 
     // If your feature test contains this:
-    $result = $this->withBodyFormat('json')
-        ->post('users', $userInfo);
+    $result = $this->withBodyFormat('json')->post('users', $userInfo);
 
     // Your controller can then get the parameters passed in with:
     $userInfo = $this->request->getJson();
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index e19403542a6e..28e99b9b4bbc 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -195,7 +195,7 @@ Ensure that something you expected to be logged actually was::
 
 Ensure that an event you expected to be triggered actually was::
 
-    Events::on('foo', function($arg) use(&$result) {
+    Events::on('foo', function ($arg) use(&$result) {
         $result = $arg;
     });
 
@@ -384,5 +384,5 @@ An example demonstrating this inside one of your test cases::
     {
         CLI::write('first.');
         $expected = "first.\n";
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index a5cc1749f58d..4152feff03d1 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -40,8 +40,7 @@ Returns a boolean true/false based on whether the response is perceived to be "o
 a response status code in the 200 or 300's.
 ::
 
-    if ($result->isOK())
-    {
+    if ($result->isOK()) {
         ...
     }
 
@@ -57,8 +56,7 @@ This assertion simply uses the **isOK()** method to test a response. **assertNot
 Returns a boolean true/false based on whether the response is a redirected response.
 ::
 
-    if ($result->isRedirect())
-    {
+    if ($result->isRedirect()) {
         ...
     }
 
@@ -314,7 +312,7 @@ Asserts that $fragment is found within the JSON response. It does not need to ma
 
     // Response body is this:
     [
-        'config' => ['key-a', 'key-b']
+        'config' => ['key-a', 'key-b'],
     ]
 
     // Is true
diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst
index 613b56b7e24f..afb38465904b 100644
--- a/user_guide_src/source/tutorial/conclusion.rst
+++ b/user_guide_src/source/tutorial/conclusion.rst
@@ -1,5 +1,5 @@
 Conclusion
-###############################################################################
+##########
 
 This tutorial did not cover all of the things you might expect of a
 full-fledged content management system, but it introduced you to the
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index d7a1ed8b321e..6b8dd53bd458 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -1,5 +1,5 @@
 Create news items
-###############################################################################
+#################
 
 You now know how you can read data from a database using CodeIgniter, but
 you haven't written any information to the database yet. In this section,
@@ -7,7 +7,7 @@ you'll expand your news controller and model created earlier to include
 this functionality.
 
 Create a form
--------------------------------------------------------
+-------------
 
 To input data into the database, you need to create a form where you can
 input the information to be stored. This means you'll be needing a form
@@ -50,21 +50,18 @@ validation <../libraries/validation>` library to do this.
         $model = new NewsModel();
 
         if ($this->request->getMethod() === 'post' && $this->validate([
-                'title' => 'required|min_length[3]|max_length[255]',
-                'body'  => 'required',
-            ]))
-        {
+            'title' => 'required|min_length[3]|max_length[255]',
+            'body'  => 'required',
+        ])) {
             $model->save([
                 'title' => $this->request->getPost('title'),
-                'slug'  => url_title($this->request->getPost('title'), '-', TRUE),
+                'slug'  => url_title($this->request->getPost('title'), '-', true),
                 'body'  => $this->request->getPost('body'),
             ]);
 
             echo view('news/success');
-            
-        }
-        else
-        {
+
+        } else {
             echo view('templates/header', ['title' => 'Create a news item']);
             echo view('news/create');
             echo view('templates/footer');
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 3ee34cfa1ba8..054b030e61e9 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -107,8 +107,7 @@ following code to your model.
 
     public function getNews($slug = false)
     {
-        if ($slug === false)
-        {
+        if ($slug === false) {
             return $this->findAll();
         }
 
@@ -243,7 +242,7 @@ add some code to the controller and create a new view. Go back to the
 
 ::
 
-    public function view($slug = NULL)
+    public function view($slug = null)
     {
         $model = new NewsModel();
 
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index a68a7e9d249a..54dfdce6a369 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -129,8 +129,7 @@ in the ``Pages`` controller created above:
 
     public function view($page = 'home')
     {
-        if ( ! is_file(APPPATH.'/Views/pages/'.$page.'.php'))
-        {
+        if ( ! is_file(APPPATH.'/Views/pages/'.$page.'.php')) {
             // Whoops, we don't have a page for that!
             throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
         }
diff --git a/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php b/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
index 9e8ac2213c01..a2cefaddfdd7 100644
--- a/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
+++ b/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\PHPStan;
 
 use CodeIgniter\Exceptions\FrameworkException;
@@ -13,32 +22,30 @@
 
 final class CheckFrameworkExceptionInstantiationViaNamedConstructorRule implements Rule
 {
-	/**
-	 * @var string
-	 */
-	private const ERROR_MESSAGE = 'FrameworkException instance creation via new expression is not allowed, use its named constructor instead';
-
-	public function getNodeType(): string
-	{
-		return New_::class;
-	}
-
-	/**
-	 * @param New_ $node
-	 */
-	public function processNode(Node $node, Scope $scope): array
-	{
-		$class = $node->class;
-		if (! $class instanceof FullyQualified)
-		{
-			return [];
-		}
-
-		if (! is_a((string) $class, FrameworkException::class, true))
-		{
-			return [];
-		}
-
-		return [self::ERROR_MESSAGE];
-	}
+    /**
+     * @var string
+     */
+    private const ERROR_MESSAGE = 'FrameworkException instance creation via new expression is not allowed, use its named constructor instead';
+
+    public function getNodeType(): string
+    {
+        return New_::class;
+    }
+
+    /**
+     * @param New_ $node
+     */
+    public function processNode(Node $node, Scope $scope): array
+    {
+        $class = $node->class;
+        if (! $class instanceof FullyQualified) {
+            return [];
+        }
+
+        if (! is_a((string) $class, FrameworkException::class, true)) {
+            return [];
+        }
+
+        return [self::ERROR_MESSAGE];
+    }
 }
diff --git a/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php b/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
index 91174fd1022b..2bcd0e20f9a9 100644
--- a/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
+++ b/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\PHPStan;
 
 use PhpParser\Comment\Doc;
@@ -13,58 +22,52 @@
 
 final class CheckUseStatementsAfterLicenseRule implements Rule
 {
-	/**
-	 * @var string
-	 */
-	private const ERROR_MESSAGE = 'Use statement must be located after license docblock';
+    /**
+     * @var string
+     */
+    private const ERROR_MESSAGE = 'Use statement must be located after license docblock';
 
-	/**
-	 * @var string
-	 */
-	private const COPYRIGHT_REGEX = '/\* \(c\) CodeIgniter Foundation <admin@codeigniter\.com>/m';
+    /**
+     * @var string
+     */
+    private const COPYRIGHT_REGEX = '/\* \(c\) CodeIgniter Foundation <admin@codeigniter\.com>/m';
 
-	public function getNodeType(): string
-	{
-		return Stmt::class;
-	}
+    public function getNodeType(): string
+    {
+        return Stmt::class;
+    }
 
-	/**
-	 * @param Stmt $node
-	 */
-	public function processNode(Node $node, Scope $scope): array
-	{
-		$comments = $node->getComments();
+    /**
+     * @param Stmt $node
+     */
+    public function processNode(Node $node, Scope $scope): array
+    {
+        $comments = $node->getComments();
 
-		if ($comments === [])
-		{
-			return [];
-		}
+        if ($comments === []) {
+            return [];
+        }
 
-		foreach ($comments as $comment)
-		{
-			if (! $comment instanceof Doc)
-			{
-				continue;
-			}
+        foreach ($comments as $comment) {
+            if (! $comment instanceof Doc) {
+                continue;
+            }
 
-			if (! preg_match(self::COPYRIGHT_REGEX, $comment->getText()))
-			{
-				continue;
-			}
+            if (! preg_match(self::COPYRIGHT_REGEX, $comment->getText())) {
+                continue;
+            }
 
-			$previous = $node->getAttribute('previous');
+            $previous = $node->getAttribute('previous');
 
-			while ($previous)
-			{
-				if ($previous instanceof Use_)
-				{
-					return [self::ERROR_MESSAGE];
-				}
+            while ($previous) {
+                if ($previous instanceof Use_) {
+                    return [self::ERROR_MESSAGE];
+                }
 
-				$previous = $previous->getAttribute('previous');
-			}
-		}
+                $previous = $previous->getAttribute('previous');
+            }
+        }
 
-		return [];
-	}
+        return [];
+    }
 }
diff --git a/utils/Rector/PassStrictParameterToFunctionParameterRector.php b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
index 0c406d70b24e..c6e92bb9d418 100644
--- a/utils/Rector/PassStrictParameterToFunctionParameterRector.php
+++ b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
@@ -18,59 +27,56 @@
  */
 final class PassStrictParameterToFunctionParameterRector extends AbstractRector
 {
-	private const FUNCTION_WITH_ARG_POSITION = [
-		// position start from 0
-		'array_search'  => 2,
-		'base64_decode' => 1,
-		'in_array'      => 2,
-	];
+    private const FUNCTION_WITH_ARG_POSITION = [
+        // position start from 0
+        'array_search'  => 2,
+        'base64_decode' => 1,
+        'in_array'      => 2,
+    ];
 
-	public function getRuleDefinition(): RuleDefinition
-	{
-		return new RuleDefinition('Pass strict to function parameter on specific position argument when no value provided', [
-			new CodeSample('array_search($value, $array);', 'array_search($value, $array, true);'),
-			new CodeSample('base64_decode($string);', 'base64_decode($string, true);'),
-			new CodeSample("in_array('a', \$array);", "in_array('a', \$array, true);"),
-		]);
-	}
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Pass strict to function parameter on specific position argument when no value provided', [
+            new CodeSample('array_search($value, $array);', 'array_search($value, $array, true);'),
+            new CodeSample('base64_decode($string);', 'base64_decode($string, true);'),
+            new CodeSample("in_array('a', \$array);", "in_array('a', \$array, true);"),
+        ]);
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getNodeTypes(): array
-	{
-		return [FuncCall::class];
-	}
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [FuncCall::class];
+    }
 
-	/**
-	 * @param FuncCall $node
-	 */
-	public function refactor(Node $node): ?Node
-	{
-		$name = $node->name;
-		if (! method_exists($name, 'toString'))
-		{
-			return null;
-		}
+    /**
+     * @param FuncCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $name = $node->name;
+        if (! method_exists($name, 'toString')) {
+            return null;
+        }
 
-		$functions           = array_keys(self::FUNCTION_WITH_ARG_POSITION);
-		$currentFunctionName = $name->toString();
+        $functions           = array_keys(self::FUNCTION_WITH_ARG_POSITION);
+        $currentFunctionName = $name->toString();
 
-		if (! in_array($currentFunctionName, $functions, true))
-		{
-			return null;
-		}
+        if (! in_array($currentFunctionName, $functions, true)) {
+            return null;
+        }
 
-		$position = self::FUNCTION_WITH_ARG_POSITION[$currentFunctionName];
+        $position = self::FUNCTION_WITH_ARG_POSITION[$currentFunctionName];
 
-		if (isset($node->args[$position]))
-		{
-			return null;
-		}
+        if (isset($node->args[$position])) {
+            return null;
+        }
 
-		$name                  = new Name('true');
-		$node->args[$position] = new Arg(new ConstFetch($name));
+        $name                  = new Name('true');
+        $node->args[$position] = new Arg(new ConstFetch($name));
 
-		return $node;
-	}
+        return $node;
+    }
 }
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index 67d153e68e24..b083b5daff87 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
@@ -13,56 +22,54 @@
 
 final class RemoveErrorSuppressInTryCatchStmtsRector extends AbstractRector
 {
-	public function getRuleDefinition(): RuleDefinition
-	{
-		return new RuleDefinition('Remove error suppression operator `@` inside try...catch blocks', [
-			new CodeSample(
-				<<<'CODE_SAMPLE'
-					try {
-						@rmdir($dirname);
-					} catch (Exception $e) {}
-				CODE_SAMPLE,
-				<<<'CODE_SAMPLE'
-				try {
-					rmdir($dirname);
-				} catch (Exception $e) {}
-				CODE_SAMPLE
-			),
-		]);
-	}
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Remove error suppression operator `@` inside try...catch blocks', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+                    	try {
+                    		@rmdir($dirname);
+                    	} catch (Exception $e) {}
+                    CODE_SAMPLE,
+                <<<'CODE_SAMPLE'
+                    try {
+                    	rmdir($dirname);
+                    } catch (Exception $e) {}
+                    CODE_SAMPLE
+            ),
+        ]);
+    }
 
-	/**
-	 * @return string[]
-	 */
-	public function getNodeTypes(): array
-	{
-		return [ErrorSuppress::class];
-	}
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [ErrorSuppress::class];
+    }
 
-	/**
-	 * @param ErrorSuppress $node
-	 */
-	public function refactor(Node $node): ?Node
-	{
-		$tryCatch = $this->betterNodeFinder->findParentType($node, TryCatch::class);
+    /**
+     * @param ErrorSuppress $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $tryCatch = $this->betterNodeFinder->findParentType($node, TryCatch::class);
 
-		// not in try catch
-		if (! $tryCatch instanceof TryCatch)
-		{
-			return null;
-		}
+        // not in try catch
+        if (! $tryCatch instanceof TryCatch) {
+            return null;
+        }
 
-		$inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static function (Node $n) use ($node) : bool {
-			return $n === $node;
-		});
+        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static function (Node $n) use ($node): bool {
+            return $n === $node;
+        });
 
-		// not in stmts, means it in catch or finally
-		if (! $inStmts)
-		{
-			return null;
-		}
+        // not in stmts, means it in catch or finally
+        if (! $inStmts) {
+            return null;
+        }
 
-		// in try { ... } stmts
-		return $node->expr;
-	}
+        // in try { ... } stmts
+        return $node->expr;
+    }
 }
diff --git a/utils/Rector/RemoveVarTagFromClassConstantRector.php b/utils/Rector/RemoveVarTagFromClassConstantRector.php
index 0a4689fac17a..d780c8647cbd 100644
--- a/utils/Rector/RemoveVarTagFromClassConstantRector.php
+++ b/utils/Rector/RemoveVarTagFromClassConstantRector.php
@@ -2,59 +2,68 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassConst;
+use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 
 final class RemoveVarTagFromClassConstantRector extends AbstractRector
 {
-	public function getRuleDefinition(): RuleDefinition
-	{
-		return new RuleDefinition('Remove @var tag from class constant', [
-			new CodeSample(
-				<<<'CODE_SAMPLE'
-				class Foo
-				{
-					/** @var string */
-					const X = 'test';
-				}
-				CODE_SAMPLE,
-				<<<'CODE_SAMPLE'
-				class Foo
-				{
-					const X = 'test';
-				}
-				CODE_SAMPLE
-			),
-		]);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getNodeTypes(): array
-	{
-		return [ClassConst::class];
-	}
-
-	/**
-	 * @param ClassConst $node
-	 */
-	public function refactor(Node $node): ?Node
-	{
-		$phpDocInfo      = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
-		$varTagValueNode = $phpDocInfo->getVarTagValueNode();
-		if (! $varTagValueNode instanceof VarTagValueNode)
-		{
-			return null;
-		}
-
-		$phpDocInfo->removeByType(VarTagValueNode::class);
-		return $node;
-	}
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Remove @var tag from class constant', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+                    class Foo
+                    {
+                    	/** @var string */
+                    	const X = 'test';
+                    }
+                    CODE_SAMPLE,
+                <<<'CODE_SAMPLE'
+                    class Foo
+                    {
+                    	const X = 'test';
+                    }
+                    CODE_SAMPLE
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [ClassConst::class];
+    }
+
+    /**
+     * @param ClassConst $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $phpDocInfo      = $this->phpDocInfoFactory->createFromNodeOrEmpty($node);
+        $varTagValueNode = $phpDocInfo->getVarTagValueNode();
+        if (! $varTagValueNode instanceof VarTagValueNode) {
+            return null;
+        }
+
+        $phpDocInfo->removeByType(VarTagValueNode::class);
+
+        return $node;
+    }
 }
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 0d670b617f26..005355bb7fd6 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use Nette\Utils\Strings;
@@ -23,152 +32,140 @@
  */
 final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
 {
-	/**
-	 * @see https://regex101.com/r/OtFn8I/1
-	 */
-	private const PARAM_NAME_REGEX = '#(?<paramPrefix>@param\s.*\s+\$)(?<paramName>%s)#ms';
-
-	/**
-	 * @var ReservedKeywordAnalyzer
-	 */
-	private $reservedKeywordAnalyzer;
-
-	/**
-	 * @var StringFormatConverter
-	 */
-	private $stringFormatConverter;
-
-	public function __construct(
-		ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
-		StringFormatConverter $stringFormatConverter
-	)
-	{
-		$this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
-		$this->stringFormatConverter   = $stringFormatConverter;
-	}
-
-	public function getRuleDefinition(): RuleDefinition
-	{
-		return new RuleDefinition('Change under_score names to camelCase', [
-			new CodeSample(
-				<<<'CODE_SAMPLE'
-final class SomeClass
-{
-    public function run($a_b)
-    {
-        $some_value = $a_b;
+    /**
+     * @see https://regex101.com/r/OtFn8I/1
+     */
+    private const PARAM_NAME_REGEX = '#(?<paramPrefix>@param\s.*\s+\$)(?<paramName>%s)#ms';
+
+    /**
+     * @var ReservedKeywordAnalyzer
+     */
+    private $reservedKeywordAnalyzer;
+
+    /**
+     * @var StringFormatConverter
+     */
+    private $stringFormatConverter;
+
+    public function __construct(
+        ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
+        StringFormatConverter $stringFormatConverter
+    ) {
+        $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
+        $this->stringFormatConverter   = $stringFormatConverter;
     }
-}
-CODE_SAMPLE
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Change under_score names to camelCase', [
+            new CodeSample(
+                <<<'CODE_SAMPLE'
+                    final class SomeClass
+                    {
+                        public function run($a_b)
+                        {
+                            $some_value = $a_b;
+                        }
+                    }
+                    CODE_SAMPLE
 ,
-				<<<'CODE_SAMPLE'
-final class SomeClass
-{
-    public function run($aB)
+                <<<'CODE_SAMPLE'
+                    final class SomeClass
+                    {
+                        public function run($aB)
+                        {
+                            $someValue = $aB;
+                        }
+                    }
+                    CODE_SAMPLE
+            ),
+        ]);
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
     {
-        $someValue = $aB;
+        return [Variable::class];
+    }
+
+    /**
+     * @param Variable $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        $nodeName = $this->getName($node);
+        if ($nodeName === null) {
+            return null;
+        }
+
+        if (! Strings::contains($nodeName, '_')) {
+            return null;
+        }
+
+        if ($this->reservedKeywordAnalyzer->isNativeVariable($nodeName)) {
+            return null;
+        }
+
+        if ($nodeName[0] === '_') {
+            return null;
+        }
+
+        $camelCaseName = $this->stringFormatConverter->underscoreAndHyphenToCamelCase($nodeName);
+        if ($camelCaseName === 'this') {
+            return null;
+        }
+
+        $node->name = $camelCaseName;
+        $this->updateDocblock($node, $nodeName, $camelCaseName);
+
+        return $node;
+    }
+
+    private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void
+    {
+        $parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
+
+        while ($parentNode) {
+            /**
+             * @var ClassMethod|Function_ $parentNode
+             */
+            $parentNode = $parentNode->getAttribute(AttributeKey::PARENT_NODE);
+
+            if ($parentNode instanceof ClassMethod || $parentNode instanceof Function_) {
+                break;
+            }
+        }
+
+        if ($parentNode === null) {
+            return;
+        }
+
+        $docComment = $parentNode->getDocComment();
+        if ($docComment === null) {
+            return;
+        }
+
+        $docCommentText = $docComment->getText();
+        if ($docCommentText === null) {
+            return;
+        }
+
+        if (! Strings::match($docCommentText, sprintf(self::PARAM_NAME_REGEX, $variableName))) {
+            return;
+        }
+
+        $phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentNode);
+        $paramTagValueNodes = $phpDocInfo->getParamTagValueNodes();
+
+        foreach ($paramTagValueNodes as $paramTagValueNode) {
+            if ($paramTagValueNode->parameterName === '$' . $variableName) {
+                $paramTagValueNode->parameterName = '$' . $camelCaseName;
+                break;
+            }
+        }
+
+        $parentNode->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
     }
-}
-CODE_SAMPLE
-			),
-		]);
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getNodeTypes(): array
-	{
-		return [Variable::class];
-	}
-
-	/**
-	 * @param Variable $node
-	 */
-	public function refactor(Node $node): ?Node
-	{
-		$nodeName = $this->getName($node);
-		if ($nodeName === null)
-		{
-			return null;
-		}
-
-		if (! Strings::contains($nodeName, '_'))
-		{
-			return null;
-		}
-
-		if ($this->reservedKeywordAnalyzer->isNativeVariable($nodeName))
-		{
-			return null;
-		}
-
-		if ($nodeName[0] === '_')
-		{
-			return null;
-		}
-
-		$camelCaseName = $this->stringFormatConverter->underscoreAndHyphenToCamelCase($nodeName);
-		if ($camelCaseName === 'this')
-		{
-			return null;
-		}
-
-		$node->name = $camelCaseName;
-		$this->updateDocblock($node, $nodeName, $camelCaseName);
-
-		return $node;
-	}
-
-	private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void
-	{
-		$parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
-		while ($parentNode)
-		{
-			/**
-			 * @var ClassMethod|Function_ $parentNode
-			 */
-			$parentNode = $parentNode->getAttribute(AttributeKey::PARENT_NODE);
-			if ($parentNode instanceof ClassMethod || $parentNode instanceof Function_)
-			{
-				break;
-			}
-		}
-
-		if ($parentNode === null)
-		{
-			return;
-		}
-
-		$docComment = $parentNode->getDocComment();
-		if ($docComment === null)
-		{
-			return;
-		}
-
-		$docCommentText = $docComment->getText();
-		if ($docCommentText === null)
-		{
-			return;
-		}
-
-		if (! Strings::match($docCommentText, sprintf(self::PARAM_NAME_REGEX, $variableName)))
-		{
-			return;
-		}
-
-		$phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentNode);
-		$paramTagValueNodes = $phpDocInfo->getParamTagValueNodes();
-
-		foreach ($paramTagValueNodes as $paramTagValueNode)
-		{
-			if ($paramTagValueNode->parameterName === '$' . $variableName)
-			{
-				$paramTagValueNode->parameterName = '$' . $camelCaseName;
-				break;
-			}
-		}
-
-		$parentNode->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
-	}
 }