From 08336b6a5da2f70bff9f9b3d0771072bf054e944 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 13 May 2021 21:07:18 +0000
Subject: [PATCH] Patch to framework latest

---
 app/Config/App.php                        | 686 ++++++++++++++--------
 app/Config/Autoload.php                   |  34 +-
 app/Config/Cache.php                      |  16 +
 app/Config/ContentSecurityPolicy.php      | 169 +++++-
 app/Config/Cookie.php                     | 119 ++++
 app/Config/Events.php                     |   6 +-
 app/Config/Exceptions.php                 |  72 ++-
 app/Config/Generators.php                 |  39 ++
 app/Config/Logger.php                     | 171 +++---
 app/Config/Mimes.php                      |  30 +-
 app/Config/Modules.php                    |  60 +-
 app/Config/Security.php                   |  95 +++
 app/Config/Services.php                   |  25 +-
 app/Controllers/BaseController.php        |  15 +-
 app/Controllers/Home.php                  |   4 +-
 app/Views/errors/cli/error_404.php        |   1 +
 app/Views/errors/cli/error_exception.php  |  81 ++-
 app/Views/errors/html/debug.css           | 210 ++++---
 app/Views/errors/html/error_404.php       | 126 ++--
 app/Views/errors/html/error_exception.php |  99 ++--
 composer.lock                             | 148 ++++-
 env                                       |  50 +-
 public/index.php                          |   8 -
 spark                                     |  21 +-
 24 files changed, 1596 insertions(+), 689 deletions(-)
 create mode 100644 app/Config/Cookie.php
 create mode 100644 app/Config/Generators.php
 create mode 100644 app/Config/Security.php

diff --git a/app/Config/App.php b/app/Config/App.php
index 71aa2db..a179f6a 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -1,282 +1,480 @@
-<?php namespace Config;
+<?php
+
+namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
 
 class App extends BaseConfig
 {
-    // Cache expiration time for GitHub data
-    public $gitHubExpires = 14400; // 4 hours
-
-    /*
-    |--------------------------------------------------------------------------
-    | MY BB Forum configurations
-    |--------------------------------------------------------------------------
-    | @mybb_news_forum_id - Code for the news forum in our MyBB
-    | @mybb_news_usernames - An array of user names to restrict our search for news articles to. This simply helps limit the work to do.
-    | @mybb_forum_url - The link to direct visitors to for our forum
-     */
-    public $mybbNewsForum_id = 2;
-    public $mybbNewsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
-    public $mybbForumURL = 'https://forum.codeigniter.com';
+	// Cache expiration time for GitHub data
+	public $gitHubExpires = 14400; // 4 hours
 
 	/*
 	|--------------------------------------------------------------------------
-	| Base Site URL
+	| MY BB Forum configurations
 	|--------------------------------------------------------------------------
-	|
-	| 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.
-	|
-	*/
+	| @mybb_news_forum_id - Code for the news forum in our MyBB
+	| @mybb_news_usernames - An array of user names to restrict our search for news articles to. This simply helps limit the work to do.
+	| @mybb_forum_url - The link to direct visitors to for our forum
+	 */
+	public $mybbNewsForum_id = 2;
+	public $mybbNewsUsernames = ['ciadmin', 'jlp', 'kilishan', 'Narf'];
+	public $mybbForumURL = 'https://forum.codeigniter.com';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
-	public $cookieHTTPOnly = false;
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$prefix property instead.
+	 */
+	public $cookiePrefix = '';
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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 Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$domain property instead.
+	 */
+	public $cookieDomain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$path property instead.
+	 */
+	public $cookiePath = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$secure property instead.
+	 */
+	public $cookieSecure = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HttpOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 *
+	 * @deprecated use Config\Cookie::$httponly property instead.
+	 */
+	public $cookieHTTPOnly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
+	 *
+	 * @var string
+	 *
+	 * @deprecated use Config\Cookie::$samesite property instead.
+	 */
+	public $cookieSameSite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Reverse Proxy IPs
+	 * --------------------------------------------------------------------------
+	 *
+	 * If your server is behind a reverse proxy, you must whitelist the proxy
+	 * IP addresses from which CodeIgniter should trust headers such as
+	 * HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+	 * the visitor's IP address.
+	 *
+	 * You can use both an array or a comma-separated list of proxy addresses,
+	 * as well as specifying whole subnets. Here are a few examples:
+	 *
+	 * Comma-separated:	'10.0.1.200,192.168.5.0/24'
+	 * Array: ['10.0.1.200', '192.168.5.0/24']
+	 *
+	 * @var string|string[]
+	 */
 	public $proxyIPs = '';
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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';
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Token Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The token name.
+	 *
+	 * @deprecated Use `Config\Security` $tokenName property instead of using this property.
+	 *
+	 * @var string
+	 */
+	public $CSRFTokenName = 'csrf_test_name';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Header Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The header name.
+	 *
+	 * @deprecated Use `Config\Security` $headerName property instead of using this property.
+	 *
+	 * @var string
+	 */
 	public $CSRFHeaderName = 'X-CSRF-TOKEN';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * CSRF Cookie Name
+	 * --------------------------------------------------------------------------
+	 *
+	 * The cookie name.
+	 *
+	 * @deprecated Use `Config\Security` $cookieName property instead of using this property.
+	 *
+	 * @var string
+	 */
 	public $CSRFCookieName = 'csrf_cookie_name';
-	public $CSRFExpire     = 7200;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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;
-	public $CSRFRedirect   = true;
 
-	/*
-	|--------------------------------------------------------------------------
-	| 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 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..1ed5e3f 100644
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -6,8 +6,9 @@
 
 /**
  * -------------------------------------------------------------------
- * AUTO-LOADER
+ * AUTOLOADER CONFIGURATION
  * -------------------------------------------------------------------
+ *
  * 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
@@ -31,13 +31,13 @@ class Autoload extends AutoloadConfig
 	 * else you will need to modify all of those classes for this to work.
 	 *
 	 * Prototype:
-	 *
+	 *```
 	 *   $psr4 = [
 	 *       'CodeIgniter' => SYSTEMPATH,
 	 *       'App'	       => APPPATH
 	 *   ];
-	 *
-	 * @var array
+	 *```
+	 * @var array<string, string>
 	 */
 	public $psr4 = [
 		APP_NAMESPACE => APPPATH, // For custom app namespace
@@ -55,12 +55,30 @@ class Autoload extends AutoloadConfig
 	 * were being autoloaded through a namespace.
 	 *
 	 * Prototype:
-	 *
+	 *```
 	 *   $classmap = [
 	 *       'MyClass'   => '/path/to/class/file.php'
 	 *   ];
-	 *
-	 * @var array
+	 *```
+	 * @var array<string, string>
 	 */
 	public $classmap = [];
+
+	/**
+	 * -------------------------------------------------------------------
+	 * Files
+	 * -------------------------------------------------------------------
+	 * The files array provides a list of paths to __non-class__ files
+	 * that will be autoloaded. This can be useful for bootstrap operations
+	 * or for loading functions.
+	 *
+	 * Prototype:
+	 * ```
+	 *	  $files = [
+	 *	 	   '/path/to/my/file.php',
+	 *    ];
+	 * ```
+	 * @var array<int, string>
+	 */
+	public $files = [];
 }
diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index 8c7900a..a3b3bbc 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -46,6 +46,8 @@ class Cache extends BaseConfig
 	 * system.
 	 *
 	 * @var string
+	 *
+	 * @deprecated Use the driver-specific variant under $file
 	 */
 	public $storePath = WRITEPATH . 'cache/';
 
@@ -80,6 +82,20 @@ class Cache extends BaseConfig
 	 */
 	public $prefix = '';
 
+	/**
+	 * --------------------------------------------------------------------------
+	 * 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
diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index 0e6955a..a04e3d0 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -1,48 +1,167 @@
-<?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
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Default CSP report context
+	 *
+	 * @var boolean
+	 */
+	public $reportOnly = false;
 
-	public $reportOnly              = false; // default CSP report context
-	public $reportURI               = null; // URL to send violation reports to
-	public $upgradeInsecureRequests = false; // toggle for forcing https
+	/**
+	 * Specifies a URL where a browser will send reports
+	 * when a content security policy is violated.
+	 *
+	 * @var string|null
+	 */
+	public $reportURI = null;
 
-	// sources allowed; string or array of strings
+	/**
+	 * Instructs user agents to rewrite URL schemes, changing
+	 * HTTP to HTTPS. This directive is for websites with
+	 * large numbers of old URLs that need to be rewritten.
+	 *
+	 * @var boolean
+	 */
+	public $upgradeInsecureRequests = false;
+
+	//-------------------------------------------------------------------------
+	// Sources allowed
 	// Note: once you set a policy to 'none', it cannot be further restricted
+	//-------------------------------------------------------------------------
+
+	/**
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $defaultSrc = null;
+
+	/**
+	 * Lists allowed scripts' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $scriptSrc = 'self';
+
+	/**
+	 * Lists allowed stylesheets' URLs.
+	 *
+	 * @var string|string[]
+	 */
+	public $styleSrc = 'self';
+
+	/**
+	 * Defines the origins from which images can be loaded.
+	 *
+	 * @var string|string[]
+	 */
+	public $imageSrc = 'self';
+
+	/**
+	 * Restricts the URLs that can appear in a page's `<base>` element.
+	 *
+	 * Will default to self if not overridden
+	 *
+	 * @var string|string[]|null
+	 */
+	public $baseURI = null;
 
-	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';
+	/**
+	 * 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
+	/**
+	 * The frame-src directive restricts the URLs which may
+	 * be loaded into nested browsing contexts.
+	 *
+	 * @var array|string|null
+	 */
+	public $frameSrc = null;
+
+	/**
+	 * Restricts the origins allowed to deliver video and audio.
+	 *
+	 * @var string|string[]|null
+	 */
+	public $mediaSrc = null;
+
+	/**
+	 * Allows control over Flash and other plugins.
+	 *
+	 * @var string|string[]
+	 */
+	public $objectSrc = 'self';
+
+	/**
+	 * @var string|string[]|null
+	 */
+	public $manifestSrc = null;
+
+	/**
+	 * Limits the kinds of plugins a page may invoke.
+	 *
+	 * @var string|string[]|null
+	 */
 	public $pluginTypes = null;
 
-	// list of actions allowed; string or array of strings
+	/**
+	 * List of actions allowed.
+	 *
+	 * @var string|string[]|null
+	 */
 	public $sandbox = null;
-
 }
diff --git a/app/Config/Cookie.php b/app/Config/Cookie.php
new file mode 100644
index 0000000..4e4e20d
--- /dev/null
+++ b/app/Config/Cookie.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+use DateTimeInterface;
+
+class Cookie extends BaseConfig
+{
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Prefix
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set a cookie name prefix if you need to avoid collisions.
+	 *
+	 * @var string
+	 */
+	public $prefix = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Expires Timestamp
+	 * --------------------------------------------------------------------------
+	 *
+	 * Default expires timestamp for cookies. Setting this to `0` will mean the
+	 * cookie will not have the `Expires` attribute and will behave as a session
+	 * cookie.
+	 *
+	 * @var DateTimeInterface|integer|string
+	 */
+	public $expires = 0;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Path
+	 * --------------------------------------------------------------------------
+	 *
+	 * Typically will be a forward slash.
+	 *
+	 * @var string
+	 */
+	public $path = '/';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Domain
+	 * --------------------------------------------------------------------------
+	 *
+	 * Set to `.your-domain.com` for site-wide cookies.
+	 *
+	 * @var string
+	 */
+	public $domain = '';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Secure
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be set if a secure HTTPS connection exists.
+	 *
+	 * @var boolean
+	 */
+	public $secure = false;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie HTTPOnly
+	 * --------------------------------------------------------------------------
+	 *
+	 * Cookie will only be accessible via HTTP(S) (no JavaScript).
+	 *
+	 * @var boolean
+	 */
+	public $httponly = true;
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie SameSite
+	 * --------------------------------------------------------------------------
+	 *
+	 * Configure cookie SameSite setting. Allowed values are:
+	 * - None
+	 * - Lax
+	 * - Strict
+	 * - ''
+	 *
+	 * Alternatively, you can use the constant names:
+	 * - `Cookie::SAMESITE_NONE`
+	 * - `Cookie::SAMESITE_LAX`
+	 * - `Cookie::SAMESITE_STRICT`
+	 *
+	 * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
+	 * (empty string) means default SameSite attribute set by browsers (`Lax`)
+	 * will be set on cookies. If set to `None`, `$secure` must also be set.
+	 *
+	 * @var string
+	 */
+	public $samesite = 'Lax';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * Cookie Raw
+	 * --------------------------------------------------------------------------
+	 *
+	 * This flag allows setting a "raw" cookie, i.e., its name and value are
+	 * not URL encoded using `rawurlencode()`.
+	 *
+	 * If this is set to `true`, cookie names should be compliant of RFC 2616's
+	 * list of allowed characters.
+	 *
+	 * @var boolean
+	 *
+	 * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
+	 * @see https://tools.ietf.org/html/rfc2616#section-2.2
+	 */
+	public $raw = false;
+}
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 14bfd32..49dd96e 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 && ! is_cli())
 	{
 		Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
 		Services::toolbar()->respond();
diff --git a/app/Config/Exceptions.php b/app/Config/Exceptions.php
index 5fe33d3..671b078 100644
--- a/app/Config/Exceptions.php
+++ b/app/Config/Exceptions.php
@@ -1,42 +1,60 @@
-<?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';
+
+	/**
+	 * --------------------------------------------------------------------------
+	 * HIDE FROM DEBUG TRACE
+	 * --------------------------------------------------------------------------
+	 * Any data that you would like to hide from the debug trace.
+	 * In order to specify 2 levels, use "/" to separate.
+	 * ex. ['server', 'setup/password', 'secret_token']
+	 *
+	 * @var array
+	 */
+	public $sensitiveDataInTrace = [];
 }
diff --git a/app/Config/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/Logger.php b/app/Config/Logger.php
index 93d38f6..0cee08d 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' => [
 
 			/*
@@ -121,12 +129,27 @@ class Logger extends BaseConfig
 		 * The ChromeLoggerHandler requires the use of the Chrome web browser
 		 * and the ChromeLogger extension. Uncomment this block to use it.
 		 */
-		//      'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
-		//          /*
-		//           * The log levels that this handler will handle.
-		//           */
-		//          'handles' => ['critical', 'alert', 'emergency', 'debug',
-		//                        'error', 'info', 'notice', 'warning'],
-		//      ]
+		// 'CodeIgniter\Log\Handlers\ChromeLoggerHandler' => [
+		//     /*
+		//      * The log levels that this handler will handle.
+		//      */
+		//     'handles' => ['critical', 'alert', 'emergency', 'debug',
+		//                   'error', 'info', 'notice', 'warning'],
+		// ],
+
+		/**
+		 * The ErrorlogHandler writes the logs to PHP's native `error_log()` function.
+		 * Uncomment this block to use it.
+		 */
+		// 'CodeIgniter\Log\Handlers\ErrorlogHandler' => [
+		// 		/* The log levels this handler can handle. */
+		// 		'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+		//
+		// 		/*
+		// 		 * The message type where the error should go. Can be 0 or 4, or use the
+		// 		 * class constants: `ErrorlogHandler::TYPE_OS` (0) or `ErrorlogHandler::TYPE_SAPI` (4)
+		// 		 */
+		// 		'messageType' => 0,
+		// ],
 	];
 }
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 1760f91..7a32e84 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -12,6 +12,9 @@
  * 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
@@ -33,7 +36,6 @@ class Mimes
 			'text/csv',
 			'text/x-comma-separated-values',
 			'text/comma-separated-values',
-			'application/octet-stream',
 			'application/vnd.ms-excel',
 			'application/x-csv',
 			'text/x-csv',
@@ -69,7 +71,6 @@ class Mimes
 			'application/pdf',
 			'application/force-download',
 			'application/x-download',
-			'binary/octet-stream',
 		],
 		'ai'    => [
 			'application/pdf',
@@ -148,6 +149,7 @@ class Mimes
 			'multipart/x-zip',
 		],
 		'rar'   => [
+			'application/vnd.rar',
 			'application/x-rar',
 			'application/rar',
 			'application/x-rar-compressed',
@@ -333,6 +335,8 @@ class Mimes
 			'application/msword',
 			'application/x-zip',
 		],
+		'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+		'xlsm'  => 'application/vnd.ms-excel.sheet.macroEnabled.12',
 		'word'  => [
 			'application/msword',
 			'application/octet-stream',
@@ -472,6 +476,11 @@ class Mimes
 			'image/x-ico',
 			'image/vnd.microsoft.icon',
 		],
+		'stl'   => [
+			'application/sla',
+			'application/vnd.ms-pki.stl',
+			'application/x-navistyle',
+		],
 	];
 
 	/**
@@ -507,14 +516,23 @@ public static function guessExtensionFromType(string $type, string $proposedExte
 
 		$proposedExtension = trim(strtolower($proposedExtension));
 
-		if ($proposedExtension !== '' && array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension]))
+		if ($proposedExtension !== '')
 		{
-			return $proposedExtension;
+			if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true))
+			{
+				// The detected mime type matches with the proposed extension.
+				return $proposedExtension;
+			}
+
+			// An extension was proposed, but the media type does not match the mime type list.
+			return null;
 		}
 
+		// 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;
 			}
@@ -522,4 +540,4 @@ public static function guessExtensionFromType(string $type, string $proposedExte
 
 		return null;
 	}
-}
\ No newline at end of file
+}
diff --git a/app/Config/Modules.php b/app/Config/Modules.php
index 40cb987..0814a0c 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
+	 * $aliases 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/Security.php b/app/Config/Security.php
new file mode 100644
index 0000000..afdfd2e
--- /dev/null
+++ b/app/Config/Security.php
@@ -0,0 +1,95 @@
+<?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
+	 *
+	 * @deprecated
+	 */
+	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/Controllers/BaseController.php b/app/Controllers/BaseController.php
index ac1dec0..bd6bd0c 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -1,8 +1,11 @@
 <?php
+
 namespace App\Controllers;
 
 use App\Libraries\GitHubHelper;
 use CodeIgniter\Controller;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;
@@ -16,12 +19,16 @@
  *     class Home extends BaseController
  *
  * For security be sure to declare any new methods as protected or private.
- *
- * @package CodeIgniter
  */
 
 class BaseController extends Controller
 {
+	/**
+	 * Instance of the main Request object.
+	 *
+	 * @var IncomingRequest|CLIRequest
+	 */
+	protected $request;
 
 	/**
 	 * An array of helpers to be loaded automatically upon
@@ -44,6 +51,10 @@ public function __construct()
 
 	/**
 	 * Constructor.
+	 *
+	 * @param RequestInterface  $request
+	 * @param ResponseInterface $response
+	 * @param LoggerInterface   $logger
 	 */
 	public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
 	{
diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php
index bb37a19..0a4d407 100644
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -1,4 +1,6 @@
-<?php namespace App\Controllers;
+<?php
+
+namespace App\Controllers;
 
 use App\Libraries\GitHubHelper;
 
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..384d66d 100644
--- a/app/Views/errors/html/debug.css
+++ b/app/Views/errors/html/debug.css
@@ -1,177 +1,197 @@
+:root {
+	--main-bg-color: #fff;
+	--main-text-color: #555;
+	--dark-text-color: #222;
+	--light-text-color: #c7c7c7;
+	--brand-primary-color: #E06E3F;
+	--light-bg-color: #ededee;
+	--dark-bg-color: #404040;
+}
+
 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: var(--main-bg-color);
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+	color: var(--main-text-color);
+	font-weight: 300;
+	margin: 0;
+	padding: 0;
 }
 h1 {
-    font-weight: lighter;
-    letter-spacing: 0.8;
-    font-size: 3rem;
-    color: #222;
-    margin: 0;
+	font-weight: lighter;
+	letter-spacing: 0.8;
+	font-size: 3rem;
+	color: var(--dark-text-color);
+	margin: 0;
 }
 h1.headline {
-    margin-top: 20%;
-    font-size: 5rem;
+	margin-top: 20%;
+	font-size: 5rem;
 }
 .text-center {
-    text-align: center;
+	text-align: center;
 }
 p.lead {
-    font-size: 1.6rem;
+	font-size: 1.6rem;
 }
 .container {
-    max-width: 75rem;
-    margin: 0 auto;
-    padding: 1rem;
+	max-width: 75rem;
+	margin: 0 auto;
+	padding: 1rem;
 }
 .header {
-    background: #85271f;
-    color: #fff;
+	background: var(--light-bg-color);
+	color: var(--dark-text-color);
+}
+.header .container {
+	padding: 1rem 1.75rem 1.75rem 1.75rem;
 }
 .header h1 {
-    color: #fff;
+	font-size: 2.5rem;
+	font-weight: 500;
 }
 .header p {
-    font-size: 1.2rem;
-    margin: 0;
-    line-height: 2.5;
+	font-size: 1.2rem;
+	margin: 0;
+	line-height: 2.5;
 }
 .header a {
-    color: rgba(255,255,255,0.5);
-    margin-left: 2rem;
-    display: none;
-    text-decoration: none;
+	color: var(--brand-primary-color);
+	margin-left: 2rem;
+	display: none;
+	text-decoration: none;
 }
 .header:hover a {
-    display: inline;
+	display: inline;
 }
 
+.footer {
+	background: var(--dark-bg-color);
+	color: var(--light-text-color);
+}
 .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: #343434;
+	color: var(--light-text-color);
+	padding: 0.5em 1em;
+	border-radius: 5px;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-size: 0.85rem;
+	margin: 0;
+	overflow-x: scroll;
 }
 .source span.line {
-    line-height: 1.4;
+	line-height: 1.4;
 }
 .source span.line .number {
-    color: #666;
+	color: #666;
 }
 .source .line .highlight {
-    display: block;
-    background: #555;
-    color: #fff;
+	display: block;
+	background: var(--dark-text-color);
+	color: var(--light-text-color);
 }
 .source span.highlight .number {
-    color: #fff;
+	color: #fff;
 }
 
 .tabs {
-    list-style: none;
-    list-style-position: inside;
-    margin: 0;
-    padding: 0;
-    margin-bottom: -1px;
+	list-style: none;
+	list-style-position: inside;
+	margin: 0;
+	padding: 0;
+	margin-bottom: -1px;
 }
 .tabs li {
-    display: inline;
+	display: inline;
 }
 .tabs a:link,
 .tabs a:visited {
-    padding: 0rem 1rem;
-    line-height: 2.7;
-    text-decoration: none;
-    color: #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: var(--dark-text-color);
+	background: var(--light-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
+	border-bottom: 0;
+	border-top-left-radius: 5px;
+	border-top-right-radius: 5px;
+	display: inline-block;
 }
 .tabs a:hover {
-    background: #e7e7e7;
-    border-color: #e1e1e1;
+	background: var(--light-bg-color);
+	border-color: rgba(0,0,0,0.15);
 }
 .tabs a.active {
-    background: #fff;
+	background: var(--main-bg-color);
+	color: var(--main-text-color);
 }
 .tab-content {
-    background: #fff;
-    border: 1px solid #efefef;
+	background: var(--main-bg-color);
+	border: 1px solid rgba(0,0,0,0.15);
 }
 .content {
-    padding: 1rem;
+	padding: 1rem;
 }
 .hide {
-    display: none;
+	display: none;
 }
 
 .alert {
-    margin-top: 2rem;
-    display: block;
-    text-align: center;
-    line-height: 3.0;
-    background: #d9edf7;
-    border: 1px solid #bcdff1;
-    border-radius: 5px;
-    color: #31708f;
+	margin-top: 2rem;
+	display: block;
+	text-align: center;
+	line-height: 3.0;
+	background: #d9edf7;
+	border: 1px solid #bcdff1;
+	border-radius: 5px;
+	color: #31708f;
 }
 ul, ol {
-    line-height: 1.8;
+	line-height: 1.8;
 }
 
 table {
-    width: 100%;
-    overflow: hidden;
+	width: 100%;
+	overflow: hidden;
 }
 th {
-    text-align: left;
-    border-bottom: 1px solid #e7e7e7;
-    padding-bottom: 0.5rem;
+	text-align: left;
+	border-bottom: 1px solid #e7e7e7;
+	padding-bottom: 0.5rem;
 }
 td {
-    padding: 0.2rem 0.5rem 0.2rem 0;
+	padding: 0.2rem 0.5rem 0.2rem 0;
 }
 tr:hover td {
-    background: #f1f1f1;
+	background: #f1f1f1;
 }
 td pre {
-    white-space: pre-wrap;
+	white-space: pre-wrap;
 }
 
 .trace a {
-    color: inherit;
+	color: inherit;
 }
 .trace table {
-    width: auto;
+	width: auto;
 }
 .trace tr td:first-child {
-    min-width: 5em;
-    font-weight: bold;
+	min-width: 5em;
+	font-weight: bold;
 }
 .trace td {
-    background: #e7e7e7;
-    padding: 0 1rem;
+	background: var(--light-bg-color);
+	padding: 0 1rem;
 }
 .trace td pre {
-    margin: 0;
+	margin: 0;
 }
 .args {
-    display: none;
-}
\ No newline at end of file
+	display: none;
+}
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index 0aa747b..1cca20c 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -5,68 +5,68 @@
 	<title>404 Page Not Found</title>
 
 	<style>
-	div.logo {
-		height: 200px;
-		width: 155px;
-		display: inline-block;
-		opacity: 0.08;
-		position: absolute;
-		top: 2rem;
-		left: 50%;
-		margin-left: -73px;
-	}
-	body {
-		height: 100%;
-		background: #fafafa;
-		font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-		color: #777;
-		font-weight: 300;
-	}
-	h1 {
-		font-weight: lighter;
-		letter-spacing: 0.8;
-		font-size: 3rem;
-		margin-top: 0;
-		margin-bottom: 0;
-		color: #222;
-	}
-	.wrap {
-		max-width: 1024px;
-		margin: 5rem auto;
-		padding: 2rem;
-		background: #fff;
-		text-align: center;
-		border: 1px solid #efefef;
-		border-radius: 0.5rem;
-		position: relative;
-	}
-	pre {
-		white-space: normal;
-		margin-top: 1.5rem;
-	}
-	code {
-		background: #fafafa;
-		border: 1px solid #efefef;
-		padding: 0.5rem 1rem;
-		border-radius: 5px;
-		display: block;
-	}
-	p {
-		margin-top: 1.5rem;
-	}
-	.footer {
-		margin-top: 2rem;
-		border-top: 1px solid #efefef;
-		padding: 1em 2em 0 2em;
-		font-size: 85%;
-		color: #999;
-	}
-	a:active,
-	a:link,
-	a:visited {
-		color: #dd4814;
-	}
-</style>
+		div.logo {
+			height: 200px;
+			width: 155px;
+			display: inline-block;
+			opacity: 0.08;
+			position: absolute;
+			top: 2rem;
+			left: 50%;
+			margin-left: -73px;
+		}
+		body {
+			height: 100%;
+			background: #fafafa;
+			font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+			color: #777;
+			font-weight: 300;
+		}
+		h1 {
+			font-weight: lighter;
+			letter-spacing: 0.8;
+			font-size: 3rem;
+			margin-top: 0;
+			margin-bottom: 0;
+			color: #222;
+		}
+		.wrap {
+			max-width: 1024px;
+			margin: 5rem auto;
+			padding: 2rem;
+			background: #fff;
+			text-align: center;
+			border: 1px solid #efefef;
+			border-radius: 0.5rem;
+			position: relative;
+		}
+		pre {
+			white-space: normal;
+			margin-top: 1.5rem;
+		}
+		code {
+			background: #fafafa;
+			border: 1px solid #efefef;
+			padding: 0.5rem 1rem;
+			border-radius: 5px;
+			display: block;
+		}
+		p {
+			margin-top: 1.5rem;
+		}
+		.footer {
+			margin-top: 2rem;
+			border-top: 1px solid #efefef;
+			padding: 1em 2em 0 2em;
+			font-size: 85%;
+			color: #999;
+		}
+		a:active,
+		a:link,
+		a:visited {
+			color: #dd4814;
+		}
+	</style>
 </head>
 <body>
 	<div class="wrap">
@@ -74,7 +74,7 @@
 
 		<p>
 			<?php if (! empty($message) && $message !== '(null)') : ?>
-				<?= esc($message) ?>
+				<?= nl2br(esc($message)) ?>
 			<?php else : ?>
 				Sorry! Cannot seem to find the page you were looking for.
 			<?php endif ?>
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 09fddcb..22b4ecd 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,10 +19,10 @@
 	<!-- 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() ?>
-				<a href="https://www.google.com/search?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+				<?= nl2br(esc($exception->getMessage())) ?>
+				<a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
 				   rel="noreferrer" target="_blank">search &rarr;</a>
 			</p>
 		</div>
@@ -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">
@@ -43,12 +43,11 @@
 
 		<ul class="tabs" id="tabs">
 			<li><a href="#backtrace">Backtrace</a></li>
-				<li><a href="#server">Server</a></li>
-				<li><a href="#request">Request</a></li>
-				<li><a href="#response">Response</a></li>
-				<li><a href="#files">Files</a></li>
-				<li><a href="#memory">Memory</a></li>
-			</li>
+			<li><a href="#server">Server</a></li>
+			<li><a href="#request">Request</a></li>
+			<li><a href="#response">Response</a></li>
+			<li><a href="#files">Files</a></li>
+			<li><a href="#memory">Memory</a></li>
 		</ul>
 
 		<div class="tab-content">
@@ -64,13 +63,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 +78,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 +108,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 +133,7 @@
 						continue;
 					} ?>
 
-					<h3>$<?= $var ?></h3>
+					<h3>$<?= esc($var) ?></h3>
 
 					<table>
 						<thead>
@@ -146,12 +145,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 +175,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 +198,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 +222,7 @@
 						</tr>
 						<tr>
 							<td>User Agent</td>
-							<td><?= $request->getUserAgent()->getAgentString() ?></td>
+							<td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
 						</tr>
 
 					</tbody>
@@ -239,7 +238,7 @@
 
 					<?php $empty = false; ?>
 
-					<h3>$<?= $var ?></h3>
+					<h3>$<?= esc($var) ?></h3>
 
 					<table style="width: 100%">
 						<thead>
@@ -251,12 +250,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 +317,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 +353,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 +365,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 +388,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.lock b/composer.lock
index 6286019..ee81b17 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/codeigniter4/CodeIgniter4.git",
-                "reference": "224322d93915950600d0757536147a25b9a2d725"
+                "reference": "43e0e9611b7e527a4b927127fc6f26a1c6d123a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/codeigniter4/CodeIgniter4/zipball/224322d93915950600d0757536147a25b9a2d725",
-                "reference": "224322d93915950600d0757536147a25b9a2d725",
+                "url": "https://api.github.com/repos/codeigniter4/CodeIgniter4/zipball/43e0e9611b7e527a4b927127fc6f26a1c6d123a5",
+                "reference": "43e0e9611b7e527a4b927127fc6f26a1c6d123a5",
                 "shasum": ""
             },
             "require": {
@@ -27,34 +27,56 @@
                 "ext-mbstring": "*",
                 "kint-php/kint": "^3.3",
                 "laminas/laminas-escaper": "^2.6",
-                "php": ">=7.2",
-                "psr/log": "^1.1"
+                "php": "^7.3 || ^8.0",
+                "psr/cache": "^1.0",
+                "psr/log": "^1.1",
+                "psr/simple-cache": "^1.0"
+            },
+            "provide": {
+                "psr/cache-implementation": "^1.0",
+                "psr/simple-cache-implementation": "^1.0"
             },
             "require-dev": {
+                "cache/integration-tests": "^0.17.0",
                 "codeigniter4/codeigniter4-standard": "^1.0",
                 "fakerphp/faker": "^1.9",
                 "mikey179/vfsstream": "^1.6",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^8.5",
+                "nexusphp/tachycardia": "^1.0",
+                "nikic/php-parser": "4.10.4",
+                "phpstan/phpstan": "0.12.85",
+                "phpunit/phpunit": "^9.1",
                 "predis/predis": "^1.1",
-                "rector/rector": "^0.8",
+                "rector/rector": "0.10.22",
                 "squizlabs/php_codesniffer": "^3.3"
             },
+            "suggest": {
+                "ext-fileinfo": "Improves mime type detection for files"
+            },
+            "default-branch": true,
             "type": "project",
+            "extra": {
+                "branch-alias": {
+                    "dev-develop": "4.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "CodeIgniter\\": "system/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "**/Database/Migrations/**"
+                ]
             },
             "autoload-dev": {
                 "psr-4": {
-                    "Utils\\": "utils"
+                    "CodeIgniter\\": "tests/system/",
+                    "Utils\\": "utils/"
                 }
             },
             "scripts": {
                 "post-update-cmd": [
                     "CodeIgniter\\ComposerScripts::postUpdate",
-                    "bash admin/setup.sh"
+                    "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
                 ],
                 "analyze": [
                     "phpstan analyze"
@@ -74,7 +96,7 @@
                 "slack": "https://codeigniterchat.slack.com",
                 "issues": "https://github.com/codeigniter4/CodeIgniter4/issues"
             },
-            "time": "2020-11-09T18:46:31+00:00"
+            "time": "2021-05-13T17:30:38+00:00"
         },
         {
             "name": "guzzle/guzzle",
@@ -502,6 +524,55 @@
             ],
             "time": "2020-10-31T13:49:32+00:00"
         },
+        {
+            "name": "psr/cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/master"
+            },
+            "time": "2016-08-06T20:24:11+00:00"
+        },
         {
             "name": "psr/log",
             "version": "1.1.3",
@@ -549,6 +620,57 @@
             ],
             "time": "2020-03-23T09:12:05+00:00"
         },
+        {
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/simple-cache/tree/master"
+            },
+            "time": "2017-10-23T01:57:42+00:00"
+        },
         {
             "name": "symfony/event-dispatcher",
             "version": "v2.8.52",
@@ -2430,5 +2552,5 @@
         "php": ">=7.2"
     },
     "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "plugin-api-version": "2.0.0"
 }
diff --git a/env b/env
index 11f4161..2e658e3 100644
--- a/env
+++ b/env
@@ -25,24 +25,12 @@
 
 # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
 # app.sessionCookieName = 'ci_session'
+# app.sessionExpiration = 7200
 # app.sessionSavePath = NULL
 # app.sessionMatchIP = false
 # app.sessionTimeToUpdate = 300
 # app.sessionRegenerateDestroy = false
 
-# app.cookiePrefix = ''
-# app.cookieDomain = ''
-# app.cookiePath = '/'
-# app.cookieSecure = false
-# app.cookieHTTPOnly = false
-
-# app.CSRFProtection  = false
-# app.CSRFTokenName   = 'csrf_test_name'
-# app.CSRFCookieName  = 'csrf_cookie_name'
-# app.CSRFExpire      = 7200
-# app.CSRFRegenerate  = true
-# app.CSRFExcludeURIs = []
-
 # app.CSPEnabled = false
 
 #--------------------------------------------------------------------
@@ -54,12 +42,14 @@
 # database.default.username = root
 # database.default.password = root
 # database.default.DBDriver = MySQLi
+# database.default.DBPrefix =
 
 # database.tests.hostname = localhost
 # database.tests.database = ci4
 # database.tests.username = root
 # database.tests.password = root
 # database.tests.DBDriver = MySQLi
+# database.tests.DBPrefix =
 
 #--------------------------------------------------------------------
 # CONTENT SECURITY POLICY
@@ -76,6 +66,7 @@
 # contentsecuritypolicy.fontSrc = null
 # contentsecuritypolicy.formAction = null
 # contentsecuritypolicy.frameAncestors = null
+# contentsecuritypolicy.frameSrc = null
 # contentsecuritypolicy.mediaSrc = null
 # contentsecuritypolicy.objectSrc = null
 # contentsecuritypolicy.pluginTypes = null
@@ -83,12 +74,27 @@
 # contentsecuritypolicy.sandbox = false
 # contentsecuritypolicy.upgradeInsecureRequests = false
 
+#--------------------------------------------------------------------
+# COOKIE
+#--------------------------------------------------------------------
+
+# cookie.prefix = ''
+# cookie.expires = 0
+# cookie.path = '/'
+# cookie.domain = ''
+# cookie.secure = false
+# cookie.httponly = false
+# cookie.samesite = 'Lax'
+# cookie.raw = false
+
 #--------------------------------------------------------------------
 # ENCRYPTION
 #--------------------------------------------------------------------
 
 # encryption.key = 
 # encryption.driver = OpenSSL
+# encryption.blockSize = 16
+# encryption.digest = SHA512
 
 #--------------------------------------------------------------------
 # HONEYPOT
@@ -99,3 +105,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/public/index.php b/public/index.php
index 127780d..cd60bae 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,13 +1,5 @@
 <?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);
-
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
diff --git a/spark b/spark
index 0a0908d..c4ad645 100755
--- a/spark
+++ b/spark
@@ -24,16 +24,16 @@ define('SPARKED', true);
  */
 
 // 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,17 +41,24 @@ $paths = new Config\Paths();
 // 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();
+if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true)))
+{
+	unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore
+	$suppress = true;
+}
+
+$console->showHeader($suppress);
 
 // fire off the command in the main framework.
 $response = $console->run();