diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6b089e0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/env export-ignore
+/phpunit.xml.dist export-ignore
+/spark export-ignore
+/app export-ignore
+/public export-ignore
+/writable export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..daac9e5
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+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.
diff --git a/README.md b/README.md
index 275f015..6692596 100644
--- a/README.md
+++ b/README.md
@@ -2,17 +2,17 @@
 
 ## What is CodeIgniter?
 
-CodeIgniter is a PHP full-stack web framework that is light, fast, flexible, and secure. 
+CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
 More information can be found at the [official site](http://codeigniter.com).
 
 This repository holds the distributable version of the framework,
-including the user guide. It has been built from the 
+including the user guide. It has been built from the
 [development repository](https://github.com/codeigniter4/CodeIgniter4).
 
 More information about the plans for version 4 can be found in [the announcement](http://forum.codeigniter.com/thread-62615.html) on the forums.
 
 The user guide corresponding to this version of the framework can be found
-[here](https://codeigniter4.github.io/userguide/). 
+[here](https://codeigniter4.github.io/userguide/).
 
 
 ## Important Change with index.php
@@ -25,7 +25,6 @@
 framework are exposed.
 
 **Please** read the user guide for a better explanation of how CI4 works!
-The user guide updating and deployment is a bit awkward at the moment, but we are working on it!
 
 ## Repository Management
 
@@ -33,7 +32,7 @@
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
-This repository is a "distribution" one, built by our release preparation script. 
+This repository is a "distribution" one, built by our release preparation script.
 Problems with it can be raised on our forum, or as issues in the main repository.
 
 ## Contributing
@@ -44,7 +43,7 @@
 
 ## Server Requirements
 
-PHP version 7.2 or higher is required, with the following extensions installed: 
+PHP version 7.2 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
diff --git a/app/Config/App.php b/app/Config/App.php
index b91c058..933b5c8 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -1,268 +1,448 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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!
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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()
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 Variables
-	|--------------------------------------------------------------------------
-	|
-	| 'sessionDriver'
-	|
-	|	The storage driver to use: files, database, redis, memcached
-	|       - CodeIgniter\Session\Handlers\FileHandler
-	|       - CodeIgniter\Session\Handlers\DatabaseHandler
-	|       - CodeIgniter\Session\Handlers\MemcachedHandler
-	|       - CodeIgniter\Session\Handlers\RedisHandler
-	|
-	| 'sessionCookieName'
-	|
-	|	The session cookie name, must contain only [0-9a-z_-] characters
-	|
-	| 'sessionExpiration'
-	|
-	|	The number of SECONDS you want the session to last.
-	|	Setting to 0 (zero) means expire when the browser is closed.
-	|
-	| 'sessionSavePath'
-	|
-	|	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.
-	|	Please read up the manual for the format with other session drivers.
-	|
-	|	IMPORTANT: You are REQUIRED to set a valid save path!
-	|
-	| 'sessionMatchIP'
-	|
-	|	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.
-	|
-	| 'sessionTimeToUpdate'
-	|
-	|	How many seconds between CI regenerating the session ID.
-	|
-	| 'sessionRegenerateDestroy'
-	|
-	|	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.
-	|
-	| Other session cookie settings are shared with the rest of the application,
-	| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
-	|
-	*/
-	public $sessionDriver            = 'CodeIgniter\Session\Handlers\FileHandler';
-	public $sessionCookieName        = 'ci_session';
-	public $sessionExpiration        = 7200;
-	public $sessionSavePath          = WRITEPATH . 'session';
-	public $sessionMatchIP           = false;
-	public $sessionTimeToUpdate      = 300;
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 Related Variables
-	|--------------------------------------------------------------------------
-	|
-	| 'cookiePrefix'   = Set a cookie name prefix if you need to avoid collisions
-	| 'cookieDomain'   = Set to .your-domain.com for site-wide cookies
-	| 'cookiePath'     = Typically will be a forward slash
-	| 'cookieSecure'   = Cookie will only be set if a secure HTTPS connection exists.
-	| 'cookieHTTPOnly' = Cookie will only be accessible via HTTP(S) (no javascript)
-	|
-	| Note: These settings (with the exception of 'cookie_prefix' and
-	|       'cookie_httponly') will also affect sessions.
-	|
-	*/
-	public $cookiePrefix   = '';
-	public $cookieDomain   = '';
-	public $cookiePath     = '/';
-	public $cookieSecure   = false;
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 */
+	public $cookiePrefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 */
+	public $cookieDomain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 */
+	public $cookiePath = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 */
+	public $cookieSecure = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HTTP Only
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 */
 	public $cookieHTTPOnly = false;
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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:		array('10.0.1.200', '192.168.5.0/24')
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means no SameSite attribute will be set on cookies. If
+	 * set to `None`, `$cookieSecure` must also be set.
+	 *
+       * @var string 'Lax'|'None'|'Strict'
+	 */
+	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 = '';
 
-	/*
-	|--------------------------------------------------------------------------
-	| Cross Site Request Forgery
-	|--------------------------------------------------------------------------
-	| Enables a CSRF cookie token to be set. When set to TRUE, token will be
-	| checked on a submitted form. If you are accepting user data, it is strongly
-	| recommended CSRF protection be enabled.
-	|
-	| CSRFTokenName   = The token name
-	| CSRFHeaderName  = The header name
-	| CSRFCookieName  = The cookie name
-	| CSRFExpire      = The number in seconds the token should expire.
-	| CSRFRegenerate  = Regenerate token on every submission
-	| CSRFRedirect    = Redirect to previous page with error on failure
-	*/
-	public $CSRFTokenName  = 'csrf_test_name';
-	public $CSRFHeaderName = 'X-CSRF-TOKEN';
-	public $CSRFCookieName = 'csrf_cookie_name';
-	public $CSRFExpire     = 7200;
-	public $CSRFRegenerate = true;
-	public $CSRFRedirect   = true;
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The token name.
+	 *
+	 * @deprecated Use `Config\Security` $tokenName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFTokenName = 'csrf_test_name';
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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:
-	|   - http://www.html5rocks.com/en/tutorials/security/content-security-policy/
-	|   - http://www.w3.org/TR/CSP/
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 }
diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php
index eaecfdf..fbd75b3 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -8,6 +8,7 @@
  * -------------------------------------------------------------------
  * AUTO-LOADER
  * -------------------------------------------------------------------
+ *
  * This file defines the namespaces and class maps so the Autoloader
  * can find the files as needed.
  *
@@ -16,7 +17,6 @@
  */
 class Autoload extends AutoloadConfig
 {
-
 	/**
 	 * -------------------------------------------------------------------
 	 * Namespaces
@@ -37,7 +37,7 @@
 	 *       'App'	       => APPPATH
 	 *   ];
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	public $psr4 = [
 		APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -60,7 +60,7 @@
 	 *       'MyClass'   => '/path/to/class/file.php'
 	 *   ];
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	public $classmap = [];
 }
diff --git a/app/Config/Boot/development.php b/app/Config/Boot/development.php
index 63fdd88..05a8612 100644
--- a/app/Config/Boot/development.php
+++ b/app/Config/Boot/development.php
@@ -1,32 +1,32 @@
 <?php
+
 /*
-  |--------------------------------------------------------------------------
-  | ERROR DISPLAY
-  |--------------------------------------------------------------------------
-  | In development, we want to show as many errors as possible to help
-  | make sure they don't make it to production. And save us hours of
-  | painful debugging.
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
  */
 error_reporting(-1);
 ini_set('display_errors', '1');
 
 /*
-  |--------------------------------------------------------------------------
-  | DEBUG BACKTRACES
-  |--------------------------------------------------------------------------
-  | If true, this constant will tell the error screens to display debug
-  | backtraces along with the other error information. If you would
-  | prefer to not see this, set this value to false.
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
  */
 defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
-  |--------------------------------------------------------------------------
-  | DEBUG MODE
-  |--------------------------------------------------------------------------
-  | Debug mode is an experimental flag that can allow changes throughout
-  | the system. This will control whether Kint is loaded, and a few other
-  | items. It can always be used within your own application too.
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. This will control whether Kint is loaded, and a few other
+ | items. It can always be used within your own application too.
  */
-
 defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Boot/production.php b/app/Config/Boot/production.php
index 1241907..21d2580 100644
--- a/app/Config/Boot/production.php
+++ b/app/Config/Boot/production.php
@@ -1,22 +1,21 @@
 <?php
 
 /*
-  |--------------------------------------------------------------------------
-  | ERROR DISPLAY
-  |--------------------------------------------------------------------------
-  | Don't show ANY in production environments. Instead, let the system catch
-  | it and display a generic error message.
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | Don't show ANY in production environments. Instead, let the system catch
+ | it and display a generic error message.
  */
 ini_set('display_errors', '0');
 error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 
 /*
-  |--------------------------------------------------------------------------
-  | DEBUG MODE
-  |--------------------------------------------------------------------------
-  | Debug mode is an experimental flag that can allow changes throughout
-  | the system. It's not widely used currently, and may not survive
-  | release of the framework.
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
  */
-
 defined('CI_DEBUG') || define('CI_DEBUG', false);
diff --git a/app/Config/Boot/testing.php b/app/Config/Boot/testing.php
index fab6c07..e07a1d4 100644
--- a/app/Config/Boot/testing.php
+++ b/app/Config/Boot/testing.php
@@ -1,33 +1,32 @@
 <?php
 
 /*
-  |--------------------------------------------------------------------------
-  | ERROR DISPLAY
-  |--------------------------------------------------------------------------
-  | In development, we want to show as many errors as possible to help
-  | make sure they don't make it to production. And save us hours of
-  | painful debugging.
+ |--------------------------------------------------------------------------
+ | ERROR DISPLAY
+ |--------------------------------------------------------------------------
+ | In development, we want to show as many errors as possible to help
+ | make sure they don't make it to production. And save us hours of
+ | painful debugging.
  */
 error_reporting(-1);
 ini_set('display_errors', '1');
 
 /*
-  |--------------------------------------------------------------------------
-  | DEBUG BACKTRACES
-  |--------------------------------------------------------------------------
-  | If true, this constant will tell the error screens to display debug
-  | backtraces along with the other error information. If you would
-  | prefer to not see this, set this value to false.
+ |--------------------------------------------------------------------------
+ | DEBUG BACKTRACES
+ |--------------------------------------------------------------------------
+ | If true, this constant will tell the error screens to display debug
+ | backtraces along with the other error information. If you would
+ | prefer to not see this, set this value to false.
  */
 defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
-  |--------------------------------------------------------------------------
-  | DEBUG MODE
-  |--------------------------------------------------------------------------
-  | Debug mode is an experimental flag that can allow changes throughout
-  | the system. It's not widely used currently, and may not survive
-  | release of the framework.
+ |--------------------------------------------------------------------------
+ | DEBUG MODE
+ |--------------------------------------------------------------------------
+ | Debug mode is an experimental flag that can allow changes throughout
+ | the system. It's not widely used currently, and may not survive
+ | release of the framework.
  */
-
 defined('CI_DEBUG') || define('CI_DEBUG', true);
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index 015bd6f..a3b3bbc 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -1,82 +1,112 @@
-<?php namespace Config;
+<?php
 
+namespace Config;
+
+use CodeIgniter\Cache\Handlers\DummyHandler;
+use CodeIgniter\Cache\Handlers\FileHandler;
+use CodeIgniter\Cache\Handlers\MemcachedHandler;
+use CodeIgniter\Cache\Handlers\PredisHandler;
+use CodeIgniter\Cache\Handlers\RedisHandler;
+use CodeIgniter\Cache\Handlers\WincacheHandler;
 use CodeIgniter\Config\BaseConfig;
 
 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 = '';
 
-	/*
-	| -------------------------------------------------------------------------
-	| 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
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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,
+	];
+
+	/**
+	 * -------------------------------------------------------------------------
+	 * 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,
@@ -84,14 +114,15 @@
 		'raw'    => false,
 	];
 
-	/*
-	| -------------------------------------------------------------------------
-	| Redis settings
-	| -------------------------------------------------------------------------
-	| Your Redis server can be specified below, if you are using
-	| the Redis or Predis drivers.
-	|
-	*/
+	/**
+	 * -------------------------------------------------------------------------
+	 * 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,
@@ -100,21 +131,22 @@
 		'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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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'     => \CodeIgniter\Cache\Handlers\DummyHandler::class,
-		'file'      => \CodeIgniter\Cache\Handlers\FileHandler::class,
-		'memcached' => \CodeIgniter\Cache\Handlers\MemcachedHandler::class,
-		'predis'    => \CodeIgniter\Cache\Handlers\PredisHandler::class,
-		'redis'     => \CodeIgniter\Cache\Handlers\RedisHandler::class,
-		'wincache'  => \CodeIgniter\Cache\Handlers\WincacheHandler::class,
+		'dummy'     => DummyHandler::class,
+		'file'      => FileHandler::class,
+		'memcached' => MemcachedHandler::class,
+		'predis'    => PredisHandler::class,
+		'redis'     => RedisHandler::class,
+		'wincache'  => WincacheHandler::class,
 	];
 }
diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index b25f71c..8f8498a 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -1,36 +1,38 @@
 <?php
 
-//--------------------------------------------------------------------
-// App Namespace
-//--------------------------------------------------------------------
-// This defines the default Namespace that is used throughout
-// CodeIgniter to refer to the Application directory. Change
-// this constant to change the namespace that all application
-// classes should use.
-//
-// NOTE: changing this will require manually modifying the
-// existing namespaces of App\* namespaced-classes.
-//
+/*
+ | --------------------------------------------------------------------
+ | App Namespace
+ | --------------------------------------------------------------------
+ |
+ | This defines the default Namespace that is used throughout
+ | CodeIgniter to refer to the Application directory. Change
+ | this constant to change the namespace that all application
+ | classes should use.
+ |
+ | NOTE: changing this will require manually modifying the
+ | existing namespaces of App\* namespaced-classes.
+ */
 defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
 
 /*
-|--------------------------------------------------------------------------
-| Composer Path
-|--------------------------------------------------------------------------
-|
-| The path that Composer's autoload file is expected to live. By default,
-| the vendor folder is in the Root directory, but you can customize that here.
-*/
+ | --------------------------------------------------------------------------
+ | Composer Path
+ | --------------------------------------------------------------------------
+ |
+ | The path that Composer's autoload file is expected to live. By default,
+ | the vendor folder is in the Root directory, but you can customize that here.
+ */
 defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . 'vendor/autoload.php');
 
 /*
-|--------------------------------------------------------------------------
-| Timing Constants
-|--------------------------------------------------------------------------
-|
-| Provide simple ways to work with the myriad of PHP functions that
-| require information to be in seconds.
-*/
+ |--------------------------------------------------------------------------
+ | Timing Constants
+ |--------------------------------------------------------------------------
+ |
+ | Provide simple ways to work with the myriad of PHP functions that
+ | require information to be in seconds.
+ */
 defined('SECOND') || define('SECOND', 1);
 defined('MINUTE') || define('MINUTE', 60);
 defined('HOUR')   || define('HOUR', 3600);
@@ -41,30 +43,30 @@
 defined('DECADE') || define('DECADE', 315360000);
 
 /*
-|--------------------------------------------------------------------------
-| Exit Status Codes
-|--------------------------------------------------------------------------
-|
-| Used to indicate the conditions under which the script is exit()ing.
-| While there is no universal standard for error codes, there are some
-| broad conventions.  Three such conventions are mentioned below, for
-| those who wish to make use of them.  The CodeIgniter defaults were
-| chosen for the least overlap with these conventions, while still
-| leaving room for others to be defined in future versions and user
-| applications.
-|
-| The three main conventions used for determining exit status codes
-| are as follows:
-|
-|    Standard C/C++ Library (stdlibc):
-|       http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
-|       (This link also contains other GNU-specific conventions)
-|    BSD sysexits.h:
-|       http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
-|    Bash scripting:
-|       http://tldp.org/LDP/abs/html/exitcodes.html
-|
-*/
+ | --------------------------------------------------------------------------
+ | Exit Status Codes
+ | --------------------------------------------------------------------------
+ |
+ | Used to indicate the conditions under which the script is exit()ing.
+ | While there is no universal standard for error codes, there are some
+ | broad conventions.  Three such conventions are mentioned below, for
+ | those who wish to make use of them.  The CodeIgniter defaults were
+ | chosen for the least overlap with these conventions, while still
+ | leaving room for others to be defined in future versions and user
+ | applications.
+ |
+ | The three main conventions used for determining exit status codes
+ | are as follows:
+ |
+ |    Standard C/C++ Library (stdlibc):
+ |       http://www.gnu.org/software/libc/manual/html_node/Exit-Status.html
+ |       (This link also contains other GNU-specific conventions)
+ |    BSD sysexits.h:
+ |       http://www.gsp.com/cgi-bin/man.cgi?section=3&topic=sysexits
+ |    Bash scripting:
+ |       http://tldp.org/LDP/abs/html/exitcodes.html
+ |
+ */
 defined('EXIT_SUCCESS')        || define('EXIT_SUCCESS', 0); // no errors
 defined('EXIT_ERROR')          || define('EXIT_ERROR', 1); // generic error
 defined('EXIT_CONFIG')         || define('EXIT_CONFIG', 3); // configuration error
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index 0e6955a..e357cba 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -1,48 +1,159 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 /**
- * Class ContentSecurityPolicyConfig
- *
  * Stores the default settings for the ContentSecurityPolicy, if you
  * choose to use it. The values here will be read in and set as defaults
  * for the site. If needed, they can be overridden on a page-by-page basis.
  *
  * Suggested reference for explanations:
- *    https://www.html5rocks.com/en/tutorials/security/content-security-policy/
  *
- * @package Config
+ * @see https://www.html5rocks.com/en/tutorials/security/content-security-policy/
  */
 class ContentSecurityPolicy extends BaseConfig
 {
-	// broadbrush CSP management
+	//-------------------------------------------------------------------------
+	// Broadbrush CSP management
+	//-------------------------------------------------------------------------
 
-	public $reportOnly              = false; // default CSP report context
-	public $reportURI               = null; // URL to send violation reports to
-	public $upgradeInsecureRequests = false; // toggle for forcing https
+	/**
+	 * Default CSP report context
+	 *
+	 * @var boolean
+	 */
+	public $reportOnly = false;
 
-	// sources allowed; string or array of strings
+	/**
+	 * 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
+	//-------------------------------------------------------------------------
 
-	public $defaultSrc     = null; // will default to self if not over-ridden
-	public $scriptSrc      = 'self';
-	public $styleSrc       = 'self';
-	public $imageSrc       = 'self';
-	public $baseURI        = null;    // will default to self if not over-ridden
-	public $childSrc       = 'self';
-	public $connectSrc     = 'self';
-	public $fontSrc        = null;
-	public $formAction     = 'self';
+	/**
+	 * 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;
-	public $mediaSrc       = null;
-	public $objectSrc      = 'self';
-	public $manifestSrc    = null;
 
-	// mime types allowed; string or array of strings
+	/**
+	 * 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; string or array of strings
+	/**
+	 * List of actions allowed.
+	 *
+	 * @var string|string[]|null
+	 */
 	public $sandbox = null;
-
 }
diff --git a/app/Config/Database.php b/app/Config/Database.php
index b31541a..a0b46c3 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -1,12 +1,13 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
+
+use CodeIgniter\Database\Config;
 
 /**
  * Database Configuration
- *
- * @package Config
  */
-
-class Database extends \CodeIgniter\Database\Config
+class Database extends Config
 {
 	/**
 	 * The directory that holds the Migrations
@@ -14,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	public $filesPath = APPPATH . 'Database/';
+	public $filesPath = APPPATH . 'Database' . DIRECTORY_SEPARATOR;
 
 	/**
 	 * Lets you choose which connection group to
@@ -39,8 +40,6 @@
 		'DBPrefix' => '',
 		'pConnect' => false,
 		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'cacheOn'  => false,
-		'cacheDir' => '',
 		'charset'  => 'utf8',
 		'DBCollat' => 'utf8_general_ci',
 		'swapPre'  => '',
@@ -67,8 +66,6 @@
 		'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
 		'pConnect' => false,
 		'DBDebug'  => (ENVIRONMENT !== 'production'),
-		'cacheOn'  => false,
-		'cacheDir' => '',
 		'charset'  => 'utf8',
 		'DBCollat' => 'utf8_general_ci',
 		'swapPre'  => '',
@@ -91,21 +88,6 @@
 		if (ENVIRONMENT === 'testing')
 		{
 			$this->defaultGroup = 'tests';
-
-			// Under Travis-CI, we can set an ENV var named 'DB_GROUP'
-			// so that we can test against multiple databases.
-			if ($group = getenv('DB'))
-			{
-				if (is_file(TESTPATH . 'travis/Database.php'))
-				{
-					require TESTPATH . 'travis/Database.php';
-
-					if (! empty($dbconfig) && array_key_exists($group, $dbconfig))
-					{
-						$this->tests = $dbconfig[$group];
-					}
-				}
-			}
 		}
 	}
 
diff --git a/app/Config/DocTypes.php b/app/Config/DocTypes.php
index 67d5dd2..dc85c04 100755
--- a/app/Config/DocTypes.php
+++ b/app/Config/DocTypes.php
@@ -1,15 +1,15 @@
-<?php namespace Config;
+<?php
 
-/**
- * DocTypes
- *
- * @package Config
- */
+namespace Config;
 
 class DocTypes
 {
-	public $list =
-	[
+	/**
+	 * 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">',
diff --git a/app/Config/Email.php b/app/Config/Email.php
index d9ca142..1d0c181 100644
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -1,11 +1,11 @@
 <?php
+
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 class Email extends BaseConfig
 {
-
 	/**
 	 * @var string
 	 */
diff --git a/app/Config/Encryption.php b/app/Config/Encryption.php
index 2cee271..39c6fd3 100644
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
@@ -11,26 +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.
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 drivers, eg 'OpenSSL' or 'Sodium'.
-	  | The default driver, if you don't specify one, is '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;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 14bfd32..ad79150 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -1,4 +1,6 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
@@ -44,7 +46,7 @@
 	 * --------------------------------------------------------------------
 	 * If you delete, they will no longer be collected.
 	 */
-	if (ENVIRONMENT !== 'production')
+	if (CI_DEBUG)
 	{
 		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 5fe33d3..c6c5a83 100644
--- a/app/Config/Exceptions.php
+++ b/app/Config/Exceptions.php
@@ -1,42 +1,48 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 /**
  * Setup how the exception handler works.
- *
- * @package Config
  */
 class Exceptions extends BaseConfig
 {
-	/*
-	 |--------------------------------------------------------------------------
-	 | LOG EXCEPTIONS?
-	 |--------------------------------------------------------------------------
-	 | If true, then exceptions will be logged
-	 | through Services::Log.
-	 |
-	 | Default: true
+	/**
+	 * --------------------------------------------------------------------------
+	 * LOG EXCEPTIONS?
+	 * --------------------------------------------------------------------------
+	 * If true, then exceptions will be logged
+	 * through Services::Log.
+	 *
+	 * Default: true
+	 *
+	 * @var boolean
 	 */
 	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.
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 ];
+	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'
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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';
 }
diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 11359e7..515aff3 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -1,36 +1,62 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Filters\CSRF;
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\Honeypot;
 
 class Filters extends BaseConfig
 {
-	// Makes reading things below nicer,
-	// and simpler to change out script that's used.
+	/**
+	 * Configures aliases for Filter classes to
+	 * make reading things nicer and simpler.
+	 *
+	 * @var array
+	 */
 	public $aliases = [
-		'csrf'     => \CodeIgniter\Filters\CSRF::class,
-		'toolbar'  => \CodeIgniter\Filters\DebugToolbar::class,
-		'honeypot' => \CodeIgniter\Filters\Honeypot::class,
+		'csrf'     => CSRF::class,
+		'toolbar'  => DebugToolbar::class,
+		'honeypot' => Honeypot::class,
 	];
 
-	// Always applied before every request
+	/**
+	 * List of filter aliases that are always
+	 * applied before and after every request.
+	 *
+	 * @var array
+	 */
 	public $globals = [
 		'before' => [
-			//'honeypot'
+			// 'honeypot',
 			// 'csrf',
 		],
 		'after'  => [
 			'toolbar',
-			//'honeypot'
+			// 'honeypot',
 		],
 	];
 
-	// Works on all of a particular HTTP method
-	// (GET, POST, etc) as BEFORE filters only
-	//     like: 'post' => ['CSRF', 'throttle'],
+	/**
+	 * List of filter aliases that works on a
+	 * particular HTTP method (GET, POST, etc.).
+	 *
+	 * Example:
+	 * 'post' => ['csrf', 'throttle']
+	 *
+	 * @var array
+	 */
 	public $methods = [];
 
-	// List filter aliases and any before/after uri patterns
-	// that they should run on, like:
-	//    'isLoggedIn' => ['before' => ['account/*', 'profiles/*']],
+	/**
+	 * 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/ForeignCharacters.php b/app/Config/ForeignCharacters.php
index 8ee6f11..174ddb1 100644
--- a/app/Config/ForeignCharacters.php
+++ b/app/Config/ForeignCharacters.php
@@ -1,6 +1,9 @@
-<?php namespace Config;
+<?php
 
-class ForeignCharacters extends \CodeIgniter\Config\ForeignCharacters
+namespace Config;
+
+use CodeIgniter\Config\ForeignCharacters as BaseForeignCharacters;
+
+class ForeignCharacters extends BaseForeignCharacters
 {
-
 }
diff --git a/app/Config/Format.php b/app/Config/Format.php
index 7448874..fdaa640 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -1,59 +1,66 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Format\FormatterInterface;
 
 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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::class,
-		'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
-		'text/xml'         => \CodeIgniter\Format\XMLFormatter::class,
+		'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. 
-	|
-	*/
-	public $formatterOptions  = [
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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,
-	];	
+	];
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -61,25 +68,12 @@
 	 *
 	 * @param string $mime
 	 *
-	 * @return \CodeIgniter\Format\FormatterInterface
+	 * @return FormatterInterface
+	 *
+	 * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
 	 */
 	public function getFormatter(string $mime)
 	{
-		if (! array_key_exists($mime, $this->formatters))
-		{
-			throw new \InvalidArgumentException('No Formatter defined for mime type: ' . $mime);
-		}
-
-		$class = $this->formatters[$mime];
-
-		if (! class_exists($class))
-		{
-			throw new \BadMethodCallException($class . ' is not a valid Formatter.');
-		}
-
-		return new $class();
+		return Services::format()->getFormatter($mime);
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/app/Config/Generators.php b/app/Config/Generators.php
new file mode 100644
index 0000000..2c32587
--- /dev/null
+++ b/app/Config/Generators.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+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',
+	];
+}
diff --git a/app/Config/Honeypot.php b/app/Config/Honeypot.php
index 3d9e372..54bdcd4 100644
--- a/app/Config/Honeypot.php
+++ b/app/Config/Honeypot.php
@@ -1,10 +1,11 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 class Honeypot extends BaseConfig
 {
-
 	/**
 	 * Makes Honeypot visible or not to human
 	 *
diff --git a/app/Config/Images.php b/app/Config/Images.php
index a416b8b..87cc5f8 100644
--- a/app/Config/Images.php
+++ b/app/Config/Images.php
@@ -1,6 +1,10 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Images\Handlers\GDHandler;
+use CodeIgniter\Images\Handlers\ImageMagickHandler;
 
 class Images extends BaseConfig
 {
@@ -22,10 +26,10 @@
 	/**
 	 * The available handler classes.
 	 *
-	 * @var \CodeIgniter\Images\Handlers\BaseHandler[]
+	 * @var array<string, string>
 	 */
 	public $handlers = [
-		'gd'      => \CodeIgniter\Images\Handlers\GDHandler::class,
-		'imagick' => \CodeIgniter\Images\Handlers\ImageMagickHandler::class,
+		'gd'      => GDHandler::class,
+		'imagick' => ImageMagickHandler::class,
 	];
 }
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index 09db83d..665de0b 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -1,25 +1,24 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 use Kint\Renderer\Renderer;
 
+/**
+ * --------------------------------------------------------------------------
+ * Kint
+ * --------------------------------------------------------------------------
+ *
+ * We use Kint's `RichRenderer` and `CLIRenderer`. This area contains options
+ * that you can set to customize how Kint works for you.
+ *
+ * @see https://kint-php.github.io/kint/ for details on these settings.
+ */
 class Kint extends BaseConfig
 {
 	/*
 	|--------------------------------------------------------------------------
-	| Kint
-	|--------------------------------------------------------------------------
-	|
-	| We use Kint's RichRenderer and CLIRenderer. This area contains options
-	| that you can set to customize how Kint works for you.
-	|
-	| For details on these settings, see Kint's docs:
-	|	https://kint-php.github.io/kint/
-	|
-	*/
-
-	/*
-	|--------------------------------------------------------------------------
 	| Global Settings
 	|--------------------------------------------------------------------------
 	*/
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 93d38f6..66f4039 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -1,80 +1,88 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 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.
-	|
-	*/
-	public $threshold = 3;
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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
-		//--------------------------------------------------------------------
-
+		/*
+		 * --------------------------------------------------------------------
+		 * File Handler
+		 * --------------------------------------------------------------------
+		 */
 		'CodeIgniter\Log\Handlers\FileHandler' => [
 
 			/*
diff --git a/app/Config/Migrations.php b/app/Config/Migrations.php
index b83fe90..1fa3100 100644
--- a/app/Config/Migrations.php
+++ b/app/Config/Migrations.php
@@ -1,50 +1,55 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 class Migrations extends BaseConfig
 {
-	/*
-	|--------------------------------------------------------------------------
-	| Enable/Disable Migrations
-	|--------------------------------------------------------------------------
-	|
-	| Migrations are enabled by default for security reasons.
-	| You should enable migrations whenever you intend to do a schema migration
-	| and disable it back when you're done.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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_
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 41014d4..0121ea1 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -1,18 +1,22 @@
-<?php namespace Config;
+<?php
 
-/*
-| -------------------------------------------------------------------
-| MIME TYPES
-| -------------------------------------------------------------------
-| This file contains an array of mime types.  It is used by the
-| Upload class to help identify allowed file types.
-|
-| When more than one variation for an extension exist (like jpg, jpeg, etc)
-| the most common one should be first in the array to aid the guess*
-| methods. The same applies when more than one mime-type exists for a
-| single extension.
-|
-*/
+namespace Config;
+
+/**
+ * Mimes
+ *
+ * This file contains an array of mime types.  It is used by the
+ * Upload class to help identify allowed file types.
+ *
+ * When more than one variation for an extension exist (like jpg, jpeg, etc)
+ * the most common one should be first in the array to aid the guess*
+ * methods. The same applies when more than one mime-type exists for a
+ * single extension.
+ *
+ * When working with mime types, please make sure you have the ´fileinfo´
+ * extension enabled to reliably detect the media types.
+ */
+
 class Mimes
 {
 	/**
@@ -32,7 +36,6 @@
 			'text/csv',
 			'text/x-comma-separated-values',
 			'text/comma-separated-values',
-			'application/octet-stream',
 			'application/vnd.ms-excel',
 			'application/x-csv',
 			'text/x-csv',
@@ -68,7 +71,6 @@
 			'application/pdf',
 			'application/force-download',
 			'application/x-download',
-			'binary/octet-stream',
 		],
 		'ai'    => [
 			'application/pdf',
@@ -147,6 +149,7 @@
 			'multipart/x-zip',
 		],
 		'rar'   => [
+			'application/vnd.rar',
 			'application/x-rar',
 			'application/rar',
 			'application/x-rar-compressed',
@@ -453,6 +456,7 @@
 		],
 		'svg'   => [
 			'image/svg+xml',
+			'image/svg',
 			'application/xml',
 			'text/xml',
 		],
@@ -470,10 +474,13 @@
 			'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.
 	 *
@@ -493,30 +500,37 @@
 		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 $proposed_extension - default extension (in case there is more than one with the same 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 $proposed_extension = null)
+	public static function guessExtensionFromType(string $type, string $proposedExtension = null)
 	{
 		$type = trim(strtolower($type), '. ');
 
-		$proposed_extension = trim(strtolower($proposed_extension));
+		$proposedExtension = trim(strtolower($proposedExtension));
 
-		if (! is_null($proposed_extension) && array_key_exists($proposed_extension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposed_extension]) ? [static::$mimes[$proposed_extension]] : static::$mimes[$proposed_extension]))
+		if ($proposedExtension !== '')
 		{
-			return $proposed_extension;
+			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;
 		}
 
+		// 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)))
+			if ((is_string($types) && $types === $type) || (is_array($types) && in_array($type, $types, true)))
 			{
 				return $ext;
 			}
@@ -524,7 +538,4 @@
 
 		return null;
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index 40cb987..8c1d049 100644
--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -2,42 +2,50 @@
 
 namespace Config;
 
-use CodeIgniter\Modules\Modules as CoreModules;
+use CodeIgniter\Modules\Modules as BaseModules;
 
-class Modules extends CoreModules
+class Modules extends BaseModules
 {
-	/*
-	 |--------------------------------------------------------------------------
-	 | Auto-Discovery Enabled?
-	 |--------------------------------------------------------------------------
-	 |
-	 | If true, then auto-discovery will happen across all elements listed in
-	 | $activeExplorers below. If false, no auto-discovery will happen at all,
-	 | giving a slight performance boost.
+	/**
+	 * --------------------------------------------------------------------------
+	 * Enable Auto-Discovery?
+	 * --------------------------------------------------------------------------
+	 *
+	 * If true, then auto-discovery will happen across all elements listed in
+	 * $activeExplorers below. If false, no auto-discovery will happen at all,
+	 * giving a slight performance boost.
+	 *
+	 * @var boolean
 	 */
 	public $enabled = true;
 
-	/*
-	 |--------------------------------------------------------------------------
-	 | Auto-Discovery Within Composer Packages Enabled?
-	 |--------------------------------------------------------------------------
-	 |
-	 | If true, then auto-discovery will happen across all namespaces loaded
-	 | by Composer, as well as the namespaces configured locally.
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 
-	/*
-	|--------------------------------------------------------------------------
-	| Auto-discover 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.
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 9b6ed83..4499313 100644
--- a/app/Config/Pager.php
+++ b/app/Config/Pager.php
@@ -1,35 +1,39 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 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;
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * Items Per Page
+	 * --------------------------------------------------------------------------
+	 *
+	 * The default number of results shown in a single page.
+	 *
+	 * @var integer
+	 */
 	public $perPage = 20;
 }
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
index 6ca2d37..bd77d27 100644
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -1,9 +1,14 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 /**
+ * Paths
+ *
  * Holds the paths that are used by the system to
  * locate the main directories, app, system, etc.
- * Modifying these allows you to re-structure your application,
+ *
+ * Modifying these allows you to restructure your application,
  * share a system folder between multiple applications, and more.
  *
  * All paths are relative to the project's root folder.
@@ -11,33 +16,35 @@
 
 class Paths
 {
-	/*
-	 *---------------------------------------------------------------
+	/**
+	 * ---------------------------------------------------------------
 	 * SYSTEM FOLDER NAME
-	 *---------------------------------------------------------------
+	 * ---------------------------------------------------------------
 	 *
-	 * This variable must contain the name of your "system" folder.
-	 * Include the path if the folder is not in the same directory
-	 * as this file.
+	 * 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. For more info please see the user guide:
-	 * http://codeigniter.com/user_guide/general/managing_apps.html
+	 * you do, use a full getServer path.
 	 *
-	 * NO TRAILING SLASH!
+	 * @see http://codeigniter.com/user_guide/general/managing_apps.html
+	 *
+	 * @var string
 	 */
 	public $appDirectory = __DIR__ . '/..';
 
-	/*
+	/**
 	 * ---------------------------------------------------------------
 	 * WRITABLE DIRECTORY NAME
 	 * ---------------------------------------------------------------
@@ -47,19 +54,23 @@
 	 * 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';
 
-	/*
+	/**
 	 * ---------------------------------------------------------------
 	 * VIEW DIRECTORY NAME
 	 * ---------------------------------------------------------------
@@ -68,6 +79,8 @@
 	 * 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 56839ca..b6e1dd4 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -1,4 +1,6 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 // Create a new instance of our RouteCollection class.
 $routes = Services::routes();
@@ -22,7 +24,7 @@
 $routes->set404Override();
 $routes->setAutoRoute(true);
 
-/**
+/*
  * --------------------------------------------------------------------
  * Route Definitions
  * --------------------------------------------------------------------
@@ -32,7 +34,7 @@
 // route since we don't have to scan directories.
 $routes->get('/', 'Home::index');
 
-/**
+/*
  * --------------------------------------------------------------------
  * Additional Routing
  * --------------------------------------------------------------------
diff --git a/app/Config/Security.php b/app/Config/Security.php
new file mode 100644
index 0000000..50cd8c3
--- /dev/null
+++ b/app/Config/Security.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Security extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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 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 Regenerate
+	 * --------------------------------------------------------------------------
+	 *
+	 * Regenerate CSRF Token on every request.
+	 *
+	 * @var boolean
+	 */
+	public $regenerate = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Redirect
+	 * --------------------------------------------------------------------------
+	 *
+	 * Redirect to previous page with error on failure.
+	 *
+	 * @var boolean
+	 */
+	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 'Lax'|'None'|'Strict'
+	 */
+	public $samesite = 'Lax';
+}
diff --git a/app/Config/Services.php b/app/Config/Services.php
index c58da70..898bcd0 100644
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -1,6 +1,8 @@
-<?php namespace Config;
+<?php
 
-use CodeIgniter\Config\Services as CoreServices;
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
 
 /**
  * Services Configuration file.
@@ -15,16 +17,15 @@
  * method format you should use for your service methods. For more examples,
  * see the core Services file at system/Config/Services.php.
  */
-class Services extends CoreServices
+class Services extends BaseService
 {
-
-	//    public static function example($getShared = true)
-	//    {
-	//        if ($getShared)
-	//        {
-	//            return static::getSharedInstance('example');
-	//        }
+	// public static function example($getShared = true)
+	// {
+	//     if ($getShared)
+	//     {
+	//         return static::getSharedInstance('example');
+	//     }
 	//
-	//        return new \CodeIgniter\Example();
-	//    }
+	//     return new \CodeIgniter\Example();
+	// }
 }
diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
index 8af156e..c7603e2 100644
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -1,68 +1,87 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\Toolbar\Collectors\Database;
+use CodeIgniter\Debug\Toolbar\Collectors\Events;
+use CodeIgniter\Debug\Toolbar\Collectors\Files;
+use CodeIgniter\Debug\Toolbar\Collectors\Logs;
+use CodeIgniter\Debug\Toolbar\Collectors\Routes;
+use CodeIgniter\Debug\Toolbar\Collectors\Timers;
+use CodeIgniter\Debug\Toolbar\Collectors\Views;
 
+/**
+ * --------------------------------------------------------------------------
+ * Debug Toolbar
+ * --------------------------------------------------------------------------
+ *
+ * The Debug Toolbar provides a way to see information about the performance
+ * and state of your application during that page display. By default it will
+ * NOT be displayed under production environments, and will only display if
+ * `CI_DEBUG` is true, since if it's not, there's not much to display anyway.
+ */
 class Toolbar extends BaseConfig
 {
-	/*
-	|--------------------------------------------------------------------------
-	| Debug Toolbar
-	|--------------------------------------------------------------------------
-	| The Debug Toolbar provides a way to see information about the performance
-	| and state of your application during that page display. By default it will
-	| NOT be displayed under production environments, and will only display if
-	| CI_DEBUG is true, since if it's not, there's not much to display anyway.
-	|
-	| toolbarMaxHistory = Number of history files, 0 for none or -1 for unlimited
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * Toolbar Collectors
+	 * --------------------------------------------------------------------------
+	 *
+	 * List of toolbar collectors that will be called when Debug Toolbar
+	 * fires up and collects data from.
+	 *
+	 * @var string[]
+	 */
 	public $collectors = [
-		\CodeIgniter\Debug\Toolbar\Collectors\Timers::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Database::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Views::class,
+		Timers::class,
+		Database::class,
+		Logs::class,
+		Views::class,
 		// \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Files::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
-		\CodeIgniter\Debug\Toolbar\Collectors\Events::class,
+		Files::class,
+		Routes::class,
+		Events::class,
 	];
 
-	/*
-	|--------------------------------------------------------------------------
-	| Max History
-	|--------------------------------------------------------------------------
-	| The Toolbar allows you to view recent requests that have been made to
-	| the application while the toolbar is active. This allows you to quickly
-	| view and compare multiple requests.
-	|
-	| $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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 
-	/*
-	|--------------------------------------------------------------------------
-	| Toolbar Views Path
-	|--------------------------------------------------------------------------
-	| The full path to the the views that are used by the toolbar.
-	| MUST have a trailing slash.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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.
-	|
-	*/
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
 }
diff --git a/app/Config/UserAgents.php b/app/Config/UserAgents.php
index 326a5d8..db17d73 100644
--- a/app/Config/UserAgents.php
+++ b/app/Config/UserAgents.php
@@ -1,18 +1,28 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
+/**
+ * -------------------------------------------------------------------
+ * User Agents
+ * -------------------------------------------------------------------
+ *
+ * This file contains four arrays of user agent data. It is used by the
+ * User Agent Class to help identify browser, platform, robot, and
+ * mobile device data. The array keys are used to identify the device
+ * and the array values are used to set the actual name of the item.
+ */
 class UserAgents extends BaseConfig
 {
-	/*
-	| -------------------------------------------------------------------
-	| USER AGENT TYPES
-	| -------------------------------------------------------------------
-	| This file contains four arrays of user agent data. It is used by the
-	| User Agent Class to help identify browser, platform, robot, and
-	| mobile device data. The array keys are used to identify the device
-	| and the array values are used to set the actual name of the item.
-	*/
+	/**
+	 * -------------------------------------------------------------------
+	 * OS Platforms
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
 	public $platforms = [
 		'windows nt 10.0' => 'Windows 10',
 		'windows nt 6.3'  => 'Windows 8.1',
@@ -58,12 +68,21 @@
 		'symbian'         => 'Symbian OS',
 	];
 
-	// The order of this array should NOT be changed. Many browsers return
-	// multiple browser types so we want to identify the sub-type first.
+	/**
+	 * -------------------------------------------------------------------
+	 * 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',
@@ -93,6 +112,13 @@
 		'Vivaldi'           => 'Vivaldi',
 	];
 
+	/**
+	 * -------------------------------------------------------------------
+	 * Mobiles
+	 * -------------------------------------------------------------------
+	 *
+	 * @var array<string, string>
+	 */
 	public $mobiles = [
 		// legacy array, old values commented out
 		'mobileexplorer'       => 'Mobile Explorer',
@@ -193,7 +219,15 @@
 		'cellphone'            => 'Generic Mobile',
 	];
 
-	// There are hundreds of bots but these are the most common.
+	/**
+	 * -------------------------------------------------------------------
+	 * Robots
+	 * -------------------------------------------------------------------
+	 *
+	 * There are hundred of bots but these are the most common.
+	 *
+	 * @var array<string, string>
+	 */
 	public $robots = [
 		'googlebot'            => 'Googlebot',
 		'msnbot'               => 'MSNBot',
diff --git a/app/Config/Validation.php b/app/Config/Validation.php
index 97f08c7..9cb802e 100644
--- a/app/Config/Validation.php
+++ b/app/Config/Validation.php
@@ -1,4 +1,11 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
+
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
 
 class Validation
 {
@@ -10,20 +17,20 @@
 	 * Stores the classes that contain the
 	 * rules that are available.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	public $ruleSets = [
-		\CodeIgniter\Validation\Rules::class,
-		\CodeIgniter\Validation\FormatRules::class,
-		\CodeIgniter\Validation\FileRules::class,
-		\CodeIgniter\Validation\CreditCardRules::class,
+		Rules::class,
+		FormatRules::class,
+		FileRules::class,
+		CreditCardRules::class,
 	];
 
 	/**
 	 * Specifies the views that are used to display the
 	 * errors.
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	public $templates = [
 		'list'   => 'CodeIgniter\Validation\Views\list',
diff --git a/app/Config/View.php b/app/Config/View.php
index f66b253..c945e2e 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -1,6 +1,10 @@
-<?php namespace Config;
+<?php
 
-class View extends \CodeIgniter\Config\View
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
+class View extends BaseView
 {
 	/**
 	 * When false, the view method will clear the data between each
@@ -9,6 +13,8 @@
 	 * 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;
 
@@ -22,6 +28,8 @@
 	 * Examples:
 	 *  { title|esc(js) }
 	 *  { created_on|date(Y-m-d)|esc(attr) }
+	 *
+	 * @var array
 	 */
 	public $filters = [];
 
@@ -29,6 +37,8 @@
 	 * 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 252692f..f92bd67 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -1,6 +1,12 @@
 <?php
+
 namespace App\Controllers;
 
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
 /**
  * Class BaseController
  *
@@ -10,15 +16,10 @@
  *     class Home extends BaseController
  *
  * For security be sure to declare any new methods as protected or private.
- *
- * @package CodeIgniter
  */
 
-use CodeIgniter\Controller;
-
 class BaseController extends Controller
 {
-
 	/**
 	 * An array of helpers to be loaded automatically upon
 	 * class instantiation. These helpers will be available
@@ -30,8 +31,12 @@
 
 	/**
 	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
 	 */
-	public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger)
+	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
 	{
 		// Do Not Edit This Line
 		parent::initController($request, $response, $logger);
@@ -39,8 +44,6 @@
 		//--------------------------------------------------------------------
 		// 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 8798cdd..f059375 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -1,4 +1,6 @@
-<?php namespace App\Controllers;
+<?php
+
+namespace App\Controllers;
 
 class Home extends BaseController
 {
@@ -6,7 +8,4 @@
 	{
 		return view('welcome_message');
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/app/Views/errors/cli/error_404.php b/app/Views/errors/cli/error_404.php
index d5bccb4..456ea3e 100644
--- a/app/Views/errors/cli/error_404.php
+++ b/app/Views/errors/cli/error_404.php
@@ -1,4 +1,5 @@
 <?php
+
 use CodeIgniter\CLI\CLI;
 
 CLI::error('ERROR: ' . $code);
diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index f8f2d95..e505003 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -1,17 +1,72 @@
-An uncaught Exception was encountered
+<?php
 
-Type:        <?= get_class($exception), "\n"; ?>
-Message:     <?= $message, "\n"; ?>
-Filename:    <?= $exception->getFile(), "\n"; ?>
-Line Number: <?= $exception->getLine(); ?>
+use CodeIgniter\CLI\CLI;
 
-<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === true): ?>
+// The main Exception
+CLI::newLine();
+CLI::write('[' . get_class($exception) . ']', 'light_gray', 'red');
+CLI::newLine();
+CLI::write($message);
+CLI::newLine();
+CLI::write('at ' . CLI::color(clean_path($exception->getFile()) . ':' . $exception->getLine(), 'green'));
+CLI::newLine();
 
-	Backtrace:
-	<?php foreach ($exception->getTrace() as $error): ?>
-		<?php if (isset($error['file'])): ?>
-			<?= trim('-' . $error['line'] . ' - ' . $error['file'] . '::' . $error['function']) . "\n" ?>
-		<?php endif ?>
-	<?php endforeach ?>
+// The backtrace
+if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE)
+{
+	$backtraces = $exception->getTrace();
 
-<?php endif ?>
+	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);
+
+		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'));
+		}
+
+		$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'] ?? [])));
+
+		$function .= '(' . $args . ')';
+
+		CLI::write($function);
+		CLI::newLine();
+	}
+}
diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
index 4b76b79..f334c7a 100644
--- a/app/Views/errors/html/debug.css
+++ b/app/Views/errors/html/debug.css
@@ -1,177 +1,177 @@
 body {
-    height: 100%;
-    background: #fafafa;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    color: #777;
-    font-weight: 300;
-    margin: 0;
-    padding: 0;
+	height: 100%;
+	background: #fafafa;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	color: #777;
+	font-weight: 300;
+	margin: 0;
+	padding: 0;
 }
 h1 {
-    font-weight: lighter;
-    letter-spacing: 0.8;
-    font-size: 3rem;
-    color: #222;
-    margin: 0;
+	font-weight: lighter;
+	letter-spacing: 0.8;
+	font-size: 3rem;
+	color: #222;
+	margin: 0;
 }
 h1.headline {
-    margin-top: 20%;
-    font-size: 5rem;
+	margin-top: 20%;
+	font-size: 5rem;
 }
 .text-center {
-    text-align: center;
+	text-align: center;
 }
 p.lead {
-    font-size: 1.6rem;
+	font-size: 1.6rem;
 }
 .container {
-    max-width: 75rem;
-    margin: 0 auto;
-    padding: 1rem;
+	max-width: 75rem;
+	margin: 0 auto;
+	padding: 1rem;
 }
 .header {
-    background: #85271f;
-    color: #fff;
+	background: #85271f;
+	color: #fff;
 }
 .header h1 {
-    color: #fff;
+	color: #fff;
 }
 .header p {
-    font-size: 1.2rem;
-    margin: 0;
-    line-height: 2.5;
+	font-size: 1.2rem;
+	margin: 0;
+	line-height: 2.5;
 }
 .header a {
-    color: rgba(255,255,255,0.5);
-    margin-left: 2rem;
-    display: none;
-    text-decoration: none;
+	color: rgba(255,255,255,0.5);
+	margin-left: 2rem;
+	display: none;
+	text-decoration: none;
 }
 .header:hover a {
-    display: inline;
+	display: inline;
 }
 
 .footer .container {
-    border-top: 1px solid #e7e7e7;
-    margin-top: 1rem;
-    text-align: center;
+	border-top: 1px solid #e7e7e7;
+	margin-top: 1rem;
+	text-align: center;
 }
 
 .source {
-    background: #333;
-    color: #c7c7c7;
-    padding: 0.5em 1em;
-    border-radius: 5px;
-    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-    margin: 0;
-    overflow-x: scroll;
+	background: #333;
+	color: #c7c7c7;
+	padding: 0.5em 1em;
+	border-radius: 5px;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	margin: 0;
+	overflow-x: scroll;
 }
 .source span.line {
-    line-height: 1.4;
+	line-height: 1.4;
 }
 .source span.line .number {
-    color: #666;
+	color: #666;
 }
 .source .line .highlight {
-    display: block;
-    background: #555;
-    color: #fff;
+	display: block;
+	background: #555;
+	color: #fff;
 }
 .source span.highlight .number {
-    color: #fff;
+	color: #fff;
 }
 
 .tabs {
-    list-style: none;
-    list-style-position: inside;
-    margin: 0;
-    padding: 0;
-    margin-bottom: -1px;
+	list-style: none;
+	list-style-position: inside;
+	margin: 0;
+	padding: 0;
+	margin-bottom: -1px;
 }
 .tabs li {
-    display: inline;
+	display: inline;
 }
 .tabs a:link,
 .tabs a:visited {
-    padding: 0rem 1rem;
-    line-height: 2.7;
-    text-decoration: none;
-    color: #a7a7a7;
-    background: #f1f1f1;
-    border: 1px solid #e7e7e7;
-    border-bottom: 0;
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-    display: inline-block;
+	padding: 0rem 1rem;
+	line-height: 2.7;
+	text-decoration: none;
+	color: #a7a7a7;
+	background: #f1f1f1;
+	border: 1px solid #e7e7e7;
+	border-bottom: 0;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	display: inline-block;
 }
 .tabs a:hover {
-    background: #e7e7e7;
-    border-color: #e1e1e1;
+	background: #e7e7e7;
+	border-color: #e1e1e1;
 }
 .tabs a.active {
-    background: #fff;
+	background: #fff;
 }
 .tab-content {
-    background: #fff;
-    border: 1px solid #efefef;
+	background: #fff;
+	border: 1px solid #efefef;
 }
 .content {
-    padding: 1rem;
+	padding: 1rem;
 }
 .hide {
-    display: none;
+	display: none;
 }
 
 .alert {
-    margin-top: 2rem;
-    display: block;
-    text-align: center;
-    line-height: 3.0;
-    background: #d9edf7;
-    border: 1px solid #bcdff1;
-    border-radius: 5px;
-    color: #31708f;
+	margin-top: 2rem;
+	display: block;
+	text-align: center;
+	line-height: 3.0;
+	background: #d9edf7;
+	border: 1px solid #bcdff1;
+	border-radius: 5px;
+	color: #31708f;
 }
 ul, ol {
-    line-height: 1.8;
+	line-height: 1.8;
 }
 
 table {
-    width: 100%;
-    overflow: hidden;
+	width: 100%;
+	overflow: hidden;
 }
 th {
-    text-align: left;
-    border-bottom: 1px solid #e7e7e7;
-    padding-bottom: 0.5rem;
+	text-align: left;
+	border-bottom: 1px solid #e7e7e7;
+	padding-bottom: 0.5rem;
 }
 td {
-    padding: 0.2rem 0.5rem 0.2rem 0;
+	padding: 0.2rem 0.5rem 0.2rem 0;
 }
 tr:hover td {
-    background: #f1f1f1;
+	background: #f1f1f1;
 }
 td pre {
-    white-space: pre-wrap;
+	white-space: pre-wrap;
 }
 
 .trace a {
-    color: inherit;
+	color: inherit;
 }
 .trace table {
-    width: auto;
+	width: auto;
 }
 .trace tr td:first-child {
-    min-width: 5em;
-    font-weight: bold;
+	min-width: 5em;
+	font-weight: bold;
 }
 .trace td {
-    background: #e7e7e7;
-    padding: 0 1rem;
+	background: #e7e7e7;
+	padding: 0 1rem;
 }
 .trace td pre {
-    margin: 0;
+	margin: 0;
 }
 .args {
-    display: none;
+	display: none;
 }
\ No newline at end of file
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
index 40a598d..f36f8b5 100644
--- a/app/Views/errors/html/debug.js
+++ b/app/Views/errors/html/debug.js
@@ -2,126 +2,127 @@
 // Tabs
 //--------------------------------------------------------------------
 
-var tabLinks = new Array();
+var tabLinks    = new Array();
 var contentDivs = new Array();
 
-function init ()
+function init()
 {
+	// Grab the tab links and content divs from the page
+	var tabListItems = document.getElementById('tabs').childNodes;
+	console.log(tabListItems);
+	for (var i = 0; i < tabListItems.length; i ++)
+	{
+		if (tabListItems[i].nodeName == "LI")
+		{
+			var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
+			var id          = getHash(tabLink.getAttribute('href'));
+			tabLinks[id]    = tabLink;
+			contentDivs[id] = document.getElementById(id);
+		}
+	}
 
-    // Grab the tab links and content divs from the page
-    var tabListItems = document.getElementById('tabs').childNodes;
-    console.log(tabListItems);
-    for (var i = 0; i < tabListItems.length; i ++)
-    {
-        if (tabListItems[i].nodeName == "LI")
-        {
-            var tabLink = getFirstChildWithTagName(tabListItems[i], 'A');
-            var id = getHash(tabLink.getAttribute('href'));
-            tabLinks[id] = tabLink;
-            contentDivs[id] = document.getElementById(id);
-        }
-    }
+	// Assign onclick events to the tab links, and
+	// highlight the first tab
+	var i = 0;
 
-    // Assign onclick events to the tab links, and
-    // highlight the first tab
-    var i = 0;
+	for (var id in tabLinks)
+	{
+		tabLinks[id].onclick = showTab;
+		tabLinks[id].onfocus = function () {
+			this.blur()
+		};
+		if (i == 0)
+		{
+			tabLinks[id].className = 'active';
+		}
+		i ++;
+	}
 
-    for (var id in tabLinks)
-    {
-        tabLinks[id].onclick = showTab;
-        tabLinks[id].onfocus = function () { this.blur() };
-        if (i == 0)
-        {
-            tabLinks[id].className = 'active';
-        }
-        i ++;
-    }
+	// Hide all content divs except the first
+	var i = 0;
 
-    // Hide all content divs except the first
-    var i = 0;
-
-    for (var id in contentDivs)
-    {
-        if (i != 0)
-        {
-            console.log(contentDivs[id]);
-            contentDivs[id].className = 'content hide';
-        }
-        i ++;
-    }
+	for (var id in contentDivs)
+	{
+		if (i != 0)
+		{
+			console.log(contentDivs[id]);
+			contentDivs[id].className = 'content hide';
+		}
+		i ++;
+	}
 }
 
 //--------------------------------------------------------------------
 
-function showTab ()
+function showTab()
 {
-    var selectedId = getHash(this.getAttribute('href'));
+	var selectedId = getHash(this.getAttribute('href'));
 
-    // Highlight the selected tab, and dim all others.
-    // Also show the selected content div, and hide all others.
-    for (var id in contentDivs)
-    {
-        if (id == selectedId)
-        {
-            tabLinks[id].className = 'active';
-            contentDivs[id].className = 'content';
-        }
-        else
-        {
-            tabLinks[id].className = '';
-            contentDivs[id].className = 'content hide';
-        }
-    }
+	// Highlight the selected tab, and dim all others.
+	// Also show the selected content div, and hide all others.
+	for (var id in contentDivs)
+	{
+		if (id == selectedId)
+		{
+			tabLinks[id].className    = 'active';
+			contentDivs[id].className = 'content';
+		}
+		else
+		{
+			tabLinks[id].className    = '';
+			contentDivs[id].className = 'content hide';
+		}
+	}
 
-    // Stop the browser following the link
-    return false;
+	// Stop the browser following the link
+	return false;
 }
 
 //--------------------------------------------------------------------
 
-function getFirstChildWithTagName (element, tagName)
+function getFirstChildWithTagName(element, tagName)
 {
-    for (var i = 0; i < element.childNodes.length; i ++)
-    {
-        if (element.childNodes[i].nodeName == tagName)
-        {
-            return element.childNodes[i];
-        }
-    }
+	for (var i = 0; i < element.childNodes.length; i ++)
+	{
+		if (element.childNodes[i].nodeName == tagName)
+		{
+			return element.childNodes[i];
+		}
+	}
 }
 
 //--------------------------------------------------------------------
 
-function getHash (url)
+function getHash(url)
 {
-    var hashPos = url.lastIndexOf('#');
-    return url.substring(hashPos + 1);
+	var hashPos = url.lastIndexOf('#');
+	return url.substring(hashPos + 1);
 }
 
 //--------------------------------------------------------------------
 
-function toggle (elem)
+function toggle(elem)
 {
-    elem = document.getElementById(elem);
+	elem = document.getElementById(elem);
 
-    if (elem.style && elem.style['display'])
-    {
-        // Only works with the "style" attr
-        var disp = elem.style['display'];
-    }
-    else if (elem.currentStyle)
-    {
-        // For MSIE, naturally
-        var disp = elem.currentStyle['display'];
-    }
-    else if (window.getComputedStyle)
-    {
-        // For most other browsers
-        var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
-    }
+	if (elem.style && elem.style['display'])
+	{
+		// Only works with the "style" attr
+		var disp = elem.style['display'];
+	}
+	else if (elem.currentStyle)
+	{
+		// For MSIE, naturally
+		var disp = elem.currentStyle['display'];
+	}
+	else if (window.getComputedStyle)
+	{
+		// For most other browsers
+		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+	}
 
-    // Toggle the state of the "display" style
-    elem.style.display = disp == 'block' ? 'none' : 'block';
+	// Toggle the state of the "display" style
+	elem.style.display = disp == 'block' ? 'none' : 'block';
 
-    return false;
+	return false;
 }
\ 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 09fddcb..43a916c 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 	<meta name="robots" content="noindex">
 
-	<title><?= htmlspecialchars($title, ENT_SUBSTITUTE, 'UTF-8') ?></title>
+	<title><?= esc($title) ?></title>
 	<style type="text/css">
 		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
 	</style>
@@ -19,9 +19,9 @@
 	<!-- Header -->
 	<div class="header">
 		<div class="container">
-			<h1><?= htmlspecialchars($title, ENT_SUBSTITUTE, 'UTF-8'), ($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
+			<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
 			<p>
-				<?= $exception->getMessage() ?>
+				<?= esc($exception->getMessage()) ?>
 				<a href="https://www.google.com/search?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
 				   rel="noreferrer" target="_blank">search &rarr;</a>
 			</p>
@@ -30,7 +30,7 @@
 
 	<!-- Source -->
 	<div class="container">
-		<p><b><?= static::cleanPath($file, $line) ?></b> at line <b><?= $line ?></b></p>
+		<p><b><?= esc(static::cleanPath($file, $line)) ?></b> at line <b><?= esc($line) ?></b></p>
 
 		<?php if (is_file($file)) : ?>
 			<div class="source">
@@ -64,13 +64,13 @@
 							<!-- 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']))
-									{
-									echo $row['function'] . ' ' . static::cleanPath($row['file']);
+								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 static::cleanPath($row['file']) . ' : ' . $row['line'];
+								{
+									echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
 								}
 								?>
 							<?php else : ?>
@@ -79,25 +79,25 @@
 
 							<!-- Class/Method -->
 							<?php if (isset($row['class'])) : ?>
-								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= $row['class'] . $row['type'] . $row['function'] ?>
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
 								<?php if (! empty($row['args'])) : ?>
 									<?php $args_id = $error_id . 'args' . $index ?>
-									( <a href="#" onclick="return toggle('<?= $args_id ?>');">arguments</a> )
-									<div class="args" id="<?= $args_id ?>">
+									( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
+									<div class="args" id="<?= esc($args_id, 'attr') ?>">
 										<table cellspacing="0">
 
 										<?php
 										$params = null;
 										// Reflection by name is not available for closure function
-										if (substr( $row['function'], -1 ) !== '}')
+										if (substr($row['function'], -1) !== '}')
 										{
-											$mirror = isset( $row['class'] ) ? new \ReflectionMethod( $row['class'], $row['function'] ) : new \ReflectionFunction( $row['function'] );
+											$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><?= htmlspecialchars(isset($params[$key]) ? '$' . $params[$key]->name : "#$key", ENT_SUBSTITUTE, 'UTF-8') ?></code></td>
-												<td><pre><?= print_r($value, true) ?></pre></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 ?>
 
@@ -109,12 +109,12 @@
 							<?php endif; ?>
 
 							<?php if (! isset($row['class']) && isset($row['function'])) : ?>
-								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;	<?= $row['function'] ?>()
+								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;	<?= esc($row['function']) ?>()
 							<?php endif; ?>
 						</p>
 
 						<!-- Source? -->
-						<?php if (isset($row['file']) && is_file($row['file']) &&  isset($row['class'])) : ?>
+						<?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
 							<div class="source">
 								<?= static::highlightFile($row['file'], $row['line']) ?>
 							</div>
@@ -134,7 +134,7 @@
 						continue;
 					} ?>
 
-					<h3>$<?= $var ?></h3>
+					<h3>$<?= esc($var) ?></h3>
 
 					<table>
 						<thead>
@@ -146,12 +146,12 @@
 						<tbody>
 						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
 							<tr>
-								<td><?= htmlspecialchars($key, ENT_IGNORE, 'UTF-8') ?></td>
+								<td><?= esc($key) ?></td>
 								<td>
 									<?php if (is_string($value)) : ?>
-										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
+										<?= esc($value) ?>
 									<?php else: ?>
-										<?= '<pre>' . print_r($value, true) ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -176,12 +176,12 @@
 						<tbody>
 						<?php foreach ($constants['user'] as $key => $value) : ?>
 							<tr>
-								<td><?= htmlspecialchars($key, ENT_IGNORE, 'UTF-8') ?></td>
+								<td><?= esc($key) ?></td>
 								<td>
-									<?php if (! is_array($value) && ! is_object($value)) : ?>
-										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
 									<?php else: ?>
-										<?= '<pre>' . print_r($value, true) ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -199,15 +199,15 @@
 					<tbody>
 						<tr>
 							<td style="width: 10em">Path</td>
-							<td><?= $request->uri ?></td>
+							<td><?= esc($request->uri) ?></td>
 						</tr>
 						<tr>
 							<td>HTTP Method</td>
-							<td><?= $request->getMethod(true) ?></td>
+							<td><?= esc($request->getMethod(true)) ?></td>
 						</tr>
 						<tr>
 							<td>IP Address</td>
-							<td><?= $request->getIPAddress() ?></td>
+							<td><?= esc($request->getIPAddress()) ?></td>
 						</tr>
 						<tr>
 							<td style="width: 10em">Is AJAX Request?</td>
@@ -223,7 +223,7 @@
 						</tr>
 						<tr>
 							<td>User Agent</td>
-							<td><?= $request->getUserAgent()->getAgentString() ?></td>
+							<td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
 						</tr>
 
 					</tbody>
@@ -239,7 +239,7 @@
 
 					<?php $empty = false; ?>
 
-					<h3>$<?= $var ?></h3>
+					<h3>$<?= esc($var) ?></h3>
 
 					<table style="width: 100%">
 						<thead>
@@ -251,12 +251,12 @@
 						<tbody>
 						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
 							<tr>
-								<td><?= htmlspecialchars($key, ENT_IGNORE, 'UTF-8') ?></td>
+								<td><?= esc($key) ?></td>
 								<td>
-									<?php if (! is_array($value) && ! is_object($value)) : ?>
-										<?= htmlspecialchars($value, ENT_SUBSTITUTE, 'UTF-8') ?>
+									<?php if (is_string($value)) : ?>
+										<?= esc($value) ?>
 									<?php else: ?>
-										<?= '<pre>' . print_r($value, true) ?>
+										<pre><?= esc(print_r($value, true)) ?></pre>
 									<?php endif; ?>
 								</td>
 							</tr>
@@ -318,7 +318,7 @@
 				<table>
 					<tr>
 						<td style="width: 15em">Response Status</td>
-						<td><?= $response->getStatusCode() . ' - ' . $response->getReason() ?></td>
+						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReason()) ?></td>
 					</tr>
 				</table>
 
@@ -354,7 +354,7 @@
 
 				<ol>
 				<?php foreach ($files as $file) :?>
-					<li><?= htmlspecialchars( static::cleanPath($file), ENT_SUBSTITUTE, 'UTF-8') ?></li>
+					<li><?= esc(static::cleanPath($file)) ?></li>
 				<?php endforeach ?>
 				</ol>
 			</div>
@@ -366,15 +366,15 @@
 					<tbody>
 						<tr>
 							<td>Memory Usage</td>
-							<td><?= static::describeMemory(memory_get_usage(true)) ?></td>
+							<td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
 						</tr>
 						<tr>
 							<td style="width: 12em">Peak Memory Usage:</td>
-							<td><?= static::describeMemory(memory_get_peak_usage(true)) ?></td>
+							<td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
 						</tr>
 						<tr>
 							<td>Memory Limit:</td>
-							<td><?= ini_get('memory_limit') ?></td>
+							<td><?= esc(ini_get('memory_limit')) ?></td>
 						</tr>
 					</tbody>
 				</table>
@@ -389,9 +389,9 @@
 		<div class="container">
 
 			<p>
-				Displayed at <?= date('H:i:sa') ?> &mdash;
-				PHP: <?= phpversion() ?>  &mdash;
-				CodeIgniter: <?= \CodeIgniter\CodeIgniter::CI_VERSION ?>
+				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+				PHP: <?= esc(phpversion()) ?>  &mdash;
+				CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
 			</p>
 
 		</div>
diff --git a/composer.json b/composer.json
index 3f3b9d5..df3468d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"homepage": "https://codeigniter.com",
 	"license": "MIT",
 	"require": {
-		"php": ">=7.2",
+		"php": "^7.2 || ^8.0",
 		"ext-curl": "*",
 		"ext-intl": "*",
 		"ext-json": "*",
@@ -16,20 +16,25 @@
 	},
 	"require-dev": {
 		"codeigniter4/codeigniter4-standard": "^1.0",
-		"fzaninotto/faker": "^1.9@dev",
-		"mikey179/vfsstream": "1.6.*",
+		"fakerphp/faker": "^1.9",
+		"mikey179/vfsstream": "^1.6",
 		"phpunit/phpunit": "^8.5",
 		"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": [
-			"@composer dump-autoload",
 			"CodeIgniter\\ComposerScripts::postUpdate"
 		],
 		"test": "phpunit"
diff --git a/env b/env
index 11f4161..79abea2 100644
--- a/env
+++ b/env
@@ -35,6 +35,7 @@
 # app.cookiePath = '/'
 # app.cookieSecure = false
 # app.cookieHTTPOnly = false
+# app.cookieSameSite = 'Lax'
 
 # app.CSRFProtection  = false
 # app.CSRFTokenName   = 'csrf_test_name'
@@ -42,6 +43,7 @@
 # app.CSRFExpire      = 7200
 # app.CSRFRegenerate  = true
 # app.CSRFExcludeURIs = []
+# app.CSRFSameSite    = 'Lax'
 
 # app.CSPEnabled = false
 
@@ -87,8 +89,10 @@
 # ENCRYPTION
 #--------------------------------------------------------------------
 
-# encryption.key = 
+# encryption.key =
 # encryption.driver = OpenSSL
+# encryption.blockSize = 16
+# encryption.digest = SHA512
 
 #--------------------------------------------------------------------
 # HONEYPOT
@@ -99,3 +103,21 @@
 # honeypot.name = 'honeypot'
 # honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
 # honeypot.container = '<div style="display:none">{template}</div>'
+
+#--------------------------------------------------------------------
+# SECURITY
+#--------------------------------------------------------------------
+
+# security.tokenName  = 'csrf_token_name'
+# security.headerName = 'X-CSRF-TOKEN'
+# security.cookieName = 'csrf_cookie_name'
+# security.expires    = 7200
+# security.regenerate = true
+# security.redirect   = true
+# security.samesite   = 'Lax'
+
+#--------------------------------------------------------------------
+# LOGGER
+#--------------------------------------------------------------------
+
+# logger.threshold = 4
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 2fb1bdd..0000000
--- a/license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014-2019 British Columbia Institute of Technology
-Copyright (c) 2019-2020 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.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 88aca1f..446ae80 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,7 +10,7 @@
 		stopOnIncomplete="false"
 		stopOnSkipped="false">
 	<testsuites>
-		<testsuite name="app">
+		<testsuite name="App">
 			<directory>./tests</directory>
 		</testsuite>
 	</testsuites>
@@ -36,7 +36,7 @@
 	</logging>
 
 	<php>
-		<server name="app.baseURL" value="http://example.com"/>
+		<server name="app.baseURL" value="http://example.com/"/>
 
 		<!-- Directory containing phpunit.xml -->
 		<const name="HOMEPATH" value="./"/>
diff --git a/public/.htaccess b/public/.htaccess
index 02026a3..712c901 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -18,7 +18,8 @@
 
 	# Redirect Trailing Slashes...
 	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.*)/$ /$1 [L,R=301]
+	RewriteCond %{REQUEST_URI} (.+)/$
+      RewriteRule ^ %1 [L,R=301]
 
 	# Rewrite "www.example.com -> example.com"
 	RewriteCond %{HTTPS} !=on
diff --git a/public/index.php b/public/index.php
index 3eaa592..127780d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -2,20 +2,15 @@
 
 // Valid PHP Version?
 $minPHPVersion = '7.2';
-if (phpversion() < $minPHPVersion)
+if (version_compare(PHP_VERSION, $minPHPVersion, '<'))
 {
-	die("Your PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: " . phpversion());
+	die("Your PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: " . PHP_VERSION);
 }
 unset($minPHPVersion);
 
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
-// Location of the Paths config file.
-// This is the line that might need to be changed, depending on your folder structure.
-$pathsPath = realpath(FCPATH . '../app/Config/Paths.php');
-// ^^^ Change this if you move your application folder
-
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION
@@ -29,11 +24,15 @@
 chdir(__DIR__);
 
 // Load our paths config file
-require $pathsPath;
+// This is the line that might need to be changed, depending on your folder structure.
+require realpath(FCPATH . '../app/Config/Paths.php') ?: FCPATH . '../app/Config/Paths.php';
+// ^^^ Change this if you move your application folder
+
 $paths = new Config\Paths();
 
 // Location of the framework bootstrap file.
-$app = require rtrim($paths->systemDirectory, '/ ') . '/bootstrap.php';
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
 
 /*
  *---------------------------------------------------------------
diff --git a/spark b/spark
index 0a0908d..5c89416 100755
--- a/spark
+++ b/spark
@@ -1,6 +1,14 @@
 #!/usr/bin/env php
 <?php
 
+// Valid PHP Version?
+$minPHPVersion = '7.2';
+if (version_compare(PHP_VERSION, $minPHPVersion, '<'))
+{
+	die("Your PHP version must be {$minPHPVersion} or higher to run CodeIgniter. Current version: " . PHP_VERSION);
+}
+unset($minPHPVersion);
+
 /*
  * --------------------------------------------------------------------
  * CodeIgniter command-line tools
@@ -24,16 +32,16 @@
  */
 
 // Refuse to run when called from php-cgi
-if (strpos(php_sapi_name(), 'cgi') === 0)
+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");
 }
 
 // Path to the front controller
-define('FCPATH', __DIR__ . '/public' . DIRECTORY_SEPARATOR);
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
 
 // Load our paths config file
-require 'app/Config/Paths.php';
+require realpath('app/Config/Paths.php') ?: 'app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
 $paths = new Config\Paths();
@@ -41,14 +49,15 @@
 // Ensure the current directory is pointing to the front controller's directory
 chdir(FCPATH);
 
-$app = require rtrim($paths->systemDirectory, '/ ') . '/bootstrap.php';
+$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+$app       = require realpath($bootstrap) ?: $bootstrap;
 
 // Grab our Console
-$console = new \CodeIgniter\CLI\Console($app);
+$console = new CodeIgniter\CLI\Console($app);
 
 // We want errors to be shown when using it from the CLI.
 error_reporting(-1);
-ini_set('display_errors', 1);
+ini_set('display_errors', '1');
 
 // Show basic information before we do anything else.
 $console->showHeader();
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 49248eb..36d0038 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -1,46 +1,20 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\API;
 
+use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
-use Config\Format;
+use Config\Services;
 
 /**
  * Response trait.
@@ -49,10 +23,8 @@
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
  *
- * @property \CodeIgniter\HTTP\IncomingRequest $request
- * @property \CodeIgniter\HTTP\Response        $response
- *
- * @package CodeIgniter\API
+ * @property IncomingRequest $request
+ * @property Response        $response
  */
 trait ResponseTrait
 {
@@ -102,6 +74,13 @@
 	 */
 	protected $format = 'json';
 
+	/**
+	 * Current Formatter instance. This is usually set by ResponseTrait::format
+	 *
+	 * @var FormatterInterface
+	 */
+	protected $formatter;
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -123,7 +102,8 @@
 
 			// Create the output var here in case of $this->response([]);
 			$output = null;
-		} // If data is null but status provided, keep the output empty.
+		}
+		// If data is null but status provided, keep the output empty.
 		elseif ($data === null && is_numeric($status))
 		{
 			$output = null;
@@ -134,8 +114,20 @@
 			$output = $this->format($data);
 		}
 
-		return $this->response->setBody($output)
-						->setStatusCode($status, $message);
+		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);
 	}
 
 	//--------------------------------------------------------------------
@@ -144,7 +136,7 @@
 	 * Used for generic failures that no custom methods exist for.
 	 *
 	 * @param string|array $messages
-	 * @param integer|null $status        HTTP status code
+	 * @param integer      $status        HTTP status code
 	 * @param string|null  $code          Custom, API-specific, error code
 	 * @param string       $customMessage
 	 *
@@ -159,7 +151,7 @@
 
 		$response = [
 			'status'   => $status,
-			'error'    => $code === null ? $status : $code,
+			'error'    => $code ?? $status,
 			'messages' => $messages,
 		];
 
@@ -382,29 +374,30 @@
 			$contentType = str_replace('application/json', 'text/html', $contentType);
 			$contentType = str_replace('application/', 'text/', $contentType);
 			$this->response->setContentType($contentType);
+			$this->format = 'html';
 
 			return $data;
 		}
 
-		$config = new Format();
-		$format = "application/$this->format";
+		$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']))
+		if (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true))
 		{
-			$format = $this->request->negotiate('media', $config->supportedResponseFormats, false);
+			$mime = $this->request->negotiate('media', $format->getConfig()->supportedResponseFormats, false);
 		}
 
-		$this->response->setContentType($format);
+		$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 = $config->getFormatter($format);
+			$this->formatter = $format->getFormatter($mime);
 		}
 
-		if ($format !== 'application/json')
+		if ($mime !== 'application/json')
 		{
 			// Recursively convert objects into associative arrays
 			// Conversion not required for JSONFormatter
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index fa5c9a2..6322b75 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -1,44 +1,20 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
 
+use Config\Autoload;
+use Config\Modules;
+use InvalidArgumentException;
+
 /**
  * CodeIgniter Autoloader
  *
@@ -74,8 +50,6 @@
  *
  *      // register the autoloader
  *      $loader->register();
- *
- * @package CodeIgniter\Autoloader
  */
 class Autoloader
 {
@@ -99,18 +73,18 @@
 	 * Reads in the configuration array (described above) and stores
 	 * the valid parts that we'll need.
 	 *
-	 * @param \Config\Autoload $config
-	 * @param \Config\Modules  $moduleConfig
+	 * @param Autoload $config
+	 * @param Modules  $modules
 	 *
 	 * @return $this
 	 */
-	public function initialize(\Config\Autoload $config, \Config\Modules $moduleConfig)
+	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.');
+			throw new InvalidArgumentException('Config array must contain either the \'psr4\' key or the \'classmap\' key.');
 		}
 
 		if (isset($config->psr4))
@@ -124,7 +98,7 @@
 		}
 
 		// Should we load through Composer's namespaces, also?
-		if ($moduleConfig->discoverInComposer)
+		if ($modules->discoverInComposer)
 		{
 			$this->discoverComposerNamespaces();
 		}
@@ -139,26 +113,19 @@
 	 */
 	public function register()
 	{
-		// Since the default file extensions are searched
-		// in order of .inc then .php, but we always use .php,
-		// put the .php extension first to eek out a bit
-		// better performance.
-		// http://php.net/manual/en/function.spl-autoload.php#78053
-		spl_autoload_extensions('.php,.inc');
-
 		// Prepend the PSR4  autoloader for maximum performance.
-		spl_autoload_register([$this, 'loadClass'], true, true);
+		spl_autoload_register([$this, 'loadClass'], true, true); // @phpstan-ignore-line
 
 		// Now prepend another loader for the files in our class map.
-		$config = is_array($this->classmap) ? $this->classmap : [];
 
-		spl_autoload_register(function ($class) use ($config) {
-			if (empty($config[$class]))
+		// @phpstan-ignore-next-line
+		spl_autoload_register(function ($class) {
+			if (empty($this->classmap[$class]))
 			{
 				return false;
 			}
 
-			include_once $config[$class];
+			include_once $this->classmap[$class];
 		}, true, // Throw exception
 			true // Prepend
 		);
@@ -172,7 +139,7 @@
 	 * @param array|string $namespace
 	 * @param string       $path
 	 *
-	 * @return Autoloader
+	 * @return $this
 	 */
 	public function addNamespace($namespace, string $path = null)
 	{
@@ -186,18 +153,18 @@
 				{
 					foreach ($path as $dir)
 					{
-						$this->prefixes[$prefix][] = rtrim($dir, '/') . '/';
+						$this->prefixes[$prefix][] = rtrim($dir, '\\/') . DIRECTORY_SEPARATOR;
 					}
 
 					continue;
 				}
 
-				$this->prefixes[$prefix][] = rtrim($path, '/') . '/';
+				$this->prefixes[$prefix][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
 			}
 		}
 		else
 		{
-			$this->prefixes[trim($namespace, '\\')][] = rtrim($path, '/') . '/';
+			$this->prefixes[trim($namespace, '\\')][] = rtrim($path, '\\/') . DIRECTORY_SEPARATOR;
 		}
 
 		return $this;
@@ -210,7 +177,7 @@
 	 *
 	 * If a prefix param is set, returns only paths to the given prefix.
 	 *
-	 * @var string|null $prefix
+	 * @param string|null $prefix
 	 *
 	 * @return array
 	 */
@@ -231,11 +198,14 @@
 	 *
 	 * @param string $namespace
 	 *
-	 * @return Autoloader
+	 * @return $this
 	 */
 	public function removeNamespace(string $namespace)
 	{
-		unset($this->prefixes[trim($namespace, '\\')]);
+		if (isset($this->prefixes[trim($namespace, '\\')]))
+		{
+			unset($this->prefixes[trim($namespace, '\\')]);
+		}
 
 		return $this;
 	}
@@ -280,6 +250,15 @@
 	{
 		if (strpos($class, '\\') === false)
 		{
+			$class    = 'Config\\' . $class;
+			$filePath = APPPATH . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
+			$filename = $this->includeFile($filePath);
+
+			if ($filename)
+			{
+				return $filename;
+			}
+
 			return false;
 		}
 
@@ -287,13 +266,12 @@
 		{
 			foreach ($directories as $directory)
 			{
-				$directory = rtrim($directory, '/');
+				$directory = rtrim($directory, '\\/');
 
 				if (strpos($class, $namespace) === 0)
 				{
-					$filePath = $directory . str_replace('\\', '/',
-							substr($class, strlen($namespace))) . '.php';
-					$filename = $this->requireFile($filePath);
+					$filePath = $directory . str_replace('\\', DIRECTORY_SEPARATOR, substr($class, strlen($namespace))) . '.php';
+					$filename = $this->includeFile($filePath);
 
 					if ($filename)
 					{
@@ -333,11 +311,11 @@
 			APPPATH . 'Models/',
 		];
 
-		$class = str_replace('\\', '/', $class) . '.php';
+		$class = str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
 
 		foreach ($paths as $path)
 		{
-			if ($file = $this->requireFile($path . $class))
+			if ($file = $this->includeFile($path . $class))
 			{
 				return $file;
 			}
@@ -349,20 +327,19 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * A central way to require a file is loaded. Split out primarily
-	 * for testing purposes.
+	 * 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 requireFile(string $file)
+	protected function includeFile(string $file)
 	{
 		$file = $this->sanitizeFilename($file);
 
 		if (is_file($file))
 		{
-			require_once $file;
+			include_once $file;
 
 			return $file;
 		}
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index c9d2b78..1ee0b46 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
@@ -44,8 +16,6 @@
  *
  * Allows loading non-class files in a namespaced manner.
  * Works with Helpers, Views, etc.
- *
- * @package CodeIgniter
  */
 class FileLocator
 {
@@ -169,11 +139,11 @@
 	 */
 	public function getClassname(string $file) : string
 	{
-		$php        = file_get_contents($file);
-		$tokens     = token_get_all($php);
-		$dlm        = false;
-		$namespace  = '';
-		$class_name = '';
+		$php       = file_get_contents($file);
+		$tokens    = token_get_all($php);
+		$dlm       = false;
+		$namespace = '';
+		$className = '';
 
 		foreach ($tokens as $i => $token)
 		{
@@ -202,17 +172,17 @@
 				&& $tokens[$i - 1][0] === T_WHITESPACE
 				&& $token[0] === T_STRING)
 			{
-				$class_name = $token[1];
+				$className = $token[1];
 				break;
 			}
 		}
 
-		if (empty( $class_name ))
+		if (empty($className))
 		{
 			return '';
 		}
 
-		return $namespace . '\\' . $class_name;
+		return $namespace . '\\' . $className;
 	}
 
 	//--------------------------------------------------------------------
@@ -354,16 +324,16 @@
 	 */
 	public function findQualifiedNameFromPath(string $path)
 	{
-		$path = realpath($path);
+		$path = realpath($path) ?: $path;
 
-		if (! $path)
+		if (! is_file($path))
 		{
 			return false;
 		}
 
 		foreach ($this->getNamespaces() as $namespace)
 		{
-			$namespace['path'] = realpath($namespace['path']);
+			$namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
 
 			if (empty($namespace['path']))
 			{
@@ -412,7 +382,8 @@
 
 		foreach ($this->getNamespaces() as $namespace)
 		{
-			$fullPath = realpath($namespace['path'] . $path);
+			$fullPath = $namespace['path'] . $path;
+			$fullPath = realpath($fullPath) ?: $fullPath;
 
 			if (! is_dir($fullPath))
 			{
@@ -454,7 +425,8 @@
 		// autoloader->getNamespace($prefix) returns an array of paths for that namespace
 		foreach ($this->autoloader->getNamespace($prefix) as $namespacePath)
 		{
-			$fullPath = realpath(rtrim($namespacePath, '/') . '/' . $path);
+			$fullPath = rtrim($namespacePath, '/') . '/' . $path;
+			$fullPath = realpath($fullPath) ?: $fullPath;
 
 			if (! is_dir($fullPath))
 			{
@@ -475,7 +447,7 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Checks the application folder to see if the file can be found.
+	 * 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
@@ -485,19 +457,12 @@
 	 */
 	protected function legacyLocate(string $file, string $folder = null)
 	{
-		$paths = [
-			APPPATH,
-			SYSTEMPATH,
-		];
+		$path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
+		$path = realpath($path) ?: $path;
 
-		foreach ($paths as $path)
+		if (is_file($path))
 		{
-			$path .= empty($folder) ? $file : $folder . '/' . $file;
-
-			if (is_file($path))
-			{
-				return $path;
-			}
+			return $path;
 		}
 
 		return false;
diff --git a/system/BaseModel.php b/system/BaseModel.php
new file mode 100644
index 0000000..6323c77
--- /dev/null
+++ b/system/BaseModel.php
@@ -0,0 +1,1844 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use Closure;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Exceptions\ModelException;
+use CodeIgniter\I18n\Time;
+use CodeIgniter\Pager\Pager;
+use CodeIgniter\Validation\ValidationInterface;
+use Config\Services;
+use InvalidArgumentException;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionProperty;
+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
+ *
+ * It will:
+ *      - simplifies pagination
+ *      - allow specifying the return type (array, object, etc) with each call
+ *      - automatically set and update timestamps
+ *      - handle soft deletes
+ *      - ensure validation is run against objects when saving items
+ *      - process various callbacks
+ *      - allow intermingling calls to the db connection
+ */
+abstract class BaseModel
+{
+	// region Properties
+
+	/**
+	 * 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 object
+	 */
+	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 ValidationInterface
+	 */
+	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 = [];
+
+	// endregion
+
+	// region Constructor
+
+	/**
+	 * 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;
+		$this->validation         = $validation ?? Services::validation(null, false);
+	}
+
+	// endregion
+
+	// region Abstract Methods
+
+	/**
+	 * 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 object|integer|string|false
+	 */
+	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 object|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
+	 */
+	abstract protected function 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);
+
+	// endregion
+
+	// region CRUD & Finders
+
+	/**
+	 * 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 = $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->idValue($data), $data);
+		}
+		else
+		{
+			$response = $this->insert($data, false);
+
+			if ($response instanceof BaseResult)
+			{
+				$response = $response->resultID !== false;
+			}
+			elseif ($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->idValue($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 BaseResult|object|integer|string|false
+	 *
+	 * @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.
+	 *
+	 * @param boolean $forceDB Always grab the db error, not validation
+	 *
+	 * @return array|null
+	 */
+	public function errors(bool $forceDB = false)
+	{
+		// Do we have validation errors?
+		if (! $forceDB && ! $this->skipValidation)
+		{
+			$errors = $this->validation->getErrors();
+
+			if (! empty($errors))
+			{
+				return $errors;
+			}
+		}
+
+		$error = $this->doErrors();
+
+		return $error['message'] ?? null;
+	}
+
+	// endregion
+
+	// region Pager
+
+	/**
+	 * 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);
+	}
+
+	// endregion
+
+	// region Allowed Fields
+
+	/**
+	 * 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 ($data as $key => $val)
+		{
+			if (! in_array($key, $this->allowedFields, true))
+			{
+				unset($data[$key]);
+			}
+		}
+
+		return $data;
+	}
+
+	// endregion
+
+	// region Timestamps
+
+	/**
+	 * 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;
+		}
+	}
+
+	// endregion
+
+	// region Validation
+
+	/**
+	 * 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))
+		{
+			// @phpstan-ignore-next-line
+			$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 ($rules as $field => $rule)
+		{
+			if (! array_key_exists($field, $data))
+			{
+				unset($rules[$field]);
+			}
+		}
+
+		return $rules;
+	}
+
+	// endregion
+
+	// region Callbacks
+
+	/**
+	 * 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;
+	}
+
+	// endregion
+
+	// region Utility
+
+	/**
+	 * 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;
+	}
+
+	// endregion
+
+	// region Magic
+
+	/**
+	 * 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;
+		}
+
+		if (isset($this->db->$name))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * 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)
+	{
+		$result = null;
+
+		if (method_exists($this->db, $name))
+		{
+			$result = $this->db->{$name}(...$params);
+		}
+
+		return $result;
+	}
+
+	// endregion
+
+	// region Deprecated
+
+	/**
+	 * 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;
+	}
+
+	// endregion
+}
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 024daf1..996f4b0 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -1,58 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use Psr\Log\LoggerInterface;
+use ReflectionException;
+use Throwable;
 
 /**
  * Class BaseCommand
- *
- * @property $group
- * @property $name
- * @property $description
- *
- * @package CodeIgniter\CLI
  */
 abstract class BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -99,15 +66,15 @@
 	/**
 	 * The Logger to use for a command
 	 *
-	 * @var \Psr\Log\LoggerInterface
+	 * @var LoggerInterface
 	 */
 	protected $logger;
 
 	/**
-	 * Instance of the CommandRunner controller
-	 * so commands can call other commands.
+	 * Instance of Commands so
+	 * commands can call other commands.
 	 *
-	 * @var \CodeIgniter\CLI\Commands
+	 * @var Commands
 	 */
 	protected $commands;
 
@@ -116,8 +83,8 @@
 	/**
 	 * BaseCommand constructor.
 	 *
-	 * @param \Psr\Log\LoggerInterface  $logger
-	 * @param \CodeIgniter\CLI\Commands $commands
+	 * @param LoggerInterface $logger
+	 * @param Commands        $commands
 	 */
 	public function __construct(LoggerInterface $logger, Commands $commands)
 	{
@@ -144,31 +111,126 @@
 	 * @param array  $params
 	 *
 	 * @return mixed
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	protected function call(string $command, array $params = [])
 	{
-		// The CommandRunner will grab the first element
-		// for the command name.
-		array_unshift($params, $command);
-
 		return $this->commands->run($command, $params);
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * A simple method to display an error with line/file,
-	 * in child commands.
+	 * A simple method to display an error with line/file, in child commands.
 	 *
-	 * @param \Exception $e
+	 * @param Throwable $e
 	 */
-	protected function showError(\Exception $e)
+	protected function showError(Throwable $e)
 	{
-		CLI::newLine();
-		CLI::error($e->getMessage());
-		CLI::write($e->getFile() . ' - ' . $e->getLine());
-		CLI::newLine();
+		$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 as $key => $value)
+		{
+			$max = max($max, strlen($key));
+		}
+		return $max + $pad;
 	}
 
 	//--------------------------------------------------------------------
@@ -203,67 +265,4 @@
 	{
 		return isset($this->$key);
 	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * show Help include (usage,arguments,description,options)
-	 */
-	public function showHelp()
-	{
-		// 4 spaces instead of tab
-		$tab = '   ';
-		CLI::write(lang('CLI.helpDescription'), 'yellow');
-		CLI::write($tab . $this->description);
-		CLI::newLine();
-
-		CLI::write(lang('CLI.helpUsage'), 'yellow');
-		$usage = empty($this->usage) ? $this->name . ' [arguments]' : $this->usage;
-		CLI::write($tab . $usage);
-		CLI::newLine();
-
-		$pad = max($this->getPad($this->options, 6), $this->getPad($this->arguments, 6));
-
-		if (! empty($this->arguments))
-		{
-			CLI::write(lang('CLI.helpArguments'), 'yellow');
-			foreach ($this->arguments as $argument => $description)
-			{
-				CLI::write($tab . CLI::color(str_pad($argument, $pad), 'green') . $description, 'yellow');
-			}
-			CLI::newLine();
-		}
-
-		if (! empty($this->options))
-		{
-			CLI::write(lang('CLI.helpOptions'), 'yellow');
-			foreach ($this->options as $option => $description)
-			{
-				CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
-			}
-			CLI::newLine();
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get pad for $key => $value array output
-	 *
-	 * @param array   $array
-	 * @param integer $pad
-	 *
-	 * @return integer
-	 */
-	public function getPad(array $array, int $pad): int
-	{
-		$max = 0;
-		foreach ($array as $key => $value)
-		{
-			$max = max($max, strlen($key));
-		}
-		return $max + $pad;
-	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 4b6d3d2..4334d2b 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -1,45 +1,19 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CLI\Exceptions\CLIException;
+use Config\Services;
+use Throwable;
 
 /**
  * Set of static methods useful for CLI request handling.
@@ -58,12 +32,9 @@
  * The wait() method is mostly testable, as long as you don't give it
  * an argument of "0".
  * These have been flagged to ignore for code coverage purposes.
- *
- * @package CodeIgniter\CLI
  */
 class CLI
 {
-
 	/**
 	 * Is the readline library on the system?
 	 *
@@ -143,21 +114,21 @@
 	 * output was a "write" or a "print" to
 	 * keep the output clean and as expected.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected static $lastWrite;
 
 	/**
 	 * Height of the CLI window
 	 *
-	 * @var integer
+	 * @var integer|null
 	 */
 	protected static $height;
 
 	/**
 	 * Width of the CLI window
 	 *
-	 * @var integer
+	 * @var integer|null
 	 */
 	protected static $width;
 
@@ -257,37 +228,38 @@
 	 */
 	public static function prompt(string $field, $options = null, string $validation = null): string
 	{
-		$extra_output = '';
-		$default      = '';
+		$extraOutput = '';
+		$default     = '';
 
 		if (is_string($options))
 		{
-			$extra_output = ' [' . static::color($options, 'white') . ']';
-			$default      = $options;
+			$extraOutput = ' [' . static::color($options, 'white') . ']';
+			$default     = $options;
 		}
 
 		if (is_array($options) && $options)
 		{
-			$opts                 = $options;
-			$extra_output_default = static::color($opts[0], 'white');
+			$opts               = $options;
+			$extraOutputDefault = static::color($opts[0], 'white');
 
 			unset($opts[0]);
 
 			if (empty($opts))
 			{
-				$extra_output = $extra_output_default;
+				$extraOutput = $extraOutputDefault;
 			}
 			else
 			{
-				$extra_output = ' [' . $extra_output_default . ', ' . implode(', ', $opts) . ']';
-				$validation  .= '|in_list[' . implode(',', $options) . ']';
-				$validation   = trim($validation, '|');
+				$extraOutput = ' [' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
+				$validation .= '|in_list[' . implode(',', $options) . ']';
+
+				$validation = trim($validation, '|');
 			}
 
 			$default = $options[0];
 		}
 
-		static::fwrite(STDOUT, $field . $extra_output . ': ');
+		static::fwrite(STDOUT, $field . $extraOutput . ': ');
 
 		// Read the input from keyboard.
 		$input = trim(static::input()) ?: $default;
@@ -320,7 +292,7 @@
 	{
 		$label      = $field;
 		$field      = 'temp';
-		$validation = \Config\Services::validation(null, false);
+		$validation = Services::validation(null, false);
 		$validation->setRule($field, $label, $rules);
 		$validation->run([$field => $value]);
 
@@ -384,9 +356,9 @@
 	/**
 	 * Outputs an error to the CLI using STDERR instead of STDOUT
 	 *
-	 * @param string|array $text       The text to output, or array of errors
-	 * @param string       $foreground
-	 * @param string       $background
+	 * @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)
 	{
@@ -609,7 +581,7 @@
 
 		$string = strtr($string, ["\033[4m" => '', "\033[0m" => '']);
 
-		return mb_strlen($string);
+		return mb_strwidth($string);
 	}
 
 	//--------------------------------------------------------------------
@@ -726,50 +698,63 @@
 	 */
 	public static function generateDimensions()
 	{
-		if (static::isWindows())
+		try
 		{
-			// 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'))
+			if (static::isWindows())
 			{
-				static::$height = (int) exec('tput lines');
-				static::$width  = (int) exec('tput cols');
-			}
-			else
-			{
-				$return = -1;
-				$output = [];
-				exec('mode CON', $output, $return);
-
-				if ($return === 0 && $output)
+				// 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'))
 				{
-					// Look for the next lines ending in ": <number>"
-					// Searching for "Columns:" or "Lines:" will fail on non-English locales
-					if (preg_match('/:\s*(\d+)\n[^:]+:\s*(\d+)\n/', implode("\n", $output), $matches))
+					static::$height = (int) exec('tput lines');
+					static::$width  = (int) exec('tput cols');
+				}
+				else
+				{
+					$return = -1;
+					$output = [];
+					exec('mode CON', $output, $return);
+
+					if ($return === 0 && $output)
 					{
-						static::$height = (int) $matches[1];
-						static::$width  = (int) $matches[2];
+						// Look for the next lines ending in ": <number>"
+						// Searching for "Columns:" or "Lines:" will fail on non-English locales
+						if (preg_match('/:\s*(\d+)\n[^:]+:\s*(\d+)\n/', implode("\n", $output), $matches))
+						{
+							static::$height = (int) $matches[1];
+							static::$width  = (int) $matches[2];
+						}
 					}
 				}
-			}
-			// @codeCoverageIgnoreEnd
-		}
-		else
-		{
-			if (($size = exec('stty size')) && preg_match('/(\d+)\s+(\d+)/', $size, $matches))
-			{
-				static::$height = (int) $matches[1];
-				static::$width  = (int) $matches[2];
+				// @codeCoverageIgnoreEnd
 			}
 			else
 			{
-				// @codeCoverageIgnoreStart
-				static::$height = (int) exec('tput lines');
-				static::$width  = (int) exec('tput cols');
-				// @codeCoverageIgnoreEnd
+				if (($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
 	}
 
 	//--------------------------------------------------------------------
@@ -798,7 +783,7 @@
 			$thisStep   = abs($thisStep);
 			$totalSteps = $totalSteps < 1 ? 1 : $totalSteps;
 
-			$percent = intval(($thisStep / $totalSteps) * 100);
+			$percent = (int) (($thisStep / $totalSteps) * 100);
 			$step    = (int) round($percent / 10);
 
 			// Write the progress bar
@@ -825,11 +810,11 @@
 	 *
 	 * @param string  $string
 	 * @param integer $max
-	 * @param integer $pad_left
+	 * @param integer $padLeft
 	 *
 	 * @return string
 	 */
-	public static function wrap(string $string = null, int $max = 0, int $pad_left = 0): string
+	public static function wrap(string $string = null, int $max = 0, int $padLeft = 0): string
 	{
 		if (empty($string))
 		{
@@ -846,20 +831,20 @@
 			$max = CLI::getWidth();
 		}
 
-		$max = $max - $pad_left;
+		$max = $max - $padLeft;
 
 		$lines = wordwrap($string, $max, PHP_EOL);
 
-		if ($pad_left > 0)
+		if ($padLeft > 0)
 		{
 			$lines = explode(PHP_EOL, $lines);
 
 			$first = true;
 
-			array_walk($lines, function (&$line, $index) use ($pad_left, &$first) {
+			array_walk($lines, function (&$line, $index) use ($padLeft, &$first) {
 				if (! $first)
 				{
-					$line = str_repeat(' ', $pad_left) . $line;
+					$line = str_repeat(' ', $padLeft) . $line;
 				}
 				else
 				{
@@ -881,32 +866,41 @@
 	/**
 	 * Parses the command line it was called from and collects all
 	 * options and valid segments.
-	 *
-	 * I tried to use getopt but had it fail occasionally to find any
-	 * options but argc has always had our back. We don't have all of the power
-	 * of getopt but this does us just fine.
 	 */
 	protected static function parseCommandLine()
 	{
-		// start picking segments off from #1, ignoring the invoking program
-		for ($i = 1; $i < $_SERVER['argc']; $i ++)
+		$args = $_SERVER['argv'] ?? [];
+		array_shift($args); // scrap invoking program
+		$optionValue = false;
+
+		foreach ($args as $i => $arg)
 		{
-			// If there's no '-' at the beginning of the argument
-			// then add it to our segments.
-			if (mb_strpos($_SERVER['argv'][$i], '-') !== 0)
+			// If there's no "-" at the beginning, then
+			// this is probably an argument or an option value
+			if (mb_strpos($arg, '-') !== 0)
 			{
-				static::$segments[] = $_SERVER['argv'][$i];
+				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   = str_replace('-', '', $_SERVER['argv'][$i]);
+			$arg   = ltrim($arg, '-');
 			$value = null;
 
-			// if there is a following segment, and it doesn't start with a dash, it's a value.
-			if (isset($_SERVER['argv'][$i + 1]) && mb_strpos($_SERVER['argv'][$i + 1], '-') !== 0)
+			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
 			{
-				$value = $_SERVER['argv'][$i + 1];
-				$i ++;
+				$value       = $args[$i + 1];
+				$optionValue = true;
 			}
 
 			static::$options[$arg] = $value;
@@ -938,6 +932,8 @@
 	 *  // 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
@@ -1006,9 +1002,12 @@
 	 * 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(): string
+	public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
 	{
 		if (empty(static::$options))
 		{
@@ -1019,17 +1018,28 @@
 
 		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)
 			{
-				$value = '"' . $value . '"';
+				$out .= '"' . $value . '" ';
 			}
-
-			$out .= "-{$name} $value ";
+			elseif ($value !== null)
+			{
+				$out .= "{$value} ";
+			}
 		}
 
-		return $out;
+		return $trim ? trim($out) : $out;
 	}
 
 	//--------------------------------------------------------------------
@@ -1045,45 +1055,45 @@
 	public static function table(array $tbody, array $thead = [])
 	{
 		// All the rows in the table will be here until the end
-		$table_rows = [];
+		$tableRows = [];
 
 		// We need only indexes and not keys
 		if (! empty($thead))
 		{
-			$table_rows[] = array_values($thead);
+			$tableRows[] = array_values($thead);
 		}
 
 		foreach ($tbody as $tr)
 		{
-			$table_rows[] = array_values($tr);
+			$tableRows[] = array_values($tr);
 		}
 
 		// Yes, it really is necessary to know this count
-		$total_rows = count($table_rows);
+		$totalRows = count($tableRows);
 
 		// Store all columns lengths
 		// $all_cols_lengths[row][column] = length
-		$all_cols_lengths = [];
+		$allColsLengths = [];
 
 		// Store maximum lengths by column
 		// $max_cols_lengths[column] = length
-		$max_cols_lengths = [];
+		$maxColsLengths = [];
 
 		// Read row by row and define the longest columns
-		for ($row = 0; $row < $total_rows; $row ++)
+		for ($row = 0; $row < $totalRows; $row ++)
 		{
 			$column = 0; // Current column index
-			foreach ($table_rows[$row] as $col)
+			foreach ($tableRows[$row] as $col)
 			{
 				// Sets the size of this column in the current row
-				$all_cols_lengths[$row][$column] = static::strlen($col);
+				$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($max_cols_lengths[$column]) || $all_cols_lengths[$row][$column] > $max_cols_lengths[$column])
+				if (! isset($maxColsLengths[$column]) || $allColsLengths[$row][$column] > $maxColsLengths[$column])
 				{
-					$max_cols_lengths[$column] = $all_cols_lengths[$row][$column];
+					$maxColsLengths[$column] = $allColsLengths[$row][$column];
 				}
 
 				// We can go check the size of the next column...
@@ -1093,15 +1103,15 @@
 
 		// Read row by row and add spaces at the end of the columns
 		// to match the exact column length
-		for ($row = 0; $row < $total_rows; $row ++)
+		for ($row = 0; $row < $totalRows; $row ++)
 		{
 			$column = 0;
-			foreach ($table_rows[$row] as $col)
+			foreach ($tableRows[$row] as $col)
 			{
-				$diff = $max_cols_lengths[$column] - static::strlen($col);
+				$diff = $maxColsLengths[$column] - static::strlen($col);
 				if ($diff)
 				{
-					$table_rows[$row][$column] = $table_rows[$row][$column] . str_repeat(' ', $diff);
+					$tableRows[$row][$column] = $tableRows[$row][$column] . str_repeat(' ', $diff);
 				}
 				$column ++;
 			}
@@ -1110,13 +1120,13 @@
 		$table = '';
 
 		// Joins columns and append the well formatted rows to the table
-		for ($row = 0; $row < $total_rows; $row ++)
+		for ($row = 0; $row < $totalRows; $row ++)
 		{
 			// Set the table border-top
 			if ($row === 0)
 			{
 				$cols = '+';
-				foreach ($table_rows[$row] as $col)
+				foreach ($tableRows[$row] as $col)
 				{
 					$cols .= str_repeat('-', static::strlen($col) + 2) . '+';
 				}
@@ -1124,10 +1134,10 @@
 			}
 
 			// Set the columns borders
-			$table .= '| ' . implode(' | ', $table_rows[$row]) . ' |' . PHP_EOL;
+			$table .= '| ' . implode(' | ', $tableRows[$row]) . ' |' . PHP_EOL;
 
 			// Set the thead and table borders-bottom
-			if ($row === 0 && ! empty($thead) || $row + 1 === $total_rows)
+			if (isset($cols) && ($row === 0 && ! empty($thead) || $row + 1 === $totalRows))
 			{
 				$table .= $cols . PHP_EOL;
 			}
@@ -1148,18 +1158,20 @@
 	 *
 	 * @param resource $handle
 	 * @param string   $string
+	 *
+	 * @return void
 	 */
 	protected static function fwrite($handle, string $string)
 	{
-		if (is_cli())
+		if (! is_cli())
 		{
-			fwrite($handle, $string);
+			// @codeCoverageIgnoreStart
+			echo $string;
 			return;
+			// @codeCoverageIgnoreEnd
 		}
 
-		// @codeCoverageIgnoreStart
-		echo $string;
-		// @codeCoverageIgnoreEnd
+		fwrite($handle, $string);
 	}
 }
 
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index 466ef33..05763dd 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -1,52 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Controller;
+use Config\Services;
+use ReflectionException;
 
 /**
  * Command runner
  */
 class CommandRunner extends Controller
 {
-
 	/**
 	 * The Command Manager
 	 *
@@ -61,7 +34,7 @@
 	 */
 	public function __construct()
 	{
-		$this->commands = service('commands');
+		$this->commands = Services::commands();
 	}
 
 	/**
@@ -72,7 +45,7 @@
 	 * @param array  ...$params
 	 *
 	 * @return mixed
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function _remap($method, ...$params)
 	{
@@ -93,7 +66,7 @@
 	 * @param array $params
 	 *
 	 * @return mixed
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function index(array $params)
 	{
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index cb6d8fd..d3ce7f6 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -1,53 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Log\Logger;
 use Config\Services;
+use ReflectionClass;
+use ReflectionException;
 
 /**
  * Class Commands
  *
  * Core functionality for running, listing, etc commands.
- *
- * @package CodeIgniter\CLI
  */
 class Commands
 {
@@ -68,11 +40,11 @@
 	/**
 	 * Constructor
 	 *
-	 * @param \CodeIgniter\Log\Logger|null $logger
+	 * @param Logger|null $logger
 	 */
 	public function __construct($logger = null)
 	{
-		$this->logger = $logger ?? service('logger');
+		$this->logger = $logger ?? Services::logger();
 	}
 
 	/**
@@ -85,10 +57,8 @@
 	{
 		$this->discoverCommands();
 
-		if (! isset($this->commands[$command]))
+		if (! $this->verifyCommand($command, $this->commands))
 		{
-			CLI::error(lang('CLI.commandNotFound', [$command]));
-			CLI::newLine();
 			return;
 		}
 
@@ -147,7 +117,7 @@
 
 			try
 			{
-				$class = new \ReflectionClass($className);
+				$class = new ReflectionClass($className);
 
 				if (! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class))
 				{
@@ -157,7 +127,7 @@
 				$class = new $className($this->logger, $this);
 
 				// Store it!
-				if ($class->group !== null)
+				if (! is_null($class->group))
 				{
 					$this->commands[$class->name] = [
 						'class'       => $className,
@@ -170,7 +140,7 @@
 				$class = null;
 				unset($class);
 			}
-			catch (\ReflectionException $e)
+			catch (ReflectionException $e)
 			{
 				$this->logger->error($e->getMessage());
 			}
@@ -178,4 +148,70 @@
 
 		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 ($collection as $commandName => $attributes)
+		{
+			$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 cf50384..c998de4 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -1,52 +1,27 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CodeIgniter;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
+use Exception;
 
 /**
  * Console
  */
 class Console
 {
-
 	/**
 	 * Main CodeIgniter instance.
 	 *
@@ -59,7 +34,7 @@
 	/**
 	 * Console constructor.
 	 *
-	 * @param \CodeIgniter\CodeIgniter $app
+	 * @param CodeIgniter $app
 	 */
 	public function __construct(CodeIgniter $app)
 	{
@@ -73,8 +48,8 @@
 	 *
 	 * @param boolean $useSafeOutput
 	 *
-	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
-	 * @throws \Exception
+	 * @return RequestInterface|Response|ResponseInterface|mixed
+	 * @throws Exception
 	 */
 	public function run(bool $useSafeOutput = false)
 	{
@@ -93,14 +68,7 @@
 	 */
 	public function showHeader()
 	{
-		CLI::newLine(1);
-
-		CLI::write(CLI::color('CodeIgniter CLI Tool', 'green')
-				. ' - Version ' . CodeIgniter::CI_VERSION
-				. ' - Server-Time: ' . date('Y-m-d H:i:sa'));
-
-		CLI::newLine(1);
+		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 474064e..2a0373d 100644
--- a/system/CLI/Exceptions/CLIException.php
+++ b/system/CLI/Exceptions/CLIException.php
@@ -1,49 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI\Exceptions;
 
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use RuntimeException;
+
 /**
  * CLIException
  */
-class CLIException extends \RuntimeException
+class CLIException extends RuntimeException
 {
+	use DebugTraceableTrait;
+
 	/**
 	 * Thrown when `$color` specified for `$type` is not within the
 	 * allowed list of colors.
@@ -51,7 +28,7 @@
 	 * @param string $type
 	 * @param string $color
 	 *
-	 * @return \CodeIgniter\CLI\Exceptions\CLIException
+	 * @return CLIException
 	 */
 	public static function forInvalidColor(string $type, string $color)
 	{
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
new file mode 100644
index 0000000..df484d8
--- /dev/null
+++ b/system/CLI/GeneratorTrait.php
@@ -0,0 +1,370 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\CLI;
+
+use Config\Services;
+use Throwable;
+
+/**
+ * GeneratorTrait contains a collection of methods
+ * to build the commands that generates a file.
+ */
+trait GeneratorTrait
+{
+	/**
+	 * Component Name
+	 *
+	 * @var string
+	 */
+	protected $component;
+
+	/**
+	 * File directory
+	 *
+	 * @var string
+	 */
+	protected $directory;
+
+	/**
+	 * View template name
+	 *
+	 * @var string
+	 */
+	protected $template;
+
+	/**
+	 * Whether to require class name.
+	 *
+	 * @internal
+	 *
+	 * @var boolean
+	 */
+	private $hasClassName = true;
+
+	/**
+	 * Whether to sort class imports.
+	 *
+	 * @internal
+	 *
+	 * @var boolean
+	 */
+	private $sortImports = 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
+			$class = CLI::prompt(lang('CLI.generator.className'), null, 'required');
+			CLI::newLine();
+			// @codeCoverageIgnoreEnd
+		}
+
+		helper('inflector');
+
+		$component = strtolower(singular($this->component));
+		$class     = strtolower($class);
+		$class     = strpos($class, $component) !== false ? str_replace($component, ucfirst($component), $class) : $class;
+
+		if ($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)), '\\');
+
+		array_push($search, '<@php', '{namespace}', '{class}');
+		array_push($replace, '<?php', $namespace, 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))
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error(lang('CLI.namespaceNotDefined', [$namespace]), 'light_gray', 'red');
+			CLI::newLine();
+
+			return '';
+			// @codeCoverageIgnoreEnd
+		}
+
+		$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;
+	}
+
+	/**
+	 * 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];
+	}
+}
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index c3501ec..e779613 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -1,66 +1,37 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
 
 use CodeIgniter\Cache\Exceptions\CacheException;
 use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
 
 /**
  * Class Cache
  *
  * A factory for loading the desired
- *
- * @package CodeIgniter\Cache
  */
 class CacheFactory
 {
 	/**
 	 * Attempts to create the desired cache handler, based upon the
 	 *
-	 * @param \Config\Cache $config
-	 * @param string|null   $handler
-	 * @param string|null   $backup
+	 * @param Cache       $config
+	 * @param string|null $handler
+	 * @param string|null $backup
 	 *
-	 * @return \CodeIgniter\Cache\CacheInterface
+	 * @return CacheInterface
 	 */
-	public static function getHandler($config, string $handler = null, string $backup = null)
+	public static function getHandler(Cache $config, string $handler = null, string $backup = null)
 	{
 		if (! isset($config->validHandlers) || ! is_array($config->validHandlers))
 		{
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
index 108c63d..a632b8d 100644
--- a/system/Cache/CacheInterface.php
+++ b/system/Cache/CacheInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
@@ -44,7 +16,6 @@
  */
 interface CacheInterface
 {
-
 	/**
 	 * Takes care of any handler-specific setup that must be done.
 	 */
diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php
index a99e3d4..6186cc2 100644
--- a/system/Cache/Exceptions/CacheException.php
+++ b/system/Cache/Exceptions/CacheException.php
@@ -1,54 +1,32 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
 
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use RuntimeException;
+
 /**
  * CacheException
  */
-class CacheException extends \RuntimeException implements ExceptionInterface
+class CacheException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
+
 	/**
 	 * Thrown when handler has no permission to write cache.
 	 *
 	 * @param string $path
 	 *
-	 * @return \CodeIgniter\Cache\Exceptions\CacheException
+	 * @return CacheException
 	 */
 	public static function forUnableToWrite(string $path)
 	{
@@ -58,7 +36,7 @@
 	/**
 	 * Thrown when an unrecognized handler is used.
 	 *
-	 * @return \CodeIgniter\Cache\Exceptions\CacheException
+	 * @return CacheException
 	 */
 	public static function forInvalidHandlers()
 	{
@@ -68,7 +46,7 @@
 	/**
 	 * Thrown when no backup handler is setup in config.
 	 *
-	 * @return \CodeIgniter\Cache\Exceptions\CacheException
+	 * @return CacheException
 	 */
 	public static function forNoBackup()
 	{
@@ -78,7 +56,7 @@
 	/**
 	 * Thrown when specified handler was not found.
 	 *
-	 * @return \CodeIgniter\Cache\Exceptions\CacheException
+	 * @return CacheException
 	 */
 	public static function forHandlerNotFound()
 	{
diff --git a/system/Cache/Exceptions/ExceptionInterface.php b/system/Cache/Exceptions/ExceptionInterface.php
index dffc67c..6a271d1 100644
--- a/system/Cache/Exceptions/ExceptionInterface.php
+++ b/system/Cache/Exceptions/ExceptionInterface.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
new file mode 100644
index 0000000..10c2b3e
--- /dev/null
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use Closure;
+use CodeIgniter\Cache\CacheInterface;
+
+/**
+ * Base class for cache handling
+ */
+abstract class BaseHandler implements CacheInterface
+{
+	/**
+	 * 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;
+	}
+}
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index fd97c29..b888a98 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -1,51 +1,23 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
+use Closure;
 
 /**
  * Dummy cache handler
  */
-class DummyHandler implements CacheInterface
+class DummyHandler extends BaseHandler
 {
-
 	/**
 	 * Takes care of any handler-specific setup that must be done.
 	 */
@@ -71,6 +43,22 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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)
+	{
+		return null;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
 	 * Saves an item to the cache store.
 	 *
 	 * @param string  $key   Cache item name
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 8bccc53..e1cb24c 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -1,53 +1,24 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Cache\Exceptions\CacheException;
+use Config\Cache;
 
 /**
  * File system cache handler
  */
-class FileHandler implements CacheInterface
+class FileHandler extends BaseHandler
 {
-
 	/**
 	 * Prefixed to all cache names.
 	 *
@@ -62,24 +33,44 @@
 	 */
 	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  \Config\Cache $config
+	 * @param  Cache $config
 	 * @throws CacheException
 	 */
-	public function __construct($config)
+	public function __construct(Cache $config)
 	{
-		$path = ! empty($config->storePath) ? $config->storePath : WRITEPATH . 'cache';
-		if (! is_really_writable($path))
+		if (! property_exists($config, 'file'))
 		{
-			throw CacheException::forUnableToWrite($path);
+			$config->file = [
+				'storePath' => $config->storePath ?? WRITEPATH . 'cache',
+				'mode'      => 0640,
+			];
 		}
 
-		$this->prefix = $config->prefix ?: '';
-		$this->path   = rtrim($path, '/') . '/';
+		$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 = (string) $config->prefix;
 	}
 
 	//--------------------------------------------------------------------
@@ -133,7 +124,7 @@
 
 		if ($this->writeFile($this->path . $key, serialize($contents)))
 		{
-			chmod($this->path . $key, 0640);
+			chmod($this->path . $key, $this->mode);
 
 			return true;
 		}
@@ -185,9 +176,9 @@
 			return false;
 		}
 
-		$new_value = $data['data'] + $offset;
+		$newValue = $data['data'] + $offset;
 
-		return $this->save($key, $new_value, $data['ttl']) ? $new_value : false;
+		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
 	}
 
 	//--------------------------------------------------------------------
@@ -218,9 +209,9 @@
 			return false;
 		}
 
-		$new_value = $data['data'] - $offset;
+		$newValue = $data['data'] - $offset;
 
-		return $this->save($key, $new_value, $data['ttl']) ? $new_value : false;
+		return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
 	}
 
 	//--------------------------------------------------------------------
@@ -320,6 +311,7 @@
 
 		$data = unserialize(file_get_contents($this->path . $key));
 
+		// @phpstan-ignore-next-line
 		if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl'])
 		{
 			// If the file is still there then remove it
@@ -381,30 +373,30 @@
 	 * 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 $del_dir 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)
+	 * @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 $del_dir = false, bool $htdocs = false, int $_level = 0): bool
+	protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs = false, int $_level = 0): bool
 	{
 		// Trim the trailing slash
 		$path = rtrim($path, '/\\');
 
-		if (! $current_dir = @opendir($path))
+		if (! $currentDir = @opendir($path))
 		{
 			return false;
 		}
 
-		while (false !== ($filename = @readdir($current_dir)))
+		while (false !== ($filename = @readdir($currentDir)))
 		{
 			if ($filename !== '.' && $filename !== '..')
 			{
 				if (is_dir($path . DIRECTORY_SEPARATOR . $filename) && $filename[0] !== '.')
 				{
-					$this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $del_dir, $htdocs, $_level + 1);
+					$this->deleteFiles($path . DIRECTORY_SEPARATOR . $filename, $delDir, $htdocs, $_level + 1);
 				}
 				elseif ($htdocs !== true || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
 				{
@@ -413,9 +405,9 @@
 			}
 		}
 
-		closedir($current_dir);
+		closedir($currentDir);
 
-		return ($del_dir === true && $_level > 0) ? @rmdir($path) : true;
+		return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
 	}
 
 	//--------------------------------------------------------------------
@@ -428,37 +420,37 @@
 	 *
 	 * Any sub-folders contained within the specified path are read as well.
 	 *
-	 * @param string  $source_dir     Path to source
-	 * @param boolean $top_level_only Look only at the top level directory specified?
-	 * @param boolean $_recursion     Internal variable to determine recursion status - do not use in calls
+	 * @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 $source_dir, bool $top_level_only = true, bool $_recursion = false)
+	protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true, bool $_recursion = false)
 	{
 		static $_filedata = [];
-		$relative_path    = $source_dir;
+		$relativePath     = $sourceDir;
 
-		if ($fp = @opendir($source_dir))
+		if ($fp = @opendir($sourceDir))
 		{
 			// reset the array and make sure $source_dir has a trailing slash on the initial call
 			if ($_recursion === false)
 			{
-				$_filedata  = [];
-				$source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+				$_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($source_dir . $file) && $file[0] !== '.' && $top_level_only === false)
+				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
 				{
-					$this->getDirFileInfo($source_dir . $file . DIRECTORY_SEPARATOR, $top_level_only, true);
+					$this->getDirFileInfo($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
 				}
 				elseif ($file[0] !== '.')
 				{
-					$_filedata[$file]                  = $this->getFileInfo($source_dir . $file);
-					$_filedata[$file]['relative_path'] = $relative_path;
+					$_filedata[$file]                  = $this->getFileInfo($sourceDir . $file);
+					$_filedata[$file]['relative_path'] = $relativePath;
 				}
 			}
 
@@ -480,24 +472,24 @@
 	 * 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  $returned_values Array or comma separated string of information returned
+	 * @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, $returned_values = ['name', 'server_path', 'size', 'date'])
+	protected function getFileInfo(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
 	{
 		if (! is_file($file))
 		{
 			return false;
 		}
 
-		if (is_string($returned_values))
+		if (is_string($returnedValues))
 		{
-			$returned_values = explode(',', $returned_values);
+			$returnedValues = explode(',', $returnedValues);
 		}
 
-		foreach ($returned_values as $key)
+		foreach ($returnedValues as $key)
 		{
 			switch ($key)
 			{
@@ -528,7 +520,7 @@
 			}
 		}
 
-		return $fileInfo;
+		return $fileInfo; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index b729a20..ea1a9e3 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -1,52 +1,27 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Exception;
+use Memcache;
+use Memcached;
 
 /**
  * Mamcached cache handler
  */
-class MemcachedHandler implements CacheInterface
+class MemcachedHandler extends BaseHandler
 {
-
 	/**
 	 * Prefixed to all cache names.
 	 *
@@ -57,7 +32,7 @@
 	/**
 	 * The memcached object
 	 *
-	 * @var \Memcached|\Memcache
+	 * @var Memcached|Memcache
 	 */
 	protected $memcached;
 
@@ -78,11 +53,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 */
-	public function __construct($config)
+	public function __construct(Cache $config)
 	{
-		$this->prefix = $config->prefix ?: '';
+		$this->prefix = (string) $config->prefix;
 
 		if (! empty($config))
 		{
@@ -97,11 +72,11 @@
 	 */
 	public function __destruct()
 	{
-		if ($this->memcached instanceof \Memcached)
+		if ($this->memcached instanceof Memcached)
 		{
 			$this->memcached->quit();
 		}
-		elseif ($this->memcached instanceof \Memcache)
+		elseif ($this->memcached instanceof Memcache)
 		{
 			$this->memcached->close();
 		}
@@ -118,13 +93,13 @@
 		// so that the CacheFactory can attempt to initiate the next cache handler.
 		try
 		{
-			if (class_exists('\Memcached'))
+			if (class_exists(Memcached::class))
 			{
-				// Create new instance of \Memcached
-				$this->memcached = new \Memcached();
+				// Create new instance of Memcached
+				$this->memcached = new Memcached();
 				if ($this->config['raw'])
 				{
-					$this->memcached->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
+					$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true);
 				}
 
 				// Add server
@@ -142,18 +117,18 @@
 					throw new CriticalError('Cache: Memcached connection failed.');
 				}
 			}
-			elseif (class_exists('\Memcache'))
+			elseif (class_exists(Memcache::class))
 			{
-				// Create new instance of \Memcache
-				$this->memcached = new \Memcache();
+				// Create new instance of Memcache
+				$this->memcached = new Memcache();
 
 				// Check if we can connect to the server
-				$can_connect = $this->memcached->connect(
+				$canConnect = $this->memcached->connect(
 					$this->config['host'], $this->config['port']
 				);
 
 				// If we can't connect, throw a CriticalError exception
-				if ($can_connect === false)
+				if ($canConnect === false)
 				{
 					throw new CriticalError('Cache: Memcache connection failed.');
 				}
@@ -173,7 +148,7 @@
 			// If a CriticalError exception occurs, throw it up.
 			throw $e;
 		}
-		catch (\Exception $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() . ').');
@@ -193,20 +168,20 @@
 	{
 		$key = $this->prefix . $key;
 
-		if ($this->memcached instanceof \Memcached)
+		if ($this->memcached instanceof Memcached)
 		{
 			$data = $this->memcached->get($key);
 
 			// check for unmatched key
-			if ($this->memcached->getResultCode() === \Memcached::RES_NOTFOUND)
+			if ($this->memcached->getResultCode() === Memcached::RES_NOTFOUND)
 			{
 				return null;
 			}
 		}
-		elseif ($this->memcached instanceof \Memcache)
+		elseif ($this->memcached instanceof Memcache)
 		{
 			$flags = false;
-			$data  = $this->memcached->get($key, $flags);
+			$data  = $this->memcached->get($key, $flags); // @phpstan-ignore-line
 
 			// check for unmatched key (i.e. $flags is untouched)
 			if ($flags === false)
@@ -215,7 +190,7 @@
 			}
 		}
 
-		return is_array($data) ? $data[0] : $data;
+		return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -242,16 +217,17 @@
 			];
 		}
 
-		if ($this->memcached instanceof \Memcached)
+		if ($this->memcached instanceof Memcached)
 		{
 			return $this->memcached->set($key, $value, $ttl);
 		}
 
-		if ($this->memcached instanceof \Memcache)
+		if ($this->memcached instanceof Memcache)
 		{
 			return $this->memcached->set($key, $value, 0, $ttl);
 		}
 
+		// @phpstan-ignore-next-line
 		return false;
 	}
 
@@ -290,6 +266,7 @@
 
 		$key = $this->prefix . $key;
 
+		// @phpstan-ignore-next-line
 		return $this->memcached->increment($key, $offset, $offset, 60);
 	}
 
@@ -313,6 +290,7 @@
 		$key = $this->prefix . $key;
 
 		//FIXME: third parameter isn't other handler actions.
+		// @phpstan-ignore-next-line
 		return $this->memcached->decrement($key, $offset, $offset, 60);
 	}
 
@@ -384,5 +362,4 @@
 	{
 		return (extension_loaded('memcached') || extension_loaded('memcache'));
 	}
-
 }
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index bdfcea0..145d560 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -1,52 +1,26 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Exception;
+use Predis\Client;
 
 /**
  * Predis cache handler
  */
-class PredisHandler implements CacheInterface
+class PredisHandler extends BaseHandler
 {
-
 	/**
 	 * Prefixed to all cache names.
 	 *
@@ -70,7 +44,7 @@
 	/**
 	 * Predis connection
 	 *
-	 * @var \Predis\Client
+	 * @var Client
 	 */
 	protected $redis;
 
@@ -79,11 +53,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 */
-	public function __construct($config)
+	public function __construct(Cache $config)
 	{
-		$this->prefix = $config->prefix ?: '';
+		$this->prefix = (string) $config->prefix;
 
 		if (isset($config->redis))
 		{
@@ -103,12 +77,12 @@
 		try
 		{
 			// Create a new instance of Predis\Client
-			$this->redis = new \Predis\Client($this->config, ['prefix' => $this->prefix]);
+			$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)
+		catch (Exception $e)
 		{
 			// thrown if can't connect to redis server.
 			throw new CriticalError('Cache: Predis connection refused (' . $e->getMessage() . ').');
@@ -167,7 +141,7 @@
 	 */
 	public function save(string $key, $value, int $ttl = 60)
 	{
-		switch ($data_type = gettype($value))
+		switch ($dataType = gettype($value))
 		{
 			case 'array':
 			case 'object':
@@ -184,7 +158,7 @@
 				return false;
 		}
 
-		if (! $this->redis->hmset($key, ['__ci_type' => $data_type, '__ci_value' => $value]))
+		if (! $this->redis->hmset($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
 		{
 			return false;
 		}
@@ -302,5 +276,4 @@
 	{
 		return class_exists('\Predis\Client');
 	}
-
 }
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 639d5f5..a7fdcb9 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -1,53 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Exceptions\CriticalError;
+use Config\Cache;
+use Redis;
+use RedisException;
 
 /**
  * Redis cache handler
  */
-class RedisHandler implements CacheInterface
+class RedisHandler extends BaseHandler
 {
-
 	/**
 	 * Prefixed to all cache names.
 	 *
@@ -71,7 +44,7 @@
 	/**
 	 * Redis connection
 	 *
-	 * @var \Redis
+	 * @var Redis
 	 */
 	protected $redis;
 
@@ -80,11 +53,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 */
-	public function __construct($config)
+	public function __construct(Cache $config)
 	{
-		$this->prefix = $config->prefix ?: '';
+		$this->prefix = (string) $config->prefix;
 
 		if (! empty($config))
 		{
@@ -99,7 +72,7 @@
 	 */
 	public function __destruct()
 	{
-		if ($this->redis)
+		if ($this->redis) // @phpstan-ignore-line
 		{
 			$this->redis->close();
 		}
@@ -114,7 +87,7 @@
 	{
 		$config = $this->config;
 
-		$this->redis = new \Redis();
+		$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.
@@ -142,7 +115,7 @@
 				throw new CriticalError('Cache: Redis select database failed.');
 			}
 		}
-		catch (\RedisException $e)
+		catch (RedisException $e)
 		{
 			// $this->redis->connect() can sometimes throw a RedisException.
 			// We need to convert the exception into a CriticalError exception and throw it.
@@ -202,7 +175,7 @@
 	{
 		$key = $this->prefix . $key;
 
-		switch ($data_type = gettype($value))
+		switch ($dataType = gettype($value))
 		{
 			case 'array':
 			case 'object':
@@ -219,11 +192,12 @@
 				return false;
 		}
 
-		if (! $this->redis->hMSet($key, ['__ci_type' => $data_type, '__ci_value' => $value]))
+		if (! $this->redis->hMSet($key, ['__ci_type' => $dataType, '__ci_value' => $value]))
 		{
 			return false;
 		}
-		elseif ($ttl)
+
+		if ($ttl)
 		{
 			$this->redis->expireAt($key, time() + $ttl);
 		}
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 2adf812..2ad1238 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -1,54 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
 
-use CodeIgniter\Cache\CacheInterface;
+use Config\Cache;
 
 /**
  * Cache handler for WinCache from Microsoft & IIS.
  * Windows-only, so not testable on travis-ci.
  * Unusable methods flagged for code coverage ignoring.
  */
-class WincacheHandler implements CacheInterface
+class WincacheHandler extends BaseHandler
 {
-
 	/**
 	 * Prefixed to all cache names.
 	 *
@@ -61,11 +32,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 */
-	public function __construct($config)
+	public function __construct(Cache $config)
 	{
-		$this->prefix = $config->prefix ?: '';
+		$this->prefix = (string) $config->prefix;
 	}
 
 	//--------------------------------------------------------------------
@@ -159,7 +130,7 @@
 		$success = false;
 		$value   = wincache_ucache_inc($key, $offset, $success);
 
-		return ($success === true) ? $value : false;
+		return ($success === true) ? $value : false; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -181,7 +152,7 @@
 		$success = false;
 		$value   = wincache_ucache_dec($key, $offset, $success);
 
-		return ($success === true) ? $value : false;
+		return ($success === true) ? $value : false; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 5859268..d50f96c 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
@@ -41,19 +14,24 @@
 use Closure;
 use CodeIgniter\Debug\Timer;
 use CodeIgniter\Events\Events;
+use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
-use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\RouteCollectionInterface;
+use Config\App;
 use Config\Cache;
 use Config\Services;
 use Exception;
+use Kint;
+use Kint\Renderer\CliRenderer;
+use Kint\Renderer\RichRenderer;
 
 /**
  * This class is the core of the framework, and will analyse the
@@ -62,11 +40,10 @@
  */
 class CodeIgniter
 {
-
 	/**
 	 * The current version of CodeIgniter Framework
 	 */
-	const CI_VERSION = '4.0.4';
+	const CI_VERSION = '4.0.5';
 
 	/**
 	 * App startup time.
@@ -85,7 +62,7 @@
 	/**
 	 * Main application configuration
 	 *
-	 * @var \Config\App
+	 * @var App
 	 */
 	protected $config;
 
@@ -99,14 +76,14 @@
 	/**
 	 * Current request.
 	 *
-	 * @var HTTP\Request|HTTP\IncomingRequest|CLIRequest
+	 * @var Request|HTTP\IncomingRequest|CLIRequest
 	 */
 	protected $request;
 
 	/**
 	 * Current response.
 	 *
-	 * @var HTTP\ResponseInterface
+	 * @var ResponseInterface
 	 */
 	protected $response;
 
@@ -120,7 +97,7 @@
 	/**
 	 * Controller to use.
 	 *
-	 * @var string|\Closure
+	 * @var string|Closure
 	 */
 	protected $controller;
 
@@ -165,9 +142,9 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param type $config
+	 * @param App $config
 	 */
-	public function __construct($config)
+	public function __construct(App $config)
 	{
 		$this->startTime = microtime(true);
 		$this->config    = $config;
@@ -180,26 +157,33 @@
 	 */
 	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))
+		{
+			// @codeCoverageIgnoreStart
+			$this->resolvePlatformExtensions();
+			// @codeCoverageIgnoreEnd
+		}
+
 		// 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');
 
-		// Define environment variables
-		$this->detectEnvironment();
-		$this->bootstrapEnvironment();
-
-		// Setup Exception Handling
-		Services::exceptions()
-				->initialize();
-
 		$this->initializeKint();
 
 		if (! CI_DEBUG)
 		{
 			// @codeCoverageIgnoreStart
-			\Kint::$enabled_mode = false;
+			Kint::$enabled_mode = false;
 			// @codeCoverageIgnoreEnd
 		}
 	}
@@ -207,6 +191,42 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * Checks system for missing required PHP extensions.
+	 *
+	 * @return void
+	 * @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()
@@ -235,31 +255,31 @@
 		 */
 		$config = config('Config\Kint');
 
-		\Kint::$max_depth           = $config->maxDepth;
-		\Kint::$display_called_from = $config->displayCalledFrom;
-		\Kint::$expanded            = $config->expanded;
+		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;
+			Kint::$plugins = $config->plugins;
 		}
 
-		\Kint\Renderer\RichRenderer::$theme  = $config->richTheme;
-		\Kint\Renderer\RichRenderer::$folder = $config->richFolder;
-		\Kint\Renderer\RichRenderer::$sort   = $config->richSort;
+		RichRenderer::$theme  = $config->richTheme;
+		RichRenderer::$folder = $config->richFolder;
+		RichRenderer::$sort   = $config->richSort;
 		if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins))
 		{
-			\Kint\Renderer\RichRenderer::$object_plugins = $config->richObjectPlugins;
+			RichRenderer::$object_plugins = $config->richObjectPlugins;
 		}
 		if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins))
 		{
-			\Kint\Renderer\RichRenderer::$tab_plugins = $config->richTabPlugins;
+			RichRenderer::$tab_plugins = $config->richTabPlugins;
 		}
 
-		\Kint\Renderer\CliRenderer::$cli_colors         = $config->cliColors;
-		\Kint\Renderer\CliRenderer::$force_utf8         = $config->cliForceUTF8;
-		\Kint\Renderer\CliRenderer::$detect_width       = $config->cliDetectWidth;
-		\Kint\Renderer\CliRenderer::$min_terminal_width = $config->cliMinWidth;
+		CliRenderer::$cli_colors         = $config->cliColors;
+		CliRenderer::$force_utf8         = $config->cliForceUTF8;
+		CliRenderer::$detect_width       = $config->cliDetectWidth;
+		CliRenderer::$min_terminal_width = $config->cliMinWidth;
 	}
 
 	//--------------------------------------------------------------------
@@ -272,12 +292,12 @@
 	 * tries to route the response, loads the controller and generally
 	 * makes all of the pieces work together.
 	 *
-	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
-	 * @param boolean                                      $returnResponse
+	 * @param RouteCollectionInterface|null $routes
+	 * @param boolean                       $returnResponse
 	 *
-	 * @return boolean|\CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return boolean|RequestInterface|ResponseInterface|mixed
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
 	{
@@ -352,14 +372,14 @@
 	/**
 	 * Handles the main request logic and fires the controller.
 	 *
-	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
-	 * @param $cacheConfig
-	 * @param boolean                                      $returnResponse
+	 * @param RouteCollectionInterface|null $routes
+	 * @param Cache                         $cacheConfig
+	 * @param boolean                       $returnResponse
 	 *
-	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\Response|\CodeIgniter\HTTP\ResponseInterface|mixed
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
+	 * @return RequestInterface|ResponseInterface|mixed
+	 * @throws RedirectException
 	 */
-	protected function handleRequest(RouteCollectionInterface $routes = null, $cacheConfig, bool $returnResponse = false)
+	protected function handleRequest(?RouteCollectionInterface $routes, Cache $cacheConfig, bool $returnResponse = false)
 	{
 		$routeFilter = $this->tryToRouteIt($routes);
 
@@ -374,20 +394,22 @@
 			$filters->enableFilter($routeFilter, 'after');
 		}
 
-		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->uri->getPath();
+		$uri = $this->request instanceof CLIRequest ? $this->request->getPath() : $this->request->getUri()->getPath();
 
 		// Never run filters when running through Spark cli
 		if (! defined('SPARKED'))
 		{
-			$possibleRedirect = $filters->run($uri, 'before');
-			if ($possibleRedirect instanceof RedirectResponse)
+			$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 $possibleRedirect->send();
+				return $returnResponse ? $possibleResponse : $possibleResponse->pretend($this->useSafeOutput)->send();
 			}
-			// If a Response instance is returned, the Response will be sent back to the client and script execution will stop
-			if ($possibleRedirect instanceof ResponseInterface)
+
+			if ($possibleResponse instanceof Request)
 			{
-				return $possibleRedirect->send();
+				$this->request = $possibleResponse;
 			}
 		}
 
@@ -398,6 +420,11 @@
 		{
 			$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');
 
@@ -432,14 +459,14 @@
 			}
 		}
 
-		if ($response instanceof Response)
+		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((string)current_url(true));
+		$this->storePreviousURL((string) current_url(true));
 
 		unset($uri);
 
@@ -505,7 +532,7 @@
 			// @codeCoverageIgnoreStart
 			header('HTTP/1.1 503 Service Unavailable.', true, 503);
 			echo 'The application environment is not set correctly.';
-			exit(1); // EXIT_ERROR
+			exit(EXIT_ERROR); // EXIT_ERROR
 			// @codeCoverageIgnoreEnd
 		}
 	}
@@ -533,9 +560,9 @@
 	 * Sets a Request object to be used for this request.
 	 * Used when running certain tests.
 	 *
-	 * @param \CodeIgniter\HTTP\Request $request
+	 * @param Request $request
 	 *
-	 * @return \CodeIgniter\CodeIgniter
+	 * @return $this
 	 */
 	public function setRequest(Request $request)
 	{
@@ -558,6 +585,7 @@
 			return;
 		}
 
+		// @phpstan-ignore-next-line
 		if (is_cli() && ENVIRONMENT !== 'testing')
 		{
 			// @codeCoverageIgnoreStart
@@ -618,13 +646,13 @@
 	/**
 	 * Determines if a response has been cached for the given URI.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 *
-	 * @return boolean|\CodeIgniter\HTTP\ResponseInterface
+	 * @return boolean|ResponseInterface
 	 */
-	public function displayCache($config)
+	public function displayCache(Cache $config)
 	{
 		if ($cachedResponse = cache()->get($this->generateCacheName($config)))
 		{
@@ -638,7 +666,7 @@
 			$output  = $cachedResponse['output'];
 
 			// Clear all default headers
-			foreach ($this->response->getHeaders() as $key => $val)
+			foreach ($this->response->headers() as $key => $val)
 			{
 				$this->response->removeHeader($key);
 			}
@@ -678,21 +706,19 @@
 	 * Caches the full response from the current request. Used for
 	 * full-page caching for very high performance.
 	 *
-	 * @param \Config\Cache $config
+	 * @param Cache $config
 	 *
 	 * @return mixed
 	 */
 	public function cachePage(Cache $config)
 	{
 		$headers = [];
-		foreach ($this->response->getHeaders() as $header)
+		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
-		);
+		return cache()->save($this->generateCacheName($config), serialize(['headers' => $headers, 'output' => $this->output]), static::$cacheTTL);
 	}
 
 	//--------------------------------------------------------------------
@@ -715,30 +741,26 @@
 	/**
 	 * Generates the cache name to use for our full-page caching.
 	 *
-	 * @param $config
+	 * @param Cache $config
 	 *
 	 * @return string
 	 */
-	protected function generateCacheName($config): string
+	protected function generateCacheName(Cache $config): string
 	{
-		if (get_class($this->request) === CLIRequest::class)
+		if ($this->request instanceof CLIRequest)
 		{
 			return md5($this->request->getPath());
 		}
 
-		$uri = $this->request->uri;
+		$uri = $this->request->getUri();
 
 		if ($config->cacheQueryString)
 		{
-			$name = URI::createURIString(
-							$uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery()
-			);
+			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery());
 		}
 		else
 		{
-			$name = URI::createURIString(
-							$uri->getScheme(), $uri->getAuthority(), $uri->getPath()
-			);
+			$name = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath());
 		}
 
 		return md5($name);
@@ -757,7 +779,7 @@
 	{
 		$this->totalTime = $this->benchmark->getElapsedTime('total_execution');
 
-		return str_replace('{elapsed_time}', $this->totalTime, $output);
+		return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
 	}
 
 	//--------------------------------------------------------------------
@@ -767,15 +789,15 @@
 	 * match a route against the current URI. If the route is a
 	 * "redirect route", will also handle the redirect.
 	 *
-	 * @param RouteCollectionInterface $routes An collection interface to use in place
+	 * @param RouteCollectionInterface|null $routes An collection interface to use in place
 	 *                                         of the config file.
 	 *
-	 * @return string
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
+	 * @return string|null
+	 * @throws RedirectException
 	 */
 	protected function tryToRouteIt(RouteCollectionInterface $routes = null)
 	{
-		if (empty($routes) || ! $routes instanceof RouteCollectionInterface)
+		if ($routes === null)
 		{
 			require APPPATH . 'Config/Routes.php';
 		}
@@ -797,7 +819,7 @@
 		// then we need to set the correct locale on our Request.
 		if ($this->router->hasLocale())
 		{
-			$this->request->setLocale($this->router->getLocale());
+			$this->request->setLocale($this->router->getLocale()); // @phpstan-ignore-line
 		}
 
 		$this->benchmark->stop('routing');
@@ -818,6 +840,7 @@
 			return $this->path;
 		}
 
+		// @phpstan-ignore-next-line
 		return (is_cli() && ! (ENVIRONMENT === 'testing')) ? $this->request->getPath() : $this->request->uri->getPath();
 	}
 
@@ -870,12 +893,6 @@
 		{
 			throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
 		}
-		else if (! method_exists($this->controller, '_remap') &&
-				! is_callable([$this->controller, $this->method], false)
-		)
-		{
-			throw PageNotFoundException::forMethodNotFound($this->method);
-		}
 	}
 
 	//--------------------------------------------------------------------
@@ -887,7 +904,7 @@
 	 */
 	protected function createController()
 	{
-		$class = new $this->controller();
+		$class = new $this->controller(); // @phpstan-ignore-line
 		$class->initController($this->request, $this->response, Services::logger());
 
 		$this->benchmark->stop('controller_constructor');
@@ -907,7 +924,7 @@
 	protected function runController($class)
 	{
 		// If this is a console request then use the input segments as parameters
-		$params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params();
+		$params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params(); // @phpstan-ignore-line
 
 		if (method_exists($class, '_remap'))
 		{
@@ -940,7 +957,7 @@
 			{
 				echo $override($e->getMessage());
 			}
-			else if (is_array($override))
+			elseif (is_array($override))
 			{
 				$this->benchmark->start('controller');
 				$this->benchmark->start('controller_constructor');
@@ -948,12 +965,12 @@
 				$this->controller = $override[0];
 				$this->method     = $override[1];
 
-				unset($override);
-
 				$controller = $this->createController();
 				$this->runController($controller);
 			}
 
+			unset($override);
+
 			$cacheConfig = new Cache();
 			$this->gatherOutput($cacheConfig);
 			$this->sendResponse();
@@ -991,10 +1008,10 @@
 	 * Gathers the script output from the buffer, replaces some execution
 	 * time tag in the output and displays the debug toolbar, if required.
 	 *
-	 * @param null $cacheConfig
-	 * @param null $returned
+	 * @param Cache|null $cacheConfig
+	 * @param mixed|null $returned
 	 */
-	protected function gatherOutput($cacheConfig = null, $returned = null)
+	protected function gatherOutput(Cache $cacheConfig = null, $returned = null)
 	{
 		$this->output = ob_get_contents();
 		// If buffering is not null.
@@ -1015,7 +1032,7 @@
 		// echoed already.
 		// We also need to save the instance locally
 		// so that any status code changes, etc, take place.
-		if ($returned instanceof Response)
+		if ($returned instanceof ResponseInterface)
 		{
 			$this->response = $returned;
 			$returned       = $returned->getBody();
@@ -1047,7 +1064,7 @@
 	 *
 	 * This helps provider safer, more reliable previous_url() detection.
 	 *
-	 * @param \CodeIgniter\HTTP\URI $uri
+	 * @param URI|string $uri
 	 */
 	public function storePreviousURL($uri)
 	{
@@ -1088,7 +1105,7 @@
 			return;
 		}
 
-		$method = $this->request->getPost('_method');
+		$method = $this->request->getPost('_method'); // @phpstan-ignore-line
 
 		if (empty($method))
 		{
@@ -1116,7 +1133,7 @@
 	 * Made into a separate method so that it can be mocked during testing
 	 * without actually stopping script execution.
 	 *
-	 * @param $code
+	 * @param integer $code
 	 */
 	protected function callExit($code)
 	{
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
index 35c6581..6a8c6b4 100644
--- a/system/Commands/Cache/ClearCache.php
+++ b/system/Commands/Cache/ClearCache.php
@@ -1,9 +1,23 @@
-<?php namespace CodeIgniter\Commands\Cache;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Cache;
 
 use CodeIgniter\Cache\CacheFactory;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 
+/**
+ * Clears current cache.
+ */
 class ClearCache extends BaseCommand
 {
 	/**
@@ -44,18 +58,19 @@
 	];
 
 	/**
-	 * Creates a new migration file with the current timestamp.
+	 * Clears the cache
 	 *
 	 * @param array $params
 	 */
-	public function run(array $params = [])
+	public function run(array $params)
 	{
-		$config = config('Cache');
-
+		$config  = config('Cache');
 		$handler = $params[0] ?? $config->handler;
+
 		if (! array_key_exists($handler, $config->validHandlers))
 		{
 			CLI::error($handler . ' is not a valid cache handler.');
+
 			return;
 		}
 
@@ -64,10 +79,13 @@
 
 		if (! $cache->clean())
 		{
+			// @codeCoverageIgnoreStart
 			CLI::error('Error while clearing the cache.');
+
 			return;
+			// @codeCoverageIgnoreEnd
 		}
 
-		CLI::write(CLI::color('Done', 'green'));
+		CLI::write(CLI::color('Cache cleared.', 'green'));
 	}
 }
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
new file mode 100644
index 0000000..c86385f
--- /dev/null
+++ b/system/Commands/Cache/InfoCache.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Cache;
+
+use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\I18n\Time;
+
+/**
+ * Shows information on the cache.
+ */
+class InfoCache extends BaseCommand
+{
+	/**
+	 * Command grouping.
+	 *
+	 * @var string
+	 */
+	protected $group = 'Cache';
+
+	/**
+	 * 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 usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'cache:info';
+
+	/**
+	 * Clears the cache
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$config = config('Cache');
+		helper('number');
+
+		if ($config->handler !== 'file')
+		{
+			CLI::error('This command only supports the file cache handler.');
+
+			return;
+		}
+
+		$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']),
+			];
+		}
+
+		$thead = [
+			CLI::color('Name', 'green'),
+			CLI::color('Server Path', 'green'),
+			CLI::color('Size', 'green'),
+			CLI::color('Date', 'green'),
+		];
+
+		CLI::table($tbody, $thead);
+	}
+}
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
new file mode 100644
index 0000000..b302500
--- /dev/null
+++ b/system/Commands/Database/CreateDatabase.php
@@ -0,0 +1,165 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\SQLite3\Connection;
+use Config\Database;
+use Throwable;
+
+/**
+ * Creates a new database.
+ */
+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
+		}
+
+		$db = Database::connect();
+
+		try
+		{
+			// Special SQLite3 handling
+			if ($db instanceof Connection)
+			{
+				$config = config('Database');
+				$group  = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
+				$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,
+				// then reset the altered Config\Database instance
+				$db = Database::connect(null, false);
+				$db->connect();
+				Factories::reset('config');
+
+				if (! is_file($db->getDatabase()) && $name !== ':memory:')
+				{
+					// @codeCoverageIgnoreStart
+					CLI::error('Database creation failed.', 'light_gray', 'red');
+					CLI::newLine();
+
+					return;
+					// @codeCoverageIgnoreEnd
+				}
+			}
+			else
+			{
+				if (! 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);
+		}
+	}
+}
diff --git a/system/Commands/Database/CreateMigration.php b/system/Commands/Database/CreateMigration.php
deleted file mode 100644
index 3983d67..0000000
--- a/system/Commands/Database/CreateMigration.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?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-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- */
-
-namespace CodeIgniter\Commands\Database;
-
-use CodeIgniter\CLI\BaseCommand;
-use CodeIgniter\CLI\CLI;
-use Config\Services;
-
-/**
- * Creates a new migration file.
- *
- * @package CodeIgniter\Commands
- */
-class CreateMigration 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:create';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Creates a new migration file.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'migrate:create [migration_name] [Options]';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'migration_name' => 'The migration file name',
-	];
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-n' => 'Set migration namespace',
-	];
-
-	/**
-	 * Creates a new migration file with the current timestamp.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params = [])
-	{
-		helper('inflector');
-		$name = array_shift($params);
-
-		if (empty($name))
-		{
-			$name = CLI::prompt(lang('Migrations.nameMigration'));
-		}
-
-		if (empty($name))
-		{
-			CLI::error(lang('Migrations.badCreateName'));
-			return;
-		}
-
-		$ns       = $params['-n'] ?? CLI::getOption('n');
-		$homepath = APPPATH;
-
-		if (! empty($ns))
-		{
-			// Get all namespaces
-			$namespaces = Services::autoloader()->getNamespace();
-
-			foreach ($namespaces as $namespace => $path)
-			{
-				if ($namespace === $ns)
-				{
-					$homepath = realpath(reset($path));
-					break;
-				}
-			}
-		}
-		else
-		{
-			$ns = 'App';
-		}
-
-		// Always use UTC/GMT so global teams can work together
-		$config   = config('Migrations');
-		$fileName = gmdate($config->timestampFormat) . $name;
-
-		// full path
-		$path = $homepath . '/Database/Migrations/' . $fileName . '.php';
-
-		// Class name should be pascal case now (camel case with upper first letter)
-		$name = pascalize($name);
-
-		$template = <<<EOD
-<?php namespace $ns\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class {name} extends Migration
-{
-	public function up()
-	{
-		//
-	}
-
-	//--------------------------------------------------------------------
-
-	public function down()
-	{
-		//
-	}
-}
-
-EOD;
-		$template = str_replace('{name}', $name, $template);
-
-		helper('filesystem');
-		if (! write_file($path, $template))
-		{
-			CLI::error(lang('Migrations.writeError', [$path]));
-			return;
-		}
-
-		CLI::write('Created file: ' . CLI::color(str_replace($homepath, $ns, $path), 'green'));
-	}
-
-}
diff --git a/system/Commands/Database/CreateSeeder.php b/system/Commands/Database/CreateSeeder.php
deleted file mode 100644
index 3c7d620..0000000
--- a/system/Commands/Database/CreateSeeder.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- */
-
-namespace CodeIgniter\Commands\Database;
-
-use CodeIgniter\CLI\BaseCommand;
-use CodeIgniter\CLI\CLI;
-use Config\Services;
-
-/**
- * Creates a new seeder file.
- *
- * @package CodeIgniter\Commands
- */
-class CreateSeeder extends BaseCommand
-{
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'Generators';
-
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'make:seeder';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Creates a new seeder file.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'make:seeder [seeder_name] [options]';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [
-		'seeder_name' => 'The seeder file name',
-	];
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-n' => 'Set seeder namespace',
-	];
-
-	/**
-	 * Creates a new migration file with the current timestamp.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params = [])
-	{
-		helper('inflector');
-		
-		$name = array_shift($params);
-
-		if (empty($name))
-		{
-			$name = CLI::prompt(lang('Seed.nameFile'), null, 'required');
-		}
-
-		$ns       = $params['-n'] ?? CLI::getOption('n');
-		$homepath = APPPATH;
-
-		if (! empty($ns))
-		{
-			// Get all namespaces
-			$namespaces = Services::autoloader()->getNamespace();
-
-			foreach ($namespaces as $namespace => $path)
-			{
-				if ($namespace === $ns)
-				{
-					$homepath = realpath(reset($path)) . DIRECTORY_SEPARATOR;
-					break;
-				}
-			}
-		}
-		else
-		{
-			$ns = defined('APP_NAMESPACE') ? APP_NAMESPACE : 'App';
-		}
-
-		// full path
-		$path = $homepath . 'Database/Seeds/' . $name . '.php';
-
-		// Class name should be pascal case now (camel case with upper first letter)
-		$name = pascalize($name);
-
-		$template = <<<EOD
-<?php namespace $ns\Database\Seeds;
-
-use CodeIgniter\Database\Seeder;
-
-class {name} extends Seeder
-{
-	public function run()
-	{
-		//
-	}
-}
-
-EOD;
-		$template = str_replace('{name}', $name, $template);
-
-		helper('filesystem');
-		if (! write_file($path, $template))
-		{
-			CLI::error(lang('Seed.writeError', [$path]));
-			return;
-		}
-
-		$ns = rtrim(str_replace('\\', DIRECTORY_SEPARATOR, $ns), '\\') . DIRECTORY_SEPARATOR;
-		CLI::write('Created file: ' . CLI::color(str_replace($homepath, $ns, $path), 'green'));
-	}
-}
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index e419b75..9a716f3 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -42,11 +14,10 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use Config\Services;
+use Throwable;
 
 /**
  * Runs all new migrations.
- *
- * @package CodeIgniter\Commands
  */
 class Migrate extends BaseCommand
 {
@@ -80,42 +51,37 @@
 	protected $usage = 'migrate [options]';
 
 	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
 	 * 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',
+		'-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 = [])
+	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');
+		$namespace = $params['n'] ?? CLI::getOption('n');
+		$group     = $params['g'] ?? CLI::getOption('g');
 
 		try
 		{
 			// Check for 'all' namespaces
-			if ($this->isAllNamespace($params))
+			if (array_key_exists('all', $params) || CLI::getOption('all'))
 			{
 				$runner->setNamespace(null);
 			}
@@ -127,41 +93,23 @@
 
 			if (! $runner->latest($group))
 			{
-				CLI::write(lang('Migrations.generalFault'), 'red');
+				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
 			}
 
 			$messages = $runner->getCliMessages();
+
 			foreach ($messages as $message)
 			{
 				CLI::write($message);
 			}
 
-			CLI::write('Done');
+			CLI::write('Done migrations.', 'green');
 		}
-		catch (\Exception $e)
+		// @codeCoverageIgnoreStart
+		catch (Throwable $e)
 		{
 			$this->showError($e);
 		}
+		// @codeCoverageIgnoreEnd
 	}
-
-	/**
-	 * To migrate all namespaces to the latest migration
-	 *
-	 * Demo:
-	 *  1. command line: php spark migrate:latest -all
-	 *  2. command file: $this->call('migrate:latest', ['-g' => 'test','-all']);
-	 *
-	 * @param  array $params
-	 * @return boolean
-	 */
-	private function isAllNamespace(array $params): bool
-	{
-		if (array_search('-all', $params) !== false)
-		{
-			return true;
-		}
-
-		return ! is_null(CLI::getOption('all'));
-	}
-
 }
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index bf6b4f8..fd7ba46 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -45,12 +17,9 @@
 /**
  * Does a rollback followed by a latest to refresh the current state
  * of the database.
- *
- * @package CodeIgniter\Commands
  */
 class MigrateRefresh extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -78,14 +47,7 @@
 	 *
 	 * @var string
 	 */
-	protected $usage = 'migrate:refresh [Options]';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+	protected $usage = 'migrate:refresh [options]';
 
 	/**
 	 * the Command's Options
@@ -93,10 +55,10 @@
 	 * @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',
+		'-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',
 	];
 
 	/**
@@ -104,24 +66,28 @@
 	 * of the database.
 	 *
 	 * @param array $params
+	 *
+	 * @return void
 	 */
-	public function run(array $params = [])
+	public function run(array $params)
 	{
-		$params = ['-b' => 0];
+		$params['b'] = 0;
 
 		if (ENVIRONMENT === 'production')
 		{
-			$force = $params['-f'] ?? CLI::getOption('f');
-			if (is_null($force) && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n')
+			// @codeCoverageIgnoreStart
+			$force = array_key_exists('f', $params) || CLI::getOption('f');
+
+			if (! $force && CLI::prompt(lang('Migrations.refreshConfirm'), ['y', 'n']) === 'n')
 			{
 				return;
 			}
 
-			$params['-f'] = '';
+			$params['f'] = null;
+			// @codeCoverageIgnoreEnd
 		}
 
 		$this->call('migrate:rollback', $params);
-		$this->call('migrate');
+		$this->call('migrate', $params);
 	}
-
 }
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index b2dca1c..284504c 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -42,16 +14,14 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use Config\Services;
+use Throwable;
 
 /**
  * Runs all of the migrations in reverse order, until they have
- * all been un-applied.
- *
- * @package CodeIgniter\Commands
+ * all been unapplied.
  */
 class MigrateRollback extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -79,14 +49,7 @@
 	 *
 	 * @var string
 	 */
-	protected $usage = 'migrate:rollback [Options]';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+	protected $usage = 'migrate:rollback [options]';
 
 	/**
 	 * the Command's Options
@@ -101,51 +64,58 @@
 
 	/**
 	 * Runs all of the migrations in reverse order, until they have
-	 * all been un-applied.
+	 * all been unapplied.
 	 *
 	 * @param array $params
+	 *
+	 * @return void
 	 */
-	public function run(array $params = [])
+	public function run(array $params)
 	{
 		if (ENVIRONMENT === 'production')
 		{
-			$force = $params['-f'] ?? CLI::getOption('f');
-			if (is_null($force) && CLI::prompt(lang('Migrations.rollBackConfirm'), ['y', 'n']) === 'n')
+			// @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');
 
-		$group = $params['-g'] ?? CLI::getOption('g');
-
-		if (! is_null($group))
+		if (is_string($group))
 		{
 			$runner->setGroup($group);
 		}
 
 		try
 		{
-			$batch = $params['-b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
+			$batch = $params['b'] ?? CLI::getOption('b') ?? $runner->getLastBatch() - 1;
 			CLI::write(lang('Migrations.rollingBack') . ' ' . $batch, 'yellow');
 
 			if (! $runner->regress($batch))
 			{
-				CLI::write(lang('Migrations.generalFault'), 'red');
+				CLI::error(lang('Migrations.generalFault'), 'light_gray', 'red'); // @codeCoverageIgnore
 			}
 
 			$messages = $runner->getCliMessages();
+
 			foreach ($messages as $message)
 			{
 				CLI::write($message);
 			}
 
-			CLI::write('Done');
+			CLI::write('Done rolling back migrations.', 'green');
 		}
-		catch (\Exception $e)
+		// @codeCoverageIgnoreStart
+		catch (Throwable $e)
 		{
 			$this->showError($e);
 		}
+		// @codeCoverageIgnoreEnd
 	}
 }
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index 94ad3ea..89b5493 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -45,12 +17,9 @@
 
 /**
  * Displays a list of all migrations and whether they've been run or not.
- *
- * @package CodeIgniter\Commands
  */
 class MigrateStatus extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -78,19 +47,12 @@
 	 *
 	 * @var string
 	 */
-	protected $usage = 'migrate:status [Options]';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
+	protected $usage = 'migrate:status [options]';
 
 	/**
 	 * the Command's Options
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	protected $options = [
 		'-g' => 'Set database group',
@@ -99,12 +61,11 @@
 	/**
 	 * Namespaces to ignore when looking for migrations.
 	 *
-	 * @var type
+	 * @var string[]
 	 */
 	protected $ignoredNamespaces = [
 		'CodeIgniter',
 		'Config',
-		'Tests\Support',
 		'Kint',
 		'Laminas\ZendFrameworkBridge',
 		'Laminas\Escaper',
@@ -114,79 +75,101 @@
 	/**
 	 * Displays a list of all migrations and whether they've been run or not.
 	 *
-	 * @param array $params
+	 * @param array<string, mixed> $params
+	 *
+	 * @return void
 	 */
-	public function run(array $params = [])
+	public function run(array $params)
 	{
 		$runner = Services::migrations();
-
-		$group = $params['-g'] ?? CLI::getOption('g');
-
-		if (! is_null($group))
-		{
-			$runner->setGroup($group);
-		}
+		$group  = $params['g'] ?? CLI::getOption('g');
 
 		// Get all namespaces
 		$namespaces = Services::autoloader()->getNamespace();
 
-		// Determines whether any migrations were found
-		$found = false;
+		// Collection of migration status
+		$status = [];
 
-		// Loop for all $namespaces
 		foreach ($namespaces as $namespace => $path)
 		{
-			if (in_array($namespace, $this->ignoredNamespaces))
+			if (ENVIRONMENT !== 'testing')
+			{
+				// Make Tests\\Support discoverable for testing
+				$this->ignoredNamespaces[] = 'Tests\Support'; // @codeCoverageIgnore
+			}
+
+			if (in_array($namespace, $this->ignoredNamespaces, true))
 			{
 				continue;
 			}
 
-			$runner->setNamespace($namespace);
-			$migrations = $runner->findMigrations();
+			if (APP_NAMESPACE !== 'App' && $namespace === 'App')
+			{
+				continue; // @codeCoverageIgnore
+			}
+
+			$migrations = $runner->findNamespaceMigrations($namespace);
 
 			if (empty($migrations))
 			{
 				continue;
 			}
 
-			$found   = true;
-			$history = $runner->getHistory();
-
-			CLI::write($namespace);
-
+			$history = $runner->getHistory((string) $group);
 			ksort($migrations);
 
-			$max = 0;
-			foreach ($migrations as $version => $migration)
-			{
-				$file                       = substr($migration->name, strpos($migration->name, $version . '_'));
-				$migrations[$version]->name = $file;
-
-				$max = max($max, strlen($file));
-			}
-
-			CLI::write('  ' . str_pad(lang('Migrations.filename'), $max + 4) . lang('Migrations.on'), 'yellow');
-
 			foreach ($migrations as $uid => $migration)
 			{
-				$date = '';
+				$migrations[$uid]->name = mb_substr($migration->name, mb_strpos($migration->name, $uid . '_'));
+
+				$date  = '---';
+				$group = '---';
+				$batch = '---';
+
 				foreach ($history as $row)
 				{
-					if ($runner->getObjectUid($row) !== $uid)
+					// @codeCoverageIgnoreStart
+					if ($runner->getObjectUid($row) !== $migration->uid)
 					{
 						continue;
 					}
 
-					$date = date('Y-m-d H:i:s', $row->time);
+					$date  = date('Y-m-d H:i:s', $row->time);
+					$group = $row->group;
+					$batch = $row->batch;
+					// @codeCoverageIgnoreEnd
 				}
-				CLI::write(str_pad('  ' . $migration->name, $max + 6) . ($date ? $date : '---'));
+
+				$status[] = [
+					$namespace,
+					$migration->version,
+					$migration->name,
+					$group,
+					$date,
+					$batch,
+				];
 			}
 		}
 
-		if (! $found)
+		if (! $status)
 		{
-			CLI::error(lang('Migrations.noneFound'));
-		}
-	}
+			// @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 ee09e0a..dcc41ab 100644
--- a/system/Commands/Database/Seed.php
+++ b/system/Commands/Database/Seed.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
@@ -42,16 +14,15 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Database\Seeder;
+use Config\Database;
+use Throwable;
 
 /**
  * Runs the specified Seeder file to populate the database
  * with some data.
- *
- * @package CodeIgniter\Commands
  */
 class Seed extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -79,54 +50,41 @@
 	 *
 	 * @var string
 	 */
-	protected $usage = 'db:seed [seeder_name]';
+	protected $usage = 'db:seed <seeder_name>';
 
 	/**
 	 * the Command's Arguments
 	 *
-	 * @var array
+	 * @var array<string, string>
 	 */
 	protected $arguments = [
 		'seeder_name' => 'The seeder name to run',
 	];
 
 	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
-
-	/**
 	 * Passes to Seeder to populate the database.
 	 *
 	 * @param array $params
+	 *
+	 * @return void
 	 */
-	public function run(array $params = [])
+	public function run(array $params)
 	{
-		$seeder = new Seeder(new \Config\Database());
-
+		$seeder   = new Seeder(new Database());
 		$seedName = array_shift($params);
 
 		if (empty($seedName))
 		{
-			$seedName = CLI::prompt(lang('Migrations.migSeeder'), 'DatabaseSeeder');
-		}
-
-		if (empty($seedName))
-		{
-			CLI::error(lang('Migrations.migMissingSeeder'));
-			return;
+			$seedName = CLI::prompt(lang('Migrations.migSeeder'), null, 'required'); // @codeCoverageIgnore
 		}
 
 		try
 		{
 			$seeder->call($seedName);
 		}
-		catch (\Exception $e)
+		catch (Throwable $e)
 		{
 			$this->showError($e);
 		}
 	}
-
 }
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
new file mode 100644
index 0000000..57b1756
--- /dev/null
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Encryption;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Config\DotEnv;
+use CodeIgniter\Encryption\Encryption;
+
+/**
+ * Generates a new encryption key.
+ */
+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";
+	}
+}
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
new file mode 100644
index 0000000..11bef84
--- /dev/null
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -0,0 +1,127 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton command file.
+ */
+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->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';
+		$group   = is_string($group) ? $group : 'CodeIgniter';
+		$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 ($type === 'generator')
+		{
+			$group = 'Generators';
+		}
+
+		return $this->parseTemplate(
+			$class,
+			['{group}', '{command}'],
+			[$group, $command],
+			['type' => $type]
+		);
+	}
+}
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
new file mode 100644
index 0000000..af6f343
--- /dev/null
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton config file.
+ */
+class ConfigGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * 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 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 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';
+
+		$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;
+
+		if ($namespace === APP_NAMESPACE)
+		{
+			$class = substr($class, strlen($namespace . '\\'));
+		}
+
+		return $this->parseTemplate($class);
+	}
+}
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
new file mode 100644
index 0000000..ff56853
--- /dev/null
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton controller file.
+ */
+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->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]
+		);
+	}
+}
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
new file mode 100644
index 0000000..7a56131
--- /dev/null
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Entity file.
+ */
+class EntityGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * 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 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 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';
+
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
new file mode 100644
index 0000000..57baa94
--- /dev/null
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Filter file.
+ */
+class FilterGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * 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 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 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';
+
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
new file mode 100644
index 0000000..546e343
--- /dev/null
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * Deprecated class for the migration creation command.
+ *
+ * @deprecated Use make:command instead.
+ *
+ * @codeCoverageIgnore
+ */
+class MigrateCreate extends BaseCommand
+{
+	/**
+	 * 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 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 arguments.
+	 *
+	 * @var array
+	 */
+	protected $arguments = [
+		'name' => 'The migration file name.',
+	];
+
+	/**
+	 * The Command's options.
+	 *
+	 * @var array
+	 */
+	protected $options = [
+		'-n'      => '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);
+
+		$params['namespace'] = $params['namespace'] ?? CLI::getOption('namespace') ?? APP_NAMESPACE;
+
+		if (array_key_exists('force', $params) || CLI::getOption('force'))
+		{
+			$params['force'] = null;
+		}
+
+		$this->call('make:migration', $params);
+	}
+}
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
new file mode 100644
index 0000000..a7c5959
--- /dev/null
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -0,0 +1,131 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton migration file.
+ */
+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->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);
+	}
+}
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
new file mode 100644
index 0000000..e9fdbfe
--- /dev/null
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Model file.
+ */
+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->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]);
+	}
+}
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
new file mode 100644
index 0000000..6750b46
--- /dev/null
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a complete set of scaffold files.
+ */
+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));
+	}
+}
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
new file mode 100644
index 0000000..d9c34ef
--- /dev/null
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton seeder file.
+ */
+class SeederGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * 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 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 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';
+
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
new file mode 100644
index 0000000..10b4a72
--- /dev/null
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a migration file for database sessions.
+ *
+ * @deprecated Use make:migration --session instead.
+ *
+ * @codeCoverageIgnore
+ */
+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);
+	}
+}
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
new file mode 100644
index 0000000..24cd37b
--- /dev/null
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Generators;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CLI\GeneratorTrait;
+
+/**
+ * Generates a skeleton Validation file.
+ */
+class ValidationGenerator extends BaseCommand
+{
+	use GeneratorTrait;
+
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = 'Generators';
+
+	/**
+	 * 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 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 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';
+
+		$this->execute($params);
+	}
+}
diff --git a/system/Commands/Generators/Views/command.tpl.php b/system/Commands/Generators/Views/command.tpl.php
new file mode 100644
index 0000000..52da0d0
--- /dev/null
+++ b/system/Commands/Generators/Views/command.tpl.php
@@ -0,0 +1,76 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+<?php if ($type === 'generator'): ?>
+use CodeIgniter\CLI\GeneratorTrait;
+<?php endif ?>
+
+class {class} extends BaseCommand
+{
+<?php if ($type === 'generator'): ?>
+	use GeneratorTrait;
+
+<?php endif ?>
+	/**
+	 * The Command's Group
+	 *
+	 * @var string
+	 */
+	protected $group = '{group}';
+
+	/**
+	 * The Command's Name
+	 *
+	 * @var string
+	 */
+	protected $name = '{command}';
+
+	/**
+	 * The Command's Description
+	 *
+	 * @var string
+	 */
+	protected $description = '';
+
+	/**
+	 * The Command's Usage
+	 *
+	 * @var string
+	 */
+	protected $usage = '{command} [arguments] [options]';
+
+	/**
+	 * The Command's Arguments
+	 *
+	 * @var array
+	 */
+	protected $arguments = [];
+
+	/**
+	 * The Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	/**
+	 * 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->execute($params);
+<?php else: ?>
+		//
+<?php endif ?>
+	}
+}
diff --git a/system/Commands/Generators/Views/config.tpl.php b/system/Commands/Generators/Views/config.tpl.php
new file mode 100644
index 0000000..72e93ad
--- /dev/null
+++ b/system/Commands/Generators/Views/config.tpl.php
@@ -0,0 +1,10 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Config\BaseConfig;
+
+class {class} extends BaseConfig
+{
+	//
+}
diff --git a/system/Commands/Generators/Views/controller.tpl.php b/system/Commands/Generators/Views/controller.tpl.php
new file mode 100644
index 0000000..f7859f2
--- /dev/null
+++ b/system/Commands/Generators/Views/controller.tpl.php
@@ -0,0 +1,177 @@
+<@php
+
+namespace {namespace};
+
+use {useStatement};
+
+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)
+	{
+		//
+	}
+<?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)
+	{
+		//
+	}
+<?php else: ?>
+	public function index()
+	{
+		//
+	}
+<?php endif ?>
+}
diff --git a/system/Commands/Generators/Views/entity.tpl.php b/system/Commands/Generators/Views/entity.tpl.php
new file mode 100644
index 0000000..7c563be
--- /dev/null
+++ b/system/Commands/Generators/Views/entity.tpl.php
@@ -0,0 +1,16 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Entity;
+
+class {class} extends Entity
+{
+	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
new file mode 100644
index 0000000..19147bb
--- /dev/null
+++ b/system/Commands/Generators/Views/filter.tpl.php
@@ -0,0 +1,47 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+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)
+	{
+		//
+	}
+
+	/**
+	 * 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
new file mode 100644
index 0000000..42bb77e
--- /dev/null
+++ b/system/Commands/Generators/Views/migration.tpl.php
@@ -0,0 +1,44 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Database\Migration;
+
+class {class} extends Migration
+{
+<?php if ($session): ?>
+	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 down()
+	{
+		$this->forge->dropTable('<?= $table ?>', true);
+	}
+<?php else: ?>
+	public function up()
+	{
+		//
+	}
+
+	public function down()
+	{
+		//
+	}
+<?php endif ?>
+}
diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
new file mode 100644
index 0000000..255c56d
--- /dev/null
+++ b/system/Commands/Generators/Views/model.tpl.php
@@ -0,0 +1,42 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Model;
+
+class {class} extends Model
+{
+	protected $DBGroup              = '{DBGroup}';
+	protected $table                = '{table}';
+	protected $primaryKey           = 'id';
+	protected $useAutoIncrement     = true;
+	protected $insertID             = 0;
+	protected $returnType           = '{return}';
+	protected $useSoftDelete        = 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';
+
+	// 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          = [];
+}
diff --git a/system/Commands/Generators/Views/seeder.tpl.php b/system/Commands/Generators/Views/seeder.tpl.php
new file mode 100644
index 0000000..bf80c7a
--- /dev/null
+++ b/system/Commands/Generators/Views/seeder.tpl.php
@@ -0,0 +1,13 @@
+<@php
+
+namespace {namespace};
+
+use CodeIgniter\Database\Seeder;
+
+class {class} extends Seeder
+{
+	public function run()
+	{
+		//
+	}
+}
diff --git a/system/Commands/Generators/Views/validation.tpl.php b/system/Commands/Generators/Views/validation.tpl.php
new file mode 100644
index 0000000..60d78a3
--- /dev/null
+++ b/system/Commands/Generators/Views/validation.tpl.php
@@ -0,0 +1,11 @@
+<@php
+
+namespace {namespace};
+
+class {class}
+{
+	// public function custom_rule(): bool
+	// {
+	// 	return true;
+	// }
+}
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index 5769685..a2899c7 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
@@ -46,12 +18,9 @@
  *
  * Lists the basic usage information for the spark script,
  * and provides a way to list help for other commands.
- *
- * @package CodeIgniter\Commands
  */
 class Help extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -100,22 +69,22 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Displays the help for the spark cli script itself.
+	 * Displays the help for spark commands.
 	 *
 	 * @param array $params
 	 */
 	public function run(array $params)
 	{
-		$command = array_shift($params);
-		if (is_null($command))
+		$command  = array_shift($params);
+		$command  = $command ?? 'help';
+		$commands = $this->commands->getCommands();
+
+		if (! $this->commands->verifyCommand($command, $commands))
 		{
-			$command = 'help';
+			return;
 		}
 
-		$commands = $this->commands->getCommands();
-		$class    = new $commands[$command]['class']($this->logger, $this->commands);
-
+		$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
new file mode 100644
index 0000000..3df1a40
--- /dev/null
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Housekeeping;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * ClearDebugbar Command
+ */
+class ClearDebugbar extends BaseCommand
+{
+	/**
+	 * 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 usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'debugbar:clear';
+
+	/**
+	 * 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');
+
+		if (! delete_files(WRITEPATH . 'debugbar'))
+		{
+			// @codeCoverageIgnoreStart
+			CLI::error('Error deleting the debugbar JSON files.');
+			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
new file mode 100644
index 0000000..6b47d68
--- /dev/null
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Housekeeping;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+/**
+ * ClearLogs command.
+ */
+class ClearLogs extends BaseCommand
+{
+	/**
+	 * 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 short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Clears all log files.';
+
+	/**
+	 * 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.',
+	];
+
+	/**
+	 * Actually execute a command.
+	 *
+	 * @param array $params
+	 */
+	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
+		}
+
+		helper('filesystem');
+
+		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 c20fe32..a5b6ea1 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
@@ -47,12 +19,9 @@
  *
  * Lists the basic usage information for the spark script,
  * and provides a way to list help for other commands.
- *
- * @package CodeIgniter\Commands
  */
 class ListCommands extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -94,15 +63,9 @@
 	 *
 	 * @var array
 	 */
-	protected $options = [];
-
-	/**
-	 * The length of the longest command name.
-	 * Used during display in columns.
-	 *
-	 * @var integer
-	 */
-	protected $maxFirstLength = 0;
+	protected $options = [
+		'--simple' => 'Prints a list of the commands with no other info',
+	];
 
 	//--------------------------------------------------------------------
 
@@ -114,83 +77,72 @@
 	public function run(array $params)
 	{
 		$commands = $this->commands->getCommands();
+		ksort($commands);
 
-		$this->describeCommands($commands);
-
-		CLI::newLine();
+		// Check for 'simple' format
+		return array_key_exists('simple', $params) || CLI::getOption('simple')
+			? $this->listSimple($commands)
+			: $this->listFull($commands);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Displays the commands on the CLI.
+	 * Lists the commands with accompanying info.
 	 *
 	 * @param array $commands
 	 */
-	protected function describeCommands(array $commands = [])
+	protected function listFull(array $commands)
 	{
-		ksort($commands);
-
 		// Sort into buckets by group
-		$sorted         = [];
-		$maxTitleLength = 0;
+		$groups = [];
 
 		foreach ($commands as $title => $command)
 		{
-			if (! isset($sorted[$command['group']]))
+			if (! isset($groups[$command['group']]))
 			{
-				$sorted[$command['group']] = [];
+				$groups[$command['group']] = [];
 			}
 
-			$sorted[$command['group']][$title] = $command;
-
-			$maxTitleLength = max($maxTitleLength, strlen($title));
+			$groups[$command['group']][$title] = $command;
 		}
 
-		ksort($sorted);
+		$length = max(array_map('strlen', array_keys($commands)));
+
+		ksort($groups);
 
 		// Display it all...
-		foreach ($sorted as $group => $items)
+		foreach ($groups as $group => $commands)
 		{
-			CLI::newLine();
-			CLI::write($group);
-
-			foreach ($items as $title => $item)
+			CLI::write($group, 'yellow');
+			foreach ($commands as $name => $command)
 			{
-				$title = $this->padTitle($title, $maxTitleLength, 2, 2);
-
-				$out = CLI::color($title, 'yellow');
-
-				if (isset($item['description']))
+				$name   = $this->setPad($name, $length, 2, 2);
+				$output = CLI::color($name, 'green');
+				if (isset($command['description']))
 				{
-					$out .= CLI::wrap($item['description'], 125, strlen($title));
+					$output .= CLI::wrap($command['description'], 125, strlen($name));
 				}
+				CLI::write($output);
+			}
 
-				CLI::write($out);
+			end($groups);
+
+			if ($group !== key($groups))
+			{
+				CLI::newLine();
 			}
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Pads our string out so that all titles are the same length to nicely line up descriptions.
+	 * Lists the commands only.
 	 *
-	 * @param string  $item
-	 * @param integer $max
-	 * @param integer $extra  // How many extra spaces to add at the end
-	 * @param integer $indent
-	 *
-	 * @return string
+	 * @param array $commands
 	 */
-	protected function padTitle(string $item, int $max, int $extra = 2, int $indent = 0): string
+	protected function listSimple(array $commands)
 	{
-		$max += $extra + $indent;
-
-		$item = str_repeat(' ', $indent) . $item;
-
-		return str_pad($item, $max);
+		foreach ($commands as $title => $command)
+		{
+			CLI::write($title);
+		}
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index 9e65862..034957c 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Server;
@@ -46,20 +19,11 @@
  *
  * Not testable, as it throws phpunit for a loop :-/
  *
- * @package CodeIgniter\Commands\Server
- *
  * @codeCoverageIgnore
  */
 class Serve extends BaseCommand
 {
 	/**
-	 * Minimum PHP version
-	 *
-	 * @var string
-	 */
-	protected $minPHPVersion = '7.2';
-
-	/**
 	 * Group
 	 *
 	 * @var string
@@ -114,9 +78,9 @@
 	 * @var array
 	 */
 	protected $options = [
-		'-php'  => 'The PHP Binary [default: "PHP_BINARY"]',
-		'-host' => 'The HTTP Host [default: "localhost"]',
-		'-port' => 'The HTTP Host Port [default: "8080"]',
+		'--php'  => 'The PHP Binary [default: "PHP_BINARY"]',
+		'--host' => 'The HTTP Host [default: "localhost"]',
+		'--port' => 'The HTTP Host Port [default: "8080"]',
 	];
 
 	/**
@@ -128,19 +92,10 @@
 	 */
 	public function run(array $params)
 	{
-		// Valid PHP Version?
-		if (phpversion() < $this->minPHPVersion)
-		{
-			// @codeCoverageIgnoreStart
-			die('Your PHP version must be ' . $this->minPHPVersion .
-				' or higher to run CodeIgniter. Current version: ' . phpversion());
-			// @codeCoverageIgnoreEnd
-		}
-
 		// 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;
+		$port = (int) (CLI::getOption('port') ?? 8080) + $this->portOffset;
 
 		// Get the party started.
 		CLI::write('CodeIgniter development server started on http://' . $host . ':' . $port, 'green');
@@ -159,10 +114,9 @@
 
 		if ($status && $this->portOffset < $this->tries)
 		{
-			$this->portOffset += 1;
+			$this->portOffset++;
 
 			$this->run($params);
 		}
 	}
-
 }
diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index 94b7d15..89290be 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -1,5 +1,15 @@
 <?php
+
 /**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
  * CodeIgniter PHP-Development Server Rewrite Rules
  *
  * This script works with the CLI serve command to help run a seamless
@@ -10,10 +20,11 @@
 
 // @codeCoverageIgnoreStart
 // Avoid this file run when listing commands
-if (php_sapi_name() === 'cli')
+if (PHP_SAPI === 'cli')
 {
 	return;
 }
+
 $uri = urldecode(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
 
 // Front Controller path - expected to be in the default folder
diff --git a/system/Commands/Sessions/CreateMigration.php b/system/Commands/Sessions/CreateMigration.php
deleted file mode 100644
index ca26bfa..0000000
--- a/system/Commands/Sessions/CreateMigration.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- */
-
-namespace CodeIgniter\Commands\Sessions;
-
-use CodeIgniter\CLI\BaseCommand;
-use CodeIgniter\CLI\CLI;
-use Config\App;
-
-/**
- * Creates a migration file for database sessions.
- *
- * @package CodeIgniter\Commands
- */
-
-class CreateMigration 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 = 'session:migration';
-
-	/**
-	 * the Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Generates the migration file for database sessions.';
-
-	/**
-	 * the Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'session:migration';
-
-	/**
-	 * the Command's Arguments
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [
-		'-n' => 'Set migration namespace',
-		'-g' => 'Set database group',
-		'-t' => 'Set table name',
-	];
-
-	/**
-	 * Creates a new migration file with the current timestamp.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params = [])
-	{
-		$config = new App();
-
-		$tableName = CLI::getOption('t') ?? 'ci_sessions';
-
-		$path = APPPATH . 'Database/Migrations/' . date('YmdHis_') . 'create_' . $tableName . '_table' . '.php';
-
-		$data = [
-			'namespace' => CLI::getOption('n') ?? APP_NAMESPACE ?? 'App',
-			'DBGroup'   => CLI::getOption('g'),
-			'tableName' => $tableName,
-			'matchIP'   => $config->sessionMatchIP ?? false,
-		];
-
-		$template = view('\CodeIgniter\Commands\Sessions\Views\migration.tpl.php', $data, ['debug' => false]);
-		$template = str_replace('@php', '<?php', $template);
-
-		// Write the file out.
-		helper('filesystem');
-		if (! write_file($path, $template))
-		{
-			CLI::error(lang('Migrations.writeError', [$path]));
-			return;
-		}
-
-		CLI::write('Created file: ' . CLI::color(str_replace(APPPATH, 'APPPATH/', $path), 'green'));
-	}
-
-}
diff --git a/system/Commands/Sessions/Views/migration.tpl.php b/system/Commands/Sessions/Views/migration.tpl.php
deleted file mode 100644
index e025ea9..0000000
--- a/system/Commands/Sessions/Views/migration.tpl.php
+++ /dev/null
@@ -1,52 +0,0 @@
-@php namespace <?= $namespace ?>\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class Migration_create_<?= $tableName ?>_table extends Migration
-{
-<?php if (isset($DBGroup)) : ?>
-	protected $DBGroup = '<?= $DBGroup ?>';
-<?php endif ?>
-
-	public function up()
-	{
-		$this->forge->addField([
-			'id'         => [
-				'type'       => 'VARCHAR',
-				'constraint' => 128,
-				'null'       => false
-			],
-			'ip_address' => [
-				'type'       => 'VARCHAR',
-				'constraint' => 45,
-				'null'       => false
-			],
-			'timestamp'  => [
-				'type'       => 'INT',
-				'constraint' => 10,
-				'unsigned'   => true,
-				'null'       => false,
-				'default'    => 0
-			],
-			'data'       => [
-				'type'       => 'TEXT',
-				'null'       => false,
-				'default'    => ''
-			],
-		]);
-	<?php if ($matchIP === true) : ?>
-	$this->forge->addKey(['id', 'ip_address'], true);
-	<?php else: ?>
-	$this->forge->addKey('id', true);
-	<?php endif ?>
-	$this->forge->addKey('timestamp');
-		$this->forge->createTable('<?= $tableName ?>', true);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function down()
-	{
-		$this->forge->dropTable('<?= $tableName ?>', true);
-	}
-}
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index 0472277..c2c5dcf 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
@@ -47,12 +19,9 @@
  * Lists namespaces set in Config\Autoload with their
  * full server path. Helps you to verify that you have
  * the namespaces setup correctly.
- *
- * @package CodeIgniter\Commands
  */
 class Namespaces extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -127,5 +96,4 @@
 
 		CLI::table($tbody, $thead);
 	}
-
 }
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 4d4a2ef..92d240c 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
@@ -47,12 +19,9 @@
  * Lists all of the user-defined routes. This will include any Routes files
  * that can be discovered, but will NOT include any routes that are not defined
  * in a routes file, but are instead discovered through auto-routing.
- *
- * @package CodeIgniter\Commands
  */
 class Routes extends BaseCommand
 {
-
 	/**
 	 * The group the command is lumped under
 	 * when listing commands.
@@ -146,5 +115,4 @@
 
 		CLI::table($tbody, $thead);
 	}
-
 }
diff --git a/system/Common.php b/system/Common.php
index 22dd413..9f27e55 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1,49 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT  MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
-use CodeIgniter\Config\Config;
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Debug\Timer;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
+use CodeIgniter\Session\Session;
 use CodeIgniter\Test\TestLogger;
 use Config\App;
 use Config\Database;
@@ -52,14 +29,6 @@
 use Config\View;
 use Laminas\Escaper\Escaper;
 
-/**
- * Common Functions
- *
- * Several application-wide utility methods.
- *
- * @package  CodeIgniter
- * @category Common Functions
- */
 //--------------------------------------------------------------------
 // Services Convenience Functions
 //--------------------------------------------------------------------
@@ -95,7 +64,7 @@
 	 *
 	 * @param string|null $key
 	 *
-	 * @return \CodeIgniter\Cache\CacheInterface|mixed
+	 * @return CacheInterface|mixed
 	 */
 	function cache(string $key = null)
 	{
@@ -112,6 +81,40 @@
 	}
 }
 
+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('command'))
 {
 	/**
@@ -127,23 +130,90 @@
 	 */
 	function command(string $command)
 	{
-		$runner = service('commands');
+		$runner      = service('commands');
+		$regexString = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+		$regexQuoted = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
-		$params  = explode(' ', $command);
-		$command = array_shift($params);
+		$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);
-		$output = ob_get_clean();
 
-		return $output;
+		return ob_get_clean();
 	}
 }
 
 if (! function_exists('config'))
 {
 	/**
-	 * More simple way of getting config instances
+	 * More simple way of getting config instances from Factories
 	 *
 	 * @param string  $name
 	 * @param boolean $getShared
@@ -152,7 +222,7 @@
 	 */
 	function config(string $name, bool $getShared = true)
 	{
-		return Config::get($name, $getShared);
+		return Factories::config($name, ['getShared' => $getShared]);
 	}
 }
 
@@ -167,9 +237,7 @@
 	 */
 	function csrf_token(): string
 	{
-		$config = config(App::class);
-
-		return $config->CSRFTokenName;
+		return Services::security()->getTokenName();
 	}
 }
 
@@ -184,9 +252,7 @@
 	 */
 	function csrf_header(): string
 	{
-		$config = config(App::class);
-
-		return $config->CSRFHeaderName;
+		return Services::security()->getHeaderName();
 	}
 }
 
@@ -201,9 +267,7 @@
 	 */
 	function csrf_hash(): string
 	{
-		$security = Services::security(null, true);
-
-		return $security->getCSRFHash();
+		return Services::security()->getHash();
 	}
 }
 
@@ -253,10 +317,10 @@
 	 * If $getShared === false then a new connection instance will be provided,
 	 * otherwise it will all calls will return the same instance.
 	 *
-	 * @param \CodeIgniter\Database\ConnectionInterface|array|string $db
-	 * @param boolean                                                $getShared
+	 * @param ConnectionInterface|array|string|null $db
+	 * @param boolean                               $getShared
 	 *
-	 * @return \CodeIgniter\Database\BaseConnection
+	 * @return BaseConnection
 	 */
 	function db_connect($db = null, bool $getShared = true)
 	{
@@ -291,18 +355,14 @@
 	 * retrieving values set from the .env file for
 	 * use in config files.
 	 *
-	 * @param string $key
-	 * @param null   $default
+	 * @param string      $key
+	 * @param string|null $default
 	 *
 	 * @return mixed
 	 */
 	function env(string $key, $default = null)
 	{
-		$value = getenv($key);
-		if ($value === false)
-		{
-			$value = $_ENV[$key] ?? $_SERVER[$key] ?? false;
-		}
+		$value = $_ENV[$key] ?? $_SERVER[$key] ?? getenv($key);
 
 		// Not found? Return the default value
 		if ($value === false)
@@ -344,7 +404,7 @@
 	 * @param string       $encoding
 	 *
 	 * @return string|array
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 */
 	function esc($data, string $context = 'html', string $encoding = null)
 	{
@@ -368,7 +428,7 @@
 				return $data;
 			}
 
-			if (! in_array($context, ['html', 'js', 'css', 'url', 'attr']))
+			if (! in_array($context, ['html', 'js', 'css', 'url', 'attr'], true))
 			{
 				throw new InvalidArgumentException('Invalid escape context provided.');
 			}
@@ -415,7 +475,7 @@
 	 * @param RequestInterface  $request
 	 * @param ResponseInterface $response
 	 *
-	 * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @throws HTTPException
 	 */
 	function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null)
 	{
@@ -496,24 +556,24 @@
 	 * be just temporary, but would probably be kept for a few years.
 	 *
 	 * @link   http://www.hardened-php.net/suhosin/
-	 * @param  string $function_name Function to check for
+	 * @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 $function_name): bool
+	function function_usable(string $functionName): bool
 	{
 		static $_suhosin_func_blacklist;
 
-		if (function_exists($function_name))
+		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($function_name, $_suhosin_func_blacklist, true);
+			return ! in_array($functionName, $_suhosin_func_blacklist, true);
 		}
 
 		return false;
@@ -532,10 +592,12 @@
 	 *   3. system/Helpers
 	 *
 	 * @param  string|array $filenames
-	 * @throws \CodeIgniter\Files\Exceptions\FileNotFoundException
+	 * @throws FileNotFoundException
 	 */
 	function helper($filenames)
 	{
+		static $loaded = [];
+
 		$loader = Services::locator(true);
 
 		if (! is_array($filenames))
@@ -559,6 +621,12 @@
 				$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)
@@ -571,6 +639,7 @@
 				}
 
 				$includes[] = $path;
+				$loaded[]   = $filename;
 			}
 
 			// No namespaces, so search in all available locations
@@ -595,6 +664,7 @@
 						else
 						{
 							$localIncludes[] = $path;
+							$loaded[]        = $filename;
 						}
 					}
 				}
@@ -604,6 +674,7 @@
 				{
 					// @codeCoverageIgnoreStart
 					$includes[] = $appHelper;
+					$loaded[]   = $filename;
 					// @codeCoverageIgnoreEnd
 				}
 
@@ -614,6 +685,7 @@
 				if (! empty($systemHelper))
 				{
 					$includes[] = $systemHelper;
+					$loaded[]   = $filename;
 				}
 			}
 		}
@@ -659,7 +731,7 @@
 	 *
 	 * @return boolean
 	 *
-	 * @throws             \Exception
+	 * @throws             Exception
 	 * @codeCoverageIgnore Not practical to test, as travis runs on linux
 	 */
 	function is_really_writable(string $file): bool
@@ -687,7 +759,8 @@
 
 			return true;
 		}
-		elseif (! is_file($file) || ( $fp = @fopen($file, 'ab')) === false)
+
+		if (! is_file($file) || ($fp = @fopen($file, 'ab')) === false)
 		{
 			return false;
 		}
@@ -704,9 +777,9 @@
 	 * 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    $locale
+	 * @param string      $line
+	 * @param array       $args
+	 * @param string|null $locale
 	 *
 	 * @return string
 	 */
@@ -733,9 +806,9 @@
 	 *  - info
 	 *  - debug
 	 *
-	 * @param string     $level
-	 * @param string     $message
-	 * @param array|null $context
+	 * @param string $level
+	 * @param string $message
+	 * @param array  $context
 	 *
 	 * @return mixed
 	 */
@@ -761,7 +834,7 @@
 if (! function_exists('model'))
 {
 	/**
-	 * More simple way of getting model instances
+	 * More simple way of getting model instances from Factories
 	 *
 	 * @param string                   $name
 	 * @param boolean                  $getShared
@@ -771,7 +844,7 @@
 	 */
 	function model(string $name, bool $getShared = true, ConnectionInterface &$conn = null)
 	{
-		return \CodeIgniter\Database\ModelFactory::get($name, $getShared, $conn);
+		return Factories::models($name, ['getShared' => $getShared], $conn);
 	}
 }
 
@@ -832,17 +905,17 @@
 	 *
 	 * If more control is needed, you must use $response->redirect explicitly.
 	 *
-	 * @param string $uri
+	 * @param string $route
 	 *
-	 * @return \CodeIgniter\HTTP\RedirectResponse
+	 * @return RedirectResponse
 	 */
-	function redirect(string $uri = null): RedirectResponse
+	function redirect(string $route = null): RedirectResponse
 	{
-		$response = Services::redirectResponse(null, true);
+		$response = Services::redirectresponse(null, true);
 
-		if (! empty($uri))
+		if (! empty($route))
 		{
-			return $response->route($uri);
+			return $response->route($route);
 		}
 
 		return $response;
@@ -897,7 +970,7 @@
 	 * have a route defined in the routes Config file.
 	 *
 	 * @param string $method
-	 * @param array  ...$params
+	 * @param mixed  ...$params
 	 *
 	 * @return false|string
 	 */
@@ -919,7 +992,7 @@
 	 *
 	 * @param string $val
 	 *
-	 * @return \CodeIgniter\Session\Session|mixed|null
+	 * @return Session|mixed|null
 	 */
 	function session(string $val = null)
 	{
@@ -961,7 +1034,6 @@
 if (! function_exists('single_service'))
 {
 	/**
-	 * Allow cleaner access to a Service.
 	 * Always returns a new instance of the class.
 	 *
 	 * @param string     $name
@@ -971,10 +1043,36 @@
 	 */
 	function single_service(string $name, ...$params)
 	{
-		// Ensure it's NOT a shared instance
-		array_push($params, false);
+		$service = Services::serviceExists($name);
 
-		return Services::$name(...$params);
+		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);
 	}
 }
 
@@ -1051,7 +1149,7 @@
 	 *
 	 * @param string|null $name
 	 *
-	 * @return \CodeIgniter\Debug\Timer|mixed
+	 * @return Timer|mixed
 	 */
 	function timer(string $name = null)
 	{
@@ -1132,7 +1230,7 @@
 	 * @param string|null $cacheName
 	 *
 	 * @return string
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	function view_cell(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
 	{
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 6ebb122..aae11ba 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -1,45 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
 
 use ReflectionClass;
+use ReflectionException;
 
 /**
  * ComposerScripts
@@ -50,14 +23,13 @@
  * download
  *
  * @codeCoverageIgnore
- * @package            CodeIgniter
  */
 class ComposerScripts
 {
 	/**
 	 * Base path to use.
 	 *
-	 * @var type
+	 * @var string
 	 */
 	protected static $basePath = 'ThirdParty/';
 
@@ -66,7 +38,7 @@
 	 * the bare-minimum required files for our dependencies
 	 * to appropriate locations.
 	 *
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public static function postUpdate()
 	{
@@ -111,7 +83,7 @@
 	 * @param string $class
 	 *
 	 * @return string
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	protected static function getClassFilePath(string $class)
 	{
@@ -125,7 +97,7 @@
 	/**
 	 * A recursive remove directory method.
 	 *
-	 * @param $dir
+	 * @param string $dir
 	 */
 	protected static function removeDir($dir)
 	{
@@ -156,9 +128,9 @@
 		$dir = opendir($source);
 		@mkdir($dest);
 
-		while (false !== ( $file = readdir($dir)))
+		while (false !== ($file = readdir($dir)))
 		{
-			if (( $file !== '.' ) && ( $file !== '..' ))
+			if (($file !== '.') && ($file !== '..'))
 			{
 				if (is_dir($source . '/' . $file))
 				{
@@ -178,7 +150,7 @@
 	 * Moves the Laminas Escaper files into our base repo so that it's
 	 * available for packaged releases where the users don't user Composer.
 	 *
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public static function moveEscaper()
 	{
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 349fcb0..8a74697 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -1,52 +1,54 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
 
 /**
- * AUTO-LOADER
+ * AUTOLOADER
  *
  * This file defines the namespaces and class maps so the Autoloader
  * can find the files as needed.
  */
 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
+	 */
+	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
+	 */
+	public $classmap = [];
 
 	/**
 	 * -------------------------------------------------------------------
@@ -63,7 +65,7 @@
 	 */
 	protected $corePsr4 = [
 		'CodeIgniter' => SYSTEMPATH,
-		'App'         => APPPATH // To ensure filters, etc still found,
+		'App'         => APPPATH, // To ensure filters, etc still found,
 	];
 
 	/**
@@ -87,7 +89,7 @@
 		'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'
+		'Laminas\Escaper\Escaper'          => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
 	];
 
 	//--------------------------------------------------------------------
@@ -102,12 +104,12 @@
 	{
 		if (isset($_SERVER['CI_ENVIRONMENT']) && $_SERVER['CI_ENVIRONMENT'] === 'testing')
 		{
-			$this->psr4['Tests\Support'] = SUPPORTPATH;
+			$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->psr4     = array_merge($this->corePsr4, $this->psr4);
+		$this->classmap = array_merge($this->coreClassmap, $this->classmap);
 	}
 }
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 256f376..4245a74 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -1,45 +1,23 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
 
+use Config\Encryption;
+use Config\Modules;
+use Config\Services;
+use ReflectionClass;
+use ReflectionException;
+use RuntimeException;
+
 /**
  * Class BaseConfig
  *
@@ -51,7 +29,6 @@
  */
 class BaseConfig
 {
-
 	/**
 	 * An optional array of classes that will act as Registrars
 	 * for rapidly setting config class properties.
@@ -70,7 +47,7 @@
 	/**
 	 * The modules configuration.
 	 *
-	 * @var type
+	 * @var Modules
 	 */
 	protected static $moduleConfig;
 
@@ -85,7 +62,7 @@
 		static::$moduleConfig = config('Modules');
 
 		$properties  = array_keys(get_object_vars($this));
-		$prefix      = get_class($this);
+		$prefix      = static::class;
 		$slashAt     = strrpos($prefix, '\\');
 		$shortPrefix = strtolower(substr($prefix, $slashAt === false ? 0 : $slashAt + 1));
 
@@ -93,28 +70,28 @@
 		{
 			$this->initEnvValue($this->$property, $property, $prefix, $shortPrefix);
 
-			// Handle hex2bin prefix
-                      if ($shortPrefix === 'encryption' && $property === 'key' && strpos($this->$property, 'hex2bin:') === 0)
+			if ($this instanceof Encryption && $property === 'key')
 			{
-				$this->$property = hex2bin(substr($this->$property, 8));
+				// Handle hex2bin prefix
+				if (strpos($this->$property, 'hex2bin:') === 0)
+				{
+					$this->$property = hex2bin(substr($this->$property, 8));
+				}
+				// Handle base64 prefix
+				elseif (strpos($this->$property, 'base64:') === 0)
+				{
+					$this->$property = base64_decode(substr($this->$property, 7), true);
+				}
 			}
 		}
 
-		if (defined('ENVIRONMENT') && ENVIRONMENT !== 'testing')
-		{
-			// well, this won't happen during unit testing
-			// @codeCoverageIgnoreStart
-			$this->registerProperties();
-			// @codeCoverageIgnoreEnd
-		}
+		$this->registerProperties();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Initialization an environment-specific configuration setting
 	 *
-	 * @param mixed  &$property
+	 * @param mixed  $property
 	 * @param string $name
 	 * @param string $prefix
 	 * @param string $shortPrefix
@@ -152,8 +129,6 @@
 		return $property;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Retrieve an environment-specific configuration setting
 	 *
@@ -182,13 +157,11 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Provides external libraries a simple way to register one or more
 	 * options into a config file.
 	 *
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	protected function registerProperties()
 	{
@@ -199,7 +172,7 @@
 
 		if (! static::$didDiscovery)
 		{
-			$locator         = \Config\Services::locator();
+			$locator         = Services::locator();
 			$registrarsFiles = $locator->search('Config/Registrar.php');
 
 			foreach ($registrarsFiles as $file)
@@ -211,7 +184,7 @@
 			static::$didDiscovery = true;
 		}
 
-		$shortName = (new \ReflectionClass($this))->getShortName();
+		$shortName = (new ReflectionClass($this))->getShortName();
 
 		// Check the registrar class for a method named after this class' shortName
 		foreach (static::$registrars as $callable)
@@ -219,14 +192,16 @@
 			// 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.');
+				throw new RuntimeException('Registrars must return an array of properties and their values.');
 			}
 
 			foreach ($properties as $property => $value)
@@ -242,6 +217,4 @@
 			}
 		}
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 65aceb1..bdcb269 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -62,7 +35,6 @@
  */
 class BaseService
 {
-
 	/**
 	 * Cache for instance of any services that
 	 * have been requested as a "shared" instance.
@@ -70,30 +42,35 @@
 	 *
 	 * @var array
 	 */
-	static protected $instances = [];
+	protected static $instances = [];
 
 	/**
 	 * Mock objects for testing which are returned if exist.
 	 *
 	 * @var array
 	 */
-	static protected $mocks = [];
+	protected static $mocks = [];
 
 	/**
 	 * Have we already discovered other Services?
 	 *
 	 * @var boolean
 	 */
-	static protected $discovered = false;
+	protected static $discovered = false;
 
 	/**
 	 * A cache of other service classes we've found.
 	 *
 	 * @var array
 	 */
-	static protected $services = [];
+	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.
@@ -126,15 +103,13 @@
 		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 \CodeIgniter\Autoloader\Autoloader
+	 * @return Autoloader
 	 */
 	public static function autoloader(bool $getShared = true)
 	{
@@ -151,8 +126,6 @@
 		return new Autoloader();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * The file locator provides utility methods for looking for non-classes
 	 * within namespaced folders, as well as convenience methods for
@@ -160,7 +133,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Autoloader\FileLocator
+	 * @return FileLocator
 	 */
 	public static function locator(bool $getShared = true)
 	{
@@ -168,19 +141,15 @@
 		{
 			if (empty(static::$instances['locator']))
 			{
-				static::$instances['locator'] = new FileLocator(
-					static::autoloader()
-				);
+				static::$instances['locator'] = new FileLocator(static::autoloader());
 			}
 
-			return static::$instances['locator'];
+			return static::$mocks['locator'] ?? static::$instances['locator'];
 		}
 
 		return new FileLocator(static::autoloader());
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Provides the ability to perform case-insensitive calling of service
 	 * names.
@@ -192,51 +161,68 @@
 	 */
 	public static function __callStatic(string $name, array $arguments)
 	{
-		$name = strtolower($name);
+		$service = static::serviceExists($name);
 
-		if (method_exists(Services::class, $name))
+		if ($service === null)
 		{
-			return Services::$name(...$arguments);
+			return null;
 		}
 
-		return static::discoverServices($name, $arguments);
+		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 $init_autoloader Initializes autoloader instance
+	 * @param boolean $initAutoloader Initializes autoloader instance
 	 */
-	public static function reset(bool $init_autoloader = false)
+	public static function reset(bool $initAutoloader = false)
 	{
-		static::$mocks = [];
-
+		static::$mocks     = [];
 		static::$instances = [];
 
-		if ($init_autoloader)
+		if ($initAutoloader)
 		{
 			static::autoloader()->initialize(new Autoload(), new Modules());
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Inject mock object for testing.
 	 *
 	 * @param string $name
-	 * @param $mock
+	 * @param mixed  $mock
 	 */
 	public static function injectMock(string $name, $mock)
 	{
-		$name                 = strtolower($name);
-		static::$mocks[$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
@@ -247,6 +233,10 @@
 	 * @param array  $arguments
 	 *
 	 * @return mixed
+	 *
+	 * @deprecated
+	 *
+	 * @codeCoverageIgnore
 	 */
 	protected static function discoverServices(string $name, array $arguments)
 	{
@@ -270,7 +260,7 @@
 				{
 					$classname = $locator->getClassname($file);
 
-					if (! in_array($classname, ['CodeIgniter\\Config\\Services']))
+					if (! in_array($classname, ['CodeIgniter\\Config\\Services'], true))
 					{
 						static::$services[] = new $classname();
 					}
@@ -289,7 +279,7 @@
 		// Try to find the desired service method
 		foreach (static::$services as $class)
 		{
-			if (method_exists(get_class($class), $name))
+			if (method_exists($class, $name))
 			{
 				return $class::$name(...$arguments);
 			}
@@ -297,4 +287,32 @@
 
 		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 1e425d3..1265c35 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -42,21 +14,11 @@
 /**
  * Class Config
  *
- * @package CodeIgniter\Config
+ * @deprecated Use CodeIgniter\Config\Factories::config()
  */
 class Config
 {
 	/**
-	 * Cache for instance of any configurations that
-	 * have been requested as "shared" instance.
-	 *
-	 * @var array
-	 */
-	static private $instances = [];
-
-	//--------------------------------------------------------------------
-
-	/**
 	 * Create new configuration instances or return
 	 * a shared instance
 	 *
@@ -67,95 +29,25 @@
 	 */
 	public static function get(string $name, bool $getShared = true)
 	{
-		$class = $name;
-		if (($pos = strrpos($name, '\\')) !== false)
-		{
-			$class = substr($name, $pos + 1);
-		}
-
-		if (! $getShared)
-		{
-			return self::createClass($name);
-		}
-
-		if (! isset( self::$instances[$class] ))
-		{
-			self::$instances[$class] = self::createClass($name);
-		}
-		return self::$instances[$class];
+		return Factories::config($name, ['getShared' => $getShared]);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Helper method for injecting mock instances while testing.
 	 *
-	 * @param string   $class
-	 * @param $instance
+	 * @param string $name
+	 * @param object $instance
 	 */
-	public static function injectMock(string $class, $instance)
+	public static function injectMock(string $name, $instance)
 	{
-		self::$instances[$class] = $instance;
+		Factories::injectMock('config', $name, $instance);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Resets the instances array
+	 * Resets the static arrays
 	 */
 	public static function reset()
 	{
-		static::$instances = [];
+		Factories::reset('config');
 	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Find configuration class and create instance
-	 *
-	 * @param string $name Classname
-	 *
-	 * @return mixed|null
-	 */
-	private static function createClass(string $name)
-	{
-		if (class_exists($name))
-		{
-			return new $name();
-		}
-
-		$locator = Services::locator();
-		$file    = $locator->locateFile($name, 'Config');
-
-		if (empty($file))
-		{
-			// No file found - check if the class was namespaced
-			if (strpos($name, '\\') !== false)
-			{
-				// Class was namespaced and locateFile couldn't find it
-				return null;
-			}
-
-			// Check all namespaces
-			$files = $locator->search('Config/' . $name);
-			if (empty($files))
-			{
-				return null;
-			}
-
-			// Get the first match (prioritizes user and framework)
-			$file = reset($files);
-		}
-
-		$name = $locator->getClassname($file);
-
-		if (empty($name))
-		{
-			return null;
-		}
-
-		return new $name();
-	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 2b7d912..bb7c4cc 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -1,50 +1,23 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
 
+use InvalidArgumentException;
+
 /**
  * Environment-specific configuration
  */
 class DotEnv
 {
-
 	/**
 	 * The directory where the .env file can be located.
 	 *
@@ -99,7 +72,7 @@
 		// Ensure the file is readable
 		if (! is_readable($this->path))
 		{
-			throw new \InvalidArgumentException("The .env file is not readable: {$this->path}");
+			throw new InvalidArgumentException("The .env file is not readable: {$this->path}");
 		}
 
 		$vars = [];
@@ -142,10 +115,12 @@
 		{
 			putenv("$name=$value");
 		}
+
 		if (empty($_ENV[$name]))
 		{
 			$_ENV[$name] = $value;
 		}
+
 		if (empty($_SERVER[$name]))
 		{
 			$_SERVER[$name] = $value;
@@ -165,7 +140,7 @@
 	 */
 	public function normaliseVariable(string $name, string $value = ''): array
 	{
-		// Split our compound string into it's parts.
+		// Split our compound string into its parts.
 		if (strpos($name, '=') !== false)
 		{
 			list($name, $value) = explode('=', $name, 2);
@@ -182,12 +157,6 @@
 
 		$value = $this->resolveNestedVariables($value);
 
-		// Handle hex2bin prefix
-              if ($name === 'encryption.key' && strpos($value, 'hex2bin:') === 0)
-		{
-			$value = hex2bin(substr($value, 8));
-		}
-
 		return [
 			$name,
 			$value,
@@ -205,7 +174,7 @@
 	 * @param string $value
 	 *
 	 * @return string
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 */
 	protected function sanitizeValue(string $value): string
 	{
@@ -233,9 +202,10 @@
 					.*$           # 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);
+
+			$value = preg_replace($regexPattern, '$1', $value);
+			$value = str_replace("\\$quote", $quote, $value);
+			$value = str_replace('\\\\', '\\', $value);
 		}
 		else
 		{
@@ -246,7 +216,7 @@
 			// Unquoted values cannot contain whitespace
 			if (preg_match('/\s+/', $value) > 0)
 			{
-				throw new \InvalidArgumentException('.env values containing spaces must be surrounded by quotes.');
+				throw new InvalidArgumentException('.env values containing spaces must be surrounded by quotes.');
 			}
 		}
 
@@ -264,7 +234,7 @@
 	 * This was borrowed from the excellent phpdotenv with very few changes.
 	 * https://github.com/vlucas/phpdotenv
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return string
 	 */
@@ -272,12 +242,10 @@
 	{
 		if (strpos($value, '$') !== false)
 		{
-			$loader = $this;
-
 			$value = preg_replace_callback(
 				'/\${([a-zA-Z0-9_]+)}/',
-				function ($matchedPatterns) use ($loader) {
-					$nestedVariable = $loader->getVariable($matchedPatterns[1]);
+				function ($matchedPatterns) {
+					$nestedVariable = $this->getVariable($matchedPatterns[1]);
 
 					if (is_null($nestedVariable))
 					{
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
new file mode 100644
index 0000000..b4c6877
--- /dev/null
+++ b/system/Config/Factories.php
@@ -0,0 +1,358 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+use Config\Services;
+
+/**
+ * Factories for creating instances.
+ *
+ * Factories allows dynamic loading of components by their path
+ * and name. The "shared instance" implementation provides a
+ * large performance boost and helps keep code clean of lengthy
+ * instantiation checks.
+ *
+ * @method static \CodeIgniter\Model models(...$arguments)
+ * @method static \Config\BaseConfig config(...$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];
+		}
+		else
+		{
+			// 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
+		else
+		{
+			// Check all namespaces, prioritizing App and modules
+			if (! $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];
+		}
+
+		// Handle Config as a special case to prevent logic loops
+		if ($component === 'config')
+		{
+			$values = self::$configOptions;
+		}
+		// Load values from the best Factory configuration (will include Registrars)
+		else
+		{
+			$values = 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;
+	}
+}
diff --git a/system/Config/Factory.php b/system/Config/Factory.php
new file mode 100644
index 0000000..94fe7ad
--- /dev/null
+++ b/system/Config/Factory.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * Factories Configuration file.
+ *
+ * Provides overriding directives for how
+ * Factories should handle discovery and
+ * instantiation of specific components.
+ * Each property should correspond to the
+ * lowercase, plural component name.
+ */
+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,
+	];
+
+	/**
+	 * 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 11d0f6c..4f08953 100644
--- a/system/Config/ForeignCharacters.php
+++ b/system/Config/ForeignCharacters.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -47,7 +19,6 @@
 	/**
 	 * Without further ado, the list of foreign characters.
 	 */
-
 	public $characterList = [
 		'/ä|æ|ǽ/'                                                     => 'ae',
 		'/ö|œ/'                                                       => 'oe',
@@ -139,5 +110,4 @@
 		'/Я/'                                                         => 'Ya',
 		'/я/'                                                         => 'ya',
 	];
-
 }
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index c891ec3..1cab0bb 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 use CodeIgniter\Exceptions\PageNotFoundException;
@@ -47,8 +20,14 @@
  * It is called by Config\Routes, and has the $routes RouteCollection
  * already loaded up and ready for us to use.
  */
+
 // Prevent access to BaseController
-$routes->add('basecontroller(:any)', function () {
+$routes->add('BaseController(:any)', function () {
+	throw PageNotFoundException::forPageNotFound();
+});
+
+// Prevent access to initController method
+$routes->add('(:any)/initController', function () {
 	throw PageNotFoundException::forPageNotFound();
 });
 
@@ -59,8 +38,3 @@
 
 // CLI Catchall - uses a _remap to call Commands
 $routes->cli('ci(:any)', '\CodeIgniter\CLI\CommandRunner::index/$1');
-
-// Prevent access to initController method
-$routes->add('(:any)/initController', function () {
-	throw PageNotFoundException::forPageNotFound();
-});
diff --git a/system/Config/Services.php b/system/Config/Services.php
index b3c9854..6f8b4ba 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -1,53 +1,30 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Cache\CacheFactory;
+use CodeIgniter\Cache\CacheInterface;
+use CodeIgniter\CLI\Commands;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Debug\Exceptions;
 use CodeIgniter\Debug\Iterator;
 use CodeIgniter\Debug\Timer;
 use CodeIgniter\Debug\Toolbar;
+use CodeIgniter\Email\Email;
 use CodeIgniter\Encryption\EncrypterInterface;
 use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Filters\Filters;
+use CodeIgniter\Format\Format;
 use CodeIgniter\Honeypot\Honeypot;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\CURLRequest;
@@ -60,7 +37,9 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Images\Handlers\BaseHandler;
 use CodeIgniter\Language\Language;
+use CodeIgniter\Log\Logger;
 use CodeIgniter\Pager\Pager;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Router\RouteCollectionInterface;
@@ -73,11 +52,21 @@
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Parser;
 use CodeIgniter\View\RendererInterface;
+use CodeIgniter\View\View;
 use Config\App;
 use Config\Cache;
+use Config\Email as EmailConfig;
+use Config\Encryption as EncryptionConfig;
+use Config\Exceptions as ExceptionsConfig;
+use Config\Filters as FiltersConfig;
+use Config\Format as FormatConfig;
+use Config\Honeypot as HoneypotConfig;
 use Config\Images;
-use Config\Logger;
 use Config\Migrations;
+use Config\Pager as PagerConfig;
+use Config\Toolbar as ToolbarConfig;
+use Config\Validation as ValidationConfig;
+use Config\View as ViewConfig;
 
 /**
  * Services Configuration file.
@@ -98,15 +87,14 @@
  */
 class Services extends BaseService
 {
-
 	/**
 	 * The cache class provides a simple way to store and retrieve
 	 * complex data for later.
 	 *
-	 * @param \Config\Cache $config
-	 * @param boolean       $getShared
+	 * @param Cache|null $config
+	 * @param boolean    $getShared
 	 *
-	 * @return \CodeIgniter\Cache\CacheInterface
+	 * @return CacheInterface
 	 */
 	public static function cache(Cache $config = null, bool $getShared = true)
 	{
@@ -115,10 +103,7 @@
 			return static::getSharedInstance('cache', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = new Cache();
-		}
+		$config = $config ?? new Cache();
 
 		return CacheFactory::getHandler($config);
 	}
@@ -129,10 +114,10 @@
 	 * The CLI Request class provides for ways to interact with
 	 * a command line request.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\CLIRequest
+	 * @return CLIRequest
 	 */
 	public static function clirequest(App $config = null, bool $getShared = true)
 	{
@@ -141,10 +126,7 @@
 			return static::getSharedInstance('clirequest', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
+		$config = $config ?? config('App');
 
 		return new CLIRequest($config);
 	}
@@ -156,7 +138,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\CLI\Commands|mixed
+	 * @return Commands
 	 */
 	public static function commands(bool $getShared = true)
 	{
@@ -165,19 +147,19 @@
 			return static::getSharedInstance('commands');
 		}
 
-		return new \CodeIgniter\CLI\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 \CodeIgniter\HTTP\ResponseInterface $response
-	 * @param \Config\App                         $config
-	 * @param boolean                             $getShared
+	 * @param array                  $options
+	 * @param ResponseInterface|null $response
+	 * @param App|null               $config
+	 * @param boolean                $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\CURLRequest
+	 * @return CURLRequest
 	 */
 	public static function curlrequest(array $options = [], ResponseInterface $response = null, App $config = null, bool $getShared = true)
 	{
@@ -186,21 +168,14 @@
 			return static::getSharedInstance('curlrequest', $options, $response, $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
-
-		if (! is_object($response))
-		{
-			$response = new Response($config);
-		}
+		$config   = $config ?? config('App');
+		$response = $response ?? new Response($config);
 
 		return new CURLRequest(
-				$config,
-				new URI($options['base_uri'] ?? null),
-				$response,
-				$options
+			$config,
+			new URI($options['base_uri'] ?? null),
+			$response,
+			$options
 		);
 	}
 
@@ -209,10 +184,10 @@
 	/**
 	 * The Email class allows you to send email via mail, sendmail, SMTP.
 	 *
-	 * @param null    $config
-	 * @param boolean $getShared
+	 * @param EmailConfig|array|null $config
+	 * @param boolean                $getShared
 	 *
-	 * @return \CodeIgniter\Email\Email|mixed
+	 * @return Email|mixed
 	 */
 	public static function email($config = null, bool $getShared = true)
 	{
@@ -220,34 +195,33 @@
 		{
 			return static::getSharedInstance('email', $config);
 		}
-		if (empty($config))
+
+		if (empty($config) || ! (is_array($config) || $config instanceof EmailConfig))
 		{
-			$config = new \Config\Email();
+			$config = config('Email');
 		}
-		return new \CodeIgniter\Email\Email($config);
+
+		return new Email($config);
 	}
 
 	/**
 	 * The Encryption class provides two-way encryption.
 	 *
-	 * @param mixed   $config
-	 * @param boolean $getShared
+	 * @param EncryptionConfig|null $config
+	 * @param boolean               $getShared
 	 *
 	 * @return EncrypterInterface Encryption handler
 	 */
-	public static function encrypter($config = null, $getShared = false)
+	public static function encrypter(EncryptionConfig $config = null, $getShared = false)
 	{
 		if ($getShared === true)
 		{
 			return static::getSharedInstance('encrypter', $config);
 		}
 
-		if (empty($config))
-		{
-			$config = new \Config\Encryption();
-		}
-
+		$config     = $config ?? config('Encryption');
 		$encryption = new Encryption($config);
+
 		return $encryption->initialize($config);
 	}
 
@@ -260,15 +234,15 @@
 	 *  - set_error_handler
 	 *  - register_shutdown_function
 	 *
-	 * @param \Config\Exceptions                $config
-	 * @param \CodeIgniter\HTTP\IncomingRequest $request
-	 * @param \CodeIgniter\HTTP\Response        $response
-	 * @param boolean                           $getShared
+	 * @param ExceptionsConfig|null $config
+	 * @param IncomingRequest|null  $request
+	 * @param Response|null         $response
+	 * @param boolean               $getShared
 	 *
-	 * @return \CodeIgniter\Debug\Exceptions
+	 * @return Exceptions
 	 */
 	public static function exceptions(
-		\Config\Exceptions $config = null,
+		ExceptionsConfig $config = null,
 		IncomingRequest $request = null,
 		Response $response = null,
 		bool $getShared = true
@@ -279,22 +253,11 @@
 			return static::getSharedInstance('exceptions', $config, $request, $response);
 		}
 
-		if (empty($config))
-		{
-			$config = new \Config\Exceptions();
-		}
+		$config   = $config ?? config('Exceptions');
+		$request  = $request ?? static::request();
+		$response = $response ?? static::response();
 
-		if (empty($request))
-		{
-			$request = static::request();
-		}
-
-		if (empty($response))
-		{
-			$response = static::response();
-		}
-
-		return (new Exceptions($config, $request, $response));
+		return new Exceptions($config, $request, $response);
 	}
 
 	//--------------------------------------------------------------------
@@ -305,22 +268,19 @@
 	 * 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 mixed   $config
-	 * @param boolean $getShared
+	 * @param FiltersConfig|null $config
+	 * @param boolean            $getShared
 	 *
-	 * @return \CodeIgniter\Filters\Filters
+	 * @return Filters
 	 */
-	public static function filters($config = null, bool $getShared = true)
+	public static function filters(FiltersConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('filters', $config);
 		}
 
-		if (empty($config))
-		{
-			$config = new \Config\Filters();
-		}
+		$config = $config ?? config('Filters');
 
 		return new Filters($config, static::request(), static::response());
 	}
@@ -328,25 +288,44 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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 \CodeIgniter\Config\BaseConfig|null $config
-	 * @param boolean                             $getShared
+	 * @param HoneypotConfig|null $config
+	 * @param boolean             $getShared
 	 *
-	 * @return \CodeIgniter\Honeypot\Honeypot|mixed
+	 * @return Honeypot
 	 */
-	public static function honeypot(BaseConfig $config = null, bool $getShared = true)
+	public static function honeypot(HoneypotConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('honeypot', $config);
 		}
 
-		if (is_null($config))
-		{
-			$config = new \Config\Honeypot();
-		}
+		$config = $config ?? config('Honeypot');
 
 		return new Honeypot($config);
 	}
@@ -357,27 +336,22 @@
 	 * 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 \Config\Images|null $config
-	 * @param boolean             $getShared
+	 * @param string|null $handler
+	 * @param Images|null $config
+	 * @param boolean     $getShared
 	 *
-	 * @return \CodeIgniter\Images\Handlers\BaseHandler
+	 * @return BaseHandler
 	 */
-	public static function image(string $handler = null, $config = null, bool $getShared = true)
+	public static function image(string $handler = null, Images $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('image', $handler, $config);
 		}
 
-		if (empty($config))
-		{
-			$config = new Images();
-		}
-
-		$handler = is_null($handler) ? $config->defaultHandler : $handler;
-
-		$class = $config->handlers[$handler];
+		$config  = $config ?? config('Images');
+		$handler = $handler ?: $config->defaultHandler;
+		$class   = $config->handlers[$handler];
 
 		return new $class($config);
 	}
@@ -391,7 +365,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Debug\Iterator
+	 * @return Iterator
 	 */
 	public static function iterator(bool $getShared = true)
 	{
@@ -408,21 +382,20 @@
 	/**
 	 * Responsible for loading the language string translations.
 	 *
-	 * @param string  $locale
-	 * @param boolean $getShared
+	 * @param string|null $locale
+	 * @param boolean     $getShared
 	 *
-	 * @return \CodeIgniter\Language\Language
+	 * @return Language
 	 */
 	public static function language(string $locale = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
-			return static::getSharedInstance('language', $locale)
-							->setLocale($locale);
+			return static::getSharedInstance('language', $locale)->setLocale($locale);
 		}
 
-		$locale = ! empty($locale) ? $locale : static::request()
-						->getLocale();
+		// Use '?:' for empty string check
+		$locale = $locale ?: static::request()->getLocale();
 
 		return new Language($locale);
 	}
@@ -435,7 +408,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Log\Logger
+	 * @return Logger
 	 */
 	public static function logger(bool $getShared = true)
 	{
@@ -444,7 +417,7 @@
 			return static::getSharedInstance('logger');
 		}
 
-		return new \CodeIgniter\Log\Logger(new Logger());
+		return new Logger(config('Logger'));
 	}
 
 	//--------------------------------------------------------------------
@@ -452,20 +425,20 @@
 	/**
 	 * Return the appropriate Migration runner.
 	 *
-	 * @param \CodeIgniter\Config\BaseConfig            $config
-	 * @param \CodeIgniter\Database\ConnectionInterface $db
-	 * @param boolean                                   $getShared
+	 * @param Migrations|null          $config
+	 * @param ConnectionInterface|null $db
+	 * @param boolean                  $getShared
 	 *
-	 * @return \CodeIgniter\Database\MigrationRunner
+	 * @return MigrationRunner
 	 */
-	public static function migrations(BaseConfig $config = null, ConnectionInterface $db = null, bool $getShared = true)
+	public static function migrations(Migrations $config = null, ConnectionInterface $db = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('migrations', $config, $db);
 		}
 
-		$config = empty($config) ? new Migrations() : $config;
+		$config = $config ?? config('Migrations');
 
 		return new MigrationRunner($config, $db);
 	}
@@ -477,10 +450,10 @@
 	 * working the request to determine correct language, encoding, charset,
 	 * and more.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
-	 * @param boolean                            $getShared
+	 * @param RequestInterface|null $request
+	 * @param boolean               $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\Negotiate
+	 * @return Negotiate
 	 */
 	public static function negotiator(RequestInterface $request = null, bool $getShared = true)
 	{
@@ -489,10 +462,7 @@
 			return static::getSharedInstance('negotiator', $request);
 		}
 
-		if (is_null($request))
-		{
-			$request = static::request();
-		}
+		$request = $request ?? static::request();
 
 		return new Negotiate($request);
 	}
@@ -502,28 +472,21 @@
 	/**
 	 * Return the appropriate pagination handler.
 	 *
-	 * @param mixed                               $config
-	 * @param \CodeIgniter\View\RendererInterface $view
-	 * @param boolean                             $getShared
+	 * @param PagerConfig|null       $config
+	 * @param RendererInterface|null $view
+	 * @param boolean                $getShared
 	 *
-	 * @return \CodeIgniter\Pager\Pager
+	 * @return Pager
 	 */
-	public static function pager($config = null, RendererInterface $view = null, bool $getShared = true)
+	public static function pager(PagerConfig $config = null, RendererInterface $view = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('pager', $config, $view);
 		}
 
-		if (empty($config))
-		{
-			$config = config('Pager');
-		}
-
-		if (! $view instanceof RendererInterface)
-		{
-			$view = static::renderer();
-		}
+		$config = $config ?? config('Pager');
+		$view   = $view ?? static::renderer();
 
 		return new Pager($config, $view);
 	}
@@ -533,29 +496,21 @@
 	/**
 	 * The Parser is a simple template parser.
 	 *
-	 * @param string  $viewPath
-	 * @param mixed   $config
-	 * @param boolean $getShared
+	 * @param string|null     $viewPath
+	 * @param ViewConfig|null $config
+	 * @param boolean         $getShared
 	 *
-	 * @return \CodeIgniter\View\Parser
+	 * @return Parser
 	 */
-	public static function parser(string $viewPath = null, $config = null, bool $getShared = true)
+	public static function parser(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('parser', $viewPath, $config);
 		}
 
-		if (is_null($config))
-		{
-			$config = new \Config\View();
-		}
-
-		if (is_null($viewPath))
-		{
-			$paths    = config('Paths');
-			$viewPath = $paths->viewDirectory;
-		}
+		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
+		$config   = $config ?? config('View');
 
 		return new Parser($config, $viewPath, static::locator(), CI_DEBUG, static::logger());
 	}
@@ -567,32 +522,23 @@
 	 * 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  $viewPath
-	 * @param mixed   $config
-	 * @param boolean $getShared
+	 * @param string|null     $viewPath
+	 * @param ViewConfig|null $config
+	 * @param boolean         $getShared
 	 *
-	 * @return \CodeIgniter\View\View
+	 * @return View
 	 */
-	public static function renderer(string $viewPath = null, $config = null, bool $getShared = true)
+	public static function renderer(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('renderer', $viewPath, $config);
 		}
 
-		if (is_null($config))
-		{
-			$config = new \Config\View();
-		}
+		$viewPath = $viewPath ?: config('Paths')->viewDirectory;
+		$config   = $config ?? config('View');
 
-		if (is_null($viewPath))
-		{
-			$paths = config('Paths');
-
-			$viewPath = $paths->viewDirectory;
-		}
-
-		return new \CodeIgniter\View\View($config, $viewPath, static::locator(), CI_DEBUG, static::logger());
+		return new View($config, $viewPath, static::locator(), CI_DEBUG, static::logger());
 	}
 
 	//--------------------------------------------------------------------
@@ -600,10 +546,10 @@
 	/**
 	 * The Request class models an HTTP request.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\IncomingRequest
+	 * @return IncomingRequest
 	 */
 	public static function request(App $config = null, bool $getShared = true)
 	{
@@ -612,16 +558,13 @@
 			return static::getSharedInstance('request', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
+		$config = $config ?? config('App');
 
 		return new IncomingRequest(
-				$config,
-				static::uri(),
-				'php://input',
-				new UserAgent()
+			$config,
+			static::uri(),
+			'php://input',
+			new UserAgent()
 		);
 	}
 
@@ -630,10 +573,10 @@
 	/**
 	 * The Response class models an HTTP response.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\Response
+	 * @return Response
 	 */
 	public static function response(App $config = null, bool $getShared = true)
 	{
@@ -642,10 +585,7 @@
 			return static::getSharedInstance('response', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
+		$config = $config ?? config('App');
 
 		return new Response($config);
 	}
@@ -655,26 +595,21 @@
 	/**
 	 * The Redirect class provides nice way of working with redirects.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\Response
+	 * @return RedirectResponse
 	 */
-	public static function redirectResponse(App $config = null, bool $getShared = true)
+	public static function redirectresponse(App $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
-			return static::getSharedInstance('redirectResponse', $config);
+			return static::getSharedInstance('redirectresponse', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
-
+		$config   = $config ?? config('App');
 		$response = new RedirectResponse($config);
-		$response->setProtocolVersion(static::request()
-						->getProtocolVersion());
+		$response->setProtocolVersion(static::request()->getProtocolVersion());
 
 		return $response;
 	}
@@ -687,7 +622,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Router\RouteCollection
+	 * @return RouteCollection
 	 */
 	public static function routes(bool $getShared = true)
 	{
@@ -705,11 +640,11 @@
 	 * The Router class uses a RouteCollection's array of routes, and determines
 	 * the correct Controller and Method to execute.
 	 *
-	 * @param \CodeIgniter\Router\RouteCollectionInterface $routes
-	 * @param \CodeIgniter\HTTP\Request                    $request
-	 * @param boolean                                      $getShared
+	 * @param RouteCollectionInterface|null $routes
+	 * @param Request|null                  $request
+	 * @param boolean                       $getShared
 	 *
-	 * @return \CodeIgniter\Router\Router
+	 * @return Router
 	 */
 	public static function router(RouteCollectionInterface $routes = null, Request $request = null, bool $getShared = true)
 	{
@@ -718,10 +653,8 @@
 			return static::getSharedInstance('router', $routes, $request);
 		}
 
-		if (empty($routes))
-		{
-			$routes = static::routes();
-		}
+		$routes  = $routes ?? static::routes();
+		$request = $request ?? static::request();
 
 		return new Router($routes, $request);
 	}
@@ -732,10 +665,10 @@
 	 * The Security class provides a few handy tools for keeping the site
 	 * secure, most notably the CSRF protection tools.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\Security\Security
+	 * @return Security
 	 */
 	public static function security(App $config = null, bool $getShared = true)
 	{
@@ -744,10 +677,7 @@
 			return static::getSharedInstance('security', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
+		$config = $config ?? config('Security') ?? config('App');
 
 		return new Security($config);
 	}
@@ -757,10 +687,10 @@
 	/**
 	 * Return the session manager.
 	 *
-	 * @param \Config\App $config
-	 * @param boolean     $getShared
+	 * @param App|null $config
+	 * @param boolean  $getShared
 	 *
-	 * @return \CodeIgniter\Session\Session
+	 * @return Session
 	 */
 	public static function session(App $config = null, bool $getShared = true)
 	{
@@ -769,11 +699,7 @@
 			return static::getSharedInstance('session', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config(App::class);
-		}
-
+		$config = $config ?? config('App');
 		$logger = static::logger();
 
 		$driverName = $config->sessionDriver;
@@ -799,7 +725,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Throttle\Throttler
+	 * @return Throttler
 	 */
 	public static function throttler(bool $getShared = true)
 	{
@@ -819,7 +745,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Debug\Timer
+	 * @return Timer
 	 */
 	public static function timer(bool $getShared = true)
 	{
@@ -836,22 +762,19 @@
 	/**
 	 * Return the debug toolbar.
 	 *
-	 * @param \Config\Toolbar $config
-	 * @param boolean         $getShared
+	 * @param ToolbarConfig|null $config
+	 * @param boolean            $getShared
 	 *
-	 * @return \CodeIgniter\Debug\Toolbar
+	 * @return Toolbar
 	 */
-	public static function toolbar(\Config\Toolbar $config = null, bool $getShared = true)
+	public static function toolbar(ToolbarConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('toolbar', $config);
 		}
 
-		if (! is_object($config))
-		{
-			$config = config('Toolbar');
-		}
+		$config = $config ?? config('Toolbar');
 
 		return new Toolbar($config);
 	}
@@ -864,7 +787,7 @@
 	 * @param string  $uri
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\HTTP\URI
+	 * @return URI
 	 */
 	public static function uri(string $uri = null, bool $getShared = true)
 	{
@@ -881,22 +804,19 @@
 	/**
 	 * The Validation class provides tools for validating input data.
 	 *
-	 * @param \Config\Validation $config
-	 * @param boolean            $getShared
+	 * @param ValidationConfig|null $config
+	 * @param boolean               $getShared
 	 *
-	 * @return \CodeIgniter\Validation\Validation
+	 * @return Validation
 	 */
-	public static function validation(\Config\Validation $config = null, bool $getShared = true)
+	public static function validation(ValidationConfig $config = null, bool $getShared = true)
 	{
 		if ($getShared)
 		{
 			return static::getSharedInstance('validation', $config);
 		}
 
-		if (is_null($config))
-		{
-			$config = config('Validation');
-		}
+		$config = $config ?? config('Validation');
 
 		return new Validation($config, static::renderer());
 	}
@@ -909,7 +829,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\View\Cell
+	 * @return Cell
 	 */
 	public static function viewcell(bool $getShared = true)
 	{
@@ -928,7 +848,7 @@
 	 *
 	 * @param boolean $getShared
 	 *
-	 * @return \CodeIgniter\Typography\Typography
+	 * @return Typography
 	 */
 	public static function typography(bool $getShared = true)
 	{
@@ -939,6 +859,4 @@
 
 		return new Typography();
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Config/View.php b/system/Config/View.php
index e9cafa6..b57d941 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -44,11 +16,35 @@
  */
 class View extends BaseConfig
 {
+	/**
+	 * When false, the view method will clear the data between each
+	 * call.
+	 *
+	 * @var boolean
+	 */
+	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 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 type
+	 * @var array
 	 */
 	protected $coreFilters = [
 		'abs'            => '\abs',
@@ -77,7 +73,7 @@
 	/**
 	 * Built-in View plugins.
 	 *
-	 * @var type
+	 * @var array
 	 */
 	protected $corePlugins = [
 		'current_url'       => '\CodeIgniter\View\Plugins::currentURL',
@@ -103,5 +99,4 @@
 
 		parent::__construct();
 	}
-
 }
diff --git a/system/Controller.php b/system/Controller.php
index 985d828..3707557 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -1,44 +1,17 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
 
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Validation\Exceptions\ValidationException;
@@ -48,54 +21,46 @@
 
 /**
  * Class Controller
- *
- * @package CodeIgniter
  */
 class Controller
 {
-
 	/**
-	 * An array of helpers to be automatically loaded
-	 * upon class instantiation.
+	 * Helpers that will be automatically loaded on class instantiation.
 	 *
 	 * @var array
 	 */
 	protected $helpers = [];
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Instance of the main Request object.
 	 *
-	 * @var HTTP\IncomingRequest
+	 * @var RequestInterface
 	 */
 	protected $request;
 
 	/**
 	 * Instance of the main response object.
 	 *
-	 * @var HTTP\Response
+	 * @var ResponseInterface
 	 */
 	protected $response;
 
 	/**
 	 * Instance of logger to use.
 	 *
-	 * @var Log\Logger
+	 * @var LoggerInterface
 	 */
 	protected $logger;
 
 	/**
-	 * Whether HTTPS access should be enforced
-	 * for all methods in this controller.
+	 * Should enforce HTTPS access for all methods in this controller.
 	 *
-	 * @var integer  Number of seconds to set HSTS header
+	 * @var integer Number of seconds to set HSTS header
 	 */
 	protected $forceHTTPS = 0;
 
 	/**
-	 * Once validation has been run,
-	 * will hold the Validation instance.
+	 * Once validation has been run, will hold the Validation instance.
 	 *
 	 * @var Validation
 	 */
@@ -106,11 +71,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param RequestInterface         $request
-	 * @param ResponseInterface        $response
-	 * @param \Psr\Log\LoggerInterface $logger
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
 	 *
-	 * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @throws HTTPException
 	 */
 	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
 	{
@@ -123,7 +88,8 @@
 			$this->forceHTTPS($this->forceHTTPS);
 		}
 
-		$this->loadHelpers();
+		// Autoload helper files.
+		helper($this->helpers);
 	}
 
 	//--------------------------------------------------------------------
@@ -138,7 +104,7 @@
 	 *                          considered secure for. Only with HSTS header.
 	 *                          Default value is 1 year.
 	 *
-	 * @throws \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @throws HTTPException
 	 */
 	protected function forceHTTPS(int $duration = 31536000)
 	{
@@ -148,8 +114,8 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Provides a simple way to tie into the main CodeIgniter class
-	 * and tell it how long to cache the current page for.
+	 * 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
 	 */
@@ -162,6 +128,8 @@
 
 	/**
 	 * Handles "auto-loading" helper files.
+	 *
+	 * @deprecated Use `helper` function instead of using this method.
 	 */
 	protected function loadHelpers()
 	{
@@ -170,10 +138,7 @@
 			return;
 		}
 
-		foreach ($this->helpers as $helper)
-		{
-			helper($helper);
-		}
+		helper($this->helpers);
 	}
 
 	//--------------------------------------------------------------------
@@ -213,11 +178,6 @@
 			$rules = $validation->$rules;
 		}
 
-		return $this->validator
-			->withRequest($this->request)
-			->setRules($rules, $messages)
-			->run();
+		return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 9e2f3eb..2eb2ab4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -42,6 +14,7 @@
 use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
+use InvalidArgumentException;
 
 /**
  * Class BaseBuilder
@@ -50,12 +23,10 @@
  * Database-specific Builders might need to override
  * certain methods to make them work.
  *
- * @package CodeIgniter\Database
- * @mixin   \CodeIgniter\Model
+ * @mixin \CodeIgniter\Model
  */
 class BaseBuilder
 {
-
 	/**
 	 * Reset DELETE data flag
 	 *
@@ -122,21 +93,21 @@
 	/**
 	 * QB LIMIT data
 	 *
-	 * @var integer
+	 * @var integer|boolean
 	 */
 	protected $QBLimit = false;
 
 	/**
 	 * QB OFFSET data
 	 *
-	 * @var integer
+	 * @var integer|boolean
 	 */
 	protected $QBOffset = false;
 
 	/**
 	 * QB ORDER BY data
 	 *
-	 * @var array
+	 * @var array|null|string
 	 */
 	public $QBOrderBy = [];
 
@@ -180,11 +151,20 @@
 	/**
 	 * A reference to the database connection.
 	 *
-	 * @var BaseConnection
+	 * @var ConnectionInterface
 	 */
 	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
@@ -271,9 +251,9 @@
 	/**
 	 * Constructor
 	 *
-	 * @param  string|array                              $tableName
-	 * @param  \CodeIgniter\Database\ConnectionInterface $db
-	 * @param  array                                     $options
+	 * @param  string|array        $tableName
+	 * @param  ConnectionInterface $db
+	 * @param  array               $options
 	 * @throws DatabaseException
 	 */
 	public function __construct($tableName, ConnectionInterface &$db, array $options = null)
@@ -285,6 +265,7 @@
 
 		$this->db = $db;
 
+		$this->tableName = $tableName;
 		$this->from($tableName);
 
 		if (! empty($options))
@@ -302,11 +283,23 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * Returns the current database connection
+	 *
+	 * @return ConnectionInterface
+	 */
+	public function db(): ConnectionInterface
+	{
+		return $this->db;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
 	 * Sets a test mode status.
 	 *
 	 * @param boolean $mode Mode to set
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function testMode(bool $mode = true)
 	{
@@ -318,6 +311,18 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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.
 	 *
@@ -338,7 +343,7 @@
 	 *
 	 * @param boolean $ignore
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function ignore(bool $ignore = true)
 	{
@@ -357,7 +362,7 @@
 	 * @param string|array $select
 	 * @param boolean      $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function select($select = '*', bool $escape = null)
 	{
@@ -406,7 +411,7 @@
 	 * @param string $select The field
 	 * @param string $alias  An alias
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function selectMax(string $select = '', string $alias = '')
 	{
@@ -423,7 +428,7 @@
 	 * @param string $select The field
 	 * @param string $alias  An alias
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function selectMin(string $select = '', string $alias = '')
 	{
@@ -440,7 +445,7 @@
 	 * @param string $select The field
 	 * @param string $alias  An alias
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function selectAvg(string $select = '', string $alias = '')
 	{
@@ -457,7 +462,7 @@
 	 * @param string $select The field
 	 * @param string $alias  An alias
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function selectSum(string $select = '', string $alias = '')
 	{
@@ -474,7 +479,7 @@
 	 * @param string $select The field
 	 * @param string $alias  An alias
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function selectCount(string $select = '', string $alias = '')
 	{
@@ -495,9 +500,9 @@
 	 * @param string $alias
 	 * @param string $type
 	 *
-	 * @return BaseBuilder
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @return $this
+	 * @throws DataException
+	 * @throws DatabaseException
 	 */
 	protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
 	{
@@ -513,7 +518,7 @@
 
 		$type = strtoupper($type);
 
-		if (! in_array($type, ['MAX', 'MIN', 'AVG', 'SUM', 'COUNT']))
+		if (! in_array($type, ['MAX', 'MIN', 'AVG', 'SUM', 'COUNT'], true))
 		{
 			throw new DatabaseException('Invalid function type: ' . $type);
 		}
@@ -561,7 +566,7 @@
 	 *
 	 * @param boolean $val
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function distinct(bool $val = true)
 	{
@@ -580,7 +585,7 @@
 	 * @param mixed   $from      can be a string or array
 	 * @param boolean $overwrite Should we remove the first table existing?
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function from($from, bool $overwrite = false)
 	{
@@ -629,7 +634,7 @@
 	 * @param string  $type   The type of join
 	 * @param boolean $escape Whether not to try to escape identifiers
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function join(string $table, string $cond, string $type = '', bool $escape = null)
 	{
@@ -689,8 +694,9 @@
 			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;
+
+				$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;
 			}
 		}
 
@@ -718,7 +724,7 @@
 	 * @param mixed   $value
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function where($key, $value = null, bool $escape = null)
 	{
@@ -737,7 +743,7 @@
 	 * @param mixed   $value
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orWhere($key, $value = null, bool $escape = null)
 	{
@@ -754,15 +760,15 @@
 	 * @used-by having()
 	 * @used-by orHaving()
 	 *
-	 * @param string  $qb_key 'QBWhere' or 'QBHaving'
+	 * @param string  $qbKey  'QBWhere' or 'QBHaving'
 	 * @param mixed   $key
 	 * @param mixed   $value
 	 * @param string  $type
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
-	protected function whereHaving(string $qb_key, $key, $value = null, string $type = 'AND ', bool $escape = null)
+	protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
 	{
 		if (! is_array($key))
 		{
@@ -774,7 +780,7 @@
 
 		foreach ($key as $k => $v)
 		{
-			$prefix = empty($this->$qb_key) ? $this->groupGetType('') : $this->groupGetType($type);
+			$prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
 
 			if ($v !== null)
 			{
@@ -815,7 +821,7 @@
 					$v = " :$bind:";
 				}
 			}
-			elseif (! $this->hasOperator($k) && $qb_key !== 'QBHaving')
+			elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving')
 			{
 				// value appears not to have been set, assign the test to IS NULL
 				$k .= ' IS NULL';
@@ -825,7 +831,7 @@
 				$k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
 
-			$this->{$qb_key}[] = [
+			$this->{$qbKey}[] = [
 				'condition' => $prefix . $k . $v,
 				'escape'    => $escape,
 			];
@@ -846,7 +852,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function whereIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -865,7 +871,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orWhereIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -884,7 +890,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function whereNotIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -903,7 +909,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orWhereNotIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -922,7 +928,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function havingIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -941,7 +947,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orHavingIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -960,7 +966,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function havingNotIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -979,7 +985,7 @@
 	 * @param array|string|Closure $values The values searched on, or anonymous function with subquery
 	 * @param boolean              $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orHavingNotIn(string $key = null, $values = null, bool $escape = null)
 	{
@@ -996,15 +1002,15 @@
 	 * @used-by whereNotIn()
 	 * @used-by orWhereNotIn()
 	 *
-	 * @param  string        $key    The field to search
-	 * @param  array|Closure $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)
+	 * @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 BaseBuilder
+	 * @return $this
 	 */
 	protected function _whereIn(string $key = null, $values = null, bool $not = false, string $type = 'AND ', bool $escape = null, string $clause = 'QBWhere')
 	{
@@ -1012,7 +1018,7 @@
 		{
 			if (CI_DEBUG)
 			{
-				throw new \InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
+				throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
 			}
 			// @codeCoverageIgnoreStart
 			return $this;
@@ -1023,7 +1029,7 @@
 		{
 			if (CI_DEBUG)
 			{
-				throw new \InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
+				throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
 			}
 			// @codeCoverageIgnoreStart
 			return $this;
@@ -1048,7 +1054,7 @@
 		}
 		else
 		{
-			$whereIn = is_array($values) ? array_values($values) : $values;
+			$whereIn = array_values($values);
 			$ok      = $this->setBind($ok, $whereIn, $escape);
 		}
 
@@ -1078,7 +1084,7 @@
 	 * @param boolean $escape
 	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function like($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1099,7 +1105,7 @@
 	 * @param boolean $escape
 	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function notLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1120,7 +1126,7 @@
 	 * @param boolean $escape
 	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1141,7 +1147,7 @@
 	 * @param boolean $escape
 	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orNotLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1161,7 +1167,7 @@
 	 * @param string  $side
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function havingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1181,7 +1187,7 @@
 	 * @param string  $side
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function notHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1201,7 +1207,7 @@
 	 * @param string  $side
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1221,7 +1227,7 @@
 	 * @param string  $side
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orNotHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
 	{
@@ -1251,7 +1257,7 @@
 	 * @param boolean $insensitiveSearch IF true, will force a case-insensitive search
 	 * @param string  $clause            (Internal use only)
 	 *
-	 * @return BaseBuilder
+	 * @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')
 	{
@@ -1291,16 +1297,16 @@
 				$bind = $this->setBind($k, "%$v%", $escape);
 			}
 
-			$like_statement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
+			$likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
 
 			// some platforms require an escape sequence definition for LIKE wildcards
 			if ($escape === true && $this->db->likeEscapeStr !== '')
 			{
-				$like_statement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
+				$likeStatement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
 			}
 
 			$this->{$clause}[] = [
-				'condition' => $like_statement,
+				'condition' => $likeStatement,
 				'escape'    => $escape,
 			];
 		}
@@ -1313,24 +1319,24 @@
 	/**
 	 * Platform independent LIKE statement builder.
 	 *
-	 * @param string  $prefix
-	 * @param string  $column
-	 * @param string  $not
-	 * @param string  $bind
-	 * @param boolean $insensitiveSearch
+	 * @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 = null, string $column, string $not = null, string $bind, bool $insensitiveSearch = false): string
+	protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
 	{
-		$like_statement = "{$prefix} {$column} {$not} LIKE :{$bind}:";
+		$likeStatement = "{$prefix} {$column} {$not} LIKE :{$bind}:";
 
 		if ($insensitiveSearch === true)
 		{
-			$like_statement = "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
+			$likeStatement = "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
 		}
 
-		return $like_statement;
+		return $likeStatement;
 	}
 
 	//--------------------------------------------------------------------
@@ -1338,7 +1344,7 @@
 	/**
 	 * Starts a query group.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function groupStart()
 	{
@@ -1350,7 +1356,7 @@
 	/**
 	 * Starts a query group, but ORs the group
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orGroupStart()
 	{
@@ -1362,7 +1368,7 @@
 	/**
 	 * Starts a query group, but NOTs the group
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function notGroupStart()
 	{
@@ -1374,7 +1380,7 @@
 	/**
 	 * Starts a query group, but OR NOTs the group
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orNotGroupStart()
 	{
@@ -1386,7 +1392,7 @@
 	/**
 	 * Ends a query group
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function groupEnd()
 	{
@@ -1398,7 +1404,7 @@
 	/**
 	 * Starts a query group for HAVING clause.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function havingGroupStart()
 	{
@@ -1410,7 +1416,7 @@
 	/**
 	 * Starts a query group for HAVING clause, but ORs the group.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orHavingGroupStart()
 	{
@@ -1422,7 +1428,7 @@
 	/**
 	 * Starts a query group for HAVING clause, but NOTs the group.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function notHavingGroupStart()
 	{
@@ -1434,7 +1440,7 @@
 	/**
 	 * Starts a query group for HAVING clause, but OR NOTs the group.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orNotHavingGroupStart()
 	{
@@ -1446,7 +1452,7 @@
 	/**
 	 * Ends a query group for HAVING clause.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function havingGroupEnd()
 	{
@@ -1462,7 +1468,7 @@
 	 * @param string $type
 	 * @param string $clause
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
 	{
@@ -1487,13 +1493,13 @@
 	 *
 	 * @param string $clause
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	protected function groupEndPrepare(string $clause = 'QBWhere')
 	{
 		$this->QBWhereGroupStarted = false;
 		$where                     = [
-			'condition' => str_repeat(' ', $this->QBWhereGroupCount -- ) . ')',
+			'condition' => str_repeat(' ', $this->QBWhereGroupCount--) . ')',
 			'escape'    => false,
 		];
 
@@ -1536,7 +1542,7 @@
 	 * @param string|array $by
 	 * @param boolean      $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function groupBy($by, bool $escape = null)
 	{
@@ -1576,7 +1582,7 @@
 	 * @param mixed        $value
 	 * @param boolean      $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function having($key, $value = null, bool $escape = null)
 	{
@@ -1594,7 +1600,7 @@
 	 * @param mixed        $value
 	 * @param boolean      $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orHaving($key, $value = null, bool $escape = null)
 	{
@@ -1610,7 +1616,7 @@
 	 * @param string  $direction ASC, DESC or RANDOM
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
 	{
@@ -1621,7 +1627,7 @@
 			$direction = '';
 
 			// Do we have a seed value?
-			$orderBy = ctype_digit((string) $orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
+			$orderBy = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
 		}
 		elseif (empty($orderBy))
 		{
@@ -1636,7 +1642,7 @@
 
 		if ($escape === false)
 		{
-			$qb_orderBy[] = [
+			$qbOrderBy[] = [
 				'field'     => $orderBy,
 				'direction' => $direction,
 				'escape'    => false,
@@ -1644,10 +1650,10 @@
 		}
 		else
 		{
-			$qb_orderBy = [];
+			$qbOrderBy = [];
 			foreach (explode(',', $orderBy) as $field)
 			{
-				$qb_orderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
+				$qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
 					?
 					[
 						'field'     => ltrim(substr($field, 0, $match[0][1])),
@@ -1663,7 +1669,7 @@
 			}
 		}
 
-		$this->QBOrderBy = array_merge($this->QBOrderBy, $qb_orderBy);
+		$this->QBOrderBy = array_merge($this->QBOrderBy, $qbOrderBy);
 
 		return $this;
 	}
@@ -1673,12 +1679,12 @@
 	/**
 	 * LIMIT
 	 *
-	 * @param integer $value  LIMIT value
-	 * @param integer $offset OFFSET value
+	 * @param integer|null $value  LIMIT value
+	 * @param integer|null $offset OFFSET value
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
-	public function limit(int $value = null, ?int $offset = 0)
+	public function limit(?int $value = null, ?int $offset = 0)
 	{
 		if (! is_null($value))
 		{
@@ -1700,7 +1706,7 @@
 	 *
 	 * @param integer $offset OFFSET value
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function offset(int $offset)
 	{
@@ -1739,7 +1745,7 @@
 	 * @param string              $value  Field value, if $key is a single field
 	 * @param boolean             $escape Whether to escape values and identifiers
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function set($key, ?string $value = '', bool $escape = null)
 	{
@@ -1846,7 +1852,7 @@
 	 * @param integer $offset The offset clause
 	 * @param boolean $reset  Are we want to clear query builder values?
 	 *
-	 * @return ResultInterface
+	 * @return ResultInterface|false
 	 */
 	public function get(int $limit = null, int $offset = 0, bool $reset = true)
 	{
@@ -1876,7 +1882,7 @@
 	 * "Count All" query
 	 *
 	 * Generates a platform-specific query string that counts all records in
-	 * the specified database
+	 * the particular table
 	 *
 	 * @param boolean $reset Are we want to clear query builder values?
 	 *
@@ -1938,11 +1944,19 @@
 		$limit         = $this->QBLimit;
 		$this->QBLimit = false;
 
-		$sql = ($this->QBDistinct === true || ! empty($this->QBGroupBy))
-			?
-			$this->countString . $this->db->protectIdentifiers('numrows') . "\nFROM (\n" . $this->compileSelect() . "\n) CI_count_all_results"
-			:
-			$this->compileSelect($this->countString . $this->db->protectIdentifiers('numrows'));
+		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)
 		{
@@ -1958,7 +1972,7 @@
 		// If we've previously reset the QBOrderBy values, get them back
 		elseif (! isset($this->QBOrderBy))
 		{
-			$this->QBOrderBy = $orderBy ?? [];
+			$this->QBOrderBy = $orderBy;
 		}
 
 		// Restore the LIMIT setting
@@ -1977,17 +1991,19 @@
 	}
 
 	//--------------------------------------------------------------------
+
 	/**
 	 * Get compiled 'where' condition string
 	 *
 	 * Compiles the set conditions and returns the sql statement
 	 *
-	 * @return string
+	 * @return array
 	 */
 	public function getCompiledQBWhere()
 	{
 		return $this->QBWhere;
 	}
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -2040,7 +2056,7 @@
 	 * @param boolean $escape    Whether to escape values and identifiers
 	 * @param integer $batchSize Batch size
 	 *
-	 * @return integer Number of rows inserted or FALSE on failure
+	 * @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)
@@ -2077,19 +2093,19 @@
 		$table = $this->QBFrom[0];
 
 		// Batch this baby
-		$affected_rows = 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)
 			{
-				++ $affected_rows;
+				++ $affectedRows;
 			}
 			else
 			{
 				$this->db->query($sql, $this->binds, false);
-				$affected_rows += $this->db->affectedRows();
+				$affectedRows += $this->db->affectedRows();
 			}
 		}
 
@@ -2098,7 +2114,7 @@
 			$this->resetWrite();
 		}
 
-		return $affected_rows;
+		return $affectedRows;
 	}
 
 	//--------------------------------------------------------------------
@@ -2128,7 +2144,7 @@
 	 * @param string  $value
 	 * @param boolean $escape
 	 *
-	 * @return BaseBuilder|null
+	 * @return $this|null
 	 */
 	public function setInsertBatch($key, string $value = '', bool $escape = null)
 	{
@@ -2147,7 +2163,7 @@
 		foreach ($key as $row)
 		{
 			$row = $this->objectToArray($row);
-			if (count(array_diff($keys, array_keys($row))) > 0 || count(array_diff(array_keys($row), $keys)) > 0)
+			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[] = [];
@@ -2187,9 +2203,9 @@
 	 *
 	 * @throws DatabaseException
 	 *
-	 * @return string
+	 * @return string|boolean
 	 */
-	public function getCompiledInsert(bool $reset = true): string
+	public function getCompiledInsert(bool $reset = true)
 	{
 		if ($this->validateInsert() === false)
 		{
@@ -2386,9 +2402,9 @@
 	 *
 	 * @param boolean $reset TRUE: reset QB values; FALSE: leave QB values alone
 	 *
-	 * @return string
+	 * @return string|boolean
 	 */
-	public function getCompiledUpdate(bool $reset = true): string
+	public function getCompiledUpdate(bool $reset = true)
 	{
 		if ($this->validateUpdate() === false)
 		{
@@ -2506,7 +2522,7 @@
 	 * chosen to be update.
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	protected function validateUpdate(): bool
 	{
@@ -2536,7 +2552,7 @@
 	 * @param integer $batchSize The size of the batch to run
 	 *
 	 * @return mixed    Number of rows affected, SQL string, or FALSE on failure
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100)
 	{
@@ -2583,9 +2599,9 @@
 		$table = $this->QBFrom[0];
 
 		// Batch this baby
-		$affected_rows = 0;
-		$savedSQL      = [];
-		$savedQBWhere  = $this->QBWhere;
+		$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)
@@ -2598,7 +2614,7 @@
 			else
 			{
 				$this->db->query($sql, $this->binds, false);
-				$affected_rows += $this->db->affectedRows();
+				$affectedRows += $this->db->affectedRows();
 			}
 
 			$this->QBWhere = $savedQBWhere;
@@ -2606,7 +2622,7 @@
 
 		$this->resetWrite();
 
-		return $this->testMode ? $savedSQL : $affected_rows;
+		return $this->testMode ? $savedSQL : $affectedRows;
 	}
 
 	//--------------------------------------------------------------------
@@ -2662,8 +2678,8 @@
 	 * @param string       $index
 	 * @param boolean      $escape
 	 *
-	 * @return BaseBuilder|null
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @return $this|null
+	 * @throws DatabaseException
 	 */
 	public function setUpdateBatch($key, string $index = '', bool $escape = null)
 	{
@@ -2678,13 +2694,13 @@
 
 		foreach ($key as $v)
 		{
-			$index_set = false;
-			$clean     = [];
+			$indexSet = false;
+			$clean    = [];
 			foreach ($v as $k2 => $v2)
 			{
 				if ($k2 === $index)
 				{
-					$index_set = true;
+					$indexSet = true;
 				}
 
 				$bind = $this->setBind($k2, $v2, $escape);
@@ -2692,7 +2708,7 @@
 				$clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":$bind:";
 			}
 
-			if ($index_set === false)
+			if ($indexSet === false)
 			{
 				throw new DatabaseException('One or more rows submitted for batch updating is missing the specified index.');
 			}
@@ -2710,7 +2726,7 @@
 	 *
 	 * Compiles a delete string and runs "DELETE FROM table"
 	 *
-	 * @return boolean    TRUE on success, FALSE on failure
+	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
 	 */
 	public function emptyTable()
 	{
@@ -2737,7 +2753,7 @@
 	 * If the database does not support the truncate() command
 	 * This function maps to "DELETE FROM table"
 	 *
-	 * @return boolean    TRUE on success, FALSE on failure
+	 * @return boolean|string    TRUE on success, FALSE on failure, string on testMode
 	 */
 	public function truncate()
 	{
@@ -2787,9 +2803,8 @@
 	 */
 	public function getCompiledDelete(bool $reset = true): string
 	{
-		$table = $this->QBFrom[0];
-
-		$sql = $this->delete($table, null, $reset, true);
+		$sql = $this->testMode()->delete('', null, $reset);
+		$this->testMode(false);
 
 		return $this->compileFinalQuery($sql);
 	}
@@ -2801,14 +2816,14 @@
 	 *
 	 * Compiles a delete string and runs the query
 	 *
-	 * @param mixed   $where      The where clause
-	 * @param integer $limit      The limit clause
-	 * @param boolean $reset_data
+	 * @param mixed   $where     The where clause
+	 * @param integer $limit     The limit clause
+	 * @param boolean $resetData
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function delete($where = '', int $limit = null, bool $reset_data = true)
+	public function delete($where = '', int $limit = null, bool $resetData = true)
 	{
 		$table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
 
@@ -2845,7 +2860,7 @@
 			$sql = $this->_limit($sql, true);
 		}
 
-		if ($reset_data)
+		if ($resetData)
 		{
 			$this->resetWrite();
 		}
@@ -2958,20 +2973,20 @@
 	 * Generates a query string based on which functions were used.
 	 * Should not be called directly.
 	 *
-	 * @param mixed $select_override
+	 * @param mixed $selectOverride
 	 *
 	 * @return string
 	 */
-	protected function compileSelect($select_override = false): string
+	protected function compileSelect($selectOverride = false): string
 	{
 		// Write the "select" portion of the query
-		if ($select_override !== false)
+		if ($selectOverride !== false)
 		{
-			$sql = $select_override;
+			$sql = $selectOverride;
 		}
 		else
 		{
-			$sql = ( ! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
+			$sql = (! $this->QBDistinct) ? 'SELECT ' : 'SELECT DISTINCT ';
 
 			if (empty($this->QBSelect))
 			{
@@ -2984,8 +2999,8 @@
 				// is because until the user calls the from() function we don't know if there are aliases
 				foreach ($this->QBSelect as $key => $val)
 				{
-					$no_escape            = $this->QBNoEscape[$key] ?? null;
-					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $no_escape);
+					$noEscape             = $this->QBNoEscape[$key] ?? null;
+					$this->QBSelect[$key] = $this->db->protectIdentifiers($val, false, $noEscape);
 				}
 
 				$sql .= implode(', ', $this->QBSelect);
@@ -3054,22 +3069,23 @@
 	 * where(), orWhere(), having(), orHaving are called prior to from(),
 	 * join() and prefixTable is added only if needed.
 	 *
-	 * @param string $qb_key 'QBWhere' or 'QBHaving'
+	 * @param string $qbKey 'QBWhere' or 'QBHaving'
 	 *
 	 * @return string    SQL statement
 	 */
-	protected function compileWhereHaving(string $qb_key): string
+	protected function compileWhereHaving(string $qbKey): string
 	{
-		if (! empty($this->$qb_key))
+		if (! empty($this->$qbKey))
 		{
-			foreach ($this->$qb_key as &$qbkey)
+			foreach ($this->$qbKey as &$qbkey)
 			{
 				// Is this condition already compiled?
 				if (is_string($qbkey))
 				{
 					continue;
 				}
-				elseif ($qbkey['escape'] === false)
+
+				if ($qbkey['escape'] === false)
 				{
 					$qbkey = $qbkey['condition'];
 					continue;
@@ -3120,8 +3136,8 @@
 				$qbkey = implode('', $conditions);
 			}
 
-			return ($qb_key === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
-					. implode("\n", $this->$qb_key);
+			return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
+					. implode("\n", $this->$qbKey);
 		}
 
 		return '';
@@ -3152,8 +3168,9 @@
 					continue;
 				}
 
-				$groupBy = ($groupBy['escape'] === false ||
-						$this->isLiteral($groupBy['field'])) ? $groupBy['field'] : $this->db->protectIdentifiers($groupBy['field']);
+				$groupBy = ($groupBy['escape'] === false || $this->isLiteral($groupBy['field']))
+					? $groupBy['field']
+					: $this->db->protectIdentifiers($groupBy['field']);
 			}
 
 			return "\nGROUP BY " . implode(', ', $this->QBGroupBy);
@@ -3191,7 +3208,8 @@
 
 			return $this->QBOrderBy = "\nORDER BY " . implode(', ', $this->QBOrderBy);
 		}
-		elseif (is_string($this->QBOrderBy))
+
+		if (is_string($this->QBOrderBy))
 		{
 			return $this->QBOrderBy;
 		}
@@ -3283,8 +3301,10 @@
 	{
 		$str = trim($str);
 
-		if (empty($str) || ctype_digit($str) || (string) (float) $str === $str ||
-				in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
+		if (empty($str)
+			|| ctype_digit($str)
+			|| (string) (float) $str === $str
+			|| in_array(strtoupper($str), ['TRUE', 'FALSE'], true)
 		)
 		{
 			return true;
@@ -3307,7 +3327,7 @@
 	 *
 	 * Publicly-visible method to reset the QB values.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	public function resetQuery()
 	{
@@ -3322,15 +3342,15 @@
 	/**
 	 * Resets the query builder values.  Called by the get() function
 	 *
-	 * @param array $qb_reset_items An array of fields to reset
+	 * @param array $qbResetItems An array of fields to reset
 	 *
 	 * @return void
 	 */
-	protected function resetRun(array $qb_reset_items)
+	protected function resetRun(array $qbResetItems)
 	{
-		foreach ($qb_reset_items as $item => $default_value)
+		foreach ($qbResetItems as $item => $defaultValue)
 		{
-			$this->$item = $default_value;
+			$this->$item = $defaultValue;
 		}
 	}
 
@@ -3481,7 +3501,7 @@
 	/**
 	 * Returns a clone of a Base Builder with reset query builder values.
 	 *
-	 * @return BaseBuilder
+	 * @return $this
 	 */
 	protected function cleanClone()
 	{
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index e1c4f7a..ddd3189 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1,53 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
+use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Events\Events;
+use Throwable;
 
 /**
  * Class BaseConnection
  */
 abstract class BaseConnection implements ConnectionInterface
 {
-
 	/**
 	 * Data Source Name / Connect string
 	 *
@@ -58,7 +31,7 @@
 	/**
 	 * Database port
 	 *
-	 * @var integer
+	 * @var integer|string
 	 */
 	protected $port = '';
 
@@ -129,20 +102,6 @@
 	protected $DBDebug = false;
 
 	/**
-	 * Should we cache results?
-	 *
-	 * @var boolean
-	 */
-	protected $cacheOn = false;
-
-	/**
-	 * Path to store cache files.
-	 *
-	 * @var string
-	 */
-	protected $cacheDir;
-
-	/**
 	 * Character set
 	 *
 	 * @var string
@@ -199,21 +158,21 @@
 	 * The last query object that was executed
 	 * on this connection.
 	 *
-	 * @var array
+	 * @var mixed
 	 */
 	protected $lastQuery;
 
 	/**
 	 * Connection ID
 	 *
-	 * @var object|resource
+	 * @var object|resource|boolean
 	 */
 	public $connID = false;
 
 	/**
 	 * Result ID
 	 *
-	 * @var object|resource
+	 * @var object|resource|boolean
 	 */
 	public $resultID = false;
 
@@ -236,7 +195,7 @@
 	/**
 	 * Identifier escape character
 	 *
-	 * @var string
+	 * @var string|array
 	 */
 	public $escapeChar = '"';
 
@@ -330,6 +289,13 @@
 	 */
 	protected $aliasedTables = [];
 
+	/**
+	 * Query Class
+	 *
+	 * @var string
+	 */
+	protected $queryClass = 'CodeIgniter\\Database\\Query';
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -341,10 +307,14 @@
 	{
 		foreach ($params as $key => $value)
 		{
-			if (property_exists($this, $key))
-			{
-				$this->$key = $value;
-			}
+			$this->$key = $value;
+		}
+
+		$queryClass = str_replace('Connection', 'Query', static::class);
+
+		if (class_exists($queryClass))
+		{
+			$this->queryClass = $queryClass;
 		}
 	}
 
@@ -354,7 +324,7 @@
 	 * Initializes the database connection/settings.
 	 *
 	 * @return mixed|void
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function initialize()
 	{
@@ -378,7 +348,7 @@
 			// Connect to the database and set the connection ID
 			$this->connID = $this->connect($this->pConnect);
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			log_message('error', 'Error connecting to the database: ' . $e->getMessage());
 		}
@@ -406,7 +376,7 @@
 						// Try to connect
 						$this->connID = $this->connect($this->pConnect);
 					}
-					catch (\Throwable $e)
+					catch (Throwable $e)
 					{
 						log_message('error', 'Error connecting to the database: ' . $e->getMessage());
 					}
@@ -605,7 +575,7 @@
 	 */
 	public function addTableAlias(string $table)
 	{
-		if (! in_array($table, $this->aliasedTables))
+		if (! in_array($table, $this->aliasedTables, true))
 		{
 			$this->aliasedTables[] = $table;
 		}
@@ -616,7 +586,7 @@
 	/**
 	 * Executes the query against the database.
 	 *
-	 * @param $sql
+	 * @param string $sql
 	 *
 	 * @return mixed
 	 */
@@ -638,9 +608,13 @@
 	 * @param string  $queryClass
 	 *
 	 * @return BaseResult|Query|false
+	 *
+	 * @todo BC set $queryClass default as null in 4.1
 	 */
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = 'CodeIgniter\\Database\\Query')
+	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
 	{
+		$queryClass = $queryClass ?: $this->queryClass;
+
 		if (empty($this->connID))
 		{
 			$this->initialize();
@@ -783,17 +757,17 @@
 	/**
 	 * Start Transaction
 	 *
-	 * @param  boolean $test_mode = FALSE
+	 * @param  boolean $testMode = FALSE
 	 * @return boolean
 	 */
-	public function transStart(bool $test_mode = false): bool
+	public function transStart(bool $testMode = false): bool
 	{
 		if (! $this->transEnabled)
 		{
 			return false;
 		}
 
-		return $this->transBegin($test_mode);
+		return $this->transBegin($testMode);
 	}
 
 	//--------------------------------------------------------------------
@@ -847,17 +821,18 @@
 	/**
 	 * Begin Transaction
 	 *
-	 * @param  boolean $test_mode
+	 * @param  boolean $testMode
 	 * @return boolean
 	 */
-	public function transBegin(bool $test_mode = false): bool
+	public function transBegin(bool $testMode = false): bool
 	{
 		if (! $this->transEnabled)
 		{
 			return false;
 		}
+
 		// When transactions are nested we only begin/commit/rollback the outermost ones
-		elseif ($this->transDepth > 0)
+		if ($this->transDepth > 0)
 		{
 			$this->transDepth ++;
 			return true;
@@ -871,7 +846,7 @@
 		// 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 = ($test_mode === true);
+		$this->transFailure = ($testMode === true);
 
 		if ($this->_transBegin())
 		{
@@ -895,8 +870,9 @@
 		{
 			return false;
 		}
+
 		// When transactions are nested we only begin/commit/rollback the outermost ones
-		elseif ($this->transDepth > 1 || $this->_transCommit())
+		if ($this->transDepth > 1 || $this->_transCommit())
 		{
 			$this->transDepth --;
 			return true;
@@ -918,8 +894,9 @@
 		{
 			return false;
 		}
+
 		// When transactions are nested we only begin/commit/rollback the outermost ones
-		elseif ($this->transDepth > 1 || $this->_transRollback())
+		if ($this->transDepth > 1 || $this->_transRollback())
 		{
 			$this->transDepth --;
 			return true;
@@ -993,12 +970,12 @@
 	 *                     ->get();
 	 *           })
 	 *
-	 * @param \Closure $func
-	 * @param array    $options Passed to the prepare() method
+	 * @param Closure $func
+	 * @param array   $options Passed to the prepare() method
 	 *
 	 * @return BasePreparedQuery|null
 	 */
-	public function prepare(\Closure $func, array $options = [])
+	public function prepare(Closure $func, array $options = [])
 	{
 		if (empty($this->connID))
 		{
@@ -1013,6 +990,7 @@
 
 		if ($sql instanceof QueryInterface)
 		{
+			// @phpstan-ignore-next-line
 			$sql = $sql->getOriginalQuery();
 		}
 
@@ -1119,13 +1097,13 @@
 
 		if (is_array($item))
 		{
-			$escaped_array = [];
+			$escapedArray = [];
 			foreach ($item as $k => $v)
 			{
-				$escaped_array[$this->protectIdentifiers($k)] = $this->protectIdentifiers($v, $prefixSingle, $protectIdentifiers, $fieldExists);
+				$escapedArray[$this->protectIdentifiers($k)] = $this->protectIdentifiers($v, $prefixSingle, $protectIdentifiers, $fieldExists);
 			}
 
-			return $escaped_array;
+			return $escapedArray;
 		}
 
 		// This is basically a bug fix for queries that use MAX, MIN, etc.
@@ -1173,13 +1151,13 @@
 			//
 			// NOTE: The ! empty() condition prevents this method
 			//       from breaking when QB isn't enabled.
-			if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables))
+			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))
+						if (! in_array($val, $this->reservedIdentifiers, true))
 						{
 							$parts[$key] = $this->escapeIdentifiers($val);
 						}
@@ -1264,7 +1242,7 @@
 			}
 		}
 
-		if ($protectIdentifiers === true && ! in_array($item, $this->reservedIdentifiers))
+		if ($protectIdentifiers === true && ! in_array($item, $this->reservedIdentifiers, true))
 		{
 			$item = $this->escapeIdentifiers($item);
 		}
@@ -1285,11 +1263,12 @@
 	 */
 	public function escapeIdentifiers($item)
 	{
-		if ($this->escapeChar === '' || empty($item) || in_array($item, $this->reservedIdentifiers))
+		if ($this->escapeChar === '' || empty($item) || in_array($item, $this->reservedIdentifiers, true))
 		{
 			return $item;
 		}
-		elseif (is_array($item))
+
+		if (is_array($item))
 		{
 			foreach ($item as $key => $value)
 			{
@@ -1298,21 +1277,23 @@
 
 			return $item;
 		}
+
 		// Avoid breaking functions and literal values inside queries
-		elseif (ctype_digit($item) || $item[0] === "'" || ( $this->escapeChar !== '"' && $item[0] === '"') ||
-				strpos($item, '(') !== false
-		)
+		if (ctype_digit($item)
+			|| $item[0] === "'"
+			|| ($this->escapeChar !== '"' && $item[0] === '"')
+			|| strpos($item, '(') !== false)
 		{
 			return $item;
 		}
 
-		static $preg_ec = [];
+		static $pregEc = [];
 
-		if (empty($preg_ec))
+		if (empty($pregEc))
 		{
 			if (is_array($this->escapeChar))
 			{
-				$preg_ec = [
+				$pregEc = [
 					preg_quote($this->escapeChar[0], '/'),
 					preg_quote($this->escapeChar[1], '/'),
 					$this->escapeChar[0],
@@ -1321,8 +1302,8 @@
 			}
 			else
 			{
-				$preg_ec[0] = $preg_ec[1] = preg_quote($this->escapeChar, '/');
-				$preg_ec[2] = $preg_ec[3] = $this->escapeChar;
+				$pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
+				$pregEc[2] = $pregEc[3] = $this->escapeChar;
 			}
 		}
 
@@ -1330,11 +1311,11 @@
 		{
 			if (strpos($item, '.' . $id) !== false)
 			{
-				return preg_replace('/' . $preg_ec[0] . '?([^' . $preg_ec[1] . '\.]+)' . $preg_ec[1] . '?\./i', $preg_ec[2] . '$1' . $preg_ec[3] . '.', $item);
+				return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
 			}
 		}
 
-		return preg_replace('/' . $preg_ec[0] . '?([^' . $preg_ec[1] . '\.]+)' . $preg_ec[1] . '?(\.)?/i', $preg_ec[2] . '$1' . $preg_ec[3] . '$2', $item);
+		return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
 	}
 
 	//--------------------------------------------------------------------
@@ -1347,7 +1328,7 @@
 	 * @param string $table the table
 	 *
 	 * @return string
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function prefixTable(string $table = ''): string
 	{
@@ -1364,7 +1345,7 @@
 	/**
 	 * Returns the total number of rows affected by this query.
 	 *
-	 * @return mixed
+	 * @return integer
 	 */
 	abstract public function affectedRows(): int;
 
@@ -1386,19 +1367,23 @@
 		{
 			return array_map([&$this, 'escape'], $str);
 		}
-		else if (is_string($str) || ( is_object($str) && method_exists($str, '__toString')))
+
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
 		{
 			return "'" . $this->escapeString($str) . "'";
 		}
-		else if (is_bool($str))
+
+		if (is_bool($str))
 		{
 			return ($str === false) ? 0 : 1;
 		}
-		else if (is_numeric($str) && $str < 0)
+
+		if (is_numeric($str) && $str < 0)
 		{
 			return "'{$str}'";
 		}
-		else if ($str === null)
+
+		if ($str === null)
 		{
 			return 'NULL';
 		}
@@ -1455,7 +1440,7 @@
 	 * Calls the individual driver for platform
 	 * specific escaping for LIKE conditions
 	 *
-	 * @param  string|string[]
+	 * @param  string|string[] $str
 	 * @return string|string[]
 	 */
 	public function escapeLikeString($str)
@@ -1493,7 +1478,8 @@
 	 */
 	public function callFunction(string $functionName, ...$params): bool
 	{
-		$driver = ($this->DBDriver === 'postgre' ? 'pg' : strtolower($this->DBDriver)) . '_';
+		$driver = strtolower($this->DBDriver);
+		$driver = ($driver === 'postgre' ? 'pg' : $driver) . '_';
 
 		if (false === strpos($driver, $functionName))
 		{
@@ -1523,7 +1509,7 @@
 	 *
 	 * @param  boolean $constrainByPrefix = FALSE
 	 * @return boolean|array
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function listTables(bool $constrainByPrefix = false)
 	{
@@ -1588,7 +1574,7 @@
 	 */
 	public function tableExists(string $tableName): bool
 	{
-		return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables());
+		return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
 	}
 
 	//--------------------------------------------------------------------
@@ -1663,7 +1649,7 @@
 	 */
 	public function fieldExists(string $fieldName, string $tableName): bool
 	{
-		return in_array($fieldName, $this->getFieldNames($tableName));
+		return in_array($fieldName, $this->getFieldNames($tableName), true);
 	}
 
 	//--------------------------------------------------------------------
@@ -1672,13 +1658,11 @@
 	 * Returns an object with field data
 	 *
 	 * @param  string $table the table name
-	 * @return array|false
+	 * @return array
 	 */
 	public function getFieldData(string $table)
 	{
-		$fields = $this->_fieldData($this->protectIdentifiers($table, true, false, false));
-
-		return $fields ?? false;
+		return $this->_fieldData($this->protectIdentifiers($table, true, false, false));
 	}
 
 	//--------------------------------------------------------------------
@@ -1687,13 +1671,11 @@
 	 * Returns an object with key data
 	 *
 	 * @param  string $table the table name
-	 * @return array|false
+	 * @return array
 	 */
 	public function getIndexData(string $table)
 	{
-		$fields = $this->_indexData($this->protectIdentifiers($table, true, false, false));
-
-		return $fields ?? false;
+		return $this->_indexData($this->protectIdentifiers($table, true, false, false));
 	}
 
 	//--------------------------------------------------------------------
@@ -1702,13 +1684,11 @@
 	 * Returns an object with foreign key data
 	 *
 	 * @param  string $table the table name
-	 * @return array|false
+	 * @return array
 	 */
 	public function getForeignKeyData(string $table)
 	{
-		$fields = $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
-
-		return $fields ?? false;
+		return $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
 	}
 
 	//--------------------------------------------------------------------
@@ -1786,9 +1766,9 @@
 	/**
 	 * Insert ID
 	 *
-	 * @return integer
+	 * @return integer|string
 	 */
-	abstract public function insertID(): int;
+	abstract public function insertID();
 
 	//--------------------------------------------------------------------
 
@@ -1797,9 +1777,9 @@
 	 *
 	 * @param boolean $constrainByPrefix
 	 *
-	 * @return string
+	 * @return string|false
 	 */
-	abstract protected function _listTables(bool $constrainByPrefix = false): string;
+	abstract protected function _listTables(bool $constrainByPrefix = false);
 
 	//--------------------------------------------------------------------
 
@@ -1808,9 +1788,9 @@
 	 *
 	 * @param string $table
 	 *
-	 * @return string
+	 * @return string|false
 	 */
-	abstract protected function _listColumns(string $table = ''): string;
+	abstract protected function _listColumns(string $table = '');
 
 	//--------------------------------------------------------------------
 
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index 247d68c..e191646 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -1,44 +1,17 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
-use CodeIgniter\Database\MySQLi\Connection;
+use BadMethodCallException;
 use CodeIgniter\Events\Events;
 
 /**
@@ -46,11 +19,10 @@
  */
 abstract class BasePreparedQuery implements PreparedQueryInterface
 {
-
 	/**
 	 * The prepared statement itself.
 	 *
-	 * @var resource|\mysqli_stmt
+	 * @var object|resource
 	 */
 	protected $statement;
 
@@ -79,7 +51,7 @@
 	/**
 	 * A reference to the db connection to use.
 	 *
-	 * @var BaseConnection|MySQLi\Connection
+	 * @var BaseConnection
 	 */
 	protected $db;
 
@@ -88,9 +60,9 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \CodeIgniter\Database\ConnectionInterface $db
+	 * @param BaseConnection $db
 	 */
-	public function __construct(ConnectionInterface $db)
+	public function __construct(BaseConnection $db)
 	{
 		$this->db = &$db;
 	}
@@ -205,7 +177,7 @@
 	/**
 	 * Explicitly closes the statement.
 	 *
-	 * @return null|void
+	 * @return void
 	 */
 	public function close()
 	{
@@ -228,7 +200,7 @@
 	{
 		if (! $this->query instanceof QueryInterface)
 		{
-			throw new \BadMethodCallException('Cannot call getQueryString on a prepared query until after the query has been prepared.');
+			throw new BadMethodCallException('Cannot call getQueryString on a prepared query until after the query has been prepared.');
 		}
 
 		return $this->query->getQuery();
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 5c6500e..d7991e9 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -46,7 +18,6 @@
  */
 abstract class BaseResult implements ResultInterface
 {
-
 	/**
 	 * Connection ID
 	 *
@@ -57,7 +28,7 @@
 	/**
 	 * Result ID
 	 *
-	 * @var resource|object
+	 * @var resource|object|boolean
 	 */
 	public $resultID;
 
@@ -78,7 +49,7 @@
 	/**
 	 * Custom Result Object
 	 *
-	 * @var object[]
+	 * @var array
 	 */
 	public $customResultObject = [];
 
@@ -90,16 +61,16 @@
 	public $currentRow = 0;
 
 	/**
-	 * Number of rows
+	 * The number of records in the query result
 	 *
-	 * @var integer
+	 * @var integer|null
 	 */
-	public $numRows;
+	protected $numRows = null;
 
 	/**
 	 * Row data
 	 *
-	 * @var array
+	 * @var array|null
 	 */
 	public $rowData;
 
@@ -134,7 +105,8 @@
 		{
 			return $this->getResultArray();
 		}
-		elseif ($type === 'object')
+
+		if ($type === 'object')
 		{
 			return $this->getResultObject();
 		}
@@ -158,7 +130,7 @@
 			return $this->customResultObject[$className];
 		}
 
-		if (is_bool($this->resultID) || ! $this->resultID || $this->numRows === 0)
+		if (is_bool($this->resultID) || ! $this->resultID)
 		{
 			return [];
 		}
@@ -202,6 +174,7 @@
 			$this->customResultObject[$className][] = $row;
 		}
 
+		// @phpstan-ignore-next-line
 		return $this->customResultObject[$className];
 	}
 
@@ -224,7 +197,7 @@
 		// 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 || $this->numRows === 0)
+		if (is_bool($this->resultID) || ! $this->resultID)
 		{
 			return [];
 		}
@@ -267,7 +240,7 @@
 		// 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 || $this->numRows === 0)
+		if (is_bool($this->resultID) || ! $this->resultID)
 		{
 			return [];
 		}
@@ -293,6 +266,7 @@
 			$this->resultObject[] = $row;
 		}
 
+		// @phpstan-ignore-next-line
 		return $this->resultObject;
 	}
 
@@ -329,7 +303,8 @@
 		{
 			return $this->getRowObject($n);
 		}
-		elseif ($type === 'array')
+
+		if ($type === 'array')
 		{
 			return $this->getRowArray($n);
 		}
@@ -546,7 +521,8 @@
 		{
 			return $this->fetchAssoc();
 		}
-		elseif ($type === 'object')
+
+		if ($type === 'object')
 		{
 			return $this->fetchObject();
 		}
@@ -557,6 +533,31 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index e9a4dd6..ffb471c 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -46,7 +18,6 @@
  */
 abstract class BaseUtils
 {
-
 	/**
 	 * Database object
 	 *
@@ -59,21 +30,21 @@
 	/**
 	 * List databases statement
 	 *
-	 * @var string
+	 * @var string|boolean
 	 */
 	protected $listDatabases = false;
 
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
-	 * @var string
+	 * @var string|boolean
 	 */
 	protected $optimizeTable = false;
 
 	/**
 	 * REPAIR TABLE statement
 	 *
-	 * @var string
+	 * @var string|boolean
 	 */
 	protected $repairTable = false;
 
@@ -82,7 +53,7 @@
 	/**
 	 * Class constructor
 	 *
-	 * @param ConnectionInterface|object $db
+	 * @param ConnectionInterface $db
 	 */
 	public function __construct(ConnectionInterface &$db)
 	{
@@ -95,7 +66,7 @@
 	 * List databases
 	 *
 	 * @return array|boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function listDatabases()
 	{
@@ -104,7 +75,8 @@
 		{
 			return $this->db->dataCache['db_names'];
 		}
-		elseif ($this->listDatabases === false)
+
+		if ($this->listDatabases === false)
 		{
 			if ($this->db->DBDebug)
 			{
@@ -134,12 +106,12 @@
 	/**
 	 * Determine if a particular database exists
 	 *
-	 * @param  string $database_name
+	 * @param  string $databaseName
 	 * @return boolean
 	 */
-	public function databaseExists(string $database_name): bool
+	public function databaseExists(string $databaseName): bool
 	{
-		return in_array($database_name, $this->listDatabases());
+		return in_array($databaseName, $this->listDatabases(), true);
 	}
 
 	//--------------------------------------------------------------------
@@ -147,11 +119,11 @@
 	/**
 	 * Optimize Table
 	 *
-	 * @param  string $table_name
+	 * @param  string $tableName
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function optimizeTable(string $table_name)
+	public function optimizeTable(string $tableName)
 	{
 		if ($this->optimizeTable === false)
 		{
@@ -162,7 +134,7 @@
 			return false;
 		}
 
-		$query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($table_name)));
+		$query = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
 		if ($query !== false)
 		{
 			$query = $query->getResultArray();
@@ -178,7 +150,7 @@
 	 * Optimize Database
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function optimizeDatabase()
 	{
@@ -192,9 +164,9 @@
 		}
 
 		$result = [];
-		foreach ($this->db->listTables() as $table_name)
+		foreach ($this->db->listTables() as $tableName)
 		{
-			$res = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($table_name)));
+			$res = $this->db->query(sprintf($this->optimizeTable, $this->db->escapeIdentifiers($tableName)));
 			if (is_bool($res))
 			{
 				return $res;
@@ -207,7 +179,7 @@
 			// Postgre & SQLite3 returns empty array
 			if (empty($res))
 			{
-				$key = $table_name;
+				$key = $tableName;
 			}
 			else
 			{
@@ -228,11 +200,11 @@
 	/**
 	 * Repair Table
 	 *
-	 * @param  string $table_name
+	 * @param  string $tableName
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function repairTable(string $table_name)
+	public function repairTable(string $tableName)
 	{
 		if ($this->repairTable === false)
 		{
@@ -243,7 +215,7 @@
 			return false;
 		}
 
-		$query = $this->db->query(sprintf($this->repairTable, $this->db->escapeIdentifiers($table_name)));
+		$query = $this->db->query(sprintf($this->repairTable, $this->db->escapeIdentifiers($tableName)));
 		if (is_bool($query))
 		{
 			return $query;
@@ -312,7 +284,10 @@
 		}
 
 		// Create variables for convenience
-		extract($params);
+		$root    = $params['root'];
+		$newline = $params['newline'];
+		$tab     = $params['tab'];
+		$element = $params['element'];
 
 		// Load the xml helper
 		helper('xml');
@@ -321,11 +296,14 @@
 		while ($row = $query->getUnbufferedRow())
 		{
 			$xml .= $tab . '<' . $element . '>' . $newline;
+
 			foreach ($row as $key => $val)
 			{
-				$val  = (! empty($val)) ? xml_convert($val) : '';
+				$val = (! empty($val)) ? xml_convert($val) : '';
+
 				$xml .= $tab . $tab . '<' . $key . '>' . $val . '</' . $key . '>' . $newline;
 			}
+
 			$xml .= $tab . '</' . $element . '>' . $newline;
 		}
 
@@ -339,7 +317,7 @@
 	 *
 	 * @param  array|string $params
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function backup($params = [])
 	{
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 89dd495..0b11785 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -1,52 +1,24 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Config\BaseConfig;
+use InvalidArgumentException;
 
 /**
  * Class Config
  */
 class Config extends BaseConfig
 {
-
 	/**
 	 * Cache for instance of any connections that
 	 * have been requested as a "shared" instance.
@@ -59,7 +31,7 @@
 	 * The main instance used to manage all of
 	 * our open database connections.
 	 *
-	 * @var \CodeIgniter\Database\Database
+	 * @var Database|null
 	 */
 	static protected $factory;
 
@@ -97,7 +69,7 @@
 
 		if (is_string($group) && ! isset($config->$group) && strpos($group, 'custom-') !== 0)
 		{
-			throw new \InvalidArgumentException($group . ' is not a valid database connection group.');
+			throw new InvalidArgumentException($group . ' is not a valid database connection group.');
 		}
 
 		if ($getShared && isset(static::$instances[$group]))
@@ -114,7 +86,7 @@
 
 		$connection = static::$factory->load($config, $group);
 
-		static::$instances[$group] = & $connection;
+		static::$instances[$group] = &$connection;
 
 		return $connection;
 	}
@@ -137,7 +109,7 @@
 	 * 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 string|array|null $group
+	 * @param ConnectionInterface|string|array|null $group
 	 *
 	 * @return Forge
 	 */
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index 2df836e..b9b40ba 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -1,52 +1,21 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 /**
  * Interface ConnectionInterface
- *
- * @package CodeIgniter\Database
  */
 interface ConnectionInterface
 {
-
 	/**
 	 * Initializes the database connection/settings.
 	 *
@@ -122,7 +91,7 @@
 	/**
 	 * Returns the last error encountered by this connection.
 	 *
-	 * @return mixed
+	 * @return array
 	 */
 	public function error(): array;
 
diff --git a/system/Database/Database.php b/system/Database/Database.php
index adb0063..7e76326 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -1,58 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
+use InvalidArgumentException;
+
 /**
  * Database Connection Factory
  *
  * Creates and returns an instance of the appropriate DatabaseConnection
- *
- * @package CodeIgniter\Database
  */
 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.
+	 * 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
 	 */
@@ -61,31 +34,39 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Parses the connection binds and returns an instance of
-	 * the driver ready to go.
+	 * Parses the connection binds and returns an instance of the driver
+	 * ready to go.
 	 *
 	 * @param array  $params
 	 * @param string $alias
 	 *
-	 * @return   mixed
+	 * @return mixed
+	 * 
+	 * @throws InvalidArgumentException
+	 * 
 	 * @internal param bool $useBuilder
 	 */
-	public function load(array $params = [], string $alias)
+	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.');
+			throw new InvalidArgumentException('You have not selected a database type to connect to.');
 		}
 
-		$className = strpos($params['DBDriver'], '\\') === false
-			? '\CodeIgniter\Database\\' . $params['DBDriver'] . '\\Connection'
-			: $params['DBDriver'] . '\\Connection';
-
-		$class = new $className($params);
-
 		// Store the connection
-		$this->connections[$alias] = $class;
+		$this->connections[$alias] = $this->initDriver($params['DBDriver'], 'Connection', $params);
 
 		return $this->connections[$alias];
 	}
@@ -93,46 +74,112 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Creates a new Forge instance for the current database type.
+	 * Creates a Forge instance for the current database type.
 	 *
-	 * @param ConnectionInterface|BaseConnection $db
+	 * @param ConnectionInterface $db
 	 *
-	 * @return mixed
+	 * @return object
 	 */
-	public function loadForge(ConnectionInterface $db)
+	public function loadForge(ConnectionInterface $db): object
 	{
-		$className = strpos($db->DBDriver, '\\') === false ? '\CodeIgniter\Database\\' . $db->DBDriver . '\\Forge' : $db->DBDriver . '\\Forge';
-
-		// Make sure a connection exists
+		// Initialize database connection if not exists.
 		if (! $db->connID)
 		{
 			$db->initialize();
 		}
 
-		return new $className($db);
+		return $this->initDriver($db->DBDriver, 'Forge', $db);
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * Loads the Database Utilities class.
+	 * Creates a Utils instance for the current database type.
 	 *
-	 * @param ConnectionInterface|BaseConnection $db
+	 * @param ConnectionInterface $db
 	 *
-	 * @return mixed
+	 * @return object
 	 */
-	public function loadUtils(ConnectionInterface $db)
+	public function loadUtils(ConnectionInterface $db): object
 	{
-		$className = strpos($db->DBDriver, '\\') === false ? '\CodeIgniter\Database\\' . $db->DBDriver . '\\Utils' : $db->DBDriver . '\\Utils';
-
-		// Make sure a connection exists
+		// Initialize database connection if not exists.
 		if (! $db->connID)
 		{
 			$db->initialize();
 		}
 
-		return new $className($db);
+		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);
+	}
 }
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
index 2af1793..ff0f212 100644
--- a/system/Database/Exceptions/DataException.php
+++ b/system/Database/Exceptions/DataException.php
@@ -1,15 +1,29 @@
 <?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Exceptions;
 
-class DataException extends \RuntimeException implements ExceptionInterface
+use CodeIgniter\Exceptions\DebugTraceableTrait;
+use RuntimeException;
+
+class DataException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
+
 	/**
 	 * Used by the Model's trigger() method when the callback cannot be found.
 	 *
 	 * @param string $method
 	 *
-	 * @return \CodeIgniter\Database\Exceptions\DataException
+	 * @return DataException
 	 */
 	public static function forInvalidMethodTriggered(string $method)
 	{
@@ -22,7 +36,7 @@
 	 *
 	 * @param string $mode
 	 *
-	 * @return \CodeIgniter\Database\Exceptions\DataException
+	 * @return DataException
 	 */
 	public static function forEmptyDataset(string $mode)
 	{
@@ -30,13 +44,27 @@
 	}
 
 	/**
+	 * 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]));
+	}
+
+	/**
 	 * 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 \CodeIgniter\Database\Exceptions\DataException
+	 * @return DataException
 	 */
 	public static function forInvalidArgument(string $argument)
 	{
diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php
index cb411cf..8717f3b 100644
--- a/system/Database/Exceptions/DatabaseException.php
+++ b/system/Database/Exceptions/DatabaseException.php
@@ -1,46 +1,19 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+use Error;
 
-class DatabaseException extends \Error implements ExceptionInterface
+class DatabaseException extends Error implements ExceptionInterface
 {
 	/**
 	 * Exit status code
diff --git a/system/Database/Exceptions/ExceptionInterface.php b/system/Database/Exceptions/ExceptionInterface.php
index 4c8adb5..3820c55 100644
--- a/system/Database/Exceptions/ExceptionInterface.php
+++ b/system/Database/Exceptions/ExceptionInterface.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Database\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Exceptions;
 
 /**
  * Provides a domain-level interface for broad capture
@@ -6,8 +17,6 @@
  *
  * catch (\CodeIgniter\Database\Exceptions\ExceptionInterface) { ... }
  */
-
 interface ExceptionInterface extends \CodeIgniter\Exceptions\ExceptionInterface
 {
-
 }
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index e38d505..c986bbc 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -1,52 +1,27 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use InvalidArgumentException;
+use RuntimeException;
+use Throwable;
 
 /**
- * Class Forge
+ * The Forge class transforms migrations to executable
+ * SQL statements.
  */
 class Forge
 {
-
 	/**
 	 * The active database connection.
 	 *
@@ -101,7 +76,7 @@
 	/**
 	 * CREATE DATABASE statement
 	 *
-	 * @var string
+	 * @var string|false
 	 */
 	protected $createDatabaseStr = 'CREATE DATABASE %s';
 
@@ -122,7 +97,7 @@
 	/**
 	 * DROP DATABASE statement
 	 *
-	 * @var string
+	 * @var string|false
 	 */
 	protected $dropDatabaseStr = 'DROP DATABASE %s';
 
@@ -136,7 +111,7 @@
 	/**
 	 * CREATE TABLE IF statement
 	 *
-	 * @var string
+	 * @var string|boolean
 	 */
 	protected $createTableIfStr = 'CREATE TABLE IF NOT EXISTS';
 
@@ -153,14 +128,14 @@
 	/**
 	 * DROP TABLE IF EXISTS statement
 	 *
-	 * @var string
+	 * @var string|boolean
 	 */
 	protected $dropTableIfStr = 'DROP TABLE IF EXISTS';
 
 	/**
 	 * RENAME TABLE statement
 	 *
-	 * @var string
+	 * @var string|false
 	 */
 	protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s;';
 
@@ -181,7 +156,7 @@
 	/**
 	 * DEFAULT value representation in CREATE/ALTER TABLE statements
 	 *
-	 * @var string
+	 * @var string|false
 	 */
 	protected $default = ' DEFAULT ';
 
@@ -190,9 +165,9 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \CodeIgniter\Database\ConnectionInterface $db
+	 * @param BaseConnection $db
 	 */
-	public function __construct(ConnectionInterface $db)
+	public function __construct(BaseConnection $db)
 	{
 		$this->db = &$db;
 	}
@@ -218,7 +193,7 @@
 	 * @param boolean $ifNotExists Whether to add IF NOT EXISTS condition
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function createDatabase(string $dbName, bool $ifNotExists = false): bool
 	{
@@ -228,6 +203,7 @@
 			{
 				return true;
 			}
+
 			$ifNotExists = false;
 		}
 
@@ -238,25 +214,39 @@
 				throw new DatabaseException('This feature is not available for the database you are using.');
 			}
 
-			return false;
+			return false; // @codeCoverageIgnore
 		}
-		elseif (! $this->db->query(sprintf($ifNotExists ? $this->createDatabaseIfStr : $this->createDatabaseStr, $dbName, $this->db->charset, $this->db->DBCollat))
-		)
+
+		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.');
+				throw new DatabaseException('Unable to create the specified database.', 0, $e);
 			}
 
-			return false;
+			return false; // @codeCoverageIgnore
 		}
-
-		if (! empty($this->db->dataCache['db_names']))
-		{
-			$this->db->dataCache['db_names'][] = $dbName;
-		}
-
-		return true;
 	}
 
 	//--------------------------------------------------------------------
@@ -267,7 +257,7 @@
 	 * @param string $dbName
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	private function databaseExists(string $dbName): bool
 	{
@@ -292,7 +282,7 @@
 	 * @param string $dbName
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function dropDatabase(string $dbName): bool
 	{
@@ -305,7 +295,8 @@
 
 			return false;
 		}
-		elseif (! $this->db->query(sprintf($this->dropDatabaseStr, $dbName)))
+
+		if (! $this->db->query(sprintf($this->dropDatabaseStr, $dbName)))
 		{
 			if ($this->db->DBDebug)
 			{
@@ -340,9 +331,9 @@
 	 */
 	public function addKey($key, bool $primary = false, bool $unique = false)
 	{
-		if ($primary === true)
+		if ($primary)
 		{
-			foreach ((array)$key as $one)
+			foreach ((array) $key as $one)
 			{
 				$this->primaryKeys[] = $one;
 			}
@@ -350,9 +341,10 @@
 		else
 		{
 			$this->keys[] = $key;
-			if ($unique === true)
+
+			if ($unique)
 			{
-				$this->uniqueKeys[] = ($c = count($this->keys)) ? $c - 1 : 0;
+				$this->uniqueKeys[] = count($this->keys) - 1;
 			}
 		}
 
@@ -415,7 +407,7 @@
 			{
 				if (strpos($field, ' ') === false)
 				{
-					throw new \InvalidArgumentException('Field information is required for that operation.');
+					throw new InvalidArgumentException('Field information is required for that operation.');
 				}
 
 				$this->fields[] = $field;
@@ -441,8 +433,8 @@
 	 * @param string $onUpdate
 	 * @param string $onDelete
 	 *
-	 * @return \CodeIgniter\Database\Forge
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @return Forge
+	 * @throws DatabaseException
 	 */
 	public function addForeignKey(string $fieldName = '', string $tableName = '', string $tableField = '', string $onUpdate = '', string $onDelete = '')
 	{
@@ -469,15 +461,15 @@
 	 * @param string $table       Table name
 	 * @param string $foreignName Foreign name
 	 *
-	 * @return boolean|\CodeIgniter\Database\BaseResult|\CodeIgniter\Database\Query|false|mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @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)
+		if ($sql === false) // @phpstan-ignore-line
 		{
 			if ($this->db->DBDebug)
 			{
@@ -495,28 +487,28 @@
 	/**
 	 * Create Table
 	 *
-	 * @param string  $table         Table name
-	 * @param boolean $if_not_exists Whether to add IF NOT EXISTS condition
-	 * @param array   $attributes    Associative array of table attributes
+	 * @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 \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function createTable(string $table, bool $if_not_exists = false, array $attributes = [])
+	public function createTable(string $table, bool $ifNotExists = false, array $attributes = [])
 	{
 		if ($table === '')
 		{
-			throw new \InvalidArgumentException('A table name is required for that operation.');
+			throw new InvalidArgumentException('A table name is required for that operation.');
 		}
 
 		$table = $this->db->DBPrefix . $table;
 
-		if (count($this->fields) === 0)
+		if ($this->fields === [])
 		{
-			throw new \RuntimeException('Field information is required.');
+			throw new RuntimeException('Field information is required.');
 		}
 
-		$sql = $this->_createTable($table, $if_not_exists, $attributes);
+		$sql = $this->_createTable($table, $ifNotExists, $attributes);
 
 		if (is_bool($sql))
 		{
@@ -559,26 +551,26 @@
 	/**
 	 * Create Table
 	 *
-	 * @param string  $table         Table name
-	 * @param boolean $if_not_exists Whether to add 'IF NOT EXISTS' condition
-	 * @param array   $attributes    Associative array of table attributes
+	 * @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 $if_not_exists, array $attributes)
+	protected function _createTable(string $table, bool $ifNotExists, array $attributes)
 	{
 		// For any platforms that don't support Create If Not Exists...
-		if ($if_not_exists === true && $this->createTableIfStr === false)
+		if ($ifNotExists === true && $this->createTableIfStr === false)
 		{
 			if ($this->db->tableExists($table))
 			{
 				return true;
 			}
 
-			$if_not_exists = false;
+			$ifNotExists = false;
 		}
 
-		$sql = ($if_not_exists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table))
+		$sql = ($ifNotExists) ? sprintf($this->createTableIfStr, $this->db->escapeIdentifiers($table))
 			: 'CREATE TABLE';
 
 		$columns = $this->_processFields(true);
@@ -596,7 +588,11 @@
 		// Are indexes created from within the CREATE TABLE statement? (e.g. in MySQL)
 		if ($this->createTableKeys === true)
 		{
-			$columns .= $this->_processIndexes($table);
+			$indexes = $this->_processIndexes($table);
+			if (is_string($indexes))
+			{
+				$columns .= $indexes;
+			}
 		}
 
 		// createTableStr will usually have the following format: "%s %s (%s\n)"
@@ -640,7 +636,7 @@
 	 * @param boolean $cascade   Whether to add an CASCADE condition
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function dropTable(string $tableName, bool $ifExists = false, bool $cascade = false)
 	{
@@ -692,17 +688,17 @@
 	 *
 	 * Generates a platform-specific DROP TABLE string
 	 *
-	 * @param string  $table     Table name
-	 * @param boolean $if_exists Whether to add an IF EXISTS condition
-	 * @param boolean $cascade   Whether to add an CASCADE condition
+	 * @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
+	 * @return string|boolean
 	 */
-	protected function _dropTable(string $table, bool $if_exists, bool $cascade): string
+	protected function _dropTable(string $table, bool $ifExists, bool $cascade)
 	{
 		$sql = 'DROP TABLE';
 
-		if ($if_exists)
+		if ($ifExists)
 		{
 			if ($this->dropTableIfStr === false)
 			{
@@ -725,19 +721,20 @@
 	/**
 	 * Rename Table
 	 *
-	 * @param string $table_name     Old table name
-	 * @param string $new_table_name New table name
+	 * @param string $tableName    Old table name
+	 * @param string $newTableName New table name
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function renameTable(string $table_name, string $new_table_name)
+	public function renameTable(string $tableName, string $newTableName)
 	{
-		if ($table_name === '' || $new_table_name === '')
+		if ($tableName === '' || $newTableName === '')
 		{
-			throw new \InvalidArgumentException('A table name is required for that operation.');
+			throw new InvalidArgumentException('A table name is required for that operation.');
 		}
-		elseif ($this->renameTableStr === false)
+
+		if ($this->renameTableStr === false)
 		{
 			if ($this->db->DBDebug)
 			{
@@ -748,17 +745,17 @@
 		}
 
 		$result = $this->db->query(sprintf($this->renameTableStr,
-				$this->db->escapeIdentifiers($this->db->DBPrefix . $table_name),
-				$this->db->escapeIdentifiers($this->db->DBPrefix . $new_table_name))
+				$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 . $table_name),
+			$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 . $new_table_name;
+				$this->db->dataCache['table_names'][$key] = $this->db->DBPrefix . $newTableName;
 			}
 		}
 
@@ -774,12 +771,12 @@
 	 * @param string|array $field Column definition
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function addColumn(string $table, $field): bool
 	{
 		// Work-around for literal column definitions
-		is_array($field) || $field = [$field];
+		is_array($field) || $field = [$field]; // @phpstan-ignore-line
 
 		foreach (array_keys($field) as $k)
 		{
@@ -814,15 +811,15 @@
 	/**
 	 * Column Drop
 	 *
-	 * @param string       $table       Table name
-	 * @param string|array $column_name Column name Array or comma separated
+	 * @param string       $table      Table name
+	 * @param string|array $columnName Column name Array or comma separated
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
-	public function dropColumn(string $table, $column_name)
+	public function dropColumn(string $table, $columnName)
 	{
-		$sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $column_name);
+		$sql = $this->_alterTable('DROP', $this->db->DBPrefix . $table, $columnName);
 		if ($sql === false)
 		{
 			if ($this->db->DBDebug)
@@ -845,21 +842,21 @@
 	 * @param string|array $field Column definition
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function modifyColumn(string $table, $field): bool
 	{
 		// Work-around for literal column definitions
-		is_array($field) || $field = [$field];
+		is_array($field) || $field = [$field]; // @phpstan-ignore-line
 
 		foreach (array_keys($field) as $k)
 		{
 			$this->addField([$k => $field[$k]]);
 		}
 
-		if (count($this->fields) === 0)
+		if ($this->fields === [])
 		{
-			throw new \RuntimeException('Field information is required');
+			throw new RuntimeException('Field information is required');
 		}
 
 		$sqls = $this->_alterTable('CHANGE', $this->db->DBPrefix . $table, $this->_processFields());
@@ -893,18 +890,18 @@
 	/**
 	 * ALTER TABLE
 	 *
-	 * @param string $alter_type ALTER type
-	 * @param string $table      Table name
-	 * @param mixed  $fields     Column definition
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $fields    Column definition
 	 *
-	 * @return string|string[]
+	 * @return string|string[]|false
 	 */
-	protected function _alterTable(string $alter_type, string $table, $fields)
+	protected function _alterTable(string $alterType, string $table, $fields)
 	{
 		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table) . ' ';
 
 		// DROP has everything it needs now.
-		if ($alter_type === 'DROP')
+		if ($alterType === 'DROP')
 		{
 			if (is_string($fields))
 			{
@@ -918,7 +915,7 @@
 			return $sql . implode(', ', $fields);
 		}
 
-		$sql .= ($alter_type === 'ADD') ? 'ADD ' : $alter_type . ' COLUMN ';
+		$sql .= ($alterType === 'ADD') ? 'ADD ' : $alterType . ' COLUMN ';
 
 		$sqls = [];
 		foreach ($fields as $data)
@@ -935,11 +932,11 @@
 	/**
 	 * Process fields
 	 *
-	 * @param boolean $create_table
+	 * @param boolean $createTable
 	 *
 	 * @return array
 	 */
-	protected function _processFields(bool $create_table = false): array
+	protected function _processFields(bool $createTable = false): array
 	{
 		$fields = [];
 
@@ -953,11 +950,12 @@
 
 			$attributes = array_change_key_case($attributes, CASE_UPPER);
 
-			if ($create_table === true && empty($attributes['TYPE']))
+			if ($createTable === true && empty($attributes['TYPE']))
 			{
 				continue;
 			}
 
+			// @phpstan-ignore-next-line
 			isset($attributes['TYPE']) && $this->_attributeType($attributes);
 
 			$field = [
@@ -973,9 +971,10 @@
 				'_literal'       => false,
 			];
 
+			// @phpstan-ignore-next-line
 			isset($attributes['TYPE']) && $this->_attributeUnsigned($attributes, $field);
 
-			if ($create_table === false)
+			if ($createTable === false)
 			{
 				if (isset($attributes['AFTER']))
 				{
@@ -983,7 +982,7 @@
 				}
 				elseif (isset($attributes['FIRST']))
 				{
-					$field['first'] = (bool)$attributes['FIRST'];
+					$field['first'] = (bool) $attributes['FIRST'];
 				}
 			}
 
@@ -1000,7 +999,7 @@
 					$field['null'] = ' NOT NULL';
 				}
 			}
-			elseif ($create_table === true)
+			elseif ($createTable === true)
 			{
 				$field['null'] = ' NOT NULL';
 			}
@@ -1057,7 +1056,7 @@
 	 *
 	 * Performs a data type mapping between different databases.
 	 *
-	 * @param array &$attributes
+	 * @param array $attributes
 	 *
 	 * @return void
 	 */
@@ -1080,8 +1079,8 @@
 	 *    - array(TYPE => UTYPE) will change $field['type'],
 	 *        from TYPE to UTYPE in case of a match
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return null|void
 	 */
@@ -1105,7 +1104,8 @@
 
 					return;
 				}
-				elseif (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
+
+				if (is_string($key) && strcasecmp($attributes['TYPE'], $key) === 0)
 				{
 					$field['type'] = $key;
 
@@ -1124,8 +1124,8 @@
 	/**
 	 * Field attribute DEFAULT
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return null|void
 	 */
@@ -1158,8 +1158,8 @@
 	/**
 	 * Field attribute UNIQUE
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return void
 	 */
@@ -1176,8 +1176,8 @@
 	/**
 	 * Field attribute AUTO_INCREMENT
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return void
 	 */
@@ -1212,7 +1212,7 @@
 			}
 		}
 
-		if (count($this->primaryKeys) > 0)
+		if ($this->primaryKeys !== [])
 		{
 			$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
 					. ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
@@ -1228,7 +1228,7 @@
 	 *
 	 * @param string $table
 	 *
-	 * @return array
+	 * @return array|string
 	 */
 	protected function _processIndexes(string $table)
 	{
@@ -1236,7 +1236,7 @@
 
 		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
 		{
-			$this->keys[$i] = (array)$this->keys[$i];
+			$this->keys[$i] = (array) $this->keys[$i];
 
 			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
 			{
@@ -1250,7 +1250,7 @@
 				continue;
 			}
 
-			if (in_array($i, $this->uniqueKeys))
+			if (in_array($i, $this->uniqueKeys, true))
 			{
 				$sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
 						  . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
@@ -1287,21 +1287,21 @@
 			'SET DEFAULT',
 		];
 
-		if (count($this->foreignKeys) > 0)
+		if ($this->foreignKeys !== [])
 		{
 			foreach ($this->foreignKeys as $field => $fkey)
 			{
-				$name_index = $table . '_' . $field . '_foreign';
+				$nameIndex = $table . '_' . $field . '_foreign';
 
-				$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($name_index)
+				$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))
+				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true))
 				{
 					$sql .= ' ON DELETE ' . $fkey['onDelete'];
 				}
 
-				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions))
+				if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true))
 				{
 					$sql .= ' ON UPDATE ' . $fkey['onUpdate'];
 				}
@@ -1324,5 +1324,4 @@
 	{
 		$this->fields = $this->keys = $this->uniqueKeys = $this->primaryKeys = $this->foreignKeys = [];
 	}
-
 }
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 3af3229..c0874ba 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -1,50 +1,23 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
+use Config\Database;
+
 /**
  * Class Migration
  */
 abstract class Migration
 {
-
 	/**
 	 * The name of the database group to use.
 	 *
@@ -55,7 +28,7 @@
 	/**
 	 * Database Connection instance
 	 *
-	 * @var BaseConnection
+	 * @var ConnectionInterface
 	 */
 	protected $db;
 
@@ -71,11 +44,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \CodeIgniter\Database\Forge $forge
+	 * @param Forge $forge
 	 */
 	public function __construct(Forge $forge = null)
 	{
-		$this->forge = ! is_null($forge) ? $forge : \Config\Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
+		$this->forge = ! is_null($forge) ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
 
 		$this->db = $this->forge->getConnection();
 	}
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 55350c8..4bce96a 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -1,54 +1,30 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
+use Config\Database;
+use Config\Migrations as MigrationsConfig;
 use Config\Services;
+use RuntimeException;
+use stdClass;
 
 /**
  * Class MigrationRunner
  */
 class MigrationRunner
 {
-
 	/**
 	 * Whether or not migrations are allowed to run.
 	 *
@@ -66,7 +42,7 @@
 	/**
 	 * The Namespace  where migrations can be found.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $namespace;
 
@@ -95,7 +71,7 @@
 	 * The main database connection. Used to store
 	 * migration information in.
 	 *
-	 * @var ConnectionInterface
+	 * @var BaseConnection
 	 */
 	protected $db;
 
@@ -132,7 +108,7 @@
 	/**
 	 * The database Group filter.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $groupFilter;
 
@@ -153,12 +129,12 @@
 	 * - existing connection instance
 	 * - array of database configuration values
 	 *
-	 * @param BaseConfig                                             $config
-	 * @param \CodeIgniter\Database\ConnectionInterface|array|string $db
+	 * @param MigrationsConfig                      $config
+	 * @param ConnectionInterface|array|string|null $db
 	 *
 	 * @throws ConfigException
 	 */
-	public function __construct(BaseConfig $config, $db = null)
+	public function __construct(MigrationsConfig $config, $db = null)
 	{
 		$this->enabled = $config->enabled ?? false;
 		$this->table   = $config->table ?? 'migrations';
@@ -182,6 +158,11 @@
 	 * Locate and run all new migrations
 	 *
 	 * @param string|null $group
+	 *
+	 * @throws ConfigException
+	 * @throws RuntimeException
+	 *
+	 * @return boolean
 	 */
 	public function latest(string $group = null)
 	{
@@ -209,7 +190,7 @@
 		}
 
 		// Remove any migrations already in the history
-		foreach ($this->getHistory($this->group) as $history)
+		foreach ($this->getHistory((string) $group) as $history)
 		{
 			unset($migrations[$this->getObjectUid($history)]);
 		}
@@ -242,10 +223,15 @@
 					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 					return false;
 				}
-				throw new \RuntimeException($message);
+
+				throw new RuntimeException($message);
 			}
 		}
 
+		$data           = get_object_vars($this);
+		$data['method'] = 'latest';
+		Events::trigger('migrate', $data);
+
 		return true;
 	}
 
@@ -259,8 +245,10 @@
 	 * @param integer     $targetBatch Target batch number, or negative for a relative batch, 0 for all
 	 * @param string|null $group
 	 *
-	 * @return mixed Current batch number on success, FALSE on failure or no migrations are found
 	 * @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)
 	{
@@ -293,7 +281,7 @@
 		}
 
 		// Make sure $targetBatch is found
-		if ($targetBatch !== 0 && ! in_array($targetBatch, $batches))
+		if ($targetBatch !== 0 && ! in_array($targetBatch, $batches, true))
 		{
 			$message = lang('Migrations.batchNotFound') . $targetBatch;
 
@@ -302,7 +290,8 @@
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
-			throw new \RuntimeException($message);
+
+			throw new RuntimeException($message);
 		}
 
 		// Save the namespace to restore it after loading migrations
@@ -314,6 +303,7 @@
 
 		// Gather migrations down through each batch until reaching the target
 		$migrations = [];
+
 		while ($batch = array_pop($batches))
 		{
 			// Check if reached target
@@ -338,7 +328,8 @@
 						$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 						return false;
 					}
-					throw new \RuntimeException($message);
+
+					throw new RuntimeException($message);
 				}
 
 				// Add the history and put it on the list
@@ -365,10 +356,15 @@
 					$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 					return false;
 				}
-				throw new \RuntimeException($message);
+
+				throw new RuntimeException($message);
 			}
 		}
 
+		$data           = get_object_vars($this);
+		$data['method'] = 'regress';
+		Events::trigger('migrate', $data);
+
 		// Restore the namespace
 		$this->namespace = $tmpNamespace;
 
@@ -413,7 +409,7 @@
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
-			throw new \RuntimeException($message);
+			throw new RuntimeException($message);
 		}
 
 		// Check the history for a match
@@ -459,7 +455,7 @@
 			$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 			return false;
 		}
-		throw new \RuntimeException($message);
+		throw new RuntimeException($message);
 	}
 
 	//--------------------------------------------------------------------
@@ -563,7 +559,7 @@
 		$locator = Services::locator(true);
 
 		// Create migration object using stdClass
-		$migration = new \stdClass();
+		$migration = new stdClass();
 
 		// Get migration version number
 		$migration->version   = $this->getMigrationNumber($name);
@@ -617,7 +613,7 @@
 	 *
 	 * @param string $name
 	 *
-	 * @return \CodeIgniter\Database\MigrationRunner
+	 * @return MigrationRunner
 	 */
 	public function setName(string $name)
 	{
@@ -682,7 +678,7 @@
 	 * Uses the non-repeatable portions of a migration or history
 	 * to create a sortable unique key
 	 *
-	 * @param object $migration or $history
+	 * @param object $object migration or $history
 	 *
 	 * @return string
 	 */
@@ -722,14 +718,13 @@
 	/**
 	 * Truncates the history table.
 	 *
-	 * @return boolean
+	 * @return void
 	 */
 	public function clearHistory()
 	{
 		if ($this->db->tableExists($this->table))
 		{
-			$this->db->table($this->table)
-					 ->truncate();
+			$this->db->table($this->table)->truncate();
 		}
 	}
 
@@ -767,7 +762,7 @@
 	/**
 	 * Removes a single history
 	 *
-	 * @param string $version
+	 * @param object $history
 	 *
 	 * @return void
 	 */
@@ -795,20 +790,23 @@
 	{
 		$this->ensureTable();
 
-		$criteria = ['group' => $group];
+		$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)
 		{
-			$criteria['namespace'] = $this->namespace;
+			$builder->where('namespace', $this->namespace);
 		}
 
-		$query = $this->db->table($this->table)
-						  ->where($criteria)
-						  ->orderBy('id', 'ASC')
-						  ->get();
+		$query = $builder->orderBy('id', 'ASC')->get();
 
-		return $query ? $query->getResultObject() : [];
+		return ! empty($query) ? $query->getResultObject() : [];
 	}
 
 	//--------------------------------------------------------------------
@@ -829,7 +827,7 @@
 						  ->orderBy('id', $order)
 						  ->get();
 
-		return $query ? $query->getResultObject() : [];
+		return ! empty($query) ? $query->getResultObject() : [];
 	}
 
 	//--------------------------------------------------------------------
@@ -850,7 +848,7 @@
 						  ->get()
 						  ->getResultArray();
 
-		return array_column($batches, 'batch');
+		return array_map('intval', array_column($batches, 'batch'));
 	}
 
 	//--------------------------------------------------------------------
@@ -873,7 +871,7 @@
 			? end($batch)->batch
 			: 0;
 
-		return (int)$batch;
+		return (int) $batch;
 	}
 
 	//--------------------------------------------------------------------
@@ -892,7 +890,7 @@
 		if ($batch < 0)
 		{
 			$batches = $this->getBatches();
-			$batch   = $batches[count($batches) - 1 + $targetBatch] ?? 0;
+			$batch   = $batches[count($batches) - 1] ?? 0;
 		}
 
 		$migration = $this->db->table($this->table)
@@ -921,7 +919,7 @@
 		if ($batch < 0)
 		{
 			$batches = $this->getBatches();
-			$batch   = $batches[count($batches) - 1 + $targetBatch] ?? 0;
+			$batch   = $batches[count($batches) - 1] ?? 0;
 		}
 
 		$migration = $this->db->table($this->table)
@@ -947,7 +945,7 @@
 			return;
 		}
 
-		$forge = \Config\Database::forge($this->db);
+		$forge = Database::forge($this->db);
 
 		$forge->addField([
 			'id'        => [
@@ -962,8 +960,9 @@
 				'null'       => false,
 			],
 			'class'     => [
-				'type' => 'TEXT',
-				'null' => false,
+				'type'       => 'VARCHAR',
+				'constraint' => 255,
+				'null'       => false,
 			],
 			'group'     => [
 				'type'       => 'VARCHAR',
@@ -997,8 +996,8 @@
 	/**
 	 * Handles the actual running of a migration.
 	 *
-	 * @param $direction   "up" or "down"
-	 * @param $migration   The migration to run
+	 * @param string $direction "up" or "down"
+	 * @param object $migration The migration to run
 	 *
 	 * @return boolean
 	 */
@@ -1019,7 +1018,7 @@
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
-			throw new \RuntimeException($message);
+			throw new RuntimeException($message);
 		}
 
 		// Initialize migration
@@ -1054,7 +1053,7 @@
 				$this->cliMessages[] = "\t" . CLI::color($message, 'red');
 				return false;
 			}
-			throw new \RuntimeException($message);
+			throw new RuntimeException($message);
 		}
 
 		$instance->{$direction}();
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index b2b4362..47a326a 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -1,22 +1,29 @@
-<?php namespace CodeIgniter\Database;
+<?php
 
-use Config\Services;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Config\Factories;
+
+/**
+ * Returns new or shared Model instances
+ *
+ * @deprecated Use CodeIgniter\Config\Factories::models()
+ */
 class ModelFactory
 {
 	/**
-	 * Cache for instance of any models that
-	 * have been requested as "shared" instance.
+	 * Creates new Model instances or returns a shared instance
 	 *
-	 * @var array
-	 */
-	static private $instances = [];
-
-	/**
-	 * Create new configuration instances or return
-	 * a shared instance
-	 *
-	 * @param string              $name       Configuration name
+	 * @param string              $name       Model name, namespace optional
 	 * @param boolean             $getShared  Use shared instance
 	 * @param ConnectionInterface $connection
 	 *
@@ -24,88 +31,25 @@
 	 */
 	public static function get(string $name, bool $getShared = true, ConnectionInterface $connection = null)
 	{
-		$class = $name;
-		if (($pos = strrpos($name, '\\')) !== false)
-		{
-			$class = substr($name, $pos + 1);
-		}
-
-		if (! $getShared)
-		{
-			return self::createClass($name, $connection);
-		}
-
-		if (! isset( self::$instances[$class] ))
-		{
-			self::$instances[$class] = self::createClass($name, $connection);
-		}
-		return self::$instances[$class];
+		return Factories::models($name, ['getShared' => $getShared], $connection);
 	}
 
 	/**
 	 * Helper method for injecting mock instances while testing.
 	 *
-	 * @param string   $class
-	 * @param $instance
+	 * @param string $name
+	 * @param object $instance
 	 */
-	public static function injectMock(string $class, $instance)
+	public static function injectMock(string $name, $instance)
 	{
-		self::$instances[$class] = $instance;
+		Factories::injectMock('models', $name, $instance);
 	}
 
 	/**
-	 * Resets the instances array
+	 * Resets the static arrays
 	 */
 	public static function reset()
 	{
-		static::$instances = [];
-	}
-
-	/**
-	 * Find configuration class and create instance
-	 *
-	 * @param string                   $name       Classname
-	 * @param ConnectionInterface|null $connection
-	 *
-	 * @return mixed|null
-	 */
-	private static function createClass(string $name, ConnectionInterface &$connection = null)
-	{
-		if (class_exists($name))
-		{
-			return new $name();
-		}
-
-		$locator = Services::locator();
-		$file    = $locator->locateFile($name, 'Models');
-
-		if (empty($file))
-		{
-			// No file found - check if the class was namespaced
-			if (strpos($name, '\\') !== false)
-			{
-				// Class was namespaced and locateFile couldn't find it
-				return null;
-			}
-
-			// Check all namespaces
-			$files = $locator->search('Models/' . $name);
-			if (empty($files))
-			{
-				return null;
-			}
-
-			// Get the first match (prioritizes user and framework)
-			$file = reset($files);
-		}
-
-		$name = $locator->getClassname($file);
-
-		if (empty($name))
-		{
-			return null;
-		}
-
-		return new $name($connection);
+		Factories::reset('models');
 	}
 }
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
index d2eb6e6..a64b3ae 100644
--- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -46,7 +18,6 @@
  */
 class Builder extends BaseBuilder
 {
-
 	/**
 	 * Identifier escape character
 	 *
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 206b9f0..5916db8 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -1,52 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use LogicException;
+use MySQLi;
+use mysqli_sql_exception;
+use stdClass;
+use Throwable;
 
 /**
  * Connection for MySQLi
  */
-class Connection extends BaseConnection implements ConnectionInterface
+class Connection extends BaseConnection
 {
 	/**
 	 * Database driver
@@ -54,6 +30,7 @@
 	 * @var string
 	 */
 	public $DBDriver = 'MySQLi';
+
 	/**
 	 * DELETE hack flag
 	 *
@@ -64,22 +41,27 @@
 	 * @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
+	 * @var MySQLi
 	 */
 	public $mysqli;
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -88,7 +70,7 @@
 	 * @param boolean $persistent
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function connect(bool $persistent = false)
 	{
@@ -106,7 +88,7 @@
 			$socket   = '';
 		}
 
-		$client_flags = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
+		$clientFlags  = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
 		$this->mysqli = mysqli_init();
 
 		mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
@@ -137,10 +119,11 @@
 
 		if (is_array($this->encrypt))
 		{
-			$ssl                                                  = [];
-			empty($this->encrypt['ssl_key']) || $ssl['key']       = $this->encrypt['ssl_key'];
-			empty($this->encrypt['ssl_cert']) || $ssl['cert']     = $this->encrypt['ssl_cert'];
-			empty($this->encrypt['ssl_ca']) || $ssl['ca']         = $this->encrypt['ssl_ca'];
+			$ssl = [];
+
+			empty($this->encrypt['ssl_key'])    || $ssl['key']    = $this->encrypt['ssl_key'];
+			empty($this->encrypt['ssl_cert'])   || $ssl['cert']   = $this->encrypt['ssl_cert'];
+			empty($this->encrypt['ssl_ca'])     || $ssl['ca']     = $this->encrypt['ssl_ca'];
 			empty($this->encrypt['ssl_capath']) || $ssl['capath'] = $this->encrypt['ssl_capath'];
 			empty($this->encrypt['ssl_cipher']) || $ssl['cipher'] = $this->encrypt['ssl_cipher'];
 
@@ -151,7 +134,7 @@
 					if ($this->encrypt['ssl_verify'])
 					{
 						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
-						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);
+						$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
@@ -161,11 +144,11 @@
 					// https://bugs.php.net/bug.php?id=68344
 					elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, '5.6', '>='))
 					{
-						$client_flags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
+						$clientFlags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
 					}
 				}
 
-				$client_flags += MYSQLI_CLIENT_SSL;
+				$clientFlags += MYSQLI_CLIENT_SSL;
 				$this->mysqli->ssl_set(
 					$ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
 					$ssl['capath'] ?? null, $ssl['cipher'] ?? null
@@ -176,11 +159,11 @@
 		try
 		{
 			if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
-				$this->database, $port, $socket, $client_flags)
+				$this->database, $port, $socket, $clientFlags)
 			)
 			{
 				// Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
-				if (($client_flags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=')
+				if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=')
 					&& empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
 										  ->fetch_object()->Value)
 				)
@@ -214,7 +197,7 @@
 				return $this->mysqli;
 			}
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			// Clean sensitive information from errors.
 			$msg = $e->getMessage();
@@ -222,7 +205,7 @@
 			$msg = str_replace($this->username, '****', $msg);
 			$msg = str_replace($this->password, '****', $msg);
 
-			throw new \mysqli_sql_exception($msg, $e->getCode(), $e);
+			throw new DatabaseException($msg, $e->getCode(), $e);
 		}
 
 		return false;
@@ -330,7 +313,7 @@
 		{
 			return $this->connID->query($this->prepQuery($sql));
 		}
-		catch (\mysqli_sql_exception $e)
+		catch (mysqli_sql_exception $e)
 		{
 			log_message('error', $e);
 			if ($this->DBDebug)
@@ -386,11 +369,6 @@
 	 */
 	protected function _escapeString(string $str): string
 	{
-		if (is_bool($str))
-		{
-			return $str;
-		}
-
 		if (! $this->connID)
 		{
 			$this->initialize();
@@ -479,7 +457,7 @@
 	 * Returns an array of objects with field data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _fieldData(string $table): array
@@ -495,14 +473,14 @@
 		$retVal = [];
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retVal[$i]       = new \stdClass();
+			$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');
+			$retVal[$i]->primary_key = (int) ($query[$i]->Key === 'PRI');
 		}
 
 		return $retVal;
@@ -514,9 +492,9 @@
 	 * Returns an array of objects with index data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
-	 * @throws \LogicException
+	 * @throws LogicException
 	 */
 	public function _indexData(string $table): array
 	{
@@ -538,7 +516,7 @@
 		{
 			if (empty($keys[$index['Key_name']]))
 			{
-				$keys[$index['Key_name']]       = new \stdClass();
+				$keys[$index['Key_name']]       = new stdClass();
 				$keys[$index['Key_name']]->name = $index['Key_name'];
 
 				if ($index['Key_name'] === 'PRIMARY')
@@ -580,7 +558,7 @@
 	 * Returns an array of objects with Foreign key data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _foreignKeyData(string $table): array
@@ -611,7 +589,7 @@
 		$retVal = [];
 		foreach ($query as $row)
 		{
-			$obj                      = new \stdClass();
+			$obj                      = new stdClass();
 			$obj->constraint_name     = $row->CONSTRAINT_NAME;
 			$obj->table_name          = $row->TABLE_NAME;
 			$obj->column_name         = $row->COLUMN_NAME;
@@ -738,5 +716,6 @@
 
 		return false;
 	}
+
 	//--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 7e7e0a2..6251054 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -1,50 +1,23 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
 
+use CodeIgniter\Database\Forge as BaseForge;
+
 /**
  * Forge for MySQLi
  */
-class Forge extends \CodeIgniter\Database\Forge
+class Forge extends BaseForge
 {
-
 	/**
 	 * CREATE DATABASE statement
 	 *
@@ -136,7 +109,7 @@
 			{
 				$sql .= ' ' . strtoupper($key) . ' = ';
 
-				if (in_array(strtoupper($key), $this->_quoted_table_options))
+				if (in_array(strtoupper($key), $this->_quoted_table_options, true))
 				{
 					$sql .= $this->db->escape($attributes[$key]);
 				}
@@ -165,16 +138,16 @@
 	/**
 	 * ALTER TABLE
 	 *
-	 * @param  string $alter_type ALTER type
-	 * @param  string $table      Table name
-	 * @param  mixed  $field      Column definition
+	 * @param  string $alterType ALTER type
+	 * @param  string $table     Table name
+	 * @param  mixed  $field     Column definition
 	 * @return string|string[]
 	 */
-	protected function _alterTable(string $alter_type, string $table, $field)
+	protected function _alterTable(string $alterType, string $table, $field)
 	{
-		if ($alter_type === 'DROP')
+		if ($alterType === 'DROP')
 		{
-			return parent::_alterTable($alter_type, $table, $field);
+			return parent::_alterTable($alterType, $table, $field);
 		}
 
 		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
@@ -182,11 +155,11 @@
 		{
 			if ($data['_literal'] !== false)
 			{
-				$field[$i] = ($alter_type === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+				$field[$i] = ($alterType === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
 			}
 			else
 			{
-				if ($alter_type === 'ADD')
+				if ($alterType === 'ADD')
 				{
 					$field[$i]['_literal'] = "\n\tADD ";
 				}
@@ -212,11 +185,11 @@
 	 */
 	protected function _processColumn(array $field): string
 	{
-		$extra_clause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+		$extraClause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
 
-		if (empty($extra_clause) && isset($field['first']) && $field['first'] === true)
+		if (empty($extraClause) && isset($field['first']) && $field['first'] === true)
 		{
-			$extra_clause = ' FIRST';
+			$extraClause = ' FIRST';
 		}
 
 		return $this->db->escapeIdentifiers($field['name'])
@@ -228,7 +201,7 @@
 				. $field['auto_increment']
 				. $field['unique']
 				. (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
-				. $extra_clause;
+				. $extraClause;
 	}
 
 	//--------------------------------------------------------------------
@@ -262,9 +235,10 @@
 				continue;
 			}
 
+			// @phpstan-ignore-next-line
 			is_array($this->keys[$i]) || $this->keys[$i] = [$this->keys[$i]];
 
-			$unique = in_array($i, $this->uniqueKeys) ? 'UNIQUE ' : '';
+			$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])) . ')';
@@ -274,6 +248,4 @@
 
 		return $sql;
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
index 3ef4104..efc9abe 100644
--- a/system/Database/MySQLi/PreparedQuery.php
+++ b/system/Database/MySQLi/PreparedQuery.php
@@ -1,53 +1,24 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
 
+use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
-use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for MySQLi
  */
-class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
+class PreparedQuery extends BasePreparedQuery
 {
-
 	/**
 	 * Prepares the query against the database, and saves the connection
 	 * info necessary to execute the query later.
@@ -76,8 +47,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Takes a new set of data and runs it against the currently
 	 * prepared query. Upon success, will return a Results object.
@@ -88,9 +57,9 @@
 	 */
 	public function _execute(array $data): bool
 	{
-		if (is_null($this->statement))
+		if (! isset($this->statement))
 		{
-			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
 		}
 
 		// First off -bind the parameters
@@ -119,8 +88,6 @@
 		return $this->statement->execute();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the result object for the prepared query.
 	 *
@@ -130,6 +97,4 @@
 	{
 		return $this->statement->get_result();
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 7a7c585..6ceb923 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -1,54 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
 
 use CodeIgniter\Database\BaseResult;
-use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
+use stdClass;
 
 /**
  * Result for MySQLi
  */
-class Result extends BaseResult implements ResultInterface
+class Result extends BaseResult
 {
-
 	/**
 	 * Gets the number of fields in the result set.
 	 *
@@ -87,51 +58,47 @@
 	 */
 	public function getFieldData(): array
 	{
-		static $data_types = [
+		static $dataTypes = [
 			MYSQLI_TYPE_DECIMAL     => 'decimal',
 			MYSQLI_TYPE_NEWDECIMAL  => 'newdecimal',
 			MYSQLI_TYPE_FLOAT       => 'float',
 			MYSQLI_TYPE_DOUBLE      => 'double',
-			
+
 			MYSQLI_TYPE_BIT         => 'bit',
-			MYSQLI_TYPE_TINY        => 'tiny',
 			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_INTERVAL    => 'interval',
+
 			MYSQLI_TYPE_SET         => 'set',
-			MYSQLI_TYPE_ENUM        => 'enum',
-			
+
 			MYSQLI_TYPE_VAR_STRING  => 'var_string',
 			MYSQLI_TYPE_STRING      => 'string',
-			MYSQLI_TYPE_CHAR        => 'char',
-			
+
 			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]              = new stdClass();
 			$retVal[$i]->name        = $data->name;
 			$retVal[$i]->type        = $data->type;
-			$retVal[$i]->type_name   = isset($data_types[$data->type]) ? $data_types[$data->type] : null;
+			$retVal[$i]->type_name   = in_array($data->type, [1, 247], true) ? 'char' : (isset($dataTypes[$data->type]) ? $dataTypes[$data->type] : null);
 			$retVal[$i]->max_length  = $data->max_length;
 			$retVal[$i]->primary_key = (int) ($data->flags & 2);
 			$retVal[$i]->length      = $data->length;
@@ -208,4 +175,21 @@
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * 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;
+	}
+
+	//--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index e5056d1..7736718 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
@@ -47,7 +19,6 @@
  */
 class Utils extends BaseUtils
 {
-
 	/**
 	 * List databases statement
 	 *
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 4bace0b..34e953d 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -46,7 +19,6 @@
  */
 class Builder extends BaseBuilder
 {
-
 	/**
 	 * ORDER BY random keyword
 	 *
@@ -106,7 +78,7 @@
 		$direction = strtoupper(trim($direction));
 		if ($direction === 'RANDOM')
 		{
-			if (! is_float($orderBy) && ctype_digit((string) $orderBy))
+			if (ctype_digit($orderBy))
 			{
 				$orderBy = (float) ($orderBy > 1 ? "0.{$orderBy}" : $orderBy);
 			}
@@ -241,7 +213,7 @@
 	 *
 	 * @param mixed   $where
 	 * @param integer $limit
-	 * @param boolean $reset_data
+	 * @param boolean $resetData
 	 *
 	 * @return   mixed
 	 * @throws   DatabaseException
@@ -249,14 +221,14 @@
 	 * @internal param the $mixed limit clause
 	 * @internal param $bool
 	 */
-	public function delete($where = '', int $limit = null, bool $reset_data = true)
+	public function delete($where = '', int $limit = null, bool $resetData = true)
 	{
 		if (! empty($limit) || ! empty($this->QBLimit))
 		{
 			throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
 		}
 
-		return parent::delete($where, $limit, $reset_data);
+		return parent::delete($where, $limit, $resetData);
 	}
 
 	//--------------------------------------------------------------------
@@ -331,7 +303,7 @@
 		}
 
 		$cases = '';
-		foreach ($final as $k => $v)
+		foreach ($final as $k => $v) // @phpstan-ignore-line
 		{
 			$cases .= "{$k} = (CASE {$index}\n"
 					. implode("\n", $v)
@@ -389,15 +361,15 @@
 	 *
 	 * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
 	 *
-	 * @param string  $prefix
-	 * @param string  $column
-	 * @param string  $not
-	 * @param string  $bind
-	 * @param boolean $insensitiveSearch
+	 * @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 = null, string $column, string $not = null, string $bind, bool $insensitiveSearch = false): string
+	public function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
 	{
 		$op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index c3d6db6..ca245ba 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -1,59 +1,32 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use ErrorException;
+use stdClass;
 
 /**
  * Connection for Postgre
  */
-class Connection extends BaseConnection implements ConnectionInterface
+class Connection extends BaseConnection
 {
-
 	/**
 	 * Database driver
 	 *
 	 * @var string
 	 */
-	public $DBDriver = 'postgre';
+	public $DBDriver = 'Postgre';
 
 	//--------------------------------------------------------------------
 
@@ -172,7 +145,8 @@
 			return $this->dataCache['version'];
 		}
 
-		if (! $this->connID || ( $pgVersion = pg_version($this->connID)) === false)
+		// @phpstan-ignore-next-line
+		if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false)
 		{
 			$this->initialize();
 		}
@@ -195,7 +169,7 @@
 		{
 			return pg_query($this->connID, $sql);
 		}
-		catch (\ErrorException $e)
+		catch (ErrorException $e)
 		{
 			log_message('error', $e);
 			if ($this->DBDebug)
@@ -235,11 +209,12 @@
 			$this->initialize();
 		}
 
-		if (is_string($str) || ( is_object($str) && method_exists($str, '__toString')))
+		if (is_string($str) || (is_object($str) && method_exists($str, '__toString')))
 		{
 			return pg_escape_literal($this->connID, $str);
 		}
-		elseif (is_bool($str))
+
+		if (is_bool($str))
 		{
 			return $str ? 'TRUE' : 'FALSE';
 		}
@@ -302,7 +277,8 @@
 		return 'SELECT "column_name"
 			FROM "information_schema"."columns"
 			WHERE LOWER("table_name") = '
-				. $this->escape($this->DBPrefix . strtolower($table));
+				. $this->escape($this->DBPrefix . strtolower($table))
+				. ' ORDER BY "ordinal_position"';
 	}
 
 	//--------------------------------------------------------------------
@@ -311,7 +287,7 @@
 	 * Returns an array of objects with field data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _fieldData(string $table): array
@@ -319,7 +295,8 @@
 		$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));
+				. $this->escape(strtolower($table))
+				. ' ORDER BY "ordinal_position"';
 
 		if (($query = $this->query($sql)) === false)
 		{
@@ -330,7 +307,7 @@
 		$retVal = [];
 		for ($i = 0, $c = count($query); $i < $c; $i ++)
 		{
-			$retVal[$i]             = new \stdClass();
+			$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;
@@ -346,7 +323,7 @@
 	 * Returns an array of objects with index data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _indexData(string $table): array
@@ -365,7 +342,7 @@
 		$retVal = [];
 		foreach ($query as $row)
 		{
-			$obj         = new \stdClass();
+			$obj         = new stdClass();
 			$obj->name   = $row->indexname;
 			$_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
 			$obj->fields = array_map(function ($v) {
@@ -393,7 +370,7 @@
 	 * Returns an array of objects with Foreign key data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _foreignKeyData(string $table): array
@@ -419,7 +396,7 @@
 		$retVal = [];
 		foreach ($query as $row)
 		{
-			$obj                      = new \stdClass();
+			$obj                      = new stdClass();
 			$obj->constraint_name     = $row->constraint_name;
 			$obj->table_name          = $row->table_name;
 			$obj->column_name         = $row->column_name;
@@ -479,9 +456,9 @@
 	/**
 	 * Insert ID
 	 *
-	 * @return integer
+	 * @return integer|string
 	 */
-	public function insertID(): int
+	public function insertID()
 	{
 		$v = pg_version($this->connID);
 		// 'server' key is only available since PostgreSQL 7.4
@@ -530,7 +507,7 @@
 	 */
 	protected function buildDSN()
 	{
-		$this->DSN === '' || $this->DSN = '';
+		$this->DSN === '' || $this->DSN = ''; // @phpstan-ignore-line
 
 		// If UNIX sockets are used, we shouldn't set a port
 		if (strpos($this->hostname, '/') !== false)
@@ -561,7 +538,7 @@
 		// 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
+		// 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} !== '')
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 9b0bbdb..7ede567 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -1,50 +1,23 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
 
+use CodeIgniter\Database\Forge as BaseForge;
+
 /**
  * Forge for Postgre
  */
-class Forge extends \CodeIgniter\Database\Forge
+class Forge extends BaseForge
 {
-
 	/**
 	 * CHECK DATABASE EXIST statement
 	 *
@@ -101,17 +74,17 @@
 	/**
 	 * ALTER TABLE
 	 *
-	 * @param string $alter_type ALTER type
-	 * @param string $table      Table name
-	 * @param mixed  $field      Column definition
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $field     Column definition
 	 *
-	 * @return string|array
+	 * @return string|array|boolean
 	 */
-	protected function _alterTable(string $alter_type, string $table, $field)
+	protected function _alterTable(string $alterType, string $table, $field)
 	{
-		if (in_array($alter_type, ['DROP', 'ADD'], true))
+		if (in_array($alterType, ['DROP', 'ADD'], true))
 		{
-			return parent::_alterTable($alter_type, $table, $field);
+			return parent::_alterTable($alterType, $table, $field);
 		}
 
 		$sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
@@ -183,7 +156,7 @@
 	 *
 	 * Performs a data type mapping between different databases.
 	 *
-	 * @param array &$attributes
+	 * @param array $attributes
 	 *
 	 * @return void
 	 */
@@ -218,8 +191,8 @@
 	/**
 	 * Field attribute AUTO_INCREMENT
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return void
 	 */
@@ -238,15 +211,15 @@
 	 *
 	 * Generates a platform-specific DROP TABLE string
 	 *
-	 * @param string  $table     Table name
-	 * @param boolean $if_exists Whether to add an IF EXISTS condition
+	 * @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 $if_exists, bool $cascade): string
+	protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
 	{
-		$sql = parent::_dropTable($table, $if_exists, $cascade);
+		$sql = parent::_dropTable($table, $ifExists, $cascade);
 
 		if ($cascade === true)
 		{
@@ -255,7 +228,4 @@
 
 		return $sql;
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index 27e3da2..bb12cb0 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -1,53 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
 
+use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
-use CodeIgniter\Database\PreparedQueryInterface;
+use Exception;
 
 /**
  * Prepared query for Postgre
  */
-class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
+class PreparedQuery extends BasePreparedQuery
 {
-
 	/**
 	 * Stores the name this query can be
 	 * used under by postgres. Only used internally.
@@ -60,12 +32,10 @@
 	 * The result resource from a successful
 	 * pg_exec. Or false.
 	 *
-	 * @var
+	 * @var Result|boolean
 	 */
 	protected $result;
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Prepares the query against the database, and saves the connection
 	 * info necessary to execute the query later.
@@ -78,11 +48,11 @@
 	 *                        Unused in the MySQLi driver.
 	 *
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function _prepare(string $sql, array $options = [])
 	{
-		$this->name = random_int(1, 10000000000000000);
+		$this->name = (string) random_int(1, 10000000000000000);
 
 		$sql = $this->parameterize($sql);
 
@@ -99,8 +69,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Takes a new set of data and runs it against the currently
 	 * prepared query. Upon success, will return a Results object.
@@ -111,9 +79,9 @@
 	 */
 	public function _execute(array $data): bool
 	{
-		if (is_null($this->statement))
+		if (! isset($this->statement))
 		{
-			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
 		}
 
 		$this->result = pg_execute($this->db->connID, $this->name, $data);
@@ -121,8 +89,6 @@
 		return (bool) $this->result;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the result object for the prepared query.
 	 *
@@ -133,8 +99,6 @@
 		return $this->result;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Replaces the ? placeholders with $1, $2, etc parameters for use
 	 * within the prepared query.
@@ -153,6 +117,4 @@
 			return "\${$count}";
 		}, $sql);
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index fcdd509..3f0dbc5 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -1,54 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
 
 use CodeIgniter\Database\BaseResult;
-use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
+use stdClass;
 
 /**
  * Result for Postgre
  */
-class Result extends BaseResult implements ResultInterface
+class Result extends BaseResult
 {
-
 	/**
 	 * Gets the number of fields in the result set.
 	 *
@@ -90,10 +61,10 @@
 
 		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
 		{
-			$retVal[$i]             = new \stdClass();
+			$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]->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);
@@ -170,4 +141,20 @@
 	}
 
 	//--------------------------------------------------------------------
+	/**
+	 * 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;
+	}
+
+	//--------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index dd45de1..7e4fcfb 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
@@ -46,7 +19,6 @@
  */
 class Utils extends BaseUtils
 {
-
 	/**
 	 * List databases statement
 	 *
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index 8bd9476..e7d7e54 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -44,7 +16,6 @@
  */
 interface PreparedQueryInterface
 {
-
 	/**
 	 * Takes a new set of data and runs it against the currently
 	 * prepared query. Upon success, will return a Results object.
diff --git a/system/Database/Query.php b/system/Database/Query.php
index dae2eeb..6891ebe 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -1,51 +1,21 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 /**
  * Query builder
- *
- * @package CodeIgniter\Database
  */
 class Query implements QueryInterface
 {
-
 	/**
 	 * The query string, as provided by the user.
 	 *
@@ -80,7 +50,7 @@
 	 * The start time in seconds with microseconds
 	 * for when this query was executed.
 	 *
-	 * @var float
+	 * @var string|float
 	 */
 	protected $startTime;
 
@@ -110,7 +80,7 @@
 	 * Pointer to database connection.
 	 * Mainly for escaping features.
 	 *
-	 * @var BaseConnection
+	 * @var ConnectionInterface
 	 */
 	public $db;
 
@@ -119,9 +89,9 @@
 	/**
 	 * BaseQuery constructor.
 	 *
-	 * @param $db ConnectionInterface
+	 * @param ConnectionInterface $db
 	 */
-	public function __construct(&$db)
+	public function __construct(ConnectionInterface &$db)
 	{
 		$this->db = $db;
 	}
@@ -168,12 +138,23 @@
 	/**
 	 * Will store the variables to bind into the query later.
 	 *
-	 * @param array $binds
+	 * @param array   $binds
+	 * @param boolean $setEscape
 	 *
 	 * @return $this
 	 */
-	public function setBinds(array $binds)
+	public function setBinds(array $binds, bool $setEscape = true)
 	{
+		if ($setEscape)
+		{
+			array_walk($binds, function (&$item) {
+				$item = [
+					$item,
+					true,
+				];
+			});
+		}
+
 		$this->binds = $binds;
 
 		return $this;
@@ -233,9 +214,9 @@
 	 * @param boolean $returnRaw
 	 * @param integer $decimals
 	 *
-	 * @return string
+	 * @return string|float
 	 */
-	public function getStartTime(bool $returnRaw = false, int $decimals = 6): string
+	public function getStartTime(bool $returnRaw = false, int $decimals = 6)
 	{
 		if ($returnRaw)
 		{
@@ -246,6 +227,7 @@
 	}
 
 	//--------------------------------------------------------------------
+
 	/**
 	 * Returns the duration of this query during execution, or null if
 	 * the query has not been executed yet.
@@ -370,9 +352,10 @@
 
 		$hasNamedBinds = strpos($sql, ':') !== false && strpos($sql, ':=') === false;
 
-		if (empty($this->binds) || empty($this->bindMarker) ||
-				(strpos($sql, $this->bindMarker) === false &&
-				$hasNamedBinds === false)
+		if (empty($this->binds)
+			|| empty($this->bindMarker)
+			|| (strpos($sql, $this->bindMarker) === false
+			&& $hasNamedBinds === false)
 		)
 		{
 			return;
@@ -468,7 +451,7 @@
 			}
 		}
 		// Number of binds must match bindMarkers in the string.
-		else if (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
+		elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
 		{
 			return $sql;
 		}
@@ -491,6 +474,58 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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',
+			'(',
+			')',
+		];
+
+		$sql = $this->getQuery();
+
+		foreach ($highlight as $term)
+		{
+			$sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
+		}
+
+		return $sql;
+	}
+
+	/**
 	 * Return text representation of the query
 	 *
 	 * @return string
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index 4a2781e..af52d40 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -44,12 +16,9 @@
  *
  * Represents a single statement that can be executed against the database.
  * Statements are platform-specific and can handle binding of binds.
- *
- * @package CodeIgniter\Database
  */
 interface QueryInterface
 {
-
 	/**
 	 * Sets the raw query string to use for this statement.
 	 *
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index 10105ff..f28c412 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
@@ -44,7 +16,6 @@
  */
 interface ResultInterface
 {
-
 	/**
 	 * Retrieve the results of the query. Typically an array of
 	 * individual data rows, which can be either an 'array', an
@@ -52,7 +23,7 @@
 	 *
 	 * @param string $type The row type. Either 'array', 'object', or a class name to use
 	 *
-	 * @return mixed
+	 * @return array
 	 */
 	public function getResult(string $type = 'object'): array;
 
@@ -149,8 +120,8 @@
 	/**
 	 * Assigns an item into a particular column slot.
 	 *
-	 * @param $key
-	 * @param null $value
+	 * @param string $key
+	 * @param null   $value
 	 *
 	 * @return mixed
 	 */
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
new file mode 100755
index 0000000..be26086
--- /dev/null
+++ b/system/Database/SQLSRV/Builder.php
@@ -0,0 +1,660 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use Closure;
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\ResultInterface;
+
+/**
+ * Builder for SQLSRV
+ *
+ * @todo auto check for TextCastToInt
+ * @todo auto check for InsertIndexValue
+ * @todo replace: delete index entries before insert
+ */
+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;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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);
+	}
+
+	/**
+	 * 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
+	{
+		if ($this->db->escapeChar === '"')
+		{
+			return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"';
+		}
+		return '[' . $this->db->getDatabase() . '].[' . $this->db->schema . '].[' . str_replace('"', '', $table) . ']';
+	}
+
+	/**
+	 * 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
+		$keyFields = array_values(array_flip(array_flip($keyFields)));
+
+		// Get the fields out of binds
+		$set = $this->binds;
+		array_walk($set, function (&$item, $key) {
+			$item = $item[0];
+		});
+
+		// Get the common field and values from the bind data and index fields
+		$setKeys = array_keys($set);
+		$common  = array_intersect($setKeys, $keyFields);
+
+		$bingo = [];
+		foreach ($common as $k => $v)
+		{
+			$bingo[$v] = $set[$v];
+		}
+
+		// 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();
+		}
+
+		// Key field names are not escaped, so escape them
+		$escapedKeyFields = array_map(function ($item) {
+			return $this->db->escapeIdentifiers($item);
+		}, $keyFields);
+
+		return 'INSERT INTO ' . $this->getFullName($table) . ' (' . implode(',', $keys) . ') VALUES (' . 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))
+			{
+				if (is_array($this->QBGroupBy))
+				{
+					foreach ($this->QBGroupBy as $field)
+					{
+						if (is_array($field))
+						{
+							$this->QBSelect[] = $field['field'];
+						}
+						else
+						{
+							$this->QBSelect[] = $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
+		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;
+	}
+}
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
new file mode 100755
index 0000000..65206c4
--- /dev/null
+++ b/system/Database/SQLSRV/Connection.php
@@ -0,0 +1,583 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use Exception;
+use stdClass;
+
+/**
+ * Connection for SQLSRV
+ */
+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
+	 * @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 === true) ? 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']);
+		}
+
+		if (false !== ($this->connID = sqlsrv_connect($this->hostname, $connection)))
+		{
+			/* Disable warnings as errors behavior. */
+			sqlsrv_configure('WarningsReturnAsErrors', 0);
+
+			// 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;
+	}
+
+	/**
+	 * 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
+			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 an array with keys 'code' and 'message':
+	 *
+	 *  return ['code' => null, 'message' => null);
+	 *
+	 * @return array
+	 */
+	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;
+	}
+
+	/**
+	 * Determines if a query is a "write" type.
+	 *
+	 * @param  string $sql An SQL query string
+	 * @return boolean
+	 */
+	public function isWriteType($sql)
+	{
+		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 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;
+	}
+}
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
new file mode 100755
index 0000000..09f9a14
--- /dev/null
+++ b/system/Database/SQLSRV/Forge.php
@@ -0,0 +1,410 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\Forge as BaseForge;
+
+/**
+ * Forge for SQLSRV
+ */
+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;
+	}
+}
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
new file mode 100755
index 0000000..4f3b586
--- /dev/null
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use BadMethodCallException;
+use CodeIgniter\Database\BasePreparedQuery;
+use Exception;
+
+/**
+ * Prepared query for Postgre
+ */
+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;
+	}
+}
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
new file mode 100755
index 0000000..500a659
--- /dev/null
+++ b/system/Database/SQLSRV/Result.php
@@ -0,0 +1,202 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Entity;
+use stdClass;
+
+/**
+ * Result for SQLSRV
+ */
+class Result extends BaseResult
+{
+	/**
+	 * Row offset
+	 *
+	 * @var integer
+	 */
+	private $rowOffset = 0;
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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 $offset => $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  = isset($dataTypes[$field['Type']]) ? $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;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
new file mode 100755
index 0000000..9bc853e
--- /dev/null
+++ b/system/Database/SQLSRV/Utils.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\SQLSRV;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for SQLSRV
+ */
+class Utils extends BaseUtils
+{
+	/**
+	 * 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';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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.');
+	}
+}
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index 3a01578..4ec74d1 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -46,7 +18,6 @@
  */
 class Builder extends BaseBuilder
 {
-
 	/**
 	 * Default installs of SQLite typically do not
 	 * support limiting delete clauses.
@@ -64,6 +35,15 @@
 	protected $canLimitWhereUpdates = false;
 
 	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'RANDOM()',
+	];
+
+	/**
 	 * @var array
 	 */
 	protected $supportedIgnoreStatements = [
@@ -105,5 +85,4 @@
 	{
 		return 'DELETE FROM ' . $table;
 	}
-
 }
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index b9851e3..04ffafa 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -1,54 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use ErrorException;
+use Exception;
+use SQLite3;
+use stdClass;
 
 /**
  * Connection for SQLite3
  */
-class Connection extends BaseConnection implements ConnectionInterface
+class Connection extends BaseConnection
 {
-
 	/**
 	 * Database driver
 	 *
@@ -66,27 +40,16 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $_random_keyword = [
-		'RANDOM()',
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
 	 * Connect to the database.
 	 *
 	 * @param boolean $persistent
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function connect(bool $persistent = false)
 	{
-		if ($persistent && $this->db->DBDebug)
+		if ($persistent && $this->DBDebug)
 		{
 			throw new DatabaseException('SQLite3 doesn\'t support persistent connections.');
 		}
@@ -98,10 +61,10 @@
 			}
 
 			return (! $this->password)
-				? new \SQLite3($this->database)
-				: new \SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
+				? new SQLite3($this->database)
+				: new SQLite3($this->database, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE, $this->password);
 		}
-		catch (\Exception $e)
+		catch (Exception $e)
 		{
 			throw new DatabaseException('SQLite3 error: ' . $e->getMessage());
 		}
@@ -161,7 +124,7 @@
 			return $this->dataCache['version'];
 		}
 
-		$version = \SQLite3::version();
+		$version = SQLite3::version();
 
 		return $this->dataCache['version'] = $version['versionString'];
 	}
@@ -183,7 +146,7 @@
 				? $this->connID->exec($sql)
 				: $this->connID->query($sql);
 		}
-		catch (\ErrorException $e)
+		catch (ErrorException $e)
 		{
 			log_message('error', $e);
 			if ($this->DBDebug)
@@ -274,15 +237,7 @@
 			$this->initialize();
 		}
 
-		if (false === ($sql = $this->_listColumns($table)))
-		{
-			if ($this->DBDebug)
-			{
-				throw new DatabaseException(lang('Database.featureUnavailable'));
-			}
-
-			return false;
-		}
+		$sql = $this->_listColumns($table);
 
 		$query                                  = $this->query($sql);
 		$this->dataCache['field_names'][$table] = [];
@@ -323,7 +278,7 @@
 	 * Returns an array of objects with field data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _fieldData(string $table): array
@@ -342,13 +297,13 @@
 		$retVal = [];
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retVal[$i]              = new \stdClass();
+			$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;
+			$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;
@@ -360,7 +315,7 @@
 	 * Returns an array of objects with index data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 * @throws DatabaseException
 	 */
 	public function _indexData(string $table): array
@@ -377,7 +332,7 @@
 		$retVal = [];
 		foreach ($query as $row)
 		{
-			$obj       = new \stdClass();
+			$obj       = new stdClass();
 			$obj->name = $row->name;
 
 			// Get fields for index
@@ -405,7 +360,7 @@
 	 * Returns an array of objects with Foreign key data
 	 *
 	 * @param  string $table
-	 * @return \stdClass[]
+	 * @return stdClass[]
 	 */
 	public function _foreignKeyData(string $table): array
 	{
@@ -429,7 +384,7 @@
 
 			foreach ($query as $row)
 			{
-				$obj                     = new \stdClass();
+				$obj                     = new stdClass();
 				$obj->constraint_name    = $row->from . ' to ' . $row->table . '.' . $row->to;
 				$obj->table_name         = $table;
 				$obj->foreign_table_name = $row->table;
@@ -542,7 +497,7 @@
 	 */
 	public function isWriteType($sql): bool
 	{
-		return (bool)preg_match(
+		return (bool) preg_match(
 			'/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i',
 			$sql);
 	}
@@ -559,7 +514,7 @@
 	{
 		$result = $this->simpleQuery('PRAGMA foreign_keys');
 
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index bb6f482..69c0f51 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -1,53 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
 
-use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Forge as BaseForge;
 
 /**
  * Forge for SQLite3
  */
-class Forge extends \CodeIgniter\Database\Forge
+class Forge extends BaseForge
 {
-
 	/**
 	 * UNSIGNED support
 	 *
@@ -67,9 +39,9 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param $db ConnectionInterface
+	 * @param BaseConnection $db
 	 */
-	public function __construct(ConnectionInterface $db)
+	public function __construct(BaseConnection $db)
 	{
 		parent::__construct($db);
 
@@ -105,7 +77,7 @@
 	 * @param string $dbName
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function dropDatabase(string $dbName): bool
 	{
@@ -149,15 +121,15 @@
 	/**
 	 * ALTER TABLE
 	 *
-	 * @param string $alter_type ALTER type
-	 * @param string $table      Table name
-	 * @param mixed  $field      Column definition
+	 * @param string $alterType ALTER type
+	 * @param string $table     Table name
+	 * @param mixed  $field     Column definition
 	 *
-	 * @return string|array
+	 * @return string|array|null
 	 */
-	protected function _alterTable(string $alter_type, string $table, $field)
+	protected function _alterTable(string $alterType, string $table, $field)
 	{
-		switch ($alter_type)
+		switch ($alterType)
 		{
 			case 'DROP':
 				$sqlTable = new Table($this->db, $this);
@@ -176,7 +148,7 @@
 
 				return null;
 			default:
-				return parent::_alterTable($alter_type, $table, $field);
+				return parent::_alterTable($alterType, $table, $field);
 		}
 	}
 
@@ -220,7 +192,7 @@
 
 		for ($i = 0, $c = count($this->keys); $i < $c; $i++)
 		{
-			$this->keys[$i] = (array)$this->keys[$i];
+			$this->keys[$i] = (array) $this->keys[$i];
 
 			for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++)
 			{
@@ -234,7 +206,7 @@
 				continue;
 			}
 
-			if (in_array($i, $this->uniqueKeys))
+			if (in_array($i, $this->uniqueKeys, true))
 			{
 				$sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
 						  . ' ON ' . $this->db->escapeIdentifiers($table)
@@ -251,12 +223,13 @@
 	}
 
 	//--------------------------------------------------------------------
+
 	/**
 	 * Field attribute TYPE
 	 *
 	 * Performs a data type mapping between different databases.
 	 *
-	 * @param array &$attributes
+	 * @param array $attributes
 	 *
 	 * @return void
 	 */
@@ -278,8 +251,8 @@
 	/**
 	 * Field attribute AUTO_INCREMENT
 	 *
-	 * @param array &$attributes
-	 * @param array &$field
+	 * @param array $attributes
+	 * @param array $field
 	 *
 	 * @return void
 	 */
@@ -307,7 +280,7 @@
 	 * @param string $foreignName Foreign name
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function dropForeignKey(string $table, string $foreignName): bool
 	{
@@ -325,7 +298,4 @@
 			->dropForeignKey($foreignName)
 			->run();
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
index 22202c3..333971d 100644
--- a/system/Database/SQLite3/PreparedQuery.php
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -1,63 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
 
+use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
-use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for SQLite3
  */
-
-class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
+class PreparedQuery extends BasePreparedQuery
 {
-
 	/**
 	 * The SQLite3Result resource, or false.
 	 *
-	 * @var
+	 * @var Result|boolean
 	 */
 	protected $result;
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Prepares the query against the database, and saves the connection
 	 * info necessary to execute the query later.
@@ -82,8 +50,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Takes a new set of data and runs it against the currently
 	 * prepared query. Upon success, will return a Results object.
@@ -96,9 +62,9 @@
 	 */
 	public function _execute(array $data): bool
 	{
-		if (is_null($this->statement))
+		if (! isset($this->statement))
 		{
-			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+			throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
 		}
 
 		foreach ($data as $key => $item)
@@ -126,8 +92,6 @@
 		return $this->result !== false;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the result object for the prepared query.
 	 *
@@ -137,7 +101,4 @@
 	{
 		return $this->result;
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index ae293d6..457ac68 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -1,54 +1,27 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
 
+use Closure;
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
+use stdClass;
 
 /**
  * Result for SQLite3
  */
-class Result extends BaseResult implements ResultInterface
+class Result extends BaseResult
 {
-
 	/**
 	 * Gets the number of fields in the result set.
 	 *
@@ -56,7 +29,7 @@
 	 */
 	public function getFieldCount(): int
 	{
-		return $this->resultID->numColumns();
+		return $this->resultID->numColumns(); // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -71,7 +44,7 @@
 		$fieldNames = [];
 		for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++)
 		{
-			$fieldNames[] = $this->resultID->columnName($i);
+			$fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
 		}
 
 		return $fieldNames;
@@ -86,7 +59,7 @@
 	 */
 	public function getFieldData(): array
 	{
-		static $data_types = [
+		static $dataTypes = [
 			SQLITE3_INTEGER => 'integer',
 			SQLITE3_FLOAT   => 'float',
 			SQLITE3_TEXT    => 'text',
@@ -95,17 +68,19 @@
 		];
 
 		$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);
-			$type                   = $this->resultID->columnType($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  = isset($data_types[$type]) ? $data_types[$type] : null;
+			$retVal[$i]->type_name  = isset($dataTypes[$type]) ? $dataTypes[$type] : null;
 			$retVal[$i]->max_length = null;
 			$retVal[$i]->length     = null;
 		}
+		$this->resultID->reset(); // @phpstan-ignore-line
 
 		return $retVal;
 	}
@@ -136,7 +111,7 @@
 	 * @param integer $n
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function dataSeek(int $n = 0)
 	{
@@ -145,7 +120,7 @@
 			throw new DatabaseException('SQLite3 doesn\'t support seeking to other offset.');
 		}
 
-		return $this->resultID->reset();
+		return $this->resultID->reset(); // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -159,7 +134,7 @@
 	 */
 	protected function fetchAssoc()
 	{
-		return $this->resultID->fetchArray(SQLITE3_ASSOC);
+		return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -180,7 +155,8 @@
 		{
 			return false;
 		}
-		elseif ($className === 'stdClass')
+
+		if ($className === 'stdClass')
 		{
 			return (object) $row;
 		}
@@ -192,7 +168,7 @@
 			return $classObj->setAttributes($row);
 		}
 
-		$classSet = \Closure::bind(function ($key, $value) {
+		$classSet = Closure::bind(function ($key, $value) {
 			$this->$key = $value;
 		}, $classObj, $className
 		);
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 0845a35..13d8db1 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -48,8 +21,6 @@
  * These are needed in order to support migrations during testing
  * when another database is used as the primary engine, but
  * SQLite in memory databases are used for faster test execution.
- *
- * @package CodeIgniter\Database\SQLite3
  */
 class Table
 {
@@ -121,7 +92,7 @@
 	 *
 	 * @param string $table
 	 *
-	 * @return \CodeIgniter\Database\SQLite3\Table
+	 * @return Table
 	 */
 	public function fromTable(string $table)
 	{
@@ -129,7 +100,7 @@
 
 		// Remove the prefix, if any, since it's
 		// already been added by the time we get here...
-		$prefix = $this->db->DBPrefix;
+		$prefix = $this->db->DBPrefix; // @phpstan-ignore-line
 		if (! empty($prefix))
 		{
 			if (strpos($table, $prefix) === 0)
@@ -158,6 +129,7 @@
 	 * 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
 	 */
@@ -181,6 +153,8 @@
 
 		$this->db->query('PRAGMA foreign_keys = ON');
 
+		$this->db->resetDataCache();
+
 		return $success;
 	}
 
@@ -189,7 +163,7 @@
 	 *
 	 * @param string|array $columns
 	 *
-	 * @return \CodeIgniter\Database\SQLite3\Table
+	 * @return Table
 	 */
 	public function dropColumn($columns)
 	{
@@ -218,7 +192,7 @@
 	 *
 	 * @param array $field
 	 *
-	 * @return \CodeIgniter\Database\SQLite3\Table
+	 * @return Table
 	 */
 	public function modifyColumn(array $field)
 	{
@@ -238,7 +212,7 @@
 	 *
 	 * @param string $column
 	 *
-	 * @return \CodeIgniter\Database\SQLite3\Table
+	 * @return Table
 	 */
 	public function dropForeignKey(string $column)
 	{
@@ -346,6 +320,7 @@
 		$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}");
 	}
 
@@ -422,7 +397,7 @@
 	 */
 	protected function dropIndexes()
 	{
-		if (! is_array($this->keys) || ! count($this->keys))
+		if (! is_array($this->keys) || $this->keys === [])
 		{
 			return;
 		}
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index 72f8d4b..95cf9ba 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
@@ -47,7 +19,6 @@
  */
 class Utils extends BaseUtils
 {
-
 	/**
 	 * OPTIMIZE TABLE statement
 	 *
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 97eb414..e8e56e1 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -1,53 +1,27 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Config\BaseConfig;
+use Config\Database;
+use Faker\Factory;
+use Faker\Generator;
+use InvalidArgumentException;
 
 /**
  * Class Seeder
  */
 class Seeder
 {
-
 	/**
 	 * The name of the database group to use.
 	 *
@@ -65,7 +39,7 @@
 	/**
 	 * An instance of the main Database configuration
 	 *
-	 * @var BaseConfig
+	 * @var Database
 	 */
 	protected $config;
 
@@ -90,56 +64,72 @@
 	 */
 	protected $silent = false;
 
-	//--------------------------------------------------------------------
+	/**
+	 * Faker Generator instance.
+	 *
+	 * @var \Faker\Generator|null
+	 */
+	private static $faker;
 
 	/**
 	 * Seeder constructor.
 	 *
-	 * @param BaseConfig     $config
-	 * @param BaseConnection $db
+	 * @param Database            $config
+	 * @param BaseConnection|null $db
 	 */
-	public function __construct(BaseConfig $config, BaseConnection $db = null)
+	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.');
+			throw new InvalidArgumentException('Invalid filesPath set in the Config\Database.');
 		}
 
-		$this->seedPath = rtrim($this->seedPath, '/') . '/Seeds/';
+		$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');
+			throw new InvalidArgumentException('Unable to locate the seeds directory. Please check Config\Database::filesPath');
 		}
 
-		$this->config = & $config;
+		$this->config = &$config;
 
-		if (is_null($db))
-		{
-			$db = \Config\Database::connect($this->DBGroup);
-		}
+		$db = $db ?? Database::connect($this->DBGroup);
 
-		$this->db = & $db;
-
-		$this->forge = \Config\Database::forge($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
+	 * @throws InvalidArgumentException
+	 *
+	 * @return void
 	 */
 	public function call(string $class)
 	{
 		if (empty($class))
 		{
-			throw new \InvalidArgumentException('No Seeder was specified.');
+			throw new InvalidArgumentException('No seeder was specified.');
 		}
 
 		$path = str_replace('.php', '', $class) . '.php';
@@ -147,6 +137,9 @@
 		// If we have namespaced class, simply try to load it.
 		if (strpos($class, '\\') !== false)
 		{
+			/**
+			 * @var Seeder
+			 */
 			$seeder = new $class($this->config);
 		}
 		// Otherwise, try to load the class manually.
@@ -156,10 +149,11 @@
 
 			if (! is_file($path))
 			{
-				throw new \InvalidArgumentException('The specified Seeder is not a valid 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))
@@ -167,11 +161,14 @@
 				require_once $path;
 			}
 
+			/**
+			 * @var Seeder
+			 */
 			$seeder = new $class($this->config);
+			// @codeCoverageIgnoreEnd
 		}
 
-		$seeder->setSilent($this->silent);
-		$seeder->run();
+		$seeder->setSilent($this->silent)->run();
 
 		unset($seeder);
 
@@ -181,30 +178,26 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets the location of the directory that seed files can be located in.
 	 *
 	 * @param string $path
 	 *
-	 * @return Seeder
+	 * @return $this
 	 */
 	public function setPath(string $path)
 	{
-		$this->seedPath = rtrim($path, '/') . '/';
+		$this->seedPath = rtrim($path, '\\/') . '/';
 
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets the silent treatment.
 	 *
 	 * @param boolean $silent
 	 *
-	 * @return Seeder
+	 * @return $this
 	 */
 	public function setSilent(bool $silent)
 	{
@@ -213,8 +206,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Run the database seeds. This is where the magic happens.
 	 *
@@ -222,10 +213,10 @@
 	 * of inserting their data here.
 	 *
 	 * @return mixed
+	 *
+	 * @codeCoverageIgnore
 	 */
 	public function run()
 	{
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 3b915e3..bc6e0b3 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -42,6 +15,7 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
+use Config\Exceptions as ExceptionsConfig;
 use Config\Paths;
 use function error_reporting;
 use ErrorException;
@@ -52,7 +26,6 @@
  */
 class Exceptions
 {
-
 	use ResponseTrait;
 
 	/**
@@ -73,21 +46,21 @@
 	/**
 	 * Config for debug exceptions.
 	 *
-	 * @var \Config\Exceptions
+	 * @var ExceptionsConfig
 	 */
 	protected $config;
 
 	/**
 	 * The incoming request.
 	 *
-	 * @var \CodeIgniter\HTTP\IncomingRequest
+	 * @var IncomingRequest
 	 */
 	protected $request;
 
 	/**
 	 * The outgoing response.
 	 *
-	 * @var \CodeIgniter\HTTP\Response
+	 * @var Response
 	 */
 	protected $response;
 
@@ -96,11 +69,11 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Exceptions                $config
-	 * @param \CodeIgniter\HTTP\IncomingRequest $request
-	 * @param \CodeIgniter\HTTP\Response        $response
+	 * @param ExceptionsConfig $config
+	 * @param IncomingRequest  $request
+	 * @param Response         $response
 	 */
-	public function __construct(\Config\Exceptions $config, IncomingRequest $request, Response $response)
+	public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
 	{
 		$this->ob_level = ob_get_level();
 
@@ -138,7 +111,7 @@
 	 * (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
+	 * @param Throwable $exception
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -150,7 +123,7 @@
 		] = $this->determineCodes($exception);
 
 		// Log it
-		if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes))
+		if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true))
 		{
 			log_message('critical', $exception->getMessage() . "\n{trace}", [
 							'trace' => $exception->getTraceAsString(),
@@ -190,7 +163,7 @@
 	 * @param string|null  $file
 	 * @param integer|null $line
 	 *
-	 * @throws \ErrorException
+	 * @throws ErrorException
 	 */
 	public function errorHandler(int $severity, string $message, string $file = null, int $line = null)
 	{
@@ -219,7 +192,7 @@
 		if (! is_null($error))
 		{
 			// Fatal Error?
-			if (in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE]))
+			if (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']));
 			}
@@ -232,16 +205,16 @@
 	 * Determines the view to display based on the exception thrown,
 	 * whether an HTTP or CLI request, etc.
 	 *
-	 * @param \Throwable $exception
-	 * @param string     $template_path
+	 * @param Throwable $exception
+	 * @param string    $templatePath
 	 *
 	 * @return string       The path and filename of the view file to use
 	 */
-	protected function determineView(Throwable $exception, string $template_path): string
+	protected function determineView(Throwable $exception, string $templatePath): string
 	{
 		// Production environments should have a custom exception file.
-		$view          = 'production.php';
-		$template_path = rtrim($template_path, '\\/ ') . DIRECTORY_SEPARATOR;
+		$view         = 'production.php';
+		$templatePath = rtrim($templatePath, '\\/ ') . DIRECTORY_SEPARATOR;
 
 		if (str_ireplace(['off', 'none', 'no', 'false', 'null'], '', ini_get('display_errors')))
 		{
@@ -255,7 +228,7 @@
 		}
 
 		// Allow for custom views based upon the status code
-		if (is_file($template_path . 'error_' . $exception->getCode() . '.php'))
+		if (is_file($templatePath . 'error_' . $exception->getCode() . '.php'))
 		{
 			return 'error_' . $exception->getCode() . '.php';
 		}
@@ -268,8 +241,8 @@
 	/**
 	 * Given an exception and status code will display the error to the client.
 	 *
-	 * @param \Throwable $exception
-	 * @param integer    $statusCode
+	 * @param Throwable $exception
+	 * @param integer   $statusCode
 	 */
 	protected function render(Throwable $exception, int $statusCode)
 	{
@@ -305,7 +278,7 @@
 		}
 
 		ob_start();
-		include $viewFile;
+		include $viewFile; // @phpstan-ignore-line
 		$buffer = ob_get_contents();
 		ob_end_clean();
 		echo $buffer;
@@ -316,8 +289,8 @@
 	/**
 	 * Gathers the variables that will be made available to the view.
 	 *
-	 * @param \Throwable $exception
-	 * @param integer    $statusCode
+	 * @param Throwable $exception
+	 * @param integer   $statusCode
 	 *
 	 * @return array
 	 */
@@ -337,7 +310,7 @@
 	/**
 	 * Determines the HTTP status code and the exit status code for this request.
 	 *
-	 * @param \Throwable $exception
+	 * @param Throwable $exception
 	 *
 	 * @return array
 	 */
@@ -360,7 +333,7 @@
 		}
 
 		return [
-			$statusCode ?? 500,
+			$statusCode ?: 500,
 			$exitStatus,
 		];
 	}
@@ -406,7 +379,7 @@
 	 * Describes memory usage in real-world units. Intended for use
 	 * with memory_get_usage, etc.
 	 *
-	 * @param $bytes
+	 * @param integer $bytes
 	 *
 	 * @return string
 	 */
@@ -416,7 +389,7 @@
 		{
 			return $bytes . 'B';
 		}
-		else if ($bytes < 1048576)
+		if ($bytes < 1048576)
 		{
 			return round($bytes / 1024, 2) . 'KB';
 		}
@@ -472,7 +445,7 @@
 		$start = $start < 0 ? 0 : $start;
 
 		// Get just the lines we need to display, while keeping line numbers...
-		$source = array_splice($source, $start, $lines, true);
+		$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';
@@ -487,7 +460,8 @@
 		foreach ($source as $n => $row)
 		{
 			$spans += substr_count($row, '<span') - substr_count($row, '</span');
-			$row    = str_replace(["\r", "\n"], ['', ''], $row);
+
+			$row = str_replace(["\r", "\n"], ['', ''], $row);
 
 			if (($n + $start + 1) === $lineNumber)
 			{
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index c9101df..62dec4f 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -1,49 +1,23 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
 
+use Closure;
+
 /**
  * Iterator for debugging.
  */
 class Iterator
 {
-
 	/**
 	 * Stores the tests that we are to run.
 	 *
@@ -66,12 +40,12 @@
 	 * Tests are simply closures that the user can define any sequence of
 	 * things to happen during the test.
 	 *
-	 * @param string   $name
-	 * @param \Closure $closure
+	 * @param string  $name
+	 * @param Closure $closure
 	 *
 	 * @return $this
 	 */
-	public function add(string $name, \Closure $closure)
+	public function add(string $name, Closure $closure)
 	{
 		$name = strtolower($name);
 
@@ -99,21 +73,21 @@
 			// clear memory before start
 			gc_collect_cycles();
 
-			$start     = microtime(true);
-			$start_mem = $max_memory = memory_get_usage(true);
+			$start    = microtime(true);
+			$startMem = $maxMemory = memory_get_usage(true);
 
 			for ($i = 0; $i < $iterations; $i ++)
 			{
 				$result = $test();
 
-				$max_memory = max($max_memory, memory_get_usage(true));
+				$maxMemory = max($maxMemory, memory_get_usage(true));
 
 				unset($result);
 			}
 
 			$this->results[$name] = [
 				'time'   => microtime(true) - $start,
-				'memory' => $max_memory - $start_mem,
+				'memory' => $maxMemory - $startMem,
 				'n'      => $iterations,
 			];
 		}
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 736f558..3474109 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -1,55 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
 
+use RuntimeException;
+
 /**
  * Class Timer
  *
  * Provides a simple way to measure the amount of time
  * that elapses between two points.
- *
- * @package CodeIgniter\Debug
  */
 class Timer
 {
-
 	/**
 	 * List of all timers.
 	 *
@@ -98,7 +69,7 @@
 
 		if (empty($this->timers[$name]))
 		{
-			throw new \RuntimeException('Cannot stop timer: invalid name given.');
+			throw new RuntimeException('Cannot stop timer: invalid name given.');
 		}
 
 		$this->timers[$name]['end'] = microtime(true);
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index ff2be35..35d9929 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -1,44 +1,19 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
 
-use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Debug\Toolbar\Collectors\BaseCollector;
+use CodeIgniter\Debug\Toolbar\Collectors\Config;
 use CodeIgniter\Debug\Toolbar\Collectors\History;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
@@ -46,6 +21,7 @@
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
+use Config\Toolbar as ToolbarConfig;
 
 /**
  * Debug Toolbar
@@ -53,23 +29,20 @@
  * Displays a toolbar with bits of stats to aid a developer in debugging.
  *
  * Inspiration: http://prophiler.fabfuel.de
- *
- * @package CodeIgniter\Debug
  */
 class Toolbar
 {
-
 	/**
 	 * Toolbar configuration settings.
 	 *
-	 * @var BaseConfig
+	 * @var ToolbarConfig
 	 */
 	protected $config;
 
 	/**
 	 * Collectors to be used and displayed.
 	 *
-	 * @var \CodeIgniter\Debug\Toolbar\Collectors\BaseCollector[]
+	 * @var BaseCollector[]
 	 */
 	protected $collectors = [];
 
@@ -78,9 +51,9 @@
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
+	 * @param ToolbarConfig $config
 	 */
-	public function __construct(BaseConfig $config)
+	public function __construct(ToolbarConfig $config)
 	{
 		$this->config = $config;
 
@@ -102,10 +75,10 @@
 	/**
 	 * Returns all the data required by Debug Bar
 	 *
-	 * @param float                               $startTime App start time
-	 * @param float                               $totalTime
-	 * @param \CodeIgniter\HTTP\RequestInterface  $request
-	 * @param \CodeIgniter\HTTP\ResponseInterface $response
+	 * @param float             $startTime App start time
+	 * @param float             $totalTime
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
 	 *
 	 * @return string JSON encoded data
 	 */
@@ -120,7 +93,7 @@
 		$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\CodeIgniter::CI_VERSION;
+		$data['CI_VERSION']      = CodeIgniter::CI_VERSION;
 		$data['collectors']      = [];
 
 		foreach ($this->collectors as $collector)
@@ -167,22 +140,9 @@
 			$data['vars']['post'][esc($name)] = is_array($value) ? '<pre>' . esc(print_r($value, true)) . '</pre>' : esc($value);
 		}
 
-		foreach ($request->getHeaders() as $value)
+		foreach ($request->headers() as $name => $header)
 		{
-			if (empty($value))
-			{
-				continue;
-			}
-
-			if (! is_array($value))
-			{
-				$value = [$value];
-			}
-
-			foreach ($value as $h)
-			{
-				$data['vars']['headers'][esc($h->getName())] = esc($h->getValueLine());
-			}
+			$data['vars']['headers'][esc($header->getName())] = esc($header->getValueLine());
 		}
 
 		foreach ($request->getCookie() as $name => $value)
@@ -198,7 +158,7 @@
 			'contentType' => esc($response->getHeaderLine('content-type')),
 		];
 
-		$data['config'] = \CodeIgniter\Debug\Toolbar\Collectors\Config::display();
+		$data['config'] = Config::display();
 
 		if ($response->CSP !== null)
 		{
@@ -241,11 +201,12 @@
 			$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 ++;
+			$output .= "<span class='timer debug-bar-timeline-{$styleCount}' title='" . number_format($length, 2) . "%'></span>";
+			$output .= '</td>';
+			$output .= '</tr>';
+
+			$styleCount++;
 		}
 
 		return $output;
@@ -329,8 +290,8 @@
 	 *
 	 * @param  RequestInterface  $request
 	 * @param  ResponseInterface $response
-	 * @global type $app
-	 * @return type
+	 * @global \CodeIgniter\CodeIgniter $app
+	 * @return void
 	 */
 	public function prepare(RequestInterface $request = null, ResponseInterface $response = null)
 	{
@@ -392,10 +353,7 @@
 
 			if (strpos($response->getBody(), '<head>') !== false)
 			{
-				$response->setBody(
-						str_replace('<head>', '<head>' . $script, $response->getBody())
-				);
-
+				$response->setBody(preg_replace('/<head>/', '<head>' . $script, $response->getBody(), 1));
 				return;
 			}
 
@@ -510,5 +468,4 @@
 
 		return $output;
 	}
-
 }
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index a403b4c..e5824a7 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -45,7 +18,6 @@
  */
 class BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -200,8 +172,6 @@
 	 *          'bar' => 'baz'
 	 *      ],
 	 *  ];
-	 *
-	 * @return null
 	 */
 	public function getVarData()
 	{
@@ -260,8 +230,6 @@
 
 	/**
 	 * Gets the "badge" value for the button.
-	 *
-	 * @return null
 	 */
 	public function getBadgeValue()
 	{
@@ -314,5 +282,4 @@
 			'timelineData'    => $this->timelineData(),
 		];
 	}
-
 }
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
index 82ef634..b7aecb7 100644
--- a/system/Debug/Toolbar/Collectors/Config.php
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 00aa740..a6c4458 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -46,7 +18,6 @@
  */
 class Database extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has timeline data.
 	 *
@@ -86,7 +57,7 @@
 	 * The query instances that have been collected
 	 * through the DBQuery Event.
 	 *
-	 * @var array
+	 * @var Query[]
 	 */
 	protected static $queries = [];
 
@@ -106,7 +77,7 @@
 	 * The static method used during Events to collect
 	 * data.
 	 *
-	 * @param \CodeIgniter\Database\Query $query
+	 * @param Query $query
 	 *
 	 * @internal param $ array \CodeIgniter\Database\Query
 	 */
@@ -167,59 +138,12 @@
 	 */
 	public function display(): array
 	{
-		// Key words we want bolded
-		$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',
-			'(',
-			')',
-		];
-
-		$data = [
-			'queries' => [],
-		];
-
-		foreach (static::$queries as $query)
-		{
-			$sql = $query->getQuery();
-
-			foreach ($highlight as $term)
-			{
-				$sql = str_replace($term, "<strong>{$term}</strong>", $sql);
-			}
-
-			$data['queries'][] = [
-				'duration' => ($query->getDuration(5) * 1000) . ' ms',
-				'sql'      => $sql,
+		$data['queries'] = array_map(function (Query $query) {
+			return [
+				'duration' => ((float) $query->getDuration(5) * 1000) . ' ms',
+				'sql'      => $query->debugToolbarDisplay(),
 			];
-		}
+		}, static::$queries);
 
 		return $data;
 	}
@@ -274,5 +198,4 @@
 	{
 		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 41c9f00..03f7846 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -47,7 +19,6 @@
  */
 class Events extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -109,7 +80,7 @@
 	{
 		$data = [];
 
-		$rows = $this->viewer->getPerformanceData();
+		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
 
 		foreach ($rows as $info)
 		{
@@ -145,17 +116,22 @@
 			{
 				$data['events'][$key] = [
 					'event'    => $key,
-					'duration' => number_format(($row['end'] - $row['start']) * 1000, 2),
+					'duration' => ($row['end'] - $row['start']) * 1000,
 					'count'    => 1,
 				];
 
 				continue;
 			}
 
-			$data['events'][$key]['duration'] += number_format(($row['end'] - $row['start']) * 1000, 2);
+			$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;
 	}
 
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index 36b0132..1c4ed77 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -44,7 +16,6 @@
  */
 class Files extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 3112e07..818d2a8 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -114,7 +86,7 @@
 			if (json_last_error() === JSON_ERROR_NONE)
 			{
 				preg_match_all('/\d+/', $filename, $time);
-				$time = (int)end($time[0]);
+				$time = (int) end($time[0]);
 
 				// Debugbar files shown in History Collector
 				$files[] = [
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
index ed279c7..acae3b7 100644
--- a/system/Debug/Toolbar/Collectors/Logs.php
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -46,7 +18,6 @@
  */
 class Logs extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -127,7 +98,7 @@
 	 */
 	protected function collectLogs()
 	{
-		if (! is_null($this->data))
+		if (! empty($this->data))
 		{
 			return $this->data;
 		}
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index f75374d..4651483 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -1,51 +1,26 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
 use Config\Services;
+use ReflectionException;
+use ReflectionFunction;
+use ReflectionMethod;
 
 /**
  * Routes collector
  */
 class Routes extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -76,7 +51,7 @@
 	 * Returns the data of this collector to be formatted in the toolbar
 	 *
 	 * @return array
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function display(): array
 	{
@@ -92,19 +67,19 @@
 		// Closure routes
 		if (is_callable($router->controllerName()))
 		{
-			$method = new \ReflectionFunction($router->controllerName());
+			$method = new ReflectionFunction($router->controllerName());
 		}
 		else
 		{
 			try
 			{
-				$method = new \ReflectionMethod($router->controllerName(), $router->methodName());
+				$method = new ReflectionMethod($router->controllerName(), $router->methodName());
 			}
-			catch (\ReflectionException $e)
+			catch (ReflectionException $e)
 			{
 				// If we're here, the method doesn't exist
 				// and is likely calculated in _remap.
-				$method = new \ReflectionMethod($router->controllerName(), '_remap');
+				$method = new ReflectionMethod($router->controllerName(), '_remap');
 			}
 		}
 
@@ -127,7 +102,7 @@
 				'method'     => $router->methodName(),
 				'paramCount' => count($router->params()),
 				'truePCount' => count($params),
-				'params'     => $params ?? [],
+				'params'     => $params,
 			],
 		];
 
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
index d6168c6..bb364f9 100644
--- a/system/Debug/Toolbar/Collectors/Timers.php
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -46,7 +18,6 @@
  */
 class Timers extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -103,5 +74,4 @@
 
 		return $data;
 	}
-
 }
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index bf0c110..c14c450 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
@@ -47,7 +19,6 @@
  */
 class Views extends BaseCollector
 {
-
 	/**
 	 * Whether this collector has data that can
 	 * be displayed in the Timeline.
@@ -124,7 +95,7 @@
 	{
 		$data = [];
 
-		$rows = $this->viewer->getPerformanceData();
+		$rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
 
 		foreach ($rows as $info)
 		{
@@ -162,6 +133,7 @@
 	public function getVarData(): array
 	{
 		return [
+			// @phpstan-ignore-next-line
 			'View Data' => $this->viewer->getData(),
 		];
 	}
@@ -175,7 +147,7 @@
 	 */
 	public function getBadgeValue(): int
 	{
-		return count($this->viewer->getPerformanceData());
+		return count($this->viewer->getPerformanceData()); // @phpstan-ignore-line
 	}
 
 	/**
diff --git a/system/Debug/Toolbar/Views/_config.tpl b/system/Debug/Toolbar/Views/_config.tpl
index 4247e81..3934cf6 100644
--- a/system/Debug/Toolbar/Views/_config.tpl
+++ b/system/Debug/Toolbar/Views/_config.tpl
@@ -33,7 +33,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td>TimeZone:</td>
+			<td>Timezone:</td>
 			<td>{ timezone }</td>
 		</tr>
 		<tr>
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index e2abb4c..f881dd1 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -1,6 +1,6 @@
-/* CodeIgniter 4 - Debug bar
- ============================================================================ */
-/* Forum: 	https://forum.codeigniter.com
+/*! CodeIgniter 4 - Debug bar
+ * ============================================================================
+ * Forum: 	https://forum.codeigniter.com
  * Github:	https://github.com/codeigniter4/codeigniter4
  * Slack: 	https://codeigniterchat.slack.com
  * Website: https://codeigniter.com
@@ -48,6 +48,9 @@
     right: 30px;
     text-align: left;
     top: 0; }
+    #debug-bar h1 svg {
+      width: 16px;
+      margin-right: 5px; }
   #debug-bar h2 {
     font-size: 16px;
     margin: 0;
@@ -101,8 +104,16 @@
         max-width: 20%; }
         #debug-bar table td:first-child.narrow {
           width: 7em; }
+  #debug-bar td[data-debugbar-route] form {
+    display: none; }
+  #debug-bar td[data-debugbar-route]:hover form {
+    display: block; }
+  #debug-bar td[data-debugbar-route]:hover > div {
+    display: none; }
+  #debug-bar td[data-debugbar-route] input[type=text] {
+    padding: 2px; }
   #debug-bar .toolbar {
-    display: block;
+    display: flex;
     overflow: hidden;
     overflow-y: auto;
     padding: 0 12px 0 12px;
@@ -117,8 +128,9 @@
       top: 36px; }
   #debug-bar #toolbar-position a,
   #debug-bar #toolbar-theme a {
-    float: left;
-    padding: 0 6px; }
+    padding: 0 6px;
+    display: inline-flex;
+    vertical-align: top; }
     #debug-bar #toolbar-position a:hover,
     #debug-bar #toolbar-theme a:hover {
       text-decoration: none; }
@@ -133,24 +145,20 @@
     top: 0;
     width: 24px; }
   #debug-bar .ci-label {
-    display: inline-block;
-    font-size: 14px;
-    vertical-align: baseline; }
+    display: inline-flex;
+    font-size: 14px; }
     #debug-bar .ci-label:hover {
       cursor: pointer; }
     #debug-bar .ci-label a {
       color: inherit;
-      display: block;
+      display: flex;
       letter-spacing: normal;
       padding: 0 10px;
-      text-decoration: none; }
+      text-decoration: none;
+      align-items: center; }
     #debug-bar .ci-label img {
-      clear: left;
-      display: inline-block;
-      float: left;
-      margin: 6px 3px 6px 0; 
-      width: 16px !important;
-    }
+      margin: 6px 3px 6px 0;
+      width: 16px !important; }
     #debug-bar .ci-label .badge {
       border-radius: 12px;
       -moz-border-radius: 12px;
@@ -226,8 +234,11 @@
   display: block !important; }
 
 @media screen and (max-width: 1024px) {
+  #debug-bar .ci-label img {
+    margin: unset; }
   .hide-sm {
     display: none !important; } }
+
 #debug-icon {
   background-color: #FFFFFF;
   box-shadow: 0 0 4px #DFDFDF;
@@ -321,7 +332,6 @@
     -webkit-box-shadow: 0 0 4px #DFDFDF; }
     #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
       color: #DD8615; }
-
   #debug-bar {
     background-color: #252525;
     color: #DFDFDF; }
@@ -393,13 +403,12 @@
       border-color: #434343; }
     #debug-bar .timeline .timer {
       background-color: #DD8615; }
-
   .debug-view.show-view {
     border-color: #DD8615; }
-
   .debug-view-path {
     background-color: #FDC894;
     color: #434343; } }
+
 #toolbarContainer.dark #debug-icon {
   background-color: #252525;
   box-shadow: 0 0 4px #DFDFDF;
@@ -407,6 +416,7 @@
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
   #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited {
     color: #DD8615; }
+
 #toolbarContainer.dark #debug-bar {
   background-color: #252525;
   color: #DFDFDF; }
@@ -478,12 +488,18 @@
     border-color: #434343; }
   #toolbarContainer.dark #debug-bar .timeline .timer {
     background-color: #DD8615; }
+
 #toolbarContainer.dark .debug-view.show-view {
   border-color: #DD8615; }
+
 #toolbarContainer.dark .debug-view-path {
   background-color: #FDC894;
   color: #434343; }
 
+#toolbarContainer.dark td[data-debugbar-route] input[type=text] {
+  background: #000;
+  color: #fff; }
+
 #toolbarContainer.light #debug-icon {
   background-color: #FFFFFF;
   box-shadow: 0 0 4px #DFDFDF;
@@ -491,6 +507,7 @@
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
   #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited {
     color: #DD8615; }
+
 #toolbarContainer.light #debug-bar {
   background-color: #FFFFFF;
   color: #434343; }
@@ -560,8 +577,10 @@
     border-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar .timeline .timer {
     background-color: #DD8615; }
+
 #toolbarContainer.light .debug-view.show-view {
   border-color: #DD8615; }
+
 #toolbarContainer.light .debug-view-path {
   background-color: #FDC894;
   color: #434343; }
@@ -595,15 +614,3 @@
 
 .debug-bar-noverflow {
   overflow: hidden; }
-
-#debug-bar td[data-debugbar-route] form {
-  display: none; }
-#debug-bar td[data-debugbar-route]:hover form {
-  display: block; }
-#debug-bar td[data-debugbar-route]:hover > div {
-  display: none; }
-#debug-bar td[data-debugbar-route] input[type=text] {
-  padding: 2px; }
-#toolbarContainer.dark td[data-debugbar-route] input[type=text] {
-  background: #000;
-  color: #fff; }
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 15fa668..ca38f9b 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -12,8 +12,8 @@
 
 	init : function () {
 		this.toolbarContainer = document.getElementById('toolbarContainer');
-		this.toolbar = document.getElementById('debug-bar');
-		this.icon    = document.getElementById('debug-icon');
+		this.toolbar          = document.getElementById('debug-bar');
+		this.icon             = document.getElementById('debug-icon');
 
 		ciDebugBar.createListeners();
 		ciDebugBar.setToolbarState();
@@ -509,9 +509,9 @@
 	//--------------------------------------------------------------------
 
 	setToolbarTheme: function () {
-		var btnTheme = document.getElementById('toolbar-theme');
-		var isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches;
-	  var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
+		var btnTheme    = document.getElementById('toolbar-theme');
+		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
+		var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
 
 		// If a cookie is set with a value, we force the color scheme
 		if (ciDebugBar.readCookie('debug-bar-theme') === 'dark')
@@ -579,7 +579,7 @@
 			var expires = "";
 		}
 
-		document.cookie = name + "=" + value + expires + "; path=/";
+		document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
 	},
 
 	//--------------------------------------------------------------------
@@ -605,27 +605,30 @@
 
 	//--------------------------------------------------------------------
 
-	trimSlash: function(text) {
+	trimSlash: function (text) {
 		return text.replace(/^\/|\/$/g, '');
 	},
 
-	routerLink: function() {
+	routerLink: function () {
 		var row, _location;
 		var rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"]');
-		var patt = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
+		var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
 
-		for (var i = 0; i < rowGet.length; i++) {
+		for (var i = 0; i < rowGet.length; i++)
+		{
 			row = rowGet[i];
-			if (!/\/\(.+?\)/.test(rowGet[i].innerText)) {
+			if (!/\/\(.+?\)/.test(rowGet[i].innerText))
+			{
 				row.style = 'cursor: pointer;';
 				row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText));
-				row.addEventListener('click', function(ev) {
-					_location = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText);
+				row.addEventListener('click', function (ev) {
+					_location          = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText);
 					var redirectWindow = window.open(_location, '_blank');
 					redirectWindow.location;
 				});
 			}
-			else {
+			else
+			{
 				row.innerHTML = '<div>' + row.innerText + '</div>'
 					+ '<form data-debugbar-route-tpl="' + ciDebugBar.trimSlash(row.innerText.replace(patt, '?')) + '">'
 					+ row.innerText.replace(patt, '<input type="text" placeholder="$1">')
@@ -635,27 +638,35 @@
 		}
 
 		rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"] form');
-		for (var i = 0; i < rowGet.length; i++) {
+		for (var i = 0; i < rowGet.length; i++)
+		{
 			row = rowGet[i];
 
-			row.addEventListener('submit', function(event) {
+			row.addEventListener('submit', function (event) {
 				event.preventDefault()
 				var inputArray = [], t = 0;
-				var input = event.target.querySelectorAll('input[type=text]'); 
-				var tpl = event.target.getAttribute('data-debugbar-route-tpl');
-				
-				for (var n = 0; n < input.length; n++) {
-					if (input[n].value.length > 0) inputArray.push(input[n].value);
+				var input      = event.target.querySelectorAll('input[type=text]');
+				var tpl        = event.target.getAttribute('data-debugbar-route-tpl');
+
+				for (var n = 0; n < input.length; n++)
+				{
+					if (input[n].value.length > 0)
+					{
+						inputArray.push(input[n].value);
+					}
 				}
 
-				if (inputArray.length > 0) {
-					_location = location.origin + '/' + tpl.replace(/\?/g, function() {return inputArray[t++]});
+				if (inputArray.length > 0)
+				{
+					_location = location.origin + '/' + tpl.replace(/\?/g, function () {
+						return inputArray[t++]
+					});
+
 					var redirectWindow = window.open(_location, '_blank');
 					redirectWindow.location;
 				}
 			})
 		}
-
 	}
 
 };
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 5f5d7c4..7c99914 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -28,22 +28,7 @@
 </script>
 <div id="debug-icon" class="debug-bar-ndisplay">
 	<a id="debug-icon-link" href="javascript:void(0)">
-		<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
-			width="155.000000px" height="200.000000px" viewBox="0 0 155.000000 200.000000"
-			preserveAspectRatio="xMidYMid meet">
-			<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)" fill="#dd4814" stroke="none">
-				<path d="M737 1963 c22 -79 -7 -185 -78 -290 -18 -26 -107 -122 -197 -213
-				-239 -240 -336 -371 -403 -544 -79 -206 -78 -408 5 -582 64 -134 212 -264 361
-				-314 l60 -20 -30 22 c-210 152 -229 387 -48 588 25 27 48 50 51 50 4 0 7 -27
-				7 -61 0 -57 2 -62 37 -95 30 -27 46 -34 78 -34 56 0 99 24 116 65 29 69 16
-				120 -50 205 -105 134 -117 233 -43 347 l31 48 7 -47 c13 -82 58 -129 250 -258
-				209 -141 306 -261 328 -405 11 -72 -1 -161 -31 -218 -27 -53 -112 -143 -165
-				-174 -24 -14 -43 -26 -43 -28 0 -2 24 4 53 14 241 83 427 271 482 486 19 76
-				19 202 -1 285 -35 152 -146 305 -299 412 l-70 49 -6 -33 c-8 -48 -26 -76 -59
-				-93 -45 -23 -103 -19 -138 10 -67 57 -78 146 -37 305 30 116 32 206 5 291 -27
-				89 -104 206 -162 247 -17 13 -18 12 -11 -15z"/>
-			</g>
-		</svg>
+		<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
 	</a>
 </div>
 <div id="debug-bar">
@@ -83,22 +68,7 @@
 		<h1>
 			<span class="ci-label">
 				<a href="javascript: void(0)" data-tab="ci-config">
-					<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
-						width="18.60px" height="24.0px" viewBox="0 0 18.60 28.000000"
-						preserveAspectRatio="xMidYMid meet">
-						<g transform="translate(0.000000,28.000000) scale(0.010000,-0.010000)" fill="#dd4814" stroke="none">
-							<path d="M737 1963 c22 -79 -7 -185 -78 -290 -18 -26 -107 -122 -197 -213
-							-239 -240 -336 -371 -403 -544 -79 -206 -78 -408 5 -582 64 -134 212 -264 361
-							-314 l60 -20 -30 22 c-210 152 -229 387 -48 588 25 27 48 50 51 50 4 0 7 -27
-							7 -61 0 -57 2 -62 37 -95 30 -27 46 -34 78 -34 56 0 99 24 116 65 29 69 16
-							120 -50 205 -105 134 -117 233 -43 347 l31 48 7 -47 c13 -82 58 -129 250 -258
-							209 -141 306 -261 328 -405 11 -72 -1 -161 -31 -218 -27 -53 -112 -143 -165
-							-174 -24 -14 -43 -26 -43 -28 0 -2 24 4 53 14 241 83 427 271 482 486 19 76
-							19 202 -1 285 -35 152 -146 305 -299 412 l-70 49 -6 -33 c-8 -48 -26 -76 -59
-							-93 -45 -23 -103 -19 -138 10 -67 57 -78 146 -37 305 30 116 32 206 5 291 -27
-							89 -104 206 -162 247 -17 13 -18 12 -11 -15z"/>
-						</g>
-					</svg>
+					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
 					<?= $CI_VERSION ?>
 				</a>
 			</span>
diff --git a/system/Email/Email.php b/system/Email/Email.php
index b3a3dcd..8871054 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1,57 +1,24 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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     EllisLab Dev Team
- * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright  Copyright (c) 2014 - 2019, British Columbia Institute of Technology (http://bcit.ca/)
- * @license    http://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
+ * 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 Config\Mimes;
+use ErrorException;
 
 /**
  * CodeIgniter Email Class
  *
  * Permits email to be sent using Mail, Sendmail, or SMTP.
- *
- * @package    CodeIgniter
- * @subpackage Libraries
- * @category   Libraries
- * @author     EllisLab Dev Team
- * @link       https://codeigniter.com/user_guide/libraries/email.html
  */
 class Email
 {
@@ -61,86 +28,101 @@
 	 * @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';    // Sendmail path
+	public $mailPath = '/usr/sbin/sendmail';
+
 	/**
 	 * Which method to use for sending e-mails.
 	 *
 	 * @var string 'mail', 'sendmail' or 'smtp'
 	 */
-	public $protocol = 'mail';        // mail/sendmail/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.
 	 *
@@ -148,36 +130,42 @@
 	 * @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;            // Default priority (1 - 5)
+	public $priority = 3;
+
 	/**
 	 * Newline character sequence.
 	 * Use "\r\n" to comply with RFC 822.
@@ -185,7 +173,8 @@
 	 * @link http://www.ietf.org/rfc/rfc822.txt
 	 * @var  string "\r\n" or "\n"
 	 */
-	public $newline = "\n";            // Default newline. "\r\n" or "\n" (Use "\r\n" to comply with RFC 822)
+	public $newline = "\n";
+
 	/**
 	 * CRLF character sequence
 	 *
@@ -199,12 +188,14 @@
 	 * @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.
@@ -212,68 +203,78 @@
 	 * @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
+	 * @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
+	 * @var resource|null
 	 */
-	protected $SMTPConnect = '';
+	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
 	 *
@@ -281,36 +282,42 @@
 	 * @var array
 	 */
 	protected $debugMessage = [];
+
 	/**
 	 * Recipients
 	 *
-	 * @var array
+	 * @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
 	 *
@@ -322,6 +329,7 @@
 		'sendmail',
 		'smtp',
 	];
+
 	/**
 	 * Base charsets
 	 *
@@ -334,6 +342,7 @@
 		'us-ascii',
 		'iso-2022-',
 	];
+
 	/**
 	 * Bit depths
 	 *
@@ -346,6 +355,7 @@
 		'7bit',
 		'8bit',
 	];
+
 	/**
 	 * $priority translations
 	 *
@@ -360,13 +370,14 @@
 		4 => '4 (Low)',
 		5 => '5 (Lowest)',
 	];
+
 	/**
 	 * mbstring.func_overload flag
 	 *
 	 * @var boolean
 	 */
 	protected static $func_overload;
-	//--------------------------------------------------------------------
+
 	/**
 	 * Constructor - Sets Email Preferences
 	 *
@@ -379,7 +390,7 @@
 		$this->initialize($config);
 		isset(static::$func_overload) || static::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Initialize preferences
 	 *
@@ -390,15 +401,18 @@
 	public function initialize($config)
 	{
 		$this->clear();
+
 		if ($config instanceof \Config\Email)
 		{
 			$config = get_object_vars($config);
 		}
+
 		foreach (get_class_vars(get_class($this)) as $key => $value)
 		{
 			if (property_exists($this, $key) && isset($config[$key]))
 			{
 				$method = 'set' . ucfirst($key);
+
 				if (method_exists($this, $method))
 				{
 					$this->$method($config[$key]);
@@ -409,11 +423,13 @@
 				}
 			}
 		}
+
 		$this->charset  = strtoupper($this->charset);
 		$this->SMTPAuth = isset($this->SMTPUser[0], $this->SMTPPass[0]);
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Initialize the Email Data
 	 *
@@ -433,14 +449,17 @@
 		$this->BCCArray     = [];
 		$this->headers      = [];
 		$this->debugMessage = [];
+
 		$this->setHeader('Date', $this->setDate());
+
 		if ($clearAttachments !== false)
 		{
 			$this->attachments = [];
 		}
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set FROM
 	 *
@@ -456,9 +475,11 @@
 		{
 			$from = $match[1];
 		}
+
 		if ($this->validate)
 		{
 			$this->validateEmail($this->stringToArray($from));
+
 			if ($returnPath)
 			{
 				$this->validateEmail($this->stringToArray($returnPath));
@@ -483,6 +504,7 @@
 				$name = $this->prepQEncoding($name);
 			}
 		}
+
 		$this->setHeader('From', $name . ' <' . $from . '>');
 		isset($returnPath) || $returnPath = $from;
 		$this->setHeader('Return-Path', '<' . $returnPath . '>');
@@ -490,7 +512,7 @@
 
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Reply-to
 	 *
@@ -505,10 +527,12 @@
 		{
 			$replyto = $match[1];
 		}
+
 		if ($this->validate)
 		{
 			$this->validateEmail($this->stringToArray($replyto));
 		}
+
 		if ($name !== '')
 		{
 			$this->tmpArchive['replyName'] = $name;
@@ -524,13 +548,14 @@
 				$name = $this->prepQEncoding($name);
 			}
 		}
+
 		$this->setHeader('Reply-To', $name . ' <' . $replyto . '>');
 		$this->replyToFlag           = true;
 		$this->tmpArchive['replyTo'] = $replyto;
 
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Recipients
 	 *
@@ -542,18 +567,22 @@
 	{
 		$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
 	 *
@@ -564,19 +593,24 @@
 	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
 	 *
@@ -592,11 +626,14 @@
 			$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;
@@ -606,9 +643,10 @@
 			$this->setHeader('Bcc', implode(', ', $bcc));
 			$this->tmpArchive['BCCArray'] = $bcc;
 		}
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Email Subject
 	 *
@@ -622,9 +660,10 @@
 
 		$subject = $this->prepQEncoding($subject);
 		$this->setHeader('Subject', $subject);
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Body
 	 *
@@ -635,9 +674,10 @@
 	public function setMessage($body)
 	{
 		$this->body = rtrim(str_replace("\r", '', $body));
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Assign file attachments
 	 *
@@ -646,7 +686,7 @@
 	 * @param string|null $newname
 	 * @param string      $mime
 	 *
-	 * @return Email
+	 * @return Email|boolean
 	 */
 	public function attach($file, $disposition = '', $newname = null, $mime = '')
 	{
@@ -655,37 +695,46 @@
 			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));
+
+			$mime = $this->mimeTypes(pathinfo($file, PATHINFO_EXTENSION));
+
 			fclose($fp);
 		}
 		else
 		{
 			$fileContent = & $file; // buffered file
 		}
+
 		// declare names on their own, to make phpcbf happy
-		$namesAttached       = [
+		$namesAttached = [
 			$file,
 			$newname,
 		];
+
 		$this->attachments[] = [
 			'name'        => $namesAttached,
 			'disposition' => empty($disposition) ? 'attachment' : $disposition,
-		// Can also be 'inline'  Not sure if it matters
+			// 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
 	 *
@@ -693,7 +742,7 @@
 	 *
 	 * @param string $filename
 	 *
-	 * @return string
+	 * @return string|boolean
 	 */
 	public function setAttachmentCID($filename)
 	{
@@ -702,13 +751,16 @@
 			if ($this->attachments[$i]['name'][0] === $filename)
 			{
 				$this->attachments[$i]['multipart'] = 'related';
-				$this->attachments[$i]['cid']       = uniqid(basename($this->attachments[$i]['name'][0]) . '@', true);
+
+				$this->attachments[$i]['cid'] = uniqid(basename($this->attachments[$i]['name'][0]) . '@', true);
+
 				return $this->attachments[$i]['cid'];
 			}
 		}
+
 		return false;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Add a Header Item
 	 *
@@ -720,9 +772,10 @@
 	public function setHeader($header, $value)
 	{
 		$this->headers[$header] = str_replace(["\n", "\r"], '', $value);
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Convert a String to an Array
 	 *
@@ -736,9 +789,10 @@
 		{
 			return (strpos($email, ',') !== false) ? preg_split('/[\s,]/', $email, -1, PREG_SPLIT_NO_EMPTY) : (array) trim($email);
 		}
+
 		return $email;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Multipart Value
 	 *
@@ -749,9 +803,10 @@
 	public function setAltMessage($str)
 	{
 		$this->altMessage = (string) $str;
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Mailtype
 	 *
@@ -762,9 +817,10 @@
 	public function setMailType($type = 'text')
 	{
 		$this->mailType = ($type === 'html') ? 'html' : 'text';
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Wordwrap
 	 *
@@ -775,9 +831,10 @@
 	public function setWordWrap($wordWrap = true)
 	{
 		$this->wordWrap = (bool) $wordWrap;
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Protocol
 	 *
@@ -788,9 +845,10 @@
 	public function setProtocol($protocol = 'mail')
 	{
 		$this->protocol = in_array($protocol, $this->protocols, true) ? strtolower($protocol) : 'mail';
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Priority
 	 *
@@ -800,10 +858,11 @@
 	 */
 	public function setPriority($n = 3)
 	{
-		$this->priority = preg_match('/^[1-5]$/', $n) ? (int) $n : 3;
+		$this->priority = preg_match('/^[1-5]$/', (string) $n) ? (int) $n : 3;
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Newline Character
 	 *
@@ -813,10 +872,11 @@
 	 */
 	public function setNewline($newline = "\n")
 	{
-		$this->newline = in_array($newline, ["\n", "\r\n", "\r"]) ? $newline : "\n";
+		$this->newline = in_array($newline, ["\n", "\r\n", "\r"], true) ? $newline : "\n";
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set CRLF
 	 *
@@ -827,9 +887,10 @@
 	public function setCRLF($CRLF = "\n")
 	{
 		$this->CRLF = ($CRLF !== "\n" && $CRLF !== "\r\n" && $CRLF !== "\r") ? "\n" : $CRLF;
+
 		return $this;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get the Message ID
 	 *
@@ -838,9 +899,10 @@
 	protected function getMessageID()
 	{
 		$from = str_replace(['>', '<'], '', $this->headers['Return-Path']);
+
 		return '<' . uniqid('', true) . strstr($from, '@') . '>';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get Mail Protocol
 	 *
@@ -848,11 +910,13 @@
 	 */
 	protected function getProtocol()
 	{
-		$this->protocol                                                      = strtolower($this->protocol);
-		in_array($this->protocol, $this->protocols, true) || $this->protocol = 'mail';
+		$this->protocol = strtolower($this->protocol);
+
+		in_array($this->protocol, $this->protocols, true) || $this->protocol = 'mail'; // @phpstan-ignore-line
+
 		return $this->protocol;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get Mail Encoding
 	 *
@@ -860,18 +924,21 @@
 	 */
 	protected function getEncoding()
 	{
-		in_array($this->encoding, $this->bitDepths) || $this->encoding = '8bit';
+		in_array($this->encoding, $this->bitDepths, true) || $this->encoding = '8bit'; // @phpstan-ignore-line
+
 		foreach ($this->baseCharsets as $charset)
 		{
 			if (strpos($this->charset, $charset) === 0)
 			{
 				$this->encoding = '7bit';
+
 				break;
 			}
 		}
+
 		return $this->encoding;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get content type (text/html/attachment)
 	 *
@@ -883,16 +950,15 @@
 		{
 			return empty($this->attachments) ? 'html' : 'html-attach';
 		}
-		elseif ($this->mailType === 'text' && ! empty($this->attachments))
+
+		if ($this->mailType === 'text' && ! empty($this->attachments))
 		{
 			return 'plain-attach';
 		}
-		else
-		{
-			return 'plain';
-		}
+
+		return 'plain';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set RFC 822 Date
 	 *
@@ -904,9 +970,10 @@
 		$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
 	 *
@@ -916,7 +983,7 @@
 	{
 		return 'This is a multi-part message in MIME format.' . $this->newline . 'Your email application may not support this format.';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Validate Email Address
 	 *
@@ -929,19 +996,23 @@
 		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
 	 *
@@ -953,19 +1024,19 @@
 	{
 		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
-			);
+			$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 $email
+	 * @param string|array $email
 	 *
-	 * @return string
+	 * @return array|string
 	 */
 	public function cleanEmail($email)
 	{
@@ -973,14 +1044,17 @@
 		{
 			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
 	 *
@@ -997,17 +1071,21 @@
 		{
 			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
 	 *
@@ -1023,16 +1101,20 @@
 		{
 			$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 ++)
@@ -1041,12 +1123,15 @@
 				$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?
@@ -1054,9 +1139,12 @@
 			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
@@ -1064,19 +1152,23 @@
 				{
 					break;
 				}
+
 				// Trim the word down
 				$temp .= static::substr($line, 0, $charlim - 1);
-				$line  = static::substr($line, $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)
 		{
@@ -1085,9 +1177,10 @@
 				$output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
 			}
 		}
+
 		return $output;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Build final headers
 	 */
@@ -1100,7 +1193,7 @@
 		$this->setHeader('Message-ID', $this->getMessageID());
 		$this->setHeader('Mime-Version', '1.0');
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Write Headers as a string
 	 */
@@ -1114,22 +1207,26 @@
 				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
 	 */
@@ -1139,44 +1236,56 @@
 		{
 			$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();
+				$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;
+					$this->finalBody = $this->body;
 				}
 				else
 				{
 					$this->finalBody = $hdr . $this->newline . $this->newline . $this->body;
 				}
-			return;
+
+				return;
+
 			case 'html':
 				if ($this->sendMultipart === false)
 				{
-					$hdr .= 'Content-Type: text/html; charset=' . $this->charset . $this->newline
-							. 'Content-Transfer-Encoding: quoted-printable';
+					$hdr .= 'Content-Type: text/html; charset='
+						. $this->charset . $this->newline
+						. 'Content-Transfer-Encoding: quoted-printable';
 				}
 				else
 				{
 					$boundary = uniqid('B_ALT_', true);
-					$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;
+
+					$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;
@@ -1185,83 +1294,105 @@
 				{
 					$this->finalBody = $hdr . $this->newline . $this->newline . $this->finalBody;
 				}
+
 				if ($this->sendMultipart !== false)
 				{
-					$this->finalBody .= '--' . $boundary . '--';
+					$this->finalBody .= '--' . $boundary . '--'; // @phpstan-ignore-line
 				}
-			return;
+
+				return;
+
 			case 'plain-attach':
 				$boundary = uniqid('B_ATC_', true);
-				$hdr     .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+				$hdr .= 'Content-Type: multipart/mixed; boundary="' . $boundary . '"';
+
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
+					$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->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;
+				break;
+
 			case 'html-attach':
-				$alt_boundary  = uniqid('B_ALT_', true);
-				$last_boundary = null;
+				$altBoundary  = uniqid('B_ALT_', true);
+				$lastBoundary = null;
+
 				if ($this->attachmentsHaveMultipart('mixed'))
 				{
-					$atc_boundary  = uniqid('B_ATC_', true);
-					$hdr          .= 'Content-Type: multipart/mixed; boundary="' . $atc_boundary . '"';
-					$last_boundary = $atc_boundary;
+					$atcBoundary = uniqid('B_ATC_', true);
+					$hdr .= 'Content-Type: multipart/mixed; boundary="' . $atcBoundary . '"';
+					$lastBoundary = $atcBoundary;
 				}
+
 				if ($this->attachmentsHaveMultipart('related'))
 				{
-					$rel_boundary        = uniqid('B_REL_', true);
-					$rel_boundary_header = 'Content-Type: multipart/related; boundary="' . $rel_boundary . '"';
-					if (isset($last_boundary))
+					$relBoundary = uniqid('B_REL_', true);
+
+					$relBoundaryHeader = 'Content-Type: multipart/related; boundary="' . $relBoundary . '"';
+
+					if (isset($lastBoundary))
 					{
-						$body .= '--' . $last_boundary . $this->newline . $rel_boundary_header;
+						$body .= '--' . $lastBoundary . $this->newline . $relBoundaryHeader;
 					}
 					else
 					{
-						$hdr .= $rel_boundary_header;
+						$hdr .= $relBoundaryHeader;
 					}
-					$last_boundary = $rel_boundary;
+
+					$lastBoundary = $relBoundary;
 				}
+
 				if ($this->getProtocol() === 'mail')
 				{
-					  $this->headerStr .= $hdr;
+					$this->headerStr .= $hdr;
 				}
+
 				static::strlen($body) && $body .= $this->newline . $this->newline;
-				$body                          .= $this->getMimeMessage() . $this->newline . $this->newline
-						. '--' . $last_boundary . $this->newline
-						. 'Content-Type: multipart/alternative; boundary="' . $alt_boundary . '"' . $this->newline . $this->newline
-						. '--' . $alt_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
-						. '--' . $alt_boundary . $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
-						. '--' . $alt_boundary . '--' . $this->newline . $this->newline;
-				if (! empty($rel_boundary))
+
+				$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, $rel_boundary, 'related');
+					$this->appendAttachments($body, $relBoundary, 'related');
 				}
+
 				// multipart/mixed attachments
-				if (! empty($atc_boundary))
+				if (! empty($atcBoundary))
 				{
 					$body .= $this->newline . $this->newline;
-					$this->appendAttachments($body, $atc_boundary, 'mixed');
+					$this->appendAttachments($body, $atcBoundary, 'mixed');
 				}
-			break;
+
+				break;
 		}
+
 		$this->finalBody = ($this->getProtocol() === 'mail') ? $body : $hdr . $this->newline . $this->newline . $body;
 	}
-	//--------------------------------------------------------------------
+
+	/**
+	 * @return boolean
+	 */
 	protected function attachmentsHaveMultipart($type)
 	{
 		foreach ($this->attachments as &$attachment)
@@ -1271,40 +1402,44 @@
 				return true;
 			}
 		}
+
 		return false;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Prepares attachment string
 	 *
-	 * @param string      &$body     Message body to append to
+	 * @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 string
+	 * @return void
 	 */
 	protected function appendAttachments(&$body, $boundary, $multipart = null)
 	{
-		for ($i = 0, $c = count($this->attachments); $i < $c; $i ++)
+		for ($i = 0, $c = count($this->attachments); $i < $c; $i++)
 		{
 			if (isset($multipart) && $this->attachments[$i]['multipart'] !== $multipart)
 			{
 				continue;
 			}
-			$name  = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
+			$name = isset($this->attachments[$i]['name'][1]) ? $this->attachments[$i]['name'][1] : basename($this->attachments[$i]['name'][0]);
+
 			$body .= '--' . $boundary . $this->newline
-					. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
-					. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
-					. 'Content-Transfer-Encoding: base64' . $this->newline
-					. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
-					. $this->newline
-					. $this->attachments[$i]['content'] . $this->newline;
+				. 'Content-Type: ' . $this->attachments[$i]['type'] . '; name="' . $name . '"' . $this->newline
+				. 'Content-Disposition: ' . $this->attachments[$i]['disposition'] . ';' . $this->newline
+				. 'Content-Transfer-Encoding: base64' . $this->newline
+				. (empty($this->attachments[$i]['cid']) ? '' : 'Content-ID: <' . $this->attachments[$i]['cid'] . '>' . $this->newline)
+				. $this->newline
+				. $this->attachments[$i]['content'] . $this->newline;
 		}
+
 		// $name won't be set if no attachments were appended,
 		// and therefore a boundary wouldn't be necessary
 		empty($name) || $body .= '--' . $boundary . '--';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Prep Quoted Printable
 	 *
@@ -1320,8 +1455,8 @@
 		// 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 $ascii_safe_chars = [
-		// ' (  )   +   ,   -   .   /   :   =   ?
+		static $asciiSafeChars = [
+			// ' (  )   +   ,   -   .   /   :   =   ?
 			39,
 			40,
 			41,
@@ -1333,7 +1468,7 @@
 			58,
 			61,
 			63,
-		// numbers
+			// numbers
 			48,
 			49,
 			50,
@@ -1344,7 +1479,7 @@
 			55,
 			56,
 			57,
-		// upper-case letters
+			// upper-case letters
 			65,
 			66,
 			67,
@@ -1371,7 +1506,7 @@
 			88,
 			89,
 			90,
-		// lower-case letters
+			// lower-case letters
 			97,
 			98,
 			99,
@@ -1399,9 +1534,11 @@
 			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,
@@ -1410,19 +1547,24 @@
 		{
 			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)
@@ -1431,6 +1573,7 @@
 				// 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)
 				{
@@ -1447,27 +1590,31 @@
 				{
 					$char = $escape . strtoupper(sprintf('%02s', dechex($ascii)));  // =3D
 				}
-				elseif (! in_array($ascii, $ascii_safe_chars, true))
+				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    = '';
+					$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
 	 *
@@ -1482,6 +1629,7 @@
 	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
@@ -1489,22 +1637,23 @@
 			//       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,
-								]);
+				$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);
+					// 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'))
@@ -1512,19 +1661,24 @@
 				$chars = mb_strlen($str, 'UTF-8');
 			}
 		}
+
 		// We might already have this set for UTF-8
 		isset($chars) || $chars = static::strlen($str);
-		$output                 = '=?' . $this->charset . '?Q?';
-		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++)
+
+		$output = '=?' . $this->charset . '?Q?';
+
+		for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++) // @phpstan-ignore-line
 		{
 			$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
+					. ' =?' . $this->charset . '?Q?' . $chr; // New line
+
+				$length = 6 + static::strlen($this->charset) + $l; // Reset the length for the new line
 			}
 			else
 			{
@@ -1532,10 +1686,11 @@
 				$length += $l;
 			}
 		}
+
 		// End the header
 		return $output . '?=';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Send Email
 	 *
@@ -1549,32 +1704,43 @@
 		{
 			$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();
@@ -1589,7 +1755,7 @@
 
 		return $result;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Batch Bcc Send. Sends groups of BCCs in batches
 	 */
@@ -1598,27 +1764,32 @@
 		$float = $this->BCCBatchSize - 1;
 		$set   = '';
 		$chunk = [];
-		for ($i = 0, $c = count($this->BCCArray); $i < $c; $i ++)
+
+		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     = '';
+				$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));
@@ -1627,6 +1798,7 @@
 			{
 				$this->BCCArray = $bcc;
 			}
+
 			$this->buildMessage();
 			$this->spoolEmail();
 		}
@@ -1635,20 +1807,19 @@
 		$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
+			'/\{unwrap\}(.*?)\{\/unwrap\}/si',
+			[$this, 'removeNLCallback'],
+			$this->finalBody
 		);
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Strip line-breaks via callback
 	 *
@@ -1662,9 +1833,10 @@
 		{
 			$matches[1] = str_replace(["\r\n", "\r", "\n"], '', $matches[1]);
 		}
+
 		return $matches[1];
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Spool mail to the mail server
 	 *
@@ -1675,24 +1847,29 @@
 		$this->unwrapSpecials();
 		$protocol = $this->getProtocol();
 		$method   = 'sendWith' . ucfirst($protocol);
+
 		try
 		{
 			$success = $this->$method();
 		}
-		catch (\ErrorException $e)
+		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
 	 *
@@ -1705,7 +1882,7 @@
 	 *
 	 * Credits for the base concept go to Paul Buonopane <paul@namepros.com>
 	 *
-	 * @param string &$email
+	 * @param string $email
 	 *
 	 * @return boolean
 	 */
@@ -1713,13 +1890,13 @@
 	{
 		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
-			);
+			$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()
 	 *
@@ -1732,15 +1909,17 @@
 		// _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
 	 *
@@ -1751,6 +1930,7 @@
 		// _validate_email_for_shell() below accepts by reference,
 		// so this needs to be assigned to a variable
 		$from = $this->cleanEmail($this->headers['From']);
+
 		if ($this->validateEmailForShell($from))
 		{
 			$from = '-f ' . $from;
@@ -1759,24 +1939,29 @@
 		{
 			$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'));
+			$this->setErrorMessage(lang('Email.noSocket'));
+
 			return false;
 		}
+
 		return true;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Send using SMTP
 	 *
@@ -1787,60 +1972,76 @@
 		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
 	 *
@@ -1850,11 +2051,11 @@
 	{
 		$this->sendCommand($this->SMTPKeepAlive ? 'reset' : 'quit');
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * SMTP Connect
 	 *
-	 * @return string
+	 * @return string|boolean
 	 */
 	protected function SMTPConnect()
 	{
@@ -1862,31 +2063,57 @@
 		{
 			return true;
 		}
-		$ssl               = ($this->SMTPCrypto === 'ssl') ? 'ssl://' : '';
+
+		$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
+			$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_TLS_CLIENT);
+			$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()));
+				$this->setErrorMessage(lang('Email.SMTPError', [$this->getSMTPData()]));
+
 				return false;
 			}
 		}
+
 		return $this->sendCommand('hello');
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Send SMTP command
 	 *
@@ -1908,16 +2135,20 @@
 				{
 					$this->sendData('HELO ' . $this->getHostname());
 				}
+
 				$resp = 250;
-			break;
+				break;
+
 			case 'starttls':
 				$this->sendData('STARTTLS');
 				$resp = 220;
-			break;
+				break;
+
 			case 'from':
 				$this->sendData('MAIL FROM:<' . $data . '>');
 				$resp = 250;
-			break;
+				break;
+
 			case 'to':
 				if ($this->DSN)
 				{
@@ -1928,34 +2159,43 @@
 					$this->sendData('RCPT TO:<' . $data . '>');
 				}
 				$resp = 250;
-			break;
+				break;
+
 			case 'data':
 				$this->sendData('DATA');
 				$resp = 354;
-			break;
+				break;
+
 			case 'reset':
 				$this->sendData('RSET');
 				$resp = 250;
-			break;
+				break;
+
 			case 'quit':
 				$this->sendData('QUIT');
 				$resp = 221;
-			break;
+				break;
 		}
-		$reply                = $this->getSMTPData();
+
+		$reply = $this->getSMTPData();
+
 		$this->debugMessage[] = '<pre>' . $cmd . ': ' . $reply . '</pre>';
-		if ((int) static::substr($reply, 0, 3) !== $resp)
+
+		if ((int) static::substr($reply, 0, 3) !== $resp) // @phpstan-ignore-line
 		{
 			$this->setErrorMessage(lang('Email.SMTPError', [$reply]));
+
 			return false;
 		}
+
 		if ($cmd === 'quit')
 		{
 			fclose($this->SMTPConnect);
 		}
+
 		return true;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * SMTP Authenticate
 	 *
@@ -1967,43 +2207,57 @@
 		{
 			return true;
 		}
+
 		if ($this->SMTPUser === '' && $this->SMTPPass === '')
 		{
-			$this->setErrorMessage(lang('lang:email.noSMTPAuth'));
+			$this->setErrorMessage(lang('Email.noSMTPAuth'));
+
 			return false;
 		}
+
 		$this->sendData('AUTH LOGIN');
 		$reply = $this->getSMTPData();
+
 		if (strpos($reply, '503') === 0)    // Already authenticated
 		{
 			return true;
 		}
-		elseif (strpos($reply, '334') !== 0)
+
+		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
 	 *
@@ -2014,14 +2268,16 @@
 	protected function sendData($data)
 	{
 		$data .= $this->newline;
+
 		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
-			elseif ($result === 0)
+			if ($result === 0)
 			{
 				if ($timestamp === 0)
 				{
@@ -2030,24 +2286,28 @@
 				elseif ($timestamp < (time() - $this->SMTPTimeout))
 				{
 					$result = false;
+
 					break;
 				}
+
 				usleep(250000);
+
 				continue;
 			}
-			else
-			{
-				$timestamp = 0;
-			}
+
+			$timestamp = 0;
 		}
-		if ($result === false)
+
+		if ($result === false) // @phpstan-ignore-line
 		{
-			$this->setErrorMessage(lang('Email.SMTPDataFailure', $data));
+			$this->setErrorMessage(lang('Email.SMTPDataFailure', [$data]));
+
 			return false;
 		}
+
 		return true;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get SMTP data
 	 *
@@ -2056,17 +2316,20 @@
 	protected function getSMTPData()
 	{
 		$data = '';
+
 		while ($str = fgets($this->SMTPConnect, 512))
 		{
 			$data .= $str;
+
 			if ($str[3] === ' ')
 			{
 				break;
 			}
 		}
+
 		return $data;
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get Hostname
 	 *
@@ -2085,9 +2348,10 @@
 		{
 			return $_SERVER['SERVER_NAME'];
 		}
+
 		return isset($_SERVER['SERVER_ADDR']) ? '[' . $_SERVER['SERVER_ADDR'] . ']' : '[127.0.0.1]';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Get Debug Message
 	 *
@@ -2099,15 +2363,19 @@
 	public function printDebugger($include = ['headers', 'subject', 'body'])
 	{
 		$msg = implode('', $this->debugMessage);
+
 		// Determine which parts of our raw data needs to be printed
-		$raw_data                                         = '';
-		is_array($include) || $include                    = [$include];
-		in_array('headers', $include, true) && $raw_data  = htmlspecialchars($this->headerStr) . "\n";
-		in_array('subject', $include, true) && $raw_data .= htmlspecialchars($this->subject) . "\n";
-		in_array('body', $include, true) && $raw_data    .= htmlspecialchars($this->finalBody);
-		return $msg . ($raw_data === '' ? '' : '<pre>' . $raw_data . '</pre>');
+		$rawData = '';
+
+		is_array($include) || $include = [$include]; // @phpstan-ignore-line
+
+		in_array('headers', $include, true) && $rawData = htmlspecialchars($this->headerStr) . "\n";
+		in_array('subject', $include, true) && $rawData .= htmlspecialchars($this->subject) . "\n";
+		in_array('body', $include, true) && $rawData    .= htmlspecialchars($this->finalBody);
+
+		return $msg . ($rawData === '' ? '' : '<pre>' . $rawData . '</pre>');
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Set Message
 	 *
@@ -2117,7 +2385,7 @@
 	{
 		$this->debugMessage[] = $msg . '<br />';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Mime Types
 	 *
@@ -2128,9 +2396,10 @@
 	protected function mimeTypes($ext = '')
 	{
 		$mime = Mimes::guessTypeFromExtension(strtolower($ext));
+
 		return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Destructor
 	 */
@@ -2138,7 +2407,7 @@
 	{
 		is_resource($this->SMTPConnect) && $this->sendCommand('quit');
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Byte-safe strlen()
 	 *
@@ -2150,7 +2419,7 @@
 	{
 		return (static::$func_overload) ? mb_strlen($str, '8bit') : strlen($str);
 	}
-	//--------------------------------------------------------------------
+
 	/**
 	 * Byte-safe substr()
 	 *
@@ -2166,9 +2435,10 @@
 		{
 			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.
 	 *
diff --git a/system/Encryption/EncrypterInterface.php b/system/Encryption/EncrypterInterface.php
index 4b008ad..6fe653d 100644
--- a/system/Encryption/EncrypterInterface.php
+++ b/system/Encryption/EncrypterInterface.php
@@ -1,44 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2017 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2014-2017 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
 
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+
 /**
  * CodeIgniter Encryption Handler
  *
@@ -46,12 +20,14 @@
  */
 interface EncrypterInterface
 {
-
 	/**
 	 * Encrypt - convert plaintext into ciphertext
 	 *
-	 * @param  string $data   Input data
-	 * @param  array  $params Over-ridden parameters, specifically the key
+	 * @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);
@@ -59,8 +35,11 @@
 	/**
 	 * Decrypt - convert ciphertext into plaintext
 	 *
-	 * @param  string $data   Encrypted data
-	 * @param  array  $params Over-ridden parameters, specifically the key
+	 * @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 4c2d333..f09bbd0 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -1,45 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2017 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2014-2017 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Encryption\Exceptions\EncryptionException;
+use Config\Encryption as EncryptionConfig;
 
 /**
  * CodeIgniter Encryption Manager
@@ -50,31 +23,38 @@
  */
 class Encryption
 {
-
 	/**
 	 * The encrypter we create
 	 *
-	 * @var string
+	 * @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
+	 * The derived HMAC key
+	 *
+	 * @var string
 	 */
 	protected $hmacKey;
 
 	/**
 	 * HMAC digest to use
+	 *
+	 * @var string
 	 */
 	protected $digest = 'SHA512';
 
@@ -85,57 +65,65 @@
 	 */
 	protected $drivers = [
 		'OpenSSL',
+		'Sodium',
 	];
 
-	// --------------------------------------------------------------------
+	/**
+	 * Handlers that are to be installed
+	 *
+	 * @var array<string, boolean>
+	 */
+	protected $handlers = [];
 
 	/**
 	 * Class constructor
 	 *
-	 * @param  BaseConfig $config Configuration parameters
-	 * @return void
+	 * @param EncryptionConfig $config Configuration parameters
 	 *
-	 * @throws \CodeIgniter\Encryption\Exceptions\EncryptionException
+	 * @throws EncryptionException
+	 *
+	 * @return void
 	 */
-	public function __construct(BaseConfig $config = null)
+	public function __construct(EncryptionConfig $config = null)
 	{
-		if (empty($config))
-		{
-			$config = new \Config\Encryption();
-		}
-		$this->driver = $config->driver;
-		$this->key    = $config->key;
+		$config = $config ?? new EncryptionConfig();
 
-		// determine what is installed
+		$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 any aren't there, bomb
-		if (in_array(false, $this->handlers))
+		// 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
-			// @codeCoverageIgnoreStart
 			throw EncryptionException::forNoHandlerAvailable($this->driver);
-			// @codeCoverageIgnoreEnd
 		}
 	}
 
 	/**
 	 * Initialize or re-initialize an encrypter
 	 *
-	 * @param  BaseConfig $config Configuration parameters
-	 * @return \CodeIgniter\Encryption\EncrypterInterface
+	 * @param EncryptionConfig $config Configuration parameters
 	 *
-	 * @throws \CodeIgniter\Encryption\Exceptions\EncryptionException
+	 * @throws EncryptionException
+	 *
+	 * @return EncrypterInterface
 	 */
-	public function initialize(BaseConfig $config = null)
+	public function initialize(EncryptionConfig $config = null)
 	{
 		// override config?
-		if (! empty($config))
+		if ($config)
 		{
-			$this->driver = $config->driver;
 			$this->key    = $config->key;
+			$this->driver = $config->driver;
+			$this->digest = $config->digest ?? 'SHA512';
 		}
 
 		// Insist on a driver
@@ -145,7 +133,7 @@
 		}
 
 		// Check for an unknown driver
-		if (! in_array($this->driver, $this->drivers))
+		if (! in_array($this->driver, $this->drivers, true))
 		{
 			throw EncryptionException::forUnKnownHandler($this->driver);
 		}
@@ -160,15 +148,15 @@
 
 		$handlerName     = 'CodeIgniter\\Encryption\\Handlers\\' . $this->driver . 'Handler';
 		$this->encrypter = new $handlerName($config);
+
 		return $this->encrypter;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * Create a random key
 	 *
-	 * @param  integer $length Output length
+	 * @param integer $length Output length
+	 *
 	 * @return string
 	 */
 	public static function createKey($length = 32)
@@ -176,17 +164,16 @@
 		return random_bytes($length);
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
 	 * __get() magic, providing readonly access to some of our protected properties
 	 *
-	 * @param  string $key Property name
+	 * @param string $key Property name
+	 *
 	 * @return mixed
 	 */
 	public function __get($key)
 	{
-		if (in_array($key, ['key', 'digest', 'driver', 'drivers'], true))
+		if ($this->__isset($key))
 		{
 			return $this->{$key};
 		}
@@ -204,5 +191,4 @@
 	{
 		return in_array($key, ['key', 'digest', 'driver', 'drivers'], true);
 	}
-
 }
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index e0d5d9e..ddf5066 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -1,41 +1,88 @@
 <?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption\Exceptions;
 
+use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
 
 /**
  * Encryption exception
  */
-class EncryptionException extends \RuntimeException implements ExceptionInterface
+class EncryptionException extends RuntimeException implements ExceptionInterface
 {
+	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'));
 	}
 
-	public static function forNoHandlerAvailable()
+	/**
+	 * 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'));
+		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 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 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 62eb6b1..50a1cd6 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -1,93 +1,58 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2017 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2014-2017 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Encryption\EncrypterInterface;
+use Config\Encryption;
+use Psr\Log\LoggerInterface;
 
 /**
  * Base class for encryption handling
  */
-abstract class BaseHandler implements \CodeIgniter\Encryption\EncrypterInterface
+abstract class BaseHandler implements EncrypterInterface
 {
-
-	/**
-	 * Configuraiton passed from encryption manager
-	 *
-	 * @var string
-	 */
-	protected $config;
-
 	/**
 	 * Logger instance to record error messages and warnings.
 	 *
-	 * @var \PSR\Log\LoggerInterface
+	 * @var LoggerInterface
 	 */
 	protected $logger;
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
+	 * @param Encryption|null $config
 	 */
-	public function __construct(BaseConfig $config = null)
+	public function __construct(Encryption $config = null)
 	{
-		if (empty($config))
-		{
-			$config = new \Config\Encryption();
-		}
+		$config = $config ?? config('Encryption');
 
 		// make the parameters conveniently accessible
-		foreach ($config as $pkey => $value)
+		foreach (get_object_vars($config) as $key => $value)
 		{
-			$this->$pkey = $value;
+			if (property_exists($this, $key))
+			{
+				$this->{$key} = $value;
+			}
 		}
 	}
 
 	/**
 	 * Byte-safe substr()
 	 *
-	 * @param  string  $str
-	 * @param  integer $start
-	 * @param  integer $length
+	 * @param string  $str
+	 * @param integer $start
+	 * @param integer $length
+	 *
 	 * @return string
 	 */
 	protected static function substr($str, $start, $length = null)
@@ -103,7 +68,7 @@
 	 */
 	public function __get($key)
 	{
-		if (in_array($key, ['cipher', 'key'], true))
+		if ($this->__isset($key))
 		{
 			return $this->{$key};
 		}
@@ -119,6 +84,6 @@
 	 */
 	public function __isset($key): bool
 	{
-		return in_array($key, ['cipher', 'key'], true);
+		return property_exists($this, $key);
 	}
 }
diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php
index 50622d1..012f900 100644
--- a/system/Encryption/Handlers/OpenSSLHandler.php
+++ b/system/Encryption/Handlers/OpenSSLHandler.php
@@ -1,44 +1,16 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2017 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2014-2017 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Encryption\Exceptions\EncryptionException;
 
 /**
@@ -46,45 +18,36 @@
  */
 class OpenSSLHandler extends BaseHandler
 {
-
 	/**
 	 * HMAC digest to use
+	 *
+	 * @var string
 	 */
 	protected $digest = 'SHA512';
 
 	/**
 	 * Cipher to use
+	 *
+	 * @var string
 	 */
 	protected $cipher = 'AES-256-CTR';
 
-	// --------------------------------------------------------------------
-
 	/**
-	 * Initialize OpenSSL, remembering parameters
+	 * Starter key
 	 *
-	 * @param BaseConfig $config
-	 *
-	 * @throws \CodeIgniter\Encryption\Exceptions\EncryptionException
+	 * @var string
 	 */
-	public function __construct(BaseConfig $config = null)
-	{
-		parent::__construct($config);
-	}
+	protected $key = '';
 
 	/**
-	 * Encrypt plaintext, with optional HMAC and base64 encoding
-	 *
-	 * @param  string $data   Input data
-	 * @param  array  $params Over-ridden parameters, specifically the key
-	 * @return string
-	 * @throws \CodeIgniter\Encryption\Exceptions\EncryptionException
+	 * {@inheritDoc}
 	 */
 	public function encrypt($data, $params = null)
 	{
-		// Allow key over-ride
-		if (! empty($params))
+		// Allow key override
+		if ($params)
 		{
-			if (isset($params['key']))
+			if (is_array($params) && isset($params['key']))
 			{
 				$this->key = $params['key'];
 			}
@@ -93,6 +56,7 @@
 				$this->key = $params;
 			}
 		}
+
 		if (empty($this->key))
 		{
 			throw EncryptionException::forNeedsStarterKey();
@@ -102,7 +66,7 @@
 		$secret = \hash_hkdf($this->digest, $this->key);
 
 		// basic encryption
-		$iv = ($iv_size = \openssl_cipher_iv_length($this->cipher)) ? \openssl_random_pseudo_bytes($iv_size) : null;
+		$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);
 
@@ -118,22 +82,15 @@
 		return $hmacKey . $result;
 	}
 
-	// --------------------------------------------------------------------
-
 	/**
-	 * Decrypt ciphertext, with optional HMAC and base64 encoding
-	 *
-	 * @param  string $data   Encrypted data
-	 * @param  array  $params Over-ridden parameters, specifically the key
-	 * @return string
-	 * @throws \CodeIgniter\Encryption\Exceptions\EncryptionException
+	 * {@inheritDoc}
 	 */
 	public function decrypt($data, $params = null)
 	{
-		// Allow key over-ride
-		if (! empty($params))
+		// Allow key override
+		if ($params)
 		{
-			if (isset($params['key']))
+			if (is_array($params) && isset($params['key']))
 			{
 				$this->key = $params['key'];
 			}
@@ -142,6 +99,7 @@
 				$this->key = $params;
 			}
 		}
+
 		if (empty($this->key))
 		{
 			throw EncryptionException::forNeedsStarterKey();
@@ -154,15 +112,16 @@
 		$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 ($iv_size = \openssl_cipher_iv_length($this->cipher))
+		if ($ivSize = \openssl_cipher_iv_length($this->cipher))
 		{
-			$iv   = self::substr($data, 0, $iv_size);
-			$data = self::substr($data, $iv_size);
+			$iv   = self::substr($data, 0, $ivSize);
+			$data = self::substr($data, $ivSize);
 		}
 		else
 		{
@@ -171,5 +130,4 @@
 
 		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
new file mode 100644
index 0000000..01645c1
--- /dev/null
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -0,0 +1,149 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Encryption\Handlers;
+
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
+
+/**
+ * SodiumHandler uses libsodium in encryption.
+ *
+ * @see https://github.com/jedisct1/libsodium/issues/392
+ */
+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, null);
+
+		// 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;
+	}
+}
diff --git a/system/Entity.php b/system/Entity.php
index b3da3ce..b9edfb1 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -1,51 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
 
 use CodeIgniter\Exceptions\CastException;
 use CodeIgniter\I18n\Time;
+use DateTime;
+use Exception;
+use JsonSerializable;
+use ReflectionException;
+use stdClass;
 
 /**
  * Entity encapsulation, for use with CodeIgniter\Model
  */
-class Entity implements \JsonSerializable
+class Entity implements JsonSerializable
 {
 	/**
 	 * Maps names used in sets and gets against unique
@@ -113,7 +90,7 @@
 	 *
 	 * @param array $data
 	 *
-	 * @return \CodeIgniter\Entity
+	 * @return $this
 	 */
 	public function fill(array $data = null)
 	{
@@ -124,7 +101,7 @@
 
 		foreach ($data as $key => $value)
 		{
-			$this->$key = $value;
+			$this->__set($key, $value);
 		}
 
 		return $this;
@@ -140,40 +117,47 @@
 	 *
 	 * @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
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	public function toArray(bool $onlyChanged = false, bool $cast = true): array
+	public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
 	{
 		$this->_cast = $cast;
 		$return      = [];
 
+		$keys = array_keys($this->attributes);
+		$keys = array_filter($keys, function ($key) {
+			return strpos($key, '_') !== 0;
+		});
+
+		if (is_array($this->datamap))
+		{
+			$keys = array_diff($keys, $this->datamap);
+			$keys = array_unique(array_merge($keys, array_keys($this->datamap)));
+		}
+
 		// we need to loop over our properties so that we
 		// allow our magic methods a chance to do their thing.
-		foreach ($this->attributes as $key => $value)
+		foreach ($keys as $key)
 		{
-			if (strpos($key, '_') === 0)
-			{
-				continue;
-			}
-
 			if ($onlyChanged && ! $this->hasChanged($key))
 			{
 				continue;
 			}
 
 			$return[$key] = $this->__get($key);
-		}
 
-		// Loop over our mapped properties and add them to the list...
-		if (is_array($this->datamap))
-		{
-			foreach ($this->datamap as $from => $to)
+			if ($recursive)
 			{
-				if (array_key_exists($to, $return))
+				if ($return[$key] instanceof Entity)
 				{
-					$return[$from] = $this->__get($to);
+					$return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
+				}
+				elseif (is_callable([$return[$key], 'toArray']))
+				{
+					$return[$key] = $return[$key]->toArray();
 				}
 			}
 		}
@@ -187,16 +171,32 @@
 	/**
 	 * Returns the raw values of the current attributes.
 	 *
-	 * @param boolean $onlyChanged
+	 * @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): 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;
 		}
 
@@ -207,7 +207,19 @@
 				continue;
 			}
 
-			$return[$key] = $this->attributes[$key];
+			if ($recursive)
+			{
+				if ($value instanceof Entity)
+				{
+					$value = $value->toRawArray($onlyChanged, $recursive);
+				}
+				elseif (is_callable([$value, 'toRawArray']))
+				{
+					$value = $value->toRawArray();
+				}
+			}
+
+			$return[$key] = $value;
 		}
 
 		return $return;
@@ -271,7 +283,7 @@
 	 * @param string $key
 	 *
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function __get(string $key)
 	{
@@ -290,18 +302,18 @@
 
 		// Otherwise return the protected property
 		// if it exists.
-		else if (array_key_exists($key, $this->attributes))
+		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))
+		if (in_array($key, $this->dates, true))
 		{
 			$result = $this->mutateDate($result);
 		}
 		// Or cast it as something?
-		else if ($this->_cast && ! empty($this->casts[$key]))
+		elseif ($this->_cast && ! empty($this->casts[$key]))
 		{
 			$result = $this->castAs($result, $this->casts[$key]);
 		}
@@ -320,18 +332,18 @@
 	 *      $this->my_property = $p;
 	 *      $this->setMyProperty() = $p;
 	 *
-	 * @param string $key
-	 * @param null   $value
+	 * @param string     $key
+	 * @param mixed|null $value
 	 *
 	 * @return $this
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	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))
+		if (in_array($key, $this->dates, true))
 		{
 			$value = $this->mutateDate($value);
 		}
@@ -347,6 +359,12 @@
 
 		if (! $isNullable || ! is_null($value))
 		{
+			// CSV casts need to be imploded.
+			if ($castTo === 'csv')
+			{
+				$value = implode(',', $value);
+			}
+
 			// Array casting requires that we serialize the value
 			// when setting it so that it can easily be stored
 			// back to the database.
@@ -398,7 +416,7 @@
 	 *
 	 * @param string $key
 	 *
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function __unset(string $key)
 	{
@@ -473,10 +491,10 @@
 	 * Converts the given string|timestamp|DateTime|Time instance
 	 * into a \CodeIgniter\I18n\Time object.
 	 *
-	 * @param $value
+	 * @param mixed $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time|mixed
+	 * @throws Exception
 	 */
 	protected function mutateDate($value)
 	{
@@ -485,7 +503,7 @@
 			return $value;
 		}
 
-		if ($value instanceof \DateTime)
+		if ($value instanceof DateTime)
 		{
 			return Time::instance($value);
 		}
@@ -509,13 +527,12 @@
 	 * 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 $value
+	 * @param mixed  $value
 	 * @param string $type
 	 *
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-
 	protected function castAs($value, string $type)
 	{
 		if (strpos($type, '?') === 0)
@@ -530,24 +547,27 @@
 		switch($type)
 		{
 			case 'int':
-			case 'integer': //alias for 'integer'
-				$value = (int)$value;
+			case 'integer': // alias for 'integer'
+				$value = (int) $value;
 				break;
 			case 'float':
-				$value = (float)$value;
+				$value = (float) $value;
 				break;
 			case 'double':
-				$value = (double)$value;
+				$value = (double) $value;
 				break;
 			case 'string':
-				$value = (string)$value;
+				$value = (string) $value;
 				break;
 			case 'bool':
-			case 'boolean': //alias for 'boolean'
-				$value = (bool)$value;
+			case 'boolean': // alias for 'boolean'
+				$value = (bool) $value;
+				break;
+			case 'csv':
+				$value = explode(',', $value);
 				break;
 			case 'object':
-				$value = (object)$value;
+				$value = (object) $value;
 				break;
 			case 'array':
 				if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0))
@@ -555,7 +575,7 @@
 					$value = unserialize($value);
 				}
 
-				$value = (array)$value;
+				$value = (array) $value;
 				break;
 			case 'json':
 				$value = $this->castAsJson($value);
@@ -581,14 +601,14 @@
 	 * @param boolean $asArray
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Exceptions\CastException
+	 * @throws CastException
 	 */
 	private function castAsJson($value, bool $asArray = false)
 	{
-		$tmp = ! is_null($value) ? ($asArray ? [] : new \stdClass) : null;
+		$tmp = ! is_null($value) ? ($asArray ? [] : new stdClass) : null;
 		if (function_exists('json_decode'))
 		{
-			if ((is_string($value) && strlen($value) > 1 && in_array($value[0], ['[', '{', '"'])) || is_numeric($value))
+			if ((is_string($value) && strlen($value) > 1 && in_array($value[0], ['[', '{', '"'], true)) || is_numeric($value))
 			{
 				$tmp = json_decode($value, $asArray);
 
@@ -605,10 +625,26 @@
 	 * Support for json_encode()
 	 *
 	 * @return array|mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	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 (null === $cast)
+		{
+			return $this->_cast;
+		}
+		$this->_cast = $cast;
+		return $this;
+	}
 }
diff --git a/system/Events/Events.php b/system/Events/Events.php
index c616256..59489b6 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -1,44 +1,17 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Events;
 
+use Config\Modules;
 use Config\Services;
 
 define('EVENT_PRIORITY_LOW', 200);
@@ -50,7 +23,6 @@
  */
 class Events
 {
-
 	/**
 	 * The list of listeners.
 	 *
@@ -78,21 +50,21 @@
 	 * Stores information about the events
 	 * for display in the debug toolbar.
 	 *
-	 * @var array
+	 * @var array<array<string, float|string>>
 	 */
 	protected static $performanceLog = [];
 
 	/**
 	 * A list of found files.
 	 *
-	 * @var array
+	 * @var string[]
 	 */
 	protected static $files = [];
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Ensures that we have a events file ready.
+	 *
+	 * @return void
 	 */
 	public static function initialize()
 	{
@@ -102,31 +74,37 @@
 			return;
 		}
 
+		/**
+		 * @var Modules
+		 */
 		$config = config('Modules');
-
-		$files = [APPPATH . 'Config/Events.php'];
+		$events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
+		$files  = [];
 
 		if ($config->shouldDiscover('events'))
 		{
-			$locator = Services::locator();
-			$files   = $locator->search('Config/Events.php');
+			$files = Services::locator()->search('Config/Events.php');
 		}
 
-		static::$files = $files;
+		$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)
 		{
-			if (is_file($file))
-			{
-				include $file;
-			}
+			include $file;
 		}
 
 		static::$initialized = true;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Registers an action to happen on an event. The action can be any sort
 	 * of callable:
@@ -136,15 +114,17 @@
 	 *  Events::on('create', [$myInstance, 'myMethod']);  // Method on an existing instance
 	 *  Events::on('create', function() {});              // Closure
 	 *
-	 * @param $event_name
-	 * @param callable   $callback
-	 * @param integer    $priority
+	 * @param string   $eventName
+	 * @param callable $callback
+	 * @param integer  $priority
+	 *
+	 * @return void
 	 */
-	public static function on($event_name, $callback, $priority = EVENT_PRIORITY_NORMAL)
+	public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
 	{
-		if (! isset(static::$listeners[$event_name]))
+		if (! isset(static::$listeners[$eventName]))
 		{
-			static::$listeners[$event_name] = [
+			static::$listeners[$eventName] = [
 				true, // If there's only 1 item, it's sorted.
 				[$priority],
 				[$callback],
@@ -152,28 +132,26 @@
 		}
 		else
 		{
-			static::$listeners[$event_name][0]   = false; // Not sorted
-			static::$listeners[$event_name][1][] = $priority;
-			static::$listeners[$event_name][2][] = $callback;
+			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 $eventName
-	 * @param $arguments
+	 * @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!
+		// Read in our Config/Events file so that we have them all!
 		if (! static::$initialized)
 		{
 			static::initialize();
@@ -205,65 +183,58 @@
 		return true;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns an array of listeners for a single event. They are
 	 * sorted by priority.
 	 *
-	 * If the listener could not be found, returns FALSE, or TRUE if
-	 * it was removed.
-	 *
-	 * @param $event_name
+	 * @param string $eventName
 	 *
 	 * @return array
 	 */
-	public static function listeners($event_name): array
+	public static function listeners($eventName): array
 	{
-		if (! isset(static::$listeners[$event_name]))
+		if (! isset(static::$listeners[$eventName]))
 		{
 			return [];
 		}
 
 		// The list is not sorted
-		if (! static::$listeners[$event_name][0])
+		if (! static::$listeners[$eventName][0])
 		{
 			// Sort it!
-			array_multisort(static::$listeners[$event_name][1], SORT_NUMERIC, static::$listeners[$event_name][2]);
+			array_multisort(static::$listeners[$eventName][1], SORT_NUMERIC, static::$listeners[$eventName][2]);
 
 			// Mark it as sorted already!
-			static::$listeners[$event_name][0] = true;
+			static::$listeners[$eventName][0] = true;
 		}
 
-		return static::$listeners[$event_name][2];
+		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 $event_name
-	 * @param callable   $listener
+	 * @param string   $eventName
+	 * @param callable $listener
 	 *
 	 * @return boolean
 	 */
-	public static function removeListener($event_name, callable $listener): bool
+	public static function removeListener($eventName, callable $listener): bool
 	{
-		if (! isset(static::$listeners[$event_name]))
+		if (! isset(static::$listeners[$eventName]))
 		{
 			return false;
 		}
 
-		foreach (static::$listeners[$event_name][2] as $index => $check)
+		foreach (static::$listeners[$eventName][2] as $index => $check)
 		{
 			if ($check === $listener)
 			{
-				unset(static::$listeners[$event_name][1][$index]);
-				unset(static::$listeners[$event_name][2][$index]);
+				unset(static::$listeners[$eventName][1][$index]);
+				unset(static::$listeners[$eventName][2][$index]);
 
 				return true;
 			}
@@ -272,21 +243,21 @@
 		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 null $event_name
+	 * @param string|null $eventName
+	 *
+	 * @return void
 	 */
-	public static function removeAllListeners($event_name = null)
+	public static function removeAllListeners($eventName = null)
 	{
-		if (! is_null($event_name))
+		if (! is_null($eventName))
 		{
-			unset(static::$listeners[$event_name]);
+			unset(static::$listeners[$eventName]);
 		}
 		else
 		{
@@ -294,55 +265,49 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * 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 mixed
+	 * @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
+	 * @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 8dff43c..7e2e8df 100644
--- a/system/Exceptions/AlertError.php
+++ b/system/Exceptions/AlertError.php
@@ -1,10 +1,21 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use Error;
 
 /**
  * Error: Action must be taken immediately (system/db down, etc)
  */
-
-class AlertError extends \Error
+class AlertError extends Error
 {
-
 }
diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
index ddcb717..df37765 100644
--- a/system/Exceptions/CastException.php
+++ b/system/Exceptions/CastException.php
@@ -1,11 +1,22 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
 
 /**
  * Cast Exceptions.
  */
-
 class CastException extends CriticalError
 {
+	use DebugTraceableTrait;
 
 	/**
 	 * Error code
@@ -32,5 +43,4 @@
 				return new static(lang('Cast.jsonErrorUnknown'));
 		}
 	}
-
 }
diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php
index 964c521..3958111 100644
--- a/system/Exceptions/ConfigException.php
+++ b/system/Exceptions/ConfigException.php
@@ -1,11 +1,22 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
 
 /**
  * Exception for automatic logging.
  */
-
 class ConfigException extends CriticalError
 {
+	use DebugTraceableTrait;
 
 	/**
 	 * Error code
diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php
index 614bc14..c835572 100644
--- a/system/Exceptions/CriticalError.php
+++ b/system/Exceptions/CriticalError.php
@@ -1,10 +1,21 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
 
 /**
- * Error: Critical conditions, like component unavailble, etc.
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
-class CriticalError extends \Error
-{
+namespace CodeIgniter\Exceptions;
 
+use Error;
+
+/**
+ * Error: Critical conditions, like component unavailable, etc.
+ */
+class CriticalError extends Error
+{
 }
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
new file mode 100644
index 0000000..2a7bc58
--- /dev/null
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace CodeIgniter\Exceptions;
+
+use Throwable;
+
+/**
+ * This trait provides framework exceptions the ability to pinpoint
+ * accurately where the exception was raised rather than instantiated.
+ *
+ * This is used primarily for factory-instantiated exceptions.
+ */
+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
+	 */
+	public function __construct(string $message = '', int $code = 0, Throwable $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+
+		$trace = $this->getTrace()[0];
+
+		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 c0e3ae7..ee1ee25 100644
--- a/system/Exceptions/DownloadException.php
+++ b/system/Exceptions/DownloadException.php
@@ -1,13 +1,24 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use RuntimeException;
 
 /**
  * Class DownloadException
- *
- * @package CodeIgniter\Exceptions
  */
-
-class DownloadException extends \RuntimeException implements ExceptionInterface
+class DownloadException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
 
 	public static function forCannotSetFilePath(string $path)
 	{
diff --git a/system/Exceptions/EmergencyError.php b/system/Exceptions/EmergencyError.php
index 832f135..0ec9c5b 100644
--- a/system/Exceptions/EmergencyError.php
+++ b/system/Exceptions/EmergencyError.php
@@ -1,10 +1,21 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use Error;
 
 /**
  * Error: system is unusable
  */
-
-class EmergencyError extends \Error
+class EmergencyError extends Error
 {
-
 }
diff --git a/system/Exceptions/ExceptionInterface.php b/system/Exceptions/ExceptionInterface.php
index b36ebb0..75cf786 100644
--- a/system/Exceptions/ExceptionInterface.php
+++ b/system/Exceptions/ExceptionInterface.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
 
 /**
  * Provides a domain-level interface for broad capture
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index 41a3e95..9d47b38 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -1,16 +1,28 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use RuntimeException;
 
 /**
  * Class FrameworkException
  *
  * A collection of exceptions thrown by the framework
  * that can only be determined at run time.
- *
- * @package CodeIgniter\Exceptions
  */
-
-class FrameworkException extends \RuntimeException implements ExceptionInterface
+class FrameworkException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
+
 	public static function forEnabledZlibOutputCompression()
 	{
 		return new static(lang('Core.enabledZlibOutputCompression'));
@@ -35,4 +47,9 @@
 	{
 		return new static(lang('Core.noHandlers', [$class]));
 	}
+
+	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 2b577bf..f42a179 100644
--- a/system/Exceptions/ModelException.php
+++ b/system/Exceptions/ModelException.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
 
 /**
  * Model Exceptions.
diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
index d935cef..1ba5c6d 100644
--- a/system/Exceptions/PageNotFoundException.php
+++ b/system/Exceptions/PageNotFoundException.php
@@ -1,7 +1,22 @@
-<?php namespace CodeIgniter\Exceptions;
+<?php
 
-class PageNotFoundException extends \OutOfBoundsException implements ExceptionInterface
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+use OutOfBoundsException;
+
+class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
+
 	/**
 	 * Error code
 	 *
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index e8950ab..31f0db0 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -1,13 +1,26 @@
-<?php namespace CodeIgniter\Files\Exceptions;
+<?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
 
-class FileException extends \RuntimeException implements ExceptionInterface
+class FileException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
 
 	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 987bf52..a5b9776 100644
--- a/system/Files/Exceptions/FileNotFoundException.php
+++ b/system/Files/Exceptions/FileNotFoundException.php
@@ -1,9 +1,24 @@
-<?php namespace CodeIgniter\Files\Exceptions;
+<?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
 
-class FileNotFoundException extends \RuntimeException implements ExceptionInterface
+class FileNotFoundException extends RuntimeException implements ExceptionInterface
 {
+	use DebugTraceableTrait;
+
 	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 727665d..dbc99a0 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -1,63 +1,40 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files;
 
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use Config\Mimes;
 use SplFileInfo;
 
 /**
  * Wrapper for PHP's built-in SplFileInfo, with goodies.
- *
- * @package CodeIgniter\Files
  */
 class File extends SplFileInfo
 {
-
 	/**
 	 * The files size in bytes
 	 *
-	 * @var float
+	 * @var integer
 	 */
 	protected $size;
 
+	/**
+	 * Original MimeType
+	 *
+	 * @var null|string
+	 */
+	protected $originalMimeType = null;
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -90,12 +67,7 @@
 	 */
 	public function getSize()
 	{
-		if (is_null($this->size))
-		{
-			$this->size = parent::getSize();
-		}
-
-		return $this->size;
+		return $this->size ?? ($this->size = parent::getSize());
 	}
 
 	/**
@@ -128,7 +100,7 @@
 	 */
 	public function guessExtension(): ?string
 	{
-		return \Config\Mimes::guessExtensionFromType($this->getMimeType());
+		return Mimes::guessExtensionFromType($this->getMimeType());
 	}
 
 	//--------------------------------------------------------------------
@@ -138,7 +110,7 @@
 	 * the $_FILES array, but should use other methods to more accurately
 	 * determine the type of file, like finfo, or mime_content_type().
 	 *
-	 * @return string|null The media type we determined it to be.
+	 * @return string The media type we determined it to be.
 	 */
 	public function getMimeType(): string
 	{
@@ -150,7 +122,7 @@
 		}
 
 		$finfo    = finfo_open(FILEINFO_MIME_TYPE);
-		$mimeType = finfo_file($finfo, $this->getRealPath());
+		$mimeType = finfo_file($finfo, $this->getRealPath() ?: $this->__toString());
 		finfo_close($finfo);
 		return $mimeType;
 	}
@@ -179,7 +151,7 @@
 	 * @param string|null $name
 	 * @param boolean     $overwrite
 	 *
-	 * @return \CodeIgniter\Files\File
+	 * @return File
 	 */
 	public function move(string $targetPath, string $name = null, bool $overwrite = false)
 	{
@@ -187,7 +159,7 @@
 		$name        = $name ?? $this->getBaseName();
 		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
-		$oldName = empty($this->getRealPath()) ? $this->getPath() : $this->getRealPath();
+		$oldName = $this->getRealPath() ?: $this->__toString();
 
 		if (! @rename($oldName, $destination))
 		{
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index c79d191..4d767f7 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -1,48 +1,17 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- *
- * This filter is not intended to be used from the command line.
- *
- * @codeCoverageIgnore
+ * 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\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
@@ -57,7 +26,6 @@
  */
 class CSRF implements FilterInterface
 {
-
 	/**
 	 * Do whatever processing this filter needs to do.
 	 * By default it should not return anything during
@@ -68,11 +36,11 @@
 	 * sent back to the client, allowing for error pages,
 	 * redirects, etc.
 	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-	 * @param array|null                                         $arguments
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param array|null                       $arguments
 	 *
 	 * @return mixed
-	 * @throws \CodeIgniter\Security\Exceptions\SecurityException
+	 * @throws SecurityException
 	 */
 	public function before(RequestInterface $request, $arguments = null)
 	{
@@ -85,11 +53,11 @@
 
 		try
 		{
-			$security->CSRFVerify($request);
+			$security->verify($request);
 		}
 		catch (SecurityException $e)
 		{
-			if (config('App')->CSRFRedirect && ! $request->isAJAX())
+			if ($security->shouldRedirect() && ! $request->isAJAX())
 			{
 				return redirect()->back()->with('error', $e->getMessage());
 			}
@@ -103,9 +71,9 @@
 	/**
 	 * 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 RequestInterface|IncomingRequest             $request
+	 * @param ResponseInterface|\CodeIgniter\HTTP\Response $response
+	 * @param array|null                                   $arguments
 	 *
 	 * @return mixed
 	 */
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index 2c3a55c..c012b14 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -1,45 +1,19 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
 
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
@@ -48,12 +22,11 @@
  */
 class DebugToolbar implements FilterInterface
 {
-
 	/**
 	 * We don't need to do anything here.
 	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-	 * @param array|null                                         $arguments
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param array|null                       $arguments
 	 *
 	 * @return void
 	 */
@@ -67,9 +40,9 @@
 	 * If the debug flag is set (CI_DEBUG) then collect performance
 	 * and debug information and display it in a toolbar.
 	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-	 * @param ResponseInterface|\CodeIgniter\HTTP\Response       $response
-	 * @param array|null                                         $arguments
+	 * @param RequestInterface|IncomingRequest $request
+	 * @param ResponseInterface|Response       $response
+	 * @param array|null                       $arguments
 	 *
 	 * @return void
 	 */
diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php
index 43e93cf..22bbf20 100644
--- a/system/Filters/Exceptions/FilterException.php
+++ b/system/Filters/Exceptions/FilterException.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters\Exceptions;
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
index 48b682e..0a9440f 100644
--- a/system/Filters/FilterInterface.php
+++ b/system/Filters/FilterInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -47,7 +19,6 @@
  */
 interface FilterInterface
 {
-
 	/**
 	 * Do whatever processing this filter needs to do.
 	 * By default it should not return anything during
@@ -58,8 +29,8 @@
 	 * sent back to the client, allowing for error pages,
 	 * redirects, etc.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
-	 * @param null                               $arguments
+	 * @param RequestInterface $request
+	 * @param null             $arguments
 	 *
 	 * @return mixed
 	 */
@@ -73,9 +44,9 @@
 	 * to stop execution of other after filters, short of
 	 * throwing an Exception or Error.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface  $request
-	 * @param \CodeIgniter\HTTP\ResponseInterface $response
-	 * @param null                                $arguments
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param null              $arguments
 	 *
 	 * @return mixed
 	 */
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 37ba2df..ef74821 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -42,13 +14,15 @@
 use CodeIgniter\Filters\Exceptions\FilterException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use Config\Filters as FiltersConfig;
+use Config\Modules;
+use Config\Services;
 
 /**
  * Filters
  */
 class Filters
 {
-
 	/**
 	 * The processed filters that will
 	 * be used to check against.
@@ -61,9 +35,27 @@
 	];
 
 	/**
+	 * 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 filtersClass.
+	 *
+	 * @var array
+	 */
+	protected $argumentsClass = [];
+
+	/**
 	 * The original config file
 	 *
-	 * @var \Config\Filters
+	 * @var FiltersConfig
 	 */
 	protected $config;
 
@@ -96,20 +88,59 @@
 	 */
 	protected $arguments = [];
 
-	//--------------------------------------------------------------------
+	/**
+	 * Handle to the modules config.
+	 *
+	 * @var Modules
+	 */
+	protected $modules;
 
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Filters   $config
+	 * @param FiltersConfig     $config
 	 * @param RequestInterface  $request
 	 * @param ResponseInterface $response
+	 * @param Modules|null      $modules
 	 */
-	public function __construct($config, RequestInterface $request, ResponseInterface $response)
+	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;
+		}
 	}
 
 	/**
@@ -122,8 +153,6 @@
 		$this->response = &$response;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Runs through all of the filters for the specified
 	 * uri and position.
@@ -131,78 +160,57 @@
 	 * @param string $uri
 	 * @param string $position
 	 *
-	 * @return \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\ResponseInterface|mixed
-	 * @throws \CodeIgniter\Filters\Exceptions\FilterException
+	 * @return RequestInterface|ResponseInterface|mixed
+	 * @throws FilterException
 	 */
 	public function run(string $uri, string $position = 'before')
 	{
 		$this->initialize(strtolower($uri));
 
-		foreach ($this->filters[$position] as $alias => $rules)
+		foreach ($this->filtersClass[$position] as $className)
 		{
-			if (is_numeric($alias) && is_string($rules))
+			$class = new $className();
+
+			if (! $class instanceof FilterInterface)
 			{
-				$alias = $rules;
+				throw FilterException::forIncorrectInterface(get_class($class));
 			}
 
-			if (! array_key_exists($alias, $this->config->aliases))
+			if ($position === 'before')
 			{
-				throw FilterException::forNoAlias($alias);
-			}
+				$result = $class->before($this->request, $this->argumentsClass[$className] ?? null);
 
-			if (is_array($this->config->aliases[$alias]))
-			{
-				$classNames = $this->config->aliases[$alias];
-			}
-			else
-			{
-				$classNames = [$this->config->aliases[$alias]];
-			}
-
-			foreach ($classNames as $className)
-			{
-				$class = new $className();
-
-				if (! $class instanceof FilterInterface)
+				if ($result instanceof RequestInterface)
 				{
-					throw FilterException::forIncorrectInterface(get_class($class));
+					$this->request = $result;
+					continue;
 				}
 
-				if ($position === 'before')
+				// If the response object was sent back,
+				// then send it and quit.
+				if ($result instanceof ResponseInterface)
 				{
-					$result = $class->before($this->request, $this->arguments[$alias] ?? 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;
-					}
-
+					// short circuit - bypass any other filters
 					return $result;
 				}
-				elseif ($position === 'after')
+				// Ignore an empty result
+				if (empty($result))
 				{
-					$result = $class->after($this->request, $this->response, $this->arguments[$alias] ?? null);
+					continue;
+				}
 
-					if ($result instanceof ResponseInterface)
-					{
-						$this->response = $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;
 				}
 			}
 		}
@@ -210,8 +218,6 @@
 		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
@@ -236,17 +242,33 @@
 			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;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the processed filters array.
 	 *
@@ -258,6 +280,16 @@
 	}
 
 	/**
+	 * 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.
@@ -290,8 +322,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Ensures that a specific filter is on and enabled for the current request.
 	 *
@@ -302,7 +332,7 @@
 	 * @param string $name
 	 * @param string $when
 	 *
-	 * @return \CodeIgniter\Filters\Filters
+	 * @return Filters
 	 */
 	public function enableFilter(string $name, string $when = 'before')
 	{
@@ -324,16 +354,22 @@
 			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->filters[$when][]    = $name;
+			$this->filtersClass[$when] = array_merge($this->filtersClass[$when], $classNames);
 		}
 
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the arguments for a specified key, or all.
 	 *
@@ -347,7 +383,6 @@
 	}
 
 	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
 	// Processors
 	//--------------------------------------------------------------------
 
@@ -408,10 +443,8 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Add any method-specific flters to the mix.
+	 * Add any method-specific filters to the mix.
 	 *
 	 * @return void
 	 */
@@ -432,8 +465,6 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Add any applicable configured filters to the mix.
 	 *
@@ -475,6 +506,44 @@
 	}
 
 	/**
+	 * 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
@@ -512,5 +581,4 @@
 
 		return false;
 	}
-
 }
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index 5f2d83c..b6f0ef1 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
@@ -49,13 +21,12 @@
  */
 class Honeypot implements FilterInterface
 {
-
 	/**
 	 * Checks if Honeypot field is empty; if not
 	 * then the requester is a bot
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
-	 * @param array|null                         $arguments
+	 * @param RequestInterface $request
+	 * @param array|null       $arguments
 	 *
 	 * @return void
 	 */
@@ -71,9 +42,9 @@
 	/**
 	 * Attach a honeypot to the current response.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface  $request
-	 * @param \CodeIgniter\HTTP\ResponseInterface $response
-	 * @param array|null                          $arguments
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param array|null        $arguments
 	 *
 	 * @return void
 	 */
@@ -82,5 +53,4 @@
 		$honeypot = Services::honeypot(new \Config\Honeypot());
 		$honeypot->attachHoneypot($response);
 	}
-
 }
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index 4529fd0..fbe3abf 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -1,16 +1,70 @@
-<?php namespace CodeIgniter\Format\Exceptions;
+<?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format\Exceptions;
+
+use CodeIgniter\Exceptions\DebugTraceableTrait;
 use CodeIgniter\Exceptions\ExceptionInterface;
+use RuntimeException;
 
-class FormatException extends \RuntimeException implements ExceptionInterface
+/**
+ * FormatException
+ */
+class FormatException extends RuntimeException implements ExceptionInterface
 {
+	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 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]));
 	}
 
 	/**
-	 * This will never be thrown in travis-ci
+	 * 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 on XMLFormatter when the `simplexml` extension
+	 * is not installed.
+	 *
+	 * @return FormatException
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -18,5 +72,4 @@
 	{
 		return new static(lang('Format.missingExtension'));
 	}
-
 }
diff --git a/system/Format/Format.php b/system/Format/Format.php
new file mode 100644
index 0000000..6f5c0e4
--- /dev/null
+++ b/system/Format/Format.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Format;
+
+use CodeIgniter\Format\Exceptions\FormatException;
+use Config\Format as FormatConfig;
+
+/**
+ * The Format class is a convenient place to create Formatters.
+ */
+class Format
+{
+	/**
+	 * Configuration instance
+	 *
+	 * @var FormatConfig
+	 */
+	protected $config;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param FormatConfig $config
+	 */
+	public function __construct(FormatConfig $config)
+	{
+		$this->config = $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);
+		}
+
+		$className = $this->config->formatters[$mime];
+
+		if (! class_exists($className))
+		{
+			throw FormatException::forInvalidFormatter($className);
+		}
+
+		$class = new $className();
+
+		if (! $class instanceof FormatterInterface)
+		{
+			throw FormatException::forInvalidFormatter($className);
+		}
+
+		return $class;
+	}
+}
diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php
index 17bc693..6b4a119 100644
--- a/system/Format/FormatterInterface.php
+++ b/system/Format/FormatterInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -44,7 +16,6 @@
  */
 interface FormatterInterface
 {
-
 	/**
 	 * Takes the given data and formats it.
 	 *
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
index 0dc0526..aefc607 100644
--- a/system/Format/JSONFormatter.php
+++ b/system/Format/JSONFormatter.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
@@ -47,18 +19,17 @@
  */
 class JSONFormatter implements FormatterInterface
 {
-
 	/**
 	 * Takes the given data and formats it.
 	 *
-	 * @param $data
+	 * @param mixed $data
 	 *
 	 * @return string|boolean (JSON string | false)
 	 */
 	public function format($data)
 	{
-		$config  = new Format();
-		
+		$config = new Format();
+
 		$options = $config->formatterOptions['application/json'] ?? JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
 		$options = $options | JSON_PARTIAL_OUTPUT_ON_ERROR;
 
@@ -66,7 +37,7 @@
 
 		$result = json_encode($data, $options, 512);
 
-		if (! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION]))
+		if (! in_array(json_last_error(), [JSON_ERROR_NONE, JSON_ERROR_RECURSION], true))
 		{
 			throw FormatException::forInvalidJSON(json_last_error_msg());
 		}
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index d8dd248..1e46f6a 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -1,64 +1,36 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
 use Config\Format;
+use SimpleXMLElement;
 
 /**
  * XML data formatter
  */
 class XMLFormatter implements FormatterInterface
 {
-
 	/**
 	 * Takes the given data and formats it.
 	 *
-	 * @param $data
+	 * @param mixed $data
 	 *
 	 * @return string|boolean (XML string | false)
 	 */
 	public function format($data)
 	{
-		$config  = new Format();
-		
+		$config = new Format();
+
 		// SimpleXML is installed but default
 		// but best to check, and then provide a fallback.
 		if (! extension_loaded('simplexml'))
@@ -70,15 +42,13 @@
 		}
 
 		$options = $config->formatterOptions['application/xml'] ?? 0;
-		$output = new \SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
+		$output  = new SimpleXMLElement('<?xml version="1.0"?><response></response>', $options);
 
-		$this->arrayToXML((array)$data, $output);
+		$this->arrayToXML((array) $data, $output);
 
 		return $output->asXML();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * A recursive method to convert an array into a valid XML string.
 	 *
@@ -86,8 +56,8 @@
 	 *
 	 * @see http://www.codexworld.com/convert-array-to-xml-in-php/
 	 *
-	 * @param array             $data
-	 * @param \SimpleXMLElement $output
+	 * @param array            $data
+	 * @param SimpleXMLElement $output
 	 */
 	protected function arrayToXML(array $data, &$output)
 	{
@@ -95,25 +65,41 @@
 		{
 			if (is_array($value))
 			{
-				if (is_numeric($key))
-				{
-					$key = "item{$key}";
-				}
-
+				$key     = $this->normalizeXMLTag($key);
 				$subnode = $output->addChild("$key");
 				$this->arrayToXML($value, $subnode);
 			}
 			else
 			{
-				if (is_numeric($key))
-				{
-					$key = "item{$key}";
-				}
-
+				$key = $this->normalizeXMLTag($key);
 				$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}';
+
+		$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
+	}
 }
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index f5b624d..0cf3bce 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -1,44 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
 use Config\App;
+use RuntimeException;
 
 /**
  * Class CLIRequest
@@ -52,12 +26,9 @@
  * originally made available under.
  *
  * http://fuelphp.com
- *
- * @package CodeIgniter\HTTP
  */
 class CLIRequest extends Request
 {
-
 	/**
 	 * Stores the segments of our cli "URI" command.
 	 *
@@ -79,8 +50,6 @@
 	 */
 	protected $method = 'cli';
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
@@ -88,6 +57,11 @@
 	 */
 	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
@@ -96,8 +70,6 @@
 		$this->parseCommand();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the "path" of the request script so that it can be used
 	 * in routing to the appropriate controller/method.
@@ -120,8 +92,6 @@
 		return empty($path) ? '' : $path;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns an associative array of all CLI options found, with
 	 * their values.
@@ -133,8 +103,6 @@
 		return $this->options;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the path segments.
 	 *
@@ -145,8 +113,6 @@
 		return $this->segments;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the value for a single CLI option that was passed in.
 	 *
@@ -159,8 +125,6 @@
 		return $this->options[$key] ?? null;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the options as a string, suitable for passing along on
 	 * the CLI to other commands.
@@ -173,9 +137,11 @@
 	 *
 	 *      getOptionString() = '-foo bar -baz "queue some stuff"'
 	 *
+	 * @param boolean $useLongOpts
+	 *
 	 * @return string
 	 */
-	public function getOptionString(): string
+	public function getOptionString(bool $useLongOpts = false): string
 	{
 		if (empty($this->options))
 		{
@@ -186,14 +152,25 @@
 
 		foreach ($this->options as $name => $value)
 		{
-			// If there's a space, we need to group
-			// so it will pass correctly.
-			if (strpos($value, ' ') !== false)
+			if ($useLongOpts && mb_strlen($name) > 1)
 			{
-				$value = '"' . $value . '"';
+				$out .= "--{$name} ";
+			}
+			else
+			{
+				$out .= "-{$name} ";
 			}
 
-			$out .= "-{$name} $value ";
+			// 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);
@@ -210,40 +187,34 @@
 	 */
 	protected function parseCommand()
 	{
-		// Since we're building the options ourselves,
-		// we stop adding it to the segments array once
-		// we have found the first dash.
-		$options_found = false;
+		$args = $this->getServer('argv');
+		array_shift($args); // Scrap index.php
 
-		$argc = $this->getServer('argc', FILTER_SANITIZE_NUMBER_INT);
-		$argv = $this->getServer('argv');
+		$optionValue = false;
 
-		// We start at 1 since we never want to include index.php
-		for ($i = 1; $i < $argc; $i ++)
+		foreach ($args as $i => $arg)
 		{
-			// If there's no '-' at the beginning of the argument
-			// then add it to our segments.
-			if (! $options_found && strpos($argv[$i], '-') !== 0)
+			if (mb_strpos($arg, '-') !== 0)
 			{
-				$this->segments[] = filter_var($argv[$i], FILTER_SANITIZE_STRING);
+				if ($optionValue)
+				{
+					$optionValue = false;
+				}
+				else
+				{
+					$this->segments[] = filter_var($arg, FILTER_SANITIZE_STRING);
+				}
+
 				continue;
 			}
 
-			$options_found = true;
-
-			if (strpos($argv[$i], '-') !== 0)
-			{
-				continue;
-			}
-
-			$arg   = filter_var(str_replace('-', '', $argv[$i]), FILTER_SANITIZE_STRING);
+			$arg   = filter_var(ltrim($arg, '-'), FILTER_SANITIZE_STRING);
 			$value = null;
 
-			// If the next item starts with a dash it's a value
-			if (isset($argv[$i + 1]) && strpos($argv[$i + 1], '-') !== 0)
+			if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0)
 			{
-				$value = filter_var($argv[$i + 1], FILTER_SANITIZE_STRING);
-				$i ++;
+				$value       = filter_var($args[$i + 1], FILTER_SANITIZE_STRING);
+				$optionValue = true;
 			}
 
 			$this->options[$arg] = $value;
@@ -251,4 +222,16 @@
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Determines if this request was made from the command line (CLI).
+	 *
+	 * @return boolean
+	 */
+	public function isCLI(): bool
+	{
+		return is_cli();
+	}
+
+	//--------------------------------------------------------------------
 }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3ee990a..dbfacbe 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -1,63 +1,32 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
+use InvalidArgumentException;
 
 /**
  * Class OutgoingRequest
  *
  * A lightweight HTTP client for sending synchronous HTTP requests
  * via cURL.
- *
- * @package CodeIgniter\HTTP
  */
 class CURLRequest extends Request
 {
-
 	/**
 	 * The response object associated with this request
 	 *
-	 * @var \CodeIgniter\HTTP\Response
+	 * @var ResponseInterface|null
 	 */
 	protected $response;
 
@@ -130,7 +99,7 @@
 		parent::__construct($config);
 
 		$this->response = $response;
-		$this->baseURI  = $uri;
+		$this->baseURI  = $uri->useRawQueryString();
 
 		$this->parseOptions($options);
 	}
@@ -141,11 +110,11 @@
 	 * 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 $method
+	 * @param string $method
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function request($method, string $url, array $options = []): ResponseInterface
 	{
@@ -168,7 +137,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function get(string $url, array $options = []): ResponseInterface
 	{
@@ -183,7 +152,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function delete(string $url, array $options = []): ResponseInterface
 	{
@@ -213,7 +182,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function options(string $url, array $options = []): ResponseInterface
 	{
@@ -228,7 +197,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function patch(string $url, array $options = []): ResponseInterface
 	{
@@ -243,7 +212,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function post(string $url, array $options = []): ResponseInterface
 	{
@@ -258,7 +227,7 @@
 	 * @param string $url
 	 * @param array  $options
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function put(string $url, array $options = []): ResponseInterface
 	{
@@ -413,12 +382,12 @@
 	 * @param string $method
 	 * @param string $url
 	 *
-	 * @return \CodeIgniter\HTTP\ResponseInterface
+	 * @return ResponseInterface
 	 */
 	public function send(string $method, string $url)
 	{
 		// Reset our curl options so we're on a fresh slate.
-		$curl_options = [];
+		$curlOptions = [];
 
 		if (! empty($this->config['query']) && is_array($this->config['query']))
 		{
@@ -429,32 +398,41 @@
 			unset($this->config['query']);
 		}
 
-		$curl_options[CURLOPT_URL]            = $url;
-		$curl_options[CURLOPT_RETURNTRANSFER] = true;
-		$curl_options[CURLOPT_HEADER]         = true;
-		$curl_options[CURLOPT_FRESH_CONNECT]  = true;
+		$curlOptions[CURLOPT_URL]            = $url;
+		$curlOptions[CURLOPT_RETURNTRANSFER] = true;
+		$curlOptions[CURLOPT_HEADER]         = true;
+		$curlOptions[CURLOPT_FRESH_CONNECT]  = true;
 		// Disable @file uploads in post data.
-		$curl_options[CURLOPT_SAFE_UPLOAD] = true;
+		$curlOptions[CURLOPT_SAFE_UPLOAD] = true;
 
-		$curl_options = $this->setCURLOptions($curl_options, $this->config);
-		$curl_options = $this->applyMethod($method, $curl_options);
-		$curl_options = $this->applyRequestHeaders($curl_options);
+		$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);
+			sleep($this->delay); // @phpstan-ignore-line
 		}
 
-		$output = $this->sendRequest($curl_options);
+		$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, "\r\n\r\n") + 4);
+			$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, "\r\n\r\n");
+		$break = strpos($output, $breakString);
 
 		if ($break !== false)
 		{
@@ -481,11 +459,11 @@
 	 * Takes all headers current part of this request and adds them
 	 * to the cURL request.
 	 *
-	 * @param array $curl_options
+	 * @param array $curlOptions
 	 *
 	 * @return array
 	 */
-	protected function applyRequestHeaders(array $curl_options = []): array
+	protected function applyRequestHeaders(array $curlOptions = []): array
 	{
 		if (empty($this->headers))
 		{
@@ -495,11 +473,11 @@
 			$this->removeHeader('Accept-Encoding');
 		}
 
-		$headers = $this->getHeaders();
+		$headers = $this->headers();
 
 		if (empty($headers))
 		{
-			return $curl_options;
+			return $curlOptions;
 		}
 
 		$set = [];
@@ -509,9 +487,9 @@
 			$set[] = $name . ': ' . $this->getHeaderLine($name);
 		}
 
-		$curl_options[CURLOPT_HTTPHEADER] = $set;
+		$curlOptions[CURLOPT_HTTPHEADER] = $set;
 
-		return $curl_options;
+		return $curlOptions;
 	}
 
 	//--------------------------------------------------------------------
@@ -520,39 +498,39 @@
 	 * Apply method
 	 *
 	 * @param string $method
-	 * @param array  $curl_options
+	 * @param array  $curlOptions
 	 *
 	 * @return array
 	 */
-	protected function applyMethod(string $method, array $curl_options): array
+	protected function applyMethod(string $method, array $curlOptions): array
 	{
 		$method = strtoupper($method);
 
-		$this->method                        = $method;
-		$curl_options[CURLOPT_CUSTOMREQUEST] = $method;
+		$this->method                       = $method;
+		$curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
 
 		$size = strlen($this->body);
 
 		// Have content?
-		if ($size === null || $size > 0)
+		if ($size > 0)
 		{
-			return $this->applyBody($curl_options);
+			return $this->applyBody($curlOptions);
 		}
 
 		if ($method === 'PUT' || $method === 'POST')
 		{
 			// See http://tools.ietf.org/html/rfc7230#section-3.3.2
-			if (is_null($this->getHeader('content-length')) && ! isset($this->config['multipart']))
+			if (is_null($this->header('content-length')) && ! isset($this->config['multipart']))
 			{
 				$this->setHeader('Content-Length', '0');
 			}
 		}
-		else if ($method === 'HEAD')
+		elseif ($method === 'HEAD')
 		{
-			$curl_options[CURLOPT_NOBODY] = 1;
+			$curlOptions[CURLOPT_NOBODY] = 1;
 		}
 
-		return $curl_options;
+		return $curlOptions;
 	}
 
 	//--------------------------------------------------------------------
@@ -560,18 +538,18 @@
 	/**
 	 * Apply body
 	 *
-	 * @param array $curl_options
+	 * @param array $curlOptions
 	 *
 	 * @return array
 	 */
-	protected function applyBody(array $curl_options = []): array
+	protected function applyBody(array $curlOptions = []): array
 	{
 		if (! empty($this->body))
 		{
-			$curl_options[CURLOPT_POSTFIELDS] = (string) $this->getBody();
+			$curlOptions[CURLOPT_POSTFIELDS] = (string) $this->getBody();
 		}
 
-		return $curl_options;
+		return $curlOptions;
 	}
 
 	//--------------------------------------------------------------------
@@ -593,9 +571,9 @@
 
 				$this->response->setHeader($title, $value);
 			}
-			else if (strpos($header, 'HTTP') === 0)
+			elseif (strpos($header, 'HTTP') === 0)
 			{
-				preg_match('#^HTTP\/([12]\.[01]) ([0-9]+) (.+)#', $header, $matches);
+				preg_match('#^HTTP\/([12](?:\.[01])?) ([0-9]+) (.+)#', $header, $matches);
 
 				if (isset($matches[1]))
 				{
@@ -615,25 +593,25 @@
 	/**
 	 * Set CURL options
 	 *
-	 * @param  array $curl_options
+	 * @param  array $curlOptions
 	 * @param  array $config
 	 * @return array
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 */
-	protected function setCURLOptions(array $curl_options = [], array $config = [])
+	protected function setCURLOptions(array $curlOptions = [], array $config = [])
 	{
 		// Auth Headers
 		if (! empty($config['auth']))
 		{
-			$curl_options[CURLOPT_USERPWD] = $config['auth'][0] . ':' . $config['auth'][1];
+			$curlOptions[CURLOPT_USERPWD] = $config['auth'][0] . ':' . $config['auth'][1];
 
 			if (! empty($config['auth'][2]) && strtolower($config['auth'][2]) === 'digest')
 			{
-				$curl_options[CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
+				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_DIGEST;
 			}
 			else
 			{
-				$curl_options[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
+				$curlOptions[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
 			}
 		}
 
@@ -644,8 +622,8 @@
 
 			if (is_array($cert))
 			{
-				$curl_options[CURLOPT_SSLCERTPASSWD] = $cert[1];
-				$cert                                = $cert[0];
+				$curlOptions[CURLOPT_SSLCERTPASSWD] = $cert[1];
+				$cert                               = $cert[0];
 			}
 
 			if (! is_file($cert))
@@ -653,7 +631,7 @@
 				throw HTTPException::forSSLCertNotFound($cert);
 			}
 
-			$curl_options[CURLOPT_SSLCERT] = $cert;
+			$curlOptions[CURLOPT_SSLCERT] = $cert;
 		}
 
 		// SSL Verification
@@ -661,27 +639,27 @@
 		{
 			if (is_string($config['verify']))
 			{
-				$file = realpath($config['ssl_key']);
+				$file = realpath($config['ssl_key']) ?: $config['ssl_key'];
 
-				if (! $file)
+				if (! is_file($file))
 				{
 					throw HTTPException::forInvalidSSLKey($config['ssl_key']);
 				}
 
-				$curl_options[CURLOPT_CAINFO]         = $file;
-				$curl_options[CURLOPT_SSL_VERIFYPEER] = 1;
+				$curlOptions[CURLOPT_CAINFO]         = $file;
+				$curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
 			}
-			else if (is_bool($config['verify']))
+			elseif (is_bool($config['verify']))
 			{
-				$curl_options[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
+				$curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
 			}
 		}
 
 		// Debug
 		if ($config['debug'])
 		{
-			$curl_options[CURLOPT_VERBOSE] = 1;
-			$curl_options[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://stderr', 'w');
+			$curlOptions[CURLOPT_VERBOSE] = 1;
+			$curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://stderr', 'w');
 		}
 
 		// Decode Content
@@ -691,12 +669,12 @@
 
 			if ($accept)
 			{
-				$curl_options[CURLOPT_ENCODING] = $accept;
+				$curlOptions[CURLOPT_ENCODING] = $accept;
 			}
 			else
 			{
-				$curl_options[CURLOPT_ENCODING]   = '';
-				$curl_options[CURLOPT_HTTPHEADER] = 'Accept-Encoding';
+				$curlOptions[CURLOPT_ENCODING]   = '';
+				$curlOptions[CURLOPT_HTTPHEADER] = 'Accept-Encoding';
 			}
 		}
 
@@ -712,16 +690,16 @@
 
 			if ($config['allow_redirects'] === false)
 			{
-				$curl_options[CURLOPT_FOLLOWLOCATION] = 0;
+				$curlOptions[CURLOPT_FOLLOWLOCATION] = 0;
 			}
 			else
 			{
-				$curl_options[CURLOPT_FOLLOWLOCATION] = 1;
-				$curl_options[CURLOPT_MAXREDIRS]      = $settings['max'];
+				$curlOptions[CURLOPT_FOLLOWLOCATION] = 1;
+				$curlOptions[CURLOPT_MAXREDIRS]      = $settings['max'];
 
 				if ($settings['strict'] === true)
 				{
-					$curl_options[CURLOPT_POSTREDIR] = 1 | 2 | 4;
+					$curlOptions[CURLOPT_POSTREDIR] = 1 | 2 | 4;
 				}
 
 				$protocols = 0;
@@ -730,21 +708,21 @@
 					$protocols += constant('CURLPROTO_' . strtoupper($proto));
 				}
 
-				$curl_options[CURLOPT_REDIR_PROTOCOLS] = $protocols;
+				$curlOptions[CURLOPT_REDIR_PROTOCOLS] = $protocols;
 			}
 		}
 
 		// Timeout
-		$curl_options[CURLOPT_TIMEOUT_MS] = (float) $config['timeout'] * 1000;
+		$curlOptions[CURLOPT_TIMEOUT_MS] = (float) $config['timeout'] * 1000;
 
 		// Connection Timeout
-		$curl_options[CURLOPT_CONNECTTIMEOUT_MS] = (float) $config['connect_timeout'] * 1000;
+		$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']);
-			$curl_options[CURLOPT_POSTFIELDS] = $postFields;
+			$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.
@@ -756,11 +734,11 @@
 		if (! empty($config['multipart']) && is_array($config['multipart']))
 		{
 			// setting the POSTFIELDS option automatically sets multipart
-			$curl_options[CURLOPT_POSTFIELDS] = $config['multipart'];
+			$curlOptions[CURLOPT_POSTFIELDS] = $config['multipart'];
 		}
 
 		// HTTP Errors
-		$curl_options[CURLOPT_FAILONERROR] = array_key_exists('http_errors', $config) ? (bool) $config['http_errors'] : true;
+		$curlOptions[CURLOPT_FAILONERROR] = array_key_exists('http_errors', $config) ? (bool) $config['http_errors'] : true;
 
 		// JSON
 		if (isset($config['json']))
@@ -777,22 +755,28 @@
 		{
 			if ($config['version'] === 1.0)
 			{
-				$curl_options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
 			}
-			else if ($config['version'] === 1.1)
+			elseif ($config['version'] === 1.1)
 			{
-				$curl_options[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
+				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
 			}
 		}
 
 		// Cookie
 		if (isset($config['cookie']))
 		{
-			$curl_options[CURLOPT_COOKIEJAR]  = $config['cookie'];
-			$curl_options[CURLOPT_COOKIEFILE] = $config['cookie'];
+			$curlOptions[CURLOPT_COOKIEJAR]  = $config['cookie'];
+			$curlOptions[CURLOPT_COOKIEFILE] = $config['cookie'];
 		}
 
-		return $curl_options;
+		// User Agent
+		if (isset($config['user_agent']))
+		{
+			$curlOptions[CURLOPT_USERAGENT] = $config['user_agent'];
+		}
+
+		return $curlOptions;
 	}
 
 	//--------------------------------------------------------------------
@@ -803,22 +787,22 @@
 	 *
 	 * @codeCoverageIgnore
 	 *
-	 * @param array $curl_options
+	 * @param array $curlOptions
 	 *
 	 * @return string
 	 */
-	protected function sendRequest(array $curl_options = []): string
+	protected function sendRequest(array $curlOptions = []): string
 	{
 		$ch = curl_init();
 
-		curl_setopt_array($ch, $curl_options);
+		curl_setopt_array($ch, $curlOptions);
 
 		// Send the request and wait for a response.
 		$output = curl_exec($ch);
 
 		if ($output === false)
 		{
-			throw HTTPException::forCurlError(curl_errno($ch), curl_error($ch));
+			throw HTTPException::forCurlError((string) curl_errno($ch), curl_error($ch));
 		}
 
 		curl_close($ch);
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 031cf3e..9ebc08d 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -1,59 +1,29 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
+use Config\ContentSecurityPolicy as ContentSecurityPolicyConfig;
+
 /**
- * Class ContentSecurityPolicy
- *
  * Provides tools for working with the Content-Security-Policy header
  * to help defeat XSS attacks.
  *
- * @see     http://www.w3.org/TR/CSP/
- * @see     http://www.html5rocks.com/en/tutorials/security/content-security-policy/
- * @see     http://content-security-policy.com/
- * @see     https://www.owasp.org/index.php/Content_Security_Policy
- * @package CodeIgniter\HTTP
+ * @see http://www.w3.org/TR/CSP/
+ * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
+ * @see http://content-security-policy.com/
+ * @see https://www.owasp.org/index.php/Content_Security_Policy
  */
 class ContentSecurityPolicy
 {
-
 	/**
 	 * Used for security enforcement
 	 *
@@ -215,44 +185,39 @@
 	 */
 	protected $reportOnlyHeaders = [];
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * ContentSecurityPolicy constructor.
+	 * Constructor.
 	 *
 	 * Stores our default values from the Config file.
 	 *
-	 * @param \Config\ContentSecurityPolicy $config
+	 * @param ContentSecurityPolicyConfig $config
 	 */
-	public function __construct(\Config\ContentSecurityPolicy $config)
+	public function __construct(ContentSecurityPolicyConfig $config)
 	{
-		foreach ($config as $setting => $value)
+		foreach (get_object_vars($config) as $setting => $value)
 		{
-			if (isset($this->{$setting}))
+			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
@@ -260,7 +225,7 @@
 	 * determine what errors need to be addressed before you turn on
 	 * all filtering.
 	 *
-	 * @param boolean|true $value
+	 * @param boolean $value
 	 *
 	 * @return $this
 	 */
@@ -271,8 +236,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new base_uri value. Can be either a URI class or a simple string.
 	 *
@@ -292,8 +255,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for a form's action. Can be either
 	 * a URI class or a simple string.
@@ -316,8 +277,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for a form's action. Can be either
 	 * a URI class or a simple string.
@@ -339,8 +298,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for a form's action. Can be either
 	 * a URI class or a simple string.
@@ -362,8 +319,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for a form's action. Can be either
 	 * a URI class or a simple string.
@@ -384,8 +339,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for a form's action. Can be either
 	 * a URI class or a simple string.
@@ -404,8 +357,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new resource that should allow embedding the resource using
 	 * <frame>, <iframe>, <object>, <embed>, or <applet>
@@ -424,8 +375,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for valid image sources. Can be either
 	 * a URI class or a simple string.
@@ -444,8 +393,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for valid video and audio. Can be either
 	 * a URI class or a simple string.
@@ -464,8 +411,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for manifest sources. Can be either
 	 * a URI class or simple string.
@@ -484,8 +429,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for Flash and other plugin sources. Can be either
 	 * a URI class or a simple string.
@@ -504,8 +447,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Limits the types of plugins that can be used. Can be either
 	 * a URI class or a simple string.
@@ -524,8 +465,6 @@
 		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.
@@ -543,8 +482,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * specifies an HTML sandbox policy that the user agent applies to
 	 * the protected resource.
@@ -562,8 +499,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for javascript file sources. Can be either
 	 * a URI class or a simple string.
@@ -582,8 +517,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Adds a new valid endpoint for CSS file sources. Can be either
 	 * a URI class or a simple string.
@@ -602,8 +535,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets whether the user agents should rewrite URL schemes, changing
 	 * HTTP to HTTPS.
@@ -619,9 +550,9 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
+	//-------------------------------------------------------------------------
 	// Utility
-	//--------------------------------------------------------------------
+	//-------------------------------------------------------------------------
 
 	/**
 	 * DRY method to add an string or array to a class property.
@@ -629,6 +560,8 @@
 	 * @param string|array $options
 	 * @param string       $target
 	 * @param boolean|null $explicitReporting
+	 *
+	 * @return void
 	 */
 	protected function addOption($options, string $target, bool $explicitReporting = null)
 	{
@@ -651,14 +584,14 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * 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|\CodeIgniter\HTTP\Response $response
+	 * @param ResponseInterface $response
+	 *
+	 * @return void
 	 */
 	protected function generateNonces(ResponseInterface &$response)
 	{
@@ -673,48 +606,49 @@
 		{
 			$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));
+		$body = preg_replace_callback('/{csp-style-nonce}/', function ($matches) {
+			$nonce = bin2hex(random_bytes(12));
 
-					$this->styleSrc[] = 'nonce-' . $nonce;
+			$this->styleSrc[] = 'nonce-' . $nonce;
 
-					return "nonce=\"{$nonce}\"";
-				}, $body
-		);
+			return "nonce=\"{$nonce}\"";
+		}, $body);
 
 		// Replace script placeholders with nonces
-		$body = preg_replace_callback(
-				'/{csp-script-nonce}/', function ($matches) {
-					$nonce = bin2hex(random_bytes(12));
+		$body = preg_replace_callback('/{csp-script-nonce}/', function ($matches) {
+			$nonce = bin2hex(random_bytes(12));
 
-					$this->scriptSrc[] = 'nonce-' . $nonce;
+			$this->scriptSrc[] = 'nonce-' . $nonce;
 
-					return "nonce=\"{$nonce}\"";
-				}, $body
-		);
+			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|\CodeIgniter\HTTP\Response $response
+	 * @param ResponseInterface $response
+	 *
+	 * @return void
 	 */
 	protected function buildHeaders(ResponseInterface &$response)
 	{
-		// Ensure both headers are available and arrays...
+		/**
+		 * Ensure both headers are available and arrays...
+		 *
+		 * @var Response $response
+		 */
 		$response->setHeader('Content-Security-Policy', []);
 		$response->setHeader('Content-Security-Policy-Report-Only', []);
 
@@ -742,6 +676,7 @@
 		{
 			$this->baseURI = 'self';
 		}
+
 		if (empty($this->defaultSrc))
 		{
 			$this->defaultSrc = 'self';
@@ -749,7 +684,6 @@
 
 		foreach ($directives as $name => $property)
 		{
-			// base_uri
 			if (! empty($this->{$property}))
 			{
 				$this->addToHeader($name, $this->{$property});
@@ -762,10 +696,12 @@
 		if (! empty($this->tempHeaders))
 		{
 			$header = '';
+
 			foreach ($this->tempHeaders as $name => $value)
 			{
 				$header .= " {$name} {$value};";
 			}
+
 			// add token only if needed
 			if ($this->upgradeInsecureRequests)
 			{
@@ -778,10 +714,12 @@
 		if (! empty($this->reportOnlyHeaders))
 		{
 			$header = '';
+
 			foreach ($this->reportOnlyHeaders as $name => $value)
 			{
 				$header .= " {$name} {$value};";
 			}
+
 			$response->appendHeader('Content-Security-Policy-Report-Only', $header);
 		}
 
@@ -789,8 +727,6 @@
 		$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
@@ -798,6 +734,8 @@
 	 *
 	 * @param string            $name
 	 * @param array|string|null $values
+	 *
+	 * @return void
 	 */
 	protected function addToHeader(string $name, $values = null)
 	{
@@ -819,7 +757,7 @@
 
 			if ($reportOnly === true)
 			{
-				$reportSources[] = in_array($value, $this->validSources) ? "'{$value}'" : $value;
+				$reportSources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
 			}
 			else
 			{
@@ -829,7 +767,7 @@
 				}
 				else
 				{
-					$sources[] = in_array($value, $this->validSources) ? "'{$value}'" : $value;
+					$sources[] = in_array($value, $this->validSources, true) ? "'{$value}'" : $value;
 				}
 			}
 		}
@@ -844,6 +782,4 @@
 			$this->reportOnlyHeaders[$name] = implode(' ', $reportSources);
 		}
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index 15b9a7f..b2df5f7 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -42,11 +14,13 @@
 use CodeIgniter\Exceptions\DownloadException;
 use CodeIgniter\Files\File;
 use Config\Mimes;
+use DateTime;
+use DateTimeZone;
 
 /**
  * HTTP response when a download is requested.
  */
-class DownloadResponse extends Message implements ResponseInterface
+class DownloadResponse extends Response
 {
 	/**
 	 * Download file name
@@ -58,7 +32,7 @@
 	/**
 	 * Download for file
 	 *
-	 * @var File
+	 * @var File|null
 	 */
 	private $file;
 
@@ -72,18 +46,11 @@
 	/**
 	 * Download for binary
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	private $binary;
 
 	/**
-	 * Download reason
-	 *
-	 * @var string
-	 */
-	private $reason = 'OK';
-
-	/**
 	 * Download charset
 	 *
 	 * @var string
@@ -91,11 +58,18 @@
 	private $charset = 'UTF-8';
 
 	/**
-	 * pretend
+	 * Download reason
 	 *
-	 * @var boolean
+	 * @var string
 	 */
-	private $pretend = false;
+	protected $reason = 'OK';
+
+	/**
+	 * The current status code for this response.
+	 *
+	 * @var integer
+	 */
+	protected $statusCode = 200;
 
 	/**
 	 * Constructor.
@@ -105,8 +79,13 @@
 	 */
 	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');
 	}
 
 	/**
@@ -163,7 +142,8 @@
 		{
 			return strlen($this->binary);
 		}
-		elseif ($this->file instanceof File)
+
+		if ($this->file instanceof File)
 		{
 			return $this->file->getSize();
 		}
@@ -181,9 +161,9 @@
 
 		if ($this->setMime === true)
 		{
-			if (($last_dot_position = strrpos($this->filename, '.')) !== false)
+			if (($lastDotPosition = strrpos($this->filename, '.')) !== false)
 			{
-				$mime    = Mimes::guessTypeFromExtension(substr($this->filename, $last_dot_position + 1));
+				$mime    = Mimes::guessTypeFromExtension(substr($this->filename, $lastDotPosition + 1));
 				$charset = $this->charset;
 			}
 		}
@@ -233,48 +213,32 @@
 	 */
 	private function getContentDisposition() : string
 	{
-		$download_filename = $this->getDownloadFileName();
+		$downloadFilename = $this->getDownloadFileName();
 
-		$utf8_filename = $download_filename;
+		$utf8Filename = $downloadFilename;
 
 		if (strtoupper($this->charset) !== 'UTF-8')
 		{
-			$utf8_filename = mb_convert_encoding($download_filename, 'UTF-8', $this->charset);
+			$utf8Filename = mb_convert_encoding($downloadFilename, 'UTF-8', $this->charset);
 		}
 
-		$result = sprintf('attachment; filename="%s"', $download_filename);
+		$result = sprintf('attachment; filename="%s"', $downloadFilename);
 
-		if (isset($utf8_filename))
+		if ($utf8Filename)
 		{
-			$result .= '; filename*=UTF-8\'\'' . rawurlencode($utf8_filename);
+			$result .= '; filename*=UTF-8\'\'' . rawurlencode($utf8Filename);
 		}
 
 		return $result;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getStatusCode(): int
-	{
-		return 200;
-	}
-
 	//--------------------------------------------------------------------
 
 	/**
-	 * Return an instance with the specified status code and, optionally, reason phrase.
+	 * Disallows status changing.
 	 *
-	 * 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.
+	 * @param integer $code
+	 * @param string  $reason
 	 *
 	 * @throws DownloadException
 	 */
@@ -286,42 +250,6 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * 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
-	 */
-	public function getReason(): string
-	{
-		return $this->reason;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Convenience Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the date header
-	 *
-	 * @param \DateTime $date
-	 *
-	 * @return ResponseInterface
-	 */
-	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;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
 	 * Sets the Content Type header for this response with the mime type
 	 * and, optionally, the charset.
 	 *
@@ -332,15 +260,9 @@
 	 */
 	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;
-		}
+		parent::setContentType($mime, $charset);
 
-		$this->removeHeader('Content-Type'); // replace existing content type
-		$this->setHeader('Content-Type', $mime);
-		if (! empty($charset))
+		if ($charset !== '')
 		{
 			$this->charset = $charset;
 		}
@@ -364,28 +286,7 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * 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
+	 * Disables cache configuration.
 	 *
 	 * @param array $options
 	 *
@@ -397,45 +298,13 @@
 	}
 
 	//--------------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 */
-	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
 	//--------------------------------------------------------------------
 
 	/**
-	 * For unit testing, don't actually send headers.
-	 *
-	 * @param  boolean $pretend
-	 * @return $this
-	 */
-	public function pretend(bool $pretend = true)
-	{
-		$this->pretend = $pretend;
-
-		return $this;
-	}
-
-	/**
 	 * {@inheritDoc}
+	 *
+	 * @todo Do downloads need CSP or Cookies? Compare with ResponseTrait::send()
 	 */
 	public function send()
 	{
@@ -459,44 +328,11 @@
 		$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->setHeader('Content-Length', (string) $this->getContentLength());
 		$this->noCache();
 	}
 
 	/**
-	 * Sends the headers of this HTTP request to the browser.
-	 *
-	 * @return DownloadResponse
-	 */
-	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']))
-		{
-			$this->setDate(\DateTime::createFromFormat('U', time()));
-		}
-
-		// HTTP Status
-		header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReason()), true,
-				$this->getStatusCode());
-
-		// Send all of our headers
-		foreach ($this->getHeaders() as $name => $values)
-		{
-			header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
-		}
-
-		return $this;
-	}
-
-	/**
 	 * output download file text.
 	 *
 	 * @throws DownloadException
@@ -509,7 +345,8 @@
 		{
 			return $this->sendBodyByBinary();
 		}
-		elseif ($this->file !== null)
+
+		if ($this->file !== null)
 		{
 			return $this->sendBodyByFilePath();
 		}
@@ -524,10 +361,10 @@
 	 */
 	private function sendBodyByFilePath()
 	{
-		$spl_file_object = $this->file->openFile('rb');
+		$splFileObject = $this->file->openFile('rb');
 
 		// Flush 1MB chunks of data
-		while (! $spl_file_object->eof() && ($data = $spl_file_object->fread(1048576)) !== false)
+		while (! $splFileObject->eof() && ($data = $splFileObject->fread(1048576)) !== false)
 		{
 			echo $data;
 		}
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 661e149..539b29a 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -1,56 +1,27 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Exceptions;
 
-use CodeIgniter\Exceptions\ExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
 
 /**
  * Things that can go wrong with HTTP
  */
-class HTTPException extends FrameworkException implements ExceptionInterface
+class HTTPException extends FrameworkException
 {
-
 	/**
 	 * For CurlRequest
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -64,7 +35,7 @@
 	 *
 	 * @param string $cert
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forSSLCertNotFound(string $cert)
 	{
@@ -76,7 +47,7 @@
 	 *
 	 * @param string $key
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidSSLKey(string $key)
 	{
@@ -104,7 +75,7 @@
 	 *
 	 * @param string $type
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidNegotiationType(string $type)
 	{
@@ -116,7 +87,7 @@
 	 *
 	 * @param string $protocols
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidHTTPProtocol(string $protocols)
 	{
@@ -126,7 +97,7 @@
 	/**
 	 * For Negotiate
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forEmptySupportedNegotiations()
 	{
@@ -138,7 +109,7 @@
 	 *
 	 * @param string $route
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidRedirectRoute(string $route)
 	{
@@ -148,7 +119,7 @@
 	/**
 	 * For Response
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forMissingResponseStatus()
 	{
@@ -160,7 +131,7 @@
 	 *
 	 * @param integer $code
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidStatusCode(int $code)
 	{
@@ -172,7 +143,7 @@
 	 *
 	 * @param integer $code
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forUnkownStatusCode(int $code)
 	{
@@ -184,7 +155,7 @@
 	 *
 	 * @param string $uri
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forUnableToParseURI(string $uri)
 	{
@@ -196,7 +167,7 @@
 	 *
 	 * @param integer $segment
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forURISegmentOutOfRange(int $segment)
 	{
@@ -208,7 +179,7 @@
 	 *
 	 * @param integer $port
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidPort(int $port)
 	{
@@ -218,7 +189,7 @@
 	/**
 	 * For URI
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forMalformedQueryString()
 	{
@@ -228,7 +199,7 @@
 	/**
 	 * For Uploaded file move
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forAlreadyMoved()
 	{
@@ -240,7 +211,7 @@
 	 *
 	 * @param string|null $path
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @return HTTPException
 	 */
 	public static function forInvalidFile(string $path = null)
 	{
@@ -254,11 +225,22 @@
 	 * @param string $target
 	 * @param string $error
 	 *
-	 * @return \CodeIgniter\HTTP\Exceptions\HTTPException
+	 * @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
+	 */
+	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 567ddf7..1a9a845 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -1,55 +1,26 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
 
+use RecursiveArrayIterator;
+use RecursiveIteratorIterator;
+
 /**
  * Class FileCollection
  *
  * Provides easy access to uploaded files for a request.
- *
- * @package CodeIgniter\HTTP\Files
  */
 class FileCollection
 {
-
 	/**
 	 * An array of UploadedFile instances for any files
 	 * uploaded as part of this request.
@@ -277,8 +248,8 @@
 				}
 
 				$stack    = [&$pointer];
-				$iterator = new \RecursiveIteratorIterator(
-						new \RecursiveArrayIterator($value), \RecursiveIteratorIterator::SELF_FIRST
+				$iterator = new RecursiveIteratorIterator(
+						new RecursiveArrayIterator($value), RecursiveIteratorIterator::SELF_FIRST
 				);
 
 				foreach ($iterator as $key => $val)
@@ -312,14 +283,13 @@
 	{
 		if (! empty($index))
 		{
-			$current_index = array_shift($index);
+			$currentIndex = array_shift($index);
 		}
-		if (is_array($index) && $index && is_array($value[$current_index]) && $value[$current_index])
+		if (isset($currentIndex) && is_array($index) && $index && is_array($value[$currentIndex]) && $value[$currentIndex])
 		{
-			return $this->getValueDotNotationSyntax($index, $value[$current_index]);
+			return $this->getValueDotNotationSyntax($index, $value[$currentIndex]);
 		}
 
-		return (isset($value[$current_index])) ? $value[$current_index] : null;
+		return (isset($currentIndex) && isset($value[$currentIndex])) ? $value[$currentIndex] : null;
 	}
-
 }
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 62a245b..38926f6 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -1,41 +1,12 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
@@ -44,6 +15,8 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\Mimes;
 use Exception;
+use InvalidArgumentException;
+use RuntimeException;
 
 /**
  * Value object representing a single file uploaded through an
@@ -51,12 +24,9 @@
  * provide files.
  *
  * Typically, implementors will extend the SplFileInfo class.
- *
- * @package CodeIgniter\HTTP
  */
 class UploadedFile extends File implements UploadedFileInterface
 {
-
 	/**
 	 * The path to the temporary file.
 	 *
@@ -154,12 +124,13 @@
 	 *
 	 * @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.
+	 * @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)
@@ -172,7 +143,6 @@
 			throw HTTPException::forInvalidFile();
 		}
 
-		$targetPath  = rtrim($targetPath, '/') . '/';
 		$name        = is_null($name) ? $this->getName() : $name;
 		$destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
@@ -252,12 +222,7 @@
 	 */
 	public function getError(): int
 	{
-		if (is_null($this->error))
-		{
-			return UPLOAD_ERR_OK;
-		}
-
-		return $this->error;
+		return $this->error ?? UPLOAD_ERR_OK;
 	}
 
 	//--------------------------------------------------------------------
@@ -280,7 +245,7 @@
 			UPLOAD_ERR_EXTENSION  => lang('HTTP.uploadErrExtension'),
 		];
 
-		$error = is_null($this->error) ? UPLOAD_ERR_OK : $this->error;
+		$error = $this->error ?? UPLOAD_ERR_OK;
 
 		return sprintf($errors[$error] ?? lang('HTTP.uploadErrUnknown'), $this->getName());
 	}
@@ -343,24 +308,29 @@
 	 * Overrides SPLFileInfo's to work with uploaded files, since
 	 * the temp file that's been uploaded doesn't have an extension.
 	 *
-	 * Is simply an alias for guessExtension for a safer method
-	 * than simply relying on the provided extension.
-	 * Additionally it will return clientExtension in case if there are
-	 * other extensions with the same mime type.
+	 * 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();
+		return $this->guessExtension() ?: $this->getClientExtension();
 	}
 
 	/**
-	 * Attempts to determine the best file extension.
+	 * 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|null
+	 * @return string
 	 */
 	public function guessExtension(): string
 	{
-		return Mimes::guessExtensionFromType($this->getClientMimeType(), $this->getClientExtension()) ?? $this->getClientExtension();
+		return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? '';
 	}
 
 	//--------------------------------------------------------------------
@@ -402,12 +372,13 @@
 	 */
 	public function store(string $folderName = null, string $fileName = null): string
 	{
-		$folderName = rtrim($folderName ?? date('Ymd'), '/') . '/' ;
+		$folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
 		$fileName   = $fileName ?? $this->getRandomName();
 
 		// Move the uploaded file to a new location.
-		return ($this->move(WRITEPATH . 'uploads/' . $folderName, $fileName)) ?
-				$folderName . $this->name : null;
+		$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 64d74ad..8ad7eaa 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -1,56 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
 
+use InvalidArgumentException;
+use RuntimeException;
+
 /**
  * Value object representing a single file uploaded through an
  * HTTP request. Used by the IncomingRequest class to
  * provide files.
  *
  * Typically, implementors will extend the SplFileInfo class.
- *
- * @package CodeIgniter\HTTP
  */
 interface UploadedFileInterface
 {
-
 	/**
 	 * Accepts the file information as would be filled in from the $_FILES array.
 	 *
@@ -89,9 +61,9 @@
 	 * @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.
+	 * @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);
 
@@ -136,7 +108,7 @@
 	 * Implementations SHOULD return the value stored in the "name" key of
 	 * the file in the $_FILES array.
 	 *
-	 * @return string|null The filename sent by the client or null if none
+	 * @return string The filename sent by the client or null if none
 	 *     was provided.
 	 */
 	public function getName(): string;
@@ -157,7 +129,7 @@
 	 * was uploaded. This is NOT a trusted source.
 	 * For a trusted version, use guessExtension() instead.
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getClientExtension(): string;
 
@@ -168,7 +140,7 @@
 	 * This is NOT a trusted value.
 	 * For a trusted version, use getMimeType() instead.
 	 *
-	 * @return string|null
+	 * @return string
 	 */
 	public function getClientMimeType(): string;
 
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 0e75fa2..2f5ce01 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -42,12 +15,9 @@
  * Class Header
  *
  * Represents a single HTTP header.
- *
- * @package CodeIgniter\HTTP
  */
 class Header
 {
-
 	/**
 	 * The name of the header.
 	 *
@@ -73,8 +43,8 @@
 	 */
 	public function __construct(string $name, $value = null)
 	{
-		$this->name  = $name;
-		$this->value = $value;
+		$this->name = $name;
+		$this->setValue($value);
 	}
 
 	//--------------------------------------------------------------------
@@ -95,7 +65,7 @@
 	 * 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|null|string
+	 * @return array|string
 	 */
 	public function getValue()
 	{
@@ -123,13 +93,13 @@
 	/**
 	 * Sets the value of the header, overwriting any previous value(s).
 	 *
-	 * @param null $value
+	 * @param string|array|null $value
 	 *
 	 * @return $this
 	 */
 	public function setValue($value = null)
 	{
-		$this->value = $value;
+		$this->value = $value ?? '';
 
 		return $this;
 	}
@@ -140,18 +110,26 @@
 	 * 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 null $value
+	 * @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];
 		}
 
-		$this->value[] = $value;
+		if (! in_array($value, $this->value, true))
+		{
+			$this->value[] = $value;
+		}
 
 		return $this;
 	}
@@ -162,12 +140,17 @@
 	 * 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 null $value
+	 * @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];
@@ -195,7 +178,7 @@
 		{
 			return $this->value;
 		}
-		else if (! is_array($this->value))
+		if (! is_array($this->value))
 		{
 			return '';
 		}
@@ -208,12 +191,12 @@
 			{
 				$options[] = $key . '=' . $value;
 			}
-			else if (is_array($value))
+			elseif (is_array($value))
 			{
 				$key       = key($value);
 				$options[] = $key . '=' . $value[$key];
 			}
-			else if (is_numeric($key))
+			elseif (is_numeric($key))
 			{
 				$options[] = $value;
 			}
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 4a89067..1e33949 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -1,41 +1,12 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -43,7 +14,10 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\Files\FileCollection;
 use CodeIgniter\HTTP\Files\UploadedFile;
+use Config\App;
 use Config\Services;
+use InvalidArgumentException;
+use Locale;
 
 /**
  * Class IncomingRequest
@@ -67,12 +41,9 @@
  * - Query string arguments (generally via $_GET, or as parsed via parse_str())
  * - Upload files, if any (as represented by $_FILES)
  * - Deserialized body binds (generally from $_POST)
- *
- * @package CodeIgniter\HTTP
  */
 class IncomingRequest extends Request
 {
-
 	/**
 	 * Enable CSRF flag
 	 *
@@ -93,14 +64,14 @@
 	/**
 	 * File collection
 	 *
-	 * @var Files\FileCollection
+	 * @var FileCollection|null
 	 */
 	protected $files;
 
 	/**
 	 * Negotiator
 	 *
-	 * @var \CodeIgniter\HTTP\Negotiate
+	 * @var Negotiate|null
 	 */
 	protected $negotiator;
 
@@ -130,7 +101,7 @@
 	/**
 	 * Configuration settings.
 	 *
-	 * @var \Config\App
+	 * @var App
 	 */
 	public $config;
 
@@ -144,7 +115,7 @@
 	/**
 	 * The user agent this request is from.
 	 *
-	 * @var \CodeIgniter\HTTP\UserAgent
+	 * @var UserAgent
 	 */
 	protected $userAgent;
 
@@ -153,13 +124,18 @@
 	/**
 	 * Constructor
 	 *
-	 * @param object                      $config
-	 * @param \CodeIgniter\HTTP\URI       $uri
-	 * @param string|null                 $body
-	 * @param \CodeIgniter\HTTP\UserAgent $userAgent
+	 * @param object      $config
+	 * @param URI         $uri
+	 * @param string|null $body
+	 * @param UserAgent   $userAgent
 	 */
-	public function __construct($config, URI $uri = null, $body = 'php://input', 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')
 		{
@@ -194,7 +170,7 @@
 	 * Handles setting up the locale, perhaps auto-detecting through
 	 * content negotiation.
 	 *
-	 * @param $config
+	 * @param App $config
 	 */
 	public function detectLocale($config)
 	{
@@ -246,29 +222,13 @@
 	{
 		// If it's not a valid locale, set it
 		// to the default locale for the site.
-		if (! in_array($locale, $this->validLocales))
+		if (! in_array($locale, $this->validLocales, true))
 		{
 			$locale = $this->defaultLocale;
 		}
 
 		$this->locale = $locale;
-
-		// If the intl extension is loaded, make sure
-		// that we set the locale for it... if not, though,
-		// don't worry about it.
-		// this should not block code coverage thru unit testing
-		// @codeCoverageIgnoreStart
-		try
-		{
-			if (class_exists('\Locale', false))
-			{
-				\Locale::setDefault($locale);
-			}
-		}
-		catch (\Exception $e)
-		{
-		}
-		// @codeCoverageIgnoreEnd
+		Locale::setDefault($locale);
 
 		return $this;
 	}
@@ -294,7 +254,7 @@
 	 */
 	public function isAJAX(): bool
 	{
-		return $this->hasHeader('X-Requested-With') && strtolower($this->getHeader('X-Requested-With')->getValue()) === 'xmlhttprequest';
+		return $this->hasHeader('X-Requested-With') && strtolower($this->header('X-Requested-With')->getValue()) === 'xmlhttprequest';
 	}
 
 	//--------------------------------------------------------------------
@@ -311,11 +271,13 @@
 		{
 			return true;
 		}
-		elseif ($this->hasHeader('X-Forwarded-Proto') && $this->getHeader('X-Forwarded-Proto')->getValue() === 'https')
+
+		if ($this->hasHeader('X-Forwarded-Proto') && $this->header('X-Forwarded-Proto')->getValue() === 'https')
 		{
 			return true;
 		}
-		elseif ($this->hasHeader('Front-End-Https') && ! empty($this->getHeader('Front-End-Https')->getValue()) && strtolower($this->getHeader('Front-End-Https')->getValue()) !== 'off')
+
+		if ($this->hasHeader('Front-End-Https') && ! empty($this->header('Front-End-Https')->getValue()) && strtolower($this->header('Front-End-Https')->getValue()) !== 'off')
 		{
 			return true;
 		}
@@ -326,7 +288,7 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * Fetch an item from the $_REQUEST object. This is the simplest way
+	 * Fetch an item from the $_REQUEST object or a JSON input stream. 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.
 	 *
@@ -338,6 +300,26 @@
 	 */
 	public function getVar($index = null, $filter = null, $flags = null)
 	{
+		if ($this->isJSON())
+		{
+			if (is_null($index))
+			{
+				return $this->getJSON();
+			}
+
+			if (is_array($index))
+			{
+				$output = [];
+				foreach ($index as $key)
+				{
+					$output[$key] = $this->getJsonVar($key);
+				}
+				return $output;
+			}
+
+			return $this->getJsonVar($index);
+		}
+
 		return $this->fetchGlobal('request', $index, $filter, $flags);
 	}
 
@@ -363,6 +345,26 @@
 		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.
+	 *
+	 * @return mixed
+	 */
+	public function getJsonVar(string $index, bool $assoc = false)
+	{
+		helper('array');
+
+		$data = dot_array_search($index, $this->getJSON(true));
+		if (is_array($data) && ! $assoc)
+		{
+			return json_decode(json_encode($data));
+		}
+		return $data;
+	}
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -469,7 +471,7 @@
 	/**
 	 * Fetch the user agent string
 	 *
-	 * @return \CodeIgniter\HTTP\UserAgent
+	 * @return UserAgent
 	 */
 	public function getUserAgent()
 	{
@@ -779,7 +781,8 @@
 		{
 			return '';
 		}
-		elseif (strncmp($uri, '/', 1) === 0)
+
+		if (strncmp($uri, '/', 1) === 0)
 		{
 			$uri                     = explode('?', $uri, 2);
 			$_SERVER['QUERY_STRING'] = $uri[1] ?? '';
@@ -808,7 +811,7 @@
 		$tok  = strtok($uri, '/');
 		while ($tok !== false)
 		{
-			if (( ! empty($tok) || $tok === '0') && $tok !== '..')
+			if ((! empty($tok) || $tok === '0') && $tok !== '..')
 			{
 				$uris[] = $tok;
 			}
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 6d7a5cc..d5bd9f2 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -1,67 +1,22 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
-use CodeIgniter\HTTP\Exceptions\HTTPException;
-
 /**
  * An HTTP message
  */
-class Message
+class Message implements MessageInterface
 {
-
-	/**
-	 * List of all HTTP request headers.
-	 *
-	 * @var array
-	 */
-	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 = [];
+	use MessageTrait;
 
 	/**
 	 * Protocol version
@@ -78,7 +33,7 @@
 	protected $validProtocolVersions = [
 		'1.0',
 		'1.1',
-		'2',
+		'2.0',
 	];
 
 	/**
@@ -89,9 +44,6 @@
 	protected $body;
 
 	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Body
-	//--------------------------------------------------------------------
 
 	/**
 	 * Returns the Message's body.
@@ -103,115 +55,33 @@
 		return $this->body;
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the body of the current message.
-	 *
-	 * @param mixed $data
-	 *
-	 * @return Message|Response
-	 */
-	public function setBody($data)
-	{
-		$this->body = $data;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Appends data to the body of the current message.
-	 *
-	 * @param $data
-	 *
-	 * @return Message|Response
-	 */
-	public function appendBody($data)
-	{
-		$this->body .= (string) $data;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Headers
-	//--------------------------------------------------------------------
-
-	/**
-	 * Populates the $headers array with any headers the getServer knows about.
-	 */
-	public function populateHeaders()
-	{
-		$contentType = $_SERVER['CONTENT_TYPE'] ?? getenv('CONTENT_TYPE');
-		if (! empty($contentType))
-		{
-			$this->setHeader('Content-Type', $contentType);
-		}
-		unset($contentType);
-
-		foreach ($_SERVER as $key => $val)
-		{
-			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        An array of the request headers
+	 * @return array<string,Header> An array of the request headers
+	 *
+	 * @deprecated Use Message::headers() to make room for PSR-7
 	 */
 	public function getHeaders(): 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;
+		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|\CodeIgniter\HTTP\Header
+	 * @return array|Header|null
+	 *
+	 * @deprecated Use Message::header() to make room for PSR-7
 	 */
 	public function getHeader(string $name)
 	{
-		$orig_name = $this->getHeaderName($name);
-
-		if (! isset($this->headers[$orig_name]))
-		{
-			return null;
-		}
-
-		return $this->headers[$orig_name];
+		return $this->header($name);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Determines whether a header exists.
 	 *
@@ -221,13 +91,11 @@
 	 */
 	public function hasHeader(string $name): bool
 	{
-		$orig_name = $this->getHeaderName($name);
+		$origName = $this->getHeaderName($name);
 
-		return isset($this->headers[$orig_name]);
+		return isset($this->headers[$origName]);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Retrieves a comma-separated string of the values for a single header.
 	 *
@@ -245,106 +113,16 @@
 	 */
 	public function getHeaderLine(string $name): string
 	{
-		$orig_name = $this->getHeaderName($name);
+		$origName = $this->getHeaderName($name);
 
-		if (! array_key_exists($orig_name, $this->headers))
+		if (! array_key_exists($origName, $this->headers))
 		{
 			return '';
 		}
 
-		return $this->headers[$orig_name]->getValueLine();
+		return $this->headers[$origName]->getValueLine();
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets a header and it's value.
-	 *
-	 * @param string            $name
-	 * @param array|null|string $value
-	 *
-	 * @return Message|Response
-	 */
-	public function setHeader(string $name, $value)
-	{
-		$origName = $this->getHeaderName($name);
-
-		if (isset($this->headers[$origName]) && is_array($this->headers[$origName]))
-		{
-			$this->appendHeader($origName, $value);
-		}
-		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 Message
-	 */
-	public function removeHeader(string $name)
-	{
-		$orig_name = $this->getHeaderName($name);
-
-		unset($this->headers[$orig_name]);
-		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 $value
-	 *
-	 * @return Message
-	 */
-	public function appendHeader(string $name, string $value)
-	{
-		$orig_name = $this->getHeaderName($name);
-
-		array_key_exists($orig_name, $this->headers)
-			? $this->headers[$orig_name]->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 Message
-	 */
-	public function prependHeader(string $name, string $value)
-	{
-		$orig_name = $this->getHeaderName($name);
-
-		$this->headers[$orig_name]->prependValue($value);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the HTTP Protocol Version.
 	 *
@@ -355,48 +133,23 @@
 		return $this->protocolVersion ?? '1.1';
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Sets the HTTP protocol version.
+	 * Determines if this is a json message based on the Content-Type header
 	 *
-	 * @param string $version
+	 * @return boolean
 	 *
-	 * @return Message
+	 * @deprecated Use header calls directly
 	 */
-	public function setProtocolVersion(string $version)
+      public function isJSON()
 	{
-		if (! is_numeric($version))
+		if (! $this->hasHeader('Content-Type'))
 		{
-			$version = substr($version, strpos($version, '/') + 1);
+			return false;
 		}
 
-		if (! in_array($version, $this->validProtocolVersions))
-		{
-			throw HTTPException::forInvalidHTTPProtocol(implode(', ', $this->validProtocolVersions));
-		}
+		$header = $this->header('Content-Type')->getValue();
+		$parts  = explode(';', $header);
 
-		$this->protocolVersion = $version;
-
-		return $this;
+		return in_array('application/json', $parts, true);
 	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	{
-		$lower_name = strtolower($name);
-
-		return $this->headerMap[$lower_name] ?? $name;
-	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php
new file mode 100644
index 0000000..ed7c541
--- /dev/null
+++ b/system/HTTP/MessageInterface.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+/**
+ * Expected behavior of an HTTP request
+ */
+interface MessageInterface
+{
+	/**
+	 * 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);
+
+	/**
+	 * 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 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);
+
+	/**
+	 * Removes a header from the list of headers we track.
+	 *
+	 * @param string $name
+	 *
+	 * @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)
+	 *
+	 * @param string $name
+	 * @param string $value
+	 *
+	 * @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);
+}
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
new file mode 100644
index 0000000..3e214dc
--- /dev/null
+++ b/system/HTTP/MessageTrait.php
@@ -0,0 +1,269 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+
+/**
+ * Message Trait
+ * Additional methods to make a PSR-7 Message class
+ * compliant with the framework's own MessageInterface.
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
+ */
+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 ($_SERVER as $key => $val)
+		{
+			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;
+	}
+}
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 793e134..a881031 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -48,16 +20,14 @@
  * type match between what the application supports and what the requesting
  * getServer wants.
  *
- * @see     http://tools.ietf.org/html/rfc7231#section-5.3
- * @package CodeIgniter\HTTP
+ * @see http://tools.ietf.org/html/rfc7231#section-5.3
  */
 class Negotiate
 {
-
 	/**
 	 * Request
 	 *
-	 * @var \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\IncomingRequest
+	 * @var RequestInterface|IncomingRequest
 	 */
 	protected $request;
 
@@ -66,7 +36,7 @@
 	/**
 	 * Constructor
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface|null $request
+	 * @param RequestInterface|null $request
 	 */
 	public function __construct(RequestInterface $request = null)
 	{
@@ -271,11 +241,14 @@
 
 			foreach ($pairs as $pair)
 			{
-				$param = [];
-				preg_match(
-						'/^(?P<name>.+?)=(?P<quoted>"|\')?(?P<value>.*?)(?:\k<quoted>)?$/', $pair, $param
-				);
-				$parameters[trim($param['name'])] = trim($param['value']);
+				if (preg_match(
+					'/^(?P<name>.+?)=(?P<quoted>"|\')?(?P<value>.*?)(?:\k<quoted>)?$/',
+					$pair,
+					$param
+				))
+				{
+					$parameters[trim($param['name'])] = trim($param['value']);
+				}
 			}
 
 			$quality = 1.0;
@@ -297,8 +270,8 @@
 		usort($results, function ($a, $b) {
 			if ($a['q'] === $b['q'])
 			{
-				$a_ast = substr_count($a['value'], '*');
-				$b_ast = substr_count($b['value'], '*');
+				$aAst = substr_count($a['value'], '*');
+				$bAst = substr_count($b['value'], '*');
 
 				// '*/*' has lower precedence than 'text/*',
 				// and 'text/*' has lower priority than 'text/plain'
@@ -306,7 +279,7 @@
 				// This seems backwards, but needs to be that way
 				// due to the way PHP7 handles ordering or array
 				// elements created by reference.
-				if ($a_ast > $b_ast)
+				if ($aAst > $bAst)
 				{
 					return 1;
 				}
@@ -317,7 +290,7 @@
 				// This seems backwards, but needs to be that way
 				// due to the way PHP7 handles ordering or array
 				// elements created by reference.
-				if ($a_ast === $b_ast)
+				if ($aAst === $bAst)
 				{
 					return count($b['params']) - count($a['params']);
 				}
@@ -394,8 +367,9 @@
 
 		foreach ($supported['params'] as $label => $value)
 		{
-			if (! isset($acceptable['params'][$label]) ||
-					$acceptable['params'][$label] !== $value)
+			if (! isset($acceptable['params'][$label])
+				|| $acceptable['params'][$label] !== $value
+			)
 			{
 				return false;
 			}
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 2753d01..99eb864 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -63,8 +35,7 @@
 		// for better security.
 		if (strpos($uri, 'http') !== 0)
 		{
-			$url = current_url(true)->resolveRelativeURI($uri);
-			$uri = (string)$url;
+			$uri = (string) current_url(true)->resolveRelativeURI($uri);
 		}
 
 		return $this->redirect($uri, $method, $code);
@@ -74,18 +45,18 @@
 	 * 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|null $code
-	 * @param string       $method
+	 * @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')
 	{
-		$routes = Services::routes(true);
-
-		$route = $routes->reverseRoute($route, ...$params);
+		$route = Services::routes()->reverseRoute($route, ...$params);
 
 		if (! $route)
 		{
@@ -108,36 +79,36 @@
 	 */
 	public function back(int $code = null, string $method = 'auto')
 	{
-		$this->ensureSession();
+		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.
+	 * packaged up with the response.
+	 *
+	 * It will then be available via the 'old()' helper function.
 	 *
 	 * @return $this
 	 */
 	public function withInput()
 	{
-		$session = $this->ensureSession();
+		$session = Services::session();
 
-		$input = [
+		$session->setFlashdata('_ci_old_input', [
 			'get'  => $_GET ?? [],
 			'post' => $_POST ?? [],
-		];
+		]);
 
-		$session->setFlashdata('_ci_old_input', $input);
+		// 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 the validator has any errors, transmit those back
-		// so they can be displayed when the validation is
-		// handled within a method different than displaying the form.
-		$validator = Services::validation();
-		if (! empty($validator->getErrors()))
+		if ($validation->getErrors())
 		{
-			$session->setFlashdata('_ci_validation_errors', serialize($validator->getErrors()));
+			$session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors()));
 		}
 
 		return $this;
@@ -153,9 +124,7 @@
 	 */
 	public function with(string $key, $message)
 	{
-		$session = $this->ensureSession();
-
-		$session->setFlashdata($key, $message);
+		Services::session()->setFlashdata($key, $message);
 
 		return $this;
 	}
@@ -170,25 +139,9 @@
 	 */
 	public function withCookies()
 	{
-		$cookies = service('response')->getCookies();
-
-		if (empty($cookies))
+		foreach (Services::response()->getCookies() as $cookie)
 		{
-			return $this;
-		}
-
-		foreach ($cookies as $cookie)
-		{
-			$this->setCookie(
-				$cookie['name'],
-				$cookie['value'],
-				$cookie['expires'],
-				$cookie['domain'],
-				$cookie['path'],
-				'', // prefix
-				$cookie['secure'],
-				$cookie['httponly']
-			);
+			$this->cookies[] = $cookie;
 		}
 
 		return $this;
@@ -204,28 +157,11 @@
 	 */
 	public function withHeaders()
 	{
-		$headers = service('response')->getHeaders();
-
-		if (empty($headers))
-		{
-			return $this;
-		}
-
-		foreach ($headers as $name => $header)
+		foreach (Services::response()->getHeaders() as $name => $header)
 		{
 			$this->setHeader($name, $header->getValue());
 		}
 
 		return $this;
 	}
-
-	/**
-	 * Ensures the session is loaded and started.
-	 *
-	 * @return \CodeIgniter\Session\Session
-	 */
-	protected function ensureSession()
-	{
-		return Services::session();
-	}
 }
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index ff30dc9..9b4c16d 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -1,61 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Validation\FormatRules;
+
 /**
  * Representation of an HTTP request.
  */
-class Request extends Message implements RequestInterface
+class Request extends Message implements MessageInterface, RequestInterface
 {
-
-	/**
-	 * IP address of the current user.
-	 *
-	 * @var string
-	 */
-	protected $ipAddress = '';
+	use RequestTrait;
 
 	/**
 	 * Proxy IPs
 	 *
 	 * @var string|array
+	 *
+	 * @deprecated Check the App config directly
 	 */
 	protected $proxyIPs;
 
@@ -67,164 +37,35 @@
 	protected $method;
 
 	/**
-	 * Stores values we've retrieved from
-	 * PHP globals.
+	 * A URI instance.
 	 *
-	 * @var array
+	 * @var URI
 	 */
-	protected $globals = [];
-
-	//--------------------------------------------------------------------
+	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)
+	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();
+		}
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Gets the user's IP address.
-	 *
-	 * @return string IP address
-	 */
-	public function getIPAddress(): string
-	{
-		if (! empty($this->ipAddress))
-		{
-			return $this->ipAddress;
-		}
-
-		$proxy_ips = $this->proxyIPs;
-		if (! empty($this->proxyIPs) && ! is_array($this->proxyIPs))
-		{
-			$proxy_ips = explode(',', str_replace(' ', '', $this->proxyIPs));
-		}
-
-		$this->ipAddress = $this->getServer('REMOTE_ADDR');
-
-		if ($proxy_ips)
-		{
-			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 (! $this->isValidIP($spoof))
-					{
-						$spoof = null;
-					}
-					else
-					{
-						break;
-					}
-				}
-			}
-
-			if ($spoof)
-			{
-				for ($i = 0, $c = count($proxy_ips); $i < $c; $i ++)
-				{
-					// Check if we have an IP address or a subnet
-					if (strpos($proxy_ips[$i], '/') === false)
-					{
-						// An IP address (and not a subnet) is specified.
-						// We can compare right away.
-						if ($proxy_ips[$i] === $this->ipAddress)
-						{
-							$this->ipAddress = $spoof;
-							break;
-						}
-
-						continue;
-					}
-
-					// We have a subnet ... now the heavy lifting begins
-					isset($separator) || $separator = $this->isValidIP($this->ipAddress, 'ipv6') ? ':' : '.';
-
-					// If the proxy entry doesn't match the IP protocol - skip it
-					if (strpos($proxy_ips[$i], $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($proxy_ips[$i], '%[^/]/%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 (! $this->isValidIP($this->ipAddress))
-		{
-			return $this->ipAddress = '0.0.0.0';
-		}
-
-		return empty($this->ipAddress) ? '' : $this->ipAddress;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Validate an IP address
 	 *
@@ -232,47 +73,36 @@
 	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
 	 *
 	 * @return boolean
+	 *
+	 * @deprecated Use Validation instead
 	 */
 	public function isValidIP(string $ip = null, string $which = null): bool
 	{
-		switch (strtolower( (string) $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);
+		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
 	 */
 	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
 	 */
 	public function setMethod(string $method)
 	{
@@ -281,198 +111,29 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * 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.
+	 * Returns an instance with the specified method.
 	 *
 	 * @param string $method
-	 * @param $value
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function setGlobal(string $method, $value)
+	public function withMethod($method)
 	{
-		$this->globals[$method] = $value;
+		$request = clone $this;
 
-		return $this;
+		$request->method = $method;
+
+		return $request;
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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 mixed             $flags
-	 *
-	 * @return mixed
-	 */
-	public function fetchGlobal($method, $index = null, $filter = null, $flags = null)
+    /**
+     * Retrieves the URI instance.
+     *
+     * @return URI
+     */
+    public function getUri()
 	{
-		$method = strtolower($method);
-
-		if (! isset($this->globals[$method]))
-		{
-			$this->populateGlobals($method);
-		}
-
-		// Null filters cause null values to return.
-		if (is_null($filter))
-		{
-			$filter = FILTER_DEFAULT;
-		}
-
-		// 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;
-		}
-
-		if (is_array($value) && ($filter !== null || $flags !== null))
-		{
-			// 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;
-		}
+		return $this->uri;
 	}
 }
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index fd8f8b3..7c46744 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -48,9 +20,9 @@
  */
 interface RequestInterface
 {
-
 	/**
 	 * Gets the user's IP address.
+	 * Supplied by RequestTrait.
 	 *
 	 * @return string IP address
 	 */
@@ -65,6 +37,8 @@
 	 * @param string $which IP protocol: 'ipv4' or 'ipv6'
 	 *
 	 * @return boolean
+	 *
+	 * @deprecated Use Validation instead
 	 */
 	public function isValidIP(string $ip, string $which = null): bool;
 
@@ -72,10 +46,13 @@
 
 	/**
 	 * 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;
 
@@ -83,6 +60,7 @@
 
 	/**
 	 * 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
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
new file mode 100644
index 0000000..7855aad
--- /dev/null
+++ b/system/HTTP/RequestTrait.php
@@ -0,0 +1,377 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Validation\FormatRules;
+
+/**
+ * Request Trait
+ *
+ * Additional methods to make a PSR-7 Request class
+ * compliant with the framework's own RequestInterface.
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/RequestInterface.php
+ */
+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 = isset($this->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 mixed             $flags
+	 *
+	 * @return mixed
+	 */
+	public function fetchGlobal($method, $index = null, $filter = null, $flags = null)
+	{
+		$method = strtolower($method);
+
+		if (! isset($this->globals[$method]))
+		{
+			$this->populateGlobals($method);
+		}
+
+		// Null filters cause null values to return.
+		if (is_null($filter))
+		{
+			$filter = FILTER_DEFAULT;
+		}
+
+		// 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 !== null || $flags !== null))
+		{
+			// 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;
+		}
+	}
+}
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 7d0e680..a685e54 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -1,48 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
-use CodeIgniter\Pager\PagerInterface;
 use Config\App;
-use Config\Format;
 
 /**
  * Representation of an outgoing, getServer-side response.
@@ -54,11 +24,10 @@
  * - Status code and reason phrase
  * - Headers
  * - Message body
- *
- * @package CodeIgniter\HTTP
  */
-class Response extends Message implements ResponseInterface
+class Response extends Message implements MessageInterface, ResponseInterface
 {
+	use ResponseTrait;
 
 	/**
 	 * HTTP status codes
@@ -141,96 +110,38 @@
 
 	/**
 	 * The current reason phrase for this response.
-	 * If null, will use the default provided for the status code.
+	 * If empty string, will use the default provided for the status code.
 	 *
 	 * @var string
 	 */
-	protected $reason;
+	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;
 
 	/**
-	 * Whether Content Security Policy is being enforced.
-	 *
-	 * @var boolean
-	 */
-	protected $CSPEnabled = false;
-
-	/**
-	 * Content security policy handler
-	 *
-	 * @var \CodeIgniter\HTTP\ContentSecurityPolicy
-	 */
-	public $CSP;
-
-	/**
-	 * Set a cookie name prefix if you need to avoid collisions
-	 *
-	 * @var string
-	 */
-	protected $cookiePrefix = '';
-
-	/**
-	 * Set to .your-domain.com for site-wide cookies
-	 *
-	 * @var string
-	 */
-	protected $cookieDomain = '';
-
-	/**
-	 * Typically will be a forward slash
-	 *
-	 * @var string
-	 */
-	protected $cookiePath = '/';
-
-	/**
-	 * Cookie will only be set if a secure HTTPS connection exists.
-	 *
-	 * @var boolean
-	 */
-	protected $cookieSecure = false;
-
-	/**
-	 * Cookie will only be accessible via HTTP(S) (no javascript)
-	 *
-	 * @var boolean
-	 */
-	protected $cookieHTTPOnly = false;
-
-	/**
-	 * Stores all cookies that were set in the response.
-	 *
-	 * @var array
-	 */
-	protected $cookies = [];
-
-	/**
 	 * 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;
 
-	/**
-	 * Type of format the body is in.
-	 * Valid: html, json, xml
-	 *
-	 * @var string
-	 */
-	protected $bodyFormat = 'html';
-
 	//--------------------------------------------------------------------
 
 	/**
 	 * Constructor
 	 *
-	 * @param \Config\App $config
+	 * @param App $config
+	 *
+	 * @todo Recommend removing reliance on config injection
 	 */
 	public function __construct($config)
 	{
@@ -247,6 +158,12 @@
 		$this->cookiePath     = $config->cookiePath;
 		$this->cookieSecure   = $config->cookieSecure;
 		$this->cookieHTTPOnly = $config->cookieHTTPOnly;
+		$this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
+
+		if (! in_array(strtolower($this->cookieSameSite), ['', 'none', 'lax', 'strict'], true))
+		{
+			throw HTTPException::forInvalidSameSiteSetting($this->cookieSameSite);
+		}
 
 		// Default to an HTML Content-Type. Devs can override if needed.
 		$this->setContentType('text/html');
@@ -256,6 +173,8 @@
 
 	/**
 	 * 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
 	 *
@@ -286,55 +205,6 @@
 		return $this->statusCode;
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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 \CodeIgniter\HTTP\Exceptions\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;
-
-		if (! empty($reason))
-		{
-			$this->reason = $reason;
-		}
-		else
-		{
-			$this->reason = static::$statusCodes[$code];
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Gets the response response phrase associated with the status code.
 	 *
@@ -342,746 +212,34 @@
 	 * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
 	 *
 	 * @return string
+	 *
+	 * @deprecated Use getReasonPhrase()
 	 */
 	public function getReason(): string
 	{
-		if (empty($this->reason))
+		return $this->getReasonPhrase();
+	}
+
+    /**
+     * 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] : '';
 		}
 
 		return $this->reason;
 	}
-
-	//--------------------------------------------------------------------
-	// 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 \CodeIgniter\Pager\PagerInterface $pager
-	 *
-	 * @see http://tools.ietf.org/html/rfc5988
-	 *
-	 * @return Response
-	 */
-	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      $name
-	 *
-	 * @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')
-		{
-			/**
-			 * @var Format $config
-			 */
-			$config    = config(Format::class);
-			$formatter = $config->getFormatter('application/json');
-
-			$body = $formatter->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')
-		{
-			/**
-			 * @var Format $config
-			 */
-			$config    = config(Format::class);
-			$formatter = $config->getFormatter('application/xml');
-
-			$body = $formatter->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')
-		{
-			/**
-			 * @var Format $config
-			 */
-			$config    = config(Format::class);
-			$formatter = $config->getFormatter($mime);
-
-			$body = $formatter->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
-	 */
-	public function noCache(): self
-	{
-		$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->statusCode, $this->reason), true, $this->statusCode);
-
-		// Send all of our headers
-		foreach ($this->getHeaders() as $name => $values)
-		{
-			header($name . ': ' . $this->getHeaderLine($name), true, $this->statusCode);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sends the Body of the message to the browser.
-	 *
-	 * @return Response
-	 */
-	public function sendBody()
-	{
-		echo $this->body;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Grabs the current body.
-	 *
-	 * @return mixed|string
-	 */
-	public function getBody()
-	{
-		return $this->body;
-	}
-
-	/**
-	 * 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 \CodeIgniter\HTTP\Exceptions\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)
-		{
-			if ($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)
-	 *
-	 * @return $this
-	 */
-	public function setCookie(
-		$name,
-		$value = '',
-		$expire = '',
-		$domain = '',
-		$path = '/',
-		$prefix = '',
-		$secure = false,
-		$httponly = false
-	)
-	{
-		if (is_array($name))
-		{
-			// always leave 'name' in last place, as the loop will break otherwise, due to $$item
-			foreach (['value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item)
-			{
-				if (isset($name[$item]))
-				{
-					$$item = $name[$item];
-				}
-			}
-		}
-
-		if ($prefix === '' && $this->cookiePrefix !== '')
-		{
-			$prefix = $this->cookiePrefix;
-		}
-
-		if ($domain === '' && $this->cookieDomain !== '')
-		{
-			$domain = $this->cookieDomain;
-		}
-
-		if ($path === '/' && $this->cookiePath !== '/')
-		{
-			$path = $this->cookiePath;
-		}
-
-		if ($secure === false && $this->cookieSecure === true)
-		{
-			$secure = $this->cookieSecure;
-		}
-
-		if ($httponly === false && $this->cookieHTTPOnly !== false)
-		{
-			$httponly = $this->cookieHTTPOnly;
-		}
-
-		if (! is_numeric($expire))
-		{
-			$expire = time() - 86500;
-		}
-		else
-		{
-			$expire = ($expire > 0) ? time() + $expire : 0;
-		}
-
-		$this->cookies[] = [
-			'name'     => $prefix . $name,
-			'value'    => $value,
-			'expires'  => $expire,
-			'path'     => $path,
-			'domain'   => $domain,
-			'secure'   => $secure,
-			'httponly' => $httponly,
-		];
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	{
-		if ($prefix === '' && $this->cookiePrefix !== '')
-		{
-			$prefix = $this->cookiePrefix;
-		}
-
-		$name = $prefix . $name;
-
-		foreach ($this->cookies as $cookie)
-		{
-			if ($cookie['name'] !== $name)
-			{
-				continue;
-			}
-
-			if ($value === null)
-			{
-				return true;
-			}
-
-			return $cookie['value'] === $value;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the cookie
-	 *
-	 * @param string|null $name
-	 * @param string      $prefix
-	 *
-	 * @return mixed
-	 */
-	public function getCookie(string $name = null, string $prefix = '')
-	{
-		// if no name given, return them all
-		if (empty($name))
-		{
-			return $this->cookies;
-		}
-
-		if ($prefix === '' && $this->cookiePrefix !== '')
-		{
-			$prefix = $this->cookiePrefix;
-		}
-
-		$name = $prefix . $name;
-
-		foreach ($this->cookies as $cookie)
-		{
-			if ($cookie['name'] === $name)
-			{
-				return $cookie;
-			}
-		}
-		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 (empty($name))
-		{
-			return $this;
-		}
-
-		if ($prefix === '' && $this->cookiePrefix !== '')
-		{
-			$prefix = $this->cookiePrefix;
-		}
-
-		$name = $prefix . $name;
-
-		$cookieHasFlag = false;
-		foreach ($this->cookies as &$cookie)
-		{
-			if ($cookie['name'] === $name)
-			{
-				if (! empty($domain) && $cookie['domain'] !== $domain)
-				{
-					continue;
-				}
-				if (! empty($path) && $cookie['path'] !== $path)
-				{
-					continue;
-				}
-				$cookie['value']   = '';
-				$cookie['expires'] = '';
-				$cookieHasFlag     = true;
-				break;
-			}
-		}
-
-		if (! $cookieHasFlag)
-		{
-			$this->setCookie($name, '', '', $domain, $path, $prefix);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns all cookies currently set.
-	 *
-	 * @return array
-	 */
-	public function getCookies()
-	{
-		return $this->cookies;
-	}
-
-	/**
-	 * Actually sets the cookies.
-	 */
-	protected function sendCookies()
-	{
-		if ($this->pretend)
-		{
-			return;
-		}
-
-		foreach ($this->cookies as $params)
-		{
-			// PHP cannot unpack array with string keys
-			$params = array_values($params);
-
-			setcookie(...$params);
-		}
-	}
-
-	/**
-	 * 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 \CodeIgniter\HTTP\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/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index b39339d..c43dae2 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -1,46 +1,24 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Pager\PagerInterface;
+use DateTime;
+use InvalidArgumentException;
+
 /**
  * Representation of an outgoing, getServer-side response.
+ * Most of these methods are supplied by ResponseTrait.
  *
  * Per the HTTP specification, this interface includes properties for
  * each of the following:
@@ -50,12 +28,10 @@
  * - Headers
  * - Message body
  *
- * @package CodeIgniter\HTTP
- * @mixin   \CodeIgniter\HTTP\RedirectResponse
+ * @mixin \CodeIgniter\HTTP\RedirectResponse
  */
 interface ResponseInterface
 {
-
 	/**
 	 * Constants for status codes.
 	 * From  https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
@@ -138,6 +114,8 @@
 	 * to understand and satisfy the request.
 	 *
 	 * @return integer Status code.
+	 *
+	 * @deprecated To be replaced by the PSR-7 version (compatible)
 	 */
 	public function getStatusCode(): int;
 
@@ -158,7 +136,7 @@
 	 *                        default to the IANA name.
 	 *
 	 * @return self
-	 * @throws \InvalidArgumentException For invalid status code arguments.
+	 * @throws InvalidArgumentException For invalid status code arguments.
 	 */
 	public function setStatusCode(int $code, string $reason = '');
 
@@ -171,24 +149,45 @@
 	 * @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
+	 * @param DateTime $date
 	 *
 	 * @return ResponseInterface
 	 */
-	public function setDate(\DateTime $date);
+	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
@@ -202,6 +201,45 @@
 	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
 	//
@@ -214,8 +252,6 @@
 	 */
 	public function noCache();
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * A shortcut method that allows the developer to set all of the
 	 * cache-control headers in one method call.
@@ -247,19 +283,6 @@
 	public function setCache(array $options = []);
 
 	//--------------------------------------------------------------------
-
-	/**
-	 * 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);
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
 	// Output Methods
 	//--------------------------------------------------------------------
 
@@ -270,5 +293,121 @@
 	 */
 	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 mixed
+	 */
+	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 array
+	 */
+	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);
 }
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
new file mode 100644
index 0000000..e39ea36
--- /dev/null
+++ b/system/HTTP/ResponseTrait.php
@@ -0,0 +1,899 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Pager\PagerInterface;
+use Config\Services;
+use DateTime;
+use DateTimeZone;
+use InvalidArgumentException;
+
+/**
+ * Request Trait
+ *
+ * Additional methods to make a PSR-7 Response class
+ * compliant with the framework's own ResponseInterface.
+ *
+ * @see https://github.com/php-fig/http-message/blob/master/src/ResponseInterface.php
+ */
+trait ResponseTrait
+{
+	/**
+	 * Whether Content Security Policy is being enforced.
+	 *
+	 * @var boolean
+	 */
+	protected $CSPEnabled = false;
+
+	/**
+	 * Content security policy handler
+	 *
+	 * @var ContentSecurityPolicy
+	 */
+	public $CSP;
+
+	/**
+	 * Set a cookie name prefix if you need to avoid collisions
+	 *
+	 * @var string
+	 */
+	protected $cookiePrefix = '';
+
+	/**
+	 * Set to .your-domain.com for site-wide cookies
+	 *
+	 * @var string
+	 */
+	protected $cookieDomain = '';
+
+	/**
+	 * Typically will be a forward slash
+	 *
+	 * @var string
+	 */
+	protected $cookiePath = '/';
+
+	/**
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 */
+	protected $cookieSecure = false;
+
+	/**
+	 * Cookie will only be accessible via HTTP(S) (no javascript)
+	 *
+	 * @var boolean
+	 */
+	protected $cookieHTTPOnly = false;
+
+	/**
+	 * Cookie SameSite setting
+	 *
+	 * @var string
+	 */
+	protected $cookieSameSite = 'Lax';
+
+	/**
+	 * Stores all cookies that were set in the response.
+	 *
+	 * @var array
+	 */
+	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;
+
+		if (! empty($reason))
+		{
+			$this->reason = $reason;
+		}
+		else
+		{
+			$this->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 ($this->getHeaders() as $name => $values)
+		{
+			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)
+		{
+			if ($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 ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		if ($domain === '' && $this->cookieDomain !== '')
+		{
+			$domain = $this->cookieDomain;
+		}
+
+		if ($path === '/' && $this->cookiePath !== '/')
+		{
+			$path = $this->cookiePath;
+		}
+
+		if ($secure === false && $this->cookieSecure === true)
+		{
+			$secure = $this->cookieSecure;
+		}
+
+		if ($httponly === false && $this->cookieHTTPOnly !== false)
+		{
+			$httponly = $this->cookieHTTPOnly;
+		}
+
+		if (is_null($samesite))
+		{
+			$samesite = $this->cookieSameSite ?? '';
+		}
+
+		if (! in_array(strtolower($samesite), ['', 'none', 'lax', 'strict'], true))
+		{
+			throw HTTPException::forInvalidSameSiteSetting($samesite);
+		}
+
+		if (! is_numeric($expire))
+		{
+			$expire = time() - 86500;
+		}
+		else
+		{
+			$expire = ($expire > 0) ? time() + $expire : 0;
+		}
+
+		$cookie = [
+			'name'     => $prefix . $name,
+			'value'    => $value,
+			'expires'  => $expire,
+			'path'     => $path,
+			'domain'   => $domain,
+			'secure'   => $secure,
+			'httponly' => $httponly,
+		];
+
+		if ($samesite !== '')
+		{
+			$cookie['samesite'] = $samesite;
+		}
+
+		$this->cookies[] = $cookie;
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	{
+		if ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		$name = $prefix . $name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie['name'] !== $name)
+			{
+				continue;
+			}
+
+			if ($value === null)
+			{
+				return true;
+			}
+
+			return $cookie['value'] === $value;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the cookie
+	 *
+	 * @param string|null $name
+	 * @param string      $prefix
+	 *
+	 * @return mixed
+	 */
+	public function getCookie(string $name = null, string $prefix = '')
+	{
+		// if no name given, return them all
+		if (empty($name))
+		{
+			return $this->cookies;
+		}
+
+		if ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		$name = $prefix . $name;
+
+		foreach ($this->cookies as $cookie)
+		{
+			if ($cookie['name'] === $name)
+			{
+				return $cookie;
+			}
+		}
+		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 (empty($name))
+		{
+			return $this;
+		}
+
+		if ($prefix === '' && $this->cookiePrefix !== '')
+		{
+			$prefix = $this->cookiePrefix;
+		}
+
+		$prefixedName = $prefix . $name;
+
+		$cookieHasFlag = false;
+		foreach ($this->cookies as &$cookie)
+		{
+			if ($cookie['name'] === $prefixedName)
+			{
+				if (! empty($domain) && $cookie['domain'] !== $domain)
+				{
+					continue;
+				}
+				if (! empty($path) && $cookie['path'] !== $path)
+				{
+					continue;
+				}
+				$cookie['value']   = '';
+				$cookie['expires'] = '';
+				$cookieHasFlag     = true;
+				break;
+			}
+		}
+
+		if (! $cookieHasFlag)
+		{
+			$this->setCookie($name, '', '', $domain, $path, $prefix);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Returns all cookies currently set.
+	 *
+	 * @return array
+	 */
+	public function getCookies()
+	{
+		return $this->cookies;
+	}
+
+	/**
+	 * Actually sets the cookies.
+	 */
+	protected function sendCookies()
+	{
+		if ($this->pretend)
+		{
+			return;
+		}
+
+		foreach ($this->cookies as $params)
+		{
+			if (PHP_VERSION_ID < 70300)
+			{
+				// For PHP 7.2 we need to use the hacky method of setting SameSite in the path
+				if (isset($params['samesite']) && in_array(strtolower($params['samesite']), ['none', 'lax', 'strict'], true))
+				{
+					$params['path'] .= '; samesite=' . $params['samesite'];
+					unset($params['samesite']);
+				}
+
+				// PHP cannot unpack array with string keys
+				$params = array_values($params);
+				setcookie(...$params);
+			}
+			else
+			{
+				// PHP 7.3 and later have a signature for setcookie() with options array as third argument
+				// and SameSite is possible to set there
+				$name  = $params['name'];
+				$value = $params['value'];
+				unset($params['name'], $params['value']);
+
+				// If samesite is blank string, skip setting the attribute on the cookie
+				if (isset($params['samesite']) && $params['samesite'] === '')
+				{
+					unset($params['samesite']);
+				}
+
+				setcookie($name, $value, $params);
+			}
+		}
+	}
+
+	/**
+	 * 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;
+	}
+}
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index fc79756..27d8379 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1,52 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
+use Config\App;
+use InvalidArgumentException;
 
 /**
  * Abstraction for a uniform resource identifier (URI).
  */
 class URI
 {
-
 	/**
 	 * Sub-delimiters used in query strings and fragments.
 	 *
@@ -160,6 +133,13 @@
 	 */
 	protected $silent = false;
 
+	/**
+	 * If true, will use raw query string.
+	 *
+	 * @var boolean
+	 */
+	protected $rawQueryString = false;
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -167,7 +147,7 @@
 	 *
 	 * @param string $uri
 	 *
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 */
 	public function __construct(string $uri = null)
 	{
@@ -197,6 +177,23 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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
@@ -418,7 +415,7 @@
 	 */
 	public function getPath(): string
 	{
-		return (is_null($this->path)) ? '' : $this->path;
+		return $this->path ?? '';
 	}
 
 	//--------------------------------------------------------------------
@@ -478,7 +475,7 @@
 	 */
 	public function getFragment(): string
 	{
-		return is_null($this->fragment) ? '' : $this->fragment;
+		return $this->fragment ?? '';
 	}
 
 	//--------------------------------------------------------------------
@@ -569,9 +566,29 @@
 	 */
 	public function __toString(): string
 	{
+		// If hosted in a sub-folder, we will have additional
+		// segments that show up prior to the URI path we just
+		// grabbed from the request, so add it on if necessary.
+		$config   = config(App::class);
+		$baseUri  = new self($config->baseURL);
+		$basePath = trim($baseUri->getPath(), '/') . '/';
+		$path     = $this->getPath();
+		$trimPath = ltrim($path, '/');
+
+		if ($basePath !== '/' && strpos($trimPath, $basePath) !== 0)
+		{
+			$path = $basePath . $trimPath;
+		}
+
+		// force https if needed
+		if ($config->forceGlobalSecureRequests)
+		{
+			$this->setScheme('https');
+		}
+
 		return static::createURIString(
-						$this->getScheme(), $this->getAuthority(), $this->getPath(), // Absolute URIs should use a "/" for an empty path
-						$this->getQuery(), $this->getFragment()
+			$this->getScheme(), $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
+			$this->getQuery(), $this->getFragment()
 		);
 	}
 
@@ -640,7 +657,7 @@
 		if (empty($parts['host']) && $parts['path'] !== '')
 		{
 			$parts['host'] = $parts['path'];
-			unset($parts['path']);
+			unset($parts['path']); // @phpstan-ignore-line
 		}
 
 		$this->applyParts($parts);
@@ -658,7 +675,7 @@
 	 *
 	 * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
 	 *
-	 * @param $str
+	 * @param string $str
 	 *
 	 * @return $this
 	 */
@@ -760,8 +777,6 @@
 	/**
 	 * Sets the path portion of the URI based on segments.
 	 *
-	 * @param string $path
-	 *
 	 * @return $this
 	 */
 	public function refreshPath()
@@ -803,7 +818,14 @@
 			$query = substr($query, 1);
 		}
 
-		parse_str($query, $this->query);
+		if ($this->rawQueryString)
+		{
+			$this->query = $this->parseStr($query);
+		}
+		else
+		{
+			parse_str($query, $this->query);
+		}
 
 		return $this;
 	}
@@ -816,7 +838,7 @@
 	 *
 	 * @param array $query
 	 *
-	 * @return \CodeIgniter\HTTP\URI
+	 * @return URI
 	 */
 	public function setQueryArray(array $query)
 	{
@@ -847,7 +869,7 @@
 	/**
 	 * Removes one or more query vars from the URI.
 	 *
-	 * @param array ...$params
+	 * @param string ...$params
 	 *
 	 * @return $this
 	 */
@@ -867,7 +889,7 @@
 	 * Filters the query variables so that only the keys passed in
 	 * are kept. The rest are removed from the object.
 	 *
-	 * @param array ...$params
+	 * @param string ...$params
 	 *
 	 * @return $this
 	 */
@@ -877,7 +899,7 @@
 
 		foreach ($this->query as $key => $value)
 		{
-			if (! in_array($key, $params))
+			if (! in_array($key, $params, true))
 			{
 				continue;
 			}
@@ -915,7 +937,7 @@
 	 * While dot segments have valid uses according to the spec,
 	 * this URI class does not allow them.
 	 *
-	 * @param $path
+	 * @param string|null $path
 	 *
 	 * @return string
 	 */
@@ -1025,7 +1047,7 @@
 	 *
 	 * @param string $uri
 	 *
-	 * @return \CodeIgniter\HTTP\URI
+	 * @return URI
 	 */
 	public function resolveRelativeURI(string $uri)
 	{
@@ -1033,7 +1055,7 @@
 		 * NOTE: We don't use removeDotSegments in this
 		 * algorithm since it's already done by this line!
 		 */
-		$relative = new URI();
+		$relative = new self();
 		$relative->setURI($uri);
 
 		if ($relative->getScheme() === $this->getScheme())
@@ -1163,7 +1185,7 @@
 			{
 				array_pop($output);
 			}
-			else if ($segment !== '.' && $segment !== '')
+			elseif ($segment !== '.' && $segment !== '')
 			{
 				array_push($output, $segment);
 			}
@@ -1191,4 +1213,38 @@
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * 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;
+	}
+
+	//--------------------------------------------------------------------
 }
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 4f7777a..029775e 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
@@ -77,7 +49,7 @@
 	/**
 	 * Holds the config file contents.
 	 *
-	 * @var \Config\UserAgents
+	 * @var UserAgents
 	 */
 	protected $config;
 
@@ -130,7 +102,7 @@
 	 *
 	 * Sets the User Agent and runs the compilation routine
 	 *
-	 * @param null|\Config\UserAgents $config
+	 * @param null|UserAgents $config
 	 */
 	public function __construct(UserAgents $config = null)
 	{
@@ -238,10 +210,10 @@
 			}
 			else
 			{
-				$referer_host = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
-				$own_host     = parse_url(\base_url(), PHP_URL_HOST);
+				$refererHost = @parse_url($_SERVER['HTTP_REFERER'], PHP_URL_HOST);
+				$ownHost     = parse_url(\base_url(), PHP_URL_HOST);
 
-				$this->referrer = ($referer_host && $referer_host !== $own_host);
+				$this->referrer = ($refererHost && $refererHost !== $ownHost);
 			}
 		}
 
@@ -307,6 +279,7 @@
 	{
 		return $this->robot;
 	}
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -359,6 +332,7 @@
 			$this->compileData();
 		}
 	}
+
 	//--------------------------------------------------------------------
 
 	/**
@@ -498,5 +472,4 @@
 	{
 		return $this->getAgentString();
 	}
-
 }
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index c114df9..c37288c 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -1,45 +1,16 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * CodeIgniter Array Helpers
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('dot_array_search'))
@@ -79,7 +50,7 @@
 			? array_shift($indexes)
 			: null;
 
-		if ((empty($currentIndex)  && intval($currentIndex) !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*'))
+		if ((empty($currentIndex) && (int) $currentIndex !== 0) || (! isset($array[$currentIndex]) && $currentIndex !== '*'))
 		{
 			return null;
 		}
@@ -88,21 +59,18 @@
 		if ($currentIndex === '*')
 		{
 			// If $array has more than 1 item, we have to loop over each.
-			if (is_array($array))
+			foreach ($array as $value)
 			{
-				foreach ($array as $value)
+				$answer = _array_search_dot($indexes, $value);
+
+				if ($answer !== null)
 				{
-					$answer = _array_search_dot($indexes, $value);
-
-					if ($answer !== null)
-					{
-						return $answer;
-					}
+					return $answer;
 				}
-
-				// Still here after searching all child nodes?
-				return null;
 			}
+
+			// Still here after searching all child nodes?
+			return null;
 		}
 
 		// If this is the last index, make sure to return it now,
@@ -122,3 +90,143 @@
 		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))
+			{
+				if ($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_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 50ab392..397d018 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -1,47 +1,21 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
+use Config\App;
+use Config\Services;
+
 // --------------------------------------------------------------------
 
 /**
  * CodeIgniter Cookie Helpers
- *
- * @package CodeIgniter
  */
 if (! function_exists('set_cookie'))
 {
@@ -61,16 +35,27 @@
 	 * @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 (\Config\Services::response())->setCookie()
 	 * @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)
+	function set_cookie(
+		$name,
+		string $value = '',
+		string $expire = '',
+		string $domain = '',
+		string $path = '/',
+		string $prefix = '',
+		bool $secure = false,
+		bool $httpOnly = false,
+		string $sameSite = null
+	)
 	{
 		// The following line shows as a syntax error in NetBeans IDE
 		//(\Config\Services::response())->setcookie
-		$response = \Config\Services::response();
-		$response->setcookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly);
+		$response = Services::response();
+		$response->setcookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly, $sameSite);
 	}
 }
 
@@ -84,17 +69,18 @@
 	 * @param string  $index
 	 * @param boolean $xssClean
 	 *
-	 * @see    (\Config\Services::request())->getCookie()
-	 * @see    \CodeIgniter\HTTP\IncomingRequest::getCookie()
 	 * @return mixed
+	 *
+	 * @see (\Config\Services::request())->getCookie()
+	 * @see \CodeIgniter\HTTP\IncomingRequest::getCookie()
 	 */
 	function get_cookie($index, bool $xssClean = false)
 	{
-		$app             = config(\Config\App::class);
+		$app             = config(App::class);
 		$appCookiePrefix = $app->cookiePrefix;
 		$prefix          = isset($_COOKIE[$index]) ? '' : $appCookiePrefix;
 
-		$request = \Config\Services::request();
+		$request = Services::request();
 		$filter  = true === $xssClean ? FILTER_SANITIZE_STRING : null;
 
 		return $request->getCookie($prefix . $index, $filter);
@@ -108,16 +94,18 @@
 	/**
 	 * 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    (\Config\Services::response())->setCookie()
-	 * @see    \CodeIgniter\HTTP\Response::setcookie()
+	 * @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 (\Config\Services::response())->deleteCookie()
+	 * @see \CodeIgniter\HTTP\Response::deleteCookie()
 	 */
 	function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
 	{
-		\Config\Services::response()->deleteCookie($name, $domain, $path, $prefix);
+		Services::response()->deleteCookie($name, $domain, $path, $prefix);
 	}
 }
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 1951d25..11e8d47 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -1,45 +1,16 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * CodeIgniter Date Helpers
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('now'))
@@ -53,7 +24,7 @@
 	 * @param string $timezone
 	 *
 	 * @return integer
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	function now(string $timezone = null): int
 	{
@@ -84,17 +55,17 @@
 	 * @param string  $country A two-letter ISO 3166-1 compatible country code (for listIdentifiers)
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	function timezone_select(string $class = '', string $default = '', int $what = \DateTimeZone::ALL, string $country = null): string
+	function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, string $country = null): string
 	{
-		$timezones = \DateTimeZone::listIdentifiers($what, $country);
+		$timezones = DateTimeZone::listIdentifiers($what, $country);
 
 		$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;
+			$buffer .= "<option value='{$timezone}' {$selected}>{$timezone}</option>" . PHP_EOL;
 		}
 
 		return $buffer . ('</select>' . PHP_EOL);
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index bf0353c..9fc6c02 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -1,47 +1,16 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2008-2014 EllisLab, Inc. (https://ellislab.com/)
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * CodeIgniter File System Helpers
- *
- * @package CodeIgniter
  */
 // ------------------------------------------------------------------------
 
@@ -54,22 +23,22 @@
 	 * representation of it. Sub-folders contained with the
 	 * directory will be mapped as well.
 	 *
-	 * @param string  $source_dir      Path to source
-	 * @param integer $directory_depth Depth of directories to traverse
+	 * @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
+	 * @param boolean $hidden         Whether to show hidden files
 	 *
 	 * @return array
 	 */
-	function directory_map(string $source_dir, int $directory_depth = 0, bool $hidden = false): array
+	function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden = false): array
 	{
 		try
 		{
-			$fp = opendir($source_dir);
+			$fp = opendir($sourceDir);
 
-			$fileData   = [];
-			$new_depth  = $directory_depth - 1;
-			$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+			$fileData  = [];
+			$newDepth  = $directoryDepth - 1;
+			$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
 			while (false !== ($file = readdir($fp)))
 			{
@@ -79,11 +48,11 @@
 					continue;
 				}
 
-				is_dir($source_dir . $file) && $file .= DIRECTORY_SEPARATOR;
+				is_dir($sourceDir . $file) && $file .= DIRECTORY_SEPARATOR;
 
-				if (($directory_depth < 1 || $new_depth > 0) && is_dir($source_dir . $file))
+				if (($directoryDepth < 1 || $newDepth > 0) && is_dir($sourceDir . $file))
 				{
-					$fileData[$file] = directory_map($source_dir . $file, $new_depth, $hidden);
+					$fileData[$file] = directory_map($sourceDir . $file, $newDepth, $hidden);
 				}
 				else
 				{
@@ -94,7 +63,7 @@
 			closedir($fp);
 			return $fileData;
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			return [];
 		}
@@ -138,7 +107,7 @@
 
 			return is_int($result);
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			return false;
 		}
@@ -157,14 +126,14 @@
 	 * 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 $del_dir 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)
+	 * @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 $del_dir = false, bool $htdocs = false, bool $hidden = false): bool
+	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;
@@ -177,21 +146,19 @@
 			) as $object)
 			{
 				$filename = $object->getFilename();
-
 				if (! $hidden && $filename[0] === '.')
 				{
 					continue;
 				}
-				elseif (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
+
+				if (! $htdocs || ! preg_match('/^(\.htaccess|index\.(html|htm|php)|web\.config)$/i', $filename))
 				{
 					$isDir = $object->isDir();
-
-					if ($isDir && $del_dir)
+					if ($isDir && $delDir)
 					{
 						@rmdir($object->getPathname());
 						continue;
 					}
-
 					if (! $isDir)
 					{
 						@unlink($object->getPathname());
@@ -201,7 +168,7 @@
 
 			return true;
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			return false;
 		}
@@ -218,39 +185,39 @@
 	 * 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       $source_dir   Path to source
-	 * @param boolean|null $include_path 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)
+	 * @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 $source_dir, ?bool $include_path = false, bool $hidden = false): array
+	function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
 	{
 		$files = [];
 
-		$source_dir = realpath($source_dir) ?: $source_dir;
-		$source_dir = rtrim($source_dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+		$sourceDir = realpath($sourceDir) ?: $sourceDir;
+		$sourceDir = rtrim($sourceDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
 		try
 		{
 			foreach (new RecursiveIteratorIterator(
-					new RecursiveDirectoryIterator($source_dir, RecursiveDirectoryIterator::SKIP_DOTS),
+					new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
 					RecursiveIteratorIterator::SELF_FIRST
 				) as $name => $object)
 			{
 				$basename = pathinfo($name, PATHINFO_BASENAME);
-
 				if (! $hidden && $basename[0] === '.')
 				{
 					continue;
 				}
-				elseif ($include_path === false)
+
+				if ($includePath === false)
 				{
 					$files[] = $basename;
 				}
-				elseif (is_null($include_path))
+				elseif (is_null($includePath))
 				{
-					$files[] = str_replace($source_dir, '', $name);
+					$files[] = str_replace($sourceDir, '', $name);
 				}
 				else
 				{
@@ -258,7 +225,7 @@
 				}
 			}
 		}
-		catch (\Throwable $e)
+		catch (Throwable $e)
 		{
 			return [];
 		}
@@ -281,38 +248,38 @@
 	 *
 	 * Any sub-folders contained within the specified path are read as well.
 	 *
-	 * @param string  $source_dir     Path to source
-	 * @param boolean $top_level_only Look only at the top level directory specified?
-	 * @param boolean $recursion      Internal variable to determine recursion status - do not use in calls
+	 * @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 $source_dir, bool $top_level_only = true, bool $recursion = false): array
+	function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $recursion = false): array
 	{
 		static $fileData = [];
-		$relative_path   = $source_dir;
+		$relativePath    = $sourceDir;
 
 		try
 		{
-			$fp = @opendir($source_dir); {
+			$fp = @opendir($sourceDir); {
 				// reset the array and make sure $source_dir has a trailing slash on the initial call
 			if ($recursion === false)
 				{
-				$fileData   = [];
-				$source_dir = rtrim(realpath($source_dir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+				$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($source_dir . $file) && $file[0] !== '.' && $top_level_only === false)
+				if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false)
 				{
-					get_dir_file_info($source_dir . $file . DIRECTORY_SEPARATOR, $top_level_only, true);
+					get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
 				}
 				elseif ($file[0] !== '.')
 				{
-					$fileData[$file]                  = get_file_info($source_dir . $file);
-					$fileData[$file]['relative_path'] = $relative_path;
+					$fileData[$file]                  = get_file_info($sourceDir . $file);
+					$fileData[$file]['relative_path'] = $relativePath;
 				}
 			}
 
@@ -320,7 +287,7 @@
 				return $fileData;
 			}
 		}
-		catch (\Throwable $fe)
+		catch (Throwable $fe)
 		{
 			return [];
 		}
@@ -339,24 +306,24 @@
 	 * 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  $returned_values Array or comma separated string of information returned
+	 * @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, $returned_values = ['name', 'server_path', 'size', 'date'])
+	function get_file_info(string $file, $returnedValues = ['name', 'server_path', 'size', 'date'])
 	{
 		if (! is_file($file))
 		{
 			return null;
 		}
 
-		if (is_string($returned_values))
+		if (is_string($returnedValues))
 		{
-			$returned_values = explode(',', $returned_values);
+			$returnedValues = explode(',', $returnedValues);
 		}
 
-		foreach ($returned_values as $key)
+		foreach ($returnedValues as $key)
 		{
 			switch ($key) {
 				case 'name':
@@ -386,7 +353,7 @@
 			}
 		}
 
-		return $fileInfo;
+		return $fileInfo; // @phpstan-ignore-line
 	}
 }
 
@@ -441,17 +408,17 @@
 		// Owner
 		$symbolic .= (($perms & 0x0100) ? 'r' : '-')
 				. (($perms & 0x0080) ? 'w' : '-')
-				. (($perms & 0x0040) ? (($perms & 0x0800) ? 's' : 'x' ) : (($perms & 0x0800) ? 'S' : '-'));
+				. (($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' : '-'));
+				. (($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' : '-'));
+				. (($perms & 0x0001) ? (($perms & 0x0200) ? 't' : 'x') : (($perms & 0x0200) ? 'T' : '-'));
 
 		return $symbolic;
 	}
@@ -484,11 +451,11 @@
 	 * Set Realpath
 	 *
 	 * @param string  $path
-	 * @param boolean $check_existence Checks to see if the path exists
+	 * @param boolean $checkExistence Checks to see if the path exists
 	 *
 	 * @return string
 	 */
-	function set_realpath(string $path, bool $check_existence = false): 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)
@@ -501,7 +468,7 @@
 		{
 			$path = realpath($path);
 		}
-		elseif ($check_existence && ! is_dir($path) && ! is_file($path))
+		elseif ($checkExistence && ! is_dir($path) && ! is_file($path))
 		{
 			throw new InvalidArgumentException('Not a valid path: ' . $path);
 		}
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 5a1ad9d..b1c06c3 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -1,50 +1,22 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
-use Config\Services;
+use Config\App;
 
 /**
  * CodeIgniter Form Helpers
- *
- * @package CodeIgniter
  */
 
+use Config\Services;
+
 //--------------------------------------------------------------------
 
 if (! function_exists('form_open'))
@@ -92,7 +64,7 @@
 		}
 		if (stripos($attributes, 'accept-charset=') === false)
 		{
-			$config      = config(\Config\App::class);
+			$config      = config(App::class);
 			$attributes .= ' accept-charset="' . strtolower($config->charset) . '"';
 		}
 
@@ -102,7 +74,7 @@
 		$before = Services::filters()
 						  ->getFilters()['before'];
 
-		if ((in_array('csrf', $before) || array_key_exists('csrf', $before)) && strpos($action, base_url()) !== false && ! stripos($form, 'method="get"'))
+		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);
 		}
@@ -186,7 +158,7 @@
 
 		if (! is_array($value))
 		{
-			$form .= '<input type="hidden" name="' . $name . '" value="' . esc($value) . "\" style=\"display:none;\" />\n";
+			$form .= form_input($name, $value, '', 'hidden');
 		}
 		else
 		{
@@ -245,7 +217,7 @@
 	 */
 	function form_password($data = '', string $value = '', $extra = ''): string
 	{
-		is_array($data) || $data = ['name' => $data];
+		is_array($data) || $data = ['name' => $data]; // @phpstan-ignore-line
 		$data['type']            = 'password';
 
 		return form_input($data, $value, $extra);
@@ -269,12 +241,14 @@
 	 */
 	function form_upload($data = '', string $value = '', $extra = ''): string
 	{
-		$defaults                = [
+		$defaults = [
 			'type' => 'file',
 			'name' => '',
 		];
-		is_array($data) || $data = ['name' => $data];
-		$data['type']            = 'file';
+
+		is_array($data) || $data = ['name' => $data]; // @phpstan-ignore-line
+
+		$data['type'] = 'file';
 
 		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
 	}
@@ -310,7 +284,18 @@
 			unset($data['value']); // textareas don't use the value attribute
 		}
 
-		return '<textarea ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . '>'
+		// 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) && strpos(strtolower(preg_replace('/\s+/', '', $extra)), 'rows=') !== false))
+		{
+			unset($defaults['rows']);
+		}
+
+		if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && strpos(strtolower(preg_replace('/\s+/', '', $extra)), 'cols=') !== false))
+		{
+			unset($defaults['cols']);
+		}
+
+		return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes($extra) . '>'
 				. htmlspecialchars($val)
 				. "</textarea>\n";
 	}
@@ -378,8 +363,9 @@
 			$defaults = ['name' => $data];
 		}
 
-		is_array($selected) || $selected = [$selected];
-		is_array($options) || $options   = [$options];
+		is_array($selected) || $selected = [$selected]; // @phpstan-ignore-line
+
+		is_array($options) || $options = [$options]; // @phpstan-ignore-line
 
 		// If no selected state was submitted we will attempt to set it automatically
 		if (empty($selected))
@@ -410,18 +396,18 @@
 					continue;
 				}
 				$form .= '<optgroup label="' . $key . "\">\n";
-				foreach ($val as $optgroup_key => $optgroup_val)
+				foreach ($val as $optgroupKey => $optgroupVal)
 				{
-					$sel   = in_array($optgroup_key, $selected) ? ' selected="selected"' : '';
-					$form .= '<option value="' . htmlspecialchars($optgroup_key) . '"' . $sel . '>'
-							. $optgroup_val . "</option>\n";
+					$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) ? ' selected="selected"' : '') . '>'
+						. (in_array($key, $selected, true) ? ' selected="selected"' : '') . '>'
 						. $val . "</option>\n";
 			}
 		}
@@ -448,7 +434,7 @@
 	{
 		$defaults = [
 			'type'  => 'checkbox',
-			'name'  => ( ! is_array($data) ? $data : ''),
+			'name'  => (! is_array($data) ? $data : ''),
 			'value' => $value,
 		];
 
@@ -471,7 +457,10 @@
 		}
 		else
 		{
-			unset($defaults['checked']);
+			if (isset($defaults['checked']))
+			{
+				unset($defaults['checked']);
+			}
 		}
 
 		return '<input ' . parse_form_attributes($data, $defaults) . stringify_attributes($extra) . " />\n";
@@ -494,7 +483,7 @@
 	 */
 	function form_radio($data = '', string $value = '', bool $checked = false, $extra = ''): string
 	{
-		is_array($data) || $data = ['name' => $data];
+		is_array($data) || $data = ['name' => $data]; // @phpstan-ignore-line
 		$data['type']            = 'radio';
 
 		return form_checkbox($data, $value, $checked, $extra);
@@ -590,13 +579,13 @@
 	/**
 	 * Form Label Tag
 	 *
-	 * @param string $label_text The text to appear onscreen
+	 * @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 $label_text = '', string $id = '', array $attributes = []): string
+	function form_label(string $labelText = '', string $id = '', array $attributes = []): string
 	{
 		$label = '<label';
 
@@ -613,7 +602,7 @@
 			}
 		}
 
-		return $label . '>' . $label_text . '</label>';
+		return $label . '>' . $labelText . '</label>';
 	}
 }
 
@@ -643,7 +632,8 @@
 			'value' => $value,
 		];
 
-		$out  = form_input($data) . "\n";
+		$out = form_input($data) . "\n";
+
 		$out .= "<datalist id='" . $name . '_list' . "'>";
 
 		foreach ($options as $option)
@@ -665,18 +655,18 @@
 	 * Used to produce <fieldset><legend>text</legend>.  To close fieldset
 	 * use form_fieldset_close()
 	 *
-	 * @param string $legend_text The legend text
-	 * @param array  $attributes  Additional attributes
+	 * @param string $legendText The legend text
+	 * @param array  $attributes Additional attributes
 	 *
 	 * @return string
 	 */
-	function form_fieldset(string $legend_text = '', array $attributes = []): string
+	function form_fieldset(string $legendText = '', array $attributes = []): string
 	{
 		$fieldset = '<fieldset' . stringify_attributes($attributes) . ">\n";
 
-		if ($legend_text !== '')
+		if ($legendText !== '')
 		{
-			return $fieldset . '<legend>' . $legend_text . "</legend>\n";
+			return $fieldset . '<legend>' . $legendText . "</legend>\n";
 		}
 
 		return $fieldset;
@@ -727,13 +717,13 @@
 	 * 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  $default     Default value
-	 * @param boolean $html_escape Whether to escape HTML special characters or not
+	 * @param string          $field      Field name
+	 * @param string|string[] $default    Default value
+	 * @param boolean         $htmlEscape Whether to escape HTML special characters or not
 	 *
-	 * @return string
+	 * @return string|string[]
 	 */
-	function set_value(string $field, string $default = '', bool $html_escape = true): string
+	function set_value(string $field, $default = '', bool $htmlEscape = true)
 	{
 		$request = Services::request();
 
@@ -745,7 +735,7 @@
 			$value = $request->getPost($field) ?? $default;
 		}
 
-		return ($html_escape) ? esc($value) : $value;
+		return ($htmlEscape) ? esc($value) : $value;
 	}
 }
 
@@ -954,7 +944,7 @@
 				{
 					continue;
 				}
-				$att .= $key . '="' . $val . '" ';
+				$att .= $key . '="' . $val . '"' . ($val === end($default) ? '' : ' ');
 			}
 			else
 			{
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 535812b..cd659a9 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -1,47 +1,22 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use Config\DocTypes;
+use Config\Mimes;
+
 // --------------------------------------------------------------------
 
 /**
  * CodeIgniter HTML Helpers
- *
- * @package CodeIgniter
  */
 if (! function_exists('ul'))
 {
@@ -51,8 +26,9 @@
 	 * Generates an HTML unordered list from an single or
 	 * multi-dimensional array.
 	 *
-	 * @param  array $list
-	 * @param  mixed $attributes HTML attributes string, array, object
+	 * @param array $list
+	 * @param mixed $attributes HTML attributes string, array, object
+	 *
 	 * @return string
 	 */
 	function ul(array $list, $attributes = ''): string
@@ -70,8 +46,9 @@
 	 *
 	 * Generates an HTML ordered list from an single or multi-dimensional array.
 	 *
-	 * @param  array $list
-	 * @param  mixed $attributes HTML attributes string, array, object
+	 * @param array $list
+	 * @param mixed $attributes HTML attributes string, array, object
+	 *
 	 * @return string
 	 */
 	function ol(array $list, $attributes = ''): string
@@ -89,10 +66,11 @@
 	 *
 	 * 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
+	 * @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
@@ -141,9 +119,10 @@
 	 *
 	 * Generates an image element
 	 *
-	 * @param  mixed   $src
-	 * @param  boolean $indexPage
-	 * @param  mixed   $attributes
+	 * @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
@@ -152,7 +131,10 @@
 		{
 			$src = ['src' => $src];
 		}
-
+		if (! isset($src['src']))
+		{
+			$src['src'] = $attributes['src'] ?? '';
+		}
 		if (! isset($src['alt']))
 		{
 			$src['alt'] = $attributes['alt'] ?? '';
@@ -160,36 +142,71 @@
 
 		$img = '<img';
 
-		foreach ($src as $k => $v)
+		// Check for a relative URI
+		if (! preg_match('#^([a-z]+:)?//#i', $src['src']) && strpos($src['src'], 'data:') !== 0)
 		{
-			//Include a protocol if nothing is explicitely defined.
-			if ($k === 'src' && ! preg_match('#^([a-z]+:)?//#i', $v))
+			if ($indexPage === true)
 			{
-				if ($indexPage === true)
-				{
-					$img .= ' src="' . site_url($v) . '"';
-				}
-				else
-				{
-					$img .= ' src="' . slash_item('baseURL') . $v . '"';
-				}
+				$img .= ' src="' . site_url($src['src']) . '"';
 			}
 			else
 			{
-				$img .= ' ' . $k . '="' . $v . '"';
+				$img .= ' src="' . slash_item('baseURL') . $src['src'] . '"';
 			}
+
+			unset($src['src']);
 		}
 
-		// prevent passing "alt" to stringify_attributes
-		if (is_array($attributes) && isset($attributes['alt']))
+		// Append any other values
+		foreach ($src as $key => $value)
 		{
-			unset($attributes['alt']);
+			$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('doctype'))
@@ -203,12 +220,13 @@
 	 * 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
+	 * @param string $type The doctype to be generated
+	 *
 	 * @return string
 	 */
 	function doctype(string $type = 'html5'): string
 	{
-		$config   = new \Config\DocTypes();
+		$config   = new DocTypes();
 		$doctypes = $config->list;
 		return $doctypes[$type] ?? false;
 	}
@@ -223,8 +241,9 @@
 	 *
 	 * 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
+	 * @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
@@ -267,13 +286,14 @@
 	 *
 	 * 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
+	 * @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
@@ -287,7 +307,7 @@
 			$type      = $href['type'] ?? $type;
 			$title     = $href['title'] ?? $title;
 			$media     = $href['media'] ?? $media;
-            		$hreflang  = $href['hreflang'] ?? '';
+			$hreflang  = $href['hreflang'] ?? '';
 			$indexPage = $href['indexPage'] ?? $indexPage;
 			$href      = $href['href'] ?? '';
 		}
@@ -310,14 +330,14 @@
 
 		if ($hreflang !== '')
 		{
-		    $link .= 'hreflang="' . $hreflang .'" ';
+			$link .= 'hreflang="' . $hreflang . '" ';
 		}
 
 		$link .= 'rel="' . $rel . '" ';
 
-		if (! in_array($rel, ['alternate','canonical']))
+		if (! in_array($rel, ['alternate', 'canonical'], true))
 		{
-		    $link .= 'type="' . $type . '" ';
+			$link .= 'type="' . $type . '" ';
 		}
 
 		if ($media !== '')
@@ -344,11 +364,12 @@
 	 * 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
+	 * @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
@@ -524,10 +545,11 @@
 	 * 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
+	 * @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
@@ -566,10 +588,11 @@
 	 * 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
+	 * @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
@@ -642,10 +665,11 @@
 	 * 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
+	 * @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
@@ -666,10 +690,11 @@
 	 *
 	 * 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
+	 * @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
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index bf869df..36ea9b5 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -1,47 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 // --------------------------------------------------------------------
 
 /**
  * CodeIgniter Inflector Helpers
- *
- * @package CodeIgniter
  */
 if (! function_exists('singular'))
 {
@@ -50,12 +21,13 @@
 	 *
 	 * Takes a plural word and makes it singular
 	 *
-	 * @param  string $string Input string
+	 * @param string $string Input string
+	 *
 	 * @return string
 	 */
 	function singular(string $string): string
 	{
-		$result = strval($string);
+		$result = $string;
 
 		if (! is_pluralizable($result))
 		{
@@ -116,12 +88,13 @@
 	 *
 	 * Takes a singular word and makes it plural
 	 *
-	 * @param  string $string Input string
+	 * @param string $string Input string
+	 *
 	 * @return string
 	 */
 	function plural(string $string): string
 	{
-		$result = strval($string);
+		$result = $string;
 
 		if (! is_pluralizable($result))
 		{
@@ -174,8 +147,9 @@
 	 * 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
+	 * @param integer $count  Number of items
+	 * @param string  $string Input string
+	 *
 	 * @return string
 	 */
 	function counted(int $count, string $string): string
@@ -216,7 +190,8 @@
 	 * underscores and converts them to Pascal case,
 	 * which is camel case with an uppercase first letter.
 	 *
-	 * @param  string $string Input string
+	 * @param string $string Input string
+	 *
 	 * @return string
 	 */
 	function pascalize(string $string): string
@@ -234,7 +209,8 @@
 	 *
 	 * Takes multiple words separated by spaces and underscores them
 	 *
-	 * @param  string $string Input string
+	 * @param string $string Input string
+	 *
 	 * @return string
 	 */
 	function underscore(string $string): string
@@ -255,8 +231,9 @@
 	 * Takes multiple words separated by the separator,
 	 * camelizes and changes them to spaces
 	 *
-	 * @param  string $string    Input string
-	 * @param  string $separator Input separator
+	 * @param string $string    Input string
+	 * @param string $separator Input separator
+	 *
 	 * @return string
 	 */
 	function humanize(string $string, string $separator = '_'): string
@@ -277,7 +254,8 @@
 	/**
 	 * Checks if the given word has a plural version.
 	 *
-	 * @param  string $word Word to check
+	 * @param string $word Word to check
+	 *
 	 * @return boolean
 	 */
 	function is_pluralizable(string $word): bool
@@ -331,7 +309,7 @@
 						   'weather',
 						   'wisdom',
 						   'work',
-					   ]);
+					   ], true);
 
 		return ! $uncountables;
 	}
@@ -344,7 +322,8 @@
 	/**
 	 * Replaces underscores with dashes in the string.
 	 *
-	 * @param  string $string Input string
+	 * @param string $string Input string
+	 *
 	 * @return string
 	 */
 	function dasherize(string $string): string
@@ -362,8 +341,8 @@
 	 * number to denote the position in an ordered
 	 * sequence such as 1st, 2nd, 3rd, 4th.
 	 *
-	 * @param  integer $integer The integer to determine
-	 *  the suffix
+	 * @param integer $integer The integer to determine the suffix
+	 *
 	 * @return string
 	 */
 	function ordinal(int $integer): string
@@ -394,7 +373,8 @@
 	 * to denote the position in an ordered sequence
 	 * such as 1st, 2nd, 3rd, 4th.
 	 *
-	 * @param  integer $integer The integer to ordinalize
+	 * @param integer $integer The integer to ordinalize
+	 *
 	 * @return string
 	 */
 	function ordinalize(int $integer): string
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index cc9e925..4262ee6 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -1,46 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2008-2014 EllisLab, Inc. (https://ellislab.com/)
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
+ * 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
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('number_to_size'))
@@ -59,16 +31,16 @@
 		// Strip any formatting & ensure numeric input
 		try
 		{
-			$num = 0 + str_replace(',', '', $num);
+			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
 		}
-		catch (\ErrorException $ee)
+		catch (ErrorException $ee)
 		{
 			return false;
 		}
 
 		// ignore sub part
 		$generalLocale = $locale;
-		if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
 		{
 			$generalLocale = substr($locale, 0, $underscorePos);
 		}
@@ -128,9 +100,9 @@
 		// Strip any formatting & ensure numeric input
 		try
 		{
-			$num = 0 + str_replace(',', '', $num);
+			$num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
 		}
-		catch (\ErrorException $ee)
+		catch (ErrorException $ee)
 		{
 			return false;
 		}
@@ -139,7 +111,7 @@
 
 		// ignore sub part
 		$generalLocale = $locale;
-		if (! empty($locale) && ( $underscorePos = strpos($locale, '_')))
+		if (! empty($locale) && ($underscorePos = strpos($locale, '_')))
 		{
 			$generalLocale = substr($locale, 0, $underscorePos);
 		}
@@ -154,17 +126,17 @@
 			$suffix = lang('Number.trillion', [], $generalLocale);
 			$num    = round(($num / 1000000000000), $precision);
 		}
-		else if ($num > 1000000000)
+		elseif ($num > 1000000000)
 		{
 			$suffix = lang('Number.billion', [], $generalLocale);
 			$num    = round(($num / 1000000000), $precision);
 		}
-		else if ($num > 1000000)
+		elseif ($num > 1000000)
 		{
 			$suffix = lang('Number.million', [], $generalLocale);
 			$num    = round(($num / 1000000), $precision);
 		}
-		else if ($num > 1000)
+		elseif ($num > 1000)
 		{
 			$suffix = lang('Number.thousand', [], $generalLocale);
 			$num    = round(($num / 1000), $precision);
@@ -214,7 +186,7 @@
 	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 ?? \Config\Services::request()->getLocale();
+		$locale = $locale ?? Services::request()->getLocale();
 
 		// Type can be any of the NumberFormatter options, but provide a default.
 		$type = (int) ($options['type'] ?? NumberFormatter::DECIMAL);
@@ -285,19 +257,19 @@
 			$key2   = null;
 			switch ($th) {
 				case 1:
-					$key1  = 'I';
-					$key2  = 'V';
-					$key_f = 'X';
+					$key1 = 'I';
+					$key2 = 'V';
+					$keyF = 'X';
 					break;
 				case 2:
-					$key1  = 'X';
-					$key2  = 'L';
-					$key_f = 'C';
+					$key1 = 'X';
+					$key2 = 'L';
+					$keyF = 'C';
 					break;
 				case 3:
-					$key1  = 'C';
-					$key2  = 'D';
-					$key_f = 'M';
+					$key1 = 'C';
+					$key2 = 'D';
+					$keyF = 'M';
 					break;
 				case 4:
 					$key1 = 'M';
@@ -322,12 +294,12 @@
 					$return = $key2 . str_repeat($key1, $n - 5);
 					break;
 				case 9:
-					$return = $key1 . $key_f;
+					$return = $key1 . $keyF; // @phpstan-ignore-line
 					break;
 			}
 			switch ($num) {
 				case 10:
-					$return = $key_f;
+					$return = $keyF; // @phpstan-ignore-line
 					break;
 			}
 			if ($num > 10)
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index 4a324a2..d743656 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -1,48 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 use Config\Services;
 
 /**
  * CodeIgniter Security Helpers
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('sanitize_filename'))
@@ -67,7 +37,8 @@
 	/**
 	 * Strip Image Tags
 	 *
-	 * @param  string $str
+	 * @param string $str
+	 *
 	 * @return string
 	 */
 	function strip_image_tags(string $str): string
@@ -87,7 +58,8 @@
 	/**
 	 * Convert PHP tags to entities
 	 *
-	 * @param  string $str
+	 * @param string $str
+	 *
 	 * @return string
 	 */
 	function encode_php_tags(string $str): string
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index 0f3e454..46d0d14 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -1,49 +1,18 @@
 <?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use CodeIgniter\Test\Fabricator;
 
 /**
- * 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-2020 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  2008-2014 EllisLab, Inc. (https://ellislab.com/)
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
- */
-
-/**
  * CodeIgniter Test Helpers
- *
- * @package CodeIgniter
  */
 //--------------------------------------------------------------------
 
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index b028897..eebe3ca 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -1,47 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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  2008-2014 EllisLab, Inc. (https://ellislab.com/)
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
+ * 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
- *
- * @package CodeIgniter
  */
 //--------------------------------------------------------------------
 
@@ -54,25 +25,25 @@
 	 *
 	 * @param string  $str
 	 * @param integer $limit
-	 * @param string  $end_char the end character. Usually an ellipsis
+	 * @param string  $endChar the end character. Usually an ellipsis
 	 *
 	 * @return string
 	 */
-	function word_limiter(string $str, int $limit = 100, string $end_char = '&#8230;'): string
+	function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'): string
 	{
 		if (trim($str) === '')
 		{
 			return $str;
 		}
 
-		preg_match('/^\s*+(?:\S++\s*+){1,' . (int) $limit . '}/', $str, $matches);
+		preg_match('/^\s*+(?:\S++\s*+){1,' . $limit . '}/', $str, $matches);
 
 		if (strlen($str) === strlen($matches[0]))
 		{
-			$end_char = '';
+			$endChar = '';
 		}
 
-		return rtrim($matches[0]) . $end_char;
+		return rtrim($matches[0]) . $endChar;
 	}
 }
 
@@ -88,11 +59,11 @@
 	 *
 	 * @param string  $str
 	 * @param integer $n
-	 * @param string  $end_char the end character. Usually an ellipsis
+	 * @param string  $endChar the end character. Usually an ellipsis
 	 *
 	 * @return string
 	 */
-	function character_limiter(string $str, int $n = 500, string $end_char = '&#8230;'): string
+	function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;'): string
 	{
 		if (mb_strlen($str) < $n)
 		{
@@ -118,7 +89,7 @@
 				break;
 			}
 		}
-		return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $end_char;
+		return (mb_strlen($out) === mb_strlen($str)) ? $out : $out . $endChar;
 	}
 }
 
@@ -151,7 +122,7 @@
 				 */
 				if (count($temp) === 1)
 				{
-					$out  .= '&#' . array_shift($temp) . ';';
+					$out .= '&#' . array_shift($temp) . ';';
 					$count = 1;
 				}
 
@@ -169,9 +140,9 @@
 				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   = [];
+					$out .= '&#' . $number . ';';
+					$count = 1;
+					$temp  = [];
 				}
 				// If this is the last iteration, just output whatever we have
 				elseif ($i === $s)
@@ -397,16 +368,16 @@
 	 *
 	 * 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 $tag_open  the opening tag to precede the phrase with
-	 * @param string $tag_close the closing tag to end the phrase with
+	 * @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 $tag_open = '<mark>', string $tag_close = '</mark>'): string
+	function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>', string $tagClose = '</mark>'): string
 	{
-		return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tag_open . '\\1' . $tag_close, $str) : $str;
+		return ($str !== '' && $phrase !== '') ? preg_replace('/(' . preg_quote($phrase, '/') . ')/i', $tagOpen . '\\1' . $tagClose, $str) : $str;
 	}
 }
 
@@ -423,26 +394,26 @@
 	 */
 	function convert_accented_characters(string $str): string
 	{
-		static $array_from, $array_to;
+		static $arrayFrom, $arrayTo;
 
-		if (! is_array($array_from))
+		if (! is_array($arrayFrom))
 		{
-			$config = new Config\ForeignCharacters();
+			$config = new ForeignCharacters();
 
 			if (empty($config->characterList) || ! is_array($config->characterList))
 			{
-				$array_from = [];
-				$array_to   = [];
+				$arrayFrom = [];
+				$arrayTo   = [];
 
 				return $str;
 			}
-			$array_from = array_keys($config->characterList);
-			$array_to   = array_values($config->characterList);
+			$arrayFrom = array_keys($config->characterList);
+			$arrayTo   = array_values($config->characterList);
 
 			unset($config);
 		}
 
-		return preg_replace($array_from, $array_to, $str);
+		return preg_replace($arrayFrom, $arrayTo, $str);
 	}
 }
 
@@ -464,9 +435,6 @@
 	 */
 	function word_wrap(string $str, int $charlim = 76): string
 	{
-		// Set the character limit
-		is_numeric($charlim) || $charlim = 76;
-
 		// Reduce multiple spaces
 		$str = preg_replace('| +|', ' ', $str);
 
@@ -518,7 +486,7 @@
 				}
 				// Trim the word down
 				$temp .= mb_substr($line, 0, $charlim - 1);
-				$line  = mb_substr($line, $charlim - 1);
+				$line = mb_substr($line, $charlim - 1);
 			}
 
 			// If $temp contains data it means we had to split up an over-length
@@ -558,34 +526,34 @@
 	 *
 	 * This function will strip tags from a string, split it at its max_length and ellipsize
 	 *
-	 * @param string  $str        String to ellipsize
-	 * @param integer $max_length Max length of string
-	 * @param mixed   $position   int (1|0) or float, .5, .2, etc for position to split
-	 * @param string  $ellipsis   ellipsis ; Default '...'
+	 * @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 $max_length, $position = 1, string $ellipsis = '&hellip;'): 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) <= $max_length)
+		if (mb_strlen($str) <= $maxLength)
 		{
 			return $str;
 		}
 
-		$beg      = mb_substr($str, 0, floor($max_length * $position));
+		$beg      = mb_substr($str, 0, (int) floor($maxLength * $position));
 		$position = ($position > 1) ? 1 : $position;
 
 		if ($position === 1)
 		{
-			$end = mb_substr($str, 0, -($max_length - mb_strlen($beg)));
+			$end = mb_substr($str, 0, -($maxLength - mb_strlen($beg)));
 		}
 		else
 		{
-			$end = mb_substr($str, -($max_length - mb_strlen($beg)));
+			$end = mb_substr($str, -($maxLength - mb_strlen($beg)));
 		}
 
 		return $beg . $ellipsis . $end;
@@ -751,11 +719,12 @@
 						break;
 				}
 
+				// @phpstan-ignore-next-line
 				return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
 			case 'md5':
-				return md5(uniqid(mt_rand(), true));
+				return md5(uniqid((string) mt_rand(), true));
 			case 'sha1':
-				return sha1(uniqid(mt_rand(), true));
+				return sha1(uniqid((string) mt_rand(), true));
 			case 'crypto':
 				return bin2hex(random_bytes($len / 2));
 		}
@@ -794,7 +763,8 @@
 	 *
 	 * Allows strings to be alternated. See docs...
 	 *
-	 * @param string (as many parameters as needed)
+	 * @phpstan-ignore-next-line
+	 * @param                    string (as many parameters as needed)
 	 *
 	 * @return string
 	 */
@@ -838,7 +808,7 @@
 	{
 		if (isset($phrase))
 		{
-			$phrasePos = strpos(strtolower($text), strtolower($phrase));
+			$phrasePos = stripos($text, $phrase);
 			$phraseLen = strlen($phrase);
 		}
 		elseif (! isset($phrase))
@@ -847,8 +817,8 @@
 			$phraseLen = 1;
 		}
 
-		$pre = explode(' ', substr($text, 0, $phrasePos));
-		$pos = explode(' ', substr($text, $phrasePos + $phraseLen));
+		$pre = explode(' ', substr($text, 0, $phrasePos)); // @phpstan-ignore-line
+		$pos = explode(' ', substr($text, $phrasePos + $phraseLen)); // @phpstan-ignore-line
 
 		$prev  = ' ';
 		$post  = ' ';
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index e39ed27..ebaebba 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -1,45 +1,21 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Router\Exceptions\RouterException;
+use Config\App;
+use Config\Services;
+
 /**
  * CodeIgniter URL Helpers
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('site_url'))
@@ -47,13 +23,13 @@
 	/**
 	 * Return a site URL to use in views
 	 *
-	 * @param mixed            $uri       URI string or array of URI segments
-	 * @param string|null      $protocol
-	 * @param \Config\App|null $altConfig Alternate configuration to use
+	 * @param mixed       $uri       URI string or array of URI segments
+	 * @param string|null $protocol
+	 * @param App|null    $altConfig Alternate configuration to use
 	 *
 	 * @return string
 	 */
-	function site_url($uri = '', string $protocol = null, \Config\App $altConfig = null): string
+	function site_url($uri = '', string $protocol = null, App $altConfig = null): string
 	{
 		// convert segment array to string
 		if (is_array($uri))
@@ -62,7 +38,7 @@
 		}
 
 		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(\Config\App::class);
+		$config = $altConfig ?? config(App::class);
 
 		$fullPath = rtrim(base_url(), '/') . '/';
 
@@ -76,7 +52,7 @@
 			$fullPath .= '/' . $uri;
 		}
 
-		$url = new \CodeIgniter\HTTP\URI($fullPath);
+		$url = new URI($fullPath);
 
 		// allow the scheme to be over-ridden; else, use default
 		if (! empty($protocol))
@@ -111,7 +87,7 @@
 		// We should be using the configured baseURL that the user set;
 		// otherwise get rid of the path, because we have
 		// no way of knowing the intent...
-		$config = \Config\Services::request()->config;
+		$config = Services::request()->config;
 
 		// If baseUrl does not have a trailing slash it won't resolve
 		// correctly for users hosting in a subfolder.
@@ -119,7 +95,7 @@
 			? rtrim($config->baseURL, '/ ') . '/'
 			: $config->baseURL;
 
-		$url = new \CodeIgniter\HTTP\URI($baseUrl);
+		$url = new URI($baseUrl);
 		unset($config);
 
 		// Merge in the path set by the user, if any
@@ -130,7 +106,7 @@
 
 		// If the scheme wasn't provided, check to
 		// see if it was a secure request
-		if (empty($protocol) && \Config\Services::request()->isSecure())
+		if (empty($protocol) && Services::request()->isSecure())
 		{
 			$protocol = 'https';
 		}
@@ -160,17 +136,7 @@
 	 */
 	function current_url(bool $returnObject = false)
 	{
-		$uri = clone \Config\Services::request()->uri;
-
-		// If hosted in a sub-folder, we will have additional
-		// segments that show up prior to the URI path we just
-		// grabbed from the request, so add it on if necessary.
-		$baseUri = new \CodeIgniter\HTTP\URI(config(\Config\App::class)->baseURL);
-
-		if (! empty($baseUri->getPath()))
-		{
-			$uri->setPath(rtrim($baseUri->getPath(), '/ ') . '/' . $uri->getPath());
-		}
+		$uri = clone Services::request()->uri;
 
 		// Since we're basing off of the IncomingRequest URI,
 		// we are guaranteed to have a host based on our own configs.
@@ -190,18 +156,18 @@
 	 *
 	 * @param boolean $returnObject
 	 *
-	 * @return \CodeIgniter\HTTP\URI|mixed|string
+	 * @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'] ?? \Config\Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
+		$referer = $_SESSION['_ci_previous_url'] ?? Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
 
 		$referer = $referer ?? site_url('/');
 
-		return $returnObject ? new \CodeIgniter\HTTP\URI($referer) : $referer;
+		return $returnObject ? new URI($referer) : $referer;
 	}
 }
 
@@ -214,11 +180,26 @@
 	 *
 	 * 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(): string
+	function uri_string(bool $relative = false): string
 	{
-		return \Config\Services::request()->uri->getPath();
+		$request = Services::request();
+		$uri     = $request->uri;
+
+		// An absolute path is equivalent to getPath()
+		if (! $relative)
+		{
+			return $uri->getPath();
+		}
+
+		// Remove the baseURL from the entire URL
+		$url     = (string) $uri->__toString();
+		$baseURL = rtrim($request->config->baseURL, '/ ') . '/';
+
+		return substr($url, strlen($baseURL));
 	}
 }
 
@@ -234,10 +215,10 @@
 	 * @param  \Config\App|null $altConfig Alternate configuration to use
 	 * @return string
 	 */
-	function index_page(\Config\App $altConfig = null): string
+	function index_page(App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(\Config\App::class);
+		$config = $altConfig ?? config(App::class);
 
 		return $config->indexPage;
 	}
@@ -252,25 +233,25 @@
 	 *
 	 * 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 \Config\App|null $altConfig  Alternate configuration to use
+	 * @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 = '', \Config\App $altConfig = null): string
+	function anchor($uri = '', string $title = '', $attributes = '', App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(\Config\App::class);
+		$config = $altConfig ?? config(App::class);
 
-		$site_url = is_array($uri) ? site_url($uri, null, $config) : (preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config));
+		$siteUrl = is_array($uri) ? site_url($uri, null, $config) : (preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, null, $config));
 		// eliminate trailing slash
-		$site_url = rtrim($site_url, '/');
+		$siteUrl = rtrim($siteUrl, '/');
 
 		if ($title === '')
 		{
-			$title = $site_url;
+			$title = $siteUrl;
 		}
 
 		if ($attributes !== '')
@@ -278,7 +259,7 @@
 			$attributes = stringify_attributes($attributes);
 		}
 
-		return '<a href="' . $site_url . '"' . $attributes . '>' . $title . '</a>';
+		return '<a href="' . $siteUrl . '"' . $attributes . '>' . $title . '</a>';
 	}
 }
 
@@ -292,29 +273,29 @@
 	 * 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 \Config\App|null $altConfig  Alternate configuration to use
+	 * @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, \Config\App $altConfig = null): string
+	function anchor_popup($uri = '', string $title = '', $attributes = false, App $altConfig = null): string
 	{
 		// use alternate config if provided, else default one
-		$config = $altConfig ?? config(\Config\App::class);
+		$config = $altConfig ?? config(App::class);
 
-		$site_url = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, '', $config);
-		$site_url = rtrim($site_url, '/');
+		$siteUrl = preg_match('#^(\w+:)?//#i', $uri) ? $uri : site_url($uri, '', $config);
+		$siteUrl = rtrim($siteUrl, '/');
 
 		if ($title === '')
 		{
-			$title = $site_url;
+			$title = $siteUrl;
 		}
 
 		if ($attributes === false)
 		{
-			return '<a href="' . $site_url . '" onclick="window.open(\'' . $site_url . "', '_blank'); return false;\">" . $title . '</a>';
+			return '<a href="' . $siteUrl . '" onclick="window.open(\'' . $siteUrl . "', '_blank'); return false;\">" . $title . '</a>';
 		}
 
 		if (! is_array($attributes))
@@ -322,16 +303,16 @@
 			$attributes = [$attributes];
 
 			// Ref: http://www.w3schools.com/jsref/met_win_open.asp
-			$window_name = '_blank';
+			$windowName = '_blank';
 		}
 		elseif (! empty($attributes['window_name']))
 		{
-			$window_name = $attributes['window_name'];
+			$windowName = $attributes['window_name'];
 			unset($attributes['window_name']);
 		}
 		else
 		{
-			$window_name = '_blank';
+			$windowName = '_blank';
 		}
 
 		foreach (['width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'menubar' => 'no', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0'] as $key => $val)
@@ -342,8 +323,8 @@
 
 		$attributes = stringify_attributes($attributes);
 
-		return '<a href="' . $site_url
-				. '" onclick="window.open(\'' . $site_url . "', '" . $window_name . "', '" . stringify_attributes($atts, true) . "'); return false;\""
+		return '<a href="' . $siteUrl
+				. '" onclick="window.open(\'' . $siteUrl . "', '" . $windowName . "', '" . stringify_attributes($atts, true) . "'); return false;\""
 				. $attributes . '>' . $title . '</a>';
 	}
 }
@@ -445,7 +426,7 @@
 				}
 
 				$temp[] = $ordinal;
-				if (count($temp) === $count)
+				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;
@@ -541,26 +522,31 @@
 if (! function_exists('prep_url'))
 {
 	/**
-	 * Prep URL - Simply adds the http:// part if no scheme is included.
+	 * 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  string  $str    the URL
+	 * @param  boolean $secure set true if you want to force https://
 	 * @return string
 	 */
-	function prep_url(string $str = ''): string
+	function prep_url(string $str = '', bool $secure = false): string
 	{
-		if ($str === 'http://' || $str === '')
+		if (in_array($str, ['http://', 'https://', '//', ''], true))
 		{
 			return '';
 		}
 
-		$url = parse_url($str);
-
-		if (! $url || ! isset($url['scheme']))
+		if (parse_url($str, PHP_URL_SCHEME) === null)
 		{
-			return 'http://' . $str;
+			$str = 'http://' . ltrim($str, '/');
+		}
+
+		// force replace http:// with https://
+		if ($secure)
+		{
+			$str = preg_replace('/^(?:http):/i', 'https:', $str);
 		}
 
 		return $str;
@@ -585,13 +571,13 @@
 	 */
 	function url_title(string $str, string $separator = '-', bool $lowercase = false): string
 	{
-		$q_separator = preg_quote($separator, '#');
+		$qSeparator = preg_quote($separator, '#');
 
 		$trans = [
-			'&.+?;'                   => '',
-			'[^\w\d _-]'              => '',
-			'\s+'                     => $separator,
-			'(' . $q_separator . ')+' => $separator,
+			'&.+?;'                  => '',
+			'[^\w\d\pL\pM _-]'       => '',
+			'\s+'                    => $separator,
+			'(' . $qSeparator . ')+' => $separator,
 		];
 
 		$str = strip_tags($str);
@@ -634,3 +620,58 @@
 }
 
 //--------------------------------------------------------------------
+
+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_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);
+	}
+}
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
index 170a896..4f42bb3 100644
--- a/system/Helpers/xml_helper.php
+++ b/system/Helpers/xml_helper.php
@@ -1,45 +1,16 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 /**
  * CodeIgniter XML Helpers
- *
- * @package CodeIgniter
  */
 
 if (! function_exists('xml_convert'))
@@ -48,10 +19,10 @@
 	 * Convert Reserved XML characters to Entities
 	 *
 	 * @param  string  $str
-	 * @param  boolean $protect_all
+	 * @param  boolean $protectAll
 	 * @return string
 	 */
-	function xml_convert(string $str, bool $protect_all = false): string
+	function xml_convert(string $str, bool $protectAll = false): string
 	{
 		$temp = '__TEMP_AMPERSANDS__';
 
@@ -59,12 +30,12 @@
 		// ampersands won't get messed up
 		$str = preg_replace('/&#(\d+);/', $temp . '\\1;', $str);
 
-		if ($protect_all === true)
+		if ($protectAll === true)
 		{
 			$str = preg_replace('/&(\w+);/', $temp . '\\1;', $str);
 		}
 
-		$original    = [
+		$original = [
 			'&',
 			'<',
 			'>',
@@ -72,6 +43,7 @@
 			"'",
 			'-',
 		];
+
 		$replacement = [
 			'&amp;',
 			'&lt;',
@@ -80,12 +52,13 @@
 			'&apos;',
 			'&#45;',
 		];
-		$str         = str_replace($original, $replacement, $str);
+
+		$str = str_replace($original, $replacement, $str);
 
 		// Decode the temp markers back to entities
 		$str = preg_replace('/' . $temp . '(\d+);/', '&#\\1;', $str);
 
-		if ($protect_all === true)
+		if ($protectAll === true)
 		{
 			return preg_replace('/' . $temp . '(\w+);/', '&\\1;', $str);
 		}
diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php
index c4805a2..6e63690 100644
--- a/system/Honeypot/Exceptions/HoneypotException.php
+++ b/system/Honeypot/Exceptions/HoneypotException.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Honeypot\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Honeypot\Exceptions;
 
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\Exceptions\ExceptionInterface;
@@ -24,5 +35,4 @@
 	{
 		return new static(lang('Honeypot.theClientIsABot'));
 	}
-
 }
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index b944395..bc0068a 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -1,58 +1,30 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Honeypot;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Honeypot\Exceptions\HoneypotException;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use Config\Honeypot as HoneypotConfig;
 
 /**
  * class Honeypot
  */
 class Honeypot
 {
-
 	/**
 	 * Our configuration.
 	 *
-	 * @var BaseConfig
+	 * @var HoneypotConfig
 	 */
 	protected $config;
 
@@ -61,14 +33,14 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param  BaseConfig $config
-	 * @throws type
+	 * @param  HoneypotConfig $config
+	 * @throws HoneypotException
 	 */
-	function __construct(BaseConfig $config)
+	public function __construct(HoneypotConfig $config)
 	{
 		$this->config = $config;
 
-		if ($this->config->hidden === '')
+		if (! $this->config->hidden)
 		{
 			throw HoneypotException::forNoHiddenValue();
 		}
@@ -94,7 +66,7 @@
 	/**
 	 * Checks the request if honeypot field has data.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
+	 * @param RequestInterface $request
 	 */
 	public function hasContent(RequestInterface $request)
 	{
@@ -104,14 +76,14 @@
 	/**
 	 * Attaches Honeypot template to response.
 	 *
-	 * @param \CodeIgniter\HTTP\ResponseInterface $response
+	 * @param ResponseInterface $response
 	 */
 	public function attachHoneypot(ResponseInterface $response)
 	{
-		$prep_field = $this->prepareTemplate($this->config->template);
+		$prepField = $this->prepareTemplate($this->config->template);
 
 		$body = $response->getBody();
-		$body = str_ireplace('</form>', $prep_field . '</form>', $body);
+		$body = str_ireplace('</form>', $prepField . '</form>', $body);
 		$response->setBody($body);
 	}
 
@@ -134,5 +106,4 @@
 
 		return $template;
 	}
-
 }
diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php
index dfbec95..8ccaf8b 100644
--- a/system/I18n/Exceptions/I18nException.php
+++ b/system/I18n/Exceptions/I18nException.php
@@ -1,53 +1,37 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n\Exceptions;
 
-use CodeIgniter\Exceptions\ExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
 
 /**
  * I18nException
  */
-class I18nException extends FrameworkException implements ExceptionInterface
+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 the numeric representation of the month falls
 	 * outside the range of allowed months.
 	 *
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index c667365..660e5cc 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
@@ -43,6 +15,7 @@
 use DateInterval;
 use DateTime;
 use DateTimeZone;
+use Exception;
 use IntlCalendar;
 use IntlDateFormatter;
 use Locale;
@@ -55,13 +28,12 @@
  *
  * Requires the intl PHP extension.
  *
- * @package CodeIgniter\I18n
+ * @property string $date
  */
 class Time extends DateTime
 {
-
 	/**
-	 * @var \DateTimeZone
+	 * @var DateTimeZone
 	 */
 	protected $timezone;
 
@@ -85,7 +57,7 @@
 	protected static $relativePattern = '/this|next|last|tomorrow|yesterday|midnight|today|[+-]|first|last|ago/i';
 
 	/**
-	 * @var \CodeIgniter\I18n\Time
+	 * @var \CodeIgniter\I18n\Time|DateTime|null
 	 */
 	protected static $testNow;
 
@@ -96,11 +68,11 @@
 	/**
 	 * Time constructor.
 	 *
-	 * @param string|null               $time
-	 * @param \DateTimeZone|string|null $timezone
-	 * @param string|null               $locale
+	 * @param string|null              $time
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function __construct(string $time = null, $timezone = null, string $locale = null)
 	{
@@ -135,7 +107,7 @@
 			}
 		}
 
-		return parent::__construct($time, $this->timezone);
+		parent::__construct($time, $this->timezone);
 	}
 
 	//--------------------------------------------------------------------
@@ -146,8 +118,8 @@
 	 * @param string|DateTimeZone|null $timezone
 	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function now($timezone = null, string $locale = null)
 	{
@@ -162,12 +134,12 @@
 	 * Example:
 	 *  $time = Time::parse('first day of December 2008');
 	 *
-	 * @param string                    $datetime
-	 * @param \DateTimeZone|string|null $timezone
-	 * @param string|null               $locale
+	 * @param string                   $datetime
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function parse(string $datetime, $timezone = null, string $locale = null)
 	{
@@ -179,11 +151,11 @@
 	/**
 	 * Return a new time with the time set to midnight.
 	 *
-	 * @param \DateTimeZone|string|null $timezone
-	 * @param string|null               $locale
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function today($timezone = null, string $locale = null)
 	{
@@ -195,11 +167,11 @@
 	/**
 	 * Returns an instance set to midnight yesterday morning.
 	 *
-	 * @param \DateTimeZone|string|null $timezone
-	 * @param string|null               $locale
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function yesterday($timezone = null, string $locale = null)
 	{
@@ -211,11 +183,11 @@
 	/**
 	 * Returns an instance set to midnight tomorrow morning.
 	 *
-	 * @param \DateTimeZone|string|null $timezone
-	 * @param string|null               $locale
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function tomorrow($timezone = null, string $locale = null)
 	{
@@ -228,14 +200,14 @@
 	 * 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
+	 * @param integer|null             $year
+	 * @param integer|null             $month
+	 * @param integer|null             $day
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function createFromDate(int $year = null, int $month = null, int $day = null, $timezone = null, string $locale = null)
 	{
@@ -247,14 +219,14 @@
 	/**
 	 * 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
+	 * @param integer|null             $hour
+	 * @param integer|null             $minutes
+	 * @param integer|null             $seconds
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function createFromTime(int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
 	{
@@ -266,17 +238,17 @@
 	/**
 	 * 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
+	 * @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 \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @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)
 	{
@@ -296,16 +268,19 @@
 	 * 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
+	 * @param string                   $format
+	 * @param string                   $datetime
+	 * @param DateTimeZone|string|null $timeZone
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function createFromFormat($format, $datetime, $timeZone = null)
 	{
-		$date = parent::createFromFormat($format, $datetime);
+		if (! $date = parent::createFromFormat($format, $datetime))
+		{
+			throw I18nException::forInvalidFormat($format);
+		}
 
 		return new Time($date->format('Y-m-d H:i:s'), $timeZone);
 	}
@@ -315,12 +290,12 @@
 	/**
 	 * 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
+	 * @param integer                  $timestamp
+	 * @param DateTimeZone|string|null $timezone
+	 * @param string|null              $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function createFromTimestamp(int $timestamp, $timezone = null, string $locale = null)
 	{
@@ -332,11 +307,11 @@
 	/**
 	 * Takes an instance of DateTime and returns an instance of Time with it's same values.
 	 *
-	 * @param \DateTime   $dateTime
+	 * @param DateTime    $dateTime
 	 * @param string|null $locale
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public static function instance(DateTime $dateTime, string $locale = null)
 	{
@@ -351,12 +326,12 @@
 	/**
 	 * Converts the current instance to a mutable DateTime object.
 	 *
-	 * @return \DateTime
-	 * @throws \Exception
+	 * @return DateTime
+	 * @throws Exception
 	 */
 	public function toDateTime()
 	{
-		$dateTime = new DateTime(null, $this->getTimezone());
+		$dateTime = new DateTime('', $this->getTimezone());
 		$dateTime->setTimestamp(parent::getTimestamp());
 
 		return $dateTime;
@@ -370,11 +345,11 @@
 	 * Creates an instance of Time that will be returned during testing
 	 * when calling 'Time::now' instead of the current time.
 	 *
-	 * @param \CodeIgniter\I18n\Time|string|null $datetime
-	 * @param \DateTimeZone|string|null          $timezone
-	 * @param string|null                        $locale
+	 * @param Time|DateTime|string|null $datetime
+	 * @param DateTimeZone|string|null  $timezone
+	 * @param string|null               $locale
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public static function setTestNow($datetime = null, $timezone = null, string $locale = null)
 	{
@@ -419,7 +394,7 @@
 	 * Returns the localized Year
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getYear(): string
 	{
@@ -432,7 +407,7 @@
 	 * Returns the localized Month
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getMonth(): string
 	{
@@ -445,7 +420,7 @@
 	 * Return the localized day of the month.
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getDay(): string
 	{
@@ -458,7 +433,7 @@
 	 * Return the localized hour (in 24-hour format).
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getHour(): string
 	{
@@ -471,7 +446,7 @@
 	 * Return the localized minutes in the hour.
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getMinute(): string
 	{
@@ -484,7 +459,7 @@
 	 * Return the localized seconds
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getSecond(): string
 	{
@@ -497,7 +472,7 @@
 	 * Return the index of the day of the week
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getDayOfWeek(): string
 	{
@@ -510,7 +485,7 @@
 	 * Return the index of the day of the year
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getDayOfYear(): string
 	{
@@ -523,7 +498,7 @@
 	 * Return the index of the week in the month
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getWeekOfMonth(): string
 	{
@@ -536,7 +511,7 @@
 	 * Return the index of the week in the year
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getWeekOfYear(): string
 	{
@@ -549,7 +524,7 @@
 	 * Returns the age in years from the "current" date and 'now'
 	 *
 	 * @return integer
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getAge()
 	{
@@ -566,7 +541,7 @@
 	 * Returns the number of the current quarter for the year.
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function getQuarter(): string
 	{
@@ -645,8 +620,8 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setYear($value)
 	{
@@ -658,12 +633,12 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setMonth($value)
 	{
-		if (is_numeric($value) && $value < 1 || $value > 12)
+		if (is_numeric($value) && ($value < 1 || $value > 12))
 		{
 			throw I18nException::forInvalidMonth($value);
 		}
@@ -681,8 +656,8 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setDay($value)
 	{
@@ -706,8 +681,8 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setHour($value)
 	{
@@ -724,8 +699,8 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setMinute($value)
 	{
@@ -742,8 +717,8 @@
 	 *
 	 * @param integer|string $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setSecond($value)
 	{
@@ -761,24 +736,33 @@
 	 * @param string  $name
 	 * @param integer $value
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	protected function setValue(string $name, $value)
 	{
 		list($year, $month, $day, $hour, $minute, $second) = explode('-', $this->format('Y-n-j-G-i-s'));
 		$$name                                             = $value;
 
-		return Time::create($year, $month, $day, $hour, $minute, $second, $this->getTimezoneName(), $this->locale);
+		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
+	 * @param string|DateTimeZone $timezone
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setTimezone($timezone)
 	{
@@ -791,8 +775,8 @@
 	 *
 	 * @param integer $timestamp
 	 *
-	 * @return \CodeIgniter\I18n\Time
-	 * @throws \Exception
+	 * @return Time
+	 * @throws Exception
 	 */
 	public function setTimestamp($timestamp)
 	{
@@ -980,7 +964,7 @@
 	/**
 	 * Returns the localized value of the date in the format 'Y-m-d H:i:s'
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function toDateTimeString()
 	{
@@ -993,7 +977,7 @@
 	 * Returns a localized version of the date in Y-m-d format.
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function toDateString()
 	{
@@ -1008,7 +992,7 @@
 	 *  i.e. Apr 1, 2017
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function toFormattedDateString()
 	{
@@ -1023,7 +1007,7 @@
 	 *  i.e. 13:20:33
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function toTimeString()
 	{
@@ -1038,7 +1022,7 @@
 	 * @param string|null $format
 	 *
 	 * @return string|boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function toLocalizedString(string $format = null)
 	{
@@ -1062,7 +1046,7 @@
 	 * @param string|null          $timezone
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function equals($testTime, string $timezone = null): bool
 	{
@@ -1084,7 +1068,7 @@
 	 * @param string|null          $timezone
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function sameAs($testTime, string $timezone = null): bool
 	{
@@ -1092,7 +1076,7 @@
 		{
 			$testTime = $testTime->format('Y-m-d H:i:s');
 		}
-		else if (is_string($testTime))
+		elseif (is_string($testTime))
 		{
 			$timezone = $timezone ?: $this->timezone;
 			$timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
@@ -1111,11 +1095,11 @@
 	 * Determines if the current instance's time is before $testTime,
 	 * after converting to UTC.
 	 *
-	 * @param $testTime
+	 * @param mixed       $testTime
 	 * @param string|null $timezone
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function isBefore($testTime, string $timezone = null): bool
 	{
@@ -1131,11 +1115,11 @@
 	 * Determines if the current instance's time is after $testTime,
 	 * after converting in UTC.
 	 *
-	 * @param $testTime
+	 * @param mixed       $testTime
 	 * @param string|null $timezone
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function isAfter($testTime, string $timezone = null): bool
 	{
@@ -1159,7 +1143,7 @@
 	 *  - 6 hours ago
 	 *
 	 * @return mixed
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function humanize()
 	{
@@ -1179,18 +1163,18 @@
 			$phrase = lang('Time.years', [abs($years)]);
 			$before = $years < 0;
 		}
-		else if ($months !== 0)
+		elseif ($months !== 0)
 		{
 			$phrase = lang('Time.months', [abs($months)]);
 			$before = $months < 0;
 		}
-		else if ($days !== 0 && (abs($days) >= 7))
+		elseif ($days !== 0 && (abs($days) >= 7))
 		{
 			$weeks  = ceil($days / 7);
 			$phrase = lang('Time.weeks', [abs($weeks)]);
 			$before = $days < 0;
 		}
-		else if ($days !== 0)
+		elseif ($days !== 0)
 		{
 			$before = $days < 0;
 
@@ -1202,12 +1186,12 @@
 
 			$phrase = lang('Time.days', [abs($days)]);
 		}
-		else if ($hours !== 0)
+		elseif ($hours !== 0)
 		{
-			// Display the actual time instead of a regular phrase.
-			return $this->format('g:i a');
+			$phrase = lang('Time.hours', [abs($hours)]);
+			$before = $hours < 0;
 		}
-		else if ($minutes !== 0)
+		elseif ($minutes !== 0)
 		{
 			$phrase = lang('Time.minutes', [abs($minutes)]);
 			$before = $minutes < 0;
@@ -1221,11 +1205,11 @@
 	}
 
 	/**
-	 * @param $testTime
+	 * @param mixed       $testTime
 	 * @param string|null $timezone
 	 *
-	 * @return \CodeIgniter\I18n\TimeDifference
-	 * @throws \Exception
+	 * @return TimeDifference
+	 * @throws Exception
 	 */
 	public function difference($testTime, string $timezone = null)
 	{
@@ -1242,11 +1226,11 @@
 	/**
 	 * Returns a Time instance with the timezone converted to UTC.
 	 *
-	 * @param $time
+	 * @param mixed       $time
 	 * @param string|null $timezone
 	 *
-	 * @return \DateTime|static
-	 * @throws \Exception
+	 * @return DateTime|static
+	 * @throws Exception
 	 */
 	public function getUTCObject($time, string $timezone = null)
 	{
@@ -1279,8 +1263,8 @@
 	 * Primarily used internally to provide the difference and comparison functions,
 	 * but available for public consumption if they need it.
 	 *
-	 * @return \IntlCalendar
-	 * @throws \Exception
+	 * @return IntlCalendar
+	 * @throws Exception
 	 */
 	public function getCalendar()
 	{
@@ -1313,7 +1297,7 @@
 	 * Outputs a short format version of the datetime.
 	 *
 	 * @return string
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function __toString(): string
 	{
@@ -1362,4 +1346,21 @@
 		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);
+	}
 }
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index e17b7ba..196f087 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
@@ -44,22 +16,20 @@
 
 /**
  * Class TimeDifference
- *
- * @package CodeIgniter\I18n
  */
 class TimeDifference
 {
 	/**
 	 * The timestamp of the "current" time.
 	 *
-	 * @var \IntlCalendar
+	 * @var IntlCalendar
 	 */
 	protected $currentTime;
 
 	/**
 	 * The timestamp to compare the current time to.
 	 *
-	 * @var integer
+	 * @var float
 	 */
 	protected $testTime;
 
@@ -76,36 +46,42 @@
 	 * @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.
 	 *
@@ -192,7 +168,7 @@
 		}
 
 		$time = clone($this->currentTime);
-		return (int)($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
+		return (int) ($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
 	}
 
 	/**
diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php
index c514c7c..451192c 100644
--- a/system/Images/Exceptions/ImageException.php
+++ b/system/Images/Exceptions/ImageException.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Images\Exceptions;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Images\Exceptions;
 
 use CodeIgniter\Exceptions\ExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index f7e59b6..f591cd6 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
@@ -42,17 +15,17 @@
 use CodeIgniter\Images\Image;
 use CodeIgniter\Images\ImageHandlerInterface;
 use Config\Images;
+use InvalidArgumentException;
 
 /**
  * Base image handling implementation
  */
 abstract class BaseHandler implements ImageHandlerInterface
 {
-
 	/**
 	 * Configuration settings.
 	 *
-	 * @var \Config\Images
+	 * @var Images
 	 */
 	protected $config;
 
@@ -94,14 +67,14 @@
 	/**
 	 * X-axis.
 	 *
-	 * @var integer
+	 * @var integer|null
 	 */
 	protected $xAxis = 0;
 
 	/**
 	 * Y-axis.
 	 *
-	 * @var integer
+	 * @var integer|null
 	 */
 	protected $yAxis = 0;
 
@@ -133,9 +106,19 @@
 	];
 
 	/**
+	 * Image types with support for transparency.
+	 *
+	 * @var array
+	 */
+	protected $supportTransparency = [
+		IMAGETYPE_PNG,
+		IMAGETYPE_WEBP,
+	];
+
+	/**
 	 * Temporary image used by the different engines.
 	 *
-	 * @var resource
+	 * @var resource|null
 	 */
 	protected $resource;
 
@@ -144,7 +127,7 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param \Config\Images|null $config
+	 * @param Images|null $config
 	 */
 	public function __construct($config = null)
 	{
@@ -189,7 +172,7 @@
 	/**
 	 * Returns the image instance.
 	 *
-	 * @return \CodeIgniter\Images\Image
+	 * @return Image
 	 */
 	public function getFile()
 	{
@@ -338,7 +321,7 @@
 	 * Changes the stored image type to indicate the new file format to use when saving.
 	 * Does not touch the actual resource.
 	 *
-	 * @param integer|null $imageType A PHP imageType constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+	 * @param integer $imageType A PHP imageType constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
 	 *
 	 * @return $this
 	 */
@@ -361,12 +344,12 @@
 	{
 		// Allowed rotation values
 		$degs = [
-			90,
-			180,
-			270,
+			90.0,
+			180.0,
+			270.0,
 		];
 
-		if ($angle === '' || ! in_array($angle, $degs))
+		if (! in_array($angle, $degs, true))
 		{
 			throw ImageException::forMissingAngle();
 		}
@@ -404,7 +387,7 @@
 		$this->width  = $this->image()->origWidth;
 		$this->height = $this->image()->origHeight;
 
-		return $this->_flatten();
+		return $this->_flatten($red, $green, $blue);
 	}
 
 	//--------------------------------------------------------------------
@@ -511,6 +494,44 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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,
@@ -559,6 +580,8 @@
 	 * @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)
@@ -569,6 +592,8 @@
 			{
 				return null;
 			}
+
+			throw ImageException::forEXIFUnsupported(); // @codeCoverageIgnore
 		}
 
 		$exif = null; // default
@@ -576,7 +601,7 @@
 		{
 			case IMAGETYPE_JPEG:
 			case IMAGETYPE_TIFF_II:
-				$exif = exif_read_data($this->image()->getPathname());
+				$exif = @exif_read_data($this->image()->getPathname());
 				if (! is_null($key) && is_array($exif))
 				{
 					$exif = $exif[$key] ?? false;
@@ -606,7 +631,7 @@
 	 * @param integer $height
 	 * @param string  $position
 	 *
-	 * @return $this
+	 * @return BaseHandler
 	 */
 	public function fit(int $width, int $height = null, string $position = 'center')
 	{
@@ -638,8 +663,13 @@
 	 *
 	 * @return array
 	 */
-	protected function calcAspectRatio($width, $height = null, $origWidth, $origHeight): 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))
@@ -686,7 +716,8 @@
 	protected function calcCropCoords($width, $height, $origWidth, $origHeight, $position): array
 	{
 		$position = strtolower($position);
-		$x        = $y = 0;
+
+		$x = $y = 0;
 
 		switch ($position)
 		{
@@ -805,12 +836,7 @@
 	 */
 	protected function reproportion()
 	{
-		if (($this->width === 0 && $this->height === 0) ||
-				$this->image()->origWidth === 0 ||
-				$this->image()->origHeight === 0 ||
-				( ! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) ||
-				! ctype_digit((string) $this->image()->origWidth) ||
-				! ctype_digit((string) $this->image()->origHeight)
+		if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)
 		)
 		{
 			return;
@@ -872,5 +898,4 @@
 	{
 		return ($this->resource !== null) ? $this->_getHeight() : $this->height;
 	}
-
 }
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index f49df25..f743b2a 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -1,55 +1,28 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
 
 use CodeIgniter\Images\Exceptions\ImageException;
+use Config\Images;
 
 /**
  * Image handler for GD package
  */
 class GDHandler extends BaseHandler
 {
-
 	/**
 	 * Constructor.
 	 *
-	 * @param  \Config\Images|null $config
+	 * @param  Images|null $config
 	 * @throws ImageException
 	 */
 	public function __construct($config = null)
@@ -171,9 +144,9 @@
 	{
 		if (function_exists('gd_info'))
 		{
-			$gd_version = @gd_info();
+			$gdVersion = @gd_info();
 
-			return preg_replace('/\D/', '', $gd_version['GD Version']);
+			return preg_replace('/\D/', '', $gdVersion['GD Version']);
 		}
 
 		return false;
@@ -184,9 +157,9 @@
 	/**
 	 * Resizes the image.
 	 *
-	 * @return \CodeIgniter\Images\Handlers\GDHandler
+	 * @return GDHandler
 	 */
-	public function _resize()
+	public function _resize(bool $maintainRatio = false)
 	{
 		return $this->process('resize');
 	}
@@ -196,7 +169,7 @@
 	/**
 	 * Crops the image.
 	 *
-	 * @return \CodeIgniter\Images\Handlers\GDHandler
+	 * @return GDHandler
 	 */
 	public function _crop()
 	{
@@ -246,7 +219,8 @@
 
 		$dest = $create($this->width, $this->height);
 
-		if ($this->image()->imageType === IMAGETYPE_PNG) // png we can actually preserve transparency
+		// for png and webp we can actually preserve transparency
+		if (in_array($this->image()->imageType, $this->supportTransparency, true))
 		{
 			imagealphablending($dest, false);
 			imagesavealpha($dest, true);
@@ -303,7 +277,7 @@
 			case IMAGETYPE_GIF:
 				if (! function_exists('imagegif'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.gifNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
 				}
 
 				if (! @imagegif($this->resource, $target))
@@ -314,7 +288,7 @@
 			case IMAGETYPE_JPEG:
 				if (! function_exists('imagejpeg'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.jpgNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
 				}
 
 				if (! @imagejpeg($this->resource, $target, $quality))
@@ -325,7 +299,7 @@
 			case IMAGETYPE_PNG:
 				if (! function_exists('imagepng'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.pngNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
 				}
 
 				if (! @imagepng($this->resource, $target))
@@ -336,7 +310,7 @@
 			case IMAGETYPE_WEBP:
 				if (! function_exists('imagewebp'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
 				}
 
 				if (! @imagewebp($this->resource, $target))
@@ -422,28 +396,28 @@
 			case IMAGETYPE_GIF:
 				if (! function_exists('imagecreatefromgif'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.gifNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.gifNotSupported'));
 				}
 
 				return imagecreatefromgif($path);
 			case IMAGETYPE_JPEG:
 				if (! function_exists('imagecreatefromjpeg'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.jpgNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.jpgNotSupported'));
 				}
 
 				return imagecreatefromjpeg($path);
 			case IMAGETYPE_PNG:
 				if (! function_exists('imagecreatefrompng'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.pngNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.pngNotSupported'));
 				}
 
 				return imagecreatefrompng($path);
 			case IMAGETYPE_WEBP:
 				if (! function_exists('imagecreatefromwebp'))
 				{
-					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
+					throw ImageException::forInvalidImageCreate(lang('Images.webpNotSupported'));
 				}
 
 				return imagecreatefromwebp($path);
@@ -517,7 +491,7 @@
 		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'];
+			$yAxis += ($this->image()->origHeight / 2) + ($fontheight / 2) - $options['padding'] - $fontheight - $options['shadowOffset'];
 		}
 		elseif ($options['vAlign'] === 'bottom')
 		{
@@ -575,6 +549,13 @@
 		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);
 
@@ -616,5 +597,4 @@
 	{
 		return imagesy($this->resource);
 	}
-
 }
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 332cc2a..b43863a 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -1,45 +1,20 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
 
 use CodeIgniter\Images\Exceptions\ImageException;
+use Config\Images;
+use Exception;
+use Imagick;
 
 /**
  * Class ImageMagickHandler
@@ -51,16 +26,13 @@
  * hmm - the width & height accessors at the end use the imagick extension.
  *
  * FIXME - This needs conversion & unit testing, to use the imagick extension
- *
- * @package CodeIgniter\Images\Handlers
  */
 class ImageMagickHandler extends BaseHandler
 {
-
 	/**
 	 * Stores image resource in memory.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $resource;
 
@@ -69,7 +41,7 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param  \Config\Images $config
+	 * @param  Images $config
 	 * @throws ImageException
 	 */
 	public function __construct($config = null)
@@ -93,7 +65,7 @@
 	 * @param boolean $maintainRatio
 	 *
 	 * @return ImageMagickHandler
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function _resize(bool $maintainRatio = false)
 	{
@@ -121,7 +93,7 @@
 	 * Crops the image.
 	 *
 	 * @return boolean|\CodeIgniter\Images\Handlers\ImageMagickHandler
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function _crop()
 	{
@@ -150,7 +122,7 @@
 	 * @param integer $angle
 	 *
 	 * @return $this
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	protected function _rotate(int $angle)
 	{
@@ -176,7 +148,7 @@
 	 * @param integer $blue
 	 *
 	 * @return $this
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
 	{
@@ -200,7 +172,7 @@
 	 * @param string $direction
 	 *
 	 * @return $this
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function _flip(string $direction)
 	{
@@ -242,7 +214,7 @@
 	 * @param integer $quality
 	 *
 	 * @return array  Lines of output from shell command
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	protected function process(string $action, int $quality = 100): array
 	{
@@ -262,7 +234,7 @@
 			$this->config->libraryPath = rtrim($this->config->libraryPath, '/') . '/convert';
 		}
 
-		$cmd  = $this->config->libraryPath;
+		$cmd = $this->config->libraryPath;
 		$cmd .= $action === '-version' ? ' ' . $action : ' -quality ' . $quality . ' ' . $action;
 
 		$retval = 1;
@@ -278,7 +250,7 @@
 			throw ImageException::forImageProcessFailed();
 		}
 
-		return $output;
+		return $output; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
@@ -344,8 +316,8 @@
 	 * To ensure we can use all features, like transparency,
 	 * during the process, we'll use a PNG as the temp file type.
 	 *
-	 * @return resource|boolean
-	 * @throws \Exception
+	 * @return string
+	 * @throws Exception
 	 */
 	protected function getResourcePath()
 	{
@@ -369,7 +341,7 @@
 	/**
 	 * Make the image resource object if needed
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	protected function ensureResource()
 	{
@@ -388,7 +360,7 @@
 		switch ($this->image()->imageType)
 		{
 			case IMAGETYPE_WEBP:
-				if (! in_array('WEBP', \Imagick::queryFormats()))
+				if (! in_array('WEBP', Imagick::queryFormats(), true))
 				{
 					throw ImageException::forInvalidImageCreate(lang('images.webpNotSupported'));
 				}
@@ -404,7 +376,7 @@
 	 * @param string $text
 	 * @param array  $options
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	protected function _text(string $text, array $options = [])
 	{
@@ -468,10 +440,10 @@
 					break;
 			}
 
-			$xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis;
-			$yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis;
+			$xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis; // @phpstan-ignore-line
+			$yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis; // @phpstan-ignore-line
 
-			$cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}";
+			$cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}"; // @phpstan-ignore-line
 		}
 
 		// Color
diff --git a/system/Images/Image.php b/system/Images/Image.php
index daec743..82d2f1a 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
@@ -47,7 +19,6 @@
  */
 class Image extends File
 {
-
 	/**
 	 * The original image width in pixels.
 	 *
@@ -109,7 +80,7 @@
 
 		if (! is_dir($targetPath))
 		{
-			mkdir($targetName, 0755, true);
+			mkdir($targetPath, 0755, true);
 		}
 
 		if (! copy($this->getPathname(), "{$targetPath}{$targetName}"))
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 8afbff7..15519f2 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT    MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
@@ -44,7 +16,6 @@
  */
 interface ImageHandlerInterface
 {
-
 	/**
 	 * Resize the image
 	 *
@@ -81,7 +52,7 @@
 	 * Changes the stored image type to indicate the new file format to use when saving.
 	 * Does not touch the actual resource.
 	 *
-	 * @param integer|null $imageType A PHP imagetype constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
+	 * @param integer $imageType A PHP imagetype constant, e.g. https://www.php.net/manual/en/function.image-type-to-mime-type.php
 	 *
 	 * @return $this
 	 */
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 3ee0c50..f812af8 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -1,55 +1,26 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Language;
 
 use Config\Services;
+use MessageFormatter;
 
 /**
  * Handle system messages and localization.
  *
  * Locale-based, built on top of PHP internationalization.
- *
- * @package CodeIgniter\Language
  */
 class Language
 {
-
 	/**
 	 * Stores the retrieved language lines
 	 * from files for faster retrieval on
@@ -88,10 +59,10 @@
 	{
 		$this->locale = $locale;
 
-		if (class_exists('\MessageFormatter'))
+		if (class_exists('MessageFormatter'))
 		{
 			$this->intlSupport = true;
-		};
+		}
 	}
 
 	//--------------------------------------------------------------------
@@ -136,29 +107,23 @@
 	 */
 	public function getLine(string $line, array $args = [])
 	{
-		// ignore requests with no file specified
-		if (! strpos($line, '.'))
+		// if no file is given, just parse the line
+		if (strpos($line, '.') === false)
 		{
-			return $line;
+			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);
+		list($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);
+			list($locale) = explode('-', $this->locale, 2);
 
-			[
-				$file,
-				$parsedLine,
-			] = $this->parseLine($line, $locale);
+			list($file, $parsedLine) = $this->parseLine($line, $locale);
 
 			$output = $this->getTranslationOutput($locale, $file, $parsedLine);
 		}
@@ -166,21 +131,14 @@
 		// if still not found, try English
 		if ($output === null)
 		{
-			[
-				$file,
-				$parsedLine,
-			]       = $this->parseLine($line, 'en');
+			list($file, $parsedLine) = $this->parseLine($line, 'en');
+
 			$output = $this->getTranslationOutput('en', $file, $parsedLine);
 		}
 
 		$output = $output ?? $line;
 
-		if (! empty($args))
-		{
-			$output = $this->formatMessage($output, $args);
-		}
-
-		return $output;
+		return $this->formatMessage($output, $args);
 	}
 
 	//--------------------------------------------------------------------
@@ -258,7 +216,7 @@
 	 */
 	protected function formatMessage($message, array $args = [])
 	{
-		if (! $this->intlSupport || ! $args)
+		if (! $this->intlSupport || $args === [])
 		{
 			return $message;
 		}
@@ -269,10 +227,11 @@
 			{
 				$message[$index] = $this->formatMessage($value, $args);
 			}
+
 			return $message;
 		}
 
-		return \MessageFormatter::formatMessage($this->locale, $message, $args);
+		return MessageFormatter::formatMessage($this->locale, $message, $args);
 	}
 
 	//--------------------------------------------------------------------
@@ -286,7 +245,7 @@
 	 * @param string  $locale
 	 * @param boolean $return
 	 *
-	 * @return array|null
+	 * @return void|array
 	 */
 	protected function load(string $file, string $locale, bool $return = false)
 	{
@@ -295,7 +254,7 @@
 			$this->loadedFiles[$locale] = [];
 		}
 
-		if (in_array($file, $this->loadedFiles[$locale]))
+		if (in_array($file, $this->loadedFiles[$locale], true))
 		{
 			// Don't load it more than once.
 			return [];
diff --git a/system/Language/en/CLI.php b/system/Language/en/CLI.php
index 1afd4f2..fa4ed3b 100644
--- a/system/Language/en/CLI.php
+++ b/system/Language/en/CLI.php
@@ -1,24 +1,37 @@
 <?php
 
 /**
- * CLI language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// CLI language settings
 return [
-   'commandNotFound' => 'Command "{0}" not found.',
-   'helpUsage'       => 'Usage:',
-   'helpDescription' => 'Description:',
-   'helpOptions'     => 'Options:',
-   'helpArguments'   => 'Arguments:',
-   'invalidColor'    => 'Invalid {0} color: {1}.',
+	'altCommandPlural'    => 'Did you mean one of these?',
+	'altCommandSingular'  => 'Did you mean this?',
+	'commandNotFound'     => 'Command "{0}" not found.',
+	'generator'           => [
+		'cancelOperation'  => 'Operation has been cancelled.',
+		'className'        => '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 a6a7038..e5c2588 100644
--- a/system/Language/en/Cache.php
+++ b/system/Language/en/Cache.php
@@ -1,22 +1,18 @@
 <?php
 
 /**
- * Cache language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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 f299df8..cf088e8 100644
--- a/system/Language/en/Cast.php
+++ b/system/Language/en/Cast.php
@@ -1,23 +1,20 @@
 <?php
+
 /**
- * Cast language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// Cast language settings
 return [
-   'jsonErrorDepth'         => 'Maximum stack depth exceeded',
-   'jsonErrorStateMismatch' => 'Underflow or the modes mismatch',
-   'jsonErrorCtrlChar'      => 'Unexpected control character found',
-   'jsonErrorSyntax'        => 'Syntax error, malformed JSON',
-   'jsonErrorUtf8'          => 'Malformed UTF-8 characters, possibly incorrectly encoded',
-   'jsonErrorUnknown'       => 'Unknown error',
+	'jsonErrorDepth'         => 'Maximum stack depth exceeded',
+	'jsonErrorStateMismatch' => 'Underflow or the modes mismatch',
+	'jsonErrorCtrlChar'      => 'Unexpected control character found',
+	'jsonErrorSyntax'        => 'Syntax error, malformed JSON',
+	'jsonErrorUtf8'          => 'Malformed UTF-8 characters, possibly incorrectly encoded',
+	'jsonErrorUnknown'       => 'Unknown error',
 ];
diff --git a/system/Language/en/Core.php b/system/Language/en/Core.php
index 3ab4e0f..8ba05c2 100644
--- a/system/Language/en/Core.php
+++ b/system/Language/en/Core.php
@@ -1,23 +1,19 @@
 <?php
 
 /**
- * Core language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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}',
-   'missingExtension'             => '{0} extension is not loaded.',
-   '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}',
+	'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 da88895..4e04aee 100644
--- a/system/Language/en/Database.php
+++ b/system/Language/en/Database.php
@@ -1,33 +1,30 @@
 <?php
 
 /**
- * Database language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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}.',
-   '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 db10a25..2abdd93 100644
--- a/system/Language/en/Email.php
+++ b/system/Language/en/Email.php
@@ -1,36 +1,33 @@
 <?php
+
 /**
- * Email language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 3.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.
  */
 
+// 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 4b4e64c..756eeaa 100644
--- a/system/Language/en/Encryption.php
+++ b/system/Language/en/Encryption.php
@@ -1,23 +1,20 @@
 <?php
+
 /**
- * Encryption language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 3.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.
  */
 
+// 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/Entity.php b/system/Language/en/Entity.php
deleted file mode 100644
index 97bc74f..0000000
--- a/system/Language/en/Entity.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * CLI language strings.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @filesource
- *
- * @codeCoverageIgnore
- */
-
-return [
-   'tryingToAccessNonExistentProperty' => 'Trying to access non existent property {0} of {1}',
-];
diff --git a/system/Language/en/Fabricator.php b/system/Language/en/Fabricator.php
index a3efbde..88ca611 100644
--- a/system/Language/en/Fabricator.php
+++ b/system/Language/en/Fabricator.php
@@ -1,20 +1,17 @@
 <?php
 
 /**
- * Fabricator language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// Fabricator language settings
 return [
-   'invalidModel'      => 'Invalid model supplied for fabrication.',
-   'missingFormatters' => 'No valid formatters defined.',
+	'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 6ff4878..fe8a80a 100644
--- a/system/Language/en/Files.php
+++ b/system/Language/en/Files.php
@@ -1,19 +1,16 @@
 <?php
+
 /**
- * Files language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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 7a757b2..4fc860f 100644
--- a/system/Language/en/Filters.php
+++ b/system/Language/en/Filters.php
@@ -1,20 +1,16 @@
 <?php
 
 /**
- * Filters language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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 c0070c8..383b5b5 100644
--- a/system/Language/en/Format.php
+++ b/system/Language/en/Format.php
@@ -1,20 +1,18 @@
 <?php
 
 /**
- * Format language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// Format language settings
 return [
-   'invalidJSON'      => 'Failed to parse json string, error: "{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 1bc53b1..d641eb5 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -1,77 +1,78 @@
 <?php
 
 /**
- * HTTP language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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}',
+	'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.',
+	'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}',
+	'invalidHTTPProtocol'        => 'Invalid HTTP Protocol Version. Must be one of: {0}',
 
 	// Negotiate
-   'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
+	'emptySupportedNegotiations' => 'You must provide an array of supported values to all Negotiations.',
 
 	// RedirectResponse
-   'invalidRoute'               => '{0} route cannot be found while reverse-routing.',
+	'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}',
+	'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}',
+	'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.',
+	'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}',
+	'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
-   'disallowedAction'           => 'The action you requested is not allowed.',
+	// @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})',
+	'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 use `Security.invalidSameSiteSetting`
+	'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 85327e6..5ad5ea6 100644
--- a/system/Language/en/Images.php
+++ b/system/Language/en/Images.php
@@ -1,38 +1,34 @@
 <?php
 
 /**
- * Image language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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/Language.php b/system/Language/en/Language.php
deleted file mode 100644
index 5d38ee7..0000000
--- a/system/Language/en/Language.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Language system language strings.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- *
- * @codeCoverageIgnore
- */
-
-return [
-   'languageGetLineInvalidArgumentException' => 'Get line must be a string or array of strings.',
-];
diff --git a/system/Language/en/Log.php b/system/Language/en/Log.php
index 0c8498d..8942ebf 100644
--- a/system/Language/en/Log.php
+++ b/system/Language/en/Log.php
@@ -1,19 +1,15 @@
 <?php
 
 /**
- * Log language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// Log language settings
 return [
-   'invalidLogLevel' => '{0} is an invalid log level.',
+	'invalidLogLevel' => '{0} is an invalid log level.',
 ];
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index d148927..05335cd 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -1,58 +1,57 @@
 <?php
 
 /**
- * Migration language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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.',
+	'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',
-   'badCreateName'     => 'You must provide a migration file name.',
-   'writeError'        => 'Error trying to create {0} file, check if the directory is writable.',
-   '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?',
+	'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.',
-   'on'                => 'Migrated On: ',
-   'migSeeder'         => 'Seeder name',
-   'migMissingSeeder'  => 'You must provide a seeder name.',
-   '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: ',
 
-   'version'           => 'Version',
-   'filename'          => 'Filename',
+	// 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 149d8a4..117c892 100644
--- a/system/Language/en/Number.php
+++ b/system/Language/en/Number.php
@@ -1,30 +1,26 @@
 <?php
 
 /**
- * Number language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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',
+	'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 6e156c4..f89fb99 100644
--- a/system/Language/en/Pager.php
+++ b/system/Language/en/Pager.php
@@ -1,27 +1,23 @@
 <?php
 
 /**
- * Pager language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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 69262a6..6a8341d 100644
--- a/system/Language/en/RESTful.php
+++ b/system/Language/en/RESTful.php
@@ -1,18 +1,15 @@
 <?php
+
 /**
- * RESTful language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 3.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.
  */
 
+// RESTful language settings
 return [
-   'notImplemented' => '"{0}" action not implemented.',
+	'notImplemented' => '"{0}" action not implemented.',
 ];
diff --git a/system/Language/en/Redirect.php b/system/Language/en/Redirect.php
deleted file mode 100644
index da77f14..0000000
--- a/system/Language/en/Redirect.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Redirect language strings.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- *
- * @codeCoverageIgnore
- */
-
-return [
-   'forUnableToRedirect' => 'Unable to redirect to "{0}". Error status code "{1}"',
-];
diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
index b305b54..450b1c3 100644
--- a/system/Language/en/Router.php
+++ b/system/Language/en/Router.php
@@ -1,20 +1,16 @@
 <?php
 
 /**
- * Router language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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
new file mode 100644
index 0000000..3e1b961
--- /dev/null
+++ b/system/Language/en/Security.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+// Security language settings
+return [
+	'disallowedAction' => 'The action you requested is not allowed.',
+	'invalidSameSite'  => 'The SameSite value must be None, Lax, Strict, or a blank string. Given: {0}',
+];
diff --git a/system/Language/en/Seed.php b/system/Language/en/Seed.php
deleted file mode 100644
index 98429b4..0000000
--- a/system/Language/en/Seed.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Seed language strings.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
- *
- * @codeCoverageIgnore
- */
-
-return [
-    // Seed command
-    'nameFile'   => 'Name the seeder file',
-    'writeError' => 'Error trying to create {0} file, check if the directory is writable.',
-];
diff --git a/system/Language/en/Session.php b/system/Language/en/Session.php
index 0d12ff0..56bd1b7 100644
--- a/system/Language/en/Session.php
+++ b/system/Language/en/Session.php
@@ -1,23 +1,20 @@
 <?php
 
 /**
- * Session language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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}',
+	'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 92fdf47..47117b2 100644
--- a/system/Language/en/Time.php
+++ b/system/Language/en/Time.php
@@ -1,36 +1,33 @@
 <?php
 
 /**
- * Time language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// Time language settings
 return [
-   '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 73a38c2..63982a5 100644
--- a/system/Language/en/Validation.php
+++ b/system/Language/en/Validation.php
@@ -1,75 +1,72 @@
 <?php
 
 /**
- * Validation language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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.',
+	'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}.',
-   '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.',
+	'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.',
+	'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.',
+	'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 eb49e1c..099c074 100644
--- a/system/Language/en/View.php
+++ b/system/Language/en/View.php
@@ -1,23 +1,20 @@
 <?php
+
 /**
- * View language strings.
+ * This file is part of the CodeIgniter 4 framework.
  *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2019-2020 CodeIgniter Foundation
- * @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.
  */
 
+// 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 b8db4ae..12ff819 100644
--- a/system/Log/Exceptions/LogException.php
+++ b/system/Log/Exceptions/LogException.php
@@ -1,13 +1,22 @@
-<?php namespace CodeIgniter\Log\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Log\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class LogException extends FrameworkException implements ExceptionInterface
+class LogException extends FrameworkException
 {
 	public static function forInvalidLogLevel(string $level)
 	{
 		return new static(lang('Log.invalidLogLevel', [$level]));
 	}
-
 }
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
index 6874d38..61b6e7d 100644
--- a/system/Log/Handlers/BaseHandler.php
+++ b/system/Log/Handlers/BaseHandler.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -44,7 +16,6 @@
  */
 abstract class BaseHandler implements HandlerInterface
 {
-
 	/**
 	 * Handles
 	 *
@@ -77,13 +48,13 @@
 	 * Checks whether the Handler will handle logging items of this
 	 * log Level.
 	 *
-	 * @param $level
+	 * @param string $level
 	 *
 	 * @return boolean
 	 */
 	public function canHandle(string $level): bool
 	{
-		return in_array($level, $this->handles);
+		return in_array($level, $this->handles, true);
 	}
 
 	//--------------------------------------------------------------------
@@ -94,8 +65,8 @@
 	 * will stop. Any handlers that have not run, yet, will not
 	 * be run.
 	 *
-	 * @param $level
-	 * @param $message
+	 * @param string $level
+	 * @param string $message
 	 *
 	 * @return boolean
 	 */
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 168eae4..b248072 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -49,12 +21,9 @@
  * Requires the ChromeLogger extension installed in your browser.
  *
  * @see https://craig.is/writing/chrome-logger
- *
- * @package CodeIgniter\Log\Handlers
  */
-class ChromeLoggerHandler extends BaseHandler implements HandlerInterface
+class ChromeLoggerHandler extends BaseHandler
 {
-
 	/**
 	 * Version of this library - for ChromeLogger use.
 	 *
@@ -131,8 +100,8 @@
 	 * will stop. Any handlers that have not run, yet, will not
 	 * be run.
 	 *
-	 * @param $level
-	 * @param $message
+	 * @param string $level
+	 * @param string $message
 	 *
 	 * @return boolean
 	 */
@@ -142,7 +111,7 @@
 		$message = $this->format($message);
 
 		// Generate Backtrace info
-		$backtrace = debug_backtrace(false, $this->backtraceLevel);
+		$backtrace = debug_backtrace(0, $this->backtraceLevel);
 		$backtrace = end($backtrace);
 
 		$backtraceMessage = 'unknown';
@@ -175,7 +144,7 @@
 	/**
 	 * Converts the object to display nicely in the Chrome Logger UI.
 	 *
-	 * @param $object
+	 * @param mixed $object
 	 *
 	 * @return array
 	 */
@@ -212,5 +181,4 @@
 
 		$response->setHeader($this->header, $data);
 	}
-
 }
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 41df096..8b608b3 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -1,50 +1,24 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
 
+use DateTime;
+use Exception;
+
 /**
  * Log error messages to file system
  */
-class FileHandler extends BaseHandler implements HandlerInterface
+class FileHandler extends BaseHandler
 {
-
 	/**
 	 * Folder to hold logs
 	 *
@@ -93,11 +67,11 @@
 	 * will stop. Any handlers that have not run, yet, will not
 	 * be run.
 	 *
-	 * @param $level
-	 * @param $message
+	 * @param string $level
+	 * @param string $message
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function handle($level, $message): bool
 	{
@@ -124,10 +98,10 @@
 		// Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
 		if (strpos($this->dateFormat, 'u') !== false)
 		{
-			$microtime_full  = microtime(true);
-			$microtime_short = sprintf('%06d', ($microtime_full - floor($microtime_full)) * 1000000);
-			$date            = new \DateTime(date('Y-m-d H:i:s.' . $microtime_short, $microtime_full));
-			$date            = $date->format($this->dateFormat);
+			$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
 		{
@@ -157,7 +131,7 @@
 			chmod($filepath, $this->filePermissions);
 		}
 
-		return is_int($result);
+		return is_int($result); // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
index 6778a46..ec29cf8 100644
--- a/system/Log/Handlers/HandlerInterface.php
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
@@ -44,15 +16,14 @@
  */
 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 $level
-	 * @param $message
+	 * @param string $level
+	 * @param string $message
 	 *
 	 * @return boolean
 	 */
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 45f2eca..d3054ef 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -1,46 +1,21 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log;
 
 use CodeIgniter\Log\Exceptions\LogException;
+use CodeIgniter\Log\Handlers\HandlerInterface;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
+use Throwable;
 
 /**
  * The CodeIgntier Logger
@@ -53,17 +28,14 @@
  * The context array can contain arbitrary data, the only assumption that
  * can be made by implementors is that if an Exception instance is given
  * to produce a stack trace, it MUST be in a key named "exception".
- *
- * @package CodeIgniter\Log
  */
 class Logger implements LoggerInterface
 {
-
 	/**
 	 * Used by the logThreshold Config setting to define
 	 * which errors to show.
 	 *
-	 * @var array
+	 * @var array<string, integer>
 	 */
 	protected $logLevels = [
 		'emergency' => 1,
@@ -144,7 +116,7 @@
 	 *
 	 * @param  \Config\Logger $config
 	 * @param  boolean        $debug
-	 * @throws \RuntimeException
+	 * @throws RuntimeException
 	 */
 	public function __construct($config, bool $debug = CI_DEBUG)
 	{
@@ -157,7 +129,7 @@
 			$temp = [];
 			foreach ($this->loggableLevels as $level)
 			{
-				$temp[] = array_search((int) $level, $this->logLevels);
+				$temp[] = array_search((int) $level, $this->logLevels, true);
 			}
 
 			$this->loggableLevels = $temp;
@@ -328,7 +300,7 @@
 	{
 		if (is_numeric($level))
 		{
-			$level = array_search((int) $level, $this->logLevels);
+			$level = array_search((int) $level, $this->logLevels, true);
 		}
 
 		// Is the level a valid level?
@@ -338,7 +310,7 @@
 		}
 
 		// Does the app want to log this right now?
-		if (! in_array($level, $this->loggableLevels))
+		if (! in_array($level, $this->loggableLevels, true))
 		{
 			return false;
 		}
@@ -367,7 +339,7 @@
 			}
 
 			/**
-			 * @var \CodeIgniter\Log\Handlers\HandlerInterface
+			 * @var HandlerInterface
 			 */
 			$handler = $this->handlers[$className];
 
@@ -420,7 +392,7 @@
 		{
 			// Verify that the 'exception' key is actually an exception
 			// or error, both of which implement the 'Throwable' interface.
-			if ($key === 'exception' && $val instanceof \Throwable)
+			if ($key === 'exception' && $val instanceof Throwable)
 			{
 				$val = $val->getMessage() . ' ' . $this->cleanFileNames($val->getFile()) . ':' . $val->getLine();
 			}
@@ -490,7 +462,7 @@
 		];
 
 		// Generate Backtrace info
-		$trace = \debug_backtrace(false);
+		$trace = \debug_backtrace(0);
 
 		// So we search from the bottom (earliest) of the stack frames
 		$stackFrames = \array_reverse($trace);
@@ -498,7 +470,7 @@
 		// Find the first reference to a Logger class method
 		foreach ($stackFrames as $frame)
 		{
-			if (\in_array($frame['function'], $logFunctions))
+			if (\in_array($frame['function'], $logFunctions, true))
 			{
 				$file = isset($frame['file']) ? $this->cleanFileNames($frame['file']) : 'unknown';
 				$line = $frame['line'] ?? 'unknown';
@@ -525,7 +497,7 @@
 	 *      becomes:
 	 *  APPPATH/Controllers/Home.php
 	 *
-	 * @param $file
+	 * @param string $file
 	 *
 	 * @return string
 	 */
diff --git a/system/Model.php b/system/Model.php
index 8245fba..acde965 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -1,44 +1,17 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
 
+use BadMethodCallException;
 use Closure;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\BaseConnection;
@@ -48,41 +21,31 @@
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Exceptions\ModelException;
 use CodeIgniter\I18n\Time;
-use CodeIgniter\Pager\Pager;
 use CodeIgniter\Validation\ValidationInterface;
 use Config\Database;
 use ReflectionClass;
+use ReflectionException;
 use ReflectionProperty;
-use stdClass;
 
 /**
  * Class Model
  *
- * The Model class provides a number of convenient features that
- * makes working with a database table less painful.
+ * The Model class extends BaseModel and provides additional
+ * convenient features that makes working with a SQL database
+ * table less painful.
  *
  * It will:
  *      - automatically connect to database
- *      - allow intermingling calls between db connection, the builder,
- *          and methods in this class.
- *      - simplifies pagination
+ *      - allow intermingling calls to the builder
  *      - removes the need to use Result object directly in most cases
- *      - allow specifying the return type (array, object, etc) with each call
- *      - ensure validation is run against objects when saving items
  *
- * @package CodeIgniter
- * @mixin   BaseBuilder
+ * @property ConnectionInterface $db
+ *
+ * @mixin BaseBuilder
  */
-class Model
+class Model extends BaseModel
 {
-
-	/**
-	 * Pager instance.
-	 * Populated after calling $this->paginate()
-	 *
-	 * @var Pager
-	 */
-	public $pager;
+	// region Properties
 
 	/**
 	 * Name of database table
@@ -99,232 +62,20 @@
 	protected $primaryKey = 'id';
 
 	/**
-	 * Last insert ID
-	 *
-	 * @var integer
-	 */
-	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.
+	 * Whether primary key uses auto increment.
 	 *
 	 * @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 ConnectionInterface
-	 */
-	protected $db;
+	protected $useAutoIncrement = true;
 
 	/**
 	 * Query Builder object
 	 *
-	 * @var BaseBuilder
+	 * @var BaseBuilder|null
 	 */
 	protected $builder;
 
 	/**
-	 * 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
-	 */
-	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 \CodeIgniter\Validation\Validation
-	 */
-	protected $validation;
-
-	/*
-	 * Callbacks. Each array should contain the method
-	 * names (within the model) that should be called
-	 * when those events are triggered. With the exception
-	 * of 'afterFind', all methods are passed the same
-	 * items that are given to the update/insert method.
-	 * 'afterFind' will also include 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 afterFind
-	 *
-	 * @var array
-	 */
-	protected $afterFind = [];
-	/**
-	 * Callbacks for beforeDelete
-	 *
-	 * @var array
-	 */
-	protected $beforeDelete = [];
-	/**
-	 * Callbacks for afterDelete
-	 *
-	 * @var array
-	 */
-	protected $afterDelete = [];
-
-	/**
 	 * Holds information passed in via 'set'
 	 * so that we can capture it (not the builder)
 	 * and ensure it gets validated first.
@@ -333,55 +84,75 @@
 	 */
 	protected $tempData = [];
 
-	//--------------------------------------------------------------------
+	/**
+	 * Escape array that maps usage of escape
+	 * flag for every parameter.
+	 *
+	 * @var array
+	 */
+	protected $escape = [];
+
+	// endregion
+
+	// region Constructor
 
 	/**
 	 * Model constructor.
 	 *
-	 * @param ConnectionInterface $db
-	 * @param ValidationInterface $validation
+	 * @param ConnectionInterface|null $db         DB Connection
+	 * @param ValidationInterface|null $validation Validation
 	 */
 	public function __construct(ConnectionInterface &$db = null, ValidationInterface $validation = null)
 	{
-		if ($db instanceof ConnectionInterface)
-		{
-			$this->db = & $db;
-		}
-		else
+		parent::__construct($validation);
+
+		if (is_null($db))
 		{
 			$this->db = Database::connect($this->DBGroup);
 		}
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		if (is_null($validation))
+		else
 		{
-			$validation = \Config\Services::validation(null, false);
+			$this->db = &$db;
 		}
-
-		$this->validation = $validation;
 	}
 
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// CRUD & FINDERS
-	//--------------------------------------------------------------------
+	// endregion
+
+	// region Setters
+
+	/**
+	 * Specify the table associated with a model
+	 *
+	 * @param string $table Table
+	 *
+	 * @return $this
+	 */
+	public function setTable(string $table)
+	{
+		$this->table = $table;
+
+		return $this;
+	}
+
+	// endregion
+
+	// region Database Methods
 
 	/**
 	 * Fetches the row of database from $this->table with a primary key
-	 * matching $id.
+	 * matching $id. This methods works only with dbCalls
+	 * This methods works only with dbCalls
 	 *
-	 * @param mixed|array|null $id One primary key or an array of primary keys
+	 * @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.
 	 */
-	public function find($id = null)
+	protected function doFind(bool $singleton, $id = null)
 	{
 		$builder = $this->builder();
 
-		if ($this->tempUseSoftDeletes === true)
+		if ($this->tempUseSoftDeletes)
 		{
 			$builder->where($this->table . '.' . $this->deletedField, null);
 		}
@@ -389,107 +160,78 @@
 		if (is_array($id))
 		{
 			$row = $builder->whereIn($this->table . '.' . $this->primaryKey, $id)
-					->get();
-			$row = $row->getResult($this->tempReturnType);
+				->get()
+				->getResult($this->tempReturnType);
 		}
-		elseif (is_numeric($id) || is_string($id))
+		elseif ($singleton)
 		{
 			$row = $builder->where($this->table . '.' . $this->primaryKey, $id)
-					->get();
-
-			$row = $row->getFirstRow($this->tempReturnType);
+				->get()
+				->getFirstRow($this->tempReturnType);
 		}
 		else
 		{
-			$row = $builder->get();
-
-			$row = $row->getResult($this->tempReturnType);
+			$row = $builder->get()->getResult($this->tempReturnType);
 		}
 
-		$eventData = $this->trigger('afterFind', ['id' => $id, 'data' => $row]);
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-
-		return $eventData['data'];
+		return $row;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Fetches the column of database from $this->table
+	 * This methods works only with dbCalls
 	 *
-	 * @param string $columnName
+	 * @param string $columnName Column Name
 	 *
-	 * @return array|null   The resulting row of data, or null if no data found.
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
+	 * @return array|null The resulting row of data, or null if no data found.
 	 */
-	public function findColumn(string $columnName)
+	protected function doFindColumn(string $columnName)
 	{
-		if (strpos($columnName, ',') !== false)
-		{
-			throw DataException::forFindColumnHaveMultipleColumns();
-		}
-
-		$resultSet = $this->select($columnName)
-						  ->asArray()
-						  ->find();
-
-		return (! empty($resultSet)) ? array_column($resultSet, $columnName) : null;
+		return $this->select($columnName)->asArray()->find();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Works with the current Query Builder instance to return
 	 * all results, while optionally limiting them.
+	 * This methods works only with dbCalls
 	 *
-	 * @param integer $limit
-	 * @param integer $offset
+	 * @param integer $limit  Limit
+	 * @param integer $offset Offset
 	 *
 	 * @return array
 	 */
-	public function findAll(int $limit = 0, int $offset = 0)
+	protected function doFindAll(int $limit = 0, int $offset = 0)
 	{
 		$builder = $this->builder();
 
-		if ($this->tempUseSoftDeletes === true)
+		if ($this->tempUseSoftDeletes)
 		{
 			$builder->where($this->table . '.' . $this->deletedField, null);
 		}
 
-		$row = $builder->limit($limit, $offset)
-				->get();
-
-		$row = $row->getResult($this->tempReturnType);
-
-		$eventData = $this->trigger('afterFind', ['data' => $row, 'limit' => $limit, 'offset' => $offset]);
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-
-		return $eventData['data'];
+		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
 	 */
-	public function first()
+	protected function doFirst()
 	{
 		$builder = $this->builder();
 
-		if ($this->tempUseSoftDeletes === true)
+		if ($this->tempUseSoftDeletes)
 		{
 			$builder->where($this->table . '.' . $this->deletedField, null);
 		}
 		else
 		{
-			if ($this->useSoftDeletes === true && empty($builder->QBGroupBy) && ! empty($this->primaryKey))
+			if ($this->useSoftDeletes && empty($builder->QBGroupBy) && $this->primaryKey)
 			{
 				$builder->groupBy($this->table . '.' . $this->primaryKey);
 			}
@@ -497,303 +239,83 @@
 
 		// Some databases, like PostgreSQL, need order
 		// information to consistently return correct results.
-		if (! empty($builder->QBGroupBy) && empty($builder->QBOrderBy) && ! empty($this->primaryKey))
+		if ($builder->QBGroupBy && empty($builder->QBOrderBy) && $this->primaryKey)
 		{
 			$builder->orderBy($this->table . '.' . $this->primaryKey, 'asc');
 		}
 
-		$row = $builder->limit(1, 0)
-					   ->get();
-
-		$row = $row->getFirstRow($this->tempReturnType);
-
-		$eventData = $this->trigger('afterFind', ['data' => $row]);
-
-		$this->tempReturnType     = $this->returnType;
-		$this->tempUseSoftDeletes = $this->useSoftDeletes;
-
-		return $eventData['data'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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  $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)
-	{
-		$data = is_array($key)
-			? $key
-			: [$key => $value];
-
-		$this->tempData['escape'] = $escape;
-		$this->tempData['data']   = array_merge($this->tempData['data'] ?? [], $data);
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	 *
-	 * @return boolean
-	 * @throws \ReflectionException
-	 */
-	public function save($data): bool
-	{
-		if (empty($data))
-		{
-			return true;
-		}
-
-		if (is_object($data) && isset($data->{$this->primaryKey}))
-		{
-			$response = $this->update($data->{$this->primaryKey}, $data);
-		}
-		elseif (is_array($data) && ! empty($data[$this->primaryKey]))
-		{
-			$response = $this->update($data[$this->primaryKey], $data);
-		}
-		else
-		{
-			$response = $this->insert($data, false);
-
-			if ($response instanceof BaseResult)
-			{
-				$response = $response->resultID !== false;
-			}
-			elseif ($response !== false)
-			{
-				$response = true;
-			}
-		}
-
-		return $response;
+		return $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType);
 	}
 
 	/**
-	 * Takes a class an returns an array of it's public and protected
-	 * properties as an array suitable for use in creates and updates.
+	 * Inserts data into the current table.
+	 * This methods works only with dbCalls
 	 *
-	 * @param string|object $data
-	 * @param string|null   $primaryKey
-	 * @param string        $dateFormat
-	 * @param boolean       $onlyChanged
-	 *
-	 * @return array
-	 * @throws \ReflectionException
-	 */
-	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) && ! 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);
-				$propName              = $prop->getName();
-				$properties[$propName] = $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;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns last insert ID or 0.
-	 *
-	 * @return integer
-	 */
-	public function getInsertID(): int
-	{
-		return $this->insertID;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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.
+	 * @param array $data Data
 	 *
 	 * @return BaseResult|integer|string|false
-	 * @throws \ReflectionException
 	 */
-	public function insert($data = null, bool $returnID = true)
+	protected function doInsert(array $data)
 	{
-		$escape = null;
+		$escape       = $this->escape;
+		$this->escape = [];
 
-		$this->insertID = 0;
-
-		if (empty($data))
+		// Require non empty primaryKey when
+		// not using auto-increment feature
+		if (! $this->useAutoIncrement && empty($data[$this->primaryKey]))
 		{
-			$data           = $this->tempData['data'] ?? null;
-			$escape         = $this->tempData['escape'] ?? null;
-			$this->tempData = [];
+			throw DataException::forEmptyPrimaryKey('insert');
 		}
 
-		if (empty($data))
+		$builder = $this->builder();
+
+		// Must use the set() method to ensure to set the correct escape flag
+		foreach ($data as $key => $val)
 		{
-			throw DataException::forEmptyDataset('insert');
+			$builder->set($key, $val, $escape[$key] ?? null);
 		}
 
-		// If $data is using a custom class with public or protected
-		// properties representing the table elements, we need to grab
-		// them as an array.
-		if (is_object($data) && ! $data instanceof stdClass)
-		{
-			$data = static::classToArray($data, $this->primaryKey, $this->dateFormat, false);
-		}
-
-		// 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 (empty($data))
-		{
-			throw DataException::forEmptyDataset('insert');
-		}
-
-		// Validate data before saving.
-		if ($this->skipValidation === false)
-		{
-			if ($this->cleanRules()->validate($data) === false)
-			{
-				return false;
-			}
-		}
-
-		// Must be called first so we don't
-		// strip out created_at values.
-		$data = $this->doProtectFields($data);
-
-		// Set created_at and updated_at with same time
-		$date = $this->setDate();
-
-		if ($this->useTimestamps && ! empty($this->createdField) && ! array_key_exists($this->createdField, $data))
-		{
-			$data[$this->createdField] = $date;
-		}
-
-		if ($this->useTimestamps && ! empty($this->updatedField) && ! array_key_exists($this->updatedField, $data))
-		{
-			$data[$this->updatedField] = $date;
-		}
-
-		$eventData = $this->trigger('beforeInsert', ['data' => $data]);
-
-		// Must use the set() method to ensure objects get converted to arrays
-		$result = $this->builder()
-				->set($eventData['data'], '', $escape)
-				->insert();
+		$result = $builder->insert();
 
 		// If insertion succeeded then save the insert ID
 		if ($result->resultID)
 		{
-			$this->insertID = $this->db->insertID();
+			if (! $this->useAutoIncrement)
+			{
+				$this->insertID = $data[$this->primaryKey];
+			}
+			else
+			{
+				// @phpstan-ignore-next-line
+				$this->insertID = $this->db->insertID();
+			}
 		}
 
-		// Trigger afterInsert events with the inserted data and new ID
-		$this->trigger('afterInsert', ['id' => $this->insertID, 'data' => $eventData['data'], 'result' => $result]);
-
-		// If insertion failed, get out of here
-		if (! $result)
-		{
-			return $result;
-		}
-
-		// otherwise return the insertID, if requested.
-		return $returnID ? $this->insertID : $result;
+		return $result;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Compiles batch insert strings and runs the queries, validating each row prior.
+	 * This methods works only with dbCalls
 	 *
-	 * @param array   $set       An associative array of insert values
-	 * @param boolean $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
+	 * @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
 	 */
-	public function insertBatch(array $set = null, bool $escape = null, int $batchSize = 100, bool $testing = false)
+	protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100, bool $testing = false)
 	{
-		if (is_array($set) && $this->skipValidation === false)
+		if (is_array($set))
 		{
 			foreach ($set as $row)
 			{
-				if ($this->cleanRules()->validate($row) === false)
+				// Require non empty primaryKey when
+				// not using auto-increment feature
+				if (! $this->useAutoIncrement && empty($row[$this->primaryKey]))
 				{
-					return false;
+					throw DataException::forEmptyPrimaryKey('insertBatch');
 				}
 			}
 		}
@@ -801,80 +323,19 @@
 		return $this->builder()->testMode($testing)->insertBatch($set, $escape, $batchSize);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Updates a single record in $this->table. If an object is provided,
-	 * it will attempt to convert it into an array.
+	 * Updates a single record in $this->table.
+	 * This methods works only with dbCalls
 	 *
-	 * @param integer|array|string $id
-	 * @param array|object         $data
+	 * @param integer|array|string|null $id   ID
+	 * @param array|null                $data Data
 	 *
 	 * @return boolean
-	 * @throws \ReflectionException
 	 */
-	public function update($id = null, $data = null): bool
+	protected function doUpdate($id = null, $data = null): bool
 	{
-		$escape = null;
-
-		if (is_numeric($id) || is_string($id))
-		{
-			$id = [$id];
-		}
-
-		if (empty($data))
-		{
-			$data           = $this->tempData['data'] ?? null;
-			$escape         = $this->tempData['escape'] ?? null;
-			$this->tempData = [];
-		}
-
-		if (empty($data))
-		{
-			throw DataException::forEmptyDataset('update');
-		}
-
-		// If $data is using a custom class with public or protected
-		// properties representing the table elements, we need to grab
-		// them as an array.
-		if (is_object($data) && ! $data instanceof stdClass)
-		{
-			$data = static::classToArray($data, $this->primaryKey, $this->dateFormat);
-		}
-
-		// 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('update');
-		}
-
-		// Validate data before saving.
-		if ($this->skipValidation === false)
-		{
-			if ($this->cleanRules(true)->validate($data) === false)
-			{
-				return false;
-			}
-		}
-
-		// Must be called first so we don't
-		// strip out updated_at values.
-		$data = $this->doProtectFields($data);
-
-		if ($this->useTimestamps && ! empty($this->updatedField) && ! array_key_exists($this->updatedField, $data))
-		{
-			$data[$this->updatedField] = $this->setDate();
-		}
-
-		$eventData = $this->trigger('beforeUpdate', ['id' => $id, 'data' => $data]);
+		$escape       = $this->escape;
+		$this->escape = [];
 
 		$builder = $this->builder();
 
@@ -883,89 +344,73 @@
 			$builder = $builder->whereIn($this->table . '.' . $this->primaryKey, $id);
 		}
 
-		// Must use the set() method to ensure objects get converted to arrays
-		$result = $builder
-				->set($eventData['data'], '', $escape)
-				->update();
-
-		$this->trigger('afterUpdate', ['id' => $id, 'data' => $eventData['data'], 'result' => $result]);
-
-		return $result;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	 * @param boolean $returnSQL True means SQL is returned, false will execute the query
-	 *
-	 * @return mixed    Number of rows affected or FALSE on failure
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
-	 */
-	public function updateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
-	{
-		if (is_array($set) && $this->skipValidation === false)
+		// Must use the set() method to ensure to set the correct escape flag
+		foreach ($data as $key => $val)
 		{
-			foreach ($set as $row)
-			{
-				if ($this->cleanRules(true)->validate($row) === false)
-				{
-					return false;
-				}
-			}
+			$builder->set($key, $val, $escape[$key] ?? null);
 		}
 
-		return $this->builder()->testMode($returnSQL)->updateBatch($set, $index, $batchSize);
+		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 BaseResult|boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 *
+	 * @throws DatabaseException
 	 */
-	public function delete($id = null, bool $purge = false)
+	protected function doDelete($id = null, bool $purge = false)
 	{
-		if (! empty($id) && (is_numeric($id) || is_string($id)))
-		{
-			$id = [$id];
-		}
-
 		$builder = $this->builder();
-		if (! empty($id))
+
+		if ($id)
 		{
 			$builder = $builder->whereIn($this->primaryKey, $id);
 		}
 
-		$this->trigger('beforeDelete', ['id' => $id, 'purge' => $purge]);
-
 		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.');
+					throw new DatabaseException(
+						'Deletes are not allowed unless they contain a "where" or "like" clause.'
+					);
 				}
+
 				// @codeCoverageIgnoreStart
 				return false;
 				// @codeCoverageIgnoreEnd
 			}
+
 			$set[$this->deletedField] = $this->setDate();
 
-			if ($this->useTimestamps && ! empty($this->updatedField))
+			if ($this->useTimestamps && $this->updatedField)
 			{
 				$set[$this->updatedField] = $this->setDate();
 			}
@@ -977,153 +422,106 @@
 			$result = $builder->delete();
 		}
 
-		$this->trigger('afterDelete', ['id' => $id, 'purge' => $purge, 'result' => $result, 'data' => null]);
-
 		return $result;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Permanently deletes all rows that have been marked as deleted
 	 * through soft deletes (deleted = 1)
+	 * This methods works only with dbCalls
 	 *
 	 * @return boolean|mixed
 	 */
-	public function purgeDeleted()
+	protected function doPurgeDeleted()
 	{
-		if (! $this->useSoftDeletes)
-		{
-			return true;
-		}
-
 		return $this->builder()
-				->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
-				->delete();
+			->where($this->table . '.' . $this->deletedField . ' IS NOT NULL')
+			->delete();
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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)
-	{
-		$this->tempUseSoftDeletes = ! $val;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Works with the find* methods to return only the rows that
 	 * have been deleted.
+	 * This methods works only with dbCalls
 	 *
-	 * @return Model
+	 * @return void
 	 */
-	public function onlyDeleted()
+	protected function doOnlyDeleted()
 	{
-		$this->tempUseSoftDeletes = false;
-
-		$this->builder()
-			 ->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
-
-		return $this;
+		$this->builder()->where($this->table . '.' . $this->deletedField . ' IS NOT NULL');
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Replace
+	 * Compiles a replace into string and runs the query
+	 * This methods works only with dbCalls
 	 *
-	 * Compiles an replace into string and runs the query
-	 *
-	 * @param null    $data
-	 * @param boolean $returnSQL
+	 * @param array|null $data      Data
+	 * @param boolean    $returnSQL Set to true to return Query String
 	 *
 	 * @return mixed
 	 */
-	public function replace($data = null, bool $returnSQL = false)
+	protected function doReplace(array $data = null, bool $returnSQL = false)
 	{
-		// Validate data before saving.
-		if (! empty($data) && $this->skipValidation === false)
+		return $this->builder()->testMode($returnSQL)->replace($data);
+	}
+
+	/**
+	 * Grabs the last error(s) that occurred from the Database connection.
+	 * This methods works only with dbCalls
+	 *
+	 * @return array|null
+	 */
+	protected function doErrors()
+	{
+		return $this->db->error();
+	}
+
+	/**
+	 * Returns the id value for the data array or object
+	 *
+	 * @param array|object $data Data
+	 *
+	 * @return integer|array|string|null
+	 */
+	protected function idValue($data)
+	{
+		if (is_object($data) && isset($data->{$this->primaryKey}))
 		{
-			if ($this->cleanRules(true)->validate($data) === false)
-			{
-				return false;
-			}
+			return $data->{$this->primaryKey};
 		}
 
-		return $this->builder()->replace($data, $returnSQL);
+		if (is_array($data) && ! empty($data[$this->primaryKey]))
+		{
+			return $data[$this->primaryKey];
+		}
+
+		return null;
 	}
 
-	//--------------------------------------------------------------------
-	// Utility
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the return type of the results to be as an associative array.
-	 *
-	 * @return Model
-	 */
-	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 table columns, or at least
-	 * allows them to be created.
-	 *
-	 * @param string $class
-	 *
-	 * @return Model
-	 */
-	public function asObject(string $class = 'object')
-	{
-		$this->tempReturnType = $class;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * 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
-	 * @param \Closure $userFunc
+	 * @param integer $size     Size
+	 * @param Closure $userFunc Callback Function
 	 *
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
+	 * @return void
+	 *
+	 * @throws DataException
 	 */
 	public function chunk(int $size, Closure $userFunc)
 	{
-		$total = $this->builder()
-				->countAllResults(false);
-
+		$total  = $this->builder()->countAllResults(false);
 		$offset = 0;
 
 		while ($offset <= $total)
 		{
-			$builder = clone($this->builder());
+			$builder = clone $this->builder();
+			$rows    = $builder->get($size, $offset);
 
-			$rows = $builder->get($size, $offset);
-
-			if ($rows === false)
+			if (! $rows)
 			{
 				throw DataException::forEmptyDataset('chunk');
 			}
@@ -1147,74 +545,54 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Works with $this->builder to get the Compiled Select to operate on.
-	 * Expects a GET variable (?page=2) that specifies the page of results
-	 * to display.
+	 * Override countAllResults to account for soft deleted accounts.
 	 *
-	 * @param integer $perPage
-	 * @param string  $group   Will be used by the pagination library
-	 *                         to identify a unique pagination set.
-	 * @param integer $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)
+	 * @param boolean $reset Reset
+	 * @param boolean $test  Test
 	 *
-	 * @return array|null
+	 * @return mixed
 	 */
-	public function paginate(int $perPage = null, string $group = 'default', int $page = null, int $segment = 0)
+	public function countAllResults(bool $reset = true, bool $test = false)
 	{
-		$pager = \Config\Services::pager(null, null, false);
-
-		if ($segment)
+		if ($this->tempUseSoftDeletes)
 		{
-			$pager->setSegment($segment);
+			$this->builder()->where($this->table . '.' . $this->deletedField, null);
 		}
 
-		$page = $page >= 1 ? $page : $pager->getCurrentPage($group);
+		// 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);
 
-		$total = $this->countAllResults(false);
-
-		// Store it in the Pager library so it can be
-		// paginated in the views.
-		$this->pager = $pager->store($group, $page, $perPage, $total, $segment);
-		$perPage     = $this->pager->getPerPage($group);
-		$offset      = ($page - 1) * $perPage;
-
-		return $this->findAll($perPage, $offset);
+		return $this->builder()->testMode($test)->countAllResults($reset);
 	}
 
-	//--------------------------------------------------------------------
+	// endregion
 
-	/**
-	 * Sets whether or not we should whitelist data set during
-	 * updates or inserts against $this->availableFields.
-	 *
-	 * @param boolean $protect
-	 *
-	 * @return Model
-	 */
-	public function protect(bool $protect = true)
-	{
-		$this->protectFields = $protect;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
+	// region Builder
 
 	/**
 	 * Provides a shared instance of the Query Builder.
 	 *
-	 * @param string $table
+	 * @param string|null $table Table name
 	 *
 	 * @return BaseBuilder
-	 * @throws \CodeIgniter\Exceptions\ModelException;
+	 * @throws ModelException
 	 */
-	protected function builder(string $table = null)
+	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;
 		}
 
@@ -1223,7 +601,7 @@
 		// and future features are likely to require them.
 		if (empty($this->primaryKey))
 		{
-			throw ModelException::forNoPrimaryKey(get_class($this));
+			throw ModelException::forNoPrimaryKey(static::class);
 		}
 
 		$table = empty($table) ? $this->table : $table;
@@ -1234,534 +612,183 @@
 			$this->db = Database::connect($this->DBGroup);
 		}
 
-		$this->builder = $this->db->table($table);
+		$builder = $this->db->table($table);
 
-		return $this->builder;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	 *
-	 * @return array
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
-	 */
-	protected function doProtectFields(array $data): array
-	{
-		if ($this->protectFields === false)
+		// Only consider it "shared" if the table is correct
+		if ($table === $this->table)
 		{
-			return $data;
+			$this->builder = $builder;
 		}
 
-		if (empty($this->allowedFields))
-		{
-			throw DataException::forInvalidAllowedFields(get_class($this));
-		}
-
-		if (is_array($data) && count($data))
-		{
-			foreach ($data as $key => $val)
-			{
-				if (! in_array($key, $this->allowedFields))
-				{
-					unset($data[$key]);
-				}
-			}
-		}
-
-		return $data;
+		return $builder;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * 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.
+	 * 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.
 	 *
-	 * 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 $userData An optional PHP timestamp to be converted.
-	 *
-	 * @return mixed
-	 * @throws \CodeIgniter\Exceptions\ModelException;
-	 */
-	protected function setDate(int $userData = null)
-	{
-		$currentDate = is_numeric($userData) ? (int) $userData : time();
-
-		switch ($this->dateFormat)
-		{
-			case 'int':
-				return $currentDate;
-			case 'datetime':
-				return date('Y-m-d H:i:s', $currentDate);
-			case 'date':
-				return date('Y-m-d', $currentDate);
-			default:
-				throw ModelException::forNoDateFormat(get_class($this));
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Specify the table associated with a model
-	 *
-	 * @param string $table
-	 *
-	 * @return Model
-	 */
-	public function setTable(string $table)
-	{
-		$this->table = $table;
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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.
-	 *
-	 * @param boolean $forceDB Always grab the db error, not validation
-	 *
-	 * @return array|null
-	 */
-	public function errors(bool $forceDB = false)
-	{
-		// Do we have validation errors?
-		if ($forceDB === false && $this->skipValidation === false)
-		{
-			$errors = $this->validation->getErrors();
-
-			if (! empty($errors))
-			{
-				return $errors;
-			}
-		}
-
-		// Still here? Grab the database-specific error, if any.
-		$error = $this->db->error();
-
-		return $error['message'] ?? null;
-	}
-
-	//--------------------------------------------------------------------
-	//--------------------------------------------------------------------
-	// Validation
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set the value of the skipValidation flag.
-	 *
-	 * @param boolean $skip
-	 *
-	 * @return Model
-	 */
-	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
-	 *
-	 * @return void
-	 */
-	public function setValidationMessages(array $validationMessages)
-	{
-		$this->validationMessages = $validationMessages;
-	}
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	 * @param array  $fieldMessages
-	 *
-	 * @return void
-	 */
-	public function setValidationMessage(string $field, array $fieldMessages)
-	{
-		$this->validationMessages[$field] = $fieldMessages;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Allows to set validation rules.
-	 * It could be used when you have to change default or override current validate rules.
-	 *
-	 * @param array $validationRules
-	 *
-	 * @return void
-	 */
-	public function setValidationRules(array $validationRules)
-	{
-		$this->validationRules = $validationRules;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * 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
-	 * @param string|array $fieldRules
-	 *
-	 * @return void
-	 */
-	public function setValidationRule(string $field, $fieldRules)
-	{
-		$this->validationRules[$field] = $fieldRules;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Should validation rules be removed before saving?
-	 * Most handy when doing updates.
-	 *
-	 * @param boolean $choice
+	 * @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 cleanRules(bool $choice = false)
+	public function set($key, ?string $value = '', ?bool $escape = null)
 	{
-		$this->cleanValidationRules = $choice;
+		$data = is_array($key) ? $key : [$key => $value];
+
+		foreach ($data as $k => $v)
+		{
+			$this->tempData['escape'][$k] = $escape;
+		}
+
+		$this->tempData['data'] = array_merge($this->tempData['data'] ?? [], $data);
 
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
+	// endregion
+
+	// region Overrides
+
+	// region CRUD & Finders
 
 	/**
-	 * Validate the data against the validation rules (or the validation group)
-	 * specified in the class property, $validationRules.
+	 * 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
+	 * @param array|object $data Data
 	 *
 	 * @return boolean
 	 */
-	public function validate($data): bool
+	protected function shouldUpdate($data) : bool
 	{
-		$rules = $this->getValidationRules();
-
-		if ($this->skipValidation === true || empty($rules) || empty($data))
-		{
-			return true;
-		}
-
-		// Query Builder works with objects as well as arrays,
-		// but validation requires array, so cast away.
-		if (is_object($data))
-		{
-			$data = (array) $data;
-		}
-
-		// 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);
-		}
-
-		$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;
-		}
-
-		$this->validation->setRules($rules, $this->validationMessages);
-		$valid = $this->validation->run($data, null, $this->DBGroup);
-
-		return (bool) $valid;
+		// 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->idValue($data))->countAllResults() === 1
+			);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * 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.
+	 * Inserts data into the database. If an object is provided,
+	 * it will attempt to convert it to an array.
 	 *
-	 * @param array      $rules
+	 * @param array|object|null $data     Data
+	 * @param boolean           $returnID Whether insert ID should be returned or not.
 	 *
-	 * @param array|null $data
+	 * @return BaseResult|object|integer|string|false
 	 *
-	 * @return array
+	 * @throws ReflectionException
 	 */
-	protected function cleanValidationRules(array $rules, array $data = null): array
+	public function insert($data = null, bool $returnID = true)
 	{
-		if (empty($data))
+		if (! empty($this->tempData['data']))
 		{
-			return [];
-		}
-
-		foreach ($rules as $field => $rule)
-		{
-			if (! array_key_exists($field, $data))
+			if (empty($data))
 			{
-				unset($rules[$field]);
+				$data = $this->tempData['data'] ?? null;
+			}
+			else
+			{
+				$data = $this->transformDataToArray($data, 'insert');
+				$data = array_merge($this->tempData['data'], $data);
 			}
 		}
 
-		return $rules;
+		$this->escape   = $this->tempData['escape'] ?? [];
+		$this->tempData = [];
+
+		return parent::insert($data, $returnID);
 	}
 
 	/**
-	 * 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:
+	 * Updates a single record in the database. If an object is provided,
+	 * it will attempt to convert it into an array.
 	 *
-	 * [ 'id' => 13 ]
+	 * @param integer|array|string|null $id   ID
+	 * @param array|object|null         $data Data
 	 *
-	 * and the following rule:
+	 * @return boolean
 	 *
-	 *  '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]'
-	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @deprecated use fillPlaceholders($rules, $data) from Validation instead
-	 *
-	 * @param array $rules
-	 * @param array $data
-	 *
-	 * @return array
+	 * @throws ReflectionException
 	 */
-	protected function fillPlaceholders(array $rules, array $data): array
+	public function update($id = null, $data = null): bool
 	{
-		$replacements = [];
-
-		foreach ($data as $key => $value)
+		if (! empty($this->tempData['data']))
 		{
-			$replacements["{{$key}}"] = $value;
-		}
-
-		if (! empty($replacements))
-		{
-			foreach ($rules as &$rule)
+			if (empty($data))
 			{
-				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);
+				$data = $this->tempData['data'] ?? null;
+			}
+			else
+			{
+				$data = $this->transformDataToArray($data, 'update');
+				$data = array_merge($this->tempData['data'], $data);
 			}
 		}
 
-		return $rules;
+		$this->escape   = $this->tempData['escape'] ?? [];
+		$this->tempData = [];
+
+		return parent::update($id, $data);
 	}
 
-	//--------------------------------------------------------------------
+	// endregion
+
+	// region Utility
 
 	/**
-	 * Returns the model's defined validation rules so that they
-	 * can be used elsewhere, if needed.
+	 * Takes a class an returns an array of it's public and protected
+	 * properties as an array with raw values.
 	 *
-	 * @param array $options
+	 * @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
+	 * @return array|null Array
+	 *
+	 * @throws ReflectionException
 	 */
-	public function getValidationRules(array $options = []): array
+	protected function objectToRawArray($data, bool $onlyChanged = true, bool $recursive = false): ?array
 	{
-		$rules = $this->validationRules;
+		$properties = parent::objectToRawArray($data, $onlyChanged);
 
-		// ValidationRules can be either a string, which is the group name,
-		// or an array of rules.
-		if (is_string($rules))
+		if (method_exists($data, 'toRawArray'))
 		{
-			$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;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Override countAllResults to account for soft deleted accounts.
-	 *
-	 * @param boolean $reset
-	 * @param boolean $test
-	 *
-	 * @return mixed
-	 */
-	public function countAllResults(bool $reset = true, bool $test = false)
-	{
-		if ($this->tempUseSoftDeletes === true)
-		{
-			$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 === true)
-			? $this->useSoftDeletes
-			: ($this->useSoftDeletes === true
-				? false
-				: $this->useSoftDeletes);
-
-		return $this->builder()->testMode($test)->countAllResults($reset);
-	}
-
-	/**
-	 * Sets $tempAllowCallbacks value so that we can temporarily override
-	 * the setting. Resets after the next trigger.
-	 *
-	 * @param boolean $val
-	 *
-	 * @return Model
-	 */
-	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
-	 * @param array  $eventData
-	 *
-	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DataException
-	 */
-	protected function trigger(string $event, array $eventData)
-	{
-		$allowed                  = $this->tempAllowCallbacks;
-		$this->tempAllowCallbacks = $this->allowCallbacks;
-
-		if (! $allowed)
-		{
-			return $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))
+			// Always grab the primary key otherwise updates will fail.
+			if (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
+				&& ! empty($data->{$this->primaryKey}))
 			{
-				throw DataException::forInvalidMethodTriggered($callback);
+				$properties[$this->primaryKey] = $data->{$this->primaryKey};
 			}
-
-			$eventData = $this->{$callback}($eventData);
 		}
 
-		return $eventData;
+		return $properties;
 	}
 
-	//--------------------------------------------------------------------
+	// endregion
 
-	//--------------------------------------------------------------------
-	// Magic
-	//--------------------------------------------------------------------
+	// region Magic
 
 	/**
 	 * Provides/instantiates the builder/db connection and model's table/primary key names and return type.
 	 *
-	 * @param string $name
+	 * @param string $name Name
 	 *
 	 * @return mixed
 	 */
 	public function __get(string $name)
 	{
-		if (property_exists($this, $name))
+		if (parent::__isset($name))
 		{
-			return $this->{$name};
+			return parent::__get($name);
 		}
-		elseif (isset($this->db->$name))
-		{
-			return $this->db->$name;
-		}
-		elseif (isset($this->builder()->$name))
+
+		if (isset($this->builder()->$name))
 		{
 			return $this->builder()->$name;
 		}
@@ -1772,21 +799,18 @@
 	/**
 	 * Checks for the existence of properties across this model, builder, and db connection.
 	 *
-	 * @param string $name
+	 * @param string $name Name
 	 *
 	 * @return boolean
 	 */
 	public function __isset(string $name): bool
 	{
-		if (property_exists($this, $name))
+		if (parent::__isset($name))
 		{
 			return true;
 		}
-		elseif (isset($this->db->$name))
-		{
-			return true;
-		}
-		elseif (isset($this->builder()->$name))
+
+		if (isset($this->builder()->$name))
 		{
 			return true;
 		}
@@ -1794,49 +818,126 @@
 		return false;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Provides direct access to method in the builder (if available)
 	 * and the database connection.
 	 *
-	 * @param string $name
-	 * @param array  $params
+	 * @param string $name   Name
+	 * @param array  $params Params
 	 *
-	 * @return Model|null
+	 * @return $this|null
 	 */
 	public function __call(string $name, array $params)
 	{
-		$result = null;
+		$result = parent::__call($name, $params);
 
-		if (method_exists($this->db, $name))
+		if ($result === null && method_exists($builder = $this->builder(), $name))
 		{
-			$result = $this->db->$name(...$params);
-		}
-		elseif (method_exists($builder = $this->builder(), $name))
-		{
-			$result = $builder->$name(...$params);
+			$result = $builder->{$name}(...$params);
 		}
 
-		// Don't return the builder object unless specifically requested
-		//, since that will interrupt the usability flow
-		// and break intermingling of model and builder methods.
-		if ($name !== 'builder' && empty($result))
+		if (empty($result))
 		{
 			if (! method_exists($this->builder(), $name))
 			{
-				$className = get_class($this);
-				throw new \BadMethodCallException("Call to undefined method $className::$name");
+				$className = static::class;
+
+				throw new BadMethodCallException('Call to undefined method ' . $className . '::' . $name);
 			}
-			return $result;
-		}
-		if ($name !== 'builder' && ! $result instanceof BaseBuilder)
-		{
+
 			return $result;
 		}
 
-		return $this;
+		if ($result instanceof BaseBuilder)
+		{
+			return $this;
+		}
+
+		return $result;
 	}
 
-	//--------------------------------------------------------------------
+	// endregion
+
+	// endregion
+
+	// region Deprecated
+
+	/**
+	 * 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;
+	}
+
+	// endregion
+
 }
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
index 73d6835..4c1d87c 100644
--- a/system/Modules/Modules.php
+++ b/system/Modules/Modules.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Modules;
@@ -42,9 +14,7 @@
 /**
  * Modules Class
  *
- * @package CodeIgniter\Modules
- * @author  EllisLab Dev Team
- * @link 	https://codeigniter.com/user_guide/general/modules.html
+ * @link https://codeigniter.com/user_guide/general/modules.html
  */
 class Modules
 {
@@ -83,6 +53,6 @@
 			return false;
 		}
 
-		return in_array(strtolower($alias), $this->aliases);
+		return in_array(strtolower($alias), $this->aliases, true);
 	}
 }
diff --git a/system/Pager/Exceptions/PagerException.php b/system/Pager/Exceptions/PagerException.php
index fe2b62c..d0f0edd 100644
--- a/system/Pager/Exceptions/PagerException.php
+++ b/system/Pager/Exceptions/PagerException.php
@@ -1,9 +1,19 @@
-<?php namespace CodeIgniter\Pager\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Pager\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class PagerException extends FrameworkException implements ExceptionInterface
+class PagerException extends FrameworkException
 {
 	public static function forInvalidTemplate(string $template = null)
 	{
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 9d81703..52aa9eb 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -1,46 +1,20 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
 
+use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Pager\Exceptions\PagerException;
 use CodeIgniter\View\RendererInterface;
+use Config\Pager as PagerConfig;
 
 /**
  * Class Pager
@@ -49,12 +23,9 @@
  * pagination links and reading the current url's query variable, "page"
  * to determine the current page. This class can support multiple
  * paginations on a single page.
- *
- * @package CodeIgniter\Pager
  */
 class Pager implements PagerInterface
 {
-
 	/**
 	 * The group data.
 	 *
@@ -72,7 +43,7 @@
 	/**
 	 * Our configuration instance.
 	 *
-	 * @var \Config\Pager
+	 * @var PagerConfig
 	 */
 	protected $config;
 
@@ -95,10 +66,10 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param type              $config
+	 * @param PagerConfig       $config
 	 * @param RendererInterface $view
 	 */
-	public function __construct($config, RendererInterface $view)
+	public function __construct(PagerConfig $config, RendererInterface $view)
 	{
 		$this->config = $config;
 		$this->view   = $view;
@@ -144,16 +115,16 @@
 	 * 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.
-	 * @param integer $segment  (if page number is provided by URI segment)
+	 * @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)
 	 *
-	 * @param  string  $group    optional group (i.e. if we'd like to define custom path)
 	 * @return string
 	 */
-	public function makeLinks(int $page, int $perPage = null, int $total, string $template = 'default_full', int $segment = 0, ?string $group = 'default'): 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;
 
@@ -192,15 +163,15 @@
 	 * 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
-	 * @param integer $segment
+	 * @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 = null, int $total, int $segment = 0)
+	public function store(string $group, int $page, ?int $perPage, int $total, int $segment = 0)
 	{
 		if ($segment)
 		{
@@ -214,8 +185,9 @@
 			$page = $this->groups[$group]['currentPage'];
 		}
 
-		$perPage                             = $perPage ?? $this->config->perPage;
-		$pageCount                           = (int)ceil($total / $perPage);
+		$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;
@@ -263,9 +235,25 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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|null $group
+	 * @param string $group
 	 *
 	 * @return integer
 	 */
@@ -281,7 +269,7 @@
 	/**
 	 * Returns the number of the current page of results.
 	 *
-	 * @param string|null $group
+	 * @param string $group
 	 *
 	 * @return integer
 	 */
@@ -297,7 +285,7 @@
 	/**
 	 * Tells whether this group of results has any more pages of results.
 	 *
-	 * @param string|null $group
+	 * @param string $group
 	 *
 	 * @return boolean
 	 */
@@ -326,7 +314,7 @@
 			return null;
 		}
 
-		return (int)ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
+		return (int) ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
 	}
 
 	//--------------------------------------------------------------------
@@ -561,7 +549,7 @@
 			{
 				$this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
 			}
-			catch (\CodeIgniter\HTTP\Exceptions\HTTPException $e)
+			catch (HTTPException $e)
 			{
 				$this->groups[$group]['currentPage'] = 1;
 			}
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index 9f975b5..6840651 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
@@ -44,7 +16,6 @@
  */
 interface PagerInterface
 {
-
 	/**
 	 * Handles creating and displaying the
 	 *
@@ -114,7 +85,7 @@
 	/**
 	 * Returns the total number of pages.
 	 *
-	 * @param string|null $group
+	 * @param string $group
 	 *
 	 * @return integer
 	 */
@@ -125,7 +96,7 @@
 	/**
 	 * Returns the number of the current page of results.
 	 *
-	 * @param string|null $group
+	 * @param string $group
 	 *
 	 * @return integer
 	 */
@@ -149,7 +120,7 @@
 	/**
 	 * Tells whether this group of results has any more pages of results.
 	 *
-	 * @param string|null $group
+	 * @param string $group
 	 *
 	 * @return boolean
 	 */
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 0944356..98a91c6 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
@@ -45,58 +17,62 @@
  * This class is passed to the view that describes the pagination,
  * and is used to get the link information and provide utility
  * methods needed to work with pagination.
- *
- * @package CodeIgniter\Pager
  */
 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 pages? unused?
+	 * Total number of items.
 	 *
 	 * @var integer
 	 */
 	protected $total;
-		/**
-		 * Page count?
-		 *
-		 * @var integer
-		 */
-	protected $pageCount;
+
 	/**
-	 * URI base for pagination links
+	 * Total number of pages.
 	 *
 	 * @var integer
 	 */
+	protected $pageCount;
+
+	/**
+	 * URI base for pagination links
+	 *
+	 * @var \CodeIgniter\HTTP\URI
+	 */
 	protected $uri;
+
 	/**
 	 * Segment number used for pagination.
 	 *
 	 * @var integer
 	 */
 	protected $segment;
+
 	/**
 	 * Name of $_GET parameter
 	 *
-	 * @var integer
+	 * @var string
 	 */
 	protected $pageSelector;
 
@@ -425,4 +401,54 @@
 
 		return (string) $uri;
 	}
+
+	/**
+	 * 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 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;
+	}
 }
diff --git a/system/Pager/Views/default_head.php b/system/Pager/Views/default_head.php
index 8f9dc69..4f91601 100644
--- a/system/Pager/Views/default_head.php
+++ b/system/Pager/Views/default_head.php
@@ -1,8 +1,17 @@
 <?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 /**
  * @var \CodeIgniter\Pager\PagerRenderer $pager
  */
-
 $pager->setSurroundCount(0);
 
 if ($pager->hasPrevious())
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
new file mode 100644
index 0000000..758cd96
--- /dev/null
+++ b/system/RESTful/BaseResource.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\RESTful;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Controller;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Psr\Log\LoggerInterface;
+
+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))
+		{
+			if (class_exists($this->modelName))
+			{
+				$this->model = model($this->modelName);
+			}
+		}
+
+		// determine model name if needed
+		if (! empty($this->model) && empty($this->modelName))
+		{
+			$this->modelName = get_class($this->model);
+		}
+	}
+}
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index d13218c..5289f81 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -1,87 +1,29 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 3.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\API\ResponseTrait;
-use CodeIgniter\Controller;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\ResponseInterface;
-use Psr\Log\LoggerInterface;
 
 /**
  * An extendable controller to provide a RESTful API for a resource.
- *
- * @package CodeIgniter\RESTful
  */
-class ResourceController extends Controller
+class ResourceController extends BaseResource
 {
-
 	use ResponseTrait;
 
 	/**
-	 *
-	 * @var string Name of the model class managing this resource's data
-	 */
-	protected $modelName;
-
-	/**
-	 *
-	 * @var \CodeIgniter\Model the model holding this resource's data
-	 */
-	protected $model;
-
-	//--------------------------------------------------------------------
-
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		parent::initController($request, $response, $logger);
-
-		// instantiate our model, if needed
-		$this->setModel($this->modelName);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
 	 * Return an array of resource objects, themselves in array format
 	 *
-	 * @return array	an array
+	 * @return mixed
 	 */
 	public function index()
 	{
@@ -91,7 +33,9 @@
 	/**
 	 * Return the properties of a resource object
 	 *
-	 * @return array	an array
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function show($id = null)
 	{
@@ -101,7 +45,7 @@
 	/**
 	 * Return a new resource object, with default properties
 	 *
-	 * @return array	an array
+	 * @return mixed
 	 */
 	public function new()
 	{
@@ -111,7 +55,7 @@
 	/**
 	 * Create a new resource object, from "posted" parameters
 	 *
-	 * @return array	an array
+	 * @return mixed
 	 */
 	public function create()
 	{
@@ -121,7 +65,9 @@
 	/**
 	 * Return the editable properties of a resource object
 	 *
-	 * @return array	an array
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function edit($id = null)
 	{
@@ -131,7 +77,9 @@
 	/**
 	 * Add or update a model resource, from "posted" properties
 	 *
-	 * @return array	an array
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function update($id = null)
 	{
@@ -141,63 +89,27 @@
 	/**
 	 * Delete the designated resource object from the model
 	 *
-	 * @return array	an array
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function delete($id = null)
 	{
 		return $this->fail(lang('RESTful.notImplemented', ['delete']), 501);
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Set or change the model this controller is bound to.
-	 * Given either the name or the object, determine the other.
-	 *
-	 * @param string|object $which
-	 */
-	public function setModel($which = null)
-	{
-		// save what we have been given
-		if (! empty($which))
-		{
-			if (is_object($which))
-			{
-				$this->model = $which;
-			}
-			else
-			{
-				$this->modelName = $which;
-			}
-		}
-
-		// make a model object if needed
-		if (empty($this->model) && ! empty($this->modelName))
-		{
-			if (class_exists($this->modelName))
-			{
-				$this->model = model($this->modelName);
-			}
-		}
-
-		// determine model name if needed
-		if (empty($this->modelName) && ! empty($this->model))
-		{
-			$this->modelName = get_class($this->model);
-		}
-	}
-
 	/**
 	 * 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']))
+		if (in_array($format, ['json', 'xml'], true))
 		{
 			$this->format = $format;
 		}
 	}
-
 }
diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php
index 91fdeb0..22dcc3c 100644
--- a/system/RESTful/ResourcePresenter.php
+++ b/system/RESTful/ResourcePresenter.php
@@ -1,84 +1,25 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 3.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
 
-use CodeIgniter\Controller;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\ResponseInterface;
-use Psr\Log\LoggerInterface;
-
 /**
  * An extendable controller to help provide a UI for a resource.
- *
- * @package CodeIgniter\RESTful
  */
-class ResourcePresenter extends Controller
+class ResourcePresenter extends BaseResource
 {
-
-	/**
-	 *
-	 * @var string Name of the model class managing this resource's data
-	 */
-	protected $modelName;
-
-	/**
-	 *
-	 * @var \CodeIgniter\Model the model holding this resource's data
-	 */
-	protected $model;
-
-	//--------------------------------------------------------------------
-
-	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
-	{
-		parent::initController($request, $response, $logger);
-
-		// instantiate our model, if needed
-		$this->setModel($this->modelName);
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Present a view of resource objects
 	 *
-	 * @return string
+	 * @return mixed
 	 */
 	public function index()
 	{
@@ -88,8 +29,9 @@
 	/**
 	 * Present a view to present a specific resource object
 	 *
-	 * @param  type $id
-	 * @return string
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function show($id = null)
 	{
@@ -99,7 +41,7 @@
 	/**
 	 * Present a view to present a new single resource object
 	 *
-	 * @return string
+	 * @return mixed
 	 */
 	public function new()
 	{
@@ -110,7 +52,7 @@
 	 * Process the creation/insertion of a new resource object.
 	 * This should be a POST.
 	 *
-	 * @return string
+	 * @return mixed
 	 */
 	public function create()
 	{
@@ -118,32 +60,11 @@
 	}
 
 	/**
-	 * Present a view to confirm the deletion of a specific resource object
-	 *
-	 * @param  type $id
-	 * @return string
-	 */
-	public function remove($id = null)
-	{
-		return lang('RESTful.notImplemented', ['remove']);
-	}
-
-	/**
-	 * Process the deletion of a specific resource object
-	 *
-	 * @param  type $id
-	 * @return string
-	 */
-	public function delete($id = null)
-	{
-		return lang('RESTful.notImplemented', ['delete']);
-	}
-
-	/**
 	 * Present a view to edit the properties of a specific resource object
 	 *
-	 * @param  type $id
-	 * @return string
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function edit($id = null)
 	{
@@ -154,53 +75,36 @@
 	 * Process the updating, full or partial, of a specific resource object.
 	 * This should be a POST.
 	 *
-	 * @param  type $id
-	 * @return string
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
 	public function update($id = null)
 	{
 		return lang('RESTful.notImplemented', ['update']);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 * Set or change the model this controller is bound to.
-	 * Given either the name or the object, determine the other.
+	 * Present a view to confirm the deletion of a specific resource object
 	 *
-	 * @param string|object $which
+	 * @param mixed $id
+	 *
+	 * @return mixed
 	 */
-	public function setModel($which = null)
+	public function remove($id = null)
 	{
-		// save what we have been given
-		if (! empty($which))
-		{
-			if (is_object($which))
-			{
-				$this->model     = $which;
-				$this->modelName = null;
-			}
-			else
-			{
-				$this->model     = null;
-				$this->modelName = $which;
-			}
-		}
-
-		// make a model object if needed
-		if (empty($this->model) && ! empty($this->modelName))
-		{
-			if (class_exists($this->modelName))
-			{
-				$this->model = model($this->modelName);
-			}
-		}
-
-		// determine model name if needed
-		if (empty($this->modelName) && ! empty($this->model))
-		{
-			$this->modelName = get_class($this->model);
-		}
+		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']);
+	}
 }
diff --git a/system/Router/Exceptions/RedirectException.php b/system/Router/Exceptions/RedirectException.php
index 6114207..a98beb4 100644
--- a/system/Router/Exceptions/RedirectException.php
+++ b/system/Router/Exceptions/RedirectException.php
@@ -1,48 +1,22 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
 
+use Exception;
+
 /**
  * RedirectException
  */
-class RedirectException extends \Exception
+class RedirectException extends Exception
 {
 	/**
 	 * Status code for redirects
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index b58d64e..4c74245 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -1,57 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
 
-use CodeIgniter\Exceptions\ExceptionInterface;
 use CodeIgniter\Exceptions\FrameworkException;
 
 /**
  * RouterException
  */
-class RouterException extends FrameworkException implements ExceptionInterface
+class RouterException extends FrameworkException
 {
 	/**
 	 * Thrown when the actual parameter type does not match
 	 * the expected types.
 	 *
-	 * @return \CodeIgniter\Router\Exceptions\RouterException
+	 * @return RouterException
 	 */
 	public static function forInvalidParameterType()
 	{
@@ -61,10 +32,35 @@
 	/**
 	 * Thrown when a default route is not set.
 	 *
-	 * @return \CodeIgniter\Router\Exceptions\RouterException
+	 * @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 route is not valid.
+	 *
+	 * @param string $route
+	 *
+	 * @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 bce96c0..0c4c99a 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1,59 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
 
+use Closure;
 use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\Router\Exceptions\RouterException;
+use Config\Modules;
 use Config\Services;
+use InvalidArgumentException;
 
 /**
  * Class RouteCollection
  *
  * @todo Implement nested resource routing (See CakePHP)
- *
- * @package CodeIgniter\Router
  */
 class RouteCollection implements RouteCollectionInterface
 {
-
 	/**
 	 * The namespace to be added to any Controllers.
 	 * Defaults to the global namespaces (\)
@@ -113,7 +85,7 @@
 	 * A callable that will be shown
 	 * when the route cannot be matched.
 	 *
-	 * @var string|\Closure
+	 * @var string|Closure
 	 */
 	protected $override404;
 
@@ -185,14 +157,14 @@
 	/**
 	 * The name of the current group, if any.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $group;
 
 	/**
 	 * The current subdomain.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $currentSubdomain;
 
@@ -200,7 +172,7 @@
 	 * Stores copy of current options being
 	 * applied during creation.
 	 *
-	 * @var null
+	 * @var array|null
 	 */
 	protected $currentOptions;
 
@@ -214,14 +186,14 @@
 	/**
 	 * Handle to the file locator to use.
 	 *
-	 * @var \CodeIgniter\Autoloader\FileLocator
+	 * @var FileLocator
 	 */
 	protected $fileLocator;
 
 	/**
 	 * Handle to the modules config.
 	 *
-	 * @var \Config\Modules
+	 * @var Modules
 	 */
 	protected $moduleConfig;
 
@@ -230,10 +202,10 @@
 	/**
 	 * Constructor
 	 *
-	 * @param \CodeIgniter\Autoloader\FileLocator $locator
-	 * @param \Config\Modules                     $moduleConfig
+	 * @param FileLocator $locator
+	 * @param Modules     $moduleConfig
 	 */
-	public function __construct(FileLocator $locator, $moduleConfig)
+	public function __construct(FileLocator $locator, Modules $moduleConfig)
 	{
 		$this->fileLocator  = $locator;
 		$this->moduleConfig = $moduleConfig;
@@ -250,9 +222,9 @@
 	 * multiple placeholders added at once.
 	 *
 	 * @param string|array $placeholder
-	 * @param string       $pattern
+	 * @param string|null  $pattern
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function addPlaceholder($placeholder, string $pattern = null): RouteCollectionInterface
 	{
@@ -274,7 +246,7 @@
 	 *
 	 * @param string $value
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function setDefaultNamespace(string $value): RouteCollectionInterface
 	{
@@ -292,7 +264,7 @@
 	 *
 	 * @param string $value
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function setDefaultController(string $value): RouteCollectionInterface
 	{
@@ -309,7 +281,7 @@
 	 *
 	 * @param string $value
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function setDefaultMethod(string $value): RouteCollectionInterface
 	{
@@ -329,7 +301,7 @@
 	 *
 	 * @param boolean $value
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function setTranslateURIDashes(bool $value): RouteCollectionInterface
 	{
@@ -385,7 +357,7 @@
 	 * Returns the 404 Override setting, which can be null, a closure
 	 * or the controller/string.
 	 *
-	 * @return string|\Closure|null
+	 * @return string|Closure|null
 	 */
 	public function get404Override()
 	{
@@ -513,11 +485,11 @@
 	/**
 	 * Returns the raw array of available routes.
 	 *
-	 * @param mixed $verb
+	 * @param string|null $verb
 	 *
 	 * @return array
 	 */
-	public function getRoutes($verb = null): array
+	public function getRoutes(string $verb = null): array
 	{
 		if (empty($verb))
 		{
@@ -529,7 +501,8 @@
 		// we might need to do.
 		$this->discoverRoutes();
 
-		$routes = [];
+		$routes     = [];
+		$collection = [];
 
 		if (isset($this->routes[$verb]))
 		{
@@ -555,13 +528,16 @@
 	/**
 	 * Returns one or all routes options
 	 *
-	 * @param string $from
+	 * @param string|null $from
+	 * @param string|null $verb
 	 *
 	 * @return array
 	 */
-	public function getRoutesOptions(string $from = null): array
+	public function getRoutesOptions(string $from = null, string $verb = null): array
 	{
-		return $from ? $this->routesOptions[$from] ?? [] : $this->routesOptions;
+		$options = $this->loadRoutesOptions($verb);
+
+		return $from ? $options[$from] ?? [] : $options;
 	}
 
 	//--------------------------------------------------------------------
@@ -598,8 +574,8 @@
 	 * It does not allow any options to be set on the route, or to
 	 * define the method used.
 	 *
-	 * @param array $routes
-	 * @param array $options
+	 * @param array      $routes
+	 * @param array|null $options
 	 *
 	 * @return RouteCollectionInterface
 	 */
@@ -725,8 +701,8 @@
 	 *            $route->resource('users');
 	 *     });
 	 *
-	 * @param string $name      The name to group/prefix the routes with.
-	 * @param array  ...$params
+	 * @param string         $name      The name to group/prefix the routes with.
+	 * @param array|callable ...$params
 	 *
 	 * @return void
 	 */
@@ -737,7 +713,8 @@
 
 		// To register a route, we'll set a flag so that our router
 		// so it will see the group name.
-		$this->group = ltrim($oldGroup . '/' . $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);
 
@@ -806,13 +783,12 @@
 		// 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.
-		$new_name = ucfirst($name);
-
+		$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']))
 		{
-			$new_name = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+			$newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
 		}
 
 		// In order to allow customization of allowed id values
@@ -834,53 +810,53 @@
 			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
 			foreach ($methods as $i => $method)
 			{
-				if (in_array($method, $options['except']))
+				if (in_array($method, $options['except'], true))
 				{
 					unset($methods[$i]);
 				}
 			}
 		}
 
-		if (in_array('index', $methods))
+		if (in_array('index', $methods, true))
 		{
-			$this->get($name, $new_name . '::index', $options);
+			$this->get($name, $newName . '::index', $options);
 		}
-		if (in_array('new', $methods))
+		if (in_array('new', $methods, true))
 		{
-			$this->get($name . '/new', $new_name . '::new', $options);
+			$this->get($name . '/new', $newName . '::new', $options);
 		}
-		if (in_array('edit', $methods))
+		if (in_array('edit', $methods, true))
 		{
-			$this->get($name . '/' . $id . '/edit', $new_name . '::edit/$1', $options);
+			$this->get($name . '/' . $id . '/edit', $newName . '::edit/$1', $options);
 		}
-		if (in_array('show', $methods))
+		if (in_array('show', $methods, true))
 		{
-			$this->get($name . '/' . $id, $new_name . '::show/$1', $options);
+			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
 		}
-		if (in_array('create', $methods))
+		if (in_array('create', $methods, true))
 		{
-			$this->post($name, $new_name . '::create', $options);
+			$this->post($name, $newName . '::create', $options);
 		}
-		if (in_array('update', $methods))
+		if (in_array('update', $methods, true))
 		{
-			$this->put($name . '/' . $id, $new_name . '::update/$1', $options);
-			$this->patch($name . '/' . $id, $new_name . '::update/$1', $options);
+			$this->put($name . '/' . $id, $newName . '::update/$1', $options);
+			$this->patch($name . '/' . $id, $newName . '::update/$1', $options);
 		}
-		if (in_array('delete', $methods))
+		if (in_array('delete', $methods, true))
 		{
-			$this->delete($name . '/' . $id, $new_name . '::delete/$1', $options);
+			$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))
+			if (in_array('delete', $methods, true))
 			{
-				$this->post($name . '/' . $id . '/delete', $new_name . '::delete/$1', $options);
+				$this->post($name . '/' . $id . '/delete', $newName . '::delete/$1', $options);
 			}
-			if (in_array('update', $methods))
+			if (in_array('update', $methods, true))
 			{
-				$this->post($name . '/' . $id, $new_name . '::update/$1', $options);
+				$this->post($name . '/' . $id, $newName . '::update/$1', $options);
 			}
 		}
 
@@ -920,8 +896,7 @@
 		// 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 = ucfirst($name);
-
+		$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']))
@@ -948,50 +923,50 @@
 			$options['except'] = is_array($options['except']) ? $options['except'] : explode(',', $options['except']);
 			foreach ($methods as $i => $method)
 			{
-				if (in_array($method, $options['except']))
+				if (in_array($method, $options['except'], true))
 				{
 					unset($methods[$i]);
 				}
 			}
 		}
 
-		if (in_array('index', $methods))
+		if (in_array('index', $methods, true))
 		{
 			$this->get($name, $newName . '::index', $options);
 		}
-		if (in_array('show', $methods))
+		if (in_array('show', $methods, true))
 		{
 			$this->get($name . '/show/' . $id, $newName . '::show/$1', $options);
 		}
-		if (in_array('new', $methods))
+		if (in_array('new', $methods, true))
 		{
 			$this->get($name . '/new', $newName . '::new', $options);
 		}
-		if (in_array('create', $methods))
+		if (in_array('create', $methods, true))
 		{
 			$this->post($name . '/create', $newName . '::create', $options);
 		}
-		if (in_array('edit', $methods))
+		if (in_array('edit', $methods, true))
 		{
 			$this->get($name . '/edit/' . $id, $newName . '::edit/$1', $options);
 		}
-		if (in_array('update', $methods))
+		if (in_array('update', $methods, true))
 		{
 			$this->post($name . '/update/' . $id, $newName . '::update/$1', $options);
 		}
-		if (in_array('remove', $methods))
+		if (in_array('remove', $methods, true))
 		{
 			$this->get($name . '/remove/' . $id, $newName . '::remove/$1', $options);
 		}
-		if (in_array('delete', $methods))
+		if (in_array('delete', $methods, true))
 		{
 			$this->post($name . '/delete/' . $id, $newName . '::delete/$1', $options);
 		}
-		if (in_array('show', $methods))
+		if (in_array('show', $methods, true))
 		{
 			$this->get($name . '/' . $id, $newName . '::show/$1', $options);
 		}
-		if (in_array('create', $methods))
+		if (in_array('create', $methods, true))
 		{
 			$this->post($name, $newName . '::create', $options);
 		}
@@ -1012,10 +987,15 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
-	public function match(array $verbs = [], string $from, $to, array $options = null): RouteCollectionInterface
+	public function match(array $verbs = [], string $from = '', $to = '', array $options = null): RouteCollectionInterface
 	{
+		if (empty($from) || empty($to))
+		{
+			throw new InvalidArgumentException('You must supply the parameters: from, to.');
+		}
+
 		foreach ($verbs as $verb)
 		{
 			$verb = strtolower($verb);
@@ -1035,7 +1015,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function get(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1053,7 +1033,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function post(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1071,7 +1051,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function put(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1089,7 +1069,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function delete(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1107,7 +1087,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function head(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1125,7 +1105,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function patch(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1143,7 +1123,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function options(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1161,7 +1141,7 @@
 	 * @param string|array $to
 	 * @param array|null   $options
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
 	public function cli(string $from, $to, array $options = null): RouteCollectionInterface
 	{
@@ -1175,12 +1155,12 @@
 	/**
 	 * Limits the routes to a specified ENVIRONMENT or they won't run.
 	 *
-	 * @param string   $env
-	 * @param \Closure $callback
+	 * @param string  $env
+	 * @param Closure $callback
 	 *
-	 * @return \CodeIgniter\Router\RouteCollectionInterface
+	 * @return RouteCollectionInterface
 	 */
-	public function environment(string $env, \Closure $callback): RouteCollectionInterface
+	public function environment(string $env, Closure $callback): RouteCollectionInterface
 	{
 		if (ENVIRONMENT === $env)
 		{
@@ -1206,7 +1186,7 @@
 	 *      reverseRoute('Controller::method', $param1, $param2);
 	 *
 	 * @param string $search
-	 * @param array  ...$params
+	 * @param mixed  ...$params
 	 *
 	 * @return string|false
 	 */
@@ -1284,13 +1264,16 @@
 	/**
 	 * Checks a route (using the "from") to see if it's filtered or not.
 	 *
-	 * @param string $search
+	 * @param string      $search
+	 * @param string|null $verb
 	 *
 	 * @return boolean
 	 */
-	public function isFiltered(string $search): bool
+	public function isFiltered(string $search, string $verb = null): bool
 	{
-		return isset($this->routesOptions[$search]['filter']);
+		$options = $this->loadRoutesOptions($verb);
+
+		return isset($options[$search]['filter']);
 	}
 
 	//--------------------------------------------------------------------
@@ -1305,18 +1288,16 @@
 	 *
 	 * has a filter of "role", with parameters of ['admin', 'manager'].
 	 *
-	 * @param string $search
+	 * @param string      $search
+	 * @param string|null $verb
 	 *
 	 * @return string
 	 */
-	public function getFilterForRoute(string $search): string
+	public function getFilterForRoute(string $search, string $verb = null): string
 	{
-		if (! $this->isFiltered($search))
-		{
-			return '';
-		}
+		$options = $this->loadRoutesOptions($verb);
 
-		return $this->routesOptions[$search]['filter'];
+		return $options[$search]['filter'] ?? '';
 	}
 
 	//--------------------------------------------------------------------
@@ -1328,7 +1309,7 @@
 	 * @param array|null $params
 	 *
 	 * @return string
-	 * @throws \CodeIgniter\Router\Exceptions\RouterException
+	 * @throws RouterException
 	 */
 	protected function fillRouteParams(string $from, array $params = null): string
 	{
@@ -1344,18 +1325,15 @@
 		// the appropriate places.
 		foreach ($matches[0] as $index => $pattern)
 		{
-			// Ensure that the param we're inserting matches
-			// the expected param type.
-			$pos = strpos($from, $pattern);
-
-			if (preg_match('#^' . $pattern . '$#u', $params[$index]))
-			{
-				$from = substr_replace($from, $params[$index], $pos, strlen($pattern));
-			}
-			else
+			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, '/');
@@ -1387,7 +1365,7 @@
 			$from = trim($from, '/');
 		}
 
-		$options = array_merge((array) $this->currentOptions, (array) $options);
+		$options = array_merge($this->currentOptions ?? [], $options ?? []);
 
 		// Hostname limiting?
 		if (! empty($options['hostname']))
@@ -1402,7 +1380,7 @@
 		}
 
 		// Limiting to subdomains?
-		else if (! empty($options['subdomain']))
+		elseif (! empty($options['subdomain']))
 		{
 			// If we don't match the current subdomain, then
 			// we don't need to add the route.
@@ -1442,17 +1420,17 @@
 		//If is redirect, No processing
 		if (! isset($options['redirect']))
 		{
-			// If no namespace found, add the default namespace
-			if (is_string($to) && (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.
 			if (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, '\\');
 			}
 		}
@@ -1473,7 +1451,7 @@
 			'route' => [$from => $to],
 		];
 
-		$this->routesOptions[$from] = $options;
+		$this->routesOptions[$verb][$from] = $options;
 
 		// Is this a redirect?
 		if (isset($options['redirect']) && is_numeric($options['redirect']))
@@ -1512,7 +1490,7 @@
 
 		// 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))
+		if (! empty($this->currentSubdomain) && in_array('*', $subdomains, true))
 		{
 			return true;
 		}
@@ -1585,4 +1563,37 @@
 		}
 	}
 
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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;
+	}
 }
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index b25e93d..1e9260a 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -1,44 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
 
+use Closure;
+
 /**
  * Interface RouteCollectionInterface
  *
@@ -48,12 +22,9 @@
  *
  * The RouteCollection provides the Router with the routes so that it can determine
  * which controller should be ran.
- *
- * @package CodeIgniter\Router
  */
 interface RouteCollectionInterface
 {
-
 	/**
 	 * Adds a single route to the collection.
 	 *
@@ -88,7 +59,7 @@
 	 * Sets the default namespace to use for Controllers when no other
 	 * namespace has been specified.
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return mixed
 	 */
@@ -100,7 +71,7 @@
 	 * Sets the default controller to use when no other controller has been
 	 * specified.
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return mixed
 	 */
@@ -112,7 +83,7 @@
 	 * Sets the default method to call on the controller when no other
 	 * method has been set in the route.
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return mixed
 	 */
@@ -170,7 +141,7 @@
 	 * Returns the 404 Override setting, which can be null, a closure
 	 * or the controller/string.
 	 *
-	 * @return string|\Closure|null
+	 * @return string|Closure|null
 	 */
 	public function get404Override();
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 3ef9150..1c61d12 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -49,11 +21,10 @@
  */
 class Router implements RouterInterface
 {
-
 	/**
 	 * A RouteCollection instance.
 	 *
-	 * @var RouteCollection
+	 * @var RouteCollectionInterface
 	 */
 	protected $collection;
 
@@ -61,7 +32,7 @@
 	 * Sub-directory that contains the requested controller class.
 	 * Primarily used by 'autoRoute'.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $directory;
 
@@ -127,7 +98,7 @@
 	 * The filter info from Route Collection
 	 * if the matched route should be filtered.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $filterInfo;
 
@@ -146,6 +117,7 @@
 		$this->controller = $this->collection->getDefaultController();
 		$this->method     = $this->collection->getDefaultMethod();
 
+		// @phpstan-ignore-next-line
 		$this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
 	}
 
@@ -155,8 +127,8 @@
 	 * @param string|null $uri
 	 *
 	 * @return mixed|string
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \CodeIgniter\Exceptions\PageNotFoundException
+	 * @throws RedirectException
+	 * @throws PageNotFoundException
 	 */
 	public function handle(string $uri = null)
 	{
@@ -174,6 +146,9 @@
 		// Decode URL-encoded string
 		$uri = urldecode($uri);
 
+		// Restart filterInfo
+		$this->filterInfo = null;
+
 		if ($this->checkRoutes($uri))
 		{
 			if ($this->collection->isFiltered($this->matchedRoute[0]))
@@ -229,7 +204,7 @@
 	 * Returns the name of the method to run in the
 	 * chosen container.
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	public function methodName(): string
 	{
@@ -273,7 +248,7 @@
 	 * during the parsing process as an array, ready to send to
 	 * instance->method(...$params).
 	 *
-	 * @return mixed
+	 * @return array
 	 */
 	public function params(): array
 	{
@@ -328,9 +303,9 @@
 	 * something like mod_rewrite to remove the page. This allows you to set
 	 * it a blank.
 	 *
-	 * @param $page
+	 * @param string $page
 	 *
-	 * @return mixed
+	 * @return $this
 	 */
 	public function setIndexPage($page): self
 	{
@@ -391,25 +366,28 @@
 	 * @param string $uri The URI path to compare against the routes
 	 *
 	 * @return boolean Whether the route was matched or not.
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
+	 * @throws RedirectException
 	 */
 	protected function checkRoutes(string $uri): bool
 	{
 		$routes = $this->collection->getRoutes($this->collection->getHTTPVerb());
 
-		$uri = $uri === '/'
-			? $uri
-			: ltrim($uri, '/ ');
-
 		// 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, '/ ');
@@ -419,7 +397,7 @@
 			// Are we dealing with a locale?
 			if (strpos($key, '{locale}') !== false)
 			{
-				$localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key));
+				$localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key), true);
 
 				// Replace it with a regex so it
 				// will actually match.
@@ -442,7 +420,6 @@
 					// The following may be inefficient, but doesn't upset NetBeans :-/
 					$temp                 = (explode('/', $uri));
 					$this->detectedLocale = $temp[$localeSegment];
-					unset($localeSegment);
 				}
 
 				// Are we using Closures? If so, then we need
@@ -485,7 +462,7 @@
 					[
 						$controller,
 						$method,
-					] = explode( '::', $val );
+					] = explode('::', $val);
 
 					// Only replace slashes in the controller, not in the method.
 					$controller = str_replace('/', '\\', $controller);
@@ -552,11 +529,13 @@
 		$controllerName   = $this->controllerName();
 		if ($this->collection->getHTTPVerb() !== 'cli')
 		{
-			$controller  = '\\' . $defaultNamespace;
+			$controller = '\\' . $defaultNamespace;
+
 			$controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
 			$controller .= $controllerName;
-			$controller  = strtolower($controller);
-			$methodName  = strtolower($this->methodName());
+
+			$controller = strtolower($controller);
+			$methodName = strtolower($this->methodName());
 
 			foreach ($this->collection->getRoutes('cli') as $route)
 			{
@@ -603,12 +582,13 @@
 	protected function validateRequest(array $segments): array
 	{
 		$segments = array_filter($segments, function ($segment) {
+			// @phpstan-ignore-next-line
 			return ! empty($segment) || ($segment !== '0' || $segment !== 0);
 		});
 		$segments = array_values($segments);
 
-		$c                  = count($segments);
-		$directory_override = isset($this->directory);
+		$c                 = count($segments);
+		$directoryOverride = isset($this->directory);
 
 		// Loop through our segments and return as soon as a controller
 		// is found or when such a directory doesn't exist
@@ -616,7 +596,7 @@
 		{
 			$test = $this->directory . ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
 
-			if (! is_file(APPPATH . 'Controllers/' . $test . '.php') && $directory_override === false && is_dir(APPPATH . 'Controllers/' . $this->directory . ucfirst($segments[0])))
+			if (! is_file(APPPATH . 'Controllers/' . $test . '.php') && $directoryOverride === false && is_dir(APPPATH . 'Controllers/' . $this->directory . ucfirst($segments[0])))
 			{
 				$this->setDirectory(array_shift($segments), true);
 				continue;
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index 46cb285..d5522e1 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
@@ -46,12 +18,11 @@
  */
 interface RouterInterface
 {
-
 	/**
 	 * Stores a reference to the RouteCollection object.
 	 *
-	 * @param RouteCollectionInterface  $routes
-	 * @param \CodeIgniter\HTTP\Request $request
+	 * @param RouteCollectionInterface $routes
+	 * @param Request                  $request
 	 */
 	public function __construct(RouteCollectionInterface $routes, Request $request = null);
 
@@ -105,7 +76,7 @@
 	 * something like mod_rewrite to remove the page. This allows you to set
 	 * it a blank.
 	 *
-	 * @param $page
+	 * @param string $page
 	 *
 	 * @return mixed
 	 */
diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php
index dda6a9d..c129ae5 100644
--- a/system/Security/Exceptions/SecurityException.php
+++ b/system/Security/Exceptions/SecurityException.php
@@ -1,12 +1,27 @@
-<?php namespace CodeIgniter\Security\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class SecurityException extends FrameworkException implements ExceptionInterface
+class SecurityException extends FrameworkException
 {
 	public static function forDisallowedAction()
 	{
-		return new static(lang('HTTP.disallowedAction'), 403);
+		return new static(lang('Security.disallowedAction'), 403);
+	}
+	
+	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 28318d9..b0854b8 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -1,203 +1,143 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security;
 
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
+use Config\App;
 
 /**
- * HTTP security handler.
+ * Class Security
+ *
+ * Provides methods that help protect your site against
+ * Cross-Site Request Forgery attacks.
  */
-class Security
+class Security implements SecurityInterface
 {
-
 	/**
 	 * CSRF Hash
 	 *
 	 * Random hash for Cross Site Request Forgery protection cookie
 	 *
-	 * @var string
+	 * @var string|null
 	 */
-	protected $CSRFHash;
+	protected $hash = null;
 
 	/**
-	 * CSRF Expire time
-	 *
-	 * Expiration time for Cross Site Request Forgery protection cookie.
-	 * Defaults to two hours (in seconds).
-	 *
-	 * @var integer
-	 */
-	protected $CSRFExpire = 7200;
-
-	/**
-	 * CSRF Token name
+	 * CSRF Token Name
 	 *
 	 * Token name for Cross Site Request Forgery protection cookie.
 	 *
 	 * @var string
 	 */
-	protected $CSRFTokenName = 'CSRFToken';
+	protected $tokenName = 'csrf_token_name';
 
 	/**
-	 * CSRF Header name
+	 * CSRF Header Name
 	 *
 	 * Token name for Cross Site Request Forgery protection cookie.
 	 *
 	 * @var string
 	 */
-	protected $CSRFHeaderName = 'CSRFToken';
+	protected $headerName = 'X-CSRF-TOKEN';
 
 	/**
-	 * CSRF Cookie name
+	 * CSRF Cookie Name
 	 *
 	 * Cookie name for Cross Site Request Forgery protection cookie.
 	 *
 	 * @var string
 	 */
-	protected $CSRFCookieName = 'CSRFToken';
+	protected $cookieName = 'csrf_cookie_name';
+
+	/**
+	 * CSRF Expires
+	 *
+	 * Expiration time for Cross Site Request Forgery protection cookie.
+	 *
+	 * Defaults to two hours (in seconds).
+	 *
+	 * @var integer
+	 */
+	protected $expires = 7200;
 
 	/**
 	 * CSRF Regenerate
 	 *
-	 * If true, the CSRF Token will be regenerated on every request.
-	 * If false, will stay the same for the life of the cookie.
+	 * Regenerate CSRF Token on every request.
 	 *
 	 * @var boolean
 	 */
-	protected $CSRFRegenerate = true;
+	protected $regenerate = true;
 
 	/**
-	 * Typically will be a forward slash
+	 * CSRF Redirect
 	 *
-	 * @var string
-	 */
-	protected $cookiePath = '/';
-
-	/**
-	 * Set to .your-domain.com for site-wide cookies
-	 *
-	 * @var string
-	 */
-	protected $cookieDomain = '';
-
-	/**
-	 * Cookie will only be set if a secure HTTPS connection exists.
+	 * Redirect to previous page with error on failure.
 	 *
 	 * @var boolean
 	 */
-	protected $cookieSecure = false;
+	protected $redirect = true;
 
 	/**
-	 * List of sanitize filename strings
+	 * CSRF SameSite
 	 *
-	 * @var array
+	 * 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 'Lax'|'None'|'Strict'
 	 */
-	public $filenameBadChars = [
-		'../',
-		'<!--',
-		'-->',
-		'<',
-		'>',
-		"'",
-		'"',
-		'&',
-		'$',
-		'#',
-		'{',
-		'}',
-		'[',
-		']',
-		'=',
-		';',
-		'?',
-		'%20',
-		'%22',
-		'%3c', // <
-		'%253c', // <
-		'%3e', // >
-		'%0e', // >
-		'%28', // (
-		'%29', // )
-		'%2528', // (
-		'%26', // &
-		'%24', // $
-		'%3f', // ?
-		'%3b', // ;
-		'%3d',       // =
-	];
+	protected $samesite = 'Lax';
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * Security constructor.
+	 * Constructor.
 	 *
-	 * Stores our configuration and fires off the init() method to
-	 * setup initial state.
+	 * Stores our configuration and fires off the init() method to setup
+	 * initial state.
 	 *
-	 * @param \Config\App $config
+	 * @param App $config
 	 *
-	 * @throws \Exception
+	 * @throws SecurityException
 	 */
 	public function __construct($config)
 	{
-		// Store our CSRF-related settings
-		$this->CSRFExpire     = $config->CSRFExpire;
-		$this->CSRFTokenName  = $config->CSRFTokenName;
-		$this->CSRFHeaderName = $config->CSRFHeaderName;
-		$this->CSRFCookieName = $config->CSRFCookieName;
-		$this->CSRFRegenerate = $config->CSRFRegenerate;
+		$security = config('Security');
+		// Store CSRF-related configurations
+		$this->tokenName  = $security->tokenName ?? $config->CSRFTokenName ?? $this->tokenName;
+		$this->headerName = $security->headerName ?? $config->CSRFHeaderName ?? $this->headerName;
+		$this->cookieName = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
+		$this->expires    = $security->expires ?? $config->CSRFExpire ?? $this->expires;
+		$this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
+		$this->samesite   = $security->samesite ?? $config->CSRFSameSite ?? $this->samesite;
+
+		if (! in_array(strtolower($this->samesite), ['none', 'lax', 'strict', ''], true))
+		{
+			throw SecurityException::forInvalidSameSite($this->samesite);
+		}
 
 		if (isset($config->cookiePrefix))
 		{
-			$this->CSRFCookieName = $config->cookiePrefix . $this->CSRFCookieName;
+			$this->cookieName = $config->cookiePrefix . $this->cookieName;
 		}
 
-		// Store cookie-related settings
-		$this->cookiePath   = $config->cookiePath;
-		$this->cookieDomain = $config->cookieDomain;
-		$this->cookieSecure = $config->cookieSecure;
-
-		$this->CSRFSetHash();
-
-		unset($config);
+		$this->generateHash();
 	}
 
 	//--------------------------------------------------------------------
@@ -208,56 +148,115 @@
 	 * @param RequestInterface $request
 	 *
 	 * @return $this|false
-	 * @throws \Exception
+	 *
+	 * @throws SecurityException
+	 *
+	 * @deprecated Use `CodeIgniter\Security\Security::verify()` instead of using this method.
 	 */
 	public function CSRFVerify(RequestInterface $request)
 	{
-		// If it's not a POST request we will set the CSRF cookie
+		return $this->verify($request);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the CSRF Hash.
+	 *
+	 * @return string|null
+	 *
+	 * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method.
+	 */
+	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.
+	 */
+	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->CSRFSetCookie($request);
+			return $this->sendCookie($request);
 		}
 
-		// Do the tokens exist in _POST, HEADER or optionally php:://input - json data
-		$CSRFTokenValue = $_POST[$this->CSRFTokenName] ??
-			(! is_null($request->getHeader($this->CSRFHeaderName)) && ! empty($request->getHeader($this->CSRFHeaderName)->getValue()) ?
-				$request->getHeader($this->CSRFHeaderName)->getValue() :
-				(! empty($request->getBody()) && ! empty($json = json_decode($request->getBody())) && json_last_error() === JSON_ERROR_NONE ?
-					($json->{$this->CSRFTokenName} ?? null) :
-					null));
+		// 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());
 
-		// Do the tokens exist in both the _POST/POSTed JSON and _COOKIE arrays?
-		if (! isset($CSRFTokenValue, $_COOKIE[$this->CSRFCookieName]) || $CSRFTokenValue !== $_COOKIE[$this->CSRFCookieName]
-		) // Do the tokens match?
+			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]) || $token !== $_COOKIE[$this->cookieName])
 		{
 			throw SecurityException::forDisallowedAction();
 		}
 
-		// We kill this since we're done and we don't want to pollute the _POST array
-		if (isset($_POST[$this->CSRFTokenName]))
+		if (isset($_POST[$this->tokenName]))
 		{
-			unset($_POST[$this->CSRFTokenName]);
+			// 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);
 		}
-		// We kill this since we're done and we don't want to pollute the JSON data
-		elseif (isset($json->{$this->CSRFTokenName}))
+		elseif (isset($json->{$this->tokenName}))
 		{
-			unset($json->{$this->CSRFTokenName});
+			// 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));
 		}
 
 		// Regenerate on every submission?
-		if ($this->CSRFRegenerate)
+		if ($this->regenerate)
 		{
-			// Nothing should last forever
-			$this->CSRFHash = null;
-			unset($_COOKIE[$this->CSRFCookieName]);
+			// Nothing should last forever.
+			$this->hash = null;
+			unset($_COOKIE[$this->cookieName]);
 		}
 
-		$this->CSRFSetHash();
-		$this->CSRFSetCookie($request);
+		$this->generateHash();
+		$this->sendCookie($request);
 
-		log_message('info', 'CSRF token verified');
+		log_message('info', 'CSRF token verified.');
 
 		return $this;
 	}
@@ -265,43 +264,13 @@
 	//--------------------------------------------------------------------
 
 	/**
-	 * CSRF Set Cookie
+	 * Returns the CSRF Hash.
 	 *
-	 * @codeCoverageIgnore
-	 *
-	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-	 *
-	 * @return Security|false
+	 * @return string|null
 	 */
-	public function CSRFSetCookie(RequestInterface $request)
+	public function getHash(): ?string
 	{
-		$expire        = time() + $this->CSRFExpire;
-		$secure_cookie = (bool) $this->cookieSecure;
-
-		if ($secure_cookie && ! $request->isSecure())
-		{
-			return false;
-		}
-
-		setcookie(
-				$this->CSRFCookieName, $this->CSRFHash, $expire, $this->cookiePath, $this->cookieDomain, $secure_cookie, true                // Enforce HTTP only cookie for security
-		);
-
-		log_message('info', 'CSRF cookie sent');
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the current CSRF Hash.
-	 *
-	 * @return string
-	 */
-	public function getCSRFHash(): string
-	{
-		return $this->CSRFHash;
+		return $this->hash;
 	}
 
 	//--------------------------------------------------------------------
@@ -311,38 +280,57 @@
 	 *
 	 * @return string
 	 */
-	public function getCSRFTokenName(): string
+	public function getTokenName(): string
 	{
-		return $this->CSRFTokenName;
+		return $this->tokenName;
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * Sets the CSRF Hash and cookie.
+	 * Returns the CSRF Header Name.
 	 *
 	 * @return string
-	 * @throws \Exception
 	 */
-	protected function CSRFSetHash(): string
+	public function getHeaderName(): string
 	{
-		if ($this->CSRFHash === 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->CSRFCookieName]) && is_string($_COOKIE[$this->CSRFCookieName]) && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->CSRFCookieName]) === 1
-			)
-			{
-				return $this->CSRFHash = $_COOKIE[$this->CSRFCookieName];
-			}
+		return $this->headerName;
+	}
 
-			$rand           = random_bytes(16);
-			$this->CSRFHash = bin2hex($rand);
-		}
+	//--------------------------------------------------------------------
 
-		return $this->CSRFHash;
+	/**
+	 * Returns the CSRF Cookie Name.
+	 *
+	 * @return string
+	 */
+	public function getCookieName(): string
+	{
+		return $this->cookieName;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Check if CSRF cookie is expired.
+	 *
+	 * @return boolean
+	 */
+	public function isExpired(): bool
+	{
+		return $this->expires === 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Check if request should be redirect on failure.
+	 *
+	 * @return boolean
+	 */
+	public function shouldRedirect(): bool
+	{
+		return $this->redirect;
 	}
 
 	//--------------------------------------------------------------------
@@ -358,16 +346,49 @@
 	 * 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 $relative_path Whether to preserve paths
+	 * @param string  $str          Input file name
+	 * @param boolean $relativePath Whether to preserve paths
 	 *
 	 * @return string
 	 */
-	public function sanitizeFilename(string $str, bool $relative_path = false): string
+	public function sanitizeFilename(string $str, bool $relativePath = false): string
 	{
-		$bad = $this->filenameBadChars;
+		// List of sanitize filename strings
+		$bad = [
+			'../',
+			'<!--',
+			'-->',
+			'<',
+			'>',
+			"'",
+			'"',
+			'&',
+			'$',
+			'#',
+			'{',
+			'}',
+			'[',
+			']',
+			'=',
+			';',
+			'?',
+			'%20',
+			'%22',
+			'%3c',
+			'%253c',
+			'%3e',
+			'%0e',
+			'%28',
+			'%29',
+			'%2528',
+			'%26',
+			'%24',
+			'%3f',
+			'%3b',
+			'%3d',
+		];
 
-		if (! $relative_path)
+		if (! $relativePath)
 		{
 			$bad[] = './';
 			$bad[] = '/';
@@ -386,4 +407,92 @@
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * 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
+	 * @codeCoverageIgnore
+	 */
+	protected function sendCookie(RequestInterface $request)
+	{
+		$config = new App();
+
+		$expires = $this->isExpired() ? $this->expires : time() + $this->expires;
+		$path    = $config->cookiePath ?? '/';
+		$domain  = $config->cookieDomain ?? '';
+		$secure  = $config->cookieSecure ?? false;
+
+		if ($secure && ! $request->isSecure())
+		{
+			return false;
+		}
+
+		if (PHP_VERSION_ID < 70300)
+		{
+			// In PHP < 7.3.0, there is a "hacky" way to set the samesite parameter
+			$samesite = '';
+
+			if (! empty($this->samesite))
+			{
+				$samesite = '; samesite=' . $this->samesite;
+			}
+
+			setcookie($this->cookieName, $this->hash, $expires, $path . $samesite, $domain, $secure, true);
+		}
+		else
+		{
+			// PHP 7.3 adds another function signature allowing setting of samesite
+			$params = [
+				'expires'  => $expires,
+				'path'     => $path,
+				'domain'   => $domain,
+				'secure'   => $secure,
+				'httponly' => true, // Enforce HTTP only cookie for security
+			];
+
+			if (! empty($this->samesite))
+			{
+				$params['samesite'] = $this->samesite;
+			}
+
+			// @phpstan-ignore-next-line @todo ignore to be removed in 4.1 with rector 0.9
+			setcookie($this->cookieName, $this->hash, $params);
+		}
+
+		log_message('info', 'CSRF cookie sent.');
+
+		return $this;
+	}
 }
diff --git a/system/Security/SecurityInterface.php b/system/Security/SecurityInterface.php
new file mode 100644
index 0000000..96f87c7
--- /dev/null
+++ b/system/Security/SecurityInterface.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
+
+/**
+ * Expected behavior of a Security.
+ */
+interface SecurityInterface
+{
+	/**
+	 * CSRF Verify
+	 *
+	 * @param RequestInterface $request
+	 *
+	 * @return $this|false
+	 * 
+	 * @throws SecurityException
+	 */
+	public function verify(RequestInterface $request);
+
+	/**
+	 * Returns the CSRF Hash.
+	 *
+	 * @return string|null
+	 */
+	public function getHash(): ?string;
+
+	/**
+	 * Returns the CSRF Token Name.
+	 *
+	 * @return string
+	 */
+	public function getTokenName(): string;
+
+	/**
+	 * Returns the CSRF Header Name.
+	 *
+	 * @return string
+	 */
+	public function getHeaderName(): string;
+
+	/**
+	 * Returns the CSRF Cookie Name.
+	 *
+	 * @return string
+	 */
+	public function getCookieName(): string;
+
+	/**
+	 * Check if CSRF cookie is expired.
+	 *
+	 * @return boolean
+	 */
+	public function isExpired(): bool;
+
+	/**
+	 * Check if request should be redirect on failure.
+	 *
+	 * @return boolean
+	 */
+	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;
+}
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
index f4733c0..8a1efa8 100644
--- a/system/Session/Exceptions/SessionException.php
+++ b/system/Session/Exceptions/SessionException.php
@@ -1,9 +1,19 @@
-<?php namespace CodeIgniter\Session\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class SessionException extends FrameworkException implements ExceptionInterface
+class SessionException extends FrameworkException
 {
 	public static function forMissingDatabaseTable()
 	{
@@ -29,4 +39,9 @@
 	{
 		return new static(lang('Session.invalidSavePathFormat', [$path]));
 	}
+
+	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 15e6324..ef4a266 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -1,51 +1,23 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use Config\Database;
+use Exception;
 
 /**
  * Session handler using static array for storage.
  * Intended only for use during testing.
  */
-class ArrayHandler extends BaseHandler implements \SessionHandlerInterface
+class ArrayHandler extends BaseHandler
 {
 	protected static $cache = [];
 
@@ -60,7 +32,7 @@
 	 * @param string $name     Session cookie name
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function open($savePath, $name): bool
 	{
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 4d8264d..0487ca4 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -1,59 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
+use Config\App as AppConfig;
 use Psr\Log\LoggerAwareTrait;
+use SessionHandlerInterface;
 
 /**
  * Base class for session handling
  */
-abstract class BaseHandler implements \SessionHandlerInterface
+abstract class BaseHandler implements SessionHandlerInterface
 {
-
 	use LoggerAwareTrait;
 
 	/**
 	 * The Data fingerprint.
 	 *
-	 * @var boolean
+	 * @var string
 	 */
 	protected $fingerprint;
 
@@ -117,7 +89,7 @@
 	 * The 'save path' for the session
 	 * varies between
 	 *
-	 * @var string
+	 * @var string|array
 	 */
 	protected $savePath;
 
@@ -133,10 +105,10 @@
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
-	 * @param string     $ipAddress
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
 	 */
-	public function __construct($config, string $ipAddress)
+	public function __construct(AppConfig $config, string $ipAddress)
 	{
 		$this->cookiePrefix = $config->cookiePrefix;
 		$this->cookieDomain = $config->cookieDomain;
@@ -159,7 +131,7 @@
 	protected function destroyCookie(): bool
 	{
 		return setcookie(
-				$this->cookieName, null, 1, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
+				$this->cookieName, '', 1, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
 		);
 	}
 
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 71ecbde..28f62da 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -1,55 +1,27 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
 use Config\Database;
+use Exception;
 
 /**
  * Session handler using current Database for storage
  */
-class DatabaseHandler extends BaseHandler implements \SessionHandlerInterface
+class DatabaseHandler extends BaseHandler
 {
-
 	/**
 	 * The database group to use for storage.
 	 *
@@ -90,10 +62,10 @@
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
-	 * @param string     $ipAddress
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
 	 */
-	public function __construct(BaseConfig $config, string $ipAddress)
+	public function __construct(AppConfig $config, string $ipAddress)
 	{
 		parent::__construct($config, $ipAddress);
 
@@ -106,6 +78,7 @@
 		}
 
 		// Get DB Connection
+		// @phpstan-ignore-next-line
 		$this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
 
 		$this->db = Database::connect($this->DBGroup);
@@ -133,7 +106,7 @@
 	 * @param string $name     Session cookie name
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function open($savePath, $name): bool
 	{
@@ -165,7 +138,7 @@
 		}
 
 		// Needed by write() to detect session_regenerate_id() calls
-		if (is_null($this->sessionID))
+		if (is_null($this->sessionID)) // @phpstan-ignore-line
 		{
 			$this->sessionID = $sessionID;
 		}
@@ -201,7 +174,7 @@
 		}
 		else
 		{
-			$result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data)) : $result->data;
+			$result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data), true) : $result->data;
 		}
 
 		$this->fingerprint = md5($result);
@@ -230,7 +203,7 @@
 		}
 
 		// Was the ID regenerated?
-		elseif ($sessionID !== $this->sessionID)
+		if ($sessionID !== $this->sessionID)
 		{
 			$this->rowExists = false;
 			$this->sessionID = $sessionID;
@@ -371,7 +344,8 @@
 
 			return $this->fail();
 		}
-		elseif ($this->platform === 'postgre')
+
+		if ($this->platform === 'postgre')
 		{
 			$arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
 			if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})"))
@@ -411,7 +385,8 @@
 
 			return $this->fail();
 		}
-		elseif ($this->platform === 'postgre')
+
+		if ($this->platform === 'postgre')
 		{
 			if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})"))
 			{
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index 19fc57f..17ee5bf 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -1,53 +1,25 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Exception;
 
 /**
  * Session handler using file system for storage
  */
-class FileHandler extends BaseHandler implements \SessionHandlerInterface
+class FileHandler extends BaseHandler
 {
-
 	/**
 	 * Where to save the session files to.
 	 *
@@ -58,14 +30,14 @@
 	/**
 	 * The file handle
 	 *
-	 * @var resource
+	 * @var resource|null
 	 */
 	protected $fileHandle;
 
 	/**
 	 * File Name
 	 *
-	 * @var resource
+	 * @var string
 	 */
 	protected $filePath;
 
@@ -83,15 +55,22 @@
 	 */
 	protected $matchIP = false;
 
+	/**
+	 * Regex of session ID
+	 *
+	 * @var string
+	 */
+	protected $sessionIDRegex = '';
+
 	//--------------------------------------------------------------------
 
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
-	 * @param string     $ipAddress
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
 	 */
-	public function __construct($config, string $ipAddress)
+	public function __construct(AppConfig $config, string $ipAddress)
 	{
 		parent::__construct($config, $ipAddress);
 
@@ -128,7 +107,7 @@
 	 * @param string $name     Session cookie name
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function open($savePath, $name): bool
 	{
@@ -161,9 +140,9 @@
 	 *
 	 * @param string $sessionID Session ID
 	 *
-	 * @return string    Serialized session data
+	 * @return string|boolean    Serialized session data
 	 */
-	public function read($sessionID): string
+	public function read($sessionID)
 	{
 		// This might seem weird, but PHP 5.6 introduced session_reset(),
 		// which re-reads session data
@@ -188,7 +167,7 @@
 			}
 
 			// Needed by write() to detect session_regenerate_id() calls
-			if (is_null($this->sessionID))
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
 			{
 				$this->sessionID = $sessionID;
 			}
@@ -206,7 +185,7 @@
 			rewind($this->fileHandle);
 		}
 
-		$session_data = '';
+		$sessionData = '';
 		clearstatcache();    // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
 		for ($read = 0, $length = filesize($this->filePath . $sessionID); $read < $length; $read += strlen($buffer))
 		{
@@ -215,12 +194,12 @@
 				break;
 			}
 
-			$session_data .= $buffer;
+			$sessionData .= $buffer;
 		}
 
-		$this->fingerprint = md5($session_data);
+		$this->fingerprint = md5($sessionData);
 
-		return $session_data;
+		return $sessionData;
 	}
 
 	//--------------------------------------------------------------------
@@ -247,7 +226,8 @@
 		{
 			return false;
 		}
-		elseif ($this->fingerprint === md5($sessionData))
+
+		if ($this->fingerprint === md5($sessionData))
 		{
 			return ($this->fileNew) ? true : touch($this->filePath . $sessionID);
 		}
@@ -268,7 +248,7 @@
 				}
 			}
 
-			if (! is_int($result))
+			if (! is_int($result)) // @phpstan-ignore-line
 			{
 				$this->fingerprint = md5(substr($sessionData, 0, $written));
 				$this->logger->error('Session: Unable to write data.');
@@ -298,7 +278,8 @@
 			flock($this->fileHandle, LOCK_UN);
 			fclose($this->fileHandle);
 
-			$this->fileHandle = $this->fileNew = null;
+			$this->fileHandle = null;
+			$this->fileNew    = false;
 
 			return true;
 		}
@@ -313,23 +294,24 @@
 	 *
 	 * Destroys the current session.
 	 *
-	 * @param string $session_id Session ID
+	 * @param string $sessionId Session ID
 	 *
 	 * @return boolean
 	 */
-	public function destroy($session_id): bool
+	public function destroy($sessionId): bool
 	{
 		if ($this->close())
 		{
-			return is_file($this->filePath . $session_id)
-				? (unlink($this->filePath . $session_id) && $this->destroyCookie()) : true;
+			return is_file($this->filePath . $sessionId)
+				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
 		}
-		elseif ($this->filePath !== null)
+
+		if ($this->filePath !== null)
 		{
 			clearstatcache();
 
-			return is_file($this->filePath . $session_id)
-				? (unlink($this->filePath . $session_id) && $this->destroyCookie()) : true;
+			return is_file($this->filePath . $sessionId)
+				? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
 		}
 
 		return false;
@@ -393,14 +375,14 @@
 	 */
 	protected function configureSessionIDRegex()
 	{
-		$bitsPerCharacter = (int)ini_get('session.sid_bits_per_character');
-		$SIDLength        = (int)ini_get('session.sid_length');
+		$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', $SIDLength);
+			$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
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index f35405e..ea744fa 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -1,56 +1,29 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Memcached;
 
 /**
  * Session handler using Memcache for persistence
  */
-class MemcachedHandler extends BaseHandler implements \SessionHandlerInterface
+class MemcachedHandler extends BaseHandler
 {
-
 	/**
 	 * Memcached instance
 	 *
-	 * @var \Memcached
+	 * @var Memcached|null
 	 */
 	protected $memcached;
 
@@ -64,7 +37,7 @@
 	/**
 	 * Lock key
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $lockKey;
 
@@ -80,11 +53,11 @@
 	/**
 	 * Constructor
 	 *
-	 * @param  BaseConfig $config
-	 * @param  string     $ipAddress
-	 * @throws \CodeIgniter\Session\Exceptions\SessionException
+	 * @param  AppConfig $config
+	 * @param  string    $ipAddress
+	 * @throws SessionException
 	 */
-	public function __construct(BaseConfig $config, string $ipAddress)
+	public function __construct(AppConfig $config, string $ipAddress)
 	{
 		parent::__construct($config, $ipAddress);
 
@@ -113,21 +86,21 @@
 	 *
 	 * Sanitizes save_path and initializes connections.
 	 *
-	 * @param string $save_path Server path(s)
-	 * @param string $name      Session cookie name, unused
+	 * @param string $savePath Server path(s)
+	 * @param string $name     Session cookie name, unused
 	 *
 	 * @return boolean
 	 */
-	public function open($save_path, $name): bool
+	public function open($savePath, $name): bool
 	{
-		$this->memcached = new \Memcached();
-		$this->memcached->setOption(\Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
+		$this->memcached = new Memcached();
+		$this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
 
-		$server_list = [];
+		$serverList = [];
 
 		foreach ($this->memcached->getServerList() as $server)
 		{
-			$server_list[] = $server['host'] . ':' . $server['port'];
+			$serverList[] = $server['host'] . ':' . $server['port'];
 		}
 
 		if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)
@@ -142,7 +115,7 @@
 		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], $server_list, true))
+			if (in_array($match[1] . ':' . $match[2], $serverList, true))
 			{
 				$this->logger->debug('Session: Memcached server pool already has ' . $match[1] . ':' . $match[2]);
 				continue;
@@ -154,11 +127,11 @@
 			}
 			else
 			{
-				$server_list[] = $match[1] . ':' . $match[2];
+				$serverList[] = $match[1] . ':' . $match[2];
 			}
 		}
 
-		if (empty($server_list))
+		if (empty($serverList))
 		{
 			$this->logger->error('Session: Memcached server pool is empty.');
 
@@ -184,15 +157,15 @@
 		if (isset($this->memcached) && $this->lockSession($sessionID))
 		{
 			// Needed by write() to detect session_regenerate_id() calls
-			if (is_null($this->sessionID))
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
 			{
 				$this->sessionID = $sessionID;
 			}
 
-			$session_data      = (string) $this->memcached->get($this->keyPrefix . $sessionID);
-			$this->fingerprint = md5($session_data);
+			$sessionData       = (string) $this->memcached->get($this->keyPrefix . $sessionID);
+			$this->fingerprint = md5($sessionData);
 
-			return $session_data;
+			return $sessionData;
 		}
 
 		return '';
@@ -216,8 +189,9 @@
 		{
 			return false;
 		}
+
 		// Was the ID regenerated?
-		elseif ($sessionID !== $this->sessionID)
+		if ($sessionID !== $this->sessionID)
 		{
 			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
 			{
@@ -285,15 +259,15 @@
 	 *
 	 * Destroys the current session.
 	 *
-	 * @param string $session_id Session ID
+	 * @param string $sessionId Session ID
 	 *
 	 * @return boolean
 	 */
-	public function destroy($session_id): bool
+	public function destroy($sessionId): bool
 	{
 		if (isset($this->memcached, $this->lockKey))
 		{
-			$this->memcached->delete($this->keyPrefix . $session_id);
+			$this->memcached->delete($this->keyPrefix . $sessionId);
 
 			return $this->destroyCookie();
 		}
@@ -337,25 +311,25 @@
 		}
 
 		// 30 attempts to obtain a lock, in case another request already has it
-		$lock_key = $this->keyPrefix . $sessionID . ':lock';
-		$attempt  = 0;
+		$lockKey = $this->keyPrefix . $sessionID . ':lock';
+		$attempt = 0;
 
 		do
 		{
-			if ($this->memcached->get($lock_key))
+			if ($this->memcached->get($lockKey))
 			{
 				sleep(1);
 				continue;
 			}
 
-			if (! $this->memcached->set($lock_key, time(), 300))
+			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 = $lock_key;
+			$this->lockKey = $lockKey;
 			break;
 		}
 		while (++ $attempt < 30);
@@ -386,7 +360,7 @@
 		if (isset($this->memcached, $this->lockKey) && $this->lock)
 		{
 			if (! $this->memcached->delete($this->lockKey) &&
-					$this->memcached->getResultCode() !== \Memcached::RES_NOTFOUND
+					$this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
 			)
 			{
 				$this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index a6fcb33..921c556 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -1,57 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
 
-use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App as AppConfig;
+use Exception;
+use Redis;
+use RedisException;
 
 /**
  * Session handler using Redis for persistence
  */
-class RedisHandler extends BaseHandler implements \SessionHandlerInterface
+class RedisHandler extends BaseHandler
 {
-
 	/**
 	 * phpRedis instance
 	 *
-	 * @var resource
+	 * @var Redis|null
 	 */
 	protected $redis;
 
@@ -65,7 +39,7 @@
 	/**
 	 * Lock key
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $lockKey;
 
@@ -88,12 +62,12 @@
 	/**
 	 * Constructor
 	 *
-	 * @param BaseConfig $config
-	 * @param string     $ipAddress
+	 * @param AppConfig $config
+	 * @param string    $ipAddress
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	public function __construct(BaseConfig $config, string $ipAddress)
+	public function __construct(AppConfig $config, string $ipAddress)
 	{
 		parent::__construct($config, $ipAddress);
 
@@ -101,8 +75,10 @@
 		{
 			throw SessionException::forEmptySavepath();
 		}
-		elseif (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches))
+
+		if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches))
 		{
+			// @phpstan-ignore-next-line
 			isset($matches[3]) || $matches[3] = ''; // Just to avoid undefined index notices below
 
 			$this->savePath = [
@@ -137,18 +113,18 @@
 	 *
 	 * Sanitizes save_path and initializes connection.
 	 *
-	 * @param  string $save_path Server path
-	 * @param  string $name      Session cookie name, unused
+	 * @param  string $savePath Server path
+	 * @param  string $name     Session cookie name, unused
 	 * @return boolean
 	 */
-	public function open($save_path, $name): bool
+	public function open($savePath, $name): bool
 	{
 		if (empty($this->savePath))
 		{
 			return false;
 		}
 
-		$redis = new \Redis();
+		$redis = new Redis();
 
 		if (! $redis->connect($this->savePath['host'], $this->savePath['port'], $this->savePath['timeout']))
 		{
@@ -180,24 +156,24 @@
 	 *
 	 * @param string $sessionID Session ID
 	 *
-	 * @return string|false	Serialized session data
+	 * @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))
+			if (is_null($this->sessionID)) // @phpstan-ignore-line
 			{
 				$this->sessionID = $sessionID;
 			}
 
-			$session_data                               = $this->redis->get($this->keyPrefix . $sessionID);
-			is_string($session_data) ? $this->keyExists = true : $session_data = '';
+			$sessionData                               = $this->redis->get($this->keyPrefix . $sessionID);
+			is_string($sessionData) ? $this->keyExists = true : $sessionData = '';
 
-			$this->fingerprint = md5($session_data);
+			$this->fingerprint = md5($sessionData);
 
-			return $session_data;
+			return $sessionData;
 		}
 
 		return '';
@@ -221,8 +197,9 @@
 		{
 			return false;
 		}
+
 		// Was the ID regenerated?
-		elseif ($sessionID !== $this->sessionID)
+		if ($sessionID !== $this->sessionID)
 		{
 			if (! $this->releaseLock() || ! $this->lockSession($sessionID))
 			{
@@ -270,8 +247,9 @@
 		{
 			try
 			{
-				$ping_reply = $this->redis->ping();
-				if (($ping_reply === true) || ($ping_reply === '+PONG'))
+				$pingReply = $this->redis->ping();
+				// @phpstan-ignore-next-line
+				if (($pingReply === true) || ($pingReply === '+PONG'))
 				{
 					isset($this->lockKey) && $this->redis->del($this->lockKey);
 
@@ -281,7 +259,7 @@
 					}
 				}
 			}
-			catch (\RedisException $e)
+			catch (RedisException $e)
 			{
 				$this->logger->error('Session: Got RedisException on close(): ' . $e->getMessage());
 			}
@@ -358,24 +336,24 @@
 		}
 
 		// 30 attempts to obtain a lock, in case another request already has it
-		$lock_key = $this->keyPrefix . $sessionID . ':lock';
-		$attempt  = 0;
+		$lockKey = $this->keyPrefix . $sessionID . ':lock';
+		$attempt = 0;
 
 		do
 		{
-			if (($ttl = $this->redis->ttl($lock_key)) > 0)
+			if (($ttl = $this->redis->ttl($lockKey)) > 0)
 			{
 				sleep(1);
 				continue;
 			}
 
-			if (! $this->redis->setex($lock_key, 300, time()))
+			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 = $lock_key;
+			$this->lockKey = $lockKey;
 			break;
 		}
 		while (++ $attempt < 30);
@@ -385,7 +363,8 @@
 			log_message('error', 'Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
 			return false;
 		}
-		elseif ($ttl === -1)
+
+		if ($ttl === -1)
 		{
 			log_message('debug', 'Session: Lock for ' . $this->keyPrefix . $sessionID . ' had no TTL, overriding.');
 		}
diff --git a/system/Session/Session.php b/system/Session/Session.php
index d925bd7..0bc3d66 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -1,44 +1,21 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
 
+use CodeIgniter\Session\Exceptions\SessionException;
+use Config\App;
 use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use SessionHandlerInterface;
 
 /**
  * Implementation of CodeIgniter session container.
@@ -48,13 +25,12 @@
  */
 class Session implements SessionInterface
 {
-
 	use LoggerAwareTrait;
 
 	/**
 	 * Instance of the driver to use.
 	 *
-	 * @var \CodeIgniter\Log\Handlers\HandlerInterface
+	 * @var SessionHandlerInterface
 	 */
 	protected $driver;
 
@@ -146,6 +122,14 @@
 	protected $cookieSecure = false;
 
 	/**
+	 * Cookie SameSite setting as described in RFC6265
+	 * Must be 'None', 'Lax' or 'Strict'.
+	 *
+	 * @var string 'Lax'|'None'|'Strict'
+	 */
+	protected $cookieSameSite = 'Lax';
+
+	/**
 	 * sid regex expression
 	 *
 	 * @var string
@@ -155,7 +139,7 @@
 	/**
 	 * Logger instance to record error messages and warnings.
 	 *
-	 * @var \PSR\Log\LoggerInterface
+	 * @var LoggerInterface
 	 */
 	protected $logger;
 
@@ -166,24 +150,30 @@
 	 *
 	 * Extract configuration settings and save them here.
 	 *
-	 * @param \SessionHandlerInterface $driver
-	 * @param \Config\App              $config
+	 * @param SessionHandlerInterface $driver
+	 * @param App                     $config
 	 */
-	public function __construct(\SessionHandlerInterface $driver, $config)
+	public function __construct(SessionHandlerInterface $driver, $config)
 	{
 		$this->driver = $driver;
 
 		$this->sessionDriverName        = $config->sessionDriver;
-		$this->sessionCookieName        = $config->sessionCookieName;
-		$this->sessionExpiration        = $config->sessionExpiration;
+		$this->sessionCookieName        = $config->sessionCookieName ?? $this->sessionCookieName;
+		$this->sessionExpiration        = $config->sessionExpiration ?? $this->sessionExpiration;
 		$this->sessionSavePath          = $config->sessionSavePath;
-		$this->sessionMatchIP           = $config->sessionMatchIP;
-		$this->sessionTimeToUpdate      = $config->sessionTimeToUpdate;
-		$this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy;
+		$this->sessionMatchIP           = $config->sessionMatchIP ?? $this->sessionMatchIP;
+		$this->sessionTimeToUpdate      = $config->sessionTimeToUpdate ?? $this->sessionTimeToUpdate;
+		$this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy;
 
-		$this->cookieDomain = $config->cookieDomain;
-		$this->cookiePath   = $config->cookiePath;
-		$this->cookieSecure = $config->cookieSecure;
+		$this->cookieDomain   = $config->cookieDomain ?? $this->cookieDomain;
+		$this->cookiePath     = $config->cookiePath ?? $this->cookiePath;
+		$this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
+		$this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
+
+		if (! in_array(strtolower($this->cookieSameSite), ['', 'none', 'lax', 'strict'], true))
+		{
+			throw SessionException::forInvalidSameSiteSetting($this->cookieSameSite);
+		}
 
 		helper('array');
 	}
@@ -205,25 +195,21 @@
 			return;
 			// @codeCoverageIgnoreEnd
 		}
-		elseif ((bool) ini_get('session.auto_start'))
+
+		if ((bool) ini_get('session.auto_start'))
 		{
 			$this->logger->error('Session: session.auto_start is enabled in php.ini. Aborting.');
 
 			return;
 		}
-		elseif (session_status() === PHP_SESSION_ACTIVE)
+
+		if (session_status() === PHP_SESSION_ACTIVE)
 		{
 			$this->logger->warning('Session: Sessions is enabled, and one exists.Please don\'t $session->start();');
 
 			return;
 		}
 
-		if (! $this->driver instanceof \SessionHandlerInterface)
-		{
-			$this->logger->error("Session: Handler '" . $this->driver .
-					"' doesn't implement SessionHandlerInterface. Aborting.");
-		}
-
 		$this->configure();
 
 		$this->setSaveHandler();
@@ -240,15 +226,16 @@
 		$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') && ($regenerate_time = $this->sessionTimeToUpdate) > 0
+		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() - $regenerate_time))
+			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerateTime))
 			{
 				$this->regenerate((bool) $this->sessionRegenerateDestroy);
 			}
@@ -303,9 +290,41 @@
 			ini_set('session.name', $this->sessionCookieName);
 		}
 
-		session_set_cookie_params(
-				$this->sessionExpiration, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true // HTTP only; Yes, this is intentional and not configurable for security reasons.
-		);
+		if (PHP_VERSION_ID < 70300)
+		{
+			$sameSite = '';
+			if ($this->cookieSameSite !== '')
+			{
+				$sameSite = '; samesite=' . $this->cookieSameSite;
+			}
+
+			session_set_cookie_params(
+				$this->sessionExpiration,
+				$this->cookiePath . $sameSite, // Hacky way to set SameSite for PHP 7.2 and earlier
+				$this->cookieDomain,
+				$this->cookieSecure,
+				true // HTTP only; Yes, this is intentional and not configurable for security reasons.
+			);
+		}
+		else
+		{
+			// PHP 7.3 adds support for setting samesite in session_set_cookie_params()
+			$params = [
+				'lifetime' => $this->sessionExpiration,
+				'path'     => $this->cookiePath,
+				'domain'   => $this->cookieDomain,
+				'secure'   => $this->cookieSecure,
+				'httponly' => true, // HTTP only; Yes, this is intentional and not configurable for security reasons.
+			];
+
+			if ($this->cookieSameSite !== '')
+			{
+				$params['samesite'] = $this->cookieSameSite;
+				ini_set('session.cookie_samesite', $this->cookieSameSite);
+			}
+
+			session_set_cookie_params($params);
+		}
 
 		//if (empty($this->sessionExpiration))
 		if (! isset($this->sessionExpiration))
@@ -314,7 +333,7 @@
 		}
 		else
 		{
-			ini_set('session.gc_maxlifetime', (int) $this->sessionExpiration);
+			ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
 		}
 
 		if (! empty($this->sessionSavePath))
@@ -323,10 +342,10 @@
 		}
 
 		// 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);
+		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();
 	}
@@ -350,22 +369,24 @@
 	 */
 	protected function configureSidLength()
 	{
-		$bits_per_character = (int) (ini_get('session.sid_bits_per_character') !== false
+		$bitsPerCharacter = (int) (ini_get('session.sid_bits_per_character') !== false
 			? ini_get('session.sid_bits_per_character')
 			: 4);
-		$sid_length         = (int) (ini_get('session.sid_length') !== false
+
+		$sidLength = (int) (ini_get('session.sid_length') !== false
 			? ini_get('session.sid_length')
 			: 40);
-		if (($sid_length * $bits_per_character) < 160)
+
+		if (($sidLength * $bitsPerCharacter) < 160)
 		{
-			$bits = ($sid_length * $bits_per_character);
+			$bits = ($sidLength * $bitsPerCharacter);
 			// Add as many more characters as necessary to reach at least 160 bits
-			$sid_length += (int) ceil((160 % $bits) / $bits_per_character);
-			ini_set('session.sid_length', $sid_length);
+			$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 ($bits_per_character)
+		switch ($bitsPerCharacter)
 		{
 			case 4:
 				$this->sidRegexp = '[0-9a-f]';
@@ -378,7 +399,7 @@
 				break;
 		}
 
-		$this->sidRegexp .= '{' . $sid_length . '}';
+		$this->sidRegexp .= '{' . $sidLength . '}';
 	}
 
 	//--------------------------------------------------------------------
@@ -396,7 +417,7 @@
 			return;
 		}
 
-		$current_time = time();
+		$currentTime = time();
 
 		foreach ($_SESSION['__ci_vars'] as $key => &$value)
 		{
@@ -404,9 +425,8 @@
 			{
 				$_SESSION['__ci_vars'][$key] = 'old';
 			}
-			// Hacky, but 'old' will (implicitly) always be less than time() ;)
 			// DO NOT move this above the 'new' check!
-			elseif ($value < $current_time)
+			elseif ($value === 'old' || $value < $currentTime)
 			{
 				unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]);
 			}
@@ -459,7 +479,7 @@
 	 * to be set as session properties.
 	 *
 	 * @param string|array $data  Property name or associative array of properties
-	 * @param string|array $value Property value if single key provided
+	 * @param mixed        $value Property value if single key provided
 	 */
 	public function set($data, $value = null)
 	{
@@ -494,8 +514,8 @@
 	 *
 	 * Replaces the legacy method $session->userdata();
 	 *
-	 * @param  string $key Identifier of the session property to retrieve
-	 * @return array|null	The property value(s)
+	 * @param  string|null $key Identifier of the session property to retrieve
+	 * @return mixed	The property value(s)
 	 */
 	public function get(string $key = null)
 	{
@@ -503,7 +523,8 @@
 		{
 			return $value;
 		}
-		elseif (empty($_SESSION))
+
+		if (empty($_SESSION))
 		{
 			return $key === null ? [] : null;
 		}
@@ -546,14 +567,14 @@
 
 	   //--------------------------------------------------------------------
 
-	  /**
-	   * 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
-	   */
+	/**
+	 * 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)))
@@ -620,7 +641,8 @@
 		{
 			return $_SESSION[$key];
 		}
-		elseif ($key === 'session_id')
+
+		if ($key === 'session_id')
 		{
 			return session_id();
 		}
@@ -675,7 +697,7 @@
 	 * 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
+	 * @return array|null	The requested property value, or an associative array of them
 	 */
 	public function getFlashdata(string $key = null)
 	{
@@ -762,7 +784,7 @@
 			return;
 		}
 
-		is_array($key) || $key = [$key];
+		is_array($key) || $key = [$key]; // @phpstan-ignore-line
 
 		foreach ($key as $k)
 		{
@@ -937,7 +959,7 @@
 			return;
 		}
 
-		is_array($key) || $key = [$key];
+		is_array($key) || $key = [$key]; // @phpstan-ignore-line
 
 		foreach ($key as $k)
 		{
@@ -1014,9 +1036,43 @@
 	 */
 	protected function setCookie()
 	{
-		setcookie(
-				$this->sessionCookieName, session_id(), (empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration), $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
-		);
+		if (PHP_VERSION_ID < 70300)
+		{
+			$sameSite = '';
+			if ($this->cookieSameSite !== '')
+			{
+				$sameSite = '; samesite=' . $this->cookieSameSite;
+			}
+
+			setcookie(
+				$this->sessionCookieName,
+				session_id(),
+				empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration,
+				$this->cookiePath . $sameSite, // Hacky way to set SameSite for PHP 7.2 and earlier
+				$this->cookieDomain,
+				$this->cookieSecure,
+				true
+			);
+		}
+		else
+		{
+			// PHP 7.3 adds another function signature allowing setting of samesite
+			$params = [
+				'expires'  => empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration,
+				'path'     => $this->cookiePath,
+				'domain'   => $this->cookieDomain,
+				'secure'   => $this->cookieSecure,
+				'httponly' => true,
+			];
+
+			if ($this->cookieSameSite !== '')
+			{
+				$params['samesite'] = $this->cookieSameSite;
+			}
+
+			// @phpstan-ignore-next-line @todo ignore to be removed in 4.1 with rector 0.9
+			setcookie($this->sessionCookieName, session_id(), $params);
+		}
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index e098514..80402ca 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
@@ -44,7 +16,6 @@
  */
 interface SessionInterface
 {
-
 	/**
 	 * Regenerates the session ID.
 	 *
@@ -71,7 +42,7 @@
 	 * to be set as session properties.
 	 *
 	 * @param string|array $data  Property name or associative array of properties
-	 * @param string|array $value Property value if single key provided
+	 * @param mixed        $value Property value if single key provided
 	 */
 	public function set($data, $value = null);
 
@@ -88,7 +59,7 @@
 	 *
 	 * @param string $key Identifier of the session property to retrieve
 	 *
-	 * @return array|null    The property value(s)
+	 * @return mixed The property value(s)
 	 */
 	public function get(string $key = null);
 
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
index 3d11ce3..188ebbc 100644
--- a/system/Test/CIDatabaseTestCase.php
+++ b/system/Test/CIDatabaseTestCase.php
@@ -1,44 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\MigrationRunner;
 use CodeIgniter\Exceptions\ConfigException;
 use Config\Database;
@@ -48,11 +22,45 @@
 /**
  * CIDatabaseTestCase
  */
-class CIDatabaseTestCase extends CIUnitTestCase
+abstract class CIDatabaseTestCase extends CIUnitTestCase
 {
 	/**
-	 * Should the db be refreshed before
-	 * each test?
+	 * Should run db migration?
+	 *
+	 * @var boolean
+	 */
+	protected $migrate = true;
+
+	/**
+	 * Should run db migration only once?
+	 *
+	 * @var boolean
+	 */
+	protected $migrateOnce = false;
+
+	/**
+	 * Is db migration done once or more than once?
+	 *
+	 * @var boolean
+	 */
+	private static $doneMigration = false;
+
+	/**
+	 * Should run seeding only once?
+	 *
+	 * @var boolean
+	 */
+	protected $seedOnce = false;
+
+	/**
+	 * Is seeding done once or more than once?
+	 *
+	 * @var boolean
+	 */
+	private static $doneSeed = false;
+
+	/**
+	 * Should the db be refreshed before test?
 	 *
 	 * @var boolean
 	 */
@@ -165,28 +173,41 @@
 
 		$this->loadDependencies();
 
-		if ($this->refresh === true)
-		{
-			$this->regressDatabase();
+		$this->setUpMigrate();
+		$this->setUpSeed();
+	}
 
-			// Reset counts on faked items
-			Fabricator::resetCounts();
+	//--------------------------------------------------------------------
+
+	/**
+	 * 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();
 		}
+	}
 
-		$this->migrateDatabase();
+	//--------------------------------------------------------------------
 
-		if (! empty($this->seed))
+	/**
+	 * Seed on setUp
+	 */
+	protected function setUpSeed()
+	{
+		if ($this->seedOnce === false || self::$doneSeed === false)
 		{
-			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);
-			}
+			$this->runSeeds();
 		}
 	}
 
@@ -214,10 +235,39 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
 	 * 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))
 		{
@@ -243,11 +293,17 @@
 	 */
 	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
@@ -258,6 +314,7 @@
 			{
 				$this->migrations->setNamespace($namespace);
 				$this->migrations->latest('tests');
+				self::$doneMigration = true;
 			}
 		}
 	}
@@ -266,10 +323,12 @@
 	 * Seeds that database with a specific seeder.
 	 *
 	 * @param string $name
+	 *
+	 * @return void
 	 */
 	public function seed(string $name)
 	{
-		return $this->seeder->call($name);
+		$this->seeder->call($name);
 	}
 
 	//--------------------------------------------------------------------
@@ -283,7 +342,7 @@
 	 * @param string $table
 	 * @param array  $where
 	 *
-	 * @return boolean
+	 * @return void
 	 */
 	public function dontSeeInDatabase(string $table, array $where)
 	{
@@ -303,8 +362,8 @@
 	 * @param string $table
 	 * @param array  $where
 	 *
-	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @return void
+	 * @throws DatabaseException
 	 */
 	public function seeInDatabase(string $table, array $where)
 	{
@@ -326,7 +385,7 @@
 	 * @param array  $where
 	 *
 	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @throws DatabaseException
 	 */
 	public function grabFromDatabase(string $table, string $column, array $where)
 	{
@@ -372,8 +431,8 @@
 	 * @param string  $table
 	 * @param array   $where
 	 *
-	 * @return boolean
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * @return void
+	 * @throws DatabaseException
 	 */
 	public function seeNumRecords(int $expected, string $table, array $where)
 	{
@@ -385,4 +444,15 @@
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Reset $doneMigration and $doneSeed
+	 *
+	 * @afterClass
+	 */
+	public static function resetMigrationSeedCount()
+	{
+		self::$doneMigration = false;
+		self::$doneSeed      = false;
+	}
 }
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index d90b2e0..4fd49ca 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -1,57 +1,32 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Test\Mock\MockCache;
 use CodeIgniter\Test\Mock\MockEmail;
 use CodeIgniter\Test\Mock\MockSession;
 use Config\Services;
+use Exception;
 use PHPUnit\Framework\TestCase;
 
 /**
  * PHPunit test case.
  */
-class CIUnitTestCase extends TestCase
+abstract class CIUnitTestCase extends TestCase
 {
-
 	use ReflectionHelper;
 
 	/**
@@ -65,6 +40,8 @@
 	 * @var array of methods
 	 */
 	protected $setUpMethods = [
+		'resetFactories',
+		'mockCache',
 		'mockEmail',
 		'mockSession',
 	];
@@ -94,7 +71,7 @@
 	{
 		parent::setUp();
 
-		if (! $this->app)
+		if (! $this->app) // @phpstan-ignore-line
 		{
 			$this->app = $this->createApplication();
 		}
@@ -120,6 +97,38 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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()
@@ -132,14 +141,6 @@
 		Services::injectMock('session', $session);
 	}
 
-	/**
-	 * Injects the mock email driver so no emails really send
-	 */
-	protected function mockEmail()
-	{
-		Services::injectMock('email', new MockEmail(config('Email')));
-	}
-
 	//--------------------------------------------------------------------
 	// Assertions
 	//--------------------------------------------------------------------
@@ -148,11 +149,11 @@
 	 * Custom function to hook into CodeIgniter's Logging mechanism
 	 * to check if certain messages were logged during code execution.
 	 *
-	 * @param string $level
-	 * @param null   $expectedMessage
+	 * @param string      $level
+	 * @param string|null $expectedMessage
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertLogged(string $level, $expectedMessage = null)
 	{
@@ -169,7 +170,7 @@
 	 * @param string $eventName
 	 *
 	 * @return boolean
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertEventTriggered(string $eventName): bool
 	{
@@ -198,7 +199,7 @@
 	 * @param string  $header     The leading portion of the header we are looking for
 	 * @param boolean $ignoreCase
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertHeaderEmitted(string $header, bool $ignoreCase = false): void
 	{
@@ -230,7 +231,7 @@
 	 * @param string  $header     The leading portion of the header we don't want to find
 	 * @param boolean $ignoreCase
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false): void
 	{
@@ -267,7 +268,7 @@
 	 * @param string  $message
 	 * @param integer $tolerance
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertCloseEnough(int $expected, $actual, string $message = '', int $tolerance = 1)
 	{
@@ -287,8 +288,8 @@
 	 * @param string  $message
 	 * @param integer $tolerance
 	 *
-	 * @return boolean
-	 * @throws \Exception
+	 * @return void|boolean
+	 * @throws Exception
 	 */
 	public function assertCloseEnoughString($expected, $actual, string $message = '', int $tolerance = 1)
 	{
@@ -307,7 +308,7 @@
 
 			$this->assertLessThanOrEqual($tolerance, $difference, $message);
 		}
-		catch (\Exception $e)
+		catch (Exception $e)
 		{
 			return false;
 		}
@@ -321,11 +322,13 @@
 	 * Loads up an instance of CodeIgniter
 	 * and gets the environment setup.
 	 *
-	 * @return \CodeIgniter\CodeIgniter
+	 * @return CodeIgniter
 	 */
 	protected function createApplication()
 	{
-		return require realpath(__DIR__ . '/../') . '/bootstrap.php';
+		$path = __DIR__ . '/../bootstrap.php';
+		$path = realpath($path) ?: $path;
+		return require $path;
 	}
 
 	/**
diff --git a/system/Test/ControllerResponse.php b/system/Test/ControllerResponse.php
index a187ce7..2e7bd8d 100644
--- a/system/Test/ControllerResponse.php
+++ b/system/Test/ControllerResponse.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -46,19 +18,19 @@
 /**
  * Testable response from a controller
  */
-class ControllerResponse {
-
+class ControllerResponse
+{
 	/**
 	 * The request.
 	 *
-	 * @var \CodeIgniter\HTTP\IncomingRequest
+	 * @var RequestInterface
 	 */
 	protected $request;
 
 	/**
 	 * The response.
 	 *
-	 * @var \CodeIgniter\HTTP\Response
+	 * @var ResponseInterface
 	 */
 	protected $response;
 
@@ -120,7 +92,7 @@
 	/**
 	 * Set the request.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
+	 * @param RequestInterface $request
 	 *
 	 * @return $this
 	 */
@@ -134,7 +106,7 @@
 	/**
 	 * Set the response.
 	 *
-	 * @param \CodeIgniter\HTTP\ResponseInterface $response
+	 * @param ResponseInterface $response
 	 *
 	 * @return $this
 	 */
@@ -150,7 +122,7 @@
 	/**
 	 * Request accessor.
 	 *
-	 * @return \CodeIgniter\HTTP\IncomingRequest
+	 * @return RequestInterface
 	 */
 	public function request()
 	{
@@ -160,7 +132,7 @@
 	/**
 	 * Response accessor.
 	 *
-	 * @return \CodeIgniter\HTTP\Response
+	 * @return ResponseInterface
 	 */
 	public function response()
 	{
@@ -196,13 +168,15 @@
 	}
 
 	/**
-	 * Returns whether or not the Response was a redirect response
+	 * Returns whether or not the Response was a redirect or RedirectResponse
 	 *
 	 * @return boolean
 	 */
 	public function isRedirect(): bool
 	{
-		return $this->response instanceof RedirectResponse;
+		return $this->response instanceof RedirectResponse
+			|| $this->response->hasHeader('Location')
+			|| $this->response->hasHeader('Refresh');
 	}
 
 	//--------------------------------------------------------------------
@@ -223,5 +197,4 @@
 			return $this->dom->{$function}(...$params);
 		}
 	}
-
 }
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
index 89d4431..8a53a4c 100644
--- a/system/Test/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -1,41 +1,12 @@
 <?php
 
-
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -65,7 +36,6 @@
  */
 trait ControllerTester
 {
-
 	/**
 	 * Controller configuration.
 	 *
@@ -79,30 +49,35 @@
 	 * @var Request
 	 */
 	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.
 	 *
@@ -131,7 +106,7 @@
 
 		if (! $this->uri instanceof URI)
 		{
-			$this->uri = new URI($this->appConfig->baseURL ?? 'http://example.com');
+			$this->uri = new URI($this->appConfig->baseURL ?? 'http://example.com/');
 		}
 
 		if (empty($this->request))
@@ -161,7 +136,9 @@
 	 * @param string $method
 	 * @param array  $params
 	 *
-	 * @return \CodeIgniter\Test\ControllerResponse|\InvalidArgumentException
+	 * @throws InvalidArgumentException
+	 *
+	 * @return ControllerResponse
 	 */
 	public function execute(string $method, ...$params)
 	{
@@ -187,8 +164,7 @@
 		}
 		catch (Throwable $e)
 		{
-			$result->response()
-					->setStatusCode($e->getCode());
+			$result->response()->setStatusCode($e->getCode());
 		}
 		finally
 		{
@@ -312,5 +288,4 @@
 
 		return $this;
 	}
-
 }
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 95b8896..ab86167 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -1,44 +1,22 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
+use BadMethodCallException;
+use DOMDocument;
+use DOMNodeList;
+use DOMXPath;
+use InvalidArgumentException;
+
 /**
  * Load a response into a DOMDocument for testing assertions based on that
  */
@@ -47,14 +25,14 @@
 	/**
 	 * DOM for the body,
 	 *
-	 * @var \DOMDocument
+	 * @var DOMDocument
 	 */
 	protected $dom;
 
 	/**
 	 * Constructor.
 	 *
-	 * @throws \BadMethodCallException
+	 * @throws BadMethodCallException
 	 */
 	public function __construct()
 	{
@@ -62,11 +40,11 @@
 		{
 			// always there in travis-ci
 			// @codeCoverageIgnoreStart
-			throw new \BadMethodCallException('DOM extension is required, but not currently loaded.');
+			throw new BadMethodCallException('DOM extension is required, but not currently loaded.');
 			// @codeCoverageIgnoreEnd
 		}
 
-		$this->dom = new \DOMDocument('1.0', 'utf-8');
+		$this->dom = new DOMDocument('1.0', 'utf-8');
 	}
 
 	/**
@@ -99,7 +77,7 @@
 			// unclear how we would get here, given that we are trapping libxml errors
 			// @codeCoverageIgnoreStart
 			libxml_clear_errors();
-			throw new \BadMethodCallException('Invalid HTML');
+			throw new BadMethodCallException('Invalid HTML');
 			// @codeCoverageIgnoreEnd
 		}
 
@@ -115,13 +93,13 @@
 	 *
 	 * @param string $path
 	 *
-	 * @return \CodeIgniter\Test\DOMParser
+	 * @return DOMParser
 	 */
 	public function withFile(string $path)
 	{
 		if (! is_file($path))
 		{
-			throw new \InvalidArgumentException(basename($path) . ' is not a valid file.');
+			throw new InvalidArgumentException(basename($path) . ' is not a valid file.');
 		}
 
 		$content = file_get_contents($path);
@@ -148,7 +126,7 @@
 
 		$result = $this->doXPath($search, $element);
 
-		return (bool)$result->length;
+		return (bool) $result->length;
 	}
 
 	/**
@@ -215,7 +193,7 @@
 	{
 		$result = $this->doXPath(null, 'input', ["[@value=\"{$value}\"][@name=\"{$field}\"]"]);
 
-		return (bool)$result->length;
+		return (bool) $result->length;
 	}
 
 	/**
@@ -232,20 +210,21 @@
 			'[@checked="checked"]',
 		]);
 
-		return (bool)$result->length;
+		return (bool) $result->length;
 	}
 
 	//--------------------------------------------------------------------
+
 	/**
 	 * Search the DOM using an XPath expression.
 	 *
-	 * @param  string $search
-	 * @param  string $element
-	 * @param  array  $paths
-	 * @return type
+	 * @param  string|null $search
+	 * @param  string      $element
+	 * @param  array       $paths
+	 *
+	 * @return DOMNodeList
 	 */
-
-	protected function doXPath(string $search = null, string $element, array $paths = [])
+	protected function doXPath(?string $search, string $element, array $paths = [])
 	{
 		// Otherwise, grab any elements that match
 		// the selector
@@ -258,19 +237,19 @@
 		{
 			$path = empty($selector['tag'])
 				? "id(\"{$selector['id']}\")"
-				: "//body//{$selector['tag']}[@id=\"{$selector['id']}\"]";
+				: "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
 		}
 		// By Class
-		else if (! empty($selector['class']))
+		elseif (! empty($selector['class']))
 		{
 			$path = empty($selector['tag'])
 				? "//*[@class=\"{$selector['class']}\"]"
-				: "//body//{$selector['tag']}[@class=\"{$selector['class']}\"]";
+				: "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
 		}
 		// By tag only
-		else if (! empty($selector['tag']))
+		elseif (! empty($selector['tag']))
 		{
-			$path = "//body//{$selector['tag']}";
+			$path = "//{$selector['tag']}";
 		}
 
 		if (! empty($selector['attr']))
@@ -296,7 +275,7 @@
 			$path .= "[contains(., \"{$search}\")]";
 		}
 
-		$xpath = new \DOMXPath($this->dom);
+		$xpath = new DOMXPath($this->dom);
 
 		return $xpath->query($path);
 	}
@@ -305,7 +284,7 @@
 	 * Look for the a selector  in the passed text.
 	 *
 	 * @param  string $selector
-	 * @return type
+	 * @return array
 	 */
 	public function parseSelector(string $selector)
 	{
@@ -355,5 +334,4 @@
 			'attr'  => $attr,
 		];
 	}
-
 }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 3791a37..c37edd8 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -1,46 +1,22 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
+use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Model;
 use Faker\Factory;
 use Faker\Generator;
+use InvalidArgumentException;
+use RuntimeException;
 
 /**
  * Fabricator
@@ -60,7 +36,7 @@
 	/**
 	 * Locale-specific Faker instance
 	 *
-	 * @var \Faker\Generator
+	 * @var Generator
 	 */
 	protected $faker;
 
@@ -81,7 +57,7 @@
 	/**
 	 * Map of properties and their formatter to use
 	 *
-	 * @var array
+	 * @var array|null
 	 */
 	protected $formatters;
 
@@ -122,7 +98,7 @@
 	 * @param array|null    $formatters Array of property => formatter
 	 * @param string|null   $locale     Locale for Faker provider
 	 *
-	 * @throws \InvalidArgumentException
+	 * @throws InvalidArgumentException
 	 */
 	public function __construct($model, array $formatters = null, string $locale = null)
 	{
@@ -134,7 +110,7 @@
 
 		if (! is_object($model))
 		{
-			throw new \InvalidArgumentException(lang('Fabricator.invalidModel'));
+			throw new InvalidArgumentException(lang('Fabricator.invalidModel'));
 		}
 
 		$this->model = $model;
@@ -249,7 +225,7 @@
 	/**
 	 * Returns the Faker generator
 	 *
-	 * @return Faker\Generator
+	 * @return Generator
 	 */
 	public function getFaker(): Generator
 	{
@@ -352,7 +328,7 @@
 	/**
 	 * Guess at the correct formatter to match a field name.
 	 *
-	 * @param $field  Name of the field
+	 * @param string $field Name of the field
 	 *
 	 * @return string  Name of the formatter
 	 */
@@ -364,27 +340,22 @@
 			$this->faker->getFormatter($field);
 			return $field;
 		}
-		catch (\InvalidArgumentException $e)
+		catch (InvalidArgumentException $e)
 		{
 			// No match, keep going
 		}
 
 		// Next look for known model fields
-		if (in_array($field, $this->dateFields))
+		if (in_array($field, $this->dateFields, true))
 		{
 			switch ($this->model->dateFormat)
 			{
 				case 'datetime':
 					return 'date';
-				break;
-
 				case 'date':
 					return 'date';
-				break;
-
 				case 'int':
 					return 'unixTime';
-				break;
 			}
 		}
 		elseif ($field === $this->model->primaryKey)
@@ -446,7 +417,7 @@
 	 *
 	 * @return array  An array of faked data
 	 *
-	 * @throws \RuntimeException
+	 * @throws RuntimeException
 	 */
 	public function makeArray()
 	{
@@ -480,7 +451,7 @@
 		// Nothing left to do but give up
 		else
 		{
-			throw new \RuntimeException(lang('Fabricator.missingFormatters'));
+			throw new RuntimeException(lang('Fabricator.missingFormatters'));
 		}
 
 		// Replace overridden fields
@@ -494,7 +465,7 @@
 	 *
 	 * @return object  An instance of the class with faked data
 	 *
-	 * @throws \RuntimeException
+	 * @throws RuntimeException
 	 */
 	public function makeObject(string $className = null): object
 	{
@@ -552,11 +523,12 @@
 	/**
 	 * Generate new entities from the database
 	 *
-	 * @param integer|null $count    Optional number to create a collection
-	 * @param array        $override Array of data to add/override
-	 * @param boolean      $mock     Whether to execute or mock the insertion
+	 * @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)
 	{
@@ -575,7 +547,10 @@
 			{
 				$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
@@ -611,13 +586,13 @@
 
 		if (! empty($this->model->useTimestamps))
 		{
-			$fields[$this->model->createdField] = $datetime;
-			$fields[$this->model->updatedField] = $datetime;
+			$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;
+			$fields[$this->model->deletedField] = null; // @phpstan-ignore-line
 		}
 
 		// Iterate over new entities and add the necessary fields
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
index 6c919b7..f6981d0 100644
--- a/system/Test/FeatureResponse.php
+++ b/system/Test/FeatureResponse.php
@@ -1,46 +1,20 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\ResponseInterface;
-use Config\Format;
+use Config\Services;
+use Exception;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -48,7 +22,6 @@
  */
 class FeatureResponse extends TestCase
 {
-
 	/**
 	 * The response.
 	 *
@@ -59,7 +32,7 @@
 	/**
 	 * DOM for the body.
 	 *
-	 * @var \CodeIgniter\Test\DOMParser
+	 * @var DOMParser
 	 */
 	protected $domParser;
 
@@ -110,23 +83,25 @@
 	}
 
 	/**
-	 * Returns whether or not the Response was a redirect response
+	 * Returns whether or not the Response was a redirect or RedirectResponse
 	 *
 	 * @return boolean
 	 */
 	public function isRedirect(): bool
 	{
-		return $this->response instanceof RedirectResponse;
+		return $this->response instanceof RedirectResponse
+			|| $this->response->hasHeader('Location')
+			|| $this->response->hasHeader('Refresh');
 	}
 
 	/**
 	 * Assert that the given response was a redirect.
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertRedirect()
 	{
-		$this->assertTrue($this->isRedirect(), 'Response is not a RedirectResponse.');
+		$this->assertTrue($this->isRedirect(), 'Response is not a redirect or RedirectResponse.');
 	}
 
 	/**
@@ -145,7 +120,8 @@
 		{
 			return $this->response->getHeaderLine('Location');
 		}
-		elseif ($this->response->hasHeader('Refresh'))
+
+		if ($this->response->hasHeader('Refresh'))
 		{
 			return str_replace('0;url=', '', $this->response->getHeaderLine('Refresh'));
 		}
@@ -158,17 +134,17 @@
 	 *
 	 * @param integer $code
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertStatus(int $code)
 	{
-		$this->assertEquals($code, (int) $this->response->getStatusCode());
+		$this->assertEquals($code, $this->response->getStatusCode());
 	}
 
 	/**
 	 * Asserts that the Response is considered OK.
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertOK()
 	{
@@ -182,10 +158,10 @@
 	/**
 	 * Asserts that an SESSION key has been set and, optionally, test it's value.
 	 *
-	 * @param string $key
-	 * @param null   $value
+	 * @param string      $key
+	 * @param string|null $value
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSessionHas(string $key, $value = null)
 	{
@@ -202,7 +178,7 @@
 	 *
 	 * @param string $key
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSessionMissing(string $key)
 	{
@@ -216,10 +192,10 @@
 	/**
 	 * Asserts that the Response contains a specific header.
 	 *
-	 * @param string $key
-	 * @param null   $value
+	 * @param string      $key
+	 * @param string|null $value
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertHeader(string $key, $value = null)
 	{
@@ -236,7 +212,7 @@
 	 *
 	 * @param string $key
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertHeaderMissing(string $key)
 	{
@@ -251,10 +227,10 @@
 	 * Asserts that the response has the specified cookie.
 	 *
 	 * @param string      $key
-	 * @param null        $value
-	 * @param string|null $prefix
+	 * @param string|null $value
+	 * @param string      $prefix
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertCookie(string $key, $value = null, string $prefix = '')
 	{
@@ -277,7 +253,7 @@
 	 * @param string $key
 	 * @param string $prefix
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertCookieExpired(string $key, string $prefix = '')
 	{
@@ -295,7 +271,7 @@
 	 * @param string|null $search
 	 * @param string|null $element
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSee(string $search = null, string $element = null)
 	{
@@ -308,7 +284,7 @@
 	 * @param string|null $search
 	 * @param string|null $element
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertDontSee(string $search = null, string $element = null)
 	{
@@ -320,7 +296,7 @@
 	 *
 	 * @param string $search
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSeeElement(string $search)
 	{
@@ -332,7 +308,7 @@
 	 *
 	 * @param string $search
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertDontSeeElement(string $search)
 	{
@@ -345,7 +321,7 @@
 	 * @param string      $text
 	 * @param string|null $details
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSeeLink(string $text, string $details = null)
 	{
@@ -358,7 +334,7 @@
 	 * @param string      $field
 	 * @param string|null $value
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertSeeInField(string $field, string $value = null)
 	{
@@ -389,15 +365,24 @@
 	/**
 	 * Test that the response contains a matching JSON fragment.
 	 *
-	 * @param array $fragment
+	 * @param array   $fragment
+	 * @param boolean $strict
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
-	public function assertJSONFragment(array $fragment)
+	public function assertJSONFragment(array $fragment, bool $strict = false)
 	{
-		$json = json_decode($this->getJSON(), true);
+		$json    = json_decode($this->getJSON(), true);
+		$patched = array_replace_recursive($json, $fragment);
 
-		$this->assertArraySubset($fragment, $json, false, 'Response does not contain a matching 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.');
+		}
 	}
 
 	/**
@@ -406,7 +391,7 @@
 	 *
 	 * @param string|array $test
 	 *
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function assertJSONExact($test)
 	{
@@ -414,9 +399,7 @@
 
 		if (is_array($test))
 		{
-			$config    = new Format();
-			$formatter = $config->getFormatter('application/json');
-			$test      = $formatter->format($test);
+			$test = Services::format()->getFormatter('application/json')->format($test);
 		}
 
 		$this->assertJsonStringEqualsJsonString($test, $json, 'Response does not contain matching JSON.');
@@ -435,5 +418,4 @@
 	{
 		return $this->response->getXML();
 	}
-
 }
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index ee70910..c5515f6 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -1,50 +1,23 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
+use CodeIgniter\Router\RouteCollection;
+
 /**
  * Class FeatureTestCase
  *
  * Provides a base class with the trait for doing full HTTP testing
  * against your application.
- *
- * @package CodeIgniter\Test
  */
 class FeatureTestCase extends CIDatabaseTestCase
 {
@@ -54,7 +27,7 @@
 	 * If present, will override application
 	 * routes when using call().
 	 *
-	 * @var \CodeIgniter\Router\RouteCollection
+	 * @var RouteCollection
 	 */
 	protected $routes;
 
@@ -72,4 +45,27 @@
 	 * @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 = '';
 }
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index b58b5cc..ce60c8b 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
@@ -43,16 +16,17 @@
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Router\Exceptions\RedirectException;
 use Config\App;
 use Config\Services;
+use Exception;
+use ReflectionException;
 
 /**
  * Trait FeatureTestTrait
  *
  * Provides additional utilities for doing full HTTP testing
  * against your application in trait format.
- *
- * @package CodeIgniter\Test
  */
 trait FeatureTestTrait
 {
@@ -90,7 +64,7 @@
 	/**
 	 * Sets any values that should exist during this session.
 	 *
-	 * @param array|null Array of values, or null to use the current $_SESSION
+	 * @param array|null $values Array of values, or null to use the current $_SESSION
 	 *
 	 * @return $this
 	 */
@@ -102,6 +76,51 @@
 	}
 
 	/**
+	 * 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
@@ -121,9 +140,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function call(string $method, string $path, array $params = null)
 	{
@@ -143,10 +162,12 @@
 		$_SERVER['REQUEST_METHOD'] = $method;
 
 		$request = $this->setupRequest($method, $path);
+		$request = $this->setupHeaders($request);
 		$request = $this->populateGlobals($method, $request, $params);
+		$request = $this->setRequestBody($request);
 
 		// Make sure the RouteCollection knows what method we're using...
-		$routes = $this->routes ?: Services::routes();
+		$routes = $this->routes ?? Services::routes();
 		$routes->setHTTPVerb($method);
 
 		// Make sure any other classes that might call the request
@@ -190,9 +211,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function get(string $path, array $params = null)
 	{
@@ -205,9 +226,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function post(string $path, array $params = null)
 	{
@@ -220,9 +241,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function put(string $path, array $params = null)
 	{
@@ -235,9 +256,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function patch(string $path, array $params = null)
 	{
@@ -250,9 +271,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function delete(string $path, array $params = null)
 	{
@@ -265,9 +286,9 @@
 	 * @param string     $path
 	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\Test\FeatureResponse
-	 * @throws \CodeIgniter\Router\Exceptions\RedirectException
-	 * @throws \Exception
+	 * @return FeatureResponse
+	 * @throws RedirectException
+	 * @throws Exception
 	 */
 	public function options(string $path, array $params = null)
 	{
@@ -281,7 +302,7 @@
 	 * @param string      $method
 	 * @param string|null $path
 	 *
-	 * @return \CodeIgniter\HTTP\IncomingRequest
+	 * @return IncomingRequest
 	 */
 	protected function setupRequest(string $method, string $path = null): IncomingRequest
 	{
@@ -303,17 +324,37 @@
 	}
 
 	/**
+	 * 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 \CodeIgniter\HTTP\Request $request
-	 * @param array|null                $params
+	 * @param string     $method
+	 * @param Request    $request
+	 * @param array|null $params
 	 *
-	 * @return \CodeIgniter\HTTP\Request
-	 * @throws \ReflectionException
+	 * @return Request
+	 * @throws ReflectionException
 	 */
 	protected function populateGlobals(string $method, Request $request, array $params = null)
 	{
@@ -321,7 +362,7 @@
 		// otherwise set it from the URL.
 		$get = ! empty($params) && $method === 'get'
 			? $params
-			: $this->getPrivateProperty($request->uri, 'query');
+			: $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
 
 		$request->setGlobal('get', $get);
 		if ($method !== 'get')
@@ -335,4 +376,48 @@
 
 		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;
+	}
 }
diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php
index 4310a7f..a8ee633 100644
--- a/system/Test/Filters/CITestStreamFilter.php
+++ b/system/Test/Filters/CITestStreamFilter.php
@@ -1,79 +1,53 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Filters;
 
+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
+class CITestStreamFilter extends php_user_filter
 {
-
 	/**
 	 * Buffer to capture stream content.
 	 *
-	 * @var type
+	 * @var string
 	 */
 	public static $buffer = '';
 
 	/**
 	 * Output filtering - catch it all.
 	 *
-	 * @param  type $in
-	 * @param  type $out
-	 * @param  type $consumed
-	 * @param  type $closing
-	 * @return type
+	 * @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;
+
+			$consumed += $bucket->datalen;
 		}
+
 		return PSFS_PASS_ON;
 	}
-
 }
 
 // @codeCoverageIgnoreStart
diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php
index fdf7500..e383eb0 100644
--- a/system/Test/Interfaces/FabricatorModel.php
+++ b/system/Test/Interfaces/FabricatorModel.php
@@ -1,44 +1,18 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Interfaces;
 
 use Faker\Generator;
+use ReflectionException;
 
 /**
  * FabricatorModel
@@ -72,7 +46,7 @@
 	 * @param boolean      $returnID Whether insert ID should be returned or not.
 	 *
 	 * @return integer|string|boolean
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function insert($data = null, bool $returnID = true);
 
diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
index fba7b76..c2d0286 100644
--- a/system/Test/Mock/MockAppConfig.php
+++ b/system/Test/Mock/MockAppConfig.php
@@ -1,8 +1,19 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 class MockAppConfig
 {
-	public $baseURL = 'http://example.com';
+	public $baseURL = 'http://example.com/';
 
 	public $uriProtocol = 'REQUEST_URI';
 
@@ -11,6 +22,7 @@
 	public $cookiePath     = '/';
 	public $cookieSecure   = false;
 	public $cookieHTTPOnly = false;
+	public $cookieSameSite = 'Lax';
 
 	public $proxyIPs = '';
 
@@ -22,6 +34,7 @@
 	public $CSRFRegenerate  = true;
 	public $CSRFExcludeURIs = ['http://example.com'];
 	public $CSRFRedirect    = false;
+	public $CSRFSameSite    = 'Lax';
 
 	public $CSPEnabled = false;
 
diff --git a/system/Test/Mock/MockAutoload.php b/system/Test/Mock/MockAutoload.php
index 0e26ef6..dfc3fe3 100644
--- a/system/Test/Mock/MockAutoload.php
+++ b/system/Test/Mock/MockAutoload.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use Config\Autoload;
 
@@ -8,14 +19,9 @@
 
 	public $classmap = [];
 
-	//--------------------------------------------------------------------
-
 	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 ddb2ab9..db0242c 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -1,15 +1,23 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\ConnectionInterface;
 
-class MockBuilder extends BaseBuilder {
-
+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 b85173f..edb0739 100644
--- a/system/Test/Mock/MockCLIConfig.php
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -1,8 +1,21 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
 
-class MockCLIConfig extends \Config\App
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\App;
+
+class MockCLIConfig extends App
 {
-	public $baseURL = 'http://example.com';
+	public $baseURL = 'http://example.com/';
 
 	public $uriProtocol = 'REQUEST_URI';
 
@@ -11,6 +24,7 @@
 	public $cookiePath     = '/';
 	public $cookieSecure   = false;
 	public $cookieHTTPOnly = false;
+	public $cookieSameSite = 'Lax';
 
 	public $proxyIPs = '';
 
@@ -20,6 +34,7 @@
 	public $CSRFExpire      = 7200;
 	public $CSRFRegenerate  = true;
 	public $CSRFExcludeURIs = ['http://example.com'];
+	public $CSRFSameSite    = 'Lax';
 
 	public $CSPEnabled = false;
 
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index eea2fd1..4c3ccdf 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\HTTP\CURLRequest;
 
@@ -11,8 +22,8 @@
  */
 class MockCURLRequest extends CURLRequest
 {
-
 	public $curl_options;
+
 	protected $output = '';
 
 	//--------------------------------------------------------------------
@@ -26,10 +37,10 @@
 
 	//--------------------------------------------------------------------
 
-	protected function sendRequest(array $curl_options = []): string
+	protected function sendRequest(array $curlOptions = []): string
 	{
 		// Save so we can access later.
-		$this->curl_options = $curl_options;
+		$this->curl_options = $curlOptions;
 
 		return $this->output;
 	}
@@ -46,5 +57,4 @@
 	{
 		return $this->delay;
 	}
-
 }
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index 855cb7b..67356cf 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -1,6 +1,18 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Cache\CacheInterface;
+use Closure;
 
 class MockCache implements CacheInterface
 {
@@ -49,15 +61,40 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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 $value  the data to save
-	 * @param null                    $ttl Time To Live, in seconds (default 60)
-	 * @param boolean                 $raw Whether to store the raw value.
+	 * @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 mixed
 	 */
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index 5580fd1..3ada4c7 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\CodeIgniter;
 
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
index 21fd542..a66b2a4 100644
--- a/system/Test/Mock/MockCommon.php
+++ b/system/Test/Mock/MockCommon.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * Common Functions for testing
+ * This file is part of the CodeIgniter 4 framework.
  *
- * Several application-wide utility methods.
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * @package  CodeIgniter
- * @category Common Functions
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 if (! function_exists('is_cli'))
@@ -17,21 +17,19 @@
 	 * Test to see if a request was made from the command line.
 	 * You can set the return value for testing.
 	 *
-	 * @param  boolean $new_return return value to set
+	 * @param  boolean $newReturn return value to set
 	 * @return boolean
 	 */
-	function is_cli(bool $new_return = null): bool
+	function is_cli(bool $newReturn = null): bool
 	{
 		// PHPUnit always runs via CLI.
-		static $return_value = true;
+		static $returnValue = true;
 
-		if ($new_return !== null)
+		if ($newReturn !== null)
 		{
-			$return_value = $new_return;
+			$returnValue = $newReturn;
 		}
 
-		return $return_value;
+		return $returnValue;
 	}
 }
-
-//--------------------------------------------------------------------
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index ba112fa..147e1d1 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -1,7 +1,20 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\CodeIgniter;
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\Query;
 
 class MockConnection extends BaseConnection
 {
@@ -35,12 +48,13 @@
 	 * @param boolean $setEscapeFlags
 	 * @param string  $queryClass
 	 *
-	 * @return \CodeIgniter\Database\BaseResult|\CodeIgniter\Database\Query|false
+	 * @return BaseResult|Query|false
+	 *
+	 * @todo BC set $queryClass default as null in 4.1
 	 */
-
-	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = 'CodeIgniter\\Database\\Query')
+	public function query(string $sql, $binds = null, bool $setEscapeFlags = true, string $queryClass = '')
 	{
-		$queryClass = str_replace('Connection', 'Query', get_class($this));
+		$queryClass = str_replace('Connection', 'Query', static::class);
 
 		$query = new $queryClass($this);
 
@@ -190,7 +204,7 @@
 	 */
 	public function insertID(): int
 	{
-		return $this->connID->insert_id;
+		return $this->connID->insert_id; // @phpstan-ignore-line
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Test/Mock/MockEmail.php b/system/Test/Mock/MockEmail.php
index ab62a77..5bc9418 100644
--- a/system/Test/Mock/MockEmail.php
+++ b/system/Test/Mock/MockEmail.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Email\Email;
 use CodeIgniter\Events\Events;
diff --git a/system/Test/Mock/MockEvents.php b/system/Test/Mock/MockEvents.php
index e8b3f43..0d36c61 100644
--- a/system/Test/Mock/MockEvents.php
+++ b/system/Test/Mock/MockEvents.php
@@ -1,41 +1,16 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2018 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-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
+ * 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\Events\Events;
 
 /**
@@ -43,7 +18,6 @@
  */
 class MockEvents extends Events
 {
-
 	public function getListeners()
 	{
 		return self::$listeners;
@@ -51,7 +25,7 @@
 
 	public function getEventsFile()
 	{
-		return self::$eventsFile;
+		return self::$files;
 	}
 
 	public function getSimulate()
diff --git a/system/Test/Mock/MockFileLogger.php b/system/Test/Mock/MockFileLogger.php
index 29f4b81..1c007ec 100644
--- a/system/Test/Mock/MockFileLogger.php
+++ b/system/Test/Mock/MockFileLogger.php
@@ -1,12 +1,24 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\Log\Handlers\FileHandler;
 
 /**
  * Class MockFileLogger
  *
  * Extends FileHandler, exposing some inner workings
  */
-
-class MockFileLogger extends \CodeIgniter\Log\Handlers\FileHandler
+class MockFileLogger extends FileHandler
 {
 	/**
 	 * Where would the log be written?
@@ -21,5 +33,4 @@
 		$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 64d7b2e..3791f26 100644
--- a/system/Test/Mock/MockIncomingRequest.php
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\HTTP\IncomingRequest;
 
@@ -13,5 +24,4 @@
 	{
 		// Do nothing...
 	}
-
 }
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index aab0fec..10cbc94 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -1,10 +1,20 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Language\Language;
 
 class MockLanguage extends Language
 {
-
 	/**
 	 * Stores the data that should be
 	 * returned by the 'requireFile()' method.
@@ -41,7 +51,7 @@
 	 *
 	 * @param string $path
 	 *
-	 * @return array|mixed
+	 * @return array
 	 */
 	protected function requireFile(string $path): array
 	{
@@ -57,5 +67,4 @@
 	{
 		$this->intlSupport = false;
 	}
-
 }
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index 239dab5..c32407b 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 class MockLogger
 {
@@ -94,5 +105,4 @@
 			'path'    => '',
 		],
 	];
-
 }
diff --git a/system/Test/Mock/MockQuery.php b/system/Test/Mock/MockQuery.php
index 851ad3e..7d6aff1 100644
--- a/system/Test/Mock/MockQuery.php
+++ b/system/Test/Mock/MockQuery.php
@@ -1,8 +1,18 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\Query;
 
 class MockQuery extends Query
 {
-
 }
diff --git a/system/Test/Mock/MockResourceController.php b/system/Test/Mock/MockResourceController.php
index 05e3c8a..743ecb8 100644
--- a/system/Test/Mock/MockResourceController.php
+++ b/system/Test/Mock/MockResourceController.php
@@ -1,10 +1,20 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\RESTful\ResourceController;
 
 class MockResourceController extends ResourceController
 {
-
 	public function getModel()
 	{
 		return $this->model;
@@ -19,5 +29,4 @@
 	{
 		return $this->format;
 	}
-
 }
diff --git a/system/Test/Mock/MockResourcePresenter.php b/system/Test/Mock/MockResourcePresenter.php
index 84f831c..1a4779a 100644
--- a/system/Test/Mock/MockResourcePresenter.php
+++ b/system/Test/Mock/MockResourcePresenter.php
@@ -1,9 +1,22 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
+
+use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\RESTful\ResourcePresenter;
 
 class MockResourcePresenter extends ResourcePresenter
 {
+	use ResponseTrait;
 
 	public function getModel()
 	{
@@ -19,5 +32,4 @@
 	{
 		return $this->format;
 	}
-
 }
diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php
index 67f1a7d..f862fc6 100755
--- a/system/Test/Mock/MockResponse.php
+++ b/system/Test/Mock/MockResponse.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\HTTP\Response;
 
@@ -7,7 +18,6 @@
  */
 class MockResponse extends Response
 {
-
 	/**
 	 * If true, will not write output. Useful during testing.
 	 *
@@ -26,5 +36,4 @@
 	{
 		$this->statusCode = 0;
 	}
-
 }
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index a76e9dd..3d2d0d3 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseResult;
 
@@ -11,6 +22,7 @@
 	 */
 	public function getFieldCount(): int
 	{
+		return 0;
 	}
 
 	//--------------------------------------------------------------------
@@ -22,6 +34,7 @@
 	 */
 	public function getFieldNames(): array
 	{
+		return [];
 	}
 
 	//--------------------------------------------------------------------
@@ -33,6 +46,7 @@
 	 */
 	public function getFieldData(): array
 	{
+		return [];
 	}
 
 	//--------------------------------------------------------------------
@@ -87,6 +101,19 @@
 	 */
 	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;
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index f9d5c9c..3570e5c 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -1,17 +1,25 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Security\Security;
 
 class MockSecurity extends Security
 {
-	public function CSRFSetCookie(RequestInterface $request)
+	public function sendCookie(RequestInterface $request)
 	{
-		$_COOKIE['csrf_cookie_name'] = $this->CSRFHash;
+		$_COOKIE['csrf_cookie_name'] = $this->hash;
 
 		return $this;
 	}
-
-	//--------------------------------------------------------------------
-
 }
diff --git a/system/Test/Mock/MockSecurityConfig.php b/system/Test/Mock/MockSecurityConfig.php
new file mode 100644
index 0000000..a0786a9
--- /dev/null
+++ b/system/Test/Mock/MockSecurityConfig.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace CodeIgniter\Test\Mock;
+
+use Config\Security as SecurityConfig;
+
+class MockSecurityConfig extends SecurityConfig
+{
+	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 5d9e736..3fa1a14 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -1,13 +1,25 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use \CodeIgniter\Config\BaseService;
+use CodeIgniter\Autoloader\FileLocator;
 
 class MockServices extends BaseService
 {
-
-	public $psr4     = [
+	public $psr4 = [
 		'Tests/Support' => TESTPATH . '_support/',
 	];
+
 	public $classmap = [];
 
 	//--------------------------------------------------------------------
@@ -21,7 +33,6 @@
 	//--------------------------------------------------------------------
 	public static function locator(bool $getShared = true)
 	{
-		return new \CodeIgniter\Autoloader\FileLocator(static::autoloader());
+		return new FileLocator(static::autoloader());
 	}
-
 }
diff --git a/system/Test/Mock/MockSession.php b/system/Test/Mock/MockSession.php
index e69183e..e760fbe 100644
--- a/system/Test/Mock/MockSession.php
+++ b/system/Test/Mock/MockSession.php
@@ -1,4 +1,15 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Session\Session;
 
@@ -39,6 +50,7 @@
 	protected function startSession()
 	{
 		//        session_start();
+		$this->setCookie();
 	}
 
 	//--------------------------------------------------------------------
@@ -49,15 +61,46 @@
 	 */
 	protected function setCookie()
 	{
-		$this->cookies[] = [
-			$this->sessionCookieName,
-			session_id(),
-			(empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration),
-			$this->cookiePath,
-			$this->cookieDomain,
-			$this->cookieSecure,
-			true,
-		];
+		if (PHP_VERSION_ID < 70300)
+		{
+			$sameSite = '';
+			if ($this->cookieSameSite !== '')
+			{
+				$sameSite = '; samesite=' . $this->cookieSameSite;
+			}
+
+			$this->cookies[] = [
+				$this->sessionCookieName,
+				session_id(),
+				empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration,
+				$this->cookiePath . $sameSite, // Hacky way to set SameSite for PHP 7.2 and earlier
+				$this->cookieDomain,
+				$this->cookieSecure,
+				true,
+			];
+		}
+		else
+		{
+			// PHP 7.3 adds another function signature allowing setting of samesite
+			$params = [
+				'expires'  => empty($this->sessionExpiration) ? 0 : time() + $this->sessionExpiration,
+				'path'     => $this->cookiePath,
+				'domain'   => $this->cookieDomain,
+				'secure'   => $this->cookieSecure,
+				'httponly' => true,
+			];
+
+			if ($this->cookieSameSite !== '')
+			{
+				$params['samesite'] = $this->cookieSameSite;
+			}
+
+			$this->cookies[] = [
+				$this->sessionCookieName,
+				session_id(),
+				$params,
+			];
+		}
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php
index 3e5758b..23a685d 100644
--- a/system/Test/Mock/MockTable.php
+++ b/system/Test/Mock/MockTable.php
@@ -1,7 +1,21 @@
-<?php namespace CodeIgniter\Test\Mock;
+<?php
 
-class MockTable extends \CodeIgniter\View\Table {
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
+namespace CodeIgniter\Test\Mock;
+
+use BadMethodCallException;
+use CodeIgniter\View\Table;
+
+class MockTable extends Table
+{
 	// Override inaccessible protected method
 	public function __call($method, $params)
 	{
@@ -12,5 +26,4 @@
 
 		throw new BadMethodCallException('Method ' . $method . ' was not found');
 	}
-
 }
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index c6c1005..9934b03 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -1,47 +1,22 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
 
+use Closure;
 use ReflectionClass;
+use ReflectionException;
 use ReflectionMethod;
 use ReflectionObject;
+use ReflectionProperty;
 
 /**
  * Testing helper.
@@ -54,45 +29,45 @@
 	 * @param object|string $obj    object or class name
 	 * @param string        $method method name
 	 *
-	 * @return \Closure
-	 * @throws \ReflectionException
+	 * @return Closure
+	 * @throws ReflectionException
 	 */
 	public static function getPrivateMethodInvoker($obj, $method)
 	{
-		$ref_method = new ReflectionMethod($obj, $method);
-		$ref_method->setAccessible(true);
+		$refMethod = new ReflectionMethod($obj, $method);
+		$refMethod->setAccessible(true);
 		$obj = (gettype($obj) === 'object') ? $obj : null;
 
-		return function () use ($obj, $ref_method) {
+		return function () use ($obj, $refMethod) {
 			$args = func_get_args();
-			return $ref_method->invokeArgs($obj, $args);
+			return $refMethod->invokeArgs($obj, $args);
 		};
 	}
 
 	/**
 	 * Find an accessible property.
 	 *
-	 * @param object $obj
-	 * @param string $property
+	 * @param object|string $obj
+	 * @param string        $property
 	 *
-	 * @return \ReflectionProperty
-	 * @throws \ReflectionException
+	 * @return ReflectionProperty
+	 * @throws ReflectionException
 	 */
 	private static function getAccessibleRefProperty($obj, $property)
 	{
 		if (is_object($obj))
 		{
-			$ref_class = new ReflectionObject($obj);
+			$refClass = new ReflectionObject($obj);
 		}
 		else
 		{
-			$ref_class = new ReflectionClass($obj);
+			$refClass = new ReflectionClass($obj);
 		}
 
-		$ref_property = $ref_class->getProperty($property);
-		$ref_property->setAccessible(true);
+		$refProperty = $refClass->getProperty($property);
+		$refProperty->setAccessible(true);
 
-		return $ref_property;
+		return $refProperty;
 	}
 
 	/**
@@ -102,12 +77,12 @@
 	 * @param string        $property property name
 	 * @param mixed         $value    value
 	 *
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public static function setPrivateProperty($obj, $property, $value)
 	{
-		$ref_property = self::getAccessibleRefProperty($obj, $property);
-		$ref_property->setValue($obj, $value);
+		$refProperty = self::getAccessibleRefProperty($obj, $property);
+		$refProperty->setValue($obj, $value);
 	}
 
 	/**
@@ -117,12 +92,11 @@
 	 * @param string        $property property name
 	 *
 	 * @return mixed value
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public static function getPrivateProperty($obj, $property)
 	{
-		$ref_property = self::getAccessibleRefProperty($obj, $property);
-		return $ref_property->getValue($obj);
+		$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 f0c1c94..396b603 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -1,10 +1,20 @@
-<?php namespace CodeIgniter\Test;
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
 
 use CodeIgniter\Log\Logger;
 
 class TestLogger extends Logger
 {
-
 	protected static $op_logs = [];
 
 	//--------------------------------------------------------------------
@@ -23,7 +33,7 @@
 	{
 		// While this requires duplicate work, we want to ensure
 		// we have the final message to test against.
-		$log_message = $this->interpolate($message, $context);
+		$logMessage = $this->interpolate($message, $context);
 
 		// Determine the file and line by finding the first
 		// backtrace that is not part of our logging system.
@@ -32,7 +42,7 @@
 
 		foreach ($trace as $row)
 		{
-			if (! in_array($row['function'], ['log', 'log_message']))
+			if (! in_array($row['function'], ['log', 'log_message'], true))
 			{
 				$file = basename($row['file'] ?? '');
 				break;
@@ -41,7 +51,7 @@
 
 		self::$op_logs[] = [
 				  'level'   => $level,
-				  'message' => $log_message,
+				  'message' => $logMessage,
 				  'file'    => $file,
 			  ];
 
@@ -78,5 +88,4 @@
 	{
 		return $this->cleanFileNames($file);
 	}
-
 }
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 89bdc7b..bc87a8f 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -1,21 +1,47 @@
 <?php
-ini_set('error_reporting', E_ALL);
 
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use CodeIgniter\Services;
+use Config\Autoload;
+use Config\Modules;
+use Config\Paths;
+
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 ini_set('display_startup_errors', '1');
 
 // Make sure it recognizes that we're testing.
 $_SERVER['CI_ENVIRONMENT'] = 'testing';
 define('ENVIRONMENT', 'testing');
+defined('CI_DEBUG') || define('CI_DEBUG', true);
+
+// 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/');
+defined('CONFIGPATH') || define('CONFIGPATH', realpath($source . 'app/Config') . DIRECTORY_SEPARATOR);
+defined('PUBLICPATH') || define('PUBLICPATH', realpath($source . 'public') . DIRECTORY_SEPARATOR);
+unset($source);
 
 // Load framework paths from their config file
 require CONFIGPATH . 'Paths.php';
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // Define necessary framework path constants
-defined('APPPATH')       || define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
-defined('WRITEPATH')     || define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
-defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
+defined('APPPATH')       || define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('WRITEPATH')     || define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
+defined('SYSTEMPATH')    || define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/')) . DIRECTORY_SEPARATOR);
 defined('ROOTPATH')      || define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 defined('CIPATH')        || define('CIPATH', realpath(SYSTEMPATH . '../') . DIRECTORY_SEPARATOR);
 defined('FCPATH')        || define('FCPATH', realpath(PUBLICPATH) . DIRECTORY_SEPARATOR);
@@ -35,7 +61,7 @@
 // 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['app.baseURL'] = 'http://example.com/';
 }
 
 // Load necessary components
@@ -57,11 +83,13 @@
 }
 
 // Launch the autoloader to gather namespaces (includes composer.json's "autoload-dev")
-$loader = \CodeIgniter\Services::autoloader();
-$loader->initialize(new Config\Autoload(), new Config\Modules());
-
-// Register the loader with the SPL autoloader stack.
-$loader->register();
+$loader = Services::autoloader();
+$loader->initialize(new Autoload(), new Modules());
+$loader->register(); // Register the loader with the SPL autoloader stack.
 
 require_once APPPATH . 'Config/Routes.php';
+
+/**
+ * @var \CodeIgniter\Router\RouteCollection $routes
+ */
 $routes->getRoutes('*');
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index c843434..f3512be 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
@@ -52,12 +24,9 @@
  * for the purposes of this implementation.
  *
  * @see https://en.wikipedia.org/wiki/Token_bucket
- *
- * @package CodeIgniter\Throttle
  */
 class Throttler implements ThrottlerInterface
 {
-
 	/**
 	 * Container for throttle counters.
 	 *
@@ -92,8 +61,7 @@
 	/**
 	 * Constructor.
 	 *
-	 * @param  type $cache
-	 * @throws type
+	 * @param CacheInterface $cache
 	 */
 	public function __construct(CacheInterface $cache)
 	{
@@ -167,7 +135,7 @@
 		// should be refilled, then checked against capacity
 		// to be sure the bucket didn't overflow.
 		$tokens += $rate * $elapsed;
-		$tokens  = $tokens > $capacity ? $capacity : $tokens;
+		$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.
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
index ef7d787..ac57dc3 100644
--- a/system/Throttle/ThrottlerInterface.php
+++ b/system/Throttle/ThrottlerInterface.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
@@ -43,7 +16,6 @@
  */
 interface ThrottlerInterface
 {
-
 	/**
 	 * Restricts the number of requests made by a single key within
 	 * a set number of seconds.
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 4e632d2..a922363 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Typography;
@@ -44,7 +16,6 @@
  */
 class Typography
 {
-
 	/**
 	 * Block level elements that should not be wrapped inside <p> tags
 	 *
@@ -99,11 +70,11 @@
 	 *  - Converts two spaces into entities
 	 *
 	 * @param string  $str
-	 * @param boolean $reduce_linebreaks whether to reduce more then two consecutive newlines to two
+	 * @param boolean $reduceLinebreaks whether to reduce more then two consecutive newlines to two
 	 *
 	 * @return string
 	 */
-	public function autoTypography(string $str, bool $reduce_linebreaks = false): string
+	public function autoTypography(string $str, bool $reduceLinebreaks = false): string
 	{
 		if ($str === '')
 		{
@@ -118,19 +89,19 @@
 
 		// 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 ($reduce_linebreaks === false)
+		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
-		$html_comments = [];
+		$htmlComments = [];
 		if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches))
 		{
 			for ($i = 0, $total = count($matches[0]); $i < $total; $i ++)
 			{
-				$html_comments[] = $matches[0][$i];
-				$str             = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
+				$htmlComments[] = $matches[0][$i];
+				$str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
 			}
 		}
 
@@ -217,12 +188,12 @@
 		$str = $this->formatCharacters($str);
 
 		// restore HTML comments
-		for ($i = 0, $total = count($html_comments); $i < $total; $i ++)
+		for ($i = 0, $total = count($htmlComments); $i < $total; $i ++)
 		{
 			// 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', $html_comments[$i], $str);
+			$str = preg_replace('#(?(?=<p>\{@HC' . $i . '\})<p>\{@HC' . $i . '\}(\s*</p>)|\{@HC' . $i . '\})#s', $htmlComments[$i], $str);
 		}
 
 		// Final clean up
@@ -254,7 +225,7 @@
 		];
 
 		// Do we need to reduce empty lines?
-		if ($reduce_linebreaks === true)
+		if ($reduceLinebreaks === true)
 		{
 			$table['#<p>\n*</p>#'] = '';
 		}
@@ -339,7 +310,7 @@
 	 */
 	protected function formatNewLines(string $str): string
 	{
-		if ($str === '' || ( strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired)))
+		if ($str === '' || (strpos($str, "\n") === false && ! in_array($this->lastBlockElement, $this->innerBlockRequired, true)))
 		{
 			return $str;
 		}
@@ -404,5 +375,4 @@
 
 		return $newstr;
 	}
-
 }
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 53234e9..d7d3bfb 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -45,12 +17,9 @@
  * Provides validation methods for common credit-card inputs.
  *
  * @see http://en.wikipedia.org/wiki/Credit_card_number
- *
- * @package CodeIgniter\Validation
  */
 class CreditCardRules
 {
-
 	/**
 	 * The cards that we support, with the defining details:
 	 *
@@ -203,12 +172,12 @@
 	 *      'cc_num' => 'valid_cc_number[visa]'
 	 *  ];
 	 *
-	 * @param string $ccNumber
-	 * @param string $type
+	 * @param string|null $ccNumber
+	 * @param string      $type
 	 *
 	 * @return boolean
 	 */
-	public function valid_cc_number(string $ccNumber = null, string $type): bool
+	public function valid_cc_number(?string $ccNumber, string $type): bool
 	{
 		$type = strtolower($type);
 		$info = null;
@@ -247,7 +216,7 @@
 		// Make sure it's a valid length for this card
 		$lengths = explode(',', $info['length']);
 
-		if (! in_array(strlen($ccNumber), $lengths))
+		if (! in_array((string) strlen($ccNumber), $lengths, true))
 		{
 			return false;
 		}
@@ -293,7 +262,7 @@
 	 */
 	protected function isValidLuhn(string $number = null): bool
 	{
-		settype($number, 'string');
+		$number = (string) $number;
 
 		$sumTable = [
 			[
diff --git a/system/Validation/Exceptions/ValidationException.php b/system/Validation/Exceptions/ValidationException.php
index 0bb6c1a..077aa1f 100644
--- a/system/Validation/Exceptions/ValidationException.php
+++ b/system/Validation/Exceptions/ValidationException.php
@@ -1,9 +1,19 @@
-<?php namespace CodeIgniter\Validation\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class ValidationException extends FrameworkException implements ExceptionInterface
+class ValidationException extends FrameworkException
 {
 	public static function forRuleNotFound(string $rule = null)
 	{
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index 61bedb9..3c6de57 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -1,45 +1,18 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\HTTP\RequestInterface;
+use Config\Mimes;
 use Config\Services;
 
 /**
@@ -47,7 +20,6 @@
  */
 class FileRules
 {
-
 	/**
 	 * Request instance. So we can get access to the files.
 	 *
@@ -77,12 +49,12 @@
 	/**
 	 * Verifies that $name is the name of a valid uploaded file.
 	 *
-	 * @param string $blank
-	 * @param string $name
+	 * @param string|null $blank
+	 * @param string      $name
 	 *
 	 * @return boolean
 	 */
-	public function uploaded(string $blank = null, string $name): bool
+	public function uploaded(?string $blank, string $name): bool
 	{
 		if (! ($files = $this->request->getFileMultiple($name)))
 		{
@@ -128,7 +100,7 @@
 	 *
 	 * @return boolean
 	 */
-	public function max_size(string $blank = null, string $params): bool
+	public function max_size(?string $blank, string $params): bool
 	{
 		// Grab the file name off the top of the $params
 		// after we split it.
@@ -177,7 +149,7 @@
 	 *
 	 * @return boolean
 	 */
-	public function is_image(string $blank = null, string $params): bool
+	public function is_image(?string $blank, string $params): bool
 	{
 		// Grab the file name off the top of the $params
 		// after we split it.
@@ -203,7 +175,7 @@
 
 			// We know that our mimes list always has the first mime
 			// start with `image` even when then are multiple accepted types.
-			$type = \Config\Mimes::guessTypeFromExtension($file->getExtension());
+			$type = Mimes::guessTypeFromExtension($file->getExtension());
 
 			if (mb_strpos($type, 'image') !== 0)
 			{
@@ -224,7 +196,7 @@
 	 *
 	 * @return boolean
 	 */
-	public function mime_in(string $blank = null, string $params): bool
+	public function mime_in(?string $blank, string $params): bool
 	{
 		// Grab the file name off the top of the $params
 		// after we split it.
@@ -248,7 +220,7 @@
 				return true;
 			}
 
-			if (! in_array($file->getMimeType(), $params))
+			if (! in_array($file->getMimeType(), $params, true))
 			{
 				return false;
 			}
@@ -267,7 +239,7 @@
 	 *
 	 * @return boolean
 	 */
-	public function ext_in(string $blank = null, string $params): bool
+	public function ext_in(?string $blank, string $params): bool
 	{
 		// Grab the file name off the top of the $params
 		// after we split it.
@@ -291,7 +263,7 @@
 				return true;
 			}
 
-			if (! in_array($file->getExtension(), $params))
+			if (! in_array($file->guessExtension(), $params, true))
 			{
 				return false;
 			}
@@ -311,7 +283,7 @@
 	 *
 	 * @return boolean
 	 */
-	public function max_dims(string $blank = null, string $params): bool
+	public function max_dims(?string $blank, string $params): bool
 	{
 		// Grab the file name off the top of the $params
 		// after we split it.
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index f121b70..cefe164 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -1,60 +1,31 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
 
+use DateTime;
+
 /**
  * Format validation Rules.
- *
- * @package CodeIgniter\Validation
  */
 class FormatRules
 {
-
 	/**
 	 * Alpha
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function alpha(string $str = null): bool
+	public function alpha(?string $str = null): bool
 	{
 		return ctype_alpha($str);
 	}
@@ -62,56 +33,59 @@
 	/**
 	 * Alpha with spaces.
 	 *
-	 * @param string $value Value.
+	 * @param string|null $value Value.
 	 *
 	 * @return boolean True if alpha with spaces, else false.
 	 */
-	public function alpha_space(string $value = null): bool
+	public function alpha_space(?string $value = null): bool
 	{
 		if ($value === null)
 		{
 			return true;
 		}
 
-		return (bool) preg_match('/^[A-Z ]+$/i', $value);
+		// @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_dash(string $str = null): bool
-	{
-			return (bool) preg_match('/^[a-z0-9_-]+$/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)
 	{
-		return (bool) preg_match('/^[A-Z0-9 ~!#$%\&\*\-_+=|:.]+$/i', $str);
+		// @see https://regex101.com/r/6N8dDY/1
+		return (bool) preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str);
 	}
 
 	/**
 	 * Alphanumeric
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function alpha_numeric(string $str = null): bool
+	public function alpha_numeric(?string $str = null): bool
 	{
 		return ctype_alnum($str);
 	}
@@ -119,13 +93,14 @@
 	/**
 	 * Alphanumeric w/ spaces
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function alpha_numeric_space(string $str = null): bool
+	public function alpha_numeric_space(?string $str = null): bool
 	{
-		return (bool) preg_match('/^[A-Z0-9 ]+$/i', $str);
+		// @see https://regex101.com/r/0AZDME/1
+		return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 	}
 
 	/**
@@ -146,23 +121,24 @@
 	/**
 	 * Decimal number
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function decimal(string $str = null): bool
+	public function decimal(?string $str = null): bool
 	{
-		return (bool) preg_match('/^[-+]?[0-9]{0,}\.?[0-9]+$/', $str);
+		// @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 $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function hex(string $str = null): bool
+	public function hex(?string $str = null): bool
 	{
 		return ctype_xdigit($str);
 	}
@@ -170,22 +146,22 @@
 	/**
 	 * Integer
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function integer(string $str = null): bool
+	public function integer(?string $str = null): bool
 	{
-		return (bool) preg_match('/^[\-+]?[0-9]+$/', $str);
+		return (bool) preg_match('/\A[\-+]?[0-9]+\z/', $str);
 	}
 
 	/**
 	 * Is a Natural number  (0,1,2,3, etc.)
 	 *
-	 * @param  string $str
+	 * @param  string|null $str
 	 * @return boolean
 	 */
-	public function is_natural(string $str = null): bool
+	public function is_natural(?string $str = null): bool
 	{
 		return ctype_digit($str);
 	}
@@ -193,10 +169,10 @@
 	/**
 	 * Is a Natural number, but not a zero  (1,2,3, etc.)
 	 *
-	 * @param  string $str
+	 * @param  string|null $str
 	 * @return boolean
 	 */
-	public function is_natural_no_zero(string $str = null): bool
+	public function is_natural_no_zero(?string $str = null): bool
 	{
 		return ($str !== '0' && ctype_digit($str));
 	}
@@ -204,24 +180,25 @@
 	/**
 	 * Numeric
 	 *
-	 * @param string $str
+	 * @param string|null $str
 	 *
 	 * @return boolean
 	 */
-	public function numeric(string $str = null): bool
+	public function numeric(?string $str = null): bool
 	{
-		return (bool) preg_match('/^[\-+]?[0-9]*\.?[0-9]+$/', $str);
+		// @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 $str
-	 * @param string $pattern
+	 * @param string|null $str
+	 * @param string      $pattern
 	 *
 	 * @return boolean
 	 */
-	public function regex_match(string $str = null, string $pattern): bool
+	public function regex_match(?string $str, string $pattern): bool
 	{
 		if (strpos($pattern, '/') !== 0)
 		{
@@ -243,7 +220,7 @@
 	 */
 	public function timezone(string $str = null): bool
 	{
-		return in_array($str, timezone_identifiers_list());
+		return in_array($str, timezone_identifiers_list(), true);
 	}
 
 	/**
@@ -257,7 +234,7 @@
 	 */
 	public function valid_base64(string $str = null): bool
 	{
-		return (base64_encode(base64_decode($str)) === $str);
+		return (base64_encode(base64_decode($str, true)) === $str);
 	}
 
 	/**
@@ -282,6 +259,7 @@
 	 */
 	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);
@@ -362,7 +340,8 @@
 		{
 			return false;
 		}
-		elseif (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
+
+		if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches))
 		{
 			if (! in_array($matches[1], ['http', 'https'], true))
 			{
@@ -392,9 +371,8 @@
 			return (bool) strtotime($str);
 		}
 
-		$date = \DateTime::createFromFormat($format, $str);
+		$date = DateTime::createFromFormat($format, $str);
 
-		return (bool) $date && \DateTime::getLastErrors()['warning_count'] === 0 && \DateTime::getLastErrors()['error_count'] === 0;
+		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 9621676..77cbd30 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -1,50 +1,21 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
 
 use Config\Database;
+use InvalidArgumentException;
 
 /**
  * Validation Rules.
- *
- * @package CodeIgniter\Validation
  */
 class Rules
 {
@@ -61,6 +32,11 @@
 	 */
 	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];
 	}
 
@@ -95,7 +71,7 @@
 		$val = explode(',', $val);
 		foreach ($val as $tmp)
 		{
-			if (is_numeric($tmp) && (int)$tmp === mb_strlen($str))
+			if (is_numeric($tmp) && (int) $tmp === mb_strlen($str))
 			{
 				return true;
 			}
@@ -154,7 +130,7 @@
 	public function is_not_unique(string $str = null, string $field, array $data): bool
 	{
 		// Grab any data for exclusion of a single row.
-		list($field, $where_field, $where_value) = array_pad(explode(',', $field), 3, null);
+		list($field, $whereField, $whereValue) = array_pad(explode(',', $field), 3, null);
 
 		// Break the table and field apart
 		sscanf($field, '%[^.].%[^.]', $table, $field);
@@ -166,16 +142,15 @@
 				  ->where($field, $str)
 				  ->limit(1);
 
-		if (! empty($where_field) && ! empty($where_value))
+		if (! empty($whereField) && ! empty($whereValue))
 		{
-			if (! preg_match('/^\{(\w+)\}$/', $where_value))
+			if (! preg_match('/^\{(\w+)\}$/', $whereValue))
 			{
-				$row = $row->where($where_field, $where_value);
+				$row = $row->where($whereField, $whereValue);
 			}
 		}
 
-		return (bool) ($row->get()
-						->getRow() !== null);
+		return (bool) ($row->get()->getRow() !== null);
 	}
 
 	//--------------------------------------------------------------------
@@ -190,10 +165,7 @@
 	 */
 	public function in_list(string $value = null, string $list): bool
 	{
-		$list = explode(',', $list);
-		$list = array_map(function ($value) {
-			return trim($value);
-		}, $list);
+		$list = array_map('trim', explode(',', $list));
 		return in_array($value, $list, true);
 	}
 
@@ -237,8 +209,7 @@
 			}
 		}
 
-		return (bool) ($row->get()
-						->getRow() === null);
+		return (bool) ($row->get()->getRow() === null);
 	}
 
 	//--------------------------------------------------------------------
@@ -284,6 +255,11 @@
 	 */
 	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];
 	}
 
@@ -299,7 +275,7 @@
 	 */
 	public function max_length(string $str = null, string $val): bool
 	{
-		return ($val >= mb_strlen($str));
+		return (is_numeric($val) && $val >= mb_strlen($str));
 	}
 
 	//--------------------------------------------------------------------
@@ -314,7 +290,7 @@
 	 */
 	public function min_length(string $str = null, string $val): bool
 	{
-		return ($val <= mb_strlen($str));
+		return (is_numeric($val) && $val <= mb_strlen($str));
 	}
 
 	//--------------------------------------------------------------------
@@ -335,6 +311,21 @@
 	//--------------------------------------------------------------------
 
 	/**
+	 * 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
@@ -361,14 +352,19 @@
 	 *
 	 *     required_with[password]
 	 *
-	 * @param $str
-	 * @param string $fields List of fields that we should check if present
-	 * @param array  $data   Complete list of fields from the form
+	 * @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, array $data): bool
+	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
@@ -388,18 +384,15 @@
 
 		foreach ($fields as $field)
 		{
-			if (array_key_exists($field, $data))
+			if (
+				(array_key_exists($field, $data) && ! empty($data[$field])) ||
+				(strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))	
+			)
 			{
 				$requiredFields[] = $field;
 			}
 		}
 
-		// Remove any keys with empty values since, that means they
-		// weren't truly there, as far as this is concerned.
-		$requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-			return ! empty($data[$item]);
-		});
-
 		return empty($requiredFields);
 	}
 
@@ -413,14 +406,19 @@
 	 *
 	 *     required_without[id,email]
 	 *
-	 * @param $str
-	 * @param string $fields
-	 * @param array  $data
+	 * @param string|null $str
+	 * @param string|null $fields
+	 * @param array       $data
 	 *
 	 * @return boolean
 	 */
-	public function required_without($str = null, string $fields, array $data): bool
+	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
@@ -437,7 +435,10 @@
 		// any of the fields are not present in $data
 		foreach ($fields as $field)
 		{
-			if (! array_key_exists($field, $data))
+			if (
+				(strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) ||
+				(strpos($field, '.') !== false && empty(dot_array_search($field, $data)))
+			)
 			{
 				return false;
 			}
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 16fb5be..3b69e41 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -1,53 +1,28 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
 
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use CodeIgniter\View\RendererInterface;
+use Config\Validation as ValidationConfig;
+use InvalidArgumentException;
 
 /**
  * Validator
  */
 class Validation implements ValidationInterface
 {
-
 	/**
 	 * Files to load with validation functions.
 	 *
@@ -97,7 +72,7 @@
 	/**
 	 * Our configuration.
 	 *
-	 * @var \Config\Validation
+	 * @var ValidationConfig
 	 */
 	protected $config;
 
@@ -113,8 +88,8 @@
 	/**
 	 * Validation constructor.
 	 *
-	 * @param \Config\Validation $config
-	 * @param RendererInterface  $view
+	 * @param ValidationConfig  $config
+	 * @param RendererInterface $view
 	 */
 	public function __construct($config, RendererInterface $view)
 	{
@@ -131,18 +106,18 @@
 	 * Runs the validation process, returning true/false determining whether
 	 * validation was successful or not.
 	 *
-	 * @param array  $data     The array of data to validate.
-	 * @param string $group    The pre-defined group of rules to apply.
-	 * @param string $db_group The database group to use.
+	 * @param array  $data    The array of data to validate.
+	 * @param string $group   The pre-defined group of rules to apply.
+	 * @param string $dbGroup The database group to use.
 	 *
 	 * @return boolean
 	 */
-	public function run(array $data = null, string $group = null, string $db_group = null): bool
+	public function run(array $data = null, string $group = null, string $dbGroup = null): bool
 	{
 		$data = $data ?? $this->data;
 
 		// i.e. is_unique
-		$data['DBGroup'] = $db_group;
+		$data['DBGroup'] = $dbGroup;
 
 		$this->loadRuleSets();
 
@@ -227,28 +202,34 @@
 	 * @param string|null  $label
 	 * @param string|array $value Value to be validated, can be a string or an array
 	 * @param array|null   $rules
-	 * @param array        $data  // All of the fields to check.
+	 * @param array        $data  All of the fields to check.
 	 *
 	 * @return boolean
 	 */
-	protected function processRules(string $field, string $label = null, $value, $rules = null, array $data): bool
+	protected function processRules(string $field, string $label = null, $value, $rules = null, array $data = null): bool
 	{
-		// If the if_exist rule is defined...
-		if (in_array('if_exist', $rules))
+		if (is_null($data))
 		{
-			// and the current field does not exists in the input data
-			// we can return true. Ignoring all other rules to this field.
-			if (! array_key_exists($field, $data))
+			throw new InvalidArgumentException('You must supply the parameter: data.');
+		}
+
+		if (in_array('if_exist', $rules, true))
+		{
+			// If the if_exist rule is defined
+			// and the current field does not exist in the input data
+			// we can return true, ignoring all other rules to this field.
+			if (! array_key_exists($field, array_flatten_with_dots($data)))
 			{
 				return true;
 			}
+
 			// Otherwise remove the if_exist rule and continue the process
 			$rules = array_diff($rules, ['if_exist']);
 		}
 
-		if (in_array('permit_empty', $rules))
+		if (in_array('permit_empty', $rules, true))
 		{
-			if (! in_array('required', $rules) && (is_array($value) ? empty($value) : (trim($value) === '')))
+			if (! in_array('required', $rules, true) && (is_array($value) ? empty($value) : (trim($value) === '')))
 			{
 				$passed = true;
 
@@ -259,7 +240,7 @@
 						$rule  = $match[1];
 						$param = $match[2];
 
-						if (! in_array($rule, ['required_with', 'required_without']))
+						if (! in_array($rule, ['required_with', 'required_without'], true))
 						{
 							continue;
 						}
@@ -344,7 +325,7 @@
 				}
 
 				$this->errors[$field] = is_null($error) ? $this->getErrorMessage($rule, $field, $label, $param, $value)
-					: $error;
+					: $error; // @phpstan-ignore-line
 
 				return false;
 			}
@@ -359,13 +340,19 @@
 	 * Takes a Request object and grabs the input data to use from its
 	 * array values.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
+	 * @param RequestInterface|IncomingRequest $request
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function withRequest(RequestInterface $request): ValidationInterface
 	{
-		if (in_array($request->getMethod(), ['put', 'patch', 'delete']))
+		if ($request->isJSON())
+		{
+			$this->data = $request->getJSON(true);
+			return $this;
+		}
+
+		if (in_array($request->getMethod(), ['put', 'patch', 'delete'], true))
 		{
 			$this->data = $request->getRawInput();
 		}
@@ -406,7 +393,8 @@
 			'label' => $label,
 			'rules' => $rules,
 		];
-		$this->customErrors  = array_merge($this->customErrors, [
+
+		$this->customErrors = array_merge($this->customErrors, [
 			$field => $errors,
 		]);
 
@@ -434,7 +422,7 @@
 	 * @param array $rules
 	 * @param array $errors // An array of custom error messages
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function setRules(array $rules, array $errors = []): ValidationInterface
 	{
@@ -492,7 +480,7 @@
 	 *
 	 * @return string[] Rule group.
 	 *
-	 * @throws \InvalidArgumentException If group not found.
+	 * @throws InvalidArgumentException If group not found.
 	 */
 	public function getRuleGroup(string $group): array
 	{
@@ -516,7 +504,7 @@
 	 *
 	 * @param string $group Group.
 	 *
-	 * @throws \InvalidArgumentException If group not found.
+	 * @throws InvalidArgumentException If group not found.
 	 */
 	public function setRuleGroup(string $group)
 	{
@@ -775,7 +763,7 @@
 	 * @param string $field
 	 * @param string $error
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function setError(string $field, string $error): ValidationInterface
 	{
@@ -827,16 +815,16 @@
 	 */
 	protected function splitRules(string $rules): array
 	{
-		$non_escape_bracket  = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
-		$pipe_not_in_bracket = sprintf(
+		$nonEscapeBracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
+		$pipeNotInBracket = sprintf(
 				'/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
-				$non_escape_bracket,
-				$non_escape_bracket,
-				$non_escape_bracket
+				$nonEscapeBracket,
+				$nonEscapeBracket,
+				$nonEscapeBracket
 		);
 
 		$_rules = preg_split(
-				$pipe_not_in_bracket,
+				$pipeNotInBracket,
 				$rules
 		);
 
@@ -852,7 +840,7 @@
 	 * Resets the class to a blank slate. Should be called whenever
 	 * you need to process more than one array.
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function reset(): ValidationInterface
 	{
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index cda21e0..3ddc7a7 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
@@ -46,7 +18,6 @@
  */
 interface ValidationInterface
 {
-
 	/**
 	 * Runs the validation process, returning true/false determining whether
 	 * or not validation was successful.
@@ -78,9 +49,9 @@
 	 * Takes a Request object and grabs the input data to use from its
 	 * array values.
 	 *
-	 * @param \CodeIgniter\HTTP\RequestInterface $request
+	 * @param RequestInterface $request
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function withRequest(RequestInterface $request): ValidationInterface;
 
@@ -94,7 +65,7 @@
 	 * @param array $rules
 	 * @param array $messages
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function setRules(array $rules, array $messages = []): ValidationInterface;
 
@@ -146,7 +117,7 @@
 	 * @param string $alias
 	 * @param string $error
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function setError(string $alias, string $error): ValidationInterface;
 
@@ -158,7 +129,7 @@
 	 * Resets the class to a blank slate. Should be called whenever
 	 * you need to process more than one array.
 	 *
-	 * @return \CodeIgniter\Validation\ValidationInterface
+	 * @return ValidationInterface
 	 */
 	public function reset(): ValidationInterface;
 
diff --git a/system/View/Cell.php b/system/View/Cell.php
index d3cc6bc..bded0ff 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -1,39 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -41,6 +14,7 @@
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\View\Exceptions\ViewException;
 use Config\Services;
+use ReflectionException;
 use ReflectionMethod;
 
 /**
@@ -67,12 +41,9 @@
  *         class Class {
  *             function method(array $params=null)
  *         }
- *
- * @package CodeIgniter\View
  */
 class Cell
 {
-
 	/**
 	 * Instance of the current Cache Instance
 	 *
@@ -85,7 +56,7 @@
 	/**
 	 * Cell constructor.
 	 *
-	 * @param \CodeIgniter\Cache\CacheInterface $cache
+	 * @param CacheInterface $cache
 	 */
 	public function __construct(CacheInterface $cache)
 	{
@@ -103,7 +74,7 @@
 	 * @param string|null $cacheName
 	 *
 	 * @return string
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	public function render(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
 	{
@@ -148,21 +119,22 @@
 
 			$output = $instance->{$method}();
 		}
-		elseif (($paramCount === 1) && (
-				( ! array_key_exists($refParams[0]->name, $paramArray)) ||
-				(array_key_exists($refParams[0]->name, $paramArray) && count($paramArray) !== 1) )
+		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      = [];
-			$method_params = [];
+			$fireArgs     = [];
+			$methodParams = [];
 
 			foreach ($refParams as $arg)
 			{
-				$method_params[$arg->name] = true;
+				$methodParams[$arg->name] = true;
 				if (array_key_exists($arg->name, $paramArray))
 				{
 					$fireArgs[$arg->name] = $paramArray[$arg->name];
@@ -171,7 +143,7 @@
 
 			foreach ($paramArray as $key => $val)
 			{
-				if (! isset($method_params[$key]))
+				if (! isset($methodParams[$key]))
 				{
 					throw ViewException::forInvalidCellParameter($key);
 				}
@@ -194,21 +166,21 @@
 	 * If a string, it should be in the format "key1=value key2=value".
 	 * It will be split and returned as an array.
 	 *
-	 * @param $params
+	 * @param mixed $params
 	 *
 	 * @return array|null
 	 */
 	public function prepareParams($params)
 	{
-		if (empty($params) || ( ! is_string($params) && ! is_array($params)))
+		if (empty($params) || (! is_string($params) && ! is_array($params)))
 		{
 			return [];
 		}
 
 		if (is_string($params))
 		{
-			$new_params = [];
-			$separator  = ' ';
+			$newParams = [];
+			$separator = ' ';
 
 			if (strpos($params, ',') !== false)
 			{
@@ -222,14 +194,14 @@
 			{
 				if (! empty($p))
 				{
-					list($key, $val)        = explode('=', $p);
-					$new_params[trim($key)] = trim($val, ', ');
+					list($key, $val)       = explode('=', $p);
+					$newParams[trim($key)] = trim($val, ', ');
 				}
 			}
 
-			$params = $new_params;
+			$params = $newParams;
 
-			unset($new_params);
+			unset($newParams);
 		}
 
 		if (is_array($params) && empty($params))
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
index d5d57f5..fc8d3be 100644
--- a/system/View/Exceptions/ViewException.php
+++ b/system/View/Exceptions/ViewException.php
@@ -1,9 +1,19 @@
-<?php namespace CodeIgniter\View\Exceptions;
+<?php
 
-use CodeIgniter\Exceptions\ExceptionInterface;
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View\Exceptions;
+
 use CodeIgniter\Exceptions\FrameworkException;
 
-class ViewException extends FrameworkException implements ExceptionInterface
+class ViewException extends FrameworkException
 {
 	public static function forInvalidCellMethod(string $class, string $method)
 	{
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 8d8ed74..cae51b9 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -50,7 +22,7 @@
 	/**
 	 * Returns $value as all lowercase with the first letter capitalized.
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return string
 	 */
@@ -64,7 +36,7 @@
 	/**
 	 * Formats a date into the given $format.
 	 *
-	 * @param $value
+	 * @param mixed  $value
 	 * @param string $format
 	 *
 	 * @return string
@@ -88,13 +60,13 @@
 	 * Example:
 	 *      my_date|date_modify(+1 day)
 	 *
-	 * @param $value
+	 * @param string $value
 	 * @param string $adjustment
 	 *
-	 * @return   string
+	 * @return   integer|false
 	 * @internal param string $format
 	 */
-	public static function date_modify($value, string $adjustment): string
+	public static function date_modify($value, string $adjustment)
 	{
 		$value = static::date($value, 'Y-m-d H:i:s');
 
@@ -106,7 +78,7 @@
 	/**
 	 * Returns the given default value if $value is empty or undefined.
 	 *
-	 * @param $value
+	 * @param mixed  $value
 	 * @param string $default
 	 *
 	 * @return string
@@ -123,7 +95,7 @@
 	/**
 	 * Escapes the given value with our `esc()` helper function.
 	 *
-	 * @param $value
+	 * @param string $value
 	 * @param string $context
 	 *
 	 * @return string
@@ -173,7 +145,7 @@
 	/**
 	 * Highlights code samples with HTML/CSS.
 	 *
-	 * @param $value
+	 * @param string $value
 	 *
 	 * @return string
 	 */
@@ -190,7 +162,7 @@
 	 * 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 $value
+	 * @param string  $value
 	 * @param integer $limit
 	 *
 	 * @return string
@@ -207,7 +179,7 @@
 	/**
 	 * Limits the number of words to $limit, and trails of with an ellipsis.
 	 *
-	 * @param $value
+	 * @param string  $value
 	 * @param integer $limit
 	 *
 	 * @return string
@@ -224,10 +196,10 @@
 	/**
 	 * Returns the $value displayed in a localized manner.
 	 *
-	 * @param $value
-	 * @param integer     $precision
-	 * @param string      $type
-	 * @param string|null $locale
+	 * @param integer|float $value
+	 * @param integer       $precision
+	 * @param string        $type
+	 * @param string|null   $locale
 	 *
 	 * @return string
 	 */
@@ -253,10 +225,10 @@
 	/**
 	 * Returns the $value displayed as a currency string.
 	 *
-	 * @param $value
-	 * @param string      $currency
-	 * @param string|null $locale
-	 * @param integer     $fraction
+	 * @param integer|float $value
+	 * @param string        $currency
+	 * @param string|null   $locale
+	 * @param integer       $fraction
 	 *
 	 * @return string
 	 */
@@ -318,9 +290,9 @@
 	 * @param mixed  $precision
 	 * @param string $type
 	 *
-	 * @return string
+	 * @return string|float
 	 */
-	public static function round(string $value, $precision = 2, string $type = 'common'): string
+	public static function round(string $value, $precision = 2, string $type = 'common')
 	{
 		if (! is_numeric($precision))
 		{
@@ -331,11 +303,11 @@
 		switch ($type)
 		{
 			case 'common':
-				return round($value, $precision);
+				return round((float) $value, $precision);
 			case 'ceil':
-				return ceil($value);
+				return ceil((float) $value);
 			case 'floor':
-				return floor($value);
+				return floor((float) $value);
 		}
 
 		// Still here, just return the value.
diff --git a/system/View/Parser.php b/system/View/Parser.php
index d5b0de1..7481a9c 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -1,57 +1,26 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
+use Config\View as ViewConfig;
+use ParseError;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class Parser
- *
- *  ClassFormerlyKnownAsTemplateParser
- *
- * @package CodeIgniter\View
+ * Class for parsing pseudo-vars
  */
 class Parser extends View
 {
-
 	/**
 	 * Left delimiter character for pseudo vars
 	 *
@@ -93,13 +62,13 @@
 	/**
 	 * Constructor
 	 *
-	 * @param \Config\View    $config
+	 * @param ViewConfig      $config
 	 * @param string          $viewPath
 	 * @param mixed           $loader
 	 * @param boolean         $debug
 	 * @param LoggerInterface $logger
 	 */
-	public function __construct($config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
+	public function __construct(ViewConfig $config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
 	{
 		// Ensure user plugins override core plugins.
 		$this->plugins = $config->plugins ?? [];
@@ -148,13 +117,14 @@
 
 		if (! is_file($file))
 		{
-			$file = $this->loader->locateFile($view, 'Views');
-		}
+			$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($file);
+			// locateFile will return an empty string if the file cannot be found.
+			if (empty($file))
+			{
+				throw ViewException::forInvalidFile($fileOrig);
+			}
 		}
 
 		if (is_null($this->tempData))
@@ -173,7 +143,7 @@
 		// Should we cache?
 		if (isset($options['cache']))
 		{
-			cache()->save($cacheName, $output, (int) $options['cache']);
+			cache()->save($cacheName, $output, (int) $options['cache']); // @phpstan-ignore-line
 		}
 		$this->tempData = null;
 		return $output;
@@ -333,7 +303,7 @@
 	 */
 	protected function parseSingle(string $key, string $val): array
 	{
-		$pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*!?' . $this->rightDelimiter . '#ms';
+		$pattern = '#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '(?(?=\s*\|\s*)(\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*))(\s*)!?' . $this->rightDelimiter . '#ms';
 
 		return [$pattern => $val];
 	}
@@ -359,8 +329,8 @@
 		// 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
+			'#' . $this->leftDelimiter . '\s*' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '(.+?)' .
+			$this->leftDelimiter . '\s*' . '/' . preg_quote($variable) . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
 		);
 
 		/*
@@ -383,9 +353,9 @@
 					$row = $row->toArray();
 				}
 				// Otherwise, cast as an array and it will grab public properties.
-				else if (is_object($row))
+				elseif (is_object($row))
 				{
-					$row = (array)$row;
+					$row = (array) $row;
 				}
 
 				$temp  = [];
@@ -400,37 +370,39 @@
 
 						if (! empty($pair))
 						{
-							$pairs[array_keys( $pair )[0]] = true;
-							$temp                          = array_merge($temp, $pair);
+							$pairs[array_keys($pair)[0]] = true;
+
+							$temp = array_merge($temp, $pair);
 						}
 
 						continue;
 					}
-					else if (is_object($val))
+
+					if (is_object($val))
 					{
 						$val = 'Class: ' . get_class($val);
 					}
-					else if (is_resource($val))
+					elseif (is_resource($val))
 					{
 						$val = 'Resource';
 					}
 
-					$temp['#' . $this->leftDelimiter . '!?\s*' . preg_quote($key) . '\s*\|*\s*([|\w<>=\(\),:.\-\s\+\\\\/]+)*\s*!?' . $this->rightDelimiter . '#s'] = $val;
+					$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] ) );
+					$out = $this->replaceSingle($pattern, $content, $out, ! isset($pairs[$pattern]));
 				}
 
 				$str .= $out;
 			}
 
 			//Escape | character from filters as it's handled as OR in regex
-			$escaped_match = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
+			$escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
 
-			$replace['#' . $escaped_match . '#s'] = $str;
+			$replace['#' . $escapedMatch . '#s'] = $str;
 		}
 
 		return $replace;
@@ -558,7 +530,7 @@
 		{
 			eval('?>' . $template . '<?php ');
 		}
-		catch (\ParseError $e)
+		catch (ParseError $e)
 		{
 			ob_end_clean();
 			throw ViewException::forTagSyntaxError(str_replace(['?>', '<?php '], '', $template));
@@ -589,21 +561,28 @@
 	 * Handles replacing a pseudo-variable with the actual content. Will double-check
 	 * for escaping brackets.
 	 *
-	 * @param $pattern
-	 * @param $content
-	 * @param $template
-	 * @param boolean  $escape
+	 * @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 mis-interpreted, so slash them
+		// Any dollar signs in the pattern will be misinterpreted, so slash them
 		$pattern = addcslashes($pattern, '$');
 
+		// Flesh out the main pattern from the delimiters and escape the hash
+		// See https://regex101.com/r/1GIHTa/1
+		if (preg_match('/^(#)(.*)(#(m?s)?)$/', $pattern, $parts))
+		{
+			$pattern = $parts[1] . addcslashes($parts[2], '#') . $parts[3];
+		}
+
 		// Replace the content in the template
 		$template = preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
-			// Check for {! !} syntax to not-escape this one.
+			// Check for {! !} syntax to not escape this one.
 			if (strpos($matches[0], '{!') === 0 && substr($matches[0], -2) === '!}')
 			{
 				$escape = false;
@@ -632,9 +611,9 @@
 
 		// 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 = isset($matches[0]) ? explode('|', $matches[0]) : [];
+		$filters = ! empty($matches[1]) ? explode('|', $matches[1]) : [];
 
-		if ($escape && ! isset($matches[0]))
+		if ($escape && empty($filters))
 		{
 			if ($context = $this->shouldAddEscaping($orig))
 			{
@@ -747,9 +726,7 @@
 
 	/**
 	 * Scans the template for any parser plugins, and attempts to execute them.
-	 * Plugins are notated based on {+ +} opening and closing braces.
-	 *
-	 * When encountered,
+	 * Plugins are delimited by {+ ... +}
 	 *
 	 * @param string $template
 	 *
@@ -763,7 +740,10 @@
 			$isPair   = is_array($callable);
 			$callable = $isPair ? array_shift($callable) : $callable;
 
-			$pattern = $isPair ? '#{\+\s*' . $plugin . '([\w\d=-_:\+\s()/\"@.]*)?\s*\+}(.+?){\+\s*/' . $plugin . '\s*\+}#ims' : '#{\+\s*' . $plugin . '([\w\d=-_:\+\s()/\"@.]*)?\s*\+}#ims';
+			// 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
@@ -773,9 +753,7 @@
 			 *   $matches[1] = all parameters string in opening tag
 			 *   $matches[2] = content between the tags to send to the plugin.
 			 */
-			preg_match_all($pattern, $template, $matches, PREG_SET_ORDER);
-
-			if (empty($matches))
+			if (! preg_match_all($pattern, $template, $matches, PREG_SET_ORDER))
 			{
 				continue;
 			}
@@ -785,9 +763,11 @@
 				$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]);
@@ -798,7 +778,9 @@
 					}
 				}
 
-				$template = $isPair ? str_replace($match[0], $callable($match[2], $params), $template) : str_replace($match[0], $callable($params), $template);
+				$template = $isPair
+					? str_replace($match[0], $callable($match[2], $params), $template)
+					: str_replace($match[0], $callable($params), $template);
 			}
 		}
 
@@ -842,7 +824,7 @@
 	 * Converts an object to an array, respecting any
 	 * toArray() methods on an object.
 	 *
-	 * @param $value
+	 * @param mixed $value
 	 *
 	 * @return mixed
 	 */
@@ -855,9 +837,9 @@
 			$value = $value->toArray();
 		}
 		// Otherwise, cast as an array and it will grab public properties.
-		else if (is_object($value))
+		elseif (is_object($value))
 		{
-			$value = (array)$value;
+			$value = (array) $value;
 		}
 
 		return $value;
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index bc88334..05bb2af 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -1,54 +1,28 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
 
- /**
-  * View plugins
-  */
+use CodeIgniter\HTTP\URI;
+use Config\Services;
+
+/**
+ * View plugins
+ */
 class Plugins
 {
-
 	/**
 	 * Wrap helper function to use as view plugin.
 	 *
-	 * @return string|\CodeIgniter\HTTP\URI
+	 * @return string|URI
 	 */
 	public static function currentURL()
 	{
@@ -60,7 +34,7 @@
 	/**
 	 * Wrap helper function to use as view plugin.
 	 *
-	 * @return \CodeIgniter\HTTP\URI|mixed|string
+	 * @return URI|mixed|string
 	 */
 	public static function previousURL()
 	{
@@ -130,7 +104,7 @@
 	 */
 	public static function ValidationErrors(array $params = []): string
 	{
-		$validator = \Config\Services::validation();
+		$validator = Services::validation();
 		if (empty($params))
 		{
 			return $validator->listErrors();
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index b046835..c8a3b7a 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -1,40 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -43,12 +15,9 @@
  * Interface RendererInterface
  *
  * The interface used for displaying Views and/or theme files.
- *
- * @package CodeIgniter\View
  */
 interface RendererInterface
 {
-
 	/**
 	 * Builds the output based upon a file name and any
 	 * data that has already been set.
@@ -57,9 +26,7 @@
 	 * @param array   $options  Reserved for 3rd-party uses since
 	 *                          it might be needed to pass additional info
 	 *                          to other template engines.
-	 * @param boolean $saveData If true, will save data for use with any other calls,
-	 *                          if false, will clean the data after displaying the view,
-	 *                             if not specified, use the config setting.
+	 * @param boolean $saveData Whether to save data for subsequent calls
 	 *
 	 * @return string
 	 */
@@ -75,9 +42,7 @@
 	 * @param array   $options  Reserved for 3rd-party uses since
 	 *                          it might be needed to pass additional info
 	 *                          to other template engines.
-	 * @param boolean $saveData If true, will save data for use with any other calls,
-	 *                          if false, will clean the data after displaying the view,
-	 *                             if not specified, use the config setting.
+	 * @param boolean $saveData Whether to save data for subsequent calls
 	 *
 	 * @return string
 	 */
diff --git a/system/View/Table.php b/system/View/Table.php
index 1447132..f25b5c5 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -1,40 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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     EllisLab Dev Team
- * @copyright  Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright  Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 1.3.1
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
@@ -45,15 +17,9 @@
  * HTML Table Generating Class
  *
  * Lets you create tables manually or from database result objects, or arrays.
- *
- * @package    CodeIgniter
- * @subpackage Libraries
- * @category   HTML Tables
- * @author     EllisLab Dev Team
  */
 class Table
 {
-
 	/**
 	 * Data for table rows
 	 *
@@ -85,7 +51,7 @@
 	/**
 	 * Table caption
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	public $caption;
 
@@ -113,7 +79,7 @@
 	/**
 	 * Callback for custom table layout
 	 *
-	 * @var function
+	 * @var callable|null
 	 */
 	public $function;
 
@@ -189,11 +155,11 @@
 	 *
 	 * @param  array   $array
 	 * @param  integer $columnLimit
-	 * @return array
+	 * @return array|false
 	 */
 	public function makeColumns($array = [], $columnLimit = 0)
 	{
-		if (! is_array($array) || count($array) === 0 || ! is_int($columnLimit))
+		if (! is_array($array) || $array === [] || ! is_int($columnLimit))
 		{
 			return false;
 		}
@@ -214,7 +180,7 @@
 
 			if (count($temp) < $columnLimit)
 			{
-				for ($i = count($temp); $i < $columnLimit; $i ++)
+				for ($i = count($temp); $i < $columnLimit; $i++)
 				{
 					$temp[] = '&nbsp;';
 				}
@@ -224,6 +190,7 @@
 		}
 		while (count($array) > 0);
 
+		// @phpstan-ignore-next-line
 		return $new;
 	}
 
@@ -265,10 +232,10 @@
 	 *
 	 * Ensures a standard associative array format for all cell data
 	 *
-	 * @param  array
+	 * @param  array $args
 	 * @return array
 	 */
-	protected function _prepArgs($args)
+	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
@@ -280,7 +247,7 @@
 
 		foreach ($args as $key => $val)
 		{
-			is_array($val) || $args[$key] = ['data' => $val];
+			is_array($val) || $args[$key] = ['data' => $val]; // @phpstan-ignore-line
 		}
 
 		return $args;
@@ -305,7 +272,8 @@
 	/**
 	 * Generate the table
 	 *
-	 * @param  mixed $tableData
+	 * @param mixed $tableData
+	 *
 	 * @return string
 	 */
 	public function generate($tableData = null)
@@ -340,7 +308,6 @@
 		}
 
 		// Build the table!
-
 		$out = $this->template['table_open'] . $this->newline;
 
 		// Add any caption here
@@ -378,10 +345,11 @@
 			$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_';
+				$name = fmod($i++, 2) ? '' : 'alt_';
 
 				$out .= $this->template['row_' . $name . 'start'] . $this->newline;
 
@@ -418,6 +386,8 @@
 
 				$out .= $this->template['row_' . $name . 'end'] . $this->newline;
 			}
+
+			$out .= $this->template['tbody_close'] . $this->newline;
 		}
 
 		// Any table footing to display?
@@ -443,8 +413,6 @@
 			$out .= $this->template['footing_row_end'] . $this->newline . $this->template['tfoot_close'] . $this->newline;
 		}
 
-		$out .= $this->template['tbody_close'] . $this->newline;
-
 		// And finally, close off the table
 		$out .= $this->template['table_close'];
 
@@ -529,12 +497,12 @@
 			return;
 		}
 
-		$this->temp = $this->_defaultTemplate();
+		$temp = $this->_defaultTemplate();
 		foreach (['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'] as $val)
 		{
 			if (! isset($this->template[$val]))
 			{
-				$this->template[$val] = $this->temp[$val];
+				$this->template[$val] = $temp[$val];
 			}
 		}
 	}
diff --git a/system/View/View.php b/system/View/View.php
index ff138dd..9357293 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -1,56 +1,30 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
 
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Debug\Toolbar\Collectors\Views;
 use CodeIgniter\View\Exceptions\ViewException;
 use Config\Services;
+use Config\Toolbar;
+use Config\View as ViewConfig;
 use Psr\Log\LoggerInterface;
+use RuntimeException;
 
 /**
  * Class View
- *
- * @package CodeIgniter\View
  */
 class View implements RendererInterface
 {
-
 	/**
 	 * Data that is made available to the Views.
 	 *
@@ -82,14 +56,14 @@
 	 * we need to attempt to find a view
 	 * that's not in standard place.
 	 *
-	 * @var \CodeIgniter\Autoloader\FileLocator
+	 * @var FileLocator
 	 */
 	protected $loader;
 
 	/**
 	 * Logger instance.
 	 *
-	 * @var \CodeIgniter\Log\Logger
+	 * @var LoggerInterface
 	 */
 	protected $logger;
 
@@ -109,7 +83,7 @@
 	protected $performanceData = [];
 
 	/**
-	 * @var \Config\View
+	 * @var ViewConfig
 	 */
 	protected $config;
 
@@ -131,7 +105,7 @@
 	 * The name of the layout being used, if any.
 	 * Set by the `extend` method used within views.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $layout;
 
@@ -146,44 +120,44 @@
 	 * The name of the current section being rendered,
 	 * if any.
 	 *
-	 * @var string
+	 * @var string|null
 	 */
 	protected $currentSection;
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor
 	 *
-	 * @param \Config\View    $config
-	 * @param string          $viewPath
-	 * @param mixed           $loader
-	 * @param boolean         $debug
-	 * @param LoggerInterface $logger
+	 * @param ViewConfig       $config
+	 * @param string|null      $viewPath
+	 * @param FileLocator|null $loader
+	 * @param boolean|null     $debug
+	 * @param LoggerInterface  $logger
 	 */
-	public function __construct($config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
+	public function __construct(ViewConfig $config, string $viewPath = null, FileLocator $loader = null, bool $debug = null, LoggerInterface $logger = null)
 	{
 		$this->config   = $config;
-		$this->viewPath = rtrim($viewPath, '/ ') . '/';
-		$this->loader   = is_null($loader) ? Services::locator() : $loader;
-		$this->logger   = is_null($logger) ? Services::logger() : $logger;
-		$this->debug    = is_null($debug) ? CI_DEBUG : $debug;
-		$this->saveData = $config->saveData ?? null;
+		$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
+	 *  - cache      Number of seconds to cache for
+	 *  - cache_name Name to use for cache
 	 *
-	 * @param string  $view
-	 * @param array   $options
-	 * @param boolean $saveData
+	 * @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
 	 */
@@ -194,23 +168,24 @@
 		// Store the results here so even if
 		// multiple views are called in a view, it won't
 		// clean it unless we mean it to.
-		if (is_null($saveData))
-		{
-			$saveData = $this->saveData;
-		}
+		$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;
+		$this->renderVars['options'] = $options ?? [];
 
 		// Was it cached?
 		if (isset($this->renderVars['options']['cache']))
 		{
-			$this->renderVars['cacheName'] = $this->renderVars['options']['cache_name'] ?? str_replace('.php', '', $this->renderVars['view']);
+			$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;
 			}
 		}
@@ -229,23 +204,25 @@
 		}
 
 		// Make our view data available to the view.
-
-		if (is_null($this->tempData))
-		{
-			$this->tempData = $this->data;
-		}
-
-		extract($this->tempData);
+		$this->tempData = $this->tempData ?? $this->data;
 
 		if ($saveData)
 		{
 			$this->data = $this->tempData;
 		}
 
-		ob_start();
-		include($this->renderVars['file']); // PHP will be processed
-		$output = ob_get_contents();
-		@ob_end_clean();
+		// 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
@@ -254,28 +231,28 @@
 		{
 			$layoutView   = $this->layout;
 			$this->layout = null;
-			$output       = $this->render($layoutView, $options, $saveData);
+			// 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))
+		if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
+			&& in_array('CodeIgniter\Filters\DebugToolbar', service('filters')->getFiltersClass()['after'], true)
+		)
 		{
-			$toolbarCollectors = config(\Config\Toolbar::class)->collectors;
+			$toolbarCollectors = config(Toolbar::class)->collectors;
 
-			if (in_array(\CodeIgniter\Debug\Toolbar\Collectors\Views::class, $toolbarCollectors))
+			if (in_array(Views::class, $toolbarCollectors, true))
 			{
 				// Clean up our path names to make them a little cleaner
-				foreach (['APPPATH', 'SYSTEMPATH', 'ROOTPATH'] as $path)
-				{
-					if (strpos($this->renderVars['file'], constant($path)) === 0)
-					{
-						$this->renderVars['file'] = str_replace(constant($path), $path . '/', $this->renderVars['file']);
-						break;
-					}
-				}
+				$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 = '<!-- DEBUG-VIEW START ' . $this->renderVars['file'] . ' -->' . PHP_EOL
 					. $output . PHP_EOL
 					. '<!-- DEBUG-VIEW ENDED ' . $this->renderVars['file'] . ' -->' . PHP_EOL;
 			}
@@ -292,59 +269,45 @@
 		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   $options  Reserved for 3rd-party uses since
-	 *                          it might be needed to pass additional info
-	 *                          to other template engines.
-	 * @param boolean $saveData If true, will save data for use with any other calls,
-	 *                          if false, will clean the data after displaying the view,
-	 *                             if not specified, use the config setting.
+	 * @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);
-
-		if (is_null($saveData))
-		{
-			$saveData = $this->saveData;
-		}
-
-		if (is_null($this->tempData))
-		{
-			$this->tempData = $this->data;
-		}
-
-		extract($this->tempData);
+		$start          = microtime(true);
+		$saveData       = $saveData ?? $this->saveData;
+		$this->tempData = $this->tempData ?? $this->data;
 
 		if ($saveData)
 		{
 			$this->data = $this->tempData;
 		}
 
-		ob_start();
-		$incoming = '?>' . $view;
-		eval($incoming);
-		$output = ob_get_contents();
-		@ob_end_clean();
+		$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
 	 *
@@ -357,8 +320,6 @@
 		return (strlen($string) > $length) ? substr($string, 0, $length - 3) . '...' : $string;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets several pieces of view data at once.
 	 *
@@ -370,7 +331,7 @@
 	 */
 	public function setData(array $data = [], string $context = null): RendererInterface
 	{
-		if (! empty($context))
+		if ($context)
 		{
 			$data = \esc($data, $context);
 		}
@@ -381,8 +342,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets a single piece of view data.
 	 *
@@ -395,7 +354,7 @@
 	 */
 	public function setVar(string $name, $value = null, string $context = null): RendererInterface
 	{
-		if (! empty($context))
+		if ($context)
 		{
 			$value = \esc($value, $context);
 		}
@@ -406,8 +365,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Removes all of the view data from the system.
 	 *
@@ -420,8 +377,6 @@
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the current data that will be displayed in the view.
 	 *
@@ -429,11 +384,9 @@
 	 */
 	public function getData(): array
 	{
-		return is_null($this->tempData) ? $this->data : $this->tempData;
+		return $this->tempData ?? $this->data;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Specifies that the current view should extend an existing layout.
 	 *
@@ -446,8 +399,6 @@
 		$this->layout = $layout;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Starts holds content for a section within the layout.
 	 *
@@ -460,12 +411,8 @@
 		ob_start();
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
-	 *
-	 *
-	 * @throws \Laminas\Escaper\Exception\RuntimeException
+	 * @throws RuntimeException
 	 */
 	public function endSection()
 	{
@@ -473,7 +420,7 @@
 
 		if (empty($this->currentSection))
 		{
-			throw new \RuntimeException('View themes, no current section.');
+			throw new RuntimeException('View themes, no current section.');
 		}
 
 		// Ensure an array exists so we can store multiple entries for this.
@@ -486,8 +433,6 @@
 		$this->currentSection = null;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Renders a section's contents.
 	 *
@@ -509,14 +454,12 @@
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Used within layout views to include additional views.
 	 *
 	 * @param string     $view
 	 * @param array|null $options
-	 * @param null       $saveData
+	 * @param boolean    $saveData
 	 *
 	 * @return string
 	 */
@@ -525,8 +468,6 @@
 		return $this->render($view, $options, $saveData);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Returns the performance data that might have been collected
 	 * during the execution. Used primarily in the Debug Toolbar.
@@ -538,28 +479,24 @@
 		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)
+		if ($this->debug)
 		{
-			return;
+			$this->performanceData[] = [
+				'start' => $start,
+				'end'   => $end,
+				'view'  => $view,
+			];
 		}
-
-		$this->performanceData[] = [
-			'start' => $start,
-			'end'   => $end,
-			'view'  => $view,
-		];
 	}
-
-	//--------------------------------------------------------------------
 }
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 9298baf..e892ed2 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -1,42 +1,21 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of the CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- * Copyright (c) 2019-2020 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-2020 CodeIgniter Foundation
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  */
 
+use CodeIgniter\CodeIgniter;
+use CodeIgniter\Config\DotEnv;
+use Config\App;
+use Config\Autoload;
+use Config\Modules;
+use Config\Services;
+
 /*
  * ---------------------------------------------------------------
  * SETUP OUR PATH CONSTANTS
@@ -47,44 +26,46 @@
  * so they are available in the config files that are loaded.
  */
 
-/**
- * The path to the application directory.
- */
+// The path to the application directory.
 if (! defined('APPPATH'))
 {
-	define('APPPATH', realpath($paths->appDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('APPPATH', realpath(rtrim($paths->appDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the project root directory. Just above APPPATH.
- */
+// The path to the project root directory. Just above APPPATH.
 if (! defined('ROOTPATH'))
 {
 	define('ROOTPATH', realpath(APPPATH . '../') . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the system directory.
- */
+// The path to the system directory.
 if (! defined('SYSTEMPATH'))
 {
-	define('SYSTEMPATH', realpath($paths->systemDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('SYSTEMPATH', realpath(rtrim($paths->systemDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the writable directory.
- */
+// The path to the writable directory.
 if (! defined('WRITEPATH'))
 {
-	define('WRITEPATH', realpath($paths->writableDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('WRITEPATH', realpath(rtrim($paths->writableDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
-/**
- * The path to the tests directory
- */
+// The path to the tests directory
 if (! defined('TESTPATH'))
 {
-	define('TESTPATH', realpath($paths->testsDirectory) . DIRECTORY_SEPARATOR);
+	/**
+	 * @var \Config\Paths $paths
+	 */
+	define('TESTPATH', realpath(rtrim($paths->testsDirectory, '\\/ ')) . DIRECTORY_SEPARATOR);
 }
 
 /*
@@ -97,8 +78,8 @@
 	require_once APPPATH . 'Config/Constants.php';
 }
 
-// Let's see if an app/Common.php file exists
-if (file_exists(APPPATH . 'Common.php'))
+// Require app/Common.php file if exists.
+if (is_file(APPPATH . 'Common.php'))
 {
 	require_once APPPATH . 'Common.php';
 }
@@ -111,12 +92,12 @@
  * LOAD OUR AUTOLOADER
  * ---------------------------------------------------------------
  *
- * The autoloader allows all of the pieces to work together
- * in the framework. We have to load it here, though, so
- * that the config files can use the path constants.
+ * The autoloader allows all of the pieces to work together in the
+ * framework. We have to load it here, though, so that the config
+ * files can use the path constants.
  */
 
-if (! class_exists(Config\Autoload::class, false))
+if (! class_exists('Config\Autoload', false))
 {
 	require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
 	require_once APPPATH . 'Config/Autoload.php';
@@ -135,14 +116,13 @@
 	class_alias('Config\Services', 'CodeIgniter\Services');
 }
 
-$loader = CodeIgniter\Services::autoloader();
-$loader->initialize(new Config\Autoload(), new Config\Modules());
-$loader->register();    // Register the loader with the SPL autoloader stack.
+// 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.
@@ -155,15 +135,13 @@
 	require_once COMPOSER_PATH;
 }
 
-// Load environment settings from .env files
-// into $_SERVER and $_ENV
+// Load environment settings from .env files into $_SERVER and $_ENV
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 
-$env = new \CodeIgniter\Config\DotEnv(ROOTPATH);
+$env = new DotEnv(ROOTPATH);
 $env->load();
 
-// Always load the URL helper -
-// it should be used in 90% of apps.
+// Always load the URL helper, it should be used in most of apps.
 helper('url');
 
 /*
@@ -176,8 +154,7 @@
  * the pieces all working together.
  */
 
-$appConfig = config(\Config\App::class);
-$app       = new \CodeIgniter\CodeIgniter($appConfig);
+$app = new CodeIgniter(new App());
 $app->initialize();
 
 return $app;